Merge branch 'pnp:dev' into dev

pnp · Jan 18, 2025 · 7780b71 · 7780b71
2 parents f3750aa + bdd1005
commit 7780b71
Show file tree

Hide file tree

Showing 27 changed files with 867 additions and 179 deletions.
diff --git 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
@@ -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/README.md b/README.md
@@ -1,6 +1,6 @@
 # PnP Framework
 
-**PnP Framework** is a .NET Standard 2.0 / .NET 6.0 / .NET 7.0 / .NET 8.0 library targeting Microsoft 365 containing the PnP Provisioning engine and a ton of other useful extensions. This library is the cross platform successor of the [PnP-Sites-Core](https://github.com/PnP/PnP-Sites-Core) library. The original [PnP-Sites-Core](https://github.com/PnP/PnP-Sites-Core) library only works on Windows (due to the dependency on .Net Framework) and supports SharePoint on-premises and SharePoint Online, while this library will work cross platform but only supports SharePoint Online. Going forward we'll only be **actively maintaining PnP Framework**, the [PnP-Sites-Core](https://github.com/PnP/PnP-Sites-Core) library is retired and archived.
+**PnP Framework** is a .NET Standard 2.0 / .NET 8.0 / .NET 9.0 library targeting Microsoft 365 containing the PnP Provisioning engine and a ton of other useful extensions. This library is the cross platform successor of the [PnP-Sites-Core](https://github.com/PnP/PnP-Sites-Core) library. The original [PnP-Sites-Core](https://github.com/PnP/PnP-Sites-Core) library only works on Windows (due to the dependency on .Net Framework) and supports SharePoint on-premises and SharePoint Online, while this library will work cross platform but only supports SharePoint Online. Going forward we'll only be **actively maintaining PnP Framework**, the [PnP-Sites-Core](https://github.com/PnP/PnP-Sites-Core) library is retired and archived.
 
 Next to PnP Framework that will be replacing [PnP-Sites-Core](https://github.com/PnP/PnP-Sites-Core) we're also building a brand new [PnP Core SDK](https://github.com/pnp/pnpcore) that targets modern .NET development and which will work everywhere where .NET will run. This library is the long term evolution of PnP Framework, we'll enable a phased transition from PnP Framework to [PnP Core SDK](https://github.com/pnp/pnpcore) without impacting PnP Framework users.
 

diff --git a/build/build-debug.ps1 b/build/build-debug.ps1
@@ -25,21 +25,15 @@ $buildCmd = "dotnet build `"$PSScriptRoot/../src/lib/PnP.Framework/PnP.Framework
 if ($LocalPnPCore) {
 	# Check if available
 	$pnpCoreAssembly = Join-Path $PSScriptRoot -ChildPath "..\..\pnpcore\src\sdk\PnP.Core\bin\Debug\netstandard2.0\PnP.Core.dll"
-	$pnpCoreAssembly5 = Join-Path $PSScriptRoot -ChildPath "..\..\pnpcore\src\sdk\PnP.Core\bin\Debug\net5.0\PnP.Core.dll"
-	$pnpCoreAssembly6 = Join-Path $PSScriptRoot -ChildPath "..\..\pnpcore\src\sdk\PnP.Core\bin\Debug\net6.0\PnP.Core.dll"
-	$pnpCoreAssembly7 = Join-Path $PSScriptRoot -ChildPath "..\..\pnpcore\src\sdk\PnP.Core\bin\Debug\net7.0\PnP.Core.dll"
 	$pnpCoreAssembly8 = Join-Path $PSScriptRoot -ChildPath "..\..\pnpcore\src\sdk\PnP.Core\bin\Debug\net8.0\PnP.Core.dll"
+	$pnpCoreAssembly9 = Join-Path $PSScriptRoot -ChildPath "..\..\pnpcore\src\sdk\PnP.Core\bin\Debug\net9.0\PnP.Core.dll"
 	$pnpCoreAssembly = [System.IO.Path]::GetFullPath($pnpCoreAssembly)
-	$pnpCoreAssembly5 = [System.IO.Path]::GetFullPath($pnpCoreAssembly5)
-	$pnpCoreAssembly6 = [System.IO.Path]::GetFullPath($pnpCoreAssembly6)
-	$pnpCoreAssembly7 = [System.IO.Path]::GetFullPath($pnpCoreAssembly7)
 	$pnpCoreAssembly8 = [System.IO.Path]::GetFullPath($pnpCoreAssembly8)
+	$pnpCoreAssembly9 = [System.IO.Path]::GetFullPath($pnpCoreAssembly9)
 	if (Test-Path $pnpCoreAssembly -PathType Leaf) {
 		$buildCmd += " -p:PnPCoreSdkPath=`"$pnpCoreAssembly`""
-		$buildCmd += " -p:PnPCoreSdkPathNet5=`"$pnpCoreAssembly5`""
-		$buildCmd += " -p:PnPCoreSdkPathNet6=`"$pnpCoreAssembly6`""
-		$buildCmd += " -p:PnPCoreSdkPathNet7=`"$pnpCoreAssembly7`""
 		$buildCmd += " -p:PnPCoreSdkPathNet8=`"$pnpCoreAssembly8`""
+		$buildCmd += " -p:PnPCoreSdkPathNet9=`"$pnpCoreAssembly9`""
 	} 
 	else {
 		Write-Error -Message "PnP Core Assembly path $pnpCoreAssembly not found"

diff --git a/build/version.debug.increment b/build/version.debug.increment
@@ -1 +1 @@
-63
+163
diff --git a/src/lib/CHANGELOG.md b/src/lib/CHANGELOG.md
@@ -10,10 +10,17 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 ### Added
 
+- Support for .NET 9.0 [jansenbe - Bert Jansen]
+- Support for Rate-Limiting in the PnP Framework + unifiqation of the throttling implementation for all http requests made [jansenbe - Bert Jansen]
+
 ### Changed
 
 - Removed references to the PnP Management Shell app (`31359c7f-bd7e-475c-86db-fdb8c937548e`) [jansenbe - Bert Jansen]
 - Fix check for HeaderTypes as new PageTitle WebPart in OneColumnFullWIth is not always in first section #1066 [czullu - Christian Zuellig]
+- Updated assembly versions #1073 [gautamdsheth - Gautam Sheth]
+- Removed dependecy on Microsoft.AspNetCore.StaticFiles #1088 [jansenbe - Bert Jansen]
+- PageTitle WebPart can be on any position #1102 [czullu - Christian Zuellig]
+- Replacing hard coded user information list value with instance that should resolve regardless of the language of the site #1097 [koenzomers - Koen Zomers]
 
 ## [1.17.0]
 

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
@@ -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="6.35.0" />
+	<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.2.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/lib/PnP.Framework.Test/Framework/ObjectHandlers/ObjectTeamsTests.cs b/src/lib/PnP.Framework.Test/Framework/ObjectHandlers/ObjectTeamsTests.cs
@@ -1,5 +1,4 @@
-using Microsoft.AspNetCore.Http.Features.Authentication;
-using Microsoft.Online.SharePoint.TenantAdministration;
+using Microsoft.Online.SharePoint.TenantAdministration;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Newtonsoft.Json.Linq;
 using PnP.Core.Model.SharePoint;

diff --git a/src/lib/PnP.Framework.Test/Pages/ClientSidePagesTests.cs b/src/lib/PnP.Framework.Test/Pages/ClientSidePagesTests.cs
@@ -3,6 +3,7 @@
 using Microsoft.SharePoint.Client;
 using Microsoft.SharePoint.Client.Taxonomy;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using PnP.Core.Services;
 using PnP.Framework.ALM;
 using PnP.Framework.Provisioning.Connectors;
 using PnP.Framework.Provisioning.Model;
@@ -45,6 +46,18 @@ public static void ClassCleanup()
         //    }
         //}
 
+        [TestMethod]
+        public void Bert2()
+        {
+            using (var cc = TestCommon.CreateClientContext())
+            {
+                cc.Load(cc.Web, p => p.Title);
+                cc.ExecuteQueryRetry();
+                //cc.ExecuteQuery();
+                Assert.IsTrue(cc.Web.Title != null);
+            }
+        }
+
         [TestMethod]
         public void ExportPagesTest()
         {

diff --git 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.0" />
-		<PackageReference Include="System.Security.Cryptography.Xml" Version="8.0.0" />
+		<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.Test/TestCommon.cs b/src/lib/PnP.Framework.Test/TestCommon.cs
@@ -332,7 +332,7 @@ private static ClientContext CreateContext(string contextUrl, AzureEnvironment a
             }
             else
             {
-                using (AuthenticationManager am = new AuthenticationManager(AppId, UserName, Password, null, azureEnvironment))
+                using (AuthenticationManager am = new AuthenticationManager(AzureADClientId, UserName, Password, null, azureEnvironment))
                 {
 
                     if (azureEnvironment == AzureEnvironment.Custom)
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
                 else
                 {
-                    using (AuthenticationManager am = new AuthenticationManager(AppId, UserName, Password, null, azureEnvironment))
+                    using (AuthenticationManager am = new AuthenticationManager(AzureADClientId, UserName, Password, null, azureEnvironment))
                     {
                         if (azureEnvironment == AzureEnvironment.Custom)
@@ Expand Down @@