Skip to content

Commit fae23c6

Browse files
authored
Remove Arcade net9.0 workarounds (#17987)
1 parent 3ac63e7 commit fae23c6

File tree

6 files changed

+6
-151
lines changed

6 files changed

+6
-151
lines changed

src/SourceBuild/content/Directory.Build.props

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88

99
<Import Condition="'$(SkipArcadeSdkImport)' != 'true'" Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
1010
<PropertyGroup>
11-
<!-- TODO: Remove NetCurrent override: https://github.com/dotnet/source-build/issues/3743 -->
12-
<NetCurrent>net9.0</NetCurrent>
1311
<!-- Fake, for SDK. -->
1412
<TargetFramework>netstandard2.0</TargetFramework>
1513
<!-- We have no projects targeting multiple frameworks, so don't include in output path. -->

src/SourceBuild/content/build.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,12 @@ if [ "$alternateTarget" == "true" ]; then
259259
export NUGET_PACKAGES=$NUGET_PACKAGES/smoke-tests
260260
"$CLI_ROOT/dotnet" msbuild "$SCRIPT_ROOT/build.proj" -bl:"$SCRIPT_ROOT/artifacts/log/Debug/BuildTests_$LogDateStamp.binlog" -flp:"LogFile=$SCRIPT_ROOT/artifacts/logs/BuildTests_$LogDateStamp.log" -clp:v=m ${MSBUILD_ARGUMENTS[@]} "$@"
261261
else
262-
"$CLI_ROOT/dotnet" msbuild "$SCRIPT_ROOT/eng/tools/init-build.proj" -bl:"$SCRIPT_ROOT/artifacts/log/Debug/BuildXPlatTasks_$LogDateStamp.binlog" -flp:LogFile="$SCRIPT_ROOT/artifacts/logs/BuildXPlatTasks_$LogDateStamp.log" -t:PrepareOfflineLocalTools ${MSBUILD_ARGUMENTS[@]} "$@"
262+
# BuildXPlatTasks uses NetCurrent but that is not set since Arcade isn't used here.
263+
# Bootstrap NetCurrent by deriving it from the installed .NET CLI version.
264+
netCurrent="$($CLI_ROOT/dotnet --version | while IFS='.' read major minor _; do echo "net$major.$minor"; done)"
265+
266+
"$CLI_ROOT/dotnet" msbuild "$SCRIPT_ROOT/eng/tools/init-build.proj" -p:NetCurrent=$netCurrent -bl:"$SCRIPT_ROOT/artifacts/log/Debug/BuildXPlatTasks_$LogDateStamp.binlog" -flp:LogFile="$SCRIPT_ROOT/artifacts/logs/BuildXPlatTasks_$LogDateStamp.log" -t:PrepareOfflineLocalTools ${MSBUILD_ARGUMENTS[@]} "$@"
267+
263268
# kill off the MSBuild server so that on future invocations we pick up our custom SDK Resolver
264269
"$CLI_ROOT/dotnet" build-server shutdown
265270

src/SourceBuild/patches/format/0001-Explicitly-set-TFM-to-net9.0.patch

Lines changed: 0 additions & 51 deletions
This file was deleted.

src/SourceBuild/patches/razor/0001-Explicitly-set-net9.0-TFM.patch

Lines changed: 0 additions & 23 deletions
This file was deleted.

src/SourceBuild/patches/source-build-reference-packages/0001-Explicitly-target-net9.0-for-NoOp-proj.patch

Lines changed: 0 additions & 23 deletions
This file was deleted.

src/SourceBuild/patches/vstest/0001-Explicitly-use-net9.0-TFM.patch

Lines changed: 0 additions & 51 deletions
This file was deleted.

0 commit comments

Comments
 (0)