diff --git a/.github/workflows/auto-update-swagger-dotnet.yml b/.github/workflows/auto-update-swagger-dotnet.yml index 28c5fd4b90..58ed953683 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.415 + dotnet-version: 6.0.416 - 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 9c62b0da19..ae8dfc81a7 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.415 + dotnet-version: 6.0.416 - 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 2fd40f9507..ca4994f6a2 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.415 + dotnet-version: 6.0.416 - 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 3da74e21c7..2cee9d3c05 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.415 + dotnet-version: 6.0.416 - 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 8443fa01f5..6b31f6c02e 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.415 + dotnet-version: 6.0.416 - name: Build (Windows) shell: pwsh diff --git a/.github/workflows/starsky-sonarqube-clientapp-netcore.yml b/.github/workflows/starsky-sonarqube-clientapp-netcore.yml index 4316fbd044..880c8d3fd4 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.415 + dotnet-version: 6.0.416 - name: Use Java 17 uses: actions/setup-java@v3 diff --git a/history.md b/history.md index e480025257..e810c7d6ff 100644 --- a/history.md +++ b/history.md @@ -37,7 +37,7 @@ Semantic Versioning 2.0.0 is from version 0.1.6+ ## version 0.5.12 _(Unreleased)_ - 2023-10-?? {#v0.5.12} -- nothing yet +- [x] (Changed) _Back-end_ Upgrade to .NET 6 - SDK 6.0.416 (Runtime: 6.0.24) (PR #1266) ## version 0.5.11 - 2023-10-13 {#v0.5.11} diff --git a/pipelines/azure/steps/use_dotnet_version.yml b/pipelines/azure/steps/use_dotnet_version.yml index 128a8a21d7..94d39332aa 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.415' + displayName: 'Use .NET Core sdk 6.0.416' enabled: true inputs: packageType: sdk - version: 6.0.415 + version: 6.0.416 installationPath: $(Agent.ToolsDirectory)/dotnet diff --git a/starsky/global.json b/starsky/global.json index 2d9fac40bc..ae956985ff 100644 --- a/starsky/global.json +++ b/starsky/global.json @@ -1,7 +1,7 @@ { "strictVersion": true, "sdk": { - "version": "6.0.415", + "version": "6.0.416", "rollForward": "disable", "allowPrerelease": false } diff --git a/starsky/nuget-packages-list.json b/starsky/nuget-packages-list.json index 793751184d..15cacf7f54 100644 --- a/starsky/nuget-packages-list.json +++ b/starsky/nuget-packages-list.json @@ -1,5 +1,5 @@ [ - "Microsoft.AspNetCore.Mvc.NewtonsoftJson 6.0.23", + "Microsoft.AspNetCore.Mvc.NewtonsoftJson 6.0.24", "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.23", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions 6.0.23", + "Microsoft.Extensions.Diagnostics.HealthChecks 6.0.24", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions 6.0.24", "AspNetCore.HealthChecks.MySql 6.0.2", "AspNetCore.HealthChecks.Sqlite 6.0.2", - "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore 6.0.23", + "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore 6.0.24", "MedallionShell 1.6.2", "RazorLight 2.3.1", "SixLabors.ImageSharp 3.0.1", "SixLabors.ImageSharp.Drawing 1.0.0", - "Microsoft.AspNetCore.Authorization 6.0.23", + "Microsoft.AspNetCore.Authorization 6.0.24", "Microsoft.ApplicationInsights.WorkerService 2.21.0", "Microsoft.Extensions.DependencyInjection.Abstractions 6.0.0", - "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", + "Microsoft.EntityFrameworkCore.Analyzers 6.0.24", + "Microsoft.EntityFrameworkCore.Design 6.0.24", + "Microsoft.EntityFrameworkCore.InMemory 6.0.24", + "Microsoft.EntityFrameworkCore.Sqlite 6.0.24", + "Microsoft.EntityFrameworkCore 6.0.24", + "Microsoft.EntityFrameworkCore.Relational 6.0.24", + "Microsoft.Extensions.Identity.Stores 6.0.24", "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.23", + "Microsoft.AspNetCore.Identity.EntityFrameworkCore 6.0.24", "Microsoft.Extensions.Hosting 6.0.1", "Microsoft.NET.Test.Sdk 17.7.0", "MSTest.TestAdapter 3.1.1", diff --git a/starsky/readme.md b/starsky/readme.md index 71a16512f0..ec5a1203be 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.415 SDK. To get the 'Build apps - SDK' .NET Core from https://www.microsoft.com/net/download or https://versionsof.net/ +2. Get the `dotnet` 6.0.416 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 diff --git a/starsky/starsky.feature.health/starsky.feature.health.csproj b/starsky/starsky.feature.health/starsky.feature.health.csproj index b209bd7cc0..cf9472e43f 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 c300aa183a..406a920df4 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 f45ca27b5c..a758d9bb5c 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 818a902023..8f1e5c9eaa 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 7aa16bd4f7..c09e03a947 100644 --- a/starsky/starsky/starsky.csproj +++ b/starsky/starsky/starsky.csproj @@ -1,7 +1,7 @@  net6.0 - 6.0.23 + 6.0.24 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 2a4fb7f827..c0b3ddc878 100644 --- a/starsky/starskyadmincli/starskyadmincli.csproj +++ b/starsky/starskyadmincli/starskyadmincli.csproj @@ -5,7 +5,7 @@ net6.0 {dcf1f6cb-1c65-4394-bef7-cccc2967b56c} - 6.0.23 + 6.0.24 Full 0.5.10 diff --git a/starsky/starskydemoseedcli/starskydemoseedcli.csproj b/starsky/starskydemoseedcli/starskydemoseedcli.csproj index 1958183d1a..3699adf343 100644 --- a/starsky/starskydemoseedcli/starskydemoseedcli.csproj +++ b/starsky/starskydemoseedcli/starskydemoseedcli.csproj @@ -5,7 +5,7 @@ enable {215a3302-a418-4148-8d20-1127e27c3dae} - 6.0.23 + 6.0.24 Full 0.5.10 diff --git a/starsky/starskygeocli/starskygeocli.csproj b/starsky/starskygeocli/starskygeocli.csproj index 638c59cc18..28b5d4faf1 100644 --- a/starsky/starskygeocli/starskygeocli.csproj +++ b/starsky/starskygeocli/starskygeocli.csproj @@ -5,7 +5,7 @@ enable {a030c158-2f79-4317-a9f9-bdd46d66d1d8} - 6.0.23 + 6.0.24 Full 0.5.10 diff --git a/starsky/starskyimportercli/starskyimportercli.csproj b/starsky/starskyimportercli/starskyimportercli.csproj index 83dd105fd4..ae5c26e9ea 100644 --- a/starsky/starskyimportercli/starskyimportercli.csproj +++ b/starsky/starskyimportercli/starskyimportercli.csproj @@ -4,7 +4,7 @@ net6.0 {23e4ea86-970a-4de1-badc-8d7e9d3d4dd6} - 6.0.23 + 6.0.24 Full 0.5.10 diff --git a/starsky/starskysynchronizecli/starskysynchronizecli.csproj b/starsky/starskysynchronizecli/starskysynchronizecli.csproj index 4f10c39cfa..9963f53809 100644 --- a/starsky/starskysynchronizecli/starskysynchronizecli.csproj +++ b/starsky/starskysynchronizecli/starskysynchronizecli.csproj @@ -5,7 +5,7 @@ net6.0 {7e1136a7-cc43-49d2-91d3-48e557f0fb66} - 6.0.23 + 6.0.24 starskysynchronizecli 0.5.10 diff --git a/starsky/starskytest/starskytest.csproj b/starsky/starskytest/starskytest.csproj index 57ea0ec282..ae8fa2ca3c 100644 --- a/starsky/starskytest/starskytest.csproj +++ b/starsky/starskytest/starskytest.csproj @@ -2,7 +2,7 @@ net6.0 - 6.0.23 + 6.0.24 Full {b3342a3e-64e1-442f-b4f7-f7a718508aac} @@ -21,8 +21,8 @@ - - + + diff --git a/starsky/starskythumbnailcli/starskythumbnailcli.csproj b/starsky/starskythumbnailcli/starskythumbnailcli.csproj index 74269cd9de..0be2a93f26 100644 --- a/starsky/starskythumbnailcli/starskythumbnailcli.csproj +++ b/starsky/starskythumbnailcli/starskythumbnailcli.csproj @@ -5,7 +5,7 @@ net6.0 {67e3fb34-1ca8-4a28-a0e0-00ff61821002} - 6.0.23 + 6.0.24 starskythumbnailcli 0.5.10 diff --git a/starsky/starskythumbnailmetacli/starskythumbnailmetacli.csproj b/starsky/starskythumbnailmetacli/starskythumbnailmetacli.csproj index cf3e51896d..bd519cea44 100644 --- a/starsky/starskythumbnailmetacli/starskythumbnailmetacli.csproj +++ b/starsky/starskythumbnailmetacli/starskythumbnailmetacli.csproj @@ -5,7 +5,7 @@ net6.0 {a0cce905-ae43-4d1b-a97a-2bcd2c010ed1} - 6.0.23 + 6.0.24 starskythumbnailmetacli 0.5.10 diff --git a/starsky/starskywebftpcli/starskywebftpcli.csproj b/starsky/starskywebftpcli/starskywebftpcli.csproj index 8ffaf0af87..80fc49d07b 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.23 + 6.0.24 Full 0.5.10 diff --git a/starsky/starskywebhtmlcli/starskywebhtmlcli.csproj b/starsky/starskywebhtmlcli/starskywebhtmlcli.csproj index 529da4abff..eba4e4ba5d 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.23 + 6.0.24 8.0 true Full