From cd22690d26dee7247b6d8c72c8715d2b0979c776 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Thu, 6 Mar 2025 16:48:51 -0800
Subject: [PATCH 1/2] Deduplidate assets in VMR builds

---
 eng/Publishing.props | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index 8f1e1fb81..a64b2808c 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -8,6 +8,21 @@
     <PlatformName Condition="'$(TargetArchitecture)' != ''">$(TargetArchitecture)</PlatformName>
   </PropertyGroup>
 
+  <!--
+    Only generate the productVersion.txt and windowsdesktop-productVersion.txt files when we're building
+    either the full VMR repo or not building in the VMR infrastructure.
+    This ensures that we don't produce these files in the "Repo source build" builds,
+    but we do produce them in both the VMR and the runtime official build.
+  -->
+  <PropertyGroup Condition="'$(DotNetBuildOrchestrator)' == 'true'">
+    <ShouldGenerateProductVersionFiles Condition="'$(EnableDefaultRidSpecificArtifacts)' != 'true' and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1')">true</ShouldGenerateProductVersionFiles>
+    <ShouldGenerateProductVersionFiles Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</ShouldGenerateProductVersionFiles>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(DotNetBuildOrchestrator)' != 'true'">
+    <ShouldGenerateProductVersionFiles Condition="'$(EnableDefaultArtifacts)' == 'true'">true</ShouldGenerateProductVersionFiles>
+  </PropertyGroup>
+
   <Target Name="GetNonStableProductVersion">
     <!-- Retrieve the non-stable runtime pack product version.
          Don't stabilize the package version in order to retrieve the VersionSuffix. -->
@@ -22,7 +37,7 @@
   <Target Name="GenerateProductVersionFiles"
           DependsOnTargets="GetNonStableProductVersion"
           BeforeTargets="PublishToAzureDevOpsArtifacts"
-          Condition="'$(EnableDefaultArtifacts)' == 'true'">
+          Condition="'$(ShouldGenerateProductVersionFiles)' == 'true'">
     <!-- Retrieve the runtime pack version -->
     <MSBuild Projects="$(RepoRoot)src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Runtime.sfxproj"
              Targets="ReturnProductVersion">

From 76d1c27b8ae747edeec1f7fefadbdeb0aec1e47d Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Fri, 7 Mar 2025 07:36:53 -0800
Subject: [PATCH 2/2] Update Publishing.props

Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
---
 eng/Publishing.props | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index a64b2808c..a4c14cb17 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -14,13 +14,9 @@
     This ensures that we don't produce these files in the "Repo source build" builds,
     but we do produce them in both the VMR and the runtime official build.
   -->
-  <PropertyGroup Condition="'$(DotNetBuildOrchestrator)' == 'true'">
-    <ShouldGenerateProductVersionFiles Condition="'$(EnableDefaultRidSpecificArtifacts)' != 'true' and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1')">true</ShouldGenerateProductVersionFiles>
-    <ShouldGenerateProductVersionFiles Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</ShouldGenerateProductVersionFiles>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(DotNetBuildOrchestrator)' != 'true'">
-    <ShouldGenerateProductVersionFiles Condition="'$(EnableDefaultArtifacts)' == 'true'">true</ShouldGenerateProductVersionFiles>
+  <PropertyGroup>
+    <ShouldGenerateProductVersionFiles Condition="'$(DotNetBuildOrchestrator)' == 'true' and '$(EnableDefaultRidSpecificArtifacts)' != 'true' and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1')">true</ShouldGenerateProductVersionFiles>
+    <ShouldGenerateProductVersionFiles Condition="'$(DotNetBuildOrchestrator)' != 'true' and '$(EnableDefaultArtifacts)' == 'true'">true</ShouldGenerateProductVersionFiles>
   </PropertyGroup>
 
   <Target Name="GetNonStableProductVersion">