correct some sonarcloud complaints and use newer hashing library (#132)

sensslen · Dec 29, 2024 · 61975d0 · 61975d0
1 parent d1a88ff
commit 61975d0
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 13 deletions.
diff --git a/src/NuGetUtility/NuGetUtility.csproj b/src/NuGetUtility/NuGetUtility.csproj
@@ -45,7 +45,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net472'">
-    <PackageReference Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
+    <PackageReference Include="System.IO.Hashing" Version="9.0.0" />
     <PackageReference Include="System.Collections.Immutable" Version="9.0.0" />
     <PackageReference Include="Microsoft.Build" ExcludeAssets="runtime" Version="17.12.*" />
     <PackageReference Include="PolySharp" Version="1.15.*">

diff --git a/src/NuGetUtility/Wrapper/NuGetWrapper/NugetWrapperException.cs b/src/NuGetUtility/Wrapper/NuGetWrapper/NugetWrapperException.cs
@@ -3,7 +3,7 @@
 
 namespace NuGetUtility.Wrapper.NuGetWrapper
 {
-    internal class NugetWrapperException : Exception
+    public class NugetWrapperException : Exception
     {
         public NugetWrapperException(string message)
             : base(message) { }

diff --git a/...uGetUtility/Wrapper/NuGetWrapper/Protocol/Core/Types/CachingDisposableSourceRepository.cs b/...uGetUtility/Wrapper/NuGetWrapper/Protocol/Core/Types/CachingDisposableSourceRepository.cs
@@ -5,7 +5,7 @@
 
 namespace NuGetUtility.Wrapper.NuGetWrapper.Protocol.Core.Types
 {
-    internal class CachingDisposableSourceRepository : IDisposableSourceRepository
+    internal sealed class CachingDisposableSourceRepository : IDisposableSourceRepository
     {
         private readonly SourceCacheContext _cacheContext = new SourceCacheContext();
         private readonly SourceRepository _sourceRepository;

diff --git a/src/NuGetUtility/Wrapper/NuGetWrapper/Protocol/Core/Types/WrappedSourceRepositoryProvider.cs b/src/NuGetUtility/Wrapper/NuGetWrapper/Protocol/Core/Types/WrappedSourceRepositoryProvider.cs
@@ -5,7 +5,7 @@
 
 namespace NuGetUtility.Wrapper.NuGetWrapper.Protocol.Core.Types
 {
-    internal class WrappedSourceRepositoryProvider : IWrappedSourceRepositoryProvider, IDisposable
+    internal sealed class WrappedSourceRepositoryProvider : IWrappedSourceRepositoryProvider, IDisposable
     {
         private readonly IDisposableSourceRepository[] _repositories;
 

diff --git a/tests/NuGetUtility.Test/Helper/AutoFixture/NuGet/Versioning/ExtendedAutoDataAttribute.cs b/tests/NuGetUtility.Test/Helper/AutoFixture/NuGet/Versioning/ExtendedAutoDataAttribute.cs
@@ -7,6 +7,7 @@
 
 namespace NuGetUtility.Test.Helper.AutoFixture.NuGet.Versioning
 {
+    [AttributeUsage(AttributeTargets.Method)]
     public class ExtendedAutoDataAttribute : AutoDataAttribute
     {
         public ExtendedAutoDataAttribute(params System.Type[] customizations)

diff --git a/.../NuGetUtility.Test/Helper/AutoFixture/NuGet/Versioning/ExtendedInlineAutoDataAttribute.cs b/.../NuGetUtility.Test/Helper/AutoFixture/NuGet/Versioning/ExtendedInlineAutoDataAttribute.cs
@@ -7,6 +7,7 @@
 
 namespace NuGetUtility.Test.Helper.AutoFixture.NuGet.Versioning
 {
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
     public class ExtendedInlineAutoDataAttribute : InlineAutoDataAttribute
     {
         public ExtendedInlineAutoDataAttribute(System.Type customization, params object[] arguments)

diff --git a/tests/NuGetUtility.Test/Helper/AutoFixture/NuGet/Versioning/NuGetVersionBuilder.cs b/tests/NuGetUtility.Test/Helper/AutoFixture/NuGet/Versioning/NuGetVersionBuilder.cs
@@ -12,12 +12,9 @@ internal class NuGetVersionBuilder : ISpecimenBuilder
 
         public object Create(object request, ISpecimenContext context)
         {
-            if (request is System.Type t)
+            if (request is System.Type t && t == typeof(INuGetVersion))
             {
-                if (t == typeof(INuGetVersion))
-                {
-                    return new NuGetVersion($"{_rnd.Next(100, 999)}.{_rnd.Next(100, 999)}{GetPatch()}{GetBeta()}");
-                }
+                return new NuGetVersion($"{_rnd.Next(100, 999)}.{_rnd.Next(100, 999)}{GetPatch()}{GetBeta()}");
             }
 
             return new NoSpecimen();

diff --git a/tests/NuGetUtility.Test/LicenseValidator/LicenseValidationResultValueEqualityComparer.cs b/tests/NuGetUtility.Test/LicenseValidator/LicenseValidationResultValueEqualityComparer.cs
@@ -26,7 +26,7 @@ public int GetHashCode(LicenseValidationResult obj)
                 obj.PackageVersion,
                 obj.PackageProjectUrl);
         }
-        private HashCode GetHashCode(List<ValidationError> validationErrors)
+        private static HashCode GetHashCode(List<ValidationError> validationErrors)
         {
             var code = new HashCode();
             foreach (ValidationError error in validationErrors)

diff --git a/tests/NuGetUtility.Test/Output/TestBase.cs b/tests/NuGetUtility.Test/Output/TestBase.cs
@@ -54,7 +54,7 @@ public void SetUp()
         }
         protected abstract IOutputFormatter CreateUut();
 
-        private T? GetNullable<T>(Faker faker, Func<T> getter) where T : class
+        private static T? GetNullable<T>(Faker faker, Func<T> getter) where T : class
         {
             if (faker.Random.Bool())
             {
@@ -63,7 +63,7 @@ public void SetUp()
             return getter();
         }
 
-        private IEnumerable<ValidationError> GetErrorList(Faker faker)
+        private static IEnumerable<ValidationError> GetErrorList(Faker faker)
         {
             int itemCount = faker.Random.Int(3, 10);
             for (int i = 0; i < itemCount; i++)

diff --git a/tests/NuGetUtility.Test/PackageInformationReader/PackageInformationReaderTest.cs b/tests/NuGetUtility.Test/PackageInformationReader/PackageInformationReaderTest.cs
@@ -139,7 +139,7 @@ public async Task GetPackageInfo_Should_PreferLocalPackageCacheOverRepositories(
             }
         }
 
-        private void SetupPackagesForRepositories(IEnumerable<CustomPackageInformation> packages, IEnumerable<IPackageMetadataResource> packageMetadataResources)
+        private static void SetupPackagesForRepositories(IEnumerable<CustomPackageInformation> packages, IEnumerable<IPackageMetadataResource> packageMetadataResources)
         {
             foreach (CustomPackageInformation package in packages)
             {
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
             }
-            private void SetupPackagesForRepositories(IEnumerable<CustomPackageInformation> packages, IEnumerable<IPackageMetadataResource> packageMetadataResources)
+            private static void SetupPackagesForRepositories(IEnumerable<CustomPackageInformation> packages, IEnumerable<IPackageMetadataResource> packageMetadataResources)
             {
                 foreach (CustomPackageInformation package in packages)
                 {
@@ Expand Down @@