Honor original code style

dependabot · Feb 1, 2024 · bc0a308 · bc0a308
1 parent 2fca256
commit bc0a308
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 40 deletions.
diff --git a/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/UpdateWorkerTestBase.cs b/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/UpdateWorkerTestBase.cs
@@ -26,8 +26,7 @@ public abstract class UpdateWorkerTestBase
         expectedProjectContents: projectContents,
         isTransitive,
         additionalFiles,
-        additionalFilesExpected: additionalFiles
-    );
+        additionalFilesExpected: additionalFiles);
 
     protected static Task TestUpdateForProject(
         string dependencyName,
@@ -47,8 +46,7 @@ public abstract class UpdateWorkerTestBase
         expectedProjectContents,
         isTransitive,
         additionalFiles,
-        additionalFilesExpected
-    );
+        additionalFilesExpected);
 
     protected static async Task TestUpdateForProject(
         string dependencyName,

diff --git a/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Utilities/MSBuildHelperTests.cs b/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Utilities/MSBuildHelperTests.cs
@@ -171,8 +171,7 @@ public async Task AllPackageDependenciesCanBeTraversed()
             temp.DirectoryPath,
             temp.DirectoryPath,
             "netstandard2.0",
-            [new Dependency("Microsoft.Extensions.Http", "7.0.0", DependencyType.Unknown)]
-        );
+            [new Dependency("Microsoft.Extensions.Http", "7.0.0", DependencyType.Unknown)]);
         Assert.Equal(expectedDependencies, actualDependencies);
     }
 
@@ -338,8 +337,7 @@ public async Task AllPackageDependenciesCanBeFoundWithNuGetConfig()
                 temp.DirectoryPath,
                 temp.DirectoryPath,
                 "netstandard2.0",
-                [new Dependency("Microsoft.CodeAnalysis.Common", "4.8.0-3.23457.5", DependencyType.Unknown)]
-            );
+                [new Dependency("Microsoft.CodeAnalysis.Common", "4.8.0-3.23457.5", DependencyType.Unknown)]);
             Assert.Equal([], dependenciesNoNuGetConfig);
 
             // Write the NuGet.config and try again.
@@ -353,8 +351,7 @@ public async Task AllPackageDependenciesCanBeFoundWithNuGetConfig()
                     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
                   </packageSources>
                 </configuration>
-                """
-            );
+                """);
 
             var expectedDependencies = new Dependency[]
             {
@@ -621,7 +618,8 @@ yield return
             // expected dependencies
             new Dependency[]
             {
-                new("Azure.Identity", "1.6.0", DependencyType.Unknown), new("Microsoft.Data.SqlClient", "5.1.4", DependencyType.Unknown, IsUpdate: true)
+                new("Azure.Identity", "1.6.0", DependencyType.Unknown),
+                new("Microsoft.Data.SqlClient", "5.1.4", DependencyType.Unknown, IsUpdate: true)
             }
         ];
     }

diff --git a/...pers/lib/NuGetUpdater/NuGetUpdater.Core/FrameworkChecker/FrameworkCompatibilityService.cs b/...pers/lib/NuGetUpdater/NuGetUpdater.Core/FrameworkChecker/FrameworkCompatibilityService.cs
@@ -66,7 +66,11 @@ public ISet<NuGetFramework> GetCompatibleFrameworks(IEnumerable<NuGetFramework>?
 
         matrix.Add(
             SupportedFrameworks.Net60Windows7,
-            new HashSet<NuGetFramework> { SupportedFrameworks.Net60Windows, SupportedFrameworks.Net60Windows7, SupportedFrameworks.Net70Windows, SupportedFrameworks.Net70Windows7 }
+            new HashSet<NuGetFramework>
+            {
+                SupportedFrameworks.Net60Windows, SupportedFrameworks.Net60Windows7,
+                SupportedFrameworks.Net70Windows, SupportedFrameworks.Net70Windows7
+            }
         );
 
         return matrix;

diff --git a/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/FrameworkChecker/SupportedFrameworks.cs b/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/FrameworkChecker/SupportedFrameworks.cs
@@ -45,8 +45,7 @@ public static class SupportedFrameworks
         public static readonly NuGetFramework Net70TvOs = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version7, "tvos", EmptyVersion);
         public static readonly NuGetFramework Net70Windows = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version7, "windows", EmptyVersion);
 
-        public static readonly NuGetFramework
-            Net80 = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version8); // https://github.com/NuGet/Engineering/issues/5112
+        public static readonly NuGetFramework Net80 = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version8); // https://github.com/NuGet/Engineering/issues/5112
 
         public static readonly NuGetFramework Net80Android = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version8, "android", EmptyVersion);
         public static readonly NuGetFramework Net80Ios = new NuGetFramework(FrameworkIdentifiers.NetCoreApp, Version8, "ios", EmptyVersion);

diff --git a/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Updater/SdkPackageUpdater.cs b/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Updater/SdkPackageUpdater.cs
@@ -247,29 +247,33 @@ private static async Task AddTransitiveDependencyAsync(string projectPath, strin
     }
 
     private static void UpdateTopLevelDepdendency(
-        ImmutableArray<ProjectBuildFile> buildFiles, string dependencyName, string previousDependencyVersion,
-        string newDependencyVersion, IDictionary<string, string> packagesAndVersions, Logger logger
+        ImmutableArray<ProjectBuildFile> buildFiles,
+        string dependencyName,
+        string previousDependencyVersion,
+        string newDependencyVersion,
+        IDictionary<string, string> packagesAndVersions,
+        Logger logger
     )
     {
-        var result = TryUpdateDependencyVersion(buildFiles, dependencyName, previousDependencyVersion,
-            newDependencyVersion, logger);
+        var result = TryUpdateDependencyVersion(buildFiles, dependencyName, previousDependencyVersion, newDependencyVersion, logger);
         if (result == UpdateResult.NotFound)
         {
-            logger.Log(
-                $"    Root package [{dependencyName}/{previousDependencyVersion}] was not updated; skipping dependencies.");
+            logger.Log($"    Root package [{dependencyName}/{previousDependencyVersion}] was not updated; skipping dependencies.");
             return;
         }
 
-        foreach (var (packageName, packageVersion) in packagesAndVersions.Where(kvp =>
-                     string.Compare(kvp.Key, dependencyName, StringComparison.OrdinalIgnoreCase) != 0))
+        foreach (var (packageName, packageVersion) in packagesAndVersions.Where(kvp => string.Compare(kvp.Key, dependencyName, StringComparison.OrdinalIgnoreCase) != 0))
         {
-            TryUpdateDependencyVersion(buildFiles, packageName, previousDependencyVersion: null,
-                newDependencyVersion: packageVersion, logger);
+            TryUpdateDependencyVersion(buildFiles, packageName, previousDependencyVersion: null, newDependencyVersion: packageVersion, logger);
         }
     }
 
     private static UpdateResult TryUpdateDependencyVersion(
-        ImmutableArray<ProjectBuildFile> buildFiles, string dependencyName, string? previousDependencyVersion, string newDependencyVersion, Logger logger
+        ImmutableArray<ProjectBuildFile> buildFiles,
+        string dependencyName,
+        string? previousDependencyVersion,
+        string newDependencyVersion,
+        Logger logger
     )
     {
         var foundCorrect = false;
@@ -503,18 +507,13 @@ private static async Task AddTransitiveDependencyAsync(string projectPath, strin
                     : UpdateResult.NotFound;
     }
 
-    private static IEnumerable<IXmlElementSyntax> FindPackageNodes(ProjectBuildFile buildFile, string packageName)
-    {
-        return buildFile.PackageItemNodes.Where(e =>
-            string.Equals(
-                e.GetAttributeOrSubElementValue("Include", StringComparison.OrdinalIgnoreCase)
-                ?? e.GetAttributeOrSubElementValue("Update", StringComparison.OrdinalIgnoreCase),
-                packageName,
-                StringComparison.OrdinalIgnoreCase
-            ) &&
-            (
-                e.GetAttributeOrSubElementValue("Version", StringComparison.OrdinalIgnoreCase)
-                ?? e.GetAttributeOrSubElementValue("VersionOverride", StringComparison.OrdinalIgnoreCase)
-            ) is not null);
-    }
+    private static IEnumerable<IXmlElementSyntax> FindPackageNodes(
+        ProjectBuildFile buildFile,
+        string packageName
+    ) => buildFile.PackageItemNodes.Where(e =>
+        string.Equals(
+            e.GetAttributeOrSubElementValue("Include", StringComparison.OrdinalIgnoreCase) ?? e.GetAttributeOrSubElementValue("Update", StringComparison.OrdinalIgnoreCase),
+            packageName,
+            StringComparison.OrdinalIgnoreCase) &&
+        (e.GetAttributeOrSubElementValue("Version", StringComparison.OrdinalIgnoreCase) ?? e.GetAttributeOrSubElementValue("VersionOverride", StringComparison.OrdinalIgnoreCase)) is not null);
 }
diff --git a/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/JsonHelper.cs b/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/JsonHelper.cs
@@ -34,7 +34,8 @@ public static string UpdateJsonProperty(string json, string[] propertyPath, stri
             using var ms = new MemoryStream();
             var writerOptions = new JsonWriterOptions
             {
-                Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping, Indented = true,
+                Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
+                Indented = true,
             };
             var writer = new Utf8JsonWriter(ms, writerOptions);