v3.1.2020.0115 X组件内部目录统一使用BasePath，支持命令行参数与环境变量，便于函数计算大石头 编写于 2020-01-15 01:22:07
diff --git a/CubeDemo/CubeDemo.csproj b/CubeDemo/CubeDemo.csproj
index afda1ae..a96ac04 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.5.7305.42329, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\NewLife.Core.8.5.2020.101\lib\net46\NewLife.Core.dll</HintPath>
+ <Reference Include="NewLife.Core, Version=8.5.7319.2076, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\NewLife.Core.8.5.2020.115\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.14.7305.42400, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\NewLife.XCode.9.14.2020.101\lib\net45\XCode.dll</HintPath>
+ <Reference Include="XCode, Version=9.14.7319.2106, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\NewLife.XCode.9.14.2020.115\lib\net45\XCode.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
diff --git a/CubeDemo/packages.config b/CubeDemo/packages.config
index 94430b4..68b1622 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.5.2020.101" targetFramework="net461" />
- <package id="NewLife.XCode" version="9.14.2020.101" targetFramework="net461" />
+ <package id="NewLife.Core" version="8.5.2020.115" targetFramework="net461" />
+ <package id="NewLife.XCode" version="9.14.2020.115" targetFramework="net461" />
</packages>
\ No newline at end of file
diff --git a/CubeDemoNC/CubeDemoNC.csproj b/CubeDemoNC/CubeDemoNC.csproj
index a37352e..498bc09 100644
--- a/CubeDemoNC/CubeDemoNC.csproj
+++ b/CubeDemoNC/CubeDemoNC.csproj
@@ -20,8 +20,8 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="NewLife.Core" Version="8.5.2020.101" />
- <PackageReference Include="NewLife.XCode" Version="9.14.2020.101" />
+ <PackageReference Include="NewLife.Core" Version="8.5.2020.115" />
+ <PackageReference Include="NewLife.XCode" Version="9.14.2020.115" />
</ItemGroup>
<ItemGroup>
diff --git a/NewLife.Cube/Areas/Admin/Controllers/DbController.cs b/NewLife.Cube/Areas/Admin/Controllers/DbController.cs
index 681d9aa..6274c42 100644
--- a/NewLife.Cube/Areas/Admin/Controllers/DbController.cs
+++ b/NewLife.Cube/Areas/Admin/Controllers/DbController.cs
@@ -35,7 +35,7 @@ namespace NewLife.Cube.Admin.Controllers
public ActionResult Index()
{
var list = new List<DbItem>();
- var dir = XCode.Setting.Current.BackupPath.AsDirectory();
+ var dir = NewLife.Setting.Current.BackupPath.GetBasePath().AsDirectory();
// 读取配置文件
foreach (var item in DAL.ConnStrs.ToArray())
diff --git a/NewLife.Cube/Common/ReadOnlyEntityController.cs b/NewLife.Cube/Common/ReadOnlyEntityController.cs
index 1554d4e..22a36b1 100644
--- a/NewLife.Cube/Common/ReadOnlyEntityController.cs
+++ b/NewLife.Cube/Common/ReadOnlyEntityController.cs
@@ -745,7 +745,7 @@ namespace NewLife.Cube
var name = fact.EntityType.Name;
var fileName = "{0}_{1:yyyyMMddHHmmss}.gz".F(name, DateTime.Now);
- var bak = XCode.Setting.Current.BackupPath.CombinePath(fileName).GetFullPath();
+ var bak = NewLife.Setting.Current.BackupPath.CombinePath(fileName).GetBasePath();
bak.EnsureDirectory(true);
var rs = 0;
@@ -778,7 +778,7 @@ namespace NewLife.Cube
var name = fact.EntityType.Name;
var fileName = "{0}_*.gz".F(name);
- var di = XCode.Setting.Current.BackupPath.AsDirectory();
+ var di = NewLife.Setting.Current.BackupPath.GetBasePath().AsDirectory();
var fi = di?.GetFiles(fileName)?.LastOrDefault();
if (fi == null || !fi.Exists) throw new XException($"找不到[{fileName}]的备份文件");
diff --git a/NewLife.Cube/Common/ViewHelper.cs b/NewLife.Cube/Common/ViewHelper.cs
index e601413..8862e03 100644
--- a/NewLife.Cube/Common/ViewHelper.cs
+++ b/NewLife.Cube/Common/ViewHelper.cs
@@ -826,7 +826,7 @@ namespace NewLife.Cube
if (user == null || user.Avatar.IsNullOrEmpty()) return null;
var set = Setting.Current;
- var av = set.AvatarPath.CombinePath(user.ID + ".png").GetFullPath();
+ var av = set.AvatarPath.CombinePath(user.ID + ".png").GetBasePath();
if (File.Exists(av)) return "/Sso/Avatar/" + user.ID;
diff --git a/NewLife.Cube/Controllers/SsoController.cs b/NewLife.Cube/Controllers/SsoController.cs
index 68cc443..5f495f6 100644
--- a/NewLife.Cube/Controllers/SsoController.cs
+++ b/NewLife.Cube/Controllers/SsoController.cs
@@ -460,7 +460,7 @@ namespace NewLife.Cube.Controllers
var set = Setting.Current;
var av = set.AvatarPath.CombinePath(id + ".png");
- var av2 = av.GetFullPath();
+ var av2 = av.GetBasePath();
if (!System.IO.File.Exists(av2))
{
var user = prv.Provider?.FindByID(id);
diff --git a/NewLife.Cube/NewLife.Cube.csproj b/NewLife.Cube/NewLife.Cube.csproj
index 04d0648..238e806 100644
--- a/NewLife.Cube/NewLife.Cube.csproj
+++ b/NewLife.Cube/NewLife.Cube.csproj
@@ -45,8 +45,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.5.7305.42330, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\NewLife.Core.8.5.2020.101\lib\net45\NewLife.Core.dll</HintPath>
+ <Reference Include="NewLife.Core, Version=8.5.7319.2075, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\NewLife.Core.8.5.2020.115\lib\net45\NewLife.Core.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -83,8 +83,8 @@
<Reference Include="System.Xml" />
<Reference Include="System.Configuration" />
<Reference Include="System.Web.Services" />
- <Reference Include="XCode, Version=9.14.7305.42400, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\NewLife.XCode.9.14.2020.101\lib\net45\XCode.dll</HintPath>
+ <Reference Include="XCode, Version=9.14.7319.2106, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\NewLife.XCode.9.14.2020.115\lib\net45\XCode.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
diff --git a/NewLife.Cube/packages.config b/NewLife.Cube/packages.config
index ed45bae..e17bbe8 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.5.2020.101" targetFramework="net45" />
- <package id="NewLife.XCode" version="9.14.2020.101" targetFramework="net45" />
+ <package id="NewLife.Core" version="8.5.2020.115" targetFramework="net45" />
+ <package id="NewLife.XCode" version="9.14.2020.115" targetFramework="net45" />
</packages>
\ No newline at end of file
diff --git a/NewLife.Cube/Properties/AssemblyInfo.cs b/NewLife.Cube/Properties/AssemblyInfo.cs
index ea2620a..4862b0f 100644
--- a/NewLife.Cube/Properties/AssemblyInfo.cs
+++ b/NewLife.Cube/Properties/AssemblyInfo.cs
@@ -12,7 +12,7 @@ using NewLife.Cube;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyProduct("NewLife.Cube")]
[assembly: AssemblyCompany("新生命开发团队")]
-[assembly: AssemblyCopyright("©2002-2018 新生命开发团队 https://github.com/NewLifeX/NewLife.Cube")]
+[assembly: AssemblyCopyright("©2002-2020 新生命开发团队 https://github.com/NewLifeX/NewLife.Cube")]
[assembly: AssemblyTrademark("四叶草")]
[assembly: AssemblyCulture("")]
@@ -36,10 +36,12 @@ using NewLife.Cube;
//
// 可以指定所有这些值，也可以使用“修订号”和“内部版本号”的默认值，
// 方法是按如下所示使用“*”:
-[assembly: AssemblyVersion("3.0.*")]
-[assembly: AssemblyFileVersion("3.0.2020.0101")]
+[assembly: AssemblyVersion("3.1.*")]
+[assembly: AssemblyFileVersion("3.1.2020.0115")]
/*
+ * v3.1.2020.0115 X组件内部目录统一使用BasePath，支持命令行参数与环境变量，便于函数计算
+ *
* v3.0.2019.1212 独立发布netcore版本魔方，并作为主线维护
*
* v2.9.2019.1110 优化单点登录和Csv导出，界面调整
diff --git a/NewLife.Cube/Web/SsoProvider.cs b/NewLife.Cube/Web/SsoProvider.cs
index 37fffc9..4539435 100644
--- a/NewLife.Cube/Web/SsoProvider.cs
+++ b/NewLife.Cube/Web/SsoProvider.cs
@@ -388,7 +388,7 @@ namespace NewLife.Cube.Web
// 不要扩展名
var set = Setting.Current;
- var dest = set.AvatarPath.CombinePath(user.ID + ".png").GetFullPath();
+ var dest = set.AvatarPath.CombinePath(user.ID + ".png").GetBasePath();
//// 头像是否已存在
//if (File.Exists(dest)) return false;
diff --git a/NewLife.CubeNC/NewLife.CubeNC.csproj b/NewLife.CubeNC/NewLife.CubeNC.csproj
index 9e30506..58a9954 100644
--- a/NewLife.CubeNC/NewLife.CubeNC.csproj
+++ b/NewLife.CubeNC/NewLife.CubeNC.csproj
@@ -8,10 +8,10 @@
<AssemblyTitle>魔方平台</AssemblyTitle>
<Description>Mvc权限管理后台，支持模版视图重载覆盖</Description>
<Company>新生命开发团队</Company>
- <Copyright>©2002-2019 新生命开发团队</Copyright>
- <Version>3.0.2020.0101</Version>
- <FileVersion>3.0.2020.0101</FileVersion>
- <AssemblyVersion>3.0.*</AssemblyVersion>
+ <Copyright>©2002-2020 新生命开发团队</Copyright>
+ <Version>3.1.2020.0115</Version>
+ <FileVersion>3.1.2020.0115</FileVersion>
+ <AssemblyVersion>3.1.*</AssemblyVersion>
<Deterministic>false</Deterministic>
<OutputPath>..\Bin</OutputPath>
<DocumentationFile>$(OutputPath)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
@@ -65,8 +65,8 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="NewLife.Core" Version="8.5.2020.101" />
- <PackageReference Include="NewLife.XCode" Version="9.14.2020.101" />
+ <PackageReference Include="NewLife.Core" Version="8.5.2020.115" />
+ <PackageReference Include="NewLife.XCode" Version="9.14.2020.115" />
</ItemGroup>
<ItemGroup>
diff --git a/Test/packages.config b/Test/packages.config
index c68968f..40796cd 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.5.2020.101" targetFramework="net45" />
- <package id="NewLife.XCode" version="9.14.2020.101" targetFramework="net45" />
+ <package id="NewLife.Core" version="8.5.2020.115" targetFramework="net45" />
+ <package id="NewLife.XCode" version="9.14.2020.115" targetFramework="net45" />
</packages>
\ No newline at end of file
diff --git a/Test/Program.cs b/Test/Program.cs
index d946a14..a407db9 100644
--- a/Test/Program.cs
+++ b/Test/Program.cs
@@ -18,7 +18,7 @@ namespace Test
var set = XCode.Setting.Current;
if (set.IsNew)
{
- set.SQLiteDbPath = "..\\Data";
+ //set.SQLiteDbPath = "..\\Data";
set.SaveAsync();
}
diff --git a/Test/Test.csproj b/Test/Test.csproj
index 676bc5b..8b0d24b 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.5.7305.42330, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\NewLife.Core.8.5.2020.101\lib\net45\NewLife.Core.dll</HintPath>
+ <Reference Include="NewLife.Core, Version=8.5.7319.2075, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\NewLife.Core.8.5.2020.115\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.14.7305.42400, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\NewLife.XCode.9.14.2020.101\lib\net45\XCode.dll</HintPath>
+ <Reference Include="XCode, Version=9.14.7319.2106, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\NewLife.XCode.9.14.2020.115\lib\net45\XCode.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>