From 9a6c24d2eac876a474bcedf788e5cb714de33c40 Mon Sep 17 00:00:00 2001 From: Rick Neeft Date: Fri, 14 Nov 2025 18:34:14 +0100 Subject: [PATCH 1/4] Upgrade to dotnet 10 Package update Nuget version 0.+1.0 upgrade --- src/csv/Top2000.Data.Csv/Top2000.Data.Csv.csproj | 4 ++-- .../Top2000.Data.CsvCreator.csproj | 12 ++++++------ .../Top2000.Data.ClientDatabase.csproj | 15 +++++++-------- .../Top2000.Data.LocalDb.csproj | 11 +++++------ .../Top2000.Data.SQLScripts.csproj | 4 ++-- .../Top2000.Data.StaticDataSiteGenerator.csproj | 12 ++++++------ .../Top2000.Data.ClientDatabase.Tests.csproj | 14 +++++++------- .../Top2000.Data.SQLScripts.Unittests.csproj | 12 ++++++------ 8 files changed, 41 insertions(+), 43 deletions(-) diff --git a/src/csv/Top2000.Data.Csv/Top2000.Data.Csv.csproj b/src/csv/Top2000.Data.Csv/Top2000.Data.Csv.csproj index bd01707..d6ecb69 100644 --- a/src/csv/Top2000.Data.Csv/Top2000.Data.Csv.csproj +++ b/src/csv/Top2000.Data.Csv/Top2000.Data.Csv.csproj @@ -1,14 +1,14 @@  - net9.0 + net10.0 false true RickNeeftDevelopment.Top2000App.ClientDatabase.CSV Client database based on an embedded CSV file. Copyright (c) Rick Neeft Development 2024 https://github.com/Top2000app/data - 1.0.0-prerelease2 + 1.1.0-prerelease2 Rick Neeft Top2000App nugeticon.png diff --git a/src/csv/Top2000.Data.CsvCreator/Top2000.Data.CsvCreator.csproj b/src/csv/Top2000.Data.CsvCreator/Top2000.Data.CsvCreator.csproj index 9fee5d6..712ae27 100644 --- a/src/csv/Top2000.Data.CsvCreator/Top2000.Data.CsvCreator.csproj +++ b/src/csv/Top2000.Data.CsvCreator/Top2000.Data.CsvCreator.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 Exe @@ -10,11 +10,11 @@ - - - - - + + + + + diff --git a/src/sql/Top2000.Data.ClientDatabase/Top2000.Data.ClientDatabase.csproj b/src/sql/Top2000.Data.ClientDatabase/Top2000.Data.ClientDatabase.csproj index cc3a08c..6121aaa 100644 --- a/src/sql/Top2000.Data.ClientDatabase/Top2000.Data.ClientDatabase.csproj +++ b/src/sql/Top2000.Data.ClientDatabase/Top2000.Data.ClientDatabase.csproj @@ -1,18 +1,17 @@  - net9.0 + net10.0 enable enable false - true true RickNeeftDevelopment.Top2000App.Data Create an auto upgradable client database based on Top2000 Data Copyright (c) Rick Neeft Development 2024 https://github.com/Top2000app/data - 2.1.0 + 2.2.0 Rick Neeft Top2000App Data nugeticon.png @@ -38,12 +37,12 @@ - - - + + + - - + + diff --git a/src/sql/Top2000.Data.LocalDb/Top2000.Data.LocalDb.csproj b/src/sql/Top2000.Data.LocalDb/Top2000.Data.LocalDb.csproj index cfbb83c..0277a2c 100644 --- a/src/sql/Top2000.Data.LocalDb/Top2000.Data.LocalDb.csproj +++ b/src/sql/Top2000.Data.LocalDb/Top2000.Data.LocalDb.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 enable enable false @@ -14,11 +14,10 @@ - - - - - + + + + diff --git a/src/sql/Top2000.Data.SQLScripts/Top2000.Data.SQLScripts.csproj b/src/sql/Top2000.Data.SQLScripts/Top2000.Data.SQLScripts.csproj index bc68702..e84e9f3 100644 --- a/src/sql/Top2000.Data.SQLScripts/Top2000.Data.SQLScripts.csproj +++ b/src/sql/Top2000.Data.SQLScripts/Top2000.Data.SQLScripts.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 enable enable true @@ -10,7 +10,7 @@ true Copyright (c) Rick Neeft Development 2024 https://github.com/Top2000app/data - 1.3.0 + 1.4.0 Rick Neeft Top2000App Data nugeticon.png diff --git a/src/sql/Top2000.Data.StaticDataSiteGenerator/Top2000.Data.StaticDataSiteGenerator.csproj b/src/sql/Top2000.Data.StaticDataSiteGenerator/Top2000.Data.StaticDataSiteGenerator.csproj index dd1aabd..b496b06 100644 --- a/src/sql/Top2000.Data.StaticDataSiteGenerator/Top2000.Data.StaticDataSiteGenerator.csproj +++ b/src/sql/Top2000.Data.StaticDataSiteGenerator/Top2000.Data.StaticDataSiteGenerator.csproj @@ -2,18 +2,18 @@ Exe - net9.0 + net10.0 enable enable false - - - - - + + + + + diff --git a/tests/sql/Top2000.Data.ClientDatabase.Tests/Top2000.Data.ClientDatabase.Tests.csproj b/tests/sql/Top2000.Data.ClientDatabase.Tests/Top2000.Data.ClientDatabase.Tests.csproj index 1d78a7a..fa292aa 100644 --- a/tests/sql/Top2000.Data.ClientDatabase.Tests/Top2000.Data.ClientDatabase.Tests.csproj +++ b/tests/sql/Top2000.Data.ClientDatabase.Tests/Top2000.Data.ClientDatabase.Tests.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 enable enable false @@ -9,14 +9,14 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + @@ -28,7 +28,7 @@ - + diff --git a/tests/sql/Top2000.Data.SQLScripts.Unittests/Top2000.Data.SQLScripts.Unittests.csproj b/tests/sql/Top2000.Data.SQLScripts.Unittests/Top2000.Data.SQLScripts.Unittests.csproj index 26b3b03..57c0f96 100644 --- a/tests/sql/Top2000.Data.SQLScripts.Unittests/Top2000.Data.SQLScripts.Unittests.csproj +++ b/tests/sql/Top2000.Data.SQLScripts.Unittests/Top2000.Data.SQLScripts.Unittests.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 enable enable false @@ -9,13 +9,13 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + @@ -27,7 +27,7 @@ - + From 1f8aba977431bcb9541cf91472cf913526e6cb1f Mon Sep 17 00:00:00 2001 From: Rick Neeft Date: Fri, 14 Nov 2025 19:18:15 +0100 Subject: [PATCH 2/4] dotnet 10 in pipeline --- .github/workflows/analyse.yml | 2 +- .github/workflows/dotnet.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/analyse.yml b/.github/workflows/analyse.yml index 98e0177..fc4f864 100644 --- a/.github/workflows/analyse.yml +++ b/.github/workflows/analyse.yml @@ -19,7 +19,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 9.0.x + dotnet-version: 10.0.x - uses: actions/checkout@v3 with: diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 83ae07d..2ff8199 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -21,7 +21,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 9.0.x + dotnet-version: 10.0.x - name: Restore dependencies run: dotnet restore From e573e68feb9bfbcaeec9c36e2c7b2c62793ec1f3 Mon Sep 17 00:00:00 2001 From: Rick Neeft Date: Fri, 14 Nov 2025 19:18:37 +0100 Subject: [PATCH 3/4] dotnet 10 --- .../Top2000.Data.StaticDataSiteGenerator.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sql/Top2000.Data.StaticDataSiteGenerator/Top2000.Data.StaticDataSiteGenerator.csproj b/src/sql/Top2000.Data.StaticDataSiteGenerator/Top2000.Data.StaticDataSiteGenerator.csproj index b496b06..2e8bc0f 100644 --- a/src/sql/Top2000.Data.StaticDataSiteGenerator/Top2000.Data.StaticDataSiteGenerator.csproj +++ b/src/sql/Top2000.Data.StaticDataSiteGenerator/Top2000.Data.StaticDataSiteGenerator.csproj @@ -19,5 +19,5 @@ - + From 67b2359122dc70678bbb1fe742e7501bcaea5023 Mon Sep 17 00:00:00 2001 From: Rick Neeft Date: Fri, 14 Nov 2025 19:55:43 +0100 Subject: [PATCH 4/4] Removed SQ and applied dotnet 10 build --- .github/workflows/analyse.yml | 54 ++++++----------------------------- .github/workflows/dotnet.yml | 3 +- 2 files changed, 10 insertions(+), 47 deletions(-) diff --git a/.github/workflows/analyse.yml b/.github/workflows/analyse.yml index fc4f864..17fca57 100644 --- a/.github/workflows/analyse.yml +++ b/.github/workflows/analyse.yml @@ -1,4 +1,4 @@ -name: SonarCloud +name: .NET on: push: branches: [ "main" ] @@ -7,57 +7,21 @@ on: jobs: build: - name: Build and analyze - runs-on: windows-latest + name: Build + runs-on: ubuntu-latest steps: - - name: Set up JDK 17 - uses: actions/setup-java@v3 - with: - java-version: 17 - distribution: 'zulu' # Alternative distribution options are available. - - name: Setup .NET uses: actions/setup-dotnet@v4 with: dotnet-version: 10.0.x - uses: actions/checkout@v3 - with: - fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - - name: Cache SonarCloud packages - uses: actions/cache@v3 - with: - path: ~\sonar\cache - key: ${{ runner.os }}-sonar - restore-keys: ${{ runner.os }}-sonar - - - name: Cache SonarCloud scanner - id: cache-sonar-scanner - uses: actions/cache@v3 - with: - path: .\.sonar\scanner - key: ${{ runner.os }}-sonar-scanner - restore-keys: ${{ runner.os }}-sonar-scanner + - name: Restore dependencies + run: dotnet restore - - name: Install SonarCloud scanner - if: steps.cache-sonar-scanner.outputs.cache-hit != 'true' - shell: powershell - run: | - New-Item -Path .\.sonar\scanner -ItemType Directory - dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner - - - name: Install dotnet coverage - shell: powershell - run: dotnet tool install dotnet-coverage --global + - name: Build + run: dotnet build --no-restore - - name: Build and analyze - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - shell: powershell - run: | - .\.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 - dotnet build - dotnet-coverage collect "dotnet test" -f xml -o "coverage.xml" - .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}" + - name: Test + run: dotnet test --no-build --verbosity normal diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 2ff8199..c6816cb 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -61,5 +61,4 @@ jobs: steps: - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v1 - \ No newline at end of file + uses: actions/deploy-pages@v1 \ No newline at end of file