Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

.NET SDK Upgrade to 6.0.412 #1193

Merged
merged 2 commits into from
Jul 20, 2023
Merged

.NET SDK Upgrade to 6.0.412 #1193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2481c9f
Auto .NET SDK version Upgrade to 6.0.412
qdraw Jul 13, 2023
6f78bf3
[Automated] Merged master into target feature/auto_dotnet_sdk_version…
qdraw Jul 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/auto-update-swagger-dotnet.yml
View file
Open in desktop
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.410
dotnet-version: 6.0.412

- name: Cache nuget packages (*nix)
uses: actions/cache@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-on-tag-netcore-desktop-electron.yml
View file
Open in desktop
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.410
dotnet-version: 6.0.412

- 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
View file
Open in desktop
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.410
dotnet-version: 6.0.412

- name: Cache node modules clientapp (*nix)
uses: actions/cache@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/starsky-dotnetcore-ubuntu.yml
View file
Open in desktop
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.410
dotnet-version: 6.0.412

- name: Cache nuget packages (*nix)
uses: actions/cache@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/starsky-dotnetcore-windows.yml
View file
Open in desktop
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.410
dotnet-version: 6.0.412

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

- name: Use Java 11
uses: actions/setup-java@v3
Expand Down
4 changes: 2 additions & 2 deletions pipelines/azure/steps/use_dotnet_version.yml
View file
Open in desktop
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.410'
displayName: 'Use .NET Core sdk 6.0.412'
enabled: true
inputs:
packageType: sdk
version: 6.0.410
version: 6.0.412
installationPath: $(Agent.ToolsDirectory)/dotnet
2 changes: 1 addition & 1 deletion starsky/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"strictVersion": true,
"sdk": {
"version": "6.0.410",
"version": "6.0.412",
"rollForward": "disable",
"allowPrerelease": false
}
Expand Down
26 changes: 13 additions & 13 deletions starsky/nuget-packages-list.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
[
"Microsoft.AspNetCore.Mvc.NewtonsoftJson 6.0.18",
"Microsoft.AspNetCore.Mvc.NewtonsoftJson 6.0.20",
"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.18",
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions 6.0.18",
"Microsoft.Extensions.Diagnostics.HealthChecks 6.0.20",
"Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions 6.0.20",
"AspNetCore.HealthChecks.MySql 6.0.2",
"AspNetCore.HealthChecks.Sqlite 6.0.2",
"Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore 6.0.18",
"Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore 6.0.20",
"MedallionShell 1.6.2",
"RazorLight 2.3.1",
"SixLabors.ImageSharp 3.0.1",
"SixLabors.ImageSharp.Drawing 1.0.0-beta15",
"Microsoft.AspNetCore.Authorization 6.0.18",
"Microsoft.AspNetCore.Authorization 6.0.20",
"Microsoft.ApplicationInsights.WorkerService 2.21.0",
"Microsoft.Extensions.DependencyInjection.Abstractions 6.0.0",
"Microsoft.EntityFrameworkCore.Analyzers 6.0.18",
"Microsoft.EntityFrameworkCore.Design 6.0.18",
"Microsoft.EntityFrameworkCore.InMemory 6.0.18",
"Microsoft.EntityFrameworkCore.Sqlite 6.0.18",
"Microsoft.EntityFrameworkCore 6.0.18",
"Microsoft.EntityFrameworkCore.Relational 6.0.18",
"Microsoft.Extensions.Identity.Stores 6.0.18",
"Microsoft.EntityFrameworkCore.Analyzers 6.0.20",
"Microsoft.EntityFrameworkCore.Design 6.0.20",
"Microsoft.EntityFrameworkCore.InMemory 6.0.20",
"Microsoft.EntityFrameworkCore.Sqlite 6.0.20",
"Microsoft.EntityFrameworkCore 6.0.20",
"Microsoft.EntityFrameworkCore.Relational 6.0.20",
"Microsoft.Extensions.Identity.Stores 6.0.20",
"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.18",
"Microsoft.AspNetCore.Identity.EntityFrameworkCore 6.0.20",
"Microsoft.Extensions.Hosting 6.0.1",
"Microsoft.NET.Test.Sdk 17.4.1",
"MSTest.TestAdapter 3.0.2",
Expand Down
6 changes: 3 additions & 3 deletions starsky/starsky.feature.health/starsky.feature.health.csproj
View file
Open in desktop
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.18" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="6.0.18" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.20" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="6.0.20" />
<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.18" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="6.0.20" />
</ItemGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion starsky/starsky.foundation.accountmanagement/starsky.foundation.accountmanagement.csproj
View file
Open in desktop
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.18" />
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="6.0.20" />
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<!-- instead of : Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0, -->
<!-- Microsoft.AspNetCore.Authentication-->
Expand Down
14 changes: 7 additions & 7 deletions starsky/starsky.foundation.database/starsky.foundation.database.csproj
View file
Open in desktop
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.18" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.18" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.18" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.18" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.18" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.18" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="6.0.18" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="6.0.20" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.20" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.20" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.20" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.20" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.20" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="6.0.20" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.2" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion starsky/starsky.foundation.databasetelemetry/starsky.foundation.databasetelemetry.csproj
View file
Open in desktop
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.18" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.20" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions starsky/starsky/starsky.csproj
View file
Open in desktop
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.18</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>6.0.20</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.18" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.20" />
<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
View file
Open in desktop
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.18</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>6.0.20</RuntimeFrameworkVersion>
<DebugType>Full</DebugType>
<Version>0.5.10</Version>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion starsky/starskydemoseedcli/starskydemoseedcli.csproj
View file
Open in desktop
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.18</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>6.0.20</RuntimeFrameworkVersion>
<DebugType>Full</DebugType>
<Version>0.5.10</Version>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion starsky/starskygeocli/starskygeocli.csproj
View file
Open in desktop
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.18</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>6.0.20</RuntimeFrameworkVersion>
<DebugType>Full</DebugType>
<Version>0.5.10</Version>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion starsky/starskyimportercli/starskyimportercli.csproj
View file
Open in desktop
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.18</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>6.0.20</RuntimeFrameworkVersion>
<DebugType>Full</DebugType>
<Version>0.5.10</Version>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion starsky/starskysynchronizecli/starskysynchronizecli.csproj
View file
Open in desktop
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.18</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>6.0.20</RuntimeFrameworkVersion>
<RootNamespace>starskysynchronizecli</RootNamespace>
<Version>0.5.10</Version>
</PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions starsky/starskytest/starskytest.csproj
View file
Open in desktop
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.18</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>6.0.20</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.18" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.18" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.20" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.20" />
<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.4.1" />
Expand Down
2 changes: 1 addition & 1 deletion starsky/starskythumbnailcli/starskythumbnailcli.csproj
View file
Open in desktop
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.18</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>6.0.20</RuntimeFrameworkVersion>
<RootNamespace>starskythumbnailcli</RootNamespace>
<Version>0.5.10</Version>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion starsky/starskythumbnailmetacli/starskythumbnailmetacli.csproj
View file
Open in desktop
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.18</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>6.0.20</RuntimeFrameworkVersion>
<RootNamespace>starskythumbnailmetacli</RootNamespace>
<Version>0.5.10</Version>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion starsky/starskywebftpcli/starskywebftpcli.csproj
View file
Open in desktop
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.18</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>6.0.20</RuntimeFrameworkVersion>
<DebugType>Full</DebugType>
<Version>0.5.10</Version>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion starsky/starskywebhtmlcli/starskywebhtmlcli.csproj
View file
Open in desktop
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.18</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>6.0.20</RuntimeFrameworkVersion>
<LangVersion>8.0</LangVersion>
<PreserveCompilationContext>true</PreserveCompilationContext>
<DebugType>Full</DebugType>
Expand Down
Loading