From 60dd57f162778620b9e1f9badcfbe1d5c15f8ad2 Mon Sep 17 00:00:00 2001 From: elachlan <2433737+elachlan@users.noreply.github.com> Date: Thu, 30 Dec 2021 12:36:24 +1000 Subject: [PATCH 1/5] CA1825 Avoid zero-length array allocations --- eng/CodeAnalysis.ruleset | 2 +- .../Definition/ProjectItem_Tests.cs | 6 +- .../Definition/Project_Tests.cs | 8 +- .../Instance/ProjectInstance_Tests.cs | 4 +- .../BackEnd/BinaryTranslator_Tests.cs | 2 +- .../BackEnd/BuildManager_Tests.cs | 60 +++++++-------- .../BuildRequestConfiguration_Tests.cs | 74 +++++++++---------- .../BackEnd/BuildRequestEngine_Tests.cs | 10 +-- .../BackEnd/BuildRequestEntry_Tests.cs | 24 +++--- .../BackEnd/BuildRequest_Tests.cs | 24 +++--- .../BackEnd/BuildResult_Tests.cs | 46 ++++++------ .../BackEnd/ConfigurationMetadata_Tests.cs | 10 +-- .../FullyQualifiedBuildRequest_Tests.cs | 14 ++-- .../BackEnd/IntrinsicTask_Tests.cs | 4 +- .../BackEnd/LoggingServicesLogMethod_Tests.cs | 4 +- .../BackEnd/RequestBuilder_Tests.cs | 6 +- .../BackEnd/Scheduler_Tests.cs | 58 +++++++-------- .../BackEnd/TargetBuilder_Tests.cs | 2 +- .../BackEnd/TargetEntry_Tests.cs | 12 +-- .../BackEnd/TargetResult_Tests.cs | 2 +- .../BackEnd/TaskBuilderTestTask.cs | 2 +- .../BackEnd/TaskBuilder_Tests.cs | 2 +- .../BackEnd/TaskExecutionHost_Tests.cs | 10 +-- src/Build.UnitTests/BackEnd/TaskHost_Tests.cs | 2 +- src/Build.UnitTests/BuildResultUtilities.cs | 4 +- .../SolutionProjectGenerator_Tests.cs | 4 +- .../Evaluation/ExpressionShredder_Tests.cs | 2 +- .../Evaluation/ItemEvaluation_Tests.cs | 2 +- .../EvaluationProfiler_Tests.cs | 2 +- .../Graph/ProjectGraph_Tests.cs | 8 +- .../Instance/HostServices_Tests.cs | 4 +- .../ProjectTargetInstance_Internal_Tests.cs | 4 +- src/Build/Utilities/NuGetFrameworkWrapper.cs | 2 +- src/Deprecated/Engine/Engine/BuildTask.cs | 2 +- src/Deprecated/Engine/Engine/Expander.cs | 6 +- src/Deprecated/Engine/Engine/Project.cs | 6 +- .../Engine/Engine/RegistryKeyWrapper.cs | 4 +- .../Engine/Engine/ToolsetRegistryReader.cs | 2 +- .../ParallelLogger/ParallelLoggerHelpers.cs | 2 +- src/Deprecated/Engine/Shared/FileMatcher.cs | 14 ++-- .../CommandLineSwitches_Tests.cs | 12 +-- .../ProjectSchemaValidationHandler_Tests.cs | 6 +- src/MSBuild.UnitTests/XMake_Tests.cs | 72 +++++++++--------- src/MSBuild/CommandLineSwitches.cs | 2 +- src/MSBuild/XMake.cs | 4 +- src/Shared/AssemblyNameExtension.cs | 4 + src/Shared/BinaryTranslator.cs | 2 + src/Shared/UnitTests/FileMatcher_Tests.cs | 6 +- src/Shared/UnitTests/ObjectModelHelpers.cs | 6 +- .../AssemblyDependency/Miscellaneous.cs | 18 ++--- .../ResolveAssemblyReferenceTestFixture.cs | 72 +++++++++--------- src/Tasks.UnitTests/CombinePath_Tests.cs | 2 +- src/Tasks.UnitTests/Exec_Tests.cs | 2 +- .../FindAppConfigFile_Tests.cs | 4 +- src/Tasks.UnitTests/FindInList_Tests.cs | 2 +- .../GenerateBindingRedirects_Tests.cs | 2 +- src/Tasks.UnitTests/Hash_Tests.cs | 2 +- .../WriteCodeFragment_Tests.cs | 2 +- src/Utilities.UnitTests/MuxLogger_Tests.cs | 16 ++-- .../ToolLocationHelper_Tests.cs | 6 +- 60 files changed, 348 insertions(+), 350 deletions(-) diff --git a/eng/CodeAnalysis.ruleset b/eng/CodeAnalysis.ruleset index 2078c42fe6c..be3e4ac3d38 100644 --- a/eng/CodeAnalysis.ruleset +++ b/eng/CodeAnalysis.ruleset @@ -96,7 +96,7 @@ - + diff --git a/src/Build.OM.UnitTests/Definition/ProjectItem_Tests.cs b/src/Build.OM.UnitTests/Definition/ProjectItem_Tests.cs index 015e7429c55..62ee33f0774 100644 --- a/src/Build.OM.UnitTests/Definition/ProjectItem_Tests.cs +++ b/src/Build.OM.UnitTests/Definition/ProjectItem_Tests.cs @@ -891,7 +891,7 @@ public void IncludeAndExcludeWorkWithRelativeAndAbsolutePaths( var formattedProject = string.Format(projectContents, include, exclude); File.WriteAllText(projectFile, formattedProject); - var expectedInclude = includeSurvivesExclude ? new[] { include } : new string[0]; + var expectedInclude = includeSurvivesExclude ? new[] { include } : Array.Empty(); ObjectModelHelpers.AssertItems(expectedInclude, new Project(projectFile).Items.ToList()); } @@ -3423,7 +3423,7 @@ public static IEnumerable UpdateAndRemoveShouldWorkWithEscapedCharacte public void UpdateAndRemoveShouldWorkWithEscapedCharacters(string projectContents, string include, string update, string remove, string[] expectedInclude, Dictionary[] expectedMetadata) { var formattedProjectContents = string.Format(projectContents, include, update, remove); - ObjectModelHelpers.AssertItemEvaluationFromProject(formattedProjectContents, new string[0], expectedInclude, expectedMetadata); + ObjectModelHelpers.AssertItemEvaluationFromProject(formattedProjectContents, Array.Empty(), expectedInclude, expectedMetadata); } [Fact] @@ -3456,7 +3456,7 @@ public void UpdateAndRemoveShouldNotUseGlobMatchingOnEscapedGlobsFromReferencedI .ToList(); }, project, - inputFiles: new string[0], + inputFiles: Array.Empty(), expectedInclude: new[] { "1.cs", "2.js" }, expectedMetadataPerItem: null ); diff --git a/src/Build.OM.UnitTests/Definition/Project_Tests.cs b/src/Build.OM.UnitTests/Definition/Project_Tests.cs index afaf6ecf8ab..91e378b998c 100644 --- a/src/Build.OM.UnitTests/Definition/Project_Tests.cs +++ b/src/Build.OM.UnitTests/Definition/Project_Tests.cs @@ -3245,7 +3245,7 @@ public void GetItemProvenanceMatchesLiteralsWithNonCanonicPaths() using (var env = TestEnvironment.Create()) { var projectCollection = env.CreateProjectCollection().Collection; - var testFiles = env.CreateTestProjectWithFiles(projectContents, new string[0], "u/x"); + var testFiles = env.CreateTestProjectWithFiles(projectContents, Array.Empty(), "u/x"); var project = new Project(testFiles.ProjectFile, new Dictionary(), MSBuildConstants.CurrentToolsVersion, projectCollection); var expected2Foo = new ProvenanceResultTupleList @@ -3274,7 +3274,7 @@ public void GetItemProvenanceMatchesAbsoluteAndRelativePaths() { var projectCollection = env.CreateProjectCollection().Collection; - var testFiles = env.CreateTestProjectWithFiles(projectContents, new string[0]); + var testFiles = env.CreateTestProjectWithFiles(projectContents, Array.Empty()); var project = new Project(testFiles.ProjectFile, new Dictionary(), MSBuildConstants.CurrentToolsVersion, projectCollection); @@ -3566,7 +3566,7 @@ public void GetItemProvenanceShouldBeSensitiveToGlobbingCone(string includeGlob, using (var env = TestEnvironment.Create()) using (var projectCollection = new ProjectCollection()) { - var testFiles = env.CreateTestProjectWithFiles(projectContents, new string[0], relativePathOfProjectFile); + var testFiles = env.CreateTestProjectWithFiles(projectContents, Array.Empty(), relativePathOfProjectFile); var project = new Project(testFiles.ProjectFile, new Dictionary(), MSBuildConstants.CurrentToolsVersion, projectCollection); ProvenanceResultTupleList expectedProvenance = null; @@ -3762,7 +3762,7 @@ public void GetAllGlobsShouldProduceGlobsThatMatchAbsolutePaths() { var projectCollection = env.CreateProjectCollection().Collection; - var testFiles = env.CreateTestProjectWithFiles(projectContents, new string[0]); + var testFiles = env.CreateTestProjectWithFiles(projectContents, Array.Empty()); var project = new Project(testFiles.ProjectFile, new Dictionary(), MSBuildConstants.CurrentToolsVersion, projectCollection); diff --git a/src/Build.OM.UnitTests/Instance/ProjectInstance_Tests.cs b/src/Build.OM.UnitTests/Instance/ProjectInstance_Tests.cs index dc1e3cfdc23..fd24f3ffad8 100644 --- a/src/Build.OM.UnitTests/Instance/ProjectInstance_Tests.cs +++ b/src/Build.OM.UnitTests/Instance/ProjectInstance_Tests.cs @@ -402,13 +402,13 @@ public void BuildProjectInstancesConsecutively() { ProjectInstance instance1 = new Project().CreateProjectInstance(); - BuildRequestData buildRequestData1 = new BuildRequestData(instance1, new string[] { }); + BuildRequestData buildRequestData1 = new BuildRequestData(instance1, Array.Empty()); BuildManager.DefaultBuildManager.Build(new BuildParameters(), buildRequestData1); new Project().CreateProjectInstance(); - BuildRequestData buildRequestData2 = new BuildRequestData(instance1, new string[] { }); + BuildRequestData buildRequestData2 = new BuildRequestData(instance1, Array.Empty()); BuildManager.DefaultBuildManager.Build(new BuildParameters(), buildRequestData2); } diff --git a/src/Build.UnitTests/BackEnd/BinaryTranslator_Tests.cs b/src/Build.UnitTests/BackEnd/BinaryTranslator_Tests.cs index 32e5a1a9ce1..a1160e070d3 100644 --- a/src/Build.UnitTests/BackEnd/BinaryTranslator_Tests.cs +++ b/src/Build.UnitTests/BackEnd/BinaryTranslator_Tests.cs @@ -125,7 +125,7 @@ public void TestSerializeString() [Fact] public void TestSerializeStringArray() { - HelperTestArray(new string[] { }, StringComparer.Ordinal); + HelperTestArray(Array.Empty(), StringComparer.Ordinal); HelperTestArray(new string[] { "foo", "bar" }, StringComparer.Ordinal); HelperTestArray(null, StringComparer.Ordinal); } diff --git a/src/Build.UnitTests/BackEnd/BuildManager_Tests.cs b/src/Build.UnitTests/BackEnd/BuildManager_Tests.cs index 466bce2536a..492290c2b7b 100644 --- a/src/Build.UnitTests/BackEnd/BuildManager_Tests.cs +++ b/src/Build.UnitTests/BackEnd/BuildManager_Tests.cs @@ -193,7 +193,7 @@ private void SimpleP2PBuild(BuildParameters buildParameters) .ProjectInstance.FullPath, new Dictionary(), MSBuildConstants.CurrentToolsVersion, - new string[0], + Array.Empty(), null)); result.OverallResult.ShouldBe(BuildResultCode.Success); @@ -444,7 +444,7 @@ private void RunOutOfProcBuild(Action buildParametersModifier) Project project = CreateProject(CleanupFileContents(contents), MSBuildDefaultToolsVersion, _projectCollection, false); - var data = new BuildRequestData(project.CreateProjectInstance(), new string[0], _projectCollection.HostServices); + var data = new BuildRequestData(project.CreateProjectInstance(), Array.Empty(), _projectCollection.HostServices); var customparameters = new BuildParameters { EnableNodeReuse = false, Loggers = new ILogger[] { _logger } }; buildParametersModifier(customparameters); @@ -655,7 +655,7 @@ public void MsBuildForwardAllPropertiesFromChildLaunchChildNode() _env.SetEnvironmentVariable("MsBuildForwardPropertiesFromChild", "Something"); var project = CreateProject(contents, null, _projectCollection, false); - var data = new BuildRequestData(project.FullPath, new Dictionary(), MSBuildDefaultToolsVersion, new string[] { }, null); + var data = new BuildRequestData(project.FullPath, new Dictionary(), MSBuildDefaultToolsVersion, Array.Empty(), null); BuildResult result = _buildManager.Build(_parameters, data); Assert.Equal(BuildResultCode.Success, result.OverallResult); @@ -711,7 +711,7 @@ public void OutOfProcNodeForwardCertainproperties() var project = CreateProject(contents, null, _projectCollection, false); var data = new BuildRequestData(project.FullPath, new Dictionary(), - MSBuildDefaultToolsVersion, new string[] { }, null); + MSBuildDefaultToolsVersion, Array.Empty(), null); BuildResult result = _buildManager.Build(_parameters, data); Assert.Equal(BuildResultCode.Success, result.OverallResult); @@ -773,7 +773,7 @@ public void OutOfProcNodeForwardCertainpropertiesAlsoGetResultsFromCache() var project = CreateProject(contents, null, _projectCollection, false); var data = new BuildRequestData(project.FullPath, new Dictionary(), - MSBuildDefaultToolsVersion, new string[] { }, null); + MSBuildDefaultToolsVersion, Array.Empty(), null); BuildResult result = _buildManager.Build(_parameters, data); Assert.Equal(BuildResultCode.Success, result.OverallResult); @@ -828,7 +828,7 @@ public void ForwardNoPropertiesLaunchChildNode() var project = CreateProject(contents, null, _projectCollection, false); var data = new BuildRequestData(project.FullPath, new Dictionary(), - MSBuildDefaultToolsVersion, new string[] { }, null); + MSBuildDefaultToolsVersion, Array.Empty(), null); BuildResult result = _buildManager.Build(_parameters, data); Assert.Equal(BuildResultCode.Success, result.OverallResult); @@ -897,7 +897,7 @@ public override bool Execute() var project = CreateProject(contents, null, projectCollection, false); var data = new BuildRequestData(project.FullPath, new Dictionary(), - MSBuildDefaultToolsVersion, new string[] { }, null); + MSBuildDefaultToolsVersion, Array.Empty(), null); var customParameters = new BuildParameters(projectCollection) { Loggers = new ILogger[] { _logger } }; BuildResult result = _buildManager.Build(customParameters, data); @@ -932,7 +932,7 @@ public void ForwardNoPropertiesLaunchChildNodeDefault() var project = CreateProject(contents, null, _projectCollection, false); var data = new BuildRequestData(project.FullPath, new Dictionary(), - MSBuildDefaultToolsVersion, new string[] { }, null); + MSBuildDefaultToolsVersion, Array.Empty(), null); BuildResult result = _buildManager.Build(_parameters, data); Assert.Equal(BuildResultCode.Success, result.OverallResult); _logger.AssertLogContains("[success]"); @@ -1098,7 +1098,7 @@ public void SimpleBuildWithFailureAndWarningOnlyLogCriticalEventsFalse() [Fact] public void BuildRequestWithoutBegin() { - BuildRequestData data = new BuildRequestData("foo", new Dictionary(), "2.0", new string[0], null); + BuildRequestData data = new BuildRequestData("foo", new Dictionary(), "2.0", Array.Empty(), null); Should.Throw(() => _buildManager.BuildRequest(data)); } @@ -1108,7 +1108,7 @@ public void BuildRequestWithoutBegin() [Fact] public void GraphBuildRequestWithoutBegin() { - GraphBuildRequestData data = new GraphBuildRequestData("foo", new Dictionary(), new string[0], null); + GraphBuildRequestData data = new GraphBuildRequestData("foo", new Dictionary(), Array.Empty(), null); Should.Throw(() => _buildManager.BuildRequest(data)); } @@ -1118,7 +1118,7 @@ public void GraphBuildRequestWithoutBegin() [Fact] public void PendBuildRequestWithoutBegin() { - BuildRequestData data = new BuildRequestData("foo", new Dictionary(), "2.0", new string[0], null); + BuildRequestData data = new BuildRequestData("foo", new Dictionary(), "2.0", Array.Empty(), null); Should.Throw(() => _buildManager.PendBuildRequest(data)); } @@ -1128,7 +1128,7 @@ public void PendBuildRequestWithoutBegin() [Fact] public void PendGraphBuildRequestWithoutBegin() { - GraphBuildRequestData data = new GraphBuildRequestData("foo", new Dictionary(), new string[0], null); + GraphBuildRequestData data = new GraphBuildRequestData("foo", new Dictionary(), Array.Empty(), null); Should.Throw(() => _buildManager.PendBuildRequest(data)); } @@ -1154,7 +1154,7 @@ public void DisposeAfterUse() "); var project = CreateProject(contents, null, _projectCollection, false); var globalProperties = new Dictionary(); - var targets = new string[0]; + var targets = Array.Empty(); var brd = new BuildRequestData(project.FullPath, globalProperties, null, targets, new HostServices()); using (var bm = new BuildManager()) { @@ -1218,7 +1218,7 @@ public void ExtraEnds() [Fact] public void PendBuildRequestAfterEnd() { - BuildRequestData data = new BuildRequestData("foo", new Dictionary(), "2.0", new string[0], null); + BuildRequestData data = new BuildRequestData("foo", new Dictionary(), "2.0", Array.Empty(), null); _buildManager.BeginBuild(new BuildParameters()); _buildManager.EndBuild(); @@ -1231,7 +1231,7 @@ public void PendBuildRequestAfterEnd() [Fact] public void PendGraphBuildRequestAfterEnd() { - GraphBuildRequestData data = new GraphBuildRequestData("foo", new Dictionary(), new string[0], null); + GraphBuildRequestData data = new GraphBuildRequestData("foo", new Dictionary(), Array.Empty(), null); _buildManager.BeginBuild(new BuildParameters()); _buildManager.EndBuild(); @@ -1247,7 +1247,7 @@ public void BuildDuringBuild() try { BuildRequestData data = - new BuildRequestData("foo", new Dictionary(), "2.0", new string[0], null); + new BuildRequestData("foo", new Dictionary(), "2.0", Array.Empty(), null); _buildManager.BeginBuild(new BuildParameters()); Assert.Throws(() => { _buildManager.Build(new BuildParameters(), data); }); @@ -1489,7 +1489,7 @@ public void EndWithUnexecutedSubmission() "); - BuildRequestData data = GetBuildRequestData(contents, new string[] { }, MSBuildDefaultToolsVersion); + BuildRequestData data = GetBuildRequestData(contents, Array.Empty(), MSBuildDefaultToolsVersion); _buildManager.BeginBuild(_parameters); _buildManager.PendBuildRequest(data); _buildManager.EndBuild(); @@ -1509,7 +1509,7 @@ public void CancelledBuildWithUnexecutedSubmission() "); - BuildRequestData data = GetBuildRequestData(contents, new string[] { }, MSBuildDefaultToolsVersion); + BuildRequestData data = GetBuildRequestData(contents, Array.Empty(), MSBuildDefaultToolsVersion); _buildManager.BeginBuild(_parameters); _buildManager.PendBuildRequest(data); _buildManager.CancelAllSubmissions(); @@ -1539,7 +1539,7 @@ public void CancelledBuild() EnableNodeReuse = false }; - BuildRequestData data = GetBuildRequestData(contents, new string[] { }, MSBuildDefaultToolsVersion); + BuildRequestData data = GetBuildRequestData(contents, Array.Empty(), MSBuildDefaultToolsVersion); Console.WriteLine("CancelledBuild: beginning build"); _buildManager.BeginBuild(_parameters); @@ -1620,7 +1620,7 @@ public void CancelledBuildInTaskHostWithDelay20() "); - BuildRequestData data = GetBuildRequestData(contents, new string[] { }, MSBuildDefaultToolsVersion); + BuildRequestData data = GetBuildRequestData(contents, Array.Empty(), MSBuildDefaultToolsVersion); _buildManager.BeginBuild(_parameters); BuildSubmission asyncResult = _buildManager.PendBuildRequest(data); asyncResult.ExecuteAsync(null, null); @@ -1657,7 +1657,7 @@ public void CancelledBuildWithDelay40() "); - BuildRequestData data = GetBuildRequestData(contents, new string[] { }, MSBuildDefaultToolsVersion); + BuildRequestData data = GetBuildRequestData(contents, Array.Empty(), MSBuildDefaultToolsVersion); _buildManager.BeginBuild(_parameters); BuildSubmission asyncResult = _buildManager.PendBuildRequest(data); asyncResult.ExecuteAsync(null, null); @@ -1688,7 +1688,7 @@ public void CancelledBuildInTaskHostWithDelay40() "); - BuildRequestData data = GetBuildRequestData(contents, new string[] { }, MSBuildDefaultToolsVersion); + BuildRequestData data = GetBuildRequestData(contents, Array.Empty(), MSBuildDefaultToolsVersion); _buildManager.BeginBuild(_parameters); BuildSubmission asyncResult = _buildManager.PendBuildRequest(data); asyncResult.ExecuteAsync(null, null); @@ -1828,7 +1828,7 @@ public void OutOfProcNodeDoesntLockWorkingDirectory() File.WriteAllText(projectFile, contents); _env.SetEnvironmentVariable("MSBUILDNOINPROCNODE", "1"); - var data = new BuildRequestData(projectFile, new Dictionary(), MSBuildDefaultToolsVersion, new string[] { }, null); + var data = new BuildRequestData(projectFile, new Dictionary(), MSBuildDefaultToolsVersion, Array.Empty(), null); _buildManager.Build(_parameters, data); } @@ -1983,7 +1983,7 @@ public void GhostProjectRootElementCache() // Create Project 1 ProjectInstance projectInstance = CreateProjectInstance(contents1, null, _projectCollection, false); - var data = new BuildRequestData(projectInstance, new string[0]); + var data = new BuildRequestData(projectInstance, Array.Empty()); _logger.ClearLog(); @@ -2010,7 +2010,7 @@ public void GhostProjectRootElementCache() // Create a new build. ProjectInstance projectInstance2 = CreateProjectInstance(contents1, null, _projectCollection, false); - var data2 = new BuildRequestData(projectInstance2, new string[0]); + var data2 = new BuildRequestData(projectInstance2, Array.Empty()); // Build again. _parameters.ResetCaches = false; @@ -2148,7 +2148,7 @@ public void Regress239661() string fileName = _env.CreateFile(".proj").Path; File.WriteAllText(fileName, contents); - var data = new BuildRequestData(fileName, _projectCollection.GlobalProperties, MSBuildDefaultToolsVersion, new string[0], null); + var data = new BuildRequestData(fileName, _projectCollection.GlobalProperties, MSBuildDefaultToolsVersion, Array.Empty(), null); _parameters.DisableInProcNode = true; BuildResult result = _buildManager.Build(_parameters, data); Assert.Equal(BuildResultCode.Success, result.OverallResult); @@ -2236,7 +2236,7 @@ public void ProjectInstanceTransfersToOOPNode() } } - var data = new BuildRequestData(instance, new string[0]); + var data = new BuildRequestData(instance, Array.Empty()); // Force this to build out-of-proc _parameters.DisableInProcNode = true; @@ -2280,7 +2280,7 @@ public void ProjectInstanceLimitedTransferToOOPNode() instance.SetProperty("VirtualProp", "overridden"); instance.SetProperty("Unmodified", "changed"); - var data = new BuildRequestData(instance, new string[0], null, BuildRequestDataFlags.None, new string[] { "VirtualProp" }); + var data = new BuildRequestData(instance, Array.Empty(), null, BuildRequestDataFlags.None, new string[] { "VirtualProp" }); // Force this to build out-of-proc _parameters.DisableInProcNode = true; @@ -2307,7 +2307,7 @@ public void CacheLifetime() // Do a build with one build manager. using (var outerBuildManager = new BuildManager()) { - outerBuildCacheDirectory = BuildAndCheckCache(outerBuildManager, new string[] { }); + outerBuildCacheDirectory = BuildAndCheckCache(outerBuildManager, Array.Empty()); // Do another build with a second build manager while the first still exists. Since both BuildManagers // share a process-wide cache directory, we want to verify that they don't stomp on each other, either @@ -4324,7 +4324,7 @@ public void GraphBuildShouldBeAbleToConstructGraphButSkipBuild() var graphResult = buildSession.BuildGraphSubmission( new GraphBuildRequestData( projectGraphEntryPoints: new[] {new ProjectGraphEntryPoint(graph.GraphRoots.First().ProjectInstance.FullPath)}, - targetsToBuild: new string[0], + targetsToBuild: Array.Empty(), hostServices: null, flags: BuildRequestDataFlags.None, graphBuildOptions: new GraphBuildOptions {Build = false})); diff --git a/src/Build.UnitTests/BackEnd/BuildRequestConfiguration_Tests.cs b/src/Build.UnitTests/BackEnd/BuildRequestConfiguration_Tests.cs index 9ccf30da8e2..43d786c6509 100644 --- a/src/Build.UnitTests/BackEnd/BuildRequestConfiguration_Tests.cs +++ b/src/Build.UnitTests/BackEnd/BuildRequestConfiguration_Tests.cs @@ -39,7 +39,7 @@ public void TestConstructorNullFile() { Assert.Throws(() => { - BuildRequestData config1 = new BuildRequestData(null, new Dictionary(), "toolsVersion", new string[0], null); + BuildRequestData config1 = new BuildRequestData(null, new Dictionary(), "toolsVersion", Array.Empty(), null); } ); } @@ -48,14 +48,14 @@ public void TestConstructorNullProps() { Assert.Throws(() => { - BuildRequestData config1 = new BuildRequestData("file", null, "toolsVersion", new string[0], null); + BuildRequestData config1 = new BuildRequestData("file", null, "toolsVersion", Array.Empty(), null); } ); } [Fact] public void TestConstructor1() { - BuildRequestData config1 = new BuildRequestData("file", new Dictionary(), "toolsVersion", new string[0], null); + BuildRequestData config1 = new BuildRequestData("file", new Dictionary(), "toolsVersion", Array.Empty(), null); } [Fact] @@ -63,7 +63,7 @@ public void TestConstructorInvalidConfigId() { Assert.Throws(() => { - BuildRequestData data = new BuildRequestData("file", new Dictionary(), "toolsVersion", new string[0], null); + BuildRequestData data = new BuildRequestData("file", new Dictionary(), "toolsVersion", Array.Empty(), null); BuildRequestConfiguration config1 = new BuildRequestConfiguration(1, data, "2.0"); config1.ShallowCloneWithNewId(0); } @@ -72,14 +72,14 @@ public void TestConstructorInvalidConfigId() [Fact] public void TestConstructor2PositiveConfigId() { - BuildRequestData config1 = new BuildRequestData("file", new Dictionary(), "toolsVersion", new string[0], null); + BuildRequestData config1 = new BuildRequestData("file", new Dictionary(), "toolsVersion", Array.Empty(), null); new BuildRequestConfiguration(1, config1, "2.0"); } [Fact] public void TestConstructor2NegativeConfigId() { - BuildRequestData config1 = new BuildRequestData("file", new Dictionary(), "toolsVersion", new string[0], null); + BuildRequestData config1 = new BuildRequestData("file", new Dictionary(), "toolsVersion", Array.Empty(), null); new BuildRequestConfiguration(-1, config1, "2.0"); } @@ -88,7 +88,7 @@ public void TestConstructor2NullFile() { Assert.Throws(() => { - BuildRequestData config1 = new BuildRequestData(null, new Dictionary(), "toolsVersion", new string[0], null); + BuildRequestData config1 = new BuildRequestData(null, new Dictionary(), "toolsVersion", Array.Empty(), null); } ); } @@ -98,22 +98,22 @@ public void TestConstructor2NullProps() { Assert.Throws(() => { - BuildRequestData config1 = new BuildRequestData("file", null, "toolsVersion", new string[0], null); + BuildRequestData config1 = new BuildRequestData("file", null, "toolsVersion", Array.Empty(), null); } ); } [Fact] public void TestWasGeneratedByNode() { - BuildRequestData data1 = new BuildRequestData("file", new Dictionary(StringComparer.OrdinalIgnoreCase), "toolsVersion", new string[0], null); + BuildRequestData data1 = new BuildRequestData("file", new Dictionary(StringComparer.OrdinalIgnoreCase), "toolsVersion", Array.Empty(), null); BuildRequestConfiguration config1 = new BuildRequestConfiguration(-1, data1, "2.0"); Assert.True(config1.WasGeneratedByNode); - BuildRequestData data2 = new BuildRequestData("file", new Dictionary(StringComparer.OrdinalIgnoreCase), "toolsVersion", new string[0], null); + BuildRequestData data2 = new BuildRequestData("file", new Dictionary(StringComparer.OrdinalIgnoreCase), "toolsVersion", Array.Empty(), null); BuildRequestConfiguration config2 = new BuildRequestConfiguration(1, data2, "2.0"); Assert.False(config2.WasGeneratedByNode); - BuildRequestData data3 = new BuildRequestData("file", new Dictionary(StringComparer.OrdinalIgnoreCase), "toolsVersion", new string[0], null); + BuildRequestData data3 = new BuildRequestData("file", new Dictionary(StringComparer.OrdinalIgnoreCase), "toolsVersion", Array.Empty(), null); BuildRequestConfiguration config3 = new BuildRequestConfiguration(data3, "2.0"); Assert.False(config3.WasGeneratedByNode); } @@ -121,15 +121,15 @@ public void TestWasGeneratedByNode() [Fact] public void TestDefaultConfigurationId() { - BuildRequestData data1 = new BuildRequestData("file", new Dictionary(StringComparer.OrdinalIgnoreCase), "toolsVersion", new string[0], null); + BuildRequestData data1 = new BuildRequestData("file", new Dictionary(StringComparer.OrdinalIgnoreCase), "toolsVersion", Array.Empty(), null); BuildRequestConfiguration config1 = new BuildRequestConfiguration(-1, data1, "2.0"); Assert.Equal(-1, config1.ConfigurationId); - BuildRequestData data2 = new BuildRequestData("file", new Dictionary(StringComparer.OrdinalIgnoreCase), "toolsVersion", new string[0], null); + BuildRequestData data2 = new BuildRequestData("file", new Dictionary(StringComparer.OrdinalIgnoreCase), "toolsVersion", Array.Empty(), null); BuildRequestConfiguration config2 = new BuildRequestConfiguration(1, data2, "2.0"); Assert.Equal(1, config2.ConfigurationId); - BuildRequestData data3 = new BuildRequestData("file", new Dictionary(StringComparer.OrdinalIgnoreCase), "toolsVersion", new string[0], null); + BuildRequestData data3 = new BuildRequestData("file", new Dictionary(StringComparer.OrdinalIgnoreCase), "toolsVersion", Array.Empty(), null); BuildRequestConfiguration config3 = new BuildRequestConfiguration(0, data3, "2.0"); Assert.Equal(0, config3.ConfigurationId); } @@ -139,7 +139,7 @@ public void TestSetConfigurationIdBad() { Assert.Throws(() => { - BuildRequestData data = new BuildRequestData("file", new Dictionary(StringComparer.OrdinalIgnoreCase), "toolsVersion", new string[0], null); + BuildRequestData data = new BuildRequestData("file", new Dictionary(StringComparer.OrdinalIgnoreCase), "toolsVersion", Array.Empty(), null); BuildRequestConfiguration config1 = new BuildRequestConfiguration(-1, data, "2.0"); config1.ConfigurationId = -2; } @@ -148,7 +148,7 @@ public void TestSetConfigurationIdBad() [Fact] public void TestSetConfigurationIdGood() { - BuildRequestData data = new BuildRequestData("file", new Dictionary(StringComparer.OrdinalIgnoreCase), "toolsVersion", new string[0], null); + BuildRequestData data = new BuildRequestData("file", new Dictionary(StringComparer.OrdinalIgnoreCase), "toolsVersion", Array.Empty(), null); BuildRequestConfiguration config1 = new BuildRequestConfiguration(data, "2.0"); Assert.Equal(0, config1.ConfigurationId); config1.ConfigurationId = 1; @@ -158,7 +158,7 @@ public void TestSetConfigurationIdGood() [Fact] public void TestGetFileName() { - BuildRequestData data = new BuildRequestData("file", new Dictionary(StringComparer.OrdinalIgnoreCase), "toolsVersion", new string[0], null); + BuildRequestData data = new BuildRequestData("file", new Dictionary(StringComparer.OrdinalIgnoreCase), "toolsVersion", Array.Empty(), null); BuildRequestConfiguration config1 = new BuildRequestConfiguration(data, "2.0"); Assert.Equal(config1.ProjectFullPath, Path.GetFullPath("file")); } @@ -166,7 +166,7 @@ public void TestGetFileName() [Fact] public void TestGetToolsVersion() { - BuildRequestData data1 = new BuildRequestData("file", new Dictionary(StringComparer.OrdinalIgnoreCase), "toolsVersion", new string[0], null); + BuildRequestData data1 = new BuildRequestData("file", new Dictionary(StringComparer.OrdinalIgnoreCase), "toolsVersion", Array.Empty(), null); BuildRequestConfiguration config1 = new BuildRequestConfiguration(data1, "2.0"); Assert.Equal("toolsVersion", config1.ToolsVersion); } @@ -175,7 +175,7 @@ public void TestGetToolsVersion() public void TestGetProperties() { Dictionary props = new Dictionary(); - BuildRequestConfiguration config1 = new BuildRequestConfiguration(new BuildRequestData("file", props, "toolsVersion", new string[0], null), "2.0"); + BuildRequestConfiguration config1 = new BuildRequestConfiguration(new BuildRequestData("file", props, "toolsVersion", Array.Empty(), null), "2.0"); Assert.Equal(props.Count, Helpers.MakeList((IEnumerable)(config1.GlobalProperties)).Count); } @@ -183,7 +183,7 @@ public void TestGetProperties() [Fact] public void TestSetProjectGood() { - BuildRequestData data1 = new BuildRequestData("file", new Dictionary(), "toolsVersion", new string[0], null); + BuildRequestData data1 = new BuildRequestData("file", new Dictionary(), "toolsVersion", Array.Empty(), null); BuildRequestConfiguration config1 = new BuildRequestConfiguration(data1, "2.0"); Assert.Null(config1.Project); Project project = new Project(XmlReader.Create(new StringReader(ObjectModelHelpers.CleanupFileContents(@"")))); @@ -196,7 +196,7 @@ public void TestSetProjectGood() [Fact] public void TestPacketType() { - BuildRequestData data1 = new BuildRequestData("file", new Dictionary(), "toolsVersion", new string[0], null); + BuildRequestData data1 = new BuildRequestData("file", new Dictionary(), "toolsVersion", Array.Empty(), null); BuildRequestConfiguration config1 = new BuildRequestConfiguration(data1, "2.0"); Assert.Equal(NodePacketType.BuildRequestConfiguration, config1.Type); } @@ -204,11 +204,11 @@ public void TestPacketType() [Fact] public void TestGetHashCode() { - BuildRequestConfiguration config1 = new BuildRequestConfiguration(new BuildRequestData("file", new Dictionary(), "toolsVersion", new string[0], null), "2.0"); - BuildRequestConfiguration config2 = new BuildRequestConfiguration(new BuildRequestData("File", new Dictionary(), "ToolsVersion", new string[0], null), "2.0"); - BuildRequestConfiguration config3 = new BuildRequestConfiguration(new BuildRequestData("file2", new Dictionary(), "toolsVersion", new string[0], null), "2.0"); - BuildRequestConfiguration config4 = new BuildRequestConfiguration(new BuildRequestData("file2", new Dictionary(), "toolsVersion2", new string[0], null), "2.0"); - BuildRequestConfiguration config5 = new BuildRequestConfiguration(new BuildRequestData("file", new Dictionary(), "toolsVersion2", new string[0], null), "2.0"); + BuildRequestConfiguration config1 = new BuildRequestConfiguration(new BuildRequestData("file", new Dictionary(), "toolsVersion", Array.Empty(), null), "2.0"); + BuildRequestConfiguration config2 = new BuildRequestConfiguration(new BuildRequestData("File", new Dictionary(), "ToolsVersion", Array.Empty(), null), "2.0"); + BuildRequestConfiguration config3 = new BuildRequestConfiguration(new BuildRequestData("file2", new Dictionary(), "toolsVersion", Array.Empty(), null), "2.0"); + BuildRequestConfiguration config4 = new BuildRequestConfiguration(new BuildRequestData("file2", new Dictionary(), "toolsVersion2", Array.Empty(), null), "2.0"); + BuildRequestConfiguration config5 = new BuildRequestConfiguration(new BuildRequestData("file", new Dictionary(), "toolsVersion2", Array.Empty(), null), "2.0"); Assert.Equal(config1.GetHashCode(), config2.GetHashCode()); Assert.NotEqual(config1.GetHashCode(), config3.GetHashCode()); @@ -219,20 +219,20 @@ public void TestGetHashCode() [Fact] public void TestEquals() { - BuildRequestConfiguration config1 = new BuildRequestConfiguration(new BuildRequestData("file", new Dictionary(), "toolsVersion", new string[0], null), "2.0"); + BuildRequestConfiguration config1 = new BuildRequestConfiguration(new BuildRequestData("file", new Dictionary(), "toolsVersion", Array.Empty(), null), "2.0"); Assert.Equal(config1, config1); - BuildRequestConfiguration config2 = new BuildRequestConfiguration(new BuildRequestData("file", new Dictionary(), "toolsVersion", new string[0], null), "2.0"); + BuildRequestConfiguration config2 = new BuildRequestConfiguration(new BuildRequestData("file", new Dictionary(), "toolsVersion", Array.Empty(), null), "2.0"); Assert.Equal(config1, config2); - BuildRequestConfiguration config3 = new BuildRequestConfiguration(new BuildRequestData("file2", new Dictionary(), "toolsVersion", new string[0], null), "2.0"); + BuildRequestConfiguration config3 = new BuildRequestConfiguration(new BuildRequestData("file2", new Dictionary(), "toolsVersion", Array.Empty(), null), "2.0"); Assert.NotEqual(config1, config3); - BuildRequestConfiguration config4 = new BuildRequestConfiguration(new BuildRequestData("file", new Dictionary(), "toolsVersion2", new string[0], null), "2.0"); + BuildRequestConfiguration config4 = new BuildRequestConfiguration(new BuildRequestData("file", new Dictionary(), "toolsVersion2", Array.Empty(), null), "2.0"); Assert.NotEqual(config1, config4); PropertyDictionary props = new PropertyDictionary(); props.Set(ProjectPropertyInstance.Create("prop1", "value1")); - BuildRequestData data = new BuildRequestData("file", props.ToDictionary(), "toolsVersion", new string[0], null); + BuildRequestData data = new BuildRequestData("file", props.ToDictionary(), "toolsVersion", Array.Empty(), null); BuildRequestConfiguration config5 = new BuildRequestConfiguration(data, "2.0"); Assert.NotEqual(config1, config5); @@ -247,7 +247,7 @@ public void TestTranslation() properties.Set(ProjectPropertyInstance.Create("this", "that")); properties.Set(ProjectPropertyInstance.Create("foo", "bar")); - BuildRequestData data = new BuildRequestData("file", properties.ToDictionary(), "4.0", new string[0], null); + BuildRequestData data = new BuildRequestData("file", properties.ToDictionary(), "4.0", Array.Empty(), null); BuildRequestConfiguration config = new BuildRequestConfiguration(data, "2.0"); Assert.Equal(NodePacketType.BuildRequestConfiguration, config.Type); @@ -288,7 +288,7 @@ public void TestTranslationWithEntireProjectState() instance.TranslateEntireState = true; - BuildRequestConfiguration configuration = new BuildRequestConfiguration(new BuildRequestData(instance, new string[] { }, null), "2.0"); + BuildRequestConfiguration configuration = new BuildRequestConfiguration(new BuildRequestData(instance, Array.Empty(), null), "2.0"); configuration.ConfigurationId = 1; ((ITranslatable)configuration).Translate(TranslationHelpers.GetWriteTranslator()); @@ -308,7 +308,7 @@ public void TestTranslationWithEntireProjectState() [Fact] public void TestProperties() { - BuildRequestConfiguration configuration = new BuildRequestConfiguration(new BuildRequestData("path", new Dictionary(), "2.0", new string[] { }, null), "2.0"); + BuildRequestConfiguration configuration = new BuildRequestConfiguration(new BuildRequestData("path", new Dictionary(), "2.0", Array.Empty(), null), "2.0"); Assert.True(configuration.IsCacheable); Assert.False(configuration.IsLoaded); Assert.False(configuration.IsCached); @@ -361,7 +361,7 @@ public void TestCache() new ProjectCollection()); project.FullPath = "foo"; ProjectInstance instance = project.CreateProjectInstance(); - BuildRequestConfiguration configuration = new BuildRequestConfiguration(new BuildRequestData(instance, new string[] { }, null), "2.0"); + BuildRequestConfiguration configuration = new BuildRequestConfiguration(new BuildRequestData(instance, Array.Empty(), null), "2.0"); configuration.ConfigurationId = 1; string originalValue = Environment.GetEnvironmentVariable("MSBUILDCACHE"); @@ -462,7 +462,7 @@ public void TestCache2() Project project = new Project(XmlReader.Create(new StringReader(projectBody)), globalProperties, ObjectModelHelpers.MSBuildDefaultToolsVersion, new ProjectCollection()); project.FullPath = "foo"; ProjectInstance instance = project.CreateProjectInstance(); - BuildRequestConfiguration configuration = new BuildRequestConfiguration(new BuildRequestData(instance, new string[] { }, null), "2.0"); + BuildRequestConfiguration configuration = new BuildRequestConfiguration(new BuildRequestData(instance, Array.Empty(), null), "2.0"); string originalTmp = Environment.GetEnvironmentVariable("TMP"); string originalTemp = Environment.GetEnvironmentVariable("TEMP"); @@ -562,7 +562,7 @@ private void TestSkipIsolationConstraints(string glob, string referencePath, boo var projectInstance = project.CreateProjectInstance(); - var configuration = new BuildRequestConfiguration(new BuildRequestData(projectInstance, new string[] {}), MSBuildConstants.CurrentToolsVersion); + var configuration = new BuildRequestConfiguration(new BuildRequestData(projectInstance, Array.Empty()), MSBuildConstants.CurrentToolsVersion); if (referencePath.Contains("$")) { diff --git a/src/Build.UnitTests/BackEnd/BuildRequestEngine_Tests.cs b/src/Build.UnitTests/BackEnd/BuildRequestEngine_Tests.cs index bd2e1172fe5..97a6ee1ea06 100644 --- a/src/Build.UnitTests/BackEnd/BuildRequestEngine_Tests.cs +++ b/src/Build.UnitTests/BackEnd/BuildRequestEngine_Tests.cs @@ -331,7 +331,7 @@ private void ConfigureEngine(IBuildRequestEngine engine) [Fact] public void TestEngineShutdownWhileActive() { - BuildRequestData data = new BuildRequestData("TestFile", new Dictionary(), "TestToolsVersion", new string[0], null); + BuildRequestData data = new BuildRequestData("TestFile", new Dictionary(), "TestToolsVersion", Array.Empty(), null); BuildRequestConfiguration config = new BuildRequestConfiguration(1, data, "2.0"); _cache.AddConfiguration(config); @@ -359,7 +359,7 @@ public void TestEngineShutdownWhileActive() [Fact] public void TestSimpleBuildScenario() { - BuildRequestData data = new BuildRequestData("TestFile", new Dictionary(), "TestToolsVersion", new string[0], null); + BuildRequestData data = new BuildRequestData("TestFile", new Dictionary(), "TestToolsVersion", Array.Empty(), null); BuildRequestConfiguration config = new BuildRequestConfiguration(1, data, "2.0"); _cache.AddConfiguration(config); @@ -386,7 +386,7 @@ public void TestSimpleBuildScenario() [Fact] public void TestBuildWithChildren() { - BuildRequestData data = new BuildRequestData("TestFile", new Dictionary(), "TestToolsVersion", new string[0], null); + BuildRequestData data = new BuildRequestData("TestFile", new Dictionary(), "TestToolsVersion", Array.Empty(), null); BuildRequestConfiguration config = new BuildRequestConfiguration(1, data, "2.0"); _cache.AddConfiguration(config); @@ -439,13 +439,13 @@ public void TestBuildWithChildren() [Fact] public void TestBuildWithNewConfiguration() { - BuildRequestData data = new BuildRequestData(Path.GetFullPath("TestFile"), new Dictionary(), "TestToolsVersion", new string[0], null); + BuildRequestData data = new BuildRequestData(Path.GetFullPath("TestFile"), new Dictionary(), "TestToolsVersion", Array.Empty(), null); BuildRequestConfiguration config = new BuildRequestConfiguration(1, data, "2.0"); _cache.AddConfiguration(config); // Configure the builder to spawn build requests MockRequestBuilder builder = (MockRequestBuilder)_host.GetComponent(BuildComponentType.RequestBuilder); - BuildRequestData data2 = new BuildRequestData(Path.GetFullPath("OtherFile"), new Dictionary(), "TestToolsVersion", new string[0], null); + BuildRequestData data2 = new BuildRequestData(Path.GetFullPath("OtherFile"), new Dictionary(), "TestToolsVersion", Array.Empty(), null); BuildRequestConfiguration unresolvedConfig = new BuildRequestConfiguration(data2, "2.0"); builder.NewRequests.Add(new FullyQualifiedBuildRequest[1] { new FullyQualifiedBuildRequest(unresolvedConfig, new string[1] { "requiredTarget1" }, true) }); diff --git a/src/Build.UnitTests/BackEnd/BuildRequestEntry_Tests.cs b/src/Build.UnitTests/BackEnd/BuildRequestEntry_Tests.cs index 00e27aeca13..e241380a2b6 100644 --- a/src/Build.UnitTests/BackEnd/BuildRequestEntry_Tests.cs +++ b/src/Build.UnitTests/BackEnd/BuildRequestEntry_Tests.cs @@ -20,8 +20,8 @@ public class BuildRequestEntry_Tests [Fact] public void TestConstructorGood() { - BuildRequest request = CreateNewBuildRequest(1, new string[0] { }); - BuildRequestData data = new BuildRequestData("foo", new Dictionary(), "foo", new string[0], null); + BuildRequest request = CreateNewBuildRequest(1, Array.Empty()); + BuildRequestData data = new BuildRequestData("foo", new Dictionary(), "foo", Array.Empty(), null); BuildRequestConfiguration config = new BuildRequestConfiguration(1, data, "2.0"); BuildRequestEntry entry = new BuildRequestEntry(request, config); @@ -43,7 +43,7 @@ public void TestSimpleStateProgression() { // Start in Ready BuildRequest request = CreateNewBuildRequest(1, new string[1] { "foo" }); - BuildRequestConfiguration config = new BuildRequestConfiguration(1, new BuildRequestData("foo", new Dictionary(), "foo", new string[0], null), "2.0"); + BuildRequestConfiguration config = new BuildRequestConfiguration(1, new BuildRequestData("foo", new Dictionary(), "foo", Array.Empty(), null), "2.0"); BuildRequestEntry entry = new BuildRequestEntry(request, config); Assert.Equal(BuildRequestEntryState.Ready, entry.State); Assert.Equal(entry.Request, request); @@ -91,7 +91,7 @@ public void TestSimpleStateProgression() public void TestResolveConfiguration() { BuildRequest request = CreateNewBuildRequest(1, new string[1] { "foo" }); - BuildRequestData data1 = new BuildRequestData("foo", new Dictionary(), "foo", new string[0], null); + BuildRequestData data1 = new BuildRequestData("foo", new Dictionary(), "foo", Array.Empty(), null); BuildRequestConfiguration config = new BuildRequestConfiguration(1, data1, "2.0"); BuildRequestEntry entry = new BuildRequestEntry(request, config); @@ -113,7 +113,7 @@ public void TestResolveConfiguration() public void TestMultipleWaitingRequests() { BuildRequest request = CreateNewBuildRequest(1, new string[1] { "foo" }); - BuildRequestData data1 = new BuildRequestData("foo", new Dictionary(), "foo", new string[0], null); + BuildRequestData data1 = new BuildRequestData("foo", new Dictionary(), "foo", Array.Empty(), null); BuildRequestConfiguration config = new BuildRequestConfiguration(1, data1, "2.0"); BuildRequestEntry entry = new BuildRequestEntry(request, config); @@ -143,7 +143,7 @@ public void TestMultipleWaitingRequests() public void TestMixedWaitingRequests() { BuildRequest request = CreateNewBuildRequest(1, new string[1] { "foo" }); - BuildRequestConfiguration config = new BuildRequestConfiguration(1, new BuildRequestData("foo", new Dictionary(), "foo", new string[0], null), "2.0"); + BuildRequestConfiguration config = new BuildRequestConfiguration(1, new BuildRequestData("foo", new Dictionary(), "foo", Array.Empty(), null), "2.0"); BuildRequestEntry entry = new BuildRequestEntry(request, config); Assert.Equal(BuildRequestEntryState.Ready, entry.State); @@ -180,7 +180,7 @@ public void TestNoReadyToWaiting() Assert.Throws(() => { BuildRequest request = CreateNewBuildRequest(1, new string[1] { "foo" }); - BuildRequestData data1 = new BuildRequestData("foo", new Dictionary(), "foo", new string[0], null); + BuildRequestData data1 = new BuildRequestData("foo", new Dictionary(), "foo", Array.Empty(), null); BuildRequestConfiguration config = new BuildRequestConfiguration(1, data1, "2.0"); BuildRequestEntry entry = new BuildRequestEntry(request, config); Assert.Equal(BuildRequestEntryState.Ready, entry.State); @@ -197,7 +197,7 @@ public void TestNoReadyToComplete() Assert.Throws(() => { BuildRequest request = CreateNewBuildRequest(1, new string[1] { "foo" }); - BuildRequestData data1 = new BuildRequestData("foo", new Dictionary(), "foo", new string[0], null); + BuildRequestData data1 = new BuildRequestData("foo", new Dictionary(), "foo", Array.Empty(), null); BuildRequestConfiguration config = new BuildRequestConfiguration(1, data1, "2.0"); BuildRequestEntry entry = new BuildRequestEntry(request, config); Assert.Equal(BuildRequestEntryState.Ready, entry.State); @@ -215,7 +215,7 @@ public void TestNoWaitingToComplete() Assert.Throws(() => { BuildRequest request = CreateNewBuildRequest(1, new string[1] { "foo" }); - BuildRequestData data1 = new BuildRequestData("foo", new Dictionary(), "foo", new string[0], null); + BuildRequestData data1 = new BuildRequestData("foo", new Dictionary(), "foo", Array.Empty(), null); BuildRequestConfiguration config = new BuildRequestConfiguration(1, data1, "2.0"); BuildRequestEntry entry = new BuildRequestEntry(request, config); Assert.Equal(BuildRequestEntryState.Ready, entry.State); @@ -240,7 +240,7 @@ public void TestNoCompleteToWaiting() Assert.Throws(() => { BuildRequest request = CreateNewBuildRequest(1, new string[1] { "foo" }); - BuildRequestConfiguration config = new BuildRequestConfiguration(1, new BuildRequestData("foo", new Dictionary(), "foo", new string[0], null), "2.0"); + BuildRequestConfiguration config = new BuildRequestConfiguration(1, new BuildRequestData("foo", new Dictionary(), "foo", Array.Empty(), null), "2.0"); BuildRequestEntry entry = new BuildRequestEntry(request, config); Assert.Equal(BuildRequestEntryState.Ready, entry.State); @@ -261,7 +261,7 @@ public void TestNoCompleteToWaiting() public void TestResultsWithNoMatch1() { BuildRequest request = CreateNewBuildRequest(1, new string[1] { "foo" }); - BuildRequestConfiguration config = new BuildRequestConfiguration(1, new BuildRequestData("foo", new Dictionary(), "foo", new string[0], null), "2.0"); + BuildRequestConfiguration config = new BuildRequestConfiguration(1, new BuildRequestData("foo", new Dictionary(), "foo", Array.Empty(), null), "2.0"); BuildRequestEntry entry = new BuildRequestEntry(request, config); Assert.Equal(BuildRequestEntryState.Ready, entry.State); @@ -272,7 +272,7 @@ public void TestResultsWithNoMatch1() entry.WaitForResult(waitingRequest1); Assert.Equal(BuildRequestEntryState.Waiting, entry.State); - BuildRequest randomRequest = CreateNewBuildRequest(3, new string[0]); + BuildRequest randomRequest = CreateNewBuildRequest(3, Array.Empty()); BuildResult requiredResult = new BuildResult(randomRequest); requiredResult.AddResultsForTarget("bar", BuildResultUtilities.GetEmptySucceedingTargetResult()); entry.ReportResult(requiredResult); diff --git a/src/Build.UnitTests/BackEnd/BuildRequest_Tests.cs b/src/Build.UnitTests/BackEnd/BuildRequest_Tests.cs index 9cede0f7298..7fcd1e1f609 100644 --- a/src/Build.UnitTests/BackEnd/BuildRequest_Tests.cs +++ b/src/Build.UnitTests/BackEnd/BuildRequest_Tests.cs @@ -32,39 +32,39 @@ public void TestConstructorBad() [Fact] public void TestConstructorGood() { - CreateNewBuildRequest(0, new string[0] { }); + CreateNewBuildRequest(0, Array.Empty() ); } [Fact] public void TestConfigurationId() { - BuildRequest request = CreateNewBuildRequest(0, new string[0] { }); + BuildRequest request = CreateNewBuildRequest(0, Array.Empty()); Assert.Equal(0, request.ConfigurationId); - BuildRequest request2 = CreateNewBuildRequest(1, new string[0] { }); + BuildRequest request2 = CreateNewBuildRequest(1, Array.Empty()); Assert.Equal(1, request2.ConfigurationId); - BuildRequest request3 = CreateNewBuildRequest(-1, new string[0] { }); + BuildRequest request3 = CreateNewBuildRequest(-1, Array.Empty()); Assert.Equal(-1, request3.ConfigurationId); } [Fact] public void TestConfigurationResolved() { - BuildRequest request = CreateNewBuildRequest(0, new string[0] { }); + BuildRequest request = CreateNewBuildRequest(0, Array.Empty()); Assert.False(request.IsConfigurationResolved); - BuildRequest request2 = CreateNewBuildRequest(1, new string[0] { }); + BuildRequest request2 = CreateNewBuildRequest(1, Array.Empty()); Assert.True(request2.IsConfigurationResolved); - BuildRequest request3 = CreateNewBuildRequest(-1, new string[0] { }); + BuildRequest request3 = CreateNewBuildRequest(-1, Array.Empty()); Assert.False(request3.IsConfigurationResolved); } [Fact] public void TestTargets() { - BuildRequest request = CreateNewBuildRequest(0, new string[0] { }); + BuildRequest request = CreateNewBuildRequest(0, Array.Empty()); Assert.NotNull(request.Targets); Assert.Empty(request.Targets); @@ -77,14 +77,14 @@ public void TestTargets() [Fact] public void TestPacketType() { - BuildRequest request = CreateNewBuildRequest(0, new string[0] { }); + BuildRequest request = CreateNewBuildRequest(0, Array.Empty()); Assert.Equal(NodePacketType.BuildRequest, request.Type); } [Fact] public void TestResolveConfigurationGood() { - BuildRequest request = CreateNewBuildRequest(0, new string[0] { }); + BuildRequest request = CreateNewBuildRequest(0, Array.Empty()); request.ResolveConfiguration(1); Assert.True(request.IsConfigurationResolved); Assert.Equal(1, request.ConfigurationId); @@ -95,7 +95,7 @@ public void TestResolveConfigurationBad() { Assert.Throws(() => { - BuildRequest request = CreateNewBuildRequest(1, new string[0] { }); + BuildRequest request = CreateNewBuildRequest(1, Array.Empty()); request.ResolveConfiguration(2); } ); @@ -106,7 +106,7 @@ public void TestResolveConfigurationBad2() { Assert.Throws(() => { - BuildRequest request = CreateNewBuildRequest(0, new string[0] { }); + BuildRequest request = CreateNewBuildRequest(0, Array.Empty()); request.ResolveConfiguration(-1); } ); diff --git a/src/Build.UnitTests/BackEnd/BuildResult_Tests.cs b/src/Build.UnitTests/BackEnd/BuildResult_Tests.cs index e46a84eb0e4..69e04708733 100644 --- a/src/Build.UnitTests/BackEnd/BuildResult_Tests.cs +++ b/src/Build.UnitTests/BackEnd/BuildResult_Tests.cs @@ -28,14 +28,14 @@ public BuildResult_Tests() [Fact] public void TestConstructorGood() { - BuildRequest request = CreateNewBuildRequest(1, new string[0]); + BuildRequest request = CreateNewBuildRequest(1, Array.Empty()); BuildResult result2 = new BuildResult(request); } [Fact] public void Clone() { - BuildRequest request = CreateNewBuildRequest(1, new string[0]); + BuildRequest request = CreateNewBuildRequest(1, Array.Empty()); BuildResult result1 = new BuildResult(request); result1.ResultsByTarget.Add("FOO", BuildResultUtilities.GetEmptySucceedingTargetResult()); Assert.True(result1.ResultsByTarget.ContainsKey("foo")); // test comparer @@ -68,11 +68,11 @@ public void TestConstructorBad() [Fact] public void TestConfigurationId() { - BuildRequest request = CreateNewBuildRequest(-1, new string[0]); + BuildRequest request = CreateNewBuildRequest(-1, Array.Empty()); BuildResult result = new BuildResult(request); Assert.Equal(-1, result.ConfigurationId); - BuildRequest request2 = CreateNewBuildRequest(1, new string[0]); + BuildRequest request2 = CreateNewBuildRequest(1, Array.Empty()); BuildResult result2 = new BuildResult(request2); Assert.Equal(1, result2.ConfigurationId); } @@ -80,7 +80,7 @@ public void TestConfigurationId() [Fact] public void TestExceptionGood() { - BuildRequest request = CreateNewBuildRequest(1, new string[0]); + BuildRequest request = CreateNewBuildRequest(1, Array.Empty()); BuildResult result = new BuildResult(request); Assert.Null(result.Exception); AccessViolationException e = new AccessViolationException(); @@ -92,20 +92,20 @@ public void TestExceptionGood() [Fact] public void TestOverallResult() { - BuildRequest request = CreateNewBuildRequest(1, new string[0]); + BuildRequest request = CreateNewBuildRequest(1, Array.Empty()); BuildResult result = new BuildResult(request); Assert.Equal(BuildResultCode.Success, result.OverallResult); result.AddResultsForTarget("foo", BuildResultUtilities.GetEmptySucceedingTargetResult()); Assert.Equal(BuildResultCode.Success, result.OverallResult); - result.AddResultsForTarget("bar", new TargetResult(new TaskItem[0] { }, new WorkUnitResult(WorkUnitResultCode.Success, WorkUnitActionCode.Continue, new Exception()))); + result.AddResultsForTarget("bar", new TargetResult(Array.Empty(), new WorkUnitResult(WorkUnitResultCode.Success, WorkUnitActionCode.Continue, new Exception()))); Assert.Equal(BuildResultCode.Success, result.OverallResult); - result.AddResultsForTarget("baz", new TargetResult(new TaskItem[0] { }, BuildResultUtilities.GetStopWithErrorResult(new Exception()))); + result.AddResultsForTarget("baz", new TargetResult(Array.Empty(), BuildResultUtilities.GetStopWithErrorResult(new Exception()))); Assert.Equal(BuildResultCode.Failure, result.OverallResult); - BuildRequest request2 = CreateNewBuildRequest(2, new string[0]); + BuildRequest request2 = CreateNewBuildRequest(2, Array.Empty()); BuildResult result2 = new BuildResult(request2); result2.AddResultsForTarget("foo", BuildResultUtilities.GetEmptySucceedingTargetResult()); result2.AddResultsForTarget("bar", BuildResultUtilities.GetEmptyFailingTargetResult()); @@ -115,7 +115,7 @@ public void TestOverallResult() [Fact] public void TestPacketType() { - BuildRequest request = CreateNewBuildRequest(1, new string[0]); + BuildRequest request = CreateNewBuildRequest(1, Array.Empty()); BuildResult result = new BuildResult(request); Assert.Equal(NodePacketType.BuildResult, ((INodePacket)result).Type); } @@ -123,7 +123,7 @@ public void TestPacketType() [Fact] public void TestAddAndRetrieve() { - BuildRequest request = CreateNewBuildRequest(1, new string[0]); + BuildRequest request = CreateNewBuildRequest(1, Array.Empty()); BuildResult result = new BuildResult(request); result.AddResultsForTarget("foo", BuildResultUtilities.GetEmptySucceedingTargetResult()); result.AddResultsForTarget("bar", BuildResultUtilities.GetEmptyFailingTargetResult()); @@ -137,7 +137,7 @@ public void TestIndexerBad1() { Assert.Throws(() => { - BuildRequest request = CreateNewBuildRequest(1, new string[0]); + BuildRequest request = CreateNewBuildRequest(1, Array.Empty()); BuildResult result = new BuildResult(request); ITargetResult targetResult = result["foo"]; } @@ -149,7 +149,7 @@ public void TestIndexerBad2() { Assert.Throws(() => { - BuildRequest request = CreateNewBuildRequest(1, new string[0]); + BuildRequest request = CreateNewBuildRequest(1, Array.Empty()); BuildResult result = new BuildResult(request); result.AddResultsForTarget("foo", BuildResultUtilities.GetEmptySucceedingTargetResult()); ITargetResult targetResult = result["bar"]; @@ -162,7 +162,7 @@ public void TestAddResultsInvalid1() { Assert.Throws(() => { - BuildRequest request = CreateNewBuildRequest(1, new string[0]); + BuildRequest request = CreateNewBuildRequest(1, Array.Empty()); BuildResult result = new BuildResult(request); result.AddResultsForTarget(null, BuildResultUtilities.GetEmptySucceedingTargetResult()); } @@ -174,7 +174,7 @@ public void TestAddResultsInvalid2() { Assert.Throws(() => { - BuildRequest request = CreateNewBuildRequest(1, new string[0]); + BuildRequest request = CreateNewBuildRequest(1, Array.Empty()); BuildResult result = new BuildResult(request); result.AddResultsForTarget("foo", null); } @@ -186,7 +186,7 @@ public void TestAddResultsInvalid3() { Assert.Throws(() => { - BuildRequest request = CreateNewBuildRequest(1, new string[0]); + BuildRequest request = CreateNewBuildRequest(1, Array.Empty()); BuildResult result = new BuildResult(request); result.AddResultsForTarget(null, BuildResultUtilities.GetEmptySucceedingTargetResult()); } @@ -195,7 +195,7 @@ public void TestAddResultsInvalid3() [Fact] public void TestMergeResults() { - BuildRequest request = CreateNewBuildRequest(1, new string[0]); + BuildRequest request = CreateNewBuildRequest(1, Array.Empty()); BuildResult result = new BuildResult(request); result.AddResultsForTarget("foo", BuildResultUtilities.GetEmptySucceedingTargetResult()); @@ -222,7 +222,7 @@ public void TestMergeResultsBad1() { Assert.Throws(() => { - BuildRequest request = CreateNewBuildRequest(1, new string[0]); + BuildRequest request = CreateNewBuildRequest(1, Array.Empty()); BuildResult result = new BuildResult(request); result.AddResultsForTarget("foo", BuildResultUtilities.GetEmptySucceedingTargetResult()); @@ -236,11 +236,11 @@ public void TestMergeResultsBad3() { Assert.Throws(() => { - BuildRequest request = CreateNewBuildRequest(1, new string[0]); + BuildRequest request = CreateNewBuildRequest(1, Array.Empty()); BuildResult result = new BuildResult(request); result.AddResultsForTarget("foo", BuildResultUtilities.GetEmptySucceedingTargetResult()); - BuildRequest request2 = CreateNewBuildRequest(2, new string[0]); + BuildRequest request2 = CreateNewBuildRequest(2, Array.Empty()); BuildResult result2 = new BuildResult(request2); result2.AddResultsForTarget("bar", BuildResultUtilities.GetEmptySucceedingTargetResult()); @@ -251,7 +251,7 @@ public void TestMergeResultsBad3() [Fact] public void TestHasResultsForTarget() { - BuildRequest request = CreateNewBuildRequest(1, new string[0]); + BuildRequest request = CreateNewBuildRequest(1, Array.Empty()); BuildResult result = new BuildResult(request); result.AddResultsForTarget("foo", BuildResultUtilities.GetEmptySucceedingTargetResult()); @@ -262,7 +262,7 @@ public void TestHasResultsForTarget() [Fact] public void TestEnumerator() { - BuildRequest request = CreateNewBuildRequest(1, new string[0]); + BuildRequest request = CreateNewBuildRequest(1, Array.Empty()); BuildResult result = new BuildResult(request); int countFound = 0; foreach (KeyValuePair resultPair in result.ResultsByTarget) @@ -322,7 +322,7 @@ public void TestTranslation() result.DefaultTargets = new List { "c", "d" }; result.AddResultsForTarget("alpha", new TargetResult(new TaskItem[] { fooTaskItem }, BuildResultUtilities.GetSuccessResult())); - result.AddResultsForTarget("omega", new TargetResult(new TaskItem[] { }, BuildResultUtilities.GetStopWithErrorResult(new ArgumentException("The argument was invalid")))); + result.AddResultsForTarget("omega", new TargetResult(Array.Empty(), BuildResultUtilities.GetStopWithErrorResult(new ArgumentException("The argument was invalid")))); Assert.Equal(NodePacketType.BuildResult, (result as INodePacket).Type); ((ITranslatable)result).Translate(TranslationHelpers.GetWriteTranslator()); diff --git a/src/Build.UnitTests/BackEnd/ConfigurationMetadata_Tests.cs b/src/Build.UnitTests/BackEnd/ConfigurationMetadata_Tests.cs index 6448a80ee70..67a47a52ec3 100644 --- a/src/Build.UnitTests/BackEnd/ConfigurationMetadata_Tests.cs +++ b/src/Build.UnitTests/BackEnd/ConfigurationMetadata_Tests.cs @@ -59,7 +59,7 @@ public void TestConstructorNullProject() [Fact] public void TestValidConfiguration() { - BuildRequestData data = new BuildRequestData("file", new Dictionary(), "toolsVersion", new string[0], null); + BuildRequestData data = new BuildRequestData("file", new Dictionary(), "toolsVersion", Array.Empty(), null); BuildRequestConfiguration config = new BuildRequestConfiguration(1, data, "2.0"); ConfigurationMetadata metadata = new ConfigurationMetadata(config); Assert.Equal(data.ProjectFullPath, metadata.ProjectFullPath); @@ -85,7 +85,7 @@ public void TestValidProject() [Fact] public void TestGetHashCode() { - BuildRequestData data = new BuildRequestData("file", new Dictionary(), ObjectModelHelpers.MSBuildDefaultToolsVersion, new string[0], null); + BuildRequestData data = new BuildRequestData("file", new Dictionary(), ObjectModelHelpers.MSBuildDefaultToolsVersion, Array.Empty(), null); BuildRequestConfiguration config = new BuildRequestConfiguration(1, data, ObjectModelHelpers.MSBuildDefaultToolsVersion); Project project = CreateProject(); @@ -101,7 +101,7 @@ public void TestGetHashCode() [Fact] public void TestEquals() { - BuildRequestData data = new BuildRequestData("file", new Dictionary(), ObjectModelHelpers.MSBuildDefaultToolsVersion, new string[0], null); + BuildRequestData data = new BuildRequestData("file", new Dictionary(), ObjectModelHelpers.MSBuildDefaultToolsVersion, Array.Empty(), null); BuildRequestConfiguration config = new BuildRequestConfiguration(1, data, ObjectModelHelpers.MSBuildDefaultToolsVersion); Project project = CreateProject(); @@ -110,12 +110,12 @@ public void TestEquals() ConfigurationMetadata metadata2 = new ConfigurationMetadata(project); Assert.True(metadata1.Equals(metadata2)); - data = new BuildRequestData("file2", new Dictionary(), ObjectModelHelpers.MSBuildDefaultToolsVersion, new string[0], null); + data = new BuildRequestData("file2", new Dictionary(), ObjectModelHelpers.MSBuildDefaultToolsVersion, Array.Empty(), null); BuildRequestConfiguration config2 = new BuildRequestConfiguration(1, data, ObjectModelHelpers.MSBuildDefaultToolsVersion); ConfigurationMetadata metadata3 = new ConfigurationMetadata(config2); Assert.False(metadata1.Equals(metadata3)); - data = new BuildRequestData("file", new Dictionary(), "3.0", new string[0], null); + data = new BuildRequestData("file", new Dictionary(), "3.0", Array.Empty(), null); BuildRequestConfiguration config3 = new BuildRequestConfiguration(1, data, "3.0"); ConfigurationMetadata metadata4 = new ConfigurationMetadata(config3); Assert.False(metadata1.Equals(metadata4)); diff --git a/src/Build.UnitTests/BackEnd/FullyQualifiedBuildRequest_Tests.cs b/src/Build.UnitTests/BackEnd/FullyQualifiedBuildRequest_Tests.cs index 4901c0fe91b..2381c054839 100644 --- a/src/Build.UnitTests/BackEnd/FullyQualifiedBuildRequest_Tests.cs +++ b/src/Build.UnitTests/BackEnd/FullyQualifiedBuildRequest_Tests.cs @@ -14,13 +14,13 @@ public class FullyQualifiedBuildRequest_Tests [Fact] public void TestConstructorGood() { - BuildRequestData data1 = new BuildRequestData("foo", new Dictionary(), "tools", new string[0], null); + BuildRequestData data1 = new BuildRequestData("foo", new Dictionary(), "tools", Array.Empty(), null); FullyQualifiedBuildRequest request = new FullyQualifiedBuildRequest(new BuildRequestConfiguration(data1, "2.0"), new string[1] { "foo" }, true); - request = new FullyQualifiedBuildRequest(new BuildRequestConfiguration(data1, "2.0"), new string[0] { }, true); + request = new FullyQualifiedBuildRequest(new BuildRequestConfiguration(data1, "2.0"), Array.Empty(), true); - BuildRequestData data3 = new BuildRequestData("foo", new Dictionary(), "tools", new string[0], null); - request = new FullyQualifiedBuildRequest(new BuildRequestConfiguration(data1, "2.0"), new string[0] { }, false); + BuildRequestData data3 = new BuildRequestData("foo", new Dictionary(), "tools", Array.Empty(), null); + request = new FullyQualifiedBuildRequest(new BuildRequestConfiguration(data1, "2.0"), Array.Empty(), false); } [Fact] @@ -38,14 +38,14 @@ public void TestConstructorBad2() { Assert.Throws(() => { - FullyQualifiedBuildRequest request = new FullyQualifiedBuildRequest(new BuildRequestConfiguration(new BuildRequestData("foo", new Dictionary(), "tools", new string[0], null), "2.0"), null, true); + FullyQualifiedBuildRequest request = new FullyQualifiedBuildRequest(new BuildRequestConfiguration(new BuildRequestData("foo", new Dictionary(), "tools", Array.Empty(), null), "2.0"), null, true); } ); } [Fact] public void TestProperties() { - BuildRequestData data = new BuildRequestData("foo", new Dictionary(), "tools", new string[0], null); + BuildRequestData data = new BuildRequestData("foo", new Dictionary(), "tools", Array.Empty(), null); BuildRequestConfiguration config = new BuildRequestConfiguration(data, "2.0"); FullyQualifiedBuildRequest request = new FullyQualifiedBuildRequest(config, new string[1] { "foo" }, true); Assert.Equal(request.Config, config); @@ -54,4 +54,4 @@ public void TestProperties() Assert.True(request.ResultsNeeded); } } -} \ No newline at end of file +} diff --git a/src/Build.UnitTests/BackEnd/IntrinsicTask_Tests.cs b/src/Build.UnitTests/BackEnd/IntrinsicTask_Tests.cs index a52b53f97f5..595f80a5d89 100644 --- a/src/Build.UnitTests/BackEnd/IntrinsicTask_Tests.cs +++ b/src/Build.UnitTests/BackEnd/IntrinsicTask_Tests.cs @@ -3879,7 +3879,7 @@ private static IntrinsicTask CreateIntrinsicTask(string content) ProjectTargetInstanceChild targetChild = projectInstance.Targets["t"].Children.First(); NodeLoggingContext nodeContext = new NodeLoggingContext(new MockLoggingService(), 1, false); - BuildRequestEntry entry = new BuildRequestEntry(new BuildRequest(1 /* submissionId */, 0, 1, new string[] { "t" }, null, BuildEventContext.Invalid, null), new BuildRequestConfiguration(1, new BuildRequestData("projectFile", new Dictionary(), "3.5", new string[0], null), "2.0")); + BuildRequestEntry entry = new BuildRequestEntry(new BuildRequest(1 /* submissionId */, 0, 1, new string[] { "t" }, null, BuildEventContext.Invalid, null), new BuildRequestConfiguration(1, new BuildRequestData("projectFile", new Dictionary(), "3.5", Array.Empty(), null), "2.0")); entry.RequestConfiguration.Project = projectInstance; IntrinsicTask task = IntrinsicTask.InstantiateTask( targetChild, @@ -3914,7 +3914,7 @@ internal static void AssertItemEvaluationFromTarget(string projectContents, stri var targetChild = projectInstance.Targets["t"].Children.First(); var nodeContext = new NodeLoggingContext(new MockLoggingService(), 1, false); - var entry = new BuildRequestEntry(new BuildRequest(1 /* submissionId */, 0, 1, new string[] { targetName }, null, BuildEventContext.Invalid, null), new BuildRequestConfiguration(1, new BuildRequestData("projectFile", new Dictionary(), "3.5", new string[0], null), "2.0")); + var entry = new BuildRequestEntry(new BuildRequest(1 /* submissionId */, 0, 1, new string[] { targetName }, null, BuildEventContext.Invalid, null), new BuildRequestConfiguration(1, new BuildRequestData("projectFile", new Dictionary(), "3.5", Array.Empty(), null), "2.0")); entry.RequestConfiguration.Project = projectInstance; var task = IntrinsicTask.InstantiateTask( targetChild, diff --git a/src/Build.UnitTests/BackEnd/LoggingServicesLogMethod_Tests.cs b/src/Build.UnitTests/BackEnd/LoggingServicesLogMethod_Tests.cs index ebbec93cd53..53ac71c8f9c 100644 --- a/src/Build.UnitTests/BackEnd/LoggingServicesLogMethod_Tests.cs +++ b/src/Build.UnitTests/BackEnd/LoggingServicesLogMethod_Tests.cs @@ -860,7 +860,7 @@ public void ProjectStartedEventTests(string projectFile, string targetNames) ProcessBuildEventHelper service = (ProcessBuildEventHelper)ProcessBuildEventHelper.CreateLoggingService(LoggerMode.Synchronous, 1, componentHost); ConfigCache cache = (ConfigCache)componentHost.GetComponent(BuildComponentType.ConfigCache); - BuildRequestData data = new BuildRequestData("file", new Dictionary(StringComparer.OrdinalIgnoreCase), "toolsVersion", new string[0], null); + BuildRequestData data = new BuildRequestData("file", new Dictionary(StringComparer.OrdinalIgnoreCase), "toolsVersion", Array.Empty(), null); BuildRequestConfiguration config = new BuildRequestConfiguration(2, data, "4.0"); cache.AddConfiguration(config); @@ -1442,7 +1442,7 @@ private void TestProjectFinishedEvent(string projectFile, bool success) ConfigCache cache = (ConfigCache)componentHost.GetComponent(BuildComponentType.ConfigCache); - BuildRequestData data = new BuildRequestData("file", new Dictionary(StringComparer.OrdinalIgnoreCase), "toolsVersion", new string[0], null); + BuildRequestData data = new BuildRequestData("file", new Dictionary(StringComparer.OrdinalIgnoreCase), "toolsVersion", Array.Empty(), null); BuildRequestConfiguration config = new BuildRequestConfiguration(2, data, "4.0"); cache.AddConfiguration(config); diff --git a/src/Build.UnitTests/BackEnd/RequestBuilder_Tests.cs b/src/Build.UnitTests/BackEnd/RequestBuilder_Tests.cs index 42ceffcef27..55c480d184f 100644 --- a/src/Build.UnitTests/BackEnd/RequestBuilder_Tests.cs +++ b/src/Build.UnitTests/BackEnd/RequestBuilder_Tests.cs @@ -221,7 +221,7 @@ public void TestMissingProjectFile() { TestTargetBuilder targetBuilder = (TestTargetBuilder)_host.GetComponent(BuildComponentType.TargetBuilder); IConfigCache configCache = (IConfigCache)_host.GetComponent(BuildComponentType.ConfigCache); - BuildRequestConfiguration configuration = new BuildRequestConfiguration(1, new BuildRequestData("testName", new Dictionary(), "3.5", new string[0], null), "2.0"); + BuildRequestConfiguration configuration = new BuildRequestConfiguration(1, new BuildRequestData("testName", new Dictionary(), "3.5", Array.Empty(), null), "2.0"); configCache.AddConfiguration(configuration); BuildRequest request = CreateNewBuildRequest(1, new string[1] { "target1" }); @@ -266,7 +266,7 @@ private BuildRequestConfiguration CreateTestProject(int configId) projectFile, new Dictionary(), ObjectModelHelpers.MSBuildDefaultToolsVersion, - new string[0], + Array.Empty(), null), defaultToolsVersion); return config; @@ -318,7 +318,7 @@ private BuildRequest CreateNewBuildRequest(int configurationId, string[] targets private TargetResult GetEmptySuccessfulTargetResult() { - return new TargetResult(new TaskItem[0] { }, new WorkUnitResult(WorkUnitResultCode.Success, WorkUnitActionCode.Continue, null)); + return new TargetResult(Array.Empty(), new WorkUnitResult(WorkUnitResultCode.Success, WorkUnitActionCode.Continue, null)); } private void WaitForEvent(WaitHandle evt, string eventName) diff --git a/src/Build.UnitTests/BackEnd/Scheduler_Tests.cs b/src/Build.UnitTests/BackEnd/Scheduler_Tests.cs index 7386b34a91f..dd7b684ff6a 100644 --- a/src/Build.UnitTests/BackEnd/Scheduler_Tests.cs +++ b/src/Build.UnitTests/BackEnd/Scheduler_Tests.cs @@ -70,11 +70,11 @@ public Scheduler_Tests() _scheduler = new Scheduler(); _scheduler.InitializeComponent(_host); CreateConfiguration(99, "parent.proj"); - _defaultParentRequest = CreateBuildRequest(99, 99, new string[] { }, null); + _defaultParentRequest = CreateBuildRequest(99, 99, Array.Empty(), null); // Set up the scheduler with one node to start with. _scheduler.ReportNodesCreated(new NodeInfo[] { new NodeInfo(1, NodeProviderType.InProc) }); - _scheduler.ReportRequestBlocked(1, new BuildRequestBlocker(-1, new string[] { }, new BuildRequest[] { _defaultParentRequest })); + _scheduler.ReportRequestBlocked(1, new BuildRequestBlocker(-1, Array.Empty(), new BuildRequest[] { _defaultParentRequest })); _logger = new MockLogger(); _parameters = new BuildParameters(); @@ -105,7 +105,7 @@ public void TestSimpleRequest() { CreateConfiguration(1, "foo.proj"); BuildRequest request = CreateBuildRequest(1, 1); - BuildRequestBlocker blocker = new BuildRequestBlocker(request.ParentGlobalRequestId, new string[] { }, new BuildRequest[] { request }); + BuildRequestBlocker blocker = new BuildRequestBlocker(request.ParentGlobalRequestId, Array.Empty(), new BuildRequest[] { request }); List response = new List(_scheduler.ReportRequestBlocked(1, blocker)); Assert.Single(response); @@ -123,7 +123,7 @@ public void TestSimpleRequestWithCachedResultsSuccess() BuildRequest request = CreateBuildRequest(1, 1, new string[] { "foo" }); BuildResult result = CacheBuildResult(request, "foo", BuildResultUtilities.GetSuccessResult()); - BuildRequestBlocker blocker = new BuildRequestBlocker(request.ParentGlobalRequestId, new string[] { }, new BuildRequest[] { request }); + BuildRequestBlocker blocker = new BuildRequestBlocker(request.ParentGlobalRequestId, Array.Empty(), new BuildRequest[] { request }); List response = new List(_scheduler.ReportRequestBlocked(1, blocker)); Assert.Equal(2, response.Count); @@ -147,7 +147,7 @@ public void TestSimpleRequestWithCachedResultsFail() BuildRequest request = CreateBuildRequest(1, 1, new string[] { "foo" }); BuildResult result = CacheBuildResult(request, "foo", BuildResultUtilities.GetStopWithErrorResult()); - BuildRequestBlocker blocker = new BuildRequestBlocker(request.ParentGlobalRequestId, new string[] { }, new BuildRequest[] { request }); + BuildRequestBlocker blocker = new BuildRequestBlocker(request.ParentGlobalRequestId, Array.Empty(), new BuildRequest[] { request }); List response = new List(_scheduler.ReportRequestBlocked(1, blocker)); Assert.Equal(2, response.Count); @@ -170,7 +170,7 @@ public void TestChildRequest() CreateConfiguration(1, "foo.proj"); BuildRequest request = CreateBuildRequest(1, 1, new string[] { "foo" }); - BuildRequestBlocker blocker = new BuildRequestBlocker(-1, new string[] { }, new BuildRequest[] { request }); + BuildRequestBlocker blocker = new BuildRequestBlocker(-1, Array.Empty(), new BuildRequest[] { request }); List response = new List(_scheduler.ReportRequestBlocked(1, blocker)); CreateConfiguration(2, "bar.proj"); @@ -201,7 +201,7 @@ public void TestMultipleRequests() BuildRequest request1 = CreateBuildRequest(1, 1, new string[] { "foo" }); BuildRequest request2 = CreateBuildRequest(2, 1, new string[] { "bar" }); - BuildRequestBlocker blocker = new BuildRequestBlocker(request1.ParentGlobalRequestId, new string[] { }, new BuildRequest[] { request1, request2 }); + BuildRequestBlocker blocker = new BuildRequestBlocker(request1.ParentGlobalRequestId, Array.Empty(), new BuildRequest[] { request1, request2 }); List response = new List(_scheduler.ReportRequestBlocked(1, blocker)); Assert.Single(response); @@ -221,7 +221,7 @@ public void TestMultipleRequestsWithSomeResults() BuildRequest request2 = CreateBuildRequest(2, 2, new string[] { "bar" }); BuildResult result2 = CacheBuildResult(request2, "bar", BuildResultUtilities.GetSuccessResult()); - BuildRequestBlocker blocker = new BuildRequestBlocker(request1.ParentGlobalRequestId, new string[] { }, new BuildRequest[] { request1, request2 }); + BuildRequestBlocker blocker = new BuildRequestBlocker(request1.ParentGlobalRequestId, Array.Empty(), new BuildRequest[] { request1, request2 }); List response = new List(_scheduler.ReportRequestBlocked(1, blocker)); Assert.Equal(2, response.Count); @@ -244,7 +244,7 @@ public void TestMultipleRequestsWithAllResults() BuildRequest request2 = CreateBuildRequest(2, 2, new string[] { "bar" }); BuildResult result2 = CacheBuildResult(request2, "bar", BuildResultUtilities.GetSuccessResult()); - BuildRequestBlocker blocker = new BuildRequestBlocker(request1.ParentGlobalRequestId, new string[] { }, new BuildRequest[] { request1, request2 }); + BuildRequestBlocker blocker = new BuildRequestBlocker(request1.ParentGlobalRequestId, Array.Empty(), new BuildRequest[] { request1, request2 }); List response = new List(_scheduler.ReportRequestBlocked(1, blocker)); Assert.Equal(3, response.Count); @@ -272,7 +272,7 @@ public void TestOutOfProcNodeCreatedWhenAffinityIsOutOfProc() BuildRequest request1 = CreateBuildRequest(1, 1, new string[] { "foo" }, NodeAffinity.OutOfProc, _defaultParentRequest); BuildRequest request2 = CreateBuildRequest(2, 1, new string[] { "bar" }, NodeAffinity.OutOfProc, _defaultParentRequest); - BuildRequestBlocker blocker = new BuildRequestBlocker(request1.ParentGlobalRequestId, new string[] { }, new BuildRequest[] { request1, request2 }); + BuildRequestBlocker blocker = new BuildRequestBlocker(request1.ParentGlobalRequestId, Array.Empty(), new BuildRequest[] { request1, request2 }); List response = new List(_scheduler.ReportRequestBlocked(1, blocker)); // Parent request is blocked by the fact that both child requests require the out-of-proc node that doesn't @@ -296,7 +296,7 @@ public void TestOutOfProcNodesCreatedWhenAffinityIsOutOfProc() BuildRequest request1 = CreateBuildRequest(1, 1, new string[] { "foo" }, NodeAffinity.OutOfProc, _defaultParentRequest); BuildRequest request2 = CreateBuildRequest(2, 1, new string[] { "bar" }, NodeAffinity.OutOfProc, _defaultParentRequest); - BuildRequestBlocker blocker = new BuildRequestBlocker(request1.ParentGlobalRequestId, new string[] { }, new BuildRequest[] { request1, request2 }); + BuildRequestBlocker blocker = new BuildRequestBlocker(request1.ParentGlobalRequestId, Array.Empty(), new BuildRequest[] { request1, request2 }); List response = new List(_scheduler.ReportRequestBlocked(1, blocker)); // Parent request is blocked by the fact that both child requests require the out-of-proc node that doesn't @@ -323,7 +323,7 @@ public void TestNoNewNodesCreatedForMultipleRequestsWithSameConfiguration() BuildRequest request3 = CreateBuildRequest(3, 1, new string[] { "baz" }); BuildRequest request4 = CreateBuildRequest(4, 1, new string[] { "qux" }); - BuildRequestBlocker blocker = new BuildRequestBlocker(request1.ParentGlobalRequestId, new string[] { }, new BuildRequest[] { request1, request2, request3, request4 }); + BuildRequestBlocker blocker = new BuildRequestBlocker(request1.ParentGlobalRequestId, Array.Empty(), new BuildRequest[] { request1, request2, request3, request4 }); List response = new List(_scheduler.ReportRequestBlocked(1, blocker)); Assert.Single(response); @@ -349,7 +349,7 @@ public void TestMaxNodeCountNotExceededWithRequestsOfAffinityAny() BuildRequest request3 = CreateBuildRequest(3, 3, new string[] { "baz" }); BuildRequest request4 = CreateBuildRequest(4, 4, new string[] { "qux" }); - BuildRequestBlocker blocker = new BuildRequestBlocker(request1.ParentGlobalRequestId, new string[] { }, new BuildRequest[] { request1, request2, request3, request4 }); + BuildRequestBlocker blocker = new BuildRequestBlocker(request1.ParentGlobalRequestId, Array.Empty(), new BuildRequest[] { request1, request2, request3, request4 }); List response = new List(_scheduler.ReportRequestBlocked(1, blocker)); Assert.Equal(2, response.Count); @@ -386,14 +386,14 @@ public void VerifyRequestOrderingDoesNotAffectNodeCreationCountWithInProcAndAnyR _buildManager = new BuildManager(); CreateConfiguration(99, "parent.proj"); - _defaultParentRequest = CreateBuildRequest(99, 99, new string[] { }, null); + _defaultParentRequest = CreateBuildRequest(99, 99, Array.Empty(), null); CreateConfiguration(1, "foo.proj"); BuildRequest request1 = CreateBuildRequest(1, 1, new string[] { "foo" }, NodeAffinity.Any, _defaultParentRequest); BuildRequest request2 = CreateBuildRequest(2, 1, new string[] { "bar" }, NodeAffinity.InProc, _defaultParentRequest); BuildRequest request3 = CreateBuildRequest(3, 1, new string[] { "bar" }, NodeAffinity.InProc, _defaultParentRequest); - List response = new List(_scheduler.ReportRequestBlocked(1, new BuildRequestBlocker(-1, new string[] { }, new BuildRequest[] { _defaultParentRequest, request1, request2, request3 }))); + List response = new List(_scheduler.ReportRequestBlocked(1, new BuildRequestBlocker(-1, Array.Empty(), new BuildRequest[] { _defaultParentRequest, request1, request2, request3 }))); Assert.Single(response); Assert.Equal(ScheduleActionType.CreateNode, response[0].Action); Assert.Equal(NodeAffinity.InProc, response[0].RequiredNodeType); @@ -427,7 +427,7 @@ public void TestMaxNodeCountOOPNodesCreatedForOOPAffinitizedRequests() BuildRequest request3 = CreateBuildRequest(3, 3, new string[] { "baz" }, NodeAffinity.OutOfProc, _defaultParentRequest); BuildRequest request4 = CreateBuildRequest(4, 4, new string[] { "qux" }, NodeAffinity.OutOfProc, _defaultParentRequest); - BuildRequestBlocker blocker = new BuildRequestBlocker(request1.ParentGlobalRequestId, new string[] { }, new BuildRequest[] { request1, request2, request3, request4 }); + BuildRequestBlocker blocker = new BuildRequestBlocker(request1.ParentGlobalRequestId, Array.Empty(), new BuildRequest[] { request1, request2, request3, request4 }); List response = new List(_scheduler.ReportRequestBlocked(1, blocker)); // Parent request is blocked by the fact that both child requests require the out-of-proc node that doesn't @@ -457,7 +457,7 @@ public void TestMaxNodeCountNodesNotExceededWithSomeOOPRequests1() BuildRequest request3 = CreateBuildRequest(3, 3, new string[] { "baz" }); BuildRequest request4 = CreateBuildRequest(4, 4, new string[] { "qux" }); - BuildRequestBlocker blocker = new BuildRequestBlocker(request1.ParentGlobalRequestId, new string[] { }, new BuildRequest[] { request1, request2, request3, request4 }); + BuildRequestBlocker blocker = new BuildRequestBlocker(request1.ParentGlobalRequestId, Array.Empty(), new BuildRequest[] { request1, request2, request3, request4 }); List response = new List(_scheduler.ReportRequestBlocked(1, blocker)); Assert.Equal(2, response.Count); @@ -487,7 +487,7 @@ public void TestMaxNodeCountNodesNotExceededWithSomeOOPRequests2() BuildRequest request3 = CreateBuildRequest(3, 3, new string[] { "baz" }); BuildRequest request4 = CreateBuildRequest(4, 4, new string[] { "qux" }); - BuildRequestBlocker blocker = new BuildRequestBlocker(request1.ParentGlobalRequestId, new string[] { }, new BuildRequest[] { request1, request2, request3, request4 }); + BuildRequestBlocker blocker = new BuildRequestBlocker(request1.ParentGlobalRequestId, Array.Empty(), new BuildRequest[] { request1, request2, request3, request4 }); List response = new List(_scheduler.ReportRequestBlocked(1, blocker)); Assert.Equal(2, response.Count); @@ -520,7 +520,7 @@ public void TestTraversalAffinityIsInProc() BuildRequest request1 = CreateBuildRequest(1, 1, new string[] { "foo" }, _defaultParentRequest); BuildRequest request2 = CreateBuildRequest(2, 2, new string[] { "bar" }, _defaultParentRequest); - BuildRequestBlocker blocker = new BuildRequestBlocker(request1.ParentGlobalRequestId, new string[] { }, new BuildRequest[] { request1, request2 }); + BuildRequestBlocker blocker = new BuildRequestBlocker(request1.ParentGlobalRequestId, Array.Empty(), new BuildRequest[] { request1, request2 }); List response = new List(_scheduler.ReportRequestBlocked(1, blocker)); // There will be no request to create a new node, because both of the above requests are traversals, @@ -544,7 +544,7 @@ public void TestProxyAffinityIsInProc() BuildRequest request1 = CreateProxyBuildRequest(1, 1, new ProxyTargets(new Dictionary {{"foo", "bar"}}), null); - BuildRequestBlocker blocker = new BuildRequestBlocker(-1, new string[] { }, new[] { request1 }); + BuildRequestBlocker blocker = new BuildRequestBlocker(-1, Array.Empty(), new[] { request1 }); List response = new List(_scheduler.ReportRequestBlocked(1, blocker)); // There will be no request to create a new node, because both of the above requests are proxy build requests, @@ -578,7 +578,7 @@ public void VerifyNoOverCreationOfNodesWithBuildLoop() _buildManager = new BuildManager(); CreateConfiguration(99, "parent.proj"); - _defaultParentRequest = CreateBuildRequest(99, 99, new string[] { }, null); + _defaultParentRequest = CreateBuildRequest(99, 99, Array.Empty(), null); CreateConfiguration(1, "foo.proj"); BuildRequest request1 = CreateBuildRequest(1, 1, new string[] { "foo" }, NodeAffinity.OutOfProc, _defaultParentRequest); @@ -587,7 +587,7 @@ public void VerifyNoOverCreationOfNodesWithBuildLoop() CreateConfiguration(3, "foo3.proj"); BuildRequest request3 = CreateBuildRequest(3, 3, new string[] { "bar" }, NodeAffinity.InProc, _defaultParentRequest); - List responses = new List(_scheduler.ReportRequestBlocked(1, new BuildRequestBlocker(-1, new string[] { }, new BuildRequest[] { _defaultParentRequest, request1, request2, request3 }))); + List responses = new List(_scheduler.ReportRequestBlocked(1, new BuildRequestBlocker(-1, Array.Empty(), new BuildRequest[] { _defaultParentRequest, request1, request2, request3 }))); int nextNodeId = 1; bool inProcNodeExists = false; @@ -606,7 +606,7 @@ public void TestTwoRequestsWithFirstFailure() BuildResult result1 = CacheBuildResult(request1, "foo", BuildResultUtilities.GetStopWithErrorResult()); BuildRequest request2 = CreateBuildRequest(2, 1, new string[] { "bar" }); - BuildRequestBlocker blocker = new BuildRequestBlocker(request1.ParentGlobalRequestId, new string[] { }, new BuildRequest[] { request1, request2 }); + BuildRequestBlocker blocker = new BuildRequestBlocker(request1.ParentGlobalRequestId, Array.Empty(), new BuildRequest[] { request1, request2 }); List response = new List(_scheduler.ReportRequestBlocked(1, blocker)); Assert.Equal(2, response.Count); @@ -625,7 +625,7 @@ public void TestTwoRequestsWithSecondFailure() BuildRequest request2 = CreateBuildRequest(2, 1, new string[] { "bar" }); BuildResult result2 = CacheBuildResult(request2, "bar", BuildResultUtilities.GetStopWithErrorResult()); - BuildRequestBlocker blocker = new BuildRequestBlocker(request1.ParentGlobalRequestId, new string[] { }, new BuildRequest[] { request1, request2 }); + BuildRequestBlocker blocker = new BuildRequestBlocker(request1.ParentGlobalRequestId, Array.Empty(), new BuildRequest[] { request1, request2 }); List response = new List(_scheduler.ReportRequestBlocked(1, blocker)); Assert.Equal(2, response.Count); @@ -645,7 +645,7 @@ public void TestThreeRequestsWithOneFailure() BuildResult result2 = CacheBuildResult(request2, "bar", BuildResultUtilities.GetStopWithErrorResult()); BuildRequest request3 = CreateBuildRequest(3, 1, new string[] { "baz" }); - BuildRequestBlocker blocker = new BuildRequestBlocker(request1.ParentGlobalRequestId, new string[] { }, new BuildRequest[] { request1, request2, request3 }); + BuildRequestBlocker blocker = new BuildRequestBlocker(request1.ParentGlobalRequestId, Array.Empty(), new BuildRequest[] { request1, request2, request3 }); List response = new List(_scheduler.ReportRequestBlocked(1, blocker)); Assert.Equal(2, response.Count); @@ -661,7 +661,7 @@ public void TestResult() { CreateConfiguration(1, "foo.proj"); BuildRequest request = CreateBuildRequest(1, 1); - BuildRequestBlocker blocker = new BuildRequestBlocker(request.ParentGlobalRequestId, new string[] { }, new BuildRequest[] { request }); + BuildRequestBlocker blocker = new BuildRequestBlocker(request.ParentGlobalRequestId, Array.Empty(), new BuildRequest[] { request }); List response = new List(_scheduler.ReportRequestBlocked(1, blocker)); BuildResult result = CreateBuildResult(request, "foo", BuildResultUtilities.GetSuccessResult()); @@ -708,7 +708,7 @@ public void TestDetailedSummary() /// private void CreateConfiguration(int configId, string file) { - BuildRequestData data = new BuildRequestData(file, new Dictionary(), "4.0", new string[] { }, null); + BuildRequestData data = new BuildRequestData(file, new Dictionary(), "4.0", Array.Empty(), null); BuildRequestConfiguration config = new BuildRequestConfiguration(configId, data, "4.0"); config.ProjectInitialTargets = new List(); config.ProjectDefaultTargets = new List(); @@ -733,7 +733,7 @@ private BuildResult CacheBuildResult(BuildRequest request, string target, WorkUn private BuildResult CreateBuildResult(BuildRequest request, string target, WorkUnitResult workUnitResult) { BuildResult result = new BuildResult(request); - result.AddResultsForTarget(target, new TargetResult(new TaskItem[] { }, workUnitResult)); + result.AddResultsForTarget(target, new TargetResult(Array.Empty(), workUnitResult)); return result; } @@ -742,7 +742,7 @@ private BuildResult CreateBuildResult(BuildRequest request, string target, WorkU /// private BuildRequest CreateBuildRequest(int nodeRequestId, int configId) { - return CreateBuildRequest(nodeRequestId, configId, new string[] { }); + return CreateBuildRequest(nodeRequestId, configId, Array.Empty()); } /// diff --git a/src/Build.UnitTests/BackEnd/TargetBuilder_Tests.cs b/src/Build.UnitTests/BackEnd/TargetBuilder_Tests.cs index 62674749d33..cbf5126c87a 100644 --- a/src/Build.UnitTests/BackEnd/TargetBuilder_Tests.cs +++ b/src/Build.UnitTests/BackEnd/TargetBuilder_Tests.cs @@ -1616,7 +1616,7 @@ private ProjectInstance CreateTestProject(string projectBodyContents, string ini } IConfigCache cache = (IConfigCache)_host.GetComponent(BuildComponentType.ConfigCache); - BuildRequestConfiguration config = new BuildRequestConfiguration(1, new BuildRequestData("testFile", new Dictionary(), "3.5", new string[0], null), "2.0"); + BuildRequestConfiguration config = new BuildRequestConfiguration(1, new BuildRequestData("testFile", new Dictionary(), "3.5", Array.Empty(), null), "2.0"); Project project = new Project(XmlReader.Create(new StringReader(projectFileContents))); config.Project = project.CreateProjectInstance(); diff --git a/src/Build.UnitTests/BackEnd/TargetEntry_Tests.cs b/src/Build.UnitTests/BackEnd/TargetEntry_Tests.cs index 3446700cae3..c921b0bdcf9 100644 --- a/src/Build.UnitTests/BackEnd/TargetEntry_Tests.cs +++ b/src/Build.UnitTests/BackEnd/TargetEntry_Tests.cs @@ -78,7 +78,7 @@ public void TestConstructorNullTarget() Assert.Throws(() => { ProjectInstance project = CreateTestProject(true /* Returns enabled */); - BuildRequestConfiguration config = new BuildRequestConfiguration(1, new BuildRequestData("foo", new Dictionary(), "foo", new string[0], null), "2.0"); + BuildRequestConfiguration config = new BuildRequestConfiguration(1, new BuildRequestData("foo", new Dictionary(), "foo", Array.Empty(), null), "2.0"); BuildRequestEntry requestEntry = new BuildRequestEntry(CreateNewBuildRequest(1, new string[] { "foo" }), config); Lookup lookup = new Lookup(new ItemDictionary(project.Items), new PropertyDictionary(project.Properties)); TargetEntry entry = new TargetEntry(requestEntry, this, null, lookup, null, TargetBuiltReason.None, _host, false); @@ -94,7 +94,7 @@ public void TestConstructorNullLookup() Assert.Throws(() => { ProjectInstance project = CreateTestProject(true /* Returns enabled */); - BuildRequestConfiguration config = new BuildRequestConfiguration(1, new BuildRequestData("foo", new Dictionary(), "foo", new string[0], null), "2.0"); + BuildRequestConfiguration config = new BuildRequestConfiguration(1, new BuildRequestData("foo", new Dictionary(), "foo", Array.Empty(), null), "2.0"); BuildRequestEntry requestEntry = new BuildRequestEntry(CreateNewBuildRequest(1, new string[] { "foo" }), config); TargetEntry entry = new TargetEntry(requestEntry, this, new TargetSpecification("Empty", null), null, null, TargetBuiltReason.None, _host, false); } @@ -109,7 +109,7 @@ public void TestConstructorNullHost() Assert.Throws(() => { ProjectInstance project = CreateTestProject(true /* Returns enabled */); - BuildRequestConfiguration config = new BuildRequestConfiguration(1, new BuildRequestData("foo", new Dictionary(), "foo", new string[0], null), "2.0"); + BuildRequestConfiguration config = new BuildRequestConfiguration(1, new BuildRequestData("foo", new Dictionary(), "foo", Array.Empty(), null), "2.0"); BuildRequestEntry requestEntry = new BuildRequestEntry(CreateNewBuildRequest(1, new string[] { "foo" }), config); Lookup lookup = new Lookup(new ItemDictionary(project.Items), new PropertyDictionary(project.Properties)); @@ -876,7 +876,7 @@ public void AfterTargetsShouldReportFailedBuild() project.FullPath, new Dictionary(), ObjectModelHelpers.MSBuildDefaultToolsVersion, - new string[] { }, + Array.Empty(), null); manager = new BuildManager(); BuildResult result = manager.Build(parameters, data); @@ -1023,7 +1023,7 @@ private BuildRequest CreateNewBuildRequest(int configurationId, string[] targets /// The new target entry private TargetEntry CreateStandardTargetEntry(ProjectInstance project, string targetName) { - BuildRequestConfiguration config = new BuildRequestConfiguration(1, new BuildRequestData("foo", new Dictionary(), "foo", new string[0], null), "2.0"); + BuildRequestConfiguration config = new BuildRequestConfiguration(1, new BuildRequestData("foo", new Dictionary(), "foo", Array.Empty(), null), "2.0"); config.Project = project; BuildRequestEntry requestEntry = new BuildRequestEntry(CreateNewBuildRequest(1, new string[] { "foo" }), config); @@ -1041,7 +1041,7 @@ private TargetEntry CreateStandardTargetEntry(ProjectInstance project, string ta /// The new target entry private TargetEntry CreateStandardTargetEntry(ProjectInstance project, string target, TargetEntry baseEntry) { - BuildRequestConfiguration config = new BuildRequestConfiguration(1, new BuildRequestData("foo", new Dictionary(), "foo", new string[0], null), "2.0"); + BuildRequestConfiguration config = new BuildRequestConfiguration(1, new BuildRequestData("foo", new Dictionary(), "foo", Array.Empty(), null), "2.0"); config.Project = project; BuildRequestEntry requestEntry = new BuildRequestEntry(CreateNewBuildRequest(1, new string[1] { "foo" }), config); TargetEntry entry = new TargetEntry(requestEntry, this, new TargetSpecification(target, project.Targets[target].Location), baseEntry.Lookup, baseEntry, TargetBuiltReason.None, _host, false); diff --git a/src/Build.UnitTests/BackEnd/TargetResult_Tests.cs b/src/Build.UnitTests/BackEnd/TargetResult_Tests.cs index 67950cf5716..4a1f5e95dce 100644 --- a/src/Build.UnitTests/BackEnd/TargetResult_Tests.cs +++ b/src/Build.UnitTests/BackEnd/TargetResult_Tests.cs @@ -23,7 +23,7 @@ public class TargetResult_Tests [Fact] public void TestConstructorNoItems() { - TargetResult result = new TargetResult(new TaskItem[] { }, BuildResultUtilities.GetStopWithErrorResult()); + TargetResult result = new TargetResult(Array.Empty(), BuildResultUtilities.GetStopWithErrorResult()); Assert.Empty(result.Items); Assert.Null(result.Exception); Assert.Equal(TargetResultCode.Failure, result.ResultCode); diff --git a/src/Build.UnitTests/BackEnd/TaskBuilderTestTask.cs b/src/Build.UnitTests/BackEnd/TaskBuilderTestTask.cs index c0341747d64..9aec67f5edd 100644 --- a/src/Build.UnitTests/BackEnd/TaskBuilderTestTask.cs +++ b/src/Build.UnitTests/BackEnd/TaskBuilderTestTask.cs @@ -270,7 +270,7 @@ public string[] EmptyStringArrayOutput get { _testTaskHost.OutputRead("EmptyStringArrayOutput", null); - return new string[0]; + return Array.Empty(); } } diff --git a/src/Build.UnitTests/BackEnd/TaskBuilder_Tests.cs b/src/Build.UnitTests/BackEnd/TaskBuilder_Tests.cs index 7ba76a5b89d..459e11c2e7c 100644 --- a/src/Build.UnitTests/BackEnd/TaskBuilder_Tests.cs +++ b/src/Build.UnitTests/BackEnd/TaskBuilder_Tests.cs @@ -1131,7 +1131,7 @@ private ProjectInstance CreateTestProject() "); IConfigCache cache = (IConfigCache)_host.GetComponent(BuildComponentType.ConfigCache); - BuildRequestConfiguration config = new BuildRequestConfiguration(1, new BuildRequestData("testfile", new Dictionary(), "3.5", new string[0], null), "2.0"); + BuildRequestConfiguration config = new BuildRequestConfiguration(1, new BuildRequestData("testfile", new Dictionary(), "3.5", Array.Empty(), null), "2.0"); Project project = new Project(XmlReader.Create(new StringReader(projectFileContents))); config.Project = project.CreateProjectInstance(); cache.AddConfiguration(config); diff --git a/src/Build.UnitTests/BackEnd/TaskExecutionHost_Tests.cs b/src/Build.UnitTests/BackEnd/TaskExecutionHost_Tests.cs index 93abec24663..9c55e1d7c20 100644 --- a/src/Build.UnitTests/BackEnd/TaskExecutionHost_Tests.cs +++ b/src/Build.UnitTests/BackEnd/TaskExecutionHost_Tests.cs @@ -897,7 +897,7 @@ public void TestOutputItemArrayToProperty() public void TestEmptyStringInStringArrayParameterIntoItemList() { SetTaskParameter("StringArrayParam", ""); - ValidateOutputItems("StringArrayOutput", new ITaskItem[] { }); + ValidateOutputItems("StringArrayOutput", Array.Empty()); } /// @@ -908,7 +908,7 @@ public void TestEmptyStringInStringArrayParameterIntoItemList() public void TestEmptyStringParameterIntoItemList() { SetTaskParameter("StringParam", ""); - ValidateOutputItems("StringOutput", new ITaskItem[] { }); + ValidateOutputItems("StringOutput", Array.Empty()); } /// @@ -917,7 +917,7 @@ public void TestEmptyStringParameterIntoItemList() [Fact] public void TestNullITaskItemArrayParameter() { - ValidateOutputItems("ItemArrayNullOutput", new ITaskItem[] { }); + ValidateOutputItems("ItemArrayNullOutput", Array.Empty()); } /// @@ -928,7 +928,7 @@ public void TestArrayListParameter() { Assert.Throws(() => { - ValidateOutputItems("ArrayListOutput", new ITaskItem[] { }); + ValidateOutputItems("ArrayListOutput", Array.Empty()); } ); } @@ -1203,7 +1203,7 @@ private void InitializeHost(bool throwOnExecute) itemsByName.Add(item2); _twoItems = new ITaskItem[] { new TaskItem(item), new TaskItem(item2) }; - _bucket = new ItemBucket(new string[0], new Dictionary(), new Lookup(itemsByName, new PropertyDictionary()), 0); + _bucket = new ItemBucket(Array.Empty(), new Dictionary(), new Lookup(itemsByName, new PropertyDictionary()), 0); _host.FindTask(null); _host.InitializeForBatch(talc, _bucket, null); _parametersSetOnTask = new Dictionary(StringComparer.OrdinalIgnoreCase); diff --git a/src/Build.UnitTests/BackEnd/TaskHost_Tests.cs b/src/Build.UnitTests/BackEnd/TaskHost_Tests.cs index e45add12e09..2f370689cb7 100644 --- a/src/Build.UnitTests/BackEnd/TaskHost_Tests.cs +++ b/src/Build.UnitTests/BackEnd/TaskHost_Tests.cs @@ -71,7 +71,7 @@ public TaskHost_Tests() _elementLocation = ElementLocation.Create("MockFile", 5, 5); BuildRequest buildRequest = new BuildRequest(1 /* submissionId */, 1, 1, new List(), null, BuildEventContext.Invalid, null); - BuildRequestConfiguration configuration = new BuildRequestConfiguration(1, new BuildRequestData("Nothing", new Dictionary(), "4.0", new string[0], null), "2.0"); + BuildRequestConfiguration configuration = new BuildRequestConfiguration(1, new BuildRequestData("Nothing", new Dictionary(), "4.0", Array.Empty(), null), "2.0"); configuration.Project = new ProjectInstance(ProjectRootElement.Create()); diff --git a/src/Build.UnitTests/BuildResultUtilities.cs b/src/Build.UnitTests/BuildResultUtilities.cs index 244fee76119..ca2a4f64822 100644 --- a/src/Build.UnitTests/BuildResultUtilities.cs +++ b/src/Build.UnitTests/BuildResultUtilities.cs @@ -12,12 +12,12 @@ internal class BuildResultUtilities { public static TargetResult GetEmptyFailingTargetResult() { - return new TargetResult(new TaskItem[0] { }, BuildResultUtilities.GetStopWithErrorResult()); + return new TargetResult(Array.Empty(), BuildResultUtilities.GetStopWithErrorResult()); } public static TargetResult GetEmptySucceedingTargetResult() { - return new TargetResult(new TaskItem[0] { }, BuildResultUtilities.GetSuccessResult()); + return new TargetResult(Array.Empty(), BuildResultUtilities.GetSuccessResult()); } public static TargetResult GetNonEmptySucceedingTargetResult() diff --git a/src/Build.UnitTests/Construction/SolutionProjectGenerator_Tests.cs b/src/Build.UnitTests/Construction/SolutionProjectGenerator_Tests.cs index a6649794529..ba15b8e328e 100644 --- a/src/Build.UnitTests/Construction/SolutionProjectGenerator_Tests.cs +++ b/src/Build.UnitTests/Construction/SolutionProjectGenerator_Tests.cs @@ -1930,7 +1930,7 @@ public void BadFrameworkMonkierExpectBuildToFail() Dictionary globalProperties = new Dictionary(); globalProperties["Configuration"] = "Release"; - BuildRequestData request = new BuildRequestData(projectFilePath, globalProperties, ObjectModelHelpers.MSBuildDefaultToolsVersion, new string[0], null); + BuildRequestData request = new BuildRequestData(projectFilePath, globalProperties, ObjectModelHelpers.MSBuildDefaultToolsVersion, Array.Empty(), null); BuildResult result = buildManager.Build(parameters, request); Assert.Equal(BuildResultCode.Failure, result.OverallResult); // Build should complete successfully even with an invalid solution config if SkipInvalidConfigurations is true @@ -2018,7 +2018,7 @@ public void BadFrameworkMonkierExpectBuildToFail2() Dictionary globalProperties = new Dictionary(); globalProperties["Configuration"] = "Release"; - BuildRequestData request = new BuildRequestData(projectFilePath, globalProperties, ObjectModelHelpers.MSBuildDefaultToolsVersion, new string[0], null); + BuildRequestData request = new BuildRequestData(projectFilePath, globalProperties, ObjectModelHelpers.MSBuildDefaultToolsVersion, Array.Empty(), null); BuildResult result = buildManager.Build(parameters, request); Assert.Equal(BuildResultCode.Failure, result.OverallResult); // Build should complete successfully even with an invalid solution config if SkipInvalidConfigurations is true diff --git a/src/Build.UnitTests/Evaluation/ExpressionShredder_Tests.cs b/src/Build.UnitTests/Evaluation/ExpressionShredder_Tests.cs index 653a01f2fd3..8e58e109926 100644 --- a/src/Build.UnitTests/Evaluation/ExpressionShredder_Tests.cs +++ b/src/Build.UnitTests/Evaluation/ExpressionShredder_Tests.cs @@ -441,7 +441,7 @@ private void VerifySplitSemiColonSeparatedList(string input, params string[] exp if (expected == null) { // passing "null" means you expect an empty array back - expected = new string[] { }; + expected = Array.Empty(); } Assert.Equal(actual, expected, StringComparer.Ordinal); diff --git a/src/Build.UnitTests/Evaluation/ItemEvaluation_Tests.cs b/src/Build.UnitTests/Evaluation/ItemEvaluation_Tests.cs index 1c9389c162f..2218fc59603 100644 --- a/src/Build.UnitTests/Evaluation/ItemEvaluation_Tests.cs +++ b/src/Build.UnitTests/Evaluation/ItemEvaluation_Tests.cs @@ -115,7 +115,7 @@ public void RemoveShouldPreserveIntermediaryReferences(string content) ObjectModelHelpers.AssertItems(new[] { "a", "b", "c" }, itemsForI, expectedMetadata); var itemsForI2 = items.Where(i => i.ItemType == "i2").ToList(); - ObjectModelHelpers.AssertItems(new string[0], itemsForI2); + ObjectModelHelpers.AssertItems(Array.Empty(), itemsForI2); } [Fact] diff --git a/src/Build.UnitTests/EvaluationProfiler_Tests.cs b/src/Build.UnitTests/EvaluationProfiler_Tests.cs index 94dea5eccbd..1e659732d9f 100644 --- a/src/Build.UnitTests/EvaluationProfiler_Tests.cs +++ b/src/Build.UnitTests/EvaluationProfiler_Tests.cs @@ -299,7 +299,7 @@ private ProfilerResult BuildAndGetProfilerResult(string projectContent, bool set var buildRequestData = new BuildRequestData( projectInstance, - new string[]{}, + Array.Empty(), projectCollection.HostServices); var result = _buildManager.Build(parameters, buildRequestData); diff --git a/src/Build.UnitTests/Graph/ProjectGraph_Tests.cs b/src/Build.UnitTests/Graph/ProjectGraph_Tests.cs index 97802055673..bc0735fc12b 100644 --- a/src/Build.UnitTests/Graph/ProjectGraph_Tests.cs +++ b/src/Build.UnitTests/Graph/ProjectGraph_Tests.cs @@ -1954,7 +1954,7 @@ public static IEnumerable AllNodesShouldHaveGraphBuildGlobalPropertyDa yield return new object[] { new Dictionary(), - new int[] {}, + Array.Empty(), globalVariables }; @@ -2089,7 +2089,7 @@ public static IEnumerable TransitiveReferencesAreDefinedPerProjectTest {1, new[] {2, 3, 4}}, {2, new[] {3}}, {3, new[] {4}}, - {4, new int[0]} + {4, Array.Empty()} } }; @@ -2154,7 +2154,7 @@ public static IEnumerable TransitiveReferencesAreDefinedPerProjectTest {3, new[] {4, 5, 6}}, {4, new[] {5}}, {5, new[] {6}}, - {6, new int[0]}, + {6, Array.Empty()}, } }; } @@ -2230,7 +2230,7 @@ public void TransitiveReferencesShouldNotBeAddedToOuterBuilds() GetFirstNodeWithProjectNumber(graph, 2).AssertReferencesIgnoringOrder(new []{3, 4, 4, 4, 5, 6, 6, 6}); - GetOuterBuild(graph, 4).AssertReferencesIgnoringOrder(new int[0]); + GetOuterBuild(graph, 4).AssertReferencesIgnoringOrder(Array.Empty()); var innerBuilds4 = GetInnerBuilds(graph, 4); innerBuilds4.Count.ShouldBe(2); diff --git a/src/Build.UnitTests/Instance/HostServices_Tests.cs b/src/Build.UnitTests/Instance/HostServices_Tests.cs index 318d56ef351..654c53aca1c 100644 --- a/src/Build.UnitTests/Instance/HostServices_Tests.cs +++ b/src/Build.UnitTests/Instance/HostServices_Tests.cs @@ -398,10 +398,10 @@ public void TestProjectInstanceWithNonConflictingHostServices() HostServices hostServices = new HostServices(); ProjectInstance project = CreateDummyProject("foo.proj"); - BuildRequestData data = new BuildRequestData(project, new string[] { }, hostServices); + BuildRequestData data = new BuildRequestData(project, Array.Empty(), hostServices); hostServices.SetNodeAffinity(project.FullPath, NodeAffinity.InProc); - BuildRequestData data2 = new BuildRequestData(project, new string[] { }, hostServices); + BuildRequestData data2 = new BuildRequestData(project, Array.Empty(), hostServices); } /// diff --git a/src/Build.UnitTests/Instance/ProjectTargetInstance_Internal_Tests.cs b/src/Build.UnitTests/Instance/ProjectTargetInstance_Internal_Tests.cs index df74f7c9cca..0eb6d03e81c 100644 --- a/src/Build.UnitTests/Instance/ProjectTargetInstance_Internal_Tests.cs +++ b/src/Build.UnitTests/Instance/ProjectTargetInstance_Internal_Tests.cs @@ -26,8 +26,8 @@ public static IEnumerable TargetChildrenTestData yield return new object[] { - new ReadOnlyCollection(new ProjectTargetInstanceChild[0]), - new ReadOnlyCollection(new ProjectOnErrorInstance[0]) + new ReadOnlyCollection(System.Array.Empty()), + new ReadOnlyCollection(System.Array.Empty()) }; yield return new object[] diff --git a/src/Build/Utilities/NuGetFrameworkWrapper.cs b/src/Build/Utilities/NuGetFrameworkWrapper.cs index a318ddb8117..a8670ebe8a1 100644 --- a/src/Build/Utilities/NuGetFrameworkWrapper.cs +++ b/src/Build/Utilities/NuGetFrameworkWrapper.cs @@ -40,7 +40,7 @@ public NuGetFrameworkWrapper() var NuGetFrameworkDefaultCompatibilityProvider = NuGetAssembly.GetType("NuGet.Frameworks.DefaultCompatibilityProvider"); ParseMethod = NuGetFramework.GetMethod("Parse", new Type[] { typeof(string) }); IsCompatibleMethod = NuGetFrameworkCompatibilityProvider.GetMethod("IsCompatible"); - DefaultCompatibilityProvider = NuGetFrameworkDefaultCompatibilityProvider.GetMethod("get_Instance").Invoke(null, new object[] { }); + DefaultCompatibilityProvider = NuGetFrameworkDefaultCompatibilityProvider.GetMethod("get_Instance").Invoke(null, Array.Empty()); FrameworkProperty = NuGetFramework.GetProperty("Framework"); VersionProperty = NuGetFramework.GetProperty("Version"); PlatformProperty = NuGetFramework.GetProperty("Platform"); diff --git a/src/Deprecated/Engine/Engine/BuildTask.cs b/src/Deprecated/Engine/Engine/BuildTask.cs index 4d7552ed0fa..6fc77b50924 100644 --- a/src/Deprecated/Engine/Engine/BuildTask.cs +++ b/src/Deprecated/Engine/Engine/BuildTask.cs @@ -310,7 +310,7 @@ public string[] GetParameterNames() { if (this.taskElement == null) { - return new string[0]; + return Array.Empty(); } ArrayList list = new ArrayList(); diff --git a/src/Deprecated/Engine/Engine/Expander.cs b/src/Deprecated/Engine/Engine/Expander.cs index 2cd7ba7bcd4..480dfee46e1 100644 --- a/src/Deprecated/Engine/Engine/Expander.cs +++ b/src/Deprecated/Engine/Engine/Expander.cs @@ -1517,7 +1517,7 @@ private static Function ConstructFunction(string expressionFunction, string expr // It may be that there are '()' but no actual arguments content if (argumentStartIndex == expressionFunction.Length - 1) { - functionArguments = new string[0]; + functionArguments = Array.Empty(); } else { @@ -1527,7 +1527,7 @@ private static Function ConstructFunction(string expressionFunction, string expr // If there are no arguments, then just create an empty array if (String.IsNullOrEmpty(argumentsContent)) { - functionArguments = new string[0]; + functionArguments = Array.Empty(); } else { @@ -1543,7 +1543,7 @@ private static Function ConstructFunction(string expressionFunction, string expr int nextMethodIndex = expressionFunction.IndexOf('.', methodStartIndex); int methodLength = expressionFunction.Length - methodStartIndex; - functionArguments = new string[0]; + functionArguments = Array.Empty(); if (nextMethodIndex > 0) { diff --git a/src/Deprecated/Engine/Engine/Project.cs b/src/Deprecated/Engine/Engine/Project.cs index fa38a06859d..4c0ddb0e1c8 100644 --- a/src/Deprecated/Engine/Engine/Project.cs +++ b/src/Deprecated/Engine/Engine/Project.cs @@ -408,7 +408,7 @@ string toolsVersion this.targets = new TargetCollection(this); // Initialize the default targets, initial targets, and project file name. - this.defaultTargetNames = new string[0]; + this.defaultTargetNames = Array.Empty(); this.initialTargetNamesInMainProject = new ArrayList(); this.initialTargetNamesInImportedProjects = new ArrayList(); this.FullFileName = String.Empty; @@ -1549,7 +1549,7 @@ string propertyName if (propertyValues == null) { - return new string[0]; + return Array.Empty(); } else { @@ -3743,7 +3743,7 @@ private void ProcessMainProjectElement this.evaluatedItemsIgnoringCondition.Clear(); this.targets.Clear(); this.nameOfFirstTarget = null; - this.defaultTargetNames = new string[0]; + this.defaultTargetNames = Array.Empty(); this.initialTargetNamesInImportedProjects.Clear(); this.initialTargetNamesInMainProject.Clear(); diff --git a/src/Deprecated/Engine/Engine/RegistryKeyWrapper.cs b/src/Deprecated/Engine/Engine/RegistryKeyWrapper.cs index b0a635794c7..188bbb81ad1 100644 --- a/src/Deprecated/Engine/Engine/RegistryKeyWrapper.cs +++ b/src/Deprecated/Engine/Engine/RegistryKeyWrapper.cs @@ -110,7 +110,7 @@ public virtual string[] GetValueNames() { try { - return Exists() ? WrappedKey.GetValueNames() : new string[] { }; + return Exists() ? WrappedKey.GetValueNames() : Array.Empty(); } catch (Exception ex) { @@ -129,7 +129,7 @@ public virtual string[] GetSubKeyNames() { try { - return Exists() ? WrappedKey.GetSubKeyNames() : new string[] { }; + return Exists() ? WrappedKey.GetSubKeyNames() : Array.Empty(); } catch (Exception ex) { diff --git a/src/Deprecated/Engine/Engine/ToolsetRegistryReader.cs b/src/Deprecated/Engine/Engine/ToolsetRegistryReader.cs index 4935eaea24e..8fce018f88f 100644 --- a/src/Deprecated/Engine/Engine/ToolsetRegistryReader.cs +++ b/src/Deprecated/Engine/Engine/ToolsetRegistryReader.cs @@ -57,7 +57,7 @@ protected override IEnumerable ToolsVersions { get { - string[] toolsVersionNames = new string[] { }; + string[] toolsVersionNames = System.Array.Empty(); try { toolsVersionNames = msbuildRegistryWrapper.OpenSubKey("ToolsVersions").GetSubKeyNames(); diff --git a/src/Deprecated/Engine/Logging/ParallelLogger/ParallelLoggerHelpers.cs b/src/Deprecated/Engine/Logging/ParallelLogger/ParallelLoggerHelpers.cs index 8470aca7630..3bde1782032 100644 --- a/src/Deprecated/Engine/Logging/ParallelLogger/ParallelLoggerHelpers.cs +++ b/src/Deprecated/Engine/Logging/ParallelLogger/ParallelLoggerHelpers.cs @@ -149,7 +149,7 @@ internal string[] ProjectCallStackFromProject(BuildEventContext e) // or the event is raised before the project started event if (startedEvent == null) { - return new string[0]; + return Array.Empty(); } List projectStackTrace = GetProjectCallStack(e); diff --git a/src/Deprecated/Engine/Shared/FileMatcher.cs b/src/Deprecated/Engine/Shared/FileMatcher.cs index 3292f664426..c18f30d1fca 100644 --- a/src/Deprecated/Engine/Shared/FileMatcher.cs +++ b/src/Deprecated/Engine/Shared/FileMatcher.cs @@ -121,7 +121,7 @@ private static string[] GetAccessibleFilesAndDirectories(string path, string pat if (entries == null) { - entries = new string[0]; + entries = Array.Empty(); } return entries; @@ -177,12 +177,12 @@ bool stripProjectDirectory catch (System.Security.SecurityException) { // For code access security. - return new string[0]; + return Array.Empty(); } catch (System.UnauthorizedAccessException) { // For OS security. - return new string[0]; + return Array.Empty(); } } @@ -229,12 +229,12 @@ string pattern catch (System.Security.SecurityException) { // For code access security. - return new string[0]; + return Array.Empty(); } catch (System.UnauthorizedAccessException) { // For OS security. - return new string[0]; + return Array.Empty(); } } @@ -1198,7 +1198,7 @@ DirectoryExists directoryExists } catch (ArgumentException) { - return new string[0]; + return Array.Empty(); } stripProjectDirectory = !String.Equals(fixedDirectoryPart, oldFixedDirectoryPart, StringComparison.OrdinalIgnoreCase); @@ -1216,7 +1216,7 @@ DirectoryExists directoryExists */ if (fixedDirectoryPart.Length > 0 && !directoryExists(fixedDirectoryPart)) { - return new string[0]; + return Array.Empty(); } // determine if we need to use the regular expression to match the files diff --git a/src/MSBuild.UnitTests/CommandLineSwitches_Tests.cs b/src/MSBuild.UnitTests/CommandLineSwitches_Tests.cs index bd04dfc4a6f..035b475dc5c 100644 --- a/src/MSBuild.UnitTests/CommandLineSwitches_Tests.cs +++ b/src/MSBuild.UnitTests/CommandLineSwitches_Tests.cs @@ -560,7 +560,7 @@ public void GraphBuildSwitchCanBeParameterless() MSBuildApp.GatherCommandLineSwitches(new List{ "/graph" }, switches); - switches[CommandLineSwitches.ParameterizedSwitch.GraphBuild].ShouldBe(new string[0]); + switches[CommandLineSwitches.ParameterizedSwitch.GraphBuild].ShouldBe(Array.Empty()); switches.HaveErrors().ShouldBeFalse(); } @@ -981,9 +981,9 @@ public void InvalidToolsVersionErrors() "ScoobyDoo", new Dictionary(StringComparer.OrdinalIgnoreCase), new Dictionary(StringComparer.OrdinalIgnoreCase), - new ILogger[] { }, + Array.Empty(), LoggerVerbosity.Normal, - new DistributedLoggerRecord[] { }, + Array.Empty(), #if FEATURE_XML_SCHEMA_VALIDATION false, null, @@ -1223,9 +1223,9 @@ public void ProcessProfileEvaluationEmpty() [Fact] public void ProcessBooleanSwitchTest() { - MSBuildApp.ProcessBooleanSwitch(new string[0], defaultValue: true, resourceName: null).ShouldBeTrue(); + MSBuildApp.ProcessBooleanSwitch(Array.Empty(), defaultValue: true, resourceName: null).ShouldBeTrue(); - MSBuildApp.ProcessBooleanSwitch(new string[0], defaultValue: false, resourceName: null).ShouldBeFalse(); + MSBuildApp.ProcessBooleanSwitch(Array.Empty(), defaultValue: false, resourceName: null).ShouldBeFalse(); MSBuildApp.ProcessBooleanSwitch(new [] { "true" }, defaultValue: false, resourceName: null).ShouldBeTrue(); @@ -1239,7 +1239,7 @@ public static IEnumerable ProcessGraphBuildSwitchData() var emptyOptions = new GraphBuildOptions(); var noBuildOptions = new GraphBuildOptions {Build = false}; - yield return new object[] {new string[0], emptyOptions, null}; + yield return new object[] {Array.Empty(), emptyOptions, null}; yield return new object[] {new[] {"true"}, emptyOptions, null}; diff --git a/src/MSBuild.UnitTests/ProjectSchemaValidationHandler_Tests.cs b/src/MSBuild.UnitTests/ProjectSchemaValidationHandler_Tests.cs index ae0e0d671f2..369b0719aba 100644 --- a/src/MSBuild.UnitTests/ProjectSchemaValidationHandler_Tests.cs +++ b/src/MSBuild.UnitTests/ProjectSchemaValidationHandler_Tests.cs @@ -30,7 +30,7 @@ public void VerifyInvalidProjectSchema ( ) { - string[] msbuildTempXsdFilenames = new string[] { }; + string[] msbuildTempXsdFilenames = Array.Empty(); string projectFilename = null; string oldValueForMSBuildOldOM = null; try @@ -165,7 +165,7 @@ public void VerifyValidProjectSchema ( ) { - string[] msbuildTempXsdFilenames = new string[] { }; + string[] msbuildTempXsdFilenames = Array.Empty(); string projectFilename = CreateTempFileOnDisk(@" @@ -209,7 +209,7 @@ public void VerifyInvalidImportNotCaughtBySchema ( ) { - string[] msbuildTempXsdFilenames = new string[] { }; + string[] msbuildTempXsdFilenames = Array.Empty(); string importedProjectFilename = CreateTempFileOnDisk(@" diff --git a/src/MSBuild.UnitTests/XMake_Tests.cs b/src/MSBuild.UnitTests/XMake_Tests.cs index e44fe59257f..a7b34e37d34 100644 --- a/src/MSBuild.UnitTests/XMake_Tests.cs +++ b/src/MSBuild.UnitTests/XMake_Tests.cs @@ -1330,7 +1330,7 @@ public void TestProcessProjectSwitchOneProjNotFoundExtension() string[] projects = { "my.proj" }; string[] extensionsToIgnore = { ".phantomextension" }; IgnoreProjectExtensionsHelper projectHelper = new IgnoreProjectExtensionsHelper(projects); - MSBuildApp.ProcessProjectSwitch(new string[] { }, extensionsToIgnore, projectHelper.GetFiles).ShouldBe("my.proj", StringCompareShould.IgnoreCase); // "Expected my.proj to be only project found" + MSBuildApp.ProcessProjectSwitch(Array.Empty(), extensionsToIgnore, projectHelper.GetFiles).ShouldBe("my.proj", StringCompareShould.IgnoreCase); // "Expected my.proj to be only project found" } /// @@ -1342,7 +1342,7 @@ public void TestTwoIdenticalExtensionsToIgnore() string[] projects = { "my.proj" }; string[] extensionsToIgnore = { ".phantomextension", ".phantomextension" }; IgnoreProjectExtensionsHelper projectHelper = new IgnoreProjectExtensionsHelper(projects); - MSBuildApp.ProcessProjectSwitch(new string[] { }, extensionsToIgnore, projectHelper.GetFiles).ShouldBe("my.proj", StringCompareShould.IgnoreCase); // "Expected my.proj to be only project found" + MSBuildApp.ProcessProjectSwitch(Array.Empty(), extensionsToIgnore, projectHelper.GetFiles).ShouldBe("my.proj", StringCompareShould.IgnoreCase); // "Expected my.proj to be only project found" } /// @@ -1354,10 +1354,10 @@ public void TestProcessProjectSwitchNullandEmptyProjectsToIgnore() string[] projects = { "my.proj" }; string[] extensionsToIgnore = null; IgnoreProjectExtensionsHelper projectHelper = new IgnoreProjectExtensionsHelper(projects); - MSBuildApp.ProcessProjectSwitch(new string[] { }, extensionsToIgnore, projectHelper.GetFiles).ShouldBe("my.proj", StringCompareShould.IgnoreCase); // "Expected my.proj to be only project found" + MSBuildApp.ProcessProjectSwitch(Array.Empty(), extensionsToIgnore, projectHelper.GetFiles).ShouldBe("my.proj", StringCompareShould.IgnoreCase); // "Expected my.proj to be only project found" - extensionsToIgnore = new string[] { }; - MSBuildApp.ProcessProjectSwitch(new string[] { }, extensionsToIgnore, projectHelper.GetFiles).ShouldBe("my.proj", StringCompareShould.IgnoreCase); // "Expected my.proj to be only project found" + extensionsToIgnore = Array.Empty(); + MSBuildApp.ProcessProjectSwitch(Array.Empty(), extensionsToIgnore, projectHelper.GetFiles).ShouldBe("my.proj", StringCompareShould.IgnoreCase); // "Expected my.proj to be only project found" } /// @@ -1371,7 +1371,7 @@ public void TestProcessProjectSwitchNullInList() string[] projects = { "my.proj" }; string[] extensionsToIgnore = { ".phantomextension", null }; IgnoreProjectExtensionsHelper projectHelper = new IgnoreProjectExtensionsHelper(projects); - MSBuildApp.ProcessProjectSwitch(new string[] { }, extensionsToIgnore, projectHelper.GetFiles).ShouldBe("my.proj", StringCompareShould.IgnoreCase); // "Expected my.proj to be only project found" + MSBuildApp.ProcessProjectSwitch(Array.Empty(), extensionsToIgnore, projectHelper.GetFiles).ShouldBe("my.proj", StringCompareShould.IgnoreCase); // "Expected my.proj to be only project found" } ); } @@ -1387,7 +1387,7 @@ public void TestProcessProjectSwitchEmptyInList() string[] projects = { "my.proj" }; string[] extensionsToIgnore = { ".phantomextension", string.Empty }; IgnoreProjectExtensionsHelper projectHelper = new IgnoreProjectExtensionsHelper(projects); - MSBuildApp.ProcessProjectSwitch(new string[] { }, extensionsToIgnore, projectHelper.GetFiles).ShouldBe("my.proj", StringCompareShould.IgnoreCase); // "Expected my.proj to be only project found" + MSBuildApp.ProcessProjectSwitch(Array.Empty(), extensionsToIgnore, projectHelper.GetFiles).ShouldBe("my.proj", StringCompareShould.IgnoreCase); // "Expected my.proj to be only project found" } ); } @@ -1402,7 +1402,7 @@ public void TestProcessProjectSwitchExtensionWithoutDot() string[] projects = { "my.proj" }; string[] extensionsToIgnore = { "phantomextension" }; IgnoreProjectExtensionsHelper projectHelper = new IgnoreProjectExtensionsHelper(projects); - MSBuildApp.ProcessProjectSwitch(new string[] { }, extensionsToIgnore, projectHelper.GetFiles).ShouldBe("my.proj", StringCompareShould.IgnoreCase); + MSBuildApp.ProcessProjectSwitch(Array.Empty(), extensionsToIgnore, projectHelper.GetFiles).ShouldBe("my.proj", StringCompareShould.IgnoreCase); } ); } @@ -1417,7 +1417,7 @@ public void TestProcessProjectSwitchMalformed() string[] projects = { "my.proj" }; string[] extensionsToIgnore = { ".C:\\boocatmoo.a" }; IgnoreProjectExtensionsHelper projectHelper = new IgnoreProjectExtensionsHelper(projects); - MSBuildApp.ProcessProjectSwitch(new string[] { }, extensionsToIgnore, projectHelper.GetFiles).ShouldBe("my.proj", StringCompareShould.IgnoreCase); // "Expected my.proj to be only project found" + MSBuildApp.ProcessProjectSwitch(Array.Empty(), extensionsToIgnore, projectHelper.GetFiles).ShouldBe("my.proj", StringCompareShould.IgnoreCase); // "Expected my.proj to be only project found" } ); } @@ -1432,7 +1432,7 @@ public void TestProcessProjectSwitchWildcards() string[] projects = { "my.proj" }; string[] extensionsToIgnore = { ".proj*", ".nativeproj?" }; IgnoreProjectExtensionsHelper projectHelper = new IgnoreProjectExtensionsHelper(projects); - MSBuildApp.ProcessProjectSwitch(new string[] { }, extensionsToIgnore, projectHelper.GetFiles); + MSBuildApp.ProcessProjectSwitch(Array.Empty(), extensionsToIgnore, projectHelper.GetFiles); } ); } @@ -1442,52 +1442,52 @@ public void TestProcessProjectSwitch() string[] projects = { "test.nativeproj", "test.vcproj" }; string[] extensionsToIgnore = { ".phantomextension", ".vcproj" }; IgnoreProjectExtensionsHelper projectHelper = new IgnoreProjectExtensionsHelper(projects); - MSBuildApp.ProcessProjectSwitch(new string[] { }, extensionsToIgnore, projectHelper.GetFiles).ShouldBe("test.nativeproj", StringCompareShould.IgnoreCase); // "Expected test.nativeproj to be only project found" + MSBuildApp.ProcessProjectSwitch(Array.Empty(), extensionsToIgnore, projectHelper.GetFiles).ShouldBe("test.nativeproj", StringCompareShould.IgnoreCase); // "Expected test.nativeproj to be only project found" projects = new[] { "test.nativeproj", "test.vcproj", "test.proj" }; extensionsToIgnore = new[] { ".phantomextension", ".vcproj" }; projectHelper = new IgnoreProjectExtensionsHelper(projects); - MSBuildApp.ProcessProjectSwitch(new string[] { }, extensionsToIgnore, projectHelper.GetFiles).ShouldBe("test.proj", StringCompareShould.IgnoreCase); // "Expected test.proj to be only project found" + MSBuildApp.ProcessProjectSwitch(Array.Empty(), extensionsToIgnore, projectHelper.GetFiles).ShouldBe("test.proj", StringCompareShould.IgnoreCase); // "Expected test.proj to be only project found" projects = new[] { "test.nativeproj", "test.vcproj" }; extensionsToIgnore = new[] { ".vcproj" }; projectHelper = new IgnoreProjectExtensionsHelper(projects); - MSBuildApp.ProcessProjectSwitch(new string[] { }, extensionsToIgnore, projectHelper.GetFiles).ShouldBe("test.nativeproj", StringCompareShould.IgnoreCase); // "Expected test.nativeproj to be only project found" + MSBuildApp.ProcessProjectSwitch(Array.Empty(), extensionsToIgnore, projectHelper.GetFiles).ShouldBe("test.nativeproj", StringCompareShould.IgnoreCase); // "Expected test.nativeproj to be only project found" projects = new[] { "test.proj", "test.sln" }; extensionsToIgnore = new[] { ".vcproj" }; projectHelper = new IgnoreProjectExtensionsHelper(projects); - MSBuildApp.ProcessProjectSwitch(new string[] { }, extensionsToIgnore, projectHelper.GetFiles).ShouldBe("test.sln", StringCompareShould.IgnoreCase); // "Expected test.sln to be only solution found" + MSBuildApp.ProcessProjectSwitch(Array.Empty(), extensionsToIgnore, projectHelper.GetFiles).ShouldBe("test.sln", StringCompareShould.IgnoreCase); // "Expected test.sln to be only solution found" projects = new[] { "test.proj", "test.sln", "test.proj~", "test.sln~" }; - extensionsToIgnore = new string[] { }; + extensionsToIgnore = Array.Empty(); projectHelper = new IgnoreProjectExtensionsHelper(projects); - MSBuildApp.ProcessProjectSwitch(new string[] { }, extensionsToIgnore, projectHelper.GetFiles).ShouldBe("test.sln", StringCompareShould.IgnoreCase); // "Expected test.sln to be only solution found" + MSBuildApp.ProcessProjectSwitch(Array.Empty(), extensionsToIgnore, projectHelper.GetFiles).ShouldBe("test.sln", StringCompareShould.IgnoreCase); // "Expected test.sln to be only solution found" projects = new[] { "test.proj" }; - extensionsToIgnore = new string[] { }; + extensionsToIgnore = Array.Empty(); projectHelper = new IgnoreProjectExtensionsHelper(projects); - MSBuildApp.ProcessProjectSwitch(new string[] { }, extensionsToIgnore, projectHelper.GetFiles).ShouldBe("test.proj", StringCompareShould.IgnoreCase); // "Expected test.proj to be only project found" + MSBuildApp.ProcessProjectSwitch(Array.Empty(), extensionsToIgnore, projectHelper.GetFiles).ShouldBe("test.proj", StringCompareShould.IgnoreCase); // "Expected test.proj to be only project found" projects = new[] { "test.proj", "test.proj~" }; - extensionsToIgnore = new string[] { }; + extensionsToIgnore = Array.Empty(); projectHelper = new IgnoreProjectExtensionsHelper(projects); - MSBuildApp.ProcessProjectSwitch(new string[] { }, extensionsToIgnore, projectHelper.GetFiles).ShouldBe("test.proj", StringCompareShould.IgnoreCase); // "Expected test.proj to be only project found" + MSBuildApp.ProcessProjectSwitch(Array.Empty(), extensionsToIgnore, projectHelper.GetFiles).ShouldBe("test.proj", StringCompareShould.IgnoreCase); // "Expected test.proj to be only project found" projects = new[] { "test.sln" }; - extensionsToIgnore = new string[] { }; + extensionsToIgnore = Array.Empty(); projectHelper = new IgnoreProjectExtensionsHelper(projects); - MSBuildApp.ProcessProjectSwitch(new string[] { }, extensionsToIgnore, projectHelper.GetFiles).ShouldBe("test.sln", StringCompareShould.IgnoreCase); // "Expected test.sln to be only solution found" + MSBuildApp.ProcessProjectSwitch(Array.Empty(), extensionsToIgnore, projectHelper.GetFiles).ShouldBe("test.sln", StringCompareShould.IgnoreCase); // "Expected test.sln to be only solution found" projects = new[] { "test.sln", "test.sln~" }; - extensionsToIgnore = new string[] { }; + extensionsToIgnore = Array.Empty(); projectHelper = new IgnoreProjectExtensionsHelper(projects); - MSBuildApp.ProcessProjectSwitch(new string[] { }, extensionsToIgnore, projectHelper.GetFiles).ShouldBe("test.sln", StringCompareShould.IgnoreCase); // "Expected test.sln to be only solution found" + MSBuildApp.ProcessProjectSwitch(Array.Empty(), extensionsToIgnore, projectHelper.GetFiles).ShouldBe("test.sln", StringCompareShould.IgnoreCase); // "Expected test.sln to be only solution found" projects = new[] { "test.sln~", "test.sln" }; - extensionsToIgnore = new string[] { }; + extensionsToIgnore = Array.Empty(); projectHelper = new IgnoreProjectExtensionsHelper(projects); - MSBuildApp.ProcessProjectSwitch(new string[] { }, extensionsToIgnore, projectHelper.GetFiles).ShouldBe("test.sln", StringCompareShould.IgnoreCase); // "Expected test.sln to be only solution found" + MSBuildApp.ProcessProjectSwitch(Array.Empty(), extensionsToIgnore, projectHelper.GetFiles).ShouldBe("test.sln", StringCompareShould.IgnoreCase); // "Expected test.sln to be only solution found" } /// @@ -1499,7 +1499,7 @@ public void TestProcessProjectSwitchReplicateBuildingDFLKG() string[] projects = { "test.proj", "test.sln", "Foo.vcproj" }; string[] extensionsToIgnore = { ".sln", ".vcproj" }; IgnoreProjectExtensionsHelper projectHelper = new IgnoreProjectExtensionsHelper(projects); - MSBuildApp.ProcessProjectSwitch(new string[] { }, extensionsToIgnore, projectHelper.GetFiles).ShouldBe("test.proj"); // "Expected test.proj to be only project found" + MSBuildApp.ProcessProjectSwitch(Array.Empty(), extensionsToIgnore, projectHelper.GetFiles).ShouldBe("test.proj"); // "Expected test.proj to be only project found" } /// @@ -1513,7 +1513,7 @@ public void TestProcessProjectSwitchRemovedAllprojects() var projects = new[] { "test.nativeproj", "test.vcproj" }; var extensionsToIgnore = new[] { ".nativeproj", ".vcproj" }; IgnoreProjectExtensionsHelper projectHelper = new IgnoreProjectExtensionsHelper(projects); - MSBuildApp.ProcessProjectSwitch(new string[] { }, extensionsToIgnore, projectHelper.GetFiles); + MSBuildApp.ProcessProjectSwitch(Array.Empty(), extensionsToIgnore, projectHelper.GetFiles); } ); } @@ -1528,7 +1528,7 @@ public void TestProcessProjectSwitchSlnProjDifferentNames() string[] projects = { "test.proj", "Different.sln" }; string[] extensionsToIgnore = null; IgnoreProjectExtensionsHelper projectHelper = new IgnoreProjectExtensionsHelper(projects); - MSBuildApp.ProcessProjectSwitch(new string[] { }, extensionsToIgnore, projectHelper.GetFiles); + MSBuildApp.ProcessProjectSwitch(Array.Empty(), extensionsToIgnore, projectHelper.GetFiles); } ); } @@ -1543,7 +1543,7 @@ public void TestProcessProjectSwitchTwoProj() string[] projects = { "test.proj", "Different.proj" }; string[] extensionsToIgnore = null; IgnoreProjectExtensionsHelper projectHelper = new IgnoreProjectExtensionsHelper(projects); - MSBuildApp.ProcessProjectSwitch(new string[] { }, extensionsToIgnore, projectHelper.GetFiles); + MSBuildApp.ProcessProjectSwitch(Array.Empty(), extensionsToIgnore, projectHelper.GetFiles); } ); } @@ -1558,7 +1558,7 @@ public void TestProcessProjectSwitchTwoNative() string[] projects = { "test.nativeproj", "Different.nativeproj" }; string[] extensionsToIgnore = null; IgnoreProjectExtensionsHelper projectHelper = new IgnoreProjectExtensionsHelper(projects); - MSBuildApp.ProcessProjectSwitch(new string[] { }, extensionsToIgnore, projectHelper.GetFiles); + MSBuildApp.ProcessProjectSwitch(Array.Empty(), extensionsToIgnore, projectHelper.GetFiles); } ); } @@ -1573,7 +1573,7 @@ public void TestProcessProjectSwitchTwoSolutions() string[] projects = { "test.sln", "Different.sln" }; string[] extensionsToIgnore = null; IgnoreProjectExtensionsHelper projectHelper = new IgnoreProjectExtensionsHelper(projects); - MSBuildApp.ProcessProjectSwitch(new string[] { }, extensionsToIgnore, projectHelper.GetFiles); + MSBuildApp.ProcessProjectSwitch(Array.Empty(), extensionsToIgnore, projectHelper.GetFiles); } ); } @@ -1588,7 +1588,7 @@ public void TestProcessProjectSwitchMoreThenTwoProj() string[] projects = { "test.nativeproj", "Different.csproj", "Another.proj" }; string[] extensionsToIgnore = null; IgnoreProjectExtensionsHelper projectHelper = new IgnoreProjectExtensionsHelper(projects); - MSBuildApp.ProcessProjectSwitch(new string[] { }, extensionsToIgnore, projectHelper.GetFiles); + MSBuildApp.ProcessProjectSwitch(Array.Empty(), extensionsToIgnore, projectHelper.GetFiles); } ); } @@ -1600,10 +1600,10 @@ public void TestProcessProjectSwitchNoProjectOrSolution() { Should.Throw(() => { - string[] projects = { }; + string[] projects = Array.Empty(); string[] extensionsToIgnore = null; IgnoreProjectExtensionsHelper projectHelper = new IgnoreProjectExtensionsHelper(projects); - MSBuildApp.ProcessProjectSwitch(new string[] { }, extensionsToIgnore, projectHelper.GetFiles); + MSBuildApp.ProcessProjectSwitch(Array.Empty(), extensionsToIgnore, projectHelper.GetFiles); } ); } @@ -2485,7 +2485,7 @@ private string ExecuteMSBuildExeExpectFailure(string projectContents, IDictionar private (bool result, string output) ExecuteMSBuildExe(string projectContents, IDictionary filesToCreate = null, IDictionary envsToCreate = null, params string[] arguments) { - TransientTestProjectWithFiles testProject = _env.CreateTestProjectWithFiles(projectContents, new string[0]); + TransientTestProjectWithFiles testProject = _env.CreateTestProjectWithFiles(projectContents, Array.Empty()); if (filesToCreate != null) { diff --git a/src/MSBuild/CommandLineSwitches.cs b/src/MSBuild/CommandLineSwitches.cs index e1e53cbb1f5..d0f9fb185a2 100644 --- a/src/MSBuild/CommandLineSwitches.cs +++ b/src/MSBuild/CommandLineSwitches.cs @@ -597,7 +597,7 @@ internal bool IsParameterizedSwitchSet(ParameterizedSwitch parameterizedSwitch) } // used to indicate a null parameter list for a switch - private static readonly string[] s_noParameters = { }; + private static readonly string[] s_noParameters = Array.Empty(); /// /// Gets the parameters (if any) detected on the command line for the given parameterized switch. diff --git a/src/MSBuild/XMake.cs b/src/MSBuild/XMake.cs index ae95d608193..bc3c60dec60 100644 --- a/src/MSBuild/XMake.cs +++ b/src/MSBuild/XMake.cs @@ -539,11 +539,11 @@ string [] commandLine // process the detected command line switches -- gather build information, take action on non-build switches, and // check for non-trivial errors string projectFile = null; - string[] targets = { }; + string[] targets = Array.Empty(); string toolsVersion = null; Dictionary globalProperties = null; Dictionary restoreProperties = null; - ILogger[] loggers = { }; + ILogger[] loggers = Array.Empty(); LoggerVerbosity verbosity = LoggerVerbosity.Normal; List distributedLoggerRecords = null; #if FEATURE_XML_SCHEMA_VALIDATION diff --git a/src/Shared/AssemblyNameExtension.cs b/src/Shared/AssemblyNameExtension.cs index 99db41274e3..4d0abc197cf 100644 --- a/src/Shared/AssemblyNameExtension.cs +++ b/src/Shared/AssemblyNameExtension.cs @@ -820,11 +820,15 @@ internal static bool ComparePublicKeyTokens(byte[] aPKT, byte[] bPKT) // Some assemblies (real case was interop assembly) may have null PKTs. if (aPKT == null) { +#pragma warning disable CA1825 // Avoid zero-length array allocations aPKT = new byte[0]; +#pragma warning restore CA1825 // Avoid zero-length array allocations } if (bPKT == null) { +#pragma warning disable CA1825 // Avoid zero-length array allocations bPKT = new byte[0]; +#pragma warning restore CA1825 // Avoid zero-length array allocations } if (aPKT.Length != bPKT.Length) diff --git a/src/Shared/BinaryTranslator.cs b/src/Shared/BinaryTranslator.cs index 56a1b1f3803..d7fad5fb653 100644 --- a/src/Shared/BinaryTranslator.cs +++ b/src/Shared/BinaryTranslator.cs @@ -197,7 +197,9 @@ public void Translate(ref byte[] byteArray) } else { +#pragma warning disable CA1825 // Avoid zero-length array allocations byteArray = new byte[0]; +#pragma warning restore CA1825 // Avoid zero-length array allocations } } diff --git a/src/Shared/UnitTests/FileMatcher_Tests.cs b/src/Shared/UnitTests/FileMatcher_Tests.cs index b779aaa45ba..79cb24389be 100644 --- a/src/Shared/UnitTests/FileMatcher_Tests.cs +++ b/src/Shared/UnitTests/FileMatcher_Tests.cs @@ -1292,7 +1292,7 @@ public void Regress367780_CrashOnStarDotDot() string workingPath = _env.CreateFolder().Path; string workingPathSubfolder = Path.Combine(workingPath, "SubDir"); string offendingPattern = Path.Combine(workingPath, @"*\..\bar"); - string[] files = new string[0]; + string[] files = Array.Empty(); Directory.CreateDirectory(workingPath); Directory.CreateDirectory(workingPathSubfolder); @@ -1518,9 +1518,7 @@ public void ExcludeSpecificFiles() @"Program_old.cs", @"Properties\AssemblyInfo_old.cs" }, - new string[] // Non matching files that shouldn't be touched - { - } + Array.Empty() // Non matching files that shouldn't be touched ); } diff --git a/src/Shared/UnitTests/ObjectModelHelpers.cs b/src/Shared/UnitTests/ObjectModelHelpers.cs index e647fd709c0..07b7b89e3a4 100644 --- a/src/Shared/UnitTests/ObjectModelHelpers.cs +++ b/src/Shared/UnitTests/ObjectModelHelpers.cs @@ -1408,7 +1408,7 @@ public static BuildResult BuildProjectFileUsingBuildManager(string projectFile, projectFile, new Dictionary(), MSBuildConstants.CurrentToolsVersion, - new string[] {}, + Array.Empty(), null); var result = buildManager.Build( @@ -1982,7 +1982,7 @@ public async Task BuildProjectFileAsync( var buildRequestData = new BuildRequestData(projectFile, globalProperties ?? new Dictionary(), MSBuildConstants.CurrentToolsVersion, - entryTargets ?? new string[0], + entryTargets ?? Array.Empty(), null); var completion = new TaskCompletionSource(); @@ -2002,7 +2002,7 @@ public GraphBuildResult BuildGraphSubmission(GraphBuildRequestData requestData) public GraphBuildResult BuildGraph(ProjectGraph graph, string[] entryTargets = null) { - return _buildManager.BuildRequest(new GraphBuildRequestData(graph, entryTargets ?? new string[0])); + return _buildManager.BuildRequest(new GraphBuildRequestData(graph, entryTargets ?? Array.Empty())); } public void Dispose() diff --git a/src/Tasks.UnitTests/AssemblyDependency/Miscellaneous.cs b/src/Tasks.UnitTests/AssemblyDependency/Miscellaneous.cs index 2d0aaec17b3..899f55b7089 100644 --- a/src/Tasks.UnitTests/AssemblyDependency/Miscellaneous.cs +++ b/src/Tasks.UnitTests/AssemblyDependency/Miscellaneous.cs @@ -3312,7 +3312,7 @@ public void ParentAssemblyResolvedFromAForGac() /// private ReferenceTable GenerateTableWithAssemblyFromTheGlobalLocation(string location) { - ReferenceTable referenceTable = new ReferenceTable(null, false, false, false, false, new string[0], null, null, null, null, null, null, SystemProcessorArchitecture.None, fileExists, null, null, null, null, + ReferenceTable referenceTable = new ReferenceTable(null, false, false, false, false, Array.Empty(), null, null, null, null, null, null, SystemProcessorArchitecture.None, fileExists, null, null, null, null, #if FEATURE_WIN32_REGISTRY null, null, null, #endif @@ -3514,7 +3514,7 @@ public void NoFrameworkDirectoriesStillCopyLocal() t.BuildEngine = engine; t.Assemblies = assemblyNames; - t.TargetFrameworkDirectories = new string[] { }; + t.TargetFrameworkDirectories = Array.Empty(); t.SearchPaths = new string[] { "{RawFileName}" }; Execute(t); Assert.Equal(@"true", t.ResolvedFiles[0].GetMetadata("CopyLocal")); @@ -6206,7 +6206,7 @@ public void SubsetListFinderNullFrameworkDirectory() { Assert.Throws(() => { - SubsetListFinder finder = new SubsetListFinder(new string[0]); + SubsetListFinder finder = new SubsetListFinder(Array.Empty()); finder.GetSubsetListPathsFromDisk(null); } ); @@ -6229,7 +6229,7 @@ public void SubsetListFinderNullSubsetToSearchFor() [Fact] public void SubsetListFinderEmptySubsetToSearchFor() { - SubsetListFinder finder = new SubsetListFinder(new string[0]); + SubsetListFinder finder = new SubsetListFinder(Array.Empty()); string[] returnArray = finder.GetSubsetListPathsFromDisk("FrameworkDirectory"); Assert.Empty(returnArray); // "Expected the array returned to be 0 length" } @@ -6526,7 +6526,7 @@ public void TestGenerateFrameworkName() targetFrameworks = new string[] { "Client", "Framework" }; Assert.Equal("Client, Framework", ResolveAssemblyReference.GenerateSubSetName(targetFrameworks, null)); - targetFrameworks = new string[0]; + targetFrameworks = Array.Empty(); Assert.True(String.IsNullOrEmpty(ResolveAssemblyReference.GenerateSubSetName(targetFrameworks, null))); targetFrameworks = null; @@ -6580,7 +6580,7 @@ public void ReferenceTablePrimaryItemInBlackListRemoveOnlyNoWarn() referenceTable.RemoveReferencesMarkedForExclusion(true, String.Empty); Dictionary table2 = referenceTable.References; - string subSetName = ResolveAssemblyReference.GenerateSubSetName(new string[] { }, null); + string subSetName = ResolveAssemblyReference.GenerateSubSetName(Array.Empty(), null); string warningMessage = rar.Log.FormatResourceString("ResolveAssemblyReference.FailedToResolveReferenceBecausePrimaryAssemblyInExclusionList", taskItem.ItemSpec, subSetName); Assert.False(Object.ReferenceEquals(table, table2)); // "Expected dictionary to be a different instance" Assert.Single(table2); // "Expected there to be one elements in the dictionary" @@ -6817,7 +6817,7 @@ public void ReferenceTableDependentItemsInBlackList3() [Fact] public void ReferenceTableDependentItemsInBlackList4() { - ReferenceTable referenceTable = new ReferenceTable(null, false, false, false, false, new string[0], null, null, null, null, null, null, SystemProcessorArchitecture.None, fileExists, null, null, null, + ReferenceTable referenceTable = new ReferenceTable(null, false, false, false, false, Array.Empty(), null, null, null, null, null, null, SystemProcessorArchitecture.None, fileExists, null, null, null, #if FEATURE_WIN32_REGISTRY null, null, null, #endif @@ -6995,7 +6995,7 @@ public void ReferenceTableDependentItemsInBlackListPrimaryWithSpecificVersion() private static ReferenceTable MakeEmptyReferenceTable(TaskLoggingHelper log) { - ReferenceTable referenceTable = new ReferenceTable(null, false, false, false, false, new string[0], null, null, null, null, null, null, SystemProcessorArchitecture.None, fileExists, null, null, null, null, + ReferenceTable referenceTable = new ReferenceTable(null, false, false, false, false, Array.Empty(), null, null, null, null, null, null, SystemProcessorArchitecture.None, fileExists, null, null, null, null, #if FEATURE_WIN32_REGISTRY null, null, null, #endif @@ -7317,7 +7317,7 @@ public void NoClientSubsetButInstalledSubTables() t.TargetFrameworkDirectories = new string[] { Path.Combine(ObjectModelHelpers.TempProjectDir, "v3.5") }; t.InstalledAssemblyTables = new ITaskItem[] { new TaskItem(redistListPath) }; // Only the explicitly specified redist list should be used - t.TargetFrameworkSubsets = new string[0]; + t.TargetFrameworkSubsets = Array.Empty(); // Create a subset list which should be read in string explicitSubsetListContents = diff --git a/src/Tasks.UnitTests/AssemblyDependency/ResolveAssemblyReferenceTestFixture.cs b/src/Tasks.UnitTests/AssemblyDependency/ResolveAssemblyReferenceTestFixture.cs index e64d7b07d8c..0eea27bff64 100644 --- a/src/Tasks.UnitTests/AssemblyDependency/ResolveAssemblyReferenceTestFixture.cs +++ b/src/Tasks.UnitTests/AssemblyDependency/ResolveAssemblyReferenceTestFixture.cs @@ -914,7 +914,7 @@ internal static string[] GetDirectories(string path, string pattern) }; } - return new string[0]; + return Array.Empty(); } /// @@ -1985,7 +1985,7 @@ internal static AssemblyNameExtension[] GetDependencies(string path) if (String.Equals(path, @"c:\Regress313086\mscorlib.dll", StringComparison.OrdinalIgnoreCase)) { - return new AssemblyNameExtension[] { }; + return Array.Empty(); } if (String.Equals(path, Path.Combine(s_myVersion20Path, "System.dll"), StringComparison.OrdinalIgnoreCase)) @@ -2088,16 +2088,12 @@ internal static AssemblyNameExtension[] GetDependencies(string path) || String.Equals(path, Path.Combine(s_myVersionPocket20Path, "mscorlib.dll"), StringComparison.OrdinalIgnoreCase) ) { - return new AssemblyNameExtension[] - { - }; + return Array.Empty(); } if (String.Equals(path, @"MyRelativeAssembly.dll", StringComparison.OrdinalIgnoreCase)) { - return new AssemblyNameExtension[] - { - }; + return Array.Empty(); } if (String.Equals(path, Path.Combine(s_myAppRootPath, "DependsOnSimpleA.dll"), StringComparison.OrdinalIgnoreCase)) @@ -2206,9 +2202,7 @@ internal static AssemblyNameExtension[] GetDependencies(string path) if (String.Equals(path, s_myLibraries_V1_E_EDllPath, StringComparison.OrdinalIgnoreCase)) { - return new AssemblyNameExtension[] - { - }; + return Array.Empty(); } if (String.Equals(path, Path.Combine(s_myApp_V05Path, "DependsOnWeaklyNamedUnified.dll"), StringComparison.OrdinalIgnoreCase)) @@ -2354,7 +2348,7 @@ internal static AssemblyNameExtension[] GetDependencies(string path) if (String.Equals(path, Path.Combine(s_myComponents2RootPath, "W.dll"), StringComparison.OrdinalIgnoreCase)) { - return new AssemblyNameExtension[] { }; + return Array.Empty(); } if (String.Equals(path, Path.Combine(s_myComponentsRootPath, "X.dll"), StringComparison.OrdinalIgnoreCase)) @@ -2367,7 +2361,7 @@ internal static AssemblyNameExtension[] GetDependencies(string path) if (String.Equals(path, Path.Combine(s_myComponentsRootPath, "Z.dll"), StringComparison.OrdinalIgnoreCase)) { - return new AssemblyNameExtension[] { }; + return Array.Empty(); } if (String.Equals(path, Path.Combine(s_myComponentsRootPath, "Y.dll"), StringComparison.OrdinalIgnoreCase)) @@ -2380,7 +2374,7 @@ internal static AssemblyNameExtension[] GetDependencies(string path) if (String.Equals(path, Path.Combine(s_myComponentsRootPath, "Microsoft.Build.dll"), StringComparison.OrdinalIgnoreCase)) { - return new AssemblyNameExtension[] { }; + return Array.Empty(); } if (String.Equals(path, Path.Combine(s_myComponentsRootPath, "DependsOnMSBuild12.dll"), StringComparison.OrdinalIgnoreCase)) @@ -2439,7 +2433,7 @@ internal static AssemblyNameExtension[] GetDependencies(string path) if (String.Equals(path, @"C:\DirectoryContainsdllAndWinmd\c.winmd", StringComparison.OrdinalIgnoreCase)) { // Simulate a strongly named assembly. - return new AssemblyNameExtension[0]; + return Array.Empty(); } if (String.Equals(path, @"C:\DirectoryContainstwoWinmd\a.winmd", StringComparison.OrdinalIgnoreCase)) @@ -2453,12 +2447,12 @@ internal static AssemblyNameExtension[] GetDependencies(string path) if (String.Equals(path, @"C:\DirectoryContainstwoWinmd\c.winmd", StringComparison.OrdinalIgnoreCase)) { - return new AssemblyNameExtension[0]; + return Array.Empty(); } if (path.StartsWith(@"C:\FakeSDK\", StringComparison.OrdinalIgnoreCase)) { - return new AssemblyNameExtension[0]; + return Array.Empty(); } if (String.Equals(path, s_portableDllPath, StringComparison.OrdinalIgnoreCase)) @@ -2526,49 +2520,49 @@ private static IEnumerable GetRegistrySubKeyNames(RegistryKey baseKey, s { if (String.Equals(subKey, @"Software\Regress714052", StringComparison.OrdinalIgnoreCase)) { - return new string[] { }; + return Array.Empty(); } if (String.Equals(subKey, @"Software\Regress714052\v2.0.0\AssemblyFoldersEx", StringComparison.OrdinalIgnoreCase)) { - return new string[] { }; + return Array.Empty(); } if (String.Equals(subKey, @"Software\Regress714052\v2.0.0\X86", StringComparison.OrdinalIgnoreCase)) { - return new string[] { }; + return Array.Empty(); } if (String.Equals(subKey, @"Software\Regress714052\v2.0.0\MSIL", StringComparison.OrdinalIgnoreCase)) { - return new string[] { }; + return Array.Empty(); } if (String.Equals(subKey, @"Software\Regress714052\v2.0.0\Mix", StringComparison.OrdinalIgnoreCase)) { - return new string[] { }; + return Array.Empty(); } if (String.Equals(subKey, @"Software\Regress714052\v2.0.0\Mix\Mix", StringComparison.OrdinalIgnoreCase)) { - return new string[] { }; + return Array.Empty(); } if (String.Equals(subKey, @"Software\Regress714052\v2.0.0\None", StringComparison.OrdinalIgnoreCase)) { - return new string[] { }; + return Array.Empty(); } if (String.Equals(subKey, @"Software\Regress714052\v2.0.0\X86\X86", StringComparison.OrdinalIgnoreCase)) { - return new string[] { }; + return Array.Empty(); } if (String.Equals(subKey, @"Software\Regress714052\v2.0.0\MSIL\MSIL", StringComparison.OrdinalIgnoreCase)) { - return new string[] { }; + return Array.Empty(); } if (String.Equals(subKey, @"Software\Regress714052\v2.0.0\None\None", StringComparison.OrdinalIgnoreCase)) { - return new string[] { }; + return Array.Empty(); } if (String.Equals(subKey, @"Software\Microsoft\.NetFramework", StringComparison.OrdinalIgnoreCase)) @@ -2609,7 +2603,7 @@ private static IEnumerable GetRegistrySubKeyNames(RegistryKey baseKey, s || String.Equals(subKey, @"Software\Microsoft\.NetFramework\v2.0.50727\AssemblyFoldersEx\ZControlB", StringComparison.OrdinalIgnoreCase) ) { - return new string[] { }; + return Array.Empty(); } if @@ -2666,12 +2660,12 @@ private static IEnumerable GetRegistrySubKeyNames(RegistryKey baseKey, s if (String.Equals(subKey, @"Software\Regress714052\v2.0.0\AssemblyFoldersEx\A", StringComparison.OrdinalIgnoreCase)) { - return new string[] { }; + return Array.Empty(); } if (String.Equals(subKey, @"Software\Regress714052\v2.0.0\AssemblyFoldersEx\B", StringComparison.OrdinalIgnoreCase)) { - return new string[] { }; + return Array.Empty(); } if (String.Equals(subKey, @"Software\Regress714052\v2.0.0\X86", StringComparison.OrdinalIgnoreCase)) { @@ -2695,21 +2689,21 @@ private static IEnumerable GetRegistrySubKeyNames(RegistryKey baseKey, s if (String.Equals(subKey, @"Software\Regress714052\v2.0.0\Mix\Mix", StringComparison.OrdinalIgnoreCase)) { - return new string[] { }; + return Array.Empty(); } if (String.Equals(subKey, @"Software\Regress714052\v2.0.0\X86\X86", StringComparison.OrdinalIgnoreCase)) { - return new string[] { }; + return Array.Empty(); } if (String.Equals(subKey, @"Software\Regress714052\v2.0.0\MSIL\MSIL", StringComparison.OrdinalIgnoreCase)) { - return new string[] { }; + return Array.Empty(); } if (String.Equals(subKey, @"Software\Regress714052\v2.0.0\None\None", StringComparison.OrdinalIgnoreCase)) { - return new string[] { }; + return Array.Empty(); } if (String.Equals(subKey, @"Software\Microsoft\.NetFramework", StringComparison.OrdinalIgnoreCase)) @@ -2724,12 +2718,12 @@ private static IEnumerable GetRegistrySubKeyNames(RegistryKey baseKey, s if (String.Equals(subKey, @"Software\Microsoft\.NetFramework\v2.0.50727\AssemblyFoldersEx\Infragistics.FancyControl.1.0", StringComparison.OrdinalIgnoreCase)) { - return new string[] { }; + return Array.Empty(); } if (String.Equals(subKey, @"Software\Microsoft\.NetFramework\v2.0.50727\AssemblyFoldersEx\Infragistics.MyHKLMControl.1.0", StringComparison.OrdinalIgnoreCase)) { - return new string[] { }; + return Array.Empty(); } if (String.Equals(subKey, @"Software\Microsoft\.NETCompactFramework", StringComparison.OrdinalIgnoreCase)) @@ -2744,12 +2738,12 @@ private static IEnumerable GetRegistrySubKeyNames(RegistryKey baseKey, s if (String.Equals(subKey, @"Software\Microsoft\.NETCompactFramework\v2.0.3600\PocketPC\AssemblyFoldersEx", StringComparison.OrdinalIgnoreCase)) { - return new string[] { }; + return Array.Empty(); } if (String.Equals(subKey, @"Software\Microsoft\.NETCompactFramework\v2.0.3600\PocketPC\AssemblyFoldersEx\AFETestDeviceControl", StringComparison.OrdinalIgnoreCase)) { - return new string[] { }; + return Array.Empty(); } if (String.Equals(subKey, @"Software\Microsoft\Microsoft SDKs\Windows", StringComparison.OrdinalIgnoreCase)) @@ -3027,7 +3021,7 @@ protected static bool Execute(ResolveAssemblyReference t, bool buildConsistencyC ); // A few checks. These should always be true or it may be a perf issue for project load. - ITaskItem[] loadModeResolvedFiles = new TaskItem[0]; + ITaskItem[] loadModeResolvedFiles = Array.Empty(); if (t.ResolvedFiles != null) { loadModeResolvedFiles = (ITaskItem[])t.ResolvedFiles.Clone(); diff --git a/src/Tasks.UnitTests/CombinePath_Tests.cs b/src/Tasks.UnitTests/CombinePath_Tests.cs index 6d60979ae68..dc05b71dde1 100644 --- a/src/Tasks.UnitTests/CombinePath_Tests.cs +++ b/src/Tasks.UnitTests/CombinePath_Tests.cs @@ -173,7 +173,7 @@ public void NoPaths() t.BuildEngine = new MockEngine(); t.BasePath = @"c:\abc\def"; - t.Paths = new ITaskItem[0]; + t.Paths = System.Array.Empty(); Assert.True(t.Execute()); // "success" ObjectModelHelpers.AssertItemsMatch(@" diff --git a/src/Tasks.UnitTests/Exec_Tests.cs b/src/Tasks.UnitTests/Exec_Tests.cs index 6bbcdb146cc..bb7f9dcefee 100644 --- a/src/Tasks.UnitTests/Exec_Tests.cs +++ b/src/Tasks.UnitTests/Exec_Tests.cs @@ -523,7 +523,7 @@ public void ExecTaskDisablesAutoRun(string environmentVariableName, string envir MethodInfo generateCommandLineCommandsMethod = execType.GetMethod("GenerateCommandLineCommands", BindingFlags.Instance | BindingFlags.NonPublic); - string commandLine = generateCommandLineCommandsMethod.Invoke(exec, new object[0]) as string; + string commandLine = generateCommandLineCommandsMethod.Invoke(exec, Array.Empty()) as string; if (autoRunShouldBeDisabled) { diff --git a/src/Tasks.UnitTests/FindAppConfigFile_Tests.cs b/src/Tasks.UnitTests/FindAppConfigFile_Tests.cs index c2bd134f11a..74d1c6a7c82 100644 --- a/src/Tasks.UnitTests/FindAppConfigFile_Tests.cs +++ b/src/Tasks.UnitTests/FindAppConfigFile_Tests.cs @@ -17,7 +17,7 @@ public void FoundInFirstInProjectDirectory() FindAppConfigFile f = new FindAppConfigFile(); f.BuildEngine = new MockEngine(); f.PrimaryList = new ITaskItem[] { new TaskItem("app.config"), new TaskItem("xxx") }; - f.SecondaryList = new ITaskItem[] { }; + f.SecondaryList = System.Array.Empty(); f.TargetPath = "targetpath"; Assert.True(f.Execute()); Assert.Equal("app.config", f.AppConfigFile.ItemSpec); @@ -86,7 +86,7 @@ public void ReturnsLastOne() ITaskItem item2 = new TaskItem("app.config"); item2.SetMetadata("id", "2"); f.PrimaryList = new ITaskItem[] { item1, item2 }; - f.SecondaryList = new ITaskItem[] { }; + f.SecondaryList = System.Array.Empty(); f.TargetPath = "targetpath"; Assert.True(f.Execute()); Assert.Equal("app.config", f.AppConfigFile.ItemSpec); diff --git a/src/Tasks.UnitTests/FindInList_Tests.cs b/src/Tasks.UnitTests/FindInList_Tests.cs index a87a9cc5ffc..25073969b17 100644 --- a/src/Tasks.UnitTests/FindInList_Tests.cs +++ b/src/Tasks.UnitTests/FindInList_Tests.cs @@ -90,7 +90,7 @@ public void ReturnsLastOneEmptyList() f.BuildEngine = new MockEngine(); f.ItemSpecToFind = "a.cs"; f.FindLastMatch = true; - f.List = new ITaskItem[] { }; + f.List = Array.Empty(); Assert.True(f.Execute()); Assert.Null(f.ItemFound); } diff --git a/src/Tasks.UnitTests/GenerateBindingRedirects_Tests.cs b/src/Tasks.UnitTests/GenerateBindingRedirects_Tests.cs index 22e3eb6a34c..0c7f25086fd 100644 --- a/src/Tasks.UnitTests/GenerateBindingRedirects_Tests.cs +++ b/src/Tasks.UnitTests/GenerateBindingRedirects_Tests.cs @@ -310,7 +310,7 @@ private BindingRedirectsExecutionResult GenerateBindingRedirects(string appConfi GenerateBindingRedirects bindingRedirects = new GenerateBindingRedirects { BuildEngine = engine, - SuggestedRedirects = suggestedRedirects ?? new ITaskItem[] { }, + SuggestedRedirects = suggestedRedirects ?? System.Array.Empty(), AppConfigFile = new TaskItem(appConfigFile), OutputAppConfigFile = new TaskItem(outputAppConfig) }; diff --git a/src/Tasks.UnitTests/Hash_Tests.cs b/src/Tasks.UnitTests/Hash_Tests.cs index e2b64378d47..ff5e3a2819d 100644 --- a/src/Tasks.UnitTests/Hash_Tests.cs +++ b/src/Tasks.UnitTests/Hash_Tests.cs @@ -39,7 +39,7 @@ public void HashTaskEmptyInputTest() var nullItemsHash = ExecuteHashTask(null); Assert.Null(nullItemsHash); - var zeroLengthItemsHash = ExecuteHashTask(new ITaskItem[0]); + var zeroLengthItemsHash = ExecuteHashTask(System.Array.Empty()); Assert.Null(zeroLengthItemsHash); } diff --git a/src/Tasks.UnitTests/WriteCodeFragment_Tests.cs b/src/Tasks.UnitTests/WriteCodeFragment_Tests.cs index b389d8c784c..e6388b02331 100644 --- a/src/Tasks.UnitTests/WriteCodeFragment_Tests.cs +++ b/src/Tasks.UnitTests/WriteCodeFragment_Tests.cs @@ -135,7 +135,7 @@ public void NoAttributesShouldEmitNoFile() MockEngine engine = new MockEngine(true); task.BuildEngine = engine; task.Language = "c#"; - task.AssemblyAttributes = new TaskItem[] { }; // MSBuild sets an empty array + task.AssemblyAttributes = Array.Empty(); // MSBuild sets an empty array task.OutputFile = new TaskItem(file); bool result = task.Execute(); diff --git a/src/Utilities.UnitTests/MuxLogger_Tests.cs b/src/Utilities.UnitTests/MuxLogger_Tests.cs index 21fcfb9f78c..1ed22c96d67 100644 --- a/src/Utilities.UnitTests/MuxLogger_Tests.cs +++ b/src/Utilities.UnitTests/MuxLogger_Tests.cs @@ -54,7 +54,7 @@ public void SimpleBuildWithNoLoggers() MuxLogger muxLogger = new MuxLogger(); BuildParameters parameters = new BuildParameters(ProjectCollection.GlobalProjectCollection); parameters.Loggers = new ILogger[] { muxLogger }; - buildManager.Build(parameters, new BuildRequestData(project, new string[0], null)); + buildManager.Build(parameters, new BuildRequestData(project, Array.Empty(), null)); } /// @@ -94,7 +94,7 @@ public void BuildWithMuxLoggerEquivalentToNormalLogger() ProjectInstance project = (new Project(XmlReader.Create(new StringReader(projectBody)), null, ObjectModelHelpers.MSBuildDefaultToolsVersion, projectCollection)).CreateProjectInstance(); BuildParameters parameters = new BuildParameters(projectCollection); parameters.Loggers = new ILogger[] { mockLogger2 }; - buildManager.Build(parameters, new BuildRequestData(project, new string[0], null)); + buildManager.Build(parameters, new BuildRequestData(project, Array.Empty(), null)); // Build with the mux logger MuxLogger muxLogger = new MuxLogger(); @@ -109,7 +109,7 @@ public void BuildWithMuxLoggerEquivalentToNormalLogger() try { - BuildSubmission submission = buildManager.PendBuildRequest(new BuildRequestData(project, new string[0], null)); + BuildSubmission submission = buildManager.PendBuildRequest(new BuildRequestData(project, Array.Empty(), null)); muxLogger.RegisterLogger(submission.SubmissionId, mockLogger); submission.Execute(); } @@ -149,7 +149,7 @@ public void OneSubmissionOneLogger() try { - BuildSubmission submission = buildManager.PendBuildRequest(new BuildRequestData(project, new string[0], null)); + BuildSubmission submission = buildManager.PendBuildRequest(new BuildRequestData(project, Array.Empty(), null)); muxLogger.RegisterLogger(submission.SubmissionId, mockLogger); submission.Execute(); @@ -202,11 +202,11 @@ public void TwoSubmissionsWithSeparateLoggers() try { - BuildSubmission submission1 = buildManager.PendBuildRequest(new BuildRequestData(project1, new string[0], null)); + BuildSubmission submission1 = buildManager.PendBuildRequest(new BuildRequestData(project1, Array.Empty(), null)); muxLogger.RegisterLogger(submission1.SubmissionId, mockLogger1); submission1.Execute(); - BuildSubmission submission2 = buildManager.PendBuildRequest(new BuildRequestData(project2, new string[0], null)); + BuildSubmission submission2 = buildManager.PendBuildRequest(new BuildRequestData(project2, Array.Empty(), null)); muxLogger.RegisterLogger(submission2.SubmissionId, mockLogger2); submission2.Execute(); } @@ -255,7 +255,7 @@ public void OneSubmissionTwoLoggers() buildManager.BeginBuild(parameters); try { - BuildSubmission submission = buildManager.PendBuildRequest(new BuildRequestData(project, new string[0], null)); + BuildSubmission submission = buildManager.PendBuildRequest(new BuildRequestData(project, Array.Empty(), null)); muxLogger.RegisterLogger(submission.SubmissionId, mockLogger1); muxLogger.RegisterLogger(submission.SubmissionId, mockLogger2); @@ -306,7 +306,7 @@ public void RegisteringLoggerDuringBuildThrowsException() { try { - BuildSubmission submission = buildManager.PendBuildRequest(new BuildRequestData(project, new string[0], null)); + BuildSubmission submission = buildManager.PendBuildRequest(new BuildRequestData(project, Array.Empty(), null)); submission.ExecuteAsync(null, null); projectStartedEvent.WaitOne(); diff --git a/src/Utilities.UnitTests/ToolLocationHelper_Tests.cs b/src/Utilities.UnitTests/ToolLocationHelper_Tests.cs index 4578651a935..9bd65b8f09c 100644 --- a/src/Utilities.UnitTests/ToolLocationHelper_Tests.cs +++ b/src/Utilities.UnitTests/ToolLocationHelper_Tests.cs @@ -2819,7 +2819,7 @@ private static string[] GetDirectories(string path, string pattern) { return new[] { @"{runtime-base}\v1.2.30617", @"{runtime-base}\v1.2.x86dbg", @"{runtime-base}\v1.2.x86fre" }; } - return new string[0]; + return Array.Empty(); } /// @@ -4084,7 +4084,7 @@ public void GetPlatformsForSDKNullSDKVersion() [Fact] public void GetPlatformsForSDKWithNoInstalledTargetPlatforms() { - ToolLocationHelper.GetPlatformsForSDK("AnySDK", new Version("1.0"), new string[0], "").Any().ShouldBeFalse(); + ToolLocationHelper.GetPlatformsForSDK("AnySDK", new Version("1.0"), Array.Empty(), "").Any().ShouldBeFalse(); } /// @@ -4753,7 +4753,7 @@ private static IEnumerable GetRegistrySubKeyNames(RegistryKey baseKey, s } } - return new string[] { }; + return Array.Empty(); } /// From f424a01fe9563102ff800a4c21b10369a3bcf11b Mon Sep 17 00:00:00 2001 From: elachlan <2433737+elachlan@users.noreply.github.com> Date: Tue, 4 Jan 2022 10:05:04 +1000 Subject: [PATCH 2/5] revert changes to deprecated --- src/Deprecated/Engine/Engine/BuildTask.cs | 2 +- src/Deprecated/Engine/Engine/Expander.cs | 6 +++--- src/Deprecated/Engine/Engine/Project.cs | 6 +++--- src/Deprecated/Engine/Engine/RegistryKeyWrapper.cs | 4 ++-- .../Engine/Engine/ToolsetRegistryReader.cs | 2 +- .../ParallelLogger/ParallelLoggerHelpers.cs | 2 +- src/Deprecated/Engine/Shared/FileMatcher.cs | 14 +++++++------- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Deprecated/Engine/Engine/BuildTask.cs b/src/Deprecated/Engine/Engine/BuildTask.cs index 6fc77b50924..4d7552ed0fa 100644 --- a/src/Deprecated/Engine/Engine/BuildTask.cs +++ b/src/Deprecated/Engine/Engine/BuildTask.cs @@ -310,7 +310,7 @@ public string[] GetParameterNames() { if (this.taskElement == null) { - return Array.Empty(); + return new string[0]; } ArrayList list = new ArrayList(); diff --git a/src/Deprecated/Engine/Engine/Expander.cs b/src/Deprecated/Engine/Engine/Expander.cs index 480dfee46e1..2cd7ba7bcd4 100644 --- a/src/Deprecated/Engine/Engine/Expander.cs +++ b/src/Deprecated/Engine/Engine/Expander.cs @@ -1517,7 +1517,7 @@ private static Function ConstructFunction(string expressionFunction, string expr // It may be that there are '()' but no actual arguments content if (argumentStartIndex == expressionFunction.Length - 1) { - functionArguments = Array.Empty(); + functionArguments = new string[0]; } else { @@ -1527,7 +1527,7 @@ private static Function ConstructFunction(string expressionFunction, string expr // If there are no arguments, then just create an empty array if (String.IsNullOrEmpty(argumentsContent)) { - functionArguments = Array.Empty(); + functionArguments = new string[0]; } else { @@ -1543,7 +1543,7 @@ private static Function ConstructFunction(string expressionFunction, string expr int nextMethodIndex = expressionFunction.IndexOf('.', methodStartIndex); int methodLength = expressionFunction.Length - methodStartIndex; - functionArguments = Array.Empty(); + functionArguments = new string[0]; if (nextMethodIndex > 0) { diff --git a/src/Deprecated/Engine/Engine/Project.cs b/src/Deprecated/Engine/Engine/Project.cs index 4c0ddb0e1c8..fa38a06859d 100644 --- a/src/Deprecated/Engine/Engine/Project.cs +++ b/src/Deprecated/Engine/Engine/Project.cs @@ -408,7 +408,7 @@ string toolsVersion this.targets = new TargetCollection(this); // Initialize the default targets, initial targets, and project file name. - this.defaultTargetNames = Array.Empty(); + this.defaultTargetNames = new string[0]; this.initialTargetNamesInMainProject = new ArrayList(); this.initialTargetNamesInImportedProjects = new ArrayList(); this.FullFileName = String.Empty; @@ -1549,7 +1549,7 @@ string propertyName if (propertyValues == null) { - return Array.Empty(); + return new string[0]; } else { @@ -3743,7 +3743,7 @@ private void ProcessMainProjectElement this.evaluatedItemsIgnoringCondition.Clear(); this.targets.Clear(); this.nameOfFirstTarget = null; - this.defaultTargetNames = Array.Empty(); + this.defaultTargetNames = new string[0]; this.initialTargetNamesInImportedProjects.Clear(); this.initialTargetNamesInMainProject.Clear(); diff --git a/src/Deprecated/Engine/Engine/RegistryKeyWrapper.cs b/src/Deprecated/Engine/Engine/RegistryKeyWrapper.cs index 188bbb81ad1..b0a635794c7 100644 --- a/src/Deprecated/Engine/Engine/RegistryKeyWrapper.cs +++ b/src/Deprecated/Engine/Engine/RegistryKeyWrapper.cs @@ -110,7 +110,7 @@ public virtual string[] GetValueNames() { try { - return Exists() ? WrappedKey.GetValueNames() : Array.Empty(); + return Exists() ? WrappedKey.GetValueNames() : new string[] { }; } catch (Exception ex) { @@ -129,7 +129,7 @@ public virtual string[] GetSubKeyNames() { try { - return Exists() ? WrappedKey.GetSubKeyNames() : Array.Empty(); + return Exists() ? WrappedKey.GetSubKeyNames() : new string[] { }; } catch (Exception ex) { diff --git a/src/Deprecated/Engine/Engine/ToolsetRegistryReader.cs b/src/Deprecated/Engine/Engine/ToolsetRegistryReader.cs index 8fce018f88f..4935eaea24e 100644 --- a/src/Deprecated/Engine/Engine/ToolsetRegistryReader.cs +++ b/src/Deprecated/Engine/Engine/ToolsetRegistryReader.cs @@ -57,7 +57,7 @@ protected override IEnumerable ToolsVersions { get { - string[] toolsVersionNames = System.Array.Empty(); + string[] toolsVersionNames = new string[] { }; try { toolsVersionNames = msbuildRegistryWrapper.OpenSubKey("ToolsVersions").GetSubKeyNames(); diff --git a/src/Deprecated/Engine/Logging/ParallelLogger/ParallelLoggerHelpers.cs b/src/Deprecated/Engine/Logging/ParallelLogger/ParallelLoggerHelpers.cs index 3bde1782032..8470aca7630 100644 --- a/src/Deprecated/Engine/Logging/ParallelLogger/ParallelLoggerHelpers.cs +++ b/src/Deprecated/Engine/Logging/ParallelLogger/ParallelLoggerHelpers.cs @@ -149,7 +149,7 @@ internal string[] ProjectCallStackFromProject(BuildEventContext e) // or the event is raised before the project started event if (startedEvent == null) { - return Array.Empty(); + return new string[0]; } List projectStackTrace = GetProjectCallStack(e); diff --git a/src/Deprecated/Engine/Shared/FileMatcher.cs b/src/Deprecated/Engine/Shared/FileMatcher.cs index c18f30d1fca..3292f664426 100644 --- a/src/Deprecated/Engine/Shared/FileMatcher.cs +++ b/src/Deprecated/Engine/Shared/FileMatcher.cs @@ -121,7 +121,7 @@ private static string[] GetAccessibleFilesAndDirectories(string path, string pat if (entries == null) { - entries = Array.Empty(); + entries = new string[0]; } return entries; @@ -177,12 +177,12 @@ bool stripProjectDirectory catch (System.Security.SecurityException) { // For code access security. - return Array.Empty(); + return new string[0]; } catch (System.UnauthorizedAccessException) { // For OS security. - return Array.Empty(); + return new string[0]; } } @@ -229,12 +229,12 @@ string pattern catch (System.Security.SecurityException) { // For code access security. - return Array.Empty(); + return new string[0]; } catch (System.UnauthorizedAccessException) { // For OS security. - return Array.Empty(); + return new string[0]; } } @@ -1198,7 +1198,7 @@ DirectoryExists directoryExists } catch (ArgumentException) { - return Array.Empty(); + return new string[0]; } stripProjectDirectory = !String.Equals(fixedDirectoryPart, oldFixedDirectoryPart, StringComparison.OrdinalIgnoreCase); @@ -1216,7 +1216,7 @@ DirectoryExists directoryExists */ if (fixedDirectoryPart.Length > 0 && !directoryExists(fixedDirectoryPart)) { - return Array.Empty(); + return new string[0]; } // determine if we need to use the regular expression to match the files From cf3e4a1323ab474d4a6b8e0acaa6266038cb6ccb Mon Sep 17 00:00:00 2001 From: elachlan <2433737+elachlan@users.noreply.github.com> Date: Sat, 8 Jan 2022 10:36:05 +1000 Subject: [PATCH 3/5] Revert CodeAnalysis.ruleset --- eng/CodeAnalysis.ruleset | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/CodeAnalysis.ruleset b/eng/CodeAnalysis.ruleset index be3e4ac3d38..2078c42fe6c 100644 --- a/eng/CodeAnalysis.ruleset +++ b/eng/CodeAnalysis.ruleset @@ -96,7 +96,7 @@ - + From 71fd1bce231564d342dffb4b9904898069e2d28c Mon Sep 17 00:00:00 2001 From: elachlan <2433737+elachlan@users.noreply.github.com> Date: Sat, 8 Jan 2022 10:36:50 +1000 Subject: [PATCH 4/5] enable warning on CA1825 --- eng/Common.globalconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Common.globalconfig b/eng/Common.globalconfig index fd878420d57..e38d296772e 100644 --- a/eng/Common.globalconfig +++ b/eng/Common.globalconfig @@ -283,7 +283,7 @@ dotnet_diagnostic.CA1823.severity = suggestion dotnet_diagnostic.CA1824.severity = warning # Avoid zero-length array allocations. -dotnet_diagnostic.CA1825.severity = suggestion +dotnet_diagnostic.CA1825.severity = warning # Do not use Count() or LongCount() when Any() can be used dotnet_diagnostic.CA1827.severity = suggestion From 8d5f9049385929aa9a1e09ee2ec6aa9b4583427d Mon Sep 17 00:00:00 2001 From: elachlan <2433737+elachlan@users.noreply.github.com> Date: Sat, 8 Jan 2022 10:46:44 +1000 Subject: [PATCH 5/5] Fix remaining occurrences of CA1825 violations --- src/Tasks.UnitTests/AssemblyDependency/Miscellaneous.cs | 8 ++++---- src/Tasks.UnitTests/ResolveSDKReference_Tests.cs | 8 ++++---- src/Tasks.UnitTests/SGen_Tests.cs | 2 +- src/Tasks.UnitTests/XamlTestHelpers.cs | 2 +- src/Tasks.UnitTests/XslTransformation_Tests.cs | 2 +- src/Tasks/GetCompatiblePlatform.cs | 2 +- .../TrackedDependencies/TrackedDependenciesTests.cs | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Tasks.UnitTests/AssemblyDependency/Miscellaneous.cs b/src/Tasks.UnitTests/AssemblyDependency/Miscellaneous.cs index 753b66491f6..e8e88138800 100644 --- a/src/Tasks.UnitTests/AssemblyDependency/Miscellaneous.cs +++ b/src/Tasks.UnitTests/AssemblyDependency/Miscellaneous.cs @@ -5639,10 +5639,10 @@ public void GetRedistListPathsFromDisk_ThrowsArgumentNullException() [Fact] public void RedistListGenerateBlackListEmptyAssemblyInfoNoRedistAssemblies() { - RedistList redistList = RedistList.GetRedistList(new AssemblyTableInfo[0]); + RedistList redistList = RedistList.GetRedistList(Array.Empty()); List whiteListErrors = new List(); List whiteListErrorFileNames = new List(); - Dictionary blackList = redistList.GenerateBlackList(new AssemblyTableInfo[0], whiteListErrors, whiteListErrorFileNames); + Dictionary blackList = redistList.GenerateBlackList(Array.Empty(), whiteListErrors, whiteListErrorFileNames); Assert.Null(blackList); // "Should return null if the AssemblyTableInfo is empty and the redist list is empty" } @@ -5660,7 +5660,7 @@ public void RedistListGenerateBlackListEmptyAssemblyInfoWithRedistAssemblies() RedistList redistList = RedistList.GetRedistList(new AssemblyTableInfo[] { redistListInfo }); List whiteListErrors = new List(); List whiteListErrorFileNames = new List(); - Dictionary blackList = redistList.GenerateBlackList(new AssemblyTableInfo[0], whiteListErrors, whiteListErrorFileNames); + Dictionary blackList = redistList.GenerateBlackList(Array.Empty(), whiteListErrors, whiteListErrorFileNames); // Since there were no white list expect the black list to return null Assert.Empty(blackList); // "Expected to have no assemblies in the black list" @@ -6543,7 +6543,7 @@ public void TestGenerateFrameworkName() installedSubSetTable = new ITaskItem[] { new TaskItem("c:\\foo\\Client.xml"), new TaskItem("D:\\foo\\bar\\Framework2\\"), new TaskItem("D:\\foo\\bar\\Framework"), new TaskItem("Nothing") }; Assert.Equal("Client, Framework, Nothing", ResolveAssemblyReference.GenerateSubSetName(null, installedSubSetTable)); - installedSubSetTable = new ITaskItem[0]; + installedSubSetTable = Array.Empty(); Assert.True(String.IsNullOrEmpty(ResolveAssemblyReference.GenerateSubSetName(null, installedSubSetTable))); installedSubSetTable = null; diff --git a/src/Tasks.UnitTests/ResolveSDKReference_Tests.cs b/src/Tasks.UnitTests/ResolveSDKReference_Tests.cs index 2a0468f4a45..c9dcf784494 100644 --- a/src/Tasks.UnitTests/ResolveSDKReference_Tests.cs +++ b/src/Tasks.UnitTests/ResolveSDKReference_Tests.cs @@ -1199,7 +1199,7 @@ public void DuplicateSDKReferences() ITaskItem item = new TaskItem("GoodTestSDK, Version=2.0"); ITaskItem item2 = new TaskItem("GoodTestSDK, Version=2.0"); t.SDKReferences = new ITaskItem[] { item, item2 }; - t.References = new TaskItem[0]; + t.References = Array.Empty(); ITaskItem installedSDK = new TaskItem(_sdkPath); installedSDK.SetMetadata("SDKName", "GoodTestSDK, Version=2.0"); t.InstalledSDKs = new ITaskItem[] { installedSDK }; @@ -1307,7 +1307,7 @@ public void InstalledSDKEmpty() ITaskItem item = new TaskItem("GoodTestSDK, Version=2.0"); t.SDKReferences = new ITaskItem[] { item }; t.References = null; - t.InstalledSDKs = new ITaskItem[0]; + t.InstalledSDKs = Array.Empty(); t.BuildEngine = engine; bool succeeded = t.Execute(); @@ -1330,7 +1330,7 @@ public void MixOfInstalledSDKItemsGoodDuplicateAndBad() ResolveSDKReference t = new ResolveSDKReference(); ITaskItem item = new TaskItem("GoodTestSDK, Version=2.0"); t.SDKReferences = new ITaskItem[] { item }; - t.References = new TaskItem[0]; + t.References = Array.Empty(); ITaskItem installedSDK1 = new TaskItem(_sdkPath); installedSDK1.SetMetadata("SDKName", "GoodTestSDK, Version=2.0"); @@ -1473,7 +1473,7 @@ public void EmptySDKReferencesList() ResolveSDKReference t = new ResolveSDKReference(); ITaskItem item = new TaskItem("GoodTestSDK, Version=2.0"); - t.SDKReferences = new ITaskItem[0]; + t.SDKReferences = Array.Empty(); ITaskItem installedSDK = new TaskItem(_sdkPath); installedSDK.SetMetadata("SDKName", "GoodTestSDK, Version=2.0"); t.InstalledSDKs = new ITaskItem[] { installedSDK }; diff --git a/src/Tasks.UnitTests/SGen_Tests.cs b/src/Tasks.UnitTests/SGen_Tests.cs index 980b3ba9c87..22c5a5ea821 100644 --- a/src/Tasks.UnitTests/SGen_Tests.cs +++ b/src/Tasks.UnitTests/SGen_Tests.cs @@ -252,7 +252,7 @@ public void TestEmptyReferences() sgen.ShouldGenerateSerializer = true; sgen.UseProxyTypes = false; sgen.UseKeep = false; - sgen.References = new string[]{ }; + sgen.References = Array.Empty(); string commandLine = sgen.CommandLine(); diff --git a/src/Tasks.UnitTests/XamlTestHelpers.cs b/src/Tasks.UnitTests/XamlTestHelpers.cs index 052fe764616..c5174dd8d6d 100644 --- a/src/Tasks.UnitTests/XamlTestHelpers.cs +++ b/src/Tasks.UnitTests/XamlTestHelpers.cs @@ -232,7 +232,7 @@ public static string GenerateCommandLine(object task) try { return (string)task.GetType().InvokeMember("GetCommandLine_ForUnitTestsOnly", BindingFlags.Public | BindingFlags.NonPublic | - BindingFlags.Instance | BindingFlags.InvokeMethod, null, task, new object[] { }); + BindingFlags.Instance | BindingFlags.InvokeMethod, null, task, Array.Empty()); } catch (TargetInvocationException e) { diff --git a/src/Tasks.UnitTests/XslTransformation_Tests.cs b/src/Tasks.UnitTests/XslTransformation_Tests.cs index 7f24c797792..59223662e76 100644 --- a/src/Tasks.UnitTests/XslTransformation_Tests.cs +++ b/src/Tasks.UnitTests/XslTransformation_Tests.cs @@ -1143,7 +1143,7 @@ private void Compile(string inputFile, string outputFile) // Add custom attribute to assembly marking it as security transparent so that Assert will not be allowed // and link demands will be converted to full demands. - asmBldr.SetCustomAttribute(new CustomAttributeBuilder(typeof(System.Security.SecurityTransparentAttribute).GetConstructor(Type.EmptyTypes), new object[] { })); + asmBldr.SetCustomAttribute(new CustomAttributeBuilder(typeof(System.Security.SecurityTransparentAttribute).GetConstructor(Type.EmptyTypes), Array.Empty())); // Mark the assembly with GeneratedCodeAttribute to improve profiling experience asmBldr.SetCustomAttribute(new CustomAttributeBuilder(typeof(GeneratedCodeAttribute).GetConstructor(new Type[] { typeof(string), typeof(string) }), new object[] { "XsltCompiler", "2.0.0.0" })); diff --git a/src/Tasks/GetCompatiblePlatform.cs b/src/Tasks/GetCompatiblePlatform.cs index 5f2ccedeb5f..f2b823767fd 100644 --- a/src/Tasks/GetCompatiblePlatform.cs +++ b/src/Tasks/GetCompatiblePlatform.cs @@ -44,7 +44,7 @@ public class GetCompatiblePlatform : TaskExtension public GetCompatiblePlatform() { - AnnotatedProjects = new ITaskItem[0]; + AnnotatedProjects = Array.Empty(); CurrentProjectPlatform = string.Empty; PlatformLookupTable = string.Empty; } diff --git a/src/Utilities.UnitTests/TrackedDependencies/TrackedDependenciesTests.cs b/src/Utilities.UnitTests/TrackedDependencies/TrackedDependenciesTests.cs index 4f09f9bbc15..a7033377e98 100644 --- a/src/Utilities.UnitTests/TrackedDependencies/TrackedDependenciesTests.cs +++ b/src/Utilities.UnitTests/TrackedDependencies/TrackedDependenciesTests.cs @@ -167,7 +167,7 @@ public void FormatNormalizedRootingMarkerTests() new ITaskItem[] {new TaskItem("Debug\\link.4567.write.1.tlog\\")}, Path.Combine(Directory.GetCurrentDirectory(), "Debug\\link.4567.write.1.tlog\\").ToUpperInvariant() }, - {new ITaskItem[0] { }, ""}, + {Array.Empty(), ""}, { new ITaskItem[3] {