From ef2bc3e35fee0ee7eac3521cfd201831a8699c05 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Wed, 5 Feb 2025 12:08:23 +0100
Subject: [PATCH 01/22] Manual VMR re-bootstrap to 10.0.100-preview.2.25104.28

The re-boostrap pipeline failed to open the PR so I'm doing this manually here.
---
 src/SourceBuild/content/eng/Version.Details.xml | 4 ++--
 src/SourceBuild/content/eng/Versions.props      | 4 ++--
 src/SourceBuild/content/global.json             | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/SourceBuild/content/eng/Version.Details.xml b/src/SourceBuild/content/eng/Version.Details.xml
index 809c1a92f7b2..52411253c623 100644
--- a/src/SourceBuild/content/eng/Version.Details.xml
+++ b/src/SourceBuild/content/eng/Version.Details.xml
@@ -2,9 +2,9 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25076.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25103.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>fe17712bedb95a55d5af00c5191772c81393745f</Sha>
+      <Sha>0b971a5e11be58af22ca83fbc111a1207bb62920</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props
index 62928dd47dd9..0da82f9cd4a9 100644
--- a/src/SourceBuild/content/eng/Versions.props
+++ b/src/SourceBuild/content/eng/Versions.props
@@ -23,8 +23,8 @@
       of a .NET major or minor release, prebuilts may be needed. When the release is mature, prebuilts
       are not necessary, and this property is removed from the file.
     -->
-    <PrivateSourceBuiltSdkVersion>10.0.100-preview.1.25078.1</PrivateSourceBuiltSdkVersion>
-    <PrivateSourceBuiltArtifactsVersion>10.0.100-preview.1.25078.1</PrivateSourceBuiltArtifactsVersion>
+    <PrivateSourceBuiltSdkVersion>10.0.100-preview.2.25105.1</PrivateSourceBuiltSdkVersion>
+    <PrivateSourceBuiltArtifactsVersion>10.0.100-preview.2.25105.1</PrivateSourceBuiltArtifactsVersion>
     <!-- command-line-api dependencies -->
     <SystemCommandLineVersion>2.0.0-beta4.24126.1</SystemCommandLineVersion>
     <!-- msbuild dependencies -->
diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json
index 5668264000d8..fa5eb069202d 100644
--- a/src/SourceBuild/content/global.json
+++ b/src/SourceBuild/content/global.json
@@ -1,10 +1,10 @@
 {
   "tools": {
-    "dotnet": "10.0.100-preview.1.25078.4"
+    "dotnet": "10.0.100-preview.2.25104.28"
   },
   "msbuild-sdks": {
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.4.0",
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25076.1"
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25103.6"
   }
 }

From 116a6fceda4aa8e4eb18cf9551d65c5d3cb6eaef Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 6 Feb 2025 15:11:21 +0100
Subject: [PATCH 02/22] Pass expected environment variables and properties to
 the test invocation

---
 .../repo-projects/Directory.Build.props       | 71 ++++++++---------
 .../repo-projects/Directory.Build.targets     | 77 +++++++++++--------
 .../content/repo-projects/scenario-tests.proj | 36 +++------
 .../content/repo-projects/sdk.proj            |  1 -
 4 files changed, 90 insertions(+), 95 deletions(-)

diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props
index 7e9dab487c46..e63d50598667 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.props
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.props
@@ -38,10 +38,6 @@
     <NuGetConfigFile Condition="'$(NuGetConfigFile)' == '' and Exists('$(ProjectDirectory)NuGet.config')">$(ProjectDirectory)NuGet.config</NuGetConfigFile>
     <NuGetConfigFile Condition="'$(NuGetConfigFile)' == '' and Exists('$(ProjectDirectory)NuGet.Config')">$(ProjectDirectory)NuGet.Config</NuGetConfigFile>
 
-    <OriginalNuGetConfigFile>$(NuGetConfigFile)</OriginalNuGetConfigFile>
-    <!-- Update nuget.config property to point to modified file that will be created/updated during build. -->
-    <NuGetConfigFile Condition="'$(OriginalNuGetConfigFile)' != ''">$(BaseIntermediateOutputPath)$([System.IO.Path]::GetFileName('$(OriginalNuGetConfigFile)'))</NuGetConfigFile>
-
     <RepoAssetManifestsDir>$([MSBuild]::NormalizeDirectory('$(AssetManifestsIntermediateDir)', '$(RepositoryName)'))</RepoAssetManifestsDir>
     <IntermediateSymbolsRepoDir>$([MSBuild]::NormalizeDirectory('$(IntermediateSymbolsRootDir)', '$(RepositoryName)'))</IntermediateSymbolsRepoDir>
 
@@ -86,39 +82,46 @@
     <BuildActions>$(BuildActions) $(FlagParameterPrefix)publish</BuildActions>
     <BuildActions Condition="'$(Sign)' == 'true'">$(BuildActions) $(FlagParameterPrefix)sign</BuildActions>
 
+    <TestActions>$(FlagParameterPrefix)restore</TestActions>
+    <TestActions>$(TestActions) $(FlagParameterPrefix)test</TestActions>
+  </PropertyGroup>
+
+  <!-- Common args used for building and testing. -->
+  <PropertyGroup>
     <!-- TODO: Remove the DotNetBuildSourceOnly condition when the default build behavior for source-only builds changes to dev.
          https://github.com/dotnet/source-build/issues/4855 -->
-    <BuildArgs Condition="'$(ContinuousIntegrationBuild)' == 'true' or '$(DotNetBuildSourceOnly)' == 'true'">$(FlagParameterPrefix)ci</BuildArgs>
-    <BuildArgs>$(BuildArgs) $(FlagParameterPrefix)configuration $(Configuration)</BuildArgs>
-    <BuildArgs>$(BuildArgs) -bl</BuildArgs>
-    <BuildArgs>$(BuildArgs) /p:DotNetBuildRepo=true</BuildArgs>
-
-    <!-- Indicate that the build is being run from the orchestrator -->
-    <BuildArgs>$(BuildArgs) /p:DotNetBuildOrchestrator=true</BuildArgs>
+    <CommonArgs Condition="'$(ContinuousIntegrationBuild)' == 'true' or '$(DotNetBuildSourceOnly)' == 'true'">$(FlagParameterPrefix)ci</CommonArgs>
+    <CommonArgs>$(CommonArgs) $(FlagParameterPrefix)configuration $(Configuration)</CommonArgs>
 
     <!-- Pass down configuration properties -->
-    <BuildArgs>$(BuildArgs) /p:TargetRid=$(TargetRid)</BuildArgs>
+    <CommonArgs>$(CommonArgs) /p:TargetRid=$(TargetRid)</CommonArgs>
 
     <!-- Pass through DotNetBuildPass for join point vertical support. -->
-    <BuildArgs Condition="'$(DotNetBuildPass)' != '' and '$(DotNetBuildPass)' != '1'">$(BuildArgs) /p:DotNetBuildPass=$(DotNetBuildPass)</BuildArgs>
+    <CommonArgs Condition="'$(DotNetBuildPass)' != '' and '$(DotNetBuildPass)' != '1'">$(CommonArgs) /p:DotNetBuildPass=$(DotNetBuildPass)</CommonArgs>
 
     <!-- Only pass these properites through when necessary to reduce command line noise. -->
-    <BuildArgs Condition="'$(CrossBuild)' == 'true'">$(BuildArgs) /p:CrossBuild=true</BuildArgs>
-    <BuildArgs Condition="'$(NuGetConfigFile)' != ''">$(BuildArgs) /p:RestoreConfigFile=$(NuGetConfigFile)</BuildArgs>
-    <BuildArgs Condition="'$(DotNetBuildUseMonoRuntime)' == 'true'">$(BuildArgs) /p:DotNetBuildUseMonoRuntime=$(DotNetBuildUseMonoRuntime)</BuildArgs>
-    <BuildArgs Condition="'$(OfficialBuildId)' != ''">$(BuildArgs) /p:OfficialBuildId=$(OfficialBuildId)</BuildArgs>
-    <BuildArgs Condition="'$(ForceDryRunSigning)' != ''">$(BuildArgs) /p:ForceDryRunSigning=$(ForceDryRunSigning)</BuildArgs>
+    <CommonArgs Condition="'$(CrossBuild)' == 'true'">$(CommonArgs) /p:CrossBuild=true</CommonArgs>
+    <CommonArgs Condition="'$(DotNetBuildUseMonoRuntime)' == 'true'">$(CommonArgs) /p:DotNetBuildUseMonoRuntime=$(DotNetBuildUseMonoRuntime)</CommonArgs>
+    <CommonArgs Condition="'$(OfficialBuildId)' != ''">$(CommonArgs) /p:OfficialBuildId=$(OfficialBuildId)</CommonArgs>
+    <CommonArgs Condition="'$(ForceDryRunSigning)' != ''">$(CommonArgs) /p:ForceDryRunSigning=$(ForceDryRunSigning)</CommonArgs>
 
     <!-- Pass locations for assets -->
-    <BuildArgs>$(BuildArgs) /p:SourceBuiltAssetsDir=$(ArtifactsAssetsDir)</BuildArgs>
-    <BuildArgs>$(BuildArgs) /p:SourceBuiltAssetManifestsDir=$(RepoAssetManifestsDir)</BuildArgs>
+    <CommonArgs>$(CommonArgs) /p:SourceBuiltAssetsDir=$(ArtifactsAssetsDir)</CommonArgs>
+    <CommonArgs>$(CommonArgs) /p:SourceBuiltAssetManifestsDir=$(RepoAssetManifestsDir)</CommonArgs>
 
     <!-- PGO assets by default are "Vertical" visibilty. Each repo will enable the specific artifacts it must publish externally -->
-    <BuildArgs Condition="'$(PgoInstrument)' == 'true'">$(BuildArgs) /p:DefaultArtifactVisibility=Vertical</BuildArgs>
+    <CommonArgs Condition="'$(PgoInstrument)' == 'true'">$(CommonArgs) /p:DefaultArtifactVisibility=Vertical</CommonArgs>
     <!-- ShortStack builds only publish new assets from the root repository. All other assets are duplicates. -->
-    <BuildArgs Condition="'$(ShortStack)' == 'true' and '$(MSBuildProjectName)' != '$(RootRepo)'">$(BuildArgs) /p:DefaultArtifactVisibility=Vertical</BuildArgs>
+    <CommonArgs Condition="'$(ShortStack)' == 'true' and '$(MSBuildProjectName)' != '$(RootRepo)'">$(CommonArgs) /p:DefaultArtifactVisibility=Vertical</CommonArgs>
   </PropertyGroup>
 
+  <!-- Build specific args -->
+  <PropertyGroup>
+    <BuildArgs>$(CommonArgs) -bl</BuildArgs>
+    <!-- Don't flow these control properties during testing to avoid the outer/inner complexity. -->
+    <BuildArgs>$(BuildArgs) /p:DotNetBuildRepo=true</BuildArgs>
+    <BuildArgs>$(BuildArgs) /p:DotNetBuildOrchestrator=true</BuildArgs>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
     <BuildArgs>$(BuildArgs) /p:SourceBuiltSymbolsDir=$(IntermediateSymbolsRepoDir)</BuildArgs>
     <BuildArgs>$(BuildArgs) /p:DotNetBuildSourceOnly=true</BuildArgs>
@@ -126,14 +129,8 @@
     <BuildArgs>$(BuildArgs) /p:ReferencePackageNupkgCacheDir="$(ReferencePackagesDir)"</BuildArgs>
   </PropertyGroup>
 
+  <!-- Test specific args-->
   <PropertyGroup>
-    <TestActions>$(FlagParameterPrefix)restore</TestActions>
-    <TestActions>$(TestActions) $(FlagParameterPrefix)test</TestActions>
-
-    <!-- TODO: Remove the DotNetBuildSourceOnly condition when the default build behavior for source-only builds changes to dev.
-         https://github.com/dotnet/source-build/issues/4855 -->
-    <TestArgs Condition="'$(ContinuousIntegrationBuild)' == 'true' or '$(DotNetBuildSourceOnly)' == 'true'">$(FlagParameterPrefix)ci</TestArgs>
-    <TestArgs>$(TestArgs) $(FlagParameterPrefix)configuration $(Configuration)</TestArgs>
     <TestArgs>$(TestArgs) /bl:$(ArtifactsLogRepoDir)Test.binlog</TestArgs>
   </PropertyGroup>
 
@@ -146,17 +143,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- TODO: Remove once net10.0 migration is complete -->
-    <EnvironmentVariables Include="SuppressTfmSupportBuildWarnings=True" />
-
     <!-- Arcade tools.sh picks up DotNetCoreSdkDir, but we can pass DOTNET_INSTALL_DIR directly. -->
-    <EnvironmentVariables Include="DOTNET_INSTALL_DIR=$(DotNetRoot)" />
-    <EnvironmentVariables Include="DOTNET_PATH=$(DotNetRoot)" />
-    <EnvironmentVariables Include="DOTNET_HOST_PATH=$(DotNetTool)" />
+    <EnvironmentVariables Include="DOTNET_INSTALL_DIR=$(RepoDotNetRoot)" />
+    <EnvironmentVariables Include="DOTNET_PATH=$(RepoDotNetRoot)" />
+    <EnvironmentVariables Include="DOTNET_HOST_PATH=$(RepoDotNetTool)" />
 
     <!-- _InitializeDotNetCli is used by websdk and templating to decide whether to init the SDK -->
-    <EnvironmentVariables Include="_InitializeDotNetCli=$(DotNetRoot.TrimEnd('/\'))" />
-    <EnvironmentVariables Include="_DotNetInstallDir=$(DotNetRoot)" />
+    <EnvironmentVariables Include="_InitializeDotNetCli=$(RepoDotNetRoot.TrimEnd('/\'))" />
+    <EnvironmentVariables Include="_DotNetInstallDir=$(RepoDotNetRoot)" />
     <EnvironmentVariables Include="_InitializeToolset=$(SourceBuiltSdksDir)Microsoft.DotNet.Arcade.Sdk/tools/Build.proj"
                           Condition="'$(UseBootstrapArcade)' != 'true'" />
 
@@ -179,12 +173,11 @@
     <EnvironmentVariables Include="DotNetPackageVersionPropsPath=$(PackageVersionPropsPath)" />
 
     <!-- Needed for miscellanous projects in various repos - see https://github.com/dotnet/source-build/issues/4081-->
-    <EnvironmentVariables Include="RestoreConfigFile=$(NuGetConfigFile)" Condition="'$(NuGetConfigFile)' != ''" />
+    <EnvironmentVariables Include="RestoreConfigFile=$(NuGetConfigFile)" Condition="'$(NuGetConfigFile)' != '' and '$(UseIntermediateNuGetConfigFile)' != 'false'" />
 
     <!-- Need to be passed in here so that outer and inner builds don't restore into the orchestrator package cache (CI builds)
          or the user package cache (local dev builds). -->
     <EnvironmentVariables Include="NUGET_PACKAGES=$(RepoArtifactsPackageCache)" />
-    <TestEnvironmentVariable Include="NUGET_PACKAGES=$(RepoArtifactsPackageCache)" />
   </ItemGroup>
 
   <ItemGroup  Condition="'$(DotNetBuildSourceOnly)' == 'true'">
diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index 68d0d163e1a3..70cf912eea6b 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -3,17 +3,26 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets, $(MSBuildThisFileDirectory)..))" />
 
   <PropertyGroup Condition="'$(UseInnerClone)' == 'true'">
-    <BuildArgs>$(BuildArgs) /p:UseInnerClone=true</BuildArgs>
-    <BuildArgs>$(BuildArgs) /p:CopySrcInsteadOfClone=true</BuildArgs>
-    <BuildArgs>$(BuildArgs) /p:CopyWipIntoInnerSourceBuildRepo=true</BuildArgs>
+    <CommonArgs>$(CommonArgs) /p:UseInnerClone=true</CommonArgs>
+    <CommonArgs>$(CommonArgs) /p:CopySrcInsteadOfClone=true</CommonArgs>
+    <CommonArgs>$(CommonArgs) /p:CopyWipIntoInnerSourceBuildRepo=true</CommonArgs>
   </PropertyGroup>
 
   <PropertyGroup>
+    <RepoDotNetRoot Condition="'$(RepoDotNetRoot)' == ''">$(DotNetRoot)</RepoDotNetRoot>
+    <RepoDotNetTool Condition="'$(BuildOS)' == 'windows'">$(RepoDotNetRoot)dotnet.exe</RepoDotNetTool>
+    <RepoDotNetTool Condition="'$(BuildOS)' != 'windows'">$(RepoDotNetRoot)dotnet</RepoDotNetTool>
+
+    <!-- Update nuget.config property to point to modified file that will be created/updated during build. -->
+    <OriginalNuGetConfigFile>$(NuGetConfigFile)</OriginalNuGetConfigFile>
+    <NuGetConfigFile Condition="'$(OriginalNuGetConfigFile)' != '' and '$(UseIntermediateNuGetConfigFile)' != 'false'">$(BaseIntermediateOutputPath)$([System.IO.Path]::GetFileName('$(OriginalNuGetConfigFile)'))</NuGetConfigFile>
+
     <DiskUsageCommand Condition="'$(BuildOS)' == 'windows'">powershell -NoProfile "Get-PSDrive -PSProvider FileSystem -Name (Get-Item "$(RepoRoot.TrimEnd('\'))").PSDrive.Name"</DiskUsageCommand>
     <DiskUsageCommand Condition="'$(BuildOS)' != 'windows'">df -h $(RepoRoot)</DiskUsageCommand>
 
     <!-- Force use of dotnet msbuild (ignoring global.json contents) unless ForceDotNetMSBuildEngine is explicitly set in the repo project. -->
-    <BuildArgs Condition="'$(BuildOS)' == 'windows' and '$(ForceDotNetMSBuildEngine)' != 'false'">$(BuildArgs) $(FlagParameterPrefix)msbuildEngine dotnet</BuildArgs>
+    <CommonArgs Condition="'$(BuildOS)' == 'windows' and '$(ForceDotNetMSBuildEngine)' != 'false'">$(CommonArgs) $(FlagParameterPrefix)msbuildEngine dotnet</CommonArgs>
+
     <!-- Add the overrides for the shipping and non-shipping packages here to allow repo projects to identify a project as reference-only -->
     <RepoArtifactsShippingPackagesDir Condition="'$(ReferenceOnlyRepoArtifacts)' != 'true'">$([MSBuild]::NormalizeDirectory('$(ArtifactsShippingPackagesDir)', '$(RepositoryName)'))</RepoArtifactsShippingPackagesDir>
     <RepoArtifactsShippingPackagesDir Condition="'$(ReferenceOnlyRepoArtifacts)' == 'true'">$(ReferencePackagesDir)</RepoArtifactsShippingPackagesDir>
@@ -21,9 +30,9 @@
     <RepoArtifactsNonShippingPackagesDir Condition="'$(ReferenceOnlyRepoArtifacts)' == 'true'">$(ReferencePackagesDir)</RepoArtifactsNonShippingPackagesDir>
 
     <!-- Pass location for packages -->
-    <BuildArgs>$(BuildArgs) /p:SourceBuiltShippingPackagesDir=$(RepoArtifactsShippingPackagesDir)</BuildArgs>
+    <CommonArgs>$(CommonArgs) /p:SourceBuiltShippingPackagesDir=$(RepoArtifactsShippingPackagesDir)</CommonArgs>
     <!-- Trim the trailing slash as it breaks argument parsing on Windows if this is the last argument. -->
-    <BuildArgs>$(BuildArgs) /p:SourceBuiltNonShippingPackagesDir=$(RepoArtifactsNonShippingPackagesDir.TrimEnd('\'))</BuildArgs>
+    <CommonArgs>$(CommonArgs) /p:SourceBuiltNonShippingPackagesDir=$(RepoArtifactsNonShippingPackagesDir.TrimEnd('\'))</CommonArgs>
 
     <!-- Pass RID and Portable/non-portable information -->
     <_platformIndex>$(NETCoreSdkRuntimeIdentifier.LastIndexOf('-'))</_platformIndex>
@@ -31,12 +40,13 @@
 
     <_platformIndex>$(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-'))</_platformIndex>
     <BaseOS>$(NETCoreSdkPortableRuntimeIdentifier.Substring(0, $(_platformIndex)))-$(TargetArchitecture)</BaseOS>
-    <BuildArgs>$(BuildArgs) /p:PortableBuild=$(PortableBuild)</BuildArgs>
-    <BuildArgs Condition="'$(ShortStack)' != 'true' and '$(TargetOS)' != 'linux-musl'">$(BuildArgs) /p:RuntimeOS=$(RuntimeOS)</BuildArgs>
-    <BuildArgs Condition="'$(ShortStack)' != 'true' and '$(TargetOS)' != 'linux-musl'">$(BuildArgs) /p:BaseOS=$(BaseOS)</BuildArgs>
+    <CommonArgs>$(CommonArgs) /p:PortableBuild=$(PortableBuild)</CommonArgs>
+    <CommonArgs Condition="'$(ShortStack)' != 'true' and '$(TargetOS)' != 'linux-musl'">$(CommonArgs) /p:RuntimeOS=$(RuntimeOS)</CommonArgs>
+    <CommonArgs Condition="'$(ShortStack)' != 'true' and '$(TargetOS)' != 'linux-musl'">$(CommonArgs) /p:BaseOS=$(BaseOS)</CommonArgs>
 
-    <!-- Only pass when enabled to reduce command line noise. -->
-    <BuildArgs Condition="'$(DotNetBuildTests)' == 'true' and '$(DotNetBuildTestsOptOut)' != 'true'">$(BuildArgs) /p:DotNetBuildTests=true</BuildArgs>
+    <!-- Only pass these properites through when necessary to reduce command line noise. -->
+    <CommonArgs Condition="'$(DotNetBuildTests)' == 'true' and '$(DotNetBuildTestsOptOut)' != 'true'">$(CommonArgs) /p:DotNetBuildTests=true</CommonArgs>
+    <CommonArgs Condition="'$(NuGetConfigFile)' != '' and '$(UseIntermediateNuGetConfigFile)' != 'false'">$(CommonArgs) /p:RestoreConfigFile=$(NuGetConfigFile)</CommonArgs>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -141,7 +151,7 @@
   <UsingTask TaskName="Microsoft.DotNet.UnifiedBuild.Tasks.UpdateNuGetConfigPackageSourcesMappings" AssemblyFile="$(MicrosoftDotNetUnifiedBuildTasksAssembly)" TaskFactory="TaskHostFactory" />
   <Target Name="UpdateNuGetConfig"
           DependsOnTargets="CopyNuGetConfig;GetRepositoryReferenceInfo"
-          Condition="'$(NuGetConfigFile)' != ''"
+          Condition="'$(NuGetConfigFile)' != '' and '$(UseIntermediateNuGetConfigFile)' != 'false'"
           Inputs="$(MSBuildProjectFullPath)"
           Outputs="$(BaseIntermediateOutputPath)UpdateNuGetConfig.complete">
     <PropertyGroup>
@@ -254,9 +264,11 @@
        This guarantees that all repositories build with the VMR's SDK version. -->
   <UsingTask TaskName="Microsoft.DotNet.UnifiedBuild.Tasks.UpdateJson" AssemblyFile="$(MicrosoftDotNetUnifiedBuildTasksAssembly)" TaskFactory="TaskHostFactory" />
   <Target Name="UpdateGlobalJsonVersions"
-          Condition="'$(GlobalJsonFile)' != ''"
-          Inputs="$(MSBuildProjectFullPath);$(MSBuildThisFileFullPath)"
-          Outputs="$(BaseIntermediateOutputPath)UpdateGlobalJsonVersions.complete">
+          Condition="'$(GlobalJsonFile)' != ''">
+    <PropertyGroup>
+      <RepoNETCoreSdkVersion Condition="'$(RepoNETCoreSdkVersion)' == ''">$(NETCoreSdkVersion)</RepoNETCoreSdkVersion>
+    </PropertyGroup>
+
     <ItemGroup>
       <_PossibleCliVersionJsonPath Include="sdk:version" />
       <_PossibleCliVersionJsonPath Include="tools:dotnet" />
@@ -264,18 +276,13 @@
 
     <UpdateJson JsonFilePath="$(GlobalJsonFile)"
                 PathToAttribute="%(_PossibleCliVersionJsonPath.Identity)"
-                NewAttributeValue="$(NETCoreSdkVersion)"
+                NewAttributeValue="$(RepoNETCoreSdkVersion)"
                 SkipUpdateIfMissingKey="true" />
 
     <!-- VB PoC, remove the global runtimes until https://github.com/dotnet/arcade/issues/14283 is resolved. -->
     <UpdateJson JsonFilePath="$(GlobalJsonFile)"
                 PathToAttribute="tools:runtimes"
                 SkipUpdateIfMissingKey="true" />
-
-    <MakeDir Directories="$(BaseIntermediateOutputPath)" />
-    <Touch Files="$(BaseIntermediateOutputPath)UpdateGlobalJsonVersions.complete" AlwaysCreate="true">
-      <Output TaskParameter="TouchedFiles" ItemName="FileWrites" />
-    </Touch>
   </Target>
 
   <!-- TODO: Remove when all repos use a consistent set of eng/common files: https://github.com/dotnet/source-build/issues/3710. -->
@@ -400,8 +407,7 @@
              Condition="'@(_DependentProjectToSkip)' != ''" />
   </Target>
 
-  <Target Name="DiscoverBuiltSdkOverrides"
-          DependsOnTargets="BuildRepoReferences;GetProducedPackagesFromTransitiveReferences">
+  <Target Name="DiscoverBuiltSdkOverrides" DependsOnTargets="GetProducedPackagesFromTransitiveReferences">
     <!--
       Discover the Arcade SDKs built from the live Arcade source and set them as overrides here.
       This will automatically no-op for Arcade and SBRP, as these packages will not have been produced yet.
@@ -459,7 +465,7 @@
            ProcessFrameworkReferences not be able to restore for the given RID.  -->
       <BuildArgs Condition="'$(DotNetBuildSourceOnly)' != 'true' and '@(TransitiveRepositoryReference->AnyHaveMetadataValue('Identity', 'runtime'))' == 'true'">$(BuildArgs) /p:DotNetBuildTargetRidOnly=true</BuildArgs>
 
-      <BuildCommand Condition="'$(BuildCommand)' == '' and '$(IsUtilityProject)' != 'true'">$(BuildScript) $(BuildActions) $(BuildArgs)</BuildCommand>
+      <BuildCommand Condition="'$(BuildCommand)' == '' and '$(IsUtilityProject)' != 'true'">$(BuildScript) $(BuildActions) $(CommonArgs) $(BuildArgs)</BuildCommand>
     </PropertyGroup>
   </Target>
 
@@ -482,6 +488,7 @@
     <Message Importance="High" Text="  Log: $(RepoConsoleLogFile)" Condition="'$(MinimalConsoleLogOutput)' == 'true'" />
     <Message Importance="High" Text="  With Environment Variables:"/>
     <Message Importance="High" Text="    %(EnvironmentVariables.Identity)" />
+    <Message Importance="High" Text="    %(BuildEnvironmentVariable.Identity)" Condition="'@(BuildEnvironmentVariable)' != ''" />
 
     <Message Text="DirSize Before Building $(RepositoryName)" Importance="High" Condition=" '$(CleanWhileBuilding)' == 'true'" />
     <Exec Command="$(DiskUsageCommand)" Condition="'$(CleanWhileBuilding)' == 'true'" />
@@ -503,7 +510,7 @@
 
     <Exec Command="$(FullCommand)"
           WorkingDirectory="$(ProjectDirectory)"
-          EnvironmentVariables="@(EnvironmentVariables)"
+          EnvironmentVariables="@(EnvironmentVariables);@(BuildEnvironmentVariable)"
           IgnoreStandardErrorWarningFormat="true">
       <Output TaskParameter="ExitCode" PropertyName="RepoBuildExitCode" />
     </Exec>
@@ -673,7 +680,7 @@
 
       Don't run when source building to prevent the build from hanging indefinitely - https://github.com/dotnet/source-build/issues/4796
     -->
-    <Exec Command="$(DotnetTool) build-server shutdown --vbcscompiler"
+    <Exec Command="$(RepoDotnetTool) build-server shutdown --vbcscompiler"
           Condition="'$(DotNetBuildSourceOnly)' != 'true'"
           EnvironmentVariables="NUGET_PACKAGES=$(RepoArtifactsPackageCache)"
           IgnoreStandardErrorWarningFormat="true"
@@ -762,16 +769,20 @@
     MoveDotNetBuildLogs;
     CleanupRepo" />
 
-  <Target Name="RepoTest">
+  <Target Name="RepoTest"
+          DependsOnTargets="UpdateGlobalJsonVersions;
+                            DiscoverBuiltSdkOverrides;
+                            SetSourceBuiltSdkOverrides">
     <PropertyGroup>
-      <TestCommand>$(BuildScript) $(TestActions) $(TestArgs)</TestCommand>
+      <TestCommand>$(BuildScript) $(TestActions) $(CommonArgs) $(TestArgs)</TestCommand>
     </PropertyGroup>
 
     <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Testing $(RepositoryName)" />
     <Message Importance="High" Text="Running command:" />
     <Message Importance="High" Text="  $(TestCommand)" />
     <Message Importance="High" Text="  With Environment Variables:"/>
-    <Message Importance="High" Text="    %(TestEnvironmentVariable.Identity)" />
+    <Message Importance="High" Text="    %(EnvironmentVariables.Identity)" />
+    <Message Importance="High" Text="    %(TestEnvironmentVariable.Identity)" Condition="'@(TestEnvironmentVariable)' != ''" />
 
     <PropertyGroup>
       <FullTestCommand>$(TestCommand)</FullTestCommand>
@@ -780,7 +791,7 @@
 
     <Exec Command="$(FullTestCommand)"
           WorkingDirectory="$(ProjectDirectory)"
-          EnvironmentVariables="@(TestEnvironmentVariable)">
+          EnvironmentVariables="@(EnvironmentVariables);@(TestEnvironmentVariable)">
       <Output TaskParameter="ExitCode" PropertyName="RepoTestExitCode" />
     </Exec>
 
@@ -789,7 +800,11 @@
     <OnError ExecuteTargets="MoveDotNetBuildLogs" />
   </Target>
 
-  <Target Name="Test" DependsOnTargets="RepoTest;MoveDotNetBuildLogs" />
+  <Target Name="Test"
+          DependsOnTargets="
+    RepoTest;
+    MoveDotNetBuildLogs;
+    CleanupRepo" />
   <Target Name="VSTest" DependsOnTargets="Test" />
 
   <UsingTask TaskName="Microsoft.DotNet.UnifiedBuild.Tasks.UsageReport.WritePackageUsageData" AssemblyFile="$(MicrosoftDotNetUnifiedBuildTasksAssembly)" TaskFactory="TaskHostFactory" />
diff --git a/src/SourceBuild/content/repo-projects/scenario-tests.proj b/src/SourceBuild/content/repo-projects/scenario-tests.proj
index 2acd2f8bf0b7..847aedebd6b1 100644
--- a/src/SourceBuild/content/repo-projects/scenario-tests.proj
+++ b/src/SourceBuild/content/repo-projects/scenario-tests.proj
@@ -2,14 +2,18 @@
 
   <PropertyGroup>
     <!-- The scenario-tests repo shouldn't be cleaned after building as we run tests from it. -->
-    <CleanWhileBuilding>false</CleanWhileBuilding>
+    <CleanWhileBuilding Condition="'$(Test)' != 'true'">false</CleanWhileBuilding>
+    <!-- Don't use the updated NuGet.config file that includes the live package feeds when testing source-only as in that configuration
+         the Microsoft built packages should be used. -->
+    <UseIntermediateNuGetConfigFile Condition="'$(Test)' == 'true' and '$(DotNetBuildSourceOnly)' == 'true'">false</UseIntermediateNuGetConfigFile>
+    <!-- When testing scenario-tests, use the live produced SDK. -->
+    <RepoDotNetRoot Condition="'$(Test)' == 'true'">$(DotNetSdkExtractDir)</RepoDotNetRoot>
 
     <ScenarioTestsResultsDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsTestResultsDir)', 'scenario-tests'))</ScenarioTestsResultsDir>
-    
+    <TestXmlOutputPath>$(ScenarioTestsResultsDir)$([System.DateTime]::Now.ToString("yyyy-MM-dd_HH_mm_ss")).xml</TestXmlOutputPath>
+
+    <TestArgs>$(TestArgs) /p:AdditionalTestArgs="--xml $(TestXmlOutputPath) --target-rid $(TargetRid) --portable-rid $(PortableRid) --no-cleanup --no-traits Category=MultiTFM"</TestArgs>
     <TestArgs>$(TestArgs) /p:TestBinlogDir=$(ArtifactsLogRepoDir)</TestArgs>
-    <!-- Pass the path of the updated NuGet.config file in which contains the live source-built feeds. Skip this when building source-only
-         as in that configuration we currently don't want to use the live generated NuGet packages from the various repositories. -->
-    <TestArgs Condition="'$(NuGetConfigFile)' != '' and '$(DotNetBuildSourceOnly)' != 'true'">$(TestArgs) /p:RestoreConfigFile=$(NuGetConfigFile)</TestArgs>
   </PropertyGroup>
 
   <ItemGroup>
@@ -29,29 +33,13 @@
 
   <Target Name="PrepareScenarioTestsInputs"
           DependsOnTargets="DetermineSourceBuiltSdkVersion"
-          BeforeTargets="RepoTest">
+          BeforeTargets="UpdateGlobalJsonVersions;RepoTest">
     <PropertyGroup>
-      <_CurrentDateTime>$([System.DateTime]::Now.ToString("yyyy-MM-dd_HH_mm_ss"))</_CurrentDateTime>
-      <_TestXmlOutputPath>$(ScenarioTestsResultsDir)$(_CurrentDateTime).xml</_TestXmlOutputPath>
-      <_ScenarioTestsAdditionalArgs>--xml $(_TestXmlOutputPath) --target-rid $(TargetRid) --portable-rid $(PortableRid) --no-cleanup --no-traits Category=MultiTFM</_ScenarioTestsAdditionalArgs>
-
-      <!-- It's necessary to explicitly define the path to the dotnet tool to prevent Arcade from attempting to derive it. Otherwise, it will run the dotnet
-           install script to get a new one. We must use the locally built SDK instead in order to support non-portable RIDs for source build. -->
-      <_DotNetTool>$(DotNetSdkExtractDir)$([System.IO.Path]::GetFileName('$(DotNetTool)'))</_DotNetTool>
+      <!-- When testing scenario-tests, use the live produced SDK.-->
+      <RepoNETCoreSdkVersion>$(SourceBuiltSdkVersion)</RepoNETCoreSdkVersion>
     </PropertyGroup>
 
     <MakeDir Directories="$(ScenarioTestsResultsDir)" />
-
-    <ItemGroup>
-      <TestEnvironmentVariable Include="
-        DotNetRoot=$(DotNetSdkExtractDir);
-        TestSdkVersion=$(SourceBuiltSdkVersion);
-        AdditionalTestArgs=$(_ScenarioTestsAdditionalArgs);
-        DotNetTool=$(_DotNetTool);
-        _InitializeDotNetCli=$(DotNetSdkExtractDir.TrimEnd('/\'))" />
-      <!-- Needed for miscellanous projects in various repos - see https://github.com/dotnet/source-build/issues/4081-->
-      <TestEnvironmentVariable Include="RestoreConfigFile=$(NuGetConfigFile)" Condition="'$(NuGetConfigFile)' != '' and '$(DotNetBuildSourceOnly)' != 'true'" />
-    </ItemGroup>
   </Target>
 
   <Target Name="SetAzureDevOpsVariableForScenarioTests"
diff --git a/src/SourceBuild/content/repo-projects/sdk.proj b/src/SourceBuild/content/repo-projects/sdk.proj
index d374626251e9..e8ec7abd2d39 100644
--- a/src/SourceBuild/content/repo-projects/sdk.proj
+++ b/src/SourceBuild/content/repo-projects/sdk.proj
@@ -22,7 +22,6 @@
     <BuildArgs>$(BuildArgs) /p:PortableOSName=$(__PortableTargetOS)</BuildArgs>
     <BuildArgs>$(BuildArgs) /p:Rid=$(TargetRid)</BuildArgs>
     <BuildArgs>$(BuildArgs) /p:Architecture=$(TargetArchitecture)</BuildArgs>
-    <BuildArgs>$(BuildArgs) /p:DOTNET_INSTALL_DIR=$(DotNetRoot)</BuildArgs>
 
     <BuildArgs Condition="'$(TargetOS)' != 'windows'">$(BuildArgs) /p:AspNetCoreInstallerRid=$(TargetRid)</BuildArgs>
     <!-- sdk always wants to build portable on FreeBSD etc. -->

From 915d921f4c7ba5842ee6b4000ff9ca3765ae72d5 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 6 Feb 2025 15:14:17 +0100
Subject: [PATCH 03/22] Remove duplicate CommonArgs condition for
 NuGetConfigFile

---
 src/SourceBuild/content/repo-projects/Directory.Build.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index 70cf912eea6b..0edca4f5c90d 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -16,6 +16,7 @@
     <!-- Update nuget.config property to point to modified file that will be created/updated during build. -->
     <OriginalNuGetConfigFile>$(NuGetConfigFile)</OriginalNuGetConfigFile>
     <NuGetConfigFile Condition="'$(OriginalNuGetConfigFile)' != '' and '$(UseIntermediateNuGetConfigFile)' != 'false'">$(BaseIntermediateOutputPath)$([System.IO.Path]::GetFileName('$(OriginalNuGetConfigFile)'))</NuGetConfigFile>
+    <CommonArgs Condition="'$(NuGetConfigFile)' != '' and '$(UseIntermediateNuGetConfigFile)' != 'false'">$(CommonArgs) /p:RestoreConfigFile=$(NuGetConfigFile)</CommonArgs>
 
     <DiskUsageCommand Condition="'$(BuildOS)' == 'windows'">powershell -NoProfile "Get-PSDrive -PSProvider FileSystem -Name (Get-Item "$(RepoRoot.TrimEnd('\'))").PSDrive.Name"</DiskUsageCommand>
     <DiskUsageCommand Condition="'$(BuildOS)' != 'windows'">df -h $(RepoRoot)</DiskUsageCommand>
@@ -46,7 +47,6 @@
 
     <!-- Only pass these properites through when necessary to reduce command line noise. -->
     <CommonArgs Condition="'$(DotNetBuildTests)' == 'true' and '$(DotNetBuildTestsOptOut)' != 'true'">$(CommonArgs) /p:DotNetBuildTests=true</CommonArgs>
-    <CommonArgs Condition="'$(NuGetConfigFile)' != '' and '$(UseIntermediateNuGetConfigFile)' != 'false'">$(CommonArgs) /p:RestoreConfigFile=$(NuGetConfigFile)</CommonArgs>
   </PropertyGroup>
 
   <PropertyGroup>

From 7642544e20b6db6ecdbff926956261f1afca7499 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 6 Feb 2025 15:16:01 +0100
Subject: [PATCH 04/22] Fix typo in Exec Command attribute

---
 src/SourceBuild/content/repo-projects/Directory.Build.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index 0edca4f5c90d..1b60da5fbc5c 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -680,7 +680,7 @@
 
       Don't run when source building to prevent the build from hanging indefinitely - https://github.com/dotnet/source-build/issues/4796
     -->
-    <Exec Command="$(RepoDotnetTool) build-server shutdown --vbcscompiler"
+    <Exec Command="$(RepoDotNetTool) build-server shutdown --vbcscompiler"
           Condition="'$(DotNetBuildSourceOnly)' != 'true'"
           EnvironmentVariables="NUGET_PACKAGES=$(RepoArtifactsPackageCache)"
           IgnoreStandardErrorWarningFormat="true"

From 2f0a80fd6ea7fa3a6f0585df54142e774a2bcfdf Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 6 Feb 2025 15:18:06 +0100
Subject: [PATCH 05/22] Add condition to PrepareScenarioTestsInputs target

---
 src/SourceBuild/content/repo-projects/scenario-tests.proj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/SourceBuild/content/repo-projects/scenario-tests.proj b/src/SourceBuild/content/repo-projects/scenario-tests.proj
index 847aedebd6b1..cfe848246161 100644
--- a/src/SourceBuild/content/repo-projects/scenario-tests.proj
+++ b/src/SourceBuild/content/repo-projects/scenario-tests.proj
@@ -33,7 +33,8 @@
 
   <Target Name="PrepareScenarioTestsInputs"
           DependsOnTargets="DetermineSourceBuiltSdkVersion"
-          BeforeTargets="UpdateGlobalJsonVersions;RepoTest">
+          BeforeTargets="UpdateGlobalJsonVersions;RepoTest"
+          Condition="'$(Test)' == 'true'">
     <PropertyGroup>
       <!-- When testing scenario-tests, use the live produced SDK.-->
       <RepoNETCoreSdkVersion>$(SourceBuiltSdkVersion)</RepoNETCoreSdkVersion>

From ee33f8e98188bc514580eef13f60df6a7c17c861 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 6 Feb 2025 15:20:52 +0100
Subject: [PATCH 06/22] Trim trailing backslash in TestBinlogDir path

---
 src/SourceBuild/content/repo-projects/scenario-tests.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SourceBuild/content/repo-projects/scenario-tests.proj b/src/SourceBuild/content/repo-projects/scenario-tests.proj
index cfe848246161..27c136bc932c 100644
--- a/src/SourceBuild/content/repo-projects/scenario-tests.proj
+++ b/src/SourceBuild/content/repo-projects/scenario-tests.proj
@@ -13,7 +13,7 @@
     <TestXmlOutputPath>$(ScenarioTestsResultsDir)$([System.DateTime]::Now.ToString("yyyy-MM-dd_HH_mm_ss")).xml</TestXmlOutputPath>
 
     <TestArgs>$(TestArgs) /p:AdditionalTestArgs="--xml $(TestXmlOutputPath) --target-rid $(TargetRid) --portable-rid $(PortableRid) --no-cleanup --no-traits Category=MultiTFM"</TestArgs>
-    <TestArgs>$(TestArgs) /p:TestBinlogDir=$(ArtifactsLogRepoDir)</TestArgs>
+    <TestArgs>$(TestArgs) /p:TestBinlogDir="$(ArtifactsLogRepoDir.TrimEnd('\'))"</TestArgs>
   </PropertyGroup>
 
   <ItemGroup>

From 170216558e35bd497a28fcaac501528d24c4988c Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 6 Feb 2025 15:45:53 +0100
Subject: [PATCH 07/22] fix

---
 src/SourceBuild/content/repo-projects/Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props
index e63d50598667..c7ec5183271d 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.props
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.props
@@ -117,7 +117,7 @@
 
   <!-- Build specific args -->
   <PropertyGroup>
-    <BuildArgs>$(CommonArgs) -bl</BuildArgs>
+    <BuildArgs>$(BuildArgs) -bl</BuildArgs>
     <!-- Don't flow these control properties during testing to avoid the outer/inner complexity. -->
     <BuildArgs>$(BuildArgs) /p:DotNetBuildRepo=true</BuildArgs>
     <BuildArgs>$(BuildArgs) /p:DotNetBuildOrchestrator=true</BuildArgs>

From 07dd39f579b14c9a1990c04d775a021ec5cddbe6 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 6 Feb 2025 18:08:50 +0100
Subject: [PATCH 08/22] fixeees (hopefully)

---
 .../repo-projects/Directory.Build.props       | 11 ---
 .../repo-projects/Directory.Build.targets     | 77 +++++++++++++------
 .../content/repo-projects/scenario-tests.proj | 21 +++--
 3 files changed, 64 insertions(+), 45 deletions(-)

diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props
index c7ec5183271d..cf1d0d2a5f93 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.props
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.props
@@ -143,14 +143,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- Arcade tools.sh picks up DotNetCoreSdkDir, but we can pass DOTNET_INSTALL_DIR directly. -->
-    <EnvironmentVariables Include="DOTNET_INSTALL_DIR=$(RepoDotNetRoot)" />
-    <EnvironmentVariables Include="DOTNET_PATH=$(RepoDotNetRoot)" />
-    <EnvironmentVariables Include="DOTNET_HOST_PATH=$(RepoDotNetTool)" />
-
-    <!-- _InitializeDotNetCli is used by websdk and templating to decide whether to init the SDK -->
-    <EnvironmentVariables Include="_InitializeDotNetCli=$(RepoDotNetRoot.TrimEnd('/\'))" />
-    <EnvironmentVariables Include="_DotNetInstallDir=$(RepoDotNetRoot)" />
     <EnvironmentVariables Include="_InitializeToolset=$(SourceBuiltSdksDir)Microsoft.DotNet.Arcade.Sdk/tools/Build.proj"
                           Condition="'$(UseBootstrapArcade)' != 'true'" />
 
@@ -172,9 +164,6 @@
     <!-- Need to be passed in as an env var so that custom Exec tasks in the repo's DotNetBuild.props receive this setting. -->
     <EnvironmentVariables Include="DotNetPackageVersionPropsPath=$(PackageVersionPropsPath)" />
 
-    <!-- Needed for miscellanous projects in various repos - see https://github.com/dotnet/source-build/issues/4081-->
-    <EnvironmentVariables Include="RestoreConfigFile=$(NuGetConfigFile)" Condition="'$(NuGetConfigFile)' != '' and '$(UseIntermediateNuGetConfigFile)' != 'false'" />
-
     <!-- Need to be passed in here so that outer and inner builds don't restore into the orchestrator package cache (CI builds)
          or the user package cache (local dev builds). -->
     <EnvironmentVariables Include="NUGET_PACKAGES=$(RepoArtifactsPackageCache)" />
diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index 1b60da5fbc5c..5cbe3f012ce5 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -9,15 +9,6 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <RepoDotNetRoot Condition="'$(RepoDotNetRoot)' == ''">$(DotNetRoot)</RepoDotNetRoot>
-    <RepoDotNetTool Condition="'$(BuildOS)' == 'windows'">$(RepoDotNetRoot)dotnet.exe</RepoDotNetTool>
-    <RepoDotNetTool Condition="'$(BuildOS)' != 'windows'">$(RepoDotNetRoot)dotnet</RepoDotNetTool>
-
-    <!-- Update nuget.config property to point to modified file that will be created/updated during build. -->
-    <OriginalNuGetConfigFile>$(NuGetConfigFile)</OriginalNuGetConfigFile>
-    <NuGetConfigFile Condition="'$(OriginalNuGetConfigFile)' != '' and '$(UseIntermediateNuGetConfigFile)' != 'false'">$(BaseIntermediateOutputPath)$([System.IO.Path]::GetFileName('$(OriginalNuGetConfigFile)'))</NuGetConfigFile>
-    <CommonArgs Condition="'$(NuGetConfigFile)' != '' and '$(UseIntermediateNuGetConfigFile)' != 'false'">$(CommonArgs) /p:RestoreConfigFile=$(NuGetConfigFile)</CommonArgs>
-
     <DiskUsageCommand Condition="'$(BuildOS)' == 'windows'">powershell -NoProfile "Get-PSDrive -PSProvider FileSystem -Name (Get-Item "$(RepoRoot.TrimEnd('\'))").PSDrive.Name"</DiskUsageCommand>
     <DiskUsageCommand Condition="'$(BuildOS)' != 'windows'">df -h $(RepoRoot)</DiskUsageCommand>
 
@@ -60,6 +51,41 @@
     <ProdConManifestFile>$(PackageReportDir)prodcon-build.xml</ProdConManifestFile>
   </PropertyGroup>
 
+  <!-- Dynamic properties that are used in both test and build. -->
+  <Target Name="SetCommonProperties">
+    <!-- Update nuget.config property to point to modified file that will be created/updated during build. -->
+    <Choose>
+      <When Condition="'$(NuGetConfigFile)' != '' and '$(UseIntermediateNuGetConfigFile)' != 'false'">
+        <PropertyGroup>
+          <NuGetConfigFile>$(BaseIntermediateOutputPath)$([System.IO.Path]::GetFileName('$(NuGetConfigFile)'))</NuGetConfigFile>
+          <CommonArgs>$(CommonArgs) /p:RestoreConfigFile=$(NuGetConfigFile)</CommonArgs>
+        </PropertyGroup>
+
+        <ItemGroup>
+          <!-- Needed for miscellanous projects in various repos - see https://github.com/dotnet/source-build/issues/4081-->
+          <EnvironmentVariables Include="RestoreConfigFile=$(NuGetConfigFile)" />
+        </ItemGroup>
+      </When>
+    </Choose>
+
+    <PropertyGroup>
+      <RepoDotNetRoot Condition="'$(RepoDotNetRoot)' == ''">$(DotNetRoot)</RepoDotNetRoot>
+      <RepoDotNetTool Condition="'$(BuildOS)' == 'windows'">$(RepoDotNetRoot)dotnet.exe</RepoDotNetTool>
+      <RepoDotNetTool Condition="'$(BuildOS)' != 'windows'">$(RepoDotNetRoot)dotnet</RepoDotNetTool>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <!-- Arcade tools.sh picks up DotNetCoreSdkDir, but we can pass DOTNET_INSTALL_DIR directly. -->
+      <EnvironmentVariables Include="DOTNET_INSTALL_DIR=$(RepoDotNetRoot)" />
+      <EnvironmentVariables Include="DOTNET_PATH=$(RepoDotNetRoot)" />
+      <EnvironmentVariables Include="DOTNET_HOST_PATH=$(RepoDotNetTool)" />
+
+      <!-- _InitializeDotNetCli is used by websdk and templating to decide whether to init the SDK -->
+      <EnvironmentVariables Include="_InitializeDotNetCli=$(RepoDotNetRoot.TrimEnd('/\'))" />
+      <EnvironmentVariables Include="_DotNetInstallDir=$(RepoDotNetRoot)" />
+    </ItemGroup>
+  </Target>
+
   <UsingTask TaskName="Microsoft.DotNet.UnifiedBuild.Tasks.ReplaceTextInFile" AssemblyFile="$(MicrosoftDotNetUnifiedBuildTasksAssembly)" TaskFactory="TaskHostFactory" />
   <Target Name="AddNoWarns"
           Condition=" EXISTS('$(ProjectDirectory)Directory.Build.props') OR EXISTS('$(ProjectDirectory)src/Directory.Build.props') "
@@ -133,15 +159,15 @@
     </ItemGroup>
   </Target>
 
-  <Target Name="CopyNuGetConfig"
-          Condition="'$(NuGetConfigFile)' != ''"
-          Inputs="$(MSBuildProjectFullPath);$(OriginalNuGetConfigFile)"
-          Outputs="$(NuGetConfigFile)">
-
+  <Target Name="CopyNuGetConfig" DependsOnTargets="SetCommonProperties">
+    <PropertyGroup>
+      <OriginalNuGetConfigFile>$(NuGetConfigFile)</OriginalNuGetConfigFile>
+    </PropertyGroup>
     <MakeDir Directories="$([System.IO.Path]::GetDirectoryName('$(NuGetConfigFile)'))" />
 
     <Copy SourceFiles="$(OriginalNuGetConfigFile)"
-          DestinationFiles="$(NuGetConfigFile)">
+          DestinationFiles="$(NuGetConfigFile)"
+          SkipUnchangedFiles="true">
       <Output TaskParameter="CopiedFiles" ItemName="FileWrites" />
     </Copy>
   </Target>
@@ -456,7 +482,7 @@
   </Target>
 
   <Target Name="SetBuildProperties"
-          DependsOnTargets="GetTransitiveRepositoryReferences">
+          DependsOnTargets="SetCommonProperties;GetTransitiveRepositoryReferences">
     <PropertyGroup>
       <!-- Infer the projects runtime identifier as the vertical's RID when doing a vertical build
            and filter down RID lists to the target RID in such a scenario. This is necessary when the host (SDK) rid
@@ -667,7 +693,7 @@
   <Target Name="CleanupRepo"
           Inputs="$(MSBuildProjectFullPath)"
           Outputs="$(BaseIntermediateOutputPath)CleanupRepo.complete"
-          DependsOnTargets="BackupProjectAssetsJsonFiles"
+          DependsOnTargets="BackupProjectAssetsJsonFiles;SetCommonProperties"
           Condition="'$(IsUtilityProject)' != 'true' and
                      '$(CleanWhileBuilding)' == 'true' and
                      Exists('$(RepoArtifactsDir)')">
@@ -770,7 +796,8 @@
     CleanupRepo" />
 
   <Target Name="RepoTest"
-          DependsOnTargets="UpdateGlobalJsonVersions;
+          DependsOnTargets="SetCommonProperties;
+                            UpdateGlobalJsonVersions;
                             DiscoverBuiltSdkOverrides;
                             SetSourceBuiltSdkOverrides">
     <PropertyGroup>
@@ -800,11 +827,15 @@
     <OnError ExecuteTargets="MoveDotNetBuildLogs" />
   </Target>
 
-  <Target Name="Test"
-          DependsOnTargets="
-    RepoTest;
-    MoveDotNetBuildLogs;
-    CleanupRepo" />
+  <PropertyGroup>
+    <TestDependsOn>
+      $(TestDependsOn);
+      RepoTest;
+      MoveDotNetBuildLogs;
+      CleanupRepo
+  </PropertyGroup>
+
+  <Target Name="Test" DependsOnTargets="$(TestDependsOn)" />
   <Target Name="VSTest" DependsOnTargets="Test" />
 
   <UsingTask TaskName="Microsoft.DotNet.UnifiedBuild.Tasks.UsageReport.WritePackageUsageData" AssemblyFile="$(MicrosoftDotNetUnifiedBuildTasksAssembly)" TaskFactory="TaskHostFactory" />
diff --git a/src/SourceBuild/content/repo-projects/scenario-tests.proj b/src/SourceBuild/content/repo-projects/scenario-tests.proj
index 27c136bc932c..71f9eda1ff7f 100644
--- a/src/SourceBuild/content/repo-projects/scenario-tests.proj
+++ b/src/SourceBuild/content/repo-projects/scenario-tests.proj
@@ -2,18 +2,15 @@
 
   <PropertyGroup>
     <!-- The scenario-tests repo shouldn't be cleaned after building as we run tests from it. -->
-    <CleanWhileBuilding Condition="'$(Test)' != 'true'">false</CleanWhileBuilding>
-    <!-- Don't use the updated NuGet.config file that includes the live package feeds when testing source-only as in that configuration
-         the Microsoft built packages should be used. -->
-    <UseIntermediateNuGetConfigFile Condition="'$(Test)' == 'true' and '$(DotNetBuildSourceOnly)' == 'true'">false</UseIntermediateNuGetConfigFile>
-    <!-- When testing scenario-tests, use the live produced SDK. -->
-    <RepoDotNetRoot Condition="'$(Test)' == 'true'">$(DotNetSdkExtractDir)</RepoDotNetRoot>
+    <CleanWhileBuilding>false</CleanWhileBuilding>
 
     <ScenarioTestsResultsDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsTestResultsDir)', 'scenario-tests'))</ScenarioTestsResultsDir>
     <TestXmlOutputPath>$(ScenarioTestsResultsDir)$([System.DateTime]::Now.ToString("yyyy-MM-dd_HH_mm_ss")).xml</TestXmlOutputPath>
 
     <TestArgs>$(TestArgs) /p:AdditionalTestArgs="--xml $(TestXmlOutputPath) --target-rid $(TargetRid) --portable-rid $(PortableRid) --no-cleanup --no-traits Category=MultiTFM"</TestArgs>
     <TestArgs>$(TestArgs) /p:TestBinlogDir="$(ArtifactsLogRepoDir.TrimEnd('\'))"</TestArgs>
+
+    <TestDependsOn>PrepareScenarioTestsInputs;$(TestDependsOn)</TestDependsOn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -31,13 +28,15 @@
     <RepositoryReference Include="sdk" />
   </ItemGroup>
 
-  <Target Name="PrepareScenarioTestsInputs"
-          DependsOnTargets="DetermineSourceBuiltSdkVersion"
-          BeforeTargets="UpdateGlobalJsonVersions;RepoTest"
-          Condition="'$(Test)' == 'true'">
+  <Target Name="PrepareScenarioTestsInputs" DependsOnTargets="DetermineSourceBuiltSdkVersion">
     <PropertyGroup>
-      <!-- When testing scenario-tests, use the live produced SDK.-->
+      <!-- When testing scenario-tests, use the live produced SDK. -->
+      <RepoDotNetRoot>$(DotNetSdkExtractDir)</RepoDotNetRoot>
       <RepoNETCoreSdkVersion>$(SourceBuiltSdkVersion)</RepoNETCoreSdkVersion>
+
+      <!-- Don't use the updated NuGet.config file that includes the live package feeds when testing source-only as in that configuration
+           the Microsoft built packages should be used. -->
+      <UseIntermediateNuGetConfigFile Condition="'$(DotNetBuildSourceOnly)' == 'true'">false</UseIntermediateNuGetConfigFile>
     </PropertyGroup>
 
     <MakeDir Directories="$(ScenarioTestsResultsDir)" />

From db2d3416c3c3b6087fc1fc4529b55c326f1160c5 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 6 Feb 2025 18:11:44 +0100
Subject: [PATCH 09/22] UseFxVersionOverride

---
 src/SourceBuild/content/repo-projects/scenario-tests.proj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/SourceBuild/content/repo-projects/scenario-tests.proj b/src/SourceBuild/content/repo-projects/scenario-tests.proj
index 71f9eda1ff7f..e7becf9310ac 100644
--- a/src/SourceBuild/content/repo-projects/scenario-tests.proj
+++ b/src/SourceBuild/content/repo-projects/scenario-tests.proj
@@ -9,6 +9,7 @@
 
     <TestArgs>$(TestArgs) /p:AdditionalTestArgs="--xml $(TestXmlOutputPath) --target-rid $(TargetRid) --portable-rid $(PortableRid) --no-cleanup --no-traits Category=MultiTFM"</TestArgs>
     <TestArgs>$(TestArgs) /p:TestBinlogDir="$(ArtifactsLogRepoDir.TrimEnd('\'))"</TestArgs>
+    <TestArgs>$(TestArgs) /p:UseFxVersionOverride=true</TestArgs>
 
     <TestDependsOn>PrepareScenarioTestsInputs;$(TestDependsOn)</TestDependsOn>
   </PropertyGroup>

From b17ddf2f12121319139894c8534a7ce0a33e9e0e Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 6 Feb 2025 19:29:34 +0100
Subject: [PATCH 10/22] msbuild fix

---
 src/SourceBuild/content/repo-projects/Directory.Build.targets | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index 5cbe3f012ce5..e5314bfbc2cf 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -833,6 +833,7 @@
       RepoTest;
       MoveDotNetBuildLogs;
       CleanupRepo
+    </TestDependsOn>
   </PropertyGroup>
 
   <Target Name="Test" DependsOnTargets="$(TestDependsOn)" />

From 61953a60c802896b3416746ca24ad258dfbe267d Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 6 Feb 2025 19:48:06 +0100
Subject: [PATCH 11/22] msbuild fix (2)

---
 .../repo-projects/Directory.Build.targets     | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index e5314bfbc2cf..78f557d1b146 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -54,19 +54,15 @@
   <!-- Dynamic properties that are used in both test and build. -->
   <Target Name="SetCommonProperties">
     <!-- Update nuget.config property to point to modified file that will be created/updated during build. -->
-    <Choose>
-      <When Condition="'$(NuGetConfigFile)' != '' and '$(UseIntermediateNuGetConfigFile)' != 'false'">
-        <PropertyGroup>
-          <NuGetConfigFile>$(BaseIntermediateOutputPath)$([System.IO.Path]::GetFileName('$(NuGetConfigFile)'))</NuGetConfigFile>
-          <CommonArgs>$(CommonArgs) /p:RestoreConfigFile=$(NuGetConfigFile)</CommonArgs>
-        </PropertyGroup>
-
-        <ItemGroup>
-          <!-- Needed for miscellanous projects in various repos - see https://github.com/dotnet/source-build/issues/4081-->
-          <EnvironmentVariables Include="RestoreConfigFile=$(NuGetConfigFile)" />
-        </ItemGroup>
-      </When>
-    </Choose>
+    <PropertyGroup Condition="'$(NuGetConfigFile)' != '' and '$(UseIntermediateNuGetConfigFile)' != 'false'">
+      <NuGetConfigFile>$(BaseIntermediateOutputPath)$([System.IO.Path]::GetFileName('$(NuGetConfigFile)'))</NuGetConfigFile>
+      <CommonArgs>$(CommonArgs) /p:RestoreConfigFile=$(NuGetConfigFile)</CommonArgs>
+    </PropertyGroup>
+
+    <ItemGroup Condition="'$(NuGetConfigFile)' != '' and '$(UseIntermediateNuGetConfigFile)' != 'false'">
+      <!-- Needed for miscellanous projects in various repos - see https://github.com/dotnet/source-build/issues/4081-->
+      <EnvironmentVariables Include="RestoreConfigFile=$(NuGetConfigFile)" />
+    </ItemGroup>
 
     <PropertyGroup>
       <RepoDotNetRoot Condition="'$(RepoDotNetRoot)' == ''">$(DotNetRoot)</RepoDotNetRoot>

From ea140e79b8b8aa037d2c15bfb392e3542b0666bf Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 6 Feb 2025 20:02:51 +0100
Subject: [PATCH 12/22] property fix

---
 src/SourceBuild/content/repo-projects/Directory.Build.targets | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index 78f557d1b146..7efb8ec1b43a 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -55,6 +55,7 @@
   <Target Name="SetCommonProperties">
     <!-- Update nuget.config property to point to modified file that will be created/updated during build. -->
     <PropertyGroup Condition="'$(NuGetConfigFile)' != '' and '$(UseIntermediateNuGetConfigFile)' != 'false'">
+      <OriginalNuGetConfigFile>$(NuGetConfigFile)</OriginalNuGetConfigFile>
       <NuGetConfigFile>$(BaseIntermediateOutputPath)$([System.IO.Path]::GetFileName('$(NuGetConfigFile)'))</NuGetConfigFile>
       <CommonArgs>$(CommonArgs) /p:RestoreConfigFile=$(NuGetConfigFile)</CommonArgs>
     </PropertyGroup>
@@ -156,9 +157,6 @@
   </Target>
 
   <Target Name="CopyNuGetConfig" DependsOnTargets="SetCommonProperties">
-    <PropertyGroup>
-      <OriginalNuGetConfigFile>$(NuGetConfigFile)</OriginalNuGetConfigFile>
-    </PropertyGroup>
     <MakeDir Directories="$([System.IO.Path]::GetDirectoryName('$(NuGetConfigFile)'))" />
 
     <Copy SourceFiles="$(OriginalNuGetConfigFile)"

From 1484f837cff41b3533ea7bac180242588f1212b1 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 6 Feb 2025 21:38:59 +0100
Subject: [PATCH 13/22] Fix test additional args passing

---
 src/SourceBuild/content/repo-projects/scenario-tests.proj | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/SourceBuild/content/repo-projects/scenario-tests.proj b/src/SourceBuild/content/repo-projects/scenario-tests.proj
index e7becf9310ac..8bf1e562013b 100644
--- a/src/SourceBuild/content/repo-projects/scenario-tests.proj
+++ b/src/SourceBuild/content/repo-projects/scenario-tests.proj
@@ -4,16 +4,21 @@
     <!-- The scenario-tests repo shouldn't be cleaned after building as we run tests from it. -->
     <CleanWhileBuilding>false</CleanWhileBuilding>
 
+    <ScenarioTestsAdditionalArgs>--xml $(_TestXmlOutputPath) --target-rid $(TargetRid) --portable-rid $(PortableRid) --no-cleanup --no-traits Category=MultiTFM</ScenarioTestsAdditionalArgs>
     <ScenarioTestsResultsDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsTestResultsDir)', 'scenario-tests'))</ScenarioTestsResultsDir>
     <TestXmlOutputPath>$(ScenarioTestsResultsDir)$([System.DateTime]::Now.ToString("yyyy-MM-dd_HH_mm_ss")).xml</TestXmlOutputPath>
 
-    <TestArgs>$(TestArgs) /p:AdditionalTestArgs="--xml $(TestXmlOutputPath) --target-rid $(TargetRid) --portable-rid $(PortableRid) --no-cleanup --no-traits Category=MultiTFM"</TestArgs>
     <TestArgs>$(TestArgs) /p:TestBinlogDir="$(ArtifactsLogRepoDir.TrimEnd('\'))"</TestArgs>
     <TestArgs>$(TestArgs) /p:UseFxVersionOverride=true</TestArgs>
 
     <TestDependsOn>PrepareScenarioTestsInputs;$(TestDependsOn)</TestDependsOn>
   </PropertyGroup>
 
+  <!-- Needs to be set as an env var as the eng/common/tools parser can't handle this string. -->
+  <ItemGroup>
+    <TestEnvironmentVariable Include="AdditionalTestArgs=$(ScenarioTestsAdditionalArgs)" />
+  </ItemGroup>
+
   <ItemGroup>
     <RepositoryReference Include="arcade" />
     <RepositoryReference Include="command-line-api" />

From fe90cc6f5102f74a84c2056929ffba6f45b72592 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 6 Feb 2025 23:51:24 +0100
Subject: [PATCH 14/22] Reorder ScenarioTestsAdditionalArgs property

---
 src/SourceBuild/content/repo-projects/scenario-tests.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SourceBuild/content/repo-projects/scenario-tests.proj b/src/SourceBuild/content/repo-projects/scenario-tests.proj
index 8bf1e562013b..55abd756191d 100644
--- a/src/SourceBuild/content/repo-projects/scenario-tests.proj
+++ b/src/SourceBuild/content/repo-projects/scenario-tests.proj
@@ -4,9 +4,9 @@
     <!-- The scenario-tests repo shouldn't be cleaned after building as we run tests from it. -->
     <CleanWhileBuilding>false</CleanWhileBuilding>
 
-    <ScenarioTestsAdditionalArgs>--xml $(_TestXmlOutputPath) --target-rid $(TargetRid) --portable-rid $(PortableRid) --no-cleanup --no-traits Category=MultiTFM</ScenarioTestsAdditionalArgs>
     <ScenarioTestsResultsDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsTestResultsDir)', 'scenario-tests'))</ScenarioTestsResultsDir>
     <TestXmlOutputPath>$(ScenarioTestsResultsDir)$([System.DateTime]::Now.ToString("yyyy-MM-dd_HH_mm_ss")).xml</TestXmlOutputPath>
+    <ScenarioTestsAdditionalArgs>--xml $(TestXmlOutputPath) --target-rid $(TargetRid) --portable-rid $(PortableRid) --no-cleanup --no-traits Category=MultiTFM</ScenarioTestsAdditionalArgs>
 
     <TestArgs>$(TestArgs) /p:TestBinlogDir="$(ArtifactsLogRepoDir.TrimEnd('\'))"</TestArgs>
     <TestArgs>$(TestArgs) /p:UseFxVersionOverride=true</TestArgs>

From 51e9c66e34a811db64e4400671bafae608324127 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 6 Feb 2025 23:52:19 +0100
Subject: [PATCH 15/22] Remove redundant restore action from TestActions

---
 src/SourceBuild/content/repo-projects/Directory.Build.props | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props
index cf1d0d2a5f93..19edf78bf63c 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.props
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.props
@@ -82,8 +82,7 @@
     <BuildActions>$(BuildActions) $(FlagParameterPrefix)publish</BuildActions>
     <BuildActions Condition="'$(Sign)' == 'true'">$(BuildActions) $(FlagParameterPrefix)sign</BuildActions>
 
-    <TestActions>$(FlagParameterPrefix)restore</TestActions>
-    <TestActions>$(TestActions) $(FlagParameterPrefix)test</TestActions>
+    <TestActions>$(FlagParameterPrefix)test</TestActions>
   </PropertyGroup>
 
   <!-- Common args used for building and testing. -->

From c0b0eabd920c7ef8be7efc13bb665db5bf80a80f Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Wed, 12 Feb 2025 14:12:28 +0100
Subject: [PATCH 16/22] Updatesssss

---
 .../content/Directory.Build.targets           | 27 +++++++
 .../repo-projects/Directory.Build.props       | 15 ++++
 .../repo-projects/Directory.Build.targets     | 71 +++++--------------
 .../content/repo-projects/scenario-tests.proj | 46 ++++++------
 4 files changed, 82 insertions(+), 77 deletions(-)

diff --git a/src/SourceBuild/content/Directory.Build.targets b/src/SourceBuild/content/Directory.Build.targets
index 183f0d154973..c8167c21fbb6 100644
--- a/src/SourceBuild/content/Directory.Build.targets
+++ b/src/SourceBuild/content/Directory.Build.targets
@@ -34,6 +34,33 @@
     </PropertyGroup>
   </Target>
 
+  <Target Name="DetermineSourceBuiltRuntimeVersion">
+    <PropertyGroup>
+      <RuntimeFilenamePrefix>dotnet-runtime-</RuntimeFilenamePrefix>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <RuntimeArchiveItem Include="$(ArtifactsAssetsDir)Runtime/**/$(RuntimeFilenamePrefix)*$(ArchiveExtension)" />
+    </ItemGroup>
+
+    <Error Text="Didn't find a runtime archive." Condition="'@(RuntimeArchiveItem)' == ''" />
+    <Error Text="Found more than one runtime archive." Condition="@(RuntimeArchiveItem->Count()) &gt; 1" />
+
+    <!--
+      Extract runtime version from runitme archive filename.
+      Keep in sync with dotnet-runtime's archive location and filename.
+
+      Example:
+      artifacts\assets\<config>\Runtime\9.0.100-alpha.1.24057.1\dotnet-runtime-9.0.100-alpha.1.24057.1-fedora.38-x64.tar.gz
+      artifacts\assets\<config>\Runtime\<RuntimeVersion>\dotnet-sdk-<RuntimeVersion>-<TargetRid><ArchiveExtension>
+    -->
+    <PropertyGroup>
+      <RuntimeFilename>%(RuntimeArchiveItem.Filename)%(RuntimeArchiveItem.Extension)</RuntimeFilename>
+      <RuntimeArchivePath>%(RuntimeArchiveItem.Identity)</RuntimeArchivePath>
+      <SourceBuiltRuntimeVersion>$(RuntimeFilename.Replace('$(RuntimeFilenamePrefix)','').Replace('-$(TargetRid)$(ArchiveExtension)',''))</SourceBuiltRuntimeVersion>
+    </PropertyGroup>
+  </Target>
+
   <ItemGroup>
     <!-- Binplace all assets and packages to ArtifactsStagingDir. -->
     <BinPlaceDir Include="$(ArtifactsStagingDir)" Condition="'$(ArtifactsStagingDir)' != ''" />
diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props
index 19edf78bf63c..9c345a10b2bb 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.props
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.props
@@ -38,6 +38,10 @@
     <NuGetConfigFile Condition="'$(NuGetConfigFile)' == '' and Exists('$(ProjectDirectory)NuGet.config')">$(ProjectDirectory)NuGet.config</NuGetConfigFile>
     <NuGetConfigFile Condition="'$(NuGetConfigFile)' == '' and Exists('$(ProjectDirectory)NuGet.Config')">$(ProjectDirectory)NuGet.Config</NuGetConfigFile>
 
+    <OriginalNuGetConfigFile>$(NuGetConfigFile)</OriginalNuGetConfigFile>
+    <!-- Update nuget.config property to point to modified file that will be created/updated during build. -->
+    <NuGetConfigFile Condition="'$(OriginalNuGetConfigFile)' != ''">$(BaseIntermediateOutputPath)$([System.IO.Path]::GetFileName('$(OriginalNuGetConfigFile)'))</NuGetConfigFile>
+
     <RepoAssetManifestsDir>$([MSBuild]::NormalizeDirectory('$(AssetManifestsIntermediateDir)', '$(RepositoryName)'))</RepoAssetManifestsDir>
     <IntermediateSymbolsRepoDir>$([MSBuild]::NormalizeDirectory('$(IntermediateSymbolsRootDir)', '$(RepositoryName)'))</IntermediateSymbolsRepoDir>
 
@@ -142,6 +146,14 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <!-- Arcade tools.sh picks up DotNetCoreSdkDir, but we can pass DOTNET_INSTALL_DIR directly. -->
+    <EnvironmentVariables Include="DOTNET_INSTALL_DIR=$(DotNetRoot)" />
+    <EnvironmentVariables Include="DOTNET_PATH=$(DotNetRoot)" />
+    <EnvironmentVariables Include="DOTNET_HOST_PATH=$(DotNetTool)" />
+
+    <!-- _InitializeDotNetCli is used by websdk and templating to decide whether to init the SDK -->
+    <EnvironmentVariables Include="_InitializeDotNetCli=$(DotNetRoot.TrimEnd('/\'))" />
+    <EnvironmentVariables Include="_DotNetInstallDir=$(DotNetRoot)" />
     <EnvironmentVariables Include="_InitializeToolset=$(SourceBuiltSdksDir)Microsoft.DotNet.Arcade.Sdk/tools/Build.proj"
                           Condition="'$(UseBootstrapArcade)' != 'true'" />
 
@@ -163,6 +175,9 @@
     <!-- Need to be passed in as an env var so that custom Exec tasks in the repo's DotNetBuild.props receive this setting. -->
     <EnvironmentVariables Include="DotNetPackageVersionPropsPath=$(PackageVersionPropsPath)" />
 
+    <!-- Needed for miscellanous projects in various repos - see https://github.com/dotnet/source-build/issues/4081-->
+    <EnvironmentVariables Include="RestoreConfigFile=$(NuGetConfigFile)" Condition="'$(NuGetConfigFile)' != ''" />
+
     <!-- Need to be passed in here so that outer and inner builds don't restore into the orchestrator package cache (CI builds)
          or the user package cache (local dev builds). -->
     <EnvironmentVariables Include="NUGET_PACKAGES=$(RepoArtifactsPackageCache)" />
diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index 7efb8ec1b43a..34b93225b1e7 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -51,38 +51,6 @@
     <ProdConManifestFile>$(PackageReportDir)prodcon-build.xml</ProdConManifestFile>
   </PropertyGroup>
 
-  <!-- Dynamic properties that are used in both test and build. -->
-  <Target Name="SetCommonProperties">
-    <!-- Update nuget.config property to point to modified file that will be created/updated during build. -->
-    <PropertyGroup Condition="'$(NuGetConfigFile)' != '' and '$(UseIntermediateNuGetConfigFile)' != 'false'">
-      <OriginalNuGetConfigFile>$(NuGetConfigFile)</OriginalNuGetConfigFile>
-      <NuGetConfigFile>$(BaseIntermediateOutputPath)$([System.IO.Path]::GetFileName('$(NuGetConfigFile)'))</NuGetConfigFile>
-      <CommonArgs>$(CommonArgs) /p:RestoreConfigFile=$(NuGetConfigFile)</CommonArgs>
-    </PropertyGroup>
-
-    <ItemGroup Condition="'$(NuGetConfigFile)' != '' and '$(UseIntermediateNuGetConfigFile)' != 'false'">
-      <!-- Needed for miscellanous projects in various repos - see https://github.com/dotnet/source-build/issues/4081-->
-      <EnvironmentVariables Include="RestoreConfigFile=$(NuGetConfigFile)" />
-    </ItemGroup>
-
-    <PropertyGroup>
-      <RepoDotNetRoot Condition="'$(RepoDotNetRoot)' == ''">$(DotNetRoot)</RepoDotNetRoot>
-      <RepoDotNetTool Condition="'$(BuildOS)' == 'windows'">$(RepoDotNetRoot)dotnet.exe</RepoDotNetTool>
-      <RepoDotNetTool Condition="'$(BuildOS)' != 'windows'">$(RepoDotNetRoot)dotnet</RepoDotNetTool>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <!-- Arcade tools.sh picks up DotNetCoreSdkDir, but we can pass DOTNET_INSTALL_DIR directly. -->
-      <EnvironmentVariables Include="DOTNET_INSTALL_DIR=$(RepoDotNetRoot)" />
-      <EnvironmentVariables Include="DOTNET_PATH=$(RepoDotNetRoot)" />
-      <EnvironmentVariables Include="DOTNET_HOST_PATH=$(RepoDotNetTool)" />
-
-      <!-- _InitializeDotNetCli is used by websdk and templating to decide whether to init the SDK -->
-      <EnvironmentVariables Include="_InitializeDotNetCli=$(RepoDotNetRoot.TrimEnd('/\'))" />
-      <EnvironmentVariables Include="_DotNetInstallDir=$(RepoDotNetRoot)" />
-    </ItemGroup>
-  </Target>
-
   <UsingTask TaskName="Microsoft.DotNet.UnifiedBuild.Tasks.ReplaceTextInFile" AssemblyFile="$(MicrosoftDotNetUnifiedBuildTasksAssembly)" TaskFactory="TaskHostFactory" />
   <Target Name="AddNoWarns"
           Condition=" EXISTS('$(ProjectDirectory)Directory.Build.props') OR EXISTS('$(ProjectDirectory)src/Directory.Build.props') "
@@ -156,7 +124,8 @@
     </ItemGroup>
   </Target>
 
-  <Target Name="CopyNuGetConfig" DependsOnTargets="SetCommonProperties">
+  <Target Name="CopyNuGetConfig"
+          Condition="'$(NuGetConfigFile)' != ''">
     <MakeDir Directories="$([System.IO.Path]::GetDirectoryName('$(NuGetConfigFile)'))" />
 
     <Copy SourceFiles="$(OriginalNuGetConfigFile)"
@@ -171,7 +140,7 @@
   <UsingTask TaskName="Microsoft.DotNet.UnifiedBuild.Tasks.UpdateNuGetConfigPackageSourcesMappings" AssemblyFile="$(MicrosoftDotNetUnifiedBuildTasksAssembly)" TaskFactory="TaskHostFactory" />
   <Target Name="UpdateNuGetConfig"
           DependsOnTargets="CopyNuGetConfig;GetRepositoryReferenceInfo"
-          Condition="'$(NuGetConfigFile)' != '' and '$(UseIntermediateNuGetConfigFile)' != 'false'"
+          Condition="'$(NuGetConfigFile)' != ''"
           Inputs="$(MSBuildProjectFullPath)"
           Outputs="$(BaseIntermediateOutputPath)UpdateNuGetConfig.complete">
     <PropertyGroup>
@@ -285,10 +254,6 @@
   <UsingTask TaskName="Microsoft.DotNet.UnifiedBuild.Tasks.UpdateJson" AssemblyFile="$(MicrosoftDotNetUnifiedBuildTasksAssembly)" TaskFactory="TaskHostFactory" />
   <Target Name="UpdateGlobalJsonVersions"
           Condition="'$(GlobalJsonFile)' != ''">
-    <PropertyGroup>
-      <RepoNETCoreSdkVersion Condition="'$(RepoNETCoreSdkVersion)' == ''">$(NETCoreSdkVersion)</RepoNETCoreSdkVersion>
-    </PropertyGroup>
-
     <ItemGroup>
       <_PossibleCliVersionJsonPath Include="sdk:version" />
       <_PossibleCliVersionJsonPath Include="tools:dotnet" />
@@ -296,13 +261,18 @@
 
     <UpdateJson JsonFilePath="$(GlobalJsonFile)"
                 PathToAttribute="%(_PossibleCliVersionJsonPath.Identity)"
-                NewAttributeValue="$(RepoNETCoreSdkVersion)"
+                NewAttributeValue="$(NETCoreSdkVersion)"
                 SkipUpdateIfMissingKey="true" />
 
     <!-- VB PoC, remove the global runtimes until https://github.com/dotnet/arcade/issues/14283 is resolved. -->
     <UpdateJson JsonFilePath="$(GlobalJsonFile)"
                 PathToAttribute="tools:runtimes"
                 SkipUpdateIfMissingKey="true" />
+
+    <MakeDir Directories="$(BaseIntermediateOutputPath)" />
+    <Touch Files="$(BaseIntermediateOutputPath)UpdateGlobalJsonVersions.complete" AlwaysCreate="true">
+      <Output TaskParameter="TouchedFiles" ItemName="FileWrites" />
+    </Touch>
   </Target>
 
   <!-- TODO: Remove when all repos use a consistent set of eng/common files: https://github.com/dotnet/source-build/issues/3710. -->
@@ -476,7 +446,7 @@
   </Target>
 
   <Target Name="SetBuildProperties"
-          DependsOnTargets="SetCommonProperties;GetTransitiveRepositoryReferences">
+          DependsOnTargets="GetTransitiveRepositoryReferences">
     <PropertyGroup>
       <!-- Infer the projects runtime identifier as the vertical's RID when doing a vertical build
            and filter down RID lists to the target RID in such a scenario. This is necessary when the host (SDK) rid
@@ -687,7 +657,7 @@
   <Target Name="CleanupRepo"
           Inputs="$(MSBuildProjectFullPath)"
           Outputs="$(BaseIntermediateOutputPath)CleanupRepo.complete"
-          DependsOnTargets="BackupProjectAssetsJsonFiles;SetCommonProperties"
+          DependsOnTargets="BackupProjectAssetsJsonFiles"
           Condition="'$(IsUtilityProject)' != 'true' and
                      '$(CleanWhileBuilding)' == 'true' and
                      Exists('$(RepoArtifactsDir)')">
@@ -700,7 +670,7 @@
 
       Don't run when source building to prevent the build from hanging indefinitely - https://github.com/dotnet/source-build/issues/4796
     -->
-    <Exec Command="$(RepoDotNetTool) build-server shutdown --vbcscompiler"
+    <Exec Command="$(DotNetTool) build-server shutdown --vbcscompiler"
           Condition="'$(DotNetBuildSourceOnly)' != 'true'"
           EnvironmentVariables="NUGET_PACKAGES=$(RepoArtifactsPackageCache)"
           IgnoreStandardErrorWarningFormat="true"
@@ -790,8 +760,7 @@
     CleanupRepo" />
 
   <Target Name="RepoTest"
-          DependsOnTargets="SetCommonProperties;
-                            UpdateGlobalJsonVersions;
+          DependsOnTargets="UpdateGlobalJsonVersions;
                             DiscoverBuiltSdkOverrides;
                             SetSourceBuiltSdkOverrides">
     <PropertyGroup>
@@ -821,16 +790,10 @@
     <OnError ExecuteTargets="MoveDotNetBuildLogs" />
   </Target>
 
-  <PropertyGroup>
-    <TestDependsOn>
-      $(TestDependsOn);
-      RepoTest;
-      MoveDotNetBuildLogs;
-      CleanupRepo
-    </TestDependsOn>
-  </PropertyGroup>
-
-  <Target Name="Test" DependsOnTargets="$(TestDependsOn)" />
+  <Target Name="Test"
+          DependsOnTargets="RepoTest;
+                            MoveDotNetBuildLogs;
+                            CleanupRepo" />
   <Target Name="VSTest" DependsOnTargets="Test" />
 
   <UsingTask TaskName="Microsoft.DotNet.UnifiedBuild.Tasks.UsageReport.WritePackageUsageData" AssemblyFile="$(MicrosoftDotNetUnifiedBuildTasksAssembly)" TaskFactory="TaskHostFactory" />
diff --git a/src/SourceBuild/content/repo-projects/scenario-tests.proj b/src/SourceBuild/content/repo-projects/scenario-tests.proj
index 55abd756191d..000787ec701d 100644
--- a/src/SourceBuild/content/repo-projects/scenario-tests.proj
+++ b/src/SourceBuild/content/repo-projects/scenario-tests.proj
@@ -4,24 +4,15 @@
     <!-- The scenario-tests repo shouldn't be cleaned after building as we run tests from it. -->
     <CleanWhileBuilding>false</CleanWhileBuilding>
 
-    <ScenarioTestsResultsDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsTestResultsDir)', 'scenario-tests'))</ScenarioTestsResultsDir>
-    <TestXmlOutputPath>$(ScenarioTestsResultsDir)$([System.DateTime]::Now.ToString("yyyy-MM-dd_HH_mm_ss")).xml</TestXmlOutputPath>
-    <ScenarioTestsAdditionalArgs>--xml $(TestXmlOutputPath) --target-rid $(TargetRid) --portable-rid $(PortableRid) --no-cleanup --no-traits Category=MultiTFM</ScenarioTestsAdditionalArgs>
-
     <TestArgs>$(TestArgs) /p:TestBinlogDir="$(ArtifactsLogRepoDir.TrimEnd('\'))"</TestArgs>
-    <TestArgs>$(TestArgs) /p:UseFxVersionOverride=true</TestArgs>
-
-    <TestDependsOn>PrepareScenarioTestsInputs;$(TestDependsOn)</TestDependsOn>
+    <TestArgs>$(TestArgs) /p:TestDotNetRoot="$(DotNetSdkExtractDir.TrimEnd('\'))"</TestArgs>
   </PropertyGroup>
 
-  <!-- Needs to be set as an env var as the eng/common/tools parser can't handle this string. -->
-  <ItemGroup>
-    <TestEnvironmentVariable Include="AdditionalTestArgs=$(ScenarioTestsAdditionalArgs)" />
-  </ItemGroup>
-
   <ItemGroup>
     <RepositoryReference Include="arcade" />
     <RepositoryReference Include="command-line-api" />
+    <!-- Depend on NuGet packages from the sdk repo and transitive repositories. -->
+    <RepositoryReference Include="sdk" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
@@ -29,23 +20,32 @@
     <RepositoryReference Include="source-build-reference-packages" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
-    <!-- Depends on NuGet packages from the sdk repo and transitive repositories. -->
-    <RepositoryReference Include="sdk" />
-  </ItemGroup>
+  <Target Name="PrepareScenarioTestsInputs"
+          DependsOnTargets="DetermineSourceBuiltSdkVersion;DetermineSourceBuiltRuntimeVersion"
+          BeforeTargets="Test">
+    <PropertyGroup>
+      <TestArgs>$(TestArgs) /p:TestSdkVersion=$(SourceBuiltSdkVersion)</TestArgs>
+      <TestArgs>$(TestArgs) /p:TestFxVersion=$(SourceBuiltRuntimeVersion)</TestArgs>
+    </PropertyGroup>
 
-  <Target Name="PrepareScenarioTestsInputs" DependsOnTargets="DetermineSourceBuiltSdkVersion">
     <PropertyGroup>
-      <!-- When testing scenario-tests, use the live produced SDK. -->
-      <RepoDotNetRoot>$(DotNetSdkExtractDir)</RepoDotNetRoot>
-      <RepoNETCoreSdkVersion>$(SourceBuiltSdkVersion)</RepoNETCoreSdkVersion>
+      <ScenarioTestsResultsDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsTestResultsDir)', 'scenario-tests'))</ScenarioTestsResultsDir>
+      <TestXmlOutputPath>$(ScenarioTestsResultsDir)$([System.DateTime]::Now.ToString("yyyy-MM-dd_HH_mm_ss")).xml</TestXmlOutputPath>
+      <ScenarioTestsAdditionalArgs>--xml $(TestXmlOutputPath) --target-rid $(TargetRid) --portable-rid $(PortableRid) --no-cleanup --no-traits Category=MultiTFM</ScenarioTestsAdditionalArgs>
+    </PropertyGroup>
 
+    <!-- Needs to be set as an env var as the eng/common/tools parser can't handle this string. -->
+    <ItemGroup>
+      <TestEnvironmentVariable Include="AdditionalTestArgs=$(ScenarioTestsAdditionalArgs)" />
+    </ItemGroup>
+
+    <MakeDir Directories="$(ScenarioTestsResultsDir)" />
+
+    <PropertyGroup>
       <!-- Don't use the updated NuGet.config file that includes the live package feeds when testing source-only as in that configuration
            the Microsoft built packages should be used. -->
-      <UseIntermediateNuGetConfigFile Condition="'$(DotNetBuildSourceOnly)' == 'true'">false</UseIntermediateNuGetConfigFile>
+      <TestArgs Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(TestArgs) /p:TestRestoreConfigFile=$(OriginalNuGetConfigFile)</TestArgs>
     </PropertyGroup>
-
-    <MakeDir Directories="$(ScenarioTestsResultsDir)" />
   </Target>
 
   <Target Name="SetAzureDevOpsVariableForScenarioTests"

From f6e1d407f9387432a7b06e361e37ea47f853e561 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Wed, 12 Feb 2025 14:15:10 +0100
Subject: [PATCH 17/22] fix

---
 src/SourceBuild/content/repo-projects/Directory.Build.targets | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index 34b93225b1e7..5ac4a511ab03 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -253,7 +253,9 @@
        This guarantees that all repositories build with the VMR's SDK version. -->
   <UsingTask TaskName="Microsoft.DotNet.UnifiedBuild.Tasks.UpdateJson" AssemblyFile="$(MicrosoftDotNetUnifiedBuildTasksAssembly)" TaskFactory="TaskHostFactory" />
   <Target Name="UpdateGlobalJsonVersions"
-          Condition="'$(GlobalJsonFile)' != ''">
+          Condition="'$(GlobalJsonFile)' != ''"
+          Inputs="$(MSBuildProjectFullPath);$(MSBuildThisFileFullPath)"
+          Outputs="$(BaseIntermediateOutputPath)UpdateGlobalJsonVersions.complete">
     <ItemGroup>
       <_PossibleCliVersionJsonPath Include="sdk:version" />
       <_PossibleCliVersionJsonPath Include="tools:dotnet" />

From d1e3fae88d9c8522dfb1c46766f70f6c592b2b9d Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Wed, 12 Feb 2025 14:15:54 +0100
Subject: [PATCH 18/22] fix

---
 src/SourceBuild/content/repo-projects/Directory.Build.targets | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index 5ac4a511ab03..b99ef122c9cf 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -762,8 +762,7 @@
     CleanupRepo" />
 
   <Target Name="RepoTest"
-          DependsOnTargets="UpdateGlobalJsonVersions;
-                            DiscoverBuiltSdkOverrides;
+          DependsOnTargets="DiscoverBuiltSdkOverrides;
                             SetSourceBuiltSdkOverrides">
     <PropertyGroup>
       <TestCommand>$(BuildScript) $(TestActions) $(CommonArgs) $(TestArgs)</TestCommand>

From 5f2bc020b1af50780f659c93d83b2c3e7ab3d8f2 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Wed, 12 Feb 2025 14:23:20 +0100
Subject: [PATCH 19/22] Refactor TestArgs property group location

---
 .../content/repo-projects/scenario-tests.proj          | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/SourceBuild/content/repo-projects/scenario-tests.proj b/src/SourceBuild/content/repo-projects/scenario-tests.proj
index 000787ec701d..b9819187f6dc 100644
--- a/src/SourceBuild/content/repo-projects/scenario-tests.proj
+++ b/src/SourceBuild/content/repo-projects/scenario-tests.proj
@@ -6,6 +6,10 @@
 
     <TestArgs>$(TestArgs) /p:TestBinlogDir="$(ArtifactsLogRepoDir.TrimEnd('\'))"</TestArgs>
     <TestArgs>$(TestArgs) /p:TestDotNetRoot="$(DotNetSdkExtractDir.TrimEnd('\'))"</TestArgs>
+
+    <!-- Don't use the updated NuGet.config file that includes the live package feeds when testing source-only as in that configuration
+         the Microsoft built packages should be used. -->
+    <TestArgs Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(TestArgs) /p:TestRestoreConfigFile=$(OriginalNuGetConfigFile)</TestArgs>
   </PropertyGroup>
 
   <ItemGroup>
@@ -40,12 +44,6 @@
     </ItemGroup>
 
     <MakeDir Directories="$(ScenarioTestsResultsDir)" />
-
-    <PropertyGroup>
-      <!-- Don't use the updated NuGet.config file that includes the live package feeds when testing source-only as in that configuration
-           the Microsoft built packages should be used. -->
-      <TestArgs Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(TestArgs) /p:TestRestoreConfigFile=$(OriginalNuGetConfigFile)</TestArgs>
-    </PropertyGroup>
   </Target>
 
   <Target Name="SetAzureDevOpsVariableForScenarioTests"

From ce3103cd71814e61cb9599368b96c96ff0dd47ef Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Wed, 12 Feb 2025 16:02:05 +0100
Subject: [PATCH 20/22] fix

---
 src/SourceBuild/content/repo-projects/scenario-tests.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SourceBuild/content/repo-projects/scenario-tests.proj b/src/SourceBuild/content/repo-projects/scenario-tests.proj
index b9819187f6dc..773ea4457a02 100644
--- a/src/SourceBuild/content/repo-projects/scenario-tests.proj
+++ b/src/SourceBuild/content/repo-projects/scenario-tests.proj
@@ -26,7 +26,7 @@
 
   <Target Name="PrepareScenarioTestsInputs"
           DependsOnTargets="DetermineSourceBuiltSdkVersion;DetermineSourceBuiltRuntimeVersion"
-          BeforeTargets="Test">
+          BeforeTargets="RepoTest">
     <PropertyGroup>
       <TestArgs>$(TestArgs) /p:TestSdkVersion=$(SourceBuiltSdkVersion)</TestArgs>
       <TestArgs>$(TestArgs) /p:TestFxVersion=$(SourceBuiltRuntimeVersion)</TestArgs>

From 75d03eff7d937070be89fc11f06cafa9d716d41e Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Wed, 12 Feb 2025 20:17:09 +0100
Subject: [PATCH 21/22] Respond to PR feedback and remove outdated comment

---
 src/SourceBuild/content/Directory.Build.targets             | 4 ++--
 src/SourceBuild/content/repo-projects/Directory.Build.props | 1 -
 src/SourceBuild/content/repo-projects/scenario-tests.proj   | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/SourceBuild/content/Directory.Build.targets b/src/SourceBuild/content/Directory.Build.targets
index c8167c21fbb6..481deba14bee 100644
--- a/src/SourceBuild/content/Directory.Build.targets
+++ b/src/SourceBuild/content/Directory.Build.targets
@@ -47,12 +47,12 @@
     <Error Text="Found more than one runtime archive." Condition="@(RuntimeArchiveItem->Count()) &gt; 1" />
 
     <!--
-      Extract runtime version from runitme archive filename.
+      Extract runtime version from the dotnet-runtime archive filename.
       Keep in sync with dotnet-runtime's archive location and filename.
 
       Example:
       artifacts\assets\<config>\Runtime\9.0.100-alpha.1.24057.1\dotnet-runtime-9.0.100-alpha.1.24057.1-fedora.38-x64.tar.gz
-      artifacts\assets\<config>\Runtime\<RuntimeVersion>\dotnet-sdk-<RuntimeVersion>-<TargetRid><ArchiveExtension>
+      artifacts\assets\<config>\Runtime\<RuntimeVersion>\dotnet-runtime-<RuntimeVersion>-<TargetRid><ArchiveExtension>
     -->
     <PropertyGroup>
       <RuntimeFilename>%(RuntimeArchiveItem.Filename)%(RuntimeArchiveItem.Extension)</RuntimeFilename>
diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props
index 9c345a10b2bb..e833298963ac 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.props
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.props
@@ -151,7 +151,6 @@
     <EnvironmentVariables Include="DOTNET_PATH=$(DotNetRoot)" />
     <EnvironmentVariables Include="DOTNET_HOST_PATH=$(DotNetTool)" />
 
-    <!-- _InitializeDotNetCli is used by websdk and templating to decide whether to init the SDK -->
     <EnvironmentVariables Include="_InitializeDotNetCli=$(DotNetRoot.TrimEnd('/\'))" />
     <EnvironmentVariables Include="_DotNetInstallDir=$(DotNetRoot)" />
     <EnvironmentVariables Include="_InitializeToolset=$(SourceBuiltSdksDir)Microsoft.DotNet.Arcade.Sdk/tools/Build.proj"
diff --git a/src/SourceBuild/content/repo-projects/scenario-tests.proj b/src/SourceBuild/content/repo-projects/scenario-tests.proj
index 773ea4457a02..0ed6c71739ed 100644
--- a/src/SourceBuild/content/repo-projects/scenario-tests.proj
+++ b/src/SourceBuild/content/repo-projects/scenario-tests.proj
@@ -4,8 +4,8 @@
     <!-- The scenario-tests repo shouldn't be cleaned after building as we run tests from it. -->
     <CleanWhileBuilding>false</CleanWhileBuilding>
 
-    <TestArgs>$(TestArgs) /p:TestBinlogDir="$(ArtifactsLogRepoDir.TrimEnd('\'))"</TestArgs>
-    <TestArgs>$(TestArgs) /p:TestDotNetRoot="$(DotNetSdkExtractDir.TrimEnd('\'))"</TestArgs>
+    <TestArgs>$(TestArgs) /p:TestBinlogDir="$(ArtifactsLogRepoDir.TrimEnd('/\'))"</TestArgs>
+    <TestArgs>$(TestArgs) /p:TestDotNetRoot="$(DotNetSdkExtractDir.TrimEnd('/\'))"</TestArgs>
 
     <!-- Don't use the updated NuGet.config file that includes the live package feeds when testing source-only as in that configuration
          the Microsoft built packages should be used. -->

From 421c04cd3d9af64b23b87c608b31a6cdab05cd86 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 13 Feb 2025 00:51:11 +0100
Subject: [PATCH 22/22] Ignore wixpack.zip

---
 src/SourceBuild/content/Directory.Build.targets | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/SourceBuild/content/Directory.Build.targets b/src/SourceBuild/content/Directory.Build.targets
index 481deba14bee..2c9efb5d2102 100644
--- a/src/SourceBuild/content/Directory.Build.targets
+++ b/src/SourceBuild/content/Directory.Build.targets
@@ -40,7 +40,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <RuntimeArchiveItem Include="$(ArtifactsAssetsDir)Runtime/**/$(RuntimeFilenamePrefix)*$(ArchiveExtension)" />
+      <RuntimeArchiveItem Include="$(ArtifactsAssetsDir)Runtime/**/$(RuntimeFilenamePrefix)*$(ArchiveExtension)"
+                          Exclude="$(ArtifactsAssetsDir)Runtime/**/$(RuntimeFilenamePrefix)*.wixpack.zip" />
     </ItemGroup>
 
     <Error Text="Didn't find a runtime archive." Condition="'@(RuntimeArchiveItem)' == ''" />