Skip to content

Commit

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

.NET SDK Upgrade to 8.0.302
  • Loading branch information
qdraw authored Jun 12, 2024
2 parents 9d20255 + 87f84e5 commit 92f86d3
Show file tree
Hide file tree
Showing 27 changed files with 52 additions and 51 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.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
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.300
dotnet-version: 8.0.302

- 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.300
dotnet-version: 8.0.302

- 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.300
dotnet-version: 8.0.302

- 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.300
dotnet-version: 8.0.302

- 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.300
dotnet-version: 8.0.302

- 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.300
dotnet-version: 8.0.302

- name: Cache nuget packages (*nix)
uses: actions/cache@v4
Expand Down
3 changes: 2 additions & 1 deletion history.md
Original file line number Diff line number Diff line change
Expand Up @@ -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}

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,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
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.300",
"version": "8.0.302",
"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.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",
Expand All @@ -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",
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.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
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.5" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="8.0.5" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.6" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="8.0.6" />
<PackageReference Include="AspNetCore.HealthChecks.MySql" Version="8.0.1"/>
<PackageReference Include="AspNetCore.HealthChecks.Sqlite" Version="8.0.1"/>
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.5" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.6" />
</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.5" />
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="8.0.6" />
<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.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.6" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="8.0.5" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="8.0.6" />
<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.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.6" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<!-- 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.5</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>8.0.6</RuntimeFrameworkVersion>
<Description>An attempt to create a database driven photo library</Description>
<!-- use node script to update version -->
<Version>0.6.1</Version>
Expand Down Expand Up @@ -59,7 +59,7 @@
<WarningLevel>0</WarningLevel>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.6" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.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.5</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>8.0.6</RuntimeFrameworkVersion>
<DebugType>Full</DebugType>
<Version>0.6.1</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.5</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>8.0.6</RuntimeFrameworkVersion>
<DebugType>Full</DebugType>
<Version>0.6.1</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.5</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>8.0.6</RuntimeFrameworkVersion>
<DebugType>Full</DebugType>
<Version>0.6.1</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.5</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>8.0.6</RuntimeFrameworkVersion>
<DebugType>Full</DebugType>
<Version>0.6.1</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.5</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>8.0.6</RuntimeFrameworkVersion>
<RootNamespace>starskysynchronizecli</RootNamespace>
<Version>0.6.1</Version>
<Nullable>enable</Nullable>
Expand Down
6 changes: 3 additions & 3 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.5</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>8.0.6</RuntimeFrameworkVersion>
<DebugType>Full</DebugType>
<!-- SonarQube needs this -->
<ProjectGuid>{b3342a3e-64e1-442f-b4f7-f7a718508aac}</ProjectGuid>
Expand All @@ -21,8 +21,8 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"/>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'"/>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0"/>
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.5</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>8.0.6</RuntimeFrameworkVersion>
<RootNamespace>starskythumbnailcli</RootNamespace>
<Version>0.6.1</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.5</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>8.0.6</RuntimeFrameworkVersion>
<RootNamespace>starskythumbnailmetacli</RootNamespace>
<Version>0.6.1</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.5</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>8.0.6</RuntimeFrameworkVersion>
<DebugType>Full</DebugType>
<Version>0.6.1</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.5</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>8.0.6</RuntimeFrameworkVersion>
<LangVersion>8.0</LangVersion>
<PreserveCompilationContext>true</PreserveCompilationContext>
<DebugType>Full</DebugType>
Expand Down

0 comments on commit 92f86d3

Please sign in to comment.