Skip to content

Commit c7be7e0

Browse files
askptaskpt
authored
feat: Upgrade to dotnet version 10 (#658)
* chore(deps): upgrade .NET SDK version to 10.0.100 Signed-off-by: André Silva <[email protected]> * chore(deps): add .NET 10.0 to target frameworks Signed-off-by: André Silva <[email protected]> * chore(deps): update target frameworks to include .NET 10.0 Signed-off-by: André Silva <[email protected]> * chore(deps): upgrade target framework to .NET 10.0 Signed-off-by: André Silva <[email protected]> * chore(deps): upgrade devcontainer image and .NET version to 10.0 Signed-off-by: André Silva <[email protected]> * chore(deps): add support for .NET 10.0 and update related package versions Signed-off-by: André Silva <[email protected]> * chore(docs): update AOT compatibility documentation to include .NET 10.0 in target framework options Signed-off-by: André Silva <[email protected]> * chore(deps): update AOT compatibility test to target .NET 10.0 Signed-off-by: André Silva <[email protected]> * chore(deps): update Microsoft.Extensions.Diagnostics.Testing to version 10.0.0 and upgrade Microsoft.AspNetCore.TestHost versions for net8.0 and net9.0 Signed-off-by: André Silva <[email protected]> * chore(deps): update dotnet feature configuration to use dotnetRuntimeVersions for versioning Signed-off-by: André Silva <[email protected]> --------- Signed-off-by: André Silva <[email protected]>
1 parent 4080f03 commit c7be7e0

File tree

15 files changed

+27
-23
lines changed

15 files changed

+27
-23
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"name": "OpenFeature .NET SDK",
3-
"image": "mcr.microsoft.com/devcontainers/dotnet:9.0-bookworm",
3+
"image": "mcr.microsoft.com/devcontainers/dotnet:10.0",
44
"features": {
55
"ghcr.io/devcontainers/features/dotnet:latest": {
6-
"version": "9.0",
7-
"additionalVersions": "8.0"
6+
"version": "10.0",
7+
"dotnetRuntimeVersions": "9.0, 8.0"
88
},
99
"ghcr.io/devcontainers/features/github-cli:latest": {},
1010
"ghcr.io/devcontainers/features/docker-in-docker": {}
@@ -30,4 +30,4 @@
3030
"memory": "8gb"
3131
},
3232
"postCreateCommand": "git submodule update --init --recursive"
33-
}
33+
}

‎.github/workflows/aot-compatibility.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ jobs:
8181
shell: pwsh
8282
run: |
8383
dotnet publish test/OpenFeature.AotCompatibility/OpenFeature.AotCompatibility.csproj `
84+
-f net10.0 `
8485
-r ${{ matrix.runtime }} `
8586
-o ./aot-output
8687

‎Directory.Packages.props‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net9.0'))">
88
<MicrosoftExtensionsVersion>9.0.0</MicrosoftExtensionsVersion>
99
</PropertyGroup>
10+
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net10.0'))">
11+
<MicrosoftExtensionsVersion>10.0.0</MicrosoftExtensionsVersion>
12+
</PropertyGroup>
1013

1114
<ItemGroup Label="src">
1215
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftExtensionsVersion)" />
@@ -34,7 +37,7 @@
3437
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
3538
<PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
3639
<PackageVersion Include="GitHubActionsTestLogger" Version="3.0.1" />
37-
<PackageVersion Include="Microsoft.Extensions.Diagnostics.Testing" Version="9.3.0" />
40+
<PackageVersion Include="Microsoft.Extensions.Diagnostics.Testing" Version="10.0.0" />
3841
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="$(MicrosoftExtensionsVersion)" />
3942
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
4043
<PackageVersion Include="NSubstitute" Version="5.3.0" />
@@ -46,11 +49,15 @@
4649
</ItemGroup>
4750

4851
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
49-
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.21" />
52+
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.22" />
5053
</ItemGroup>
5154

5255
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
53-
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="9.0.10" />
56+
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="9.0.11" />
57+
</ItemGroup>
58+
59+
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
60+
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="10.0.0" />
5461
</ItemGroup>
5562

5663
<ItemGroup Condition="'$(OS)' == 'Unix'">

‎build/Common.samples.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<ImplicitUsings>enable</ImplicitUsings>
55
<Nullable>enable</Nullable>
66
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

‎docs/AOT_COMPATIBILITY.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ To enable NativeAOT in your project, add these properties to your `.csproj` file
2626
```xml
2727
<Project Sdk="Microsoft.NET.Sdk">
2828
<PropertyGroup>
29-
<TargetFramework>net8.0</TargetFramework> <!-- or net9.0 -->
29+
<TargetFramework>net8.0</TargetFramework> <!-- or net9.0, net10.0 -->
3030
<OutputType>Exe</OutputType>
3131

3232
<!-- Enable NativeAOT -->

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"sdk": {
33
"rollForward": "latestFeature",
4-
"version": "9.0.300",
4+
"version": "10.0.100",
55
"allowPrerelease": false
66
}
77
}

‎src/Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<Import
33
Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'OpenFeature.slnx'))\build\Common.prod.props" />
44
<PropertyGroup>
5-
<TargetFrameworks>net462;netstandard2.0;net8.0;net9.0</TargetFrameworks>
5+
<TargetFrameworks>net462;netstandard2.0;net8.0;net9.0;net10.0</TargetFrameworks>
66
<!-- Enable native AOT related analyzers
77
https://learn.microsoft.com/dotnet/core/deploying/native-aot/#aot-compatibility-analyzers -->
88
<IsAotCompatible>$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))</IsAotCompatible>
99
</PropertyGroup>
10-
</Project>
10+
</Project>

‎test/Directory.Build.props‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
<Project>
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'OpenFeature.slnx'))\build\Common.tests.props" />
3+
<PropertyGroup>
4+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
5+
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
6+
</PropertyGroup>
37
</Project>

‎test/OpenFeature.AotCompatibility/OpenFeature.AotCompatibility.csproj‎

Lines changed: 1 addition & 1 deletion
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+
<TargetFrameworks>net9.0;net10.0</TargetFrameworks>
55
<OutputType>Exe</OutputType>
66
<Nullable>enable</Nullable>
77
<ImplicitUsings>enable</ImplicitUsings>

‎test/OpenFeature.Benchmarks/OpenFeature.Benchmarks.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net9.0;net10.0</TargetFrameworks>
55
<RootNamespace>OpenFeature.Benchmark</RootNamespace>
66
<OutputType>Exe</OutputType>
77
</PropertyGroup>

0 commit comments

Comments
 (0)