From d621ec5f5be1c7859550f40b4cb344c2cffd3fea Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Tue, 9 Apr 2024 12:54:14 +0200 Subject: [PATCH 1/4] Update to 9p2 SDK --- .devcontainer/devcontainer.json | 12 +++++------- eng/Versions.props | 2 +- global.json | 6 +++--- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 44cf398c407..b0b82686f2c 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,14 +1,12 @@ // For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at: { "name": "F#", - "image": "mcr.microsoft.com/dotnet/sdk:8.0", + "image": "mcr.microsoft.com/dotnet/sdk:9.0.100-preview.2", "features": { - "ghcr.io/devcontainers/features/common-utils:2": {}, - "ghcr.io/devcontainers/features/git:1": {}, - "ghcr.io/devcontainers/features/github-cli:1": { - "version": "2" - }, - "ghcr.io/devcontainers/features/dotnet:2": {} + "ghcr.io/devcontainers/features/common-utils:2.4.2": {}, + "ghcr.io/devcontainers/features/git:1.2.0": {}, + "ghcr.io/devcontainers/features/github-cli:1.0.11": {}, + "ghcr.io/devcontainers/features/dotnet:2.0.5": {} }, "hostRequirements": { "cpus": 2, diff --git a/eng/Versions.props b/eng/Versions.props index 17d084022bd..b0215a834a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ $(FCSMajorVersion)$(FCSMinorVersion)$(FCSBuildVersion) - 8.0.100 + 8.0.200 $(FSCorePackageVersionValue)-$(PreReleaseVersionLabel).* diff --git a/global.json b/global.json index 1d7b86d8b37..a312669c66e 100644 --- a/global.json +++ b/global.json @@ -1,17 +1,17 @@ { "sdk": { - "version": "8.0.101", + "version": "9.0.100-preview.2.24157.14", "allowPrerelease": true }, "tools": { - "dotnet": "8.0.101", + "dotnet": "9.0.100-preview.2.24157.14", "vs": { "version": "17.8", "components": [ "Microsoft.VisualStudio.Component.FSharp" ] }, - "xcopy-msbuild": "17.8.1-2" + "xcopy-msbuild": "17.8.5" }, "native-tools": { "perl": "5.38.0.1" From c7c0c71fbe1022a4976dd03835a0db88752ec783 Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Wed, 10 Apr 2024 12:23:51 +0200 Subject: [PATCH 2/4] Added PackageProjectUrl --- Directory.Build.props | 1 + 1 file changed, 1 insertion(+) diff --git a/Directory.Build.props b/Directory.Build.props index e8e24051b1d..20a9571ab58 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,7 @@ + https://github.com/dotnet/fsharp $(FSharpLangVersion) $(MSBuildThisFileDirectory) true From 4b6b8d4edb593cf79ad2d6d44e87ec34de369c1d Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Wed, 10 Apr 2024 14:34:41 +0200 Subject: [PATCH 3/4] Added RepositoryUrl --- Directory.Build.props | 1 + 1 file changed, 1 insertion(+) diff --git a/Directory.Build.props b/Directory.Build.props index 20a9571ab58..e53ebf98156 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,6 +2,7 @@ https://github.com/dotnet/fsharp + https://github.com/dotnet/fsharp $(FSharpLangVersion) $(MSBuildThisFileDirectory) true From d518a4dc3e60fe49dfe631d2da5751e616e87d8e Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Wed, 10 Apr 2024 14:50:57 +0200 Subject: [PATCH 4/4] Fix sb --- eng/SourceBuildPrebuiltBaseline.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 18c94ed53e3..001c3d14879 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -9,9 +9,9 @@ These will go away when repo updates targeting to net8.0 Tracked with https://github.com/dotnet/fsharp/issues/14765 --> - - - + + +