Switch to .NET 9 + bump nuget dependencies versions (#568)

aborziak-ms · web-flow · commit 675fc58924e4 · 2025-01-14T13:08:19.000-08:00
diff --git a/Lottie-Windows.sln b/Lottie-Windows.sln
@@ -204,6 +204,7 @@ Global
 		{5120EFD7-A556-46BF-8D56-F65F1EF9A305}.BETA|x86.Build.0 = BETA|x86
 		{5120EFD7-A556-46BF-8D56-F65F1EF9A305}.BETA|x86.Deploy.0 = BETA|x86
 		{5120EFD7-A556-46BF-8D56-F65F1EF9A305}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{5120EFD7-A556-46BF-8D56-F65F1EF9A305}.Debug|Any CPU.Build.0 = Debug|x86
 		{5120EFD7-A556-46BF-8D56-F65F1EF9A305}.Debug|ARM.ActiveCfg = Debug|ARM
 		{5120EFD7-A556-46BF-8D56-F65F1EF9A305}.Debug|ARM.Build.0 = Debug|ARM
 		{5120EFD7-A556-46BF-8D56-F65F1EF9A305}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -217,6 +218,7 @@ Global
 		{5120EFD7-A556-46BF-8D56-F65F1EF9A305}.Debug|x86.Build.0 = Debug|x86
 		{5120EFD7-A556-46BF-8D56-F65F1EF9A305}.Debug|x86.Deploy.0 = Debug|x86
 		{5120EFD7-A556-46BF-8D56-F65F1EF9A305}.Release|Any CPU.ActiveCfg = Release|x86
+		{5120EFD7-A556-46BF-8D56-F65F1EF9A305}.Release|Any CPU.Build.0 = Release|x86
 		{5120EFD7-A556-46BF-8D56-F65F1EF9A305}.Release|ARM.ActiveCfg = Release|ARM
 		{5120EFD7-A556-46BF-8D56-F65F1EF9A305}.Release|ARM.Build.0 = Release|ARM
 		{5120EFD7-A556-46BF-8D56-F65F1EF9A305}.Release|ARM.Deploy.0 = Release|ARM
diff --git a/Lottie-Windows/Lottie-Windows-Uwp/Lottie-Windows-Uwp.csproj b/Lottie-Windows/Lottie-Windows-Uwp/Lottie-Windows-Uwp.csproj
@@ -22,13 +22,13 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </PackageReference>
-    <PackageReference Include="System.Memory" Version="4.5.4" />
+    <PackageReference Include="System.Memory" Version="4.5.5" />
     <PackageReference Include="System.Numerics.Vectors">
       <Version>4.5.0</Version>
     </PackageReference>
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="5.0.1" />
-    <PackageReference Include="System.Text.Json" Version="5.0.1" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="9.0.0" />
+    <PackageReference Include="System.Text.Json" Version="9.0.0" />
     <PackageReference Include="System.ValueTuple">
       <Version>4.5.0</Version>
     </PackageReference>
diff --git a/Lottie-Windows/Lottie-Windows-WinUI3/Lottie-Windows-WinUI3.csproj b/Lottie-Windows/Lottie-Windows-WinUI3/Lottie-Windows-WinUI3.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0-windows10.0.18362.0</TargetFramework>
+    <TargetFramework>net9.0-windows10.0.18362.0</TargetFramework>
     <IsAotCompatible>true</IsAotCompatible>
     <OutputType>Library</OutputType>
     
@@ -15,8 +15,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Graphics.Win2D" Version="1.0.4" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.3.230331000" />
+    <PackageReference Include="Microsoft.Graphics.Win2D" Version="1.0.5.1" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" />
   </ItemGroup>
 
   <Import Project="..\Lottie-Windows.props" />
diff --git a/LottieGen/Common.proj b/LottieGen/Common.proj
@@ -4,7 +4,7 @@
   <PropertyGroup Label="Configuration">
     <Import_RootNamespace>LottieGen</Import_RootNamespace>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <RootNamespace>LottieGen</RootNamespace>
     <Configurations>Debug;Release</Configurations>
     <LangVersion>latest</LangVersion>
diff --git a/LottieGen/MSBuildTask/LottieGen.MsBuild.csproj b/LottieGen/MSBuildTask/LottieGen.MsBuild.csproj
@@ -58,7 +58,7 @@
     </packageTypes>
   </metadata>
   <files>
-    <file src="]]>$([MsBuild]::NormalizePath('$(MsBuildThisFileDirectory)..\win-x64\bin\AnyCPU\$(Configuration)\net7.0\win-x64\publish\LottieGen.exe'))<![CDATA[" target="bin" />
+    <file src="]]>$([MsBuild]::NormalizePath('$(MsBuildThisFileDirectory)..\win-x64\bin\AnyCPU\$(Configuration)\net9.0\win-x64\publish\LottieGen.exe'))<![CDATA[" target="bin" />
     <file src="]]>$(MsBuildThisFileDirectory)$(_LottieGenNuspecPropsFile)<![CDATA[" target="build/native/" />
     <file src="]]>$(MsBuildThisFileDirectory)$(_LottieGenNuspecPropsFile)<![CDATA[" target="build/win/" />
     <file src="]]>$([MsBuild]::NormalizePath('$(MsBuildThisFileDirectory)..\MSBuildTask\bin\AnyCPU\$(Configuration)\net472\$(AssemblyName).dll'))<![CDATA[" target="bin/" />
diff --git a/LottieGen/README.md b/LottieGen/README.md
@@ -8,11 +8,11 @@ LottieGen requires [.NET Core 7.0 SDK](https://dotnet.microsoft.com/download/dot
 
 Local builds can be run directly. Just install [.NET Core 7.0](https://dotnet.microsoft.com/download/dotnet-core/7.0), build the LottieGen.sln solution and run the output.
 
-    f:\GitHub\Lottie-Windows\LottieGen\DotnetTool\bin\AnyCpu\Debug\net7.0\lottiegen.exe
+    f:\GitHub\Lottie-Windows\LottieGen\DotnetTool\bin\AnyCpu\Debug\net9.0\lottiegen.exe
 
 And of course you can copy LottieGen to a directory and run directly without installing it, for example:
 
-    copy f:\GitHub\Lottie-Windows\LottieGen\DotnetTool\bin\AnyCpu\Debug\net7.0\* d:\mybuildtools
+    copy f:\GitHub\Lottie-Windows\LottieGen\DotnetTool\bin\AnyCpu\Debug\net9.0\* d:\mybuildtools
 
 
 # Install as a .NET Core global tool
diff --git a/LottieSamples/LottieSamples.csproj b/LottieSamples/LottieSamples.csproj
@@ -258,12 +258,12 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="CommunityToolkit.Uwp.Lottie">
+      <Version>8.1.240821</Version>
+    </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.12</Version>
     </PackageReference>
-    <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Lottie">
-      <Version>7.0.0</Version>
-    </PackageReference>
     <PackageReference Include="Microsoft.UI.Xaml">
       <Version>2.5.0</Version>
     </PackageReference>
diff --git a/LottieSamples/Scenarios/FallbackPage.xaml b/LottieSamples/Scenarios/FallbackPage.xaml
@@ -2,7 +2,7 @@
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:lottie="using:Microsoft.Toolkit.Uwp.UI.Lottie"
+      xmlns:lottie="using:CommunityToolkit.WinUI.Lottie"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
       Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
diff --git a/LottieSamples/Scenarios/JsonPage.xaml b/LottieSamples/Scenarios/JsonPage.xaml
@@ -2,7 +2,7 @@
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:lottie="using:Microsoft.Toolkit.Uwp.UI.Lottie"
+      xmlns:lottie="using:CommunityToolkit.WinUI.Lottie"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
       Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
diff --git a/LottieSamples/Scenarios/ProgressPage.xaml b/LottieSamples/Scenarios/ProgressPage.xaml
@@ -2,7 +2,7 @@
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:lottie="using:Microsoft.Toolkit.Uwp.UI.Lottie"
+      xmlns:lottie="using:CommunityToolkit.WinUI.Lottie"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
       Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
diff --git a/LottieViewer/LottieViewer.csproj b/LottieViewer/LottieViewer.csproj
@@ -217,19 +217,19 @@
       <Version>6.2.12</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.UI.Xaml">
-      <Version>2.5.0</Version>
+      <Version>2.8.6</Version>
     </PackageReference>
     <PackageReference Include="System.Memory">
-      <Version>4.5.4</Version>
+      <Version>4.5.5</Version>
     </PackageReference>
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe">
-      <Version>6.0.0</Version>
+      <Version>6.1.0</Version>
     </PackageReference>
     <PackageReference Include="System.Text.Json">
-      <Version>5.0.1</Version>
+      <Version>9.0.1</Version>
     </PackageReference>
     <PackageReference Include="Win2D.uwp">
-      <Version>1.26.0</Version>
+      <Version>1.28.1</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="..\source\CompMetadata\CompMetadata.projitems" Label="Shared" />
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -38,17 +38,17 @@ steps:
     custom: tool
     arguments: install --tool-path . nbgv
 
-# .NET Core SDK Installer.
+# .NET Core 9 SDK Installer.
 - task: UseDotNet@2
   inputs:
     packageType: 'sdk' # Options: runtime, sdk
-    version: '7.0.x'
+    version: '9.0.x'
 
 # Nerdbank.GitVersioning
 - script: nbgv cloud
   displayName: Set Version
 
-# Install the Windows SDK. Version 18362 (Windows 1909 release).
+# Install the Windows SDK.
 # This is needed to build the UWP code.
 - powershell: .\build\Install-WindowsSdkISO.ps1 18362
   displayName: Insider SDK
diff --git a/build/Install-WindowsSdkISO.ps1 b/build/Install-WindowsSdkISO.ps1
@@ -242,6 +242,11 @@ if ($InstallWindowsSDK)
     # Note: there is a delay from Windows SDK announcements to availability via the static link
     $uri = "https://go.microsoft.com/fwlink/?prd=11966&pver=1.0&plcid=0x409&clcid=0x409&ar=Flight&sar=Sdsurl&o1=$buildNumber"
 
+    if ($buildNumber -eq "18362")
+    {
+        $uri = "https://go.microsoft.com/fwlink/?linkid=2083448"
+    }
+
     if ($buildNumber -eq "22621")
     {
         $uri = "https://go.microsoft.com/fwlink/p/?linkid=2196240"
diff --git a/dlls/Animatables/Animatables.dll.csproj b/dlls/Animatables/Animatables.dll.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Configurations>Debug;Release</Configurations>
     <LangVersion>latest</LangVersion>
     <DefineConstants>PUBLIC_Animatables</DefineConstants>
diff --git a/dlls/CompMetadata/CompMetadata.dll.csproj b/dlls/CompMetadata/CompMetadata.dll.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Configurations>Debug;Release</Configurations>
     <LangVersion>latest</LangVersion>
     <DefineConstants>PUBLIC_CompMetadata</DefineConstants>
diff --git a/dlls/DotLottie/DotLottie.dll.csproj b/dlls/DotLottie/DotLottie.dll.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Configurations>Debug;Release</Configurations>
     <LangVersion>latest</LangVersion>
     <DefineConstants>PUBLIC_DotLottie</DefineConstants>
diff --git a/dlls/GenericData/GenericData.dll.csproj b/dlls/GenericData/GenericData.dll.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Configurations>Debug;Release</Configurations>
     <LangVersion>latest</LangVersion>
     <DefineConstants>PUBLIC_LottieData</DefineConstants>
diff --git a/dlls/LottieData/LottieData.dll.csproj b/dlls/LottieData/LottieData.dll.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Configurations>Debug;Release</Configurations>
     <LangVersion>latest</LangVersion>
     <DefineConstants>PUBLIC_LottieData</DefineConstants>
diff --git a/dlls/LottieMetadata/LottieMetadata.dll.csproj b/dlls/LottieMetadata/LottieMetadata.dll.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Configurations>Debug;Release</Configurations>
     <LangVersion>latest</LangVersion>
     <DefineConstants>PUBLIC_LottieMetadata</DefineConstants>
diff --git a/dlls/LottieReader/LottieReader.dll.csproj b/dlls/LottieReader/LottieReader.dll.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Configurations>Debug;Release</Configurations>
     <LangVersion>latest</LangVersion>
     <DefineConstants>PUBLIC_LottieReader</DefineConstants>
diff --git a/dlls/LottieToWinComp/LottieToWinComp.dll.csproj b/dlls/LottieToWinComp/LottieToWinComp.dll.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Configurations>Debug;Release</Configurations>
     <LangVersion>latest</LangVersion>
     <DefineConstants>PUBLIC_LottieToWinComp</DefineConstants>
diff --git a/dlls/UIData/UIData.dll.csproj b/dlls/UIData/UIData.dll.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Configurations>Debug;Release</Configurations>
     <LangVersion>latest</LangVersion>
     <DefineConstants>PUBLIC_UIData</DefineConstants>
diff --git a/dlls/UIDataCodeGen/UIDataCodeGen.dll.csproj b/dlls/UIDataCodeGen/UIDataCodeGen.dll.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Configurations>Debug;Release</Configurations>
     <LangVersion>latest</LangVersion>
     <DefineConstants>PUBLIC_UIDataCodeGen</DefineConstants>
diff --git a/dlls/WinCompData/WinCompData.dll.csproj b/dlls/WinCompData/WinCompData.dll.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Configurations>Debug;Release</Configurations>
     <LangVersion>latest</LangVersion>
     <DefineConstants>PUBLIC_WinCompData</DefineConstants>
diff --git a/dlls/WinStorageStreamsData/WinStorageStreamsData.dll.csproj b/dlls/WinStorageStreamsData/WinStorageStreamsData.dll.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Configurations>Debug;Release</Configurations>
     <LangVersion>latest</LangVersion>
     <DefineConstants>PUBLIC_WinStorageStreamsData</DefineConstants>
diff --git a/dlls/WinUIXamlMediaData/WinUIXamlMediaData.dll.csproj b/dlls/WinUIXamlMediaData/WinUIXamlMediaData.dll.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Configurations>Debug;Release</Configurations>
     <LangVersion>latest</LangVersion>
     <DefineConstants>PUBLIC_WinUIXamlMediaData</DefineConstants>
diff --git a/dlls/YamlData/YamlData.dll.csproj b/dlls/YamlData/YamlData.dll.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Configurations>Debug;Release</Configurations>
     <LangVersion>latest</LangVersion>
     <DefineConstants>PUBLIC_YamlData</DefineConstants>
diff --git a/source/Lottie/AnimatedVisualFactory.cs b/source/Lottie/AnimatedVisualFactory.cs
@@ -25,7 +25,7 @@ namespace CommunityToolkit.WinUI.Lottie
     /// translation of a composition and some metadata. This allows multiple instances of the translation
     /// to be instantiated without requiring repeated translations.
     /// </summary>
-    sealed class AnimatedVisualFactory
+    internal sealed partial class AnimatedVisualFactory
         : IAnimatedVisualSource
     {
         readonly Dictionary<Uri, ICompositionSurface?> _imageCache = new Dictionary<Uri, ICompositionSurface?>();
diff --git a/source/Lottie/DisposableAnimatedVisual.cs b/source/Lottie/DisposableAnimatedVisual.cs
@@ -17,7 +17,10 @@
 
 namespace CommunityToolkit.WinUI.Lottie
 {
-    sealed class DisposableAnimatedVisual : IAnimatedVisual, IDisposable
+    /// <summary>
+    /// Type and any parent types should be marked partial for trimming and AOT compatibility if passed across the WinRT ABI.
+    /// </summary>
+    internal sealed partial class DisposableAnimatedVisual : IAnimatedVisual, IDisposable
     {
         internal DisposableAnimatedVisual(Visual rootVisual, IEnumerable<AnimationController> customAnimationControllers)
         {
diff --git a/source/Lottie/LottieVisualSource.cs b/source/Lottie/LottieVisualSource.cs
@@ -30,7 +30,7 @@ namespace CommunityToolkit.WinUI.Lottie
     /// An <see cref="IAnimatedVisualSource"/> for a Lottie composition. This allows
     /// a Lottie to be specified as the source for a <see cref="AnimatedVisualPlayer"/>.
     /// </summary>
-    public sealed class LottieVisualSource : DependencyObject, IDynamicAnimatedVisualSource
+    public sealed partial class LottieVisualSource : DependencyObject, IDynamicAnimatedVisualSource
     {
 #if WINAPPSDK
         HashSet<TypedEventHandler<IDynamicAnimatedVisualSource?, object?>> _compositionInvalidatedEventTokenTable = new HashSet<TypedEventHandler<IDynamicAnimatedVisualSource?, object?>>();
