From 245e974a55dfe0737c868f8f81d3be9738c205b2 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 14 Apr 2025 10:27:24 +0200
Subject: [PATCH 1/3] Move DotNetBuild.props logic into repo

Also remove the TargetFrameworkFilter which isn't necessary as defined centrally by Arcade with the same value.
---
 Directory.Build.props | 2 ++
 eng/DotNetBuild.props | 9 ---------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index f43565b31163..596c19e05572 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -107,6 +107,8 @@
 
     <IncludeSymbols>true</IncludeSymbols>
     <DefaultNetFxTargetFramework>net462</DefaultNetFxTargetFramework>
+
+    <CrossgenOutput Condition="'$(DotNetBuildUseMonoRuntime)' == 'true'">false</CrossgenOutput>
   </PropertyGroup>
 
   <!-- Warnings and errors -->
diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props
index 336dc46ba9c9..396722f73c5f 100644
--- a/eng/DotNetBuild.props
+++ b/eng/DotNetBuild.props
@@ -5,7 +5,6 @@
   <PropertyGroup>
     <GitHubRepositoryName>aspnetcore</GitHubRepositoryName>
     <SourceBuildManagedOnly>true</SourceBuildManagedOnly>
-    <SourceBuildTargetFrameworkFilter>netstandard2.0%3bnetstandard2.1%3bnetcoreapp2.1%3bnetcoreapp3.1%3bnet5.0%3bnet6.0%3bnet7.0%3bnet8.0%3bnet9.0%3bnet10.0</SourceBuildTargetFrameworkFilter>
   </PropertyGroup>
 
   <!--
@@ -60,14 +59,6 @@
       Condition="'$(OS)' == 'Windows_NT'" />
   </Target>
 
-  <Target Name="CustomizeInnerBuildArgs"
-          BeforeTargets="GetSourceBuildCommandConfiguration">
-
-    <PropertyGroup>
-      <InnerBuildArgs Condition="'$(DotNetBuildUseMonoRuntime)' == 'true'">$(InnerBuildArgs) /p:CrossgenOutput=false</InnerBuildArgs>
-    </PropertyGroup>
-  </Target>
-
   <Target Name="GetAspnetcoreCategorizedIntermediateNupkgContents"
           BeforeTargets="GetCategorizedIntermediateNupkgContents">
     <PropertyGroup>

From f5f770cc216df422522abfb2d698ec6601f396bd Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 14 Apr 2025 11:42:57 +0200
Subject: [PATCH 2/3] Delete unnecessary settings

---
 eng/DotNetBuild.props | 53 -------------------------------------------
 1 file changed, 53 deletions(-)

diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props
index 396722f73c5f..cbd68f155c85 100644
--- a/eng/DotNetBuild.props
+++ b/eng/DotNetBuild.props
@@ -7,20 +7,6 @@
     <SourceBuildManagedOnly>true</SourceBuildManagedOnly>
   </PropertyGroup>
 
-  <!--
-    Remove inner source .globalconfig file as both the inner and outer config files get loaded and cause a conflict.
-    Leaving the inner will cause all conflicting settings to be ignored.
-    https://learn.microsoft.com/dotnet/fundamentals/code-analysis/configuration-files#general-options.
-    This only needs to be done if there is an inner clone.
-  -->
-  <Target Name="RemoveInnerGlobalConfig"
-          DependsOnTargets="PrepareInnerSourceBuildRepoRoot"
-          BeforeTargets="RunInnerSourceBuildCommand"
-          Condition="'$(DotNetBuildOrchestrator)' != 'true'">
-
-    <Delete Files="$(InnerSourceBuildRepoRoot).globalconfig" />
-  </Target>
-
   <!-- Build RepoTasks - this is normally triggered via the build script but the inner ArPow source-build is run via msbuild.
        https://github.com/dotnet/source-build/issues/3807 -->
   <Target Name="BuildRepoTasks"
@@ -75,43 +61,4 @@
     </ItemGroup>
   </Target>
 
-  <Target Name="RestoreNpmPackages"
-          Condition="'$(BuildNodeJS)' == 'true' and '$(DotNetBuildSourceOnly)' == 'true'"
-          BeforeTargets="RunInnerSourceBuildCommand">
-
-    <Message Text="Checking node version..." Importance="high" />
-    <Exec
-      Command="node --version"
-      WorkingDirectory="$(InnerSourceBuildRepoRoot)" />
-
-    <Message Text="Checking npm version..." Importance="high" />
-    <Exec
-      Command="npm --version"
-      WorkingDirectory="$(InnerSourceBuildRepoRoot)" />
-
-    <PropertyGroup>
-      <!-- Disable installing puppeteer browsers when running in source build -->
-      <_AdditionalEnvironmentVariable Condition="$(DotNetBuildSourceOnly) == 'true'">PUPPETEER_SKIP_DOWNLOAD=1</_AdditionalEnvironmentVariable>
-    </PropertyGroup>
-
-    <Exec
-      Command="npm ci"
-      WorkingDirectory="$(InnerSourceBuildRepoRoot)"
-      EnvironmentVariables="$(_AdditionalEnvironmentVariable)" />
-
-  </Target>
-
-  <Target Name="BuildNpmFiles"
-          Condition="'$(BuildNodeJS)' == 'true' and '$(DotNetBuildSourceOnly)' == 'true'"
-          DependsOnTargets="RestoreNpmPackages"
-          BeforeTargets="RunInnerSourceBuildCommand">
-
-    <Message Text="Building Node JS files..." Importance="high" />
-
-    <Exec
-      Command="npm run build"
-      WorkingDirectory="$(InnerSourceBuildRepoRoot)" />
-
-  </Target>
-
 </Project>

From b48f3d7043bf395ca3fb3ff77f2afda5c81bd959 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 14 Apr 2025 11:45:05 +0200
Subject: [PATCH 3/3] Add target to remove inner .globalconfig file

---
 eng/DotNetBuild.props | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props
index cbd68f155c85..50e2eb96238e 100644
--- a/eng/DotNetBuild.props
+++ b/eng/DotNetBuild.props
@@ -7,6 +7,20 @@
     <SourceBuildManagedOnly>true</SourceBuildManagedOnly>
   </PropertyGroup>
 
+  <!--
+    Remove inner source .globalconfig file as both the inner and outer config files get loaded and cause a conflict.
+    Leaving the inner will cause all conflicting settings to be ignored.
+    https://learn.microsoft.com/dotnet/fundamentals/code-analysis/configuration-files#general-options.
+    This only needs to be done if there is an inner clone.
+  -->
+  <Target Name="RemoveInnerGlobalConfig"
+          DependsOnTargets="PrepareInnerSourceBuildRepoRoot"
+          BeforeTargets="RunInnerSourceBuildCommand"
+          Condition="'$(DotNetBuildOrchestrator)' != 'true'">
+
+    <Delete Files="$(InnerSourceBuildRepoRoot).globalconfig" />
+  </Target>
+
   <!-- Build RepoTasks - this is normally triggered via the build script but the inner ArPow source-build is run via msbuild.
        https://github.com/dotnet/source-build/issues/3807 -->
   <Target Name="BuildRepoTasks"