diff --git a/eng/Common.globalconfig b/eng/Common.globalconfig index fd878420d57..2a3789073e4 100644 --- a/eng/Common.globalconfig +++ b/eng/Common.globalconfig @@ -292,7 +292,7 @@ dotnet_diagnostic.CA1827.severity = suggestion dotnet_diagnostic.CA1828.severity = warning # Use Length/Count property instead of Count() when available -dotnet_diagnostic.CA1829.severity = suggestion +dotnet_diagnostic.CA1829.severity = warning # Prefer strongly-typed Append and Insert method overloads on StringBuilder. dotnet_diagnostic.CA1830.severity = warning diff --git a/src/Build.OM.UnitTests/Definition/Project_Tests.cs b/src/Build.OM.UnitTests/Definition/Project_Tests.cs index 5dd7d583c19..3d271c1767f 100644 --- a/src/Build.OM.UnitTests/Definition/Project_Tests.cs +++ b/src/Build.OM.UnitTests/Definition/Project_Tests.cs @@ -2286,7 +2286,7 @@ public void RemoveSeveralItemsOfVariousTypes() project.RemoveItems(list); - project.Items.Count().ShouldBe(2); + project.Items.Count.ShouldBe(2); } /// @@ -2306,7 +2306,7 @@ public void RemoveSeveralItemsExpandExpression() Project project = new Project(XmlReader.Create(new StringReader(projectOriginalContents))); project.RemoveItems(project.GetItems("j").Take(2)); - project.Items.Count().ShouldBe(3); + project.Items.Count.ShouldBe(3); StringWriter writer = new EncodingStringWriter(); project.Save(writer); diff --git a/src/Build.UnitTests/BackEnd/IntrinsicTask_Tests.cs b/src/Build.UnitTests/BackEnd/IntrinsicTask_Tests.cs index ad59e9aa5ce..077f2fea952 100644 --- a/src/Build.UnitTests/BackEnd/IntrinsicTask_Tests.cs +++ b/src/Build.UnitTests/BackEnd/IntrinsicTask_Tests.cs @@ -2014,7 +2014,7 @@ public void RemoveWithMatchingMultipleMetadata() Lookup lookup = LookupHelpers.CreateEmptyLookup(); ExecuteTask(task, lookup); ICollection items = lookup.GetItems("I2"); - items.Count().ShouldBe(3); + items.Count.ShouldBe(3); items.ElementAt(0).EvaluatedInclude.ShouldBe("a2"); items.ElementAt(1).EvaluatedInclude.ShouldBe("c2"); items.ElementAt(2).EvaluatedInclude.ShouldBe("d2"); @@ -3480,7 +3480,7 @@ public void PhoenixBatchingIssue() ProjectInstance instance = new ProjectInstance(xml); instance.Build(); - Assert.Equal(2, instance.Items.Count()); + Assert.Equal(2, instance.Items.Count); Assert.Equal("gen.obj", instance.GetItems("CppCompile").First().GetMetadataValue("ObjectFile")); Assert.Equal("def.obj", instance.GetItems("CppCompile").Last().GetMetadataValue("ObjectFile")); } diff --git a/src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs b/src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs index ceaecb12aea..2b86246c83f 100644 --- a/src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs +++ b/src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs @@ -246,7 +246,7 @@ private void ValidateExpectedPropertiesAndItems(bool includePropertiesAndItems, result.PropertiesToAdd.Count.ShouldBe(1); result.PropertiesToAdd["PropertyFromSdkResolver"].ShouldBe("ValueFromSdkResolver"); - result.ItemsToAdd.Count().ShouldBe(1); + result.ItemsToAdd.Count.ShouldBe(1); result.ItemsToAdd.Keys.Single().ShouldBe("ItemNameFromSdkResolver"); result.ItemsToAdd.Values.Single().ItemSpec.ShouldBe("ItemValueFromSdkResolver"); var metadata = result.ItemsToAdd.Values.Single().Metadata; diff --git a/src/Build.UnitTests/BackEnd/TaskBuilderTestTask.cs b/src/Build.UnitTests/BackEnd/TaskBuilderTestTask.cs index f9b99f90586..d43a166e34b 100644 --- a/src/Build.UnitTests/BackEnd/TaskBuilderTestTask.cs +++ b/src/Build.UnitTests/BackEnd/TaskBuilderTestTask.cs @@ -552,8 +552,8 @@ public TaskPropertyInfo[] GetTaskParameters() propertyInfos[i] = new TaskPropertyInfo( infos[i].Name, infos[i].PropertyType, - infos[i].GetCustomAttributes(typeof(OutputAttribute), false).Count() > 0, - infos[i].GetCustomAttributes(typeof(RequiredAttribute), false).Count() > 0); + infos[i].GetCustomAttributes(typeof(OutputAttribute), false).Length > 0, + infos[i].GetCustomAttributes(typeof(RequiredAttribute), false).Length > 0); } return propertyInfos; diff --git a/src/Build.UnitTests/Evaluation/Evaluator_Tests.cs b/src/Build.UnitTests/Evaluation/Evaluator_Tests.cs index 0ac654bcb3a..06324b51b52 100644 --- a/src/Build.UnitTests/Evaluation/Evaluator_Tests.cs +++ b/src/Build.UnitTests/Evaluation/Evaluator_Tests.cs @@ -1888,7 +1888,7 @@ public void AllEvaluatedItems() Project project = new Project(XmlReader.Create(new StringReader(content))); - Assert.Equal(6, project.AllEvaluatedItems.Count()); + Assert.Equal(6, project.AllEvaluatedItems.Count); Assert.Equal("i1", project.AllEvaluatedItems.ElementAt(0).EvaluatedInclude); Assert.Equal(String.Empty, project.AllEvaluatedItems.ElementAt(0).GetMetadataValue("m")); Assert.Equal("j1", project.AllEvaluatedItems.ElementAt(1).EvaluatedInclude); @@ -1904,12 +1904,12 @@ public void AllEvaluatedItems() project.AddItem("i", "i7"); project.RemoveItem(project.AllEvaluatedItems.ElementAt(1)); - Assert.Equal(6, project.AllEvaluatedItems.Count()); + Assert.Equal(6, project.AllEvaluatedItems.Count); project.MarkDirty(); project.ReevaluateIfNecessary(); - Assert.Equal(7, project.AllEvaluatedItems.Count()); + Assert.Equal(7, project.AllEvaluatedItems.Count); } finally { @@ -2004,15 +2004,15 @@ public void AllEvaluatedPropertiesSetProperty() Project project = new Project(XmlReader.Create(new StringReader(content))); - int initial = project.AllEvaluatedProperties.Count(); + int initial = project.AllEvaluatedProperties.Count; project.SetProperty("p", "1"); - Assert.Equal(initial, project.AllEvaluatedProperties.Count()); + Assert.Equal(initial, project.AllEvaluatedProperties.Count); project.ReevaluateIfNecessary(); - Assert.Equal(initial + 1, project.AllEvaluatedProperties.Count()); + Assert.Equal(initial + 1, project.AllEvaluatedProperties.Count); } /// @@ -2040,13 +2040,13 @@ public void AllEvaluatedItemDefinitionMetadata() Project project = new Project(XmlReader.Create(new StringReader(content))); - Assert.Equal(4, project.AllEvaluatedItemDefinitionMetadata.Count()); + Assert.Equal(4, project.AllEvaluatedItemDefinitionMetadata.Count); Assert.Equal("2", project.AllEvaluatedItemDefinitionMetadata.ElementAt(1).EvaluatedValue); Assert.Equal("1;2", project.AllEvaluatedItemDefinitionMetadata.ElementAt(3).EvaluatedValue); // Verify lists are cleared on reevaluation - Assert.Equal(4, project.AllEvaluatedItemDefinitionMetadata.Count()); + Assert.Equal(4, project.AllEvaluatedItemDefinitionMetadata.Count); } /// diff --git a/src/MSBuild/OutOfProcTaskAppDomainWrapperBase.cs b/src/MSBuild/OutOfProcTaskAppDomainWrapperBase.cs index 94e797b172c..8df0fe6a543 100644 --- a/src/MSBuild/OutOfProcTaskAppDomainWrapperBase.cs +++ b/src/MSBuild/OutOfProcTaskAppDomainWrapperBase.cs @@ -408,7 +408,7 @@ IDictionary taskParams foreach (PropertyInfo value in finalPropertyValues) { // only record outputs - if (value.GetCustomAttributes(typeof(OutputAttribute), true).Count() > 0) + if (value.GetCustomAttributes(typeof(OutputAttribute), true).Length > 0) { try { diff --git a/src/Tasks.UnitTests/ResourceManagement_Tests.cs b/src/Tasks.UnitTests/ResourceManagement_Tests.cs index 372d0665ac7..d3c607678e1 100644 --- a/src/Tasks.UnitTests/ResourceManagement_Tests.cs +++ b/src/Tasks.UnitTests/ResourceManagement_Tests.cs @@ -25,7 +25,7 @@ public void SingleCoreRequest() }", ""); var filteredMessages = messages.Where(m => m.Message.StartsWith("Number of cores acquired: ")).ToArray(); - filteredMessages.Count().ShouldBe(1); + filteredMessages.Length.ShouldBe(1); GetTrailingIntegerFromMessage(filteredMessages[0]).ShouldBeGreaterThan(0); } @@ -40,7 +40,7 @@ public void SingleCoreRequestWithNoRelease() }", " "); var filteredMessages = messages.Where(m => m.Message.StartsWith("Number of cores acquired: ")).ToArray(); - filteredMessages.Count().ShouldBe(2); + filteredMessages.Length.ShouldBe(2); int grantedCores1 = GetTrailingIntegerFromMessage(filteredMessages[0]); int grantedCores2 = GetTrailingIntegerFromMessage(filteredMessages[1]); @@ -67,7 +67,7 @@ public void SingleCoreRequestWithReacquire() }", ""); var filteredMessages = messages.Where(m => m.Message.StartsWith("Number of cores acquired: ")).ToArray(); - filteredMessages.Count().ShouldBe(2); + filteredMessages.Length.ShouldBe(2); int grantedCores1 = GetTrailingIntegerFromMessage(filteredMessages[0]); int grantedCores2 = GetTrailingIntegerFromMessage(filteredMessages[1]); diff --git a/src/Tasks.UnitTests/RoslynCodeTaskFactory_Tests.cs b/src/Tasks.UnitTests/RoslynCodeTaskFactory_Tests.cs index 496e9cceb02..a87f30daff6 100644 --- a/src/Tasks.UnitTests/RoslynCodeTaskFactory_Tests.cs +++ b/src/Tasks.UnitTests/RoslynCodeTaskFactory_Tests.cs @@ -87,7 +87,7 @@ public void RoslynCodeTaskFactory_ReuseCompilation() // with broken cache we get two Compiling messages // as we fail to reuse the first assembly - messages.Count().ShouldBe(1); + messages.Length.ShouldBe(1); } [Fact] diff --git a/src/Utilities.UnitTests/ToolLocationHelper_Tests.cs b/src/Utilities.UnitTests/ToolLocationHelper_Tests.cs index 845959692ef..ef6c50a7f54 100644 --- a/src/Utilities.UnitTests/ToolLocationHelper_Tests.cs +++ b/src/Utilities.UnitTests/ToolLocationHelper_Tests.cs @@ -4204,7 +4204,7 @@ public void VerifyFindRootFolderWhereAllFilesExist() string testDirectoryRoot = Path.Combine(Path.GetTempPath(), "VerifyFindRootFolderWhereAllFilesExist"); string[] rootDirectories = new string[] { Path.Combine(testDirectoryRoot, "Root1"), Path.Combine(testDirectoryRoot, "Root2") }; - for(int i = 0; i < rootDirectories.Count(); i++) + for(int i = 0; i < rootDirectories.Length; i++) { // create directory string subdir = Path.Combine(rootDirectories[i], "Subdir");