Merge branch 'dev'

ZeeLyn · Apr 26, 2019 · 279fa38 · 279fa38
2 parents 84492bc + 46b3e6f
commit 279fa38
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 18 deletions.
diff --git a/build.cake b/build.cake
@@ -40,6 +40,7 @@ Task("UpdateVersion").DoesForEach(GetFiles("**/Uragano.*.csproj"),(file)=>{
    XmlPoke(file,"/Project/PropertyGroup/PackageTags","Uragano,RPC,DotNetty,Microservice,MessagePack,DynamicProxy,dotnetcore,service-discovery,polly,circuit-breaker,consul,zookeeper,dependency-injection");
    XmlPoke(file,"/Project/PropertyGroup/PackageIconUrl","https://raw.githubusercontent.com/1100100/Uragano/master/icon.png");
    XmlPoke(file,"/Project/PropertyGroup/Authors","Owen");
+   XmlPoke(file,"/Project/PropertyGroup/PackageLicenseExpression","MIT");
 });
 
 Task("Restore").Does(()=>{

diff --git a/samples/Sample.Server/appsettings.json b/samples/Sample.Server/appsettings.json
@@ -9,20 +9,14 @@
     "Server": {
       "address": "192.168.1.129",
       "port": 5001,
-      "certUrl": "",
-      "certPwd": "",
       "weight": 1
     },
     "Client": {
       "DefaultCert": {
-        "url": "",
-        "pwd": ""
+
       },
       "ServicesCert": {
-        "RPC": {
-          "url": "",
-          "pwd": ""
-        }
+
       }
     },
     "ServiceDiscovery": {

diff --git a/src/Uragano.Abstract/Uragano.Abstractions.csproj b/src/Uragano.Abstract/Uragano.Abstractions.csproj
@@ -9,9 +9,10 @@
     <PackageProjectUrl>https://github.com/1100100/Uragano</PackageProjectUrl>
     <PackageTags>Uragano,RPC,DotNetty,Microservice,MessagePack,DynamicProxy,dotnetcore,service-discovery,polly,circuit-breaker,consul,zookeeper,dependency-injection</PackageTags>
     <PackageIconUrl>https://raw.githubusercontent.com/1100100/Uragano/master/icon.png</PackageIconUrl>
-    <PackageLicenseUrl>https://github.com/1100100Uragano/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageLicenseUrl></PackageLicenseUrl>
     <Authors>Owen</Authors>
     <Company>Owen</Company>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
 
 

diff --git a/src/Uragano.Caching.Memory/Uragano.Caching.Memory.csproj b/src/Uragano.Caching.Memory/Uragano.Caching.Memory.csproj
@@ -8,10 +8,11 @@
     <Authors>Owen</Authors>
     <Company>Owen</Company>
     <Description>A simple, high performance RPC library.</Description>
-    <PackageLicenseUrl>https://github.com/1100100/Uragano/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageLicenseUrl></PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/1100100/Uragano</PackageProjectUrl>
     <PackageIconUrl>https://raw.githubusercontent.com/1100100/Uragano/master/icon.png</PackageIconUrl>
     <PackageTags>Uragano,RPC,DotNetty,Microservice,MessagePack,DynamicProxy,dotnetcore,service-discovery,polly,circuit-breaker,consul,zookeeper,dependency-injection</PackageTags>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Uragano.Caching.Redis/Uragano.Caching.Redis.csproj b/src/Uragano.Caching.Redis/Uragano.Caching.Redis.csproj
@@ -8,10 +8,11 @@
     <Authors>Owen</Authors>
     <Company>Owen</Company>
     <Description>A simple, high performance RPC library.</Description>
-    <PackageLicenseUrl>https://github.com/1100100/Uragano/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageLicenseUrl></PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/1100100/Uragano</PackageProjectUrl>
     <PackageIconUrl>https://raw.githubusercontent.com/1100100/Uragano/master/icon.png</PackageIconUrl>
     <PackageTags>Uragano,RPC,DotNetty,Microservice,MessagePack,DynamicProxy,dotnetcore,service-discovery,polly,circuit-breaker,consul,zookeeper,dependency-injection</PackageTags>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Uragano.Codec.MessagePack/Uragano.Codec.MessagePack.csproj b/src/Uragano.Codec.MessagePack/Uragano.Codec.MessagePack.csproj
@@ -9,9 +9,10 @@
     <PackageProjectUrl>https://github.com/1100100/Uragano</PackageProjectUrl>
     <PackageIconUrl>https://raw.githubusercontent.com/1100100/Uragano/master/icon.png</PackageIconUrl>
     <PackageTags>Uragano,RPC,DotNetty,Microservice,MessagePack,DynamicProxy,dotnetcore,service-discovery,polly,circuit-breaker,consul,zookeeper,dependency-injection</PackageTags>
-    <PackageLicenseUrl>https://github.com/1100100/Uragano/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageLicenseUrl></PackageLicenseUrl>
     <Authors>Owen</Authors>
     <Company>Owen</Company>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Uragano.Consul/Uragano.Consul.csproj b/src/Uragano.Consul/Uragano.Consul.csproj
@@ -9,9 +9,10 @@
     <PackageProjectUrl>https://github.com/1100100/Uragano</PackageProjectUrl>
     <Description>A simple, high performance RPC library.</Description>
     <Version>0.0.3</Version>
-    <PackageLicenseUrl>https://github.com/1100100/Uragano/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageLicenseUrl></PackageLicenseUrl>
     <Authors>Owen</Authors>
     <Company>Owen</Company>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Uragano.Core/Uragano.Core.csproj b/src/Uragano.Core/Uragano.Core.csproj
@@ -8,10 +8,11 @@
     <PackageProjectUrl>https://github.com/1100100/Uragano</PackageProjectUrl>
     <Description>A simple, high performance RPC library.</Description>
     <Version>0.0.3</Version>
-    <PackageLicenseUrl>https://github.com/1100100/Uragano/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageLicenseUrl></PackageLicenseUrl>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <Authors>Owen</Authors>
     <Company>Owen</Company>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Uragano.DynamicProxy/Uragano.DynamicProxy.csproj b/src/Uragano.DynamicProxy/Uragano.DynamicProxy.csproj
@@ -9,9 +9,10 @@
     <PackageProjectUrl>https://github.com/1100100/Uragano</PackageProjectUrl>
     <Description>A simple, high performance RPC library.</Description>
     <Version>0.0.3</Version>
-    <PackageLicenseUrl>https://github.com/1100100/Uragano/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageLicenseUrl></PackageLicenseUrl>
     <Authors>Owen</Authors>
     <Company>Owen</Company>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Uragano.Logging.Exceptionless/Uragano.Logging.Exceptionless.csproj b/src/Uragano.Logging.Exceptionless/Uragano.Logging.Exceptionless.csproj
@@ -7,10 +7,11 @@
     <Authors>Owen</Authors>
     <Company>Owen</Company>
     <Description>A simple, high performance RPC library.</Description>
-    <PackageLicenseUrl>https://github.com/1100100/Uragano/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageLicenseUrl></PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/1100100/Uragano</PackageProjectUrl>
     <PackageIconUrl>https://raw.githubusercontent.com/1100100/Uragano/master/icon.png</PackageIconUrl>
     <PackageTags>Uragano,RPC,DotNetty,Microservice,MessagePack,DynamicProxy,dotnetcore,service-discovery,polly,circuit-breaker,consul,zookeeper,dependency-injection</PackageTags>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Uragano.Logging.Log4net/Uragano.Logging.Log4Net.csproj b/src/Uragano.Logging.Log4net/Uragano.Logging.Log4Net.csproj
@@ -8,10 +8,11 @@
     <Company>Owen</Company>
     <Description>A simple, high performance RPC library.</Description>
     <Copyright></Copyright>
-    <PackageLicenseUrl>https://github.com/1100100/Uragano/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageLicenseUrl></PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/1100100/Uragano</PackageProjectUrl>
     <PackageIconUrl>https://raw.githubusercontent.com/1100100/Uragano/master/icon.png</PackageIconUrl>
     <PackageTags>Uragano,RPC,DotNetty,Microservice,MessagePack,DynamicProxy,dotnetcore,service-discovery,polly,circuit-breaker,consul,zookeeper,dependency-injection</PackageTags>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Uragano.Logging.NLog/Uragano.Logging.NLog.csproj b/src/Uragano.Logging.NLog/Uragano.Logging.NLog.csproj
@@ -11,6 +11,7 @@
     <PackageIconUrl>https://raw.githubusercontent.com/1100100/Uragano/master/icon.png</PackageIconUrl>
     <PackageTags>Uragano,RPC,DotNetty,Microservice,MessagePack,DynamicProxy,dotnetcore,service-discovery,polly,circuit-breaker,consul,zookeeper,dependency-injection</PackageTags>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Uragano.Remoting/Uragano.Remoting.csproj b/src/Uragano.Remoting/Uragano.Remoting.csproj
@@ -9,9 +9,10 @@
     <PackageProjectUrl>https://github.com/1100100/Uragano</PackageProjectUrl>
     <Description>A simple, high performance RPC library.</Description>
     <Version>0.0.3</Version>
-    <PackageLicenseUrl>https://github.com/1100100/Uragano/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageLicenseUrl></PackageLicenseUrl>
     <Authors>Owen</Authors>
     <Company>Owen</Company>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Uragano.ZooKeeper/Uragano.ZooKeeper.csproj b/src/Uragano.ZooKeeper/Uragano.ZooKeeper.csproj
@@ -11,6 +11,7 @@
     <PackageIconUrl>https://raw.githubusercontent.com/1100100/Uragano/master/icon.png</PackageIconUrl>
     <PackageTags>Uragano,RPC,DotNetty,Microservice,MessagePack,DynamicProxy,dotnetcore,service-discovery,polly,circuit-breaker,consul,zookeeper,dependency-injection</PackageTags>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
 
   <ItemGroup>