From 823aa94c2bbf643855b0ec6d08723365fe237ae3 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Thu, 7 Mar 2024 22:19:59 +0000
Subject: [PATCH 01/11] Enable publishing in VMR

---
 eng/Publishing.props | 40 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index a2ad98846..0426da4f4 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -1,5 +1,37 @@
 <Project>
-   <PropertyGroup>
-      <ProducesDotNetReleaseShippingAssets>true</ProducesDotNetReleaseShippingAssets>
-   </PropertyGroup>
-</Project>
\ No newline at end of file
+
+  <PropertyGroup>
+    <ProducesDotNetReleaseShippingAssets>true</ProducesDotNetReleaseShippingAssets>
+    <PublishDependsOnTargets>$(PublishDependsOnTargets);_PublishInstallers</PublishDependsOnTargets>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <_InstallersToPublish Remove="@(_InstallersToPublish)" />
+    <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.zip" UploadPathSegment="WindowsDesktop" Condition="'$(DotNetBuildRepo)' == 'true'" />
+    <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.exe" UploadPathSegment="WindowsDesktop" Condition="'$(DotNetBuildRepo)' == 'true'" />
+    <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.msi" UploadPathSegment="WindowsDesktop" Condition="'$(DotNetBuildRepo)' == 'true'" />
+  </ItemGroup>
+
+  <Target Name="_PublishInstallers">
+
+    <ItemGroup>
+      <!-- Do not push .nupkg files from Linux and macOS builds. They'll be packed up separately and signed on Windows.
+           Do not remove if post build sign is true, as we avoid the xplat codesign jobs, and need to have
+           the nupkgs pushed. Do not do this if building from source, since we want the source build intermediate package
+           to be published. Use DotNetBuildRepo as DotNetBuildFromSource is only set in the internal source build,
+           and Build.proj is invoked from the wrapper build. -->
+      <ItemsToPushToBlobFeed Remove="@(ItemsToPushToBlobFeed)" Condition="'$(OS)' != 'Windows_NT' and '$(PostBuildSign)' != 'true' and '$(DotNetBuildRepo)' != 'true'" />
+
+      <!--
+         MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion is x64 version - there is no Rid-specific property.
+         TODO: This will need to be updated to support arm64.
+      -->
+      <ItemsToPushToBlobFeed Include="@(_InstallersToPublish)">
+        <ManifestArtifactData>NonShipping=false</ManifestArtifactData>
+        <PublishFlatContainer>true</PublishFlatContainer>
+        <RelativeBlobPath>%(_InstallersToPublish.UploadPathSegment)/$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)/%(Filename)%(Extension)</RelativeBlobPath>
+      </ItemsToPushToBlobFeed>
+    </ItemGroup>
+  </Target>
+
+</Project>

From 980d597dc079d093c179d29969b762ccf960ea5c Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Fri, 15 Mar 2024 18:08:39 +0100
Subject: [PATCH 02/11] Update Publishing.props

---
 eng/Publishing.props | 43 +++++++++++++++----------------------------
 1 file changed, 15 insertions(+), 28 deletions(-)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index 0426da4f4..f83c7beab 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -2,36 +2,23 @@
 
   <PropertyGroup>
     <ProducesDotNetReleaseShippingAssets>true</ProducesDotNetReleaseShippingAssets>
-    <PublishDependsOnTargets>$(PublishDependsOnTargets);_PublishInstallers</PublishDependsOnTargets>
   </PropertyGroup>
 
-  <ItemGroup>
-    <_InstallersToPublish Remove="@(_InstallersToPublish)" />
-    <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.zip" UploadPathSegment="WindowsDesktop" Condition="'$(DotNetBuildRepo)' == 'true'" />
-    <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.exe" UploadPathSegment="WindowsDesktop" Condition="'$(DotNetBuildRepo)' == 'true'" />
-    <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.msi" UploadPathSegment="WindowsDesktop" Condition="'$(DotNetBuildRepo)' == 'true'" />
-  </ItemGroup>
-
-  <Target Name="_PublishInstallers">
+  <!-- Include installer archives and packages which aren't globbed by default. -->
+  <ItemGroup Condition="'$(DotNetBuildRepo)' == 'true'">
+    <InstallerToPublish Include="$(ArtifactsPackagesDir)**\*.zip;
+                                 $(ArtifactsPackagesDir)**\*.exe;
+                                 $(ArtifactsPackagesDir)**\*.msi" />
 
-    <ItemGroup>
-      <!-- Do not push .nupkg files from Linux and macOS builds. They'll be packed up separately and signed on Windows.
-           Do not remove if post build sign is true, as we avoid the xplat codesign jobs, and need to have
-           the nupkgs pushed. Do not do this if building from source, since we want the source build intermediate package
-           to be published. Use DotNetBuildRepo as DotNetBuildFromSource is only set in the internal source build,
-           and Build.proj is invoked from the wrapper build. -->
-      <ItemsToPushToBlobFeed Remove="@(ItemsToPushToBlobFeed)" Condition="'$(OS)' != 'Windows_NT' and '$(PostBuildSign)' != 'true' and '$(DotNetBuildRepo)' != 'true'" />
-
-      <!--
-         MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion is x64 version - there is no Rid-specific property.
-         TODO: This will need to be updated to support arm64.
-      -->
-      <ItemsToPushToBlobFeed Include="@(_InstallersToPublish)">
-        <ManifestArtifactData>NonShipping=false</ManifestArtifactData>
-        <PublishFlatContainer>true</PublishFlatContainer>
-        <RelativeBlobPath>%(_InstallersToPublish.UploadPathSegment)/$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)/%(Filename)%(Extension)</RelativeBlobPath>
-      </ItemsToPushToBlobFeed>
-    </ItemGroup>
-  </Target>
+    <!--
+       MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion is x64 version - there is no Rid-specific property.
+       TODO: This will need to be updated to support arm64.
+    -->
+    <ItemsToPushToBlobFeed Include="@(_InstallersToPublish)"
+                           ManifestArtifactData="NonShipping=false"
+                           PublishFlatContainer="true"
+                           RelativeBlobPath="WindowsDesktop/$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)/%(Filename)%(Extension)" />
+    </ItemsToPushToBlobFeed>
+  </ItemGroup>
 
 </Project>

From 849fac743afc31f0c3d16cecc0a83bf13a6d7dde Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Fri, 15 Mar 2024 18:11:14 +0100
Subject: [PATCH 03/11] Update Publishing.props

---
 eng/Publishing.props | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index f83c7beab..4c7b5cf7e 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -6,15 +6,13 @@
 
   <!-- Include installer archives and packages which aren't globbed by default. -->
   <ItemGroup Condition="'$(DotNetBuildRepo)' == 'true'">
-    <InstallerToPublish Include="$(ArtifactsPackagesDir)**\*.zip;
-                                 $(ArtifactsPackagesDir)**\*.exe;
-                                 $(ArtifactsPackagesDir)**\*.msi" />
-
     <!--
        MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion is x64 version - there is no Rid-specific property.
        TODO: This will need to be updated to support arm64.
     -->
-    <ItemsToPushToBlobFeed Include="@(_InstallersToPublish)"
+    <ItemsToPushToBlobFeed Include="$(ArtifactsPackagesDir)**\*.zip;
+                                   $(ArtifactsPackagesDir)**\*.exe;
+                                   $(ArtifactsPackagesDir)**\*.msi"
                            ManifestArtifactData="NonShipping=false"
                            PublishFlatContainer="true"
                            RelativeBlobPath="WindowsDesktop/$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)/%(Filename)%(Extension)" />

From db4760be72eae7da23857ac65aeab411d98cbc41 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Fri, 15 Mar 2024 18:13:45 +0100
Subject: [PATCH 04/11] Update Publishing.props

---
 eng/Publishing.props | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index 4c7b5cf7e..d7927a94e 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -16,7 +16,6 @@
                            ManifestArtifactData="NonShipping=false"
                            PublishFlatContainer="true"
                            RelativeBlobPath="WindowsDesktop/$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)/%(Filename)%(Extension)" />
-    </ItemsToPushToBlobFeed>
   </ItemGroup>
 
 </Project>

From 3b946d61897a90a4971fc9fc51b857f340d9e124 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Fri, 15 Mar 2024 18:16:22 +0100
Subject: [PATCH 05/11] Update Publishing.props

---
 eng/Publishing.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index d7927a94e..6ac0790fe 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -11,8 +11,8 @@
        TODO: This will need to be updated to support arm64.
     -->
     <ItemsToPushToBlobFeed Include="$(ArtifactsPackagesDir)**\*.zip;
-                                   $(ArtifactsPackagesDir)**\*.exe;
-                                   $(ArtifactsPackagesDir)**\*.msi"
+                                    $(ArtifactsPackagesDir)**\*.exe;
+                                    $(ArtifactsPackagesDir)**\*.msi"
                            ManifestArtifactData="NonShipping=false"
                            PublishFlatContainer="true"
                            RelativeBlobPath="WindowsDesktop/$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)/%(Filename)%(Extension)" />

From 83d7216eb334769b8afc044da39b0b451f546199 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Fri, 15 Mar 2024 18:24:43 +0100
Subject: [PATCH 06/11] Update Publishing.props

---
 eng/Publishing.props | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index 6ac0790fe..4a936c679 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -2,20 +2,24 @@
 
   <PropertyGroup>
     <ProducesDotNetReleaseShippingAssets>true</ProducesDotNetReleaseShippingAssets>
+    <PublishDependsOnTargets Condition="'$(DotNetBuildRepo)' == 'true'">$(PublishDependsOnTargets);PublishWindowsDesktopInstallers</PublishDependsOnTargets>
   </PropertyGroup>
 
   <!-- Include installer archives and packages which aren't globbed by default. -->
-  <ItemGroup Condition="'$(DotNetBuildRepo)' == 'true'">
-    <!--
-       MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion is x64 version - there is no Rid-specific property.
-       TODO: This will need to be updated to support arm64.
-    -->
-    <ItemsToPushToBlobFeed Include="$(ArtifactsPackagesDir)**\*.zip;
-                                    $(ArtifactsPackagesDir)**\*.exe;
-                                    $(ArtifactsPackagesDir)**\*.msi"
-                           ManifestArtifactData="NonShipping=false"
-                           PublishFlatContainer="true"
-                           RelativeBlobPath="WindowsDesktop/$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)/%(Filename)%(Extension)" />
-  </ItemGroup>
+  <Target Name="PublishWindowsDesktopInstallers">
+    <MSBuild Projects="$(RepoRoot)src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Runtime.sfxproj"
+             Targets="ReturnProductVersion">
+      <Output TaskParameter="TargetOutputs" ItemName="WindowsDesktopRuntimePackProductVersion" />
+    </MSBuild>
+
+    <ItemGroup>
+      <ItemsToPushToBlobFeed Include="$(ArtifactsPackagesDir)**\*.zip;
+                                      $(ArtifactsPackagesDir)**\*.exe;
+                                      $(ArtifactsPackagesDir)**\*.msi"
+                             ManifestArtifactData="NonShipping=false"
+                             PublishFlatContainer="true"
+                             RelativeBlobPath="WindowsDesktop/$(WindowsDesktopRuntimePackProductVersion)/%(Filename)%(Extension)" />
+    </ItemGroup>
+  </Target>
 
 </Project>

From b3bb9d8fb80ad1683c702651304e87affb59104d Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Fri, 15 Mar 2024 18:26:28 +0100
Subject: [PATCH 07/11] Update Publishing.props

---
 eng/Publishing.props | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index 4a936c679..5ea06f8a5 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -7,6 +7,7 @@
 
   <!-- Include installer archives and packages which aren't globbed by default. -->
   <Target Name="PublishWindowsDesktopInstallers">
+    <!-- Retrieve windows desktop runtime pack product version. -->
     <MSBuild Projects="$(RepoRoot)src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Runtime.sfxproj"
              Targets="ReturnProductVersion">
       <Output TaskParameter="TargetOutputs" ItemName="WindowsDesktopRuntimePackProductVersion" />

From e4ccabae5fe9aaad18f2b5e9954fc4804a8c50f4 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Fri, 15 Mar 2024 18:51:19 +0100
Subject: [PATCH 08/11] Update Publishing.props

---
 eng/Publishing.props | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index 5ea06f8a5..a8808b4a9 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -7,9 +7,11 @@
 
   <!-- Include installer archives and packages which aren't globbed by default. -->
   <Target Name="PublishWindowsDesktopInstallers">
-    <!-- Retrieve windows desktop runtime pack product version. -->
+    <!-- Retrieve windows desktop runtime pack product version.
+         Don't stabilize the package version in order to retrieve the VersionSuffix. -->
     <MSBuild Projects="$(RepoRoot)src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Runtime.sfxproj"
-             Targets="ReturnProductVersion">
+             Targets="ReturnProductVersion"
+             Properties="IsShipping=false">
       <Output TaskParameter="TargetOutputs" ItemName="WindowsDesktopRuntimePackProductVersion" />
     </MSBuild>
 

From 29433398101c2f747a5bc45b5f19c36620e64d33 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Fri, 15 Mar 2024 19:03:18 +0100
Subject: [PATCH 09/11] Update Publishing.props

---
 eng/Publishing.props | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index a8808b4a9..5f716499d 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -2,11 +2,12 @@
 
   <PropertyGroup>
     <ProducesDotNetReleaseShippingAssets>true</ProducesDotNetReleaseShippingAssets>
-    <PublishDependsOnTargets Condition="'$(DotNetBuildRepo)' == 'true'">$(PublishDependsOnTargets);PublishWindowsDesktopInstallers</PublishDependsOnTargets>
   </PropertyGroup>
 
   <!-- Include installer archives and packages which aren't globbed by default. -->
-  <Target Name="PublishWindowsDesktopInstallers">
+  <Target Name="PublishWindowsDesktopInstallers"
+          BeforeTargets="BeforePublish;PublishToAzureDevOpsArtifacts"
+          Condition="'$(DotNetBuildRepo)' == 'true'">
     <!-- Retrieve windows desktop runtime pack product version.
          Don't stabilize the package version in order to retrieve the VersionSuffix. -->
     <MSBuild Projects="$(RepoRoot)src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Runtime.sfxproj"

From 2190636187e9fb59c20a4fc7d8805c76eb4b39e9 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Fri, 15 Mar 2024 21:48:07 +0100
Subject: [PATCH 10/11] Update Publishing.props

---
 eng/Publishing.props | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index 5f716499d..c25642e6d 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -13,14 +13,15 @@
     <MSBuild Projects="$(RepoRoot)src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Runtime.sfxproj"
              Targets="ReturnProductVersion"
              Properties="IsShipping=false">
-      <Output TaskParameter="TargetOutputs" ItemName="WindowsDesktopRuntimePackProductVersion" />
+      <Output TaskParameter="TargetOutputs" PropertyName="WindowsDesktopRuntimePackProductVersion" />
     </MSBuild>
 
     <ItemGroup>
-      <ItemsToPushToBlobFeed Include="$(ArtifactsPackagesDir)**\*.zip;
-                                      $(ArtifactsPackagesDir)**\*.exe;
-                                      $(ArtifactsPackagesDir)**\*.msi"
-                             ManifestArtifactData="NonShipping=false"
+      <InstallerToPublish Include="$(ArtifactsPackagesDir)**\*.zip;
+                                   $(ArtifactsPackagesDir)**\*.exe;
+                                   $(ArtifactsPackagesDir)**\*.msi" />
+      <ItemsToPushToBlobFeed Include="@(InstallerToPublish)"
+                             IsShipping="true"
                              PublishFlatContainer="true"
                              RelativeBlobPath="WindowsDesktop/$(WindowsDesktopRuntimePackProductVersion)/%(Filename)%(Extension)" />
     </ItemGroup>

From deb39fb8be16827afcc05ad5bc52140d3bcdae4b Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Fri, 15 Mar 2024 22:17:26 +0100
Subject: [PATCH 11/11] Update Publishing.props

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

diff --git a/eng/Publishing.props b/eng/Publishing.props
index c25642e6d..a6308abcc 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -6,7 +6,7 @@
 
   <!-- Include installer archives and packages which aren't globbed by default. -->
   <Target Name="PublishWindowsDesktopInstallers"
-          BeforeTargets="BeforePublish;PublishToAzureDevOpsArtifacts"
+          BeforeTargets="BeforePublish"
           Condition="'$(DotNetBuildRepo)' == 'true'">
     <!-- Retrieve windows desktop runtime pack product version.
          Don't stabilize the package version in order to retrieve the VersionSuffix. -->
@@ -22,6 +22,7 @@
                                    $(ArtifactsPackagesDir)**\*.msi" />
       <ItemsToPushToBlobFeed Include="@(InstallerToPublish)"
                              IsShipping="true"
+                             ManifestArtifactData="DotNetReleaseShipping=true"
                              PublishFlatContainer="true"
                              RelativeBlobPath="WindowsDesktop/$(WindowsDesktopRuntimePackProductVersion)/%(Filename)%(Extension)" />
     </ItemGroup>