From 8236974d24172ae261628e22a488af371c8799d9 Mon Sep 17 00:00:00 2001
From: LTRData <ol@ltr-data.se>
Date: Fri, 13 Sep 2024 20:12:41 +0200
Subject: [PATCH] Compatibility checks for .NET 9

---
 Directory.Build.props                              | 2 +-
 Library/Directory.Build.props                      | 4 ++--
 Library/DiscUtils.Xva/DiscUtils.Xva.csproj         | 7 ++++---
 Tests/LibraryTests/LibraryTests.csproj             | 2 +-
 Utilities/Directory.Build.props                    | 4 ++--
 Utilities/DiscUtils.Common/DiscUtils.Common.csproj | 1 +
 Utilities/DiskClone/DiskClone.csproj               | 2 +-
 Utilities/MSBuildTask/MSBuildTask.csproj           | 7 ++++---
 8 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index f36b4a840..08f61161f 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
 
-    <LangVersion>Latest</LangVersion>
+    <LangVersion>Preview</LangVersion>
 
     <PackageProjectUrl>https://github.com/LTRData/DiscUtils</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
diff --git a/Library/Directory.Build.props b/Library/Directory.Build.props
index 1c7dfde9a..e3889ef9b 100644
--- a/Library/Directory.Build.props
+++ b/Library/Directory.Build.props
@@ -3,7 +3,7 @@
   
   <!-- Package related stuff -->
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net46;net48;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net46;net48;net6.0;net8.0;net9.0</TargetFrameworks>
 	<GeneratePackageOnBuild Condition="'$(Configuration)' == 'Release'">true</GeneratePackageOnBuild>
 	<PackageId>LTRData.$(MSBuildProjectName)</PackageId>
     <PackageOutputPath>$(LocalNuGetPath)</PackageOutputPath>
@@ -37,4 +37,4 @@
     </PackageReference>
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Library/DiscUtils.Xva/DiscUtils.Xva.csproj b/Library/DiscUtils.Xva/DiscUtils.Xva.csproj
index 7ece227e7..e77e80ac4 100644
--- a/Library/DiscUtils.Xva/DiscUtils.Xva.csproj
+++ b/Library/DiscUtils.Xva/DiscUtils.Xva.csproj
@@ -13,9 +13,10 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.1" />
-    <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
-    <PackageReference Include="System.Xml.XPath" Version="4.3.0" />
+    <PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.*" />
+    <PackageReference Include="System.Xml.XmlDocument" Version="4.3.*" />
+    <PackageReference Include="System.Xml.XPath" Version="4.3.*" />
+    <PackageReference Include="System.Text.RegularExpressions" Version="*" />
   </ItemGroup>
 
 </Project>
diff --git a/Tests/LibraryTests/LibraryTests.csproj b/Tests/LibraryTests/LibraryTests.csproj
index f3e7fa44f..1f1cb04a3 100644
--- a/Tests/LibraryTests/LibraryTests.csproj
+++ b/Tests/LibraryTests/LibraryTests.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net48;net46</TargetFrameworks>
+    <TargetFrameworks>net9.0</TargetFrameworks>
     <DebugType>portable</DebugType>
     <AssemblyName>LibraryTests</AssemblyName>
     <PackageId>LibraryTests</PackageId>
diff --git a/Utilities/Directory.Build.props b/Utilities/Directory.Build.props
index 024bf7018..838de6f36 100644
--- a/Utilities/Directory.Build.props
+++ b/Utilities/Directory.Build.props
@@ -5,7 +5,7 @@
   <!-- Package related stuff -->
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net46;net48;netstandard2.1;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net9.0</TargetFrameworks>
     <RollForward>LatestMajor</RollForward>
     <LangVersion>Latest</LangVersion>
     <SignAssembly>false</SignAssembly>
@@ -15,4 +15,4 @@
     <PackageVersion>$(FileVersion)</PackageVersion>
   </PropertyGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Utilities/DiscUtils.Common/DiscUtils.Common.csproj b/Utilities/DiscUtils.Common/DiscUtils.Common.csproj
index c6460170e..b83add132 100644
--- a/Utilities/DiscUtils.Common/DiscUtils.Common.csproj
+++ b/Utilities/DiscUtils.Common/DiscUtils.Common.csproj
@@ -3,6 +3,7 @@
 
   <PropertyGroup>
     <DebugType>portable</DebugType>
+    <TargetFrameworks>net46;net48;netstandard2.0;netstandard2.1;net6.0;net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Utilities/DiskClone/DiskClone.csproj b/Utilities/DiskClone/DiskClone.csproj
index d1969ea14..473eaa723 100644
--- a/Utilities/DiskClone/DiskClone.csproj
+++ b/Utilities/DiskClone/DiskClone.csproj
@@ -2,7 +2,7 @@
   
 
   <PropertyGroup>
-    <TargetFrameworks>net46;net48;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net9.0-windows</TargetFrameworks>
     <DebugType>portable</DebugType>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/Utilities/MSBuildTask/MSBuildTask.csproj b/Utilities/MSBuildTask/MSBuildTask.csproj
index 7b3d397cf..bef80a4da 100644
--- a/Utilities/MSBuildTask/MSBuildTask.csproj
+++ b/Utilities/MSBuildTask/MSBuildTask.csproj
@@ -4,8 +4,9 @@
     <TargetFrameworks>net48</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Framework" Version="17.11.4" />
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.11.4" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="*" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="*" />
+    <PackageReference Include="Microsoft.IO.Redist" Version="*" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\DiscUtils.Common\DiscUtils.Common.csproj" />
@@ -13,4 +14,4 @@
     <ProjectReference Include="..\..\Library\DiscUtils.Iso9660\DiscUtils.Iso9660.csproj" />
     <ProjectReference Include="..\..\Library\DiscUtils.SquashFs\DiscUtils.SquashFs.csproj" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>