Merge branch 'release/8.0.2xx'

eng/AfterSigning.targets

@@ -4,6 +4,7 @@
   </PropertyGroup>
 
   <Target Name="PopulateGenerateChecksumItems"
+          Condition="'$(PackInstaller)' == 'true'"
           AfterTargets="Build"
           BeforeTargets="GenerateChecksums" >
 

run-build.ps1

@@ -8,6 +8,7 @@ param(
     [string]$Configuration="Debug",
     [string]$Architecture="x64",
     [switch]$Sign=$false,
+    [switch]$Pack=$false,
     [switch]$PgoInstrument,
     [bool]$WarnAsError=$true,
     [Parameter(ValueFromRemainingArguments=$true)][String[]]$ExtraParameters
@@ -23,10 +24,11 @@ if ($PgoInstrument) {
 }
 
 if ($Sign) {
-  $Parameters = "$Parameters -sign /p:SignCoreSdk=true"
+  $Parameters = "$Parameters -sign"
+}
 
-  # Workaround https://github.com/dotnet/arcade/issues/1776
-  $WarnAsError = $false
+if ($Pack) {
+  $Parameters = "$Parameters /p:PackInstaller=true"
 }
 
 $Parameters = "$Parameters -WarnAsError `$$WarnAsError"

run-build.sh

@@ -45,6 +45,9 @@ 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 ""

src/redist/targets/Crossgen.targets

@@ -2,7 +2,7 @@
   <!-- Crossgen is currently not supported on the s390x, ppc64le architecture as using mono instead of CoreCLR.
        Neither crossgen2 nor mono is supported on the loongarch64 architecture at present. -->
   <Target Name="CrossgenLayout"
-          Condition="'$(DISABLE_CROSSGEN)' == '' AND '$(Architecture)' != 's390x' AND '$(Architecture)' != 'ppc64le' AND '$(Architecture)' != 'loongarch64'"
+          Condition="'$(DISABLE_CROSSGEN)' == '' AND '$(Architecture)' != 's390x' AND '$(Architecture)' != 'ppc64le' AND '$(Architecture)' != 'loongarch64' AND '$(PackInstaller)' == 'true'"
           DependsOnTargets="SetSdkBrandingInfo">
     
     <PropertyGroup>

src/redist/targets/GenerateArchives.targets

@@ -1,5 +1,7 @@
 <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">