From c327b9aaa5fbc23cc638e216dd5ad9efd2e9e9e9 Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Thu, 2 May 2024 15:32:31 +0200 Subject: [PATCH 1/2] Update build depencencies + SDK --- .devcontainer/devcontainer.json | 2 +- eng/Build.ps1 | 2 +- global.json | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index b0b82686f2c..8de3807c90d 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,7 +1,7 @@ // 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:9.0.100-preview.2", + "image": "mcr.microsoft.com/dotnet/sdk:9.0.100-preview.3", "features": { "ghcr.io/devcontainers/features/common-utils:2.4.2": {}, "ghcr.io/devcontainers/features/git:1.2.0": {}, diff --git a/eng/Build.ps1 b/eng/Build.ps1 index 434751d04e4..690b8a58f81 100644 --- a/eng/Build.ps1 +++ b/eng/Build.ps1 @@ -538,7 +538,7 @@ try { $nativeTools = InitializeNativeTools if (-not (Test-Path variable:NativeToolsOnMachine)) { - $env:PERL5Path = Join-Path $nativeTools "perl\5.38.0.1\perl\bin\perl.exe" + $env:PERL5Path = Join-Path $nativeTools "perl\5.38.2.2\perl\bin\perl.exe" write-host "variable:NativeToolsOnMachine = unset or false" $nativeTools write-host "Path = $env:PERL5Path" diff --git a/global.json b/global.json index dd1d822cc7a..f0f1cc4ee75 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,10 @@ { "sdk": { - "version": "9.0.100-preview.2.24157.14", + "version": "9.0.100-preview.3.24204.13", "allowPrerelease": true }, "tools": { - "dotnet": "9.0.100-preview.2.24157.14", + "dotnet": "9.0.100-preview.3.24204.13", "vs": { "version": "17.8", "components": [ @@ -14,7 +14,7 @@ "xcopy-msbuild": "17.8.5" }, "native-tools": { - "perl": "5.38.0.1" + "perl": "5.38.2.2" }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24225.1", From 7b9f38c5475dd5f8452941599cb5022acc467757 Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Thu, 2 May 2024 16:10:55 +0200 Subject: [PATCH 2/2] Update sb prebuilt baselines --- eng/SourceBuildPrebuiltBaseline.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 001c3d14879..31c0ad52ed2 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 --> - - - + + +