diff --git a/.github/workflows/auto-update-swagger-dotnet.yml b/.github/workflows/auto-update-swagger-dotnet.yml index 603a071b8f..286e079ee0 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 SDK uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.101 + dotnet-version: 8.0.200 - name: Cache nuget packages (*nix) uses: actions/cache@v4 diff --git a/.github/workflows/release-on-tag-netcore-desktop-electron.yml b/.github/workflows/release-on-tag-netcore-desktop-electron.yml index 61ce9bdb96..6212ba6d3d 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@v4 with: - dotnet-version: 8.0.101 + dotnet-version: 8.0.200 - 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/starsky-codecov-clientapp-netcore.yml b/.github/workflows/starsky-codecov-clientapp-netcore.yml index 65d8fea9de..d3b9aba212 100644 --- a/.github/workflows/starsky-codecov-clientapp-netcore.yml +++ b/.github/workflows/starsky-codecov-clientapp-netcore.yml @@ -35,7 +35,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.101 + dotnet-version: 8.0.200 - name: Cache node modules clientapp (*nix) uses: actions/cache@v4 diff --git a/.github/workflows/starsky-dotnetcore-ubuntu.yml b/.github/workflows/starsky-dotnetcore-ubuntu.yml index a7d007ebbc..9f495c7021 100644 --- a/.github/workflows/starsky-dotnetcore-ubuntu.yml +++ b/.github/workflows/starsky-dotnetcore-ubuntu.yml @@ -38,7 +38,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.101 + dotnet-version: 8.0.200 - name: Cache nuget packages (*nix) uses: actions/cache@v4 diff --git a/.github/workflows/starsky-dotnetcore-windows.yml b/.github/workflows/starsky-dotnetcore-windows.yml index 0971a6ff3c..dab17ce7c8 100644 --- a/.github/workflows/starsky-dotnetcore-windows.yml +++ b/.github/workflows/starsky-dotnetcore-windows.yml @@ -35,7 +35,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.101 + dotnet-version: 8.0.200 - name: Build (Windows) shell: pwsh diff --git a/.github/workflows/starsky-sonarqube-clientapp-netcore.yml b/.github/workflows/starsky-sonarqube-clientapp-netcore.yml index 9438393f1c..2a384aabd5 100644 --- a/.github/workflows/starsky-sonarqube-clientapp-netcore.yml +++ b/.github/workflows/starsky-sonarqube-clientapp-netcore.yml @@ -45,7 +45,7 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.101 + dotnet-version: 8.0.200 - name: Use Java 17 uses: actions/setup-java@v4 diff --git a/.github/workflows/webapp-net-only-macos.yml b/.github/workflows/webapp-net-only-macos.yml index e872333b42..87b1737899 100644 --- a/.github/workflows/webapp-net-only-macos.yml +++ b/.github/workflows/webapp-net-only-macos.yml @@ -35,7 +35,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.101 + dotnet-version: 8.0.200 - name: "BuildNetCore (MacOS)" shell: bash diff --git a/history.md b/history.md index 77bbaf2fb3..2c6031f398 100644 --- a/history.md +++ b/history.md @@ -41,9 +41,10 @@ Semantic Versioning 2.0.0 is from version 0.1.6+ ## List of versions -## version 0.6.0-beta.1 - _(Unreleased)_ - 2024-01-? {#v0.6.0-beta.0} +## version 0.6.0-beta.1 - _(Unreleased)_ - 2024-02-? {#v0.6.0-beta.1} + +- [x] (Changed) _Back-end_ Upgrade to .NET 8 - SDK 8.0.200 (Runtime: 8.0.2) (PR #1382) -- WIP Electron forge ## version 0.6.0-beta.0 - 2024-02-11 {#v0.6.0-beta.0} diff --git a/pipelines/azure/steps/use_dotnet_version.yml b/pipelines/azure/steps/use_dotnet_version.yml index 83c2e853a2..c1a9db2b45 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.101' + displayName: 'Use .NET SDK 8.0.200' enabled: true inputs: packageType: sdk - version: 8.0.101 + version: 8.0.200 installationPath: $(Agent.ToolsDirectory)/dotnet diff --git a/starsky/global.json b/starsky/global.json index 41df4afed0..25a9f5b73b 100644 --- a/starsky/global.json +++ b/starsky/global.json @@ -1,7 +1,7 @@ { "strictVersion": true, "sdk": { - "version": "8.0.101", + "version": "8.0.200", "rollForward": "disable", "allowPrerelease": false } diff --git a/starsky/nuget-packages-list.json b/starsky/nuget-packages-list.json index 777e60b6ad..5b80eb164c 100644 --- a/starsky/nuget-packages-list.json +++ b/starsky/nuget-packages-list.json @@ -1,29 +1,29 @@ [ - "Microsoft.AspNetCore.Mvc.NewtonsoftJson 8.0.1", + "Microsoft.AspNetCore.Mvc.NewtonsoftJson 8.0.2", "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.1", - "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions 8.0.1", + "Microsoft.Extensions.Diagnostics.HealthChecks 8.0.2", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions 8.0.2", "AspNetCore.HealthChecks.MySql 8.0.0", "AspNetCore.HealthChecks.Sqlite 8.0.0", - "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore 8.0.1", + "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore 8.0.2", "MedallionShell 1.6.2", "RazorLight 2.3.1", "SixLabors.ImageSharp 3.1.2", "SixLabors.ImageSharp.Drawing 2.1.1", - "Microsoft.AspNetCore.Authorization 8.0.1", - "Microsoft.EntityFrameworkCore.Analyzers 8.0.1", - "Microsoft.EntityFrameworkCore.Design 8.0.1", - "Microsoft.EntityFrameworkCore.InMemory 8.0.1", - "Microsoft.EntityFrameworkCore.Sqlite 8.0.1", - "Microsoft.EntityFrameworkCore 8.0.1", - "Microsoft.EntityFrameworkCore.Relational 8.0.1", + "Microsoft.AspNetCore.Authorization 8.0.2", + "Microsoft.EntityFrameworkCore.Analyzers 8.0.2", + "Microsoft.EntityFrameworkCore.Design 8.0.2", + "Microsoft.EntityFrameworkCore.InMemory 8.0.2", + "Microsoft.EntityFrameworkCore.Sqlite 8.0.2", + "Microsoft.EntityFrameworkCore 8.0.2", + "Microsoft.EntityFrameworkCore.Relational 8.0.2", "Microsoft.Extensions.DependencyInjection 8.0.0", - "Microsoft.Extensions.Identity.Stores 8.0.1", + "Microsoft.Extensions.Identity.Stores 8.0.2", "Pomelo.EntityFrameworkCore.MySql 8.0.0-beta.2", "System.ComponentModel.Annotations 5.0.0", "Microsoft.Extensions.DependencyInjection.Abstractions 8.0.0", @@ -49,7 +49,7 @@ "OpenTelemetry.Instrumentation.Runtime 1.7.0", "System.Diagnostics.DiagnosticSource 8.0.0", "System.Text.Json 8.0.1", - "Microsoft.AspNetCore.Identity.EntityFrameworkCore 8.0.1", + "Microsoft.AspNetCore.Identity.EntityFrameworkCore 8.0.2", "Microsoft.Extensions.Hosting 8.0.0", "Microsoft.NET.Test.Sdk 17.9.0", "MSTest.TestAdapter 3.2.0", diff --git a/starsky/readme.md b/starsky/readme.md index 0b896663c8..fd547ae01c 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.417 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.200 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 434c13c2c7..6fed3e580b 100644 --- a/starsky/starsky.feature.health/starsky.feature.health.csproj +++ b/starsky/starsky.feature.health/starsky.feature.health.csproj @@ -14,11 +14,11 @@ - - + + - + diff --git a/starsky/starsky.foundation.accountmanagement/starsky.foundation.accountmanagement.csproj b/starsky/starsky.foundation.accountmanagement/starsky.foundation.accountmanagement.csproj index 25556e9eb1..f020ce4a5a 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 f211c059f6..4c4e7392db 100644 --- a/starsky/starsky.foundation.database/starsky.foundation.database.csproj +++ b/starsky/starsky.foundation.database/starsky.foundation.database.csproj @@ -11,14 +11,14 @@ - - - - - - + + + + + + - + diff --git a/starsky/starsky.foundation.webtelemetry/starsky.foundation.webtelemetry.csproj b/starsky/starsky.foundation.webtelemetry/starsky.foundation.webtelemetry.csproj index 9ddec18c4e..a76ac34fc0 100644 --- a/starsky/starsky.foundation.webtelemetry/starsky.foundation.webtelemetry.csproj +++ b/starsky/starsky.foundation.webtelemetry/starsky.foundation.webtelemetry.csproj @@ -19,7 +19,7 @@ - + diff --git a/starsky/starsky/starsky.csproj b/starsky/starsky/starsky.csproj index 8bffacebbf..5da0fc60ff 100644 --- a/starsky/starsky/starsky.csproj +++ b/starsky/starsky/starsky.csproj @@ -1,7 +1,7 @@  net8.0 - 8.0.1 + 8.0.2 An attempt to create a database driven photo library 0.6.0-beta.0 @@ -58,7 +58,7 @@ 0 - + diff --git a/starsky/starskyadmincli/starskyadmincli.csproj b/starsky/starskyadmincli/starskyadmincli.csproj index 0dde38539e..49a7c10bbf 100644 --- a/starsky/starskyadmincli/starskyadmincli.csproj +++ b/starsky/starskyadmincli/starskyadmincli.csproj @@ -5,7 +5,7 @@ net8.0 {dcf1f6cb-1c65-4394-bef7-cccc2967b56c} - 8.0.1 + 8.0.2 Full 0.6.0-beta.0 enable diff --git a/starsky/starskydemoseedcli/starskydemoseedcli.csproj b/starsky/starskydemoseedcli/starskydemoseedcli.csproj index 5fae46ece1..c623052a85 100644 --- a/starsky/starskydemoseedcli/starskydemoseedcli.csproj +++ b/starsky/starskydemoseedcli/starskydemoseedcli.csproj @@ -5,7 +5,7 @@ enable {215a3302-a418-4148-8d20-1127e27c3dae} - 8.0.1 + 8.0.2 Full 0.6.0-beta.0 enable diff --git a/starsky/starskygeocli/starskygeocli.csproj b/starsky/starskygeocli/starskygeocli.csproj index 3225f2e77c..17ff595a11 100644 --- a/starsky/starskygeocli/starskygeocli.csproj +++ b/starsky/starskygeocli/starskygeocli.csproj @@ -5,7 +5,7 @@ enable {a030c158-2f79-4317-a9f9-bdd46d66d1d8} - 8.0.1 + 8.0.2 Full 0.6.0-beta.0 enable diff --git a/starsky/starskyimportercli/starskyimportercli.csproj b/starsky/starskyimportercli/starskyimportercli.csproj index 308fde19e7..b3af706e69 100644 --- a/starsky/starskyimportercli/starskyimportercli.csproj +++ b/starsky/starskyimportercli/starskyimportercli.csproj @@ -4,7 +4,7 @@ net8.0 {23e4ea86-970a-4de1-badc-8d7e9d3d4dd6} - 8.0.1 + 8.0.2 Full 0.6.0-beta.0 enable diff --git a/starsky/starskysynchronizecli/starskysynchronizecli.csproj b/starsky/starskysynchronizecli/starskysynchronizecli.csproj index dbe6dd5093..39a497c24d 100644 --- a/starsky/starskysynchronizecli/starskysynchronizecli.csproj +++ b/starsky/starskysynchronizecli/starskysynchronizecli.csproj @@ -5,7 +5,7 @@ net8.0 {7e1136a7-cc43-49d2-91d3-48e557f0fb66} - 8.0.1 + 8.0.2 starskysynchronizecli 0.6.0-beta.0 enable diff --git a/starsky/starskytest/starskytest.csproj b/starsky/starskytest/starskytest.csproj index 5953ee1eeb..9d6f1e90b4 100644 --- a/starsky/starskytest/starskytest.csproj +++ b/starsky/starskytest/starskytest.csproj @@ -1,7 +1,7 @@  net8.0 - 8.0.1 + 8.0.2 Full {b3342a3e-64e1-442f-b4f7-f7a718508aac} @@ -20,8 +20,8 @@ - - + + diff --git a/starsky/starskythumbnailcli/starskythumbnailcli.csproj b/starsky/starskythumbnailcli/starskythumbnailcli.csproj index 5ced66d16b..375ea545cb 100644 --- a/starsky/starskythumbnailcli/starskythumbnailcli.csproj +++ b/starsky/starskythumbnailcli/starskythumbnailcli.csproj @@ -5,7 +5,7 @@ net8.0 {67e3fb34-1ca8-4a28-a0e0-00ff61821002} - 8.0.1 + 8.0.2 starskythumbnailcli 0.6.0-beta.0 enable diff --git a/starsky/starskythumbnailmetacli/starskythumbnailmetacli.csproj b/starsky/starskythumbnailmetacli/starskythumbnailmetacli.csproj index dae9222c78..1766db9bca 100644 --- a/starsky/starskythumbnailmetacli/starskythumbnailmetacli.csproj +++ b/starsky/starskythumbnailmetacli/starskythumbnailmetacli.csproj @@ -5,7 +5,7 @@ net8.0 {a0cce905-ae43-4d1b-a97a-2bcd2c010ed1} - 8.0.1 + 8.0.2 starskythumbnailmetacli 0.6.0-beta.0 enable diff --git a/starsky/starskywebftpcli/starskywebftpcli.csproj b/starsky/starskywebftpcli/starskywebftpcli.csproj index d6859379d0..9575736c2e 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.1 + 8.0.2 Full 0.6.0-beta.0 enable diff --git a/starsky/starskywebhtmlcli/starskywebhtmlcli.csproj b/starsky/starskywebhtmlcli/starskywebhtmlcli.csproj index 316de1996c..2110eb2cbb 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.1 + 8.0.2 8.0 true Full diff --git a/starskydesktop/src/app/main-window/on-headers-received.ts b/starskydesktop/src/app/main-window/on-headers-received.ts index 548f9defa6..a24af7adcb 100644 --- a/starskydesktop/src/app/main-window/on-headers-received.ts +++ b/starskydesktop/src/app/main-window/on-headers-received.ts @@ -15,7 +15,7 @@ export function onHeaderReceived(newWindow: BrowserWindow) { // } /// default-src 'none'; img-src 'self' https://a.tile.openstreetmap.org/ https://b.tile.openstreetmap.org/ https://c.tile.openstreetmap.org/; script-src 'self'; connect-src 'self' wss://starsky.server ;style-src 'self'; font-src 'self'; frame-ancestors 'none'; base-uri 'none'; form-action 'self'; object-src 'none'; media-src 'self'; frame-src 'none'; manifest-src 'self'; block-all-mixed-content; - + // // When change also check if CSPMiddleware needs to be updated // var csp = "default-src 'none'; img-src 'self' file://* https://www.openstreetmap.org https://tile.openstreetmap.org https://*.tile.openstreetmap.org " // + whitelistDomain + "; " + "style-src file://* unsafe-inline https://www.openstreetmap.org " + whitelistDomain