Skip to content

Commit 265fd47

Browse files
arnaudleclercCopilot
arnaudleclerc
and
Copilot
committed
Upgrade projects to supported .NET versions (net8.0, net9.0, net10.0)
- Drop net6.0 (EOL Nov 2024) and net7.0 (EOL May 2024) - Add net9.0 and net10.0 target frameworks to library and test projects - Update sample project to target net10.0 - Add per-TFM package references for net9.0 and net10.0 - Upgrade bunit from 1.26.64 to 1.37.7 for .NET 9/10 compatibility - Update all CI workflows to set up .NET 8.0, 9.0, and 10.0 SDKs Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent ef97648 commit 265fd47

File tree

7 files changed

+37
-41
lines changed

7 files changed

+37
-41
lines changed

‎.github/workflows/build.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@ jobs:
2121

2222
steps:
2323
- uses: actions/checkout@v2
24-
- name: Setup .NET 6.0
24+
- name: Setup .NET 8.0
2525
uses: actions/setup-dotnet@v1
2626
with:
27-
dotnet-version: 6.0.x
28-
- name: Setup .NET 7.0
27+
dotnet-version: 8.0.x
28+
- name: Setup .NET 9.0
2929
uses: actions/setup-dotnet@v1
3030
with:
31-
dotnet-version: 7.0.x
32-
- name: Setup .NET 8.0
31+
dotnet-version: 9.0.x
32+
- name: Setup .NET 10.0
3333
uses: actions/setup-dotnet@v1
3434
with:
35-
dotnet-version: 8.0.x
35+
dotnet-version: 10.0.x
3636
- name: Install dependencies
3737
run: dotnet restore ./src/AzureMapsControl.Components/AzureMapsControl.Components.csproj
3838
- name: Build

‎.github/workflows/code-coverage.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,18 @@ jobs:
2727

2828
steps:
2929
- uses: actions/checkout@v2
30-
- name: Setup .NET 6.0
30+
- name: Setup .NET 8.0
3131
uses: actions/setup-dotnet@v1
3232
with:
33-
dotnet-version: 6.0.x
34-
- name: Setup .NET 7.0
33+
dotnet-version: 8.0.x
34+
- name: Setup .NET 9.0
3535
uses: actions/setup-dotnet@v1
3636
with:
37-
dotnet-version: 7.0.x
38-
- name: Setup .NET 8.0
37+
dotnet-version: 9.0.x
38+
- name: Setup .NET 10.0
3939
uses: actions/setup-dotnet@v1
4040
with:
41-
dotnet-version: 8.0.x
41+
dotnet-version: 10.0.x
4242
- name: Install dependencies
4343
run: dotnet restore ./src/AzureMapsControl.Components/AzureMapsControl.Components.csproj
4444
- name: Build

‎.github/workflows/release.yml‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,18 @@ jobs:
2020
uses: actions/checkout@v2
2121
with:
2222
fetch-depth: 0
23-
- name: Setup .NET 6.0
24-
uses: actions/setup-dotnet@v1
25-
with:
26-
dotnet-version: 6.0.x
27-
- name: Setup .NET 7.0
28-
uses: actions/setup-dotnet@v1
29-
with:
30-
dotnet-version: 7.0.x
3123
- name: Setup .NET 8.0
3224
uses: actions/setup-dotnet@v1
3325
with:
3426
dotnet-version: 8.0.x
35-
- name: Setup .NET Core 3.1
27+
- name: Setup .NET 9.0
28+
uses: actions/setup-dotnet@v1
29+
with:
30+
dotnet-version: 9.0.x
31+
- name: Setup .NET 10.0
3632
uses: actions/setup-dotnet@v1
3733
with:
38-
dotnet-version: 3.1.x
34+
dotnet-version: 10.0.x
3935
- name: Install GitVersion
4036
uses: gittools/actions/gitversion/setup@v0.9.11
4137
with:

‎.github/workflows/unit-tests.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,18 @@ jobs:
2626

2727
steps:
2828
- uses: actions/checkout@v2
29-
- name: Setup .NET 6.0
29+
- name: Setup .NET 8.0
3030
uses: actions/setup-dotnet@v1
3131
with:
32-
dotnet-version: 6.0.x
33-
- name: Setup .NET 7.0
32+
dotnet-version: 8.0.x
33+
- name: Setup .NET 9.0
3434
uses: actions/setup-dotnet@v1
3535
with:
36-
dotnet-version: 7.0.x
37-
- name: Setup .NET 8.0
36+
dotnet-version: 9.0.x
37+
- name: Setup .NET 10.0
3838
uses: actions/setup-dotnet@v1
3939
with:
40-
dotnet-version: 8.0.x
40+
dotnet-version: 10.0.x
4141
- name: Install dependencies
4242
run: dotnet restore ./src/AzureMapsControl.Components/AzureMapsControl.Components.csproj
4343
- name: Build

‎samples/AzureMapsControl.Sample/AzureMapsControl.Sample.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.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>

‎src/AzureMapsControl.Components/AzureMapsControl.Components.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
55
<RazorLangVersion>3.0</RazorLangVersion>
66
<Authors>Arnaud Leclerc</Authors>
77
<Company />
@@ -37,19 +37,19 @@
3737
<None Include="tsconfig.json" />
3838
</ItemGroup>
3939

40-
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
41-
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.25" />
42-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
40+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
41+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0" />
42+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
4343
</ItemGroup>
4444

45-
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
46-
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.14" />
47-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
45+
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
46+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
47+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0" />
4848
</ItemGroup>
4949

50-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
51-
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0" />
52-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
50+
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
51+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="10.0.0" />
52+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0" />
5353
</ItemGroup>
5454

5555
</Project>

‎tests/AzureMapsControl.Components.Tests/AzureMapsControl.Components.Tests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="bunit" Version="1.26.64" />
9+
<PackageReference Include="bunit" Version="1.37.7" />
1010
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
1111
<PackageReference Include="Moq" Version="4.16.1" />
1212
<PackageReference Include="xunit" Version="2.6.3" />

0 commit comments

Comments
 (0)