Skip to content

Commit

Permalink
ASP.NET Core 5/ Angular 11 Release
Browse files Browse the repository at this point in the history
  • Loading branch information
emonney committed Apr 15, 2021
1 parent 0a082a3 commit ea5c7d1
Show file tree
Hide file tree
Showing 54 changed files with 6,865 additions and 4,820 deletions.
16 changes: 9 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,12 @@ x64/
x86/
build/
bld/
[Bb]in/
[Oo]bj/
[Ll]og/
bin/
Bin/
obj/
Obj/
log/
Log/

# Visual Studio 2015 cache/options directory
.vs/
Expand Down Expand Up @@ -175,7 +178,7 @@ rcf/
# Microsoft Azure ApplicationInsights config file
ApplicationInsights.config

# Windows Store app package directories and files
# Windows Store app package directory
AppPackages/
BundleArtifacts/
Package.StoreAssociation.xml
Expand All @@ -198,9 +201,7 @@ ClientBin/
*.publishsettings
orleans.codegen.cs

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

# RIA/Silverlight projects
Generated_Code/
Expand Down Expand Up @@ -264,3 +265,4 @@ __pycache__/
*.licenseheader
Thumbs.db
tempkey.rsa
tempkey.jwk
6 changes: 3 additions & 3 deletions DAL/DAL.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

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

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.3" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.4" />
</ItemGroup>

</Project>
17 changes: 17 additions & 0 deletions QuickApp/ClientApp/.browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
# For additional information regarding the format and rule options, please see:
# https://github.com/browserslist/browserslist#queries

# For the full list of supported browsers by the Angular framework, please see:
# https://angular.io/guide/browser-support

# You can see what browsers were selected by your queries by running:
# npx browserslist

last 1 Chrome version
last 1 Firefox version
last 2 Edge major versions
last 2 Safari major versions
last 2 iOS major versions
Firefox ESR
not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.
4 changes: 2 additions & 2 deletions QuickApp/ClientApp/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# QuickApp

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

## Development server

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

## Further help

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).
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.
5 changes: 1 addition & 4 deletions QuickApp/ClientApp/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,13 @@
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"aot": true,
"outputPath": "dist",
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.app.json",
"aot": true,
"progress": false,
"extractCss": true,
"assets": [
"src/assets"
],
Expand All @@ -49,9 +48,7 @@
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
Expand Down
12 changes: 0 additions & 12 deletions QuickApp/ClientApp/browserslist

This file was deleted.

9 changes: 7 additions & 2 deletions QuickApp/ClientApp/e2e/protractor.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// Protractor configuration file, see link for more information
// https://github.com/angular/protractor/blob/master/lib/config.ts

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

/**
* @type { import("protractor").Config }
Expand All @@ -21,6 +21,7 @@ exports.config = {
browserName: 'chrome'
},
directConnect: true,
SELENIUM_PROMISE_MANAGER: false,
baseUrl: 'http://localhost:4200/',
framework: 'jasmine',
jasmineNodeOpts: {
Expand All @@ -32,6 +33,10 @@ exports.config = {
require('ts-node').register({
project: require('path').join(__dirname, './tsconfig.json')
});
jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
jasmine.getEnv().addReporter(new SpecReporter({
spec: {
displayStacktrace: StacktraceOption.PRETTY
}
}));
}
};
6 changes: 3 additions & 3 deletions QuickApp/ClientApp/e2e/src/app.e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ describe('QuickApp App', () => {
page = new AppPage();
});

it('should display application title: QuickApp', () => {
page.navigateTo();
expect(page.getAppTitle()).toEqual('QuickApp');
it('should display application title: QuickApp', async () => {
await page.navigateTo();
expect(await page.getAppTitle()).toEqual('QuickApp');
});
});
8 changes: 4 additions & 4 deletions QuickApp/ClientApp/e2e/src/app.po.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
import { browser, by, element } from 'protractor';

export class AppPage {
navigateTo(): Promise<unknown> {
return browser.get(browser.baseUrl) as Promise<unknown>;
async navigateTo(): Promise<unknown> {
return browser.get(browser.baseUrl);
}

getAppTitle(): Promise<string> {
return element(by.css('app-root .appTitle')).getText() as Promise<string>;
async getAppTitle(): Promise<string> {
return element(by.css('app-root .appTitle')).getText();
}
}
4 changes: 2 additions & 2 deletions QuickApp/ClientApp/e2e/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/e2e",
"module": "commonjs",
"target": "es5",
"target": "es2018",
"types": [
"jasmine",
"jasminewd2",
"node"
]
}
Expand Down
20 changes: 16 additions & 4 deletions QuickApp/ClientApp/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,28 @@ module.exports = function (config) {
require('karma-jasmine'),
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'),
require('karma-coverage'),
require('@angular-devkit/build-angular/plugins/karma')
],
client: {
jasmine: {
// you can add configuration options for Jasmine here
// the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html
// for example, you can disable the random execution with `random: false`
// or set a specific seed with `seed: 4321`
},
clearContext: false // leave Jasmine Spec Runner output visible in browser
},
coverageIstanbulReporter: {
jasmineHtmlReporter: {
suppressAll: true // removes the duplicated traces
},
coverageReporter: {
dir: require('path').join(__dirname, './coverage/quickapp'),
reports: ['html', 'lcovonly', 'text-summary'],
fixWebpackSourcePaths: true
subdir: '.',
reporters: [
{ type: 'html' },
{ type: 'text-summary' }
]
},
reporters: ['progress', 'kjhtml'],
port: 9876,
Expand Down
Loading

0 comments on commit ea5c7d1

Please sign in to comment.