chore: update client version and remove clientip of ConnectionSetupRe…

…quest
BryanLiu2019 · Sep 10, 2021 · 767e879 · 767e879
1 parent 833d78d
commit 767e879
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 9 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -13,7 +13,7 @@
     <PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="5.*" PrivateAssets="All" />
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.*" PrivateAssets="All" Condition="'$(OS)' != 'Windows_NT'" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.*" PrivateAssets="All"/>
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.164">
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.354">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/_stylecop/codeanalysis.ruleset b/_stylecop/codeanalysis.ruleset
@@ -53,6 +53,8 @@
     <Rule Id="SA1503" Action="None" />
     <!-- Code should not contain multiple blank lines in a row -->
     <Rule Id="SA1507" Action="None" />
+    <!-- File is required to end with a single newline character-->
+    <Rule Id="SA1518" Action="None" />    
     <!-- Element must be documented -->
     <Rule Id="SA1600" Action="None" />
     <!-- Parameter documentation mus be in the right order -->

diff --git a/build/version.props b/build/version.props
@@ -1,5 +1,5 @@
 <Project>
     <PropertyGroup>
-        <NugetVersion>1.2.0</NugetVersion>
+        <NugetVersion>1.2.1</NugetVersion>
     </PropertyGroup>
 </Project>
diff --git a/samples/App3/App3.csproj b/samples/App3/App3.csproj
@@ -7,5 +7,4 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\Nacos.AspNetCore\Nacos.AspNetCore.csproj" />
   </ItemGroup>
-
 </Project>
diff --git a/src/Nacos/V2/Common/Constants.cs b/src/Nacos/V2/Common/Constants.cs
@@ -2,7 +2,7 @@
 {
     public class Constants
     {
-        public static string CLIENT_VERSION = "Nacos-CSharp-Client:v1.1.0";
+        public static string CLIENT_VERSION = "Nacos-CSharp-Client:v1.2.1";
 
         public static int DATA_IN_BODY_VERSION = 204;
 

diff --git a/src/Nacos/V2/Naming/Backups/FailoverReactor.cs b/src/Nacos/V2/Naming/Backups/FailoverReactor.cs
@@ -170,7 +170,7 @@ public async Task RunFailoverFileRead()
                     {
                         var dataString = await file.ReadFileAsync().ConfigureAwait(false);
 
-                        using (StringReader reader = new (dataString))
+                        using (StringReader reader = new StringReader(dataString))
                         {
                             var json = reader.ReadLine();
 

diff --git a/src/Nacos/V2/Remote/GRpc/GrpcClient.cs b/src/Nacos/V2/Remote/GRpc/GrpcClient.cs
@@ -52,7 +52,6 @@ public override RemoteConnection ConnectToServer(RemoteServerInfo serverInfo)
                     ClientVersion = Constants.CLIENT_VERSION,
                     Labels = labels,
                     Abilities = clientAbilities,
-                    ClientIp = Utils.NetUtils.LocalIP(),
                     Tenant = GetTenant()
                 };
 

diff --git a/src/Nacos/V2/Remote/Requests/ConnectionSetupRequest.cs b/src/Nacos/V2/Remote/Requests/ConnectionSetupRequest.cs
@@ -13,9 +13,6 @@ public class ConnectionSetupRequest : CommonRequest
         [Newtonsoft.Json.JsonProperty("tenant")]
         public string Tenant { get; set; }
 
-        [Newtonsoft.Json.JsonProperty("clientIp")]
-        public string ClientIp { get; set; }
-
         [Newtonsoft.Json.JsonProperty("labels")]
         public Dictionary<string, string> Labels = new Dictionary<string, string>();