File tree Expand file tree Collapse file tree 4 files changed +23
-10
lines changed Expand file tree Collapse file tree 4 files changed +23
-10
lines changed Original file line number Diff line number Diff line change 5757 </Dependency >
5858 </ProductDependencies >
5959 <ToolsetDependencies >
60- <Dependency Name =" Microsoft.DotNet.Arcade.Sdk" Version =" 8.0.0-beta.23620.2 " >
60+ <Dependency Name =" Microsoft.DotNet.Arcade.Sdk" Version =" 8.0.0-beta.24059.4 " >
6161 <Uri >https://github.com/dotnet/arcade</Uri >
62- <Sha >84129325171e65373edef24019e1171feeb19cbc </Sha >
62+ <Sha >61ae141d2bf3534619265c8f691fd55dc3e75147 </Sha >
6363 </Dependency >
64- <Dependency Name =" Microsoft.DotNet.Helix.Sdk" Version =" 8.0.0-beta.23620.2 " >
64+ <Dependency Name =" Microsoft.DotNet.Helix.Sdk" Version =" 8.0.0-beta.24059.4 " >
6565 <Uri >https://github.com/dotnet/arcade</Uri >
66- <Sha >84129325171e65373edef24019e1171feeb19cbc </Sha >
66+ <Sha >61ae141d2bf3534619265c8f691fd55dc3e75147 </Sha >
6767 </Dependency >
6868 </ToolsetDependencies >
6969</Dependencies >
Original file line number Diff line number Diff line change @@ -601,7 +601,15 @@ function InitializeBuildTool() {
601601 ExitWithExitCode 1
602602 }
603603 $dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName ' dotnet' )
604- $buildTool = @ { Path = $dotnetPath ; Command = ' msbuild' ; Tool = ' dotnet' ; Framework = ' net8.0' }
604+
605+ # Use override if it exists - commonly set by source-build
606+ if ($null -eq $env: _OverrideArcadeInitializeBuildToolFramework ) {
607+ $initializeBuildToolFramework = " net8.0"
608+ } else {
609+ $initializeBuildToolFramework = $env: _OverrideArcadeInitializeBuildToolFramework
610+ }
611+
612+ $buildTool = @ { Path = $dotnetPath ; Command = ' msbuild' ; Tool = ' dotnet' ; Framework = $initializeBuildToolFramework }
605613 } elseif ($msbuildEngine -eq " vs" ) {
606614 try {
607615 $msbuildPath = InitializeVisualStudioMSBuild - install:$restore
Original file line number Diff line number Diff line change @@ -341,7 +341,12 @@ function InitializeBuildTool {
341341 # return values
342342 _InitializeBuildTool=" $_InitializeDotNetCli /dotnet"
343343 _InitializeBuildToolCommand=" msbuild"
344- _InitializeBuildToolFramework=" net8.0"
344+ # use override if it exists - commonly set by source-build
345+ if [[ " ${_OverrideArcadeInitializeBuildToolFramework:- x} " == " x" ]]; then
346+ _InitializeBuildToolFramework=" net8.0"
347+ else
348+ _InitializeBuildToolFramework=" ${_OverrideArcadeInitializeBuildToolFramework} "
349+ fi
345350}
346351
347352# Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116
Original file line number Diff line number Diff line change 11{
22 "sdk" : {
3- "version" : " 8.0.100 "
3+ "version" : " 8.0.101 "
44 },
55 "tools" : {
6- "dotnet" : " 8.0.100 " ,
6+ "dotnet" : " 8.0.101 " ,
77 "runtimes" : {
88 "dotnet/x64" : [
99 " 6.0.22"
1414 }
1515 },
1616 "msbuild-sdks" : {
17- "Microsoft.DotNet.Arcade.Sdk" : " 8.0.0-beta.23620.2 " ,
18- "Microsoft.DotNet.Helix.Sdk" : " 8.0.0-beta.23620.2 "
17+ "Microsoft.DotNet.Arcade.Sdk" : " 8.0.0-beta.24059.4 " ,
18+ "Microsoft.DotNet.Helix.Sdk" : " 8.0.0-beta.24059.4 "
1919 }
2020}
You can’t perform that action at this time.
0 commit comments