Win7/PowerShell7
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Use Quality only with Channel in dotnet-install (#17847)

Browse Source
This commit is contained in:
Aditya Patwardhan 2022-08-05 14:42:47 -07:00
parent d29f7a7035
commit da96d2f7c6
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
assets/wix/files.wxs
View File

@ -3154,8 +3154,8 @@
<Component Id="cmp22840874A8C84AA796496634FBEBF09C">
<File Id="fil2067B616D1FA4B30932A0240ABE06089" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Web.Services.Description.dll" />
</Component>
<Component Id="cmpC520D874B9BB4524893E563774B70B0E">
<File Id="filABAB2F157E0643769210BC36B605566A" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.622.26707.dll" />
<Component Id="cmp6E693946CF2840BBAC511380EEA8B9B3">
<File Id="fil4E1C62F801184F0E9A2F1D265968B3C7" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.722.32202.dll" />
</Component>
</DirectoryRef>
</Fragment>
@ -4173,7 +4173,7 @@
<ComponentRef Id="cmpF96C036EAE3B436DB096888697193FAF" />
<ComponentRef Id="cmp789F545EA2CB4AC5A2688CF730A5F6B4" />
<ComponentRef Id="cmpB2EF287C99374D839EDF65DF6D2610F0" />
<ComponentRef Id="cmpC520D874B9BB4524893E563774B70B0E" />
<ComponentRef Id="cmp6E693946CF2840BBAC511380EEA8B9B3" />
</ComponentGroup>
</Fragment>
</Wix>

15
build.psm1
View File

@ -1840,13 +1840,12 @@ function Install-Dotnet {
$installScript = "dotnet-install.ps1"
Invoke-WebRequest -Uri $installObtainUrl/$installScript -OutFile $installScript
if (-not $environment.IsCoreCLR) {
$installArgs = @{
Quality = $Quality
}
$installArgs = @{}
if ($Version) {
$installArgs += @{ Version = $Version }
} elseif ($Channel) {
$installArgs += @{ Quality = $Quality }
$installArgs += @{ Channel = $Channel }
}
@ -1874,7 +1873,7 @@ function Install-Dotnet {
$fullDotnetInstallPath = Join-Path -Path $PWD.Path -ChildPath $installScript
if ($Version) {
$psArgs = @('-NoLogo', '-NoProfile', '-File', $fullDotnetInstallPath, '-Version', $Version, '-Quality', $Quality)
$psArgs = @('-NoLogo', '-NoProfile', '-File', $fullDotnetInstallPath, '-Version', $Version)
}
elseif ($Channel) {
$psArgs = @('-NoLogo', '-NoProfile', '-File', $fullDotnetInstallPath, '-Channel', $Channel, '-Quality', $Quality)
@ -2375,14 +2374,14 @@ function script:Write-Log
)
if ($isError)
{
Write-Host -Foreground Red $message
Write-Host -Foreground Red "ERROR: $message"
#reset colors for older package to at return to default after error message on a compilation error
[console]::ResetColor()
}
else
{
Write-Host -Foreground Green $message
Write-Verbose -Verbose $message
}
#reset colors for older package to at return to default after error message on a compilation error
[console]::ResetColor()
}
function script:precheck([string]$command, [string]$missedMessage) {
$c = Get-Command $command -ErrorAction Ignore

2
global.json
View File

@ -1,5 +1,5 @@
{
"sdk": {
"version": "6.0.301"
"version": "6.0.302"
}
}

5
tools/packaging/packaging.psm1
View File

@ -2778,6 +2778,11 @@ function New-NugetContentPackage
New-StagingFolder -StagingPath $contentFolder -PackageSourcePath $PackageSourcePath
}
Start-PSBootstrap | Out-String | Write-Verbose -Verbose
Write-Verbose -Verbose "Starting dotnet --info"
dotnet --info | Out-String | Write-Verbose -Verbose
Write-Verbose -Verbose "Ending dotnet --info"
$projectFolder = Join-Path $PSScriptRoot 'projects/nuget'
$arguments = @('pack')