Bump WinAppSDK to 1.6

.github/dependabot.yml

@@ -41,6 +41,7 @@ updates:
         - "Microsoft.Graphics.Win2D"
         - "Microsoft.Windows.SDK.BuildTools"
         - "Microsoft.WindowsAppSDK"
+        - "Microsoft.Web.WebView2"
     xunit:
       patterns:
         - "xunit"
@@ -57,7 +58,7 @@ updates:
     - dependency-name: "Newtonsoft.Json"                      # needs to be done manually to match VS
     - dependency-name: "Microsoft.Build*"                     # these packages neet to be kept on old version that supports netstandard2.0
     - dependency-name: "Selenium.*"                           # needs to be done manually because other packages need to be compiled with these new versions
-      
+
   labels:
       - "nuget"
       - "dependencies"

Directory.Build.props

@@ -2,7 +2,7 @@
   <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
   <Import Condition="'$(EnvironmentBuildPropsImported)' != 'True'" Project="$(MSBuildThisFileDirectory)eng\Environment.Build.props" />
 
-  <PropertyGroup> 
+  <PropertyGroup>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <DebugType>portable</DebugType>
     <DebugSymbols>true</DebugSymbols>
@@ -43,13 +43,13 @@
     <NuGetAuditMode>all</NuGetAuditMode>
     <NuGetAuditLevel>moderate</NuGetAuditLevel>
   </PropertyGroup>
-    
+
   <PropertyGroup>
     <_MauiDotNetVersionMajor Condition="'$(_MauiDotNetVersionMajor)' == ''">9</_MauiDotNetVersionMajor>
     <_MauiDotNetVersionMinor Condition="'$(_MauiDotNetVersionMinor)' == ''">0</_MauiDotNetVersionMinor>
     <_MauiDotNetVersion Condition="'$(_MauiDotNetVersion)' == ''">$(_MauiDotNetVersionMajor).$(_MauiDotNetVersionMinor)</_MauiDotNetVersion>
     <_MauiDotNetTfm Condition="'$(_MauiDotNetTfm)' == ''">net$(_MauiDotNetVersion)</_MauiDotNetTfm>
-    
+
     <_MauiPreviousDotNetVersionMajor Condition="'$(_MauiPreviousDotNetVersionMajor)' == ''">8</_MauiPreviousDotNetVersionMajor>
     <_MauiPreviousDotNetVersionMinor Condition="'$(_MauiPreviousDotNetVersionMinor)' == ''">0</_MauiPreviousDotNetVersionMinor>
     <_MauiPreviousDotNetVersion Condition="'$(_MauiPreviousDotNetVersion)' == ''">$(_MauiPreviousDotNetVersionMajor).$(_MauiPreviousDotNetVersionMinor)</_MauiPreviousDotNetVersion>
@@ -127,6 +127,11 @@
     <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
   </PropertyGroup>
 
+  <!-- Windows specific settings -->
+  <PropertyGroup Condition="'$(_MauiTargetPlatformIsWindows)' == 'True'">
+    <WindowsSdkPackageVersion>10.0.19041.44</WindowsSdkPackageVersion>
+  </PropertyGroup>
+
   <!-- version number information -->
   <PropertyGroup>
     <!-- Default versions from the SDKs (update when there is a new TFM version) -->
@@ -221,7 +226,7 @@
     <_MauiBuildTasksLocation>$(_MauiBuildTasksLocation)</_MauiBuildTasksLocation>
     <_MauiBuildTasksLocation Condition="'$(_MauiBuildTasksLocation)' == ''">$(MSBuildThisFileDirectory).buildtasks\</_MauiBuildTasksLocation>
     <_MauiAOTProfileLocation>$(MauiSrcDirectory)Controls\src\Build.Tasks\nuget\buildTransitive\netstandard2.0\</_MauiAOTProfileLocation>
-    <StrongNamerKeyFile>$(MauiRootDirectory)eng/microsoft.maui.controls.snk</StrongNamerKeyFile>  
+    <StrongNamerKeyFile>$(MauiRootDirectory)eng/microsoft.maui.controls.snk</StrongNamerKeyFile>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
     <ProduceReferenceAssembly Condition="'$(UsingMicrosoftNETSdk)' == 'True' AND '$(Configuration)' == 'Debug'">True</ProduceReferenceAssembly>
     <ProduceReferenceAssemblyInOutDir>True</ProduceReferenceAssemblyInOutDir>

Directory.Build.targets

@@ -55,8 +55,8 @@
     <TargetPlatformMinVersion>6.5</TargetPlatformMinVersion>
   </PropertyGroup>
 
-  <!-- 
-    NOTE: The Contains('-windows10') is a bit of a hack 
+  <!--
+    NOTE: The Contains('-windows10') is a bit of a hack
     because we don't want to set these properties for WPF projects...
     There's probably a better way we should find to infer this
   -->
@@ -83,9 +83,6 @@
   <ItemGroup Condition=" '$(_MauiTargetPlatformIsWindows)' == 'True' AND '$(IncludeWindowsSDKRefFrameworkReferences)' == 'True'">
     <FrameworkReference Include="Microsoft.Windows.SDK.NET.Ref" IsImplicitlyDefined="true" Pack="false" PrivateAssets="All" />
   </ItemGroup>
-  <PropertyGroup>
-    <WindowsSdkPackageVersion>10.0.19041.34</WindowsSdkPackageVersion>   
-  </PropertyGroup>
 
   <!--
     Workaround for https://github.com/microsoft/WindowsAppSDK/issues/2684

eng/NuGetVersions.targets

@@ -137,6 +137,11 @@
         Version="$(MicrosoftWindowsAppSDKPackageVersion)"
         NoWarn="NU1605"
     />
+    <PackageReference
+        Update="Microsoft.Web.WebView2"
+        Version="$(MicrosoftWindowsWebView2PackageVersion)"
+        NoWarn="NU1605"
+    />
     <PackageReference
         Update="Microsoft.Windows.SDK.BuildTools"
         Version="$(MicrosoftWindowsSDKBuildToolsPackageVersion)"
@@ -254,10 +259,6 @@
         Update="Microsoft.Bcl.AsyncInterfaces"
         Version="$(MicrosoftBclAsyncInterfacesPackageVersion)"
     />
-    <PackageReference
-        Update="Microsoft.Web.WebView2"
-        Version="$(_MicrosoftWebWebView2Version)"
-    />
     <PackageReference
         Update="Microsoft.CodeAnalysis.PublicApiAnalyzers"
         Version="$(MicrosoftCodeAnalysisPublicApiAnalyzersVersion)"

eng/Versions.props

@@ -63,9 +63,10 @@
     <MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-rtm.24469.1</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
     <MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
     <!-- wasdk -->
-    <MicrosoftWindowsAppSDKPackageVersion>1.5.240802000</MicrosoftWindowsAppSDKPackageVersion>
+    <MicrosoftWindowsAppSDKPackageVersion>1.6.240923002</MicrosoftWindowsAppSDKPackageVersion>
     <MicrosoftWindowsSDKBuildToolsPackageVersion>10.0.22621.756</MicrosoftWindowsSDKBuildToolsPackageVersion>
     <MicrosoftGraphicsWin2DPackageVersion>1.2.0</MicrosoftGraphicsWin2DPackageVersion>
+    <MicrosoftWindowsWebView2PackageVersion>1.0.2792.45</MicrosoftWindowsWebView2PackageVersion>
     <!-- Everything else -->
     <MicrosoftAspNetCoreAuthorizationPackageVersion>9.0.0-rtm.24501.7</MicrosoftAspNetCoreAuthorizationPackageVersion>
     <MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>9.0.0-rtm.24501.7</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>
@@ -106,7 +107,6 @@
     <SystemIOUnmanagedMemoryStreamPackageVersion>4.3.0</SystemIOUnmanagedMemoryStreamPackageVersion>
     <SystemObjectModelPackageVersion>4.3.0</SystemObjectModelPackageVersion>
     <SystemRuntimeCompilerServicesUnsafePackageVersion>6.0.0</SystemRuntimeCompilerServicesUnsafePackageVersion>
-    <_MicrosoftWebWebView2Version>1.0.2592.51</_MicrosoftWebWebView2Version>
     <!-- GLIDE - the android maven artifact in /src/Core/AndroidNative/maui/build.gradle -->
     <!-- must be kept in sync with the binding library version to it here: -->
     <_XamarinAndroidGlideVersion>4.16.0.6</_XamarinAndroidGlideVersion>

eng/pipelines/common/maui-templates.yml

@@ -107,6 +107,18 @@ jobs:
       displayName: Run $(PLATFORM_NAME) templates build tests
       workingDirectory: ${{ parameters.checkoutDirectory }}
 
+    - task: CopyFiles@2
+      displayName: Copy binlogs
+      inputs:
+        SourceFolder: '$(Build.SourcesDirectory)'
+        Contents: |
+          **/*.binlog
+          ../**/*.binlog
+          ../../**/*.binlog
+        TargetFolder: '$(Build.StagingDirectory)/IntegrationTestsBuildLogs'
+      continueOnError: true
+      condition: succeededOrFailed()
+
     - task: PublishTestResults@2
       displayName: Publish the $(PLATFORM_NAME) templates build tests
       condition: always()

src/Compatibility/ControlGallery/src/WinUI/Compatibility.ControlGallery.WinUI.csproj

@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>$(_MauiDotNetTfm)-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>$(_MauiDotNetTfm)-windows$(WindowsTargetFrameworkVersion)</TargetFramework>
     <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
     <RootNamespace>Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI</RootNamespace>
     <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -20,9 +20,6 @@
   <ItemGroup Condition="'$(IncludeWindowsSDKRefFrameworkReferences)' == 'True'">
     <FrameworkReference Include="Microsoft.Windows.SDK.NET.Ref" IsImplicitlyDefined="true" Pack="false" PrivateAssets="All" />
   </ItemGroup>
-  <PropertyGroup>
-    <WindowsSdkPackageVersion>10.0.19041.34</WindowsSdkPackageVersion>   
-  </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Core\Compatibility.ControlGallery.Core.csproj" />
@@ -39,6 +36,10 @@
     </AppxManifest>
   </ItemGroup>
 
+  <ItemGroup Condition="'$(IncludeWindowsSDKRefFrameworkReferences)' == 'True'">
+    <FrameworkReference Include="Microsoft.Windows.SDK.NET.Ref" IsImplicitlyDefined="true" Pack="false" PrivateAssets="All" />
+  </ItemGroup>
+
   <ItemGroup>
     <Content Include="bank.png" />
     <Content Include="calculator.png" />
@@ -110,7 +111,7 @@
     <None Include="Compatibility\**\*.cs" />
     <Compile Remove="Compatibility\**\*.cs" />
   </ItemGroup>
-  
+
   <Import Project="$(MauiSrcDirectory)Maui.InTree.props" Condition=" '$(UseMaui)' != 'true' " />
 
 </Project>

src/Compatibility/Core/src/Compatibility.csproj

@@ -9,7 +9,7 @@
     <iOSRoot>iOS\</iOSRoot>
     <WindowsRoot>Windows\</WindowsRoot>
     <TizenRoot>Tizen\</TizenRoot>
-    <IsAotCompatible Condition="!$(TargetFramework.StartsWith('netstandard'))">true</IsAotCompatible>
+    <IsAotCompatible Condition="!$(TargetFramework.StartsWith('netstandard')) and $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) != 'windows'">true</IsAotCompatible>
     <MauiGenerateResourceDesigner>true</MauiGenerateResourceDesigner>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);CS1591;CS0672;CS0618</NoWarn>
@@ -50,9 +50,6 @@
         <Link>Windows\BootstrapHelper.cs</Link>
     </Compile>
   </ItemGroup>
-  <ItemGroup Condition="$(TargetFramework.Contains('-windows')) == true ">
-  </ItemGroup>
-
   <PropertyGroup>
     <InterceptorsPreviewNamespaces>$(InterceptorsPreviewNamespaces);Microsoft.Maui.Controls.Generated</InterceptorsPreviewNamespaces>
     <!-- https://github.com/dotnet/msbuild/issues/9785 -->

src/Controls/samples/Controls.Sample.Sandbox/MainPage.xaml

@@ -1,7 +1,5 @@
-<ContentPage
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    x:Class="Maui.Controls.Sample.MainPage"
-    xmlns:local="clr-namespace:Maui.Controls.Sample">
-
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Maui.Controls.Sample.MainPage"
+             xmlns:local="clr-namespace:Maui.Controls.Sample">
 </ContentPage>

src/Controls/src/Core/Compatibility/Handlers/ListView/Windows/CellControl.cs

@@ -21,7 +21,7 @@
 
 namespace Microsoft.Maui.Controls.Platform.Compatibility
 {
-	public class CellControl : ContentControl
+	public partial class CellControl : ContentControl
 	{
 		public static readonly DependencyProperty CellProperty = DependencyProperty.Register("Cell", typeof(object), typeof(CellControl),
 			new PropertyMetadata(null, (o, e) => ((CellControl)o).SetSource((Cell)e.OldValue, (Cell)e.NewValue)));

src/Controls/src/Core/Compatibility/Handlers/ListView/Windows/EntryCellTextBox.cs

@@ -5,7 +5,7 @@
 
 namespace Microsoft.Maui.Controls.Platform.Compatibility
 {
-	public class EntryCellTextBox : TextBox
+	public partial class EntryCellTextBox : TextBox
 	{
 		protected override void OnKeyUp(KeyRoutedEventArgs e)
 		{

src/Controls/src/Core/Compatibility/Handlers/ListView/Windows/ListGroupHeaderPresenter.cs

@@ -6,7 +6,7 @@
 
 namespace Microsoft.Maui.Controls.Platform.Compatibility
 {
-	public class ListGroupHeaderPresenter : Microsoft.UI.Xaml.Controls.ContentPresenter
+	public partial class ListGroupHeaderPresenter : Microsoft.UI.Xaml.Controls.ContentPresenter
 	{
 		void OnTapped(object sender, TappedRoutedEventArgs tappedRoutedEventArgs)
 		{

src/Controls/src/Core/Compatibility/Handlers/ListView/Windows/ListViewGroupStyleSelector.cs

@@ -3,7 +3,7 @@
 
 namespace Microsoft.Maui.Controls.Platform.Compatibility
 {
-	public class ListViewGroupStyleSelector : GroupStyleSelector
+	public partial class ListViewGroupStyleSelector : GroupStyleSelector
 	{
 		protected override GroupStyle SelectGroupStyleCore(object group, uint level)
 		{

src/Controls/src/Core/Compatibility/Handlers/ListView/Windows/ListViewRenderer.cs

@@ -30,7 +30,7 @@
 
 namespace Microsoft.Maui.Controls.Handlers.Compatibility
 {
-	public class ListViewRenderer : ViewRenderer<ListView, FrameworkElement>
+	public partial class ListViewRenderer : ViewRenderer<ListView, FrameworkElement>
 	{
 		public static PropertyMapper<ListView, ListViewRenderer> Mapper =
 				new PropertyMapper<ListView, ListViewRenderer>(VisualElementRendererMapper);
@@ -57,7 +57,7 @@ public ListViewRenderer() : base(Mapper, CommandMapper)
 			AutoPackage = false;
 		}
 
-		internal sealed class ListViewTransparent : WListView
+		internal sealed partial class ListViewTransparent : WListView
 		{
 			internal ListViewRenderer ListViewRenderer { get; }
 			public ListViewTransparent(ListViewRenderer listViewRenderer) : base()

src/Controls/src/Core/Compatibility/Handlers/TableView/Windows/TableViewRenderer.cs

@@ -9,7 +9,7 @@
 
 namespace Microsoft.Maui.Controls.Handlers.Compatibility
 {
-	public class TableViewRenderer : ViewRenderer<TableView, Microsoft.UI.Xaml.Controls.ListView>
+	public partial class TableViewRenderer : ViewRenderer<TableView, Microsoft.UI.Xaml.Controls.ListView>
 	{
 		bool _ignoreSelectionEvent;
 		bool _disposed;

src/Controls/src/Core/Compatibility/Handlers/Windows/FrameRenderer.cs

@@ -12,7 +12,7 @@
 namespace Microsoft.Maui.Controls.Handlers.Compatibility
 {
 	[Obsolete("Frame is obsolete as of .NET 9. Please use Border instead.")]
-	public class FrameRenderer : ViewRenderer<Frame, WBorder>
+	public partial class FrameRenderer : ViewRenderer<Frame, WBorder>
 	{
 		public static IPropertyMapper<Frame, FrameRenderer> Mapper
 			= new PropertyMapper<Frame, FrameRenderer>(VisualElementRendererMapper)

src/Controls/src/Core/Compatibility/Windows/CaseConverter.cs

@@ -4,7 +4,7 @@
 
 namespace Microsoft.Maui.Controls.Platform.Compatibility
 {
-	public class CaseConverter : Microsoft.UI.Xaml.Data.IValueConverter
+	public partial class CaseConverter : Microsoft.UI.Xaml.Data.IValueConverter
 	{
 		public bool ConvertToUpper { get; set; }
 

src/Controls/src/Core/Compatibility/Windows/CollapseWhenEmptyConverter.cs

@@ -4,7 +4,7 @@
 
 namespace Microsoft.Maui.Controls.Platform.Compatibility
 {
-	public class CollapseWhenEmptyConverter : Microsoft.UI.Xaml.Data.IValueConverter
+	public partial class CollapseWhenEmptyConverter : Microsoft.UI.Xaml.Data.IValueConverter
 	{
 		public object Convert(object value, Type targetType, object parameter, string language)
 		{

src/Controls/src/Core/Compatibility/Windows/ColorConverter.cs

@@ -8,7 +8,7 @@
 
 namespace Microsoft.Maui.Controls.Platform.Compatibility
 {
-	public sealed class ColorConverter : Microsoft.UI.Xaml.Data.IValueConverter
+	public sealed partial class ColorConverter : Microsoft.UI.Xaml.Data.IValueConverter
 	{
 		public object Convert(object value, Type targetType, object parameter, string language)
 		{

src/Controls/src/Core/Compatibility/Windows/HeightConverter.cs

@@ -3,7 +3,7 @@
 
 namespace Microsoft.Maui.Controls.Platform.Compatibility
 {
-	public sealed class HeightConverter : Microsoft.UI.Xaml.Data.IValueConverter
+	public sealed partial class HeightConverter : Microsoft.UI.Xaml.Data.IValueConverter
 	{
 		public object Convert(object value, Type targetType, object parameter, string language)
 		{

src/Controls/src/Core/Compatibility/Windows/HorizontalTextAlignmentConverter.cs

@@ -3,7 +3,7 @@
 
 namespace Microsoft.Maui.Controls.Platform.Compatibility
 {
-	public class HorizontalTextAlignmentConverter : Microsoft.UI.Xaml.Data.IValueConverter
+	public partial class HorizontalTextAlignmentConverter : Microsoft.UI.Xaml.Data.IValueConverter
 	{
 		public object Convert(object value, Type targetType, object parameter, string language)
 		{

src/Controls/src/Core/Compatibility/Windows/KeyboardConverter.cs

@@ -5,7 +5,7 @@
 
 namespace Microsoft.Maui.Controls.Platform.Compatibility
 {
-	public class KeyboardConverter : Microsoft.UI.Xaml.Data.IValueConverter
+	public partial class KeyboardConverter : Microsoft.UI.Xaml.Data.IValueConverter
 	{
 		public object Convert(object value, Type targetType, object parameter, string language)
 		{

src/Controls/src/Core/Handlers/Items/SelectableItemsViewHandler.Windows.cs

@@ -210,7 +210,7 @@ protected override void UpdateItemsSource()
 			_ignorePlatformSelectionChange = false;
 		}
 
-		class SelectionModeConvert : Microsoft.UI.Xaml.Data.IValueConverter
+		partial class SelectionModeConvert : Microsoft.UI.Xaml.Data.IValueConverter
 		{
 			public object Convert(object value, Type targetType, object parameter, string language)
 			{

src/Controls/src/Core/Handlers/Shell/Windows/ShellFlyoutItemView.cs

@@ -9,7 +9,7 @@
 
 namespace Microsoft.Maui.Controls.Platform
 {
-	public class ShellFlyoutItemView : ContentControl
+	public partial class ShellFlyoutItemView : ContentControl
 	{
 		public static readonly DependencyProperty IsSelectedProperty = DependencyProperty.Register(
 			nameof(IsSelected), typeof(bool), typeof(ShellFlyoutItemView),

src/Controls/src/Core/Handlers/Shell/Windows/ShellFlyoutTemplateSelector.cs

@@ -4,7 +4,7 @@
 
 namespace Microsoft.Maui.Controls.Platform
 {
-	public class ShellFlyoutTemplateSelector : Microsoft.UI.Xaml.Controls.DataTemplateSelector
+	public partial class ShellFlyoutTemplateSelector : Microsoft.UI.Xaml.Controls.DataTemplateSelector
 	{
 		Microsoft.UI.Xaml.DataTemplate BaseShellItemTemplate { get; }
 		Microsoft.UI.Xaml.DataTemplate MenuItemTemplate { get; }

src/Controls/src/Core/Handlers/Shell/Windows/ShellFooterView.cs

@@ -7,7 +7,7 @@
 
 namespace Microsoft.Maui.Controls.Platform
 {
-	public class ShellFooterView : Microsoft.UI.Xaml.Controls.ContentControl
+	public partial class ShellFooterView : Microsoft.UI.Xaml.Controls.ContentControl
 	{
 		Shell _shell;
 

src/Controls/src/Core/Handlers/Shell/Windows/ShellHeaderView.cs

@@ -4,7 +4,7 @@
 
 namespace Microsoft.Maui.Controls.Platform
 {
-	public class ShellHeaderView : UI.Xaml.Controls.ContentControl
+	public partial class ShellHeaderView : UI.Xaml.Controls.ContentControl
 	{
 		Shell _shell;