Skip to content

Commit

Permalink
Use quiet mode by default in new runtime packages
Browse files Browse the repository at this point in the history
Existing packages will gain this once they are reworked to use the new
tools.

Implements: #51
  • Loading branch information
jberezanski committed Nov 3, 2020
1 parent fe1d773 commit be2fb74
Show file tree
Hide file tree
Showing 18 changed files with 39 additions and 39 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ The runtime package store enables creating a precompiled cache of common librari

The package supports the following parameters (--package-parameters, --params):

- `Quiet` - suppress display of native installer progress window (may be needed on Server Core)
- `Passive` - display native installer progress window (may not work on Server Core)
- `Skip32Bit` - do not install the 32-bit runtime on a 64-bit system

Example: cinst -y --params="Quiet Skip32Bit" dotnetcore-runtime.install
Example: cinst -y --params="Passive Skip32Bit" dotnetcore-runtime.install
</description>
<releaseNotes>
##### Software
Expand Down
4 changes: 2 additions & 2 deletions dotnet-5.0-aspnetruntime/dotnet-5.0-aspnetruntime.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ The ASP.NET Core Runtime enables you to run existing web/server applications.

The package supports the following parameters (--package-parameters, --params):

- `Quiet` - suppress display of native installer progress window (may be needed on Server Core)
- `Passive` - display native installer progress window (may not work on Server Core)
- `Skip32Bit` - do not install the 32-bit runtime on a 64-bit system

Example: cinst -y --params="Quiet Skip32Bit" dotnetcore-runtime.install
Example: cinst -y --params="Passive Skip32Bit" dotnetcore-runtime.install
</description>
<releaseNotes>
##### Software
Expand Down
4 changes: 2 additions & 2 deletions dotnet-5.0-desktopruntime/dotnet-5.0-desktopruntime.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ The .NET Core Desktop Runtime enables you to run existing Windows desktop applic

The package supports the following parameters (--package-parameters, --params):

- `Quiet` - suppress display of native installer progress window (may be needed on Server Core)
- `Passive` - display native installer progress window (may not work on Server Core)
- `Skip32Bit` - do not install the 32-bit runtime on a 64-bit system

Example: cinst -y --params="Quiet Skip32Bit" dotnetcore-runtime.install
Example: cinst -y --params="Passive Skip32Bit" dotnetcore-runtime.install
</description>
<releaseNotes>
##### Software
Expand Down
4 changes: 2 additions & 2 deletions dotnet-5.0-runtime/dotnet-5.0-runtime.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ This package is required to run console applications with the .NET Core runtime.

The package supports the following parameters (--package-parameters, --params):

- `Quiet` - suppress display of native installer progress window (may be needed on Server Core)
- `Passive` - display native installer progress window (may not work on Server Core)
- `Skip32Bit` - do not install the 32-bit runtime on a 64-bit system

Example: cinst -y --params="Quiet Skip32Bit" dotnetcore-runtime.install
Example: cinst -y --params="Passive Skip32Bit" dotnetcore-runtime.install
</description>
<releaseNotes>
##### Software
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ The native installer is instructed to skip installing the .NET Core Runtime (`OP

The package supports the following parameters (--package-parameters, --params):

- `Quiet` - suppress display of native installer progress window (may be needed on Server Core)
- `Passive` - display native installer progress window (may not work on Server Core)
- `IgnoreMissingIIS` - allow package installation even if IIS is not present (probably useless, as the native installer will not install anything)

Example: cinst -y --params="Quiet IgnoreMissingIIS" dotnet-aspnetcoremodule-v1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ The native installer is instructed to skip installing the .NET Core Runtime (`OP

The package supports the following parameters (--package-parameters, --params):

- `Quiet` - suppress display of native installer progress window (may be needed on Server Core)
- `Passive` - display native installer progress window (may not work on Server Core)
- `IgnoreMissingIIS` - allow package installation even if IIS is not present (probably useless, as the native installer will not install anything)

Example: cinst -y --params="Quiet IgnoreMissingIIS" dotnet-aspnetcoremodule-v2
Expand Down
4 changes: 2 additions & 2 deletions dotnetcore-2.0-runtime/dotnetcore-2.0-runtime.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ This package is required to run console applications with the .NET Core runtime.

The package supports the following parameters (--package-parameters, --params):

- `Quiet` - suppress display of native installer progress window (may be needed on Server Core)
- `Passive` - display native installer progress window (may not work on Server Core)
- `Skip32Bit` - do not install the 32-bit runtime on a 64-bit system

Example: cinst -y --params="Quiet Skip32Bit" dotnetcore-runtime.install
Example: cinst -y --params="Passive Skip32Bit" dotnetcore-runtime.install
</description>
<releaseNotes>
##### Software
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ The ASP.NET Core Runtime enables you to run existing web/server applications.

The package supports the following parameters (--package-parameters, --params):

- `Quiet` - suppress display of native installer progress window (may be needed on Server Core)
- `Passive` - display native installer progress window (may not work on Server Core)
- `Skip32Bit` - do not install the 32-bit runtime on a 64-bit system

Example: cinst -y --params="Quiet Skip32Bit" dotnetcore-runtime.install
Example: cinst -y --params="Passive Skip32Bit" dotnetcore-runtime.install
</description>
<releaseNotes>
##### Software
Expand Down
4 changes: 2 additions & 2 deletions dotnetcore-2.1-runtime/dotnetcore-2.1-runtime.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ This package is required to run console applications with the .NET Core runtime.

The package supports the following parameters (--package-parameters, --params):

- `Quiet` - suppress display of native installer progress window (may be needed on Server Core)
- `Passive` - display native installer progress window (may not work on Server Core)
- `Skip32Bit` - do not install the 32-bit runtime on a 64-bit system

Example: cinst -y --params="Quiet Skip32Bit" dotnetcore-runtime.install
Example: cinst -y --params="Passive Skip32Bit" dotnetcore-runtime.install
</description>
<releaseNotes>
##### Software
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ The ASP.NET Core Runtime enables you to run existing web/server applications.

The package supports the following parameters (--package-parameters, --params):

- `Quiet` - suppress display of native installer progress window (may be needed on Server Core)
- `Passive` - display native installer progress window (may not work on Server Core)
- `Skip32Bit` - do not install the 32-bit runtime on a 64-bit system

Example: cinst -y --params="Quiet Skip32Bit" dotnetcore-runtime.install
Example: cinst -y --params="Passive Skip32Bit" dotnetcore-runtime.install
</description>
<releaseNotes>
##### Software
Expand Down
4 changes: 2 additions & 2 deletions dotnetcore-2.2-runtime/dotnetcore-2.2-runtime.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ This package is required to run console applications with the .NET Core runtime.

The package supports the following parameters (--package-parameters, --params):

- `Quiet` - suppress display of native installer progress window (may be needed on Server Core)
- `Passive` - display native installer progress window (may not work on Server Core)
- `Skip32Bit` - do not install the 32-bit runtime on a 64-bit system

Example: cinst -y --params="Quiet Skip32Bit" dotnetcore-runtime.install
Example: cinst -y --params="Passive Skip32Bit" dotnetcore-runtime.install
</description>
<releaseNotes>
##### Software
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ The ASP.NET Core Runtime enables you to run existing web/server applications.

The package supports the following parameters (--package-parameters, --params):

- `Quiet` - suppress display of native installer progress window (may be needed on Server Core)
- `Passive` - display native installer progress window (may not work on Server Core)
- `Skip32Bit` - do not install the 32-bit runtime on a 64-bit system

Example: cinst -y --params="Quiet Skip32Bit" dotnetcore-runtime.install
Example: cinst -y --params="Passive Skip32Bit" dotnetcore-runtime.install
</description>
<releaseNotes>
##### Software
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ The .NET Core Desktop Runtime enables you to run existing Windows desktop applic

The package supports the following parameters (--package-parameters, --params):

- `Quiet` - suppress display of native installer progress window (may be needed on Server Core)
- `Passive` - display native installer progress window (may not work on Server Core)
- `Skip32Bit` - do not install the 32-bit runtime on a 64-bit system

Example: cinst -y --params="Quiet Skip32Bit" dotnetcore-runtime.install
Example: cinst -y --params="Passive Skip32Bit" dotnetcore-runtime.install
</description>
<releaseNotes>
##### Software
Expand Down
4 changes: 2 additions & 2 deletions dotnetcore-3.0-runtime/dotnetcore-3.0-runtime.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ This package is required to run console applications with the .NET Core runtime.

The package supports the following parameters (--package-parameters, --params):

- `Quiet` - suppress display of native installer progress window (may be needed on Server Core)
- `Passive` - display native installer progress window (may not work on Server Core)
- `Skip32Bit` - do not install the 32-bit runtime on a 64-bit system

Example: cinst -y --params="Quiet Skip32Bit" dotnetcore-runtime.install
Example: cinst -y --params="Passive Skip32Bit" dotnetcore-runtime.install
</description>
<releaseNotes>
##### Software
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ The ASP.NET Core Runtime enables you to run existing web/server applications.

The package supports the following parameters (--package-parameters, --params):

- `Quiet` - suppress display of native installer progress window (may be needed on Server Core)
- `Passive` - display native installer progress window (may not work on Server Core)
- `Skip32Bit` - do not install the 32-bit runtime on a 64-bit system

Example: cinst -y --params="Quiet Skip32Bit" dotnetcore-runtime.install
Example: cinst -y --params="Passive Skip32Bit" dotnetcore-runtime.install
</description>
<releaseNotes>
##### Software
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ The .NET Core Desktop Runtime enables you to run existing Windows desktop applic

The package supports the following parameters (--package-parameters, --params):

- `Quiet` - suppress display of native installer progress window (may be needed on Server Core)
- `Passive` - display native installer progress window (may not work on Server Core)
- `Skip32Bit` - do not install the 32-bit runtime on a 64-bit system

Example: cinst -y --params="Quiet Skip32Bit" dotnetcore-runtime.install
Example: cinst -y --params="Passive Skip32Bit" dotnetcore-runtime.install
</description>
<releaseNotes>
##### Software
Expand Down
4 changes: 2 additions & 2 deletions dotnetcore-3.1-runtime/dotnetcore-3.1-runtime.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ This package is required to run console applications with the .NET Core runtime.

The package supports the following parameters (--package-parameters, --params):

- `Quiet` - suppress display of native installer progress window (may be needed on Server Core)
- `Passive` - display native installer progress window (may not work on Server Core)
- `Skip32Bit` - do not install the 32-bit runtime on a 64-bit system

Example: cinst -y --params="Quiet Skip32Bit" dotnetcore-runtime.install
Example: cinst -y --params="Passive Skip32Bit" dotnetcore-runtime.install
</description>
<releaseNotes>
##### Software
Expand Down
14 changes: 7 additions & 7 deletions tools/Shared/ChocolateyInstall-runtime.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ function Test-Skip32BitRequested
return $Env:chocolateyPackageParameters -like '*Skip32Bit*'
}

function Test-QuietRequested
function Test-PassiveRequested
{
return $Env:chocolateyPackageParameters -like '*Quiet*'
return $Env:chocolateyPackageParameters -like '*Passive*'
}

function Test-OsSupports32Bit
Expand All @@ -30,12 +30,12 @@ function Get-PassiveOrQuietArgument
Param (
[string] $Scenario = 'installation'
)
if (Test-QuietRequested) {
Write-Verbose "Performing a quiet $Scenario, as requested."
$passiveOrQuiet = 'quiet'
} else {
Write-Verbose "Performing an $Scenario with visible progress window (default)."
if (Test-PassiveRequested) {
Write-Verbose "Performing an $Scenario with visible progress window, as requested."
$passiveOrQuiet = 'passive'
} else {
Write-Verbose "Performing a quiet $Scenario (default)."
$passiveOrQuiet = 'quiet'
}
return $passiveOrQuiet
}
Expand Down

0 comments on commit be2fb74

Please sign in to comment.