Updating windows msi code to use variables for the SDK and Runtime brandings.
This commit is contained in:
parent
4883d9643b
commit
f496a9bb18
4 changed files with 14 additions and 5 deletions
|
@ -154,7 +154,9 @@
|
|||
'$(SimpleVersion)'
|
||||
'$(NugetVersion)'
|
||||
'$(CombinedFrameworkSDKHostInstallerUpgradeCode)'
|
||||
'$(Architecture)'" />
|
||||
'$(Architecture)'
|
||||
'$(SharedFrameworkVersion)'
|
||||
'$(AspNetCoreRuntimePackageVersion)'" />
|
||||
</Target>
|
||||
|
||||
<Target Name="GenerateSdkNupkg"
|
||||
|
|
|
@ -50,9 +50,9 @@
|
|||
<String Id="FirstTimeWelcomeMessage">The installation was successful
|
||||
|
||||
The following were installed at [DOTNETHOME]
|
||||
• .NET Core SDK 2.1.300
|
||||
• .NET Core Runtime 2.1.0
|
||||
• ASP.NET Core Runtime 2.1.0
|
||||
• .NET Core SDK [DOTNETSDKVERSION]
|
||||
• .NET Core Runtime [DOTNETRUNTIMEVERSION]
|
||||
• ASP.NET Core Runtime [ASPNETCOREVERSION]
|
||||
|
||||
This product collects usage data
|
||||
• More information and opt-out https://aka.ms/dotnet-cli-telemetry
|
||||
|
|
|
@ -24,6 +24,9 @@
|
|||
|
||||
<Variable Name="DOTNETHOME" Type="string" Value="[ProgramFiles6432Folder]dotnet" bal:Overridable="no" />
|
||||
<Variable Name="BUNDLEMONIKER" Type="string" Value="$(var.ProductMoniker)" bal:Overridable="no" />
|
||||
<Variable Name="DOTNETSDKVERSION" Type="string" Value="$(var.DisplayVersion)" bal:Overridable="no" />
|
||||
<Variable Name="DOTNETRUNTIMEVERSION" Type="string" Value="$(var.DotNetRuntimeVersion)" bal:Overridable="no" />
|
||||
<Variable Name="ASPNETCOREVERSION" Type="string" Value="$(var.AspNetCoreVersion)" bal:Overridable="no" />
|
||||
|
||||
<Chain DisableSystemRestore="yes" ParallelCache="yes">
|
||||
<MsiPackage SourceFile="$(var.SharedFXMsiSourcePath)">
|
||||
|
|
|
@ -14,7 +14,9 @@ param(
|
|||
[Parameter(Mandatory=$true)][string]$DotnetCLIDisplayVersion,
|
||||
[Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion,
|
||||
[Parameter(Mandatory=$true)][string]$UpgradeCode,
|
||||
[Parameter(Mandatory=$true)][string]$Architecture
|
||||
[Parameter(Mandatory=$true)][string]$Architecture,
|
||||
[Parameter(Mandatory=$true)][string]$DotNetRuntimeVersion,
|
||||
[Parameter(Mandatory=$true)][string]$AspNetCoreVersion
|
||||
)
|
||||
|
||||
. "$PSScriptRoot\..\..\..\scripts\common\_common.ps1"
|
||||
|
@ -43,6 +45,8 @@ function RunCandleForBundle
|
|||
-dAdditionalSharedFXMsiSourcePath="$AdditionalSharedFxMSIFile" `
|
||||
-dAdditionalHostFXRMsiSourcePath="$AdditionalHostFxrMSIFile" `
|
||||
-dAdditionalSharedHostMsiSourcePath="$AdditionalSharedHostMSIFile" `
|
||||
-dDotNetRuntimeVersion="$DotNetRuntimeVersion" `
|
||||
-dAspNetCoreVersion="$AspNetCoreVersion" `
|
||||
-arch "$Architecture" `
|
||||
-ext WixBalExtension.dll `
|
||||
-ext WixUtilExtension.dll `
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue