Skip to content

Commit

Permalink
Merge pull request #1821 from qdraw/feature/auto_dotnet_sdk_version_u…
Browse files Browse the repository at this point in the history
…pgrade_8.0.404

.NET SDK Upgrade to 8.0.404
  • Loading branch information
qdraw authored Nov 13, 2024
2 parents 431062c + 30728c9 commit ddb277a
Show file tree
Hide file tree
Showing 29 changed files with 55 additions and 54 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/desktop-release-on-tag-net-electron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.403
dotnet-version: 8.0.404

- name: Build --no-unit-test linux-arm,linux-arm64,win-x64,osx-x64,linux-x64,osx-arm64 --ready-to-run
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/webapp-build-net-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.403
dotnet-version: 8.0.404

- name: "BuildNetCore (MacOS)"
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/webapp-build-net-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.403
dotnet-version: 8.0.404

- name: Cache nuget packages (*nix)
uses: actions/cache@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/webapp-build-net-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.403
dotnet-version: 8.0.404

- name: Build (Windows)
shell: pwsh
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/webapp-codecov-clientapp-netcore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.403
dotnet-version: 8.0.404

- name: Cache node modules clientapp (*nix)
uses: actions/cache@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/webapp-sonarqube-clientapp-netcore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- name: Setup .NET SDK
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.403
dotnet-version: 8.0.404

- name: Use Java 17
uses: actions/setup-java@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/webapp-update-swagger-dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Setup .NET SDK
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.403
dotnet-version: 8.0.404

- name: Cache nuget packages (*nix)
uses: actions/cache@v4
Expand Down
1 change: 1 addition & 0 deletions history.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ Semantic Versioning 2.0.0 is from version 0.1.6+
- [x] (Added) _Back-end_ WebP support for sync, thumbnails, reading & writing (PR #1813)
- [x] (Added) _Back-end_ Psd support for sync, reading & writing (no thumbnail) (PR #1817)
- [x] (Added) _Front-end_ Cache display issue with fileName contains (PR #1817)
- [x] (Changed) _Back-end_ Upgrade to .NET 8 - SDK 8.0.404 (Runtime: 8.0.11) (PR #1821)

## version 0.6.2 - 2024-10-11 {#v0.6.2}

Expand Down
4 changes: 2 additions & 2 deletions pipelines/azure/steps/use_dotnet_version.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
steps:
- task: UseDotNet@2
displayName: 'Use .NET SDK 8.0.403'
displayName: 'Use .NET SDK 8.0.404'
enabled: true
inputs:
packageType: sdk
version: 8.0.403
version: 8.0.404
installationPath: $(Agent.ToolsDirectory)/dotnet
performMultiLevelLookup: true
2 changes: 1 addition & 1 deletion starsky/.config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"dotnet-sonarscanner": {
"version": "9.0.1",
"version": "9.0.2",
"commands": [
"dotnet-sonarscanner"
],
Expand Down
2 changes: 1 addition & 1 deletion starsky/build/helpers/SonarQube.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public static class SonarQube
/// <summary>
/// @see: https://www.nuget.org/packages/dotnet-sonarscanner
/// </summary>
private const string SonarQubePackageVersion = "9.0.1";
private const string SonarQubePackageVersion = "9.0.2";

private const string SonarQubeDotnetSonarScannerApi =
"https://api.nuget.org/v3-flatcontainer/dotnet-sonarscanner/index.json";
Expand Down
2 changes: 1 addition & 1 deletion starsky/global.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"strictVersion": true,
"sdk": {
"version": "8.0.403",
"version": "8.0.404",
"rollForward": "disable",
"allowPrerelease": false
}
Expand Down
26 changes: 13 additions & 13 deletions starsky/nuget-packages-list.json
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
[
"Microsoft.AspNetCore.Mvc.NewtonsoftJson 8.0.10",
"Microsoft.AspNetCore.Mvc.NewtonsoftJson 8.0.11",
"Microsoft.Extensions.Hosting.WindowsServices 8.0.1",
"Swashbuckle.AspNetCore 6.9.0",
"Microsoft.Extensions.Caching.Abstractions 8.0.0",
"Microsoft.Extensions.Caching.Memory 8.0.1",
"Microsoft.Extensions.Hosting.Abstractions 8.0.1",
"NGeoNames 1.5.1",
"Microsoft.Extensions.Diagnostics.HealthChecks 8.0.10",
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions 8.0.10",
"Microsoft.Extensions.Diagnostics.HealthChecks 8.0.11",
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions 8.0.11",
"AspNetCore.HealthChecks.MySql 8.0.1",
"AspNetCore.HealthChecks.Sqlite 8.1.0",
"Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore 8.0.10",
"Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore 8.0.11",
"MedallionShell 1.6.2",
"RazorLight 2.3.1",
"SixLabors.ImageSharp 3.1.5",
"SixLabors.ImageSharp.Drawing 2.1.4",
"Microsoft.AspNetCore.Authorization 8.0.10",
"Microsoft.EntityFrameworkCore.Analyzers 8.0.10",
"Microsoft.EntityFrameworkCore.Design 8.0.10",
"Microsoft.EntityFrameworkCore.InMemory 8.0.10",
"Microsoft.EntityFrameworkCore.Sqlite 8.0.10",
"Microsoft.EntityFrameworkCore 8.0.10",
"Microsoft.EntityFrameworkCore.Relational 8.0.10",
"Microsoft.AspNetCore.Authorization 8.0.11",
"Microsoft.EntityFrameworkCore.Analyzers 8.0.11",
"Microsoft.EntityFrameworkCore.Design 8.0.11",
"Microsoft.EntityFrameworkCore.InMemory 8.0.11",
"Microsoft.EntityFrameworkCore.Sqlite 8.0.11",
"Microsoft.EntityFrameworkCore 8.0.11",
"Microsoft.EntityFrameworkCore.Relational 8.0.11",
"Microsoft.Extensions.DependencyInjection 8.0.1",
"Microsoft.Extensions.Identity.Stores 8.0.10",
"Microsoft.Extensions.Identity.Stores 8.0.11",
"Pomelo.EntityFrameworkCore.MySql 8.0.2",
"System.ComponentModel.Annotations 5.0.0",
"Microsoft.Extensions.DependencyInjection.Abstractions 8.0.2",
Expand All @@ -50,7 +50,7 @@
"OpenTelemetry.Instrumentation.Runtime 1.9.0",
"System.Diagnostics.DiagnosticSource 8.0.1",
"System.Text.Json 8.0.5",
"Microsoft.AspNetCore.Identity.EntityFrameworkCore 8.0.10",
"Microsoft.AspNetCore.Identity.EntityFrameworkCore 8.0.11",
"Microsoft.Extensions.Hosting 8.0.1",
"Microsoft.NET.Test.Sdk 17.11.1",
"MSTest.TestAdapter 3.6.2",
Expand Down
2 changes: 1 addition & 1 deletion starsky/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ to compile the application for development
git clone "https://github.com/qdraw/starsky.git"
```

2. Get the `dotnet` 8.0.403 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.404 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 (20.x or newer)

4. Make a build of all the projects and run the tests
Expand Down
6 changes: 3 additions & 3 deletions starsky/starsky.feature.health/starsky.feature.health.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.10" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="8.0.10" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.11" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="8.0.11" />
<PackageReference Include="AspNetCore.HealthChecks.MySql" Version="8.0.1"/>
<PackageReference Include="AspNetCore.HealthChecks.Sqlite" Version="8.1.0" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.10" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.11" />
</ItemGroup>

<PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="8.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="8.0.11" />
<FrameworkReference Include="Microsoft.AspNetCore.App"/>
<!-- instead of : Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0, -->
<!-- Microsoft.AspNetCore.Authentication-->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="8.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="8.0.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.11" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="8.0.10" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="8.0.11" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2"/>
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0"/>
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.11" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
<!-- instead of : Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0-->
Expand Down
4 changes: 2 additions & 2 deletions starsky/starsky/starsky.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<RuntimeFrameworkVersion>8.0.10</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>8.0.11</RuntimeFrameworkVersion>
<Description>An attempt to create a database driven photo library</Description>
<!-- use node script to update version -->
<Version>0.6.2</Version>
Expand Down Expand Up @@ -59,7 +59,7 @@
<WarningLevel>0</WarningLevel>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.10" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.11" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.1" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion starsky/starskyadmincli/starskyadmincli.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<TargetFramework>net8.0</TargetFramework>
<!-- SonarQube needs this -->
<ProjectGuid>{dcf1f6cb-1c65-4394-bef7-cccc2967b56c}</ProjectGuid>
<RuntimeFrameworkVersion>8.0.10</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>8.0.11</RuntimeFrameworkVersion>
<DebugType>Full</DebugType>
<Version>0.6.2</Version>
<Nullable>enable</Nullable>
Expand Down
2 changes: 1 addition & 1 deletion starsky/starskydemoseedcli/starskydemoseedcli.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Nullable>enable</Nullable>
<!-- SonarQube needs this -->
<ProjectGuid>{215a3302-a418-4148-8d20-1127e27c3dae}</ProjectGuid>
<RuntimeFrameworkVersion>8.0.10</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>8.0.11</RuntimeFrameworkVersion>
<DebugType>Full</DebugType>
<Version>0.6.2</Version>
<Nullable>enable</Nullable>
Expand Down
2 changes: 1 addition & 1 deletion starsky/starskygeocli/starskygeocli.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Nullable>enable</Nullable>
<!-- SonarQube needs this -->
<ProjectGuid>{a030c158-2f79-4317-a9f9-bdd46d66d1d8}</ProjectGuid>
<RuntimeFrameworkVersion>8.0.10</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>8.0.11</RuntimeFrameworkVersion>
<DebugType>Full</DebugType>
<Version>0.6.2</Version>
<Nullable>enable</Nullable>
Expand Down
2 changes: 1 addition & 1 deletion starsky/starskyimportercli/starskyimportercli.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>net8.0</TargetFramework>
<!-- SonarQube needs this -->
<ProjectGuid>{23e4ea86-970a-4de1-badc-8d7e9d3d4dd6}</ProjectGuid>
<RuntimeFrameworkVersion>8.0.10</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>8.0.11</RuntimeFrameworkVersion>
<DebugType>Full</DebugType>
<Version>0.6.2</Version>
<Nullable>enable</Nullable>
Expand Down
2 changes: 1 addition & 1 deletion starsky/starskysynchronizecli/starskysynchronizecli.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<TargetFramework>net8.0</TargetFramework>
<!-- SonarQube needs this -->
<ProjectGuid>{7e1136a7-cc43-49d2-91d3-48e557f0fb66}</ProjectGuid>
<RuntimeFrameworkVersion>8.0.10</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>8.0.11</RuntimeFrameworkVersion>
<RootNamespace>starskysynchronizecli</RootNamespace>
<Version>0.6.2</Version>
<Nullable>enable</Nullable>
Expand Down
10 changes: 5 additions & 5 deletions starsky/starskytest/starskytest.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<RuntimeFrameworkVersion>8.0.10</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>8.0.11</RuntimeFrameworkVersion>
<DebugType>Full</DebugType>
<!-- SonarQube needs this -->
<ProjectGuid>{b3342a3e-64e1-442f-b4f7-f7a718508aac}</ProjectGuid>
Expand All @@ -21,10 +21,10 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"/>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'"/>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.10"/>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.10"/>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1"/>
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.1"/>
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.11" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1"/>
<PackageReference Include="MSTest.TestAdapter" Version="3.6.2"/>
<PackageReference Include="MSTest.TestFramework" Version="3.6.2"/>
Expand Down
2 changes: 1 addition & 1 deletion starsky/starskythumbnailcli/starskythumbnailcli.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<TargetFramework>net8.0</TargetFramework>
<!-- SonarQube needs this -->
<ProjectGuid>{67e3fb34-1ca8-4a28-a0e0-00ff61821002}</ProjectGuid>
<RuntimeFrameworkVersion>8.0.10</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>8.0.11</RuntimeFrameworkVersion>
<RootNamespace>starskythumbnailcli</RootNamespace>
<Version>0.6.2</Version>
<Nullable>enable</Nullable>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<TargetFramework>net8.0</TargetFramework>
<!-- SonarQube needs this -->
<ProjectGuid>{a0cce905-ae43-4d1b-a97a-2bcd2c010ed1}</ProjectGuid>
<RuntimeFrameworkVersion>8.0.10</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>8.0.11</RuntimeFrameworkVersion>
<RootNamespace>starskythumbnailmetacli</RootNamespace>
<Version>0.6.2</Version>
<Nullable>enable</Nullable>
Expand Down
2 changes: 1 addition & 1 deletion starsky/starskywebftpcli/starskywebftpcli.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<ProjectGuid>{eb1d57d1-29d8-4bfb-950e-447ef8522a10}</ProjectGuid>
<RuntimeFrameworkVersion>8.0.10</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>8.0.11</RuntimeFrameworkVersion>
<DebugType>Full</DebugType>
<Version>0.6.2</Version>
<Nullable>enable</Nullable>
Expand Down
2 changes: 1 addition & 1 deletion starsky/starskywebhtmlcli/starskywebhtmlcli.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<ProjectGuid>{76d7bf62-9f1d-48f1-9035-dceb01de55c3}</ProjectGuid>
<RuntimeFrameworkVersion>8.0.10</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>8.0.11</RuntimeFrameworkVersion>
<LangVersion>8.0</LangVersion>
<PreserveCompilationContext>true</PreserveCompilationContext>
<DebugType>Full</DebugType>
Expand Down

0 comments on commit ddb277a

Please sign in to comment.