Skip to content

Commit a6ce6e1

Browse files
committed
upgraded to .net 6
1 parent 6cb0791 commit a6ce6e1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1305
-3265
lines changed

.github/workflows/sts-azure-app.yml_distabled

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515
env:
1616
AZURE_WEBAPP_NAME: aspnetcorests # set this to your application's name
1717
AZURE_WEBAPP_PACKAGE_PATH: "." # set this to the path to your web app project, defaults to the repository root
18-
DOTNET_VERSION: "5.0.102" # set this to the dot net version to use
18+
DOTNET_VERSION: "6.0.100" # set this to the dot net version to use
1919

2020
jobs:
2121
build-and-deploy:

.github/workflows/sts-vm.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Setup .NET Core
1515
uses: actions/setup-dotnet@v1
1616
with:
17-
dotnet-version: 5.0.102
17+
dotnet-version: 6.0.100
1818
- name: Build
1919
run: dotnet build AspNetCoreSpa.sln --configuration Release
2020
- name: Test

.github/workflows/web-vm.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Setup .NET Core
1515
uses: actions/setup-dotnet@v1
1616
with:
17-
dotnet-version: 5.0.102
17+
dotnet-version: 6.0.100
1818
- uses: actions/cache@v1
1919
with:
2020
path: ~/.npm

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ ClientBin/
181181
~$*
182182
*~
183183
*.db
184+
*.db*
184185
*.dbmdl
185186
*.dbproj.schemaview
186187
*.pfx

.vscode/launch.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"type": "coreclr",
1010
"request": "launch",
1111
"preLaunchTask": "build",
12-
"program": "${workspaceFolder}/src/Presentation/Web/bin/Debug/net5.0/AspNetCoreSpa.Web.dll",
12+
"program": "${workspaceFolder}/src/Presentation/Web/bin/Debug/net6.0/AspNetCoreSpa.Web.dll",
1313
"args": [],
1414
"cwd": "${workspaceFolder}/src/Presentation/Web",
1515
"stopAtEntry": false,
@@ -29,7 +29,7 @@
2929
"type": "coreclr",
3030
"request": "launch",
3131
"preLaunchTask": "buildsts",
32-
"program": "${workspaceFolder}/src/Presentation/STS/bin/Debug/net5.0/AspNetCoreSpa.STS.dll",
32+
"program": "${workspaceFolder}/src/Presentation/STS/bin/Debug/net6.0/AspNetCoreSpa.STS.dll",
3333
"args": [],
3434
"cwd": "${workspaceFolder}/src/Presentation/STS",
3535
"stopAtEntry": false,

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
## Features
88

9-
- [ASP.NET Core 5.0](http://www.dot.net/)
10-
- [Entity Framework Core 5.0](https://docs.efproject.net/en/latest/)
9+
- [ASP.NET Core 6.0](http://www.dot.net/)
10+
- [Entity Framework Core 6.0](https://docs.efproject.net/en/latest/)
1111
- Both Sql Server and Sql lite databases are supported (Check installation instrcutions for more details)
1212
- [Identity Server 4](http://identityserver.io/)
1313
- [Angular 11](https://angular.io/)
@@ -29,7 +29,7 @@
2929

3030
## Pre-requisites
3131

32-
1. [.Net 5.0 SDK](https://www.microsoft.com/net/core#windows)
32+
1. [.Net 6.0 SDK](https://www.microsoft.com/net/core#windows)
3333
2. [Visual studio 2019](https://www.visualstudio.com/) OR [VSCode](https://code.visualstudio.com/) with [C#](https://marketplace.visualstudio.com/items?itemName=ms-vscode.csharp) extension
3434
3. [NodeJs](https://nodejs.org/en/) (Latest LTS)
3535
4. [Microsoft SQL Server](https://www.microsoft.com/en-us/sql-server) (Optional: If MS SQL server required instead of Sqlite during development)
@@ -207,7 +207,7 @@ From powershell:
207207
### Replace your app name where it is `aspnetcorespa`
208208

209209
- dotnet publish -c release
210-
- docker build -t aspnetcorespa ./bin/release/net5.0/publish
210+
- docker build -t aspnetcorespa ./bin/release/net6.0/publish
211211
- heroku login
212212
- heroku container:login
213213
- docker tag aspnetcorespa registry.heroku.com/aspnetcorespa/web

azure-pipelines.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ steps:
1919
displayName: Install Nuget
2020

2121
- task: UseDotNet@2
22-
displayName: Install 5.0.x
22+
displayName: Install 6.0.x
2323
inputs:
24-
version: "5.0.x"
24+
version: "6.0.x"
2525

2626
- task: NuGetCommand@2
2727
displayName: Restore

src/Core/Application/Application.csproj

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<RootNamespace>AspNetCoreSpa.Application</RootNamespace>
66
<AssemblyName>AspNetCoreSpa.Application</AssemblyName>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
11-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="5.0.0" />
12-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
13-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.11" />
14-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
15-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="5.0.0" />
10+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
11+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.0" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
14+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
15+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
1616
<PackageReference Include="AutoMapper" Version="10.1.1" />
1717
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
1818
<PackageReference Include="FluentValidation" Version="10.3.4" />

src/Core/Common/Common.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<RootNamespace>AspNetCoreSpa.Common</RootNamespace>
66
<AssemblyName>AspNetCoreSpa.Common</AssemblyName>
77
</PropertyGroup>

src/Core/Domain/Domain.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<RootNamespace>AspNetCoreSpa.Domain</RootNamespace>
66
<AssemblyName>AspNetCoreSpa.Domain</AssemblyName>
77
</PropertyGroup>

0 commit comments

Comments
 (0)