From 4706ec18950ab28b4f4b3d9236d370a5082e9207 Mon Sep 17 00:00:00 2001 From: qdraw Date: Wed, 12 Jun 2024 05:47:27 +0000 Subject: [PATCH 1/3] Auto .NET SDK version Upgrade to 8.0.302 --- .../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.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 | 6 ++--- .../starskythumbnailcli.csproj | 2 +- .../starskythumbnailmetacli.csproj | 2 +- .../starskywebftpcli/starskywebftpcli.csproj | 2 +- .../starskywebhtmlcli.csproj | 2 +- 25 files changed, 49 insertions(+), 49 deletions(-) diff --git a/.github/workflows/desktop-release-on-tag-net-electron.yml b/.github/workflows/desktop-release-on-tag-net-electron.yml index 7234807bae..e86ad8e7ca 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.300 + dotnet-version: 8.0.302 - 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 7c9000eb32..77692dacac 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.300 + dotnet-version: 8.0.302 - name: "BuildNetCore (MacOS)" shell: bash diff --git a/.github/workflows/webapp-build-net-ubuntu.yml b/.github/workflows/webapp-build-net-ubuntu.yml index 86bf208e42..44f72b059b 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.300 + dotnet-version: 8.0.302 - 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 50fbb2be28..57878d7a46 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.300 + dotnet-version: 8.0.302 - name: Build (Windows) shell: pwsh diff --git a/.github/workflows/webapp-codecov-clientapp-netcore.yml b/.github/workflows/webapp-codecov-clientapp-netcore.yml index 79c45d0211..c5c20b0baa 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.300 + dotnet-version: 8.0.302 - 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 f7b9f4066d..70970958ab 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.300 + dotnet-version: 8.0.302 - 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 c3984a6409..8c29c67a65 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.300 + dotnet-version: 8.0.302 - 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 82762aa934..abdc0f1ef0 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.300' + displayName: 'Use .NET SDK 8.0.302' enabled: true inputs: packageType: sdk - version: 8.0.300 + version: 8.0.302 installationPath: $(Agent.ToolsDirectory)/dotnet diff --git a/starsky/global.json b/starsky/global.json index 0a70cde256..1afea63fcc 100644 --- a/starsky/global.json +++ b/starsky/global.json @@ -1,7 +1,7 @@ { "strictVersion": true, "sdk": { - "version": "8.0.300", + "version": "8.0.302", "rollForward": "disable", "allowPrerelease": false } diff --git a/starsky/nuget-packages-list.json b/starsky/nuget-packages-list.json index d315bf09f5..c11a68e252 100644 --- a/starsky/nuget-packages-list.json +++ b/starsky/nuget-packages-list.json @@ -1,29 +1,29 @@ [ - "Microsoft.AspNetCore.Mvc.NewtonsoftJson 8.0.5", + "Microsoft.AspNetCore.Mvc.NewtonsoftJson 8.0.6", "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.5", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions 8.0.5", + "Microsoft.Extensions.Diagnostics.HealthChecks 8.0.6", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions 8.0.6", "AspNetCore.HealthChecks.MySql 8.0.1", "AspNetCore.HealthChecks.Sqlite 8.0.1", - "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore 8.0.5", + "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore 8.0.6", "MedallionShell 1.6.2", "RazorLight 2.3.1", "SixLabors.ImageSharp 3.1.4", "SixLabors.ImageSharp.Drawing 2.1.3", - "Microsoft.AspNetCore.Authorization 8.0.5", - "Microsoft.EntityFrameworkCore.Analyzers 8.0.5", - "Microsoft.EntityFrameworkCore.Design 8.0.5", - "Microsoft.EntityFrameworkCore.InMemory 8.0.5", - "Microsoft.EntityFrameworkCore.Sqlite 8.0.5", - "Microsoft.EntityFrameworkCore 8.0.5", - "Microsoft.EntityFrameworkCore.Relational 8.0.5", + "Microsoft.AspNetCore.Authorization 8.0.6", + "Microsoft.EntityFrameworkCore.Analyzers 8.0.6", + "Microsoft.EntityFrameworkCore.Design 8.0.6", + "Microsoft.EntityFrameworkCore.InMemory 8.0.6", + "Microsoft.EntityFrameworkCore.Sqlite 8.0.6", + "Microsoft.EntityFrameworkCore 8.0.6", + "Microsoft.EntityFrameworkCore.Relational 8.0.6", "Microsoft.Extensions.DependencyInjection 8.0.0", - "Microsoft.Extensions.Identity.Stores 8.0.5", + "Microsoft.Extensions.Identity.Stores 8.0.6", "Pomelo.EntityFrameworkCore.MySql 8.0.2", "System.ComponentModel.Annotations 5.0.0", "Microsoft.Extensions.DependencyInjection.Abstractions 8.0.1", @@ -50,7 +50,7 @@ "OpenTelemetry.Instrumentation.Runtime 1.8.0", "System.Diagnostics.DiagnosticSource 8.0.1", "System.Text.Json 8.0.3", - "Microsoft.AspNetCore.Identity.EntityFrameworkCore 8.0.5", + "Microsoft.AspNetCore.Identity.EntityFrameworkCore 8.0.6", "Microsoft.Extensions.Hosting 8.0.0", "Microsoft.NET.Test.Sdk 17.9.0", "MSTest.TestAdapter 3.3.1", diff --git a/starsky/starsky.feature.health/starsky.feature.health.csproj b/starsky/starsky.feature.health/starsky.feature.health.csproj index 2e88a12f80..c1e700ac6c 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 481f5bd930..f862ab6419 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 5508916d4c..a141c046c4 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.webtelemetry/starsky.foundation.webtelemetry.csproj b/starsky/starsky.foundation.webtelemetry/starsky.foundation.webtelemetry.csproj index e27592832e..0f7f6376a6 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 9a30900112..0220a1b4f4 100644 --- a/starsky/starsky/starsky.csproj +++ b/starsky/starsky/starsky.csproj @@ -1,7 +1,7 @@  net8.0 - 8.0.5 + 8.0.6 An attempt to create a database driven photo library 0.6.1 @@ -59,7 +59,7 @@ 0 - + diff --git a/starsky/starskyadmincli/starskyadmincli.csproj b/starsky/starskyadmincli/starskyadmincli.csproj index 1e708c0364..02d5219953 100644 --- a/starsky/starskyadmincli/starskyadmincli.csproj +++ b/starsky/starskyadmincli/starskyadmincli.csproj @@ -5,7 +5,7 @@ net8.0 {dcf1f6cb-1c65-4394-bef7-cccc2967b56c} - 8.0.5 + 8.0.6 Full 0.6.1 enable diff --git a/starsky/starskydemoseedcli/starskydemoseedcli.csproj b/starsky/starskydemoseedcli/starskydemoseedcli.csproj index ecbd5645fd..f0d7f2320a 100644 --- a/starsky/starskydemoseedcli/starskydemoseedcli.csproj +++ b/starsky/starskydemoseedcli/starskydemoseedcli.csproj @@ -5,7 +5,7 @@ enable {215a3302-a418-4148-8d20-1127e27c3dae} - 8.0.5 + 8.0.6 Full 0.6.1 enable diff --git a/starsky/starskygeocli/starskygeocli.csproj b/starsky/starskygeocli/starskygeocli.csproj index f20c7d1505..1f7c31483e 100644 --- a/starsky/starskygeocli/starskygeocli.csproj +++ b/starsky/starskygeocli/starskygeocli.csproj @@ -5,7 +5,7 @@ enable {a030c158-2f79-4317-a9f9-bdd46d66d1d8} - 8.0.5 + 8.0.6 Full 0.6.1 enable diff --git a/starsky/starskyimportercli/starskyimportercli.csproj b/starsky/starskyimportercli/starskyimportercli.csproj index 607672ff73..d87cd7b3dd 100644 --- a/starsky/starskyimportercli/starskyimportercli.csproj +++ b/starsky/starskyimportercli/starskyimportercli.csproj @@ -4,7 +4,7 @@ net8.0 {23e4ea86-970a-4de1-badc-8d7e9d3d4dd6} - 8.0.5 + 8.0.6 Full 0.6.1 enable diff --git a/starsky/starskysynchronizecli/starskysynchronizecli.csproj b/starsky/starskysynchronizecli/starskysynchronizecli.csproj index 8eda4ef824..5c0897d8d2 100644 --- a/starsky/starskysynchronizecli/starskysynchronizecli.csproj +++ b/starsky/starskysynchronizecli/starskysynchronizecli.csproj @@ -5,7 +5,7 @@ net8.0 {7e1136a7-cc43-49d2-91d3-48e557f0fb66} - 8.0.5 + 8.0.6 starskysynchronizecli 0.6.1 enable diff --git a/starsky/starskytest/starskytest.csproj b/starsky/starskytest/starskytest.csproj index bd84404885..4af3645620 100644 --- a/starsky/starskytest/starskytest.csproj +++ b/starsky/starskytest/starskytest.csproj @@ -1,7 +1,7 @@  net8.0 - 8.0.5 + 8.0.6 Full {b3342a3e-64e1-442f-b4f7-f7a718508aac} @@ -21,8 +21,8 @@ - - + + diff --git a/starsky/starskythumbnailcli/starskythumbnailcli.csproj b/starsky/starskythumbnailcli/starskythumbnailcli.csproj index c46f5910f1..84370b8449 100644 --- a/starsky/starskythumbnailcli/starskythumbnailcli.csproj +++ b/starsky/starskythumbnailcli/starskythumbnailcli.csproj @@ -5,7 +5,7 @@ net8.0 {67e3fb34-1ca8-4a28-a0e0-00ff61821002} - 8.0.5 + 8.0.6 starskythumbnailcli 0.6.1 enable diff --git a/starsky/starskythumbnailmetacli/starskythumbnailmetacli.csproj b/starsky/starskythumbnailmetacli/starskythumbnailmetacli.csproj index e3c32785b8..0779f7d6da 100644 --- a/starsky/starskythumbnailmetacli/starskythumbnailmetacli.csproj +++ b/starsky/starskythumbnailmetacli/starskythumbnailmetacli.csproj @@ -5,7 +5,7 @@ net8.0 {a0cce905-ae43-4d1b-a97a-2bcd2c010ed1} - 8.0.5 + 8.0.6 starskythumbnailmetacli 0.6.1 enable diff --git a/starsky/starskywebftpcli/starskywebftpcli.csproj b/starsky/starskywebftpcli/starskywebftpcli.csproj index 5195fd285e..4e889d948c 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.5 + 8.0.6 Full 0.6.1 enable diff --git a/starsky/starskywebhtmlcli/starskywebhtmlcli.csproj b/starsky/starskywebhtmlcli/starskywebhtmlcli.csproj index fbd56f6f21..2b57bf3943 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.5 + 8.0.6 8.0 true Full From 8bd7d508d72bde4d536dcf578347ee3b331ee18d Mon Sep 17 00:00:00 2001 From: Dion van Velde Date: Wed, 12 Jun 2024 17:17:07 +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 cb63553770..aa615724fd 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.300 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.302 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 87f84e5caa1cdb77d942ca31d5be319e3b6822c6 Mon Sep 17 00:00:00 2001 From: Dion van Velde Date: Wed, 12 Jun 2024 17:17:36 +0200 Subject: [PATCH 3/3] Update history.md --- history.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/history.md b/history.md index a7481245bb..76e9771eaa 100644 --- a/history.md +++ b/history.md @@ -43,7 +43,8 @@ Semantic Versioning 2.0.0 is from version 0.1.6+ ## version 0.6.2 - _(Unreleased)_ - 2024-06-?? {#v0.6.2} -- nothing yet +- [x] (Changed) Back-end Upgrade to .NET 8 - SDK 8.0.302 (Runtime: 8.0.6) (PR #1601) + ## version 0.6.1 - _(Unreleased)_ - 2024-05-16 {#v0.6.1}