Update to Windows App SDK 1.8

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Win2D Changelog
 
+## Win2D-WinUI 1.4.0
+_February ??, 2026_
+- Update WindowsAppSDK to use WindowsAppSDK.WinUI package and 1.8.260204000
+- Update BuildTools version to 10.0.28000.1-RTM
+- Update CsWinRT to 2.2.0
+
 ## Win2D-WinUI 1.3.2
 _January 22nd, 2025_
 - Enable transitive MSBuild configuration

build/WindowsAppSdk.common.props

@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
+        <CsWinRTVersion>2.2.0</CsWinRTVersion>
         <!-- This value controls all of the projects consuming the WindowsAppSdk and centralizes it in one spot.
             When updating the version, don't forget to update all of the package.config files as well.
             The AzureDevOps pipeline will override the version here by setting NIGHTLY_WINAPPSDK_VERSION in the nightly build.
             That nightly version is read from \eng\Version.Details.xml -->
-        <WindowsAppSdkVersion Condition="'$(NIGHTLY_WINAPPSDK_VERSION)' == ''">1.6.241114003</WindowsAppSdkVersion>
+        <WindowsAppSdkVersion Condition="'$(NIGHTLY_WINAPPSDK_VERSION)' == ''">1.8.260204000</WindowsAppSdkVersion>
         <WindowsAppSdkVersion Condition="'$(NIGHTLY_WINAPPSDK_VERSION)' != ''">$(NIGHTLY_WINAPPSDK_VERSION)</WindowsAppSdkVersion>
 
         <_PackagesPath>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\packages'))</_PackagesPath>
-        <_WindowsAppSdkPackageRoot>$(_PackagesPath)\Microsoft.WindowsAppSdk.$(WindowsAppSdkVersion)</_WindowsAppSdkPackageRoot>
+        <_WindowsAppSdkPackageRoot>$(_PackagesPath)\Microsoft.WindowsAppSDK.WinUI.$(WindowsAppSdkVersion)</_WindowsAppSdkPackageRoot>
 
-        <WindowsAppSdk_props>$(_WindowsAppSdkPackageRoot)\build\native\Microsoft.WindowsAppSdk.props</WindowsAppSdk_props>
-        <WindowsAppSdk_targets>$(_WindowsAppSdkPackageRoot)\build\native\Microsoft.WindowsAppSdk.targets</WindowsAppSdk_targets>
+        <WindowsAppSdk_props>$(_WindowsAppSdkPackageRoot)\build\native\Microsoft.WindowsAppSDK.WinUI.props</WindowsAppSdk_props>
+        <WindowsAppSdk_targets>$(_WindowsAppSdkPackageRoot)\build\native\Microsoft.WindowsAppSDK.WinUI.targets</WindowsAppSdk_targets>
     </PropertyGroup>
 </Project>

build/nuget/Microsoft.Graphics.Win2D.nuspec

@@ -14,7 +14,7 @@
         <copyright>© Microsoft Corporation. All rights reserved.</copyright>
         <tags>graphics 2D Direct2D DirectX WinRT XAML canvas drawing C# C++ Windows Reunion ProjectReunion WindowsAppSdk</tags>
         <dependencies>
-            <dependency id="Microsoft.WindowsAppSDK" version="1.6.241114003" />
+            <dependency id="Microsoft.WindowsAppSDK.WinUI" version="1.8.260204000" />
         </dependencies>
     </metadata>
 

build/nuget/VERSION

@@ -1 +1 @@
-1.3.2
+1.4.0

build/pkges/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.WindowsAppSdk" version="1.6.241114003" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.WinUI" version="1.8.260204000" targetFramework="native" />
 </packages>

eng/Version.Details.xml

@@ -11,7 +11,7 @@ Licensed under the MIT License. See LICENSE.txt in the project root for license
      defined in build\WindowsAppSdk.common.props -->
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.WindowsAppSDK" Version="1.1.0">
+    <Dependency Name="Microsoft.WindowsAppSDK.WinUI" Version="1.8.260204000">
       <Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal</Uri>
       <Sha>e9f6d119a70db6516304e4ed00b080ce46dc4bee</Sha>
     </Dependency>

eng/Versions.props

@@ -6,7 +6,7 @@ Licensed under the MIT License. See LICENSE.txt in the project root for license
 -->
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.WindowsAppSDK" Version="1.0.0">
+    <Dependency Name="Microsoft.WindowsAppSDK.WinUI" Version="1.8.260204000">
       <Uri>https://dev.azure.com/microsoft/WindowsAppSDK</Uri>
       <Sha>400c67880dae14f57e388cf8eb364d60fe814eb6</Sha>
     </Dependency>

winrt/dll/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.WindowsAppSdk" version="1.6.241114003" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.WinUI" version="1.8.260204000" targetFramework="native" />
 </packages>

winrt/lib/packages.config

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Web.WebView2" version="1.0.2792.45" targetFramework="native" />
   <package id="Microsoft.Windows.AbiWinRT" version="2.0.210330.2" targetFramework="native" />
   <package id="Microsoft.Windows.MidlRT" version="2.0.200924.1" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSdk" version="1.6.241114003" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.WinUI" version="1.8.260204000" targetFramework="native" />
 </packages>

winrt/lib/winrt.lib.uap.vcxproj

@@ -502,11 +502,9 @@
     <Error Condition="!Exists('..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.targets'))" />
     <Error Condition="!Exists('$(WindowsAppSdk_props)')" Text="$([System.String]::Format('$(ErrorText)', '$(WindowsAppSdk_props)'))" />
     <Error Condition="!Exists('$(WindowsAppSdk_targets)')" Text="$([System.String]::Format('$(ErrorText)', '$(WindowsAppSdk_targets)'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.Web.WebView2.1.0.2792.45\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Web.WebView2.1.0.2792.45\build\native\Microsoft.Web.WebView2.targets'))" />
   </Target>
   <Import Project="..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.targets" Condition="Exists('..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.targets')" />
   <Import Project="..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.targets" Condition="Exists('..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.targets')" />
   <Import Project="$(WindowsAppSdk_targets)" Condition="Exists('$(WindowsAppSdk_targets)')" />
   <Import Project="$(MSBuildThisFileDirectory)..\..\build\midlrt.targets" />
-  <Import Project="..\..\packages\Microsoft.Web.WebView2.1.0.2792.45\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\..\packages\Microsoft.Web.WebView2.1.0.2792.45\build\native\Microsoft.Web.WebView2.targets')" />
 </Project>

winrt/projection/winrt.projection.csproj

@@ -50,9 +50,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2792.45" />
-    <PackageReference Include="Microsoft.WindowsAppSdk" Version="$(WindowsAppSdkVersion)" />
-    <PackageReference Include="Microsoft.Windows.CSWinRT" Version="2.1.6" />
+    <PackageReference Include="Microsoft.WindowsAppSDK.WinUI" Version="$(WindowsAppSdkVersion)" />
+    <PackageReference Include="Microsoft.Windows.CSWinRT" Version="$(CsWinRTVersion)" />
     <PackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
 </Project>

winrt/test.external/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.WindowsAppSdk" version="1.6.241114003" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSdk.WinUI" version="1.8.260204000" targetFramework="native" />
 </packages>

winrt/test.internal/packages.config

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Web.WebView2" version="1.0.2792.45" targetFramework="native" />
   <package id="Microsoft.Windows.AbiWinRT" version="2.0.210330.2" targetFramework="native" />
   <package id="Microsoft.Windows.MidlRT" version="2.0.200924.1" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSdk" version="1.6.241114003" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.WinUI" version="1.8.260204000" targetFramework="native" />
 </packages>

winrt/test.internal/winrt.test.internal.uap.vcxproj

@@ -291,7 +291,6 @@
     <Error Condition="!Exists('..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.targets'))" />
     <Error Condition="!Exists('$(WindowsAppSdk_props)')" Text="$([System.String]::Format('$(ErrorText)', '$(WindowsAppSdk_props)'))" />
     <Error Condition="!Exists('$(WindowsAppSdk_targets)')" Text="$([System.String]::Format('$(ErrorText)', '$(WindowsAppSdk_targets)'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.Web.WebView2.1.0.2792.45\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Web.WebView2.1.0.2792.45\build\native\Microsoft.Web.WebView2.targets'))" />
   </Target>
   <Import Project="..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.targets" Condition="Exists('..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.targets')" />
   <Import Project="..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.targets" Condition="Exists('..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.targets')" />
@@ -309,5 +308,4 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <Import Project="$(WindowsAppSdk_targets)" Condition="Exists('$(WindowsAppSdk_targets)')" />
-  <Import Project="..\..\packages\Microsoft.Web.WebView2.1.0.2792.45\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\..\packages\Microsoft.Web.WebView2.1.0.2792.45\build\native\Microsoft.Web.WebView2.targets')" />
 </Project>

winrt/test.managed/winrt.test.managed.winappsdk.csproj

@@ -35,10 +35,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2792.45" />
-    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.6" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="$(WindowsAppSdkVersion)" />
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
+    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="$(CsWinRTVersion)" />
+    <PackageReference Include="Microsoft.WindowsAppSDK.WinUI" Version="$(WindowsAppSdkVersion)" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.28000.1-RTM" />
     <PackageReference Include="MSTest.TestAdapter">
       <Version>3.0.2</Version>
     </PackageReference>

winrt/test.nativecomponent.projection/winrt.test.nativecomponent.projection.csproj

@@ -17,10 +17,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2792.45" />
-    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.6" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="$(WindowsAppSdkVersion)" />
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
+    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="$(CsWinRTVersion)" />
+    <PackageReference Include="Microsoft.WindowsAppSDK.WinUI" Version="$(WindowsAppSdkVersion)" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.28000.1-RTM" />
   </ItemGroup>
 
   <ItemGroup>

winrt/test.nativecomponent/packages.config

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Web.WebView2" version="1.0.2792.45" targetFramework="native" />
   <package id="Microsoft.Windows.AbiWinRT" version="2.0.210330.2" targetFramework="native" />
   <package id="Microsoft.Windows.MidlRT" version="2.0.200924.1" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSdk" version="1.6.241114003" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.WinUI" version="1.8.260204000" targetFramework="native" />
 </packages>

winrt/test.nativecomponent/winrt.test.nativecomponent.uap.vcxproj

@@ -87,10 +87,8 @@
     <Error Condition="!Exists('..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.targets'))" />
     <Error Condition="!Exists('$(WindowsAppSdk_props)')" Text="$([System.String]::Format('$(ErrorText)', '$(WindowsAppSdk_props)'))" />
     <Error Condition="!Exists('$(WindowsAppSdk_targets)')" Text="$([System.String]::Format('$(ErrorText)', '$(WindowsAppSdk_targets)'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.Web.WebView2.1.0.2792.45\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Web.WebView2.1.0.2792.45\build\native\Microsoft.Web.WebView2.targets'))" />
   </Target>
   <Import Project="..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.targets" Condition="Exists('..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.targets')" />
   <Import Project="..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.targets" Condition="Exists('..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.targets')" />
   <Import Project="$(WindowsAppSdk_targets)" Condition="Exists('$(WindowsAppSdk_targets)')" />
-  <Import Project="..\..\packages\Microsoft.Web.WebView2.1.0.2792.45\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\..\packages\Microsoft.Web.WebView2.1.0.2792.45\build\native\Microsoft.Web.WebView2.targets')" />
 </Project>