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 @@ 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 ] [--architecture ] [--docker ] [--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 @@ - 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 @@ -