Merge branch 'master' into release

picklesdoc · Dec 30, 2015 · 29d7f9e · 29d7f9e
2 parents dbc697e + 0f97dd6
commit 29d7f9e
Show file tree

Hide file tree

Showing 29 changed files with 346 additions and 590 deletions.
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
diff --git a/build.bat b/build.bat
@@ -1,5 +1,5 @@
 @echo off
-set "picklesVersion=2.0.4"
+set "picklesVersion=2.1.0"
 
 cls
 

diff --git a/chocolatey.fsx b/chocolatey.fsx
@@ -18,7 +18,22 @@ Target "Clean" (fun _ ->
 
 
 Target "CreatePackage CMD" (fun _ ->
-    CopyFiles packagingDir [cmdDir + "Pickles.exe"; cmdDir + "NLog.config"]
+    CopyFiles packagingDir [
+        cmdDir + "Autofac.dll";
+        cmdDir + "AutoMapper.dll";
+        cmdDir + "ClosedXML.dll";
+        cmdDir + "DocumentFormat.OpenXml.dll";
+        cmdDir + "Gherkin.dll";
+        cmdDir + "MarkdownDeep.dll";
+        cmdDir + "NDesk.Options.dll";
+        cmdDir + "Newtonsoft.Json.dll";
+        cmdDir + "NGenerics.dll";
+        cmdDir + "NLog.dll";
+        cmdDir + "PicklesDoc.Pickles.Library.dll";
+        cmdDir + "System.IO.Abstractions.dll";
+        cmdDir + "pickles.exe";
+        cmdDir + "NLog.config" ]
+
     WriteFile (packagingDir + "version.ps1") [("$version = \"" + version + "\"")]
     NuGet (fun p ->
         {p with
@@ -31,7 +46,31 @@ Target "CreatePackage CMD" (fun _ ->
 
 
 Target "CreatePackage GUI" (fun _ ->
-    CopyFiles packagingDir [guiDir + "picklesui.exe"; guiDir + "NLog.config"; guiDir + "PicklesUI.exe.config"]
+    CopyFiles packagingDir [
+        guiDir + "Autofac.dll";
+        guiDir + "AutoMapper.dll";
+        guiDir + "ClosedXML.dll";
+        guiDir + "DocumentFormat.OpenXml.dll";
+        guiDir + "GalaSoft.MvvmLight.dll";
+        guiDir + "GalaSoft.MvvmLight.Extras.dll";
+        guiDir + "GalaSoft.MvvmLight.Platform.dll";
+        guiDir + "Gherkin.dll";
+        guiDir + "MahApps.Metro.dll";
+        guiDir + "MarkdownDeep.dll";
+        guiDir + "Microsoft.Practices.ServiceLocation.dll";
+        guiDir + "NDesk.Options.dll";
+        guiDir + "Newtonsoft.Json.dll";
+        guiDir + "NGenerics.dll";
+        guiDir + "NLog.dll";
+        guiDir + "NlogViewer.dll";
+        guiDir + "Ookii.Dialogs.Wpf.dll";
+        guiDir + "PicklesDoc.Pickles.Library.dll";
+        guiDir + "System.IO.Abstractions.dll";
+        guiDir + "System.Windows.Interactivity.dll";
+        guiDir + "picklesui.exe";
+        guiDir + "NLog.config";
+        guiDir + "PicklesUI.exe.config"]
+
     WriteFile (packagingDir + "version.ps1") [("$version = \"" + version + "\"")]
     WriteFile (packagingDir + "picklesui.exe.gui") [("")]
     NuGet (fun p ->

diff --git a/chocolatey/pickles.nuspec b/chocolatey/pickles.nuspec
@@ -35,6 +35,18 @@ Optionally, *Pickles* can **integrate test results**, so that your stakeholders
         <iconUrl>https://cdn.rawgit.com/picklesdoc/pickles/master/pickles.jpeg</iconUrl>
     </metadata>
     <files>
+        <file src="Autofac.dll" target="tools" />
+        <file src="AutoMapper.dll" target="tools" />
+        <file src="ClosedXML.dll" target="tools" />
+        <file src="DocumentFormat.OpenXml.dll" target="tools" />
+        <file src="Gherkin.dll" target="tools" />
+        <file src="MarkdownDeep.dll" target="tools" />
+        <file src="NDesk.Options.dll" target="tools" />
+        <file src="Newtonsoft.Json.dll" target="tools" />
+        <file src="NGenerics.dll" target="tools" />
+        <file src="NLog.dll" target="tools" />
+        <file src="PicklesDoc.Pickles.Library.dll" target="tools" />
+        <file src="System.IO.Abstractions.dll" target="tools" />
         <file src="pickles.exe" target="tools" />
     </files>
 </package>

diff --git a/chocolatey/picklesui.nuspec b/chocolatey/picklesui.nuspec
@@ -35,6 +35,26 @@ Optionally, *Pickles* can **integrate test results**, so that your stakeholders
         <iconUrl>https://cdn.rawgit.com/picklesdoc/pickles/master/pickles.jpeg</iconUrl>
     </metadata>
     <files>
+        <file src="Autofac.dll" target="tools" />
+        <file src="AutoMapper.dll" target="tools" />
+        <file src="ClosedXML.dll" target="tools" />
+        <file src="DocumentFormat.OpenXml.dll" target="tools" />
+        <file src="GalaSoft.MvvmLight.dll" target="tools" />
+        <file src="GalaSoft.MvvmLight.Extras.dll" target="tools" />
+        <file src="GalaSoft.MvvmLight.Platform.dll" target="tools" />
+        <file src="Gherkin.dll" target="tools" />
+        <file src="MahApps.Metro.dll" target="tools" />
+        <file src="MarkdownDeep.dll" target="tools" />
+        <file src="Microsoft.Practices.ServiceLocation.dll" target="tools" />
+        <file src="NDesk.Options.dll" target="tools" />
+        <file src="Newtonsoft.Json.dll" target="tools" />
+        <file src="NGenerics.dll" target="tools" />
+        <file src="NLog.dll" target="tools" />
+        <file src="NlogViewer.dll" target="tools" />
+        <file src="Ookii.Dialogs.Wpf.dll" target="tools" />
+        <file src="PicklesDoc.Pickles.Library.dll" target="tools" />
+        <file src="System.IO.Abstractions.dll" target="tools" />
+        <file src="System.Windows.Interactivity.dll" target="tools" />
         <file src="picklesui.exe" target="tools" />
         <file src="picklesui.exe.gui" target="tools" />
         <file src="NLog.config" target="tools" />

diff --git a/nuget.fsx b/nuget.fsx
@@ -20,27 +20,55 @@ Target "Clean" (fun _ ->
 
 Target "CreatePackageCommandLine" (fun _ ->
     // Copy all the package files into a package folder
-    CopyFiles packagingDir [cmdDir + "pickles.exe"; cmdDir + "NLog.config" ]
+    CopyFiles packagingDir [
+        cmdDir + "Autofac.dll";
+        cmdDir + "AutoMapper.dll";
+        cmdDir + "ClosedXML.dll";
+        cmdDir + "DocumentFormat.OpenXml.dll";
+        cmdDir + "Gherkin.dll";
+        cmdDir + "MarkdownDeep.dll";
+        cmdDir + "NDesk.Options.dll";
+        cmdDir + "Newtonsoft.Json.dll";
+        cmdDir + "NGenerics.dll";
+        cmdDir + "NLog.dll";
+        cmdDir + "PicklesDoc.Pickles.Library.dll";
+        cmdDir + "System.IO.Abstractions.dll";
+        cmdDir + "pickles.exe";
+        cmdDir + "NLog.config" ]
 
-    NuGet (fun p -> 
+    NuGet (fun p ->
         {p with
             OutputPath = deployDir
             WorkingDir = packagingDir
             Version = version
-            Publish = false }) 
+            Publish = false })
             "src/Pickles/Pickles.CommandLine/Pickles.CommandLine.nuspec"
 )
 
 Target "CreatePackageMsBuild" (fun _ ->
     // Copy all the package files into a package folder
-    CopyFiles packagingDir [msBuildDir + "PicklesDoc.Pickles.MSBuild.Tasks.dll"; msBuildDir + "build/Pickles.MSBuild.targets";]
+    CopyFiles packagingDir [
+        msBuildDir + "Autofac.dll";
+        msBuildDir + "AutoMapper.dll";
+        msBuildDir + "ClosedXML.dll";
+        msBuildDir + "DocumentFormat.OpenXml.dll";
+        msBuildDir + "Gherkin.dll";
+        msBuildDir + "MarkdownDeep.dll";
+        msBuildDir + "NDesk.Options.dll";
+        msBuildDir + "Newtonsoft.Json.dll";
+        msBuildDir + "NGenerics.dll";
+        msBuildDir + "NLog.dll";
+        msBuildDir + "PicklesDoc.Pickles.Library.dll";
+        msBuildDir + "System.IO.Abstractions.dll";
+        msBuildDir + "PicklesDoc.Pickles.MSBuild.Tasks.dll";
+        msBuildDir + "build/Pickles.MSBuild.targets";]
 
-    NuGet (fun p -> 
+    NuGet (fun p ->
         {p with
             OutputPath = deployDir
             WorkingDir = packagingDir
             Version = version
-            Publish = false }) 
+            Publish = false })
             "src/Pickles/Pickles.MSBuild/Pickles.MSBuild.nuspec"
 )
 
@@ -62,16 +90,16 @@ Target "CreatePackagePowerShell" (fun _ ->
         powerShellDir + "System.IO.Abstractions.dll";
         "src/Pickles/Pickles.PowerShell/init.ps1"  ]
 
-    NuGet (fun p -> 
+    NuGet (fun p ->
         {p with
             OutputPath = deployDir
             WorkingDir = packagingDir
             Version = version
-            Publish = false }) 
+            Publish = false })
             "src/Pickles/Pickles.PowerShell/Pickles.nuspec"
 )
 
-Target "CreatePackage" (fun _ -> 
+Target "CreatePackage" (fun _ ->
     trace ("Starting build of nuget packages version " + version)
     DeleteDir packagingDir
 )

diff --git a/src/Pickles/.vs/config/applicationhost.config b/src/Pickles/.vs/config/applicationhost.config
@@ -163,7 +163,7 @@
             </site>
             <site name="Pickles.BaseDhtmlFiles" id="2">
                 <application path="/" applicationPool="Clr4IntegratedAppPool">
-                    <virtualDirectory path="/" physicalPath="C:\Dev\Code\GitHub\DirkRombauts\pickles\src\Pickles\Pickles.BaseDhtmlFiles" />
+                    <virtualDirectory path="/" physicalPath="C:\Dev\Code\GitHub\PicklesDoc\pickles\src\Pickles\Pickles.BaseDhtmlFiles" />
                 </application>
                 <bindings>
                     <binding protocol="http" bindingInformation="*:52000:localhost" />

diff --git a/src/Pickles/Pickles.CommandLine/FodyWeavers.xml b/src/Pickles/Pickles.CommandLine/FodyWeavers.xml