Code clean: 1) Remove the backup files, 2) Remve the .NETCore related…

… 3) Add 'Microsoft.CodeAnalysis.NetAnalyzers' for code analysis
OData · Dec 10, 2024 · 25b6e8e · 25b6e8e
1 parent 5e715a2
commit 25b6e8e
Show file tree

Hide file tree

Showing 19 changed files with 24 additions and 2,601 deletions.
diff --git a/src/Microsoft.OData.Client/Microsoft.OData.Client.csproj b/src/Microsoft.OData.Client/Microsoft.OData.Client.csproj
@@ -157,6 +157,10 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/Microsoft.OData.Core/Json/ODataUtf8JsonWriter.TextWriter.cs b/src/Microsoft.OData.Core/Json/ODataUtf8JsonWriter.TextWriter.cs
@@ -42,7 +42,7 @@ public TextWriter StartTextWriterValueScope(string contentType)
             WriteItemWithSeparatorIfNeeded();
 
             this.currentTextWriterContentType = contentType;
-            this.isWritingJson = this.CheckIfWritingJson(this.currentTextWriterContentType);
+            this.isWritingJson = CheckIfWritingJson(this.currentTextWriterContentType);
 
             // We don't perform escaping when the content type is not JSON
             // since we assume the input to be already a valid JSON with all escaping handled by the caller.
@@ -128,7 +128,7 @@ public async Task EndTextWriterValueScopeAsync()
         /// Checks whether the current TextWriter is writing JSON
         /// </summary>
         /// <returns></returns>
-        private bool CheckIfWritingJson(string currentContentType)
+        private static bool CheckIfWritingJson(string currentContentType)
         {
             return string.IsNullOrEmpty(currentContentType) || currentContentType.StartsWith(MimeConstants.MimeApplicationJson, StringComparison.Ordinal);
         }

diff --git a/src/Microsoft.OData.Core/Json/TranscodingWriteStream.cs b/src/Microsoft.OData.Core/Json/TranscodingWriteStream.cs
@@ -406,7 +406,7 @@ async ValueTask WriteAsyncCore(ReadOnlyMemory<byte> remainingOuterEncodedBytes,
         public override void WriteByte(byte value)
             => Write(new ReadOnlySpan<byte>(new byte[] { value }));
 
-        private static void ValidateBufferArguments(byte[] buffer, int offset, int size)
+        private static new void ValidateBufferArguments(byte[] buffer, int offset, int size)
         {
             if (buffer == null)
             {

diff --git a/src/Microsoft.OData.Core/Microsoft.OData.Core.csproj b/src/Microsoft.OData.Core/Microsoft.OData.Core.csproj
@@ -57,6 +57,10 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/Microsoft.OData.Core/ShippingAssemblyAttributes.cs b/src/Microsoft.OData.Core/ShippingAssemblyAttributes.cs
@@ -20,6 +20,4 @@
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Microsoft.Test.Taupo.OData" + AssemblyRef.TestPublicKey)]
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Microsoft.OData.Core.Tests" + AssemblyRef.TestPublicKey)]
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Microsoft.OData.Client.Tests" + AssemblyRef.TestPublicKey)]
-[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Microsoft.Test.OData.DependencyInjection.NetCore" + AssemblyRef.TestPublicKey)]
-[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Microsoft.OData.Core.Tests.NetCore" + AssemblyRef.TestPublicKey)]
 #pragma warning restore 436
diff --git a/src/Microsoft.OData.Core/UriParser/Visitors/PathSegmentTokenEqualityComparer.cs b/src/Microsoft.OData.Core/UriParser/Visitors/PathSegmentTokenEqualityComparer.cs
@@ -32,7 +32,7 @@ public override bool Equals(PathSegmentToken first, PathSegmentToken second)
                 return false;
             }
 
-            return this.ToHashableString(first) == this.ToHashableString(second);
+            return ToHashableString(first) == ToHashableString(second);
         }
 
         /// <summary>
@@ -49,22 +49,22 @@ public override int GetHashCode(PathSegmentToken path)
                 return 0;
             }
 
-            return this.ToHashableString(path).GetHashCode(StringComparison.Ordinal);
+            return ToHashableString(path).GetHashCode(StringComparison.Ordinal);
         }
 
         /// <summary>
         /// Converts the token to a string that is sufficiently unique to be hashed or compared.
         /// </summary>
         /// <param name="token">The path token to convert to a string.</param>
         /// <returns>A string representing the path.</returns>
-        private string ToHashableString(PathSegmentToken token)
+        private static string ToHashableString(PathSegmentToken token)
         {
             if (token.NextToken == null)
             {
                 return token.Identifier;
             }
 
-            return token.Identifier + "/" + this.ToHashableString(token.NextToken);
+            return token.Identifier + "/" + ToHashableString(token.NextToken);
         }
     }
 }
diff --git a/src/Microsoft.OData.Edm/Microsoft.OData.Edm.csproj b/src/Microsoft.OData.Edm/Microsoft.OData.Edm.csproj
@@ -96,6 +96,10 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/Microsoft.OData.Edm/ShippingAssemblyAttributes.cs b/src/Microsoft.OData.Edm/ShippingAssemblyAttributes.cs
@@ -11,9 +11,3 @@
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("EdmLibTests" + AssemblyRef.TestPublicKey)]
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("EdmLibTests.SL" + AssemblyRef.TestPublicKey)]
 #pragma warning restore 436
-
-// .NET Core
-[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Microsoft.OData.TestCommon.NetCore" + AssemblyRef.TestPublicKey)]
-[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Microsoft.OData.Edm.Tests.NetCore" + AssemblyRef.TestPublicKey)]
-[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Microsoft.OData.Core.Tests.NetCore" + AssemblyRef.TestPublicKey)]
-[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Microsoft.Spatial.Tests.NetCore" + AssemblyRef.TestPublicKey)]
diff --git a/src/Microsoft.Spatial/InternalsVisibleTo.cs b/src/Microsoft.Spatial/InternalsVisibleTo.cs
@@ -10,10 +10,4 @@
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Microsoft.OData.Service.Test.Client.TDDUnitTests" + AssemblyRef.TestPublicKey)]
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("AstoriaUnitTests.TDDUnitTests" + AssemblyRef.TestPublicKey)]
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Microsoft.Spatial.TDDUnitTests" + AssemblyRef.TestPublicKey)]
-[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Microsoft.Spatial.Tests" + AssemblyRef.TestPublicKey)]
-
-// .NET Core
-[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Microsoft.OData.TestCommon.NetCore" + AssemblyRef.TestPublicKey)]
-[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Microsoft.OData.Edm.Tests.NetCore" + AssemblyRef.TestPublicKey)]
-[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Microsoft.OData.Core.Tests.NetCore" + AssemblyRef.TestPublicKey)]
-[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Microsoft.Spatial.Tests.NetCore" + AssemblyRef.TestPublicKey)]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Microsoft.Spatial.Tests" + AssemblyRef.TestPublicKey)]
diff --git a/src/Microsoft.Spatial/Microsoft.Spatial.csproj b/src/Microsoft.Spatial/Microsoft.Spatial.csproj
@@ -36,6 +36,10 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>