mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'release/8.0.2xx'

Browse source
This commit is contained in:
Jason Zhai 2023-11-15 00:54:28 -08:00
commit e641a47a9f
5 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
eng/AfterSigning.targets
View file

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

8
run-build.ps1
View file

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

3
run-build.sh
View file

@ -45,6 +45,9 @@ while [[ $# > 0 ]]; do
--pgoInstrument) --pgoInstrument)
args+=("/p:PgoInstrument=true") args+=("/p:PgoInstrument=true")
;; ;;
--pack)
args+=("/p:PackInstaller=true")
;;
--help) --help)
echo "Usage: $0 [--configuration <CONFIGURATION>] [--architecture <ARCHITECTURE>] [--docker <IMAGENAME>] [--help]" echo "Usage: $0 [--configuration <CONFIGURATION>] [--architecture <ARCHITECTURE>] [--docker <IMAGENAME>] [--help]"
echo "" echo ""

2
src/redist/targets/Crossgen.targets
View file

@ -2,7 +2,7 @@
<!-- Crossgen is currently not supported on the s390x, ppc64le architecture as using mono instead of CoreCLR. <!-- 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. --> Neither crossgen2 nor mono is supported on the loongarch64 architecture at present. -->
<Target Name="CrossgenLayout" <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"> DependsOnTargets="SetSdkBrandingInfo">
<PropertyGroup> <PropertyGroup>

2
src/redist/targets/GenerateArchives.targets
View file

@ -1,5 +1,7 @@
<Project> <Project>
<!-- Disable the GenerateArchives step in the local dev build, only do when -pack is specified to speed up dev builds -->
<Target Name="GenerateArchives" <Target Name="GenerateArchives"
Condition="'$(PackInstaller)' == 'true'"
DependsOnTargets="GenerateLayout;GetCurrentRuntimeInformation" DependsOnTargets="GenerateLayout;GetCurrentRuntimeInformation"
BeforeTargets="AfterBuild"> BeforeTargets="AfterBuild">