From 137e7dd5de63e0437115b72a6c2f9291c3f1c7ad Mon Sep 17 00:00:00 2001
From: Thomas Labrecque <thomas.labrecque@nventive.com>
Date: Wed, 2 Apr 2025 09:07:37 -0400
Subject: [PATCH] chore!: Dotnet 8

---
 BREAKING_CHANGES.md                                |  4 ++++
 build/stage-build.yml                              |  6 +++---
 .../DataLoader.Abstractions.csproj                 |  2 +-
 .../DataLoader.DynamicMvvm.csproj                  |  1 +
 src/DataLoader.Tests/DataLoader.Tests.csproj       |  4 ++--
 .../DataLoader.Uno.WinUI.csproj                    | 14 +++++++++-----
 .../winappsdk-workaround.targets                   |  4 ++--
 src/DataLoader/DataLoader.csproj                   |  1 +
 8 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/BREAKING_CHANGES.md b/BREAKING_CHANGES.md
index fd7ce82..fe616ca 100644
--- a/BREAKING_CHANGES.md
+++ b/BREAKING_CHANGES.md
@@ -1,5 +1,9 @@
 # Breaking Changes
 
+## 3.0.0
+- Added support for .NET 8.
+- Removed support for .NET 7.
+
 ## 2.0.0
 - Added support for .NET 7.
 - Updated Uno.WinUI to 5.0.19.
diff --git a/build/stage-build.yml b/build/stage-build.yml
index 4a38158..1d206c1 100644
--- a/build/stage-build.yml
+++ b/build/stage-build.yml
@@ -1,7 +1,7 @@
 parameters:
-  DotNetVersion: '7.0.102'
-  UnoCheck_Version: '1.11.0'
-  UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/146b0b4b23d866bef455494a12ad7ffd2f6f2d20/manifests/uno.ui.manifest.json'
+  DotNetVersion: '8.0.401'
+  UnoCheck_Version: '1.30.1'
+  UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/0ca039bef4097295fc6c2c5c282ae18a797160c1/manifests/uno.ui.manifest.json'
 
 steps:
 - task: gitversion/setup@0
diff --git a/src/DataLoader.Abstractions/DataLoader.Abstractions.csproj b/src/DataLoader.Abstractions/DataLoader.Abstractions.csproj
index 02f008e..973bf53 100644
--- a/src/DataLoader.Abstractions/DataLoader.Abstractions.csproj
+++ b/src/DataLoader.Abstractions/DataLoader.Abstractions.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<LangVersion>11.0</LangVersion>
 		<TargetFrameworks>netstandard2.0</TargetFrameworks>
+		<LangVersion>12</LangVersion>
 		<RootNamespace>Chinook.DataLoader</RootNamespace>
 		<Authors>nventive</Authors>
 		<Company>nventive</Company>
diff --git a/src/DataLoader.DynamicMvvm/DataLoader.DynamicMvvm.csproj b/src/DataLoader.DynamicMvvm/DataLoader.DynamicMvvm.csproj
index 4954599..e33791b 100644
--- a/src/DataLoader.DynamicMvvm/DataLoader.DynamicMvvm.csproj
+++ b/src/DataLoader.DynamicMvvm/DataLoader.DynamicMvvm.csproj
@@ -2,6 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0</TargetFrameworks>
+		<LangVersion>12</LangVersion>
 		<RootNamespace>Chinook.DynamicMvvm</RootNamespace>
 		<Authors>nventive</Authors>
 		<Company>nventive</Company>
diff --git a/src/DataLoader.Tests/DataLoader.Tests.csproj b/src/DataLoader.Tests/DataLoader.Tests.csproj
index 3e32974..a98a80a 100644
--- a/src/DataLoader.Tests/DataLoader.Tests.csproj
+++ b/src/DataLoader.Tests/DataLoader.Tests.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net472</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<IsPackable>false</IsPackable>
 		<AssemblyName>Chinook.DataLoader.Tests</AssemblyName>
 		<RootNamespace>Tests</RootNamespace>
 		<IsTestProject>True</IsTestProject>
-		<LangVersion>8.0</LangVersion>
+		<LangVersion>12.0</LangVersion>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/src/DataLoader.Uno.WinUI/DataLoader.Uno.WinUI.csproj b/src/DataLoader.Uno.WinUI/DataLoader.Uno.WinUI.csproj
index 6e9b7a4..a482b4b 100644
--- a/src/DataLoader.Uno.WinUI/DataLoader.Uno.WinUI.csproj
+++ b/src/DataLoader.Uno.WinUI/DataLoader.Uno.WinUI.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras/3.0.44">
 	<PropertyGroup>
-		<TargetFrameworks>net7.0;net7.0-windows10.0.19041;net7.0-android;net7.0-ios;</TargetFrameworks>
-		<LangVersion>11.0</LangVersion>
+		<TargetFrameworks>net8.0;net8.0-windows10.0.19041;net8.0-android;net8.0-ios;</TargetFrameworks>
+		<LangVersion>12.0</LangVersion>
 		<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
 		<GenerateLibraryLayout>true</GenerateLibraryLayout>
 		<RootNamespace>Chinook.DataLoader</RootNamespace>
@@ -36,17 +36,21 @@
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)'=='net7.0-windows10.0.19041'">
+	<ItemGroup Condition="'$(TargetFramework)'=='net8.0-windows10.0.19041'">
 		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.3" />
 		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.22000.24" />
 		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.22000.24" />
 	</ItemGroup>
 
-	<PropertyGroup Condition="'$(TargetFramework)'=='net7.0'">
+	<PropertyGroup Condition="'$(TargetFramework)'=='net8.0-windows10.0.19041'">
+		<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(TargetFramework)'=='net8.0'">
 		<DefineConstants>$(DefineConstants);__WASM__</DefineConstants>
 	</PropertyGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)'!='net7.0-windows10.0.19041'">
+	<ItemGroup Condition="'$(TargetFramework)'!='net8.0-windows10.0.19041'">
 		<Page Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
 		<Compile Update="**\*.xaml.cs">
 			<DependentUpon>%(Filename)</DependentUpon>
diff --git a/src/DataLoader.Uno.WinUI/winappsdk-workaround.targets b/src/DataLoader.Uno.WinUI/winappsdk-workaround.targets
index aabc9c5..05bb4d5 100644
--- a/src/DataLoader.Uno.WinUI/winappsdk-workaround.targets
+++ b/src/DataLoader.Uno.WinUI/winappsdk-workaround.targets
@@ -1,8 +1,8 @@
-<Project>
+<Project>
 	<!--
 		Workaround to avoid including Uno.Toolkit.UI XBFs in the PRI file:
 			> C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\Microsoft.Common.CurrentVersion.targets(5097,5):
-			> error MSB3030: Could not copy the file "D:\a\1\s\src\Uno.Toolkit.UI\obj\Uno.Toolkit.WinUI\Release\net7.0-windows10.0.19041\Controls\AutoLayout\AutoLayout.xbf" because it was not found.
+			> error MSB3030: Could not copy the file "D:\a\1\s\src\Uno.Toolkit.UI\obj\Uno.Toolkit.WinUI\Release\net8.0-windows10.0.19041\Controls\AutoLayout\AutoLayout.xbf" because it was not found.
 			> [D:\a\1\s\src\Uno.Toolkit.RuntimeTests\Uno.Toolkit.RuntimeTests.WinUI.csproj]
 		Just <Import /> this file into the winui project appearing in the `[]` bracket.
 	-->
diff --git a/src/DataLoader/DataLoader.csproj b/src/DataLoader/DataLoader.csproj
index 714bbb4..2528107 100644
--- a/src/DataLoader/DataLoader.csproj
+++ b/src/DataLoader/DataLoader.csproj
@@ -2,6 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0</TargetFrameworks>
+		<LangVersion>12</LangVersion>
 		<RootNamespace>Chinook.DataLoader</RootNamespace>
 		<Authors>nventive</Authors>
 		<Company>nventive</Company>