update to Typescript 3.9

signumsoftware · May 17, 2020 · a244722 · a244722
1 parent 1453912
commit a244722
Show file tree

Hide file tree

Showing 13 changed files with 281 additions and 207 deletions.
diff --git a/Extensions b/Extensions
diff --git a/Framework b/Framework
diff --git a/Modules.xml b/Modules.xml
@@ -93,7 +93,7 @@
 
     <Module Name="Chart" DependsOn="Files">
       <RemoveLine Path="Southwind.Logic\Starter.cs" Line="sb.Schema.Settings.FieldAttributes((UserChartEntity uc) => uc.Owner).Replace(new ImplementedByAttribute(typeof(UserEntity), typeof(RoleEntity)));"/>
-      <RemoveLine Path="Southwind.Logic\Starter.cs" Line="ChartLogic.Start(sb);"/>
+      <RemoveLine Path="Southwind.Logic\Starter.cs" Line="ChartLogic.Start(sb, googleMapsChartScripts: false /*requires Google Maps API key in ChartClient */);"/>
       <RemoveLine Path="Southwind.Logic\Starter.cs" Line="UserChartLogic.RegisterUserTypeCondition(sb, SouthwindGroup.UserEntities);"/>
       <RemoveLine Path="Southwind.Logic\Starter.cs" Line="UserChartLogic.RegisterRoleTypeCondition(sb, SouthwindGroup.RoleEntities);"/>
       <RemoveLine Path="Southwind.React\App\MainAdmin.tsx" Line="import * as ChartClient from &quot;@extensions/Chart/ChartClient&quot;"/>
@@ -279,7 +279,7 @@
       <RemoveLine Path="Southwind.React\App\MainPublic.tsx" From="AuthClient.Options.onLogout = () => {" To="};"/>
       <RemoveLine Path="Southwind.React\App\MainAdmin.tsx" Line="AuthAdminClient.start({ routes, types: true, properties: true, operations: true, queries: true, permissions: true });"/>
       <RemoveLine Path="Southwind.Test.Environment\SouthwindEnvironment.cs" From="internal static void LoadUsers()" To="}//LoadUsers"/>
-      <RemoveLine Path="Southwind.Test.Environment\SouthwindEnvironment.cs" Line="user.SetMixin((UserEmployeeMixin e) => e.Employee, Database.Query&lt;EmployeeEntity>().Single(e => e.FirstName == userName).ToLite());" DependsOn="ExampleEntities"/>
+      <RemoveLine Path="Southwind.Test.Environment\SouthwindEnvironment.cs" Line="user.SetMixin((UserEmployeeMixin e) => e.Employee, Database.Query&lt;EmployeeEntity>().SingleOrDefaultEx(e => e.FirstName == userName)?.ToLite());" DependsOn="ExampleEntities"/>
       <RemoveLine Path="Southwind.Test.Environment\EnvironmentTest.cs" Line="SouthwindEnvironment.LoadUsers();"/>
       <RemoveLine Path="Southwind.Test.Environment\EnvironmentTest.cs" Line="var authRules = XDocument.Load(@&quot;..\..\..\..\Southwind.Terminal\AuthRules.xml&quot;);"/>
       <RemoveLine Path="Southwind.Test.Environment\EnvironmentTest.cs" Line="AuthLogic.LoadRoles(authRules);"/>

diff --git a/Southwind.Entities/Southwind.Entities.csproj b/Southwind.Entities/Southwind.Entities.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Signum.Analyzer" Version="2.5.0" />
+    <PackageReference Include="Signum.Analyzer" Version="2.7.0" />
     <PackageReference Include="Signum.MSBuildTask" Version="2.0.1" />
   </ItemGroup>
 

diff --git a/Southwind.Logic/Southwind.Logic.csproj b/Southwind.Logic/Southwind.Logic.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Signum.Analyzer" Version="2.5.0" />
+    <PackageReference Include="Signum.Analyzer" Version="2.7.0" />
     <PackageReference Include="Signum.MSBuildTask" Version="2.0.1" />
     <PackageReference Include="Microsoft.Exchange.WebServices.NETStandard" Version="1.1.3" />
   </ItemGroup>

diff --git a/Southwind.Logic/Starter.cs b/Southwind.Logic/Starter.cs
@@ -147,7 +147,7 @@ public static void Start(string connectionString, bool isPostgres, bool includeD
                 UserQueryLogic.RegisterUserTypeCondition(sb, SouthwindGroup.UserEntities);
                 UserQueryLogic.RegisterRoleTypeCondition(sb, SouthwindGroup.RoleEntities);
 
-                ChartLogic.Start(sb);
+                ChartLogic.Start(sb, googleMapsChartScripts: false /*requires Google Maps API key in ChartClient */);
                 UserChartLogic.RegisterUserTypeCondition(sb, SouthwindGroup.UserEntities);
                 UserChartLogic.RegisterRoleTypeCondition(sb, SouthwindGroup.RoleEntities);
 

diff --git a/Southwind.React/Southwind.React.csproj b/Southwind.React/Southwind.React.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <TypeScriptToolsVersion>3.8</TypeScriptToolsVersion>
+    <TypeScriptToolsVersion>3.9</TypeScriptToolsVersion>
     <TypeScriptBuildMode>true</TypeScriptBuildMode>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <Nullable>enable</Nullable>
@@ -55,14 +55,14 @@
 
   <ItemGroup>
     <PackageReference Include="CNTK.CPUOnly" Version="2.7.0" />
-    <PackageReference Include="Microsoft.TypeScript.MSBuild" Version="3.8.2">
+    <PackageReference Include="Microsoft.TypeScript.MSBuild" Version="3.9.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.9.10" />
-    <PackageReference Include="Signum.Analyzer" Version="2.5.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
+    <PackageReference Include="Signum.Analyzer" Version="2.7.0" />
     <PackageReference Include="Signum.TSGenerator" Version="3.0.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.4.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Southwind.React/package.json b/Southwind.React/package.json
@@ -69,10 +69,10 @@
     "node-sass": "4.13.1",
     "rimraf": "3.0.2",
     "style-loader": "1.1.3",
-    "ts-loader": "6.2.1",
-    "typescript": "3.8.2",
+    "ts-loader": "7.0.4",
+    "typescript": "3.9.2",
     "url-loader": "3.0.0",
-    "webpack": "4.41.6",
+    "webpack": "4.43.0",
     "webpack-cli": "3.3.11",
     "webpack-notifier": "1.8.0"
   },
+2 −1		Signum.Engine.Extensions/Dynamic/DynamicIsolationLogic.cs
+1 −1		Signum.Engine.Extensions/Signum.Engine.Extensions.csproj
+1 −1		Signum.React.Extensions/Chart/D3Scripts/Punchcard.tsx
+1 −1		Signum.React.Extensions/Chart/HtmlScripts/PivotTable.tsx
+2 −2		Signum.React.Extensions/Dynamic/Expression/DynamicExpression.tsx
+1 −1		Signum.React.Extensions/Dynamic/View/NodeUtils.tsx
+5 −5		Signum.React.Extensions/Help/HelpClient.tsx
+1 −1		Signum.React.Extensions/MachineLearning/Templates/NeuralNetworkSettings.tsx
+1 −1		Signum.React.Extensions/Mailing/Templates/EmailTemplate.tsx
+2 −2		Signum.React.Extensions/Profiler/Heavy/HeavyEntryPage.tsx
+2 −2		Signum.React.Extensions/Signum.React.Extensions.csproj
+2 −0		README.md
+1 −1		Signum.React/Scripts/QuickLinks.tsx
+1 −1		Signum.React/Scripts/ValueLineModal.tsx
+3 −3		Signum.React/Signum.React.csproj
+3 −3		Signum.Test/Signum.Test.csproj