升级基础组件

.gitignore

@@ -31,3 +31,4 @@ bld/
 /BinServer
 /BinAgent
 /Samples/HisData/Config
+/AntJob.Web/.config

AntJob.Agent/AntJob.Agent.csproj

@@ -42,7 +42,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Agent" Version="8.7.2020.601" />
+    <PackageReference Include="NewLife.Agent" Version="8.7.2020.802" />
   </ItemGroup>
 
   <ItemGroup>

AntJob.Data/AntJob.Data.csproj

@@ -42,8 +42,8 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="8.8.2020.705-beta" />
+    <PackageReference Include="NewLife.Core" Version="8.9.2020.825-beta8" />
-    <PackageReference Include="NewLife.XCode" Version="9.18.2020.705-beta" />
+    <PackageReference Include="NewLife.XCode" Version="9.19.2020.825-beta8" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />

AntJob.Data/Entity/作业.Biz.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 using System.Xml.Serialization;
+using NewLife;
 using NewLife.Data;
 using NewLife.Serialization;
 using XCode;

AntJob.Data/Entity/作业任务.Biz.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 using System.Xml.Serialization;
+using NewLife;
 using NewLife.Data;
 using XCode;
 

AntJob.Data/Entity/作业错误.Biz.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Xml.Serialization;
+using NewLife;
 using NewLife.Data;
 using XCode;
 using XCode.Membership;

AntJob.Data/Entity/应用历史.Biz.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Runtime.Serialization;
 using System.Xml.Serialization;
+using NewLife;
 using NewLife.Data;
 using XCode;
 using XCode.Cache;

AntJob.Data/Entity/应用在线.Biz.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Xml.Serialization;
+using NewLife;
 using NewLife.Data;
 using XCode;
 using XCode.Membership;

AntJob.Data/Entity/应用消息.Biz.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 using System.Xml.Serialization;
+using NewLife;
 using NewLife.Data;
 using XCode;
 using XCode.Membership;

AntJob.Data/Entity/应用系统.Biz.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
+using NewLife;
 using NewLife.Data;
 using XCode;
 using XCode.Cache;

AntJob.Data/Entity/应用配置.Biz.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Runtime.Serialization;
 using System.Xml.Serialization;
+using NewLife;
 using NewLife.Data;
 using XCode;
 using XCode.Cache;

AntJob.Extensions/AntJob.Extensions.csproj

@@ -42,8 +42,8 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="8.8.2020.705-beta" />
+    <PackageReference Include="NewLife.Core" Version="8.9.2020.825-beta8" />
-    <PackageReference Include="NewLife.XCode" Version="9.18.2020.705-beta" />
+    <PackageReference Include="NewLife.XCode" Version="9.19.2020.825-beta8" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\AntJob\AntJob.csproj" />

AntJob.Extensions/DataHandler.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using AntJob.Data;
+using NewLife;
 using XCode;
 using XCode.Configuration;
 

AntJob.Extensions/SqlMessage.cs

@@ -5,6 +5,7 @@ using AntJob.Data;
 using AntJob.Extensions;
 using AntJob.Handlers;
 using AntJob.Providers;
+using NewLife;
 using NewLife.Data;
 
 namespace AntJob

AntJob.Extensions/SqlSection.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using NewLife;
 using NewLife.Data;
 using NewLife.Model;
 using NewLife.Reflection;
@@ -151,14 +152,14 @@ namespace AntJob.Extensions
             }
 
             // 选取目标表和数据集共有的字段
-            tableName = dal.Db.FormatTableName(tableName);
+            //tableName = dal.Db.FormatTableName(tableName);
             var columns = new List<IDataColumn>();
             foreach (var dc in table.Columns)
             {
                 if (dc.ColumnName.EqualIgnoreCase(dt.Columns)) columns.Add(dc);
             }
 
-            return dal.Session.Insert(tableName, columns.ToArray(), dt.Cast<IIndexAccessor>());
+            return dal.Session.Insert(table, columns.ToArray(), dt.Cast<IIndexAccessor>());
         }
         #endregion
     }

AntJob.Server/AntJob.Server.csproj

@@ -40,9 +40,9 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NewLife.Agent" Version="8.7.2020.601" />
+    <PackageReference Include="NewLife.Agent" Version="8.7.2020.802" />
-    <PackageReference Include="NewLife.Core" Version="8.8.2020.705-beta" />
+    <PackageReference Include="NewLife.Core" Version="8.9.2020.825-beta8" />
-    <PackageReference Include="NewLife.XCode" Version="9.18.2020.705-beta" />
+    <PackageReference Include="NewLife.XCode" Version="9.19.2020.825-beta8" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\AntJob.Data\AntJob.Data.csproj" />

AntJob.Server/Properties/PublishProfiles/FolderProfile.pubxml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>..\Bin\Server\publish\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
+    <SelfContained>false</SelfContained>
+    <PublishSingleFile>False</PublishSingleFile>
+  </PropertyGroup>
+</Project>

AntJob.Web/AntJob.Web.csproj

@@ -16,6 +16,7 @@
     <Optimize>true</Optimize>
     <DefineConstants>TRACE</DefineConstants>
     <LangVersion>latest</LangVersion>
+    <UserSecretsId>98927802-be3c-45aa-98b7-98c431ed6ec3</UserSecretsId>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">
     <DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
@@ -23,9 +24,9 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="8.8.2020.705-beta" />
+    <PackageReference Include="NewLife.Core" Version="8.9.2020.825-beta8" />
-    <PackageReference Include="NewLife.Cube.Core" Version="3.6.2020.709" />
+    <PackageReference Include="NewLife.Cube.Core" Version="3.6.2020.825-beta3" />
-    <PackageReference Include="NewLife.XCode" Version="9.18.2020.705-beta" />
+    <PackageReference Include="NewLife.XCode" Version="9.19.2020.825-beta8" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\AntJob.Data\AntJob.Data.csproj" />

AntJob.Web/Areas/Ant/AntAreaRegistration.cs

@@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel;
+using NewLife;
 using NewLife.Cube;
 
 namespace AntJob.Web.Areas.Ant

AntJob.Web/Areas/Ant/Controllers/AppController.cs

@@ -4,6 +4,7 @@ using System.ComponentModel;
 using System.Linq;
 using AntJob.Data.Entity;
 using Microsoft.AspNetCore.Mvc;
+using NewLife;
 using NewLife.Cube;
 using NewLife.Web;
 using XCode.Membership;

AntJob.Web/Areas/Ant/Controllers/JobController.cs

@@ -4,6 +4,7 @@ using System.ComponentModel;
 using System.Threading.Tasks;
 using AntJob.Data.Entity;
 using Microsoft.AspNetCore.Mvc;
+using NewLife;
 using NewLife.Cube;
 using NewLife.Security;
 using NewLife.Web;

AntJob.Web/Areas/Ant/Controllers/JobTaskController.cs

@@ -4,6 +4,7 @@ using System.ComponentModel;
 using AntJob.Data;
 using AntJob.Data.Entity;
 using Microsoft.AspNetCore.Mvc;
+using NewLife;
 using NewLife.Cube;
 using NewLife.Web;
 using XCode.Membership;

AntJob.Web/Properties/PublishProfiles/FolderProfile.pubxml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <DeleteExistingFiles>False</DeleteExistingFiles>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <PublishProvider>FileSystem</PublishProvider>
+    <PublishUrl>..\Bin\Web\publish\</PublishUrl>
+    <WebPublishMethod>FileSystem</WebPublishMethod>
+    <SiteUrlToLaunchAfterPublish />
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
+    <ProjectGuid>a9e0597c-e818-4b33-8ac3-be134d68b78e</ProjectGuid>
+    <SelfContained>false</SelfContained>
+  </PropertyGroup>
+</Project>

AntJob/AntJob.csproj

@@ -46,6 +46,6 @@
     <Compile Remove="StarService.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="8.8.2020.705-beta" />
+    <PackageReference Include="NewLife.Core" Version="8.9.2020.825-beta8" />
   </ItemGroup>
 </Project>

AntJob/AntSetting.cs

@@ -1,6 +1,7 @@
 using System;
 using System.ComponentModel;
 using System.Reflection;
+using NewLife;
 using NewLife.Configuration;
 
 namespace AntJob

AntJob/Data/TemplateHelper.cs

@@ -1,4 +1,5 @@
 using System;
+using NewLife;
 using NewLife.Collections;
 
 namespace AntJob.Data

AntJob/Handler.cs

@@ -4,6 +4,7 @@ using System.Diagnostics;
 using System.Threading;
 using AntJob.Data;
 using AntJob.Providers;
+using NewLife;
 using NewLife.Collections;
 using NewLife.Log;
 

AntJob/Handlers/CSharpHandler.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using AntJob.Data;
+using NewLife;
 
 namespace AntJob.Handlers
 {

AntJob/Handlers/MessageHandler.cs

@@ -3,6 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using AntJob.Data;
+using NewLife;
 using NewLife.Serialization;
 
 namespace AntJob.Handlers

AntJob/Providers/AntClient.cs

@@ -6,6 +6,7 @@ using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
 using AntJob.Data;
+using NewLife;
 using NewLife.Log;
 using NewLife.Net;
 using NewLife.Reflection;

AntTest/AntTest.csproj

@@ -11,7 +11,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0-preview-20200519-01" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

Samples/HisData/HisData.csproj

@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.XCode" Version="9.18.2020.705-beta" />
+    <PackageReference Include="NewLife.XCode" Version="9.19.2020.825-beta8" />
   </ItemGroup>
 
   <ItemGroup>

Samples/HisWeb/Areas/His/HisAreaRegistration.cs

@@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel;
+using NewLife;
 using NewLife.Cube;
 
 namespace HisWeb.Areas.His

Samples/HisWeb/HisWeb.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Cube.Core" Version="3.6.2020.709" />
+    <PackageReference Include="NewLife.Cube.Core" Version="3.6.2020.825-beta3" />
   </ItemGroup>
 
   <ItemGroup>