Style fix final (kubernetes-client#523)

* all net5 * var * SA1310 * SA1310 * allow 1031 * SA1805 * fix SA1642 * remove unused code * allow sa1405 * isempty * fix CA1714 * fix CA1806 * remove always false if * fix format * fix CA1062 * allow SA0001 * fix CA1062 * allow ca1034 and temp allow ca1835 * fix 16XX doc related warnings * elm SA16XX * elm SA16XX * fix CA2213 * revert to pass all test * move unclear rule to ruleset * follow up of moving ruleset * remove this * fix test flaky
tg123 · Nov 22, 2020 · 5be3cff · 5be3cff
1 parent 8003ab0
commit 5be3cff
Show file tree

Hide file tree

Showing 74 changed files with 841 additions and 628 deletions.
diff --git a/examples/attach/attach.csproj b/examples/attach/attach.csproj
@@ -1,13 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <ItemGroup>
+    <ItemGroup>
     <ProjectReference Include="..\..\src\KubernetesClient\KubernetesClient.csproj" />
   </ItemGroup>
 
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <LangVersion>7.1</LangVersion>
+    <OutputType>Exe</OutputType> 
+    <TargetFramework>net5</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/examples/exec/exec.csproj b/examples/exec/exec.csproj
@@ -6,8 +6,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <LangVersion>7.1</LangVersion>
+    <TargetFramework>net5</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/examples/httpClientFactory/httpClientFactory.csproj b/examples/httpClientFactory/httpClientFactory.csproj
@@ -2,8 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
-    <LangVersion>latest</LangVersion>
+    <TargetFramework>net5</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/examples/labels/labels.csproj b/examples/labels/labels.csproj
@@ -1,12 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\KubernetesClient\KubernetesClient.csproj" />
   </ItemGroup>
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>net5</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/examples/logs/logs.csproj b/examples/logs/logs.csproj
@@ -1,13 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\KubernetesClient\KubernetesClient.csproj" />
   </ItemGroup>
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
-    <LangVersion>7.1</LangVersion>
+    <TargetFramework>net5</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/examples/metrics/metrics.csproj b/examples/metrics/metrics.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/examples/namespace/namespace.csproj b/examples/namespace/namespace.csproj
@@ -1,12 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\KubernetesClient\KubernetesClient.csproj" />
   </ItemGroup>
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>net5</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/examples/patch/patch.csproj b/examples/patch/patch.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net5</TargetFramework>
   </PropertyGroup>
 
     <ItemGroup>

diff --git a/examples/simple/simple.csproj b/examples/simple/simple.csproj
@@ -1,12 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\KubernetesClient\KubernetesClient.csproj" />
   </ItemGroup>
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>net5</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/examples/watch/watch.csproj b/examples/watch/watch.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>net5</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/gen/KubernetesWatchGenerator/Kubernetes.Watch.cs.template b/gen/KubernetesWatchGenerator/Kubernetes.Watch.cs.template
@@ -14,7 +14,7 @@ namespace k8s
     public partial class Kubernetes
     {
         {{#.}}
-        /// <inheritdoc>
+        /// <inheritdoc/>
         public Task<Watcher<{{GetClassName operation}}>> {{GetMethodName operation}}(
 {{#operation.actualParameters}}
 {{#isRequired}}

diff --git a/gen/KubernetesWatchGenerator/KubernetesWatchGenerator.csproj b/gen/KubernetesWatchGenerator/KubernetesWatchGenerator.csproj
@@ -2,8 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
-    <LangVersion>latest</LangVersion>
+    <TargetFramework>net5</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/gen/KubernetesWatchGenerator/Program.cs b/gen/KubernetesWatchGenerator/Program.cs
@@ -67,7 +67,7 @@ private static async Task Main(string[] args)
                 .ToHashSet();
 
             _classNameToPluralMap = swagger.Operations
-                .Where(x => x.Operation.OperationId.StartsWith("list"))
+                .Where(x => x.Operation.OperationId.StartsWith("list", StringComparison.InvariantCulture))
                 .Select(x =>
                 {
                     return new
@@ -82,7 +82,7 @@ private static async Task Main(string[] args)
 
             // dictionary only contains "list" plural maps. assign the same plural names to entities those lists support
             _classNameToPluralMap = _classNameToPluralMap
-                .Where(x => x.Key.EndsWith("List"))
+                .Where(x => x.Key.EndsWith("List", StringComparison.InvariantCulture))
                 .Select(x =>
                     new { ClassName = x.Key.Remove(x.Key.Length - 4), PluralName = x.Value })
                 .ToDictionary(x => x.ClassName, x => x.PluralName)
@@ -171,9 +171,9 @@ private static void ToXmlDoc(RenderContext context, IList<object> arguments, IDi
         {
             if (arguments != null && arguments.Count > 0 && arguments[0] != null && arguments[0] is string)
             {
-                bool first = true;
+                var first = true;
 
-                using (StringReader reader = new StringReader(arguments[0] as string))
+                using (var reader = new StringReader(arguments[0] as string))
                 {
                     string line = null;
                     while ((line = reader.ReadLine()) != null)
@@ -496,9 +496,9 @@ private static void GetPathExpression(RenderContext context, IList<object> argum
 
         private static string GetPathExpression(SwaggerOperationDescription operation)
         {
-            string pathExpression = operation.Path;
+            var pathExpression = operation.Path;
 
-            if (pathExpression.StartsWith("/"))
+            if (pathExpression.StartsWith("/", StringComparison.InvariantCulture))
             {
                 pathExpression = pathExpression.Substring(1);
             }

diff --git a/kubernetes-client.ruleset b/kubernetes-client.ruleset
@@ -85,7 +85,7 @@
     <Rule Id="SA1402" Action="Error" />
 
     <!-- A call to Debug.Assert in C# code does not include a descriptive message. https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1405.md -->
-    <Rule Id="SA1405" Action="Warning" />
+    <Rule Id="SA1405" Action="None" />
 
     <!-- The last statement in a multi-line C# initializer or list is missing a trailing comma. https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1413.md -->
     <Rule Id="SA1413" Action="Error" />
@@ -187,7 +187,7 @@
     <Rule Id="SA1028" Action="Warning" />
 
     <!-- All diagnostics of XML documentation comments has been disabled due to the current project configuration. https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA0001.md -->
-    <Rule Id="SA0001" Action="Warning" />
+    <Rule Id="SA0001" Action="None" />
 
     <!-- Call GC.SuppressFinalize correctly https://docs.microsoft.com/en-us/visualstudio/code-quality/CA1816 -->
     <Rule Id="CA1816" Action="Error" />
@@ -220,10 +220,10 @@
     <Rule Id="CA1028" Action="Warning" />
 
     <!-- Do not catch general exception types https://docs.microsoft.com/en-us/visualstudio/code-quality/CA1031 -->
-    <Rule Id="CA1031" Action="Warning" />
+    <Rule Id="CA1031" Action="None" />
 
     <!-- Nested types should not be visible https://docs.microsoft.com/en-us/visualstudio/code-quality/CA1034 -->
-    <Rule Id="CA1034" Action="Warning" />
+    <Rule Id="CA1034" Action="None" />
 
     <!-- Do not declare visible instance fields https://docs.microsoft.com/en-us/visualstudio/code-quality/CA1051 -->
     <Rule Id="CA1051" Action="Warning" />
@@ -293,5 +293,13 @@
     <!-- TODO -->
     <Rule Id="CA2008" Action="None" />
 
+    <!-- TODO only in netcore2.1+-->
+    <Rule Id="CA1835" Action="Info" />
+
+    <!-- TODO missing doc-->
+    <Rule Id="CS1591" Action="None" />
+    <Rule Id="CS1573" Action="None" />
+    <Rule Id="CS1574" Action="None" />
+
   </Rules>
 </RuleSet>