Merged PR 33539: Update .NET 6 MSBuild configuration

Same as !33538 but for WindowsAppSDK.

----
#### AI description  (iteration 1)
#### PR Classification
Code cleanup and configuration update.

#### PR Summary
This pull request updates the MSBuild configuration for .NET 6, improving platform handling and warning messages.
- Updated platform property names and added support for `arm64` in `/build/nuget/Microsoft.Graphics.Win2D-WinUI3.targets`.
- Enhanced warning message for unsupported 'AnyCPU' builds in `/build/nuget/Microsoft.Graphics.Win2D-WinUI3.targets`.
- Adjusted file paths in `/build/nuget/Microsoft.Graphics.Win2D.nuspec` to ensure correct inclusion of target files.

Author: Sergio0694

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Win2D Changelog
 
+## Win2D-WinUI 1.3.2
+_January 22nd, 2025_
+- Enable transitive MSBuild configuration
+- Fix an issue causing CanvasAnimatedControl to use 100% of the CPU in some scenarios
+
 ## Win2D-WinUI 1.3.1
 _December 12th, 2024_
 - Fix pause/resume issues with CanvasAnimatedControl

build/nuget/Microsoft.Graphics.Win2D-WinUI3.targets

@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+  <!-- Set the platform from the RID, first -->
   <PropertyGroup>
     <win2d-Platform Condition="$(RuntimeIdentifier.EndsWith('-x64'))">x64</win2d-Platform>
     <win2d-Platform Condition="$(RuntimeIdentifier.EndsWith('-x86'))">x86</win2d-Platform>
+    <win2d-Platform Condition="$(RuntimeIdentifier.EndsWith('-arm64'))">arm64</win2d-Platform>
   </PropertyGroup>
 
+  <!-- If still empty, try to set the platform based on the build platform -->
   <PropertyGroup Condition="'$(win2d-Platform)' == ''">
     <win2d-Platform Condition="'$(Platform)' == 'Win32'">x86</win2d-Platform>
     <win2d-Platform Condition="'$(Platform)' != 'Win32'">$(Platform)</win2d-Platform>
@@ -16,21 +19,19 @@
     <Win2DWarnNoPlatform Condition="'$(Win2DWarnNoPlatform)' == ''">true</Win2DWarnNoPlatform>
   </PropertyGroup>
 
-  <ItemGroup>
-    <ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-$(win2d-Platform)\native\Microsoft.Graphics.Canvas.dll" Condition="'$(win2d-Platform)' != ''" />
-  </ItemGroup>
-
-  <Target Name="Win2DWarnNoPlatform" BeforeTargets="BeforeBuild" Condition="'$(win2d-Platform)' == '' and '$(Win2DWarnNoPlatform)' == 'true'">
-    <Warning Text="Microsoft.Graphics.Canvas.dll could not be copied because the AnyCPU platform is being used. Please specify a specific platform to copy this file." />
-  </Target>
-
+  <!-- Register the Win2D .winmd in the APPX manifest (requires the new MSIX tooling) -->
   <ItemGroup>
     <WindowsMetadataReference Include="$(Win2DWinMDPath)" Implementation="$(Win2DWinMDImplementationDllName)" />
   </ItemGroup>
 
   <!--
-  Don't import Win2D.common.targets here, as it will cause build failures because desktop project
-  files don't define $(TargetPlatformVersion) with the same semantics as with UWP or C++ project files.
+    Emit a warning if building as 'AnyCPU', which is not supported. Note that we are emitting this warning but
+    we are not copying the .dll ourselves. NuGet will do that automatically when projects are published.
   -->
+  <Target Name="Win2DWarnNoPlatform" BeforeTargets="BeforeBuild" Condition="'$(win2d-Platform)' == '' and '$(Win2DWarnNoPlatform)' == 'true'">
+    <Warning
+      Code="WIN2D0001"
+      Text="'Microsoft.Graphics.Canvas.dll' cannot be referenced correctly, because the project is being built as 'AnyCPU'. Please specify a specific platform (eg. 'x64'), publish with a RID (runtime identifier, eg. 'win-x64'), or set 'Win2DWarnNoPlatform' to suppress this error (note: you'll need to manually handle referencing the Win2D .dll in that case)." />
+  </Target>
 
-</Project>
+</Project>

build/nuget/Microsoft.Graphics.Win2D.nuspec

@@ -21,15 +21,18 @@
     <files>
 
       <file target="Win2d.githash.txt"                                                    src="obj\Win2d.githash.txt" />
-
       <file target="icon.png"                                                             src="build\nuget\icon.png" />
+
       <file target="build\native\Microsoft.Graphics.Win2D.targets"                        src="build\nuget\Microsoft.Graphics.Win2D-native.targets" />
       <file target="build\net6.0-windows10.0.19041.0\Microsoft.Graphics.Win2D.props"      src="build\nuget\Microsoft.Graphics.Win2D-WinUI3.props" />
       <file target="build\net6.0-windows10.0.19041.0\Microsoft.Graphics.Win2D.targets"    src="build\nuget\Microsoft.Graphics.Win2D-WinUI3.targets" />
       <file target="build\net45\Microsoft.Graphics.Win2D.targets"                         src="build\nuget\Microsoft.Graphics.Win2D-managed.targets" />
       <file target="build\win10\Microsoft.Graphics.Win2D.targets"                         src="build\nuget\Microsoft.Graphics.Win2D-win10.targets" />
       <file target="build\Win2D.common.targets"                                           src="build\nuget\Win2D.common.targets" />
 
+      <file target="buildTransitive\net6.0-windows10.0.19041.0\Microsoft.Graphics.Win2D.props"      src="build\nuget\Microsoft.Graphics.Win2D-WinUI3.props" />
+      <file target="buildTransitive\net6.0-windows10.0.19041.0\Microsoft.Graphics.Win2D.targets"    src="build\nuget\Microsoft.Graphics.Win2D-WinUI3.targets" />
+
       <file target="include\x86\Microsoft.Graphics.Canvas.h"                              src="obj\winrt.lib.uap\UAPx86\release\Generated Files\Microsoft.Graphics.Canvas.h"/>
       <file target="include\x64\Microsoft.Graphics.Canvas.h"                              src="obj\winrt.lib.uap\UAPx64\release\Generated Files\Microsoft.Graphics.Canvas.h"/>
       <file target="include\arm64\Microsoft.Graphics.Canvas.h"                            src="obj\winrt.lib.uap\UAParm64\release\Generated Files\Microsoft.Graphics.Canvas.h"/>

build/nuget/VERSION

@@ -1 +1 @@
-1.3.1
+1.3.2