v2.4.2018.0630 OAuthServer支持回调地址和密钥验证

zxingdream · Jun 30, 2018 · 81ff357 · 81ff357
1 parent 00e5e4a
commit 81ff357
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -39,3 +39,9 @@ bld/
 /TestST/Properties/PublishProfiles
 /DLL
 /NewLife.Cube/Entity/Config
+/NewLife.Cube/Build.tt
+/NewLife.Cube/Build.cs
+/NewLife.Cube/Model.xml
+/NewLife.Cube4/Model.xml
+/NewLife.Cube4/Build.tt
+/NewLife.Cube4/Build.cs
diff --git a/NewLife.Cube/NewLife.Cube.csproj b/NewLife.Cube/NewLife.Cube.csproj
@@ -56,8 +56,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=7.0.6722.39740, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NewLife.Core.7.0.6722.39740\lib\net45\NewLife.Core.dll</HintPath>
+    <Reference Include="NewLife.Core, Version=7.3.6755.22250, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\NewLife.Core.7.3.6755.22250\lib\net45\NewLife.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -88,8 +88,8 @@
     <Reference Include="System.Xml" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Web.Services" />
-    <Reference Include="XCode, Version=9.7.6722.39741, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NewLife.XCode.9.7.6722.39741\lib\net45\XCode.dll</HintPath>
+    <Reference Include="XCode, Version=9.8.6755.22252, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\NewLife.XCode.9.8.6755.22252\lib\net45\XCode.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/NewLife.Cube/Properties/AssemblyInfo.cs b/NewLife.Cube/Properties/AssemblyInfo.cs
@@ -36,10 +36,12 @@
 //
 // 可以指定所有这些值，也可以使用“修订号”和“内部版本号”的默认值，
 // 方法是按如下所示使用“*”:
-[assembly: AssemblyVersion("2.3.*")]
-[assembly: AssemblyFileVersion("2.3.2018.0403")]
+[assembly: AssemblyVersion("2.4.*")]
+[assembly: AssemblyFileVersion("2.4.2018.0630")]
 
 /*
+ * v2.4.2018.0630   OAuthServer支持回调地址和密钥验证
+ * 
  * v2.3.2018.0403   支持数据权限，控制器重载ValidPermission
  * 
  * v2.2.2018.0326   重构权限体系，支持多角色

diff --git 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="7.0.6722.39740" targetFramework="net45" />
-  <package id="NewLife.XCode" version="9.7.6722.39741" targetFramework="net45" />
+  <package id="NewLife.Core" version="7.3.6755.22250" targetFramework="net45" />
+  <package id="NewLife.XCode" version="9.8.6755.22252" targetFramework="net45" />
 </packages>
diff --git a/NewLife.Cube4/NewLife.Cube40.csproj b/NewLife.Cube4/NewLife.Cube40.csproj
@@ -53,8 +53,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=7.0.6722.39741, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NewLife.Core.7.0.6722.39740\lib\net40\NewLife.Core.dll</HintPath>
+    <Reference Include="NewLife.Core, Version=7.3.6755.22250, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\NewLife.Core.7.3.6755.22250\lib\net40\NewLife.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -87,8 +87,8 @@
     <Reference Include="System.Configuration" />
     <Reference Include="System.Web.Services" />
     <Reference Include="System.Xml.Linq" />
-    <Reference Include="XCode, Version=9.7.6722.39741, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NewLife.XCode.9.7.6722.39741\lib\net40\XCode.dll</HintPath>
+    <Reference Include="XCode, Version=9.8.6755.22252, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\NewLife.XCode.9.8.6755.22252\lib\net40\XCode.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/NewLife.Cube4/packages.config b/NewLife.Cube4/packages.config
@@ -6,6 +6,6 @@
   <package id="Microsoft.AspNet.WebPages" version="2.0.30506.0" targetFramework="net40" />
   <package id="Microsoft.AspNet.WebPages.zh-Hans" version="2.0.30506.0" targetFramework="net40" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
-  <package id="NewLife.Core" version="7.0.6722.39740" targetFramework="net40" />
-  <package id="NewLife.XCode" version="9.7.6722.39741" targetFramework="net40" />
+  <package id="NewLife.Core" version="7.3.6755.22250" targetFramework="net40" />
+  <package id="NewLife.XCode" version="9.8.6755.22252" targetFramework="net40" />
 </packages>