From 34bcad8117fbfebe5ae9e0d47d3a4f96488acd46 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Mon, 24 Sep 2018 13:32:54 -0700
Subject: [PATCH] Insert updated DesktopUI

---
 build/BundledRuntimes.props     | 8 ++++----
 build/DependencyVersions.props  | 6 +++---
 build/MSBuildExtensions.targets | 6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props
index 3179e15bc..9192d752d 100644
--- a/build/BundledRuntimes.props
+++ b/build/BundledRuntimes.props
@@ -23,7 +23,7 @@
     <DownloadedSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedSharedFrameworkInstallerFileName>
     <DownloadedSharedFrameworkInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(DownloadedSharedFrameworkInstallerFileName)</DownloadedSharedFrameworkInstallerFile>
 
-    <DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-extension-$(MicrosoftPrivateWpfPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName>
+    <DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-extension-$(MicrosoftDesktopUIPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName>
     <DownloadedWinFormsAndWpfSharedFrameworkInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName)</DownloadedWinFormsAndWpfSharedFrameworkInstallerFile>
 
     <!-- Use the portable "linux-x64" Rid when downloading Linux shared framework compressed file. -->
@@ -45,7 +45,7 @@
     <AspNetCoreSharedFxArchiveFileName>aspnetcore-runtime-internal-$(AspNetCoreVersion)-$(AspNetCoreSharedFxArchiveRid)$(ArchiveExtension)</AspNetCoreSharedFxArchiveFileName>
     <AspNetCoreSharedFxArchiveFile>$(PackagesDirectory)/$(AspNetCoreSharedFxArchiveFileName)</AspNetCoreSharedFxArchiveFile>
 
-    <WinFormsAndWpfSharedFxArchiveFileName>dotnet-extension-$(MicrosoftPrivateWpfPackageVersion)-$(Architecture)$(ArchiveExtension)</WinFormsAndWpfSharedFxArchiveFileName>
+    <WinFormsAndWpfSharedFxArchiveFileName>dotnet-extension-$(MicrosoftDesktopUIPackageVersion)-$(Architecture)$(ArchiveExtension)</WinFormsAndWpfSharedFxArchiveFileName>
     <WinFormsAndWpfSharedFxArchiveFile>$(PackagesDirectory)/$(WinFormsAndWpfSharedFxArchiveFileName)</WinFormsAndWpfSharedFxArchiveFile>
 
     <!-- Used to detect if ASP.NET Core is built against the same version of Microsoft.NETCore.App. -->
@@ -124,14 +124,14 @@
   <ItemGroup Condition=" '$(IncludeWpfAndWinForms)' != 'false' ">
     <_DownloadAndExtractItem Include="WinFormsAndWpfSharedFxArchiveFile"
                              Condition="!Exists('$(WinFormsAndWpfSharedFxArchiveFile)')">
-      <Url>$(WinFormsAndWpfSharedFxRootUrl)$(MicrosoftPrivateWpfPackageVersion)/$(WinFormsAndWpfSharedFxArchiveFileName)$(CoreSetupBlobAccessTokenParam)</Url>
+      <Url>$(WinFormsAndWpfSharedFxRootUrl)$(MicrosoftDesktopUIPackageVersion)/$(WinFormsAndWpfSharedFxArchiveFileName)$(CoreSetupBlobAccessTokenParam)</Url>
       <DownloadFileName>$(WinFormsAndWpfSharedFxArchiveFile)</DownloadFileName>
       <ExtractDestination>$(WinFormsAndWpfSharedFxPublishDirectory)/shared</ExtractDestination>
     </_DownloadAndExtractItem>
 
     <_DownloadAndExtractItem Include="DownloadedWinFormsAndWpfSharedFrameworkInstallerFile"
                          Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFile)') And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
-      <Url>$(WinFormsAndWpfSharedFxRootUrl)$(MicrosoftPrivateWpfPackageVersion)/$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName)$(CoreSetupBlobAccessTokenParam)</Url>
+      <Url>$(WinFormsAndWpfSharedFxRootUrl)$(MicrosoftDesktopUIPackageVersion)/$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName)$(CoreSetupBlobAccessTokenParam)</Url>
       <DownloadFileName>$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFile)</DownloadFileName>
       <ExtractDestination></ExtractDestination>
     </_DownloadAndExtractItem>
diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index dae69d59b..af7622001 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -38,9 +38,9 @@
     <SharedHostVersion>$(MicrosoftNETCoreAppPackageVersion)</SharedHostVersion>
     <HostFxrVersion>$(MicrosoftNETCoreAppPackageVersion)</HostFxrVersion>
     <AspNetCoreVersion>$(MicrosoftAspNetCoreAppPackageVersion)</AspNetCoreVersion>
-    <MicrosoftPrivateWpfPackageVersion>3.0.0-alpha-26829-8</MicrosoftPrivateWpfPackageVersion>
-    <MicrosoftDotnetWpfProjectTemplatesPackageVersion>$(MicrosoftPrivateWpfPackageVersion)</MicrosoftDotnetWpfProjectTemplatesPackageVersion>
-    <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>$(MicrosoftPrivateWpfPackageVersion)</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
+    <MicrosoftDesktopUIPackageVersion>3.0.0-alpha-26921-3</MicrosoftDesktopUIPackageVersion>
+    <MicrosoftDotnetWpfProjectTemplatesPackageVersion>$(MicrosoftDesktopUIPackageVersion)</MicrosoftDotnetWpfProjectTemplatesPackageVersion>
+    <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>$(MicrosoftDesktopUIPackageVersion)</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
   </PropertyGroup>
 
   <!-- infrastructure and test only dependencies -->
diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets
index 2c4969ac3..bc8489a5f 100644
--- a/build/MSBuildExtensions.targets
+++ b/build/MSBuildExtensions.targets
@@ -121,10 +121,10 @@ Copyright (c) .NET Foundation. All rights reserved.
   <ItemGroup>
     <KnownFrameworkReference Include="Microsoft.DesktopUI"
                               RuntimeFrameworkName="Microsoft.DesktopUI.App"
-                              DefaultRuntimeFrameworkVersion="$(MicrosoftPrivateWpfPackageVersion)"
-                              LatestRuntimeFrameworkVersion="$(MicrosoftPrivateWpfPackageVersion)"
+                              DefaultRuntimeFrameworkVersion="$(MicrosoftDesktopUIPackageVersion)"
+                              LatestRuntimeFrameworkVersion="$(MicrosoftDesktopUIPackageVersion)"
                               TargetingPackName="Microsoft.DesktopUI.App"
-                              TargetingPackVersion="$(MicrosoftPrivateWpfPackageVersion)"
+                              TargetingPackVersion="$(MicrosoftDesktopUIPackageVersion)"
                               />
 
     <KnownFrameworkReference Include="Microsoft.AspNetCore"