From bc0a308b966491210d56929b2ef7864403c40b4e Mon Sep 17 00:00:00 2001 From: Jan Trejbal Date: Thu, 1 Feb 2024 14:08:19 +0100 Subject: [PATCH] Honor original code style --- .../Update/UpdateWorkerTestBase.cs | 6 +-- .../Utilities/MSBuildHelperTests.cs | 12 ++--- .../FrameworkCompatibilityService.cs | 6 ++- .../FrameworkChecker/SupportedFrameworks.cs | 3 +- .../Updater/SdkPackageUpdater.cs | 49 +++++++++---------- .../NuGetUpdater.Core/Utilities/JsonHelper.cs | 3 +- 6 files changed, 39 insertions(+), 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 index fb756b439cdb..ce120120ef26 100644 --- 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 index 0862cf83e7d1..7fe941c2bb6b 100644 --- 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() - """ - ); + """); 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/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/FrameworkChecker/FrameworkCompatibilityService.cs b/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/FrameworkChecker/FrameworkCompatibilityService.cs index 6e82a4f8e17d..e3e6642e1590 100644 --- a/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/FrameworkChecker/FrameworkCompatibilityService.cs +++ b/nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core/FrameworkChecker/FrameworkCompatibilityService.cs @@ -66,7 +66,11 @@ public ISet GetCompatibleFrameworks(IEnumerable? matrix.Add( SupportedFrameworks.Net60Windows7, - new HashSet { SupportedFrameworks.Net60Windows, SupportedFrameworks.Net60Windows7, SupportedFrameworks.Net70Windows, SupportedFrameworks.Net70Windows7 } + new HashSet + { + 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 index 0695cda552dc..9ded2bf4f2be 100644 --- 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 index e9b9222e4cee..c37549a2954a 100644 --- 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 buildFiles, string dependencyName, string previousDependencyVersion, - string newDependencyVersion, IDictionary packagesAndVersions, Logger logger + ImmutableArray buildFiles, + string dependencyName, + string previousDependencyVersion, + string newDependencyVersion, + IDictionary 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 buildFiles, string dependencyName, string? previousDependencyVersion, string newDependencyVersion, Logger logger + ImmutableArray 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 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 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 index b4b379f3881c..1c5683ddd6c6 100644 --- 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);