From 534f26238f6bec011c812fed98b05b4e52f3d979 Mon Sep 17 00:00:00 2001 From: qdraw Date: Thu, 12 Oct 2023 05:48:38 +0000 Subject: [PATCH 1/3] Auto .NET SDK version Upgrade to 6.0.415 --- .../workflows/auto-update-swagger-dotnet.yml | 2 +- ...elease-on-tag-netcore-desktop-electron.yml | 2 +- .../starsky-codecov-clientapp-netcore.yml | 2 +- .../workflows/starsky-dotnetcore-ubuntu.yml | 2 +- .../workflows/starsky-dotnetcore-windows.yml | 2 +- .../starsky-sonarqube-clientapp-netcore.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 +++++----- ...tarsky.foundation.databasetelemetry.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 +- 24 files changed, 48 insertions(+), 48 deletions(-) diff --git a/.github/workflows/auto-update-swagger-dotnet.yml b/.github/workflows/auto-update-swagger-dotnet.yml index 4383ed565a..28c5fd4b90 100644 --- a/.github/workflows/auto-update-swagger-dotnet.yml +++ b/.github/workflows/auto-update-swagger-dotnet.yml @@ -29,7 +29,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v3 with: - dotnet-version: 6.0.414 + dotnet-version: 6.0.415 - name: Cache nuget packages (*nix) uses: actions/cache@v3 diff --git a/.github/workflows/release-on-tag-netcore-desktop-electron.yml b/.github/workflows/release-on-tag-netcore-desktop-electron.yml index b021befb43..9c62b0da19 100644 --- a/.github/workflows/release-on-tag-netcore-desktop-electron.yml +++ b/.github/workflows/release-on-tag-netcore-desktop-electron.yml @@ -22,7 +22,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v3 with: - dotnet-version: 6.0.414 + dotnet-version: 6.0.415 - name: Build --no-unit-test linux-arm,linux-arm64,win-x64,osx-x64,linux-x64 shell: bash diff --git a/.github/workflows/starsky-codecov-clientapp-netcore.yml b/.github/workflows/starsky-codecov-clientapp-netcore.yml index 4f3a2aa6af..2fd40f9507 100644 --- a/.github/workflows/starsky-codecov-clientapp-netcore.yml +++ b/.github/workflows/starsky-codecov-clientapp-netcore.yml @@ -33,7 +33,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v3 with: - dotnet-version: 6.0.414 + dotnet-version: 6.0.415 - name: Cache node modules clientapp (*nix) uses: actions/cache@v3 diff --git a/.github/workflows/starsky-dotnetcore-ubuntu.yml b/.github/workflows/starsky-dotnetcore-ubuntu.yml index 219186394c..3da74e21c7 100644 --- a/.github/workflows/starsky-dotnetcore-ubuntu.yml +++ b/.github/workflows/starsky-dotnetcore-ubuntu.yml @@ -38,7 +38,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v3 with: - dotnet-version: 6.0.414 + dotnet-version: 6.0.415 - name: Cache nuget packages (*nix) uses: actions/cache@v3 diff --git a/.github/workflows/starsky-dotnetcore-windows.yml b/.github/workflows/starsky-dotnetcore-windows.yml index 039909c3d5..8443fa01f5 100644 --- a/.github/workflows/starsky-dotnetcore-windows.yml +++ b/.github/workflows/starsky-dotnetcore-windows.yml @@ -35,7 +35,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v3 with: - dotnet-version: 6.0.414 + dotnet-version: 6.0.415 - name: Build (Windows) shell: pwsh diff --git a/.github/workflows/starsky-sonarqube-clientapp-netcore.yml b/.github/workflows/starsky-sonarqube-clientapp-netcore.yml index 9265a55d8a..4316fbd044 100644 --- a/.github/workflows/starsky-sonarqube-clientapp-netcore.yml +++ b/.github/workflows/starsky-sonarqube-clientapp-netcore.yml @@ -43,7 +43,7 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v3 with: - dotnet-version: 6.0.414 + dotnet-version: 6.0.415 - name: Use Java 17 uses: actions/setup-java@v3 diff --git a/pipelines/azure/steps/use_dotnet_version.yml b/pipelines/azure/steps/use_dotnet_version.yml index e6911b8dad..128a8a21d7 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 Core sdk 6.0.414' + displayName: 'Use .NET Core sdk 6.0.415' enabled: true inputs: packageType: sdk - version: 6.0.414 + version: 6.0.415 installationPath: $(Agent.ToolsDirectory)/dotnet diff --git a/starsky/global.json b/starsky/global.json index 1ad29f8d79..2d9fac40bc 100644 --- a/starsky/global.json +++ b/starsky/global.json @@ -1,7 +1,7 @@ { "strictVersion": true, "sdk": { - "version": "6.0.414", + "version": "6.0.415", "rollForward": "disable", "allowPrerelease": false } diff --git a/starsky/nuget-packages-list.json b/starsky/nuget-packages-list.json index b3dcd64bbf..793751184d 100644 --- a/starsky/nuget-packages-list.json +++ b/starsky/nuget-packages-list.json @@ -1,5 +1,5 @@ [ - "Microsoft.AspNetCore.Mvc.NewtonsoftJson 6.0.22", + "Microsoft.AspNetCore.Mvc.NewtonsoftJson 6.0.23", "Microsoft.Extensions.Hosting.WindowsServices 6.0.2", "SQLitePCLRaw.lib.e_sqlite3.linux 1.1.14", "Swashbuckle.AspNetCore 6.5.0", @@ -7,25 +7,25 @@ "Microsoft.Extensions.Caching.Memory 6.0.1", "Microsoft.Extensions.Hosting.Abstractions 6.0.0", "NGeoNames 1.5.1", - "Microsoft.Extensions.Diagnostics.HealthChecks 6.0.22", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions 6.0.22", + "Microsoft.Extensions.Diagnostics.HealthChecks 6.0.23", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions 6.0.23", "AspNetCore.HealthChecks.MySql 6.0.2", "AspNetCore.HealthChecks.Sqlite 6.0.2", - "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore 6.0.22", + "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore 6.0.23", "MedallionShell 1.6.2", "RazorLight 2.3.1", "SixLabors.ImageSharp 3.0.1", "SixLabors.ImageSharp.Drawing 1.0.0", - "Microsoft.AspNetCore.Authorization 6.0.22", + "Microsoft.AspNetCore.Authorization 6.0.23", "Microsoft.ApplicationInsights.WorkerService 2.21.0", "Microsoft.Extensions.DependencyInjection.Abstractions 6.0.0", - "Microsoft.EntityFrameworkCore.Analyzers 6.0.22", - "Microsoft.EntityFrameworkCore.Design 6.0.22", - "Microsoft.EntityFrameworkCore.InMemory 6.0.22", - "Microsoft.EntityFrameworkCore.Sqlite 6.0.22", - "Microsoft.EntityFrameworkCore 6.0.22", - "Microsoft.EntityFrameworkCore.Relational 6.0.22", - "Microsoft.Extensions.Identity.Stores 6.0.22", + "Microsoft.EntityFrameworkCore.Analyzers 6.0.23", + "Microsoft.EntityFrameworkCore.Design 6.0.23", + "Microsoft.EntityFrameworkCore.InMemory 6.0.23", + "Microsoft.EntityFrameworkCore.Sqlite 6.0.23", + "Microsoft.EntityFrameworkCore 6.0.23", + "Microsoft.EntityFrameworkCore.Relational 6.0.23", + "Microsoft.Extensions.Identity.Stores 6.0.23", "Pomelo.EntityFrameworkCore.MySql 6.0.2", "System.ComponentModel.Annotations 5.0.0", "Microsoft.ApplicationInsights 2.21.0", @@ -48,7 +48,7 @@ "Microsoft.ApplicationInsights.AspNetCore 2.21.0", "Microsoft.Extensions.Logging.Console 6.0.0", "System.Text.Json 6.0.7", - "Microsoft.AspNetCore.Identity.EntityFrameworkCore 6.0.22", + "Microsoft.AspNetCore.Identity.EntityFrameworkCore 6.0.23", "Microsoft.Extensions.Hosting 6.0.1", "Microsoft.NET.Test.Sdk 17.7.0", "MSTest.TestAdapter 3.1.1", diff --git a/starsky/starsky.feature.health/starsky.feature.health.csproj b/starsky/starsky.feature.health/starsky.feature.health.csproj index bfdba704ee..b209bd7cc0 100644 --- a/starsky/starsky.feature.health/starsky.feature.health.csproj +++ b/starsky/starsky.feature.health/starsky.feature.health.csproj @@ -13,11 +13,11 @@ - - + + - + diff --git a/starsky/starsky.foundation.accountmanagement/starsky.foundation.accountmanagement.csproj b/starsky/starsky.foundation.accountmanagement/starsky.foundation.accountmanagement.csproj index f8fd1b0c85..c300aa183a 100644 --- a/starsky/starsky.foundation.accountmanagement/starsky.foundation.accountmanagement.csproj +++ b/starsky/starsky.foundation.accountmanagement/starsky.foundation.accountmanagement.csproj @@ -14,7 +14,7 @@ - + diff --git a/starsky/starsky.foundation.database/starsky.foundation.database.csproj b/starsky/starsky.foundation.database/starsky.foundation.database.csproj index 880cde2471..f45ca27b5c 100644 --- a/starsky/starsky.foundation.database/starsky.foundation.database.csproj +++ b/starsky/starsky.foundation.database/starsky.foundation.database.csproj @@ -11,13 +11,13 @@ - - - - - - - + + + + + + + diff --git a/starsky/starsky.foundation.databasetelemetry/starsky.foundation.databasetelemetry.csproj b/starsky/starsky.foundation.databasetelemetry/starsky.foundation.databasetelemetry.csproj index 6938c64e18..818a902023 100644 --- a/starsky/starsky.foundation.databasetelemetry/starsky.foundation.databasetelemetry.csproj +++ b/starsky/starsky.foundation.databasetelemetry/starsky.foundation.databasetelemetry.csproj @@ -12,7 +12,7 @@ - + diff --git a/starsky/starsky/starsky.csproj b/starsky/starsky/starsky.csproj index e1ed734c24..7aa16bd4f7 100644 --- a/starsky/starsky/starsky.csproj +++ b/starsky/starsky/starsky.csproj @@ -1,7 +1,7 @@  net6.0 - 6.0.22 + 6.0.23 An attempt to create a database driven photo library 0.5.10 @@ -54,7 +54,7 @@ 0 - + diff --git a/starsky/starskyadmincli/starskyadmincli.csproj b/starsky/starskyadmincli/starskyadmincli.csproj index dd9087622b..2a4fb7f827 100644 --- a/starsky/starskyadmincli/starskyadmincli.csproj +++ b/starsky/starskyadmincli/starskyadmincli.csproj @@ -5,7 +5,7 @@ net6.0 {dcf1f6cb-1c65-4394-bef7-cccc2967b56c} - 6.0.22 + 6.0.23 Full 0.5.10 diff --git a/starsky/starskydemoseedcli/starskydemoseedcli.csproj b/starsky/starskydemoseedcli/starskydemoseedcli.csproj index b353e9b434..1958183d1a 100644 --- a/starsky/starskydemoseedcli/starskydemoseedcli.csproj +++ b/starsky/starskydemoseedcli/starskydemoseedcli.csproj @@ -5,7 +5,7 @@ enable {215a3302-a418-4148-8d20-1127e27c3dae} - 6.0.22 + 6.0.23 Full 0.5.10 diff --git a/starsky/starskygeocli/starskygeocli.csproj b/starsky/starskygeocli/starskygeocli.csproj index ae044765ed..638c59cc18 100644 --- a/starsky/starskygeocli/starskygeocli.csproj +++ b/starsky/starskygeocli/starskygeocli.csproj @@ -5,7 +5,7 @@ enable {a030c158-2f79-4317-a9f9-bdd46d66d1d8} - 6.0.22 + 6.0.23 Full 0.5.10 diff --git a/starsky/starskyimportercli/starskyimportercli.csproj b/starsky/starskyimportercli/starskyimportercli.csproj index 7271c26acb..83dd105fd4 100644 --- a/starsky/starskyimportercli/starskyimportercli.csproj +++ b/starsky/starskyimportercli/starskyimportercli.csproj @@ -4,7 +4,7 @@ net6.0 {23e4ea86-970a-4de1-badc-8d7e9d3d4dd6} - 6.0.22 + 6.0.23 Full 0.5.10 diff --git a/starsky/starskysynchronizecli/starskysynchronizecli.csproj b/starsky/starskysynchronizecli/starskysynchronizecli.csproj index d8afe096b6..4f10c39cfa 100644 --- a/starsky/starskysynchronizecli/starskysynchronizecli.csproj +++ b/starsky/starskysynchronizecli/starskysynchronizecli.csproj @@ -5,7 +5,7 @@ net6.0 {7e1136a7-cc43-49d2-91d3-48e557f0fb66} - 6.0.22 + 6.0.23 starskysynchronizecli 0.5.10 diff --git a/starsky/starskytest/starskytest.csproj b/starsky/starskytest/starskytest.csproj index 6ca3ed6ef1..57ea0ec282 100644 --- a/starsky/starskytest/starskytest.csproj +++ b/starsky/starskytest/starskytest.csproj @@ -2,7 +2,7 @@ net6.0 - 6.0.22 + 6.0.23 Full {b3342a3e-64e1-442f-b4f7-f7a718508aac} @@ -21,8 +21,8 @@ - - + + diff --git a/starsky/starskythumbnailcli/starskythumbnailcli.csproj b/starsky/starskythumbnailcli/starskythumbnailcli.csproj index 7f4d3a58f3..74269cd9de 100644 --- a/starsky/starskythumbnailcli/starskythumbnailcli.csproj +++ b/starsky/starskythumbnailcli/starskythumbnailcli.csproj @@ -5,7 +5,7 @@ net6.0 {67e3fb34-1ca8-4a28-a0e0-00ff61821002} - 6.0.22 + 6.0.23 starskythumbnailcli 0.5.10 diff --git a/starsky/starskythumbnailmetacli/starskythumbnailmetacli.csproj b/starsky/starskythumbnailmetacli/starskythumbnailmetacli.csproj index 5214f0473a..cf3e51896d 100644 --- a/starsky/starskythumbnailmetacli/starskythumbnailmetacli.csproj +++ b/starsky/starskythumbnailmetacli/starskythumbnailmetacli.csproj @@ -5,7 +5,7 @@ net6.0 {a0cce905-ae43-4d1b-a97a-2bcd2c010ed1} - 6.0.22 + 6.0.23 starskythumbnailmetacli 0.5.10 diff --git a/starsky/starskywebftpcli/starskywebftpcli.csproj b/starsky/starskywebftpcli/starskywebftpcli.csproj index 461fe3b84f..8ffaf0af87 100644 --- a/starsky/starskywebftpcli/starskywebftpcli.csproj +++ b/starsky/starskywebftpcli/starskywebftpcli.csproj @@ -4,7 +4,7 @@ Exe net6.0 {eb1d57d1-29d8-4bfb-950e-447ef8522a10} - 6.0.22 + 6.0.23 Full 0.5.10 diff --git a/starsky/starskywebhtmlcli/starskywebhtmlcli.csproj b/starsky/starskywebhtmlcli/starskywebhtmlcli.csproj index f7bafd2a65..529da4abff 100644 --- a/starsky/starskywebhtmlcli/starskywebhtmlcli.csproj +++ b/starsky/starskywebhtmlcli/starskywebhtmlcli.csproj @@ -3,7 +3,7 @@ Exe net6.0 {76d7bf62-9f1d-48f1-9035-dceb01de55c3} - 6.0.22 + 6.0.23 8.0 true Full From d14bcd0a1c9290ea83ca58e174f76dc8d4d3c607 Mon Sep 17 00:00:00 2001 From: Dion van Velde Date: Fri, 13 Oct 2023 10:13:19 +0200 Subject: [PATCH 2/3] 415 --- starsky/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/starsky/readme.md b/starsky/readme.md index c77731c7aa..aceb8520be 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` 6.0.414 SDK. To get the 'Build apps - SDK' .NET Core from https://www.microsoft.com/net/download +2. Get the `dotnet` 6.0.415 SDK. To get the 'Build apps - SDK' .NET Core from https://www.microsoft.com/net/download 3. Get a recent version of nodejs (18.x or newer) 4. Make a build of all the projects and run the tests From 7bfe82ecdfd3d9168b69b15f60e98e052320387a Mon Sep 17 00:00:00 2001 From: Dion van Velde Date: Fri, 13 Oct 2023 10:15:01 +0200 Subject: [PATCH 3/3] Update history.md --- history.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/history.md b/history.md index 6ba66bad90..42910a9c77 100644 --- a/history.md +++ b/history.md @@ -40,13 +40,14 @@ Semantic Versioning 2.0.0 is from version 0.1.6+ ## version 0.5.11 _(Unreleased)_ - 2023-10-?? {#v0.5.11} -- [x] (Changed) _Back-end_ Upgrade to .NET 6 - SDK 6.0.413 (Runtime: 6.0.21) (PR #1205) -- [x] (Changed) _Back-end_ Upgrade to .NET 6 - SDK 6.0.414 (Runtime: 6.0.22) (PR #1237) +- [x] (Changed) _Back-end_ Upgrade to .NET 6 - SDK 6.0.413 - see #1256 - (Runtime: 6.0.21) (PR #1205) +- [x] (Changed) _Back-end_ Upgrade to .NET 6 - SDK 6.0.414 - see #1256 - (Runtime: 6.0.22) (PR #1237) - [x] (Changed) _Front-end_ Move from Create React App to Vite (PR #1204) - [x] (Changed) _Front-end_ Upgrade npm packages (PR #1219, 1220, 1228, 1230, 1237, 1240) - [x] (Changed) _Front-end_ Upgrade npm packages (PR 1241, 1239, 1252, 1244, 1246, 1247, 1250, 1251) - [x] (Changed) _Back-end_ Upgrade github yaml's (PR 1232, 1233, 1234, 1235) - [x] (Changed) _Desktop_ Upgrade Electron to 26.x (27.0 has removed support for Mac OS 10.13 and 10.14) (PR #1255) +- [x] (Changed) _Back-end_ Upgrade to .NET 6 - SDK 6.0.415 (Runtime: 6.0.23) (PR #1256) ## version 0.5.10 - 2023-07-27 {#v0.5.10}