From 9c5168a739ee3fe87e54d05cba5f6a24a5f78472 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <chohfi@outlook.com>
Date: Tue, 18 Apr 2023 22:59:16 -0700
Subject: [PATCH] Updated Cake build system to newer version, and updated
 source to net7.0. (#530)

* Updated Cake build system to newer version, and updated source to net7.0.

* Small fix on version number.
---
 .config/dotnet-tools.json                     |  12 +
 Directory.Build.props                         |   4 +-
 Lottie-Windows.sln                            |  16 +-
 .../Lottie-Windows-Uwp.csproj                 |   2 +-
 .../Lottie-Windows-WinUI3.csproj              |   7 +-
 LottieGen/Common.proj                         |   2 +-
 .../MSBuildTask/LottieGen.MsBuild.csproj      |   4 +-
 LottieGen/README.md                           |   8 +-
 LottieViewer/LottieViewer.csproj              |   2 +-
 azure-pipelines.yml                           |  19 +-
 build/build.cake                              |  22 +-
 build/build.ps1                               | 256 +-----------------
 build/tools/packages.config                   |   2 +-
 dlls/Animatables/Animatables.dll.csproj       |   2 +-
 dlls/CompMetadata/CompMetadata.dll.csproj     |   2 +-
 dlls/DotLottie/DotLottie.dll.csproj           |   2 +-
 dlls/GenericData/GenericData.dll.csproj       |   4 +-
 dlls/LottieData/LottieData.dll.csproj         |   4 +-
 dlls/LottieMetadata/LottieMetadata.dll.csproj |   4 +-
 dlls/LottieReader/LottieReader.dll.csproj     |   2 +-
 .../LottieToWinComp.dll.csproj                |   2 +-
 dlls/UIData/UIData.dll.csproj                 |   2 +-
 dlls/UIDataCodeGen/UIDataCodeGen.dll.csproj   |   2 +-
 dlls/WinCompData/WinCompData.dll.csproj       |   2 +-
 .../WinStorageStreamsData.dll.csproj          |   2 +-
 .../WinUIXamlMediaData.dll.csproj             |   2 +-
 dlls/YamlData/YamlData.dll.csproj             |   2 +-
 global.json                                   |   2 +-
 source/Animatables/Easing.cs                  |   2 +
 .../CodeGen/InstantiatorGeneratorBase.cs      |   4 +
 source/WinCompData/CompositionObject.cs       |   9 +
 source/WinCompData/Mgcg/CanvasPathBuilder.cs  |   2 +
 32 files changed, 88 insertions(+), 321 deletions(-)
 create mode 100644 .config/dotnet-tools.json

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
new file mode 100644
index 000000000..831d039b6
--- /dev/null
+++ b/.config/dotnet-tools.json
@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "cake.tool": {
+      "version": "3.0.0",
+      "commands": [
+        "dotnet-cake"
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/Directory.Build.props b/Directory.Build.props
index 39873c696..b9107cbf7 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -127,7 +127,7 @@
   <Choose>
     <When Condition="'$(IsTestProject)' != 'true' and '$(IsSampleProject)' != 'true' and '$(IsDesignProject)' != 'true'">
       <ItemGroup>
-        <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="16.5.132" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.5.22" PrivateAssets="all" />
         <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
 
         <!-- <EmbeddedResource Include="**\*.rd.xml" />
@@ -145,7 +145,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version=" 2.1.65" PrivateAssets="all" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.5.119" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Lottie-Windows.sln b/Lottie-Windows.sln
index b30bd62ef..5bbb5a05f 100644
--- a/Lottie-Windows.sln
+++ b/Lottie-Windows.sln
@@ -548,26 +548,26 @@ Global
 		{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.BETA|x64.Build.0 = Debug|x64
 		{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.BETA|x86.ActiveCfg = Debug|x86
 		{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.BETA|x86.Build.0 = Debug|x86
-		{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|Any CPU.Build.0 = Debug|x64
+		{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|ARM.ActiveCfg = Debug|x64
 		{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|ARM.Build.0 = Debug|x64
 		{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|ARM64.ActiveCfg = Debug|x64
 		{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|ARM64.Build.0 = Debug|x64
 		{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|x64.ActiveCfg = Debug|x64
 		{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|x64.Build.0 = Debug|x64
-		{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|x86.ActiveCfg = Debug|x86
-		{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|x86.Build.0 = Debug|x86
-		{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|Any CPU.ActiveCfg = Release|x64
-		{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|Any CPU.Build.0 = Release|x64
+		{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|x86.Build.0 = Debug|Any CPU
+		{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|ARM.ActiveCfg = Release|x64
 		{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|ARM.Build.0 = Release|x64
 		{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|ARM64.ActiveCfg = Release|x64
 		{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|ARM64.Build.0 = Release|x64
 		{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|x64.ActiveCfg = Release|x64
 		{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|x64.Build.0 = Release|x64
-		{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|x86.ActiveCfg = Release|x86
-		{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|x86.Build.0 = Release|x86
+		{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|x86.ActiveCfg = Release|Any CPU
+		{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|x86.Build.0 = Release|Any CPU
 		{6AB50ED0-6273-4919-9ADE-50195664EF15}.BETA|Any CPU.ActiveCfg = Debug|x64
 		{6AB50ED0-6273-4919-9ADE-50195664EF15}.BETA|Any CPU.Build.0 = Debug|x64
 		{6AB50ED0-6273-4919-9ADE-50195664EF15}.BETA|Any CPU.Deploy.0 = Debug|x64
diff --git a/Lottie-Windows/Lottie-Windows-Uwp/Lottie-Windows-Uwp.csproj b/Lottie-Windows/Lottie-Windows-Uwp/Lottie-Windows-Uwp.csproj
index dcbe9f6ef..b7a3a091f 100644
--- a/Lottie-Windows/Lottie-Windows-Uwp/Lottie-Windows-Uwp.csproj
+++ b/Lottie-Windows/Lottie-Windows-Uwp/Lottie-Windows-Uwp.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="System.Numerics.Vectors">
       <Version>4.5.0</Version>
     </PackageReference>
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
+    <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.ValueTuple">
diff --git a/Lottie-Windows/Lottie-Windows-WinUI3/Lottie-Windows-WinUI3.csproj b/Lottie-Windows/Lottie-Windows-WinUI3/Lottie-Windows-WinUI3.csproj
index 32698fadc..4414d8626 100644
--- 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>net5.0-windows10.0.18362.0</TargetFramework>
+    <TargetFramework>net7.0-windows10.0.18362.0</TargetFramework>
     <OutputType>Library</OutputType>
     
     <PackageId>CommunityToolkit.WinUI.Lottie</PackageId>
@@ -9,14 +9,13 @@
 
     <Nullable>enable</Nullable>
     <CsWinRTIncludes>Microsoft</CsWinRTIncludes>
-    <Platforms>x64;x86</Platforms>
     <DefineConstants>WINAPPSDK</DefineConstants>
     <SignAssembly>True</SignAssembly>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Graphics.Win2D" Version="1.0.0.30" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.3" />
+    <PackageReference Include="Microsoft.Graphics.Win2D" Version="1.0.4" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.3.230331000" />
   </ItemGroup>
 
   <Import Project="..\Lottie-Windows.props" />
diff --git a/LottieGen/Common.proj b/LottieGen/Common.proj
index b14fe4a10..1ac1c1d36 100644
--- a/LottieGen/Common.proj
+++ b/LottieGen/Common.proj
@@ -4,7 +4,7 @@
   <PropertyGroup Label="Configuration">
     <Import_RootNamespace>LottieGen</Import_RootNamespace>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.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
index e11d74490..3065fb679 100644
--- a/LottieGen/MSBuildTask/LottieGen.MsBuild.csproj
+++ b/LottieGen/MSBuildTask/LottieGen.MsBuild.csproj
@@ -21,7 +21,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.9.0" />
+        <PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.5.0" />
     </ItemGroup>
 
     <!--
@@ -58,7 +58,7 @@
     </packageTypes>
   </metadata>
   <files>
-    <file src="]]>$([MsBuild]::NormalizePath('$(MsBuildThisFileDirectory)..\win-x64\bin\AnyCPU\$(Configuration)\net5.0\win-x64\publish\LottieGen.exe'))<![CDATA[" target="bin" />
+    <file src="]]>$([MsBuild]::NormalizePath('$(MsBuildThisFileDirectory)..\win-x64\bin\AnyCPU\$(Configuration)\net7.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
index 0d94a59fc..741998722 100644
--- a/LottieGen/README.md
+++ b/LottieGen/README.md
@@ -2,17 +2,17 @@
 
 LottieGen is a tool for generating C#, C++, and other outputs from Lottie / Bodymovin JSON files. LottieGen is built as a [.NET global tool](https://docs.microsoft.com/en-us/dotnet/core/tools/global-tools), which means it will run anywhere .NET Core is available, including Linux and Mac.
 
-LottieGen requires [.NET Core 5.0 SDK](https://dotnet.microsoft.com/download/dotnet-core/5.0) or later.
+LottieGen requires [.NET Core 7.0 SDK](https://dotnet.microsoft.com/download/dotnet-core/7.0) or later.
 
 # Run without installation
 
-Local builds can be run directly. Just install [.NET Core 5.0](https://dotnet.microsoft.com/download/dotnet-core/5.0), build the LottieGen.sln solution and run the output.
+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\net5.0\lottiegen.exe
+    f:\GitHub\Lottie-Windows\LottieGen\DotnetTool\bin\AnyCpu\Debug\net7.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\net5.0\* d:\mybuildtools
+    copy f:\GitHub\Lottie-Windows\LottieGen\DotnetTool\bin\AnyCpu\Debug\net7.0\* d:\mybuildtools
 
 
 # Install as a .NET Core global tool
diff --git a/LottieViewer/LottieViewer.csproj b/LottieViewer/LottieViewer.csproj
index fd9bffc00..c98dcde5a 100644
--- a/LottieViewer/LottieViewer.csproj
+++ b/LottieViewer/LottieViewer.csproj
@@ -223,7 +223,7 @@
       <Version>4.5.4</Version>
     </PackageReference>
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe">
-      <Version>5.0.0</Version>
+      <Version>6.0.0</Version>
     </PackageReference>
     <PackageReference Include="System.Text.Json">
       <Version>5.0.1</Version>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d6f5bf96e..4e11b0dbc 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -10,7 +10,7 @@ pr:
 - rel/*
 
 pool:
-  vmImage: windows-2019
+  vmImage: windows-2022
 
 variables: 
   BuildConfiguration: Lottie-Windows
@@ -20,15 +20,15 @@ steps:
 - task: BatchScript@1
   displayName: Setup Environment Variables
   inputs:
-    filename: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\Common7\\Tools\\VsDevCmd.bat"
+    filename: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Common7\\Tools\\VsDevCmd.bat"
     arguments: -no_logo
     modifyEnvironment: true
 
 # Install NuGet tools.  
 - task: NuGetToolInstaller@1
-  displayName: Use NuGet 5.8.1
+  displayName: Use NuGet 6.5.0
   inputs:
-    versionSpec: 5.8.1
+    versionSpec: 6.5.0
 
 # Install Nerbank.GitVersioning.
 - task: DotNetCoreCLI@2  
@@ -39,17 +39,10 @@ steps:
     arguments: install --tool-path . nbgv
 
 # .NET Core SDK Installer.
-# 2.2.x is needed to build the UWP code.
-# 5.0.x is used for everything else that the UWP apps don't depend on.
 - task: UseDotNet@2
   inputs:
     packageType: 'sdk' # Options: runtime, sdk
-    version: '2.2.x' 
-
-- task: UseDotNet@2
-  inputs:
-    packageType: 'sdk' # Options: runtime, sdk
-    version: '5.0.x'
+    version: '7.0.x'
 
 # Nerdbank.GitVersioning
 - script: nbgv cloud
@@ -61,7 +54,7 @@ steps:
   displayName: Insider SDK
 
 # Run the build.
-- powershell: .\build.ps1 -target=Package
+- powershell: .\build.ps1 --target=Package
   displayName: Build
   workingDirectory: .\build
 
diff --git a/build/build.cake b/build/build.cake
index e8d8e28bb..8e4cbdc2d 100644
--- a/build/build.cake
+++ b/build/build.cake
@@ -1,7 +1,5 @@
-#module "Cake.Longpath.Module"
-
-#addin nuget:?package=Cake.FileHelpers&version=3.2.1
-#addin nuget:?package=Cake.Powershell&version=0.4.8
+#addin nuget:?package=Cake.FileHelpers&version=6.1.3
+#addin nuget:?package=Cake.GitVersioning&version=3.5.119
 
 using System;
 using System.Linq;
@@ -18,7 +16,6 @@ var configuration = Argument("configuration", "Release");
 // VERSIONS OF TOOLS TO USE
 //////////////////////////////////////////////////////////////////////
 
-var gitVersioningVersion = "3.0.28";
 var inheritDocVersion = "2.3.0";
 
 //////////////////////////////////////////////////////////////////////
@@ -178,9 +175,6 @@ Task("Verify")
 {
     // Source code needs to have appropriate licensing headers.
     VerifyHeaders(false);
-
-    // SDK needs to be installed.
-    StartPowershellFile("./Find-WindowsSDKVersions.ps1");
 });
 
 Task("Version")
@@ -188,18 +182,8 @@ Task("Version")
     .IsDependentOn("Verify")
     .Does(() =>
 {
-    Information("\r\nDownloading NerdBank GitVersioning...");
-    var installSettings = new NuGetInstallSettings {
-        ExcludeVersion  = true,
-        Version = gitVersioningVersion,
-        OutputDirectory = toolsDir
-    };
-
-    NuGetInstall(new []{"nerdbank.gitversioning"}, installSettings);
-
     Information("\r\nRetrieving version...");
-    var results = StartPowershellFile(versionClient);
-    Version = results[1].Properties["NuGetPackageVersion"].Value.ToString();
+    Version = GitVersioningGetVersion().NuGetPackageVersion;
     Information($"\r\nBuild Version: {Version}");
 });
 
diff --git a/build/build.ps1 b/build/build.ps1
index 968c7c637..21821d291 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -1,251 +1,13 @@
-##########################################################################
-# This is the Cake bootstrapper script for PowerShell.
-# This file was downloaded from https://github.com/cake-build/resources
-# Feel free to change this file to fit your needs.
-##########################################################################
+$ErrorActionPreference = 'Stop'
 
-<#
-.SYNOPSIS
-This is a Powershell script to bootstrap a Cake build.
-.DESCRIPTION
-This Powershell script will download NuGet if missing, restore NuGet tools (including Cake)
-and execute your Cake build script with the parameters you provide.
-.PARAMETER Script
-The build script to execute.
-.PARAMETER Target
-The build script target to run.
-.PARAMETER Configuration
-The build configuration to use.
-.PARAMETER Verbosity
-Specifies the amount of information to be displayed.
-.PARAMETER ShowDescription
-Shows description about tasks.
-.PARAMETER DryRun
-Performs a dry run.
-.PARAMETER SkipToolPackageRestore
-Skips restoring of packages.
-.PARAMETER ScriptArgs
-Remaining arguments are added here.
-.LINK
-https://cakebuild.net
-#>
+Set-Location -LiteralPath $PSScriptRoot
 
-[CmdletBinding()]
-Param(
-    [string]$Script = "build.cake",
-    [string]$Target,
-    [string]$Configuration,
-    [ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")]
-    [string]$Verbosity,
-    [switch]$ShowDescription,
-    [Alias("WhatIf", "Noop")]
-    [switch]$DryRun,
-    [switch]$SkipToolPackageRestore,
-    [Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)]
-    [string[]]$ScriptArgs
-)
+$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = '1'
+$env:DOTNET_CLI_TELEMETRY_OPTOUT = '1'
+$env:DOTNET_NOLOGO = '1'
 
-# Attempt to set highest encryption available for SecurityProtocol.
-# PowerShell will not set this by default (until maybe .NET 4.6.x). This
-# will typically produce a message for PowerShell v2 (just an info
-# message though)
-try {
-    # Set TLS 1.2 (3072), then TLS 1.1 (768), then TLS 1.0 (192), finally SSL 3.0 (48)
-    # Use integers because the enumeration values for TLS 1.2 and TLS 1.1 won't
-    # exist in .NET 4.0, even though they are addressable if .NET 4.5+ is
-    # installed (.NET 4.5 is an in-place upgrade).
-    # PowerShell Core already has support for TLS 1.2 so we can skip this if running in that.
-    if (-not $IsCoreCLR) {
-        [System.Net.ServicePointManager]::SecurityProtocol = 3072 -bor 768 -bor 192 -bor 48
-    }
-  } catch {
-    Write-Output 'Unable to set PowerShell to use TLS 1.2 and TLS 1.1 due to old .NET Framework installed. If you see underlying connection closed or trust errors, you may need to upgrade to .NET Framework 4.5+ and PowerShell v3'
-  }
+dotnet tool restore
+if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
 
-[Reflection.Assembly]::LoadWithPartialName("System.Security") | Out-Null
-function MD5HashFile([string] $filePath)
-{
-    if ([string]::IsNullOrEmpty($filePath) -or !(Test-Path $filePath -PathType Leaf))
-    {
-        return $null
-    }
-
-    [System.IO.Stream] $file = $null;
-    [System.Security.Cryptography.MD5] $md5 = $null;
-    try
-    {
-        $md5 = [System.Security.Cryptography.MD5]::Create()
-        $file = [System.IO.File]::OpenRead($filePath)
-        return [System.BitConverter]::ToString($md5.ComputeHash($file))
-    }
-    finally
-    {
-        if ($file -ne $null)
-        {
-            $file.Dispose()
-        }
-    }
-}
-
-function GetProxyEnabledWebClient
-{
-    $wc = New-Object System.Net.WebClient
-    $proxy = [System.Net.WebRequest]::GetSystemWebProxy()
-    $proxy.Credentials = [System.Net.CredentialCache]::DefaultCredentials
-    $wc.Proxy = $proxy
-    return $wc
-}
-
-Write-Host "Preparing to run build script..."
-
-if(!$PSScriptRoot){
-    $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
-}
-
-$TOOLS_DIR = Join-Path $PSScriptRoot "tools"
-$ADDINS_DIR = Join-Path $TOOLS_DIR "Addins"
-$MODULES_DIR = Join-Path $TOOLS_DIR "Modules"
-$NUGET_EXE = Join-Path $TOOLS_DIR "nuget.exe"
-$CAKE_EXE = Join-Path $TOOLS_DIR "Cake/Cake.exe"
-$NUGET_URL = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
-$PACKAGES_CONFIG = Join-Path $TOOLS_DIR "packages.config"
-$PACKAGES_CONFIG_MD5 = Join-Path $TOOLS_DIR "packages.config.md5sum"
-$ADDINS_PACKAGES_CONFIG = Join-Path $ADDINS_DIR "packages.config"
-$MODULES_PACKAGES_CONFIG = Join-Path $MODULES_DIR "packages.config"
-
-# Make sure tools folder exists
-if ((Test-Path $PSScriptRoot) -and !(Test-Path $TOOLS_DIR)) {
-    Write-Verbose -Message "Creating tools directory..."
-    New-Item -Path $TOOLS_DIR -Type Directory | Out-Null
-}
-
-# Make sure that packages.config exist.
-if (!(Test-Path $PACKAGES_CONFIG)) {
-    Write-Verbose -Message "Downloading packages.config..."
-    try {
-        $wc = GetProxyEnabledWebClient
-        $wc.DownloadFile("https://cakebuild.net/download/bootstrapper/packages", $PACKAGES_CONFIG)
-    } catch {
-        Throw "Could not download packages.config."
-    }
-}
-
-# Try find NuGet.exe in path if not exists
-if (!(Test-Path $NUGET_EXE)) {
-    Write-Verbose -Message "Trying to find nuget.exe in PATH..."
-    $existingPaths = $Env:Path -Split ';' | Where-Object { (![string]::IsNullOrEmpty($_)) -and (Test-Path $_ -PathType Container) }
-    $NUGET_EXE_IN_PATH = Get-ChildItem -Path $existingPaths -Filter "nuget.exe" | Select -First 1
-    if ($NUGET_EXE_IN_PATH -ne $null -and (Test-Path $NUGET_EXE_IN_PATH.FullName)) {
-        Write-Verbose -Message "Found in PATH at $($NUGET_EXE_IN_PATH.FullName)."
-        $NUGET_EXE = $NUGET_EXE_IN_PATH.FullName
-    }
-}
-
-# Try download NuGet.exe if not exists
-if (!(Test-Path $NUGET_EXE)) {
-    Write-Verbose -Message "Downloading NuGet.exe..."
-    try {
-        $wc = GetProxyEnabledWebClient
-        $wc.DownloadFile($NUGET_URL, $NUGET_EXE)
-    } catch {
-        Throw "Could not download NuGet.exe."
-    }
-}
-
-# Save nuget.exe path to environment to be available to child processed
-$env:NUGET_EXE = $NUGET_EXE
-$env:NUGET_EXE_INVOCATION = if ($IsLinux -or $IsMacOS) {
-    "mono `"$NUGET_EXE`""
-} else {
-    "`"$NUGET_EXE`""
-}
-
-# Restore tools from NuGet?
-if(-Not $SkipToolPackageRestore.IsPresent) {
-    Push-Location
-    Set-Location $TOOLS_DIR
-
-    # Check for changes in packages.config and remove installed tools if true.
-    [string] $md5Hash = MD5HashFile $PACKAGES_CONFIG
-    if((!(Test-Path $PACKAGES_CONFIG_MD5)) -Or
-    ($md5Hash -ne (Get-Content $PACKAGES_CONFIG_MD5 ))) {
-        Write-Verbose -Message "Missing or changed package.config hash..."
-        Get-ChildItem -Exclude packages.config,nuget.exe,Cake.Bakery |
-        Remove-Item -Recurse -Force
-    }
-
-    Write-Verbose -Message "Restoring tools from NuGet..."
-    
-    $NuGetOutput = Invoke-Expression "& $env:NUGET_EXE_INVOCATION install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`""
-
-    if ($LASTEXITCODE -ne 0) {
-        Throw "An error occurred while restoring NuGet tools."
-    }
-    else
-    {
-        $md5Hash | Out-File $PACKAGES_CONFIG_MD5 -Encoding "ASCII"
-    }
-    Write-Verbose -Message ($NuGetOutput | Out-String)
-
-    Pop-Location
-}
-
-# Restore addins from NuGet
-if (Test-Path $ADDINS_PACKAGES_CONFIG) {
-    Push-Location
-    Set-Location $ADDINS_DIR
-
-    Write-Verbose -Message "Restoring addins from NuGet..."
-    $NuGetOutput = Invoke-Expression "& $env:NUGET_EXE_INVOCATION install -ExcludeVersion -OutputDirectory `"$ADDINS_DIR`""
-
-    if ($LASTEXITCODE -ne 0) {
-        Throw "An error occurred while restoring NuGet addins."
-    }
-
-    Write-Verbose -Message ($NuGetOutput | Out-String)
-
-    Pop-Location
-}
-
-# Restore modules from NuGet
-if (Test-Path $MODULES_PACKAGES_CONFIG) {
-    Push-Location
-    Set-Location $MODULES_DIR
-
-    Write-Verbose -Message "Restoring modules from NuGet..."
-    $NuGetOutput = Invoke-Expression "& $env:NUGET_EXE_INVOCATION install -ExcludeVersion -OutputDirectory `"$MODULES_DIR`""
-
-    if ($LASTEXITCODE -ne 0) {
-        Throw "An error occurred while restoring NuGet modules."
-    }
-
-    Write-Verbose -Message ($NuGetOutput | Out-String)
-
-    Pop-Location
-}
-
-# Make sure that Cake has been installed.
-if (!(Test-Path $CAKE_EXE)) {
-    Throw "Could not find Cake.exe at $CAKE_EXE"
-}
-
-$CAKE_EXE_INVOCATION = if ($IsLinux -or $IsMacOS) {
-    "mono `"$CAKE_EXE`""
-} else {
-    "`"$CAKE_EXE`""
-}
-
- # Build an array (not a string) of Cake arguments to be joined later
-$cakeArguments = @()
-if ($Script) { $cakeArguments += "`"$Script`"" }
-if ($Target) { $cakeArguments += "-target=`"$Target`"" }
-if ($Configuration) { $cakeArguments += "-configuration=$Configuration" }
-if ($Verbosity) { $cakeArguments += "-verbosity=$Verbosity" }
-if ($ShowDescription) { $cakeArguments += "-showdescription" }
-if ($DryRun) { $cakeArguments += "-dryrun" }
-$cakeArguments += $ScriptArgs
-
-# Start Cake
-Write-Host "Running build script..."
-Invoke-Expression "& $CAKE_EXE_INVOCATION $($cakeArguments -join " ")"
-exit $LASTEXITCODE
+dotnet cake @args
+if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
diff --git a/build/tools/packages.config b/build/tools/packages.config
index cedcc6ab5..955b88002 100644
--- a/build/tools/packages.config
+++ b/build/tools/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-    <package id="Cake" version="0.37.0" />
+  <package id="Cake" version="1.3.0" />
 </packages>
diff --git a/dlls/Animatables/Animatables.dll.csproj b/dlls/Animatables/Animatables.dll.csproj
index 7bbce563f..55ffd6f6d 100644
--- a/dlls/Animatables/Animatables.dll.csproj
+++ b/dlls/Animatables/Animatables.dll.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.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
index 3c0ad8c0f..d2195c113 100644
--- a/dlls/CompMetadata/CompMetadata.dll.csproj
+++ b/dlls/CompMetadata/CompMetadata.dll.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.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
index 2bd4f2e49..912716d29 100644
--- a/dlls/DotLottie/DotLottie.dll.csproj
+++ b/dlls/DotLottie/DotLottie.dll.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.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
index f15d6be5a..b5e0ed5a4 100644
--- a/dlls/GenericData/GenericData.dll.csproj
+++ b/dlls/GenericData/GenericData.dll.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Configurations>Debug;Release</Configurations>
     <LangVersion>latest</LangVersion>
     <DefineConstants>PUBLIC_LottieData</DefineConstants>
@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="System.Memory" Version="4.5.4" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/dlls/LottieData/LottieData.dll.csproj b/dlls/LottieData/LottieData.dll.csproj
index a75423dd7..0217aa8af 100644
--- a/dlls/LottieData/LottieData.dll.csproj
+++ b/dlls/LottieData/LottieData.dll.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Configurations>Debug;Release</Configurations>
     <LangVersion>latest</LangVersion>
     <DefineConstants>PUBLIC_LottieData</DefineConstants>
@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="System.Memory" Version="4.5.4" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/dlls/LottieMetadata/LottieMetadata.dll.csproj b/dlls/LottieMetadata/LottieMetadata.dll.csproj
index 9db8b3337..3036a0d51 100644
--- a/dlls/LottieMetadata/LottieMetadata.dll.csproj
+++ b/dlls/LottieMetadata/LottieMetadata.dll.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Configurations>Debug;Release</Configurations>
     <LangVersion>latest</LangVersion>
     <DefineConstants>PUBLIC_LottieMetadata</DefineConstants>
@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="System.Memory" Version="4.5.4" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/dlls/LottieReader/LottieReader.dll.csproj b/dlls/LottieReader/LottieReader.dll.csproj
index 2d1e07e2c..c9105eb07 100644
--- a/dlls/LottieReader/LottieReader.dll.csproj
+++ b/dlls/LottieReader/LottieReader.dll.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.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
index 366e3641e..c380d1d00 100644
--- a/dlls/LottieToWinComp/LottieToWinComp.dll.csproj
+++ b/dlls/LottieToWinComp/LottieToWinComp.dll.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.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
index 9422509dc..d9dd9769b 100644
--- a/dlls/UIData/UIData.dll.csproj
+++ b/dlls/UIData/UIData.dll.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.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
index 734a17fba..ca28a9315 100644
--- a/dlls/UIDataCodeGen/UIDataCodeGen.dll.csproj
+++ b/dlls/UIDataCodeGen/UIDataCodeGen.dll.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.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
index be98a2c79..cf36dee07 100644
--- a/dlls/WinCompData/WinCompData.dll.csproj
+++ b/dlls/WinCompData/WinCompData.dll.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.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
index bc8e4c14d..df493de44 100644
--- a/dlls/WinStorageStreamsData/WinStorageStreamsData.dll.csproj
+++ b/dlls/WinStorageStreamsData/WinStorageStreamsData.dll.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.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
index b02fa482d..b95600b98 100644
--- a/dlls/WinUIXamlMediaData/WinUIXamlMediaData.dll.csproj
+++ b/dlls/WinUIXamlMediaData/WinUIXamlMediaData.dll.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.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
index fd0766937..283a9736b 100644
--- a/dlls/YamlData/YamlData.dll.csproj
+++ b/dlls/YamlData/YamlData.dll.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Configurations>Debug;Release</Configurations>
     <LangVersion>latest</LangVersion>
     <DefineConstants>PUBLIC_YamlData</DefineConstants>
diff --git a/global.json b/global.json
index 80d84a257..f3cb0dc95 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "msbuild-sdks": {
-    "MSBuild.Sdk.Extras": "2.0.54"
+    "MSBuild.Sdk.Extras": "3.0.44"
   }
 }
\ No newline at end of file
diff --git a/source/Animatables/Easing.cs b/source/Animatables/Easing.cs
index a4ce5fdb7..7630b5c2e 100644
--- a/source/Animatables/Easing.cs
+++ b/source/Animatables/Easing.cs
@@ -49,7 +49,9 @@ public bool Equals(Easing? other)
                     var yCb = (CubicBezierEasing)other;
                     return xCb.Equals(yCb);
                 default:
+#pragma warning disable CA1065 // Do not raise exceptions in unexpected locations
                     throw Unreachable;
+#pragma warning restore CA1065 // Do not raise exceptions in unexpected locations
             }
         }
 
diff --git a/source/UIDataCodeGen/CodeGen/InstantiatorGeneratorBase.cs b/source/UIDataCodeGen/CodeGen/InstantiatorGeneratorBase.cs
index 6087b9ca6..a6cb95c3c 100644
--- a/source/UIDataCodeGen/CodeGen/InstantiatorGeneratorBase.cs
+++ b/source/UIDataCodeGen/CodeGen/InstantiatorGeneratorBase.cs
@@ -732,6 +732,8 @@ string String(GenericDataObject value) =>
 
         string New(string typeName) => _s.New(typeName);
 
+#pragma warning disable CA1033 // Interface methods should be callable by child types
+
         string IAnimatedVisualSourceInfo.ClassName => _className;
 
         string IAnimatedVisualSourceInfo.Namespace => _namespace;
@@ -778,6 +780,8 @@ string String(GenericDataObject value) =>
 
         SourceMetadata IAnimatedVisualSourceInfo.SourceMetadata => _sourceMetadata;
 
+#pragma warning restore CA1033 // Interface methods should be callable by child types
+
         // Return true if any of the AnimatedVisualGenerators match the given predicate.
         bool Any(Func<AnimatedVisualGenerator, bool> predicate) => _animatedVisualGenerators.Any(predicate);
 
diff --git a/source/WinCompData/CompositionObject.cs b/source/WinCompData/CompositionObject.cs
index e01d8c2db..f36ae4a52 100644
--- a/source/WinCompData/CompositionObject.cs
+++ b/source/WinCompData/CompositionObject.cs
@@ -83,6 +83,8 @@ public void SetMetadata(in Guid key, object? value)
 
         public string? Comment { get; set; }
 
+#pragma warning disable CA1033 // Interface methods should be callable by child types
+
         /// <summary>
         /// Gets or sets a description of the object. This may be used to add comments to generated code.
         /// Cf. the <see cref="Comment"/> property which is a property on real composition
@@ -113,6 +115,7 @@ public void SetMetadata(in Guid key, object? value)
             get => (string?)TryGetMetadata(in s_nameMetadataKey);
             set => SetMetadata(in s_nameMetadataKey, value);
         }
+#pragma warning restore CA1033 // Interface methods should be callable by child types
 
         public CompositionPropertySet Properties { get; }
 
@@ -207,6 +210,12 @@ public void StopAnimation(string propertyName)
 
         /// <inheritdoc/>
         public void Dispose()
+        {
+            Dispose(disposing: true);
+            GC.SuppressFinalize(this);
+        }
+
+        protected virtual void Dispose(bool disposing)
         {
         }
 
diff --git a/source/WinCompData/Mgcg/CanvasPathBuilder.cs b/source/WinCompData/Mgcg/CanvasPathBuilder.cs
index 423938004..117893070 100644
--- a/source/WinCompData/Mgcg/CanvasPathBuilder.cs
+++ b/source/WinCompData/Mgcg/CanvasPathBuilder.cs
@@ -93,7 +93,9 @@ public bool Equals(Command? other)
                     CommandType.EndFigure => ((EndFigure)this).Equals((EndFigure)other),
                     CommandType.AddCubicBezier => ((AddCubicBezier)this).Equals((AddCubicBezier)other),
                     CommandType.AddLine => ((AddLine)this).Equals((AddLine)other),
+#pragma warning disable CA1065 // Do not raise exceptions in unexpected locations
                     _ => throw new InvalidOperationException(),
+#pragma warning restore CA1065 // Do not raise exceptions in unexpected locations
                 };
             }