diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
index 961b3b93a..7146514a9 100644
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@@ -30,6 +30,7 @@
dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)
dotnet-extension-$(MicrosoftWindowsDesktopPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)
dotnet-targeting-pack$(InstallerStartSuffix)-$(NetCoreAppTargetingPackVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)
+ windowsdesktop-targeting-pack$(InstallerStartSuffix)-$(WindowsDesktopTargetingPackVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)
$(CoreSetupRid)
@@ -138,7 +139,14 @@
$(DownloadedNetCoreAppTargetingPackInstallerFileName)
$(CoreSetupBlobAccessTokenParam)
-
+
+
+ $(CoreSetupRootUrl)$(WindowsDesktopTargetingPackVersion)
+ $(DownloadedWindowsDesktopTargetingPackInstallerFileName)
+ $(CoreSetupBlobAccessTokenParam)
+
+
$(DotnetToolsetBlobRootUrl)Toolset/$(MicrosoftDotnetToolsetInternalPackageVersion)
dotnet-toolset-internal-$(MicrosoftDotnetToolsetInternalPackageVersion).zip
@@ -146,7 +154,7 @@
sdk/$(SdkVersion)
-
+
$(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion)
@@ -161,7 +169,7 @@
$(DownloadedAspNetTargetingPackInstallerFileName)
$(CoreSetupBlobAccessTokenParam)
-
+
$(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion)
diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets
index e709e0229..07879cb13 100644
--- a/src/redist/targets/GenerateMSIs.targets
+++ b/src/redist/targets/GenerateMSIs.targets
@@ -140,6 +140,7 @@
'$(DownloadsFolder)$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName)' ^
'$(DownloadsFolder)$(DownloadedNetCoreAppTargetingPackInstallerFileName)' ^
'$(DownloadsFolder)$(DownloadedAspNetTargetingPackInstallerFileName)' ^
+ '$(DownloadsFolder)$(DownloadedWindowsDesktopTargetingPackInstallerFileName)' ^
'$(CombinedFrameworkSdkHostMSIInstallerFile)' ^
'$(WixRoot)' ^
'$(SdkBrandName)' ^
diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.wxs b/src/redist/targets/packaging/windows/clisdk/bundle.wxs
index 5defdb31f..00ea77786 100644
--- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs
@@ -133,6 +133,9 @@
+
+
+
diff --git a/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 b/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1
index 491cac30e..4fdd00ae4 100644
--- a/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1
+++ b/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1
@@ -10,6 +10,7 @@ param(
[Parameter(Mandatory=$true)][string]$WinFormsAndWpfMSIFile,
[Parameter(Mandatory=$true)][string]$NetCoreAppTargetingPackMSIFile,
[Parameter(Mandatory=$true)][string]$AspNetTargetingPackMSIFile,
+ [Parameter(Mandatory=$true)][string]$WindowsDesktopTargetingPackMSIFile,
[Parameter(Mandatory=$true)][string]$DotnetBundleOutput,
[Parameter(Mandatory=$true)][string]$WixRoot,
[Parameter(Mandatory=$true)][string]$ProductMoniker,
@@ -48,6 +49,7 @@ function RunCandleForBundle
-dWinFormsAndWpfMsiSourcePath="$WinFormsAndWpfMSIFile" `
-dNetCoreAppTargetingPackMsiSourcePath="$NetCoreAppTargetingPackMSIFile" `
-dAspNetTargetingPackMsiSourcePath="$AspNetTargetingPackMSIFile" `
+ -dWindowsDesktopTargetingPackMsiSourcePath="$WindowsDesktopTargetingPackMSIFile" `
-dWinFormsAndWpfVersion="$WindowsDesktopVersion" `
-dAdditionalSharedFXMsiSourcePath="$AdditionalSharedFxMSIFile" `
-dAdditionalHostFXRMsiSourcePath="$AdditionalHostFxrMSIFile" `