Skip to content

Commit

Permalink
Merge pull request #1237 from qdraw/feature/auto_dotnet_sdk_version_u…
Browse files Browse the repository at this point in the history
…pgrade_6.0.414

.NET SDK Upgrade to 6.0.414
  • Loading branch information
qdraw authored Sep 26, 2023
2 parents 910dc43 + 16d41a5 commit ba18b71
Show file tree
Hide file tree
Showing 26 changed files with 51 additions and 50 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/auto-update-swagger-dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.413
dotnet-version: 6.0.414

- name: Cache nuget packages (*nix)
uses: actions/cache@v3
Expand Down
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@v3
with:
dotnet-version: 6.0.413
dotnet-version: 6.0.414

- name: Build --no-unit-test linux-arm,linux-arm64,win-x64,osx-x64,linux-x64
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/starsky-codecov-clientapp-netcore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.413
dotnet-version: 6.0.414

- name: Cache node modules clientapp (*nix)
uses: actions/cache@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/starsky-dotnetcore-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.413
dotnet-version: 6.0.414

- name: Cache nuget packages (*nix)
uses: actions/cache@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/starsky-dotnetcore-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.413
dotnet-version: 6.0.414

- name: Build (Windows)
shell: pwsh
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/starsky-sonarqube-clientapp-netcore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- name: Setup .NET SDK
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.413
dotnet-version: 6.0.414

- name: Use Java 17
uses: actions/setup-java@v3
Expand Down
3 changes: 2 additions & 1 deletion history.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ Semantic Versioning 2.0.0 is from version 0.1.6+

## version 0.5.11 _(Unreleased)_ - 2023-07-?? {#v0.5.10}

- [x] (Changed) _Back-end_ Upgrade to .NET 6 - SDK 6.0.413 (Runtime: 6.0.17 (PR #1205)
- [x] (Changed) _Back-end_ Upgrade to .NET 6 - SDK 6.0.413 (Runtime: 6.0.17) (PR #1205)
- [x] (Changed) _Back-end_ Upgrade to .NET 6 - SDK 6.0.414 (Runtime: 6.0.18) (PR #1237)

## version 0.5.10 - 2023-07-27 {#v0.5.10}

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 Core sdk 6.0.413'
displayName: 'Use .NET Core sdk 6.0.414'
enabled: true
inputs:
packageType: sdk
version: 6.0.413
version: 6.0.414
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": "6.0.413",
"version": "6.0.414",
"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,31 +1,31 @@
[
"Microsoft.AspNetCore.Mvc.NewtonsoftJson 6.0.21",
"Microsoft.AspNetCore.Mvc.NewtonsoftJson 6.0.22",
"Microsoft.Extensions.Hosting.WindowsServices 6.0.2",
"SQLitePCLRaw.lib.e_sqlite3.linux 1.1.14",
"Swashbuckle.AspNetCore 6.5.0",
"Microsoft.Extensions.Caching.Abstractions 6.0.0",
"Microsoft.Extensions.Caching.Memory 6.0.1",
"Microsoft.Extensions.Hosting.Abstractions 6.0.0",
"NGeoNames 1.5.1",
"Microsoft.Extensions.Diagnostics.HealthChecks 6.0.21",
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions 6.0.21",
"Microsoft.Extensions.Diagnostics.HealthChecks 6.0.22",
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions 6.0.22",
"AspNetCore.HealthChecks.MySql 6.0.2",
"AspNetCore.HealthChecks.Sqlite 6.0.2",
"Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore 6.0.21",
"Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore 6.0.22",
"MedallionShell 1.6.2",
"RazorLight 2.3.1",
"SixLabors.ImageSharp 3.0.1",
"SixLabors.ImageSharp.Drawing 1.0.0",
"Microsoft.AspNetCore.Authorization 6.0.21",
"Microsoft.AspNetCore.Authorization 6.0.22",
"Microsoft.ApplicationInsights.WorkerService 2.21.0",
"Microsoft.Extensions.DependencyInjection.Abstractions 6.0.0",
"Microsoft.EntityFrameworkCore.Analyzers 6.0.21",
"Microsoft.EntityFrameworkCore.Design 6.0.21",
"Microsoft.EntityFrameworkCore.InMemory 6.0.21",
"Microsoft.EntityFrameworkCore.Sqlite 6.0.21",
"Microsoft.EntityFrameworkCore 6.0.21",
"Microsoft.EntityFrameworkCore.Relational 6.0.21",
"Microsoft.Extensions.Identity.Stores 6.0.21",
"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",
"Pomelo.EntityFrameworkCore.MySql 6.0.2",
"System.ComponentModel.Annotations 5.0.0",
"Microsoft.ApplicationInsights 2.21.0",
Expand All @@ -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.21",
"Microsoft.AspNetCore.Identity.EntityFrameworkCore 6.0.22",
"Microsoft.Extensions.Hosting 6.0.1",
"Microsoft.NET.Test.Sdk 17.7.0",
"MSTest.TestAdapter 3.1.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` 6.0.413 SDK. To get the 'Build apps - SDK' .NET Core from https://www.microsoft.com/net/download
2. Get the `dotnet` 6.0.414 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
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 @@ -13,11 +13,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.21" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="6.0.21" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.22" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="6.0.22" />
<PackageReference Include="AspNetCore.HealthChecks.MySql" Version="6.0.2" />
<PackageReference Include="AspNetCore.HealthChecks.Sqlite" Version="6.0.2" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="6.0.21" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="6.0.22" />
</ItemGroup>

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

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="6.0.21" />
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="6.0.22" />
<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 @@ -11,13 +11,13 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="6.0.21" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.21" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.21" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.21" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.21" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.21" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="6.0.21" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="6.0.22" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.22" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.22" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.22" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.22" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.22" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="6.0.22" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.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 @@ -12,7 +12,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.21.0" />
<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.21.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.21" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.22" />
</ItemGroup>

<ItemGroup>
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>net6.0</TargetFramework>
<RuntimeFrameworkVersion>6.0.21</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>6.0.22</RuntimeFrameworkVersion>
<Description>An attempt to create a database driven photo library</Description>
<!-- use node script to update version -->
<Version>0.5.10</Version>
Expand Down Expand Up @@ -54,7 +54,7 @@
<WarningLevel>0</WarningLevel>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.21" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.22" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.2" />
<PackageReference Include="SQLitePCLRaw.lib.e_sqlite3.linux" Version="1.1.14" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
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>net6.0</TargetFramework>
<!-- SonarQube needs this -->
<ProjectGuid>{dcf1f6cb-1c65-4394-bef7-cccc2967b56c}</ProjectGuid>
<RuntimeFrameworkVersion>6.0.21</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>6.0.22</RuntimeFrameworkVersion>
<DebugType>Full</DebugType>
<Version>0.5.10</Version>
</PropertyGroup>
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>6.0.21</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>6.0.22</RuntimeFrameworkVersion>
<DebugType>Full</DebugType>
<Version>0.5.10</Version>
</PropertyGroup>
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>6.0.21</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>6.0.22</RuntimeFrameworkVersion>
<DebugType>Full</DebugType>
<Version>0.5.10</Version>
</PropertyGroup>
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>net6.0</TargetFramework>
<!-- SonarQube needs this -->
<ProjectGuid>{23e4ea86-970a-4de1-badc-8d7e9d3d4dd6}</ProjectGuid>
<RuntimeFrameworkVersion>6.0.21</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>6.0.22</RuntimeFrameworkVersion>
<DebugType>Full</DebugType>
<Version>0.5.10</Version>
</PropertyGroup>
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>net6.0</TargetFramework>
<!-- SonarQube needs this -->
<ProjectGuid>{7e1136a7-cc43-49d2-91d3-48e557f0fb66}</ProjectGuid>
<RuntimeFrameworkVersion>6.0.21</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>6.0.22</RuntimeFrameworkVersion>
<RootNamespace>starskysynchronizecli</RootNamespace>
<Version>0.5.10</Version>
</PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions starsky/starskytest/starskytest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<!-- Condition=" '$(TargetFramework)' == 'netcoreapp3.1' " -->
<RuntimeFrameworkVersion>6.0.21</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>6.0.22</RuntimeFrameworkVersion>
<DebugType>Full</DebugType>
<!-- SonarQube needs this -->
<ProjectGuid>{b3342a3e-64e1-442f-b4f7-f7a718508aac}</ProjectGuid>
Expand All @@ -21,8 +21,8 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
<ItemGroup>
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.21.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.21" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.21" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.22" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.22" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.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>net6.0</TargetFramework>
<!-- SonarQube needs this -->
<ProjectGuid>{67e3fb34-1ca8-4a28-a0e0-00ff61821002}</ProjectGuid>
<RuntimeFrameworkVersion>6.0.21</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>6.0.22</RuntimeFrameworkVersion>
<RootNamespace>starskythumbnailcli</RootNamespace>
<Version>0.5.10</Version>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<TargetFramework>net6.0</TargetFramework>
<!-- SonarQube needs this -->
<ProjectGuid>{a0cce905-ae43-4d1b-a97a-2bcd2c010ed1}</ProjectGuid>
<RuntimeFrameworkVersion>6.0.21</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>6.0.22</RuntimeFrameworkVersion>
<RootNamespace>starskythumbnailmetacli</RootNamespace>
<Version>0.5.10</Version>
</PropertyGroup>
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>net6.0</TargetFramework>
<ProjectGuid>{eb1d57d1-29d8-4bfb-950e-447ef8522a10}</ProjectGuid>
<RuntimeFrameworkVersion>6.0.21</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>6.0.22</RuntimeFrameworkVersion>
<DebugType>Full</DebugType>
<Version>0.5.10</Version>
</PropertyGroup>
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>net6.0</TargetFramework>
<ProjectGuid>{76d7bf62-9f1d-48f1-9035-dceb01de55c3}</ProjectGuid>
<RuntimeFrameworkVersion>6.0.21</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>6.0.22</RuntimeFrameworkVersion>
<LangVersion>8.0</LangVersion>
<PreserveCompilationContext>true</PreserveCompilationContext>
<DebugType>Full</DebugType>
Expand Down

0 comments on commit ba18b71

Please sign in to comment.