fix packaging issues

mbraceproject · Sep 14, 2017 · 46bf006 · 46bf006
1 parent 2b4d937
commit 46bf006
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 35 deletions.
diff --git a/build.fsx b/build.fsx
@@ -105,7 +105,7 @@ FinalTarget "CloseTestRunner" (fun _ ->
 //// --------------------------------------------------------------------------------------
 //// Build a NuGet package
 
-Target "NuGet" (fun _ ->    
+Target "BundleNuGet" (fun _ ->    
     Paket.Pack (fun p -> 
         { p with 
             ToolPath = ".paket/paket.exe" 
@@ -202,8 +202,8 @@ Target "Release" DoNothing
   ==> "Build.Net35"
   ==> "PrepareRelease"
   ==> "GenerateDocs"
+  ==> "BundleNuGet"
   ==> "ReleaseDocs"
-  ==> "NuGet"
   ==> "NuGetPush"
   ==> "ReleaseGithub"
   ==> "Release"

diff --git a/paket.dependencies b/paket.dependencies
@@ -2,9 +2,9 @@ framework: >= net35
 redirects: on
 source https://www.nuget.org/api/v2
 
-nuget FSharp.Core 4.0.0.1
+nuget FSharp.Core >= 3.1 lowest_matching: true
 nuget Newtonsoft.Json >= 6.0.5
-nuget TaskParallelLibrary framework:net35
+nuget TaskParallelLibrary ~> 1.0 framework:net35
 
 github eiriktsarpalis/TypeShape:2.17 src/TypeShape/TypeShape.fs
 

diff --git a/paket.lock b/paket.lock
@@ -2,7 +2,7 @@ REDIRECTS: ON
 RESTRICTION: >= net35
 NUGET
   remote: https://www.nuget.org/api/v2
-    FSharp.Core (4.0.0.1)
+    FSharp.Core (3.1.2)
     Newtonsoft.Json (10.0.3)
     TaskParallelLibrary (1.0.2856) - restriction: == net35
 GITHUB

diff --git a/src/FsPickler.CSharp/FsPickler.CSharp.csproj b/src/FsPickler.CSharp/FsPickler.CSharp.csproj
@@ -113,21 +113,21 @@
     </When>
   </Choose>
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v3.5'">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v5.0')">
       <ItemGroup>
         <Reference Include="FSharp.Core">
-          <HintPath>..\..\packages\FSharp.Core\lib\net20\FSharp.Core.dll</HintPath>
+          <HintPath>..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath>
           <Private>False</Private>
           <Paket>True</Paket>
         </Reference>
       </ItemGroup>
     </When>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v5.0')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v3.5')">
       <ItemGroup>
         <Reference Include="FSharp.Core">
-          <HintPath>..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath>
+          <HintPath>..\..\packages\FSharp.Core\lib\net35\FSharp.Core.dll</HintPath>
           <Private>False</Private>
-          <Paket>True</Paket>
+          <Paket>False</Paket>
         </Reference>
       </ItemGroup>
     </When>

diff --git a/src/FsPickler.CSharp/Properties/AssemblyInfo.cs b/src/FsPickler.CSharp/Properties/AssemblyInfo.cs
@@ -3,13 +3,13 @@
 
 [assembly: AssemblyProductAttribute("FsPickler")]
 [assembly: AssemblyCopyrightAttribute("© Eirik Tsarpalis.")]
-[assembly: AssemblyVersionAttribute("4.3.0")]
-[assembly: AssemblyFileVersionAttribute("4.3.0")]
+[assembly: AssemblyVersionAttribute("3.4.0")]
+[assembly: AssemblyFileVersionAttribute("3.4.0")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const System.String AssemblyProduct = "FsPickler";
         internal const System.String AssemblyCopyright = "© Eirik Tsarpalis.";
-        internal const System.String AssemblyVersion = "4.3.0";
-        internal const System.String AssemblyFileVersion = "4.3.0";
+        internal const System.String AssemblyVersion = "3.4.0";
+        internal const System.String AssemblyFileVersion = "3.4.0";
     }
 }
diff --git a/src/FsPickler.Json/AssemblyInfo.fs b/src/FsPickler.Json/AssemblyInfo.fs
@@ -4,12 +4,12 @@ open System.Reflection
 
 [<assembly: AssemblyProductAttribute("FsPickler")>]
 [<assembly: AssemblyCopyrightAttribute("© Eirik Tsarpalis.")>]
-[<assembly: AssemblyVersionAttribute("4.3.0")>]
-[<assembly: AssemblyFileVersionAttribute("4.3.0")>]
+[<assembly: AssemblyVersionAttribute("3.4.0")>]
+[<assembly: AssemblyFileVersionAttribute("3.4.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyProduct = "FsPickler"
     let [<Literal>] AssemblyCopyright = "© Eirik Tsarpalis."
-    let [<Literal>] AssemblyVersion = "4.3.0"
-    let [<Literal>] AssemblyFileVersion = "4.3.0"
+    let [<Literal>] AssemblyVersion = "3.4.0"
+    let [<Literal>] AssemblyFileVersion = "3.4.0"
diff --git a/src/FsPickler.Json/FsPickler.Json.fsproj b/src/FsPickler.Json/FsPickler.Json.fsproj
@@ -123,21 +123,21 @@
   </ItemGroup>
   <Import Project="..\..\.paket\paket.targets" />
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v3.5'">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v5.0')">
       <ItemGroup>
         <Reference Include="FSharp.Core">
-          <HintPath>..\..\packages\FSharp.Core\lib\net20\FSharp.Core.dll</HintPath>
+          <HintPath>..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath>
           <Private>False</Private>
           <Paket>True</Paket>
         </Reference>
       </ItemGroup>
     </When>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v5.0')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v3.5')">
       <ItemGroup>
         <Reference Include="FSharp.Core">
-          <HintPath>..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath>
+          <HintPath>..\..\packages\FSharp.Core\lib\net35\FSharp.Core.dll</HintPath>
           <Private>False</Private>
-          <Paket>True</Paket>
+          <Paket>False</Paket>
         </Reference>
       </ItemGroup>
     </When>

diff --git a/src/FsPickler/AssemblyInfo.fs b/src/FsPickler/AssemblyInfo.fs
@@ -4,12 +4,12 @@ open System.Reflection
 
 [<assembly: AssemblyProductAttribute("FsPickler")>]
 [<assembly: AssemblyCopyrightAttribute("© Eirik Tsarpalis.")>]
-[<assembly: AssemblyVersionAttribute("4.3.0")>]
-[<assembly: AssemblyFileVersionAttribute("4.3.0")>]
+[<assembly: AssemblyVersionAttribute("3.4.0")>]
+[<assembly: AssemblyFileVersionAttribute("3.4.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyProduct = "FsPickler"
     let [<Literal>] AssemblyCopyright = "© Eirik Tsarpalis."
-    let [<Literal>] AssemblyVersion = "4.3.0"
-    let [<Literal>] AssemblyFileVersion = "4.3.0"
+    let [<Literal>] AssemblyVersion = "3.4.0"
+    let [<Literal>] AssemblyFileVersion = "3.4.0"
diff --git a/src/FsPickler/FsPickler.fsproj b/src/FsPickler/FsPickler.fsproj
@@ -165,7 +165,7 @@
         <Reference Include="System.Threading">
           <HintPath>..\..\packages\TaskParallelLibrary\lib\net35\System.Threading.dll</HintPath>
           <Private>True</Private>
-          <Paket>false</Paket>
+          <Paket>False</Paket>
         </Reference>
       </ItemGroup>
     </When>
@@ -179,21 +179,21 @@
   </Choose>
   <Import Project="..\..\.paket\paket.targets" />
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v3.5'">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v5.0')">
       <ItemGroup>
         <Reference Include="FSharp.Core">
-          <HintPath>..\..\packages\FSharp.Core\lib\net20\FSharp.Core.dll</HintPath>
+          <HintPath>..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath>
           <Private>False</Private>
           <Paket>True</Paket>
         </Reference>
       </ItemGroup>
     </When>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v5.0')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v3.5')">
       <ItemGroup>
         <Reference Include="FSharp.Core">
-          <HintPath>..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath>
+          <HintPath>..\..\packages\FSharp.Core\lib\net35\FSharp.Core.dll</HintPath>
           <Private>False</Private>
-          <Paket>True</Paket>
+          <Paket>False</Paket>
         </Reference>
       </ItemGroup>
     </When>

diff --git a/src/FsPickler/paket.references b/src/FsPickler/paket.references
@@ -1,3 +1,2 @@
 FSharp.Core copy_local:false
-File: TypeShape.fs TypeShape
-TaskParallelLibrary
+File: TypeShape.fs TypeShape