Skip to content

Commit ea5c7d1

Browse files
committed
ASP.NET Core 5/ Angular 11 Release
1 parent 0a082a3 commit ea5c7d1

Some content is hidden

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

54 files changed

+6865
-4820
lines changed

.gitignore

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,12 @@ x64/
2222
x86/
2323
build/
2424
bld/
25-
[Bb]in/
26-
[Oo]bj/
27-
[Ll]og/
25+
bin/
26+
Bin/
27+
obj/
28+
Obj/
29+
log/
30+
Log/
2831

2932
# Visual Studio 2015 cache/options directory
3033
.vs/
@@ -175,7 +178,7 @@ rcf/
175178
# Microsoft Azure ApplicationInsights config file
176179
ApplicationInsights.config
177180

178-
# Windows Store app package directories and files
181+
# Windows Store app package directory
179182
AppPackages/
180183
BundleArtifacts/
181184
Package.StoreAssociation.xml
@@ -198,9 +201,7 @@ ClientBin/
198201
*.publishsettings
199202
orleans.codegen.cs
200203

201-
# Since there are multiple workflows, uncomment next line to ignore bower_components
202-
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
203-
#bower_components/
204+
/node_modules
204205

205206
# RIA/Silverlight projects
206207
Generated_Code/
@@ -264,3 +265,4 @@ __pycache__/
264265
*.licenseheader
265266
Thumbs.db
266267
tempkey.rsa
268+
tempkey.jwk

DAL/DAL.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
5-
<Version>4.0.0</Version>
4+
<TargetFramework>net5.0</TargetFramework>
5+
<Version>5.0.0</Version>
66
<Description>Data Access Layer for the Quick Application template</Description>
77
<Copyright>Copyright © 2019 www.ebenmonney.com</Copyright>
88
<PackageProjectUrl>https://www.ebenmonney.com/quickapp</PackageProjectUrl>
@@ -11,7 +11,7 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
14-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.3" />
14+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.4" />
1515
</ItemGroup>
1616

1717
</Project>

QuickApp/ClientApp/.browserslistrc

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
2+
# For additional information regarding the format and rule options, please see:
3+
# https://github.com/browserslist/browserslist#queries
4+
5+
# For the full list of supported browsers by the Angular framework, please see:
6+
# https://angular.io/guide/browser-support
7+
8+
# You can see what browsers were selected by your queries by running:
9+
# npx browserslist
10+
11+
last 1 Chrome version
12+
last 1 Firefox version
13+
last 2 Edge major versions
14+
last 2 Safari major versions
15+
last 2 iOS major versions
16+
Firefox ESR
17+
not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.

QuickApp/ClientApp/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# QuickApp
22

3-
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 9.1.4.
3+
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 11.2.8.
44

55
## Development server
66

@@ -24,4 +24,4 @@ Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protrac
2424

2525
## Further help
2626

27-
To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
27+
To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.io/cli) page.

QuickApp/ClientApp/angular.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,13 @@
1717
"build": {
1818
"builder": "@angular-devkit/build-angular:browser",
1919
"options": {
20-
"aot": true,
2120
"outputPath": "dist",
2221
"index": "src/index.html",
2322
"main": "src/main.ts",
2423
"polyfills": "src/polyfills.ts",
2524
"tsConfig": "tsconfig.app.json",
25+
"aot": true,
2626
"progress": false,
27-
"extractCss": true,
2827
"assets": [
2928
"src/assets"
3029
],
@@ -49,9 +48,7 @@
4948
"optimization": true,
5049
"outputHashing": "all",
5150
"sourceMap": false,
52-
"extractCss": true,
5351
"namedChunks": false,
54-
"aot": true,
5552
"extractLicenses": true,
5653
"vendorChunk": false,
5754
"buildOptimizer": true,

QuickApp/ClientApp/browserslist

Lines changed: 0 additions & 12 deletions
This file was deleted.

QuickApp/ClientApp/e2e/protractor.conf.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// Protractor configuration file, see link for more information
88
// https://github.com/angular/protractor/blob/master/lib/config.ts
99

10-
const { SpecReporter } = require('jasmine-spec-reporter');
10+
const { SpecReporter, StacktraceOption } = require('jasmine-spec-reporter');
1111

1212
/**
1313
* @type { import("protractor").Config }
@@ -21,6 +21,7 @@ exports.config = {
2121
browserName: 'chrome'
2222
},
2323
directConnect: true,
24+
SELENIUM_PROMISE_MANAGER: false,
2425
baseUrl: 'http://localhost:4200/',
2526
framework: 'jasmine',
2627
jasmineNodeOpts: {
@@ -32,6 +33,10 @@ exports.config = {
3233
require('ts-node').register({
3334
project: require('path').join(__dirname, './tsconfig.json')
3435
});
35-
jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
36+
jasmine.getEnv().addReporter(new SpecReporter({
37+
spec: {
38+
displayStacktrace: StacktraceOption.PRETTY
39+
}
40+
}));
3641
}
3742
};

QuickApp/ClientApp/e2e/src/app.e2e-spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ describe('QuickApp App', () => {
1212
page = new AppPage();
1313
});
1414

15-
it('should display application title: QuickApp', () => {
16-
page.navigateTo();
17-
expect(page.getAppTitle()).toEqual('QuickApp');
15+
it('should display application title: QuickApp', async () => {
16+
await page.navigateTo();
17+
expect(await page.getAppTitle()).toEqual('QuickApp');
1818
});
1919
});

QuickApp/ClientApp/e2e/src/app.po.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
import { browser, by, element } from 'protractor';
77

88
export class AppPage {
9-
navigateTo(): Promise<unknown> {
10-
return browser.get(browser.baseUrl) as Promise<unknown>;
9+
async navigateTo(): Promise<unknown> {
10+
return browser.get(browser.baseUrl);
1111
}
1212

13-
getAppTitle(): Promise<string> {
14-
return element(by.css('app-root .appTitle')).getText() as Promise<string>;
13+
async getAppTitle(): Promise<string> {
14+
return element(by.css('app-root .appTitle')).getText();
1515
}
1616
}

QuickApp/ClientApp/e2e/tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1+
/* To learn more about this file see: https://angular.io/config/tsconfig. */
12
{
23
"extends": "../tsconfig.json",
34
"compilerOptions": {
45
"outDir": "../out-tsc/e2e",
56
"module": "commonjs",
6-
"target": "es5",
7+
"target": "es2018",
78
"types": [
89
"jasmine",
9-
"jasminewd2",
1010
"node"
1111
]
1212
}

0 commit comments

Comments
 (0)