Skip to content

Commit 48cd680

Browse files
authored
dotnet 10 (#18)
* Upgrade to dotnet 10 Package update Nuget version 0.+1.0 upgrade * dotnet 10 in pipeline * dotnet 10 * Removed SQ and applied dotnet 10 build
1 parent 6fbecb7 commit 48cd680

10 files changed

Lines changed: 54 additions & 93 deletions

File tree

.github/workflows/analyse.yml

Lines changed: 10 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: SonarCloud
1+
name: .NET
22
on:
33
push:
44
branches: [ "main" ]
@@ -7,57 +7,21 @@ on:
77

88
jobs:
99
build:
10-
name: Build and analyze
11-
runs-on: windows-latest
10+
name: Build
11+
runs-on: ubuntu-latest
1212
steps:
13-
- name: Set up JDK 17
14-
uses: actions/setup-java@v3
15-
with:
16-
java-version: 17
17-
distribution: 'zulu' # Alternative distribution options are available.
18-
1913
- name: Setup .NET
2014
uses: actions/setup-dotnet@v4
2115
with:
22-
dotnet-version: 9.0.x
16+
dotnet-version: 10.0.x
2317

2418
- uses: actions/checkout@v3
25-
with:
26-
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
2719

28-
- name: Cache SonarCloud packages
29-
uses: actions/cache@v3
30-
with:
31-
path: ~\sonar\cache
32-
key: ${{ runner.os }}-sonar
33-
restore-keys: ${{ runner.os }}-sonar
34-
35-
- name: Cache SonarCloud scanner
36-
id: cache-sonar-scanner
37-
uses: actions/cache@v3
38-
with:
39-
path: .\.sonar\scanner
40-
key: ${{ runner.os }}-sonar-scanner
41-
restore-keys: ${{ runner.os }}-sonar-scanner
20+
- name: Restore dependencies
21+
run: dotnet restore
4222

43-
- name: Install SonarCloud scanner
44-
if: steps.cache-sonar-scanner.outputs.cache-hit != 'true'
45-
shell: powershell
46-
run: |
47-
New-Item -Path .\.sonar\scanner -ItemType Directory
48-
dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner
49-
50-
- name: Install dotnet coverage
51-
shell: powershell
52-
run: dotnet tool install dotnet-coverage --global
23+
- name: Build
24+
run: dotnet build --no-restore
5325

54-
- name: Build and analyze
55-
env:
56-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
57-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
58-
shell: powershell
59-
run: |
60-
.\.sonar\scanner\dotnet-sonarscanner begin /k:"Top2000app_data" /o:"top2000app" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.vscoveragexml.reportsPaths=coverage.xml
61-
dotnet build
62-
dotnet-coverage collect "dotnet test" -f xml -o "coverage.xml"
63-
.\.sonar\scanner\dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"
26+
- name: Test
27+
run: dotnet test --no-build --verbosity normal

.github/workflows/dotnet.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Setup .NET
2222
uses: actions/setup-dotnet@v4
2323
with:
24-
dotnet-version: 9.0.x
24+
dotnet-version: 10.0.x
2525

2626
- name: Restore dependencies
2727
run: dotnet restore
@@ -61,5 +61,4 @@ jobs:
6161
steps:
6262
- name: Deploy to GitHub Pages
6363
id: deployment
64-
uses: actions/deploy-pages@v1
65-
64+
uses: actions/deploy-pages@v1

src/csv/Top2000.Data.Csv/Top2000.Data.Csv.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>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
<Deterministic>true</Deterministic>
77
<PackageId>RickNeeftDevelopment.Top2000App.ClientDatabase.CSV</PackageId>
88
<Description>Client database based on an embedded CSV file.</Description>
99
<Copyright>Copyright (c) Rick Neeft Development 2024</Copyright>
1010
<PackageProjectUrl>https://github.com/Top2000app/data</PackageProjectUrl>
11-
<Version>1.0.0-prerelease2</Version>
11+
<Version>1.1.0-prerelease2</Version>
1212
<Authors>Rick Neeft</Authors>
1313
<Product>Top2000App</Product>
1414
<PackageIcon>nugeticon.png</PackageIcon>
Lines changed: 6 additions & 6 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
<OutputType>Exe</OutputType>
66
</PropertyGroup>
77

@@ -10,11 +10,11 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="9.0.0" />
14-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
15-
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
16-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
17-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
13+
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="10.0.0" />
14+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
15+
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.0" />
16+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
17+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.0" />
1818
</ItemGroup>
1919

2020
</Project>

src/sql/Top2000.Data.ClientDatabase/Top2000.Data.ClientDatabase.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<UseRidGraph>false</UseRidGraph>
8-
98
<IsPackable>true</IsPackable>
109
<Deterministic>true</Deterministic>
1110
<PackageId>RickNeeftDevelopment.Top2000App.Data</PackageId>
1211
<Description>Create an auto upgradable client database based on Top2000 Data</Description>
1312
<Copyright>Copyright (c) Rick Neeft Development 2024</Copyright>
1413
<PackageProjectUrl>https://github.com/Top2000app/data</PackageProjectUrl>
15-
<Version>2.1.0</Version>
14+
<Version>2.2.0</Version>
1615
<Authors>Rick Neeft</Authors>
1716
<Product>Top2000App Data</Product>
1817
<PackageIcon>nugeticon.png</PackageIcon>
@@ -38,12 +37,12 @@
3837
</ItemGroup>
3938

4039
<ItemGroup>
41-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
42-
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
43-
<PackageReference Include="morelinq" Version="4.3.0" />
40+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
41+
<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.0" />
42+
<PackageReference Include="morelinq" Version="4.4.0" />
4443
<PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
45-
<PackageReference Include="System.Collections.Immutable" Version="9.0.0" />
46-
<PackageReference Include="System.Text.Json" Version="9.0.0" />
44+
<PackageReference Include="System.Collections.Immutable" Version="10.0.0" />
45+
<PackageReference Include="System.Text.Json" Version="10.0.0" />
4746
</ItemGroup>
4847

4948
<ItemGroup>

src/sql/Top2000.Data.LocalDb/Top2000.Data.LocalDb.csproj

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net9.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
<IsPackable>false</IsPackable>
@@ -14,11 +14,10 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Azure.Identity" Version="1.13.1" />
18-
<PackageReference Include="dbup-sqlserver" Version="6.0.0" />
19-
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.2.1" />
20-
<PackageReference Include="System.Formats.Asn1" Version="9.0.0" />
21-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.2.1" />
17+
<PackageReference Include="dbup-sqlserver" Version="6.0.16" />
18+
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.14.0" />
19+
<PackageReference Include="System.Formats.Asn1" Version="10.0.0" />
20+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.14.0" />
2221
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
2322
</ItemGroup>
2423

src/sql/Top2000.Data.SQLScripts/Top2000.Data.SQLScripts.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
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<IsPackable>true</IsPackable>
@@ -10,7 +10,7 @@
1010
<Deterministic>true</Deterministic>
1111
<Copyright>Copyright (c) Rick Neeft Development 2024</Copyright>
1212
<PackageProjectUrl>https://github.com/Top2000app/data</PackageProjectUrl>
13-
<Version>1.3.0</Version>
13+
<Version>1.4.0</Version>
1414
<Authors>Rick Neeft</Authors>
1515
<Product>Top2000App Data</Product>
1616
<PackageIcon>nugeticon.png</PackageIcon>

src/sql/Top2000.Data.StaticDataSiteGenerator/Top2000.Data.StaticDataSiteGenerator.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net9.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
<IsPackable>false</IsPackable>
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="9.0.0" />
13-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
14-
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
15-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
16-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="10.0.0" />
13+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
14+
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.0" />
15+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
16+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.0" />
1717
</ItemGroup>
1818

1919
<ItemGroup>
2020
<ProjectReference Include="..\Top2000.Data.ClientDatabase\Top2000.Data.ClientDatabase.csproj" />
2121
</ItemGroup>
22-
22+
2323
</Project>

tests/sql/Top2000.Data.ClientDatabase.Tests/Top2000.Data.ClientDatabase.Tests.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<IsPackable>false</IsPackable>
88
<IsTestProject>true</IsTestProject>
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="coverlet.collector" Version="6.0.2">
12+
<PackageReference Include="coverlet.collector" Version="6.0.4">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
</PackageReference>
16-
<PackageReference Include="MSTest.TestAdapter" Version="3.6.3" />
17-
<PackageReference Include="MSTest.TestFramework" Version="3.6.3" />
18-
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
19-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
16+
<PackageReference Include="MSTest.TestAdapter" Version="4.0.2" />
17+
<PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
18+
<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.0" />
19+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
2020
</ItemGroup>
2121

2222
<ItemGroup>
@@ -28,7 +28,7 @@
2828
</ItemGroup>
2929

3030
<ItemGroup>
31-
<PackageReference Update="FluentAssertions" Version="6.12.2" />
31+
<PackageReference Update="FluentAssertions" Version="8.8.0" />
3232
<PackageReference Update="Moq" Version="4.20.72" />
3333
</ItemGroup>
3434

tests/sql/Top2000.Data.SQLScripts.Unittests/Top2000.Data.SQLScripts.Unittests.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<IsPackable>false</IsPackable>
88
<IsTestProject>true</IsTestProject>
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="coverlet.collector" Version="6.0.2">
12+
<PackageReference Include="coverlet.collector" Version="6.0.4">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
</PackageReference>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
17-
<PackageReference Include="MSTest.TestAdapter" Version="3.6.3" />
18-
<PackageReference Include="MSTest.TestFramework" Version="3.6.3" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
17+
<PackageReference Include="MSTest.TestAdapter" Version="4.0.2" />
18+
<PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
1919
</ItemGroup>
2020

2121
<ItemGroup>
@@ -27,7 +27,7 @@
2727
</ItemGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Update="FluentAssertions" Version="6.12.2" />
30+
<PackageReference Update="FluentAssertions" Version="8.8.0" />
3131
<PackageReference Update="Moq" Version="4.20.72" />
3232
</ItemGroup>
3333

0 commit comments

Comments
 (0)