Merge pull request #590 from dsyme/merge-pkg

merge FSharp.Core nuget package

Author: dsyme

appveyor.ps1

@@ -1,6 +1,6 @@
 
 # the version under development, update after a release
-$version = '4.0.1.3'
+$version = '4.0.1.4'
 
 function isVersionTag($tag){
     $v = New-Object Version
@@ -31,3 +31,11 @@ function pack($nuspec){
 pack(gi .\FSharp.Core.Nuget\FSharp.Core.nuspec)
 pack(gi .\FSharp.Compiler.Tools.Nuget\FSharp.Compiler.Tools.nuspec)
 
+# Merge the latest known .NET Core FSharp.Core nuget package with the one we build here
+pushd dotnet-tools
+& dotnet restore
+& dotnet mergenupkg --source ..\FSharp.Core.Nuget\FSharp.Core.$version.nupkg --other ..\packages\Microsoft.FSharp.Core.netcore.1.0.0-alpha-160629\Microsoft.FSharp.Core.netcore.1.0.0-alpha-160629.nupkg --framework netstandard1.6
+popd
+& copy FSharp.Core.Nuget\*.nupkg lib\release
+& copy FSharp.Compiler.Tools.Nuget\*.nupkg lib\release
+

appveyor.yml

@@ -11,5 +11,4 @@ version: '{build}'
 artifacts:
   - path: lib\release
     name: release
-  - path: FSharp.Core.Nuget\*.nupkg
-  - path: FSharp.Compiler.Tools.Nuget\*.nupkg
+  - path: lib\release\*.nupkg

dotnet-tools/project.json

@@ -0,0 +1,8 @@
+{
+  "tools": {
+    "dotnet-mergenupkg": "1.0.*",
+  },
+  "frameworks": {
+    "netstandard1.6": {}
+  }
+}

packages.config

@@ -14,4 +14,5 @@
   <package id="Microsoft.DiaSymReader" version="1.0.8" />
   <package id="FsSrGen" version="3.0.0" targetFramework="net46" />
   <package id="FSharp.SRGen.Build.Tasks" version="3.0.0" targetFramework="net46" />
+  <package id="Microsoft.FSharp.Core.netcore" version="1.0.0-alpha-160629" />
 </packages>