Skip to content

Commit 15263bf

Browse files
enricosadaenricosada
committed
update to .net core sdk preview2 and .net core 1.0 rtm
the nuget.config use a temporary feed until deps are published on nuget.org
1 parent f9fe855 commit 15263bf

File tree

7 files changed

+43
-71
lines changed

7 files changed

+43
-71
lines changed

‎appveyor.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ init:
55

66
environment:
77
global:
8-
CLI_VERSION: 1.0.0-preview1-002702 # released preview1
8+
CLI_VERSION: 1.0.0-preview2-003121 # released preview1
99
matrix:
1010
- BUILD_TARGET: DotnetCliTests
1111
- BUILD_TARGET: NuGet
1212

1313
install:
1414
# .NET Core SDK binaries
15-
- ps: $url = "https://dotnetcli.blob.core.windows.net/dotnet/beta/Binaries/$($env:CLI_VERSION)/dotnet-dev-win-x64.$($env:CLI_VERSION.ToLower()).zip"
15+
- ps: $url = "https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/$($env:CLI_VERSION)/dotnet-dev-win-x64.$($env:CLI_VERSION.ToLower()).zip"
1616
# Download .NET Core SDK and add to PATH
1717
- ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk"
1818
- ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null

‎src/fsharp/FSharp.Compiler.Service.ProjectCracker.netcore/NuGet.Config‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<packageSources>
4-
<add key="fsharp-daily" value="https://www.myget.org/F/fsharp-daily/api/v3/index.json" />
5-
<!-- MSBuild -->
6-
<add key="dotnet-buildtools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
7-
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
4+
<add key="fsharp-netcore-preview2" value="https://www.myget.org/F/fsharp-netcoresdk-preview2-betatest/api/v3/index.json" />
85
</packageSources>
96
</configuration>

‎src/fsharp/FSharp.Compiler.Service.ProjectCracker.netcore/project.json‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"dependencies": {
5050
"Microsoft.NETCore.App": {
5151
"type": "platform",
52-
"version": "1.0.0-rc2-3002702"
52+
"version": "1.0.0"
5353
},
5454
"Microsoft.Build": "0.1.0-preview-*",
5555
"Microsoft.Build.Framework": "0.1.0-preview-*",
@@ -61,20 +61,13 @@
6161
},
6262
"tools": {
6363
"dotnet-compile-fsc": {
64-
"version": "1.0.0-preview1-*",
65-
"imports": [
66-
"dnxcore50",
67-
"portable-net45+win81",
68-
"netstandard1.3"
69-
]
64+
"version": "1.0.0-preview2-*",
65+
"imports": "dnxcore50"
7066
}
7167
},
7268
"frameworks": {
73-
"netstandard1.5": {
74-
"imports": [
75-
"portable-net45+win81",
76-
"dnxcore50"
77-
]
69+
"netcoreapp1.0": {
70+
"imports": "dnxcore50"
7871
}
7972
}
8073
}

‎src/fsharp/FSharp.Compiler.Service.netcore/NuGet.Config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<packageSources>
4-
<add key="fsharp-daily" value="https://www.myget.org/F/fsharp-daily/api/v3/index.json" />
4+
<add key="fsharp-netcore-preview2" value="https://www.myget.org/F/fsharp-netcoresdk-preview2-betatest/api/v3/index.json" />
55
</packageSources>
66
</configuration>

‎src/fsharp/FSharp.Compiler.Service.netcore/project.json‎

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"Microsoft Corporation",
66
"Dave Thomas",
77
"Anh-Dung Phan",
8-
"Tomas Petricek",
8+
"Tomas Petricek"
99
],
1010
"copyright": "",
1111
"description": "The F# compiler services package contains a custom build of the F# compiler that exposes additional functionality for implementing F# language bindings, additional tools based on the compiler or refactoring tools. The package also includes F# interactive service that can be used for embedding F# scripting into your applications.",
@@ -17,7 +17,7 @@
1717
"tags": [
1818
"F# fsharp interactive compiler editor"
1919
],
20-
"releaseNotes": "",
20+
"releaseNotes": ""
2121
},
2222
"buildOptions": {
2323
"debugType": "portable",
@@ -258,7 +258,7 @@
258258
"STRONG_NAME_AND_DELAY_SIGN_FSHARP_COMPILER_WITH_MSFT_KEY",
259259
"TODO_REWORK_ASSEMBLY_LOAD",
260260
"TODO_REWORK_SERVER",
261-
"TRACE",
261+
"TRACE"
262262
],
263263
"nowarn": [
264264
"44",
@@ -269,44 +269,40 @@
269269
"75",
270270
"62",
271271
"9",
272-
"2003",
272+
"2003"
273273
],
274274
"xmlDoc": true,
275275
"delaySign": true,
276276
"warningsAsErrors": true,
277277
"additionalArguments": [
278278
"--fullpaths",
279279
"--flaterrors",
280-
"--warnon:1182",
280+
"--warnon:1182"
281281
]
282282
},
283283
"dependencies": {
284-
"NETStandard.Library": "1.5.0-rc2-24027",
285-
"System.Diagnostics.TraceSource": "4.0.0-rc2-*",
286-
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160509",
287-
"System.Collections.Immutable": "1.2.0-rc2-24027",
288-
"System.Security.Cryptography.Algorithms": "4.1.0-rc2-24027",
289-
"System.Security.Cryptography.Primitives": "4.0.0-rc2-24027",
290-
"System.Reflection.Metadata": "1.3.0-rc2-24027",
291-
"System.Diagnostics.Process": "4.1.0-rc2-24027"
284+
"NETStandard.Library": "1.6.0",
285+
"System.Diagnostics.TraceSource": "4.0.0",
286+
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-*",
287+
"System.Collections.Immutable": "1.2.0",
288+
"System.Security.Cryptography.Algorithms": "4.2.0",
289+
"System.Security.Cryptography.Primitives": "4.0.0",
290+
"System.Reflection.Metadata": "1.4.1-beta-24227-04",
291+
"System.Diagnostics.Process": "4.1.0"
292292
},
293293
"tools": {
294-
"dotnet-fssrgen": "3.1.*",
294+
"dotnet-fssrgen": "3.2.*",
295295
"dotnet-compile-fsc": {
296-
"version": "1.0.0-preview1-*",
297-
"imports": [
298-
"dnxcore50",
299-
"portable-net45+win81",
300-
"netstandard1.3"
301-
]
296+
"version": "1.0.0-preview2-*",
297+
"imports": "dnxcore50"
302298
}
303299
},
304300
"frameworks": {
305-
"netstandard1.5": {
301+
"netstandard1.6": {
306302
"imports": [
307303
"portable-net45+win81",
308304
"dnxcore50"
309305
]
310306
}
311307
}
312-
}
308+
}

‎tests/FSharp.Compiler.Service.Tests.netcore/NuGet.Config‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<packageSources>
4-
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
5-
<clear />
6-
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
7-
<add key="fsharp-daily" value="https://www.myget.org/F/fsharp-daily/api/v3/index.json" />
8-
<add key="dotnet-buildtools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
9-
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
10-
<add key="dotnet-cli" value="https://dotnet.myget.org/F/dotnet-cli/api/v3/index.json" />
11-
<add key="cli-deps" value="https://dotnet.myget.org/F/cli-deps/api/v3/index.json" />
4+
<add key="fsharp-netcore-preview2" value="https://www.myget.org/F/fsharp-netcoresdk-preview2-betatest/api/v3/index.json" />
125
</packageSources>
136
</configuration>

‎tests/FSharp.Compiler.Service.Tests.netcore/project.json‎

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@
1515
"../service/PerfTests.fs",
1616
"../service/InteractiveCheckerTests.fs",
1717
"../service/ProjectAnalysisTests.fs",
18-
"Program.fs",
18+
"Program.fs"
1919
],
2020
"excludeFiles": [
2121
"../service/FscTests.fs",
2222
"../service/ProjectOptionsTests.fs",
2323
"../service/FileSystemTests.fs",
2424
"../service/FsiTests.fs",
2525
"../service/MultiProjectAnalysisTests.fs",
26-
"../service/CSharpProjectAnalysis.fs",
27-
],
26+
"../service/CSharpProjectAnalysis.fs"
27+
]
2828
},
2929
"define": [
3030
"DOTNETCORE",
@@ -33,45 +33,38 @@
3333
"FX_NO_RUNTIMEENVIRONMENT",
3434
"FX_RESHAPED_REFLECTION",
3535
"TODO_REWORK_ASSEMBLY_LOAD",
36-
"TRACE",
36+
"TRACE"
3737
],
3838
"nowarn": [
39-
"44",
39+
"44"
4040
],
4141
"xmlDoc": true,
4242
"delaySign": true,
4343
"warningsAsErrors": true,
4444
"additionalArguments": [
4545
"--fullpaths",
46-
"--flaterrors",
47-
],
46+
"--flaterrors"
47+
]
4848
},
4949
"dependencies": {
5050
"Microsoft.NETCore.App": {
5151
"type": "platform",
52-
"version": "1.0.0-rc2-3002702"
52+
"version": "1.0.0"
5353
},
5454
"NUnitLite": "3.2.1",
55-
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160509",
55+
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-*",
5656
"FSharp.Compiler.Service.netcore": "1.0.0-alpha-*",
57-
"FSharp.Compiler.Service.ProjectCracker.netcore": "1.0.0-alpha-*",
57+
"FSharp.Compiler.Service.ProjectCracker.netcore": "1.0.0-alpha-*"
5858
},
5959
"tools": {
6060
"dotnet-compile-fsc": {
61-
"version": "1.0.0-rc2-*",
62-
"imports": [
63-
"dnxcore50",
64-
"portable-net45+win81",
65-
"netstandard1.3"
66-
]
61+
"version": "1.0.0-preview2-*",
62+
"imports": "dnxcore50"
6763
}
6864
},
6965
"frameworks": {
70-
"netstandard1.5": {
71-
"imports": [
72-
"portable-net45+win81",
73-
"dnxcore50"
74-
]
66+
"netcoreapp1.0": {
67+
"imports": "dnxcore50"
7568
}
7669
}
77-
}
70+
}

0 commit comments

Comments
 (0)