From 8e4889bef61fe7e92bfd5661f0b22b58ae8b86c5 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 18 Oct 2024 17:30:16 -0600
Subject: [PATCH] Handle building host test assets with stabilized package
 versions (#109031)

Co-authored-by: Elinor Fung <elfung@microsoft.com>
---
 .../tests/Assets/Projects/Directory.Build.targets        | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/installer/tests/Assets/Projects/Directory.Build.targets b/src/installer/tests/Assets/Projects/Directory.Build.targets
index 09d445f31a2faa..0c23a06b0228d4 100644
--- a/src/installer/tests/Assets/Projects/Directory.Build.targets
+++ b/src/installer/tests/Assets/Projects/Directory.Build.targets
@@ -12,8 +12,15 @@
   <Target Name="UpdateRuntimeFrameworkVersion"
           Condition="'$(UseLocalTargetingRuntimePack)' == 'true'"
           AfterTargets="ResolveTargetingPackAssets">
+    <PropertyGroup>
+      <_UpdatedVersion>$(Version)</_UpdatedVersion>
+      <!-- When package versions are stabilized, they do not have version suffixes. Because these are
+           non-shipping tests assets, the Version property will still include suffixes (unlike for shipping
+           assets), so we explicitly use the ProductVersion (without suffixes) in the stabilized case. -->
+      <_UpdatedVersion Condition="'$(StabilizePackageVersion)' == 'true'">$(ProductVersion)</_UpdatedVersion>
+    </PropertyGroup>
     <ItemGroup>
-      <RuntimeFramework Version="$(Version)"
+      <RuntimeFramework Version="$(_UpdatedVersion)"
                         Condition="'%(RuntimeFramework.FrameworkName)' == '$(LocalFrameworkOverrideName)'" />
     </ItemGroup>
   </Target>