diff --git a/.gitignore b/.gitignore
index 055893d..c2c65fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,3 +71,5 @@ bld/
/XTemp
/Temp
/NewLife.CubeNC/Properties/launchSettings.json
+/CubeDemo/Entity
+/NewLife.Cube/Entity
diff --git a/CubeDemo/CubeDemo.csproj b/CubeDemo/CubeDemo.csproj
index 3463fc4..fd0ca98 100644
--- a/CubeDemo/CubeDemo.csproj
+++ b/CubeDemo/CubeDemo.csproj
@@ -44,8 +44,8 @@
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualBasic" />
- <Reference Include="NewLife.Core, Version=8.6.7372.32105, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\NewLife.Core.8.6.2020.308-rc\lib\net46\NewLife.Core.dll</HintPath>
+ <Reference Include="NewLife.Core, Version=8.7.7372.40134, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\NewLife.Core.8.7.2020.308\lib\net46\NewLife.Core.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -95,8 +95,8 @@
</Reference>
<Reference Include="System.Net.Http.WebRequest">
</Reference>
- <Reference Include="XCode, Version=9.15.7372.32564, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\NewLife.XCode.9.15.2020.308-rc2\lib\net45\XCode.dll</HintPath>
+ <Reference Include="XCode, Version=9.16.7372.40226, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\NewLife.XCode.9.16.2020.308\lib\net45\XCode.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -139,6 +139,11 @@
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
</Compile>
+ <Compile Include="Entity\Build_netcore.cs">
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
+ <DependentUpon>Build_netcore.tt</DependentUpon>
+ </Compile>
<Compile Include="Entity\交易.Biz.cs" />
<Compile Include="Entity\交易.cs" />
<Compile Include="Entity\学生.Biz.cs" />
@@ -160,6 +165,10 @@
<Generator>TextTemplatingFileGenerator</Generator>
<LastGenOutput>Build.cs</LastGenOutput>
</Content>
+ <Content Include="Entity\Build_netcore.tt">
+ <Generator>TextTemplatingFileGenerator</Generator>
+ <LastGenOutput>Build_netcore.cs</LastGenOutput>
+ </Content>
<Content Include="Global.asax" />
<Content Include="Model.xml" />
</ItemGroup>
diff --git a/CubeDemo/packages.config b/CubeDemo/packages.config
index 5d3f1f6..9bf050d 100644
--- a/CubeDemo/packages.config
+++ b/CubeDemo/packages.config
@@ -7,6 +7,6 @@
<package id="Microsoft.AspNet.WebPages" version="3.2.6" targetFramework="net461" />
<package id="Microsoft.AspNet.WebPages.zh-Hans" version="3.2.6" targetFramework="net461" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net461" />
- <package id="NewLife.Core" version="8.6.2020.308-rc" targetFramework="net461" />
- <package id="NewLife.XCode" version="9.15.2020.308-rc2" targetFramework="net461" />
+ <package id="NewLife.Core" version="8.7.2020.308" targetFramework="net461" />
+ <package id="NewLife.XCode" version="9.16.2020.308" targetFramework="net461" />
</packages>
\ No newline at end of file
diff --git a/CubeDemoNC/CubeDemoNC.csproj b/CubeDemoNC/CubeDemoNC.csproj
index 0719998..6c89dfb 100644
--- a/CubeDemoNC/CubeDemoNC.csproj
+++ b/CubeDemoNC/CubeDemoNC.csproj
@@ -24,8 +24,8 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="NewLife.Core" Version="8.6.2020.308-rc" />
- <PackageReference Include="NewLife.XCode" Version="9.15.2020.308-rc2" />
+ <PackageReference Include="NewLife.Core" Version="8.7.2020.308" />
+ <PackageReference Include="NewLife.XCode" Version="9.16.2020.308" />
</ItemGroup>
<ItemGroup>
diff --git a/NewLife.Cube/NewLife.Cube.csproj b/NewLife.Cube/NewLife.Cube.csproj
index ca38463..4936f5d 100644
--- a/NewLife.Cube/NewLife.Cube.csproj
+++ b/NewLife.Cube/NewLife.Cube.csproj
@@ -46,8 +46,8 @@
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
<Private>True</Private>
</Reference>
- <Reference Include="NewLife.Core, Version=8.6.7372.32104, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\NewLife.Core.8.6.2020.308-rc\lib\net45\NewLife.Core.dll</HintPath>
+ <Reference Include="NewLife.Core, Version=8.7.7372.40134, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\NewLife.Core.8.7.2020.308\lib\net45\NewLife.Core.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -84,8 +84,8 @@
<Reference Include="System.Xml" />
<Reference Include="System.Configuration" />
<Reference Include="System.Web.Services" />
- <Reference Include="XCode, Version=9.15.7372.32564, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\NewLife.XCode.9.15.2020.308-rc2\lib\net45\XCode.dll</HintPath>
+ <Reference Include="XCode, Version=9.16.7372.40226, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\NewLife.XCode.9.16.2020.308\lib\net45\XCode.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -360,6 +360,11 @@
<Compile Include="Controllers\HomeController.cs" />
<Compile Include="Controllers\ODataController.cs" />
<Compile Include="Controllers\SsoController.cs" />
+ <Compile Include="Entity\Build_netcore.cs">
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
+ <DependentUpon>Build_netcore.tt</DependentUpon>
+ </Compile>
<Compile Include="Entity\应用日志.Biz.cs" />
<Compile Include="Entity\应用日志.cs" />
<Compile Include="Entity\应用系统.Biz.cs" />
@@ -907,6 +912,10 @@
<Generator>RazorGenerator</Generator>
<LastGenOutput>Index.generated.cs</LastGenOutput>
</None>
+ <Content Include="Entity\Build_netcore.tt">
+ <Generator>TextTemplatingFileGenerator</Generator>
+ <LastGenOutput>Build_netcore.cs</LastGenOutput>
+ </Content>
<Content Include="Views\Shared\_Layout_Nav.cshtml">
<Generator>RazorGenerator</Generator>
<LastGenOutput>_Layout_Nav.generated.cs</LastGenOutput>
diff --git a/NewLife.Cube/packages.config b/NewLife.Cube/packages.config
index 4ed41d3..02daaa1 100644
--- a/NewLife.Cube/packages.config
+++ b/NewLife.Cube/packages.config
@@ -7,6 +7,6 @@
<package id="Microsoft.AspNet.WebPages" version="3.2.6" targetFramework="net45" />
<package id="Microsoft.AspNet.WebPages.zh-Hans" version="3.2.6" targetFramework="net45" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
- <package id="NewLife.Core" version="8.6.2020.308-rc" targetFramework="net45" />
- <package id="NewLife.XCode" version="9.15.2020.308-rc2" targetFramework="net45" />
+ <package id="NewLife.Core" version="8.7.2020.308" targetFramework="net45" />
+ <package id="NewLife.XCode" version="9.16.2020.308" targetFramework="net45" />
</packages>
\ No newline at end of file
diff --git a/NewLife.Cube/Properties/AssemblyInfo.cs b/NewLife.Cube/Properties/AssemblyInfo.cs
index e148b11..a4d8701 100644
--- a/NewLife.Cube/Properties/AssemblyInfo.cs
+++ b/NewLife.Cube/Properties/AssemblyInfo.cs
@@ -36,10 +36,12 @@ using NewLife.Cube;
//
// 可以指定所有这些值，也可以使用“修订号”和“内部版本号”的默认值，
// 方法是按如下所示使用“*”:
-[assembly: AssemblyVersion("3.2.*")]
-[assembly: AssemblyFileVersion("3.2.2020.0204")]
+[assembly: AssemblyVersion("3.3.*")]
+[assembly: AssemblyFileVersion("3.3.2020.0308")]
/*
+ * v3.3.2020.0308 支持ECharts图表，支持钉钉登录，新增页面数据分享
+ *
* v3.2.2020.0204 支持数据权限、用户部门地区选择、用户分享令牌授权
*
* v3.1.2020.0115 X组件内部目录统一使用BasePath，支持命令行参数与环境变量，便于函数计算
diff --git a/NewLife.CubeNC/NewLife.CubeNC.csproj b/NewLife.CubeNC/NewLife.CubeNC.csproj
index ccf6049..6360361 100644
--- a/NewLife.CubeNC/NewLife.CubeNC.csproj
+++ b/NewLife.CubeNC/NewLife.CubeNC.csproj
@@ -9,9 +9,9 @@
<Description>Mvc权限管理后台，支持模版视图重载覆盖</Description>
<Company>新生命开发团队</Company>
<Copyright>©2002-2020 NewLife</Copyright>
- <Version>3.2.2020.0219-beta</Version>
- <FileVersion>3.2.2020.0219-beta</FileVersion>
- <AssemblyVersion>3.2.*</AssemblyVersion>
+ <Version>3.3.2020.0308</Version>
+ <FileVersion>3.3.2020.0308</FileVersion>
+ <AssemblyVersion>3.3.*</AssemblyVersion>
<Deterministic>false</Deterministic>
<OutputPath>..\Bin</OutputPath>
<DocumentationFile>$(OutputPath)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
@@ -28,7 +28,7 @@
<RepositoryUrl>https://github.com/NewLifeX/NewLife.Cube</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageTags>新生命团队;X组件;NewLife;$(AssemblyName)</PackageTags>
- <PackageReleaseNotes>高性能备份导出百万级数据</PackageReleaseNotes>
+ <PackageReleaseNotes>支持ECharts图表，支持钉钉登录，新增页面数据分享</PackageReleaseNotes>
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
@@ -47,8 +47,8 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="NewLife.Core" Version="8.6.2020.308-rc" />
- <PackageReference Include="NewLife.XCode" Version="9.15.2020.308-rc2" />
+ <PackageReference Include="NewLife.Core" Version="8.7.2020.308" />
+ <PackageReference Include="NewLife.XCode" Version="9.16.2020.308" />
</ItemGroup>
<ItemGroup>
diff --git a/Test/packages.config b/Test/packages.config
index 3ab9446..2285312 100644
--- a/Test/packages.config
+++ b/Test/packages.config
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="NewLife.Core" version="8.6.2020.308-rc" targetFramework="net45" />
- <package id="NewLife.XCode" version="9.15.2020.308-rc2" targetFramework="net45" />
+ <package id="NewLife.Core" version="8.7.2020.308" targetFramework="net45" />
+ <package id="NewLife.XCode" version="9.16.2020.308" targetFramework="net45" />
</packages>
\ No newline at end of file
diff --git a/Test/Test.csproj b/Test/Test.csproj
index 5a80467..b4c5701 100644
--- a/Test/Test.csproj
+++ b/Test/Test.csproj
@@ -35,8 +35,8 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualBasic" />
- <Reference Include="NewLife.Core, Version=8.6.7372.32104, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\NewLife.Core.8.6.2020.308-rc\lib\net45\NewLife.Core.dll</HintPath>
+ <Reference Include="NewLife.Core, Version=8.7.7372.40134, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\NewLife.Core.8.7.2020.308\lib\net45\NewLife.Core.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -52,8 +52,8 @@
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
- <Reference Include="XCode, Version=9.15.7372.32564, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\NewLife.XCode.9.15.2020.308-rc2\lib\net45\XCode.dll</HintPath>
+ <Reference Include="XCode, Version=9.16.7372.40226, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\NewLife.XCode.9.16.2020.308\lib\net45\XCode.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>