huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix merge conficts

This commit is contained in:
Isaac Levin 2019-07-02 10:18:29 -04:00
parent 5f50e28bca
commit e0ba612fe4
2 changed files with 791 additions and 929 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1701
src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

19
src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/package.json
View File

@ -21,24 +21,21 @@
"@angular/platform-browser-dynamic": "8.0.0", "@angular/platform-browser-dynamic": "8.0.0",
"@angular/platform-server": "8.0.0", "@angular/platform-server": "8.0.0",
"@angular/router": "8.0.0", "@angular/router": "8.0.0",
"@nguniversal/module-map-ngfactory-loader": "7.1.0", "@nguniversal/module-map-ngfactory-loader": "8.0.0-rc.1",
"core-js": "^2.6.5", "core-js": "^2.6.5",
"rxjs": "^6.4.0", "rxjs": "^6.4.0",
"zone.js": "~0.9.1", "zone.js": "~0.9.1",
"aspnet-prerendering": "^3.0.1", "aspnet-prerendering": "^3.0.1",
"bootstrap": "^4.3.1", "bootstrap": "^4.3.1",
"core-js": "^2.6.5", "jquery": "3.4.1",
"jquery": "3.3.1",
"oidc-client": "^1.8.0", "oidc-client": "^1.8.0",
"popper.js": "^1.14.3", "popper.js": "^1.14.3"
"rxjs": "^6.4.0",
"zone.js": "^0.8.29"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "~0.800.0", "@angular-devkit/build-angular": "^0.800.6",
"@angular/cli": "~8.0.1", "@angular/cli": "8.0.6",
"@angular/compiler-cli": "^8.0.0", "@angular/compiler-cli": "8.0.0",
"@angular/language-service": "^8.0.0", "@angular/language-service": "8.0.0",
"@types/jasmine": "~3.3.9", "@types/jasmine": "~3.3.9",
"@types/jasminewd2": "~2.0.6", "@types/jasminewd2": "~2.0.6",
"@types/node": "~11.10.5", "@types/node": "~11.10.5",
@ -50,7 +47,7 @@
"karma-coverage-istanbul-reporter": "~2.0.5", "karma-coverage-istanbul-reporter": "~2.0.5",
"karma-jasmine": "~2.0.1", "karma-jasmine": "~2.0.1",
"karma-jasmine-html-reporter": "^1.4.0", "karma-jasmine-html-reporter": "^1.4.0",
"typescript": "~3.4.5" "typescript": "3.4.5"
}, },
"optionalDependencies": { "optionalDependencies": {
"node-sass": "^4.9.3", "node-sass": "^4.9.3",