Merge pull request #5 from microsoft/master-update-to-winui2.4

Master update to winui2.4
microsoft · Jun 25, 2020 · 88a5246 · 88a5246
2 parents 9af47bc + 624b6db
commit 88a5246
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 7 deletions.
diff --git a/HueApp/App.xaml b/HueApp/App.xaml
@@ -24,4 +24,7 @@ THE SOFTWARE.
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:HueApp"
     RequestedTheme="Light">
-</Application>
+    <Application.Resources>
+        <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
+    </Application.Resources>
+</Application>
diff --git a/HueApp/HueApp.csproj b/HueApp/HueApp.csproj
@@ -11,8 +11,8 @@
     <AssemblyName>HueApp</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.19569.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
     <FileAlignment>512</FileAlignment>
@@ -151,6 +151,9 @@
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>5.0.0</Version>
     </PackageReference>
+    <PackageReference Include="Microsoft.UI.Xaml">
+      <Version>2.4.2</Version>
+    </PackageReference>
   </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>

diff --git a/HueApp/Initializer.xaml b/HueApp/Initializer.xaml
@@ -23,7 +23,9 @@ THE SOFTWARE.
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006">
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      xmlns:MUXC="using:Microsoft.UI.Xaml.Controls"
+      >
 
     <Grid.RowDefinitions>
         <RowDefinition/>
@@ -34,7 +36,7 @@ THE SOFTWARE.
         <Image x:Name="extendedSplashImage" Source="Assets/splash.png"/>
     </Canvas>
 
-    <ProgressRing Grid.Row="1" Name="SplashProgressRing" IsActive="True" Width="20" Height="20" Foreground="Black"></ProgressRing>
+    <MUXC:ProgressRing Grid.Row="1" Name="SplashProgressRing" IsActive="True" Width="20" Height="20" Foreground="Black"></MUXC:ProgressRing>
 
     <ContentDialog x:Name="BridgeEntryPopup"
                         VerticalAlignment="Stretch"

diff --git a/HueBackground/HueBackground.csproj b/HueBackground/HueBackground.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>BackgroundTasks</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
+    <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>

diff --git a/HueLibrary/HueLibrary.csproj b/HueLibrary/HueLibrary.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>HueLibrary</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
+    <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>

diff --git a/README.md b/README.md
@@ -30,6 +30,16 @@ Additionally, through Bluetooth LE, the app supports a proximity scenario where
 ![HueApp connect screen](Screenshots/Connecting.png)
 ![HueApp light screen](Screenshots/HueApp.png)
 
+### June 2020 update
+
+This update includes:
+
+* Update to WinUI 2.4 
+	* Add Microsoft.UI.Xaml NuGet package reference
+	* Update <Application.Resources> in App.xaml 
+* Refactoring for the following WinUI 2.4 controls:
+   * [ProgressRing](https://docs.microsoft.com/windows/uwp/design/controls-and-patterns/progress-controls)
+
 ## Features
 
 The HueLightController app demonstrates: