Update workflows and projects to .NET 10.0 and upgrade dependencies

gautamdsheth · gautamdsheth · commit 07bd47676e8c · 2025-11-14T21:52:37.000+02:00
diff --git a/.github/workflows/buildandtest.yml b/.github/workflows/buildandtest.yml
@@ -40,13 +40,13 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}              
     - name: Checkout dev branch
-      uses: actions/checkout@v2
+      uses: actions/checkout@v5
       with: 
         ref: dev
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v5
       with:
-        dotnet-version: '9.0.x'
+        dotnet-version: '10.0.x'
         include-prerelease: false
     - name: Install dependencies
       run: dotnet restore
diff --git a/.github/workflows/cleannightlynuget.yml b/.github/workflows/cleannightlynuget.yml
@@ -14,13 +14,13 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v5
       with: 
         ref: dev
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v5
       with:
-        dotnet-version: '6.0.x'
+        dotnet-version: '10.0.x'
         include-prerelease: false    
     - name: Unlist nightly nuget packages
       env:
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -64,9 +64,9 @@ jobs:
     #   make release
 
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v5
       with:
-        dotnet-version: '9.0.x'
+        dotnet-version: '10.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
@@ -18,14 +18,14 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}      
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v5
       with: 
         ref: dev
         token: ${{ secrets.GITHUB_TOKEN }}
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v5
       with:
-        dotnet-version: '9.0.x'    
+        dotnet-version: '10.0.x'    
         include-prerelease: false
     - name: Create and publish nuget 
       env:
diff --git a/src/sdk/PnP.Core.Admin/Model/SharePoint/Core/Internal/SharePointAdmin.cs b/src/sdk/PnP.Core.Admin/Model/SharePoint/Core/Internal/SharePointAdmin.cs
@@ -195,7 +195,9 @@ public async Task<List<ISharePointUser>> GetTenantAdminsAsync(VanityUrlOptions v
         {
             using (var tenantAdminCenterContext = await GetTenantAdminCenterContextAsync(vanityUrlOptions).ConfigureAwait(false))
             {
-                return await tenantAdminCenterContext.Web.SiteUsers.Where(p => p.IsSiteAdmin == true).ToListAsync().ConfigureAwait(false);
+                // Materialize the collection first, then filter in-memory to avoid ambiguity
+                var users = await PnP.Core.QueryModel.QueryableExtensions.ToListAsync(tenantAdminCenterContext.Web.SiteUsers).ConfigureAwait(false);
+                return users.Where(p => p.IsSiteAdmin == true).ToList();
             }
         }
 
diff --git a/src/sdk/PnP.Core.Admin/PnP.Core.Admin.csproj b/src/sdk/PnP.Core.Admin/PnP.Core.Admin.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.0;net8.0;net9.0</TargetFrameworks>
+		<TargetFrameworks>netstandard2.0;net8.0;net9.0;net10.0</TargetFrameworks>
 		<LangVersion>10.0</LangVersion>
 		<RootNamespace>PnP.Core.Admin</RootNamespace>
 		<AssemblyName>PnP.Core.Admin</AssemblyName>
@@ -43,7 +43,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-*">
+		<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.0-*">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
diff --git a/src/sdk/PnP.Core.Auth/PnP.Core.Auth.csproj b/src/sdk/PnP.Core.Auth/PnP.Core.Auth.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.0;net8.0;net9.0</TargetFrameworks>
+		<TargetFrameworks>netstandard2.0;net8.0;net9.0;net10.0</TargetFrameworks>
 		<LangVersion>10.0</LangVersion>
 		<RootNamespace>PnP.Core.Auth</RootNamespace>
 		<AssemblyName>PnP.Core.Auth</AssemblyName>
@@ -43,7 +43,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-*">
+		<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.0-*">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
diff --git a/src/sdk/PnP.Core.Test/PnP.Core.Test.csproj b/src/sdk/PnP.Core.Test/PnP.Core.Test.csproj
@@ -25,7 +25,7 @@
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="System.Runtime" Version="4.3.1" />
-		<PackageReference Include="TimeZoneConverter" Version="6.1.0" />
+		<PackageReference Include="TimeZoneConverter" Version="7.2.0" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/src/sdk/PnP.Core.Transformation.SharePoint/PnP.Core.Transformation.SharePoint.csproj b/src/sdk/PnP.Core.Transformation.SharePoint/PnP.Core.Transformation.SharePoint.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.0;net8.0;net9.0</TargetFrameworks>
+		<TargetFrameworks>netstandard2.0;net8.0;net9.0;net10.0</TargetFrameworks>
 		<LangVersion>10.0</LangVersion>
 		<Version>1.15.0</Version>
 		<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
@@ -66,7 +66,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="AngleSharp.Css" Version="0.17.0" />
-		<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-*">
+		<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.0-*">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
diff --git a/src/sdk/PnP.Core.Transformation/PnP.Core.Transformation.csproj b/src/sdk/PnP.Core.Transformation/PnP.Core.Transformation.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net8.0;net9.0;net10.0</TargetFrameworks>
     <LangVersion>10.0</LangVersion>
     <RootNamespace>PnP.Core.Transformation</RootNamespace>
     <AssemblyName>PnP.Core.Transformation</AssemblyName>
@@ -43,7 +43,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-*">
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.0-*">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/sdk/PnP.Core/Model/Security/Internal/SharePointGroup.cs b/src/sdk/PnP.Core/Model/Security/Internal/SharePointGroup.cs
@@ -188,7 +188,11 @@ public async Task<bool> AddRoleDefinitionsAsync(params string[] names)
             var result = false;
             foreach (var name in names)
             {
-                var roleDefinition = await PnPContext.Web.RoleDefinitions.FirstOrDefaultAsync(d => d.Name == name).ConfigureAwait(false);
+                // Explicitly use the QueryableExtensions to resolve ambiguity
+                var roleDefinition = await QueryableExtensions.FirstOrDefaultAsync(
+                    PnPContext.Web.RoleDefinitions, 
+                    d => d.Name == name
+                ).ConfigureAwait(false);
                 if (roleDefinition != null)
                 {
                     var apiCall = new ApiCall($"_api/web/roleassignments/addroleassignment(principalid={Id},roledefid={roleDefinition.Id})", ApiType.SPORest);
diff --git a/src/sdk/PnP.Core/Model/Security/Internal/SharePointUser.cs b/src/sdk/PnP.Core/Model/Security/Internal/SharePointUser.cs
@@ -154,7 +154,8 @@ public async Task<bool> AddRoleDefinitionsAsync(params string[] names)
             var result = false;
             foreach (var name in names)
             {
-                var roleDefinition = await PnPContext.Web.RoleDefinitions.FirstOrDefaultAsync(d => d.Name == name).ConfigureAwait(false);
+                var roleDefinition = await PnP.Core.QueryModel.QueryableExtensions.FirstOrDefaultAsync(
+                    PnPContext.Web.RoleDefinitions, d => d.Name == name).ConfigureAwait(false);
                 if (roleDefinition != null)
                 {
                     var apiCall = new ApiCall($"_api/web/roleassignments/addroleassignment(principalid={Id},roledefid={roleDefinition.Id})", ApiType.SPORest);
diff --git a/src/sdk/PnP.Core/Model/SharePoint/Core/Internal/List.cs b/src/sdk/PnP.Core/Model/SharePoint/Core/Internal/List.cs
@@ -859,7 +859,7 @@ public async Task<bool> AddRoleDefinitionsAsync(int principalId, params string[]
                 return false;
             }
 
-            var roleDefinitions = await PnPContext.Web.RoleDefinitions.ToListAsync().ConfigureAwait(false);
+            var roleDefinitions = await PnP.Core.QueryModel.QueryableExtensions.ToListAsync(PnPContext.Web.RoleDefinitions).ConfigureAwait(false);
             var batch = PnPContext.NewBatch();
             foreach (var name in names)
             {
diff --git a/src/sdk/PnP.Core/Model/SharePoint/Core/Internal/ListItem.cs b/src/sdk/PnP.Core/Model/SharePoint/Core/Internal/ListItem.cs
@@ -1316,7 +1316,7 @@ public async Task<bool> AddRoleDefinitionsAsync(int principalId, params string[]
                 return false;
             }
 
-            var roleDefinitions = await PnPContext.Web.RoleDefinitions.ToListAsync().ConfigureAwait(false);
+            var roleDefinitions = await PnP.Core.QueryModel.QueryableExtensions.ToListAsync(PnPContext.Web.RoleDefinitions).ConfigureAwait(false);
             var batch = PnPContext.NewBatch();
             foreach (var name in names)
             {
diff --git a/src/sdk/PnP.Core/Model/SharePoint/Core/Internal/Web.cs b/src/sdk/PnP.Core/Model/SharePoint/Core/Internal/Web.cs
@@ -1561,7 +1561,7 @@ public async Task<bool> AddRoleDefinitionsAsync(int principalId, params string[]
                 return false;
             }
 
-            var roleDefinitions = await PnPContext.Web.RoleDefinitions.ToListAsync().ConfigureAwait(false);
+            var roleDefinitions = await PnP.Core.QueryModel.QueryableExtensions.ToListAsync(PnPContext.Web.RoleDefinitions).ConfigureAwait(false);
             var batch = PnPContext.NewBatch();
             foreach (var name in names)
             {
diff --git a/src/sdk/PnP.Core/Model/SharePoint/Syntex/Internal/SyntexContentCenter.cs b/src/sdk/PnP.Core/Model/SharePoint/Syntex/Internal/SyntexContentCenter.cs
@@ -26,7 +26,10 @@ public async Task<List<ISyntexModel>> GetSyntexModelsAsync(string modelName = nu
             {
                 var currentGraphFirstSetting = Web.PnPContext.GraphFirst;
                 Web.PnPContext.GraphFirst = false;
-                modelLibrary = await Web.Lists.Where(p => p.TemplateType == (ListTemplateType)1328).FirstOrDefaultAsync().ConfigureAwait(false);
+                modelLibrary = await ((IQueryable<IList>)Web.Lists)
+                    .Where(p => p.TemplateType == (ListTemplateType)1328)
+                    .FirstOrDefaultAsync()
+                    .ConfigureAwait(false);
                 Web.PnPContext.GraphFirst = currentGraphFirstSetting;
             }
 
diff --git a/src/sdk/PnP.Core/Model/SharePoint/Taxonomy/Internal/TermSet.cs b/src/sdk/PnP.Core/Model/SharePoint/Taxonomy/Internal/TermSet.cs
@@ -207,11 +207,11 @@ await RawRequestAsync(getTermsCall, HttpMethod.Post)
 
             foreach (var termGuidString in getTermsByCustomPropertyRequest.Result.Select(guid => guid.ToString()))
             {
-                var term = await Terms
-                    .Where(p => p.Id == termGuidString)
+                var term = await System.Linq.Queryable
+                    .Where(Terms, p => p.Id == termGuidString)
                     .FirstOrDefaultAsync()
                     .ConfigureAwait(false);
-                
+
                 result.Add(term);
             }
 
diff --git a/src/sdk/PnP.Core/PnP.Core.csproj b/src/sdk/PnP.Core/PnP.Core.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.0;net8.0;net9.0</TargetFrameworks>
+		<TargetFrameworks>netstandard2.0;net8.0;net9.0;net10.0</TargetFrameworks>
 		<LangVersion>10.0</LangVersion>
 		<RootNamespace>PnP.Core</RootNamespace>
 		<AssemblyName>PnP.Core</AssemblyName>
@@ -44,15 +44,15 @@
 
 	<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
 		<PackageReference Include="Microsoft.ApplicationInsights" Version="2.13.1" />
-		<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.5" />
+		<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="2.2.0" />
 		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.2.0" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
 		<PackageReference Include="Microsoft.Extensions.Http" Version="2.2.0" />
 		<PackageReference Include="Microsoft.Extensions.Options" Version="2.2.0" />
 		<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
 		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.35.0" />
-		<PackageReference Include="System.Text.Json" Version="9.0.0" />
+		<PackageReference Include="System.Text.Json" Version="10.0.0" />
 	</ItemGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
@@ -81,14 +81,27 @@
 		<PackageReference Include="System.Text.Json" Version="9.0.0" />
 	</ItemGroup>
 
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net10.0' ">
+		<PackageReference Include="Microsoft.ApplicationInsights" Version="2.23.0" />
+		<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="10.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Options" Version="10.0.0" />
+		<PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.0" />
+		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.14.0" />
+		<PackageReference Include="System.Text.Json" Version="10.0.0" />
+	</ItemGroup>
+
 	<ItemGroup>
 		<PackageReference Include="AngleSharp" Version="0.17.0" />
-		<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-*">
+		<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.0-*">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-		<PackageReference Include="TimeZoneConverter" Version="6.1.0" />
+		<PackageReference Include="TimeZoneConverter" Version="7.2.0" />
 	</ItemGroup>
 
 	<ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,9 @@ public async Task<List<ISharePointUser>> GetTenantAdminsAsync(VanityUrlOptions v`
`195`	`195`	`{`
`196`	`196`	`using (var tenantAdminCenterContext = await GetTenantAdminCenterContextAsync(vanityUrlOptions).ConfigureAwait(false))`
`197`	`197`	`{`
`198`		`- return await tenantAdminCenterContext.Web.SiteUsers.Where(p => p.IsSiteAdmin == true).ToListAsync().ConfigureAwait(false);`
	`198`	`+ // Materialize the collection first, then filter in-memory to avoid ambiguity`
	`199`	`+ var users = await PnP.Core.QueryModel.QueryableExtensions.ToListAsync(tenantAdminCenterContext.Web.SiteUsers).ConfigureAwait(false);`
	`200`	`+ return users.Where(p => p.IsSiteAdmin == true).ToList();`
`199`	`201`	`}`
`200`	`202`	`}`
`201`	`203`