Merge branch 'master' into release

picklesdoc · Dec 27, 2015 · dbc697e · dbc697e
2 parents 3bca9ff + 461a6aa
commit dbc697e
Show file tree

Hide file tree

Showing 8 changed files with 306 additions and 23 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.3"
+set "picklesVersion=2.0.4"
 
 cls
 

diff --git a/nuget.fsx b/nuget.fsx
@@ -46,7 +46,21 @@ Target "CreatePackageMsBuild" (fun _ ->
 
 Target "CreatePackagePowerShell" (fun _ ->
     // Copy all the package files into a package folder
-    CopyFiles packagingDir [powerShellDir + "PicklesDoc.Pickles.PowerShell.dll"; "src/Pickles/Pickles.PowerShell/init.ps1"  ]
+    CopyFiles packagingDir [
+        powerShellDir + "Autofac.dll";
+        powerShellDir + "AutoMapper.dll";
+        powerShellDir + "ClosedXML.dll";
+        powerShellDir + "DocumentFormat.OpenXml.dll";
+        powerShellDir + "Gherkin.dll";
+        powerShellDir + "MarkdownDeep.dll";
+        powerShellDir + "NDesk.Options.dll";
+        powerShellDir + "Newtonsoft.Json.dll";
+        powerShellDir + "NGenerics.dll";
+        powerShellDir + "NLog.dll";
+        powerShellDir + "PicklesDoc.Pickles.Library.dll";
+        powerShellDir + "PicklesDoc.Pickles.PowerShell.dll";
+        powerShellDir + "System.IO.Abstractions.dll";
+        "src/Pickles/Pickles.PowerShell/init.ps1"  ]
 
     NuGet (fun p -> 
         {p with

diff --git a/src/Pickles/Pickles.PowerShell/FodyWeavers.xml b/src/Pickles/Pickles.PowerShell/FodyWeavers.xml
diff --git a/src/Pickles/Pickles.PowerShell/Pickles.PowerShell.csproj b/src/Pickles/Pickles.PowerShell/Pickles.PowerShell.csproj
@@ -72,17 +72,7 @@
     <None Include="packages.config" />
     <None Include="Settings.StyleCop" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="FodyWeavers.xml" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Fody.1.29.3\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.1.29.3\build\dotnet\Fody.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Fody.1.29.3\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.3\build\dotnet\Fody.targets'))" />
-  </Target>
   <!--<UsingTask TaskName="CosturaCleanup" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll" TaskFactory="CodeTaskFactory">
     <ParameterGroup>
       <Config Output="false" Required="true" ParameterType="Microsoft.Build.Framework.ITaskItem" />

diff --git a/src/Pickles/Pickles.PowerShell/Pickles.nuspec b/src/Pickles/Pickles.PowerShell/Pickles.nuspec
@@ -36,7 +36,19 @@
     <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="PicklesDoc.Pickles.PowerShell.dll" target="tools" />
+    <file src="System.IO.Abstractions.dll" target="tools" />
     <file src="init.ps1" target="tools\init.ps1" />
   </files>
 </package>
diff --git a/src/Pickles/Pickles.PowerShell/packages.config b/src/Pickles/Pickles.PowerShell/packages.config
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Autofac" version="3.5.2" targetFramework="net45" />
-  <package id="Costura.Fody" version="1.3.5.0" targetFramework="net45" developmentDependency="true" />
-  <package id="Fody" version="1.29.3" targetFramework="net45" developmentDependency="true" />
   <package id="System.IO.Abstractions" version="2.0.0.117" targetFramework="net45" />
 </packages>
diff --git a/src/Pickles/VersionInfo.cs b/src/Pickles/VersionInfo.cs
@@ -8,10 +8,10 @@
 [assembly: AssemblyTrademarkAttribute("")]
 [assembly: AssemblyCultureAttribute("")]
 [assembly: ComVisibleAttribute(false)]
-[assembly: AssemblyVersionAttribute("2.0.3")]
-[assembly: AssemblyFileVersionAttribute("2.0.3")]
+[assembly: AssemblyVersionAttribute("2.0.4")]
+[assembly: AssemblyFileVersionAttribute("2.0.4")]
 namespace System {
     internal static class AssemblyVersionInformation {
-        internal const string Version = "2.0.3";
+        internal const string Version = "2.0.4";
     }
 }