Skip to content

Commit edbc191

Browse files
codebytescodebytes
authored
Merge pull request #178 from Codebytes/net6.0
upgrade to .net 6.0
2 parents 1833bde + 786e364 commit edbc191

11 files changed

Lines changed: 29 additions & 33 deletions

File tree

‎.github/workflows/aspnetcore.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: Setup .NET Core
1313
uses: actions/setup-dotnet@v1
1414
with:
15-
dotnet-version: '5.0.x'
15+
dotnet-version: '6.0.x'
1616
- name: Install dependencies
1717
run: dotnet restore
1818
- name: Build

‎.github/workflows/linter.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
---
2-
###########################
3-
###########################
4-
## Linter GitHub Actions ##
5-
###########################
6-
###########################
2+
#################################
3+
#################################
4+
## Super Linter GitHub Actions ##
5+
#################################
6+
#################################
77
name: Lint Code Base
88

99
#
1010
# Documentation:
11-
# https://help.github.com/en/articles/workflow-syntax-for-github-actions
11+
# https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions
1212
#
1313

1414
#############################
1515
# Start the job on all push #
1616
#############################
1717
on:
1818
push:
19-
branches-ignore: [master]
19+
branches-ignore: [master, main]
2020
# Remove the line above to run when pushing to master
2121
pull_request:
22-
branches: [master]
22+
branches: [master, main]
2323

2424
###############
2525
# Set the Job #
@@ -48,8 +48,8 @@ jobs:
4848
# Run Linter against code base #
4949
################################
5050
- name: Lint Code Base
51-
uses: github/super-linter@v3
51+
uses: github/super-linter@v4
5252
env:
5353
VALIDATE_ALL_CODEBASE: false
5454
DEFAULT_BRANCH: master
55-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
55+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.upgrade-assistant‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎DIDemo.Services.Tests/.upgrade-assistant‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎DIDemo.Services.Tests/DIDemo.Services.Tests.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net5.0</TargetFramework>
3+
<TargetFramework>net6.0</TargetFramework>
44
<IsPackable>false</IsPackable>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
8-
<PackageReference Include="MSTest.TestAdapter" Version="2.2.7" />
9-
<PackageReference Include="MSTest.TestFramework" Version="2.2.7" />
7+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
8+
<PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
9+
<PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
1010
</ItemGroup>
1111
<ItemGroup>
1212
<ProjectReference Include="..\DIDemoServices\DIDemoServices.csproj" />

‎DIDemo.Tests/.upgrade-assistant‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎DIDemo.Tests/DIDemo.Tests.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net5.0</TargetFramework>
3+
<TargetFramework>net6.0</TargetFramework>
44
<IsPackable>false</IsPackable>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
8-
<PackageReference Include="MSTest.TestAdapter" Version="2.2.7" />
9-
<PackageReference Include="MSTest.TestFramework" Version="2.2.7" />
7+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
8+
<PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
9+
<PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
1010
</ItemGroup>
1111
<ItemGroup>
1212
<ProjectReference Include="..\DIDemo\DIDemo.csproj" />

‎DIDemo/DIDemo.csproj‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>net5.0</TargetFramework>
3+
<TargetFramework>net6.0</TargetFramework>
44
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
55
<IncludeOpenAPIAnalyzers>true</IncludeOpenAPIAnalyzers>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.11" />
9-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.11">
8+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.1" />
9+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.1">
1010
<PrivateAssets>all</PrivateAssets>
1111
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1212
</PackageReference>
13-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
14-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.2" />
15-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.11" />
13+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
14+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
15+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.1" />
16+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.1" />
1617
</ItemGroup>
1718
<ItemGroup>
1819
<ProjectReference Include="..\DIDemoServices\DIDemoServices.csproj" />

‎DIDemo/Startup.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ public void ConfigureServices(IServiceCollection services)
5656
services.AddSingleton<IOperationServiceSingleton, OperationService>();
5757

5858
services.AddMvc()
59-
.SetCompatibilityVersion(CompatibilityVersion.Version_3_0)
6059
.AddNewtonsoftJson();
6160
}
6261

@@ -82,7 +81,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
8281
{
8382
endpoints.MapControllerRoute("default", "{controller=Home}/{action=Index}/{id?}");
8483
endpoints.MapRazorPages();
85-
});
84+
});
8685
}
8786
}
8887
}

‎DIDemoServices/.upgrade-assistant‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)