From 03bd49d0167386ba57231120509546fbdaa81d5c Mon Sep 17 00:00:00 2001 From: "Brett V. Forsgren" Date: Tue, 10 Nov 2020 11:01:03 -0800 Subject: [PATCH] use 5.0 sdk --- DEVGUIDE.md | 2 ++ README.md | 2 ++ azure-pipelines.yml | 20 +++++++++++++++++++ global.json | 6 +++--- src/fsharp/fsc/fsc.fsproj | 1 + src/fsharp/fsi/fsi.fsproj | 1 + tests/FSharp.Test.Utilities/CompilerAssert.fs | 2 +- .../GetTypesVS.UnitTests.fsproj | 1 + 8 files changed, 31 insertions(+), 4 deletions(-) diff --git a/DEVGUIDE.md b/DEVGUIDE.md index 031d0d339bd..cc8c7e84a6e 100644 --- a/DEVGUIDE.md +++ b/DEVGUIDE.md @@ -44,6 +44,8 @@ Install the latest released [Visual Studio](https://www.visualstudio.com/downloa * .NET desktop development (also check F# desktop support, as this will install some legacy templates) * Visual Studio extension development +You will also need the latest .NET 5 SDK installed from [here](https://dotnet.microsoft.com/download/dotnet/5.0). + Building is simple: build.cmd diff --git a/README.md b/README.md index 02a742ccb5e..1eb6e1c3b78 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ You're invited to contribute to future releases of the F# compiler, core library, and tools. Development of this repository can be done on any OS supported by [.NET Core](https://dotnet.microsoft.com/). +You will also need the latest .NET 5 SDK installed from [here](https://dotnet.microsoft.com/download/dotnet/5.0). + ## Contributing ### Quickstart on Windows diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e9e1a3506ef..89f35ff7cc1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -56,6 +56,8 @@ variables: value: .NETCore - name: VisualStudioDropName value: Products/$(System.TeamProject)/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildNumber) + - name: DotNetSdkVersion + value: '5.0.100' - ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}: - name: RunningAsPullRequest value: true @@ -407,6 +409,12 @@ stages: # displayName: Initial build # - script: dotnet --list-sdks # displayName: Report dotnet SDK versions + # - task: UseDotNet@2 + # displayName: install SDK + # inputs: + # packageType: sdk + # version: $(DotNetSdkVersion) + # installationPath: $(Agent.ToolsDirectory)/dotnet # - script: dotnet build .\FSharp.sln /bl:\"artifacts/log/$(_BuildConfig)/RegularBuild.binlog\" # displayName: Regular rebuild @@ -424,6 +432,12 @@ stages: displayName: Initial build - script: dotnet --list-sdks displayName: Report dotnet SDK versions + - task: UseDotNet@2 + displayName: install SDK + inputs: + packageType: sdk + version: $(DotNetSdkVersion) + installationPath: $(Agent.ToolsDirectory)/dotnet - script: dotnet build ./FSharp.sln /bl:\"artifacts/log/$(_BuildConfig)/RegularBuild.binlog\" displayName: Regular rebuild @@ -441,6 +455,12 @@ stages: displayName: Initial build - script: dotnet --list-sdks displayName: Report dotnet SDK versions + - task: UseDotNet@2 + displayName: install SDK + inputs: + packageType: sdk + version: $(DotNetSdkVersion) + installationPath: $(Agent.ToolsDirectory)/dotnet - script: dotnet build ./FSharp.sln /bl:\"artifacts/log/$(_BuildConfig)/RegularBuild.binlog\" displayName: Regular rebuild diff --git a/global.json b/global.json index 4158c49c34f..e284d68d620 100644 --- a/global.json +++ b/global.json @@ -1,12 +1,12 @@ { "sdk": { - "version": "3.1.302", + "version": "5.0.100", "rollForward": "minor" }, "tools": { - "dotnet": "3.1.302", + "dotnet": "5.0.100", "vs": { - "version": "16.4", + "version": "16.8", "components": [ "Microsoft.VisualStudio.Component.FSharp" ] diff --git a/src/fsharp/fsc/fsc.fsproj b/src/fsharp/fsc/fsc.fsproj index 0e4f91b0ee5..c3a5e28dfa9 100644 --- a/src/fsharp/fsc/fsc.fsproj +++ b/src/fsharp/fsc/fsc.fsproj @@ -12,6 +12,7 @@ true $(OtherFlags) --maxerrors:20 --extraoptimizationloops:1 true + false diff --git a/src/fsharp/fsi/fsi.fsproj b/src/fsharp/fsi/fsi.fsproj index bb2bcc73b25..7751134335e 100644 --- a/src/fsharp/fsi/fsi.fsproj +++ b/src/fsharp/fsi/fsi.fsproj @@ -13,6 +13,7 @@ --warnon:1182 --maxerrors:20 --extraoptimizationloops:1 fsi.res true + false diff --git a/tests/FSharp.Test.Utilities/CompilerAssert.fs b/tests/FSharp.Test.Utilities/CompilerAssert.fs index c163edb7617..e166df05295 100644 --- a/tests/FSharp.Test.Utilities/CompilerAssert.fs +++ b/tests/FSharp.Test.Utilities/CompilerAssert.fs @@ -453,7 +453,7 @@ let main argv = 0""" "tfm": "netcoreapp3.1", "framework": { "name": "Microsoft.NETCore.App", - "version": "3.1.0" + "version": "5.0.0" } } }""" diff --git a/vsintegration/tests/GetTypesVS.UnitTests/GetTypesVS.UnitTests.fsproj b/vsintegration/tests/GetTypesVS.UnitTests/GetTypesVS.UnitTests.fsproj index fbd1ed485d5..911e5e9a944 100644 --- a/vsintegration/tests/GetTypesVS.UnitTests/GetTypesVS.UnitTests.fsproj +++ b/vsintegration/tests/GetTypesVS.UnitTests/GetTypesVS.UnitTests.fsproj @@ -22,6 +22,7 @@ +