From f53ee469ac446f967d10a6a86d02941fbe71d2d7 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 3 Dec 2025 19:24:43 +0000
Subject: [PATCH 1/8] Initial plan


From c9a7bf58534d224d06d539c77401c5a37f71ca07 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 3 Dec 2025 19:57:14 +0000
Subject: [PATCH 2/8] Remove parent Directory.Build.props import from test
 assets

These test assets should use SDK defaults instead of repo defaults.
- Set ImportDirectoryBuildProps=false to prevent automatic parent import
- Define necessary properties locally (NetCoreAppCurrent, paths, etc.)
- Keep Directory.Build.targets imports for local runtime targeting

Co-authored-by: agocke <515774+agocke@users.noreply.github.com>
---
 .../Assets/Projects/Directory.Build.props     | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/installer/tests/Assets/Projects/Directory.Build.props b/src/installer/tests/Assets/Projects/Directory.Build.props
index 2d331dfb98451d..715d4f708be28d 100644
--- a/src/installer/tests/Assets/Projects/Directory.Build.props
+++ b/src/installer/tests/Assets/Projects/Directory.Build.props
@@ -1,6 +1,26 @@
 <Project>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
+  <PropertyGroup>
+    <!-- Prevent automatic import of parent Directory.Build.props to avoid pulling in repo defaults.
+         These are test assets and should use SDK defaults instead. -->
+    <ImportDirectoryBuildProps>false</ImportDirectoryBuildProps>
+  </PropertyGroup>
+
+  <!-- Calculate necessary paths manually without depending on repo-level properties -->
+  <PropertyGroup>
+    <!-- Determine the repo root by walking up from this directory -->
+    <RepoRoot>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', '..', '..', '..', '..', '..'))</RepoRoot>
+    <RepositoryEngineeringDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'eng'))</RepositoryEngineeringDir>
+    <ArtifactsDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts'))</ArtifactsDir>
+  </PropertyGroup>
+
+  <!-- Define the target framework version these test assets should build against -->
+  <PropertyGroup>
+    <!-- This should match NetCoreAppCurrentVersion in the repo root Directory.Build.props -->
+    <NetCoreAppCurrentVersion>10.0</NetCoreAppCurrentVersion>
+    <NetCoreAppCurrent>net$(NetCoreAppCurrentVersion)</NetCoreAppCurrent>
+  </PropertyGroup>
 
+  <!-- Test asset build configuration -->
   <PropertyGroup>
     <EnableDefaultItems>true</EnableDefaultItems>
     <UseLocalTargetingRuntimePack>true</UseLocalTargetingRuntimePack>

From 8ca13f76cdcefd3bdb05dbef928c0eedd57e5d35 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 3 Dec 2025 20:10:10 +0000
Subject: [PATCH 3/8] Add clarifying comment about intentional hard-coded path

Co-authored-by: agocke <515774+agocke@users.noreply.github.com>
---
 src/installer/tests/Assets/Projects/Directory.Build.props | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/installer/tests/Assets/Projects/Directory.Build.props b/src/installer/tests/Assets/Projects/Directory.Build.props
index 715d4f708be28d..1a21a76cc07ea5 100644
--- a/src/installer/tests/Assets/Projects/Directory.Build.props
+++ b/src/installer/tests/Assets/Projects/Directory.Build.props
@@ -7,7 +7,9 @@
 
   <!-- Calculate necessary paths manually without depending on repo-level properties -->
   <PropertyGroup>
-    <!-- Determine the repo root by walking up from this directory -->
+    <!-- Determine the repo root by walking up from this directory.
+         Hard-coded path traversal is intentional to avoid automatic discovery of parent Directory.Build.props.
+         Path: src/installer/tests/Assets/Projects -> repo root requires 5 levels up. -->
     <RepoRoot>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', '..', '..', '..', '..', '..'))</RepoRoot>
     <RepositoryEngineeringDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'eng'))</RepositoryEngineeringDir>
     <ArtifactsDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts'))</ArtifactsDir>

From 9dfe47aa950817874d1049a216f498fbba82cc7b Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 4 Dec 2025 00:14:02 +0000
Subject: [PATCH 4/8] Define TestTfm property and use it in all test asset
 projects

- Added TestTfm property to Directory.Build.props (set to NetCoreAppCurrent)
- Updated all test asset projects to use $(TestTfm) instead of $(NetCoreAppCurrent) or hardcoded target frameworks
- This fixes the issue where SelfContained.csproj was using outdated net6.0 target framework

Co-authored-by: agocke <515774+agocke@users.noreply.github.com>
---
 .../AppWithCustomEntryPoints/AppWithCustomEntryPoints.csproj    | 2 +-
 .../tests/Assets/Projects/AppWithSubDirs/AppWithSubDirs.csproj  | 2 +-
 .../AppWithUnknownLanguageResource.csproj                       | 2 +-
 .../tests/Assets/Projects/AppWithWait/AppWithWait.csproj        | 2 +-
 .../tests/Assets/Projects/ComLibrary/ComLibrary.csproj          | 2 +-
 .../ComLibraryConflictingGuid/ComLibraryConflictingGuid.csproj  | 2 +-
 .../Projects/ComLibraryMissingGuid/ComLibraryMissingGuid.csproj | 2 +-
 src/installer/tests/Assets/Projects/Component/Component.csproj  | 2 +-
 src/installer/tests/Assets/Projects/Directory.Build.props       | 2 ++
 .../Assets/Projects/HammerServicing/HammerServicing.csproj      | 2 +-
 .../tests/Assets/Projects/HelloWorld/HelloWorld.csproj          | 2 +-
 .../HelloWorld/HelloWorld_\344\270\255\346\226\207.csproj"      | 2 +-
 .../tests/Assets/Projects/HelloWorld/SelfContained.csproj       | 2 +-
 .../Assets/Projects/HostApiInvokerApp/HostApiInvokerApp.csproj  | 2 +-
 .../tests/Assets/Projects/LocalizedApp/LocalizedApp.csproj      | 2 +-
 .../tests/Assets/Projects/ManagedHost/ManagedHost.csproj        | 2 +-
 .../tests/Assets/Projects/ManagedHost/RegFreeCom.csproj         | 2 +-
 .../Assets/Projects/ServicedLibrary/ServicedLibrary.csproj      | 2 +-
 .../tests/Assets/Projects/SharedLibrary/SharedLibrary.csproj    | 2 +-
 .../Projects/SingleFileApiTests/SingleFileApiTests.csproj       | 2 +-
 .../tests/Assets/Projects/StartupHook/StartupHook.csproj        | 2 +-
 .../StartupHookWithAssemblyResolver.csproj                      | 2 +-
 .../Assets/Projects/WindowsSpecific/WindowsSpecific.csproj      | 2 +-
 23 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/installer/tests/Assets/Projects/AppWithCustomEntryPoints/AppWithCustomEntryPoints.csproj b/src/installer/tests/Assets/Projects/AppWithCustomEntryPoints/AppWithCustomEntryPoints.csproj
index 585d09a13a809e..bbb3d5e6b2ad53 100644
--- a/src/installer/tests/Assets/Projects/AppWithCustomEntryPoints/AppWithCustomEntryPoints.csproj
+++ b/src/installer/tests/Assets/Projects/AppWithCustomEntryPoints/AppWithCustomEntryPoints.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
+    <TargetFramework>$(TestTfm)</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/src/installer/tests/Assets/Projects/AppWithSubDirs/AppWithSubDirs.csproj b/src/installer/tests/Assets/Projects/AppWithSubDirs/AppWithSubDirs.csproj
index 0bf7fe92f94437..11b9fa3d5a57ea 100644
--- a/src/installer/tests/Assets/Projects/AppWithSubDirs/AppWithSubDirs.csproj
+++ b/src/installer/tests/Assets/Projects/AppWithSubDirs/AppWithSubDirs.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
+    <TargetFramework>$(TestTfm)</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/src/installer/tests/Assets/Projects/AppWithUnknownLanguageResource/AppWithUnknownLanguageResource.csproj b/src/installer/tests/Assets/Projects/AppWithUnknownLanguageResource/AppWithUnknownLanguageResource.csproj
index 4b68943005e42d..a0de933719fa3e 100644
--- a/src/installer/tests/Assets/Projects/AppWithUnknownLanguageResource/AppWithUnknownLanguageResource.csproj
+++ b/src/installer/tests/Assets/Projects/AppWithUnknownLanguageResource/AppWithUnknownLanguageResource.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
+    <TargetFramework>$(TestTfm)</TargetFramework>
     <OutputType>Exe</OutputType>
     <Win32Resource>test.res</Win32Resource>
     <!-- Current .NET SDK can't run CreateAppHost so disable creating AppHost on build -->
diff --git a/src/installer/tests/Assets/Projects/AppWithWait/AppWithWait.csproj b/src/installer/tests/Assets/Projects/AppWithWait/AppWithWait.csproj
index e71444bd29bbfe..43fb8fce09c09e 100644
--- a/src/installer/tests/Assets/Projects/AppWithWait/AppWithWait.csproj
+++ b/src/installer/tests/Assets/Projects/AppWithWait/AppWithWait.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
+    <TargetFramework>$(TestTfm)</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/src/installer/tests/Assets/Projects/ComLibrary/ComLibrary.csproj b/src/installer/tests/Assets/Projects/ComLibrary/ComLibrary.csproj
index 2e38ad45709bf0..bd699cfc9ab375 100644
--- a/src/installer/tests/Assets/Projects/ComLibrary/ComLibrary.csproj
+++ b/src/installer/tests/Assets/Projects/ComLibrary/ComLibrary.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
+    <TargetFramework>$(TestTfm)</TargetFramework>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <!-- Assembly version must match that in SxS manifests using this library. -->
     <AssemblyVersion>1.0.0</AssemblyVersion>
diff --git a/src/installer/tests/Assets/Projects/ComLibraryConflictingGuid/ComLibraryConflictingGuid.csproj b/src/installer/tests/Assets/Projects/ComLibraryConflictingGuid/ComLibraryConflictingGuid.csproj
index 77439bfe0c2fe6..7af58ddcf31e77 100644
--- a/src/installer/tests/Assets/Projects/ComLibraryConflictingGuid/ComLibraryConflictingGuid.csproj
+++ b/src/installer/tests/Assets/Projects/ComLibraryConflictingGuid/ComLibraryConflictingGuid.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
+    <TargetFramework>$(TestTfm)</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/src/installer/tests/Assets/Projects/ComLibraryMissingGuid/ComLibraryMissingGuid.csproj b/src/installer/tests/Assets/Projects/ComLibraryMissingGuid/ComLibraryMissingGuid.csproj
index 77439bfe0c2fe6..7af58ddcf31e77 100644
--- a/src/installer/tests/Assets/Projects/ComLibraryMissingGuid/ComLibraryMissingGuid.csproj
+++ b/src/installer/tests/Assets/Projects/ComLibraryMissingGuid/ComLibraryMissingGuid.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
+    <TargetFramework>$(TestTfm)</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/src/installer/tests/Assets/Projects/Component/Component.csproj b/src/installer/tests/Assets/Projects/Component/Component.csproj
index d56cb42d7259e5..98d3c6d5b55c8f 100644
--- a/src/installer/tests/Assets/Projects/Component/Component.csproj
+++ b/src/installer/tests/Assets/Projects/Component/Component.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
+    <TargetFramework>$(TestTfm)</TargetFramework>
     <EnableDynamicLoading>true</EnableDynamicLoading>
   </PropertyGroup>
 
diff --git a/src/installer/tests/Assets/Projects/Directory.Build.props b/src/installer/tests/Assets/Projects/Directory.Build.props
index 1a21a76cc07ea5..16c0d667bef539 100644
--- a/src/installer/tests/Assets/Projects/Directory.Build.props
+++ b/src/installer/tests/Assets/Projects/Directory.Build.props
@@ -20,6 +20,8 @@
     <!-- This should match NetCoreAppCurrentVersion in the repo root Directory.Build.props -->
     <NetCoreAppCurrentVersion>10.0</NetCoreAppCurrentVersion>
     <NetCoreAppCurrent>net$(NetCoreAppCurrentVersion)</NetCoreAppCurrent>
+    <!-- TestTfm is used by test projects that need to reference a specific target framework -->
+    <TestTfm>$(NetCoreAppCurrent)</TestTfm>
   </PropertyGroup>
 
   <!-- Test asset build configuration -->
diff --git a/src/installer/tests/Assets/Projects/HammerServicing/HammerServicing.csproj b/src/installer/tests/Assets/Projects/HammerServicing/HammerServicing.csproj
index d3fe43c68503f2..ba972d4a3af536 100644
--- a/src/installer/tests/Assets/Projects/HammerServicing/HammerServicing.csproj
+++ b/src/installer/tests/Assets/Projects/HammerServicing/HammerServicing.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
+    <TargetFramework>$(TestTfm)</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/src/installer/tests/Assets/Projects/HelloWorld/HelloWorld.csproj b/src/installer/tests/Assets/Projects/HelloWorld/HelloWorld.csproj
index a600aa229c5ec8..572f26a31301d2 100644
--- a/src/installer/tests/Assets/Projects/HelloWorld/HelloWorld.csproj
+++ b/src/installer/tests/Assets/Projects/HelloWorld/HelloWorld.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
+    <TargetFramework>$(TestTfm)</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git "a/src/installer/tests/Assets/Projects/HelloWorld/HelloWorld_\344\270\255\346\226\207.csproj" "b/src/installer/tests/Assets/Projects/HelloWorld/HelloWorld_\344\270\255\346\226\207.csproj"
index a600aa229c5ec8..572f26a31301d2 100644
--- "a/src/installer/tests/Assets/Projects/HelloWorld/HelloWorld_\344\270\255\346\226\207.csproj"
+++ "b/src/installer/tests/Assets/Projects/HelloWorld/HelloWorld_\344\270\255\346\226\207.csproj"
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
+    <TargetFramework>$(TestTfm)</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/src/installer/tests/Assets/Projects/HelloWorld/SelfContained.csproj b/src/installer/tests/Assets/Projects/HelloWorld/SelfContained.csproj
index d2014e98987476..838d8034c7747d 100644
--- a/src/installer/tests/Assets/Projects/HelloWorld/SelfContained.csproj
+++ b/src/installer/tests/Assets/Projects/HelloWorld/SelfContained.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>HelloWorld</AssemblyName>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(TestTfm)</TargetFramework>
     <OutputType>Exe</OutputType>
     <SelfContained>true</SelfContained>
     <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
diff --git a/src/installer/tests/Assets/Projects/HostApiInvokerApp/HostApiInvokerApp.csproj b/src/installer/tests/Assets/Projects/HostApiInvokerApp/HostApiInvokerApp.csproj
index 83ed0728c93e6e..3a48b01b98fe41 100644
--- a/src/installer/tests/Assets/Projects/HostApiInvokerApp/HostApiInvokerApp.csproj
+++ b/src/installer/tests/Assets/Projects/HostApiInvokerApp/HostApiInvokerApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
+    <TargetFramework>$(TestTfm)</TargetFramework>
     <OutputType>Exe</OutputType>
     <DefineConstants Condition="'$(OS)' == 'Windows_NT'">WINDOWS;$(DefineConstants)</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/src/installer/tests/Assets/Projects/LocalizedApp/LocalizedApp.csproj b/src/installer/tests/Assets/Projects/LocalizedApp/LocalizedApp.csproj
index 220da64fcfd772..c0dde4dd002b49 100644
--- a/src/installer/tests/Assets/Projects/LocalizedApp/LocalizedApp.csproj
+++ b/src/installer/tests/Assets/Projects/LocalizedApp/LocalizedApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
+    <TargetFramework>$(TestTfm)</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/src/installer/tests/Assets/Projects/ManagedHost/ManagedHost.csproj b/src/installer/tests/Assets/Projects/ManagedHost/ManagedHost.csproj
index 1497ab6b853216..dc973603d04817 100644
--- a/src/installer/tests/Assets/Projects/ManagedHost/ManagedHost.csproj
+++ b/src/installer/tests/Assets/Projects/ManagedHost/ManagedHost.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
+    <TargetFramework>$(TestTfm)</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
diff --git a/src/installer/tests/Assets/Projects/ManagedHost/RegFreeCom.csproj b/src/installer/tests/Assets/Projects/ManagedHost/RegFreeCom.csproj
index 6da1dcc13ccc1e..5006b751e454c7 100644
--- a/src/installer/tests/Assets/Projects/ManagedHost/RegFreeCom.csproj
+++ b/src/installer/tests/Assets/Projects/ManagedHost/RegFreeCom.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
+    <TargetFramework>$(TestTfm)</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <ApplicationManifest>App.manifest</ApplicationManifest>
   </PropertyGroup>
diff --git a/src/installer/tests/Assets/Projects/ServicedLibrary/ServicedLibrary.csproj b/src/installer/tests/Assets/Projects/ServicedLibrary/ServicedLibrary.csproj
index 3347900cb283cf..666ec5d1bdf0f6 100644
--- a/src/installer/tests/Assets/Projects/ServicedLibrary/ServicedLibrary.csproj
+++ b/src/installer/tests/Assets/Projects/ServicedLibrary/ServicedLibrary.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <AssemblyName>SharedLibrary</AssemblyName>
-    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
+    <TargetFramework>$(TestTfm)</TargetFramework>
     <OutputType>Library</OutputType>
   </PropertyGroup>
 
diff --git a/src/installer/tests/Assets/Projects/SharedLibrary/SharedLibrary.csproj b/src/installer/tests/Assets/Projects/SharedLibrary/SharedLibrary.csproj
index d1faceadaa7e4e..4af67967363bfb 100644
--- a/src/installer/tests/Assets/Projects/SharedLibrary/SharedLibrary.csproj
+++ b/src/installer/tests/Assets/Projects/SharedLibrary/SharedLibrary.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
+    <TargetFramework>$(TestTfm)</TargetFramework>
     <OutputType>Library</OutputType>
   </PropertyGroup>
 
diff --git a/src/installer/tests/Assets/Projects/SingleFileApiTests/SingleFileApiTests.csproj b/src/installer/tests/Assets/Projects/SingleFileApiTests/SingleFileApiTests.csproj
index e71444bd29bbfe..43fb8fce09c09e 100644
--- a/src/installer/tests/Assets/Projects/SingleFileApiTests/SingleFileApiTests.csproj
+++ b/src/installer/tests/Assets/Projects/SingleFileApiTests/SingleFileApiTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
+    <TargetFramework>$(TestTfm)</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/src/installer/tests/Assets/Projects/StartupHook/StartupHook.csproj b/src/installer/tests/Assets/Projects/StartupHook/StartupHook.csproj
index 77439bfe0c2fe6..7af58ddcf31e77 100644
--- a/src/installer/tests/Assets/Projects/StartupHook/StartupHook.csproj
+++ b/src/installer/tests/Assets/Projects/StartupHook/StartupHook.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
+    <TargetFramework>$(TestTfm)</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/src/installer/tests/Assets/Projects/StartupHookWithAssemblyResolver/StartupHookWithAssemblyResolver.csproj b/src/installer/tests/Assets/Projects/StartupHookWithAssemblyResolver/StartupHookWithAssemblyResolver.csproj
index 77240eabc1c858..623d9a9b3b49f2 100644
--- a/src/installer/tests/Assets/Projects/StartupHookWithAssemblyResolver/StartupHookWithAssemblyResolver.csproj
+++ b/src/installer/tests/Assets/Projects/StartupHookWithAssemblyResolver/StartupHookWithAssemblyResolver.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
+    <TargetFramework>$(TestTfm)</TargetFramework>
   </PropertyGroup>
 
   <!-- Copy the preloaded base type to the startup hook's output
diff --git a/src/installer/tests/Assets/Projects/WindowsSpecific/WindowsSpecific.csproj b/src/installer/tests/Assets/Projects/WindowsSpecific/WindowsSpecific.csproj
index c9331b241889f5..f05e0a97916420 100644
--- a/src/installer/tests/Assets/Projects/WindowsSpecific/WindowsSpecific.csproj
+++ b/src/installer/tests/Assets/Projects/WindowsSpecific/WindowsSpecific.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
+    <TargetFramework>$(TestTfm)</TargetFramework>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>

From 5a37deb7ca787003797ebbf208bc92cad5499e23 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 4 Dec 2025 00:37:38 +0000
Subject: [PATCH 5/8] Address review feedback: simplify Directory.Build.props

- Remove unnecessary ImportDirectoryBuildProps=false setting
- Make TestTfm the primary property, with NetCoreAppCurrent as an alias
- Simplify property definitions per code review feedback

Co-authored-by: agocke <515774+agocke@users.noreply.github.com>
---
 .../tests/Assets/Projects/Directory.Build.props      | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/installer/tests/Assets/Projects/Directory.Build.props b/src/installer/tests/Assets/Projects/Directory.Build.props
index 16c0d667bef539..29d2bf9369e977 100644
--- a/src/installer/tests/Assets/Projects/Directory.Build.props
+++ b/src/installer/tests/Assets/Projects/Directory.Build.props
@@ -1,10 +1,4 @@
 <Project>
-  <PropertyGroup>
-    <!-- Prevent automatic import of parent Directory.Build.props to avoid pulling in repo defaults.
-         These are test assets and should use SDK defaults instead. -->
-    <ImportDirectoryBuildProps>false</ImportDirectoryBuildProps>
-  </PropertyGroup>
-
   <!-- Calculate necessary paths manually without depending on repo-level properties -->
   <PropertyGroup>
     <!-- Determine the repo root by walking up from this directory.
@@ -19,9 +13,9 @@
   <PropertyGroup>
     <!-- This should match NetCoreAppCurrentVersion in the repo root Directory.Build.props -->
     <NetCoreAppCurrentVersion>10.0</NetCoreAppCurrentVersion>
-    <NetCoreAppCurrent>net$(NetCoreAppCurrentVersion)</NetCoreAppCurrent>
-    <!-- TestTfm is used by test projects that need to reference a specific target framework -->
-    <TestTfm>$(NetCoreAppCurrent)</TestTfm>
+    <TestTfm>net$(NetCoreAppCurrentVersion)</TestTfm>
+    <!-- NetCoreAppCurrent is an alias for TestTfm for compatibility -->
+    <NetCoreAppCurrent>$(TestTfm)</NetCoreAppCurrent>
   </PropertyGroup>
 
   <!-- Test asset build configuration -->

From f6d31632890d9673342a2118031063de9b6d4062 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 5 Dec 2025 04:36:48 +0000
Subject: [PATCH 6/8] Use NetCoreAppCurrent instead of TestTfm in all projects

- Removed TestTfm property from Directory.Build.props
- NetCoreAppCurrent is now the primary target framework property
- Updated all 22 test asset projects to use $(NetCoreAppCurrent)

Co-authored-by: agocke <515774+agocke@users.noreply.github.com>
---
 .../AppWithCustomEntryPoints/AppWithCustomEntryPoints.csproj  | 2 +-
 .../Assets/Projects/AppWithSubDirs/AppWithSubDirs.csproj      | 2 +-
 .../AppWithUnknownLanguageResource.csproj                     | 2 +-
 .../tests/Assets/Projects/AppWithWait/AppWithWait.csproj      | 2 +-
 .../tests/Assets/Projects/ComLibrary/ComLibrary.csproj        | 2 +-
 .../ComLibraryConflictingGuid.csproj                          | 2 +-
 .../ComLibraryMissingGuid/ComLibraryMissingGuid.csproj        | 2 +-
 .../tests/Assets/Projects/Component/Component.csproj          | 2 +-
 src/installer/tests/Assets/Projects/Directory.Build.props     | 4 +---
 .../Assets/Projects/HammerServicing/HammerServicing.csproj    | 2 +-
 .../tests/Assets/Projects/HelloWorld/HelloWorld.csproj        | 2 +-
 .../HelloWorld/HelloWorld_\344\270\255\346\226\207.csproj"    | 2 +-
 .../tests/Assets/Projects/HelloWorld/SelfContained.csproj     | 2 +-
 .../Projects/HostApiInvokerApp/HostApiInvokerApp.csproj       | 2 +-
 .../tests/Assets/Projects/LocalizedApp/LocalizedApp.csproj    | 2 +-
 .../tests/Assets/Projects/ManagedHost/ManagedHost.csproj      | 2 +-
 .../tests/Assets/Projects/ManagedHost/RegFreeCom.csproj       | 2 +-
 .../Assets/Projects/ServicedLibrary/ServicedLibrary.csproj    | 2 +-
 .../tests/Assets/Projects/SharedLibrary/SharedLibrary.csproj  | 2 +-
 .../Projects/SingleFileApiTests/SingleFileApiTests.csproj     | 2 +-
 .../tests/Assets/Projects/StartupHook/StartupHook.csproj      | 2 +-
 .../StartupHookWithAssemblyResolver.csproj                    | 2 +-
 .../Assets/Projects/WindowsSpecific/WindowsSpecific.csproj    | 2 +-
 23 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/src/installer/tests/Assets/Projects/AppWithCustomEntryPoints/AppWithCustomEntryPoints.csproj b/src/installer/tests/Assets/Projects/AppWithCustomEntryPoints/AppWithCustomEntryPoints.csproj
index bbb3d5e6b2ad53..585d09a13a809e 100644
--- a/src/installer/tests/Assets/Projects/AppWithCustomEntryPoints/AppWithCustomEntryPoints.csproj
+++ b/src/installer/tests/Assets/Projects/AppWithCustomEntryPoints/AppWithCustomEntryPoints.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(TestTfm)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/src/installer/tests/Assets/Projects/AppWithSubDirs/AppWithSubDirs.csproj b/src/installer/tests/Assets/Projects/AppWithSubDirs/AppWithSubDirs.csproj
index 11b9fa3d5a57ea..0bf7fe92f94437 100644
--- a/src/installer/tests/Assets/Projects/AppWithSubDirs/AppWithSubDirs.csproj
+++ b/src/installer/tests/Assets/Projects/AppWithSubDirs/AppWithSubDirs.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(TestTfm)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/src/installer/tests/Assets/Projects/AppWithUnknownLanguageResource/AppWithUnknownLanguageResource.csproj b/src/installer/tests/Assets/Projects/AppWithUnknownLanguageResource/AppWithUnknownLanguageResource.csproj
index a0de933719fa3e..4b68943005e42d 100644
--- a/src/installer/tests/Assets/Projects/AppWithUnknownLanguageResource/AppWithUnknownLanguageResource.csproj
+++ b/src/installer/tests/Assets/Projects/AppWithUnknownLanguageResource/AppWithUnknownLanguageResource.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(TestTfm)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <OutputType>Exe</OutputType>
     <Win32Resource>test.res</Win32Resource>
     <!-- Current .NET SDK can't run CreateAppHost so disable creating AppHost on build -->
diff --git a/src/installer/tests/Assets/Projects/AppWithWait/AppWithWait.csproj b/src/installer/tests/Assets/Projects/AppWithWait/AppWithWait.csproj
index 43fb8fce09c09e..e71444bd29bbfe 100644
--- a/src/installer/tests/Assets/Projects/AppWithWait/AppWithWait.csproj
+++ b/src/installer/tests/Assets/Projects/AppWithWait/AppWithWait.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(TestTfm)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/src/installer/tests/Assets/Projects/ComLibrary/ComLibrary.csproj b/src/installer/tests/Assets/Projects/ComLibrary/ComLibrary.csproj
index bd699cfc9ab375..2e38ad45709bf0 100644
--- a/src/installer/tests/Assets/Projects/ComLibrary/ComLibrary.csproj
+++ b/src/installer/tests/Assets/Projects/ComLibrary/ComLibrary.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(TestTfm)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <!-- Assembly version must match that in SxS manifests using this library. -->
     <AssemblyVersion>1.0.0</AssemblyVersion>
diff --git a/src/installer/tests/Assets/Projects/ComLibraryConflictingGuid/ComLibraryConflictingGuid.csproj b/src/installer/tests/Assets/Projects/ComLibraryConflictingGuid/ComLibraryConflictingGuid.csproj
index 7af58ddcf31e77..77439bfe0c2fe6 100644
--- a/src/installer/tests/Assets/Projects/ComLibraryConflictingGuid/ComLibraryConflictingGuid.csproj
+++ b/src/installer/tests/Assets/Projects/ComLibraryConflictingGuid/ComLibraryConflictingGuid.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(TestTfm)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/src/installer/tests/Assets/Projects/ComLibraryMissingGuid/ComLibraryMissingGuid.csproj b/src/installer/tests/Assets/Projects/ComLibraryMissingGuid/ComLibraryMissingGuid.csproj
index 7af58ddcf31e77..77439bfe0c2fe6 100644
--- a/src/installer/tests/Assets/Projects/ComLibraryMissingGuid/ComLibraryMissingGuid.csproj
+++ b/src/installer/tests/Assets/Projects/ComLibraryMissingGuid/ComLibraryMissingGuid.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(TestTfm)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/src/installer/tests/Assets/Projects/Component/Component.csproj b/src/installer/tests/Assets/Projects/Component/Component.csproj
index 98d3c6d5b55c8f..d56cb42d7259e5 100644
--- a/src/installer/tests/Assets/Projects/Component/Component.csproj
+++ b/src/installer/tests/Assets/Projects/Component/Component.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(TestTfm)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <EnableDynamicLoading>true</EnableDynamicLoading>
   </PropertyGroup>
 
diff --git a/src/installer/tests/Assets/Projects/Directory.Build.props b/src/installer/tests/Assets/Projects/Directory.Build.props
index 29d2bf9369e977..dc9dc81d39bae8 100644
--- a/src/installer/tests/Assets/Projects/Directory.Build.props
+++ b/src/installer/tests/Assets/Projects/Directory.Build.props
@@ -13,9 +13,7 @@
   <PropertyGroup>
     <!-- This should match NetCoreAppCurrentVersion in the repo root Directory.Build.props -->
     <NetCoreAppCurrentVersion>10.0</NetCoreAppCurrentVersion>
-    <TestTfm>net$(NetCoreAppCurrentVersion)</TestTfm>
-    <!-- NetCoreAppCurrent is an alias for TestTfm for compatibility -->
-    <NetCoreAppCurrent>$(TestTfm)</NetCoreAppCurrent>
+    <NetCoreAppCurrent>net$(NetCoreAppCurrentVersion)</NetCoreAppCurrent>
   </PropertyGroup>
 
   <!-- Test asset build configuration -->
diff --git a/src/installer/tests/Assets/Projects/HammerServicing/HammerServicing.csproj b/src/installer/tests/Assets/Projects/HammerServicing/HammerServicing.csproj
index ba972d4a3af536..d3fe43c68503f2 100644
--- a/src/installer/tests/Assets/Projects/HammerServicing/HammerServicing.csproj
+++ b/src/installer/tests/Assets/Projects/HammerServicing/HammerServicing.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(TestTfm)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/src/installer/tests/Assets/Projects/HelloWorld/HelloWorld.csproj b/src/installer/tests/Assets/Projects/HelloWorld/HelloWorld.csproj
index 572f26a31301d2..a600aa229c5ec8 100644
--- a/src/installer/tests/Assets/Projects/HelloWorld/HelloWorld.csproj
+++ b/src/installer/tests/Assets/Projects/HelloWorld/HelloWorld.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(TestTfm)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git "a/src/installer/tests/Assets/Projects/HelloWorld/HelloWorld_\344\270\255\346\226\207.csproj" "b/src/installer/tests/Assets/Projects/HelloWorld/HelloWorld_\344\270\255\346\226\207.csproj"
index 572f26a31301d2..a600aa229c5ec8 100644
--- "a/src/installer/tests/Assets/Projects/HelloWorld/HelloWorld_\344\270\255\346\226\207.csproj"
+++ "b/src/installer/tests/Assets/Projects/HelloWorld/HelloWorld_\344\270\255\346\226\207.csproj"
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(TestTfm)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/src/installer/tests/Assets/Projects/HelloWorld/SelfContained.csproj b/src/installer/tests/Assets/Projects/HelloWorld/SelfContained.csproj
index 838d8034c7747d..b1a478e36efd99 100644
--- a/src/installer/tests/Assets/Projects/HelloWorld/SelfContained.csproj
+++ b/src/installer/tests/Assets/Projects/HelloWorld/SelfContained.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>HelloWorld</AssemblyName>
-    <TargetFramework>$(TestTfm)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <OutputType>Exe</OutputType>
     <SelfContained>true</SelfContained>
     <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
diff --git a/src/installer/tests/Assets/Projects/HostApiInvokerApp/HostApiInvokerApp.csproj b/src/installer/tests/Assets/Projects/HostApiInvokerApp/HostApiInvokerApp.csproj
index 3a48b01b98fe41..83ed0728c93e6e 100644
--- a/src/installer/tests/Assets/Projects/HostApiInvokerApp/HostApiInvokerApp.csproj
+++ b/src/installer/tests/Assets/Projects/HostApiInvokerApp/HostApiInvokerApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(TestTfm)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <OutputType>Exe</OutputType>
     <DefineConstants Condition="'$(OS)' == 'Windows_NT'">WINDOWS;$(DefineConstants)</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/src/installer/tests/Assets/Projects/LocalizedApp/LocalizedApp.csproj b/src/installer/tests/Assets/Projects/LocalizedApp/LocalizedApp.csproj
index c0dde4dd002b49..220da64fcfd772 100644
--- a/src/installer/tests/Assets/Projects/LocalizedApp/LocalizedApp.csproj
+++ b/src/installer/tests/Assets/Projects/LocalizedApp/LocalizedApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(TestTfm)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/src/installer/tests/Assets/Projects/ManagedHost/ManagedHost.csproj b/src/installer/tests/Assets/Projects/ManagedHost/ManagedHost.csproj
index dc973603d04817..1497ab6b853216 100644
--- a/src/installer/tests/Assets/Projects/ManagedHost/ManagedHost.csproj
+++ b/src/installer/tests/Assets/Projects/ManagedHost/ManagedHost.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>$(TestTfm)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
diff --git a/src/installer/tests/Assets/Projects/ManagedHost/RegFreeCom.csproj b/src/installer/tests/Assets/Projects/ManagedHost/RegFreeCom.csproj
index 5006b751e454c7..6da1dcc13ccc1e 100644
--- a/src/installer/tests/Assets/Projects/ManagedHost/RegFreeCom.csproj
+++ b/src/installer/tests/Assets/Projects/ManagedHost/RegFreeCom.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>$(TestTfm)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <ApplicationManifest>App.manifest</ApplicationManifest>
   </PropertyGroup>
diff --git a/src/installer/tests/Assets/Projects/ServicedLibrary/ServicedLibrary.csproj b/src/installer/tests/Assets/Projects/ServicedLibrary/ServicedLibrary.csproj
index 666ec5d1bdf0f6..3347900cb283cf 100644
--- a/src/installer/tests/Assets/Projects/ServicedLibrary/ServicedLibrary.csproj
+++ b/src/installer/tests/Assets/Projects/ServicedLibrary/ServicedLibrary.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <AssemblyName>SharedLibrary</AssemblyName>
-    <TargetFramework>$(TestTfm)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <OutputType>Library</OutputType>
   </PropertyGroup>
 
diff --git a/src/installer/tests/Assets/Projects/SharedLibrary/SharedLibrary.csproj b/src/installer/tests/Assets/Projects/SharedLibrary/SharedLibrary.csproj
index 4af67967363bfb..d1faceadaa7e4e 100644
--- a/src/installer/tests/Assets/Projects/SharedLibrary/SharedLibrary.csproj
+++ b/src/installer/tests/Assets/Projects/SharedLibrary/SharedLibrary.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(TestTfm)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <OutputType>Library</OutputType>
   </PropertyGroup>
 
diff --git a/src/installer/tests/Assets/Projects/SingleFileApiTests/SingleFileApiTests.csproj b/src/installer/tests/Assets/Projects/SingleFileApiTests/SingleFileApiTests.csproj
index 43fb8fce09c09e..e71444bd29bbfe 100644
--- a/src/installer/tests/Assets/Projects/SingleFileApiTests/SingleFileApiTests.csproj
+++ b/src/installer/tests/Assets/Projects/SingleFileApiTests/SingleFileApiTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(TestTfm)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
diff --git a/src/installer/tests/Assets/Projects/StartupHook/StartupHook.csproj b/src/installer/tests/Assets/Projects/StartupHook/StartupHook.csproj
index 7af58ddcf31e77..77439bfe0c2fe6 100644
--- a/src/installer/tests/Assets/Projects/StartupHook/StartupHook.csproj
+++ b/src/installer/tests/Assets/Projects/StartupHook/StartupHook.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(TestTfm)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/src/installer/tests/Assets/Projects/StartupHookWithAssemblyResolver/StartupHookWithAssemblyResolver.csproj b/src/installer/tests/Assets/Projects/StartupHookWithAssemblyResolver/StartupHookWithAssemblyResolver.csproj
index 623d9a9b3b49f2..77240eabc1c858 100644
--- a/src/installer/tests/Assets/Projects/StartupHookWithAssemblyResolver/StartupHookWithAssemblyResolver.csproj
+++ b/src/installer/tests/Assets/Projects/StartupHookWithAssemblyResolver/StartupHookWithAssemblyResolver.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(TestTfm)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
 
   <!-- Copy the preloaded base type to the startup hook's output
diff --git a/src/installer/tests/Assets/Projects/WindowsSpecific/WindowsSpecific.csproj b/src/installer/tests/Assets/Projects/WindowsSpecific/WindowsSpecific.csproj
index f05e0a97916420..c9331b241889f5 100644
--- a/src/installer/tests/Assets/Projects/WindowsSpecific/WindowsSpecific.csproj
+++ b/src/installer/tests/Assets/Projects/WindowsSpecific/WindowsSpecific.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(TestTfm)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>

From 523dd54c662d068fe6d862b11f7f755077524d2a Mon Sep 17 00:00:00 2001
From: Andy Gocke <andy@commentout.net>
Date: Fri, 5 Dec 2025 00:16:16 -0800
Subject: [PATCH 7/8] Port over some needed properties and disable warnings

---
 .../tests/Assets/Projects/Directory.Build.props   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/installer/tests/Assets/Projects/Directory.Build.props b/src/installer/tests/Assets/Projects/Directory.Build.props
index dc9dc81d39bae8..caf19155b048a6 100644
--- a/src/installer/tests/Assets/Projects/Directory.Build.props
+++ b/src/installer/tests/Assets/Projects/Directory.Build.props
@@ -7,6 +7,18 @@
     <RepoRoot>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', '..', '..', '..', '..', '..'))</RepoRoot>
     <RepositoryEngineeringDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'eng'))</RepositoryEngineeringDir>
     <ArtifactsDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts'))</ArtifactsDir>
+    <ArtifactsBinDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'bin'))</ArtifactsBinDir>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <MicrosoftNetCoreAppRefPackDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'microsoft.netcore.app.ref'))</MicrosoftNetCoreAppRefPackDir>
+    <MicrosoftNetCoreAppRefPackRefDir>$([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRefPackDir)', 'ref', '$(NetCoreAppCurrent)'))</MicrosoftNetCoreAppRefPackRefDir>
+    <MicrosoftNetCoreAppRefPackDataDir>$([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRefPackDir)', 'data'))</MicrosoftNetCoreAppRefPackDataDir>
+
+    <MicrosoftNetCoreAppRuntimePackDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'microsoft.netcore.app.runtime.$(TargetRid)', '$(LibrariesConfiguration)'))</MicrosoftNetCoreAppRuntimePackDir>
+    <MicrosoftNetCoreAppRuntimePackRidDir>$([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRuntimePackDir)', 'runtimes', '$(TargetRid)'))</MicrosoftNetCoreAppRuntimePackRidDir>
+    <MicrosoftNetCoreAppRuntimePackRidLibTfmDir>$([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRuntimePackRidDir)', 'lib', '$(NetCoreAppCurrent)'))</MicrosoftNetCoreAppRuntimePackRidLibTfmDir>
+    <MicrosoftNetCoreAppRuntimePackNativeDir>$([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRuntimePackRidDir)', 'native'))</MicrosoftNetCoreAppRuntimePackNativeDir>
   </PropertyGroup>
 
   <!-- Define the target framework version these test assets should build against -->
@@ -14,6 +26,9 @@
     <!-- This should match NetCoreAppCurrentVersion in the repo root Directory.Build.props -->
     <NetCoreAppCurrentVersion>10.0</NetCoreAppCurrentVersion>
     <NetCoreAppCurrent>net$(NetCoreAppCurrentVersion)</NetCoreAppCurrent>
+    <!-- Allow nullable, but don't check for correctness -->
+    <Nullable>annotations</Nullable>
+    <RunAnalyzers>false</RunAnalyzers>
   </PropertyGroup>
 
   <!-- Test asset build configuration -->

From f11d4888b3379ecac837bec56097aa8006c390e3 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 24 Jul 2026 21:36:46 +0000
Subject: [PATCH 8/8] Derive NetCoreAppCurrentVersion from eng/Versions.props
 instead of hardcoding

Co-authored-by: elinor-fung <47805090+elinor-fung@users.noreply.github.com>
---
 .../tests/Assets/Projects/Directory.Build.props     | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/installer/tests/Assets/Projects/Directory.Build.props b/src/installer/tests/Assets/Projects/Directory.Build.props
index caf19155b048a6..00ec8bf7777050 100644
--- a/src/installer/tests/Assets/Projects/Directory.Build.props
+++ b/src/installer/tests/Assets/Projects/Directory.Build.props
@@ -10,6 +10,15 @@
     <ArtifactsBinDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'bin'))</ArtifactsBinDir>
   </PropertyGroup>
 
+  <!-- Import Versions.props to get MajorVersion/MinorVersion for NetCoreAppCurrentVersion -->
+  <Import Project="$(RepositoryEngineeringDir)Versions.props" />
+
+  <!-- Define the target framework version these test assets should build against -->
+  <PropertyGroup>
+    <NetCoreAppCurrentVersion Condition="'$(NetCoreAppCurrentVersion)' == ''">$(MajorVersion).$(MinorVersion)</NetCoreAppCurrentVersion>
+    <NetCoreAppCurrent>net$(NetCoreAppCurrentVersion)</NetCoreAppCurrent>
+  </PropertyGroup>
+
   <PropertyGroup>
     <MicrosoftNetCoreAppRefPackDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'microsoft.netcore.app.ref'))</MicrosoftNetCoreAppRefPackDir>
     <MicrosoftNetCoreAppRefPackRefDir>$([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRefPackDir)', 'ref', '$(NetCoreAppCurrent)'))</MicrosoftNetCoreAppRefPackRefDir>
@@ -21,11 +30,7 @@
     <MicrosoftNetCoreAppRuntimePackNativeDir>$([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRuntimePackRidDir)', 'native'))</MicrosoftNetCoreAppRuntimePackNativeDir>
   </PropertyGroup>
 
-  <!-- Define the target framework version these test assets should build against -->
   <PropertyGroup>
-    <!-- This should match NetCoreAppCurrentVersion in the repo root Directory.Build.props -->
-    <NetCoreAppCurrentVersion>10.0</NetCoreAppCurrentVersion>
-    <NetCoreAppCurrent>net$(NetCoreAppCurrentVersion)</NetCoreAppCurrent>
     <!-- Allow nullable, but don't check for correctness -->
     <Nullable>annotations</Nullable>
     <RunAnalyzers>false</RunAnalyzers>