Skip to content

Commit e77df40

Browse files
gautamdshethgautamdsheth
authored
Merge pull request #1199 from pnp/feat/bump-net10
Update workflows and project files for .NET 10.0 compatibility
2 parents 1e8e80e + 15f04ce commit e77df40

File tree

7 files changed

+45
-19
lines changed

7 files changed

+45
-19
lines changed

‎.github/workflows/buildandtest.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ jobs:
2424
env:
2525
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2626
- name: Checkout PnP Framework dev branch
27-
uses: actions/checkout@v4
27+
uses: actions/checkout@v5
2828
with:
2929
ref: dev
3030
- name: Setup .NET Core
31-
uses: actions/setup-dotnet@v4
31+
uses: actions/setup-dotnet@v5
3232
with:
33-
dotnet-version: '9.0.x'
33+
dotnet-version: '10.0.x'
3434
include-prerelease: false
3535
- name: Install dependencies
3636
run: dotnet restore

‎.github/workflows/docfx.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ jobs:
1919
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2020
# Checks-out dev branch
2121
- name: Checkout dev branch
22-
uses: actions/checkout@v4
22+
uses: actions/checkout@v5
2323
with:
2424
ref: dev
2525
path: dev
2626
# Checks-out gh-pages branch
27-
- name: Checkout dev branch
28-
uses: actions/checkout@v4
27+
- name: Checkout gh-pages branch
28+
uses: actions/checkout@v5
2929
with:
3030
ref: gh-pages
3131
path: gh-pages

‎.github/workflows/nightlynuget_dev.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ jobs:
1111
runs-on: ubuntu-latest
1212

1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515
with:
1616
ref: dev
1717
- name: Setup .NET Core
18-
uses: actions/setup-dotnet@v4
18+
uses: actions/setup-dotnet@v5
1919
with:
20-
dotnet-version: '9.0.x'
20+
dotnet-version: '10.0.x'
2121
include-prerelease: false
2222
- name: Create and publish nuget
2323
env:

‎build/build-debug.ps1‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,16 @@ if ($LocalPnPCore) {
2727
$pnpCoreAssembly = Join-Path $PSScriptRoot -ChildPath "..\..\pnpcore\src\sdk\PnP.Core\bin\Debug\netstandard2.0\PnP.Core.dll"
2828
$pnpCoreAssembly8 = Join-Path $PSScriptRoot -ChildPath "..\..\pnpcore\src\sdk\PnP.Core\bin\Debug\net8.0\PnP.Core.dll"
2929
$pnpCoreAssembly9 = Join-Path $PSScriptRoot -ChildPath "..\..\pnpcore\src\sdk\PnP.Core\bin\Debug\net9.0\PnP.Core.dll"
30+
$pnpCoreAssembly10 = Join-Path $PSScriptRoot -ChildPath "..\..\pnpcore\src\sdk\PnP.Core\bin\Debug\net10.0\PnP.Core.dll"
3031
$pnpCoreAssembly = [System.IO.Path]::GetFullPath($pnpCoreAssembly)
3132
$pnpCoreAssembly8 = [System.IO.Path]::GetFullPath($pnpCoreAssembly8)
3233
$pnpCoreAssembly9 = [System.IO.Path]::GetFullPath($pnpCoreAssembly9)
34+
$pnpCoreAssembly10 = [System.IO.Path]::GetFullPath($pnpCoreAssembly10)
3335
if (Test-Path $pnpCoreAssembly -PathType Leaf) {
3436
$buildCmd += " -p:PnPCoreSdkPath=`"$pnpCoreAssembly`""
3537
$buildCmd += " -p:PnPCoreSdkPathNet8=`"$pnpCoreAssembly8`""
3638
$buildCmd += " -p:PnPCoreSdkPathNet9=`"$pnpCoreAssembly9`""
39+
$buildCmd += " -p:PnPCoreSdkPathNet10=`"$pnpCoreAssembly10`""
3740
}
3841
else {
3942
Write-Error -Message "PnP Core Assembly path $pnpCoreAssembly not found"

‎src/lib/PnP.Framework.Modernization.Test/PnP.Framework.Modernization.Test.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-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77
<SignAssembly>true</SignAssembly>
@@ -15,7 +15,7 @@
1515
<PackageReference Include="MSTest.TestAdapter" Version="3.6.3" />
1616
<PackageReference Include="MSTest.TestFramework" Version="3.6.3" />
1717
<PackageReference Include="coverlet.collector" Version="6.0.0" />
18-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.2.1" />
18+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.14.0" />
1919
</ItemGroup>
2020

2121
<ItemGroup>

‎src/lib/PnP.Framework.Test/PnP.Framework.Test.csproj‎

Lines changed: 3 additions & 3 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
<IsPackable>false</IsPackable>
66
<SignAssembly>true</SignAssembly>
77
<AssemblyOriginatorKeyFile>..\pnp.core.snk</AssemblyOriginatorKeyFile>
@@ -184,8 +184,8 @@
184184
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
185185
</PackageReference>
186186
<PackageReference Include="PrivateObjectExtensions" Version="1.4.0" />
187-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
188-
<PackageReference Include="System.Security.Cryptography.Xml" Version="9.0.0" />
187+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.0" />
188+
<PackageReference Include="System.Security.Cryptography.Xml" Version="10.0.0" />
189189
<PackageReference Include="PnP.Core" Version="1.15.*-*" Condition="'$(PnPCoreSdkPath)' == ''" />
190190
</ItemGroup>
191191

‎src/lib/PnP.Framework/PnP.Framework.csproj‎

Lines changed: 28 additions & 5 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.Framework</RootNamespace>
77
<AssemblyName>PnP.Framework</AssemblyName>
@@ -31,6 +31,7 @@
3131
<PnPCoreSdkPath Condition="'$(PnPCoreSdkPath)' == ''"></PnPCoreSdkPath>
3232
<PnPCoreSdkPathNet8 Condition="'$(PnPCoreSdkPathNet8)' == ''"></PnPCoreSdkPathNet8>
3333
<PnPCoreSdkPathNet9 Condition="'$(PnPCoreSdkPathNet9)' == ''"></PnPCoreSdkPathNet9>
34+
<PnPCoreSdkPathNet10 Condition="'$(PnPCoreSdkPathNet10)' == ''"></PnPCoreSdkPathNet10>
3435
<SignAssembly>true</SignAssembly>
3536
<AssemblyOriginatorKeyFile>..\pnp.core.snk</AssemblyOriginatorKeyFile>
3637
</PropertyGroup>
@@ -188,7 +189,7 @@
188189

189190
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
190191
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.13.1" />
191-
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.5" />
192+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.0" />
192193
<PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
193194
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.2.0" />
194195
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
@@ -199,7 +200,7 @@
199200
<PackageReference Include="System.IO.Packaging" Version="4.7.0" />
200201
<PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
201202
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.35.0" />
202-
<PackageReference Include="System.Text.Json" Version="9.0.0" />
203+
<PackageReference Include="System.Text.Json" Version="10.0.0" />
203204
</ItemGroup>
204205

205206
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
@@ -230,9 +231,23 @@
230231
<PackageReference Include="System.Text.Json" Version="9.0.0" />
231232
</ItemGroup>
232233

234+
<ItemGroup Condition=" '$(TargetFramework)' == 'net10.0' ">
235+
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.23.0" />
236+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0" />
237+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0" />
238+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
239+
<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.0" />
240+
<PackageReference Include="Microsoft.Extensions.Options" Version="10.0.0" />
241+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.0" />
242+
<PackageReference Include="System.DirectoryServices" Version="10.0.0" />
243+
<PackageReference Include="System.IO.Packaging" Version="10.0.0" />
244+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.14.0" />
245+
<PackageReference Include="System.Text.Json" Version="10.0.0" />
246+
</ItemGroup>
247+
233248
<ItemGroup>
234249
<!-- Required -->
235-
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-*">
250+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.0-*">
236251
<PrivateAssets>all</PrivateAssets>
237252
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
238253
</PackageReference>
@@ -249,7 +264,7 @@
249264
</ItemGroup>
250265

251266
<ItemGroup Condition="'$(PnPCoreSdkPath)' != ''">
252-
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.5" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
267+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.0" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
253268
<Reference Include="PnP.Core" Condition="'$(TargetFramework)' == 'netstandard2.0'">
254269
<HintPath>$(PnPCoreSdkPath)</HintPath>
255270
<Private>true</Private>
@@ -273,6 +288,14 @@
273288
</Reference>
274289
</ItemGroup>
275290

291+
<ItemGroup Condition="'$(PnPCoreSdkPathNet10)' != ''">
292+
<Reference Include="PnP.Core" Condition="'$(TargetFramework)' == 'net10.0'">
293+
<HintPath>$(PnPCoreSdkPathNet10)</HintPath>
294+
<Private>true</Private>
295+
<SpecificVersion>false</SpecificVersion>
296+
</Reference>
297+
</ItemGroup>
298+
276299
<ItemGroup>
277300
<None Update="Modernization\Nuget\webpartmapping.xml">
278301
<CopyToOutputDirectory>Always</CopyToOutputDirectory>

0 commit comments

Comments
 (0)