Package updates and fixes for modern dotnet on uwp

Author: Arlodotexe

MultiTarget/AvailableTargetFrameworks.props

@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <UwpTargetFramework>uap10.0.17763;net8.0-windows10.0.22621.0;</UwpTargetFramework>
+        <UwpTargetFramework>uap10.0.17763;net8.0-windows10.0.26100.0;</UwpTargetFramework>
         <WinAppSdkTargetFramework>net8.0-windows10.0.22621.0;net7.0-windows10.0.22621.0;net6.0-windows10.0.22621.0;</WinAppSdkTargetFramework>
 
         <WasmHeadTargetFramework>net8.0</WasmHeadTargetFramework>

MultiTarget/EnabledTargetFrameworks.props

@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <UwpTargetFramework>uap10.0.17763;net8.0-windows10.0.22621.0;</UwpTargetFramework>
+        <UwpTargetFramework>uap10.0.17763;net8.0-windows10.0.26100.0;</UwpTargetFramework>
         <WinAppSdkTargetFramework>net8.0-windows10.0.22621.0;net7.0-windows10.0.22621.0;net6.0-windows10.0.22621.0;</WinAppSdkTargetFramework>
 
         <WasmHeadTargetFramework>net8.0</WasmHeadTargetFramework>

MultiTarget/MultiTargetIdentifiers.props

@@ -60,7 +60,7 @@
     <WinUIMajorVersion Condition="'$(HasWinUI)' == 'true' AND '$(IsUwp)' == 'true'">2</WinUIMajorVersion>
     <WinUIMajorVersion Condition="'$(HasWinUI)' == 'true' AND '$(IsWinAppSdk)' == 'true'">3</WinUIMajorVersion>
 
-    <UseUwp Condition="'$(HasWinUI)' == 'true' AND '$(IsUwp)' == 'true'">true</UseUwp>
-    <UseUwpTools Condition="'$(HasWinUI)' == 'true' AND '$(IsUwp)' == 'true'">true</UseUwpTools>
+    <UseUwp Condition="'$(HasWinUI)' == 'true' AND '$(IsUwp)' == 'true' AND $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">true</UseUwp>
+    <UseUwpTools Condition="'$(HasWinUI)' == 'true' AND '$(IsUwp)' == 'true' AND $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">true</UseUwpTools>
   </PropertyGroup>
 </Project>

MultiTarget/NoWarn.props

@@ -3,4 +3,12 @@
   <PropertyGroup Condition="'$(IsUwp)' == 'true' AND $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">
     <NoWarn>$(NoWarn);CA1416;</NoWarn>
   </PropertyGroup>
+
+  <!--
+     WinUI 2 preview suppression
+    'Microsoft.UI.Xaml.*' is for evaluation purposes only and is subject to change or removal in future updates.
+  -->
+  <PropertyGroup Condition="'$(IsUwp)' == 'true'">
+    <NoWarn>$(NoWarn);CS8305;</NoWarn>
+  </PropertyGroup>
 </Project>

MultiTarget/PackageReferences/Uwp.props

@@ -1,6 +1,7 @@
 <Project>
   <ItemGroup>
-    <PackageReference Condition="'$(HasWinUI)' == 'true'" Include="Microsoft.UI.Xaml" Version="2.8.7-prerelease.240725004" />
-    <PackageReference Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'" Include="Microsoft.Windows.CsWinRT" Version="2.1.0-prerelease-ci.240731.2" PrivateAssets="all" />
+    <PackageReference Condition="'$(HasWinUI)' == 'true'" Include="Microsoft.UI.Xaml" Version="2.8.7-ci.240911006" />
+    <PackageReference Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'" Include="Microsoft.Windows.CsWinRT" Version="2.1.3" PrivateAssets="all" />
+    <PackageReference Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'" Include="Microsoft.Web.WebView2" Version="1.0.2783-prerelease" IncludeAssets="none" />
   </ItemGroup>
 </Project>

MultiTarget/WinUI.Extra.props

@@ -17,8 +17,7 @@
     -->
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <SupportedOSPlatformVersion>$(TargetPlatformMinVersion)</SupportedOSPlatformVersion>
-    <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
-    <WindowsSdkPackageVersion>10.0.22621.37-preview</WindowsSdkPackageVersion>
+    <TargetPlatformVersion>10.0.26100.0</TargetPlatformVersion>
   </PropertyGroup>
 
   <!-- Workaround, improved error message when consuming from Uno projects with mismatched TFMs -->
@@ -30,6 +29,9 @@
 
   <PropertyGroup Condition="'$(IsUwp)' == 'true'">
     <Platforms>x86;x64;arm64</Platforms>
+    
+    <WindowsSdkPackageVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.26100.39</WindowsSdkPackageVersion>
+    <RuntimeIdentifiers Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">win-x86;win-x64;win-arm64</RuntimeIdentifiers> 
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(IsWinAppSdk)' == 'true'">

ProjectHeads/App.Head.Uwp.Dependencies.props

@@ -3,7 +3,7 @@
 <Project>
   <ItemGroup>
     <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls.Markdown" Version="7.1.2" />
-    <PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed" Version="3.0.0-local2430.1330" />
+    <PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed" Version="3.0.0-local.240918" />
     <PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
   </ItemGroup>
 </Project>