From 386b555cf45dc3d5a94192cde96b9ca50d103e91 Mon Sep 17 00:00:00 2001
From: Bert Jansen <bjansen@microsoft.com>
Date: Tue, 19 Nov 2024 13:05:22 +0100
Subject: [PATCH] Support for .NET 9.0

---
 .github/workflows/buildandtest.yml            |  2 +-
 .github/workflows/nightlynuget_dev.yml        |  2 +-
 src/lib/CHANGELOG.md                          |  2 ++
 .../PnP.Framework.Modernization.Test.csproj   | 10 +++----
 .../PnP.Framework.Test.csproj                 | 12 ++++-----
 src/lib/PnP.Framework/PnP.Framework.csproj    | 27 +++++++++++++++++--
 6 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/buildandtest.yml b/.github/workflows/buildandtest.yml
index 93ac68c0b..748ec7eff 100644
--- a/.github/workflows/buildandtest.yml
+++ b/.github/workflows/buildandtest.yml
@@ -30,7 +30,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '8.0.x'
+        dotnet-version: '9.0.x'
         include-prerelease: false
     - name: Install dependencies
       run: dotnet restore
diff --git a/.github/workflows/nightlynuget_dev.yml b/.github/workflows/nightlynuget_dev.yml
index 9f4bf9de3..2bdda487f 100644
--- a/.github/workflows/nightlynuget_dev.yml
+++ b/.github/workflows/nightlynuget_dev.yml
@@ -17,7 +17,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '8.0.x'    
+        dotnet-version: '9.0.x'    
         include-prerelease: false
     - name: Create and publish nuget 
       env:
diff --git a/src/lib/CHANGELOG.md b/src/lib/CHANGELOG.md
index 7e4d706cd..7b759854d 100644
--- a/src/lib/CHANGELOG.md
+++ b/src/lib/CHANGELOG.md
@@ -10,6 +10,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 ### Added
 
+- Support for .NET 9.0 [jansenbe - Bert Jansen]
+
 ### Changed
 
 - Removed references to the PnP Management Shell app (`31359c7f-bd7e-475c-86db-fdb8c937548e`) [jansenbe - Bert Jansen]
diff --git a/src/lib/PnP.Framework.Modernization.Test/PnP.Framework.Modernization.Test.csproj b/src/lib/PnP.Framework.Modernization.Test/PnP.Framework.Modernization.Test.csproj
index 05ec5d096..d9673e826 100644
--- a/src/lib/PnP.Framework.Modernization.Test/PnP.Framework.Modernization.Test.csproj
+++ b/src/lib/PnP.Framework.Modernization.Test/PnP.Framework.Modernization.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
 	  <SignAssembly>true</SignAssembly>
@@ -10,12 +10,12 @@
 
   <ItemGroup>
     <PackageReference Include="AngleSharp" Version="0.17.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageReference Include="Moq" Version="4.15.1" />
-	<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-	<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+	<PackageReference Include="MSTest.TestAdapter" Version="3.6.3" />
+	<PackageReference Include="MSTest.TestFramework" Version="3.6.3" />
 	<PackageReference Include="coverlet.collector" Version="6.0.0" />
-	<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.2.0" />
+	<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.2.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/lib/PnP.Framework.Test/PnP.Framework.Test.csproj b/src/lib/PnP.Framework.Test/PnP.Framework.Test.csproj
index f30080f51..043c32b6a 100644
--- a/src/lib/PnP.Framework.Test/PnP.Framework.Test.csproj
+++ b/src/lib/PnP.Framework.Test/PnP.Framework.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net9.0</TargetFramework>
 		<IsPackable>false</IsPackable>
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>..\pnp.core.snk</AssemblyOriginatorKeyFile>
@@ -175,17 +175,17 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
 		<PackageReference Include="Microsoft.SharePointOnline.CSOM" Version="16.1.*" />
-		<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-		<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+		<PackageReference Include="MSTest.TestAdapter" Version="3.6.3" />
+		<PackageReference Include="MSTest.TestFramework" Version="3.6.3" />
 		<PackageReference Include="coverlet.collector" Version="6.0.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="PrivateObjectExtensions" Version="1.4.0" />
-		<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
-		<PackageReference Include="System.Security.Cryptography.Xml" Version="8.0.2" />
+		<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
+		<PackageReference Include="System.Security.Cryptography.Xml" Version="9.0.0" />
 		<PackageReference Include="PnP.Core" Version="1.14.*-*" Condition="'$(PnPCoreSdkPath)' == ''" />
 	</ItemGroup>
 
diff --git a/src/lib/PnP.Framework/PnP.Framework.csproj b/src/lib/PnP.Framework/PnP.Framework.csproj
index ecf33f411..dc9cd0490 100644
--- a/src/lib/PnP.Framework/PnP.Framework.csproj
+++ b/src/lib/PnP.Framework/PnP.Framework.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
+		<TargetFrameworks>netstandard2.0;net8.0;net9.0</TargetFrameworks>
 		<LangVersion>10.0</LangVersion>
 		<RootNamespace>PnP.Framework</RootNamespace>
 		<AssemblyName>PnP.Framework</AssemblyName>
@@ -30,6 +30,7 @@
 		<!-- Set the PnPCoreSdkPath and PnPCoreSdkPathNet5 to non published PnP Core SDK binaries to load them instead of the nuget ones -->
 		<PnPCoreSdkPath Condition="'$(PnPCoreSdkPath)' == ''"></PnPCoreSdkPath>		
 		<PnPCoreSdkPathNet8 Condition="'$(PnPCoreSdkPathNet8)' == ''"></PnPCoreSdkPathNet8>
+		<PnPCoreSdkPathNet9 Condition="'$(PnPCoreSdkPathNet9)' == ''"></PnPCoreSdkPathNet9>
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>..\pnp.core.snk</AssemblyOriginatorKeyFile>
 	</PropertyGroup>
@@ -215,9 +216,23 @@
 		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.2.0" />
 	</ItemGroup>
 
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
+		<PackageReference Include="System.Text.Json" Version="9.0.0" />
+		<PackageReference Include="Microsoft.ApplicationInsights" Version="2.21.0" />
+		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.0" />
+		<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
+		<PackageReference Include="System.DirectoryServices" Version="9.0.0" />
+		<PackageReference Include="System.IO.Packaging" Version="9.0.0" />
+		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.2.1" />
+	</ItemGroup>
+
 	<ItemGroup>
 		<!-- Required -->
-		<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-*">
+		<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-*">
 		  <PrivateAssets>all</PrivateAssets>
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
@@ -253,6 +268,14 @@
 		</Reference>
 	</ItemGroup>
 
+	<ItemGroup Condition="'$(PnPCoreSdkPathNet9)' != ''">
+		<Reference Include="PnP.Core" Condition="'$(TargetFramework)' == 'net9.0'">
+			<HintPath>$(PnPCoreSdkPathNet9)</HintPath>
+			<Private>true</Private>
+			<SpecificVersion>false</SpecificVersion>
+		</Reference>
+	</ItemGroup>
+
 	<ItemGroup>
 		<None Update="Modernization\Nuget\webpartmapping.xml">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>