Skip to content

Commit aad5433

Browse files
dsymedsyme
authored
Merge pull request #598 from enricosada/pin_to_preview1_in_appveyor
use .net core sdk 1.0 in appveyor
2 parents 2aac1b1 + 94a80bc commit aad5433

File tree

8 files changed

+63
-86
lines changed

8 files changed

+63
-86
lines changed

‎build.fsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -248,18 +248,18 @@ Target "DotnetCliCodeGen" (fun _ ->
248248

249249
Target "DotnetCliBuild" (fun _ ->
250250
let workDir = @"src/fsharp/FSharp.Compiler.Service.netcore/"
251-
Shell.Exec("dotnet", "restore -v Minimal", workDir) |> assertExitCodeZero
252-
Shell.Exec("dotnet", "pack -c Release -o ../../../" + buildDir, workDir) |> assertExitCodeZero
251+
Shell.Exec("dotnet", "restore -v Information", workDir) |> assertExitCodeZero
252+
Shell.Exec("dotnet", "-v pack -c Release -o ../../../" + buildDir, workDir) |> assertExitCodeZero
253253

254254
let workDir = @"src/fsharp/FSharp.Compiler.Service.ProjectCracker.netcore/"
255-
Shell.Exec("dotnet", "restore -v Minimal", workDir) |> assertExitCodeZero
256-
Shell.Exec("dotnet", "pack -c Release -o ../../../" + buildDir, workDir) |> assertExitCodeZero
255+
Shell.Exec("dotnet", "restore -v Information", workDir) |> assertExitCodeZero
256+
Shell.Exec("dotnet", "-v pack -c Release -o ../../../" + buildDir, workDir) |> assertExitCodeZero
257257
)
258258

259259
Target "DotnetCliTests" (fun _ ->
260260
let workDir = @"tests/FSharp.Compiler.Service.Tests.netcore/"
261-
Shell.Exec("dotnet", "restore -v Minimal", workDir) |> assertExitCodeZero
262-
Shell.Exec("dotnet", "run -c Release", workDir) |> assertExitCodeZero
261+
Shell.Exec("dotnet", "restore -v Information", workDir) |> assertExitCodeZero
262+
Shell.Exec("dotnet", "-v run -c Release", workDir) |> assertExitCodeZero
263263
)
264264

265265
// --------------------------------------------------------------------------------------

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
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
<!-- MSBuild -->
66
<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" />
87
</packageSources>
98
</configuration>

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

Lines changed: 19 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"title": "FSharp.Compiler.Service.ProjectCracker",
44
"authors": [
55
"Microsoft Corporation",
6-
"Robin Neatherway",
6+
"Robin Neatherway"
77
],
88
"copyright": "",
99
"description": "Adds F# project cracking capabilities.",
@@ -15,7 +15,7 @@
1515
"tags": [
1616
"F# fsharp msbuild editor"
1717
],
18-
"releaseNotes": "",
18+
"releaseNotes": ""
1919
},
2020
"buildOptions": {
2121
"debugType": "portable",
@@ -26,55 +26,48 @@
2626
"../FSharp.Compiler.Service.ProjectCrackerTool/ProjectCrackerOptions.fs",
2727
"../FSharp.Compiler.Service.ProjectCrackerTool/ProjectCrackerTool.fs",
2828
"ProjectCracker.fs",
29-
"Program.fs",
30-
],
29+
"Program.fs"
30+
]
3131
},
3232
"define": [
3333
"DOTNETCORE",
34-
"TRACE",
34+
"TRACE"
3535
],
3636
"nowarn": [
3737
"44",
38-
"2003",
38+
"2003"
3939
],
4040
"xmlDoc": true,
4141
"delaySign": true,
4242
"warningsAsErrors": true,
4343
"additionalArguments": [
4444
"--fullpaths",
4545
"--flaterrors",
46-
"--warnon:1182",
47-
],
46+
"--warnon:1182"
47+
]
4848
},
4949
"dependencies": {
5050
"Microsoft.NETCore.App": {
5151
"type": "platform",
52-
"version": "1.0.0-rc2-3002702"
52+
"version": "1.0.0"
5353
},
54-
"Microsoft.Build": "0.1.0-preview-*",
55-
"Microsoft.Build.Framework": "0.1.0-preview-*",
56-
"Microsoft.Build.Tasks.Core": "0.1.0-preview-*",
57-
"Microsoft.Build.Utilities.Core": "0.1.0-preview-*",
58-
"System.Runtime.Serialization.Json": "4.0.2-rc2-*",
54+
"Microsoft.Build": "0.1.0-preview-00028-*",
55+
"Microsoft.Build.Framework": "0.1.0-preview-00028-*",
56+
"Microsoft.Build.Tasks.Core": "0.1.0-preview-00028-*",
57+
"Microsoft.Build.Utilities.Core": "0.1.0-preview-00028-*",
58+
"System.Runtime.Serialization.Json": "4.0.2",
5959
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-*",
60-
"FSharp.Compiler.Service.netcore": "1.0.0-alpha-*",
60+
"FSharp.Compiler.Service.netcore": "1.0.0-alpha-*"
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 & 21 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",
@@ -266,7 +266,7 @@
266266
"STRONG_NAME_AND_DELAY_SIGN_FSHARP_COMPILER_WITH_MSFT_KEY",
267267
"TODO_REWORK_ASSEMBLY_LOAD",
268268
"TODO_REWORK_SERVER",
269-
"TRACE",
269+
"TRACE"
270270
],
271271
"nowarn": [
272272
"44",
@@ -277,44 +277,41 @@
277277
"75",
278278
"62",
279279
"9",
280-
"2003",
280+
"2003"
281281
],
282282
"xmlDoc": true,
283283
"delaySign": true,
284284
"warningsAsErrors": true,
285285
"additionalArguments": [
286286
"--fullpaths",
287287
"--flaterrors",
288-
"--warnon:1182",
288+
"--max-errors:10000",
289+
"--warnon:1182"
289290
]
290291
},
291292
"dependencies": {
292-
"NETStandard.Library": "1.5.0-rc2-24027",
293-
"System.Diagnostics.TraceSource": "4.0.0-rc2-*",
293+
"NETStandard.Library": "1.6.0",
294+
"System.Diagnostics.TraceSource": "4.0.0",
294295
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-*",
295-
"System.Collections.Immutable": "1.2.0-rc2-24027",
296-
"System.Security.Cryptography.Algorithms": "4.1.0-rc2-24027",
297-
"System.Security.Cryptography.Primitives": "4.0.0-rc2-24027",
298-
"System.Reflection.Metadata": "1.3.0-rc2-24027",
299-
"System.Diagnostics.Process": "4.1.0-rc2-24027"
296+
"System.Collections.Immutable": "1.2.0",
297+
"System.Security.Cryptography.Algorithms": "4.2.0",
298+
"System.Security.Cryptography.Primitives": "4.0.0",
299+
"System.Reflection.Metadata": "1.4.1-beta-24227-04",
300+
"System.Diagnostics.Process": "4.1.0"
300301
},
301302
"tools": {
302-
"dotnet-fssrgen": "3.0.1",
303+
"dotnet-fssrgen": "3.2.*",
303304
"dotnet-compile-fsc": {
304-
"version": "1.0.0-preview1-*",
305-
"imports": [
306-
"dnxcore50",
307-
"portable-net45+win81",
308-
"netstandard1.3"
309-
]
305+
"version": "1.0.0-preview2-*",
306+
"imports": "dnxcore50"
310307
}
311308
},
312309
"frameworks": {
313-
"netstandard1.5": {
310+
"netstandard1.6": {
314311
"imports": [
315312
"portable-net45+win81",
316313
"dnxcore50"
317314
]
318315
}
319316
}
320-
}
317+
}

‎src/fsharp/vs/Exprs.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -935,7 +935,7 @@ and FSharpImplementationFileContents(cenv, mimpl) =
935935

936936
and getDecls mdef =
937937
match mdef with
938-
| TMDefRec(isRec,tycons,mbinds,_m) ->
938+
| TMDefRec(_isRec,tycons,mbinds,_m) ->
939939
[ for tycon in tycons do
940940
let entity = FSharpEntity(cenv, mkLocalEntityRef tycon)
941941
yield FSharpImplementationFileDeclaration.Entity(entity, [])

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
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" />
4+
<add key="fsharp-netcore-preview2" value="https://www.myget.org/F/fsharp-netcoresdk-preview2-betatest/api/v3/index.json" />
5+
<!-- MSBuild -->
86
<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" />
127
</packageSources>
138
</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
},
54-
"NUnitLite": "3.2.1",
54+
"NUnitLite": "3.4.0",
5555
"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)