升级发布1117

NewLifeX · Nov 17, 2019 · 17b0c43 · 17b0c43
1 parent 2c3b784
commit 17b0c43
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 14 deletions.
diff --git a/NewLife.Redis/NewLife.Redis.csproj b/NewLife.Redis/NewLife.Redis.csproj
@@ -7,8 +7,8 @@
     <Description>Redis基础操作、列表结构、哈希结构、Set结构，经过日均100亿次调用量的项目验证</Description>
     <Company>新生命开发团队</Company>
     <Copyright>©2002-2019 新生命开发团队</Copyright>
-    <Version>3.3.2019.0707</Version>
-    <FileVersion>3.3.2019.0707</FileVersion>
+    <Version>3.3.2019.1117</Version>
+    <FileVersion>3.3.2019.1117</FileVersion>
     <AssemblyVersion>3.3.*</AssemblyVersion>
     <Deterministic>false</Deterministic>
     <OutputPath>..\Bin</OutputPath>
@@ -44,7 +44,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="8.2.2019.706" />
+    <PackageReference Include="NewLife.Core" Version="8.4.2019.1109" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/NewLife.Redis/Node.cs b/NewLife.Redis/Node.cs
@@ -179,13 +179,10 @@ protected override RedisClient OnCreate()
                 var uri = new NetUri("tcp://" + addr);
                 if (uri.Port == 0) uri.Port = 6379;
 
-                var rc = new RedisClient
+                var rc = new RedisClient(rds, uri)
                 {
-                    Host = rds,
-                    Server = uri,
+                    Log = rds.Log
                 };
-
-                rc.Log = rds.Log;
                 if (rds.Db > 0) rc.Select(rds.Db);
 
                 return rc;

diff --git a/Test/Test.csproj b/Test/Test.csproj
@@ -31,12 +31,14 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="NewLife.Core, Version=8.2.7126.42291, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NewLife.Core.8.2.2019.706\lib\net45\NewLife.Core.dll</HintPath>
+    <Reference Include="Microsoft.VisualBasic" />
+    <Reference Include="NewLife.Core, Version=8.4.7252.1562, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\NewLife.Core.8.4.2019.1109\lib\net45\NewLife.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Management" />
     <Reference Include="System.ServiceProcess" />
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Extensions" />

diff --git a/Test/packages.config b/Test/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NewLife.Core" version="8.2.2019.706" targetFramework="net45" />
+  <package id="NewLife.Core" version="8.4.2019.1109" targetFramework="net45" />
 </packages>
diff --git a/Test2/Test2.csproj b/Test2/Test2.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="8.2.2019.706" />
+    <PackageReference Include="NewLife.Core" Version="8.4.2019.1109" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/XUnitTest/BasicTest.cs b/XUnitTest/BasicTest.cs
@@ -12,7 +12,7 @@ public class BasicTest
         public BasicTest()
         {
             FullRedis.Register();
-            var rds = FullRedis.Create("127.0.0.1:6379", 2);
+            var rds = FullRedis.Create("127.0.0.1:6379", "newlife", 2);
 
             Cache = rds as FullRedis;
         }

diff --git a/XUnitTest/XUnitTest.csproj b/XUnitTest/XUnitTest.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>