Skip to content

Commit 4194b3b

Browse files
authored
Merge pull request #619 from dsyme/simpe-nuget-1
simplify dependencies
2 parents 0b73755 + 8b8784b commit 4194b3b

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

.nuget/NuGet.Config

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

88
<clear />
9-
<add key="dotnet-core" value="https://www.myget.org/F/dotnet-core/api/v3/index.json" />
109
<add key="nuget.org" value="https://www.nuget.org/api/v2/" />
1110
</packageSources>
1211
</configuration>

appveyor.ps1

Lines changed: 2 additions & 2 deletions
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.9'
3+
$version = '4.0.1.13'
44

55
function isVersionTag($tag){
66
$v = New-Object Version
@@ -34,7 +34,7 @@ pack(gi .\FSharp.Compiler.Tools.Nuget\FSharp.Compiler.Tools.nuspec)
3434
# Merge the latest known .NET Core FSharp.Core nuget package with the one we build here
3535
pushd dotnet-tools
3636
& dotnet restore
37-
& 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
37+
& dotnet mergenupkg --source ..\FSharp.Core.Nuget\FSharp.Core.$version.nupkg --other ..\packages\Microsoft.FSharp.Core.netcore.1.0.0-alpha-160831\Microsoft.FSharp.Core.netcore.1.0.0-alpha-160831.nupkg --framework netstandard1.6
3838
popd
3939
& copy FSharp.Core.Nuget\*.nupkg lib\release
4040
& copy FSharp.Compiler.Tools.Nuget\*.nupkg lib\release

packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +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="Microsoft.VisualFSharp.Core.Redist" version="1.0.0" />
1817
<package id="System.ValueTuple" version="4.0.0-rc3-24212-01" />
18+
<package id="Microsoft.FSharp.Core.netcore" version="1.0.0-alpha-160831" />
1919
</packages>

0 commit comments

Comments
 (0)