From 1799acaa9c830aede6b1c90f2a1499df59eb640f Mon Sep 17 00:00:00 2001
From: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com>
Date: Tue, 28 Nov 2023 13:54:44 +0800
Subject: [PATCH] Revert "Disable crossgen and zip file creation in the local
 dev build unless -pack is used"

---
 eng/AfterSigning.targets                    | 1 -
 run-build.ps1                               | 8 +++-----
 run-build.sh                                | 3 ---
 src/redist/targets/Crossgen.targets         | 3 +--
 src/redist/targets/GenerateArchives.targets | 2 --
 5 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/eng/AfterSigning.targets b/eng/AfterSigning.targets
index a2a586db7..b8a08378a 100644
--- a/eng/AfterSigning.targets
+++ b/eng/AfterSigning.targets
@@ -4,7 +4,6 @@
   </PropertyGroup>
 
   <Target Name="PopulateGenerateChecksumItems"
-          Condition="'$(PackInstaller)' == 'true'"
           AfterTargets="Build"
           BeforeTargets="GenerateChecksums" >
 
diff --git a/run-build.ps1 b/run-build.ps1
index 7b98f2ee5..4f2e1275f 100644
--- a/run-build.ps1
+++ b/run-build.ps1
@@ -8,7 +8,6 @@ param(
     [string]$Configuration="Debug",
     [string]$Architecture="x64",
     [switch]$Sign=$false,
-    [switch]$Pack=$false,
     [switch]$PgoInstrument,
     [bool]$WarnAsError=$true,
     [Parameter(ValueFromRemainingArguments=$true)][String[]]$ExtraParameters
@@ -24,11 +23,10 @@ if ($PgoInstrument) {
 }
 
 if ($Sign) {
-  $Parameters = "$Parameters -sign"
-}
+  $Parameters = "$Parameters -sign /p:SignCoreSdk=true"
 
-if ($Pack) {
-  $Parameters = "$Parameters /p:PackInstaller=true"
+  # Workaround https://github.com/dotnet/arcade/issues/1776
+  $WarnAsError = $false
 }
 
 $Parameters = "$Parameters -WarnAsError `$$WarnAsError"
diff --git a/run-build.sh b/run-build.sh
index e735b79f3..c380d75ce 100755
--- a/run-build.sh
+++ b/run-build.sh
@@ -45,9 +45,6 @@ while [[ $# > 0 ]]; do
         --pgoInstrument)
             args+=("/p:PgoInstrument=true")
             ;;
-        --pack)
-            args+=("/p:PackInstaller=true")
-            ;;
         --help)
             echo "Usage: $0 [--configuration <CONFIGURATION>] [--architecture <ARCHITECTURE>] [--docker <IMAGENAME>] [--help]"
             echo ""
diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets
index e55047af6..d9f961933 100644
--- a/src/redist/targets/Crossgen.targets
+++ b/src/redist/targets/Crossgen.targets
@@ -1,8 +1,7 @@
 <Project>
   <!-- Crossgen is currently not supported on the s390x, ppc64le architecture as using mono instead of CoreCLR. -->
-  <!-- Disable the cross-gen step in the local dev build, only do when -pack is specified to speed up dev builds -->
   <Target Name="CrossgenLayout"
-          Condition="'$(DISABLE_CROSSGEN)' == '' AND '$(Architecture)' != 's390x' AND '$(Architecture)' != 'ppc64le' AND '$(PackInstaller)' == 'true'"
+          Condition="'$(DISABLE_CROSSGEN)' == '' AND '$(Architecture)' != 's390x' AND '$(Architecture)' != 'ppc64le'"
           DependsOnTargets="SetSdkBrandingInfo">
     
     <PropertyGroup>
diff --git a/src/redist/targets/GenerateArchives.targets b/src/redist/targets/GenerateArchives.targets
index be8668f85..814abbe71 100644
--- a/src/redist/targets/GenerateArchives.targets
+++ b/src/redist/targets/GenerateArchives.targets
@@ -1,7 +1,5 @@
 <Project>
-  <!-- Disable the GenerateArchives step in the local dev build, only do when -pack is specified to speed up dev builds -->
   <Target Name="GenerateArchives"
-          Condition="'$(PackInstaller)' == 'true'"
           DependsOnTargets="GenerateLayout;GetCurrentRuntimeInformation"
           BeforeTargets="AfterBuild">