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

Updating windows msi code to use variables for the SDK and Runtime brandings.

Browse source
This commit is contained in:
Livar Cunha 2018-04-04 10:37:38 -07:00
parent 4883d9643b
commit f496a9bb18
4 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
build/package/Installer.MSI.targets
View file

@ -154,7 +154,9 @@
'$(SimpleVersion)' '$(SimpleVersion)'
'$(NugetVersion)' '$(NugetVersion)'
'$(CombinedFrameworkSDKHostInstallerUpgradeCode)' '$(CombinedFrameworkSDKHostInstallerUpgradeCode)'
'$(Architecture)'" /> '$(Architecture)'
'$(SharedFrameworkVersion)'
'$(AspNetCoreRuntimePackageVersion)'" />
</Target> </Target>
<Target Name="GenerateSdkNupkg" <Target Name="GenerateSdkNupkg"

6
packaging/windows/clisdk/bundle.wxl
View file

@ -50,9 +50,9 @@
<String Id="FirstTimeWelcomeMessage">The installation was successful <String Id="FirstTimeWelcomeMessage">The installation was successful
The following were installed at [DOTNETHOME] The following were installed at [DOTNETHOME]
• .NET Core SDK 2.1.300 • .NET Core SDK [DOTNETSDKVERSION]
• .NET Core Runtime 2.1.0 • .NET Core Runtime [DOTNETRUNTIMEVERSION]
• ASP.NET Core Runtime 2.1.0 • ASP.NET Core Runtime [ASPNETCOREVERSION]
This product collects usage data This product collects usage data
• More information and opt-out https://aka.ms/dotnet-cli-telemetry • More information and opt-out https://aka.ms/dotnet-cli-telemetry

3
packaging/windows/clisdk/bundle.wxs
View file

@ -24,6 +24,9 @@
<Variable Name="DOTNETHOME" Type="string" Value="[ProgramFiles6432Folder]dotnet" bal:Overridable="no" /> <Variable Name="DOTNETHOME" Type="string" Value="[ProgramFiles6432Folder]dotnet" bal:Overridable="no" />
<Variable Name="BUNDLEMONIKER" Type="string" Value="$(var.ProductMoniker)" 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"> <Chain DisableSystemRestore="yes" ParallelCache="yes">
<MsiPackage SourceFile="$(var.SharedFXMsiSourcePath)"> <MsiPackage SourceFile="$(var.SharedFXMsiSourcePath)">

6
packaging/windows/clisdk/generatebundle.ps1
View file

@ -14,7 +14,9 @@ param(
[Parameter(Mandatory=$true)][string]$DotnetCLIDisplayVersion, [Parameter(Mandatory=$true)][string]$DotnetCLIDisplayVersion,
[Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion, [Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion,
[Parameter(Mandatory=$true)][string]$UpgradeCode, [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" . "$PSScriptRoot\..\..\..\scripts\common\_common.ps1"
@ -43,6 +45,8 @@ function RunCandleForBundle
-dAdditionalSharedFXMsiSourcePath="$AdditionalSharedFxMSIFile" ` -dAdditionalSharedFXMsiSourcePath="$AdditionalSharedFxMSIFile" `
-dAdditionalHostFXRMsiSourcePath="$AdditionalHostFxrMSIFile" ` -dAdditionalHostFXRMsiSourcePath="$AdditionalHostFxrMSIFile" `
-dAdditionalSharedHostMsiSourcePath="$AdditionalSharedHostMSIFile" ` -dAdditionalSharedHostMsiSourcePath="$AdditionalSharedHostMSIFile" `
-dDotNetRuntimeVersion="$DotNetRuntimeVersion" `
-dAspNetCoreVersion="$AspNetCoreVersion" `
-arch "$Architecture" ` -arch "$Architecture" `
-ext WixBalExtension.dll ` -ext WixBalExtension.dll `
-ext WixUtilExtension.dll ` -ext WixUtilExtension.dll `