Merge pull request #161 from damienbod/dev_7_0_0

Update to Angular 10
damienbod · Jun 26, 2020 · 5f985e4 · 5f985e4
2 parents c49f5c8 + 163b7b3
commit 5f985e4
Show file tree

Hide file tree

Showing 6 changed files with 8,317 additions and 6,248 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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

diff --git a/src/AngularWebpackVisualStudio/AngularWebpackVisualStudio.csproj b/src/AngularWebpackVisualStudio/AngularWebpackVisualStudio.csproj
@@ -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" />

diff --git a/src/AngularWebpackVisualStudio/angularApp/app/core/core.module.ts b/src/AngularWebpackVisualStudio/angularApp/app/core/core.module.ts
@@ -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: [