Skip to content

Commit da7189c

Browse files
TonyTroeffTonyTroeff
authored
Merge pull request #105
Add support for .NET 9
2 parents d7eade3 + 682f725 commit da7189c

File tree

11 files changed

+55
-62
lines changed

11 files changed

+55
-62
lines changed

‎.github/workflows/Core validation.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,21 @@ jobs:
1616
CONFIGURATION: Release
1717

1818
steps:
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
2020
with:
2121
fetch-depth: 0
2222

2323
- name: Setup .NET
24-
uses: actions/setup-dotnet@v3
24+
uses: actions/setup-dotnet@v4
2525
with:
2626
dotnet-version: |
27-
3.1.x
27+
6.x
2828
7.x
2929
8.x
30+
9.x
3031
31-
- name: Set up JDK 11
32-
uses: actions/setup-java@v3
32+
- name: Set up JDK 17
33+
uses: actions/setup-java@v4
3334
with:
3435
distribution: microsoft
3536
java-version: 17
@@ -63,7 +64,7 @@ jobs:
6364
run: dotnet build --no-restore --configuration "${{ env.CONFIGURATION }}"
6465

6566
- name: Test the solution
66-
run: dotnet test --no-build --configuration "${{ env.CONFIGURATION }}" /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
67+
run: dotnet test --no-build --configuration "${{ env.CONFIGURATION }}" --collect "XPlat Code Coverage;Format=opencover"
6768

6869
- name: Finalize analyzation with SonarCloud
6970
run: ./.sonar/scanner/dotnet-sonarscanner end ${{ env.SONAR_ARGS }}

‎.github/workflows/Publish packages.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,18 @@ jobs:
1414
NUGET_SOURCE: https://api.nuget.org/v3/index.json
1515

1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818
with:
1919
fetch-depth: 0
2020

2121
- name: Setup .NET
22-
uses: actions/setup-dotnet@v3
22+
uses: actions/setup-dotnet@v4
2323
with:
2424
dotnet-version: |
25-
3.1.x
25+
6.x
2626
7.x
2727
8.x
28+
9.x
2829
2930
- name: Restore dependencies
3031
run: dotnet restore

‎TryAtSoftware.Extensions.Collections.Tests/TryAtSoftware.Extensions.Collections.Tests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1;net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
55
<LangVersion>latest</LangVersion>
66
<Nullable>enable</Nullable>
77

@@ -10,26 +10,22 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="coverlet.msbuild" Version="6.0.0">
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
14+
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.6.0.109712">
1415
<PrivateAssets>all</PrivateAssets>
1516
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1617
</PackageReference>
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
18-
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.15.0.81779">
19-
<PrivateAssets>all</PrivateAssets>
20-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
21-
</PackageReference>
22-
<PackageReference Include="TryAtSoftware.Randomizer" Version="2.0.2-alpha.1" />
23-
<PackageReference Include="xunit" Version="2.6.2" />
24-
<PackageReference Include="coverlet.collector" Version="6.0.0" PrivateAssets="all" />
18+
<PackageReference Include="TryAtSoftware.Randomizer" Version="2.0.2" />
19+
<PackageReference Include="xunit" Version="2.9.3" />
20+
<PackageReference Include="coverlet.collector" Version="6.0.4" PrivateAssets="all" />
2521
</ItemGroup>
2622

2723
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
2824
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="all" />
2925
</ItemGroup>
3026

31-
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net8.0'">
32-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4" PrivateAssets="all" />
27+
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net9.0'">
28+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2" PrivateAssets="all" />
3329
</ItemGroup>
3430

3531
<ItemGroup>

‎TryAtSoftware.Extensions.Collections/TryAtSoftware.Extensions.Collections.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.1;net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.1;net7.0</TargetFrameworks>
55
<LangVersion>latest</LangVersion>
66
<Nullable>enable</Nullable>
77

@@ -18,7 +18,7 @@
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.15.0.81779" PrivateAssets="all" />
21+
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.6.0.109712" PrivateAssets="all" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

‎TryAtSoftware.Extensions.DependencyInjection.Standard.Tests/TryAtSoftware.Extensions.DependencyInjection.Standard.Tests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77

@@ -10,24 +10,20 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="coverlet.msbuild" Version="6.0.0">
14-
<PrivateAssets>all</PrivateAssets>
15-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
16-
</PackageReference>
1713
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
19-
<PackageReference Include="NSubstitute" Version="5.1.0" />
20-
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.15.0.81779">
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
15+
<PackageReference Include="NSubstitute" Version="5.3.0" />
16+
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.6.0.109712">
2117
<PrivateAssets>all</PrivateAssets>
2218
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2319
</PackageReference>
24-
<PackageReference Include="TryAtSoftware.Randomizer" Version="2.0.2-alpha.1" />
25-
<PackageReference Include="xunit" Version="2.6.2" />
26-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
20+
<PackageReference Include="TryAtSoftware.Randomizer" Version="2.0.2" />
21+
<PackageReference Include="xunit" Version="2.9.3" />
22+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
2723
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2824
<PrivateAssets>all</PrivateAssets>
2925
</PackageReference>
30-
<PackageReference Include="coverlet.collector" Version="6.0.0">
26+
<PackageReference Include="coverlet.collector" Version="6.0.4">
3127
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3228
<PrivateAssets>all</PrivateAssets>
3329
</PackageReference>

‎TryAtSoftware.Extensions.DependencyInjection.Standard/TryAtSoftware.Extensions.DependencyInjection.Standard.csproj‎

Lines changed: 6 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.1;net8.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.1;net8.0;net9.0</TargetFrameworks>
55
<LangVersion>latest</LangVersion>
66
<Nullable>enable</Nullable>
77

@@ -18,7 +18,7 @@
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.15.0.81779">
21+
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.6.0.109712">
2222
<PrivateAssets>all</PrivateAssets>
2323
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2424
</PackageReference>
@@ -33,6 +33,10 @@
3333
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
3434
</ItemGroup>
3535

36+
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
37+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
38+
</ItemGroup>
39+
3640
<ItemGroup>
3741
<None Include="..\TryAtSoftware.Extensions.DependencyInjection.Standard.md" Pack="true" PackagePath="\" />
3842
</ItemGroup>

‎TryAtSoftware.Extensions.DependencyInjection.Tests/TryAtSoftware.Extensions.DependencyInjection.Tests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77

@@ -10,23 +10,19 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="coverlet.msbuild" Version="6.0.0">
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
14+
<PackageReference Include="NSubstitute" Version="5.3.0" />
15+
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.6.0.109712">
1416
<PrivateAssets>all</PrivateAssets>
1517
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1618
</PackageReference>
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
18-
<PackageReference Include="NSubstitute" Version="5.1.0" />
19-
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.15.0.81779">
20-
<PrivateAssets>all</PrivateAssets>
21-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
22-
</PackageReference>
23-
<PackageReference Include="TryAtSoftware.Randomizer" Version="2.0.2-alpha.1" />
24-
<PackageReference Include="xunit" Version="2.6.2" />
25-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
19+
<PackageReference Include="TryAtSoftware.Randomizer" Version="2.0.2" />
20+
<PackageReference Include="xunit" Version="2.9.3" />
21+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
2622
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2723
<PrivateAssets>all</PrivateAssets>
2824
</PackageReference>
29-
<PackageReference Include="coverlet.collector" Version="6.0.0">
25+
<PackageReference Include="coverlet.collector" Version="6.0.4">
3026
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3127
<PrivateAssets>all</PrivateAssets>
3228
</PackageReference>

‎TryAtSoftware.Extensions.DependencyInjection/TryAtSoftware.Extensions.DependencyInjection.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.15.0.81779">
21+
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.6.0.109712">
2222
<PrivateAssets>all</PrivateAssets>
2323
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2424
</PackageReference>

‎TryAtSoftware.Extensions.Reflection.Benchmark/TryAtSoftware.Extensions.Reflection.Benchmark.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<OutputType>Exe</OutputType>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
11+
<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎TryAtSoftware.Extensions.Reflection.Tests/TryAtSoftware.Extensions.Reflection.Tests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
55
<Nullable>enable</Nullable>
66

77
<IsPackable>false</IsPackable>
88
<IsTestProject>true</IsTestProject>
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="coverlet.msbuild" Version="6.0.0" PrivateAssets="all" />
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
14-
<PackageReference Include="NSubstitute" Version="5.1.0" />
15-
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.15.0.81779" PrivateAssets="all" />
16-
<PackageReference Include="TryAtSoftware.Randomizer" Version="2.0.2-alpha.1" />
17-
<PackageReference Include="xunit" Version="2.6.2" />
18-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4" PrivateAssets="all" />
19-
<PackageReference Include="coverlet.collector" Version="6.0.0" PrivateAssets="all" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
13+
<PackageReference Include="NSubstitute" Version="5.3.0" />
14+
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.6.0.109712" PrivateAssets="all" />
15+
<PackageReference Include="TryAtSoftware.Randomizer" Version="2.0.2" />
16+
<PackageReference Include="xunit" Version="2.9.3" />
17+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2" PrivateAssets="all" />
18+
<PackageReference Include="coverlet.collector" Version="6.0.4" PrivateAssets="all" />
2019
</ItemGroup>
2120

2221
<ItemGroup>

0 commit comments

Comments
 (0)