Skip to content

Commit eebd2a8

Browse files
committed
.net5 and angular 11 upgrade
1 parent fcefc09 commit eebd2a8

Some content is hidden

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

49 files changed

+11519
-7977
lines changed

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

Lines changed: 1 addition & 1 deletion
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: "3.1.302" # set this to the dot net version to use
18+
DOTNET_VERSION: "5.0.102" # set this to the dot net version to use
1919

2020
jobs:
2121
build-and-deploy:

.github/workflows/sts-vm.yml

Lines changed: 1 addition & 1 deletion
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: 3.1.100
17+
dotnet-version: 5.0.102
1818
- name: Build
1919
run: dotnet build AspNetCoreSpa.sln --configuration Release
2020
- name: Test

.github/workflows/web-vm.yml

Lines changed: 1 addition & 1 deletion
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: 3.1.100
17+
dotnet-version: 5.0.102
1818
- uses: actions/cache@v1
1919
with:
2020
path: ~/.npm

.idea/.idea.AspNetCoreSpa/.idea/.gitignore

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/.idea.AspNetCoreSpa/.idea/encodings.xml

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/.idea.AspNetCoreSpa/.idea/indexLayout.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/.idea.AspNetCoreSpa/.idea/riderModule.iml

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/.idea.AspNetCoreSpa/.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.vscode/launch.json

Lines changed: 7 additions & 4 deletions
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/netcoreapp3.1/AspNetCoreSpa.Web.dll",
12+
"program": "${workspaceFolder}/src/Presentation/Web/bin/Debug/net5.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/netcoreapp3.1/AspNetCoreSpa.STS.dll",
32+
"program": "${workspaceFolder}/src/Presentation/STS/bin/Debug/net5.0/AspNetCoreSpa.STS.dll",
3333
"args": [],
3434
"cwd": "${workspaceFolder}/src/Presentation/STS",
3535
"stopAtEntry": false,
@@ -48,7 +48,10 @@
4848
"compounds": [
4949
{
5050
"name": "Web/STS",
51-
"configurations": ["Web", "STS"]
51+
"configurations": [
52+
"Web",
53+
"STS"
54+
]
5255
}
5356
]
54-
}
57+
}

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
## Features
88

9-
- [ASP.NET Core 3.1](http://www.dot.net/)
10-
- [Entity Framework Core 3.1](https://docs.efproject.net/en/latest/)
9+
- [ASP.NET Core 5.0](http://www.dot.net/)
10+
- [Entity Framework Core 5.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/)
13-
- [Angular 10](https://angular.io/)
14-
- [Angular CLI 10](https://cli.angular.io/)
13+
- [Angular 11](https://angular.io/)
14+
- [Angular CLI 11](https://cli.angular.io/)
1515
- Secure - with CSP and custom security headers
1616
- [SignalR](https://github.com/aspnet/SignalR/)
1717
- [SASS](http://sass-lang.com/)
@@ -29,10 +29,10 @@
2929

3030
## Pre-requisites
3131

32-
1. [.Net core 3.1 SDK](https://www.microsoft.com/net/core#windows)
32+
1. [.Net 5.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)
35-
4. [Microsoft SQL Server](https://www.microsoft.com/en-us/sql-server/sql-server-2017) (Optional: If MS SQL server required instead of Sqlite during development)
35+
4. [Microsoft SQL Server](https://www.microsoft.com/en-us/sql-server) (Optional: If MS SQL server required instead of Sqlite during development)
3636
5. [Docker](https://www.docker.com/) (Optional: If application will run inside docker container)
3737

3838
## Installation
@@ -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/netcoreapp3.1/publish
210+
- docker build -t aspnetcorespa ./bin/release/net5.0/publish
211211
- heroku login
212212
- heroku container:login
213213
- docker tag aspnetcorespa registry.heroku.com/aspnetcorespa/web

0 commit comments

Comments
 (0)