From baf4e919188bb031d774a5767915225e93707e4b Mon Sep 17 00:00:00 2001
From: Jacques Eloff <joeloff@users.noreply.github.com>
Date: Mon, 16 Aug 2021 21:39:55 -0700
Subject: [PATCH] Add MSI installer type file (#11539)

The sentinel file will trigger using the MSI based installation
---
 src/redist/targets/GenerateMSIs.targets            |  2 ++
 .../targets/packaging/windows/clisdk/dotnet.wxs    | 14 +++++++++++++-
 .../packaging/windows/clisdk/generatemsi.ps1       |  2 ++
 src/redist/targets/packaging/windows/clisdk/msi    |  0
 4 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 src/redist/targets/packaging/windows/clisdk/msi

diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets
index 29d519270..059bc74bf 100644
--- a/src/redist/targets/GenerateMSIs.targets
+++ b/src/redist/targets/GenerateMSIs.targets
@@ -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)"
diff --git a/src/redist/targets/packaging/windows/clisdk/dotnet.wxs b/src/redist/targets/packaging/windows/clisdk/dotnet.wxs
index 4c4c9fcc8..211883bb3 100644
--- a/src/redist/targets/packaging/windows/clisdk/dotnet.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/dotnet.wxs
@@ -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>
diff --git a/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1 b/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1
index bfddd68a8..47d83909c 100644
--- a/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1
+++ b/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1
@@ -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" `
diff --git a/src/redist/targets/packaging/windows/clisdk/msi b/src/redist/targets/packaging/windows/clisdk/msi
new file mode 100644
index 000000000..e69de29bb