diff --git a/CHANGELOG.md b/CHANGELOG.md index 85415b7a5..be07ebc17 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/build/WindowsAppSdk.common.props b/build/WindowsAppSdk.common.props index 60c345ab5..f64b28573 100644 --- a/build/WindowsAppSdk.common.props +++ b/build/WindowsAppSdk.common.props @@ -1,17 +1,18 @@ + 2.2.0 - 1.6.241114003 + 1.8.260204000 $(NIGHTLY_WINAPPSDK_VERSION) <_PackagesPath>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\packages')) - <_WindowsAppSdkPackageRoot>$(_PackagesPath)\Microsoft.WindowsAppSdk.$(WindowsAppSdkVersion) + <_WindowsAppSdkPackageRoot>$(_PackagesPath)\Microsoft.WindowsAppSDK.WinUI.$(WindowsAppSdkVersion) - $(_WindowsAppSdkPackageRoot)\build\native\Microsoft.WindowsAppSdk.props - $(_WindowsAppSdkPackageRoot)\build\native\Microsoft.WindowsAppSdk.targets + $(_WindowsAppSdkPackageRoot)\build\native\Microsoft.WindowsAppSDK.WinUI.props + $(_WindowsAppSdkPackageRoot)\build\native\Microsoft.WindowsAppSDK.WinUI.targets diff --git a/build/nuget/Microsoft.Graphics.Win2D.nuspec b/build/nuget/Microsoft.Graphics.Win2D.nuspec index d6bc7b9e0..df7a08575 100644 --- a/build/nuget/Microsoft.Graphics.Win2D.nuspec +++ b/build/nuget/Microsoft.Graphics.Win2D.nuspec @@ -14,7 +14,7 @@ © Microsoft Corporation. All rights reserved. graphics 2D Direct2D DirectX WinRT XAML canvas drawing C# C++ Windows Reunion ProjectReunion WindowsAppSdk - + diff --git a/build/nuget/VERSION b/build/nuget/VERSION index d5e98f723..e21e727f9 100644 --- a/build/nuget/VERSION +++ b/build/nuget/VERSION @@ -1 +1 @@ -1.3.2 \ No newline at end of file +1.4.0 \ No newline at end of file diff --git a/build/pkges/packages.config b/build/pkges/packages.config index 053b3ed27..234638a6e 100644 --- a/build/pkges/packages.config +++ b/build/pkges/packages.config @@ -1,4 +1,4 @@  - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e5cc105d0..d6fe558b1 100644 --- a/eng/Version.Details.xml +++ b/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 --> - + https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal e9f6d119a70db6516304e4ed00b080ce46dc4bee diff --git a/eng/Versions.props b/eng/Versions.props index da78d2f92..e7b94a4ef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,7 +6,7 @@ Licensed under the MIT License. See LICENSE.txt in the project root for license --> - + https://dev.azure.com/microsoft/WindowsAppSDK 400c67880dae14f57e388cf8eb364d60fe814eb6 diff --git a/winrt/dll/packages.config b/winrt/dll/packages.config index 535161157..32c240e87 100644 --- a/winrt/dll/packages.config +++ b/winrt/dll/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/winrt/lib/packages.config b/winrt/lib/packages.config index d4eb0ffa2..9b81d2418 100644 --- a/winrt/lib/packages.config +++ b/winrt/lib/packages.config @@ -1,7 +1,6 @@  - - + \ No newline at end of file diff --git a/winrt/lib/winrt.lib.uap.vcxproj b/winrt/lib/winrt.lib.uap.vcxproj index 4941acd8c..d1be45f65 100644 --- a/winrt/lib/winrt.lib.uap.vcxproj +++ b/winrt/lib/winrt.lib.uap.vcxproj @@ -502,11 +502,9 @@ - - \ No newline at end of file diff --git a/winrt/projection/winrt.projection.csproj b/winrt/projection/winrt.projection.csproj index 4157b1a31..685800810 100644 --- a/winrt/projection/winrt.projection.csproj +++ b/winrt/projection/winrt.projection.csproj @@ -50,9 +50,8 @@ - - - + + diff --git a/winrt/test.external/packages.config b/winrt/test.external/packages.config index 535161157..216b1c07a 100644 --- a/winrt/test.external/packages.config +++ b/winrt/test.external/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/winrt/test.internal/packages.config b/winrt/test.internal/packages.config index d4eb0ffa2..9b81d2418 100644 --- a/winrt/test.internal/packages.config +++ b/winrt/test.internal/packages.config @@ -1,7 +1,6 @@  - - + \ No newline at end of file diff --git a/winrt/test.internal/winrt.test.internal.uap.vcxproj b/winrt/test.internal/winrt.test.internal.uap.vcxproj index 34015ccf5..f0a4577b6 100644 --- a/winrt/test.internal/winrt.test.internal.uap.vcxproj +++ b/winrt/test.internal/winrt.test.internal.uap.vcxproj @@ -291,7 +291,6 @@ - @@ -309,5 +308,4 @@ - \ No newline at end of file diff --git a/winrt/test.managed/winrt.test.managed.winappsdk.csproj b/winrt/test.managed/winrt.test.managed.winappsdk.csproj index 11e135802..739631422 100644 --- a/winrt/test.managed/winrt.test.managed.winappsdk.csproj +++ b/winrt/test.managed/winrt.test.managed.winappsdk.csproj @@ -35,10 +35,9 @@ - - - - + + + 3.0.2 diff --git a/winrt/test.nativecomponent.projection/winrt.test.nativecomponent.projection.csproj b/winrt/test.nativecomponent.projection/winrt.test.nativecomponent.projection.csproj index 190765410..52458328d 100644 --- a/winrt/test.nativecomponent.projection/winrt.test.nativecomponent.projection.csproj +++ b/winrt/test.nativecomponent.projection/winrt.test.nativecomponent.projection.csproj @@ -17,10 +17,9 @@ - - - - + + + diff --git a/winrt/test.nativecomponent/packages.config b/winrt/test.nativecomponent/packages.config index d4eb0ffa2..9b81d2418 100644 --- a/winrt/test.nativecomponent/packages.config +++ b/winrt/test.nativecomponent/packages.config @@ -1,7 +1,6 @@  - - + \ No newline at end of file diff --git a/winrt/test.nativecomponent/winrt.test.nativecomponent.uap.vcxproj b/winrt/test.nativecomponent/winrt.test.nativecomponent.uap.vcxproj index 1a5c55872..39dd22a0a 100644 --- a/winrt/test.nativecomponent/winrt.test.nativecomponent.uap.vcxproj +++ b/winrt/test.nativecomponent/winrt.test.nativecomponent.uap.vcxproj @@ -87,10 +87,8 @@ - - \ No newline at end of file