Skip to content

Commit 6d8cd86

Browse files
committed
merge FSharp.Core nuget package
1 parent 2f737f8 commit 6d8cd86

File tree

5 files changed

+9
-25
lines changed

5 files changed

+9
-25
lines changed

.nuget/NuGet.Config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<packageSources>
77

88
<clear />
9+
<add key="myget.org fsharp-daily" value="https://www.myget.org/F/fsharp-daily/api/v3/index.json" />
910
<add key="dotnet-core" value="https://www.myget.org/F/dotnet-core/api/v3/index.json" />
1011
<add key="nuget.org" value="https://www.nuget.org/api/v2/" />
1112

appveyor.ps1

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
# the version under development, update after a release
3-
$version = '4.0.1.3'
3+
$version = '4.0.1.4'
44

55
function isVersionTag($tag){
66
$v = New-Object Version
@@ -31,3 +31,7 @@ function pack($nuspec){
3131
pack(gi .\FSharp.Core.Nuget\FSharp.Core.nuspec)
3232
pack(gi .\FSharp.Compiler.Tools.Nuget\FSharp.Compiler.Tools.nuspec)
3333

34+
# Merge the latest known .NET Core FSharp.Core nuget package with the one we build here
35+
& packages\NupkgMerge.1.0.0.1\tools\NupkgMerge.exe -p FSharp.Core.Nuget\FSharp.Core.$version.nupkg -s packages\Microsoft.FSharp.Core.netcore.1.0.0-alpha-160627\Microsoft.FSharp.Core.netcore.1.0.0-alpha-160627.nupkg -o lib\release\FSharp.Core.$version.nupkg
36+
& copy FSharp.Compiler.Tools.Nuget\*.nupkg lib\release
37+

appveyor.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,4 @@ version: '{build}'
1111
artifacts:
1212
- path: lib\release
1313
name: release
14-
- path: FSharp.Core.Nuget\*.nupkg
15-
- path: FSharp.Compiler.Tools.Nuget\*.nupkg
14+
- path: lib\release\*.nupkg

packages.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,6 @@
1414
<package id="Microsoft.DiaSymReader" version="1.0.8" />
1515
<package id="FsSrGen" version="3.0.0" targetFramework="net46" />
1616
<package id="FSharp.SRGen.Build.Tasks" version="3.0.0" targetFramework="net46" />
17+
<package id="NupkgMerge" version="1.0.0.1" />
18+
<package id="Microsoft.FSharp.Core.netcore" version="1.0.0-alpha-160627" />
1719
</packages>

src/fsharp/FSharp.Build/project.json

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)