Skip to content

Commit

Permalink
Merge pull request #161 from damienbod/dev_7_0_0
Browse files Browse the repository at this point in the history
Update to Angular 10
damienbod authored Jun 26, 2020
2 parents c49f5c8 + 163b7b3 commit 5f985e4
Showing 6 changed files with 8,317 additions and 6,248 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -5,6 +5,10 @@ For a fresh start, consider running these commands

<a href="https://github.com/damienbod/Angular2WebpackVisualStudio/blob/master/README.md">Readme</a>

<a name="2020-06-26"></a>
# 2020-06-26 Version 7.0.0
* Update to Angular 10.0.0

<a name="2020-05-03"></a>
# 2020-05-03 Version 6.0.2
* Update to Angular 9.1.4
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Version>6.0.1</Version>
<Version>7.0.0</Version>
<TypeScriptToolsVersion>3.7</TypeScriptToolsVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.3" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.5" />
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ import { ThingService } from './services/thing-data.service';
})

export class CoreModule {
static forRoot(): ModuleWithProviders {
static forRoot(): ModuleWithProviders<CoreModule> {
return {
ngModule: CoreModule,
providers: [
14,481 changes: 8,273 additions & 6,208 deletions src/AngularWebpackVisualStudio/package-lock.json

Large diffs are not rendered by default.

66 changes: 33 additions & 33 deletions src/AngularWebpackVisualStudio/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-webpack-visualstudio",
"version": "6.0.1",
"version": "7.0.0",
"description": "An Angular VS template",
"main": "wwwroot/index.html",
"author": "",
@@ -24,31 +24,31 @@
"lint": "eslint . --ext .ts"
},
"dependencies": {
"@angular/animations": "~9.1.4",
"@angular/common": "~9.1.4",
"@angular/compiler": "~9.1.4",
"@angular/core": "~9.1.4",
"@angular/forms": "~9.1.4",
"@angular/platform-browser": "~9.1.4",
"@angular/platform-browser-dynamic": "~9.1.4",
"@angular/router": "~9.1.4",
"@popperjs/core": "^2.4.0",
"bootstrap": "4.4.1",
"@angular/animations": "~10.0.0",
"@angular/common": "~10.0.0",
"@angular/compiler": "~10.0.0",
"@angular/core": "~10.0.0",
"@angular/forms": "~10.0.0",
"@angular/platform-browser": "~10.0.0",
"@angular/platform-browser-dynamic": "~10.0.0",
"@angular/router": "~10.0.0",
"@popperjs/core": "^2.4.2",
"bootstrap": "4.5.0",
"core-js": "^2.6.5",
"ie-shim": "0.1.0",
"rxjs": "~6.5.5",
"rxjs-compat": "^6.5.5",
"zone.js": "~0.10.3"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.901.4",
"@angular/cli": "~9.1.4",
"@angular/compiler-cli": "~9.1.4",
"@angular/language-service": "~9.1.4",
"@ngtools/webpack": "^9.1.4",
"@types/jasmine": "~3.5.10",
"@angular-devkit/build-angular": "^0.1000.0",
"@angular/cli": "~10.0.0",
"@angular/compiler-cli": "~10.0.0",
"@angular/language-service": "~10.0.0",
"@ngtools/webpack": "^10.0.0",
"@types/jasmine": "~3.5.11",
"@types/jasminewd2": "~2.0.8",
"@types/node": "~13.13.4",
"@types/node": "~14.0.14",
"angular-router-loader": "0.8.5",
"angular2-template-loader": "^0.6.2",
"awesome-typescript-loader": "^5.2.1",
@@ -57,40 +57,40 @@
"concurrently": "^5.2.0",
"copy-webpack-plugin": "^5.1.1",
"css-loader": "^3.4.2",
"eslint": "^6.8.0",
"file-loader": "^3.0.1",
"html-webpack-plugin": "^3.2.0",
"eslint": "^7.3.1",
"jasmine-core": "~3.5.0",
"jasmine-spec-reporter": "~5.0.2",
"jquery": "^3.5.0",
"jquery": "^3.5.1",
"json-loader": "^0.5.7",
"karma": "~5.0.4",
"karma": "~5.1.0",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~3.0.0",
"karma-jasmine": "~3.1.1",
"karma-jasmine-html-reporter": "^1.5.3",
"karma-coverage-istanbul-reporter": "~3.0.3",
"karma-jasmine": "~3.3.1",
"karma-jasmine-html-reporter": "^1.5.4",
"karma-sourcemap-loader": "^0.3.7",
"karma-spec-reporter": "^0.0.32",
"karma-webpack": "4.0.2",
"node-sass": "^4.14.0",
"protractor": "~6.0.0",
"raw-loader": "^1.0.0",
"node-sass": "^4.14.1",
"sass-loader": "^8.0.2",
"rimraf": "^3.0.2",
"source-map-loader": "^0.2.4",
"style-loader": "^1.1.3",
"toposort": "2.0.2",
"url-loader": "^1.1.2",
"ts-node": "~8.10.0",
"@typescript-eslint/eslint-plugin-tslint": "^2.30.0",
"@typescript-eslint/eslint-plugin": "^2.30.0",
"@typescript-eslint/parser": "^2.30.0",
"ts-node": "~8.10.2",
"@typescript-eslint/eslint-plugin-tslint": "^3.4.0",
"@typescript-eslint/eslint-plugin": "^3.4.0",
"@typescript-eslint/parser": "^3.4.0",
"uglifyjs-webpack-plugin": "^2.2.0",
"typescript": "~3.8.3",
"typescript": "~3.9.5",
"webpack": "^4.43.0",
"webpack-bundle-analyzer": "^3.7.0",
"webpack-cli": "3.3.11",
"webpack-dev-server": "^3.10.3",
"webpack-bundle-analyzer": "^3.8.0",
"webpack-cli": "3.3.12",
"webpack-dev-server": "^3.11.0",
"webpack-filter-warnings-plugin": "^1.2.1"
},
"-vs-binding": {
Original file line number Diff line number Diff line change
@@ -5,15 +5,15 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.3" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.3" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.3" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.5" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.5" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.5" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
<PackageReference Include="xunit.runner.console" Version="2.4.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>

0 comments on commit 5f985e4

Please sign in to comment.