From 80bf695d9fe8b5b08a4fc9f486441a127a8cbe00 Mon Sep 17 00:00:00 2001 From: qdraw Date: Wed, 10 Apr 2024 05:47:20 +0000 Subject: [PATCH 1/3] Auto .NET SDK version Upgrade to 8.0.204 --- .../desktop-release-on-tag-net-electron.yml | 2 +- .github/workflows/webapp-build-net-macos.yml | 2 +- .github/workflows/webapp-build-net-ubuntu.yml | 2 +- .../workflows/webapp-build-net-windows.yml | 2 +- .../webapp-codecov-clientapp-netcore.yml | 2 +- .../webapp-sonarqube-clientapp-netcore.yml | 2 +- .../webapp-update-swagger-dotnet.yml | 2 +- pipelines/azure/steps/use_dotnet_version.yml | 4 +-- starsky/global.json | 2 +- starsky/nuget-packages-list.json | 26 +++++++++---------- .../starsky.feature.health.csproj | 6 ++--- ...tarsky.foundation.accountmanagement.csproj | 2 +- .../starsky.foundation.database.csproj | 14 +++++----- .../starsky.foundation.platform.csproj | 14 +++++----- .../starsky.foundation.webtelemetry.csproj | 2 +- starsky/starsky/starsky.csproj | 4 +-- .../starskyadmincli/starskyadmincli.csproj | 2 +- .../starskydemoseedcli.csproj | 2 +- starsky/starskygeocli/starskygeocli.csproj | 2 +- .../starskyimportercli.csproj | 2 +- .../starskysynchronizecli.csproj | 2 +- starsky/starskytest/starskytest.csproj | 10 +++---- .../starskythumbnailcli.csproj | 2 +- .../starskythumbnailmetacli.csproj | 2 +- .../starskywebftpcli/starskywebftpcli.csproj | 2 +- .../starskywebhtmlcli.csproj | 2 +- 26 files changed, 58 insertions(+), 58 deletions(-) diff --git a/.github/workflows/desktop-release-on-tag-net-electron.yml b/.github/workflows/desktop-release-on-tag-net-electron.yml index 0d77e48002..559738bc94 100644 --- a/.github/workflows/desktop-release-on-tag-net-electron.yml +++ b/.github/workflows/desktop-release-on-tag-net-electron.yml @@ -22,7 +22,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.202 + dotnet-version: 8.0.204 - name: Build --no-unit-test linux-arm,linux-arm64,win-x64,osx-x64,linux-x64,osx-arm64 --ready-to-run shell: bash diff --git a/.github/workflows/webapp-build-net-macos.yml b/.github/workflows/webapp-build-net-macos.yml index f8376f6663..e07714ee25 100644 --- a/.github/workflows/webapp-build-net-macos.yml +++ b/.github/workflows/webapp-build-net-macos.yml @@ -35,7 +35,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.202 + dotnet-version: 8.0.204 - name: "BuildNetCore (MacOS)" shell: bash diff --git a/.github/workflows/webapp-build-net-ubuntu.yml b/.github/workflows/webapp-build-net-ubuntu.yml index 38e76f5788..8eb648f839 100644 --- a/.github/workflows/webapp-build-net-ubuntu.yml +++ b/.github/workflows/webapp-build-net-ubuntu.yml @@ -38,7 +38,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.202 + dotnet-version: 8.0.204 - name: Cache nuget packages (*nix) uses: actions/cache@v4 diff --git a/.github/workflows/webapp-build-net-windows.yml b/.github/workflows/webapp-build-net-windows.yml index 754bb5e1db..031a6c8220 100644 --- a/.github/workflows/webapp-build-net-windows.yml +++ b/.github/workflows/webapp-build-net-windows.yml @@ -35,7 +35,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.202 + dotnet-version: 8.0.204 - name: Build (Windows) shell: pwsh diff --git a/.github/workflows/webapp-codecov-clientapp-netcore.yml b/.github/workflows/webapp-codecov-clientapp-netcore.yml index 6cfc8a02ef..a5bd6fe405 100644 --- a/.github/workflows/webapp-codecov-clientapp-netcore.yml +++ b/.github/workflows/webapp-codecov-clientapp-netcore.yml @@ -26,7 +26,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.202 + dotnet-version: 8.0.204 - name: Cache node modules clientapp (*nix) uses: actions/cache@v4 diff --git a/.github/workflows/webapp-sonarqube-clientapp-netcore.yml b/.github/workflows/webapp-sonarqube-clientapp-netcore.yml index 1355979563..9e9058694a 100644 --- a/.github/workflows/webapp-sonarqube-clientapp-netcore.yml +++ b/.github/workflows/webapp-sonarqube-clientapp-netcore.yml @@ -45,7 +45,7 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.202 + dotnet-version: 8.0.204 - name: Use Java 17 uses: actions/setup-java@v4 diff --git a/.github/workflows/webapp-update-swagger-dotnet.yml b/.github/workflows/webapp-update-swagger-dotnet.yml index 63e2035ba8..5b1fa17f66 100644 --- a/.github/workflows/webapp-update-swagger-dotnet.yml +++ b/.github/workflows/webapp-update-swagger-dotnet.yml @@ -29,7 +29,7 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.202 + dotnet-version: 8.0.204 - name: Cache nuget packages (*nix) uses: actions/cache@v4 diff --git a/pipelines/azure/steps/use_dotnet_version.yml b/pipelines/azure/steps/use_dotnet_version.yml index 32f7dd9e11..d9ec92b276 100644 --- a/pipelines/azure/steps/use_dotnet_version.yml +++ b/pipelines/azure/steps/use_dotnet_version.yml @@ -1,8 +1,8 @@ steps: - task: UseDotNet@2 - displayName: 'Use .NET SDK 8.0.202' + displayName: 'Use .NET SDK 8.0.204' enabled: true inputs: packageType: sdk - version: 8.0.202 + version: 8.0.204 installationPath: $(Agent.ToolsDirectory)/dotnet diff --git a/starsky/global.json b/starsky/global.json index 3e46d880b6..78c4803ad0 100644 --- a/starsky/global.json +++ b/starsky/global.json @@ -1,7 +1,7 @@ { "strictVersion": true, "sdk": { - "version": "8.0.202", + "version": "8.0.204", "rollForward": "disable", "allowPrerelease": false } diff --git a/starsky/nuget-packages-list.json b/starsky/nuget-packages-list.json index 1d2ae0e30a..e1b25fab43 100644 --- a/starsky/nuget-packages-list.json +++ b/starsky/nuget-packages-list.json @@ -1,29 +1,29 @@ [ - "Microsoft.AspNetCore.Mvc.NewtonsoftJson 8.0.3", + "Microsoft.AspNetCore.Mvc.NewtonsoftJson 8.0.4", "Microsoft.Extensions.Hosting.WindowsServices 8.0.0", "Swashbuckle.AspNetCore 6.5.0", "Microsoft.Extensions.Caching.Abstractions 8.0.0", "Microsoft.Extensions.Caching.Memory 8.0.0", "Microsoft.Extensions.Hosting.Abstractions 8.0.0", "NGeoNames 1.5.1", - "Microsoft.Extensions.Diagnostics.HealthChecks 8.0.3", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions 8.0.3", + "Microsoft.Extensions.Diagnostics.HealthChecks 8.0.4", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions 8.0.4", "AspNetCore.HealthChecks.MySql 8.0.0", "AspNetCore.HealthChecks.Sqlite 8.0.0", - "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore 8.0.3", + "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore 8.0.4", "MedallionShell 1.6.2", "RazorLight 2.3.1", "SixLabors.ImageSharp 3.1.3", "SixLabors.ImageSharp.Drawing 2.1.2", - "Microsoft.AspNetCore.Authorization 8.0.3", - "Microsoft.EntityFrameworkCore.Analyzers 8.0.3", - "Microsoft.EntityFrameworkCore.Design 8.0.3", - "Microsoft.EntityFrameworkCore.InMemory 8.0.3", - "Microsoft.EntityFrameworkCore.Sqlite 8.0.3", - "Microsoft.EntityFrameworkCore 8.0.3", - "Microsoft.EntityFrameworkCore.Relational 8.0.3", + "Microsoft.AspNetCore.Authorization 8.0.4", + "Microsoft.EntityFrameworkCore.Analyzers 8.0.4", + "Microsoft.EntityFrameworkCore.Design 8.0.4", + "Microsoft.EntityFrameworkCore.InMemory 8.0.4", + "Microsoft.EntityFrameworkCore.Sqlite 8.0.4", + "Microsoft.EntityFrameworkCore 8.0.4", + "Microsoft.EntityFrameworkCore.Relational 8.0.4", "Microsoft.Extensions.DependencyInjection 8.0.0", - "Microsoft.Extensions.Identity.Stores 8.0.3", + "Microsoft.Extensions.Identity.Stores 8.0.4", "Pomelo.EntityFrameworkCore.MySql 8.0.1", "System.ComponentModel.Annotations 5.0.0", "Microsoft.Extensions.DependencyInjection.Abstractions 8.0.1", @@ -50,7 +50,7 @@ "OpenTelemetry.Instrumentation.Runtime 1.7.0", "System.Diagnostics.DiagnosticSource 8.0.0", "System.Text.Json 8.0.2", - "Microsoft.AspNetCore.Identity.EntityFrameworkCore 8.0.3", + "Microsoft.AspNetCore.Identity.EntityFrameworkCore 8.0.4", "Microsoft.Extensions.Hosting 8.0.0", "Microsoft.NET.Test.Sdk 17.9.0", "MSTest.TestAdapter 3.2.2", diff --git a/starsky/starsky.feature.health/starsky.feature.health.csproj b/starsky/starsky.feature.health/starsky.feature.health.csproj index bca3791d89..58dccc1fb6 100644 --- a/starsky/starsky.feature.health/starsky.feature.health.csproj +++ b/starsky/starsky.feature.health/starsky.feature.health.csproj @@ -15,11 +15,11 @@ - - + + - + diff --git a/starsky/starsky.foundation.accountmanagement/starsky.foundation.accountmanagement.csproj b/starsky/starsky.foundation.accountmanagement/starsky.foundation.accountmanagement.csproj index 402db1d668..6d7d42296b 100644 --- a/starsky/starsky.foundation.accountmanagement/starsky.foundation.accountmanagement.csproj +++ b/starsky/starsky.foundation.accountmanagement/starsky.foundation.accountmanagement.csproj @@ -15,7 +15,7 @@ - + diff --git a/starsky/starsky.foundation.database/starsky.foundation.database.csproj b/starsky/starsky.foundation.database/starsky.foundation.database.csproj index ee5e7aa8db..d6d1799b3b 100644 --- a/starsky/starsky.foundation.database/starsky.foundation.database.csproj +++ b/starsky/starsky.foundation.database/starsky.foundation.database.csproj @@ -13,14 +13,14 @@ - - - - - - + + + + + + - + diff --git a/starsky/starsky.foundation.platform/starsky.foundation.platform.csproj b/starsky/starsky.foundation.platform/starsky.foundation.platform.csproj index 25a942357a..15e954307b 100644 --- a/starsky/starsky.foundation.platform/starsky.foundation.platform.csproj +++ b/starsky/starsky.foundation.platform/starsky.foundation.platform.csproj @@ -16,13 +16,13 @@ - - - - - - - + + + + + + + diff --git a/starsky/starsky.foundation.webtelemetry/starsky.foundation.webtelemetry.csproj b/starsky/starsky.foundation.webtelemetry/starsky.foundation.webtelemetry.csproj index 13a618f717..3f5a0d9f9d 100644 --- a/starsky/starsky.foundation.webtelemetry/starsky.foundation.webtelemetry.csproj +++ b/starsky/starsky.foundation.webtelemetry/starsky.foundation.webtelemetry.csproj @@ -20,7 +20,7 @@ - + diff --git a/starsky/starsky/starsky.csproj b/starsky/starsky/starsky.csproj index 2f97fc2637..58315c35b8 100644 --- a/starsky/starsky/starsky.csproj +++ b/starsky/starsky/starsky.csproj @@ -1,7 +1,7 @@  net8.0 - 8.0.3 + 8.0.4 An attempt to create a database driven photo library 0.6.0 @@ -59,7 +59,7 @@ 0 - + diff --git a/starsky/starskyadmincli/starskyadmincli.csproj b/starsky/starskyadmincli/starskyadmincli.csproj index c7751c7400..6a3e72724d 100644 --- a/starsky/starskyadmincli/starskyadmincli.csproj +++ b/starsky/starskyadmincli/starskyadmincli.csproj @@ -5,7 +5,7 @@ net8.0 {dcf1f6cb-1c65-4394-bef7-cccc2967b56c} - 8.0.3 + 8.0.4 Full 0.6.0 enable diff --git a/starsky/starskydemoseedcli/starskydemoseedcli.csproj b/starsky/starskydemoseedcli/starskydemoseedcli.csproj index c98c1ba272..13dc5f03ca 100644 --- a/starsky/starskydemoseedcli/starskydemoseedcli.csproj +++ b/starsky/starskydemoseedcli/starskydemoseedcli.csproj @@ -5,7 +5,7 @@ enable {215a3302-a418-4148-8d20-1127e27c3dae} - 8.0.3 + 8.0.4 Full 0.6.0 enable diff --git a/starsky/starskygeocli/starskygeocli.csproj b/starsky/starskygeocli/starskygeocli.csproj index eaae9d9f12..f867583ad0 100644 --- a/starsky/starskygeocli/starskygeocli.csproj +++ b/starsky/starskygeocli/starskygeocli.csproj @@ -5,7 +5,7 @@ enable {a030c158-2f79-4317-a9f9-bdd46d66d1d8} - 8.0.3 + 8.0.4 Full 0.6.0 enable diff --git a/starsky/starskyimportercli/starskyimportercli.csproj b/starsky/starskyimportercli/starskyimportercli.csproj index 5b17cabcdf..139254b6f9 100644 --- a/starsky/starskyimportercli/starskyimportercli.csproj +++ b/starsky/starskyimportercli/starskyimportercli.csproj @@ -4,7 +4,7 @@ net8.0 {23e4ea86-970a-4de1-badc-8d7e9d3d4dd6} - 8.0.3 + 8.0.4 Full 0.6.0 enable diff --git a/starsky/starskysynchronizecli/starskysynchronizecli.csproj b/starsky/starskysynchronizecli/starskysynchronizecli.csproj index 87cbbfa2d7..b290fa6363 100644 --- a/starsky/starskysynchronizecli/starskysynchronizecli.csproj +++ b/starsky/starskysynchronizecli/starskysynchronizecli.csproj @@ -5,7 +5,7 @@ net8.0 {7e1136a7-cc43-49d2-91d3-48e557f0fb66} - 8.0.3 + 8.0.4 starskysynchronizecli 0.6.0 enable diff --git a/starsky/starskytest/starskytest.csproj b/starsky/starskytest/starskytest.csproj index 0a684b8cdd..11f800b9cf 100644 --- a/starsky/starskytest/starskytest.csproj +++ b/starsky/starskytest/starskytest.csproj @@ -1,7 +1,7 @@  net8.0 - 8.0.3 + 8.0.4 Full {b3342a3e-64e1-442f-b4f7-f7a718508aac} @@ -21,10 +21,10 @@ - - - - + + + + diff --git a/starsky/starskythumbnailcli/starskythumbnailcli.csproj b/starsky/starskythumbnailcli/starskythumbnailcli.csproj index b7ae739a5a..be61c73c53 100644 --- a/starsky/starskythumbnailcli/starskythumbnailcli.csproj +++ b/starsky/starskythumbnailcli/starskythumbnailcli.csproj @@ -5,7 +5,7 @@ net8.0 {67e3fb34-1ca8-4a28-a0e0-00ff61821002} - 8.0.3 + 8.0.4 starskythumbnailcli 0.6.0 enable diff --git a/starsky/starskythumbnailmetacli/starskythumbnailmetacli.csproj b/starsky/starskythumbnailmetacli/starskythumbnailmetacli.csproj index c10501a7b0..cc81a44b33 100644 --- a/starsky/starskythumbnailmetacli/starskythumbnailmetacli.csproj +++ b/starsky/starskythumbnailmetacli/starskythumbnailmetacli.csproj @@ -5,7 +5,7 @@ net8.0 {a0cce905-ae43-4d1b-a97a-2bcd2c010ed1} - 8.0.3 + 8.0.4 starskythumbnailmetacli 0.6.0 enable diff --git a/starsky/starskywebftpcli/starskywebftpcli.csproj b/starsky/starskywebftpcli/starskywebftpcli.csproj index 706f4edca2..8e5e3360bc 100644 --- a/starsky/starskywebftpcli/starskywebftpcli.csproj +++ b/starsky/starskywebftpcli/starskywebftpcli.csproj @@ -4,7 +4,7 @@ Exe net8.0 {eb1d57d1-29d8-4bfb-950e-447ef8522a10} - 8.0.3 + 8.0.4 Full 0.6.0 enable diff --git a/starsky/starskywebhtmlcli/starskywebhtmlcli.csproj b/starsky/starskywebhtmlcli/starskywebhtmlcli.csproj index 1026f03e59..fade5a6492 100644 --- a/starsky/starskywebhtmlcli/starskywebhtmlcli.csproj +++ b/starsky/starskywebhtmlcli/starskywebhtmlcli.csproj @@ -3,7 +3,7 @@ Exe net8.0 {76d7bf62-9f1d-48f1-9035-dceb01de55c3} - 8.0.3 + 8.0.4 8.0 true Full From 776f8299933ce8830bfc6d40ebe67133a96e51d8 Mon Sep 17 00:00:00 2001 From: Dion van Velde Date: Wed, 10 Apr 2024 10:39:05 +0200 Subject: [PATCH 2/3] Update readme.md --- starsky/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/starsky/readme.md b/starsky/readme.md index 22918d4984..2785d37c97 100644 --- a/starsky/readme.md +++ b/starsky/readme.md @@ -37,7 +37,7 @@ to compile the application for development git clone "https://github.com/qdraw/starsky.git" ``` -2. Get the `dotnet` 8.0.202 SDK. To get the 'Build apps - SDK' .NET Core from https://www.microsoft.com/net/download or https://versionsof.net/ +2. Get the `dotnet` 8.0.204 SDK. To get the 'Build apps - SDK' .NET Core from https://www.microsoft.com/net/download or https://versionsof.net/ 3. Get a recent version of nodejs (18.x or newer) 4. Make a build of all the projects and run the tests From 0fe0b33f474c37c0378f71d68f03b9e3d007f505 Mon Sep 17 00:00:00 2001 From: Dion van Velde Date: Wed, 10 Apr 2024 10:39:48 +0200 Subject: [PATCH 3/3] Update history.md --- history.md | 1 + 1 file changed, 1 insertion(+) diff --git a/history.md b/history.md index 4e99337e6f..bf0ff67731 100644 --- a/history.md +++ b/history.md @@ -46,6 +46,7 @@ Semantic Versioning 2.0.0 is from version 0.1.6+ - [x] (Changed) _Front-end_ Make prev / next more contrast (PR #1511) - [x] (Fixed) _Docs_ Demo site is not working (PR #1486) - [x] (Fixed) _Back-end_ GetFileNameRegex refactor to avoid timeouts (PR #1515) +- [x] (Changed) Back-end Upgrade to .NET 8 - SDK 8.0.204 (Runtime: 8.0.4) (PR #1541) ## version 0.6.0 - 2024-03-15 {#v0.6.0}