Add MSI installer type file (#11539)

The sentinel file will trigger using the MSI based installation
This commit is contained in:
Jacques Eloff 2021-08-16 21:39:55 -07:00 committed by GitHub
parent 6b1a59719e
commit baf4e91918
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 1 deletions

View file

@ -166,6 +166,7 @@
'$(SdkMSIInstallerFile)' ^
'$(WixRoot)' ^
'$(ToolsetBrandName)' ^
'$(VersionPrefix)' ^
'$(MsiVersion)' ^
'$(SDKBundleVersion)' ^
'$(Version)' ^
@ -183,6 +184,7 @@
<CreateLightCommandPackageDrop
LightCommandWorkingDir="$(LightCommandObjDir)"
OutputFolder="$(LightCommandPackagesDir)"
AdditionalBasePaths="$(MSBuildThisFileDirectory)packaging\windows\clisdk"
NoLogo="true"
Cultures="en-us"
InstallerFile="$(SdkMSIInstallerFile)"

View file

@ -15,6 +15,7 @@
<ComponentGroupRef Id="InstallFiles" />
<ComponentGroupRef Id="AuthoredRegistryKeys_x86node"/>
<ComponentGroupRef Id="DotnetToolSetup"/>
<ComponentRef Id="WorkloadInstallerTypeComp" />
</Feature>
<Feature Id="Provider" Absent="disallow" AllowAdvertise="no" Description="Used for Ref Counting" Display="hidden" Level="1" InstallDefault="local" Title="RefCounting" TypicalDefault="install">
<ComponentRef Id="$(var.DependencyKeyId)" />
@ -56,7 +57,15 @@
<Fragment>
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="$(var.Program_Files)">
<Directory Id="DOTNETHOME" Name="dotnet"/>
<Directory Id="DOTNETHOME" Name="dotnet">
<Directory Id="MetadataDir" Name="metadata">
<Directory Id="WorkloadsDir" Name="workloads">
<Directory Id="FeatureBandDir" Name="$(var.SdkFeatureBandVersion)">
<Directory Id="InstallerTypeDir" Name="installertype" />
</Directory>
</Directory>
</Directory>
</Directory>
</Directory>
</Directory>
</Fragment>
@ -66,5 +75,8 @@
<Environment Id="E_PATH" Name="PATH" Value="%USERPROFILE%\.dotnet\tools" Part="last" Action="set" System="no" />
</Component>
</ComponentGroup>
<Component Id="WorkloadInstallerTypeComp" Directory="InstallerTypeDir">
<File KeyPath="yes" Name="msi" />
</Component>
</Fragment>
</Wix>

View file

@ -6,6 +6,7 @@ param(
[Parameter(Mandatory=$true)][string]$DotnetMSIOutput,
[Parameter(Mandatory=$true)][string]$WixRoot,
[Parameter(Mandatory=$true)][string]$ProductMoniker,
[Parameter(Mandatory=$true)][string]$SdkFeatureBandVersion,
[Parameter(Mandatory=$true)][string]$DotnetMSIVersion,
[Parameter(Mandatory=$true)][string]$SDKBundleVersion,
[Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion,
@ -64,6 +65,7 @@ function RunCandle
-dMicrosoftEula="$PSScriptRoot\dummyeula.rtf" `
-dProductMoniker="$ProductMoniker" `
-dBuildVersion="$DotnetMSIVersion" `
-dSdkFeatureBandVersion="$SdkFeatureBandVersion" `
-dSDKBundleVersion="$SDKBundleVersion" `
-dNugetVersion="$DotnetCLINugetVersion" `
-dUpgradeCode="$UpgradeCode" `