Skip to content

Update workflows and project files for .NET 10.0 compatibility #1199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gautamdsheth wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Update workflows and project files for .NET 10.0 compatibility #1199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/buildandtest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Checkout PnP Framework dev branch
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
ref: dev
- name: Setup .NET Core
uses: actions/setup-dotnet@v4
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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docfx.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# Checks-out dev branch
- name: Checkout dev branch
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
ref: dev
path: dev
# Checks-out gh-pages branch
- name: Checkout dev branch
uses: actions/checkout@v4
- name: Checkout gh-pages branch
uses: actions/checkout@v5
with:
ref: gh-pages
path: gh-pages
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/nightlynuget_dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
ref: dev
- name: Setup .NET Core
uses: actions/setup-dotnet@v4
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:
Expand Down
3 changes: 3 additions & 0 deletions build/build-debug.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,16 @@ if ($LocalPnPCore) {
$pnpCoreAssembly = Join-Path $PSScriptRoot -ChildPath "..\..\pnpcore\src\sdk\PnP.Core\bin\Debug\netstandard2.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"
$pnpCoreAssembly10 = Join-Path $PSScriptRoot -ChildPath "..\..\pnpcore\src\sdk\PnP.Core\bin\Debug\net10.0\PnP.Core.dll"
$pnpCoreAssembly = [System.IO.Path]::GetFullPath($pnpCoreAssembly)
$pnpCoreAssembly8 = [System.IO.Path]::GetFullPath($pnpCoreAssembly8)
$pnpCoreAssembly9 = [System.IO.Path]::GetFullPath($pnpCoreAssembly9)
$pnpCoreAssembly10 = [System.IO.Path]::GetFullPath($pnpCoreAssembly10)
if (Test-Path $pnpCoreAssembly -PathType Leaf) {
$buildCmd += " -p:PnPCoreSdkPath=`"$pnpCoreAssembly`""
$buildCmd += " -p:PnPCoreSdkPathNet8=`"$pnpCoreAssembly8`""
$buildCmd += " -p:PnPCoreSdkPathNet9=`"$pnpCoreAssembly9`""
$buildCmd += " -p:PnPCoreSdkPathNet10=`"$pnpCoreAssembly10`""
}
else {
Write-Error -Message "PnP Core Assembly path $pnpCoreAssembly not found"
Expand Down
4 changes: 2 additions & 2 deletions src/lib/PnP.Framework.Modernization.Test/PnP.Framework.Modernization.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>

<IsPackable>false</IsPackable>
<SignAssembly>true</SignAssembly>
Expand All @@ -15,7 +15,7 @@
<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.1" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.14.0" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/lib/PnP.Framework.Test/PnP.Framework.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<IsPackable>false</IsPackable>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\pnp.core.snk</AssemblyOriginatorKeyFile>
Expand Down Expand Up @@ -184,8 +184,8 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="PrivateObjectExtensions" Version="1.4.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
<PackageReference Include="System.Security.Cryptography.Xml" Version="9.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.0" />
<PackageReference Include="System.Security.Cryptography.Xml" Version="10.0.0" />
<PackageReference Include="PnP.Core" Version="1.15.*-*" Condition="'$(PnPCoreSdkPath)' == ''" />
</ItemGroup>

Expand Down
33 changes: 28 additions & 5 deletions src/lib/PnP.Framework/PnP.Framework.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.Framework</RootNamespace>
<AssemblyName>PnP.Framework</AssemblyName>
Expand Down Expand Up @@ -31,6 +31,7 @@
<PnPCoreSdkPath Condition="'$(PnPCoreSdkPath)' == ''"></PnPCoreSdkPath>
<PnPCoreSdkPathNet8 Condition="'$(PnPCoreSdkPathNet8)' == ''"></PnPCoreSdkPathNet8>
<PnPCoreSdkPathNet9 Condition="'$(PnPCoreSdkPathNet9)' == ''"></PnPCoreSdkPathNet9>
<PnPCoreSdkPathNet10 Condition="'$(PnPCoreSdkPathNet10)' == ''"></PnPCoreSdkPathNet10>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\pnp.core.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
Expand Down Expand Up @@ -188,7 +189,7 @@

<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.Bcl.HashCode" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
Expand All @@ -199,7 +200,7 @@
<PackageReference Include="System.IO.Packaging" Version="4.7.0" />
<PackageReference Include="System.Runtime.Loader" Version="4.3.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' ">
Expand Down Expand Up @@ -230,9 +231,23 @@
<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.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.DirectoryServices" Version="10.0.0" />
<PackageReference Include="System.IO.Packaging" 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>
<!-- Required -->
<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>
Expand All @@ -249,7 +264,7 @@
</ItemGroup>

<ItemGroup Condition="'$(PnPCoreSdkPath)' != ''">
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.5" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.0" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
<Reference Include="PnP.Core" Condition="'$(TargetFramework)' == 'netstandard2.0'">
<HintPath>$(PnPCoreSdkPath)</HintPath>
<Private>true</Private>
Expand All @@ -273,6 +288,14 @@
</Reference>
</ItemGroup>

<ItemGroup Condition="'$(PnPCoreSdkPathNet10)' != ''">
<Reference Include="PnP.Core" Condition="'$(TargetFramework)' == 'net10.0'">
<HintPath>$(PnPCoreSdkPathNet10)</HintPath>
<Private>true</Private>
<SpecificVersion>false</SpecificVersion>
</Reference>
</ItemGroup>

<ItemGroup>
<None Update="Modernization\Nuget\webpartmapping.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
Expand Down
Loading