Revert "Merge branch 'release/8.0.2xx'"

This reverts commit e641a47a9f, reversing
changes made to dccd713909.
This commit is contained in:
Ankit Jain 2023-11-27 16:09:21 -05:00
parent efb6e60105
commit 724bfa82da
5 changed files with 4 additions and 12 deletions

View file

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

View file

@ -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"

View file

@ -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 ""

View file

@ -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' AND '$(PackInstaller)' == 'true'"
Condition="'$(DISABLE_CROSSGEN)' == '' AND '$(Architecture)' != 's390x' AND '$(Architecture)' != 'ppc64le' AND '$(Architecture)' != 'loongarch64'"
DependsOnTargets="SetSdkBrandingInfo">
<PropertyGroup>

View file

@ -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">