Skip to content

Commit 416f6c8

Browse files
gautamdshethgautamdsheth
authored
Merge pull request #1705 from gautamdsheth/feat/bump-net10
Update workflows and projects to .NET 10.0 and upgrade dependencies
2 parents 706e693 + 9ae02ca commit 416f6c8

File tree

61 files changed

+392
-517
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+392
-517
lines changed

‎.github/workflows/buildandtest.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ jobs:
4040
env:
4141
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4242
- name: Checkout dev branch
43-
uses: actions/checkout@v2
43+
uses: actions/checkout@v5
4444
with:
4545
ref: dev
4646
- name: Setup .NET Core
47-
uses: actions/setup-dotnet@v1
47+
uses: actions/setup-dotnet@v5
4848
with:
49-
dotnet-version: '9.0.x'
49+
dotnet-version: '10.0.x'
5050
include-prerelease: false
5151
- name: Install dependencies
5252
run: dotnet restore

‎.github/workflows/cleannightlynuget.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ jobs:
1414
# Steps represent a sequence of tasks that will be executed as part of the job
1515
steps:
1616
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
17-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v5
1818
with:
1919
ref: dev
2020
- name: Setup .NET Core
21-
uses: actions/setup-dotnet@v1
21+
uses: actions/setup-dotnet@v5
2222
with:
23-
dotnet-version: '6.0.x'
23+
dotnet-version: '10.0.x'
2424
include-prerelease: false
2525
- name: Unlist nightly nuget packages
2626
env:

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939

4040
# Initializes the CodeQL tools for scanning.
4141
- name: Initialize CodeQL
42-
uses: github/codeql-action/init@v1
42+
uses: github/codeql-action/init@v2
4343
with:
4444
languages: ${{ matrix.language }}
4545
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -64,9 +64,9 @@ jobs:
6464
# make release
6565

6666
- name: Setup .NET Core
67-
uses: actions/setup-dotnet@v1
67+
uses: actions/setup-dotnet@v5
6868
with:
69-
dotnet-version: '9.0.x'
69+
dotnet-version: '10.0.x'
7070
include-prerelease: false
7171
- name: Install dependencies
7272
run: dotnet restore
@@ -75,4 +75,4 @@ jobs:
7575
run: dotnet build --configuration debug --no-restore --verbosity normal
7676
working-directory: src/sdk
7777
- name: Perform CodeQL Analysis
78-
uses: github/codeql-action/analyze@v1
78+
uses: github/codeql-action/analyze@v2

‎.github/workflows/nightlynuget_dev.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ jobs:
1818
env:
1919
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2020
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
21-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v5
2222
with:
2323
ref: dev
2424
token: ${{ secrets.GITHUB_TOKEN }}
2525
- name: Setup .NET Core
26-
uses: actions/setup-dotnet@v1
26+
uses: actions/setup-dotnet@v5
2727
with:
28-
dotnet-version: '9.0.x'
28+
dotnet-version: '10.0.x'
2929
include-prerelease: false
3030
- name: Create and publish nuget
3131
env:

‎src/sdk/PnP.Core.Admin.Test/PnP.Core.Admin.Test.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77
<SignAssembly>true</SignAssembly>
@@ -13,12 +13,12 @@
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
</PackageReference>
16-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0" />
17-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
18-
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
19-
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="9.0.0" />
20-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
21-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />
16+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0" />
17+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0" />
18+
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.0" />
19+
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="10.0.0" />
20+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.0" />
21+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.0" />
2222
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
2323
<PackageReference Include="MSTest.TestAdapter" Version="3.6.3" />
2424
<PackageReference Include="MSTest.TestFramework" Version="3.6.3" />

‎src/sdk/PnP.Core.Admin.Test/SharePoint/SiteCreationTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,7 @@ public async Task CreateTeamSiteWithMembersUsingApplicationPermissions()
840840

841841
// Determine the user to set as testMember
842842
await context.Web.LoadAsync(p => p.AssociatedMemberGroup.QueryProperties(p => p.Users));
843-
var testMember = context.Web.AssociatedMemberGroup.Users.Where(u => u.PrincipalType == Core.Model.Security.PrincipalType.User).FirstOrDefault();
843+
var testMember = System.Linq.Queryable.Where(context.Web.AssociatedMemberGroup.Users, u => u.PrincipalType == Core.Model.Security.PrincipalType.User).FirstOrDefault();
844844
if(testMember == null)
845845
{
846846
testMember = testOwner;

‎src/sdk/PnP.Core.Admin/Model/SharePoint/Core/Internal/SharePointAdmin.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ public async Task<List<ISharePointUser>> GetTenantAdminsAsync(VanityUrlOptions v
195195
{
196196
using (var tenantAdminCenterContext = await GetTenantAdminCenterContextAsync(vanityUrlOptions).ConfigureAwait(false))
197197
{
198-
return await tenantAdminCenterContext.Web.SiteUsers.Where(p => p.IsSiteAdmin == true).ToListAsync().ConfigureAwait(false);
198+
return await QueryableExtensions.ToListAsync(Queryable.Where(tenantAdminCenterContext.Web.SiteUsers, p => p.IsSiteAdmin == true)).ConfigureAwait(false);
199199
}
200200
}
201201

‎src/sdk/PnP.Core.Admin/PnP.Core.Admin.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net8.0;net9.0;net10.0</TargetFrameworks>
55
<LangVersion>10.0</LangVersion>
66
<RootNamespace>PnP.Core.Admin</RootNamespace>
77
<AssemblyName>PnP.Core.Admin</AssemblyName>
@@ -43,7 +43,7 @@
4343
</PropertyGroup>
4444

4545
<ItemGroup>
46-
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-*">
46+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.0-*">
4747
<PrivateAssets>all</PrivateAssets>
4848
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4949
</PackageReference>

‎src/sdk/PnP.Core.Auth.Test/PnP.Core.Auth.Test.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77
<SignAssembly>true</SignAssembly>
@@ -13,12 +13,12 @@
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
</PackageReference>
16-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0" />
17-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
18-
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
19-
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="9.0.0" />
20-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
21-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />
16+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0" />
17+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0" />
18+
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.0" />
19+
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="10.0.0" />
20+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.0" />
21+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.0" />
2222
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
2323
<PackageReference Include="MSTest.TestAdapter" Version="3.6.3" />
2424
<PackageReference Include="MSTest.TestFramework" Version="3.6.3" />

‎src/sdk/PnP.Core.Auth/PnP.Core.Auth.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net8.0;net9.0;net10.0</TargetFrameworks>
55
<LangVersion>10.0</LangVersion>
66
<RootNamespace>PnP.Core.Auth</RootNamespace>
77
<AssemblyName>PnP.Core.Auth</AssemblyName>
@@ -43,7 +43,7 @@
4343
</PropertyGroup>
4444

4545
<ItemGroup>
46-
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-*">
46+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.0-*">
4747
<PrivateAssets>all</PrivateAssets>
4848
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4949
</PackageReference>

0 commit comments

Comments
 (0)