Merge pull request #174 from unoplatform/dev/jela/net6

feat: Add .NET 6 mobile support
unoplatform · Mar 23, 2022 · 12261e2 · 12261e2
2 parents db22867 + c384499
commit 12261e2
Show file tree

Hide file tree

Showing 25 changed files with 1,910 additions and 25,461 deletions.
diff --git a/.vsts-ci.yml b/.vsts-ci.yml
@@ -6,7 +6,7 @@ jobs:
 - job: Windows
 
   pool:
-    vmImage: 'windows-2019'
+    vmImage: 'windows-2022'
 
   variables: 
     BuildConfiguration: Release
@@ -37,11 +37,14 @@ jobs:
 
   - task: BatchScript@1
     inputs:
-      filename: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\Common7\\Tools\\VsDevCmd.bat"
+      filename: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Common7\\Tools\\VsDevCmd.bat"
       arguments: -no_logo
       modifyEnvironment: true
     displayName: Setup Environment Variables
 
+  - powershell: .\build\Install-WindowsSdkISO.ps1 18362
+    displayName: Install Windows SDK 18362
+
   - task: NuGetToolInstaller@0
     displayName: Use NuGet 5.6.0
     inputs:
@@ -59,6 +62,9 @@ jobs:
       version: '5.0.402'
     displayName: Use .NET SDK 5.0.402
 
+  - template: build/ci/dotnet-install-windows.yml
+  - template: build/ci/jdk-setup.yml
+
   - task: DotNetCoreCLI@2  
     inputs:
       command: custom

diff --git a/CommunityToolkit.WinUI.Connectivity/CommunityToolkit.WinUI.Connectivity.csproj b/CommunityToolkit.WinUI.Connectivity/CommunityToolkit.WinUI.Connectivity.csproj
@@ -21,8 +21,8 @@
 		<PackageId>Uno.CommunityToolkit.WinUI.Connectivity</PackageId>
 	</PropertyGroup>
 
-	<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
-		<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5688" />
+  <ItemGroup Condition="'$(_IsUno)'=='true'">
+    <PackageReference Include="Uno.WinUI" Version="4.1.9" />
 	</ItemGroup>
 	<!-- END UNO SPECIFIC -->
 </Project>
diff --git a/CommunityToolkit.WinUI.DeveloperTools/CommunityToolkit.WinUI.DeveloperTools.csproj b/CommunityToolkit.WinUI.DeveloperTools/CommunityToolkit.WinUI.DeveloperTools.csproj
@@ -26,8 +26,8 @@
 		<PackageId>Uno.CommunityToolkit.WinUI.DeveloperTools</PackageId>
 	</PropertyGroup>
 
-	<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
-		<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5688" />
+  <ItemGroup Condition="'$(_IsUno)'=='true'">
+    <PackageReference Include="Uno.WinUI" Version="4.1.9" />
 	</ItemGroup>
 	<!-- END UNO SPECIFIC -->
 

diff --git a/CommunityToolkit.WinUI.SampleApp.Droid/CommunityToolkit.WinUI.SampleApp.Droid.csproj b/CommunityToolkit.WinUI.SampleApp.Droid/CommunityToolkit.WinUI.SampleApp.Droid.csproj
@@ -89,10 +89,10 @@
     <PackageReference Include="Uno.WinUI.Sample.Banner" Version="1.44.0-dev.42" />
     <PackageReference Include="Uno.UniversalImageLoader" Version="1.9.33" />
     <PackageReference Include="Uno.Microsoft.Xaml.Behaviors.WinUI.Managed">
-      <Version>2.3.0-uno.12</Version>
+      <Version>2.3.1-uno.2</Version>
     </PackageReference>
-    <PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5688" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.0-dev.5688" />
+    <PackageReference Include="Uno.WinUI" Version="4.1.9" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.1.9" />
     <PackageReference Include="System.Text.Json" Version="4.7.2" />
   </ItemGroup>
   <ItemGroup>

diff --git a/CommunityToolkit.WinUI.SampleApp.Droid/Resources/Resource.designer.cs b/CommunityToolkit.WinUI.SampleApp.Droid/Resources/Resource.designer.cs
diff --git a/CommunityToolkit.WinUI.SampleApp.Skia.Gtk/CommunityToolkit.WinUI.SampleApp.Skia.Gtk.csproj b/CommunityToolkit.WinUI.SampleApp.Skia.Gtk/CommunityToolkit.WinUI.SampleApp.Skia.Gtk.csproj
@@ -26,9 +26,9 @@
     <!-- Note that for WebAssembly version 1.1.1 of the console logger required -->
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
-    <PackageReference Include="Uno.WinUI.Skia.Gtk" Version="4.0.0-dev.5688" />
-    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.0.0-dev.5688" Condition="'$(Configuration)'=='Debug'" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.0-dev.5688" />
+    <PackageReference Include="Uno.WinUI.Skia.Gtk" Version="4.1.9" />
+    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.1.9" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.1.9" />
 		<PackageReference Include="System.Text.Json" Version="4.7.2" />
     <PackageReference Include="Uno.WinUI.Sample.Banner" Version="1.44.0-dev.42" />
 	</ItemGroup>

diff --git a/CommunityToolkit.WinUI.SampleApp.Wasm/CommunityToolkit.WinUI.SampleApp.Wasm.csproj b/CommunityToolkit.WinUI.SampleApp.Wasm/CommunityToolkit.WinUI.SampleApp.Wasm.csproj
@@ -27,7 +27,7 @@
 	-->
 
   <ItemGroup>
-    <PackageReference Include="Uno.WinUI.WebAssembly" Version="4.0.0-dev.5688" />
+    <PackageReference Include="Uno.WinUI.WebAssembly" Version="4.1.9" />
     <PackageReference Include="Uno.Wasm.Bootstrap" Version="3.0.0" />
     <PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="3.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
@@ -38,7 +38,7 @@
     <Reference Include="System.Net.Http" />
     <PackageReference Include="System.Text.Json" Version="4.7.2" />
     <PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.1" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.0-dev.5688" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.1.9" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/CommunityToolkit.WinUI.SampleApp.iOS/CommunityToolkit.WinUI.SampleApp.iOS.csproj b/CommunityToolkit.WinUI.SampleApp.iOS/CommunityToolkit.WinUI.SampleApp.iOS.csproj
@@ -116,10 +116,10 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
     <PackageReference Include="Uno.WinUI.Sample.Banner" Version="1.44.0-dev.42" />
-    <PackageReference Include="Uno.Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.3.0-uno.12" />
-    <PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5688" />
+    <PackageReference Include="Uno.Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.3.1-uno.2" />
+    <PackageReference Include="Uno.WinUI" Version="4.1.9" />
     <PackageReference Include="System.Text.Json" Version="4.7.2" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.0-dev.5688" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.1.9" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.Toolkit.Parsers\Microsoft.Toolkit.Parsers.csproj">

diff --git a/CommunityToolkit.WinUI.UI.Animations/CommunityToolkit.WinUI.UI.Animations.csproj b/CommunityToolkit.WinUI.UI.Animations/CommunityToolkit.WinUI.UI.Animations.csproj
@@ -32,8 +32,8 @@
 		<PackageId>Uno.CommunityToolkit.WinUI.UI.Animations</PackageId>
 	</PropertyGroup>
 
-	<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
-		<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5688" />
+  <ItemGroup Condition="'$(_IsUno)'=='true'">
+    <PackageReference Include="Uno.WinUI" Version="4.1.9" />
 
 		<Compile Remove="Effects\Blur.cs" />
 		<Compile Remove="Effects\Saturation.cs" />

diff --git a/CommunityToolkit.WinUI.UI.Behaviors/CommunityToolkit.WinUI.UI.Behaviors.csproj b/CommunityToolkit.WinUI.UI.Behaviors/CommunityToolkit.WinUI.UI.Behaviors.csproj
@@ -44,10 +44,10 @@
   <ItemGroup>
     <PackageReference Remove="Microsoft.Xaml.Behaviors.WinUI.Managed" />
   </ItemGroup>
-	
-	<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
-		<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5688" />
-		<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.3.0-uno.12" />
+
+  <ItemGroup Condition="'$(_IsUno)'=='true'">
+    <PackageReference Include="Uno.WinUI" Version="4.1.9" />
+		<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.3.1-uno.2" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net5.0-windows10.0.18362.0'">

diff --git a/CommunityToolkit.WinUI.UI.Controls.Core/CommunityToolkit.WinUI.UI.Controls.Core.csproj b/CommunityToolkit.WinUI.UI.Controls.Core/CommunityToolkit.WinUI.UI.Controls.Core.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
     <TargetFrameworks>net5.0-windows10.0.18362.0</TargetFrameworks>
@@ -62,9 +62,9 @@
       <!-- Validation fails as the generated document is too big -->
 		<XamarinAndroidSupportSkipVerifyVersions>true</XamarinAndroidSupportSkipVerifyVersions>
 	</PropertyGroup>
-	<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
-		<PackageReference Remove="Microsoft.UI.Xaml" />
-		<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5688" />
+  <ItemGroup Condition="'$(_IsUno)'=='true'">
+    <PackageReference Remove="Microsoft.UI.Xaml" />
+		<PackageReference Include="Uno.WinUI" Version="4.1.9" />
 	</ItemGroup>
 	<!-- END UNO SPECIFIC -->
 

diff --git a/...nityToolkit.WinUI.UI.Controls.DataGrid/CommunityToolkit.WinUI.UI.Controls.DataGrid.csproj b/...nityToolkit.WinUI.UI.Controls.DataGrid/CommunityToolkit.WinUI.UI.Controls.DataGrid.csproj
@@ -37,10 +37,10 @@
 		<PackageId>Uno.CommunityToolkit.WinUI.UI.Controls.DataGrid</PackageId>
 	</PropertyGroup>
 
-	<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
+  <ItemGroup Condition="'$(_IsUno)'=='true'">
     <PackageReference Remove="Microsoft.UI.Xaml" />
 		<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
-		<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5688" />
+		<PackageReference Include="Uno.WinUI" Version="4.1.9" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'monoandroid11.0' or '$(TargetFramework)' == 'xamarinios10' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">

diff --git a/CommunityToolkit.WinUI.UI.Controls.Input/CommunityToolkit.WinUI.UI.Controls.Input.csproj b/CommunityToolkit.WinUI.UI.Controls.Input/CommunityToolkit.WinUI.UI.Controls.Input.csproj
@@ -53,9 +53,9 @@
     <!-- Validation fails as the generated document is too big -->
     <XamarinAndroidSupportSkipVerifyVersions>true</XamarinAndroidSupportSkipVerifyVersions>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
+  <ItemGroup Condition="'$(_IsUno)'=='true'">
     <PackageReference Remove="Microsoft.UI.Xaml" />
-    <PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5688" />
+    <PackageReference Include="Uno.WinUI" Version="4.1.9" />
 
     <Page Remove="RichSuggestBox/**/*.xaml" />
     <Compile Remove="RichSuggestBox/**/*.cs" />

diff --git a/CommunityToolkit.WinUI.UI.Controls.Layout/CommunityToolkit.WinUI.UI.Controls.Layout.csproj b/CommunityToolkit.WinUI.UI.Controls.Layout/CommunityToolkit.WinUI.UI.Controls.Layout.csproj
@@ -54,9 +54,9 @@
     <!-- Validation fails as the generated document is too big -->
       <XamarinAndroidSupportSkipVerifyVersions>true</XamarinAndroidSupportSkipVerifyVersions>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
-      <PackageReference Remove="Microsoft.UI.Xaml" />
-      <PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5688" />
+  <ItemGroup Condition="'$(_IsUno)'=='true'">
+    <PackageReference Remove="Microsoft.UI.Xaml" />
+      <PackageReference Include="Uno.WinUI" Version="4.1.9" />
   </ItemGroup>
   <!-- END UNO SPECIFIC -->
 </Project>
diff --git a/...nityToolkit.WinUI.UI.Controls.Markdown/CommunityToolkit.WinUI.UI.Controls.Markdown.csproj b/...nityToolkit.WinUI.UI.Controls.Markdown/CommunityToolkit.WinUI.UI.Controls.Markdown.csproj
@@ -49,9 +49,9 @@
         <!-- Validation fails as the generated document is too big -->
 		<XamarinAndroidSupportSkipVerifyVersions>true</XamarinAndroidSupportSkipVerifyVersions>
 	</PropertyGroup>
-	<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
-		<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5688" />
-		<PackageReference Include="Uno.ColorCode.WinUI" Version="2.1.0-uno.32" />
+  <ItemGroup Condition="'$(_IsUno)'=='true'">
+    <PackageReference Include="Uno.WinUI" Version="4.1.9" />
+		<PackageReference Include="Uno.ColorCode.WinUI" Version="2.1.0-uno.36" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'monoandroid11.0' or '$(TargetFramework)' == 'xamarinios10' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">

diff --git a/CommunityToolkit.WinUI.UI.Controls.Media/CommunityToolkit.WinUI.UI.Controls.Media.csproj b/CommunityToolkit.WinUI.UI.Controls.Media/CommunityToolkit.WinUI.UI.Controls.Media.csproj
@@ -47,8 +47,8 @@
       <!-- Validation fails as the generated document is too big -->
 		<XamarinAndroidSupportSkipVerifyVersions>true</XamarinAndroidSupportSkipVerifyVersions>
 	</PropertyGroup>
-	<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
-		<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5688" />
+  <ItemGroup Condition="'$(_IsUno)'=='true'">
+    <PackageReference Include="Uno.WinUI" Version="4.1.9" />
 
 		<Page Remove="Eyedropper/**/*.xaml" />
 		<Page Remove="InfiniteCanvas/**/*.xaml" />

diff --git a/...Toolkit.WinUI.UI.Controls.Primitives/CommunityToolkit.WinUI.UI.Controls.Primitives.csproj b/...Toolkit.WinUI.UI.Controls.Primitives/CommunityToolkit.WinUI.UI.Controls.Primitives.csproj
@@ -51,9 +51,9 @@
       <!-- Validation fails as the generated document is too big -->
 		<XamarinAndroidSupportSkipVerifyVersions>true</XamarinAndroidSupportSkipVerifyVersions>
 	</PropertyGroup>
-	<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
-		<PackageReference Remove="Microsoft.UI.Xaml" />
-		<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5688" />
+  <ItemGroup Condition="'$(_IsUno)'=='true'">
+    <PackageReference Remove="Microsoft.UI.Xaml" />
+		<PackageReference Include="Uno.WinUI" Version="4.1.9" />
 	</ItemGroup>
 	<!-- END UNO SPECIFIC -->
 

diff --git a/CommunityToolkit.WinUI.UI.Media/CommunityToolkit.WinUI.UI.Media.csproj b/CommunityToolkit.WinUI.UI.Media/CommunityToolkit.WinUI.UI.Media.csproj
@@ -64,8 +64,8 @@
     <!-- Validation fails as the generated document is too big -->
     <XamarinAndroidSupportSkipVerifyVersions>true</XamarinAndroidSupportSkipVerifyVersions>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
-    <PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5688" />
+  <ItemGroup Condition="'$(_IsUno)'=='true'">
+    <PackageReference Include="Uno.WinUI" Version="4.1.9" />
 
 
     <Compile Remove="Brushes\**\*.cs" />

diff --git a/CommunityToolkit.WinUI.UI/CommunityToolkit.WinUI.UI.csproj b/CommunityToolkit.WinUI.UI/CommunityToolkit.WinUI.UI.csproj
@@ -60,9 +60,9 @@
 		<PackageId>Uno.CommunityToolkit.WinUI.UI</PackageId>
 	</PropertyGroup>
 
-	<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
-		<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5688" />
-		<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.3.0-uno.12" />
+  <ItemGroup Condition="'$(_IsUno)'=='true'">
+    <PackageReference Include="Uno.WinUI" Version="4.1.9" />
+		<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.3.1-uno.2" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)'=='uap10.0.17763'">

diff --git a/CommunityToolkit.WinUI/CommunityToolkit.WinUI.csproj b/CommunityToolkit.WinUI/CommunityToolkit.WinUI.csproj
@@ -21,8 +21,8 @@
     <PackageId>Uno.CommunityToolkit.WinUI</PackageId>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
-    <PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5688" />
+  <ItemGroup Condition="'$(_IsUno)'=='true'">
+    <PackageReference Include="Uno.WinUI" Version="4.1.9" />
   </ItemGroup>
 
   <!-- END UNO SPECIFIC -->

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -94,7 +94,8 @@
 	<!-- BEGIN Uno Specific -->
 
 	<PropertyGroup>
-      <TargetFrameworksOverride>MonoAndroid11.0;xamarinios10;netstandard2.0;xamarinmac20</TargetFrameworksOverride>
+      <TargetFrameworksOverride>MonoAndroid11.0;xamarinios10;netstandard2.0;xamarinmac20;net6.0-ios;net6.0-macos;net6.0-android;net6.0-maccatalyst</TargetFrameworksOverride>
+      <_IsUno>true</_IsUno>
       <!--<TargetFrameworksOverride>netstandard2.0</TargetFrameworksOverride>-->
 
       <NoWarn>$(NoWarn);SA1633</NoWarn>
@@ -108,7 +109,7 @@
 	<!--<TargetFrameworksOverride>netstandard2.0</TargetFrameworksOverride>-->
 	</PropertyGroup>
 
-	<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'MonoAndroid80' or '$(TargetFramework)' == 'xamarinios10' ">
+	<PropertyGroup Condition=" '$(_IsUno)'=='true' ">
 		<NoWarn>$(NoWarn);CS0649;CS0067;CS1998</NoWarn>
 	</PropertyGroup>
 
@@ -120,15 +121,15 @@
 		<JavaSdkDirectory Condition="'$(JavaSdkDirectory)'=='' and '$(JAVA_HOME_8_X64)'!=''">$(JAVA_HOME_8_X64)</JavaSdkDirectory>
 	</PropertyGroup>
 
-    <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'MonoAndroid80' or '$(TargetFramework)' == 'xamarinios10' ">
+    <PropertyGroup Condition=" '$(_IsUno)'=='true' ">
       <ExtrasEnableDefaultPageItems>false</ExtrasEnableDefaultPageItems>
     </PropertyGroup>
 
   <PropertyGroup>
     <EnableDefaultPageItems>false</EnableDefaultPageItems>
   </PropertyGroup>
 
-    <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'MonoAndroid80' or '$(TargetFramework)' == 'xamarinios10' ">
+    <ItemGroup Condition=" '$(_IsUno)'=='true' ">
       <None Remove="$(MSBuildProjectDirectory)\**\*.xaml"/>
       <Page Include="$(MSBuildProjectDirectory)\**\*.xaml" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(ExtrasDefaultPageExcludes)" 
             XamlRuntime="WinUI" />

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -36,7 +36,7 @@
 	<ItemGroup Condition="'$(UnoUIVersionOverride)'!=''">
 		<!-- Force all projects to use the same uno version to avoid net5 build issues on linux -->
 		<PackageReference Update="Uno.WinUI"
-											Version="4.0.0-dev.5688" />
+											Version="4.1.9" />
 	</ItemGroup>
 	<!-- END Uno Specific -->
 

diff --git a/build/Windows.Toolkit.Common.props b/build/Windows.Toolkit.Common.props
@@ -26,7 +26,7 @@
     <TargetPlatformBaseVersion>10.0</TargetPlatformBaseVersion>
     <TargetPlatformRevision>18362</TargetPlatformRevision>
     <TargetPlatformMinRevision>17763</TargetPlatformMinRevision>
-    <WindowsAppSDKVersion>1.0.0-preview2</WindowsAppSDKVersion>
+    <WindowsAppSDKVersion>1.0.1</WindowsAppSDKVersion>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/build/ci/dotnet-install-windows.yml b/build/ci/dotnet-install-windows.yml
@@ -0,0 +1,32 @@
+parameters:
+  DotNetVersion: '6.0.300-preview.22154.4'
+  UnoCheck_Version: '1.1.0-dev.22'
+  UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/d14571a546b55f58e51e392c04cf098168d6fe2d/manifests/uno.ui-preview.manifest.json'
+
+steps:
+
+  # Required until .NET 6 installs properly on Windows using UseDotnet
+  # using preview builds
+  - powershell: |
+      $ProgressPreference = 'SilentlyContinue'
+      Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -OutFile dotnet-install.ps1
+      & .\dotnet-install.ps1 -Version ${{ parameters.DotNetVersion }} -InstallDir "$env:ProgramFiles\dotnet\" -Verbose
+      & dotnet --list-sdks
+    displayName: Install .NET ${{ parameters.DotNetVersion }}
+    errorActionPreference: stop
+    retryCountOnTaskFailure: 3
+  #- task: UseDotNet@2
+  #  displayName: 'Use .NET Core SDK ${{ parameters.DotNetVersion }}'
+  #  retryCountOnTaskFailure: 3
+  #  inputs:
+  #    packageType: sdk
+  #    version: ${{ parameters.DotNetVersion }}
+  #    includePreviewVersions: true
+
+  - powershell: |
+      & dotnet tool update --global uno.check --version ${{ parameters.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json
+      & uno-check -v --ci --non-interactive --fix --skip xcode --skip gtk3 --skip vswin --skip androidemulator --skip androidsdk --skip vsmac --manifest ${{ parameters.UnoCheck_Manifest }}
+    displayName: Install .NET Workloads
+    errorActionPreference: continue
+    ignoreLASTEXITCODE: true
+    retryCountOnTaskFailure: 3
diff --git a/build/ci/jdk-setup.yml b/build/ci/jdk-setup.yml
@@ -0,0 +1,6 @@
+steps:
+
+  - pwsh: |
+      echo "##vso[task.setvariable variable=JAVA_HOME]$(JAVA_HOME_11_X64)"
+      echo "##vso[task.setvariable variable=JavaSdkDirectory]$(JAVA_HOME_11_X64)"
+    displayName: Select JDK 11