diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6422d175c123b0..fa5165002c82ae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,9 +111,9 @@ - + https://github.com/dotnet/arcade - 84129325171e65373edef24019e1171feeb19cbc + 61ae141d2bf3534619265c8f691fd55dc3e75147 @@ -121,69 +121,69 @@ 73f0850939d96131c28cf6ea6ee5aacb4da0083a - + https://github.com/dotnet/arcade - 84129325171e65373edef24019e1171feeb19cbc + 61ae141d2bf3534619265c8f691fd55dc3e75147 - + https://github.com/dotnet/arcade - 84129325171e65373edef24019e1171feeb19cbc + 61ae141d2bf3534619265c8f691fd55dc3e75147 - + https://github.com/dotnet/arcade - 84129325171e65373edef24019e1171feeb19cbc + 61ae141d2bf3534619265c8f691fd55dc3e75147 - + https://github.com/dotnet/arcade - 84129325171e65373edef24019e1171feeb19cbc + 61ae141d2bf3534619265c8f691fd55dc3e75147 - + https://github.com/dotnet/arcade - 84129325171e65373edef24019e1171feeb19cbc + 61ae141d2bf3534619265c8f691fd55dc3e75147 - + https://github.com/dotnet/arcade - 84129325171e65373edef24019e1171feeb19cbc + 61ae141d2bf3534619265c8f691fd55dc3e75147 - + https://github.com/dotnet/arcade - 84129325171e65373edef24019e1171feeb19cbc + 61ae141d2bf3534619265c8f691fd55dc3e75147 - + https://github.com/dotnet/arcade - 84129325171e65373edef24019e1171feeb19cbc + 61ae141d2bf3534619265c8f691fd55dc3e75147 - + https://github.com/dotnet/arcade - 84129325171e65373edef24019e1171feeb19cbc + 61ae141d2bf3534619265c8f691fd55dc3e75147 - + https://github.com/dotnet/arcade - 84129325171e65373edef24019e1171feeb19cbc + 61ae141d2bf3534619265c8f691fd55dc3e75147 - + https://github.com/dotnet/arcade - 84129325171e65373edef24019e1171feeb19cbc + 61ae141d2bf3534619265c8f691fd55dc3e75147 - + https://github.com/dotnet/arcade - 84129325171e65373edef24019e1171feeb19cbc + 61ae141d2bf3534619265c8f691fd55dc3e75147 - + https://github.com/dotnet/arcade - 84129325171e65373edef24019e1171feeb19cbc + 61ae141d2bf3534619265c8f691fd55dc3e75147 - + https://github.com/dotnet/arcade - 84129325171e65373edef24019e1171feeb19cbc + 61ae141d2bf3534619265c8f691fd55dc3e75147 - + https://github.com/dotnet/arcade - 84129325171e65373edef24019e1171feeb19cbc + 61ae141d2bf3534619265c8f691fd55dc3e75147 - + https://github.com/dotnet/arcade - 84129325171e65373edef24019e1171feeb19cbc + 61ae141d2bf3534619265c8f691fd55dc3e75147 https://github.com/dotnet/runtime-assets @@ -334,9 +334,9 @@ https://github.com/dotnet/xharness 480b9159eb7e69b182a87581d5a336e97e0b6dae - + https://github.com/dotnet/arcade - 84129325171e65373edef24019e1171feeb19cbc + 61ae141d2bf3534619265c8f691fd55dc3e75147 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 623f222f87522d..d8d01d258643cf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -87,21 +87,21 @@ 8.0.100 - 8.0.0-beta.23620.2 - 8.0.0-beta.23620.2 - 8.0.0-beta.23620.2 - 8.0.0-beta.23620.2 - 8.0.0-beta.23620.2 - 2.5.1-beta.23620.2 - 8.0.0-beta.23620.2 - 8.0.0-beta.23620.2 - 8.0.0-beta.23620.2 - 8.0.0-beta.23620.2 - 8.0.0-beta.23620.2 - 8.0.0-beta.23620.2 - 8.0.0-beta.23620.2 - 8.0.0-beta.23620.2 - 8.0.0-beta.23620.2 + 8.0.0-beta.24059.4 + 8.0.0-beta.24059.4 + 8.0.0-beta.24059.4 + 8.0.0-beta.24059.4 + 8.0.0-beta.24059.4 + 2.5.1-beta.24059.4 + 8.0.0-beta.24059.4 + 8.0.0-beta.24059.4 + 8.0.0-beta.24059.4 + 8.0.0-beta.24059.4 + 8.0.0-beta.24059.4 + 8.0.0-beta.24059.4 + 8.0.0-beta.24059.4 + 8.0.0-beta.24059.4 + 8.0.0-beta.24059.4 6.0.0-preview.1.102 @@ -258,7 +258,7 @@ 3.1.7 1.0.406601 - 8.0.100 + 8.0.101 $(MicrosoftDotnetSdkInternalVersion) diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index fdd0cbb91f8596..eb188cfda415b4 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -601,7 +601,15 @@ function InitializeBuildTool() { ExitWithExitCode 1 } $dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet') - $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net8.0' } + + # Use override if it exists - commonly set by source-build + if ($null -eq $env:_OverrideArcadeInitializeBuildToolFramework) { + $initializeBuildToolFramework="net8.0" + } else { + $initializeBuildToolFramework=$env:_OverrideArcadeInitializeBuildToolFramework + } + + $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = $initializeBuildToolFramework } } elseif ($msbuildEngine -eq "vs") { try { $msbuildPath = InitializeVisualStudioMSBuild -install:$restore diff --git a/eng/common/tools.sh b/eng/common/tools.sh index e8d478943341df..3392e3a99921f7 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -341,7 +341,12 @@ function InitializeBuildTool { # return values _InitializeBuildTool="$_InitializeDotNetCli/dotnet" _InitializeBuildToolCommand="msbuild" - _InitializeBuildToolFramework="net8.0" + # use override if it exists - commonly set by source-build + if [[ "${_OverrideArcadeInitializeBuildToolFramework:-x}" == "x" ]]; then + _InitializeBuildToolFramework="net8.0" + else + _InitializeBuildToolFramework="${_OverrideArcadeInitializeBuildToolFramework}" + fi } # Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116 diff --git a/global.json b/global.json index 4822dcaddf37ee..13f92203054630 100644 --- a/global.json +++ b/global.json @@ -1,16 +1,16 @@ { "sdk": { - "version": "8.0.100", + "version": "8.0.101", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "8.0.100" + "dotnet": "8.0.101" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23620.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23620.2", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23620.2", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24059.4", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24059.4", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.24059.4", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6"