Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update build depencencies + SDK #17111

Merged
merged 4 commits into from
May 2, 2024
Merged

Update build depencencies + SDK #17111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c327b9a
Update build depencencies + SDK
vzarytovskii May 2, 2024
1ddf00d
Merge branch 'main' into update-build-tooling
vzarytovskii May 2, 2024
7b9f38c
Update sb prebuilt baselines
vzarytovskii May 2, 2024
228bc7a
Merge branch 'update-build-tooling' of https://github.com/vzarytovski…
vzarytovskii May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {},
Expand Down
2 changes: 1 addition & 1 deletion eng/Build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions eng/SourceBuildPrebuiltBaseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
These will go away when repo updates targeting to net8.0
Tracked with https://github.com/dotnet/fsharp/issues/14765
-->
<UsagePattern IdentityGlob="Microsoft.AspNetCore.App.Ref/8.0.1" />
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Host.linux-x64/8.0.1" />
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Ref/8.0.1" />
<UsagePattern IdentityGlob="Microsoft.AspNetCore.App.Ref/8.0.2" />
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Host.linux-x64/8.0.2" />
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Ref/8.0.2" />
<UsagePattern IdentityGlob="System.Configuration.ConfigurationManager/7.0.0" />
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/7.0.0" />
<UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/7.0.0" />
Expand Down
6 changes: 3 additions & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": [
Expand All @@ -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",
Expand Down
Loading