From 59d4a7eb59512a4cbd9be182eb6a82529cf76e96 Mon Sep 17 00:00:00 2001
From: John Beisner <johnbeisner@users.noreply.github.com>
Date: Fri, 14 Dec 2018 13:35:20 -0800
Subject: [PATCH] Include the WindowsDesktop sharedframework in install
 'Finish' page. (#208)

---
 build/package/Installer.MSI.targets         | 1 +
 packaging/windows/clisdk/bundle.wxl         | 1 +
 packaging/windows/clisdk/bundle.wxs         | 1 +
 packaging/windows/clisdk/generatebundle.ps1 | 2 ++
 4 files changed, 5 insertions(+)

diff --git a/build/package/Installer.MSI.targets b/build/package/Installer.MSI.targets
index 2ea419296..92c559489 100644
--- a/build/package/Installer.MSI.targets
+++ b/build/package/Installer.MSI.targets
@@ -161,6 +161,7 @@
                       '$(MsiVersion)' ^
                       '$(SimpleVersion)' ^
                       '$(NugetVersion)' ^
+                      '$(MicrosoftWindowsDesktopPackageVersion)' ^
                       '$(CombinedFrameworkSDKHostInstallerUpgradeCode)' ^
                       '$(Architecture)' ^
                       '$(MicrosoftNETCoreAppPackageVersion)' ^
diff --git a/packaging/windows/clisdk/bundle.wxl b/packaging/windows/clisdk/bundle.wxl
index 5919fc5c7..f05221996 100644
--- a/packaging/windows/clisdk/bundle.wxl
+++ b/packaging/windows/clisdk/bundle.wxl
@@ -53,6 +53,7 @@ The following were installed at: '[DOTNETHOME]'
     • .NET Core SDK [DOTNETSDKVERSION]
     • .NET Core Runtime [DOTNETRUNTIMEVERSION]
     • ASP.NET Core Runtime [ASPNETCOREVERSION]
+    • .NET Core Windows Desktop Runtime [WINFORMSANDWPFVERSION]
 
 This product collects usage data
     • More information and opt-out https://aka.ms/dotnet-cli-telemetry
diff --git a/packaging/windows/clisdk/bundle.wxs b/packaging/windows/clisdk/bundle.wxs
index b1bd6fdde..8ce12580b 100644
--- a/packaging/windows/clisdk/bundle.wxs
+++ b/packaging/windows/clisdk/bundle.wxs
@@ -94,6 +94,7 @@
     <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" />
+    <Variable Name="WINFORMSANDWPFVERSION" Type="string" Value="$(var.WinFormsAndWpfVersion)" bal:Overridable="no" />
     <Variable Name="DOTNETHOMESIMILARITYCHECKOVERRIDE" Type="string" Value="" bal:Overridable="yes" />
       
       <Chain DisableSystemRestore="yes" ParallelCache="yes">
diff --git a/packaging/windows/clisdk/generatebundle.ps1 b/packaging/windows/clisdk/generatebundle.ps1
index 27b1b062a..6e574d13a 100644
--- a/packaging/windows/clisdk/generatebundle.ps1
+++ b/packaging/windows/clisdk/generatebundle.ps1
@@ -14,6 +14,7 @@ param(
     [Parameter(Mandatory=$true)][string]$DotnetMSIVersion,
     [Parameter(Mandatory=$true)][string]$DotnetCLIDisplayVersion,
     [Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion,
+    [Parameter(Mandatory=$true)][string]$WindowsDesktopVersion,
     [Parameter(Mandatory=$true)][string]$UpgradeCode,
     [Parameter(Mandatory=$true)][string]$Architecture,
     [Parameter(Mandatory=$true)][string]$DotNetRuntimeVersion,
@@ -44,6 +45,7 @@ function RunCandleForBundle
         -dHostFXRMsiSourcePath="$HostFxrMSIFile" `
         -dSharedHostMsiSourcePath="$SharedHostMSIFile" `
         -dWinFormsAndWpfMsiSourcePath="$WinFormsAndWpfMSIFile" `
+        -dWinFormsAndWpfVersion="$WindowsDesktopVersion" `
         -dAdditionalSharedFXMsiSourcePath="$AdditionalSharedFxMSIFile" `
         -dAdditionalHostFXRMsiSourcePath="$AdditionalHostFxrMSIFile" `
         -dAdditionalSharedHostMsiSourcePath="$AdditionalSharedHostMSIFile" `