From 8cc09668ba309bbf63bad12796452f68933e4355 Mon Sep 17 00:00:00 2001 From: elachlan <2433737+elachlan@users.noreply.github.com> Date: Wed, 12 Jan 2022 18:30:59 +1000 Subject: [PATCH] SA1508 A closing brace should not be preceded by a blank line --- eng/Common.globalconfig | 2 +- src/Build.UnitTests/BackEnd/SdkResultItemComparison_Tests.cs | 1 - src/Build.UnitTests/BackEnd/TaskHostConfiguration_Tests.cs | 1 - src/Build.UnitTests/EventArgsFormatting_Tests.cs | 1 - src/Build.UnitTests/ProjectCache/ProjectCacheTests.cs | 1 - src/Build/BackEnd/BuildManager/BuildManager.cs | 1 - src/Build/BackEnd/Components/RequestBuilder/TaskHost.cs | 1 - .../BackEnd/Components/SdkResolution/SdkResolverService.cs | 1 - src/Build/BackEnd/Shared/BuildRequest.cs | 1 - src/Build/Evaluation/Evaluator.cs | 1 - src/Build/Evaluation/LazyItemEvaluator.EvaluatorData.cs | 1 - .../Evaluation/LazyItemEvaluator.OrderedItemDataCollection.cs | 1 - src/Build/Instance/ProjectItemGroupTaskItemInstance.cs | 1 - src/Build/ObjectModelRemoting/LinkedObjectFactory.cs | 1 - src/MSBuild.UnitTests/XMake_Tests.cs | 1 - src/Shared/BufferedReadStream.cs | 1 - src/Shared/UnitTests/FileUtilities_Tests.cs | 1 - src/Tasks.UnitTests/ReadLinesFromFile_Tests.cs | 1 - src/Tasks.UnitTests/WriteCodeFragment_Tests.cs | 1 - src/Tasks/WriteCodeFragment.cs | 1 - src/Utilities.UnitTests/CommandLineBuilder_Tests.cs | 1 - src/Utilities.UnitTests/EventArgsFormatting_Tests.cs | 1 - 22 files changed, 1 insertion(+), 22 deletions(-) diff --git a/eng/Common.globalconfig b/eng/Common.globalconfig index ba417e063f2..48785df0c0d 100644 --- a/eng/Common.globalconfig +++ b/eng/Common.globalconfig @@ -993,7 +993,7 @@ dotnet_diagnostic.SA1506.severity = suggestion dotnet_diagnostic.SA1507.severity = suggestion # A closing brace should not be preceded by a blank line -dotnet_diagnostic.SA1508.severity = suggestion +dotnet_diagnostic.SA1508.severity = warning # Opening braces should not be preceded by blank line dotnet_diagnostic.SA1509.severity = suggestion diff --git a/src/Build.UnitTests/BackEnd/SdkResultItemComparison_Tests.cs b/src/Build.UnitTests/BackEnd/SdkResultItemComparison_Tests.cs index cec66126473..20c76c5c493 100644 --- a/src/Build.UnitTests/BackEnd/SdkResultItemComparison_Tests.cs +++ b/src/Build.UnitTests/BackEnd/SdkResultItemComparison_Tests.cs @@ -55,6 +55,5 @@ public void SdkResultItem_GetHashCode_Compare_MetadataIgnoreKeyOrder() hashSdkItem1.ShouldBe(hashSdkItem2); } - } } diff --git a/src/Build.UnitTests/BackEnd/TaskHostConfiguration_Tests.cs b/src/Build.UnitTests/BackEnd/TaskHostConfiguration_Tests.cs index 0d596b32bc5..87905c53e65 100644 --- a/src/Build.UnitTests/BackEnd/TaskHostConfiguration_Tests.cs +++ b/src/Build.UnitTests/BackEnd/TaskHostConfiguration_Tests.cs @@ -611,7 +611,6 @@ public void TestTranslationWithWarningsAsErrors() #endif Assert.NotNull(deserializedConfig.WarningsAsErrors); config.WarningsAsErrors.SequenceEqual(deserializedConfig.WarningsAsErrors, StringComparer.Ordinal).ShouldBeTrue(); - } /// diff --git a/src/Build.UnitTests/EventArgsFormatting_Tests.cs b/src/Build.UnitTests/EventArgsFormatting_Tests.cs index 1f19220f9b1..6ab17518cfc 100644 --- a/src/Build.UnitTests/EventArgsFormatting_Tests.cs +++ b/src/Build.UnitTests/EventArgsFormatting_Tests.cs @@ -135,7 +135,6 @@ public void NullMessage() EventArgsFormatting.FormatEventMessage("error", "CS", null, "312", "source.cs", 233, 236, 4, 8, 0); // No exception was thrown - } } } diff --git a/src/Build.UnitTests/ProjectCache/ProjectCacheTests.cs b/src/Build.UnitTests/ProjectCache/ProjectCacheTests.cs index 07d7ce076ac..68267fc233c 100644 --- a/src/Build.UnitTests/ProjectCache/ProjectCacheTests.cs +++ b/src/Build.UnitTests/ProjectCache/ProjectCacheTests.cs @@ -836,7 +836,6 @@ public void RunningProxyBuildsOnOutOfProcNodesShouldIssueWarning(bool disableInp buildSession.Logger.FullLog.ShouldContain("Static graph based"); buildSession.Logger.AssertMessageCount("MSB4274", 1); - } private void AssertCacheBuild( diff --git a/src/Build/BackEnd/BuildManager/BuildManager.cs b/src/Build/BackEnd/BuildManager/BuildManager.cs index e2b4a71dc6f..206e0383f2a 100644 --- a/src/Build/BackEnd/BuildManager/BuildManager.cs +++ b/src/Build/BackEnd/BuildManager/BuildManager.cs @@ -1762,7 +1762,6 @@ void IssueBuildSubmissionToSchedulerImpl(BuildSubmission submission, bool allowM ReportResultsToSubmission(new BuildResult(submission.BuildRequest, ex)); _overallBuildSuccess = false; } - } } } diff --git a/src/Build/BackEnd/Components/RequestBuilder/TaskHost.cs b/src/Build/BackEnd/Components/RequestBuilder/TaskHost.cs index 9ab8c7b0227..dcff489cd06 100644 --- a/src/Build/BackEnd/Components/RequestBuilder/TaskHost.cs +++ b/src/Build/BackEnd/Components/RequestBuilder/TaskHost.cs @@ -903,7 +903,6 @@ public override bool LogsMessagesOfImportance(MessageImportance importance) #endif MessageImportance minimumImportance = _taskHost._taskLoggingContext?.LoggingService.MinimumRequiredMessageImportance ?? MessageImportance.Low; return importance <= minimumImportance; - } /// diff --git a/src/Build/BackEnd/Components/SdkResolution/SdkResolverService.cs b/src/Build/BackEnd/Components/SdkResolution/SdkResolverService.cs index 6c74e1f12b7..f6675ba42a5 100644 --- a/src/Build/BackEnd/Components/SdkResolution/SdkResolverService.cs +++ b/src/Build/BackEnd/Components/SdkResolution/SdkResolverService.cs @@ -241,7 +241,6 @@ private void Initialize(LoggingContext loggingContext, ElementLocation location) _resolvers = _sdkResolverLoader.LoadResolvers(loggingContext, location); MSBuildEventSource.Log.SdkResolverServiceInitializeStop(_resolvers.Count); } - } private void SetResolverState(int submissionId, SdkResolver resolver, object state) diff --git a/src/Build/BackEnd/Shared/BuildRequest.cs b/src/Build/BackEnd/Shared/BuildRequest.cs index 5958f654534..d0ffa213952 100644 --- a/src/Build/BackEnd/Shared/BuildRequest.cs +++ b/src/Build/BackEnd/Shared/BuildRequest.cs @@ -97,7 +97,6 @@ internal class BuildRequest : INodePacket /// public BuildRequest() { - } private BuildRequest( diff --git a/src/Build/Evaluation/Evaluator.cs b/src/Build/Evaluation/Evaluator.cs index 53f192f268d..5f785ca60c4 100644 --- a/src/Build/Evaluation/Evaluator.cs +++ b/src/Build/Evaluation/Evaluator.cs @@ -1229,7 +1229,6 @@ private void AddToolsetProperties() } } } - } /// diff --git a/src/Build/Evaluation/LazyItemEvaluator.EvaluatorData.cs b/src/Build/Evaluation/LazyItemEvaluator.EvaluatorData.cs index 0934053e67e..0255a8fbf2d 100644 --- a/src/Build/Evaluation/LazyItemEvaluator.EvaluatorData.cs +++ b/src/Build/Evaluation/LazyItemEvaluator.EvaluatorData.cs @@ -313,5 +313,4 @@ public P SetProperty(string name, string evaluatedValueEscaped, bool isGlobalPro } } } - } diff --git a/src/Build/Evaluation/LazyItemEvaluator.OrderedItemDataCollection.cs b/src/Build/Evaluation/LazyItemEvaluator.OrderedItemDataCollection.cs index ac9264ca6dc..5df914d50e8 100644 --- a/src/Build/Evaluation/LazyItemEvaluator.OrderedItemDataCollection.cs +++ b/src/Build/Evaluation/LazyItemEvaluator.OrderedItemDataCollection.cs @@ -78,7 +78,6 @@ public ItemData this[int index] ItemDataCollectionValue newDictionaryEntry = _dictionaryBuilder[newNormalizedValue]; newDictionaryEntry.Add(value.Item); _dictionaryBuilder[newNormalizedValue] = newDictionaryEntry; - } else { diff --git a/src/Build/Instance/ProjectItemGroupTaskItemInstance.cs b/src/Build/Instance/ProjectItemGroupTaskItemInstance.cs index 9eeda046676..255729b5ba3 100644 --- a/src/Build/Instance/ProjectItemGroupTaskItemInstance.cs +++ b/src/Build/Instance/ProjectItemGroupTaskItemInstance.cs @@ -197,7 +197,6 @@ List metadata private ProjectItemGroupTaskItemInstance() { - } /// diff --git a/src/Build/ObjectModelRemoting/LinkedObjectFactory.cs b/src/Build/ObjectModelRemoting/LinkedObjectFactory.cs index 6d3f6a05138..b6b534637e0 100644 --- a/src/Build/ObjectModelRemoting/LinkedObjectFactory.cs +++ b/src/Build/ObjectModelRemoting/LinkedObjectFactory.cs @@ -314,5 +314,4 @@ public override string UnevaluatedValue } #endregion } - } diff --git a/src/MSBuild.UnitTests/XMake_Tests.cs b/src/MSBuild.UnitTests/XMake_Tests.cs index 16805bcb677..91cca226e9a 100644 --- a/src/MSBuild.UnitTests/XMake_Tests.cs +++ b/src/MSBuild.UnitTests/XMake_Tests.cs @@ -732,7 +732,6 @@ public void ConfigurationInvalid() // If there's a space in the %TEMP% path, the config file is read in the static constructor by the URI class and we catch there; // if there's not, we will catch when we try to read the toolsets. Either is fine; we just want to not crash. (output.Contains("MSB1043") || output.Contains("MSB4136")).ShouldBeTrue("Output should contain 'MSB1043' or 'MSB4136'"); - } #endif diff --git a/src/Shared/BufferedReadStream.cs b/src/Shared/BufferedReadStream.cs index 479e5b7f168..da095e37121 100644 --- a/src/Shared/BufferedReadStream.cs +++ b/src/Shared/BufferedReadStream.cs @@ -146,6 +146,5 @@ protected override void Dispose(bool disposing) base.Dispose(disposing); } - } } diff --git a/src/Shared/UnitTests/FileUtilities_Tests.cs b/src/Shared/UnitTests/FileUtilities_Tests.cs index 629dcdf5d9b..fb4d85038c9 100644 --- a/src/Shared/UnitTests/FileUtilities_Tests.cs +++ b/src/Shared/UnitTests/FileUtilities_Tests.cs @@ -144,7 +144,6 @@ public void MakeRelativeTests() Assert.Equal(@"../", FileUtilities.MakeRelative(@"/abc/def/xyz", @"/abc/def/")); Assert.Equal(@"../ghi/", FileUtilities.MakeRelative(@"/abc/def/xyz", @"/abc/def/ghi/")); Assert.Equal(@".", FileUtilities.MakeRelative(@"/abc/def", @"/abc/def/")); - } } diff --git a/src/Tasks.UnitTests/ReadLinesFromFile_Tests.cs b/src/Tasks.UnitTests/ReadLinesFromFile_Tests.cs index 137b0d4164a..e7ba35224bf 100644 --- a/src/Tasks.UnitTests/ReadLinesFromFile_Tests.cs +++ b/src/Tasks.UnitTests/ReadLinesFromFile_Tests.cs @@ -267,6 +267,5 @@ public void ReadNoAccess() } #endif - } } diff --git a/src/Tasks.UnitTests/WriteCodeFragment_Tests.cs b/src/Tasks.UnitTests/WriteCodeFragment_Tests.cs index 9d6fd7eacc6..5898a23ceb0 100644 --- a/src/Tasks.UnitTests/WriteCodeFragment_Tests.cs +++ b/src/Tasks.UnitTests/WriteCodeFragment_Tests.cs @@ -1064,7 +1064,6 @@ private void ExecuteAndVerifyFailure(WriteCodeFragment task, string errorCode) Assert.False(result, engine.Log); engine.AssertLogContains(errorCode); - } finally { diff --git a/src/Tasks/WriteCodeFragment.cs b/src/Tasks/WriteCodeFragment.cs index 62ce4f4e2d4..889688864cb 100644 --- a/src/Tasks/WriteCodeFragment.cs +++ b/src/Tasks/WriteCodeFragment.cs @@ -445,7 +445,6 @@ bool isPositional } break; - } attribute.Arguments.Add(new CodeAttributeArgument(parameter.Name, value)); diff --git a/src/Utilities.UnitTests/CommandLineBuilder_Tests.cs b/src/Utilities.UnitTests/CommandLineBuilder_Tests.cs index 241757645df..25e43977f53 100644 --- a/src/Utilities.UnitTests/CommandLineBuilder_Tests.cs +++ b/src/Utilities.UnitTests/CommandLineBuilder_Tests.cs @@ -467,7 +467,6 @@ public void TestVerifyThrowElse() } ); } - } internal static class CommandLineBuilderExtensionMethods diff --git a/src/Utilities.UnitTests/EventArgsFormatting_Tests.cs b/src/Utilities.UnitTests/EventArgsFormatting_Tests.cs index ba5c3dd5467..5725b1fd685 100644 --- a/src/Utilities.UnitTests/EventArgsFormatting_Tests.cs +++ b/src/Utilities.UnitTests/EventArgsFormatting_Tests.cs @@ -122,7 +122,6 @@ public void NullMessage() EventArgsFormatting.FormatEventMessage("error", "CS", null, "312", "source.cs", 233, 236, 4, 8, 0); // No exception was thrown - } ///