From 3b631bd85d3ffacb08e93e299d1d956be591d6ee Mon Sep 17 00:00:00 2001
From: Keith Mahoney <41657372+kmahone@users.noreply.github.com>
Date: Mon, 1 Jul 2019 14:44:01 -0700
Subject: [PATCH] Update Min OS Version for MUX to RS2 (#977)

---
 .github/ISSUE_TEMPLATE/bug_report.md          |  1 -
 README.md                                     |  3 +-
 .../FrameworkPackage/FrameworkPackage.csproj  |  4 +-
 .../FrameworkPackageContents/AppxManifest.xml |  2 +-
 .../FrameworkPackage/MakeFrameworkPackage.ps1 | 15 ------
 .../NuSpecs/MUXControls-Nuget-Common.targets  |  4 +-
 .../MUXControls-Nuget-FrameworkPackage.props  |  8 ---
 .../MUXControlsFrameworkPackage.nuspec        |  1 -
 dev/dll/Microsoft.UI.Xaml.vcxproj             | 19 +------
 dev/dll/Microsoft.UI.Xaml.vcxproj.filters     |  2 -
 dev/dll/XamlControlsResources.cpp             | 54 ++-----------------
 test/IXMPTestApp/IXMPTestApp.Shared.projitems |  2 +-
 test/IXMPTestApp/MSTest/IXMPTestApp.csproj    |  2 +-
 test/IXMPTestApp/MSTest/project.json          |  2 +-
 test/IXMPTestApp/Package.appxmanifest         |  2 +-
 test/IXMPTestApp/TAEF/project.json            |  2 +-
 .../MUXControls.ReleaseTest.Shared.projitems  |  2 +-
 .../NugetPackageTestApp.csproj                |  2 +-
 .../MSTest/MUXControlsTestApp.csproj          |  2 +-
 test/MUXControlsTestApp/MSTest/project.json   |  2 +-
 .../MUXControlsTestApp.Shared.projitems       |  2 +-
 test/MUXControlsTestApp/TAEF/project.json     |  2 +-
 .../MUXControlsTestApp/ThemeResourcesTests.cs | 15 ------
 .../MUXControlsTestAppForIslands.csproj       |  2 +-
 .../MUXControlsTestAppForIslands/project.json |  2 +-
 .../MUXControlsTestAppWPFPackage.wapproj      |  2 +-
 .../Package.appxmanifest                      |  2 +-
 .../MUXTestUtilities/MUXTestUtilities.vcxproj |  2 +-
 test/TestAppCX/TestAppCX.vcxproj              |  2 +-
 29 files changed, 30 insertions(+), 132 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index fc2f68e791..4610c8c52b 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -37,7 +37,6 @@ NuGet package version:
 | April 2018 Update (17134)          | <!-- Yes/No? -->   |
 | Fall Creators Update (16299)       | <!-- Yes/No? -->   |
 | Creators Update (15063)            | <!-- Yes/No? -->   |
-| Anniversary Update (14393)         | <!-- Yes/No? -->   |
 
 <!-- Which device form factors did you see the issue on? Leave blank if you didn't try that device. -->
 | Device form factor | Saw the problem? |
diff --git a/README.md b/README.md
index 8ee24338f5..f3c49ae515 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ You don't need version checks or conditional XAML markup to use WinUI controls o
 
 ### Version support
 
-The Microsoft.UI.Xaml 2.2 NuGet package requires your project to have TargetPlatformVersion &gt;= 10.0.18362.0 and TargetPlatformMinVersion &gt;= 10.0.14393.0 when building. 
+The Microsoft.UI.Xaml 2.2 NuGet package requires your project to have TargetPlatformVersion &gt;= 10.0.18362.0 and TargetPlatformMinVersion &gt;= 10.0.15063.0 when building. 
 
 Your app's users can be on any of the following supported Windows versions:
 * Windows Insider Previews
@@ -70,7 +70,6 @@ Your app's users can be on any of the following supported Windows versions:
 * April 2018 Update (17134 aka "Redstone 4")
 * Fall Creators Update (16299 aka "Redstone 3")
 * Creators Update (15063 aka "Redstone 2")
-* Anniversary Update (14393 aka "Redstone 1")
 
 Some features may have a reduced or slightly different user experience on older versions, particularly on builds before 15063. This should not impact overall usability.
 
diff --git a/build/FrameworkPackage/FrameworkPackage.csproj b/build/FrameworkPackage/FrameworkPackage.csproj
index f4460d4687..5eb1a6bcf9 100644
--- a/build/FrameworkPackage/FrameworkPackage.csproj
+++ b/build/FrameworkPackage/FrameworkPackage.csproj
@@ -52,8 +52,8 @@
     <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <AppContainerApplication>true</AppContainerApplication>
     <ApplicationType>Windows Store</ApplicationType>
-    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformMinVersion>10.0.10586.0</WindowsTargetPlatformMinVersion>
+    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformMinVersion>10.0.15063.0</WindowsTargetPlatformMinVersion>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/build/FrameworkPackage/FrameworkPackageContents/AppxManifest.xml b/build/FrameworkPackage/FrameworkPackageContents/AppxManifest.xml
index 5e77a99506..4c1c9a541c 100644
--- a/build/FrameworkPackage/FrameworkPackageContents/AppxManifest.xml
+++ b/build/FrameworkPackage/FrameworkPackageContents/AppxManifest.xml
@@ -12,7 +12,7 @@
     <Resource Language="en-US" />
   </Resources>
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.14393.0" MaxVersionTested="10.0.17706.0" />
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.15063.0" MaxVersionTested="10.0.18362.0" />
   </Dependencies>
   <mp:PhoneIdentity PhoneProductId="3F0E3E5D-C663-407a-9187-9A5F47398F11" PhonePublisherId="1AC97219-40D1-4c98-B175-2BFCD96578C3" />
   <Extensions>
diff --git a/build/FrameworkPackage/MakeFrameworkPackage.ps1 b/build/FrameworkPackage/MakeFrameworkPackage.ps1
index eea30534f3..b7fc29908f 100644
--- a/build/FrameworkPackage/MakeFrameworkPackage.ps1
+++ b/build/FrameworkPackage/MakeFrameworkPackage.ps1
@@ -220,21 +220,6 @@ if ($Configuration -ilike "debug")
     #$PackageName += ".Debug"
 }
 
-# On RS1 we do not have support for DefaultStyleResourceUri which enables our controls to point the XAML framework to load 
-# their  default style out of the framework package's versioned generic.xaml. The support exists on RS2 and greater so for 
-# RS1 we include a generic.xaml in the default app location that the framework looks for component styles and have that 
-# file just be a pointer to the framework package rs1 generic.xaml.
-$rs1_genericxaml = 
-@"
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="ms-appx://$PackageName/Microsoft.UI.Xaml/Themes/generic.xaml"/>
-    </ResourceDictionary.MergedDictionaries>
-</ResourceDictionary>
-"@
-
-Set-Content -Value $rs1_genericxaml $fullOutputPath\rs1_themes_generic.xaml
-
 # Allow single URI to access Compact.xaml from both framework package and nuget package
 $compactxaml = 
 @"
diff --git a/build/NuSpecs/MUXControls-Nuget-Common.targets b/build/NuSpecs/MUXControls-Nuget-Common.targets
index 0b68699add..2ce3f6458d 100644
--- a/build/NuSpecs/MUXControls-Nuget-Common.targets
+++ b/build/NuSpecs/MUXControls-Nuget-Common.targets
@@ -7,8 +7,8 @@
       <MicrosoftUIXamlTargetPlatformMinCheckValue>$([System.Version]::Parse('$(TargetPlatformMinVersion)').Build)</MicrosoftUIXamlTargetPlatformMinCheckValue>
     </PropertyGroup>
     <Error 
-        Text="Microsoft.UI.Xaml nuget package requires TargetPlatformMinVersion &gt;= 10.0.14393.0 (current project is $(MicrosoftUIXamlTargetPlatformMinCheckValue))" 
-        Condition="$(MicrosoftUIXamlTargetPlatformMinCheckValue) &lt; 14393" />
+        Text="Microsoft.UI.Xaml nuget package requires TargetPlatformMinVersion &gt;= 10.0.15063.0 (current project is $(MicrosoftUIXamlTargetPlatformMinCheckValue))" 
+        Condition="$(MicrosoftUIXamlTargetPlatformMinCheckValue) &lt; 15063" />
     <PropertyGroup>
       <MicrosoftUIXamlTargetPlatformCheckValue>$([System.Version]::Parse('$(TargetPlatformVersion)').Build)</MicrosoftUIXamlTargetPlatformCheckValue>
     </PropertyGroup>
diff --git a/build/NuSpecs/MUXControls-Nuget-FrameworkPackage.props b/build/NuSpecs/MUXControls-Nuget-FrameworkPackage.props
index f39b4454b0..4ad552ebf8 100644
--- a/build/NuSpecs/MUXControls-Nuget-FrameworkPackage.props
+++ b/build/NuSpecs/MUXControls-Nuget-FrameworkPackage.props
@@ -129,14 +129,6 @@
       <PackagingOutputs Remove="@(XamlCompactXbfPackagingOutputToBeRemoved)" />
     </ItemGroup>
   </Target>
-
-  <!-- Workaround for apps that need RS1 support, include this only if min version is RS1 -->
-  <ItemGroup Condition="($([System.Version]::Parse('$(TargetPlatformMinVersion)').Build) &lt; 15063) And '$(DisableMicrosoftUIXamlRS1ThemesWorkaround)'==''">
-    <Page Include="$(MSBuildThisFileDirectory)rs1_themes\generic.xaml">
-      <SubType>Designer</SubType>
-      <Link>Microsoft.UI.Xaml\Themes\generic.xaml</Link>
-    </Page>
-  </ItemGroup>
   
   <!-- Make this URI works in framework package "ms-appx:///Microsoft.UI.Xaml/DensityStyles/Compact.xaml" -->
   <ItemGroup>
diff --git a/build/NuSpecs/MUXControlsFrameworkPackage.nuspec b/build/NuSpecs/MUXControlsFrameworkPackage.nuspec
index ff2085d2f5..0098468ab4 100644
--- a/build/NuSpecs/MUXControlsFrameworkPackage.nuspec
+++ b/build/NuSpecs/MUXControlsFrameworkPackage.nuspec
@@ -32,7 +32,6 @@
     <file target="build\Common.targets" src="MUXControls-Nuget-Common.targets"/>
     <file target="build\$ID$.props" src="MUXControls-Nuget-FrameworkPackage.props"/>
     <file target="build\native\$ID$.targets" src="MUXControls-Nuget-FrameworkPackage.targets"/>
-    <file target="build\rs1_themes\generic.xaml" src="$BUILDOUTPUT$\$BUILDFLAVOR$\$BUILDARCH$\FrameworkPackage\rs1_themes_generic.xaml"/>
     <file target="build\DensityStyles\Compact.xaml" src="$BUILDOUTPUT$\$BUILDFLAVOR$\$BUILDARCH$\FrameworkPackage\Compact.xaml"/>
   </files>
 </package>
\ No newline at end of file
diff --git a/dev/dll/Microsoft.UI.Xaml.vcxproj b/dev/dll/Microsoft.UI.Xaml.vcxproj
index 316d1d4c44..4ee883192c 100644
--- a/dev/dll/Microsoft.UI.Xaml.vcxproj
+++ b/dev/dll/Microsoft.UI.Xaml.vcxproj
@@ -19,7 +19,7 @@
     <AppContainerApplication>true</AppContainerApplication>
     <ApplicationType>Windows Store</ApplicationType>
     <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">$(MuxSdkVersion)</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformMinVersion>10.0.14393.0</WindowsTargetPlatformMinVersion>
+    <WindowsTargetPlatformMinVersion>10.0.15063.0</WindowsTargetPlatformMinVersion>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
     <!-- Use 64-bit compilers because 32-bit compilers run out of heap space -->
     <PreferredToolArchitecture>x64</PreferredToolArchitecture>
@@ -290,11 +290,6 @@
     <ResourceCompile Include="Microsoft.UI.Xaml.rc" />
   </ItemGroup>
   <ItemGroup>
-    <Page Include="$(OutDir)Generic.xaml">
-      <SubType>Designer</SubType>
-      <ThemeResource>true</ThemeResource>
-      <Link>Themes\%(Filename)%(Extension)</Link>
-    </Page>
     <Page Include="$(MSBuildProjectDirectory)\DensityStyles\Compact.xaml">
       <SubType>Designer</SubType>
       <ThemeResource>true</ThemeResource>
@@ -305,16 +300,6 @@
       <ThemeResource>true</ThemeResource>
       <Link>DensityStyles\%(Filename)%(Extension)</Link>
     </Page>
-    <Page Include="$(OutDir)rs1_themeresources.xaml">
-      <SubType>Designer</SubType>
-      <ThemeResource>true</ThemeResource>
-      <Link>Themes\%(Filename)%(Extension)</Link>
-    </Page>
-    <Page Include="$(OutDir)rs1_compact_themeresources.xaml">
-      <SubType>Designer</SubType>
-      <ThemeResource>true</ThemeResource>
-      <Link>Themes\%(Filename)%(Extension)</Link>
-    </Page>
     <!-- Pages which needs CustomCompile to run a different version of GenXBF, we attach MinSDKVersionRequired to Page to help CompileXaml to identify the min SDK Version -->
     <PageRequiringCustomCompilation Include="$(OutDir)rs2_generic.xaml">
       <SubType>Designer</SubType>
@@ -483,7 +468,7 @@
   <Target Name="GenerateGenericResourceFile" DependsOnTargets="CategorizeSharedPages" BeforeTargets="$(GenerateXamlFileBeforeTargets)" Inputs="@(RS1StylePage);@(RS2StylePage);@(RS3StylePage);@(RS4StylePage);@(RS5StylePage);@(NineteenH1StylePage)" Outputs="$(OutDir)Generic.xaml;$(OutDir)rs1_generic.xaml;$(OutDir)rs2_generic.xaml;$(OutDir)rs3_generic.xaml;$(OutDir)rs4_generic.xaml;$(OutDir)rs5_generic.xaml;$(OutDir)19h1_generic.xaml;">
     <Message Text="Generating generic resources XAML file " />
     <BatchMergeXaml RS1Pages="@(RS1StylePage)" RS2Pages="@(RS2StylePage)" RS3Pages="@(RS3StylePage)" RS4Pages="@(RS4StylePage)" RS5Pages="@(RS5StylePage)" N19H1Pages="@(NineteenH1StylePage)" PostfixForGeneratedFile="generic" OutputDirectory="$(OutDir)" />
-    <Copy SourceFiles="$(OutDir)rs1_generic.xaml" DestinationFiles="$(OutDir)Generic.xaml" />
+    <Copy SourceFiles="$(OutDir)rs2_generic.xaml" DestinationFiles="$(OutDir)Generic.xaml" />
     <!-- NB: We have to use CreateProperty here instead of PropertyGroup.	
       PropertyGroup values are always evaluated even when their enclosing target is skipped,	
       whereas CreateProperty has the TaskParameter ValueSetByTask that can be used	
diff --git a/dev/dll/Microsoft.UI.Xaml.vcxproj.filters b/dev/dll/Microsoft.UI.Xaml.vcxproj.filters
index 9048538670..d88e15caf6 100644
--- a/dev/dll/Microsoft.UI.Xaml.vcxproj.filters
+++ b/dev/dll/Microsoft.UI.Xaml.vcxproj.filters
@@ -113,12 +113,10 @@
   </ItemGroup>
   <ItemGroup>
     <Page Include="$(OutDir)Generic.xaml" />
-    <Page Include="$(OutDir)rs1_themeresources.xaml" />
     <Page Include="@(PageRequiringCustomCompilation)" />
     <Page Include="$(MSBuildProjectDirectory)\DensityStyles\Compact.xaml" />
     <Page Include="$(MSBuildProjectDirectory)\DensityStyles\CompactDatePickerTimePickerFlyout.xaml" />
     <Page Include="@(PageRequiringCustomCompilation)" />
-    <Page Include="$(OutDir)rs1_compact_themeresources.xaml" />
     <Page Include="@(PageRequiringCustomCompilation)" />
   </ItemGroup>
   <ItemGroup>
diff --git a/dev/dll/XamlControlsResources.cpp b/dev/dll/XamlControlsResources.cpp
index 17b2e3064e..3d051b8b0d 100644
--- a/dev/dll/XamlControlsResources.cpp
+++ b/dev/dll/XamlControlsResources.cpp
@@ -38,8 +38,6 @@ void XamlControlsResources::UpdateSource()
     // is the best we can do without conditional markup.
     winrt::Uri uri{
         [useCompactResources]() -> hstring {
-            // Our RS2 styles depend on XamlCompositionBrushBase so use that as the condition here.
-            bool isRS2OrHigher = SharedHelpers::IsXamlCompositionBrushBaseAvailable();
             // RS3 styles should be used on builds where ListViewItemPresenter's VSM integration works.
             bool isRS3OrHigher = SharedHelpers::DoesListViewItemPresenterVSMWork();
             bool isRS4OrHigher = SharedHelpers::IsRS4OrHigher();
@@ -75,13 +73,9 @@ void XamlControlsResources::UpdateSource()
             {
                 releasePrefix = L"rs3_";
             }
-            else if (isRS2OrHigher)
-            {
-                releasePrefix = L"rs2_";
-            }
             else
             {
-                releasePrefix = L"rs1_";
+                releasePrefix = L"rs2_";
             }
 
             return packagePrefix + releasePrefix + compactPrefix + postfix;
@@ -97,42 +91,13 @@ void XamlControlsResources::UpdateSource()
 
 void SetDefaultStyleKeyWorker(winrt::IControlProtected const& controlProtected, std::wstring_view const& className) 
 {
-    if (SharedHelpers::IsRS2OrHigher() || SharedHelpers::IsInDesignMode())
-    {
-        // On RS2 we set the DefaultStyleResourceUri so we don't need the complex DefaultStyleKey
-        // logic to hint XAML about the different generic.xaml location. We are telling them directly, so
-        // just have the DefaultStyleKey be the class name.
+    controlProtected.DefaultStyleKey(box_value(className));
 
-        controlProtected.DefaultStyleKey(box_value(className));
-    }
-    else
-    {
-        // On RS1 and earlier where we don't have DefaultStyleResourceUri we need to tell XAML where to look
-        // to load generic.xaml. By default it takes the DefaultStyleKey string (like Microsoft.UI.Xaml.Controls.Blah) 
-        // and does ms-appx:///Microsoft.UI.Xaml.Controls/Themes/generic.xaml. This doesn't work for us
-        // because the PRI resource root is actually Microsoft.UI.Xaml. Luckily XAML has special logic if
-        // the DefaultStyleKey is an IReference<TypeName>. In this case, XAML will look up generic.xaml in a path 
-        // constructed from the Assembly Name, and then we can have that be what we want (Microsoft.UI.Xaml).
-        // Also cache the style key that we make in a static because we don't want to build these two objects
-        // (hstring and IReference) every time we instance a control.
-
-        WCHAR szFullTypeName[256];
-        // Use the full type name discovered from what C# produces with typeof(X).FullName for Microsoft.UI.Xaml types.
-        StringCchPrintfW(szFullTypeName, _countof(szFullTypeName),
-            L"%s, " MUXCONTROLSROOT_NAMESPACE_STR ", Version = 255.255.255.255, Culture = neutral, PublicKeyToken = null, ContentType = WindowsRuntime",
-            className.data());
-
-        winrt::TypeName assemblyTypeName{ winrt::hstring(szFullTypeName), winrt::TypeKind::Metadata };
-        controlProtected.DefaultStyleKey(box_value(assemblyTypeName));
-    }
-
-#ifndef BUILD_WINDOWS
     if (auto control5 = controlProtected.try_as<winrt::IControl5>())
     {
         winrt::Uri uri{
             []() -> PCWSTR {
-            // Our RS2 styles depend on XamlCompositionBrushBase so use that as the condition here.
-            bool isRS2OrHigher = SharedHelpers::IsXamlCompositionBrushBaseAvailable();
+            
             // RS3 styles should be used on builds where ListViewItemPresenter's VSM integration works.
             bool isRS3OrHigher = SharedHelpers::DoesListViewItemPresenterVSMWork();
             bool isRS4OrHigher = SharedHelpers::IsRS4OrHigher();
@@ -158,13 +123,9 @@ void SetDefaultStyleKeyWorker(winrt::IControlProtected const& controlProtected,
                 {
                     return L"ms-appx://" MUXCONTROLS_PACKAGE_NAME "/" MUXCONTROLSROOT_NAMESPACE_STR "/Themes/rs3_generic.xaml";
                 }
-                else if (isRS2OrHigher)
-                {
-                    return L"ms-appx://" MUXCONTROLS_PACKAGE_NAME "/" MUXCONTROLSROOT_NAMESPACE_STR "/Themes/rs2_generic.xaml";
-                }
                 else
                 {
-                    return L"ms-appx://" MUXCONTROLS_PACKAGE_NAME "/" MUXCONTROLSROOT_NAMESPACE_STR "/Themes/rs1_generic.xaml";
+                    return L"ms-appx://" MUXCONTROLS_PACKAGE_NAME "/" MUXCONTROLSROOT_NAMESPACE_STR "/Themes/rs2_generic.xaml";
                 }
             }
             else
@@ -185,13 +146,9 @@ void SetDefaultStyleKeyWorker(winrt::IControlProtected const& controlProtected,
                 {
                     return L"ms-appx:///" MUXCONTROLSROOT_NAMESPACE_STR "/Themes/rs3_generic.xaml";
                 }
-                else if (isRS2OrHigher)
-                {
-                    return L"ms-appx:///" MUXCONTROLSROOT_NAMESPACE_STR "/Themes/rs2_generic.xaml";
-                }
                 else
                 {
-                    return L"ms-appx:///" MUXCONTROLSROOT_NAMESPACE_STR "/Themes/rs1_generic.xaml";
+                    return L"ms-appx:///" MUXCONTROLSROOT_NAMESPACE_STR "/Themes/rs2_generic.xaml";
                 }
             }
         }()
@@ -199,7 +156,6 @@ void SetDefaultStyleKeyWorker(winrt::IControlProtected const& controlProtected,
         // Choose a default resource URI based on whether we're running in a framework package scenario or not.
         control5.DefaultStyleResourceUri(uri);
     }
-#endif
 }
 
 // Normally global reveal lights are attached automtically via the first call to
diff --git a/test/IXMPTestApp/IXMPTestApp.Shared.projitems b/test/IXMPTestApp/IXMPTestApp.Shared.projitems
index e97125c9e3..b34d5895f3 100644
--- a/test/IXMPTestApp/IXMPTestApp.Shared.projitems
+++ b/test/IXMPTestApp/IXMPTestApp.Shared.projitems
@@ -24,7 +24,7 @@
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
     <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">$(MuxSdkVersion)</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
+    <TargetPlatformMinVersion>10.0.15063.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
diff --git a/test/IXMPTestApp/MSTest/IXMPTestApp.csproj b/test/IXMPTestApp/MSTest/IXMPTestApp.csproj
index 4059e6d283..cd208402c6 100644
--- a/test/IXMPTestApp/MSTest/IXMPTestApp.csproj
+++ b/test/IXMPTestApp/MSTest/IXMPTestApp.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
   <!-- We need to define NuGet references using this newer style for running tests locally in VS to work.
        However, for some reason, specifially in lab builds, using the below to resolve NuGet references
-       causes it to complain that the uap10.0.14393 framework wasn't referenced.
+       causes it to complain that the uap10.0.15063 framework wasn't referenced.
        As such, we'll use the more old-school package.json NuGet reference format for lab builds. -->
   <PropertyGroup Condition="'$(XES_DFSDROP)' == ''">
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
diff --git a/test/IXMPTestApp/MSTest/project.json b/test/IXMPTestApp/MSTest/project.json
index 6906f92a7c..6b671aca35 100644
--- a/test/IXMPTestApp/MSTest/project.json
+++ b/test/IXMPTestApp/MSTest/project.json
@@ -7,7 +7,7 @@
     "MSTest.TestFramework": "1.3.2"
   },
   "frameworks": {
-    "uap10.0.14393": {}
+    "uap10.0.15063": {}
   },
   "runtimes": {
     "win10-x86": {},
diff --git a/test/IXMPTestApp/Package.appxmanifest b/test/IXMPTestApp/Package.appxmanifest
index d451846236..6b629882c1 100644
--- a/test/IXMPTestApp/Package.appxmanifest
+++ b/test/IXMPTestApp/Package.appxmanifest
@@ -9,7 +9,7 @@
     <Logo>Assets\StoreLogo.png</Logo>
   </Properties>
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.10586.0" MaxVersionTested="10.0.14393.0" />
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.15063.0" MaxVersionTested="10.0.18362.0" />
   </Dependencies>
   <Resources>
     <Resource Language="x-generate" />
diff --git a/test/IXMPTestApp/TAEF/project.json b/test/IXMPTestApp/TAEF/project.json
index f19b37ca69..f635b8f268 100644
--- a/test/IXMPTestApp/TAEF/project.json
+++ b/test/IXMPTestApp/TAEF/project.json
@@ -6,7 +6,7 @@
     "TAEF.Redist.Wlk": "10.31.180822002"
   },
   "frameworks": {
-    "uap10.0.14393": {}
+    "uap10.0.15063": {}
   },
   "runtimes": {
     "win10-x86": {},
diff --git a/test/MUXControlsReleaseTest/MUXControls.ReleaseTest/MUXControls.ReleaseTest.Shared.projitems b/test/MUXControlsReleaseTest/MUXControls.ReleaseTest/MUXControls.ReleaseTest.Shared.projitems
index f42e2b62b6..8639731d8b 100644
--- a/test/MUXControlsReleaseTest/MUXControls.ReleaseTest/MUXControls.ReleaseTest.Shared.projitems
+++ b/test/MUXControlsReleaseTest/MUXControls.ReleaseTest/MUXControls.ReleaseTest.Shared.projitems
@@ -20,7 +20,7 @@
     <RootNamespace>MUXControls.ReleaseTest</RootNamespace>
     <AssemblyName>MUXControls.ReleaseTest</AssemblyName>
     <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">$(ReleaseTestSdkVersion)</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
+    <TargetPlatformMinVersion>10.0.15063.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
diff --git a/test/MUXControlsReleaseTest/NugetPackageTestApp/NugetPackageTestApp.csproj b/test/MUXControlsReleaseTest/NugetPackageTestApp/NugetPackageTestApp.csproj
index ad2d8735cd..3fae22ee82 100644
--- a/test/MUXControlsReleaseTest/NugetPackageTestApp/NugetPackageTestApp.csproj
+++ b/test/MUXControlsReleaseTest/NugetPackageTestApp/NugetPackageTestApp.csproj
@@ -14,7 +14,7 @@
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
     <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">$(MuxSdkVersion)</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
+    <TargetPlatformMinVersion>10.0.15063.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
diff --git a/test/MUXControlsTestApp/MSTest/MUXControlsTestApp.csproj b/test/MUXControlsTestApp/MSTest/MUXControlsTestApp.csproj
index 1d4f82d73e..bdcba97145 100644
--- a/test/MUXControlsTestApp/MSTest/MUXControlsTestApp.csproj
+++ b/test/MUXControlsTestApp/MSTest/MUXControlsTestApp.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
   <!-- We need to define NuGet references using this newer style for running tests locally in VS to work.
        However, for some reason, specifially in lab builds, using the below to resolve NuGet references
-       causes it to complain that the uap10.0.14393 framework wasn't referenced.
+       causes it to complain that the uap10.0.15063 framework wasn't referenced.
        As such, we'll use the more old-school package.json NuGet reference format for lab builds. -->
   <PropertyGroup Condition="'$(XES_DFSDROP)' == ''">
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
diff --git a/test/MUXControlsTestApp/MSTest/project.json b/test/MUXControlsTestApp/MSTest/project.json
index 9257ae8f2a..e2da8fa941 100644
--- a/test/MUXControlsTestApp/MSTest/project.json
+++ b/test/MUXControlsTestApp/MSTest/project.json
@@ -8,7 +8,7 @@
     "DiffPlex": "1.2.1"
   },
   "frameworks": {
-    "uap10.0.14393": {}
+    "uap10.0.15063": {}
   },
   "runtimes": {
     "win10-x86": {},
diff --git a/test/MUXControlsTestApp/MUXControlsTestApp.Shared.projitems b/test/MUXControlsTestApp/MUXControlsTestApp.Shared.projitems
index 6e8608df79..ecda489f96 100644
--- a/test/MUXControlsTestApp/MUXControlsTestApp.Shared.projitems
+++ b/test/MUXControlsTestApp/MUXControlsTestApp.Shared.projitems
@@ -24,7 +24,7 @@
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
     <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">$(MuxSdkVersion)</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
+    <TargetPlatformMinVersion>10.0.15063.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
diff --git a/test/MUXControlsTestApp/TAEF/project.json b/test/MUXControlsTestApp/TAEF/project.json
index 16a47e0fd8..f2373a9f38 100644
--- a/test/MUXControlsTestApp/TAEF/project.json
+++ b/test/MUXControlsTestApp/TAEF/project.json
@@ -8,7 +8,7 @@
     "Win2D.uwp": "1.22.0"
   },
   "frameworks": {
-    "uap10.0.14393": {}
+    "uap10.0.15063": {}
   },
   "runtimes": {
     "win10-x86": {},
diff --git a/test/MUXControlsTestApp/ThemeResourcesTests.cs b/test/MUXControlsTestApp/ThemeResourcesTests.cs
index adf3247917..b9ae6da887 100644
--- a/test/MUXControlsTestApp/ThemeResourcesTests.cs
+++ b/test/MUXControlsTestApp/ThemeResourcesTests.cs
@@ -131,14 +131,6 @@ public void VerifyOverrides()
             IdleSynchronizer.TryWait();
         }
 
-        // These files only apply to MUX, so there's no need to run these tests for WUXC.
-#if !BUILD_WINDOWS
-        //[TestMethod] TODO: Re-enable after fixing bug 17186090.
-        public void VerifyRS1DefaultStyleDictionariesWereMergedCorrectly()
-        {
-            VerifyDictionariesWereMergedCorrectly(GetRS1DefaultStyleDictionaries(), "Microsoft.UI.Xaml/Themes/Generic.xaml");
-        }
-
         [TestMethod]
         public void VerifyRS2DefaultStyleDictionariesWereMergedCorrectly()
         {
@@ -184,12 +176,6 @@ public void Verify19H1DefaultStyleDictionariesWereMergedCorrectly()
             }
         }
 
-        [TestMethod]
-        public void VerifyRS1ThemeResourceDictionariesWereMergedCorrectly()
-        {
-            VerifyDictionariesWereMergedCorrectly(GetRS1ThemeResourceDictionaries(), "Microsoft.UI.Xaml/Themes/rs1_themeresources.xaml");
-        }
-
         [TestMethod]
         public void VerifyRS2ThemeResourceDictionariesWereMergedCorrectly()
         {
@@ -529,6 +515,5 @@ private bool CompareObjects(object value, object mergedValue, int indentation)
         }
 
         #endregion
-#endif
     }
 }
diff --git a/test/MUXControlsTestAppForIslands/MUXControlsTestAppForIslands.csproj b/test/MUXControlsTestAppForIslands/MUXControlsTestAppForIslands.csproj
index 3ff95c000c..5dd8dd09a7 100644
--- a/test/MUXControlsTestAppForIslands/MUXControlsTestAppForIslands.csproj
+++ b/test/MUXControlsTestAppForIslands/MUXControlsTestAppForIslands.csproj
@@ -15,7 +15,7 @@
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
     <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">$(MuxSdkVersion)</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
+    <TargetPlatformMinVersion>10.0.15063.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
diff --git a/test/MUXControlsTestAppForIslands/project.json b/test/MUXControlsTestAppForIslands/project.json
index be8ee59567..17e4d6d30f 100644
--- a/test/MUXControlsTestAppForIslands/project.json
+++ b/test/MUXControlsTestAppForIslands/project.json
@@ -3,7 +3,7 @@
     "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2"
   },
   "frameworks": {
-    "uap10.0.14393": {}
+    "uap10.0.15063": {}
   },
   "runtimes": {
     "win10-x86": {},
diff --git a/test/MUXControlsTestAppWPFPackage/MUXControlsTestAppWPFPackage.wapproj b/test/MUXControlsTestAppWPFPackage/MUXControlsTestAppWPFPackage.wapproj
index bd3cfce7af..50d41b85bd 100644
--- a/test/MUXControlsTestAppWPFPackage/MUXControlsTestAppWPFPackage.wapproj
+++ b/test/MUXControlsTestAppWPFPackage/MUXControlsTestAppWPFPackage.wapproj
@@ -58,7 +58,7 @@
   <PropertyGroup>
     <ProjectGuid>03f7f4f7-0250-435e-a730-ed82f6a08652</ProjectGuid>
     <TargetPlatformVersion>$(MuxSdkVersion)</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
+    <TargetPlatformMinVersion>10.0.15063.0</TargetPlatformMinVersion>
     <DefaultLanguage>en-US</DefaultLanguage>
     <EntryPointProjectUniqueName>..\MUXControlsTestAppWPF\MUXControlsTestAppWPF.csproj</EntryPointProjectUniqueName>
   </PropertyGroup>
diff --git a/test/MUXControlsTestAppWPFPackage/Package.appxmanifest b/test/MUXControlsTestAppWPFPackage/Package.appxmanifest
index 7217e19ba2..60bbfc63d0 100644
--- a/test/MUXControlsTestAppWPFPackage/Package.appxmanifest
+++ b/test/MUXControlsTestAppWPFPackage/Package.appxmanifest
@@ -9,7 +9,7 @@
   </Properties>
   <Dependencies>
     <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14393.0" MaxVersionTested="10.0.14393.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.15063.0" MaxVersionTested="10.0.18362.0" />
     <PackageDependency Name="Microsoft.VCLibs.140.00.Debug" MinVersion="14.0.26428.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
   </Dependencies>
   <Resources>
diff --git a/test/MUXTestUtilities/MUXTestUtilities.vcxproj b/test/MUXTestUtilities/MUXTestUtilities.vcxproj
index 474029c932..20c960ce58 100644
--- a/test/MUXTestUtilities/MUXTestUtilities.vcxproj
+++ b/test/MUXTestUtilities/MUXTestUtilities.vcxproj
@@ -18,7 +18,7 @@
     <AppContainerApplication>true</AppContainerApplication>
     <ApplicationType>Windows Store</ApplicationType>
     <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">$(MuxSdkVersion)</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformMinVersion>10.0.14393.0</WindowsTargetPlatformMinVersion>
+    <WindowsTargetPlatformMinVersion>10.0.15063.0</WindowsTargetPlatformMinVersion>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
     <StlVersion>110</StlVersion>
   </PropertyGroup>
diff --git a/test/TestAppCX/TestAppCX.vcxproj b/test/TestAppCX/TestAppCX.vcxproj
index c2fa6de63f..1a2f414b1d 100644
--- a/test/TestAppCX/TestAppCX.vcxproj
+++ b/test/TestAppCX/TestAppCX.vcxproj
@@ -12,7 +12,7 @@
     <AppContainerApplication>true</AppContainerApplication>
     <ApplicationType>Windows Store</ApplicationType>
     <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">$(MuxSdkVersion)</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformMinVersion>10.0.14393.0</WindowsTargetPlatformMinVersion>
+    <WindowsTargetPlatformMinVersion>10.0.15063.0</WindowsTargetPlatformMinVersion>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
     <PackageCertificateKeyFile>..\..\build\MSTest.pfx</PackageCertificateKeyFile>
   </PropertyGroup>