From 03aab5dbe011be0778b8af9c3c6ac4225ec7cd66 Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Tue, 23 Mar 2021 12:04:13 -0700
Subject: [PATCH 1/4] Don't separately build arm64 installers

---
 .azure/pipelines/ci.yml | 42 +++++++----------------------------------
 1 file changed, 7 insertions(+), 35 deletions(-)

diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
index f4cb66affec1..182865761b29 100644
--- a/.azure/pipelines/ci.yml
+++ b/.azure/pipelines/ci.yml
@@ -277,15 +277,6 @@ stages:
       agentOs: Windows
       installNodeJs: false
       installJdk: false
-      artifacts:
-      - name: Windows_arm64_Logs
-        path: artifacts/log/
-        publishOnError: true
-        includeForks: true
-      - name: Windows_arm64_Packages
-        path: artifacts/packages/
-      - name: Windows_arm64_Installers
-        path: artifacts/installers/
       steps:
       - script: ./eng/build.cmd
                 -ci
@@ -300,32 +291,13 @@ stages:
                 $(_InternalRuntimeDownloadArgs)
                 $(WindowsArm64LogArgs)
         displayName: Build ARM64
-
-      # Windows installers bundle for arm64
-      - script: ./eng/build.cmd
-                -ci
-                -noBuildRepoTasks
-                -arch arm64
-                -sign
-                -buildInstallers
-                -noBuildNative
-                /p:DotNetSignType=$(_SignType)
-                /p:AssetManifestFileName=aspnetcore-win-arm64.xml
-                $(_BuildArgs)
-                $(_PublishArgs)
-                $(_InternalRuntimeDownloadArgs)
-                $(WindowsArm64InstallersLogArgs)
-        displayName: Build Arm64 Installers
-
-      # A few files must also go to the VS package feed.
-      - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(variables['PostBuildSign'], 'true')) }}:
-        - task: NuGetCommand@2
-          displayName: Push Visual Studio packages
-          inputs:
-            command: push
-            packagesToPush: 'artifacts/packages/**/VS.Redist.Common.AspNetCore.*.nupkg'
-            nuGetFeedType: external
-            publishFeedCredentials: 'DevDiv - VS package feed'
+      artifacts:
+      - name: Windows_arm64_Logs
+        path: artifacts/log/
+        publishOnError: true
+        includeForks: true
+      - name: Windows_arm64_Packages
+        path: artifacts/packages/
 
 
   # Build MacOS arm64

From ef8a5063994b71f02a483abee22f264102be72e0 Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Tue, 23 Mar 2021 13:48:43 -0700
Subject: [PATCH 2/4] Don't build targeting pack nupkgs

---
 Directory.Build.targets | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 93ea0bfa204f..6ea2934354f7 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -79,8 +79,7 @@
   <PropertyGroup>
     <!-- When OnlyPackPlatformSpecificPackages is set, only produce packages for projects which set RuntimeIdentifier. -->
     <!-- Keep this below where we set "IsPackageInThisPatch" -->
-    <!-- Do not apply this logic to App.Ref and App.Ref.Internal, it's packability is determined by IsTargetingPackBuilding -->
-    <IsPackable Condition=" '$(MSBuildProjectName)' != 'Microsoft.AspNetCore.App.Ref' AND '$(MSBuildProjectName)' != 'Microsoft.AspNetCore.App.Ref.Internal' AND '$(OnlyPackPlatformSpecificPackages)' == 'true' AND '$(RuntimeIdentifier)' == '' ">false</IsPackable>
+    <IsPackable Condition=" '$(OnlyPackPlatformSpecificPackages)' == 'true' AND '$(RuntimeIdentifier)' == '' ">false</IsPackable>
   </PropertyGroup>
 
   <PropertyGroup>

From 978613996256de7984e80afd65b90548daedd337 Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Tue, 23 Mar 2021 15:28:40 -0700
Subject: [PATCH 3/4] Undo change that stopped building installers in win-arm64
 leg.

This reverts commit 03aab5dbe011be0778b8af9c3c6ac4225ec7cd66.
---
 .azure/pipelines/ci.yml | 42 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 35 insertions(+), 7 deletions(-)

diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
index 182865761b29..f4cb66affec1 100644
--- a/.azure/pipelines/ci.yml
+++ b/.azure/pipelines/ci.yml
@@ -277,6 +277,15 @@ stages:
       agentOs: Windows
       installNodeJs: false
       installJdk: false
+      artifacts:
+      - name: Windows_arm64_Logs
+        path: artifacts/log/
+        publishOnError: true
+        includeForks: true
+      - name: Windows_arm64_Packages
+        path: artifacts/packages/
+      - name: Windows_arm64_Installers
+        path: artifacts/installers/
       steps:
       - script: ./eng/build.cmd
                 -ci
@@ -291,13 +300,32 @@ stages:
                 $(_InternalRuntimeDownloadArgs)
                 $(WindowsArm64LogArgs)
         displayName: Build ARM64
-      artifacts:
-      - name: Windows_arm64_Logs
-        path: artifacts/log/
-        publishOnError: true
-        includeForks: true
-      - name: Windows_arm64_Packages
-        path: artifacts/packages/
+
+      # Windows installers bundle for arm64
+      - script: ./eng/build.cmd
+                -ci
+                -noBuildRepoTasks
+                -arch arm64
+                -sign
+                -buildInstallers
+                -noBuildNative
+                /p:DotNetSignType=$(_SignType)
+                /p:AssetManifestFileName=aspnetcore-win-arm64.xml
+                $(_BuildArgs)
+                $(_PublishArgs)
+                $(_InternalRuntimeDownloadArgs)
+                $(WindowsArm64InstallersLogArgs)
+        displayName: Build Arm64 Installers
+
+      # A few files must also go to the VS package feed.
+      - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(variables['PostBuildSign'], 'true')) }}:
+        - task: NuGetCommand@2
+          displayName: Push Visual Studio packages
+          inputs:
+            command: push
+            packagesToPush: 'artifacts/packages/**/VS.Redist.Common.AspNetCore.*.nupkg'
+            nuGetFeedType: external
+            publishFeedCredentials: 'DevDiv - VS package feed'
 
 
   # Build MacOS arm64

From eceffca70590d8e17cca3d395e0d6587fde97725 Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Tue, 23 Mar 2021 15:29:22 -0700
Subject: [PATCH 4/4] Update comment

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

diff --git a/eng/Build.props b/eng/Build.props
index b7b2d23bd6c5..a2fb171c2968 100644
--- a/eng/Build.props
+++ b/eng/Build.props
@@ -95,8 +95,8 @@
       </ItemGroup>
 
       <ItemGroup Condition=" '$(BuildInstallers)' == 'true' AND '$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'arm64' ">
-        <!-- We don't build the bundle here because we'd have to bundle the x86 installer which gets built in a different leg.
-        Instead we only provide the ARM64 MSI-->
+        <!-- We don't build the targeting pack installer here because it's built in the x86/x64 leg.
+        Instead we only provide the ARM64 SharedFramework MSI-->
 
         <!-- Build the SharedFramework wixlib -->
         <ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkLib\SharedFrameworkLib.wixproj" AdditionalProperties="Platform=arm64" />