From 48300b9e998cc6095d74792440f71a3092d46e5f Mon Sep 17 00:00:00 2001 From: Ladi Prosek Date: Fri, 3 Feb 2023 09:59:12 +0100 Subject: [PATCH] Rectify namespace imports with dotnet format --- .../Construction/ConstructionEditing_Tests.cs | 4 +-- .../ElementLocationPublic_Tests.cs | 6 ++--- .../ProjectChooseElement_Tests.cs | 6 ++--- .../ProjectExtensionsElement_Tests.cs | 3 +-- .../Construction/ProjectFormatting_Tests.cs | 6 ++--- .../ProjectImportElement_Tests.cs | 6 ++--- .../ProjectImportGroupElement_Tests.cs | 3 +-- ...ProjectItemDefinitionGroupElement_Tests.cs | 4 +-- .../Construction/ProjectItemElement_Tests.cs | 6 ++--- .../ProjectMetadataElement_Tests.cs | 7 +++--- .../ProjectOnErrorElement_Tests.cs | 4 +-- .../ProjectOutputElement_Tests.cs | 3 +-- .../ProjectPropertyElement_Tests.cs | 3 +-- .../Construction/ProjectTaskElement_Tests.cs | 3 +-- .../ProjectUsingTaskElement_Tests.cs | 4 +-- .../Construction/SolutionFile_Tests.cs | 4 +-- .../UsingTaskBodyElement_Tests.cs | 3 +-- .../UsingTaskParameterElement_Tests.cs | 3 +-- .../UsingTaskParameterGroup_Tests.cs | 3 +-- .../WhiteSpacePreservation_Tests.cs | 5 ++-- .../Definition/ProjectCollection_Tests.cs | 6 ++--- .../Definition/ProjectItemDefinition_Tests.cs | 2 +- .../Definition/ProjectItem_Tests.cs | 2 +- .../Definition/Project_Tests.cs | 16 ++++++------ .../Instance/ProjectInstance_Tests.cs | 3 +-- .../Instance/ProjectItemInstance_Tests.cs | 8 +++--- .../Helpers/ViewValidation.construction.cs | 4 +-- .../Helpers/ViewValidation.evaluation.cs | 2 +- .../MockProjectRootElementLink.cs | 2 +- .../EvaluationLinkMocks/MockProjectLink.cs | 2 +- .../BackEnd/AssemblyTaskFactory_Tests.cs | 8 +++--- .../BackEnd/BatchingEngine_Tests.cs | 5 ++-- .../BackEnd/BinaryTranslator_Tests.cs | 2 +- .../BuildEventArgTransportSink_Tests.cs | 2 +- .../BuildRequestConfiguration_Tests.cs | 8 +++--- .../BackEnd/BuildRequestEngine_Tests.cs | 6 ++--- .../BackEnd/CentralForwardingLogger_Tests.cs | 2 +- .../BackEnd/ConfigurationMetadata_Tests.cs | 6 ++--- .../BackEnd/CustomTaskHelper.cs | 5 ++-- .../BackEnd/EventRedirectorToSink_Tests.cs | 2 +- .../BackEnd/EventSourceSink_Tests.cs | 5 ++-- .../GenerateTemporaryTargetAssembly_Tests.cs | 4 +-- .../BackEnd/IntrinsicTask_Tests.cs | 3 +-- .../BackEnd/LoggingServiceFactory_Tests.cs | 2 +- .../BackEnd/LoggingService_Tests.cs | 16 ++++++------ .../BackEnd/LoggingServicesLogMethod_Tests.cs | 25 +++++++++---------- src/Build.UnitTests/BackEnd/MockHost.cs | 2 +- .../BackEnd/MockLoggingService.cs | 3 +-- .../BackEnd/MockSdkResolverService.cs | 2 +- .../BackEnd/MockTaskBuilder.cs | 5 ++-- .../BackEnd/NodeEndpointInProc_Tests.cs | 2 +- .../BackEnd/NodePackets_Tests.cs | 6 ++--- .../BackEnd/NullMetadataTask.cs | 4 +-- src/Build.UnitTests/BackEnd/OnError_Tests.cs | 12 ++++----- src/Build.UnitTests/BackEnd/ProcessIdTask.cs | 2 +- .../BackEnd/RequestBuilder_Tests.cs | 10 ++++---- .../BackEnd/ResultsCache_Tests.cs | 2 +- .../BackEnd/Scheduler_Tests.cs | 10 ++++---- .../BackEnd/SdkResolverLoader_Tests.cs | 2 +- .../BackEnd/SdkResolverService_Tests.cs | 14 +++++------ .../BackEnd/SdkResultItemComparison_Tests.cs | 4 +-- .../BackEnd/SdkResultOutOfProc_Tests.cs | 10 ++++---- .../BackEnd/TargetBuilder_Tests.cs | 17 ++++++------- .../BackEnd/TargetResult_Tests.cs | 6 ++--- .../BackEnd/TargetUpToDateChecker_Tests.cs | 10 ++++---- .../BackEnd/TaskBuilderTestTask.cs | 2 +- .../BackEnd/TaskBuilder_Tests.cs | 9 +++---- .../BackEnd/TaskExecutionHost_Tests.cs | 4 +-- .../BackEnd/TaskHostTaskCancelled_Tests.cs | 2 +- .../BackEnd/TaskHostTaskComplete_Tests.cs | 5 +--- src/Build.UnitTests/BackEnd/TaskHost_Tests.cs | 18 ++++++------- .../BackEnd/TaskRegistry_Tests.cs | 2 +- .../BackEnd/TranslationHelpers.cs | 2 +- src/Build.UnitTests/ChangeWaves_Tests.cs | 12 ++++----- .../MSBuildNameIgnoreCaseComparer_Tests.cs | 2 +- .../Collections/MultiDictionary_Tests.cs | 2 +- .../Collections/OMcollections_tests.cs | 12 ++++----- .../ConfigureableForwardingLogger_Tests.cs | 2 +- src/Build.UnitTests/ConsoleLogger_Tests.cs | 8 +++--- .../Construction/ElementLocation_Tests.cs | 10 ++++---- .../ProjectImportElement_Tests.cs | 4 +-- .../Construction/SolutionFile_Tests.cs | 8 +++--- .../SolutionProjectGenerator_Tests.cs | 24 ++++++++---------- .../XmlReaderWithoutLocation_Tests.cs | 4 +-- .../Definition/ItemDefinitionGroup_Tests.cs | 9 +++---- .../Definition/ProjectItem_Tests.cs | 6 ++--- .../Definition/Project_Internal_Tests.cs | 4 +-- .../Definition/ToolsVersion_Tests.cs | 17 ++++++------- .../ToolsetConfigurationReader_Tests.cs | 7 +++--- .../Evaluation/Expander_Tests.cs | 20 ++++++--------- .../Evaluation/ExpressionShredder_Tests.cs | 2 +- .../ImportFromMSBuildExtensionsPath_Tests.cs | 7 +++--- .../Evaluation/ItemEvaluation_Tests.cs | 4 +-- .../Evaluation/ItemSpec_Tests.cs | 4 +-- .../Evaluation/Preprocessor_Tests.cs | 12 ++++----- .../ProjectRootElementCache_Tests.cs | 3 +-- .../ProjectSdkImplicitImport_Tests.cs | 2 +- .../Evaluation/SdkResultEvaluation_Tests.cs | 8 +++--- .../Evaluation/SemiColonTokenizer_Tests.cs | 3 +-- .../Evaluation/SimpleVersion_Tests.cs | 2 +- src/Build.UnitTests/FileLogger_Tests.cs | 3 +-- .../FileUtilitiesRegex_Tests.cs | 8 +++--- .../ProjectMetadataInstance_Internal_Tests.cs | 4 +-- .../ProjectPropertyInstance_Internal_Tests.cs | 4 +-- .../ProjectTargetInstance_Internal_Tests.cs | 2 +- .../Instance/TaskItem_Tests.cs | 16 ++++++------ src/Build.UnitTests/LogFormatter_Tests.cs | 2 +- .../LoggerDescription_Tests.cs | 3 +-- src/Build.UnitTests/LoggerException_Tests.cs | 4 +-- src/Build.UnitTests/Scanner_Tests.cs | 3 +-- src/Build.UnitTests/TargetsFile_Test.cs | 3 +-- src/Build.UnitTests/Utilities_Tests.cs | 16 ++++-------- .../BackEnd/BuildManager/BuildParameters.cs | 2 +- .../BackEnd/BuildManager/BuildSubmission.cs | 2 +- .../BuildManager/LegacyThreadingData.cs | 4 +-- .../BuildRequestEngine/BuildRequestEntry.cs | 7 +++--- .../BuildRequestEngine/IBuildRequestEngine.cs | 2 +- .../Components/Caching/ResultsCache.cs | 2 +- .../Components/Communications/NodeManager.cs | 6 ++--- .../Communications/NodeProviderOutOfProc.cs | 4 +-- .../NodeProviderOutOfProcTaskHost.cs | 7 +++--- .../Communications/TaskHostNodeManager.cs | 4 +-- .../BackEnd/Components/IBuildComponentHost.cs | 2 +- .../Components/Logging/ILoggingService.cs | 3 +-- .../Components/Logging/NodeLoggingContext.cs | 2 +- .../Logging/TargetLoggingContext.cs | 4 +-- .../Components/Logging/TaskLoggingContext.cs | 6 ++--- .../RequestBuilder/BatchingEngine.cs | 3 +-- .../RequestBuilder/IRequestBuilderCallback.cs | 4 +-- .../RequestBuilder/ITargetBuilderCallback.cs | 4 +-- .../RequestBuilder/IntrinsicTask.cs | 4 +-- .../IntrinsicTasks/ItemGroupIntrinsicTask.cs | 8 +++--- .../Components/RequestBuilder/ItemBucket.cs | 7 +++--- .../Components/RequestBuilder/Lookup.cs | 5 ++-- .../RequestBuilder/RequestBuilder.cs | 16 ++++++------ .../RequestBuilder/TargetBuilder.cs | 16 ++++++------ .../RequestBuilder/TargetSpecification.cs | 4 +-- .../RequestBuilder/TargetUpToDateChecker.cs | 3 +-- .../Scheduler/SchedulableRequest.cs | 2 +- .../Components/Scheduler/SchedulingData.cs | 2 +- .../Components/Scheduler/SchedulingPlan.cs | 2 +- .../SdkResolution/DefaultSdkResolver.cs | 3 +-- .../HostedSdkResolverServiceBase.cs | 4 +-- .../SdkResolution/ISdkResolverService.cs | 2 +- .../MainNodeSdkResolverService.cs | 4 +-- .../OutOfProcNodeSdkResolverService.cs | 6 ++--- .../SdkResolution/SdkResolverManifest.cs | 2 +- .../SdkResolution/SdkResolverService.cs | 16 ++++++------ .../Components/SdkResolution/SdkResult.cs | 2 +- .../SdkResolution/SdkResultFactory.cs | 3 +-- .../SdkResolution/TranslationHelpers.cs | 2 +- src/Build/BackEnd/Node/InProcNode.cs | 4 +-- src/Build/BackEnd/Node/OutOfProcNode.cs | 12 ++++----- src/Build/BackEnd/Node/OutOfProcServerNode.cs | 6 ++--- src/Build/BackEnd/Shared/BuildRequest.cs | 4 +-- .../Shared/BuildRequestConfiguration.cs | 8 +++--- src/Build/BackEnd/Shared/TargetResult.cs | 6 ++--- src/Build/Collections/MultiDictionary.cs | 4 +-- src/Build/Collections/PropertyDictionary.cs | 2 +- .../RetrievableEntryHashSet/HashSet.cs | 4 +-- .../Construction/ProjectChooseElement.cs | 4 +-- src/Build/Construction/ProjectElement.cs | 2 +- .../Construction/ProjectElementContainer.cs | 4 +-- .../Construction/ProjectExtensionsElement.cs | 2 +- .../ProjectItemDefinitionElement.cs | 2 +- .../ProjectItemDefinitionGroupElement.cs | 2 +- src/Build/Construction/ProjectItemElement.cs | 2 +- .../Construction/ProjectOutputElement.cs | 2 +- src/Build/Construction/ProjectTaskElement.cs | 2 +- src/Build/Construction/ProjectWhenElement.cs | 2 +- .../Construction/Solution/SolutionFile.cs | 19 +++++++------- .../UsingTaskParameterGroupElement.cs | 3 +-- src/Build/Definition/Project.cs | 20 +++++++-------- src/Build/Definition/ProjectCollection.cs | 3 +-- src/Build/Definition/ProjectItem.cs | 8 +++--- src/Build/Definition/ProjectItemDefinition.cs | 6 ++--- src/Build/Definition/ProjectMetadata.cs | 2 +- src/Build/Definition/ToolsetLocalReader.cs | 4 +-- .../Definition/ToolsetPropertyDefinition.cs | 3 +-- src/Build/Definition/ToolsetReader.cs | 6 ++--- src/Build/Definition/ToolsetRegistryReader.cs | 15 ++++++----- src/Build/ElementLocation/ElementLocation.cs | 6 ++--- src/Build/ElementLocation/RegistryLocation.cs | 4 +-- .../XmlAttributeWithLocation.cs | 2 +- .../ElementLocation/XmlElementWithLocation.cs | 2 +- src/Build/Evaluation/ConditionEvaluator.cs | 10 ++++---- .../Conditionals/AndExpressionNode.cs | 2 +- .../Conditionals/NotExpressionNode.cs | 2 +- .../Conditionals/OrExpressionNode.cs | 2 +- src/Build/Evaluation/Conditionals/Scanner.cs | 3 +-- .../Evaluation/EvaluatorMetadataTable.cs | 3 +-- src/Build/Evaluation/Expander.cs | 5 ++-- src/Build/Evaluation/ExpressionShredder.cs | 2 +- src/Build/Evaluation/IEvaluatorData.cs | 6 ++--- .../LazyItemEvaluator.EvaluatorData.cs | 4 +-- .../LazyItemEvaluator.IncludeOperation.cs | 8 +++--- .../LazyItemEvaluator.LazyItemOperation.cs | 6 ++--- .../LazyItemEvaluator.RemoveOperation.cs | 6 ++--- .../LazyItemEvaluator.UpdateOperation.cs | 4 +-- src/Build/Evaluation/ProjectParser.cs | 7 +++--- .../Evaluation/ProjectRootElementCache.cs | 11 ++++---- src/Build/Evaluation/ProjectStringCache.cs | 4 +-- .../PropertyTrackingEvaluatorDataWrapper.cs | 8 +++--- src/Build/Evaluation/ToolsetProvider.cs | 2 +- src/Build/FileSystem/MSBuildFileSystemBase.cs | 2 +- src/Build/Instance/HostServices.cs | 10 ++++---- .../Instance/ProjectItemGroupTaskInstance.cs | 3 +-- .../ProjectItemGroupTaskItemInstance.cs | 3 +-- .../ProjectItemGroupTaskMetadataInstance.cs | 3 +-- src/Build/Instance/ProjectItemInstance.cs | 9 +++---- src/Build/Instance/ProjectMetadataInstance.cs | 4 +-- src/Build/Instance/ProjectOnErrorInstance.cs | 3 +-- .../ProjectPropertyGroupTaskInstance.cs | 3 +-- ...rojectPropertyGroupTaskPropertyInstance.cs | 3 +-- src/Build/Instance/ProjectPropertyInstance.cs | 9 +++---- .../Instance/ProjectTargetInstanceChild.cs | 3 +-- src/Build/Instance/ProjectTaskInstance.cs | 8 +++--- .../Instance/ProjectTaskInstanceChild.cs | 3 +-- .../Instance/ProjectTaskOutputItemInstance.cs | 3 +-- .../ProjectTaskOutputPropertyInstance.cs | 2 +- .../Instance/TaskFactories/TaskHostTask.cs | 5 ++-- src/Build/Instance/TaskFactoryWrapper.cs | 2 +- src/Build/Instance/TaskRegistry.cs | 18 ++++++------- src/Build/Logging/BaseConsoleLogger.cs | 4 +-- src/Build/Logging/ConsoleLogger.cs | 4 +-- src/Build/Logging/LoggerDescription.cs | 6 ++--- .../ParallelLogger/ParallelConsoleLogger.cs | 6 ++--- .../ParallelLogger/ParallelLoggerHelpers.cs | 2 +- src/Build/Logging/SerialConsoleLogger.cs | 8 +++--- .../ProjectItemDefinitionLink.cs | 2 +- .../DefinitionObjectsLinks/ProjectItemLink.cs | 2 +- .../LinkedObjectFactory.cs | 2 +- src/Build/Resources/AssemblyResources.cs | 4 +-- src/Build/Resources/Constants.cs | 4 +-- src/Build/Utilities/EngineFileUtilities.cs | 2 +- src/Build/Utilities/FileSpecMatchTester.cs | 2 +- src/Build/Utilities/SimpleVersion.cs | 2 +- src/Build/Utilities/Utilities.cs | 3 +-- ...ectXmlUtilities.XmlElementChildIterator.cs | 2 +- src/Build/Xml/ProjectXmlUtilities.cs | 4 +-- .../LoggerException_Tests.cs | 3 +-- src/Framework.UnitTests/SdkReference_Tests.cs | 2 +- src/Framework/BuildEventArgs.cs | 2 +- src/Framework/ITaskHost.cs | 2 +- src/Framework/ProjectStartedEventArgs.cs | 4 +-- src/Framework/TargetFinishedEventArgs.cs | 2 +- src/MSBuild.UnitTests/PerfLog_Tests.cs | 3 +-- src/MSBuild.UnitTests/XMake_Tests.cs | 11 ++++---- src/MSBuild/AssemblyResources.cs | 4 +-- src/MSBuild/MSBuildClientApp.cs | 2 +- src/MSBuildTaskHost/AssemblyResources.cs | 4 +-- src/MSBuildTaskHost/TypeLoader.cs | 2 +- .../Dependency/Properties/AssemblyInfo.cs | 2 +- .../PortableTask/Properties/AssemblyInfo.cs | 2 +- src/Samples/PortableTask/ShowItems.cs | 2 +- .../TaskUsageLogger/TaskUsageLogger.cs | 9 +++---- .../Properties/AssemblyInfo.cs | 2 +- src/Shared/AssemblyLoadInfo.cs | 2 +- src/Shared/AssemblyNameExtension.cs | 8 +++--- src/Shared/BinaryTranslator.cs | 2 +- src/Shared/BuildEnvironmentHelper.cs | 3 +-- src/Shared/CoreCLRAssemblyLoader.cs | 4 +-- src/Shared/Debugging/DebugUtils.cs | 2 +- src/Shared/ErrorUtilities.cs | 3 +-- .../LanguageParser/CSharptokenEnumerator.cs | 2 +- src/Shared/LanguageParser/CSharptokenizer.cs | 2 +- .../LanguageParser/VisualBasictokenizer.cs | 2 +- src/Shared/MSBuildLoadContext.cs | 5 ++-- src/Shared/Modifiers.cs | 4 +-- src/Shared/ProjectWriter.cs | 2 +- src/Shared/ReadOnlyCollection.cs | 2 +- src/Shared/ReadOnlyEmptyCollection.cs | 2 +- src/Shared/RegistryDelegates.cs | 2 +- src/Shared/StrongNameHelpers.cs | 4 +-- .../UnitTests/BuildEventArgsExtension.cs | 2 +- .../UnitTests/CopyOnWriteDictionary_Tests.cs | 2 +- src/Shared/UnitTests/FileMatcher_Tests.cs | 8 +++--- src/Shared/UnitTests/FileUtilities_Tests.cs | 2 +- src/Shared/UnitTests/ObjectModelHelpers.cs | 3 +-- src/Shared/UnitTests/TestEnvironment.cs | 3 +-- src/Shared/UnitTests/TypeLoader_Tests.cs | 6 ++--- .../SpanBasedStringBuilder_Benchmark.cs | 2 +- src/Tasks.UnitTests/AspNetCompiler_Tests.cs | 4 +-- .../AssemblyDependency/Miscellaneous.cs | 6 ++--- .../ResolveAssemblyReferenceTestFixture.cs | 7 +++--- .../AssignLinkMetadata_Tests.cs | 8 +++--- .../AssignProjectConfiguration_Tests.cs | 3 +-- src/Tasks.UnitTests/AxTlbBaseTask_Tests.cs | 2 +- src/Tasks.UnitTests/CodeTaskFactoryTests.cs | 4 +-- .../ComReferenceWalker_Tests.cs | 4 +-- src/Tasks.UnitTests/ComReference_Tests.cs | 2 +- src/Tasks.UnitTests/CommandLine_Support.cs | 2 +- src/Tasks.UnitTests/CreateItem_Tests.cs | 4 +-- src/Tasks.UnitTests/CreateProperty_Tests.cs | 2 +- .../DirectoryBuildProjectImportTestBase.cs | 2 +- src/Tasks.UnitTests/DownloadFile_Tests.cs | 7 +++--- src/Tasks.UnitTests/Exec_Tests.cs | 6 ++--- .../FindAppConfigFile_Tests.cs | 2 +- src/Tasks.UnitTests/FindInList_Tests.cs | 2 +- .../FindInvalidProjectReferences_Tests.cs | 4 +-- .../GetInstalledSDKLocations_Tests.cs | 3 +-- .../GetReferencePaths_Tests.cs | 6 ++--- src/Tasks.UnitTests/HintPathResolver_Tests.cs | 4 +-- src/Tasks.UnitTests/MakeDir_Tests.cs | 2 +- src/Tasks.UnitTests/MockTypeInfo.cs | 5 ++-- src/Tasks.UnitTests/MockTypeLib.cs | 4 +-- .../MockUnmanagedMemoryHelper.cs | 3 +-- src/Tasks.UnitTests/Move_Tests.cs | 4 +-- src/Tasks.UnitTests/NuGetPropsImportTests.cs | 2 +- .../ProjectExtensionsImportTestBase.cs | 2 +- .../RARPrecomputedCache_Tests.cs | 6 ++--- .../ResolveCodeAnalysisRuleSet_Tests.cs | 2 +- .../ResolveComReference_Tests.cs | 16 ++++++------ .../ResolveNonMSBuildProjectOutput_Tests.cs | 2 +- .../ResolveSDKReference_Tests.cs | 8 +++--- .../GenerateResourceOutOfProc_Tests.cs | 8 +++--- .../GenerateResource_Tests.cs | 11 ++++---- .../ResGenDependencies_Tests.cs | 6 ++--- .../ResourceHandling/ResGen_Tests.cs | 5 ++-- .../ResourceManagement_Tests.cs | 6 ++--- src/Tasks.UnitTests/SGen_Tests.cs | 6 ++--- .../SdkToolsPathUtility_Tests.cs | 4 +-- src/Tasks.UnitTests/WinMDExp_Tests.cs | 2 +- .../WriteCodeFragment_Tests.cs | 8 +++--- src/Tasks.UnitTests/XamlTaskFactory_Tests.cs | 14 +++++------ src/Tasks.UnitTests/XamlTestHelpers.cs | 5 ++-- src/Tasks.UnitTests/XmlPeek_Tests.cs | 4 +-- .../XslTransformation_Tests.cs | 10 ++++---- src/Tasks.UnitTests/ZipDirectory_Tests.cs | 6 ++--- src/Tasks/AppConfig/DependentAssembly.cs | 4 +-- src/Tasks/AppConfig/RuntimeSection.cs | 2 +- .../AssemblyFoldersFromConfigResolver.cs | 2 +- .../AssemblyDependency/AssemblyResolution.cs | 2 +- .../CandidateAssemblyFilesResolver.cs | 2 +- .../GenerateBindingRedirects.cs | 3 +-- .../AssemblyDependency/GlobalAssemblyCache.cs | 10 ++++---- src/Tasks/AssemblyDependency/Reference.cs | 2 +- src/Tasks/AssemblyDependency/Resolver.cs | 2 +- src/Tasks/AssemblyInfo.cs | 3 +-- src/Tasks/AssemblyResources.cs | 4 +-- src/Tasks/AssignLinkMetadata.cs | 4 +-- src/Tasks/AssignTargetPath.cs | 2 +- .../BootstrapperUtil/BootstrapperBuilder.cs | 4 +-- src/Tasks/BootstrapperUtil/Package.cs | 2 +- src/Tasks/BootstrapperUtil/Product.cs | 2 +- src/Tasks/CodeTaskFactory.cs | 4 +-- src/Tasks/ComDependencyWalker.cs | 5 ++-- src/Tasks/ComReference.cs | 4 +-- src/Tasks/ComReferenceInfo.cs | 6 ++--- src/Tasks/CombinePath.cs | 4 +-- .../CombineTargetFrameworkInfoProperties.cs | 2 +- src/Tasks/CombineXmlElements.cs | 2 +- src/Tasks/ConvertToAbsolutePath.cs | 2 +- src/Tasks/Copy.cs | 8 +++--- src/Tasks/CreateItem.cs | 2 +- src/Tasks/CreateManifestResourceName.cs | 2 +- src/Tasks/Delegate.cs | 3 +-- src/Tasks/DownloadFile.cs | 4 +-- src/Tasks/Exec.cs | 2 +- src/Tasks/FileIO/ReadLinesFromFile.cs | 2 +- src/Tasks/FileIO/WriteLinesToFile.cs | 6 ++--- src/Tasks/FindInvalidProjectReferences.cs | 2 +- src/Tasks/GenerateBootstrapper.cs | 2 +- src/Tasks/GenerateDeploymentManifest.cs | 2 +- src/Tasks/GetCompatiblePlatform.cs | 2 +- src/Tasks/GetFrameworkSDKPath.cs | 2 +- src/Tasks/LC.cs | 2 +- src/Tasks/MSBuild.cs | 3 +-- src/Tasks/MakeDir.cs | 2 +- src/Tasks/ManifestUtil/AssemblyIdentity.cs | 2 +- .../AssemblyReferenceCollection.cs | 2 +- src/Tasks/ManifestUtil/DeployManifest.cs | 6 ++--- src/Tasks/ManifestUtil/OutputMessage.cs | 2 +- src/Tasks/ManifestUtil/PathUtil.cs | 2 +- src/Tasks/ManifestUtil/Util.cs | 6 ++--- src/Tasks/ManifestUtil/mansign2.cs | 7 +++--- src/Tasks/ParserState.cs | 2 +- src/Tasks/RCWForCurrentContext.cs | 2 +- src/Tasks/RedistList.cs | 2 +- src/Tasks/RemoveDir.cs | 2 +- .../ResourceHandling/MSBuildResXReader.cs | 2 +- .../RoslynCodeTaskFactory.cs | 6 ++--- .../RoslynCodeTaskFactoryCompilers.cs | 4 +-- src/Tasks/SdkToolsPathUtility.cs | 4 +-- src/Tasks/StateFileBase.cs | 4 +-- src/Tasks/StrongNameUtils.cs | 3 +-- src/Tasks/System.Design.cs | 5 ++-- src/Tasks/Telemetry.cs | 4 +-- src/Tasks/TlbReference.cs | 12 ++++----- src/Tasks/XamlTaskFactory/RelationsParser.cs | 2 +- src/Tasks/XamlTaskFactory/TaskGenerator.cs | 3 +-- src/Tasks/XamlTaskFactory/TaskParser.cs | 2 +- .../XamlTaskFactory/XamlDataDrivenToolTask.cs | 5 ++-- src/Tasks/XamlTaskFactory/XamlTaskFactory.cs | 4 +-- src/Tasks/XslTransformation.cs | 2 +- src/Tasks/ZipDirectory.cs | 2 +- src/UnitTests.Shared/RunnerUtilities.cs | 2 +- .../PlatformManifest_Tests.cs | 3 +-- .../ProcessExtensions_Tests.cs | 7 +++--- .../StringExtensions_Tests.cs | 3 +-- src/Utilities/ApiContract.cs | 2 +- src/Utilities/AssemblyResources.cs | 4 +-- src/Utilities/CommandLineBuilder.cs | 3 +-- src/Utilities/PlatformManifest.cs | 2 +- src/Utilities/ToolLocationHelper.cs | 12 ++++----- .../CanonicalTrackedInputFiles.cs | 3 +-- 406 files changed, 878 insertions(+), 1034 deletions(-) diff --git a/src/Build.OM.UnitTests/Construction/ConstructionEditing_Tests.cs b/src/Build.OM.UnitTests/Construction/ConstructionEditing_Tests.cs index 8d3690d5d5c..2faf7294143 100644 --- a/src/Build.OM.UnitTests/Construction/ConstructionEditing_Tests.cs +++ b/src/Build.OM.UnitTests/Construction/ConstructionEditing_Tests.cs @@ -7,13 +7,11 @@ using System.Linq; using System.Text; using System.Xml; - using Microsoft.Build.Construction; using Microsoft.Build.Evaluation; using Microsoft.Build.Shared; - -using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using Xunit; +using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; #nullable disable diff --git a/src/Build.OM.UnitTests/Construction/ElementLocationPublic_Tests.cs b/src/Build.OM.UnitTests/Construction/ElementLocationPublic_Tests.cs index fabff8c5bcc..29361bbf569 100644 --- a/src/Build.OM.UnitTests/Construction/ElementLocationPublic_Tests.cs +++ b/src/Build.OM.UnitTests/Construction/ElementLocationPublic_Tests.cs @@ -1,12 +1,12 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.Collections.Generic; using System; -using Microsoft.Build.Construction; +using System.Collections.Generic; using System.Reflection; -using Xunit; +using Microsoft.Build.Construction; using Shouldly; +using Xunit; #nullable disable diff --git a/src/Build.OM.UnitTests/Construction/ProjectChooseElement_Tests.cs b/src/Build.OM.UnitTests/Construction/ProjectChooseElement_Tests.cs index f8bcc00dc81..1be0eae1c2e 100644 --- a/src/Build.OM.UnitTests/Construction/ProjectChooseElement_Tests.cs +++ b/src/Build.OM.UnitTests/Construction/ProjectChooseElement_Tests.cs @@ -6,12 +6,10 @@ using System.IO; using System.Text; using System.Xml; - -using Microsoft.Build.Evaluation; using Microsoft.Build.Construction; - -using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; +using Microsoft.Build.Evaluation; using Xunit; +using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; #nullable disable diff --git a/src/Build.OM.UnitTests/Construction/ProjectExtensionsElement_Tests.cs b/src/Build.OM.UnitTests/Construction/ProjectExtensionsElement_Tests.cs index 75630c2f041..922608cecd5 100644 --- a/src/Build.OM.UnitTests/Construction/ProjectExtensionsElement_Tests.cs +++ b/src/Build.OM.UnitTests/Construction/ProjectExtensionsElement_Tests.cs @@ -5,9 +5,8 @@ using System.IO; using System.Xml; using Microsoft.Build.Construction; - -using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using Xunit; +using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; #nullable disable diff --git a/src/Build.OM.UnitTests/Construction/ProjectFormatting_Tests.cs b/src/Build.OM.UnitTests/Construction/ProjectFormatting_Tests.cs index 48ade2120bc..57441a1ae20 100644 --- a/src/Build.OM.UnitTests/Construction/ProjectFormatting_Tests.cs +++ b/src/Build.OM.UnitTests/Construction/ProjectFormatting_Tests.cs @@ -1,16 +1,16 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Construction; -using Microsoft.Build.Evaluation; -using Microsoft.Build.UnitTests; using System; using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; using System.Xml; +using Microsoft.Build.Construction; +using Microsoft.Build.Evaluation; using Microsoft.Build.Shared; +using Microsoft.Build.UnitTests; using Xunit; using Xunit.Abstractions; diff --git a/src/Build.OM.UnitTests/Construction/ProjectImportElement_Tests.cs b/src/Build.OM.UnitTests/Construction/ProjectImportElement_Tests.cs index 790558091f5..5950b6a4ec2 100644 --- a/src/Build.OM.UnitTests/Construction/ProjectImportElement_Tests.cs +++ b/src/Build.OM.UnitTests/Construction/ProjectImportElement_Tests.cs @@ -5,13 +5,11 @@ using System.Collections.Generic; using System.IO; using System.Xml; - -using Microsoft.Build.Evaluation; using Microsoft.Build.Construction; +using Microsoft.Build.Evaluation; using Microsoft.Build.Shared; - -using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using Xunit; +using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; #nullable disable diff --git a/src/Build.OM.UnitTests/Construction/ProjectImportGroupElement_Tests.cs b/src/Build.OM.UnitTests/Construction/ProjectImportGroupElement_Tests.cs index d5566731c72..289fe98f4cc 100644 --- a/src/Build.OM.UnitTests/Construction/ProjectImportGroupElement_Tests.cs +++ b/src/Build.OM.UnitTests/Construction/ProjectImportGroupElement_Tests.cs @@ -6,9 +6,8 @@ using System.IO; using System.Xml; using Microsoft.Build.Construction; - -using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using Xunit; +using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; #nullable disable diff --git a/src/Build.OM.UnitTests/Construction/ProjectItemDefinitionGroupElement_Tests.cs b/src/Build.OM.UnitTests/Construction/ProjectItemDefinitionGroupElement_Tests.cs index 2112fa2d2c2..0ffa9b60cc2 100644 --- a/src/Build.OM.UnitTests/Construction/ProjectItemDefinitionGroupElement_Tests.cs +++ b/src/Build.OM.UnitTests/Construction/ProjectItemDefinitionGroupElement_Tests.cs @@ -3,11 +3,9 @@ using System.IO; using System.Xml; - using Microsoft.Build.Construction; - -using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using Xunit; +using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; #nullable disable diff --git a/src/Build.OM.UnitTests/Construction/ProjectItemElement_Tests.cs b/src/Build.OM.UnitTests/Construction/ProjectItemElement_Tests.cs index b6ec9024a6e..ac62b8e21d7 100644 --- a/src/Build.OM.UnitTests/Construction/ProjectItemElement_Tests.cs +++ b/src/Build.OM.UnitTests/Construction/ProjectItemElement_Tests.cs @@ -5,12 +5,10 @@ using System.IO; using System.Linq; using System.Xml; - -using Microsoft.Build.Evaluation; using Microsoft.Build.Construction; - -using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; +using Microsoft.Build.Evaluation; using Xunit; +using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; #nullable disable diff --git a/src/Build.OM.UnitTests/Construction/ProjectMetadataElement_Tests.cs b/src/Build.OM.UnitTests/Construction/ProjectMetadataElement_Tests.cs index cd8d9167026..a57c3694e45 100644 --- a/src/Build.OM.UnitTests/Construction/ProjectMetadataElement_Tests.cs +++ b/src/Build.OM.UnitTests/Construction/ProjectMetadataElement_Tests.cs @@ -3,14 +3,13 @@ using System; using System.IO; +using System.Linq; using System.Xml; using Microsoft.Build.Construction; - -using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; -using Xunit; -using System.Linq; using Microsoft.Build.Evaluation; +using Xunit; using Xunit.Abstractions; +using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; #nullable disable diff --git a/src/Build.OM.UnitTests/Construction/ProjectOnErrorElement_Tests.cs b/src/Build.OM.UnitTests/Construction/ProjectOnErrorElement_Tests.cs index 216a583cbe6..0bad6797fbe 100644 --- a/src/Build.OM.UnitTests/Construction/ProjectOnErrorElement_Tests.cs +++ b/src/Build.OM.UnitTests/Construction/ProjectOnErrorElement_Tests.cs @@ -4,11 +4,9 @@ using System; using System.IO; using System.Xml; - using Microsoft.Build.Construction; - -using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using Xunit; +using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; #nullable disable diff --git a/src/Build.OM.UnitTests/Construction/ProjectOutputElement_Tests.cs b/src/Build.OM.UnitTests/Construction/ProjectOutputElement_Tests.cs index f64361abb46..2193bf0ca8e 100644 --- a/src/Build.OM.UnitTests/Construction/ProjectOutputElement_Tests.cs +++ b/src/Build.OM.UnitTests/Construction/ProjectOutputElement_Tests.cs @@ -5,9 +5,8 @@ using System.IO; using System.Xml; using Microsoft.Build.Construction; - -using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using Xunit; +using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; #nullable disable diff --git a/src/Build.OM.UnitTests/Construction/ProjectPropertyElement_Tests.cs b/src/Build.OM.UnitTests/Construction/ProjectPropertyElement_Tests.cs index ed38f1828e0..148b5f409ef 100644 --- a/src/Build.OM.UnitTests/Construction/ProjectPropertyElement_Tests.cs +++ b/src/Build.OM.UnitTests/Construction/ProjectPropertyElement_Tests.cs @@ -5,9 +5,8 @@ using System.IO; using System.Xml; using Microsoft.Build.Construction; - -using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using Xunit; +using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; #nullable disable diff --git a/src/Build.OM.UnitTests/Construction/ProjectTaskElement_Tests.cs b/src/Build.OM.UnitTests/Construction/ProjectTaskElement_Tests.cs index bffc428efb8..86d90da04cf 100644 --- a/src/Build.OM.UnitTests/Construction/ProjectTaskElement_Tests.cs +++ b/src/Build.OM.UnitTests/Construction/ProjectTaskElement_Tests.cs @@ -5,9 +5,8 @@ using System.IO; using System.Xml; using Microsoft.Build.Construction; - -using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using Xunit; +using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; #nullable disable diff --git a/src/Build.OM.UnitTests/Construction/ProjectUsingTaskElement_Tests.cs b/src/Build.OM.UnitTests/Construction/ProjectUsingTaskElement_Tests.cs index e905ecdf342..cbb90d0ff94 100644 --- a/src/Build.OM.UnitTests/Construction/ProjectUsingTaskElement_Tests.cs +++ b/src/Build.OM.UnitTests/Construction/ProjectUsingTaskElement_Tests.cs @@ -4,11 +4,9 @@ using System; using System.IO; using System.Xml; - using Microsoft.Build.Construction; - -using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using Xunit; +using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; #nullable disable diff --git a/src/Build.OM.UnitTests/Construction/SolutionFile_Tests.cs b/src/Build.OM.UnitTests/Construction/SolutionFile_Tests.cs index fb060ae1026..a67068c7fe8 100644 --- a/src/Build.OM.UnitTests/Construction/SolutionFile_Tests.cs +++ b/src/Build.OM.UnitTests/Construction/SolutionFile_Tests.cs @@ -4,12 +4,12 @@ using System; using System.Collections.Generic; using System.IO; +using System.Text; using Microsoft.Build.Construction; -using Microsoft.Build.Shared; using Microsoft.Build.Exceptions; +using Microsoft.Build.Shared; using Shouldly; using Xunit; -using System.Text; #nullable disable diff --git a/src/Build.OM.UnitTests/Construction/UsingTaskBodyElement_Tests.cs b/src/Build.OM.UnitTests/Construction/UsingTaskBodyElement_Tests.cs index b941411298c..12424a672a4 100644 --- a/src/Build.OM.UnitTests/Construction/UsingTaskBodyElement_Tests.cs +++ b/src/Build.OM.UnitTests/Construction/UsingTaskBodyElement_Tests.cs @@ -5,9 +5,8 @@ using System.IO; using System.Xml; using Microsoft.Build.Construction; - -using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using Xunit; +using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; #nullable disable diff --git a/src/Build.OM.UnitTests/Construction/UsingTaskParameterElement_Tests.cs b/src/Build.OM.UnitTests/Construction/UsingTaskParameterElement_Tests.cs index a6dd098573f..955f6a1fe89 100644 --- a/src/Build.OM.UnitTests/Construction/UsingTaskParameterElement_Tests.cs +++ b/src/Build.OM.UnitTests/Construction/UsingTaskParameterElement_Tests.cs @@ -5,9 +5,8 @@ using System.IO; using System.Xml; using Microsoft.Build.Construction; - -using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using Xunit; +using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; #nullable disable diff --git a/src/Build.OM.UnitTests/Construction/UsingTaskParameterGroup_Tests.cs b/src/Build.OM.UnitTests/Construction/UsingTaskParameterGroup_Tests.cs index 82b99505a26..9a4b587a16a 100644 --- a/src/Build.OM.UnitTests/Construction/UsingTaskParameterGroup_Tests.cs +++ b/src/Build.OM.UnitTests/Construction/UsingTaskParameterGroup_Tests.cs @@ -5,9 +5,8 @@ using System.IO; using System.Xml; using Microsoft.Build.Construction; - -using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using Xunit; +using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; #nullable disable diff --git a/src/Build.OM.UnitTests/Construction/WhiteSpacePreservation_Tests.cs b/src/Build.OM.UnitTests/Construction/WhiteSpacePreservation_Tests.cs index 5985ad2754e..0411b347ea2 100644 --- a/src/Build.OM.UnitTests/Construction/WhiteSpacePreservation_Tests.cs +++ b/src/Build.OM.UnitTests/Construction/WhiteSpacePreservation_Tests.cs @@ -3,13 +3,12 @@ using System; using System.IO; -using Microsoft.Build.Construction; - -using Xunit; using System.Linq; using System.Text.RegularExpressions; +using Microsoft.Build.Construction; using Microsoft.Build.Evaluation; using Microsoft.Build.Shared; +using Xunit; #nullable disable diff --git a/src/Build.OM.UnitTests/Definition/ProjectCollection_Tests.cs b/src/Build.OM.UnitTests/Definition/ProjectCollection_Tests.cs index 3b4481b3cfb..71aef5e0df8 100644 --- a/src/Build.OM.UnitTests/Definition/ProjectCollection_Tests.cs +++ b/src/Build.OM.UnitTests/Definition/ProjectCollection_Tests.cs @@ -4,17 +4,17 @@ using System; using System.Collections.Generic; using System.IO; +using System.Reflection; using System.Xml; using Microsoft.Build.Construction; using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; using Microsoft.Build.Shared; using Microsoft.Build.Utilities; -using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; +using Shouldly; using Xunit; using Xunit.Abstractions; -using Shouldly; -using System.Reflection; +using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; #nullable disable diff --git a/src/Build.OM.UnitTests/Definition/ProjectItemDefinition_Tests.cs b/src/Build.OM.UnitTests/Definition/ProjectItemDefinition_Tests.cs index caeacc2c859..a3e8c701e6f 100644 --- a/src/Build.OM.UnitTests/Definition/ProjectItemDefinition_Tests.cs +++ b/src/Build.OM.UnitTests/Definition/ProjectItemDefinition_Tests.cs @@ -8,11 +8,11 @@ using System.Xml; using Microsoft.Build.Construction; using Microsoft.Build.Evaluation; -using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using Microsoft.Build.Execution; using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Xunit; +using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; #nullable disable diff --git a/src/Build.OM.UnitTests/Definition/ProjectItem_Tests.cs b/src/Build.OM.UnitTests/Definition/ProjectItem_Tests.cs index 406ad017571..b00d5d59fe5 100644 --- a/src/Build.OM.UnitTests/Definition/ProjectItem_Tests.cs +++ b/src/Build.OM.UnitTests/Definition/ProjectItem_Tests.cs @@ -14,9 +14,9 @@ using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Shouldly; -using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using Xunit; using Xunit.NetCore.Extensions; +using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; #nullable disable diff --git a/src/Build.OM.UnitTests/Definition/Project_Tests.cs b/src/Build.OM.UnitTests/Definition/Project_Tests.cs index 67c6e7cba7d..3313fd7bf81 100644 --- a/src/Build.OM.UnitTests/Definition/Project_Tests.cs +++ b/src/Build.OM.UnitTests/Definition/Project_Tests.cs @@ -8,7 +8,6 @@ using System.Linq; using System.Text; using System.Xml; - using Microsoft.Build.Construction; using Microsoft.Build.Engine.UnitTests.Globbing; using Microsoft.Build.Evaluation; @@ -16,17 +15,16 @@ using Microsoft.Build.Framework; using Microsoft.Build.Globbing; using Microsoft.Build.Shared; - -using Task = System.Threading.Tasks.Task; -// can't use an actual ProvenanceResult because it points to a ProjectItemElement which is hard to mock. -using ProvenanceResultTupleList = System.Collections.Generic.List<(string, Microsoft.Build.Evaluation.Operation, Microsoft.Build.Evaluation.Provenance, int)>; -using GlobResultList = System.Collections.Generic.List<(string, string[], System.Collections.Immutable.ImmutableHashSet, System.Collections.Immutable.ImmutableHashSet)>; -using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; -using ToolLocationHelper = Microsoft.Build.Utilities.ToolLocationHelper; -using TargetDotNetFrameworkVersion = Microsoft.Build.Utilities.TargetDotNetFrameworkVersion; using Shouldly; using Xunit; using Xunit.Abstractions; +using GlobResultList = System.Collections.Generic.List<(string, string[], System.Collections.Immutable.ImmutableHashSet, System.Collections.Immutable.ImmutableHashSet)>; +using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; +// can't use an actual ProvenanceResult because it points to a ProjectItemElement which is hard to mock. +using ProvenanceResultTupleList = System.Collections.Generic.List<(string, Microsoft.Build.Evaluation.Operation, Microsoft.Build.Evaluation.Provenance, int)>; +using TargetDotNetFrameworkVersion = Microsoft.Build.Utilities.TargetDotNetFrameworkVersion; +using Task = System.Threading.Tasks.Task; +using ToolLocationHelper = Microsoft.Build.Utilities.ToolLocationHelper; #nullable disable diff --git a/src/Build.OM.UnitTests/Instance/ProjectInstance_Tests.cs b/src/Build.OM.UnitTests/Instance/ProjectInstance_Tests.cs index 7fd5bf6425f..7379237e594 100644 --- a/src/Build.OM.UnitTests/Instance/ProjectInstance_Tests.cs +++ b/src/Build.OM.UnitTests/Instance/ProjectInstance_Tests.cs @@ -9,12 +9,11 @@ using Microsoft.Build.Construction; using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; - using Microsoft.Build.Framework; -using ForwardingLoggerRecord = Microsoft.Build.Logging.ForwardingLoggerRecord; using Microsoft.Build.Shared; using Xunit; using Xunit.Abstractions; +using ForwardingLoggerRecord = Microsoft.Build.Logging.ForwardingLoggerRecord; #nullable disable diff --git a/src/Build.OM.UnitTests/Instance/ProjectItemInstance_Tests.cs b/src/Build.OM.UnitTests/Instance/ProjectItemInstance_Tests.cs index 96bee6d7db8..c4c4e0b9c59 100644 --- a/src/Build.OM.UnitTests/Instance/ProjectItemInstance_Tests.cs +++ b/src/Build.OM.UnitTests/Instance/ProjectItemInstance_Tests.cs @@ -4,20 +4,18 @@ using System; using System.Collections.Generic; using System.IO; +using System.Linq; using System.Xml; - using Microsoft.Build.Construction; using Microsoft.Build.Definition; using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; using Microsoft.Build.Framework; using Microsoft.Build.Shared; - -using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; -using Xunit; using Shouldly; -using System.Linq; +using Xunit; using Xunit.NetCore.Extensions; +using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; #nullable disable diff --git a/src/Build.OM.UnitTests/ObjectModelRemoting/Helpers/ViewValidation.construction.cs b/src/Build.OM.UnitTests/ObjectModelRemoting/Helpers/ViewValidation.construction.cs index ef34a5876b9..749ecb4ed3f 100644 --- a/src/Build.OM.UnitTests/ObjectModelRemoting/Helpers/ViewValidation.construction.cs +++ b/src/Build.OM.UnitTests/ObjectModelRemoting/Helpers/ViewValidation.construction.cs @@ -6,13 +6,13 @@ namespace Microsoft.Build.UnitTests.OM.ObjectModelRemoting { using System; + using System.Collections; using System.Collections.Generic; using System.Linq; using Microsoft.Build.Construction; - using Microsoft.Build.ObjectModelRemoting; using Microsoft.Build.Evaluation; + using Microsoft.Build.ObjectModelRemoting; using Xunit; - using System.Collections; internal class ElementLinkPair : LinkPair where T : ProjectElement diff --git a/src/Build.OM.UnitTests/ObjectModelRemoting/Helpers/ViewValidation.evaluation.cs b/src/Build.OM.UnitTests/ObjectModelRemoting/Helpers/ViewValidation.evaluation.cs index 09505be2280..220483abdde 100644 --- a/src/Build.OM.UnitTests/ObjectModelRemoting/Helpers/ViewValidation.evaluation.cs +++ b/src/Build.OM.UnitTests/ObjectModelRemoting/Helpers/ViewValidation.evaluation.cs @@ -8,8 +8,8 @@ namespace Microsoft.Build.UnitTests.OM.ObjectModelRemoting using System.Collections.Generic; using System.Linq; using Microsoft.Build.Evaluation; - using Xunit; using Microsoft.Build.Framework; + using Xunit; internal class ProjectPair : LinkPair { diff --git a/src/Build.OM.UnitTests/ObjectModelRemoting/RemoteProjectsProviderMock/ConstructionLinkMocks/MockProjectRootElementLink.cs b/src/Build.OM.UnitTests/ObjectModelRemoting/RemoteProjectsProviderMock/ConstructionLinkMocks/MockProjectRootElementLink.cs index a42fa6bf257..f8e242431e1 100644 --- a/src/Build.OM.UnitTests/ObjectModelRemoting/RemoteProjectsProviderMock/ConstructionLinkMocks/MockProjectRootElementLink.cs +++ b/src/Build.OM.UnitTests/ObjectModelRemoting/RemoteProjectsProviderMock/ConstructionLinkMocks/MockProjectRootElementLink.cs @@ -5,8 +5,8 @@ namespace Microsoft.Build.UnitTests.OM.ObjectModelRemoting { - using System.Collections.Generic; using System; + using System.Collections.Generic; using System.IO; using System.Text; using System.Xml; diff --git a/src/Build.OM.UnitTests/ObjectModelRemoting/RemoteProjectsProviderMock/EvaluationLinkMocks/MockProjectLink.cs b/src/Build.OM.UnitTests/ObjectModelRemoting/RemoteProjectsProviderMock/EvaluationLinkMocks/MockProjectLink.cs index abb23669f25..cd83fbd1427 100644 --- a/src/Build.OM.UnitTests/ObjectModelRemoting/RemoteProjectsProviderMock/EvaluationLinkMocks/MockProjectLink.cs +++ b/src/Build.OM.UnitTests/ObjectModelRemoting/RemoteProjectsProviderMock/EvaluationLinkMocks/MockProjectLink.cs @@ -12,9 +12,9 @@ namespace Microsoft.Build.UnitTests.OM.ObjectModelRemoting using Microsoft.Build.Evaluation; using Microsoft.Build.Evaluation.Context; using Microsoft.Build.Execution; - using Microsoft.Build.ObjectModelRemoting; using Microsoft.Build.Framework; using Microsoft.Build.Logging; + using Microsoft.Build.ObjectModelRemoting; internal class MockProjectLinkRemoter : MockLinkRemoter { diff --git a/src/Build.UnitTests/BackEnd/AssemblyTaskFactory_Tests.cs b/src/Build.UnitTests/BackEnd/AssemblyTaskFactory_Tests.cs index 92362f41ed9..8bf9bf686bb 100644 --- a/src/Build.UnitTests/BackEnd/AssemblyTaskFactory_Tests.cs +++ b/src/Build.UnitTests/BackEnd/AssemblyTaskFactory_Tests.cs @@ -3,15 +3,15 @@ using System; using System.Collections.Generic; +using System.Reflection; using Microsoft.Build.BackEnd; +using Microsoft.Build.Construction; using Microsoft.Build.Framework; using Microsoft.Build.Shared; -using System.Reflection; using Microsoft.Build.Utilities; -using Microsoft.Build.Construction; -using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; -using Xunit; using Shouldly; +using Xunit; +using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; #nullable disable diff --git a/src/Build.UnitTests/BackEnd/BatchingEngine_Tests.cs b/src/Build.UnitTests/BackEnd/BatchingEngine_Tests.cs index c47157d44fb..8cfb2d4a575 100644 --- a/src/Build.UnitTests/BackEnd/BatchingEngine_Tests.cs +++ b/src/Build.UnitTests/BackEnd/BatchingEngine_Tests.cs @@ -2,19 +2,18 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; +using System.Collections.Generic; using System.IO; using System.Xml; - using Microsoft.Build.BackEnd; using Microsoft.Build.Collections; using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; using Microsoft.Build.Framework; -using System.Collections.Generic; using Microsoft.Build.Shared.FileSystem; +using Xunit; using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using ProjectItemInstanceFactory = Microsoft.Build.Execution.ProjectItemInstance.TaskItem.ProjectItemInstanceFactory; -using Xunit; #nullable disable diff --git a/src/Build.UnitTests/BackEnd/BinaryTranslator_Tests.cs b/src/Build.UnitTests/BackEnd/BinaryTranslator_Tests.cs index 528e53b0285..eda7904c8e7 100644 --- a/src/Build.UnitTests/BackEnd/BinaryTranslator_Tests.cs +++ b/src/Build.UnitTests/BackEnd/BinaryTranslator_Tests.cs @@ -5,9 +5,9 @@ using System.Collections.Generic; using System.Configuration.Assemblies; using System.Globalization; -using Microsoft.Build.BackEnd; using System.IO; using System.Reflection; +using Microsoft.Build.BackEnd; using Shouldly; using Xunit; diff --git a/src/Build.UnitTests/BackEnd/BuildEventArgTransportSink_Tests.cs b/src/Build.UnitTests/BackEnd/BuildEventArgTransportSink_Tests.cs index b9d4f98ffcb..170ab5deb73 100644 --- a/src/Build.UnitTests/BackEnd/BuildEventArgTransportSink_Tests.cs +++ b/src/Build.UnitTests/BackEnd/BuildEventArgTransportSink_Tests.cs @@ -2,9 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using Microsoft.Build.Framework; using Microsoft.Build.BackEnd; using Microsoft.Build.BackEnd.Logging; +using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Xunit; using Xunit.NetCore.Extensions; diff --git a/src/Build.UnitTests/BackEnd/BuildRequestConfiguration_Tests.cs b/src/Build.UnitTests/BackEnd/BuildRequestConfiguration_Tests.cs index 09c32f3184a..2892ae25f6b 100644 --- a/src/Build.UnitTests/BackEnd/BuildRequestConfiguration_Tests.cs +++ b/src/Build.UnitTests/BackEnd/BuildRequestConfiguration_Tests.cs @@ -6,14 +6,14 @@ using System.IO; using System.Linq; using System.Xml; -using Microsoft.Build.Shared; +using Microsoft.Build.BackEnd; using Microsoft.Build.Collections; +using Microsoft.Build.Construction; +using Microsoft.Build.Definition; using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; using Microsoft.Build.Framework; -using Microsoft.Build.BackEnd; -using Microsoft.Build.Construction; -using Microsoft.Build.Definition; +using Microsoft.Build.Shared; using Shouldly; using Xunit; using Xunit.Abstractions; diff --git a/src/Build.UnitTests/BackEnd/BuildRequestEngine_Tests.cs b/src/Build.UnitTests/BackEnd/BuildRequestEngine_Tests.cs index a2c9cd48246..9168b1a37aa 100644 --- a/src/Build.UnitTests/BackEnd/BuildRequestEngine_Tests.cs +++ b/src/Build.UnitTests/BackEnd/BuildRequestEngine_Tests.cs @@ -2,18 +2,18 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.Xml; using System.Collections.Generic; using System.IO; using System.Threading; +using System.Xml; +using Microsoft.Build.BackEnd; using Microsoft.Build.Evaluation; using Microsoft.Build.Exceptions; using Microsoft.Build.Execution; using Microsoft.Build.Framework; -using Microsoft.Build.BackEnd; using Microsoft.Build.Unittest; -using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; using Xunit; +using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; #nullable disable diff --git a/src/Build.UnitTests/BackEnd/CentralForwardingLogger_Tests.cs b/src/Build.UnitTests/BackEnd/CentralForwardingLogger_Tests.cs index 35a76ac4ae7..bba093a7d71 100644 --- a/src/Build.UnitTests/BackEnd/CentralForwardingLogger_Tests.cs +++ b/src/Build.UnitTests/BackEnd/CentralForwardingLogger_Tests.cs @@ -1,8 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Framework; using Microsoft.Build.BackEnd.Logging; +using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Xunit; diff --git a/src/Build.UnitTests/BackEnd/ConfigurationMetadata_Tests.cs b/src/Build.UnitTests/BackEnd/ConfigurationMetadata_Tests.cs index ed39c3676dd..d930cc19092 100644 --- a/src/Build.UnitTests/BackEnd/ConfigurationMetadata_Tests.cs +++ b/src/Build.UnitTests/BackEnd/ConfigurationMetadata_Tests.cs @@ -2,13 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.Xml; using System.Collections.Generic; +using System.IO; +using System.Xml; +using Microsoft.Build.BackEnd; using Microsoft.Build.Collections; using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; -using Microsoft.Build.BackEnd; -using System.IO; using Shouldly; using Xunit; diff --git a/src/Build.UnitTests/BackEnd/CustomTaskHelper.cs b/src/Build.UnitTests/BackEnd/CustomTaskHelper.cs index 1b53811036a..bd5fab167bd 100644 --- a/src/Build.UnitTests/BackEnd/CustomTaskHelper.cs +++ b/src/Build.UnitTests/BackEnd/CustomTaskHelper.cs @@ -2,11 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; +using System.CodeDom.Compiler; using System.IO; -using System.Text; using System.Reflection; -using System.CodeDom.Compiler; - +using System.Text; using Microsoft.Build.Utilities; #nullable disable diff --git a/src/Build.UnitTests/BackEnd/EventRedirectorToSink_Tests.cs b/src/Build.UnitTests/BackEnd/EventRedirectorToSink_Tests.cs index 429c8b56084..62f2cef2033 100644 --- a/src/Build.UnitTests/BackEnd/EventRedirectorToSink_Tests.cs +++ b/src/Build.UnitTests/BackEnd/EventRedirectorToSink_Tests.cs @@ -1,8 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Framework; using Microsoft.Build.BackEnd.Logging; +using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Xunit; diff --git a/src/Build.UnitTests/BackEnd/EventSourceSink_Tests.cs b/src/Build.UnitTests/BackEnd/EventSourceSink_Tests.cs index 379f27a3f1c..da76b7ad625 100644 --- a/src/Build.UnitTests/BackEnd/EventSourceSink_Tests.cs +++ b/src/Build.UnitTests/BackEnd/EventSourceSink_Tests.cs @@ -3,12 +3,11 @@ using System; using System.Collections.Generic; -using Microsoft.Build.Framework; using Microsoft.Build.BackEnd.Logging; +using Microsoft.Build.Framework; using Microsoft.Build.Shared; - -using InternalLoggerException = Microsoft.Build.Exceptions.InternalLoggerException; using Xunit; +using InternalLoggerException = Microsoft.Build.Exceptions.InternalLoggerException; #nullable disable diff --git a/src/Build.UnitTests/BackEnd/GenerateTemporaryTargetAssembly_Tests.cs b/src/Build.UnitTests/BackEnd/GenerateTemporaryTargetAssembly_Tests.cs index 51748e79ab0..88a88252485 100644 --- a/src/Build.UnitTests/BackEnd/GenerateTemporaryTargetAssembly_Tests.cs +++ b/src/Build.UnitTests/BackEnd/GenerateTemporaryTargetAssembly_Tests.cs @@ -1,10 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.UnitTests; -using Shouldly; using System.Linq; using System.Reflection; +using Microsoft.Build.UnitTests; +using Shouldly; using Xunit; #nullable disable diff --git a/src/Build.UnitTests/BackEnd/IntrinsicTask_Tests.cs b/src/Build.UnitTests/BackEnd/IntrinsicTask_Tests.cs index 3e2a1cb560a..9c1ef800dc6 100644 --- a/src/Build.UnitTests/BackEnd/IntrinsicTask_Tests.cs +++ b/src/Build.UnitTests/BackEnd/IntrinsicTask_Tests.cs @@ -6,7 +6,6 @@ using System.IO; using System.Linq; using System.Xml; - using Microsoft.Build.BackEnd; using Microsoft.Build.Collections; using Microsoft.Build.Construction; @@ -16,9 +15,9 @@ using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Shouldly; +using Xunit; using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using NodeLoggingContext = Microsoft.Build.BackEnd.Logging.NodeLoggingContext; -using Xunit; #nullable disable diff --git a/src/Build.UnitTests/BackEnd/LoggingServiceFactory_Tests.cs b/src/Build.UnitTests/BackEnd/LoggingServiceFactory_Tests.cs index 4d56352d241..e0f6a6ff618 100644 --- a/src/Build.UnitTests/BackEnd/LoggingServiceFactory_Tests.cs +++ b/src/Build.UnitTests/BackEnd/LoggingServiceFactory_Tests.cs @@ -1,8 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.BackEnd; +using Microsoft.Build.BackEnd.Logging; using Xunit; #nullable disable diff --git a/src/Build.UnitTests/BackEnd/LoggingService_Tests.cs b/src/Build.UnitTests/BackEnd/LoggingService_Tests.cs index 504cbb3747b..eb99f903f9a 100644 --- a/src/Build.UnitTests/BackEnd/LoggingService_Tests.cs +++ b/src/Build.UnitTests/BackEnd/LoggingService_Tests.cs @@ -3,19 +3,19 @@ using System; using System.Collections; -using Microsoft.Build.Framework; -using Microsoft.Build.BackEnd.Logging; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Threading; using Microsoft.Build.BackEnd; -using Microsoft.Build.Logging; +using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Evaluation; -using Microsoft.Build.Execution; using Microsoft.Build.Exceptions; +using Microsoft.Build.Execution; +using Microsoft.Build.Framework; +using Microsoft.Build.Logging; using Microsoft.Build.Shared; using Microsoft.Build.UnitTests.BackEnd; -using System.Threading; -using System.Reflection; -using System.Collections.Generic; -using System.Linq; using Shouldly; using Xunit; diff --git a/src/Build.UnitTests/BackEnd/LoggingServicesLogMethod_Tests.cs b/src/Build.UnitTests/BackEnd/LoggingServicesLogMethod_Tests.cs index f0619052e66..d9923bffd67 100644 --- a/src/Build.UnitTests/BackEnd/LoggingServicesLogMethod_Tests.cs +++ b/src/Build.UnitTests/BackEnd/LoggingServicesLogMethod_Tests.cs @@ -2,24 +2,23 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using Microsoft.Build.Framework; -using Microsoft.Build.BackEnd.Logging; -using Microsoft.Build.BackEnd; -using Microsoft.Build.Shared; -using System.IO; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Construction; -using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; -using Microsoft.Build.Execution; -using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using System.Collections; using System.Collections.Generic; +using System.IO; using System.Linq; using System.Xml; - -using MockHost = Microsoft.Build.UnitTests.BackEnd.MockHost; -using Xunit; +using Microsoft.Build.BackEnd; +using Microsoft.Build.BackEnd.Logging; +using Microsoft.Build.Construction; +using Microsoft.Build.Evaluation; +using Microsoft.Build.Execution; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using Shouldly; +using Xunit; +using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; +using MockHost = Microsoft.Build.UnitTests.BackEnd.MockHost; +using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; #nullable disable diff --git a/src/Build.UnitTests/BackEnd/MockHost.cs b/src/Build.UnitTests/BackEnd/MockHost.cs index caae65aa14d..7bcfd77200a 100644 --- a/src/Build.UnitTests/BackEnd/MockHost.cs +++ b/src/Build.UnitTests/BackEnd/MockHost.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System; using Microsoft.Build.BackEnd; using Microsoft.Build.BackEnd.Logging; -using System; using Microsoft.Build.BackEnd.SdkResolution; using Microsoft.Build.Engine.UnitTests.BackEnd; using Microsoft.Build.Evaluation; diff --git a/src/Build.UnitTests/BackEnd/MockLoggingService.cs b/src/Build.UnitTests/BackEnd/MockLoggingService.cs index 63872aacec7..b3ceffe4bd5 100644 --- a/src/Build.UnitTests/BackEnd/MockLoggingService.cs +++ b/src/Build.UnitTests/BackEnd/MockLoggingService.cs @@ -4,12 +4,11 @@ using System; using System.Collections; using System.Collections.Generic; +using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Framework; using Microsoft.Build.Framework.Profiler; -using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Logging; using Microsoft.Build.Shared; - using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; diff --git a/src/Build.UnitTests/BackEnd/MockSdkResolverService.cs b/src/Build.UnitTests/BackEnd/MockSdkResolverService.cs index 8d4c69d1e0b..094eac727b4 100644 --- a/src/Build.UnitTests/BackEnd/MockSdkResolverService.cs +++ b/src/Build.UnitTests/BackEnd/MockSdkResolverService.cs @@ -1,12 +1,12 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System; using Microsoft.Build.BackEnd; using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.BackEnd.SdkResolution; using Microsoft.Build.Construction; using Microsoft.Build.Framework; -using System; #nullable disable diff --git a/src/Build.UnitTests/BackEnd/MockTaskBuilder.cs b/src/Build.UnitTests/BackEnd/MockTaskBuilder.cs index c69de1ec4ee..8cf5bee6d55 100644 --- a/src/Build.UnitTests/BackEnd/MockTaskBuilder.cs +++ b/src/Build.UnitTests/BackEnd/MockTaskBuilder.cs @@ -4,12 +4,11 @@ using System; using System.Collections.Generic; using System.Threading; +using System.Threading.Tasks; using Microsoft.Build.BackEnd; -using Microsoft.Build.Shared; using Microsoft.Build.Execution; - +using Microsoft.Build.Shared; using TargetLoggingContext = Microsoft.Build.BackEnd.Logging.TargetLoggingContext; -using System.Threading.Tasks; #nullable disable diff --git a/src/Build.UnitTests/BackEnd/NodeEndpointInProc_Tests.cs b/src/Build.UnitTests/BackEnd/NodeEndpointInProc_Tests.cs index 7675567e257..422f7c00ccc 100644 --- a/src/Build.UnitTests/BackEnd/NodeEndpointInProc_Tests.cs +++ b/src/Build.UnitTests/BackEnd/NodeEndpointInProc_Tests.cs @@ -9,8 +9,8 @@ using Microsoft.Build.Execution; using Microsoft.Build.Framework; using Microsoft.Build.Shared; -using LegacyThreadingData = Microsoft.Build.Execution.LegacyThreadingData; using Xunit; +using LegacyThreadingData = Microsoft.Build.Execution.LegacyThreadingData; #nullable disable diff --git a/src/Build.UnitTests/BackEnd/NodePackets_Tests.cs b/src/Build.UnitTests/BackEnd/NodePackets_Tests.cs index 9287c529d6c..13de6f28e6f 100644 --- a/src/Build.UnitTests/BackEnd/NodePackets_Tests.cs +++ b/src/Build.UnitTests/BackEnd/NodePackets_Tests.cs @@ -3,13 +3,13 @@ using System; using System.Collections; +using System.Collections.Generic; using System.Linq; -using Microsoft.Build.Framework; using Microsoft.Build.BackEnd; +using Microsoft.Build.Framework; using Microsoft.Build.Shared; -using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; -using System.Collections.Generic; using Xunit; +using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; #nullable disable diff --git a/src/Build.UnitTests/BackEnd/NullMetadataTask.cs b/src/Build.UnitTests/BackEnd/NullMetadataTask.cs index f30a88b9058..1cd4019786c 100644 --- a/src/Build.UnitTests/BackEnd/NullMetadataTask.cs +++ b/src/Build.UnitTests/BackEnd/NullMetadataTask.cs @@ -1,10 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using System.Collections; using System.Collections.Generic; +using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; #nullable disable diff --git a/src/Build.UnitTests/BackEnd/OnError_Tests.cs b/src/Build.UnitTests/BackEnd/OnError_Tests.cs index 15ad66ee408..c82578b6e61 100644 --- a/src/Build.UnitTests/BackEnd/OnError_Tests.cs +++ b/src/Build.UnitTests/BackEnd/OnError_Tests.cs @@ -3,15 +3,15 @@ using System; using System.IO; -using Microsoft.Build.Framework; +using System.Linq; +using System.Reflection; +using System.Xml; using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; -using System.Xml; -using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; -using Xunit; -using System.Reflection; +using Microsoft.Build.Framework; using Shouldly; -using System.Linq; +using Xunit; +using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; #nullable disable diff --git a/src/Build.UnitTests/BackEnd/ProcessIdTask.cs b/src/Build.UnitTests/BackEnd/ProcessIdTask.cs index 6dc7565ad85..d59076ff254 100644 --- a/src/Build.UnitTests/BackEnd/ProcessIdTask.cs +++ b/src/Build.UnitTests/BackEnd/ProcessIdTask.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System.Diagnostics; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -using System.Diagnostics; #nullable disable namespace Microsoft.Build.UnitTests diff --git a/src/Build.UnitTests/BackEnd/RequestBuilder_Tests.cs b/src/Build.UnitTests/BackEnd/RequestBuilder_Tests.cs index ae711aeac89..2b36a1af6ce 100644 --- a/src/Build.UnitTests/BackEnd/RequestBuilder_Tests.cs +++ b/src/Build.UnitTests/BackEnd/RequestBuilder_Tests.cs @@ -3,24 +3,24 @@ using System; using System.Collections.Generic; -using System.Threading; using System.IO; -using Microsoft.Build.Framework; +using System.Threading; using Microsoft.Build.BackEnd; using Microsoft.Build.BackEnd.Logging; -using Microsoft.Build.Shared; using Microsoft.Build.Collections; using Microsoft.Build.Execution; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using Microsoft.Build.Unittest; -using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; using Xunit; +using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; #nullable disable namespace Microsoft.Build.UnitTests.BackEnd { - using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using System.Threading.Tasks; + using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; public class RequestBuilder_Tests : IDisposable { diff --git a/src/Build.UnitTests/BackEnd/ResultsCache_Tests.cs b/src/Build.UnitTests/BackEnd/ResultsCache_Tests.cs index 60e08fe2019..7bcca24e739 100644 --- a/src/Build.UnitTests/BackEnd/ResultsCache_Tests.cs +++ b/src/Build.UnitTests/BackEnd/ResultsCache_Tests.cs @@ -4,9 +4,9 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.Build.Framework; using Microsoft.Build.BackEnd; using Microsoft.Build.Execution; +using Microsoft.Build.Framework; using Microsoft.Build.Internal; using Microsoft.Build.Shared; using Microsoft.Build.Unittest; diff --git a/src/Build.UnitTests/BackEnd/Scheduler_Tests.cs b/src/Build.UnitTests/BackEnd/Scheduler_Tests.cs index 94079fa39f1..2b36c96ae56 100644 --- a/src/Build.UnitTests/BackEnd/Scheduler_Tests.cs +++ b/src/Build.UnitTests/BackEnd/Scheduler_Tests.cs @@ -2,18 +2,18 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.Xml; using System.Collections.Generic; using System.IO; -using Microsoft.Build.Framework; +using System.Xml; using Microsoft.Build.BackEnd; -using Microsoft.Build.Shared; -using Microsoft.Build.Execution; using Microsoft.Build.Evaluation; +using Microsoft.Build.Execution; using Microsoft.Build.Experimental.ProjectCache; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using Shouldly; -using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; using Xunit; +using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; #nullable disable diff --git a/src/Build.UnitTests/BackEnd/SdkResolverLoader_Tests.cs b/src/Build.UnitTests/BackEnd/SdkResolverLoader_Tests.cs index 3a8b2877175..7b2e31cbc08 100644 --- a/src/Build.UnitTests/BackEnd/SdkResolverLoader_Tests.cs +++ b/src/Build.UnitTests/BackEnd/SdkResolverLoader_Tests.cs @@ -3,7 +3,6 @@ using System; using System.Collections.Generic; -using Shouldly; using System.IO; using System.Linq; using System.Reflection; @@ -14,6 +13,7 @@ using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Microsoft.Build.UnitTests; +using Shouldly; using Xunit; using Xunit.Abstractions; using Exception = System.Exception; diff --git a/src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs b/src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs index 5dbc1c65571..f61ec0d31b7 100644 --- a/src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs +++ b/src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs @@ -1,24 +1,24 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.BackEnd.Logging; -using Microsoft.Build.BackEnd.SdkResolution; -using Microsoft.Build.Construction; -using Microsoft.Build.Framework; -using Microsoft.Build.UnitTests; using System; using System.Collections.Generic; using System.Linq; +using System.Text.RegularExpressions; using System.Threading.Tasks; +using Microsoft.Build.BackEnd.Logging; +using Microsoft.Build.BackEnd.SdkResolution; +using Microsoft.Build.Construction; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using Microsoft.Build.Unittest; +using Microsoft.Build.UnitTests; using Shouldly; using Xunit; using SdkResolverContextBase = Microsoft.Build.Framework.SdkResolverContext; using SdkResultBase = Microsoft.Build.Framework.SdkResult; using SdkResultFactoryBase = Microsoft.Build.Framework.SdkResultFactory; using SdkResultImpl = Microsoft.Build.BackEnd.SdkResolution.SdkResult; -using Microsoft.Build.Shared; -using System.Text.RegularExpressions; #nullable disable diff --git a/src/Build.UnitTests/BackEnd/SdkResultItemComparison_Tests.cs b/src/Build.UnitTests/BackEnd/SdkResultItemComparison_Tests.cs index 20c76c5c493..6af6e6616b5 100644 --- a/src/Build.UnitTests/BackEnd/SdkResultItemComparison_Tests.cs +++ b/src/Build.UnitTests/BackEnd/SdkResultItemComparison_Tests.cs @@ -1,10 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Framework; -using Shouldly; using System; using System.Collections.Generic; +using Microsoft.Build.Framework; +using Shouldly; using Xunit; #nullable disable diff --git a/src/Build.UnitTests/BackEnd/SdkResultOutOfProc_Tests.cs b/src/Build.UnitTests/BackEnd/SdkResultOutOfProc_Tests.cs index 7a2fedacf27..322c61aa579 100644 --- a/src/Build.UnitTests/BackEnd/SdkResultOutOfProc_Tests.cs +++ b/src/Build.UnitTests/BackEnd/SdkResultOutOfProc_Tests.cs @@ -1,6 +1,11 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.IO; +using System.Linq; using Microsoft.Build.BackEnd; using Microsoft.Build.BackEnd.SdkResolution; using Microsoft.Build.Construction; @@ -10,11 +15,6 @@ using Microsoft.Build.Framework; using Microsoft.Build.Unittest; using Shouldly; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Linq; using Xunit; using Xunit.Abstractions; using static Microsoft.Build.UnitTests.ObjectModelHelpers; diff --git a/src/Build.UnitTests/BackEnd/TargetBuilder_Tests.cs b/src/Build.UnitTests/BackEnd/TargetBuilder_Tests.cs index 802920e0bd4..34ed0cbab54 100644 --- a/src/Build.UnitTests/BackEnd/TargetBuilder_Tests.cs +++ b/src/Build.UnitTests/BackEnd/TargetBuilder_Tests.cs @@ -2,26 +2,25 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.Xml; using System.Collections.Generic; using System.IO; using System.Threading; -using Microsoft.Build.Framework; +using System.Threading.Tasks; +using System.Xml; using Microsoft.Build.BackEnd; +using Microsoft.Build.BackEnd.SdkResolution; using Microsoft.Build.Collections; +using Microsoft.Build.Engine.UnitTests.BackEnd; using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; +using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Shouldly; - +using Xunit; using ILoggingService = Microsoft.Build.BackEnd.Logging.ILoggingService; -using ProjectLoggingContext = Microsoft.Build.BackEnd.Logging.ProjectLoggingContext; -using NodeLoggingContext = Microsoft.Build.BackEnd.Logging.NodeLoggingContext; using LegacyThreadingData = Microsoft.Build.Execution.LegacyThreadingData; -using System.Threading.Tasks; -using Microsoft.Build.BackEnd.SdkResolution; -using Microsoft.Build.Engine.UnitTests.BackEnd; -using Xunit; +using NodeLoggingContext = Microsoft.Build.BackEnd.Logging.NodeLoggingContext; +using ProjectLoggingContext = Microsoft.Build.BackEnd.Logging.ProjectLoggingContext; #nullable disable diff --git a/src/Build.UnitTests/BackEnd/TargetResult_Tests.cs b/src/Build.UnitTests/BackEnd/TargetResult_Tests.cs index 716d67fd83b..5c653497011 100644 --- a/src/Build.UnitTests/BackEnd/TargetResult_Tests.cs +++ b/src/Build.UnitTests/BackEnd/TargetResult_Tests.cs @@ -3,12 +3,12 @@ using System; using Microsoft.Build.BackEnd; -using Microsoft.Build.Unittest; +using Microsoft.Build.Engine.UnitTests.TestComparers; using Microsoft.Build.Exceptions; using Microsoft.Build.Execution; -using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; +using Microsoft.Build.Unittest; using Xunit; -using Microsoft.Build.Engine.UnitTests.TestComparers; +using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; #nullable disable diff --git a/src/Build.UnitTests/BackEnd/TargetUpToDateChecker_Tests.cs b/src/Build.UnitTests/BackEnd/TargetUpToDateChecker_Tests.cs index 4e870f62a04..ee078ab4d94 100644 --- a/src/Build.UnitTests/BackEnd/TargetUpToDateChecker_Tests.cs +++ b/src/Build.UnitTests/BackEnd/TargetUpToDateChecker_Tests.cs @@ -4,19 +4,19 @@ using System; using System.Collections.Generic; using System.IO; +using System.Runtime.InteropServices; +using System.Runtime.Versioning; using System.Threading; using System.Xml; -using System.Runtime.InteropServices; using Microsoft.Build.BackEnd; using Microsoft.Build.Collections; using Microsoft.Build.Evaluation; -using Microsoft.Win32.SafeHandles; -using Xunit; -using Xunit.Abstractions; using Microsoft.Build.Execution; using Microsoft.Build.Framework; using Microsoft.Build.Shared; -using System.Runtime.Versioning; +using Microsoft.Win32.SafeHandles; +using Xunit; +using Xunit.Abstractions; #nullable disable diff --git a/src/Build.UnitTests/BackEnd/TaskBuilderTestTask.cs b/src/Build.UnitTests/BackEnd/TaskBuilderTestTask.cs index 27775be9a60..89a8491a11f 100644 --- a/src/Build.UnitTests/BackEnd/TaskBuilderTestTask.cs +++ b/src/Build.UnitTests/BackEnd/TaskBuilderTestTask.cs @@ -5,8 +5,8 @@ using System.Collections; using System.Collections.Generic; using System.Linq; -using Microsoft.Build.Framework; using System.Reflection; +using Microsoft.Build.Framework; #nullable disable diff --git a/src/Build.UnitTests/BackEnd/TaskBuilder_Tests.cs b/src/Build.UnitTests/BackEnd/TaskBuilder_Tests.cs index 3b13e37087c..b253afdf8b3 100644 --- a/src/Build.UnitTests/BackEnd/TaskBuilder_Tests.cs +++ b/src/Build.UnitTests/BackEnd/TaskBuilder_Tests.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.IO; using System.Reflection; +using System.Threading; using System.Threading.Tasks; using System.Xml; using Microsoft.Build.BackEnd; @@ -15,14 +16,12 @@ using Microsoft.Build.Execution; using Microsoft.Build.Framework; using Microsoft.Build.Shared; - -using ElementLocation = Microsoft.Build.Construction.ElementLocation; -using ILoggingService = Microsoft.Build.BackEnd.Logging.ILoggingService; -using LegacyThreadingData = Microsoft.Build.Execution.LegacyThreadingData; using Shouldly; using Xunit; using Xunit.Abstractions; -using System.Threading; +using ElementLocation = Microsoft.Build.Construction.ElementLocation; +using ILoggingService = Microsoft.Build.BackEnd.Logging.ILoggingService; +using LegacyThreadingData = Microsoft.Build.Execution.LegacyThreadingData; #nullable disable diff --git a/src/Build.UnitTests/BackEnd/TaskExecutionHost_Tests.cs b/src/Build.UnitTests/BackEnd/TaskExecutionHost_Tests.cs index 994620b917a..7ca94153d09 100644 --- a/src/Build.UnitTests/BackEnd/TaskExecutionHost_Tests.cs +++ b/src/Build.UnitTests/BackEnd/TaskExecutionHost_Tests.cs @@ -13,14 +13,14 @@ using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Collections; using Microsoft.Build.Construction; +using Microsoft.Build.Engine.UnitTests.TestComparers; using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; using Microsoft.Build.Framework; using Microsoft.Build.Shared; +using Xunit; using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; -using Xunit; -using Microsoft.Build.Engine.UnitTests.TestComparers; #nullable disable diff --git a/src/Build.UnitTests/BackEnd/TaskHostTaskCancelled_Tests.cs b/src/Build.UnitTests/BackEnd/TaskHostTaskCancelled_Tests.cs index 7c0369ec0ae..c85e00e0f9c 100644 --- a/src/Build.UnitTests/BackEnd/TaskHostTaskCancelled_Tests.cs +++ b/src/Build.UnitTests/BackEnd/TaskHostTaskCancelled_Tests.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.Build.BackEnd; -using Xunit; using Shouldly; +using Xunit; #nullable disable diff --git a/src/Build.UnitTests/BackEnd/TaskHostTaskComplete_Tests.cs b/src/Build.UnitTests/BackEnd/TaskHostTaskComplete_Tests.cs index ec73cdbc6d9..5c6bf006b2c 100644 --- a/src/Build.UnitTests/BackEnd/TaskHostTaskComplete_Tests.cs +++ b/src/Build.UnitTests/BackEnd/TaskHostTaskComplete_Tests.cs @@ -3,15 +3,12 @@ using System; using System.Collections.Generic; - using Microsoft.Build.BackEnd; using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Microsoft.Build.Utilities; - - -using TaskHostPacketHelpers = Microsoft.Build.UnitTests.BackEnd.TaskHostConfiguration_Tests.TaskHostPacketHelpers; using Xunit; +using TaskHostPacketHelpers = Microsoft.Build.UnitTests.BackEnd.TaskHostConfiguration_Tests.TaskHostPacketHelpers; #nullable disable diff --git a/src/Build.UnitTests/BackEnd/TaskHost_Tests.cs b/src/Build.UnitTests/BackEnd/TaskHost_Tests.cs index 821e0e2644e..105e60d71f0 100644 --- a/src/Build.UnitTests/BackEnd/TaskHost_Tests.cs +++ b/src/Build.UnitTests/BackEnd/TaskHost_Tests.cs @@ -2,20 +2,20 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using Microsoft.Build.Framework; +using System.Collections; +using System.Collections.Generic; +using System.Threading.Tasks; using Microsoft.Build.BackEnd; -using Microsoft.Build.Construction; -using Microsoft.Build.Shared; using Microsoft.Build.BackEnd.Logging; -using System.Collections.Generic; -using Microsoft.Build.Execution; using Microsoft.Build.Collections; -using System.Collections; +using Microsoft.Build.Construction; +using Microsoft.Build.Execution; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using Microsoft.Build.Unittest; -using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; -using System.Threading.Tasks; -using Xunit; using Shouldly; +using Xunit; +using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; #nullable disable diff --git a/src/Build.UnitTests/BackEnd/TaskRegistry_Tests.cs b/src/Build.UnitTests/BackEnd/TaskRegistry_Tests.cs index 025477ab3bd..95e2b8efe98 100644 --- a/src/Build.UnitTests/BackEnd/TaskRegistry_Tests.cs +++ b/src/Build.UnitTests/BackEnd/TaskRegistry_Tests.cs @@ -16,11 +16,11 @@ using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Microsoft.Build.Shared.FileSystem; -using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using Microsoft.Build.Utilities; using Shouldly; using Xunit; using Xunit.Abstractions; +using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; #nullable disable diff --git a/src/Build.UnitTests/BackEnd/TranslationHelpers.cs b/src/Build.UnitTests/BackEnd/TranslationHelpers.cs index 8a357f8b621..60f073a0cf2 100644 --- a/src/Build.UnitTests/BackEnd/TranslationHelpers.cs +++ b/src/Build.UnitTests/BackEnd/TranslationHelpers.cs @@ -4,8 +4,8 @@ using System; using System.Collections; using System.Collections.Generic; -using System.Linq; using System.IO; +using System.Linq; using System.Text; using Microsoft.Build.BackEnd; using Microsoft.Build.Framework; diff --git a/src/Build.UnitTests/ChangeWaves_Tests.cs b/src/Build.UnitTests/ChangeWaves_Tests.cs index ebb131da07d..2fcc3003a50 100644 --- a/src/Build.UnitTests/ChangeWaves_Tests.cs +++ b/src/Build.UnitTests/ChangeWaves_Tests.cs @@ -1,15 +1,15 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Xunit; -using Shouldly; -using Microsoft.Build.Framework; +using System; using Microsoft.Build.Evaluation; -using Microsoft.Build.Utilities; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using Microsoft.Build.UnitTests; +using Microsoft.Build.Utilities; +using Shouldly; +using Xunit; using Xunit.Abstractions; -using System; -using Microsoft.Build.Shared; #nullable disable diff --git a/src/Build.UnitTests/Collections/MSBuildNameIgnoreCaseComparer_Tests.cs b/src/Build.UnitTests/Collections/MSBuildNameIgnoreCaseComparer_Tests.cs index f7b81000d87..1f167556b98 100644 --- a/src/Build.UnitTests/Collections/MSBuildNameIgnoreCaseComparer_Tests.cs +++ b/src/Build.UnitTests/Collections/MSBuildNameIgnoreCaseComparer_Tests.cs @@ -3,9 +3,9 @@ using System; using Microsoft.Build.Collections; +using Microsoft.Build.Execution; using Microsoft.Build.Framework; using Microsoft.Build.Shared; -using Microsoft.Build.Execution; using Xunit; #nullable disable diff --git a/src/Build.UnitTests/Collections/MultiDictionary_Tests.cs b/src/Build.UnitTests/Collections/MultiDictionary_Tests.cs index 75d3029570a..eabc4ee8b91 100644 --- a/src/Build.UnitTests/Collections/MultiDictionary_Tests.cs +++ b/src/Build.UnitTests/Collections/MultiDictionary_Tests.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System; using System.Collections.Generic; using Microsoft.Build.Collections; -using System; using Xunit; #nullable disable diff --git a/src/Build.UnitTests/Collections/OMcollections_tests.cs b/src/Build.UnitTests/Collections/OMcollections_tests.cs index dbc03d5df13..354a6bc9464 100644 --- a/src/Build.UnitTests/Collections/OMcollections_tests.cs +++ b/src/Build.UnitTests/Collections/OMcollections_tests.cs @@ -1,20 +1,20 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.Collections.Generic; -using Microsoft.Build.Collections; using System; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Framework; using System.Collections; +using System.Collections.Generic; using System.Linq; +using Microsoft.Build.BackEnd; +using Microsoft.Build.Collections; +using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; +using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Microsoft.Build.UnitTests.BackEnd; using Shouldly; -using ObjectModel = System.Collections.ObjectModel; using Xunit; -using Microsoft.Build.BackEnd; +using ObjectModel = System.Collections.ObjectModel; #nullable disable diff --git a/src/Build.UnitTests/ConfigureableForwardingLogger_Tests.cs b/src/Build.UnitTests/ConfigureableForwardingLogger_Tests.cs index 1612c82f6a5..c22f59b5930 100644 --- a/src/Build.UnitTests/ConfigureableForwardingLogger_Tests.cs +++ b/src/Build.UnitTests/ConfigureableForwardingLogger_Tests.cs @@ -3,9 +3,9 @@ using System; using System.Collections.Generic; +using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Framework; using Microsoft.Build.Logging; -using Microsoft.Build.BackEnd.Logging; using Shouldly; using Xunit; diff --git a/src/Build.UnitTests/ConsoleLogger_Tests.cs b/src/Build.UnitTests/ConsoleLogger_Tests.cs index 4f5ba07b009..82925cbea0e 100644 --- a/src/Build.UnitTests/ConsoleLogger_Tests.cs +++ b/src/Build.UnitTests/ConsoleLogger_Tests.cs @@ -6,22 +6,20 @@ using System.Collections.Generic; using System.Globalization; using System.IO; +using System.Runtime.Versioning; using System.Text; using System.Text.RegularExpressions; using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Construction; +using Microsoft.Build.Execution; using Microsoft.Build.Framework; using Microsoft.Build.Logging; using Microsoft.Build.Shared; - - -using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; using Shouldly; using Xunit; using Xunit.Abstractions; -using Microsoft.Build.Execution; -using System.Runtime.Versioning; using Xunit.NetCore.Extensions; +using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; #nullable disable diff --git a/src/Build.UnitTests/Construction/ElementLocation_Tests.cs b/src/Build.UnitTests/Construction/ElementLocation_Tests.cs index 2a5130e7bde..7a33e0d5343 100644 --- a/src/Build.UnitTests/Construction/ElementLocation_Tests.cs +++ b/src/Build.UnitTests/Construction/ElementLocation_Tests.cs @@ -2,16 +2,16 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; +using System.IO; +using System.Reflection; +using System.Xml; +using Microsoft.Build.BackEnd; +using Microsoft.Build.Construction; using Microsoft.Build.Exceptions; using Microsoft.Build.Framework; using Microsoft.Build.Shared; -using Microsoft.Build.Construction; using Microsoft.Build.UnitTests.BackEnd; -using System.Xml; -using System.IO; -using System.Reflection; using Xunit; -using Microsoft.Build.BackEnd; #nullable disable diff --git a/src/Build.UnitTests/Construction/ProjectImportElement_Tests.cs b/src/Build.UnitTests/Construction/ProjectImportElement_Tests.cs index aab1c6b3273..bc8888a0359 100644 --- a/src/Build.UnitTests/Construction/ProjectImportElement_Tests.cs +++ b/src/Build.UnitTests/Construction/ProjectImportElement_Tests.cs @@ -1,11 +1,11 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System; +using System.Linq; using Microsoft.Build.Construction; using Microsoft.Build.Evaluation; using Shouldly; -using System; -using System.Linq; using Xunit; #nullable disable diff --git a/src/Build.UnitTests/Construction/SolutionFile_Tests.cs b/src/Build.UnitTests/Construction/SolutionFile_Tests.cs index 74de8fa1a11..84c24cb12b0 100644 --- a/src/Build.UnitTests/Construction/SolutionFile_Tests.cs +++ b/src/Build.UnitTests/Construction/SolutionFile_Tests.cs @@ -1,14 +1,14 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Construction; -using Microsoft.Build.Exceptions; -using Microsoft.Build.Shared; -using Shouldly; using System; using System.Collections; using System.Collections.Generic; using System.IO; +using Microsoft.Build.Construction; +using Microsoft.Build.Exceptions; +using Microsoft.Build.Shared; +using Shouldly; using Xunit; using Xunit.Abstractions; diff --git a/src/Build.UnitTests/Construction/SolutionProjectGenerator_Tests.cs b/src/Build.UnitTests/Construction/SolutionProjectGenerator_Tests.cs index b6097d1c35a..2306910aabc 100644 --- a/src/Build.UnitTests/Construction/SolutionProjectGenerator_Tests.cs +++ b/src/Build.UnitTests/Construction/SolutionProjectGenerator_Tests.cs @@ -6,29 +6,25 @@ using System.IO; using System.Linq; using Microsoft.Build.BackEnd; -using Microsoft.Build.Framework; using Microsoft.Build.Construction; using Microsoft.Build.Execution; +using Microsoft.Build.Framework; using Microsoft.Build.Shared; - -using LoggingService = Microsoft.Build.BackEnd.Logging.LoggingService; +using Microsoft.Build.UnitTests.Shared; +using Shouldly; +using Xunit; +using Xunit.Abstractions; +using FrameworkLocationHelper = Microsoft.Build.Shared.FrameworkLocationHelper; using ILoggingService = Microsoft.Build.BackEnd.Logging.ILoggingService; +using InternalUtilities = Microsoft.Build.Internal.Utilities; +using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using LoggerMode = Microsoft.Build.BackEnd.Logging.LoggerMode; - +using LoggingService = Microsoft.Build.BackEnd.Logging.LoggingService; using Project = Microsoft.Build.Evaluation.Project; using ProjectCollection = Microsoft.Build.Evaluation.ProjectCollection; +using ResourceUtilities = Microsoft.Build.Shared.ResourceUtilities; using Toolset = Microsoft.Build.Evaluation.Toolset; - -using InternalUtilities = Microsoft.Build.Internal.Utilities; - using XMakeElements = Microsoft.Build.Shared.XMakeElements; -using ResourceUtilities = Microsoft.Build.Shared.ResourceUtilities; -using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; -using FrameworkLocationHelper = Microsoft.Build.Shared.FrameworkLocationHelper; -using Xunit; -using Xunit.Abstractions; -using Shouldly; -using Microsoft.Build.UnitTests.Shared; #nullable disable diff --git a/src/Build.UnitTests/Construction/XmlReaderWithoutLocation_Tests.cs b/src/Build.UnitTests/Construction/XmlReaderWithoutLocation_Tests.cs index db3134ae8eb..5f4969602ab 100644 --- a/src/Build.UnitTests/Construction/XmlReaderWithoutLocation_Tests.cs +++ b/src/Build.UnitTests/Construction/XmlReaderWithoutLocation_Tests.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Evaluation; -using System.Xml; using System.IO; +using System.Xml; +using Microsoft.Build.Evaluation; using Xunit; #nullable disable diff --git a/src/Build.UnitTests/Definition/ItemDefinitionGroup_Tests.cs b/src/Build.UnitTests/Definition/ItemDefinitionGroup_Tests.cs index d155a128239..798c1294447 100644 --- a/src/Build.UnitTests/Definition/ItemDefinitionGroup_Tests.cs +++ b/src/Build.UnitTests/Definition/ItemDefinitionGroup_Tests.cs @@ -2,19 +2,18 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; +using System.Collections.Generic; using System.IO; using System.Linq; using System.Reflection; -using System.Collections.Generic; using System.Xml; -using Microsoft.Build.Execution; using Microsoft.Build.Evaluation; +using Microsoft.Build.Execution; using Microsoft.Build.Framework; using Microsoft.Build.Shared; - -using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; -using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using Xunit; +using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; +using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; #nullable disable diff --git a/src/Build.UnitTests/Definition/ProjectItem_Tests.cs b/src/Build.UnitTests/Definition/ProjectItem_Tests.cs index 86311e423a3..fa09e0d0cd5 100644 --- a/src/Build.UnitTests/Definition/ProjectItem_Tests.cs +++ b/src/Build.UnitTests/Definition/ProjectItem_Tests.cs @@ -2,14 +2,14 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; +using System.Collections.Generic; using System.IO; using System.Linq; -using System.Collections.Generic; using System.Xml; -using Microsoft.Build.Evaluation; -using ProjectItemFactory = Microsoft.Build.Evaluation.ProjectItem.ProjectItemFactory; using Microsoft.Build.Construction; +using Microsoft.Build.Evaluation; using Xunit; +using ProjectItemFactory = Microsoft.Build.Evaluation.ProjectItem.ProjectItemFactory; #nullable disable diff --git a/src/Build.UnitTests/Definition/Project_Internal_Tests.cs b/src/Build.UnitTests/Definition/Project_Internal_Tests.cs index 507514617ea..c08c92c9134 100644 --- a/src/Build.UnitTests/Definition/Project_Internal_Tests.cs +++ b/src/Build.UnitTests/Definition/Project_Internal_Tests.cs @@ -3,13 +3,13 @@ using System; using System.Collections.Generic; -using System.Xml; using System.IO; +using System.Xml; using Microsoft.Build.Evaluation; using Microsoft.Build.Shared; using Shouldly; -using InternalUtilities = Microsoft.Build.Internal.Utilities; using Xunit; +using InternalUtilities = Microsoft.Build.Internal.Utilities; #nullable disable diff --git a/src/Build.UnitTests/Definition/ToolsVersion_Tests.cs b/src/Build.UnitTests/Definition/ToolsVersion_Tests.cs index 35e2ad09124..b33fd7a00ce 100644 --- a/src/Build.UnitTests/Definition/ToolsVersion_Tests.cs +++ b/src/Build.UnitTests/Definition/ToolsVersion_Tests.cs @@ -6,19 +6,18 @@ using System.IO; using System.Text.RegularExpressions; using System.Xml; +using Microsoft.Build.Collections; +using Microsoft.Build.Construction; using Microsoft.Build.Evaluation; -using Microsoft.Build.Shared; -using Microsoft.Build.Framework; using Microsoft.Build.Execution; -using Microsoft.Build.Construction; -using Microsoft.Build.Collections; - -using LoggingService = Microsoft.Build.BackEnd.Logging.LoggingService; -using LoggerMode = Microsoft.Build.BackEnd.Logging.LoggerMode; -using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; -using InternalUtilities = Microsoft.Build.Internal.Utilities; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using Xunit; using Xunit.NetCore.Extensions; +using InternalUtilities = Microsoft.Build.Internal.Utilities; +using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; +using LoggerMode = Microsoft.Build.BackEnd.Logging.LoggerMode; +using LoggingService = Microsoft.Build.BackEnd.Logging.LoggingService; #nullable disable diff --git a/src/Build.UnitTests/Definition/ToolsetConfigurationReader_Tests.cs b/src/Build.UnitTests/Definition/ToolsetConfigurationReader_Tests.cs index 70db749fe92..4b1c8457c93 100644 --- a/src/Build.UnitTests/Definition/ToolsetConfigurationReader_Tests.cs +++ b/src/Build.UnitTests/Definition/ToolsetConfigurationReader_Tests.cs @@ -1,16 +1,15 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System; +using System.Collections.Generic; using System.Configuration; using Microsoft.Build.Collections; using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; using Microsoft.Build.Shared; - -using ToolsetConfigurationSection = Microsoft.Build.Evaluation.ToolsetConfigurationSection; using Xunit; -using System; -using System.Collections.Generic; +using ToolsetConfigurationSection = Microsoft.Build.Evaluation.ToolsetConfigurationSection; #nullable disable diff --git a/src/Build.UnitTests/Evaluation/Expander_Tests.cs b/src/Build.UnitTests/Evaluation/Expander_Tests.cs index c30721a2d59..d93e4342dc0 100644 --- a/src/Build.UnitTests/Evaluation/Expander_Tests.cs +++ b/src/Build.UnitTests/Evaluation/Expander_Tests.cs @@ -10,29 +10,23 @@ using System.Runtime.Versioning; using System.Text; using System.Xml; - +using Microsoft.Build.BackEnd; using Microsoft.Build.Collections; using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; using Microsoft.Build.Framework; using Microsoft.Build.Internal; using Microsoft.Build.Shared; +using Microsoft.Build.Shared.FileSystem; using Microsoft.Build.Utilities; using Microsoft.Win32; - - - -using ProjectHelpers = Microsoft.Build.UnitTests.BackEnd.ProjectHelpers; -using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; - -using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; -using ProjectItemInstanceFactory = Microsoft.Build.Execution.ProjectItemInstance.TaskItem.ProjectItemInstanceFactory; - -using Xunit; -using Microsoft.Build.BackEnd; -using Microsoft.Build.Shared.FileSystem; using Shouldly; +using Xunit; using Xunit.NetCore.Extensions; +using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; +using ProjectHelpers = Microsoft.Build.UnitTests.BackEnd.ProjectHelpers; +using ProjectItemInstanceFactory = Microsoft.Build.Execution.ProjectItemInstance.TaskItem.ProjectItemInstanceFactory; +using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; #nullable disable diff --git a/src/Build.UnitTests/Evaluation/ExpressionShredder_Tests.cs b/src/Build.UnitTests/Evaluation/ExpressionShredder_Tests.cs index 2419fe271db..1d768794e9f 100644 --- a/src/Build.UnitTests/Evaluation/ExpressionShredder_Tests.cs +++ b/src/Build.UnitTests/Evaluation/ExpressionShredder_Tests.cs @@ -4,9 +4,9 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Text.RegularExpressions; using Microsoft.Build.Evaluation; using Microsoft.Build.Shared; -using System.Text.RegularExpressions; using Xunit; #nullable disable diff --git a/src/Build.UnitTests/Evaluation/ImportFromMSBuildExtensionsPath_Tests.cs b/src/Build.UnitTests/Evaluation/ImportFromMSBuildExtensionsPath_Tests.cs index d3bd36d2e35..4d4e33ff79d 100644 --- a/src/Build.UnitTests/Evaluation/ImportFromMSBuildExtensionsPath_Tests.cs +++ b/src/Build.UnitTests/Evaluation/ImportFromMSBuildExtensionsPath_Tests.cs @@ -1,16 +1,15 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System; +using System.Collections.Generic; +using System.IO; using Microsoft.Build.Collections; using Microsoft.Build.Evaluation; using Microsoft.Build.Exceptions; using Microsoft.Build.Execution; using Microsoft.Build.Shared; - using Xunit; -using System; -using System.Collections.Generic; -using System.IO; #nullable disable diff --git a/src/Build.UnitTests/Evaluation/ItemEvaluation_Tests.cs b/src/Build.UnitTests/Evaluation/ItemEvaluation_Tests.cs index c80efa78126..67b41b392cf 100644 --- a/src/Build.UnitTests/Evaluation/ItemEvaluation_Tests.cs +++ b/src/Build.UnitTests/Evaluation/ItemEvaluation_Tests.cs @@ -5,11 +5,11 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using Microsoft.Build.Evaluation; -using Xunit; using System.Text; +using Microsoft.Build.Evaluation; using Microsoft.Build.Internal; using Microsoft.Build.Shared; +using Xunit; #nullable disable diff --git a/src/Build.UnitTests/Evaluation/ItemSpec_Tests.cs b/src/Build.UnitTests/Evaluation/ItemSpec_Tests.cs index 0ef9b538656..856de263ffe 100644 --- a/src/Build.UnitTests/Evaluation/ItemSpec_Tests.cs +++ b/src/Build.UnitTests/Evaluation/ItemSpec_Tests.cs @@ -10,10 +10,10 @@ using Microsoft.Build.UnitTests.BackEnd; using Shouldly; using Xunit; -using ProjectInstanceItemSpec = - Microsoft.Build.Evaluation.ItemSpec; using ProjectInstanceExpander = Microsoft.Build.Evaluation.Expander; +using ProjectInstanceItemSpec = + Microsoft.Build.Evaluation.ItemSpec; #nullable disable diff --git a/src/Build.UnitTests/Evaluation/Preprocessor_Tests.cs b/src/Build.UnitTests/Evaluation/Preprocessor_Tests.cs index c743a3a02da..3f17110a7d0 100644 --- a/src/Build.UnitTests/Evaluation/Preprocessor_Tests.cs +++ b/src/Build.UnitTests/Evaluation/Preprocessor_Tests.cs @@ -1,17 +1,17 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Construction; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Shared; +using System; using System.Collections.Generic; using System.IO; +using System.Linq; using System.Xml; -using System; +using Microsoft.Build.Construction; +using Microsoft.Build.Evaluation; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using Microsoft.Build.Unittest; using Xunit; -using Microsoft.Build.Framework; -using System.Linq; #nullable disable diff --git a/src/Build.UnitTests/Evaluation/ProjectRootElementCache_Tests.cs b/src/Build.UnitTests/Evaluation/ProjectRootElementCache_Tests.cs index 4e478ab372e..1d30e7f6067 100644 --- a/src/Build.UnitTests/Evaluation/ProjectRootElementCache_Tests.cs +++ b/src/Build.UnitTests/Evaluation/ProjectRootElementCache_Tests.cs @@ -1,11 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Evaluation; using System; using System.IO; - using Microsoft.Build.Construction; +using Microsoft.Build.Evaluation; using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Xunit; diff --git a/src/Build.UnitTests/Evaluation/ProjectSdkImplicitImport_Tests.cs b/src/Build.UnitTests/Evaluation/ProjectSdkImplicitImport_Tests.cs index 1a1918ead7e..0e4212e65e3 100644 --- a/src/Build.UnitTests/Evaluation/ProjectSdkImplicitImport_Tests.cs +++ b/src/Build.UnitTests/Evaluation/ProjectSdkImplicitImport_Tests.cs @@ -16,10 +16,10 @@ using Microsoft.Build.Unittest; using Shouldly; using Xunit; +using SdkReferencePropertyExpansionMode = Microsoft.Build.Framework.EscapeHatches.SdkReferencePropertyExpansionMode; using SdkResolverContext = Microsoft.Build.Framework.SdkResolverContext; using SdkResult = Microsoft.Build.Framework.SdkResult; using SdkResultFactory = Microsoft.Build.Framework.SdkResultFactory; -using SdkReferencePropertyExpansionMode = Microsoft.Build.Framework.EscapeHatches.SdkReferencePropertyExpansionMode; #nullable disable diff --git a/src/Build.UnitTests/Evaluation/SdkResultEvaluation_Tests.cs b/src/Build.UnitTests/Evaluation/SdkResultEvaluation_Tests.cs index 4258549fe70..a5041d55fd6 100644 --- a/src/Build.UnitTests/Evaluation/SdkResultEvaluation_Tests.cs +++ b/src/Build.UnitTests/Evaluation/SdkResultEvaluation_Tests.cs @@ -1,6 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; using Microsoft.Build.Construction; using Microsoft.Build.Definition; using Microsoft.Build.Evaluation; @@ -8,10 +12,6 @@ using Microsoft.Build.Framework; using Microsoft.Build.Unittest; using Shouldly; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; using Xunit; using Xunit.Abstractions; diff --git a/src/Build.UnitTests/Evaluation/SemiColonTokenizer_Tests.cs b/src/Build.UnitTests/Evaluation/SemiColonTokenizer_Tests.cs index 505b4e12f5b..9ab78f45907 100644 --- a/src/Build.UnitTests/Evaluation/SemiColonTokenizer_Tests.cs +++ b/src/Build.UnitTests/Evaluation/SemiColonTokenizer_Tests.cs @@ -2,9 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.Build.Evaluation; - -using Xunit; using Shouldly; +using Xunit; #nullable disable diff --git a/src/Build.UnitTests/Evaluation/SimpleVersion_Tests.cs b/src/Build.UnitTests/Evaluation/SimpleVersion_Tests.cs index cfb3c3ad477..8d2b638d485 100644 --- a/src/Build.UnitTests/Evaluation/SimpleVersion_Tests.cs +++ b/src/Build.UnitTests/Evaluation/SimpleVersion_Tests.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Utilities; using System; using System.Collections.Generic; +using Microsoft.Build.Utilities; using Xunit; #nullable disable diff --git a/src/Build.UnitTests/FileLogger_Tests.cs b/src/Build.UnitTests/FileLogger_Tests.cs index 06d4883bfed..279859f2058 100644 --- a/src/Build.UnitTests/FileLogger_Tests.cs +++ b/src/Build.UnitTests/FileLogger_Tests.cs @@ -8,10 +8,9 @@ using Microsoft.Build.Framework; using Microsoft.Build.Logging; using Microsoft.Build.Shared; - +using Xunit; using EventSourceSink = Microsoft.Build.BackEnd.Logging.EventSourceSink; using Project = Microsoft.Build.Evaluation.Project; -using Xunit; #nullable disable diff --git a/src/Build.UnitTests/FileUtilitiesRegex_Tests.cs b/src/Build.UnitTests/FileUtilitiesRegex_Tests.cs index 0a0b99e5b37..72a46b6d23b 100644 --- a/src/Build.UnitTests/FileUtilitiesRegex_Tests.cs +++ b/src/Build.UnitTests/FileUtilitiesRegex_Tests.cs @@ -1,11 +1,11 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Xunit; -using Shouldly; -using Microsoft.Build.Shared; -using System.Text.RegularExpressions; using System.Globalization; +using System.Text.RegularExpressions; +using Microsoft.Build.Shared; +using Shouldly; +using Xunit; #nullable disable diff --git a/src/Build.UnitTests/Instance/ProjectMetadataInstance_Internal_Tests.cs b/src/Build.UnitTests/Instance/ProjectMetadataInstance_Internal_Tests.cs index f47190d3d78..fdde22a05a9 100644 --- a/src/Build.UnitTests/Instance/ProjectMetadataInstance_Internal_Tests.cs +++ b/src/Build.UnitTests/Instance/ProjectMetadataInstance_Internal_Tests.cs @@ -1,12 +1,12 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Execution; using System; +using Microsoft.Build.BackEnd; using Microsoft.Build.Evaluation; +using Microsoft.Build.Execution; using Microsoft.Build.UnitTests.BackEnd; using Xunit; -using Microsoft.Build.BackEnd; #nullable disable diff --git a/src/Build.UnitTests/Instance/ProjectPropertyInstance_Internal_Tests.cs b/src/Build.UnitTests/Instance/ProjectPropertyInstance_Internal_Tests.cs index 4424a3d53e3..92ee3d73435 100644 --- a/src/Build.UnitTests/Instance/ProjectPropertyInstance_Internal_Tests.cs +++ b/src/Build.UnitTests/Instance/ProjectPropertyInstance_Internal_Tests.cs @@ -1,12 +1,12 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Execution; using System; +using Microsoft.Build.BackEnd; using Microsoft.Build.Evaluation; +using Microsoft.Build.Execution; using Microsoft.Build.UnitTests.BackEnd; using Xunit; -using Microsoft.Build.BackEnd; #nullable disable diff --git a/src/Build.UnitTests/Instance/ProjectTargetInstance_Internal_Tests.cs b/src/Build.UnitTests/Instance/ProjectTargetInstance_Internal_Tests.cs index 2f8177e5a78..1f575aecfbc 100644 --- a/src/Build.UnitTests/Instance/ProjectTargetInstance_Internal_Tests.cs +++ b/src/Build.UnitTests/Instance/ProjectTargetInstance_Internal_Tests.cs @@ -7,8 +7,8 @@ using Microsoft.Build.Execution; using Microsoft.Build.UnitTests.BackEnd; using Xunit; -using static Microsoft.Build.Engine.UnitTests.TestData.ProjectInstanceTestObjects; using static Microsoft.Build.Engine.UnitTests.TestComparers.ProjectInstanceModelTestComparers; +using static Microsoft.Build.Engine.UnitTests.TestData.ProjectInstanceTestObjects; #nullable disable diff --git a/src/Build.UnitTests/Instance/TaskItem_Tests.cs b/src/Build.UnitTests/Instance/TaskItem_Tests.cs index b3f48f86480..da4fd47acd2 100644 --- a/src/Build.UnitTests/Instance/TaskItem_Tests.cs +++ b/src/Build.UnitTests/Instance/TaskItem_Tests.cs @@ -2,20 +2,20 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Collections.Generic; -using Microsoft.Build.Shared; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Construction; -using Microsoft.Build.UnitTests.BackEnd; -using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; -using System.Xml; -using Microsoft.Build.Framework; using System.IO; using System.Linq; -using Xunit; +using System.Xml; using Microsoft.Build.BackEnd; using Microsoft.Build.Collections; +using Microsoft.Build.Construction; +using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using Microsoft.Build.UnitTests.BackEnd; using Shouldly; +using Xunit; +using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; #nullable disable diff --git a/src/Build.UnitTests/LogFormatter_Tests.cs b/src/Build.UnitTests/LogFormatter_Tests.cs index 972239729b9..8ecb8e65e4a 100644 --- a/src/Build.UnitTests/LogFormatter_Tests.cs +++ b/src/Build.UnitTests/LogFormatter_Tests.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using Microsoft.Build.BackEnd.Logging; using System.Globalization; +using Microsoft.Build.BackEnd.Logging; using Xunit; #nullable disable diff --git a/src/Build.UnitTests/LoggerDescription_Tests.cs b/src/Build.UnitTests/LoggerDescription_Tests.cs index f65fcbbdb01..345df4543cc 100644 --- a/src/Build.UnitTests/LoggerDescription_Tests.cs +++ b/src/Build.UnitTests/LoggerDescription_Tests.cs @@ -3,10 +3,9 @@ using System; using System.IO; - using Microsoft.Build.Framework; -using Xunit; using Microsoft.Build.Logging; +using Xunit; #nullable disable diff --git a/src/Build.UnitTests/LoggerException_Tests.cs b/src/Build.UnitTests/LoggerException_Tests.cs index 4fb900a4cce..6a052a7ee27 100644 --- a/src/Build.UnitTests/LoggerException_Tests.cs +++ b/src/Build.UnitTests/LoggerException_Tests.cs @@ -3,10 +3,10 @@ using System; using System.IO; -using Microsoft.Build.Framework; +using System.Runtime.Serialization.Formatters.Binary; using Microsoft.Build.Exceptions; +using Microsoft.Build.Framework; using Xunit; -using System.Runtime.Serialization.Formatters.Binary; #nullable disable diff --git a/src/Build.UnitTests/Scanner_Tests.cs b/src/Build.UnitTests/Scanner_Tests.cs index 97d786fd815..b2b705d2c22 100644 --- a/src/Build.UnitTests/Scanner_Tests.cs +++ b/src/Build.UnitTests/Scanner_Tests.cs @@ -2,10 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; - -using Microsoft.Build.Framework; using Microsoft.Build.Evaluation; using Microsoft.Build.Exceptions; +using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Microsoft.Build.Utilities; using Shouldly; diff --git a/src/Build.UnitTests/TargetsFile_Test.cs b/src/Build.UnitTests/TargetsFile_Test.cs index 3012894b25c..364c68081a9 100644 --- a/src/Build.UnitTests/TargetsFile_Test.cs +++ b/src/Build.UnitTests/TargetsFile_Test.cs @@ -3,9 +3,8 @@ using System; using System.IO; - -using Microsoft.Build.Shared; using Microsoft.Build.Evaluation; +using Microsoft.Build.Shared; using Xunit; #nullable disable diff --git a/src/Build.UnitTests/Utilities_Tests.cs b/src/Build.UnitTests/Utilities_Tests.cs index 00162f01816..d6ded939073 100644 --- a/src/Build.UnitTests/Utilities_Tests.cs +++ b/src/Build.UnitTests/Utilities_Tests.cs @@ -3,27 +3,21 @@ using System; using System.Collections; - +using System.Collections.Generic; +using System.IO; using Microsoft.Build.Shared; - +using Shouldly; +using Xunit; +using Xunit.Abstractions; using CommunicationsUtilities = Microsoft.Build.Internal.CommunicationsUtilities; using InternalUtilities = Microsoft.Build.Internal.Utilities; using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using MSBuildApp = Microsoft.Build.CommandLine.MSBuildApp; using ProjectCollection = Microsoft.Build.Evaluation.ProjectCollection; - using Toolset = Microsoft.Build.Evaluation.Toolset; - - using XmlDocumentWithLocation = Microsoft.Build.Construction.XmlDocumentWithLocation; using XmlElementWithLocation = Microsoft.Build.Construction.XmlElementWithLocation; -using Xunit; -using System.Collections.Generic; -using System.IO; -using Xunit.Abstractions; -using Shouldly; - #nullable disable namespace Microsoft.Build.UnitTests diff --git a/src/Build/BackEnd/BuildManager/BuildParameters.cs b/src/Build/BackEnd/BuildManager/BuildParameters.cs index a91ec457ef8..18bc290d14a 100644 --- a/src/Build/BackEnd/BuildManager/BuildParameters.cs +++ b/src/Build/BackEnd/BuildManager/BuildParameters.cs @@ -5,8 +5,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Diagnostics.CodeAnalysis; -using System.Threading; using System.Globalization; +using System.Threading; using Microsoft.Build.BackEnd; using Microsoft.Build.Collections; using Microsoft.Build.Evaluation; diff --git a/src/Build/BackEnd/BuildManager/BuildSubmission.cs b/src/Build/BackEnd/BuildManager/BuildSubmission.cs index 1a50e0248e0..ca2147dfae2 100644 --- a/src/Build/BackEnd/BuildManager/BuildSubmission.cs +++ b/src/Build/BackEnd/BuildManager/BuildSubmission.cs @@ -2,10 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; +using System.Globalization; using System.Threading; using Microsoft.Build.BackEnd; using Microsoft.Build.Shared; -using System.Globalization; #nullable disable diff --git a/src/Build/BackEnd/BuildManager/LegacyThreadingData.cs b/src/Build/BackEnd/BuildManager/LegacyThreadingData.cs index d6454f5c8c5..cb4464c8460 100644 --- a/src/Build/BackEnd/BuildManager/LegacyThreadingData.cs +++ b/src/Build/BackEnd/BuildManager/LegacyThreadingData.cs @@ -2,11 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; +using System.Collections.Generic; using System.Threading; +using System.Threading.Tasks; using Microsoft.Build.BackEnd; using Microsoft.Build.Shared; -using System.Collections.Generic; -using System.Threading.Tasks; #nullable disable diff --git a/src/Build/BackEnd/Components/BuildRequestEngine/BuildRequestEntry.cs b/src/Build/BackEnd/Components/BuildRequestEngine/BuildRequestEntry.cs index 6ac44d35291..3e926e2e75e 100644 --- a/src/Build/BackEnd/Components/BuildRequestEngine/BuildRequestEntry.cs +++ b/src/Build/BackEnd/Components/BuildRequestEngine/BuildRequestEntry.cs @@ -2,12 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.IO; using System.Collections.Generic; -using Microsoft.Build.Shared; -using Microsoft.Build.Execution; using System.Diagnostics; - +using System.IO; +using Microsoft.Build.Execution; +using Microsoft.Build.Shared; using BuildAbortedException = Microsoft.Build.Exceptions.BuildAbortedException; #nullable disable diff --git a/src/Build/BackEnd/Components/BuildRequestEngine/IBuildRequestEngine.cs b/src/Build/BackEnd/Components/BuildRequestEngine/IBuildRequestEngine.cs index 8d7d6cac205..fe0362d6fba 100644 --- a/src/Build/BackEnd/Components/BuildRequestEngine/IBuildRequestEngine.cs +++ b/src/Build/BackEnd/Components/BuildRequestEngine/IBuildRequestEngine.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using NodeLoggingContext = Microsoft.Build.BackEnd.Logging.NodeLoggingContext; using BuildResult = Microsoft.Build.Execution.BuildResult; +using NodeLoggingContext = Microsoft.Build.BackEnd.Logging.NodeLoggingContext; #nullable disable diff --git a/src/Build/BackEnd/Components/Caching/ResultsCache.cs b/src/Build/BackEnd/Components/Caching/ResultsCache.cs index fd85472b1be..f02decfdc60 100644 --- a/src/Build/BackEnd/Components/Caching/ResultsCache.cs +++ b/src/Build/BackEnd/Components/Caching/ResultsCache.cs @@ -3,8 +3,8 @@ using System; using System.Collections; -using System.Collections.Generic; using System.Collections.Concurrent; +using System.Collections.Generic; using Microsoft.Build.Execution; using Microsoft.Build.Shared; diff --git a/src/Build/BackEnd/Components/Communications/NodeManager.cs b/src/Build/BackEnd/Components/Communications/NodeManager.cs index ed7bcc24057..f05aa33f9f6 100644 --- a/src/Build/BackEnd/Components/Communications/NodeManager.cs +++ b/src/Build/BackEnd/Components/Communications/NodeManager.cs @@ -3,10 +3,10 @@ using System; using System.Collections.Generic; -using Microsoft.Build.Shared; -using Microsoft.Build.Execution; -using System.Threading; using System.Diagnostics; +using System.Threading; +using Microsoft.Build.Execution; +using Microsoft.Build.Shared; namespace Microsoft.Build.BackEnd { diff --git a/src/Build/BackEnd/Components/Communications/NodeProviderOutOfProc.cs b/src/Build/BackEnd/Components/Communications/NodeProviderOutOfProc.cs index c587d69211f..c5f2aa282f8 100644 --- a/src/Build/BackEnd/Components/Communications/NodeProviderOutOfProc.cs +++ b/src/Build/BackEnd/Components/Communications/NodeProviderOutOfProc.cs @@ -5,11 +5,11 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Diagnostics; -using Microsoft.Build.Shared; +using System.Linq; using Microsoft.Build.Exceptions; using Microsoft.Build.Framework; using Microsoft.Build.Internal; -using System.Linq; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Build/BackEnd/Components/Communications/NodeProviderOutOfProcTaskHost.cs b/src/Build/BackEnd/Components/Communications/NodeProviderOutOfProcTaskHost.cs index c892dc79e2e..03a45a0e6bb 100644 --- a/src/Build/BackEnd/Components/Communications/NodeProviderOutOfProcTaskHost.cs +++ b/src/Build/BackEnd/Components/Communications/NodeProviderOutOfProcTaskHost.cs @@ -3,13 +3,12 @@ using System; using System.Collections.Generic; -using System.IO; using System.Diagnostics; +using System.IO; +using System.Linq; using System.Threading; - -using Microsoft.Build.Shared; using Microsoft.Build.Internal; -using System.Linq; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Build/BackEnd/Components/Communications/TaskHostNodeManager.cs b/src/Build/BackEnd/Components/Communications/TaskHostNodeManager.cs index 914acb1de57..ad7730289d5 100644 --- a/src/Build/BackEnd/Components/Communications/TaskHostNodeManager.cs +++ b/src/Build/BackEnd/Components/Communications/TaskHostNodeManager.cs @@ -2,10 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using Microsoft.Build.Shared; -using Microsoft.Build.Execution; using System.Collections.Generic; using System.Diagnostics; +using Microsoft.Build.Execution; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Build/BackEnd/Components/IBuildComponentHost.cs b/src/Build/BackEnd/Components/IBuildComponentHost.cs index 874159feb38..bcbc7eac430 100644 --- a/src/Build/BackEnd/Components/IBuildComponentHost.cs +++ b/src/Build/BackEnd/Components/IBuildComponentHost.cs @@ -1,8 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using ILoggingService = Microsoft.Build.BackEnd.Logging.ILoggingService; using BuildParameters = Microsoft.Build.Execution.BuildParameters; +using ILoggingService = Microsoft.Build.BackEnd.Logging.ILoggingService; using LegacyThreadingData = Microsoft.Build.Execution.LegacyThreadingData; #nullable disable diff --git a/src/Build/BackEnd/Components/Logging/ILoggingService.cs b/src/Build/BackEnd/Components/Logging/ILoggingService.cs index 0906d1eaae4..a3b78640194 100644 --- a/src/Build/BackEnd/Components/Logging/ILoggingService.cs +++ b/src/Build/BackEnd/Components/Logging/ILoggingService.cs @@ -7,9 +7,8 @@ using Microsoft.Build.Framework; using Microsoft.Build.Framework.Profiler; using Microsoft.Build.Shared; - -using LoggerDescription = Microsoft.Build.Logging.LoggerDescription; using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; +using LoggerDescription = Microsoft.Build.Logging.LoggerDescription; using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; #nullable disable diff --git a/src/Build/BackEnd/Components/Logging/NodeLoggingContext.cs b/src/Build/BackEnd/Components/Logging/NodeLoggingContext.cs index d3b442b7dea..36138422b00 100644 --- a/src/Build/BackEnd/Components/Logging/NodeLoggingContext.cs +++ b/src/Build/BackEnd/Components/Logging/NodeLoggingContext.cs @@ -1,8 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Framework; using Microsoft.Build.Execution; +using Microsoft.Build.Framework; using Microsoft.Build.Shared; #nullable disable diff --git a/src/Build/BackEnd/Components/Logging/TargetLoggingContext.cs b/src/Build/BackEnd/Components/Logging/TargetLoggingContext.cs index 8b2b9694b85..7bff292f0e1 100644 --- a/src/Build/BackEnd/Components/Logging/TargetLoggingContext.cs +++ b/src/Build/BackEnd/Components/Logging/TargetLoggingContext.cs @@ -2,12 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; +using System.Collections; using System.Collections.Generic; -using Microsoft.Build.Framework; using Microsoft.Build.Execution; +using Microsoft.Build.Framework; using Microsoft.Build.Shared; using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; -using System.Collections; #nullable disable diff --git a/src/Build/BackEnd/Components/Logging/TaskLoggingContext.cs b/src/Build/BackEnd/Components/Logging/TaskLoggingContext.cs index 576827e292f..2728ed5592e 100644 --- a/src/Build/BackEnd/Components/Logging/TaskLoggingContext.cs +++ b/src/Build/BackEnd/Components/Logging/TaskLoggingContext.cs @@ -1,11 +1,11 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.Build.Execution; using System; using System.Collections.Generic; +using Microsoft.Build.Execution; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Build/BackEnd/Components/RequestBuilder/BatchingEngine.cs b/src/Build/BackEnd/Components/RequestBuilder/BatchingEngine.cs index a985b059b81..c5852c97d30 100644 --- a/src/Build/BackEnd/Components/RequestBuilder/BatchingEngine.cs +++ b/src/Build/BackEnd/Components/RequestBuilder/BatchingEngine.cs @@ -3,12 +3,11 @@ using System; using System.Collections.Generic; - using Microsoft.Build.Collections; -using ElementLocation = Microsoft.Build.Construction.ElementLocation; using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; using Microsoft.Build.Shared; +using ElementLocation = Microsoft.Build.Construction.ElementLocation; #nullable disable diff --git a/src/Build/BackEnd/Components/RequestBuilder/IRequestBuilderCallback.cs b/src/Build/BackEnd/Components/RequestBuilder/IRequestBuilderCallback.cs index 9c8542a8888..2cce591c070 100644 --- a/src/Build/BackEnd/Components/RequestBuilder/IRequestBuilderCallback.cs +++ b/src/Build/BackEnd/Components/RequestBuilder/IRequestBuilderCallback.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Execution; -using Microsoft.Build.Collections; using System.Threading.Tasks; +using Microsoft.Build.Collections; +using Microsoft.Build.Execution; #nullable disable diff --git a/src/Build/BackEnd/Components/RequestBuilder/ITargetBuilderCallback.cs b/src/Build/BackEnd/Components/RequestBuilder/ITargetBuilderCallback.cs index 946b66ddf91..51fe0d9196d 100644 --- a/src/Build/BackEnd/Components/RequestBuilder/ITargetBuilderCallback.cs +++ b/src/Build/BackEnd/Components/RequestBuilder/ITargetBuilderCallback.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using ElementLocation = Microsoft.Build.Construction.ElementLocation; -using Microsoft.Build.Execution; using System.Threading.Tasks; +using Microsoft.Build.Execution; +using ElementLocation = Microsoft.Build.Construction.ElementLocation; #nullable disable diff --git a/src/Build/BackEnd/Components/RequestBuilder/IntrinsicTask.cs b/src/Build/BackEnd/Components/RequestBuilder/IntrinsicTask.cs index 4406501a860..74d4f09524a 100644 --- a/src/Build/BackEnd/Components/RequestBuilder/IntrinsicTask.cs +++ b/src/Build/BackEnd/Components/RequestBuilder/IntrinsicTask.cs @@ -3,10 +3,10 @@ using System; using System.Collections.Generic; -using Microsoft.Build.Shared; using System.Reflection; -using Microsoft.Build.Execution; using Microsoft.Build.BackEnd.Logging; +using Microsoft.Build.Execution; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Build/BackEnd/Components/RequestBuilder/IntrinsicTasks/ItemGroupIntrinsicTask.cs b/src/Build/BackEnd/Components/RequestBuilder/IntrinsicTasks/ItemGroupIntrinsicTask.cs index 28607329499..8dd00b2148b 100644 --- a/src/Build/BackEnd/Components/RequestBuilder/IntrinsicTasks/ItemGroupIntrinsicTask.cs +++ b/src/Build/BackEnd/Components/RequestBuilder/IntrinsicTasks/ItemGroupIntrinsicTask.cs @@ -5,17 +5,17 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; +using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Collections; -using ElementLocation = Microsoft.Build.Construction.ElementLocation; +using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; using Microsoft.Build.Framework; using Microsoft.Build.Shared; -using Microsoft.Build.Evaluation; using Microsoft.Build.Shared.FileSystem; -using ProjectItemInstanceFactory = Microsoft.Build.Execution.ProjectItemInstance.TaskItem.ProjectItemInstanceFactory; +using ElementLocation = Microsoft.Build.Construction.ElementLocation; using EngineFileUtilities = Microsoft.Build.Internal.EngineFileUtilities; +using ProjectItemInstanceFactory = Microsoft.Build.Execution.ProjectItemInstance.TaskItem.ProjectItemInstanceFactory; using TargetLoggingContext = Microsoft.Build.BackEnd.Logging.TargetLoggingContext; -using Microsoft.Build.BackEnd.Logging; #nullable disable diff --git a/src/Build/BackEnd/Components/RequestBuilder/ItemBucket.cs b/src/Build/BackEnd/Components/RequestBuilder/ItemBucket.cs index 7f230112204..0c250da8f00 100644 --- a/src/Build/BackEnd/Components/RequestBuilder/ItemBucket.cs +++ b/src/Build/BackEnd/Components/RequestBuilder/ItemBucket.cs @@ -3,11 +3,10 @@ using System; using System.Collections.Generic; - -using Microsoft.Build.Shared; -using Microsoft.Build.Execution; -using Microsoft.Build.Evaluation; using Microsoft.Build.Collections; +using Microsoft.Build.Evaluation; +using Microsoft.Build.Execution; +using Microsoft.Build.Shared; using Microsoft.Build.Shared.FileSystem; #nullable disable diff --git a/src/Build/BackEnd/Components/RequestBuilder/Lookup.cs b/src/Build/BackEnd/Components/RequestBuilder/Lookup.cs index 69fe0121518..9ead103fe08 100644 --- a/src/Build/BackEnd/Components/RequestBuilder/Lookup.cs +++ b/src/Build/BackEnd/Components/RequestBuilder/Lookup.cs @@ -4,12 +4,11 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.Build.Shared; using System.Threading; +using Microsoft.Build.Collections; using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; -using Microsoft.Build.Collections; - +using Microsoft.Build.Shared; using ReservedPropertyNames = Microsoft.Build.Internal.ReservedPropertyNames; #nullable disable diff --git a/src/Build/BackEnd/Components/RequestBuilder/RequestBuilder.cs b/src/Build/BackEnd/Components/RequestBuilder/RequestBuilder.cs index 607e0f576e4..f4dffa6bb06 100644 --- a/src/Build/BackEnd/Components/RequestBuilder/RequestBuilder.cs +++ b/src/Build/BackEnd/Components/RequestBuilder/RequestBuilder.cs @@ -1,6 +1,14 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Globalization; +using System.IO; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Collections; using Microsoft.Build.Evaluation; @@ -10,14 +18,6 @@ using Microsoft.Build.Framework; using Microsoft.Build.Internal; using Microsoft.Build.Shared; -using System; -using System.Collections.Concurrent; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; using NodeLoggingContext = Microsoft.Build.BackEnd.Logging.NodeLoggingContext; using ProjectLoggingContext = Microsoft.Build.BackEnd.Logging.ProjectLoggingContext; diff --git a/src/Build/BackEnd/Components/RequestBuilder/TargetBuilder.cs b/src/Build/BackEnd/Components/RequestBuilder/TargetBuilder.cs index 9bc4f3de097..537660af9bf 100644 --- a/src/Build/BackEnd/Components/RequestBuilder/TargetBuilder.cs +++ b/src/Build/BackEnd/Components/RequestBuilder/TargetBuilder.cs @@ -1,21 +1,21 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Collections; -using Microsoft.Build.Eventing; -using Microsoft.Build.Execution; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; using System; using System.Collections.Concurrent; using System.Collections.Generic; +using System.Linq; using System.Threading; using System.Threading.Tasks; -using ProjectLoggingContext = Microsoft.Build.BackEnd.Logging.ProjectLoggingContext; -using ElementLocation = Microsoft.Build.Construction.ElementLocation; +using Microsoft.Build.Collections; +using Microsoft.Build.Eventing; +using Microsoft.Build.Execution; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using BuildAbortedException = Microsoft.Build.Exceptions.BuildAbortedException; +using ElementLocation = Microsoft.Build.Construction.ElementLocation; +using ProjectLoggingContext = Microsoft.Build.BackEnd.Logging.ProjectLoggingContext; using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; -using System.Linq; #nullable disable diff --git a/src/Build/BackEnd/Components/RequestBuilder/TargetSpecification.cs b/src/Build/BackEnd/Components/RequestBuilder/TargetSpecification.cs index 9f0e9097a14..8409e8135ca 100644 --- a/src/Build/BackEnd/Components/RequestBuilder/TargetSpecification.cs +++ b/src/Build/BackEnd/Components/RequestBuilder/TargetSpecification.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using ElementLocation = Microsoft.Build.Construction.ElementLocation; -using Microsoft.Build.Shared; using System.Diagnostics; +using Microsoft.Build.Shared; +using ElementLocation = Microsoft.Build.Construction.ElementLocation; #nullable disable diff --git a/src/Build/BackEnd/Components/RequestBuilder/TargetUpToDateChecker.cs b/src/Build/BackEnd/Components/RequestBuilder/TargetUpToDateChecker.cs index 65f1f4cbb51..bb99f7d5237 100644 --- a/src/Build/BackEnd/Components/RequestBuilder/TargetUpToDateChecker.cs +++ b/src/Build/BackEnd/Components/RequestBuilder/TargetUpToDateChecker.cs @@ -20,7 +20,7 @@ namespace Microsoft.Build.BackEnd { using ILoggingService = Microsoft.Build.BackEnd.Logging.ILoggingService; - + using ItemVectorPartition = System.Collections.Generic.Dictionary>; // ItemVectorPartitionCollection is designed to contains a set of project items which have possibly undergone transforms. // The outer dictionary it usually keyed by item type, so if items originally came from // an expression like @(Foo), the outer dictionary would have a key of "Foo" in it. @@ -29,7 +29,6 @@ namespace Microsoft.Build.BackEnd // the inner dictionary would have a key of "@(Foo->'%(Filename).obj')", in which would be // contained a list of the items which were created/transformed using that pattern. using ItemVectorPartitionCollection = System.Collections.Generic.Dictionary>>; - using ItemVectorPartition = System.Collections.Generic.Dictionary>; /// /// Enumeration of the results of target dependency analysis. diff --git a/src/Build/BackEnd/Components/Scheduler/SchedulableRequest.cs b/src/Build/BackEnd/Components/Scheduler/SchedulableRequest.cs index 142b8021262..33d0de2f88c 100644 --- a/src/Build/BackEnd/Components/Scheduler/SchedulableRequest.cs +++ b/src/Build/BackEnd/Components/Scheduler/SchedulableRequest.cs @@ -3,8 +3,8 @@ using System; using System.Collections.Generic; -using Microsoft.Build.Shared; using Microsoft.Build.Execution; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Build/BackEnd/Components/Scheduler/SchedulingData.cs b/src/Build/BackEnd/Components/Scheduler/SchedulingData.cs index ea8229ef246..e28c86db050 100644 --- a/src/Build/BackEnd/Components/Scheduler/SchedulingData.cs +++ b/src/Build/BackEnd/Components/Scheduler/SchedulingData.cs @@ -3,8 +3,8 @@ using System; using System.Collections.Generic; -using Microsoft.Build.Shared; using Microsoft.Build.Collections; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Build/BackEnd/Components/Scheduler/SchedulingPlan.cs b/src/Build/BackEnd/Components/Scheduler/SchedulingPlan.cs index ff41aea3c33..022b6acf9d0 100644 --- a/src/Build/BackEnd/Components/Scheduler/SchedulingPlan.cs +++ b/src/Build/BackEnd/Components/Scheduler/SchedulingPlan.cs @@ -5,10 +5,10 @@ using System.Collections.Generic; using System.Globalization; using System.IO; +using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Execution; using Microsoft.Build.Framework; using Microsoft.Build.Shared; -using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Shared.FileSystem; #nullable disable diff --git a/src/Build/BackEnd/Components/SdkResolution/DefaultSdkResolver.cs b/src/Build/BackEnd/Components/SdkResolution/DefaultSdkResolver.cs index e9239f1d124..8ce9065b9d0 100644 --- a/src/Build/BackEnd/Components/SdkResolution/DefaultSdkResolver.cs +++ b/src/Build/BackEnd/Components/SdkResolution/DefaultSdkResolver.cs @@ -1,10 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System.IO; using Microsoft.Build.Framework; using Microsoft.Build.Shared; -using System.IO; - using SdkResolverBase = Microsoft.Build.Framework.SdkResolver; using SdkResolverContextBase = Microsoft.Build.Framework.SdkResolverContext; using SdkResultBase = Microsoft.Build.Framework.SdkResult; diff --git a/src/Build/BackEnd/Components/SdkResolution/HostedSdkResolverServiceBase.cs b/src/Build/BackEnd/Components/SdkResolution/HostedSdkResolverServiceBase.cs index 03806f0f311..e0ecb46e353 100644 --- a/src/Build/BackEnd/Components/SdkResolution/HostedSdkResolverServiceBase.cs +++ b/src/Build/BackEnd/Components/SdkResolution/HostedSdkResolverServiceBase.cs @@ -1,11 +1,11 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System; +using System.Threading; using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Construction; using Microsoft.Build.Framework; -using System; -using System.Threading; #nullable disable diff --git a/src/Build/BackEnd/Components/SdkResolution/ISdkResolverService.cs b/src/Build/BackEnd/Components/SdkResolution/ISdkResolverService.cs index 037279f85bd..289abf71f6d 100644 --- a/src/Build/BackEnd/Components/SdkResolution/ISdkResolverService.cs +++ b/src/Build/BackEnd/Components/SdkResolution/ISdkResolverService.cs @@ -1,10 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System; using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Construction; using Microsoft.Build.Framework; -using System; #nullable disable diff --git a/src/Build/BackEnd/Components/SdkResolution/MainNodeSdkResolverService.cs b/src/Build/BackEnd/Components/SdkResolution/MainNodeSdkResolverService.cs index 1df10d45a37..8b937f7c5e6 100644 --- a/src/Build/BackEnd/Components/SdkResolution/MainNodeSdkResolverService.cs +++ b/src/Build/BackEnd/Components/SdkResolution/MainNodeSdkResolverService.cs @@ -1,14 +1,14 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System; +using System.Collections.Generic; using Microsoft.Build.BackEnd.Components.Logging; using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Construction; using Microsoft.Build.Evaluation; using Microsoft.Build.Framework; using Microsoft.Build.Shared; -using System; -using System.Collections.Generic; #nullable disable diff --git a/src/Build/BackEnd/Components/SdkResolution/OutOfProcNodeSdkResolverService.cs b/src/Build/BackEnd/Components/SdkResolution/OutOfProcNodeSdkResolverService.cs index 78a3f1e42a2..40dc8ffdf2b 100644 --- a/src/Build/BackEnd/Components/SdkResolution/OutOfProcNodeSdkResolverService.cs +++ b/src/Build/BackEnd/Components/SdkResolution/OutOfProcNodeSdkResolverService.cs @@ -1,15 +1,15 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System; +using System.Collections.Concurrent; +using System.Threading; using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Collections; using Microsoft.Build.Construction; using Microsoft.Build.Eventing; using Microsoft.Build.Framework; using Microsoft.Build.Shared; -using System; -using System.Collections.Concurrent; -using System.Threading; #nullable disable diff --git a/src/Build/BackEnd/Components/SdkResolution/SdkResolverManifest.cs b/src/Build/BackEnd/Components/SdkResolution/SdkResolverManifest.cs index e6743f911e7..68a14ae42a9 100644 --- a/src/Build/BackEnd/Components/SdkResolution/SdkResolverManifest.cs +++ b/src/Build/BackEnd/Components/SdkResolution/SdkResolverManifest.cs @@ -1,11 +1,11 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Shared; using System; using System.IO; using System.Text.RegularExpressions; using System.Xml; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Build/BackEnd/Components/SdkResolution/SdkResolverService.cs b/src/Build/BackEnd/Components/SdkResolution/SdkResolverService.cs index 275e2b6bd03..8b5f572381a 100644 --- a/src/Build/BackEnd/Components/SdkResolution/SdkResolverService.cs +++ b/src/Build/BackEnd/Components/SdkResolution/SdkResolverService.cs @@ -1,19 +1,19 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.BackEnd.Logging; -using Microsoft.Build.Construction; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; using System; -using System.IO; using System.Collections.Concurrent; using System.Collections.Generic; -using System.Reflection; -using Microsoft.Build.Eventing; +using System.IO; using System.Linq; +using System.Reflection; using System.Text.RegularExpressions; +using Microsoft.Build.BackEnd.Logging; +using Microsoft.Build.Construction; +using Microsoft.Build.Evaluation; +using Microsoft.Build.Eventing; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Build/BackEnd/Components/SdkResolution/SdkResult.cs b/src/Build/BackEnd/Components/SdkResolution/SdkResult.cs index f95bc780ca1..d341db1add7 100644 --- a/src/Build/BackEnd/Components/SdkResolution/SdkResult.cs +++ b/src/Build/BackEnd/Components/SdkResolution/SdkResult.cs @@ -1,10 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Framework; using System; using System.Collections.Generic; using System.Linq; +using Microsoft.Build.Framework; using SdkReference = Microsoft.Build.Framework.SdkReference; using SdkResultBase = Microsoft.Build.Framework.SdkResult; diff --git a/src/Build/BackEnd/Components/SdkResolution/SdkResultFactory.cs b/src/Build/BackEnd/Components/SdkResolution/SdkResultFactory.cs index d4341ee5f1c..56c31a7c5e4 100644 --- a/src/Build/BackEnd/Components/SdkResolution/SdkResultFactory.cs +++ b/src/Build/BackEnd/Components/SdkResolution/SdkResultFactory.cs @@ -1,9 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Framework; using System.Collections.Generic; - +using Microsoft.Build.Framework; using SdkReference = Microsoft.Build.Framework.SdkReference; using SdkResultBase = Microsoft.Build.Framework.SdkResult; using SdkResultFactoryBase = Microsoft.Build.Framework.SdkResultFactory; diff --git a/src/Build/BackEnd/Components/SdkResolution/TranslationHelpers.cs b/src/Build/BackEnd/Components/SdkResolution/TranslationHelpers.cs index 0e2ee6b45c8..efa6765d159 100644 --- a/src/Build/BackEnd/Components/SdkResolution/TranslationHelpers.cs +++ b/src/Build/BackEnd/Components/SdkResolution/TranslationHelpers.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Framework; using System; using System.Collections.Generic; +using Microsoft.Build.Framework; #nullable disable diff --git a/src/Build/BackEnd/Node/InProcNode.cs b/src/Build/BackEnd/Node/InProcNode.cs index c143daf038e..3b0b1600905 100644 --- a/src/Build/BackEnd/Node/InProcNode.cs +++ b/src/Build/BackEnd/Node/InProcNode.cs @@ -2,17 +2,17 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.Collections.Generic; using System.Collections.Concurrent; +using System.Collections.Generic; using System.Globalization; using System.Threading; +using Microsoft.Build.BackEnd.Components.Caching; using Microsoft.Build.Execution; using Microsoft.Build.Framework; using Microsoft.Build.Internal; using Microsoft.Build.Shared; using ILoggingService = Microsoft.Build.BackEnd.Logging.ILoggingService; using NodeLoggingContext = Microsoft.Build.BackEnd.Logging.NodeLoggingContext; -using Microsoft.Build.BackEnd.Components.Caching; #nullable disable diff --git a/src/Build/BackEnd/Node/OutOfProcNode.cs b/src/Build/BackEnd/Node/OutOfProcNode.cs index 266b8189db5..c0c3531ff34 100644 --- a/src/Build/BackEnd/Node/OutOfProcNode.cs +++ b/src/Build/BackEnd/Node/OutOfProcNode.cs @@ -2,22 +2,22 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.Collections.Generic; using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Diagnostics; using System.Diagnostics.CodeAnalysis; -using System.IO; using System.Globalization; +using System.IO; using System.Threading; using Microsoft.Build.BackEnd; +using Microsoft.Build.BackEnd.Components.Caching; using Microsoft.Build.BackEnd.Logging; +using Microsoft.Build.BackEnd.SdkResolution; using Microsoft.Build.Evaluation; using Microsoft.Build.Framework; -using Microsoft.Build.Shared; using Microsoft.Build.Internal; -using Microsoft.Build.BackEnd.Components.Caching; -using Microsoft.Build.BackEnd.SdkResolution; +using Microsoft.Build.Shared; using SdkResult = Microsoft.Build.BackEnd.SdkResolution.SdkResult; -using System.Diagnostics; #nullable disable diff --git a/src/Build/BackEnd/Node/OutOfProcServerNode.cs b/src/Build/BackEnd/Node/OutOfProcServerNode.cs index cc23c012e8e..c77b7f2442c 100644 --- a/src/Build/BackEnd/Node/OutOfProcServerNode.cs +++ b/src/Build/BackEnd/Node/OutOfProcServerNode.cs @@ -7,11 +7,11 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.Build.BackEnd; -using Microsoft.Build.Shared; -using Microsoft.Build.Internal; -using Microsoft.Build.Execution; using Microsoft.Build.BackEnd.Logging; +using Microsoft.Build.Execution; using Microsoft.Build.Framework.Telemetry; +using Microsoft.Build.Internal; +using Microsoft.Build.Shared; namespace Microsoft.Build.Experimental { diff --git a/src/Build/BackEnd/Shared/BuildRequest.cs b/src/Build/BackEnd/Shared/BuildRequest.cs index a2c3132444d..428eea19656 100644 --- a/src/Build/BackEnd/Shared/BuildRequest.cs +++ b/src/Build/BackEnd/Shared/BuildRequest.cs @@ -4,10 +4,10 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; -using Microsoft.Build.Shared; -using Microsoft.Build.Framework; using Microsoft.Build.Execution; using Microsoft.Build.Experimental.ProjectCache; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Build/BackEnd/Shared/BuildRequestConfiguration.cs b/src/Build/BackEnd/Shared/BuildRequestConfiguration.cs index b1616f43858..6d3cf235dc2 100644 --- a/src/Build/BackEnd/Shared/BuildRequestConfiguration.cs +++ b/src/Build/BackEnd/Shared/BuildRequestConfiguration.cs @@ -3,17 +3,17 @@ using System; using System.Collections.Generic; -using System.Globalization; -using Microsoft.Build.Shared; -using Microsoft.Build.Execution; -using Microsoft.Build.Collections; using System.Diagnostics; +using System.Globalization; using System.IO; using System.Linq; using Microsoft.Build.BackEnd.SdkResolution; +using Microsoft.Build.Collections; using Microsoft.Build.Evaluation; +using Microsoft.Build.Execution; using Microsoft.Build.Framework; using Microsoft.Build.Globbing; +using Microsoft.Build.Shared; using Microsoft.Build.Shared.FileSystem; #nullable disable diff --git a/src/Build/BackEnd/Shared/TargetResult.cs b/src/Build/BackEnd/Shared/TargetResult.cs index 21634fb0f4e..3136450178d 100644 --- a/src/Build/BackEnd/Shared/TargetResult.cs +++ b/src/Build/BackEnd/Shared/TargetResult.cs @@ -3,14 +3,14 @@ using System; using System.Diagnostics; -using System.IO; using System.Globalization; +using System.IO; using Microsoft.Build.BackEnd; +using Microsoft.Build.Collections; using Microsoft.Build.Framework; using Microsoft.Build.Shared; -using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; using Microsoft.Build.Shared.FileSystem; -using Microsoft.Build.Collections; +using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; #nullable disable diff --git a/src/Build/Collections/MultiDictionary.cs b/src/Build/Collections/MultiDictionary.cs index 7a1492aa855..4c1243c7010 100644 --- a/src/Build/Collections/MultiDictionary.cs +++ b/src/Build/Collections/MultiDictionary.cs @@ -2,10 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.Collections.Generic; using System.Collections; -using Microsoft.Build.Shared; +using System.Collections.Generic; using System.Diagnostics; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Build/Collections/PropertyDictionary.cs b/src/Build/Collections/PropertyDictionary.cs index 71ddf8eb4b4..5b20c1f59ba 100644 --- a/src/Build/Collections/PropertyDictionary.cs +++ b/src/Build/Collections/PropertyDictionary.cs @@ -5,8 +5,8 @@ using System.Collections; using System.Collections.Generic; using System.Diagnostics; -using Microsoft.Build.Shared; using Microsoft.Build.Evaluation; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Build/Collections/RetrievableEntryHashSet/HashSet.cs b/src/Build/Collections/RetrievableEntryHashSet/HashSet.cs index c480f2cc80e..eeedd7c4c1b 100644 --- a/src/Build/Collections/RetrievableEntryHashSet/HashSet.cs +++ b/src/Build/Collections/RetrievableEntryHashSet/HashSet.cs @@ -5,12 +5,12 @@ using System.Collections; using System.Collections.Generic; using System.Diagnostics; +using System.Diagnostics.CodeAnalysis; using System.Diagnostics.Contracts; using System.Runtime.Serialization; -using System.Diagnostics.CodeAnalysis; using System.Security; -using Microsoft.Build.Shared; using Microsoft.Build.Internal; +using Microsoft.Build.Shared; /* ================================================================================================================== diff --git a/src/Build/Construction/ProjectChooseElement.cs b/src/Build/Construction/ProjectChooseElement.cs index 5914776c11f..39d9fc749ac 100644 --- a/src/Build/Construction/ProjectChooseElement.cs +++ b/src/Build/Construction/ProjectChooseElement.cs @@ -2,12 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Collections.Generic; -using System.Xml; using System.Diagnostics; using System.Linq; +using System.Xml; +using Microsoft.Build.Collections; using Microsoft.Build.ObjectModelRemoting; using Microsoft.Build.Shared; -using Microsoft.Build.Collections; #nullable disable diff --git a/src/Build/Construction/ProjectElement.cs b/src/Build/Construction/ProjectElement.cs index bc4edf2addd..b6208f51108 100644 --- a/src/Build/Construction/ProjectElement.cs +++ b/src/Build/Construction/ProjectElement.cs @@ -3,8 +3,8 @@ using System; using System.Collections.Generic; -using System.Xml; using System.Diagnostics; +using System.Xml; using Microsoft.Build.Framework; using Microsoft.Build.ObjectModelRemoting; using Microsoft.Build.Shared; diff --git a/src/Build/Construction/ProjectElementContainer.cs b/src/Build/Construction/ProjectElementContainer.cs index 5f0c2d45ada..4eb8f8edb91 100644 --- a/src/Build/Construction/ProjectElementContainer.cs +++ b/src/Build/Construction/ProjectElementContainer.cs @@ -3,12 +3,12 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Linq; using System.Xml; -using System.Diagnostics; +using Microsoft.Build.Internal; using Microsoft.Build.ObjectModelRemoting; using Microsoft.Build.Shared; -using Microsoft.Build.Internal; #nullable disable diff --git a/src/Build/Construction/ProjectExtensionsElement.cs b/src/Build/Construction/ProjectExtensionsElement.cs index 9f0058fcbda..3f9f6541d5a 100644 --- a/src/Build/Construction/ProjectExtensionsElement.cs +++ b/src/Build/Construction/ProjectExtensionsElement.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.Xml; using System.Diagnostics; +using System.Xml; using Microsoft.Build.ObjectModelRemoting; using Microsoft.Build.Shared; diff --git a/src/Build/Construction/ProjectItemDefinitionElement.cs b/src/Build/Construction/ProjectItemDefinitionElement.cs index be712263f49..dc8fa52003f 100644 --- a/src/Build/Construction/ProjectItemDefinitionElement.cs +++ b/src/Build/Construction/ProjectItemDefinitionElement.cs @@ -2,9 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Collections.Generic; -using System.Xml; using System.Diagnostics; using System.Linq; +using System.Xml; using Microsoft.Build.Collections; using Microsoft.Build.ObjectModelRemoting; using Microsoft.Build.Shared; diff --git a/src/Build/Construction/ProjectItemDefinitionGroupElement.cs b/src/Build/Construction/ProjectItemDefinitionGroupElement.cs index f8f4d2aad05..892b33cb8d6 100644 --- a/src/Build/Construction/ProjectItemDefinitionGroupElement.cs +++ b/src/Build/Construction/ProjectItemDefinitionGroupElement.cs @@ -2,9 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Collections.Generic; -using System.Xml; using System.Diagnostics; using System.Linq; +using System.Xml; using Microsoft.Build.Collections; using Microsoft.Build.ObjectModelRemoting; using Microsoft.Build.Shared; diff --git a/src/Build/Construction/ProjectItemElement.cs b/src/Build/Construction/ProjectItemElement.cs index 2d9a2e0adfd..bb31b120e9f 100644 --- a/src/Build/Construction/ProjectItemElement.cs +++ b/src/Build/Construction/ProjectItemElement.cs @@ -3,9 +3,9 @@ using System; using System.Collections.Generic; -using System.Xml; using System.Diagnostics; using System.Linq; +using System.Xml; using Microsoft.Build.Collections; using Microsoft.Build.ObjectModelRemoting; using Microsoft.Build.Shared; diff --git a/src/Build/Construction/ProjectOutputElement.cs b/src/Build/Construction/ProjectOutputElement.cs index d1b22301339..43814d3f9a0 100644 --- a/src/Build/Construction/ProjectOutputElement.cs +++ b/src/Build/Construction/ProjectOutputElement.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.Xml; using System.Diagnostics; +using System.Xml; using Microsoft.Build.ObjectModelRemoting; using Microsoft.Build.Shared; diff --git a/src/Build/Construction/ProjectTaskElement.cs b/src/Build/Construction/ProjectTaskElement.cs index 9798a27df29..49048f632bd 100644 --- a/src/Build/Construction/ProjectTaskElement.cs +++ b/src/Build/Construction/ProjectTaskElement.cs @@ -4,9 +4,9 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Xml; using System.Diagnostics; using System.Linq; +using System.Xml; using Microsoft.Build.Collections; using Microsoft.Build.ObjectModelRemoting; using Microsoft.Build.Shared; diff --git a/src/Build/Construction/ProjectWhenElement.cs b/src/Build/Construction/ProjectWhenElement.cs index bf4c2dc4db0..92140145ed1 100644 --- a/src/Build/Construction/ProjectWhenElement.cs +++ b/src/Build/Construction/ProjectWhenElement.cs @@ -2,9 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Collections.Generic; -using System.Xml; using System.Diagnostics; using System.Linq; +using System.Xml; using Microsoft.Build.Collections; using Microsoft.Build.ObjectModelRemoting; using Microsoft.Build.Shared; diff --git a/src/Build/Construction/Solution/SolutionFile.cs b/src/Build/Construction/Solution/SolutionFile.cs index 8326549c24b..4cdd0fe8ac1 100644 --- a/src/Build/Construction/Solution/SolutionFile.cs +++ b/src/Build/Construction/Solution/SolutionFile.cs @@ -3,24 +3,23 @@ using System; using System.Collections.Generic; -using System.Xml; -using System.IO; -using System.Text; +using System.Collections.ObjectModel; using System.Globalization; +using System.IO; using System.Runtime.InteropServices; using System.Security; +using System.Text; using System.Text.Json; using System.Text.RegularExpressions; - +using System.Xml; +using Microsoft.Build.Shared; +using Microsoft.Build.Shared.FileSystem; +using BuildEventFileInfo = Microsoft.Build.Shared.BuildEventFileInfo; using ErrorUtilities = Microsoft.Build.Shared.ErrorUtilities; -using VisualStudioConstants = Microsoft.Build.Shared.VisualStudioConstants; +using ExceptionUtilities = Microsoft.Build.Shared.ExceptionHandling; using ProjectFileErrorUtilities = Microsoft.Build.Shared.ProjectFileErrorUtilities; -using BuildEventFileInfo = Microsoft.Build.Shared.BuildEventFileInfo; using ResourceUtilities = Microsoft.Build.Shared.ResourceUtilities; -using ExceptionUtilities = Microsoft.Build.Shared.ExceptionHandling; -using System.Collections.ObjectModel; -using Microsoft.Build.Shared; -using Microsoft.Build.Shared.FileSystem; +using VisualStudioConstants = Microsoft.Build.Shared.VisualStudioConstants; #nullable disable diff --git a/src/Build/Construction/UsingTaskParameterGroupElement.cs b/src/Build/Construction/UsingTaskParameterGroupElement.cs index 9b58223c601..a0fc796495a 100644 --- a/src/Build/Construction/UsingTaskParameterGroupElement.cs +++ b/src/Build/Construction/UsingTaskParameterGroupElement.cs @@ -2,13 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.Diagnostics; using System.Collections.Generic; +using System.Diagnostics; using System.Linq; using Microsoft.Build.Collections; using Microsoft.Build.ObjectModelRemoting; using Microsoft.Build.Shared; - using ProjectXmlUtilities = Microsoft.Build.Internal.ProjectXmlUtilities; #nullable disable diff --git a/src/Build/Definition/Project.cs b/src/Build/Definition/Project.cs index 6faa9cde0ea..c3df653db94 100644 --- a/src/Build/Definition/Project.cs +++ b/src/Build/Definition/Project.cs @@ -6,32 +6,32 @@ using System.Collections.Immutable; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; +using System.Globalization; using System.IO; using System.Linq; using System.Text; using System.Xml; using Microsoft.Build.BackEnd; +using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Collections; -using ObjectModel = System.Collections.ObjectModel; using Microsoft.Build.Construction; +using Microsoft.Build.Definition; +using Microsoft.Build.Evaluation.Context; using Microsoft.Build.Execution; +using Microsoft.Build.FileSystem; using Microsoft.Build.Framework; +using Microsoft.Build.Globbing; +using Microsoft.Build.ObjectModelRemoting; using Microsoft.Build.Shared; using Constants = Microsoft.Build.Internal.Constants; +using EvaluationItemExpressionFragment = Microsoft.Build.Evaluation.ItemSpec.ItemExpressionFragment; +using EvaluationItemSpec = Microsoft.Build.Evaluation.ItemSpec; using ForwardingLoggerRecord = Microsoft.Build.Logging.ForwardingLoggerRecord; using ILoggingService = Microsoft.Build.BackEnd.Logging.ILoggingService; using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; +using ObjectModel = System.Collections.ObjectModel; using ProjectItemFactory = Microsoft.Build.Evaluation.ProjectItem.ProjectItemFactory; -using System.Globalization; -using Microsoft.Build.BackEnd.Logging; -using Microsoft.Build.Definition; -using Microsoft.Build.Evaluation.Context; -using Microsoft.Build.Globbing; -using Microsoft.Build.ObjectModelRemoting; -using EvaluationItemSpec = Microsoft.Build.Evaluation.ItemSpec; -using EvaluationItemExpressionFragment = Microsoft.Build.Evaluation.ItemSpec.ItemExpressionFragment; using SdkResult = Microsoft.Build.BackEnd.SdkResolution.SdkResult; -using Microsoft.Build.FileSystem; #nullable disable diff --git a/src/Build/Definition/ProjectCollection.cs b/src/Build/Definition/ProjectCollection.cs index 2a7325a9d32..1f24703fd5b 100644 --- a/src/Build/Definition/ProjectCollection.cs +++ b/src/Build/Definition/ProjectCollection.cs @@ -10,15 +10,14 @@ using System.Reflection; using System.Threading; using System.Xml; - using Microsoft.Build.BackEnd; using Microsoft.Build.Collections; using Microsoft.Build.Construction; using Microsoft.Build.Execution; using Microsoft.Build.Framework; +using Microsoft.Build.Internal; using Microsoft.Build.ObjectModelRemoting; using Microsoft.Build.Shared; -using Microsoft.Build.Internal; using ForwardingLoggerRecord = Microsoft.Build.Logging.ForwardingLoggerRecord; using ILoggingService = Microsoft.Build.BackEnd.Logging.ILoggingService; using InternalLoggerException = Microsoft.Build.Exceptions.InternalLoggerException; diff --git a/src/Build/Definition/ProjectItem.cs b/src/Build/Definition/ProjectItem.cs index 11e35aa5ece..645f8810cc0 100644 --- a/src/Build/Definition/ProjectItem.cs +++ b/src/Build/Definition/ProjectItem.cs @@ -1,15 +1,15 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System; +using System.Collections.Generic; using System.Diagnostics; +using System.Diagnostics.CodeAnalysis; +using System.Linq; using Microsoft.Build.Collections; using Microsoft.Build.Construction; using Microsoft.Build.ObjectModelRemoting; using Microsoft.Build.Shared; -using System.Collections.Generic; -using System; -using System.Diagnostics.CodeAnalysis; -using System.Linq; using Microsoft.Build.Shared.FileSystem; #nullable disable diff --git a/src/Build/Definition/ProjectItemDefinition.cs b/src/Build/Definition/ProjectItemDefinition.cs index 0e3ddd7a1d8..5cbad98cb06 100644 --- a/src/Build/Definition/ProjectItemDefinition.cs +++ b/src/Build/Definition/ProjectItemDefinition.cs @@ -1,15 +1,15 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System; +using System.Collections.Generic; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; +using System.Linq; using Microsoft.Build.Collections; using Microsoft.Build.Construction; using Microsoft.Build.ObjectModelRemoting; using Microsoft.Build.Shared; -using System.Collections.Generic; -using System; -using System.Linq; #nullable disable diff --git a/src/Build/Definition/ProjectMetadata.cs b/src/Build/Definition/ProjectMetadata.cs index aa172d165b5..bd4cc51c88a 100644 --- a/src/Build/Definition/ProjectMetadata.cs +++ b/src/Build/Definition/ProjectMetadata.cs @@ -3,8 +3,8 @@ using System; using System.Diagnostics; -using Microsoft.Build.Construction; using Microsoft.Build.Collections; +using Microsoft.Build.Construction; using Microsoft.Build.ObjectModelRemoting; using Microsoft.Build.Shared; diff --git a/src/Build/Definition/ToolsetLocalReader.cs b/src/Build/Definition/ToolsetLocalReader.cs index b4476a5786e..33feee94720 100644 --- a/src/Build/Definition/ToolsetLocalReader.cs +++ b/src/Build/Definition/ToolsetLocalReader.cs @@ -1,12 +1,12 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System.Collections.Generic; +using System.Linq; using Microsoft.Build.Collections; using Microsoft.Build.Construction; using Microsoft.Build.Execution; using Microsoft.Build.Shared; -using System.Collections.Generic; -using System.Linq; #nullable disable diff --git a/src/Build/Definition/ToolsetPropertyDefinition.cs b/src/Build/Definition/ToolsetPropertyDefinition.cs index 2c38bce7b0c..da172891cd1 100644 --- a/src/Build/Definition/ToolsetPropertyDefinition.cs +++ b/src/Build/Definition/ToolsetPropertyDefinition.cs @@ -2,9 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Diagnostics; - -using ErrorUtilities = Microsoft.Build.Shared.ErrorUtilities; using Microsoft.Build.Shared; +using ErrorUtilities = Microsoft.Build.Shared.ErrorUtilities; #nullable disable diff --git a/src/Build/Definition/ToolsetReader.cs b/src/Build/Definition/ToolsetReader.cs index c7723447806..9c064f5e68f 100644 --- a/src/Build/Definition/ToolsetReader.cs +++ b/src/Build/Definition/ToolsetReader.cs @@ -2,21 +2,21 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.IO; using System.Collections.Generic; +using System.IO; using System.Linq; +using System.Runtime.CompilerServices; using System.Text.RegularExpressions; -using Microsoft.Build.Shared; using Microsoft.Build.Collections; using Microsoft.Build.Execution; using Microsoft.Build.Framework; using Microsoft.Build.Internal; +using Microsoft.Build.Shared; using Microsoft.Build.Shared.FileSystem; using ErrorUtils = Microsoft.Build.Shared.ErrorUtilities; using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using InvalidToolsetDefinitionException = Microsoft.Build.Exceptions.InvalidToolsetDefinitionException; using ReservedPropertyNames = Microsoft.Build.Internal.ReservedPropertyNames; -using System.Runtime.CompilerServices; #nullable disable diff --git a/src/Build/Definition/ToolsetRegistryReader.cs b/src/Build/Definition/ToolsetRegistryReader.cs index 7c38151cac7..0cc16709f31 100644 --- a/src/Build/Definition/ToolsetRegistryReader.cs +++ b/src/Build/Definition/ToolsetRegistryReader.cs @@ -5,17 +5,16 @@ using System; using System.Collections.Generic; - -using Microsoft.Build.Shared; -using error = Microsoft.Build.Shared.ErrorUtilities; -using RegistryKeyWrapper = Microsoft.Build.Internal.RegistryKeyWrapper; -using RegistryException = Microsoft.Build.Exceptions.RegistryException; -using InvalidToolsetDefinitionException = Microsoft.Build.Exceptions.InvalidToolsetDefinitionException; -using Constants = Microsoft.Build.Internal.Constants; -using Microsoft.Build.Construction; using Microsoft.Build.Collections; +using Microsoft.Build.Construction; using Microsoft.Build.Execution; using Microsoft.Build.Internal; +using Microsoft.Build.Shared; +using Constants = Microsoft.Build.Internal.Constants; +using error = Microsoft.Build.Shared.ErrorUtilities; +using InvalidToolsetDefinitionException = Microsoft.Build.Exceptions.InvalidToolsetDefinitionException; +using RegistryException = Microsoft.Build.Exceptions.RegistryException; +using RegistryKeyWrapper = Microsoft.Build.Internal.RegistryKeyWrapper; #nullable disable diff --git a/src/Build/ElementLocation/ElementLocation.cs b/src/Build/ElementLocation/ElementLocation.cs index 63629f1ef21..8d84d5dc908 100644 --- a/src/Build/ElementLocation/ElementLocation.cs +++ b/src/Build/ElementLocation/ElementLocation.cs @@ -1,11 +1,11 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Shared; -using Microsoft.Build.BackEnd; -using Microsoft.Build.Collections; using System; using System.Diagnostics; +using Microsoft.Build.BackEnd; +using Microsoft.Build.Collections; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Build/ElementLocation/RegistryLocation.cs b/src/Build/ElementLocation/RegistryLocation.cs index b39b4da62a2..f8e947908d1 100644 --- a/src/Build/ElementLocation/RegistryLocation.cs +++ b/src/Build/ElementLocation/RegistryLocation.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Shared; -using Microsoft.Build.BackEnd; using System; +using Microsoft.Build.BackEnd; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Build/ElementLocation/XmlAttributeWithLocation.cs b/src/Build/ElementLocation/XmlAttributeWithLocation.cs index c0fbad7e82c..6749621b10c 100644 --- a/src/Build/ElementLocation/XmlAttributeWithLocation.cs +++ b/src/Build/ElementLocation/XmlAttributeWithLocation.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.Xml; using System.Diagnostics; +using System.Xml; #nullable disable diff --git a/src/Build/ElementLocation/XmlElementWithLocation.cs b/src/Build/ElementLocation/XmlElementWithLocation.cs index 91a5f107a36..ddbf27a08de 100644 --- a/src/Build/ElementLocation/XmlElementWithLocation.cs +++ b/src/Build/ElementLocation/XmlElementWithLocation.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.Xml; using System.Diagnostics; +using System.Xml; using Microsoft.Build.ObjectModelRemoting; #nullable disable diff --git a/src/Build/Evaluation/ConditionEvaluator.cs b/src/Build/Evaluation/ConditionEvaluator.cs index 653cfe536b9..3ff00696595 100644 --- a/src/Build/Evaluation/ConditionEvaluator.cs +++ b/src/Build/Evaluation/ConditionEvaluator.cs @@ -11,13 +11,13 @@ namespace Microsoft.Build.Evaluation { - using ILoggingService = Microsoft.Build.BackEnd.Logging.ILoggingService; - using BuildEventContext = Microsoft.Build.Framework.BuildEventContext; - using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; - using ElementLocation = Microsoft.Build.Construction.ElementLocation; + using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Shared; using Microsoft.Build.Shared.FileSystem; - using Microsoft.Build.BackEnd.Logging; + using BuildEventContext = Microsoft.Build.Framework.BuildEventContext; + using ElementLocation = Microsoft.Build.Construction.ElementLocation; + using ILoggingService = Microsoft.Build.BackEnd.Logging.ILoggingService; + using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; internal static class ConditionEvaluator { diff --git a/src/Build/Evaluation/Conditionals/AndExpressionNode.cs b/src/Build/Evaluation/Conditionals/AndExpressionNode.cs index 07708c80e85..ce021dc2f10 100644 --- a/src/Build/Evaluation/Conditionals/AndExpressionNode.cs +++ b/src/Build/Evaluation/Conditionals/AndExpressionNode.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System.Diagnostics; using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Shared; -using System.Diagnostics; #nullable disable diff --git a/src/Build/Evaluation/Conditionals/NotExpressionNode.cs b/src/Build/Evaluation/Conditionals/NotExpressionNode.cs index f40106ded47..71dec16ec3d 100644 --- a/src/Build/Evaluation/Conditionals/NotExpressionNode.cs +++ b/src/Build/Evaluation/Conditionals/NotExpressionNode.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System.Diagnostics; using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Shared; -using System.Diagnostics; #nullable disable diff --git a/src/Build/Evaluation/Conditionals/OrExpressionNode.cs b/src/Build/Evaluation/Conditionals/OrExpressionNode.cs index ea702400754..9d4add7436e 100644 --- a/src/Build/Evaluation/Conditionals/OrExpressionNode.cs +++ b/src/Build/Evaluation/Conditionals/OrExpressionNode.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System.Diagnostics; using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Shared; -using System.Diagnostics; #nullable disable diff --git a/src/Build/Evaluation/Conditionals/Scanner.cs b/src/Build/Evaluation/Conditionals/Scanner.cs index 76ad5124991..a9d31698a28 100644 --- a/src/Build/Evaluation/Conditionals/Scanner.cs +++ b/src/Build/Evaluation/Conditionals/Scanner.cs @@ -1,10 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.Globalization; using System; using System.Diagnostics; - +using System.Globalization; using Microsoft.Build.Shared; #nullable disable diff --git a/src/Build/Evaluation/EvaluatorMetadataTable.cs b/src/Build/Evaluation/EvaluatorMetadataTable.cs index 9f7c871a7e0..d48f458465c 100644 --- a/src/Build/Evaluation/EvaluatorMetadataTable.cs +++ b/src/Build/Evaluation/EvaluatorMetadataTable.cs @@ -4,9 +4,8 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.Build.Construction; using Microsoft.Build.Collections; - +using Microsoft.Build.Construction; using EscapingUtilities = Microsoft.Build.Shared.EscapingUtilities; #nullable disable diff --git a/src/Build/Evaluation/Expander.cs b/src/Build/Evaluation/Expander.cs index ab6d9b76eb6..5e3147ec52f 100644 --- a/src/Build/Evaluation/Expander.cs +++ b/src/Build/Evaluation/Expander.cs @@ -12,6 +12,7 @@ using System.Reflection; using System.Runtime.CompilerServices; using System.Text.RegularExpressions; +using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Collections; using Microsoft.Build.Evaluation.Context; using Microsoft.Build.Execution; @@ -19,15 +20,13 @@ using Microsoft.Build.Internal; using Microsoft.Build.Shared; using Microsoft.Build.Shared.FileSystem; +using Microsoft.NET.StringTools; using Microsoft.Win32; using AvailableStaticMethods = Microsoft.Build.Internal.AvailableStaticMethods; using ReservedPropertyNames = Microsoft.Build.Internal.ReservedPropertyNames; using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; using TaskItemFactory = Microsoft.Build.Execution.ProjectItemInstance.TaskItem.TaskItemFactory; -using Microsoft.NET.StringTools; -using Microsoft.Build.BackEnd.Logging; - #nullable disable namespace Microsoft.Build.Evaluation diff --git a/src/Build/Evaluation/ExpressionShredder.cs b/src/Build/Evaluation/ExpressionShredder.cs index e7130f4b211..c555a10d0e2 100644 --- a/src/Build/Evaluation/ExpressionShredder.cs +++ b/src/Build/Evaluation/ExpressionShredder.cs @@ -2,9 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using Microsoft.Build.Shared; using System.Collections.Generic; using Microsoft.Build.Collections; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Build/Evaluation/IEvaluatorData.cs b/src/Build/Evaluation/IEvaluatorData.cs index 2c534c608d2..729e99b48ab 100644 --- a/src/Build/Evaluation/IEvaluatorData.cs +++ b/src/Build/Evaluation/IEvaluatorData.cs @@ -3,12 +3,12 @@ using System; using System.Collections.Generic; -using Microsoft.Build.Construction; -using Microsoft.Build.Execution; -using Microsoft.Build.Collections; using Microsoft.Build.BackEnd; using Microsoft.Build.BackEnd.SdkResolution; +using Microsoft.Build.Collections; +using Microsoft.Build.Construction; using Microsoft.Build.Evaluation.Context; +using Microsoft.Build.Execution; #nullable disable diff --git a/src/Build/Evaluation/LazyItemEvaluator.EvaluatorData.cs b/src/Build/Evaluation/LazyItemEvaluator.EvaluatorData.cs index 19290e8f921..6bda7df146c 100644 --- a/src/Build/Evaluation/LazyItemEvaluator.EvaluatorData.cs +++ b/src/Build/Evaluation/LazyItemEvaluator.EvaluatorData.cs @@ -1,15 +1,15 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Collections; using System; using System.Collections.Generic; using Microsoft.Build.BackEnd; +using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.BackEnd.SdkResolution; +using Microsoft.Build.Collections; using Microsoft.Build.Construction; using Microsoft.Build.Evaluation.Context; using Microsoft.Build.Execution; -using Microsoft.Build.BackEnd.Logging; #nullable disable diff --git a/src/Build/Evaluation/LazyItemEvaluator.IncludeOperation.cs b/src/Build/Evaluation/LazyItemEvaluator.IncludeOperation.cs index 4850ef44d0a..f35b4cc322a 100644 --- a/src/Build/Evaluation/LazyItemEvaluator.IncludeOperation.cs +++ b/src/Build/Evaluation/LazyItemEvaluator.IncludeOperation.cs @@ -1,16 +1,16 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System; +using System.Collections.Generic; +using System.Collections.Immutable; +using System.Linq; using Microsoft.Build.Construction; using Microsoft.Build.Eventing; using Microsoft.Build.Framework; using Microsoft.Build.Internal; using Microsoft.Build.Shared; using Microsoft.CodeAnalysis.Collections; -using System; -using System.Collections.Generic; -using System.Collections.Immutable; -using System.Linq; #nullable disable diff --git a/src/Build/Evaluation/LazyItemEvaluator.LazyItemOperation.cs b/src/Build/Evaluation/LazyItemEvaluator.LazyItemOperation.cs index 9517f7c0542..bd7933842b0 100644 --- a/src/Build/Evaluation/LazyItemEvaluator.LazyItemOperation.cs +++ b/src/Build/Evaluation/LazyItemEvaluator.LazyItemOperation.cs @@ -1,14 +1,14 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Construction; -using Microsoft.Build.Eventing; -using Microsoft.Build.Shared; using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; using System.Linq; +using Microsoft.Build.Construction; +using Microsoft.Build.Eventing; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Build/Evaluation/LazyItemEvaluator.RemoveOperation.cs b/src/Build/Evaluation/LazyItemEvaluator.RemoveOperation.cs index ddabfcf4e94..771b0e6ce40 100644 --- a/src/Build/Evaluation/LazyItemEvaluator.RemoveOperation.cs +++ b/src/Build/Evaluation/LazyItemEvaluator.RemoveOperation.cs @@ -1,12 +1,12 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Construction; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; +using Microsoft.Build.Construction; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Build/Evaluation/LazyItemEvaluator.UpdateOperation.cs b/src/Build/Evaluation/LazyItemEvaluator.UpdateOperation.cs index bddbcaf8150..e773885225b 100644 --- a/src/Build/Evaluation/LazyItemEvaluator.UpdateOperation.cs +++ b/src/Build/Evaluation/LazyItemEvaluator.UpdateOperation.cs @@ -3,10 +3,10 @@ using System; using System.Collections.Generic; -using Microsoft.Build.Construction; -using Microsoft.Build.Framework; using System.Collections.Immutable; using System.Linq; +using Microsoft.Build.Construction; +using Microsoft.Build.Framework; #nullable disable diff --git a/src/Build/Evaluation/ProjectParser.cs b/src/Build/Evaluation/ProjectParser.cs index 9c38f01f962..e622acbfdc5 100644 --- a/src/Build/Evaluation/ProjectParser.cs +++ b/src/Build/Evaluation/ProjectParser.cs @@ -1,13 +1,12 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Eventing; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; using System; using System.Collections.Generic; using System.Xml; - +using Microsoft.Build.Eventing; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using Expander = Microsoft.Build.Evaluation.Expander; using ProjectXmlUtilities = Microsoft.Build.Internal.ProjectXmlUtilities; using ReservedPropertyNames = Microsoft.Build.Internal.ReservedPropertyNames; diff --git a/src/Build/Evaluation/ProjectRootElementCache.cs b/src/Build/Evaluation/ProjectRootElementCache.cs index beb1d86e13e..49e921d8160 100644 --- a/src/Build/Evaluation/ProjectRootElementCache.cs +++ b/src/Build/Evaluation/ProjectRootElementCache.cs @@ -3,16 +3,15 @@ using System; using System.Collections.Generic; +using System.Diagnostics; +using System.Globalization; using System.IO; using System.Xml; -using Microsoft.Build.Construction; - -using ErrorUtilities = Microsoft.Build.Shared.ErrorUtilities; using Microsoft.Build.Collections; -using Microsoft.Build.Shared; -using System.Diagnostics; -using System.Globalization; +using Microsoft.Build.Construction; using Microsoft.Build.Internal; +using Microsoft.Build.Shared; +using ErrorUtilities = Microsoft.Build.Shared.ErrorUtilities; using OutOfProcNode = Microsoft.Build.Execution.OutOfProcNode; #nullable disable diff --git a/src/Build/Evaluation/ProjectStringCache.cs b/src/Build/Evaluation/ProjectStringCache.cs index f6fdd3733b0..dc1132049de 100644 --- a/src/Build/Evaluation/ProjectStringCache.cs +++ b/src/Build/Evaluation/ProjectStringCache.cs @@ -5,10 +5,10 @@ using System.Collections.Generic; using System.Diagnostics; using System.Xml; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Shared; using Microsoft.Build.Collections; +using Microsoft.Build.Evaluation; using Microsoft.Build.Framework; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Build/Evaluation/PropertyTrackingEvaluatorDataWrapper.cs b/src/Build/Evaluation/PropertyTrackingEvaluatorDataWrapper.cs index 08ddb45cd60..7a4d6da9521 100644 --- a/src/Build/Evaluation/PropertyTrackingEvaluatorDataWrapper.cs +++ b/src/Build/Evaluation/PropertyTrackingEvaluatorDataWrapper.cs @@ -1,14 +1,14 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.BackEnd; -using Microsoft.Build.Collections; -using Microsoft.Build.Construction; -using Microsoft.Build.Execution; using System; using System.Collections.Generic; +using Microsoft.Build.BackEnd; using Microsoft.Build.BackEnd.Components.Logging; +using Microsoft.Build.Collections; +using Microsoft.Build.Construction; using Microsoft.Build.Evaluation.Context; +using Microsoft.Build.Execution; using Microsoft.Build.Framework; using Microsoft.Build.Shared; using SdkResult = Microsoft.Build.BackEnd.SdkResolution.SdkResult; diff --git a/src/Build/Evaluation/ToolsetProvider.cs b/src/Build/Evaluation/ToolsetProvider.cs index 9309c78af57..01fa37d33e2 100644 --- a/src/Build/Evaluation/ToolsetProvider.cs +++ b/src/Build/Evaluation/ToolsetProvider.cs @@ -3,10 +3,10 @@ using System; using System.Collections.Generic; +using Microsoft.Build.BackEnd; using Microsoft.Build.Collections; using Microsoft.Build.Execution; using Microsoft.Build.Shared; -using Microsoft.Build.BackEnd; #nullable disable diff --git a/src/Build/FileSystem/MSBuildFileSystemBase.cs b/src/Build/FileSystem/MSBuildFileSystemBase.cs index a6be85df301..3fc54552ddd 100644 --- a/src/Build/FileSystem/MSBuildFileSystemBase.cs +++ b/src/Build/FileSystem/MSBuildFileSystemBase.cs @@ -1,10 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Shared.FileSystem; using System; using System.Collections.Generic; using System.IO; +using Microsoft.Build.Shared.FileSystem; #nullable disable diff --git a/src/Build/Instance/HostServices.cs b/src/Build/Instance/HostServices.cs index 3bd49e0fe24..2154606e625 100644 --- a/src/Build/Instance/HostServices.cs +++ b/src/Build/Instance/HostServices.cs @@ -1,15 +1,15 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Shared; -using Microsoft.Build.Framework; -using System.Collections.Generic; using System; +using System.Collections.Generic; using System.Diagnostics; -using System.Runtime.InteropServices; using System.Linq; -using Microsoft.Build.BackEnd; +using System.Runtime.InteropServices; using System.Runtime.Versioning; +using Microsoft.Build.BackEnd; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Build/Instance/ProjectItemGroupTaskInstance.cs b/src/Build/Instance/ProjectItemGroupTaskInstance.cs index 6166df3ed20..93b70dbf356 100644 --- a/src/Build/Instance/ProjectItemGroupTaskInstance.cs +++ b/src/Build/Instance/ProjectItemGroupTaskInstance.cs @@ -5,9 +5,8 @@ using System.Diagnostics; using Microsoft.Build.BackEnd; using Microsoft.Build.Collections; -using Microsoft.Build.Shared; - using Microsoft.Build.Construction; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Build/Instance/ProjectItemGroupTaskItemInstance.cs b/src/Build/Instance/ProjectItemGroupTaskItemInstance.cs index e48abcebe21..8ab3e2a467a 100644 --- a/src/Build/Instance/ProjectItemGroupTaskItemInstance.cs +++ b/src/Build/Instance/ProjectItemGroupTaskItemInstance.cs @@ -5,9 +5,8 @@ using System.Diagnostics; using Microsoft.Build.BackEnd; using Microsoft.Build.Collections; -using Microsoft.Build.Shared; - using Microsoft.Build.Construction; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Build/Instance/ProjectItemGroupTaskMetadataInstance.cs b/src/Build/Instance/ProjectItemGroupTaskMetadataInstance.cs index 6c0a2915eff..4779f833474 100644 --- a/src/Build/Instance/ProjectItemGroupTaskMetadataInstance.cs +++ b/src/Build/Instance/ProjectItemGroupTaskMetadataInstance.cs @@ -3,9 +3,8 @@ using System.Diagnostics; using Microsoft.Build.BackEnd; -using Microsoft.Build.Shared; - using Microsoft.Build.Construction; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Build/Instance/ProjectItemInstance.cs b/src/Build/Instance/ProjectItemInstance.cs index 05aa7f5e8c0..2d124f82d8d 100644 --- a/src/Build/Instance/ProjectItemInstance.cs +++ b/src/Build/Instance/ProjectItemInstance.cs @@ -6,15 +6,14 @@ using System.Collections.Generic; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; -using System.Linq; using System.IO; - +using System.Linq; +using Microsoft.Build.BackEnd; using Microsoft.Build.Collections; -using Microsoft.Build.Shared; +using Microsoft.Build.Construction; using Microsoft.Build.Evaluation; using Microsoft.Build.Framework; -using Microsoft.Build.Construction; -using Microsoft.Build.BackEnd; +using Microsoft.Build.Shared; using Microsoft.Build.Shared.FileSystem; #nullable disable diff --git a/src/Build/Instance/ProjectMetadataInstance.cs b/src/Build/Instance/ProjectMetadataInstance.cs index e1cd5c22df6..dc807f89574 100644 --- a/src/Build/Instance/ProjectMetadataInstance.cs +++ b/src/Build/Instance/ProjectMetadataInstance.cs @@ -3,10 +3,10 @@ using System; using System.Diagnostics; +using Microsoft.Build.BackEnd; using Microsoft.Build.Collections; -using Microsoft.Build.Shared; using Microsoft.Build.Evaluation; -using Microsoft.Build.BackEnd; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Build/Instance/ProjectOnErrorInstance.cs b/src/Build/Instance/ProjectOnErrorInstance.cs index f36b8407df7..b4ee503221a 100644 --- a/src/Build/Instance/ProjectOnErrorInstance.cs +++ b/src/Build/Instance/ProjectOnErrorInstance.cs @@ -3,9 +3,8 @@ using System.Diagnostics; using Microsoft.Build.BackEnd; -using Microsoft.Build.Shared; - using Microsoft.Build.Construction; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Build/Instance/ProjectPropertyGroupTaskInstance.cs b/src/Build/Instance/ProjectPropertyGroupTaskInstance.cs index 428761765b5..aaef26a3e97 100644 --- a/src/Build/Instance/ProjectPropertyGroupTaskInstance.cs +++ b/src/Build/Instance/ProjectPropertyGroupTaskInstance.cs @@ -5,9 +5,8 @@ using System.Diagnostics; using Microsoft.Build.BackEnd; using Microsoft.Build.Collections; -using Microsoft.Build.Shared; - using Microsoft.Build.Construction; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Build/Instance/ProjectPropertyGroupTaskPropertyInstance.cs b/src/Build/Instance/ProjectPropertyGroupTaskPropertyInstance.cs index 9f2640e0de9..6eb9b3f1972 100644 --- a/src/Build/Instance/ProjectPropertyGroupTaskPropertyInstance.cs +++ b/src/Build/Instance/ProjectPropertyGroupTaskPropertyInstance.cs @@ -3,9 +3,8 @@ using System.Diagnostics; using Microsoft.Build.BackEnd; -using Microsoft.Build.Shared; - using Microsoft.Build.Construction; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Build/Instance/ProjectPropertyInstance.cs b/src/Build/Instance/ProjectPropertyInstance.cs index 300d6150226..efcc5bbec16 100644 --- a/src/Build/Instance/ProjectPropertyInstance.cs +++ b/src/Build/Instance/ProjectPropertyInstance.cs @@ -3,15 +3,14 @@ using System; using System.Diagnostics; +using Microsoft.Build.BackEnd; +using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Collections; using Microsoft.Build.Construction; -using Microsoft.Build.Shared; using Microsoft.Build.Evaluation; -using Microsoft.Build.BackEnd; - -using ReservedPropertyNames = Microsoft.Build.Internal.ReservedPropertyNames; -using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using ReservedPropertyNames = Microsoft.Build.Internal.ReservedPropertyNames; #nullable disable diff --git a/src/Build/Instance/ProjectTargetInstanceChild.cs b/src/Build/Instance/ProjectTargetInstanceChild.cs index 7a2fa4c7240..a44cf35b295 100644 --- a/src/Build/Instance/ProjectTargetInstanceChild.cs +++ b/src/Build/Instance/ProjectTargetInstanceChild.cs @@ -2,9 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.Build.BackEnd; -using Microsoft.Build.Shared; - using Microsoft.Build.Construction; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Build/Instance/ProjectTaskInstance.cs b/src/Build/Instance/ProjectTaskInstance.cs index 87fac8bd045..1e066edcda8 100644 --- a/src/Build/Instance/ProjectTaskInstance.cs +++ b/src/Build/Instance/ProjectTaskInstance.cs @@ -1,13 +1,13 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System; using System.Collections.Generic; -using Microsoft.Build.Construction; -using Microsoft.Build.Collections; -using Microsoft.Build.Shared; using System.Diagnostics; -using System; using Microsoft.Build.BackEnd; +using Microsoft.Build.Collections; +using Microsoft.Build.Construction; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Build/Instance/ProjectTaskInstanceChild.cs b/src/Build/Instance/ProjectTaskInstanceChild.cs index a4a94933f0a..a9b67aa341b 100644 --- a/src/Build/Instance/ProjectTaskInstanceChild.cs +++ b/src/Build/Instance/ProjectTaskInstanceChild.cs @@ -2,9 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.Build.BackEnd; -using Microsoft.Build.Shared; - using Microsoft.Build.Construction; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Build/Instance/ProjectTaskOutputItemInstance.cs b/src/Build/Instance/ProjectTaskOutputItemInstance.cs index e475c63cb23..f0f0eb61705 100644 --- a/src/Build/Instance/ProjectTaskOutputItemInstance.cs +++ b/src/Build/Instance/ProjectTaskOutputItemInstance.cs @@ -2,9 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.Build.BackEnd; -using Microsoft.Build.Shared; - using Microsoft.Build.Construction; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Build/Instance/ProjectTaskOutputPropertyInstance.cs b/src/Build/Instance/ProjectTaskOutputPropertyInstance.cs index 01152bb2ed9..38dc5f6adb6 100644 --- a/src/Build/Instance/ProjectTaskOutputPropertyInstance.cs +++ b/src/Build/Instance/ProjectTaskOutputPropertyInstance.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.Build.BackEnd; -using Microsoft.Build.Shared; using Microsoft.Build.Construction; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Build/Instance/TaskFactories/TaskHostTask.cs b/src/Build/Instance/TaskFactories/TaskHostTask.cs index 19cde9900c8..0b874696321 100644 --- a/src/Build/Instance/TaskFactories/TaskHostTask.cs +++ b/src/Build/Instance/TaskFactories/TaskHostTask.cs @@ -2,17 +2,16 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.Collections.Generic; using System.Collections.Concurrent; +using System.Collections.Generic; using System.Diagnostics; using System.Reflection; using System.Threading; - +using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Exceptions; using Microsoft.Build.Framework; using Microsoft.Build.Internal; using Microsoft.Build.Shared; -using Microsoft.Build.BackEnd.Logging; #nullable disable diff --git a/src/Build/Instance/TaskFactoryWrapper.cs b/src/Build/Instance/TaskFactoryWrapper.cs index bcdf1286940..58dcc1b4e7b 100644 --- a/src/Build/Instance/TaskFactoryWrapper.cs +++ b/src/Build/Instance/TaskFactoryWrapper.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.Reflection; using System.Collections.Generic; +using System.Reflection; using Microsoft.Build.Collections; using Microsoft.Build.Framework; using Microsoft.Build.Shared; diff --git a/src/Build/Instance/TaskRegistry.cs b/src/Build/Instance/TaskRegistry.cs index ced1b61e0fa..33cf3ae1322 100644 --- a/src/Build/Instance/TaskRegistry.cs +++ b/src/Build/Instance/TaskRegistry.cs @@ -2,26 +2,24 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.Diagnostics; using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Diagnostics; using System.IO; using System.Reflection; +using Microsoft.Build.BackEnd; using Microsoft.Build.Collections; +using Microsoft.Build.Construction; +using Microsoft.Build.Evaluation; using Microsoft.Build.Framework; using Microsoft.Build.Shared; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Construction; -using Microsoft.Build.BackEnd; - +using Microsoft.Build.Shared.FileSystem; +using Microsoft.NET.StringTools; using ILoggingService = Microsoft.Build.BackEnd.Logging.ILoggingService; using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; -using TaskEngineAssemblyResolver = Microsoft.Build.BackEnd.Logging.TaskEngineAssemblyResolver; using ProjectXmlUtilities = Microsoft.Build.Internal.ProjectXmlUtilities; using TargetLoggingContext = Microsoft.Build.BackEnd.Logging.TargetLoggingContext; -using System.Collections.ObjectModel; -using Microsoft.Build.Shared.FileSystem; - -using Microsoft.NET.StringTools; +using TaskEngineAssemblyResolver = Microsoft.Build.BackEnd.Logging.TaskEngineAssemblyResolver; #nullable disable diff --git a/src/Build/Logging/BaseConsoleLogger.cs b/src/Build/Logging/BaseConsoleLogger.cs index 67e6691aa4d..ce386341186 100644 --- a/src/Build/Logging/BaseConsoleLogger.cs +++ b/src/Build/Logging/BaseConsoleLogger.cs @@ -8,14 +8,12 @@ using System.IO; using System.Linq; using System.Text; - using Microsoft.Build.Evaluation; using Microsoft.Build.Framework; using Microsoft.Build.Internal; using Microsoft.Build.Shared; - -using ColorSetter = Microsoft.Build.Logging.ColorSetter; using ColorResetter = Microsoft.Build.Logging.ColorResetter; +using ColorSetter = Microsoft.Build.Logging.ColorSetter; using WriteHandler = Microsoft.Build.Logging.WriteHandler; #nullable disable diff --git a/src/Build/Logging/ConsoleLogger.cs b/src/Build/Logging/ConsoleLogger.cs index 6cd217dc48a..be295c3bf94 100644 --- a/src/Build/Logging/ConsoleLogger.cs +++ b/src/Build/Logging/ConsoleLogger.cs @@ -2,14 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; - using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Framework; using Microsoft.Build.Shared; - using BaseConsoleLogger = Microsoft.Build.BackEnd.Logging.BaseConsoleLogger; -using SerialConsoleLogger = Microsoft.Build.BackEnd.Logging.SerialConsoleLogger; using ParallelConsoleLogger = Microsoft.Build.BackEnd.Logging.ParallelConsoleLogger; +using SerialConsoleLogger = Microsoft.Build.BackEnd.Logging.SerialConsoleLogger; #nullable disable diff --git a/src/Build/Logging/LoggerDescription.cs b/src/Build/Logging/LoggerDescription.cs index 3f9dff7f034..a66ac147253 100644 --- a/src/Build/Logging/LoggerDescription.cs +++ b/src/Build/Logging/LoggerDescription.cs @@ -2,13 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.Reflection; using System.IO; - +using System.Reflection; +using Microsoft.Build.BackEnd; using Microsoft.Build.Framework; using Microsoft.Build.Shared; -using Microsoft.Build.BackEnd; - using InternalLoggerException = Microsoft.Build.Exceptions.InternalLoggerException; #nullable disable diff --git a/src/Build/Logging/ParallelLogger/ParallelConsoleLogger.cs b/src/Build/Logging/ParallelLogger/ParallelConsoleLogger.cs index 6fc7b7e6702..2c22169321f 100644 --- a/src/Build/Logging/ParallelLogger/ParallelConsoleLogger.cs +++ b/src/Build/Logging/ParallelLogger/ParallelConsoleLogger.cs @@ -3,15 +3,15 @@ using System; using System.Collections; -using System.Globalization; using System.Collections.Generic; +using System.Globalization; +using System.Linq; using Microsoft.Build.Evaluation; using Microsoft.Build.Framework; using Microsoft.Build.Shared; -using ColorSetter = Microsoft.Build.Logging.ColorSetter; using ColorResetter = Microsoft.Build.Logging.ColorResetter; +using ColorSetter = Microsoft.Build.Logging.ColorSetter; using WriteHandler = Microsoft.Build.Logging.WriteHandler; -using System.Linq; #nullable disable diff --git a/src/Build/Logging/ParallelLogger/ParallelLoggerHelpers.cs b/src/Build/Logging/ParallelLogger/ParallelLoggerHelpers.cs index 0774ad98fbd..d7612d7f3a6 100644 --- a/src/Build/Logging/ParallelLogger/ParallelLoggerHelpers.cs +++ b/src/Build/Logging/ParallelLogger/ParallelLoggerHelpers.cs @@ -3,9 +3,9 @@ using System; using System.Collections.Generic; +using System.Globalization; using Microsoft.Build.Framework; using Microsoft.Build.Shared; -using System.Globalization; #nullable disable diff --git a/src/Build/Logging/SerialConsoleLogger.cs b/src/Build/Logging/SerialConsoleLogger.cs index f5f8127a5c2..ac0ce5609c3 100644 --- a/src/Build/Logging/SerialConsoleLogger.cs +++ b/src/Build/Logging/SerialConsoleLogger.cs @@ -2,16 +2,14 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.Collections.Generic; using System.Collections; - +using System.Collections.Generic; +using System.Linq; using Microsoft.Build.Framework; using Microsoft.Build.Shared; - -using ColorSetter = Microsoft.Build.Logging.ColorSetter; using ColorResetter = Microsoft.Build.Logging.ColorResetter; +using ColorSetter = Microsoft.Build.Logging.ColorSetter; using WriteHandler = Microsoft.Build.Logging.WriteHandler; -using System.Linq; #nullable disable diff --git a/src/Build/ObjectModelRemoting/DefinitionObjectsLinks/ProjectItemDefinitionLink.cs b/src/Build/ObjectModelRemoting/DefinitionObjectsLinks/ProjectItemDefinitionLink.cs index ea9a88049be..aec8a9493a0 100644 --- a/src/Build/ObjectModelRemoting/DefinitionObjectsLinks/ProjectItemDefinitionLink.cs +++ b/src/Build/ObjectModelRemoting/DefinitionObjectsLinks/ProjectItemDefinitionLink.cs @@ -1,8 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Evaluation; using System.Collections.Generic; +using Microsoft.Build.Evaluation; #nullable disable diff --git a/src/Build/ObjectModelRemoting/DefinitionObjectsLinks/ProjectItemLink.cs b/src/Build/ObjectModelRemoting/DefinitionObjectsLinks/ProjectItemLink.cs index 6f21870c95d..609ba0a95fd 100644 --- a/src/Build/ObjectModelRemoting/DefinitionObjectsLinks/ProjectItemLink.cs +++ b/src/Build/ObjectModelRemoting/DefinitionObjectsLinks/ProjectItemLink.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System.Collections.Generic; using Microsoft.Build.Construction; using Microsoft.Build.Evaluation; -using System.Collections.Generic; #nullable disable diff --git a/src/Build/ObjectModelRemoting/LinkedObjectFactory.cs b/src/Build/ObjectModelRemoting/LinkedObjectFactory.cs index 76b3a0a5f4c..4baaa9ace7d 100644 --- a/src/Build/ObjectModelRemoting/LinkedObjectFactory.cs +++ b/src/Build/ObjectModelRemoting/LinkedObjectFactory.cs @@ -1,10 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System.Collections.Generic; using Microsoft.Build.Construction; using Microsoft.Build.Evaluation; using Microsoft.Build.Framework; -using System.Collections.Generic; #nullable disable diff --git a/src/Build/Resources/AssemblyResources.cs b/src/Build/Resources/AssemblyResources.cs index f6113241bf7..19954b16396 100644 --- a/src/Build/Resources/AssemblyResources.cs +++ b/src/Build/Resources/AssemblyResources.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.Resources; -using System.Reflection; using System.Globalization; +using System.Reflection; +using System.Resources; #nullable disable diff --git a/src/Build/Resources/Constants.cs b/src/Build/Resources/Constants.cs index fb8c9b64a74..2436979d94f 100644 --- a/src/Build/Resources/Constants.cs +++ b/src/Build/Resources/Constants.cs @@ -2,10 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.IO; -using System.Collections.Generic; using System.Collections.Concurrent; +using System.Collections.Generic; using System.Globalization; +using System.IO; using System.Runtime.InteropServices; using System.Text.RegularExpressions; using Microsoft.Build.Collections; diff --git a/src/Build/Utilities/EngineFileUtilities.cs b/src/Build/Utilities/EngineFileUtilities.cs index 997b6c29c0c..a0dd2580e23 100644 --- a/src/Build/Utilities/EngineFileUtilities.cs +++ b/src/Build/Utilities/EngineFileUtilities.cs @@ -6,11 +6,11 @@ using System.Collections.Generic; using System.IO; using System.Linq; +using System.Text.RegularExpressions; using Microsoft.Build.BackEnd.Components.Logging; using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Framework; using Microsoft.Build.Shared; -using System.Text.RegularExpressions; #nullable disable diff --git a/src/Build/Utilities/FileSpecMatchTester.cs b/src/Build/Utilities/FileSpecMatchTester.cs index 977655e7fa2..15380c2d5a0 100644 --- a/src/Build/Utilities/FileSpecMatchTester.cs +++ b/src/Build/Utilities/FileSpecMatchTester.cs @@ -1,11 +1,11 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Shared; using System; using System.Diagnostics; using System.IO; using System.Text.RegularExpressions; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Build/Utilities/SimpleVersion.cs b/src/Build/Utilities/SimpleVersion.cs index 82f23426a39..9ed8e0eb05d 100644 --- a/src/Build/Utilities/SimpleVersion.cs +++ b/src/Build/Utilities/SimpleVersion.cs @@ -1,10 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Shared; using System; using System.Diagnostics; using System.Globalization; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Build/Utilities/Utilities.cs b/src/Build/Utilities/Utilities.cs index 12e73b4806b..c70d46dac78 100644 --- a/src/Build/Utilities/Utilities.cs +++ b/src/Build/Utilities/Utilities.cs @@ -2,14 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.Diagnostics; using System.Collections; using System.Collections.Generic; +using System.Diagnostics; using System.IO; using System.Linq; using System.Text.RegularExpressions; using System.Xml; - using Microsoft.Build.Collections; using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; diff --git a/src/Build/Xml/ProjectXmlUtilities.XmlElementChildIterator.cs b/src/Build/Xml/ProjectXmlUtilities.XmlElementChildIterator.cs index d0ea43ec76e..acd3388da81 100644 --- a/src/Build/Xml/ProjectXmlUtilities.XmlElementChildIterator.cs +++ b/src/Build/Xml/ProjectXmlUtilities.XmlElementChildIterator.cs @@ -2,9 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; +using System.Diagnostics; using System.Xml; using Microsoft.Build.Construction; -using System.Diagnostics; #nullable disable diff --git a/src/Build/Xml/ProjectXmlUtilities.cs b/src/Build/Xml/ProjectXmlUtilities.cs index e9c01d6bd13..25667c21f6c 100644 --- a/src/Build/Xml/ProjectXmlUtilities.cs +++ b/src/Build/Xml/ProjectXmlUtilities.cs @@ -3,11 +3,11 @@ using System; using System.Collections.Generic; -using Microsoft.Build.Shared; -using Microsoft.Build.Construction; using System.IO; using System.Xml; +using Microsoft.Build.Construction; using Microsoft.Build.Framework; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Framework.UnitTests/LoggerException_Tests.cs b/src/Framework.UnitTests/LoggerException_Tests.cs index 91ba8b2eae5..abc8c6fc726 100644 --- a/src/Framework.UnitTests/LoggerException_Tests.cs +++ b/src/Framework.UnitTests/LoggerException_Tests.cs @@ -4,10 +4,9 @@ using System; using System.IO; using System.Runtime.Serialization.Formatters.Binary; - using Microsoft.Build.Framework; -using Xunit; using Shouldly; +using Xunit; #nullable disable diff --git a/src/Framework.UnitTests/SdkReference_Tests.cs b/src/Framework.UnitTests/SdkReference_Tests.cs index bc63f3b8c23..90f225b8f18 100644 --- a/src/Framework.UnitTests/SdkReference_Tests.cs +++ b/src/Framework.UnitTests/SdkReference_Tests.cs @@ -1,8 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Xunit; using Shouldly; +using Xunit; #nullable disable diff --git a/src/Framework/BuildEventArgs.cs b/src/Framework/BuildEventArgs.cs index 01daed1341a..206ab7fa5a9 100644 --- a/src/Framework/BuildEventArgs.cs +++ b/src/Framework/BuildEventArgs.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.Runtime.Serialization; using System.IO; +using System.Runtime.Serialization; using System.Text; using Microsoft.Build.Shared; diff --git a/src/Framework/ITaskHost.cs b/src/Framework/ITaskHost.cs index d4a0f207409..687d2c3229f 100644 --- a/src/Framework/ITaskHost.cs +++ b/src/Framework/ITaskHost.cs @@ -1,8 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.Runtime.InteropServices; using System.Diagnostics.CodeAnalysis; +using System.Runtime.InteropServices; #nullable disable diff --git a/src/Framework/ProjectStartedEventArgs.cs b/src/Framework/ProjectStartedEventArgs.cs index 55f523a2dc1..539fae2b5e1 100644 --- a/src/Framework/ProjectStartedEventArgs.cs +++ b/src/Framework/ProjectStartedEventArgs.cs @@ -3,10 +3,10 @@ using System; using System.Collections; -using System.IO; -using System.Runtime.Serialization; using System.Collections.Generic; +using System.IO; using System.Linq; +using System.Runtime.Serialization; using Microsoft.Build.Shared; namespace Microsoft.Build.Framework diff --git a/src/Framework/TargetFinishedEventArgs.cs b/src/Framework/TargetFinishedEventArgs.cs index 7dd9e1ad1d7..5909897d5eb 100644 --- a/src/Framework/TargetFinishedEventArgs.cs +++ b/src/Framework/TargetFinishedEventArgs.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.IO; using System.Collections; +using System.IO; using Microsoft.Build.Shared; #nullable disable diff --git a/src/MSBuild.UnitTests/PerfLog_Tests.cs b/src/MSBuild.UnitTests/PerfLog_Tests.cs index 9927e43e78c..eadb3226199 100644 --- a/src/MSBuild.UnitTests/PerfLog_Tests.cs +++ b/src/MSBuild.UnitTests/PerfLog_Tests.cs @@ -2,11 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.IO; - using Microsoft.Build.UnitTests.Shared; +using Shouldly; using Xunit; using Xunit.Abstractions; -using Shouldly; #nullable disable diff --git a/src/MSBuild.UnitTests/XMake_Tests.cs b/src/MSBuild.UnitTests/XMake_Tests.cs index 3dec3a1446c..6dceee9e1f8 100644 --- a/src/MSBuild.UnitTests/XMake_Tests.cs +++ b/src/MSBuild.UnitTests/XMake_Tests.cs @@ -6,20 +6,19 @@ using System.Diagnostics; using System.Globalization; using System.IO; +using System.IO.Compression; using System.Linq; +using System.Reflection; using System.Threading; - using Microsoft.Build.CommandLine; using Microsoft.Build.Framework; +using Microsoft.Build.Logging; using Microsoft.Build.Shared; using Microsoft.Build.UnitTests.Shared; +using Microsoft.Build.Utilities; +using Shouldly; using Xunit; using Xunit.Abstractions; -using Shouldly; -using System.IO.Compression; -using System.Reflection; -using Microsoft.Build.Utilities; -using Microsoft.Build.Logging; #nullable disable diff --git a/src/MSBuild/AssemblyResources.cs b/src/MSBuild/AssemblyResources.cs index a0eaaa57204..041c55cc2b2 100644 --- a/src/MSBuild/AssemblyResources.cs +++ b/src/MSBuild/AssemblyResources.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.Resources; -using System.Reflection; using System.Globalization; +using System.Reflection; +using System.Resources; #nullable disable diff --git a/src/MSBuild/MSBuildClientApp.cs b/src/MSBuild/MSBuildClientApp.cs index c9ea4f7cd03..6b0cd0fffbc 100644 --- a/src/MSBuild/MSBuildClientApp.cs +++ b/src/MSBuild/MSBuildClientApp.cs @@ -2,10 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using Microsoft.Build.Shared; using System.Threading; using Microsoft.Build.Experimental; using Microsoft.Build.Framework.Telemetry; +using Microsoft.Build.Shared; #if RUNTIME_TYPE_NETCORE || MONO using System.IO; diff --git a/src/MSBuildTaskHost/AssemblyResources.cs b/src/MSBuildTaskHost/AssemblyResources.cs index d03e3abe886..6ee4f10b194 100644 --- a/src/MSBuildTaskHost/AssemblyResources.cs +++ b/src/MSBuildTaskHost/AssemblyResources.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.Resources; -using System.Reflection; using System.Globalization; +using System.Reflection; +using System.Resources; #nullable disable diff --git a/src/MSBuildTaskHost/TypeLoader.cs b/src/MSBuildTaskHost/TypeLoader.cs index 08ab44925ed..148cc6b1210 100644 --- a/src/MSBuildTaskHost/TypeLoader.cs +++ b/src/MSBuildTaskHost/TypeLoader.cs @@ -2,9 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; +using System.Collections.Generic; using System.IO; using System.Reflection; -using System.Collections.Generic; using System.Threading; using Microsoft.Build.Framework; diff --git a/src/Samples/Dependency/Properties/AssemblyInfo.cs b/src/Samples/Dependency/Properties/AssemblyInfo.cs index 4219e2cae88..0fa73ca8f5c 100644 --- a/src/Samples/Dependency/Properties/AssemblyInfo.cs +++ b/src/Samples/Dependency/Properties/AssemblyInfo.cs @@ -1,8 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.Resources; using System.Reflection; +using System.Resources; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information diff --git a/src/Samples/PortableTask/Properties/AssemblyInfo.cs b/src/Samples/PortableTask/Properties/AssemblyInfo.cs index 098449693bb..574e376635c 100644 --- a/src/Samples/PortableTask/Properties/AssemblyInfo.cs +++ b/src/Samples/PortableTask/Properties/AssemblyInfo.cs @@ -1,8 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.Resources; using System.Reflection; +using System.Resources; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information diff --git a/src/Samples/PortableTask/ShowItems.cs b/src/Samples/PortableTask/ShowItems.cs index 15937c7a645..061f38bdb7d 100644 --- a/src/Samples/PortableTask/ShowItems.cs +++ b/src/Samples/PortableTask/ShowItems.cs @@ -1,8 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Framework; using System.Reflection; +using Microsoft.Build.Framework; #nullable disable diff --git a/src/Samples/TaskUsageLogger/TaskUsageLogger.cs b/src/Samples/TaskUsageLogger/TaskUsageLogger.cs index 207ed556262..d20a09bfd14 100644 --- a/src/Samples/TaskUsageLogger/TaskUsageLogger.cs +++ b/src/Samples/TaskUsageLogger/TaskUsageLogger.cs @@ -2,14 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.IO; using System.Collections.Generic; -using System.Linq; -using System.Globalization; -using System.Text.RegularExpressions; using System.Diagnostics; +using System.Globalization; +using System.IO; +using System.Linq; using System.Reflection; - +using System.Text.RegularExpressions; using Microsoft.Build.Construction; using Microsoft.Build.Evaluation; using Microsoft.Build.Framework; diff --git a/src/Samples/TaskWithDependency/Properties/AssemblyInfo.cs b/src/Samples/TaskWithDependency/Properties/AssemblyInfo.cs index ac44e52b0c3..ab5fb3ba759 100644 --- a/src/Samples/TaskWithDependency/Properties/AssemblyInfo.cs +++ b/src/Samples/TaskWithDependency/Properties/AssemblyInfo.cs @@ -1,8 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.Resources; using System.Reflection; +using System.Resources; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information diff --git a/src/Shared/AssemblyLoadInfo.cs b/src/Shared/AssemblyLoadInfo.cs index d4b3413772c..be467ff2a20 100644 --- a/src/Shared/AssemblyLoadInfo.cs +++ b/src/Shared/AssemblyLoadInfo.cs @@ -2,9 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; +using System.Diagnostics; using System.IO; using Microsoft.Build.BackEnd; -using System.Diagnostics; #nullable disable diff --git a/src/Shared/AssemblyNameExtension.cs b/src/Shared/AssemblyNameExtension.cs index aed07dfebdd..c63b0ff90a1 100644 --- a/src/Shared/AssemblyNameExtension.cs +++ b/src/Shared/AssemblyNameExtension.cs @@ -2,13 +2,13 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.Text; -using System.Reflection; -using System.Globalization; using System.Collections.Generic; using System.Configuration.Assemblies; -using System.Runtime.Serialization; +using System.Globalization; using System.IO; +using System.Reflection; +using System.Runtime.Serialization; +using System.Text; using Microsoft.Build.BackEnd; #nullable disable diff --git a/src/Shared/BinaryTranslator.cs b/src/Shared/BinaryTranslator.cs index e7bf01731cc..055d34bb141 100644 --- a/src/Shared/BinaryTranslator.cs +++ b/src/Shared/BinaryTranslator.cs @@ -4,11 +4,11 @@ using System; using System.Collections.Generic; using System.Diagnostics; +using System.Globalization; using System.IO; using System.Runtime.Serialization.Formatters.Binary; using Microsoft.Build.Framework; using Microsoft.Build.Shared; -using System.Globalization; #nullable disable diff --git a/src/Shared/BuildEnvironmentHelper.cs b/src/Shared/BuildEnvironmentHelper.cs index 493ab1758b5..2e437517ef0 100644 --- a/src/Shared/BuildEnvironmentHelper.cs +++ b/src/Shared/BuildEnvironmentHelper.cs @@ -2,12 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; +using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Linq; -using System.Collections.Generic; using System.Text.RegularExpressions; - using Microsoft.Build.Framework; using Microsoft.Build.Shared.FileSystem; diff --git a/src/Shared/CoreCLRAssemblyLoader.cs b/src/Shared/CoreCLRAssemblyLoader.cs index f1bd9b9fca4..27bdb7e93e3 100644 --- a/src/Shared/CoreCLRAssemblyLoader.cs +++ b/src/Shared/CoreCLRAssemblyLoader.cs @@ -1,14 +1,14 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Framework; -using Microsoft.Build.Shared.FileSystem; using System; using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Reflection; using System.Runtime.Loader; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared.FileSystem; #nullable disable diff --git a/src/Shared/Debugging/DebugUtils.cs b/src/Shared/Debugging/DebugUtils.cs index 3dbb923f690..cd81d66dc0c 100644 --- a/src/Shared/Debugging/DebugUtils.cs +++ b/src/Shared/Debugging/DebugUtils.cs @@ -1,11 +1,11 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Framework; using System; using System.Diagnostics; using System.IO; using System.Text.RegularExpressions; +using Microsoft.Build.Framework; #nullable disable diff --git a/src/Shared/ErrorUtilities.cs b/src/Shared/ErrorUtilities.cs index 1dc5a2b9c8a..048974719bb 100644 --- a/src/Shared/ErrorUtilities.cs +++ b/src/Shared/ErrorUtilities.cs @@ -3,11 +3,10 @@ using System; using System.Collections.Generic; -using System.IO; using System.Diagnostics; using System.Globalization; +using System.IO; using System.Threading; - using Microsoft.Build.Framework; #nullable disable diff --git a/src/Shared/LanguageParser/CSharptokenEnumerator.cs b/src/Shared/LanguageParser/CSharptokenEnumerator.cs index 0dbcda4b003..1e3e70f5c03 100644 --- a/src/Shared/LanguageParser/CSharptokenEnumerator.cs +++ b/src/Shared/LanguageParser/CSharptokenEnumerator.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.IO; using System.Diagnostics; +using System.IO; #nullable disable diff --git a/src/Shared/LanguageParser/CSharptokenizer.cs b/src/Shared/LanguageParser/CSharptokenizer.cs index d609157d3d2..06519da0616 100644 --- a/src/Shared/LanguageParser/CSharptokenizer.cs +++ b/src/Shared/LanguageParser/CSharptokenizer.cs @@ -1,8 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.IO; using System.Collections; +using System.IO; #nullable disable diff --git a/src/Shared/LanguageParser/VisualBasictokenizer.cs b/src/Shared/LanguageParser/VisualBasictokenizer.cs index fc76012673e..59b51bbb49b 100644 --- a/src/Shared/LanguageParser/VisualBasictokenizer.cs +++ b/src/Shared/LanguageParser/VisualBasictokenizer.cs @@ -1,8 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.IO; using System.Collections; +using System.IO; #nullable disable diff --git a/src/Shared/MSBuildLoadContext.cs b/src/Shared/MSBuildLoadContext.cs index 6bbdaa7983e..9bde8a4db14 100644 --- a/src/Shared/MSBuildLoadContext.cs +++ b/src/Shared/MSBuildLoadContext.cs @@ -1,14 +1,13 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Framework; -using Microsoft.Build.Shared.FileSystem; - using System; using System.Collections.Immutable; using System.IO; using System.Reflection; using System.Runtime.Loader; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared.FileSystem; namespace Microsoft.Build.Shared { diff --git a/src/Shared/Modifiers.cs b/src/Shared/Modifiers.cs index 24ed8cc9a85..785e7c42ce1 100644 --- a/src/Shared/Modifiers.cs +++ b/src/Shared/Modifiers.cs @@ -2,9 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.IO; -using System.Diagnostics.CodeAnalysis; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; +using System.IO; using Microsoft.Build.Shared.FileSystem; #nullable disable diff --git a/src/Shared/ProjectWriter.cs b/src/Shared/ProjectWriter.cs index bcbcf374cb2..fa2e6f76a1c 100644 --- a/src/Shared/ProjectWriter.cs +++ b/src/Shared/ProjectWriter.cs @@ -3,9 +3,9 @@ using System; using System.IO; -using System.Xml; using System.Text; using System.Text.RegularExpressions; +using System.Xml; #nullable disable diff --git a/src/Shared/ReadOnlyCollection.cs b/src/Shared/ReadOnlyCollection.cs index 452b28889d2..32d751d2749 100644 --- a/src/Shared/ReadOnlyCollection.cs +++ b/src/Shared/ReadOnlyCollection.cs @@ -2,9 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; +using System.Collections; using System.Collections.Generic; using System.Linq; -using System.Collections; using Microsoft.Build.Shared; #nullable disable diff --git a/src/Shared/ReadOnlyEmptyCollection.cs b/src/Shared/ReadOnlyEmptyCollection.cs index a29a5f75867..128480dca68 100644 --- a/src/Shared/ReadOnlyEmptyCollection.cs +++ b/src/Shared/ReadOnlyEmptyCollection.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.Collections.Generic; using System.Collections; +using System.Collections.Generic; using Microsoft.Build.Shared; #nullable disable diff --git a/src/Shared/RegistryDelegates.cs b/src/Shared/RegistryDelegates.cs index a3eb5d25133..3222f6e2600 100644 --- a/src/Shared/RegistryDelegates.cs +++ b/src/Shared/RegistryDelegates.cs @@ -1,8 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Win32; using System.Collections.Generic; +using Microsoft.Win32; namespace Microsoft.Build.Shared { diff --git a/src/Shared/StrongNameHelpers.cs b/src/Shared/StrongNameHelpers.cs index f72147f976d..102681f6050 100644 --- a/src/Shared/StrongNameHelpers.cs +++ b/src/Shared/StrongNameHelpers.cs @@ -4,10 +4,10 @@ #if FEATURE_STRONG_NAMES using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; using System.Diagnostics.CodeAnalysis; using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; #nullable disable diff --git a/src/Shared/UnitTests/BuildEventArgsExtension.cs b/src/Shared/UnitTests/BuildEventArgsExtension.cs index 4ee4e78d47e..eb492bbecd7 100644 --- a/src/Shared/UnitTests/BuildEventArgsExtension.cs +++ b/src/Shared/UnitTests/BuildEventArgsExtension.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using Microsoft.Build.Framework; using System.Collections.Generic; +using Microsoft.Build.Framework; using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; #nullable disable diff --git a/src/Shared/UnitTests/CopyOnWriteDictionary_Tests.cs b/src/Shared/UnitTests/CopyOnWriteDictionary_Tests.cs index 7b77647dd70..9589762b100 100644 --- a/src/Shared/UnitTests/CopyOnWriteDictionary_Tests.cs +++ b/src/Shared/UnitTests/CopyOnWriteDictionary_Tests.cs @@ -6,8 +6,8 @@ using System.IO; using System.Runtime.Serialization.Formatters.Binary; using Microsoft.Build.Collections; -using Xunit; using Shouldly; +using Xunit; #nullable disable diff --git a/src/Shared/UnitTests/FileMatcher_Tests.cs b/src/Shared/UnitTests/FileMatcher_Tests.cs index b8c1416aa96..18b321ada7e 100644 --- a/src/Shared/UnitTests/FileMatcher_Tests.cs +++ b/src/Shared/UnitTests/FileMatcher_Tests.cs @@ -1,16 +1,16 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Shouldly; using System; -using System.Collections.Generic; using System.Collections.Concurrent; +using System.Collections.Generic; using System.IO; using System.Linq; using System.Text.RegularExpressions; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using Microsoft.Build.Shared.FileSystem; +using Shouldly; using Xunit; using Xunit.Abstractions; using Xunit.NetCore.Extensions; diff --git a/src/Shared/UnitTests/FileUtilities_Tests.cs b/src/Shared/UnitTests/FileUtilities_Tests.cs index 86f2028956c..a99d79be223 100644 --- a/src/Shared/UnitTests/FileUtilities_Tests.cs +++ b/src/Shared/UnitTests/FileUtilities_Tests.cs @@ -4,8 +4,8 @@ using System; using System.Globalization; using System.IO; -using System.Threading; using System.Linq; +using System.Threading; using Microsoft.Build.Shared; using Shouldly; using Xunit; diff --git a/src/Shared/UnitTests/ObjectModelHelpers.cs b/src/Shared/UnitTests/ObjectModelHelpers.cs index ac61dc8380c..bc3c06d8cb6 100644 --- a/src/Shared/UnitTests/ObjectModelHelpers.cs +++ b/src/Shared/UnitTests/ObjectModelHelpers.cs @@ -12,8 +12,6 @@ using System.Threading; using System.Threading.Tasks; using System.Xml; - -using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using Microsoft.Build.Construction; using Microsoft.Build.Definition; using Microsoft.Build.Evaluation; @@ -27,6 +25,7 @@ using Shouldly; using Xunit; using Xunit.Abstractions; +using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; #nullable disable diff --git a/src/Shared/UnitTests/TestEnvironment.cs b/src/Shared/UnitTests/TestEnvironment.cs index 6e531508885..830e4463a64 100644 --- a/src/Shared/UnitTests/TestEnvironment.cs +++ b/src/Shared/UnitTests/TestEnvironment.cs @@ -15,9 +15,8 @@ using Shouldly; using Xunit; using Xunit.Abstractions; - -using TempPaths = System.Collections.Generic.Dictionary; using CommonWriterType = System.Action>; +using TempPaths = System.Collections.Generic.Dictionary; #nullable disable diff --git a/src/Shared/UnitTests/TypeLoader_Tests.cs b/src/Shared/UnitTests/TypeLoader_Tests.cs index 742bfca4919..4f206d425b9 100644 --- a/src/Shared/UnitTests/TypeLoader_Tests.cs +++ b/src/Shared/UnitTests/TypeLoader_Tests.cs @@ -4,13 +4,13 @@ using System; using System.IO; -using Microsoft.Build.Shared; +using System.Linq; using System.Reflection; +using Microsoft.Build.Shared; using Microsoft.Build.UnitTests.Shared; +using Shouldly; using Xunit; using Xunit.Abstractions; -using Shouldly; -using System.Linq; #nullable disable diff --git a/src/StringTools.Benchmark/SpanBasedStringBuilder_Benchmark.cs b/src/StringTools.Benchmark/SpanBasedStringBuilder_Benchmark.cs index b4cc4806e20..c5ea2533add 100644 --- a/src/StringTools.Benchmark/SpanBasedStringBuilder_Benchmark.cs +++ b/src/StringTools.Benchmark/SpanBasedStringBuilder_Benchmark.cs @@ -1,8 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using BenchmarkDotNet.Attributes; using System.Text; +using BenchmarkDotNet.Attributes; #nullable disable diff --git a/src/Tasks.UnitTests/AspNetCompiler_Tests.cs b/src/Tasks.UnitTests/AspNetCompiler_Tests.cs index 61b899f3c1a..d0bbb4b1df0 100644 --- a/src/Tasks.UnitTests/AspNetCompiler_Tests.cs +++ b/src/Tasks.UnitTests/AspNetCompiler_Tests.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Tasks; -using Microsoft.Build.Evaluation; using System.Globalization; +using Microsoft.Build.Evaluation; +using Microsoft.Build.Tasks; using Xunit; #nullable disable diff --git a/src/Tasks.UnitTests/AssemblyDependency/Miscellaneous.cs b/src/Tasks.UnitTests/AssemblyDependency/Miscellaneous.cs index 5dd2309309b..d8a3e63f4e9 100644 --- a/src/Tasks.UnitTests/AssemblyDependency/Miscellaneous.cs +++ b/src/Tasks.UnitTests/AssemblyDependency/Miscellaneous.cs @@ -11,14 +11,14 @@ using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Microsoft.Build.Tasks; +using Microsoft.Build.UnitTests.Shared; using Microsoft.Build.Utilities; using Microsoft.Win32; +using Shouldly; using Xunit; -using SystemProcessorArchitecture = System.Reflection.ProcessorArchitecture; using Xunit.Abstractions; -using Shouldly; -using Microsoft.Build.UnitTests.Shared; using Xunit.NetCore.Extensions; +using SystemProcessorArchitecture = System.Reflection.ProcessorArchitecture; #nullable disable diff --git a/src/Tasks.UnitTests/AssemblyDependency/ResolveAssemblyReferenceTestFixture.cs b/src/Tasks.UnitTests/AssemblyDependency/ResolveAssemblyReferenceTestFixture.cs index 690a1eb3dd8..748cce32307 100644 --- a/src/Tasks.UnitTests/AssemblyDependency/ResolveAssemblyReferenceTestFixture.cs +++ b/src/Tasks.UnitTests/AssemblyDependency/ResolveAssemblyReferenceTestFixture.cs @@ -6,19 +6,18 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.IO; +using System.Runtime.Versioning; using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Microsoft.Build.Tasks; using Microsoft.Build.Tasks.AssemblyDependency; using Microsoft.Build.Utilities; using Microsoft.Win32; -using FrameworkNameVersioning = System.Runtime.Versioning.FrameworkName; -using SystemProcessorArchitecture = System.Reflection.ProcessorArchitecture; using Xunit; using Xunit.Abstractions; - +using FrameworkNameVersioning = System.Runtime.Versioning.FrameworkName; using NativeMethods = Microsoft.Build.Tasks.NativeMethods; -using System.Runtime.Versioning; +using SystemProcessorArchitecture = System.Reflection.ProcessorArchitecture; #nullable disable diff --git a/src/Tasks.UnitTests/AssignLinkMetadata_Tests.cs b/src/Tasks.UnitTests/AssignLinkMetadata_Tests.cs index 68ae84b67c6..f4fa9b32284 100644 --- a/src/Tasks.UnitTests/AssignLinkMetadata_Tests.cs +++ b/src/Tasks.UnitTests/AssignLinkMetadata_Tests.cs @@ -2,14 +2,14 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; +using System.Collections.Generic; using System.IO; -using Microsoft.Build.Framework; -using Microsoft.Build.Tasks; -using Microsoft.Build.Utilities; using Microsoft.Build.Evaluation; -using System.Collections.Generic; using Microsoft.Build.Execution; +using Microsoft.Build.Framework; using Microsoft.Build.Shared; +using Microsoft.Build.Tasks; +using Microsoft.Build.Utilities; using Xunit; #nullable disable diff --git a/src/Tasks.UnitTests/AssignProjectConfiguration_Tests.cs b/src/Tasks.UnitTests/AssignProjectConfiguration_Tests.cs index 048fa815c50..5a84c242c91 100644 --- a/src/Tasks.UnitTests/AssignProjectConfiguration_Tests.cs +++ b/src/Tasks.UnitTests/AssignProjectConfiguration_Tests.cs @@ -4,10 +4,9 @@ using System; using System.Collections; using System.Xml; - using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Tasks; +using Microsoft.Build.Utilities; using Xunit; using Xunit.Abstractions; diff --git a/src/Tasks.UnitTests/AxTlbBaseTask_Tests.cs b/src/Tasks.UnitTests/AxTlbBaseTask_Tests.cs index da0e6a9097a..9965648369b 100644 --- a/src/Tasks.UnitTests/AxTlbBaseTask_Tests.cs +++ b/src/Tasks.UnitTests/AxTlbBaseTask_Tests.cs @@ -3,10 +3,10 @@ using System; using System.IO; +using Microsoft.Build.Shared; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; using Microsoft.Runtime.Hosting; -using Microsoft.Build.Shared; using Xunit; using Xunit.NetCore.Extensions; diff --git a/src/Tasks.UnitTests/CodeTaskFactoryTests.cs b/src/Tasks.UnitTests/CodeTaskFactoryTests.cs index 4837636b510..f6d0b3a01ed 100644 --- a/src/Tasks.UnitTests/CodeTaskFactoryTests.cs +++ b/src/Tasks.UnitTests/CodeTaskFactoryTests.cs @@ -1,12 +1,12 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.IO; using System; +using System.IO; using System.Linq; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; using Xunit; #nullable disable diff --git a/src/Tasks.UnitTests/ComReferenceWalker_Tests.cs b/src/Tasks.UnitTests/ComReferenceWalker_Tests.cs index 54f66e923a1..689a15dbb70 100644 --- a/src/Tasks.UnitTests/ComReferenceWalker_Tests.cs +++ b/src/Tasks.UnitTests/ComReferenceWalker_Tests.cs @@ -3,10 +3,10 @@ using System; using System.Collections.Generic; -using Microsoft.Build.Tasks; using System.Runtime.InteropServices.ComTypes; -using COMException = System.Runtime.InteropServices.COMException; +using Microsoft.Build.Tasks; using Xunit; +using COMException = System.Runtime.InteropServices.COMException; #nullable disable diff --git a/src/Tasks.UnitTests/ComReference_Tests.cs b/src/Tasks.UnitTests/ComReference_Tests.cs index d30c3552c9f..741cd74479e 100644 --- a/src/Tasks.UnitTests/ComReference_Tests.cs +++ b/src/Tasks.UnitTests/ComReference_Tests.cs @@ -3,8 +3,8 @@ using System; using System.Collections.Generic; -using Microsoft.Build.Tasks; using Microsoft.Build.Shared; +using Microsoft.Build.Tasks; using Xunit; using Xunit.NetCore.Extensions; diff --git a/src/Tasks.UnitTests/CommandLine_Support.cs b/src/Tasks.UnitTests/CommandLine_Support.cs index 0c33111ede9..36ca55794f3 100644 --- a/src/Tasks.UnitTests/CommandLine_Support.cs +++ b/src/Tasks.UnitTests/CommandLine_Support.cs @@ -3,9 +3,9 @@ using System; using System.Reflection; +using Microsoft.Build.Shared; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; using Xunit; #nullable disable diff --git a/src/Tasks.UnitTests/CreateItem_Tests.cs b/src/Tasks.UnitTests/CreateItem_Tests.cs index c9edcec199b..69f481a1cf7 100644 --- a/src/Tasks.UnitTests/CreateItem_Tests.cs +++ b/src/Tasks.UnitTests/CreateItem_Tests.cs @@ -1,8 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.IO; using System.Collections.Generic; +using System.IO; using Microsoft.Build.Definition; using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; @@ -10,9 +10,9 @@ using Microsoft.Build.Shared; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; +using Shouldly; using Xunit; using Xunit.Abstractions; -using Shouldly; using Xunit.NetCore.Extensions; #nullable disable diff --git a/src/Tasks.UnitTests/CreateProperty_Tests.cs b/src/Tasks.UnitTests/CreateProperty_Tests.cs index f20bc8c9f60..23e74a88957 100644 --- a/src/Tasks.UnitTests/CreateProperty_Tests.cs +++ b/src/Tasks.UnitTests/CreateProperty_Tests.cs @@ -1,8 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Evaluation; using System; +using Microsoft.Build.Evaluation; using Xunit; #nullable disable diff --git a/src/Tasks.UnitTests/DirectoryBuildProjectImportTestBase.cs b/src/Tasks.UnitTests/DirectoryBuildProjectImportTestBase.cs index ce9919c8aa5..f0bf4e2172e 100644 --- a/src/Tasks.UnitTests/DirectoryBuildProjectImportTestBase.cs +++ b/src/Tasks.UnitTests/DirectoryBuildProjectImportTestBase.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Evaluation; using System; using System.IO; +using Microsoft.Build.Evaluation; using Xunit; #nullable disable diff --git a/src/Tasks.UnitTests/DownloadFile_Tests.cs b/src/Tasks.UnitTests/DownloadFile_Tests.cs index 6edc5512418..b35fbfeadda 100644 --- a/src/Tasks.UnitTests/DownloadFile_Tests.cs +++ b/src/Tasks.UnitTests/DownloadFile_Tests.cs @@ -1,9 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.UnitTests; -using Microsoft.Build.Utilities; -using Shouldly; using System; using System.IO; using System.Net; @@ -13,8 +10,10 @@ using System.Text; using System.Threading; using System.Threading.Tasks; +using Microsoft.Build.UnitTests; +using Microsoft.Build.Utilities; +using Shouldly; using Xunit; - using Task = System.Threading.Tasks.Task; #nullable disable diff --git a/src/Tasks.UnitTests/Exec_Tests.cs b/src/Tasks.UnitTests/Exec_Tests.cs index 52e2c3e4bcf..1014be81dee 100644 --- a/src/Tasks.UnitTests/Exec_Tests.cs +++ b/src/Tasks.UnitTests/Exec_Tests.cs @@ -2,19 +2,19 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; +using System.Collections.Generic; using System.IO; using System.Reflection; using System.Text; +using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; using Shouldly; using Xunit; using Xunit.Abstractions; -using System.Collections.Generic; -using Microsoft.Build.Evaluation; using Xunit.NetCore.Extensions; #nullable disable diff --git a/src/Tasks.UnitTests/FindAppConfigFile_Tests.cs b/src/Tasks.UnitTests/FindAppConfigFile_Tests.cs index b24510a83dd..0965bb7c461 100644 --- a/src/Tasks.UnitTests/FindAppConfigFile_Tests.cs +++ b/src/Tasks.UnitTests/FindAppConfigFile_Tests.cs @@ -1,10 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Utilities; using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Microsoft.Build.Tasks; +using Microsoft.Build.Utilities; using Xunit; #nullable disable diff --git a/src/Tasks.UnitTests/FindInList_Tests.cs b/src/Tasks.UnitTests/FindInList_Tests.cs index 4f20967bda6..c051964fdfa 100644 --- a/src/Tasks.UnitTests/FindInList_Tests.cs +++ b/src/Tasks.UnitTests/FindInList_Tests.cs @@ -2,10 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using Microsoft.Build.Utilities; using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Microsoft.Build.Tasks; +using Microsoft.Build.Utilities; using Xunit; #nullable disable diff --git a/src/Tasks.UnitTests/FindInvalidProjectReferences_Tests.cs b/src/Tasks.UnitTests/FindInvalidProjectReferences_Tests.cs index 006ff88f7bf..482ab9c1c3b 100644 --- a/src/Tasks.UnitTests/FindInvalidProjectReferences_Tests.cs +++ b/src/Tasks.UnitTests/FindInvalidProjectReferences_Tests.cs @@ -1,10 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Utilities; +using System.Collections.Generic; using Microsoft.Build.Shared; using Microsoft.Build.Tasks; -using System.Collections.Generic; +using Microsoft.Build.Utilities; using Xunit; #nullable disable diff --git a/src/Tasks.UnitTests/GetInstalledSDKLocations_Tests.cs b/src/Tasks.UnitTests/GetInstalledSDKLocations_Tests.cs index f4c311c11ce..ad5535b8991 100644 --- a/src/Tasks.UnitTests/GetInstalledSDKLocations_Tests.cs +++ b/src/Tasks.UnitTests/GetInstalledSDKLocations_Tests.cs @@ -6,11 +6,10 @@ using System; using System.Collections.Generic; using System.IO; - using Microsoft.Build.Framework; using Microsoft.Build.Shared; -using Xunit; using Microsoft.Build.Tasks; +using Xunit; using Xunit.NetCore.Extensions; #nullable disable diff --git a/src/Tasks.UnitTests/GetReferencePaths_Tests.cs b/src/Tasks.UnitTests/GetReferencePaths_Tests.cs index 880a4bfae09..056f0080963 100644 --- a/src/Tasks.UnitTests/GetReferencePaths_Tests.cs +++ b/src/Tasks.UnitTests/GetReferencePaths_Tests.cs @@ -2,12 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using Microsoft.Build.Tasks; -using Microsoft.Build.Shared; using System.IO; +using Microsoft.Build.Shared; +using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; -using FrameworkNameVersioning = System.Runtime.Versioning.FrameworkName; using Xunit; +using FrameworkNameVersioning = System.Runtime.Versioning.FrameworkName; #if !RUNTIME_TYPE_NETCORE #nullable disable diff --git a/src/Tasks.UnitTests/HintPathResolver_Tests.cs b/src/Tasks.UnitTests/HintPathResolver_Tests.cs index a62b711cf18..800a3d7cb1a 100644 --- a/src/Tasks.UnitTests/HintPathResolver_Tests.cs +++ b/src/Tasks.UnitTests/HintPathResolver_Tests.cs @@ -1,11 +1,11 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System; +using System.Collections.Generic; using Microsoft.Build.Shared; using Microsoft.Build.UnitTests; using Shouldly; -using System; -using System.Collections.Generic; using Xunit; using Xunit.Abstractions; using Xunit.NetCore.Extensions; diff --git a/src/Tasks.UnitTests/MakeDir_Tests.cs b/src/Tasks.UnitTests/MakeDir_Tests.cs index 2eb1c473196..fd390661eb3 100644 --- a/src/Tasks.UnitTests/MakeDir_Tests.cs +++ b/src/Tasks.UnitTests/MakeDir_Tests.cs @@ -4,9 +4,9 @@ using System; using System.IO; using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; using Xunit; using Xunit.NetCore.Extensions; diff --git a/src/Tasks.UnitTests/MockTypeInfo.cs b/src/Tasks.UnitTests/MockTypeInfo.cs index 3cf5d11f108..aabf7050f11 100644 --- a/src/Tasks.UnitTests/MockTypeInfo.cs +++ b/src/Tasks.UnitTests/MockTypeInfo.cs @@ -4,11 +4,10 @@ using System; using System.Collections.Generic; using System.Runtime.InteropServices.ComTypes; - +using Xunit; +using IFixedTypeInfo = Microsoft.Build.Tasks.IFixedTypeInfo; using Marshal = System.Runtime.InteropServices.Marshal; using VarEnum = System.Runtime.InteropServices.VarEnum; -using IFixedTypeInfo = Microsoft.Build.Tasks.IFixedTypeInfo; -using Xunit; #nullable disable diff --git a/src/Tasks.UnitTests/MockTypeLib.cs b/src/Tasks.UnitTests/MockTypeLib.cs index 889aa6f63a1..28b42a5fa5c 100644 --- a/src/Tasks.UnitTests/MockTypeLib.cs +++ b/src/Tasks.UnitTests/MockTypeLib.cs @@ -4,11 +4,9 @@ using System; using System.Collections.Generic; using System.Runtime.InteropServices.ComTypes; - using Microsoft.Build.Tasks; - -using Marshal = System.Runtime.InteropServices.Marshal; using Xunit; +using Marshal = System.Runtime.InteropServices.Marshal; #nullable disable diff --git a/src/Tasks.UnitTests/MockUnmanagedMemoryHelper.cs b/src/Tasks.UnitTests/MockUnmanagedMemoryHelper.cs index e5ebcfc90ab..5adffb71e6e 100644 --- a/src/Tasks.UnitTests/MockUnmanagedMemoryHelper.cs +++ b/src/Tasks.UnitTests/MockUnmanagedMemoryHelper.cs @@ -3,9 +3,8 @@ using System; using System.Collections.Generic; - -using Marshal = System.Runtime.InteropServices.Marshal; using Xunit; +using Marshal = System.Runtime.InteropServices.Marshal; #nullable disable diff --git a/src/Tasks.UnitTests/Move_Tests.cs b/src/Tasks.UnitTests/Move_Tests.cs index eff307187e2..5c14b9ad86a 100644 --- a/src/Tasks.UnitTests/Move_Tests.cs +++ b/src/Tasks.UnitTests/Move_Tests.cs @@ -3,9 +3,9 @@ using System.IO; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Tasks; using Microsoft.Build.Shared; +using Microsoft.Build.Tasks; +using Microsoft.Build.Utilities; using Xunit; using Xunit.NetCore.Extensions; diff --git a/src/Tasks.UnitTests/NuGetPropsImportTests.cs b/src/Tasks.UnitTests/NuGetPropsImportTests.cs index 96880608729..bf7eaa44f9e 100644 --- a/src/Tasks.UnitTests/NuGetPropsImportTests.cs +++ b/src/Tasks.UnitTests/NuGetPropsImportTests.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Evaluation; using System; using System.IO; +using Microsoft.Build.Evaluation; using Xunit; #nullable disable diff --git a/src/Tasks.UnitTests/ProjectExtensionsImportTestBase.cs b/src/Tasks.UnitTests/ProjectExtensionsImportTestBase.cs index 5b4ad49085b..a430f5c2993 100644 --- a/src/Tasks.UnitTests/ProjectExtensionsImportTestBase.cs +++ b/src/Tasks.UnitTests/ProjectExtensionsImportTestBase.cs @@ -1,10 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Evaluation; using System; using System.IO; using System.Linq; +using Microsoft.Build.Evaluation; using Shouldly; using Xunit; diff --git a/src/Tasks.UnitTests/RARPrecomputedCache_Tests.cs b/src/Tasks.UnitTests/RARPrecomputedCache_Tests.cs index a889879c079..062eab76b12 100644 --- a/src/Tasks.UnitTests/RARPrecomputedCache_Tests.cs +++ b/src/Tasks.UnitTests/RARPrecomputedCache_Tests.cs @@ -1,13 +1,13 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System; +using System.Collections.Generic; +using System.IO; using Microsoft.Build.Framework; using Microsoft.Build.UnitTests; using Microsoft.Build.Utilities; using Shouldly; -using System; -using System.Collections.Generic; -using System.IO; using Xunit; #nullable disable diff --git a/src/Tasks.UnitTests/ResolveCodeAnalysisRuleSet_Tests.cs b/src/Tasks.UnitTests/ResolveCodeAnalysisRuleSet_Tests.cs index 367bc2660bf..20e907bdba9 100644 --- a/src/Tasks.UnitTests/ResolveCodeAnalysisRuleSet_Tests.cs +++ b/src/Tasks.UnitTests/ResolveCodeAnalysisRuleSet_Tests.cs @@ -3,8 +3,8 @@ using System; using System.IO; -using Microsoft.Build.Tasks; using Microsoft.Build.Shared; +using Microsoft.Build.Tasks; using Xunit; #nullable disable diff --git a/src/Tasks.UnitTests/ResolveComReference_Tests.cs b/src/Tasks.UnitTests/ResolveComReference_Tests.cs index afc8048fea0..f71b3383a34 100644 --- a/src/Tasks.UnitTests/ResolveComReference_Tests.cs +++ b/src/Tasks.UnitTests/ResolveComReference_Tests.cs @@ -5,18 +5,16 @@ using System; using System.Collections.Generic; - -// TYPELIBATTR clashes with the one in InteropServices. -using TYPELIBATTR = System.Runtime.InteropServices.ComTypes.TYPELIBATTR; - -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Tasks; -using Xunit; -using Microsoft.Build.Shared; using System.IO; using Microsoft.Build.BackEnd; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using Microsoft.Build.Tasks; +using Microsoft.Build.Utilities; using Shouldly; +using Xunit; +// TYPELIBATTR clashes with the one in InteropServices. +using TYPELIBATTR = System.Runtime.InteropServices.ComTypes.TYPELIBATTR; #nullable disable diff --git a/src/Tasks.UnitTests/ResolveNonMSBuildProjectOutput_Tests.cs b/src/Tasks.UnitTests/ResolveNonMSBuildProjectOutput_Tests.cs index 3cf283c5a6b..5de1bfcf5fb 100644 --- a/src/Tasks.UnitTests/ResolveNonMSBuildProjectOutput_Tests.cs +++ b/src/Tasks.UnitTests/ResolveNonMSBuildProjectOutput_Tests.cs @@ -5,8 +5,8 @@ using System.Collections; using System.IO; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Tasks; +using Microsoft.Build.Utilities; using Xunit; using Xunit.Abstractions; diff --git a/src/Tasks.UnitTests/ResolveSDKReference_Tests.cs b/src/Tasks.UnitTests/ResolveSDKReference_Tests.cs index d9a11b3e2d1..fd2d6460e19 100644 --- a/src/Tasks.UnitTests/ResolveSDKReference_Tests.cs +++ b/src/Tasks.UnitTests/ResolveSDKReference_Tests.cs @@ -4,16 +4,16 @@ using System; using System.Collections.Generic; using System.IO; +using Microsoft.Build.Evaluation; +using Microsoft.Build.Execution; using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; -using SDKReference = Microsoft.Build.Tasks.ResolveSDKReference.SDKReference; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Execution; +using Shouldly; using Xunit; using Xunit.NetCore.Extensions; -using Shouldly; +using SDKReference = Microsoft.Build.Tasks.ResolveSDKReference.SDKReference; #nullable disable diff --git a/src/Tasks.UnitTests/ResourceHandling/GenerateResourceOutOfProc_Tests.cs b/src/Tasks.UnitTests/ResourceHandling/GenerateResourceOutOfProc_Tests.cs index 4a2dcdac485..4172d013c78 100644 --- a/src/Tasks.UnitTests/ResourceHandling/GenerateResourceOutOfProc_Tests.cs +++ b/src/Tasks.UnitTests/ResourceHandling/GenerateResourceOutOfProc_Tests.cs @@ -3,16 +3,16 @@ using System; using System.Collections.Generic; +using System.IO; +using System.Threading; using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; +using Shouldly; using Xunit; using Xunit.Abstractions; using Xunit.NetCore.Extensions; -using System.IO; -using System.Threading; -using Shouldly; #nullable disable diff --git a/src/Tasks.UnitTests/ResourceHandling/GenerateResource_Tests.cs b/src/Tasks.UnitTests/ResourceHandling/GenerateResource_Tests.cs index b63883cf855..94131f1e4b6 100644 --- a/src/Tasks.UnitTests/ResourceHandling/GenerateResource_Tests.cs +++ b/src/Tasks.UnitTests/ResourceHandling/GenerateResource_Tests.cs @@ -2,20 +2,19 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; +using System.Collections; +using System.Collections.Generic; using System.IO; using System.Reflection; -using System.Collections; +using System.Text; +using System.Text.RegularExpressions; using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; - -using System.Text; using Shouldly; using Xunit; using Xunit.Abstractions; -using System.Collections.Generic; -using System.Text.RegularExpressions; using Xunit.NetCore.Extensions; #nullable disable diff --git a/src/Tasks.UnitTests/ResourceHandling/ResGenDependencies_Tests.cs b/src/Tasks.UnitTests/ResourceHandling/ResGenDependencies_Tests.cs index 042d17b9e16..d8462b8017b 100644 --- a/src/Tasks.UnitTests/ResourceHandling/ResGenDependencies_Tests.cs +++ b/src/Tasks.UnitTests/ResourceHandling/ResGenDependencies_Tests.cs @@ -1,13 +1,13 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System; using System.IO; using System.Reflection; -using Microsoft.Build.Tasks; using Microsoft.Build.Shared; -using Xunit; +using Microsoft.Build.Tasks; using Shouldly; -using System; +using Xunit; #nullable disable diff --git a/src/Tasks.UnitTests/ResourceHandling/ResGen_Tests.cs b/src/Tasks.UnitTests/ResourceHandling/ResGen_Tests.cs index 6b99bca8e7d..d62a9334a4a 100644 --- a/src/Tasks.UnitTests/ResourceHandling/ResGen_Tests.cs +++ b/src/Tasks.UnitTests/ResourceHandling/ResGen_Tests.cs @@ -3,14 +3,13 @@ using System; using System.Collections.Generic; -using System.Text; using System.IO; using System.Reflection; +using System.Text; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; - -using ResGen = Microsoft.Build.Tasks.GenerateResource.ResGen; using Xunit; +using ResGen = Microsoft.Build.Tasks.GenerateResource.ResGen; #nullable disable diff --git a/src/Tasks.UnitTests/ResourceManagement_Tests.cs b/src/Tasks.UnitTests/ResourceManagement_Tests.cs index 330331071d2..1906c954726 100644 --- a/src/Tasks.UnitTests/ResourceManagement_Tests.cs +++ b/src/Tasks.UnitTests/ResourceManagement_Tests.cs @@ -1,12 +1,12 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Framework; -using Microsoft.Build.UnitTests; using System.Collections.Generic; using System.Linq; -using Xunit; +using Microsoft.Build.Framework; +using Microsoft.Build.UnitTests; using Shouldly; +using Xunit; #nullable disable diff --git a/src/Tasks.UnitTests/SGen_Tests.cs b/src/Tasks.UnitTests/SGen_Tests.cs index ac7c6847ec5..16f70bf630e 100644 --- a/src/Tasks.UnitTests/SGen_Tests.cs +++ b/src/Tasks.UnitTests/SGen_Tests.cs @@ -2,12 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using Microsoft.Build.Tasks; -using Microsoft.Build.Shared; using System.IO; using System.Linq; -using Xunit; +using Microsoft.Build.Shared; +using Microsoft.Build.Tasks; using Shouldly; +using Xunit; #nullable disable diff --git a/src/Tasks.UnitTests/SdkToolsPathUtility_Tests.cs b/src/Tasks.UnitTests/SdkToolsPathUtility_Tests.cs index 0fd3095dd12..073447296a1 100644 --- a/src/Tasks.UnitTests/SdkToolsPathUtility_Tests.cs +++ b/src/Tasks.UnitTests/SdkToolsPathUtility_Tests.cs @@ -2,10 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using Microsoft.Build.Shared; -using Microsoft.Build.Utilities; using System.IO; +using Microsoft.Build.Shared; using Microsoft.Build.Tasks; +using Microsoft.Build.Utilities; using Xunit; using Xunit.NetCore.Extensions; diff --git a/src/Tasks.UnitTests/WinMDExp_Tests.cs b/src/Tasks.UnitTests/WinMDExp_Tests.cs index 6382f489296..5a86a08b22b 100644 --- a/src/Tasks.UnitTests/WinMDExp_Tests.cs +++ b/src/Tasks.UnitTests/WinMDExp_Tests.cs @@ -3,10 +3,10 @@ using System; using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; using Xunit; -using Microsoft.Build.Shared; #nullable disable diff --git a/src/Tasks.UnitTests/WriteCodeFragment_Tests.cs b/src/Tasks.UnitTests/WriteCodeFragment_Tests.cs index 2d52b6f8855..a538b371cf3 100644 --- a/src/Tasks.UnitTests/WriteCodeFragment_Tests.cs +++ b/src/Tasks.UnitTests/WriteCodeFragment_Tests.cs @@ -3,13 +3,13 @@ using System; using System.IO; -using Microsoft.Build.Tasks; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; -using Xunit; using System.Linq; using System.Runtime.InteropServices; +using Microsoft.Build.Shared; +using Microsoft.Build.Tasks; +using Microsoft.Build.Utilities; using Shouldly; +using Xunit; using Xunit.NetCore.Extensions; #nullable disable diff --git a/src/Tasks.UnitTests/XamlTaskFactory_Tests.cs b/src/Tasks.UnitTests/XamlTaskFactory_Tests.cs index cdcee567020..c298b8c75f2 100644 --- a/src/Tasks.UnitTests/XamlTaskFactory_Tests.cs +++ b/src/Tasks.UnitTests/XamlTaskFactory_Tests.cs @@ -2,19 +2,19 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.Collections.Generic; -using Microsoft.Build.Framework; -using System.IO; using System.CodeDom; using System.CodeDom.Compiler; -using Microsoft.CSharp; +using System.Collections.Generic; +using System.Globalization; +using System.IO; using System.Reflection; +using System.Xaml; +using Microsoft.Build.Framework; using Microsoft.Build.Shared; -using System.Globalization; using Microsoft.Build.Tasks.Xaml; -using System.Xaml; -using Xunit; +using Microsoft.CSharp; using Shouldly; +using Xunit; #nullable disable diff --git a/src/Tasks.UnitTests/XamlTestHelpers.cs b/src/Tasks.UnitTests/XamlTestHelpers.cs index 3fd447fbe62..15e4609b432 100644 --- a/src/Tasks.UnitTests/XamlTestHelpers.cs +++ b/src/Tasks.UnitTests/XamlTestHelpers.cs @@ -1,9 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.CSharp; -using Microsoft.Build.Tasks.Xaml; - using System; using System.CodeDom; using System.CodeDom.Compiler; @@ -12,6 +9,8 @@ using System.Reflection; using System.Xaml; using Microsoft.Build.Evaluation; +using Microsoft.Build.Tasks.Xaml; +using Microsoft.CSharp; using Xunit; #nullable disable diff --git a/src/Tasks.UnitTests/XmlPeek_Tests.cs b/src/Tasks.UnitTests/XmlPeek_Tests.cs index d7c5e18531d..0367f6c78bc 100644 --- a/src/Tasks.UnitTests/XmlPeek_Tests.cs +++ b/src/Tasks.UnitTests/XmlPeek_Tests.cs @@ -1,10 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Tasks; -using Microsoft.Build.Utilities; using System; using System.IO; +using Microsoft.Build.Tasks; +using Microsoft.Build.Utilities; using Xunit; #nullable disable diff --git a/src/Tasks.UnitTests/XslTransformation_Tests.cs b/src/Tasks.UnitTests/XslTransformation_Tests.cs index bb4697a60ce..10a4e43738a 100644 --- a/src/Tasks.UnitTests/XslTransformation_Tests.cs +++ b/src/Tasks.UnitTests/XslTransformation_Tests.cs @@ -1,18 +1,18 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Tasks; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; using System; using System.CodeDom.Compiler; using System.Collections.Generic; +using System.IO; using System.Reflection; using System.Reflection.Emit; -using System.IO; using System.Text.RegularExpressions; -using System.Xml.Xsl; using System.Xml; +using System.Xml.Xsl; +using Microsoft.Build.Shared; +using Microsoft.Build.Tasks; +using Microsoft.Build.Utilities; using Shouldly; using Xunit; diff --git a/src/Tasks.UnitTests/ZipDirectory_Tests.cs b/src/Tasks.UnitTests/ZipDirectory_Tests.cs index 931229c1a29..88d9d50224a 100644 --- a/src/Tasks.UnitTests/ZipDirectory_Tests.cs +++ b/src/Tasks.UnitTests/ZipDirectory_Tests.cs @@ -1,14 +1,14 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.UnitTests; -using Microsoft.Build.Utilities; -using Shouldly; using System; using System.Collections.Generic; using System.IO; using System.IO.Compression; using System.Linq; +using Microsoft.Build.UnitTests; +using Microsoft.Build.Utilities; +using Shouldly; using Xunit; #nullable disable diff --git a/src/Tasks/AppConfig/DependentAssembly.cs b/src/Tasks/AppConfig/DependentAssembly.cs index f1e0bd4e4a9..4af507aac9e 100644 --- a/src/Tasks/AppConfig/DependentAssembly.cs +++ b/src/Tasks/AppConfig/DependentAssembly.cs @@ -2,10 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.Xml; -using System.Reflection; using System.Collections.Generic; using System.Globalization; +using System.Reflection; +using System.Xml; using Microsoft.Build.Shared; #nullable disable diff --git a/src/Tasks/AppConfig/RuntimeSection.cs b/src/Tasks/AppConfig/RuntimeSection.cs index 8867f62dfb8..59056ed3027 100644 --- a/src/Tasks/AppConfig/RuntimeSection.cs +++ b/src/Tasks/AppConfig/RuntimeSection.cs @@ -1,8 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.Xml; using System.Collections.Generic; +using System.Xml; #nullable disable diff --git a/src/Tasks/AssemblyDependency/AssemblyFoldersFromConfig/AssemblyFoldersFromConfigResolver.cs b/src/Tasks/AssemblyDependency/AssemblyFoldersFromConfig/AssemblyFoldersFromConfigResolver.cs index 87fc5b6d16c..00fbece8e58 100644 --- a/src/Tasks/AssemblyDependency/AssemblyFoldersFromConfig/AssemblyFoldersFromConfigResolver.cs +++ b/src/Tasks/AssemblyDependency/AssemblyFoldersFromConfig/AssemblyFoldersFromConfigResolver.cs @@ -5,8 +5,8 @@ using System.Collections.Generic; using System.Runtime.Serialization; using System.Text.RegularExpressions; -using Microsoft.Build.Shared; using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using Microsoft.Build.Shared.FileSystem; using Microsoft.Build.Utilities; using ProcessorArchitecture = System.Reflection.ProcessorArchitecture; diff --git a/src/Tasks/AssemblyDependency/AssemblyResolution.cs b/src/Tasks/AssemblyDependency/AssemblyResolution.cs index d3064f2b7ff..2653a30a416 100644 --- a/src/Tasks/AssemblyDependency/AssemblyResolution.cs +++ b/src/Tasks/AssemblyDependency/AssemblyResolution.cs @@ -4,9 +4,9 @@ using System; using System.Collections.Generic; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; using Microsoft.Build.Tasks.AssemblyFoldersFromConfig; +using Microsoft.Build.Utilities; #nullable disable diff --git a/src/Tasks/AssemblyDependency/CandidateAssemblyFilesResolver.cs b/src/Tasks/AssemblyDependency/CandidateAssemblyFilesResolver.cs index 77695308943..352b3e463a3 100644 --- a/src/Tasks/AssemblyDependency/CandidateAssemblyFilesResolver.cs +++ b/src/Tasks/AssemblyDependency/CandidateAssemblyFilesResolver.cs @@ -3,9 +3,9 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Reflection; using Microsoft.Build.Shared; -using System.Diagnostics; #nullable disable diff --git a/src/Tasks/AssemblyDependency/GenerateBindingRedirects.cs b/src/Tasks/AssemblyDependency/GenerateBindingRedirects.cs index aaf3cadfe52..fbb3c2470cb 100644 --- a/src/Tasks/AssemblyDependency/GenerateBindingRedirects.cs +++ b/src/Tasks/AssemblyDependency/GenerateBindingRedirects.cs @@ -4,11 +4,10 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Reflection; using System.Xml.Linq; - using Microsoft.Build.Framework; using Microsoft.Build.Shared; -using System.Reflection; using Microsoft.Build.Shared.FileSystem; #nullable disable diff --git a/src/Tasks/AssemblyDependency/GlobalAssemblyCache.cs b/src/Tasks/AssemblyDependency/GlobalAssemblyCache.cs index 66f9de8bfe1..3ac6302c964 100644 --- a/src/Tasks/AssemblyDependency/GlobalAssemblyCache.cs +++ b/src/Tasks/AssemblyDependency/GlobalAssemblyCache.cs @@ -2,15 +2,15 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.IO; -using System.Runtime.InteropServices; -using Microsoft.Build.Shared; +using System.Collections.Concurrent; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; +using System.IO; using System.Reflection; -using Microsoft.Build.Framework; -using System.Collections.Concurrent; +using System.Runtime.InteropServices; using System.Runtime.Versioning; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Tasks/AssemblyDependency/Reference.cs b/src/Tasks/AssemblyDependency/Reference.cs index 8718bb29c40..f25e796f1a7 100644 --- a/src/Tasks/AssemblyDependency/Reference.cs +++ b/src/Tasks/AssemblyDependency/Reference.cs @@ -7,8 +7,8 @@ using System.IO; using System.Reflection; using System.Runtime.Versioning; -using Microsoft.Build.Shared; using Microsoft.Build.Framework; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Tasks/AssemblyDependency/Resolver.cs b/src/Tasks/AssemblyDependency/Resolver.cs index 527902d5370..b854a4015e5 100644 --- a/src/Tasks/AssemblyDependency/Resolver.cs +++ b/src/Tasks/AssemblyDependency/Resolver.cs @@ -2,9 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; +using System.Collections.Generic; using System.IO; using System.Reflection; -using System.Collections.Generic; using Microsoft.Build.Shared; #nullable disable diff --git a/src/Tasks/AssemblyInfo.cs b/src/Tasks/AssemblyInfo.cs index f86d61efe2b..2fefd520e31 100644 --- a/src/Tasks/AssemblyInfo.cs +++ b/src/Tasks/AssemblyInfo.cs @@ -2,11 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. global using NativeMethodsShared = Microsoft.Build.Framework.NativeMethods; - using System; using System.Resources; -using System.Runtime.InteropServices; using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; // This is the assembly-level GUID, and the GUID for the TypeLib associated with // this assembly. We should specify this explicitly, as opposed to letting diff --git a/src/Tasks/AssemblyResources.cs b/src/Tasks/AssemblyResources.cs index f8d24b76557..51a9b19d201 100644 --- a/src/Tasks/AssemblyResources.cs +++ b/src/Tasks/AssemblyResources.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.Resources; -using System.Reflection; using System.Globalization; +using System.Reflection; +using System.Resources; #nullable disable diff --git a/src/Tasks/AssignLinkMetadata.cs b/src/Tasks/AssignLinkMetadata.cs index 768149a9fc8..55a043eefc7 100644 --- a/src/Tasks/AssignLinkMetadata.cs +++ b/src/Tasks/AssignLinkMetadata.cs @@ -1,11 +1,11 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System; +using System.Collections.Generic; using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Microsoft.Build.Utilities; -using System; -using System.Collections.Generic; #nullable disable diff --git a/src/Tasks/AssignTargetPath.cs b/src/Tasks/AssignTargetPath.cs index 91d2f1d32b2..1c9ca3d5c38 100644 --- a/src/Tasks/AssignTargetPath.cs +++ b/src/Tasks/AssignTargetPath.cs @@ -4,8 +4,8 @@ using System; using System.IO; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; #nullable disable diff --git a/src/Tasks/BootstrapperUtil/BootstrapperBuilder.cs b/src/Tasks/BootstrapperUtil/BootstrapperBuilder.cs index 33082afe26f..12e60df9bbc 100644 --- a/src/Tasks/BootstrapperUtil/BootstrapperBuilder.cs +++ b/src/Tasks/BootstrapperUtil/BootstrapperBuilder.cs @@ -1,7 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Shared; using System; using System.Collections.Generic; using System.Diagnostics; @@ -11,13 +10,14 @@ using System.Linq; using System.Reflection; using System.Runtime.InteropServices; +using System.Runtime.Versioning; using System.Security.Cryptography.X509Certificates; using System.Text; using System.Xml; using System.Xml.XPath; using System.Xml.Xsl; +using Microsoft.Build.Shared; using Microsoft.Build.Shared.FileSystem; -using System.Runtime.Versioning; #nullable disable diff --git a/src/Tasks/BootstrapperUtil/Package.cs b/src/Tasks/BootstrapperUtil/Package.cs index 36160c909d1..b452bf71d84 100644 --- a/src/Tasks/BootstrapperUtil/Package.cs +++ b/src/Tasks/BootstrapperUtil/Package.cs @@ -1,8 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.Xml; using System.Runtime.InteropServices; +using System.Xml; #nullable disable diff --git a/src/Tasks/BootstrapperUtil/Product.cs b/src/Tasks/BootstrapperUtil/Product.cs index 0909ebd1d61..6e9d0e1ceca 100644 --- a/src/Tasks/BootstrapperUtil/Product.cs +++ b/src/Tasks/BootstrapperUtil/Product.cs @@ -5,8 +5,8 @@ using System.Collections.Generic; using System.Diagnostics; using System.Globalization; -using System.Xml; using System.Runtime.InteropServices; +using System.Xml; #nullable disable diff --git a/src/Tasks/CodeTaskFactory.cs b/src/Tasks/CodeTaskFactory.cs index 237817f1b2d..522b4de5c81 100644 --- a/src/Tasks/CodeTaskFactory.cs +++ b/src/Tasks/CodeTaskFactory.cs @@ -12,11 +12,11 @@ namespace Microsoft.Build.Tasks { #if FEATURE_CODETASKFACTORY - using System.CodeDom.Compiler; using System.CodeDom; + using System.CodeDom.Compiler; using System.Collections.Concurrent; - using System.Diagnostics.CodeAnalysis; using System.Diagnostics; + using System.Diagnostics.CodeAnalysis; using System.Globalization; using System.IO; using System.Reflection; diff --git a/src/Tasks/ComDependencyWalker.cs b/src/Tasks/ComDependencyWalker.cs index 3b736f1da1c..9de8725cd65 100644 --- a/src/Tasks/ComDependencyWalker.cs +++ b/src/Tasks/ComDependencyWalker.cs @@ -3,11 +3,10 @@ using System; using System.Collections.Generic; -using System.Runtime.InteropServices.ComTypes; using System.Globalization; - -using Marshal = System.Runtime.InteropServices.Marshal; +using System.Runtime.InteropServices.ComTypes; using COMException = System.Runtime.InteropServices.COMException; +using Marshal = System.Runtime.InteropServices.Marshal; using VarEnum = System.Runtime.InteropServices.VarEnum; #nullable disable diff --git a/src/Tasks/ComReference.cs b/src/Tasks/ComReference.cs index 1bcc11c2df1..95d63adb880 100644 --- a/src/Tasks/ComReference.cs +++ b/src/Tasks/ComReference.cs @@ -3,12 +3,10 @@ using System; using System.Runtime.InteropServices.ComTypes; - using Microsoft.Build.Shared; using Microsoft.Build.Utilities; - -using Marshal = System.Runtime.InteropServices.Marshal; using COMException = System.Runtime.InteropServices.COMException; +using Marshal = System.Runtime.InteropServices.Marshal; #nullable disable diff --git a/src/Tasks/ComReferenceInfo.cs b/src/Tasks/ComReferenceInfo.cs index 4e74972a731..f41dd573f48 100644 --- a/src/Tasks/ComReferenceInfo.cs +++ b/src/Tasks/ComReferenceInfo.cs @@ -5,13 +5,11 @@ using System.IO; using System.Runtime.InteropServices; using System.Runtime.InteropServices.ComTypes; - -// TYPELIBATTR clashes with the one in InteropServices. -using TYPELIBATTR = System.Runtime.InteropServices.ComTypes.TYPELIBATTR; - using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Microsoft.Build.Utilities; +// TYPELIBATTR clashes with the one in InteropServices. +using TYPELIBATTR = System.Runtime.InteropServices.ComTypes.TYPELIBATTR; #nullable disable diff --git a/src/Tasks/CombinePath.cs b/src/Tasks/CombinePath.cs index e798dc6b265..85138e2c215 100644 --- a/src/Tasks/CombinePath.cs +++ b/src/Tasks/CombinePath.cs @@ -2,11 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.IO; using System.Collections.Generic; +using System.IO; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; #nullable disable diff --git a/src/Tasks/CombineTargetFrameworkInfoProperties.cs b/src/Tasks/CombineTargetFrameworkInfoProperties.cs index 3d8eff50d94..6830ba9cb99 100644 --- a/src/Tasks/CombineTargetFrameworkInfoProperties.cs +++ b/src/Tasks/CombineTargetFrameworkInfoProperties.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System.Xml.Linq; using Microsoft.Build.Framework; using Microsoft.Build.Shared; -using System.Xml.Linq; #nullable disable diff --git a/src/Tasks/CombineXmlElements.cs b/src/Tasks/CombineXmlElements.cs index e2cf53fe52c..8fb5af15dc2 100644 --- a/src/Tasks/CombineXmlElements.cs +++ b/src/Tasks/CombineXmlElements.cs @@ -1,8 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Framework; using System.Xml.Linq; +using Microsoft.Build.Framework; #nullable disable diff --git a/src/Tasks/ConvertToAbsolutePath.cs b/src/Tasks/ConvertToAbsolutePath.cs index 079a730a94a..099f6560c31 100644 --- a/src/Tasks/ConvertToAbsolutePath.cs +++ b/src/Tasks/ConvertToAbsolutePath.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.IO; using System.Collections.Generic; +using System.IO; using Microsoft.Build.Framework; using Microsoft.Build.Shared; diff --git a/src/Tasks/Copy.cs b/src/Tasks/Copy.cs index eefeb02668e..36fd9b90a26 100644 --- a/src/Tasks/Copy.cs +++ b/src/Tasks/Copy.cs @@ -3,16 +3,16 @@ using System; using System.Collections.Concurrent; -using System.IO; using System.Collections.Generic; -using System.Threading; +using System.IO; using System.Runtime.InteropServices; +using System.Threading; using System.Threading.Tasks.Dataflow; +using Microsoft.Build.Eventing; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; using Microsoft.Build.Shared.FileSystem; -using Microsoft.Build.Eventing; +using Microsoft.Build.Utilities; #nullable disable diff --git a/src/Tasks/CreateItem.cs b/src/Tasks/CreateItem.cs index 8c7f8962e96..78f30146616 100644 --- a/src/Tasks/CreateItem.cs +++ b/src/Tasks/CreateItem.cs @@ -4,8 +4,8 @@ using System; using System.Collections.Generic; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; #nullable disable diff --git a/src/Tasks/CreateManifestResourceName.cs b/src/Tasks/CreateManifestResourceName.cs index e271d7f6a29..4d67448ef78 100644 --- a/src/Tasks/CreateManifestResourceName.cs +++ b/src/Tasks/CreateManifestResourceName.cs @@ -8,8 +8,8 @@ using System.IO; using System.Text; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; #nullable disable diff --git a/src/Tasks/Delegate.cs b/src/Tasks/Delegate.cs index 61b226008e3..f3c37bd0023 100644 --- a/src/Tasks/Delegate.cs +++ b/src/Tasks/Delegate.cs @@ -3,10 +3,9 @@ using System; using System.Collections.Concurrent; -using System.IO; using System.Collections.Generic; +using System.IO; using System.Runtime.Versioning; - using Microsoft.Build.Shared; using Microsoft.Build.Tasks.AssemblyDependency; diff --git a/src/Tasks/DownloadFile.cs b/src/Tasks/DownloadFile.cs index c4152670c81..88ac589b204 100644 --- a/src/Tasks/DownloadFile.cs +++ b/src/Tasks/DownloadFile.cs @@ -1,14 +1,14 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using System; using System.IO; using System.Net; using System.Net.Http; using System.Threading; using System.Threading.Tasks; +using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; using Task = System.Threading.Tasks.Task; #nullable disable diff --git a/src/Tasks/Exec.cs b/src/Tasks/Exec.cs index afc49604a4e..dbf4be1fc51 100644 --- a/src/Tasks/Exec.cs +++ b/src/Tasks/Exec.cs @@ -3,8 +3,8 @@ using System; using System.Collections.Generic; -using System.Text; using System.IO; +using System.Text; using System.Text.RegularExpressions; using Microsoft.Build.Framework; using Microsoft.Build.Shared; diff --git a/src/Tasks/FileIO/ReadLinesFromFile.cs b/src/Tasks/FileIO/ReadLinesFromFile.cs index 083e8a5ad97..ead4981ecfe 100644 --- a/src/Tasks/FileIO/ReadLinesFromFile.cs +++ b/src/Tasks/FileIO/ReadLinesFromFile.cs @@ -4,9 +4,9 @@ using System; using System.Collections.Generic; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; using Microsoft.Build.Shared.FileSystem; +using Microsoft.Build.Utilities; #nullable disable diff --git a/src/Tasks/FileIO/WriteLinesToFile.cs b/src/Tasks/FileIO/WriteLinesToFile.cs index f7cc3a3c2dc..db4d76c0315 100644 --- a/src/Tasks/FileIO/WriteLinesToFile.cs +++ b/src/Tasks/FileIO/WriteLinesToFile.cs @@ -1,12 +1,12 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Eventing; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; using System; using System.IO; using System.Text; +using Microsoft.Build.Eventing; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Tasks/FindInvalidProjectReferences.cs b/src/Tasks/FindInvalidProjectReferences.cs index d49ad88dfb8..7342f60e6f4 100644 --- a/src/Tasks/FindInvalidProjectReferences.cs +++ b/src/Tasks/FindInvalidProjectReferences.cs @@ -2,9 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using Microsoft.Build.Framework; using System.Collections.Generic; using System.Text.RegularExpressions; +using Microsoft.Build.Framework; #nullable disable diff --git a/src/Tasks/GenerateBootstrapper.cs b/src/Tasks/GenerateBootstrapper.cs index 5a3b8da3e1b..7eb63e1e8e0 100644 --- a/src/Tasks/GenerateBootstrapper.cs +++ b/src/Tasks/GenerateBootstrapper.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.IO; using System.Collections.Generic; +using System.IO; using Microsoft.Build.Framework; using Microsoft.Build.Tasks.Deployment.Bootstrapper; diff --git a/src/Tasks/GenerateDeploymentManifest.cs b/src/Tasks/GenerateDeploymentManifest.cs index 827699955c9..729deffab5c 100644 --- a/src/Tasks/GenerateDeploymentManifest.cs +++ b/src/Tasks/GenerateDeploymentManifest.cs @@ -4,8 +4,8 @@ using System; using System.Diagnostics; using System.IO; -using Microsoft.Build.Tasks.Deployment.ManifestUtilities; using System.Runtime.Versioning; +using Microsoft.Build.Tasks.Deployment.ManifestUtilities; #nullable disable diff --git a/src/Tasks/GetCompatiblePlatform.cs b/src/Tasks/GetCompatiblePlatform.cs index 4b4da73a3c0..2b81a9dca99 100644 --- a/src/Tasks/GetCompatiblePlatform.cs +++ b/src/Tasks/GetCompatiblePlatform.cs @@ -1,10 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System; using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Microsoft.Build.Utilities; -using System; namespace Microsoft.Build.Tasks { diff --git a/src/Tasks/GetFrameworkSDKPath.cs b/src/Tasks/GetFrameworkSDKPath.cs index 86d0a2eaa83..5d10aaf2817 100644 --- a/src/Tasks/GetFrameworkSDKPath.cs +++ b/src/Tasks/GetFrameworkSDKPath.cs @@ -3,8 +3,8 @@ using System; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; #nullable disable diff --git a/src/Tasks/LC.cs b/src/Tasks/LC.cs index f4d5e0e871e..bc3e27b35ba 100644 --- a/src/Tasks/LC.cs +++ b/src/Tasks/LC.cs @@ -4,8 +4,8 @@ using System; using System.IO; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Tasks.Deployment.ManifestUtilities; +using Microsoft.Build.Utilities; #nullable disable diff --git a/src/Tasks/MSBuild.cs b/src/Tasks/MSBuild.cs index c4d32f8cfac..b2c28967c6b 100644 --- a/src/Tasks/MSBuild.cs +++ b/src/Tasks/MSBuild.cs @@ -2,9 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.IO; using System.Collections.Generic; - +using System.IO; using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Microsoft.Build.Shared.FileSystem; diff --git a/src/Tasks/MakeDir.cs b/src/Tasks/MakeDir.cs index 6cc263c7254..4b5412534b0 100644 --- a/src/Tasks/MakeDir.cs +++ b/src/Tasks/MakeDir.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.IO; using System.Collections.Generic; +using System.IO; using Microsoft.Build.Framework; using Microsoft.Build.Shared; diff --git a/src/Tasks/ManifestUtil/AssemblyIdentity.cs b/src/Tasks/ManifestUtil/AssemblyIdentity.cs index 63658f51f7f..828a2ba70a0 100644 --- a/src/Tasks/ManifestUtil/AssemblyIdentity.cs +++ b/src/Tasks/ManifestUtil/AssemblyIdentity.cs @@ -1,7 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Utilities; using System; using System.Collections.Generic; using System.ComponentModel; @@ -14,6 +13,7 @@ using System.Xml; using System.Xml.Serialization; using Microsoft.Build.Shared.FileSystem; +using Microsoft.Build.Utilities; using FrameworkNameVersioning = System.Runtime.Versioning.FrameworkName; #nullable disable diff --git a/src/Tasks/ManifestUtil/AssemblyReferenceCollection.cs b/src/Tasks/ManifestUtil/AssemblyReferenceCollection.cs index a67b01d991e..45fcf658329 100644 --- a/src/Tasks/ManifestUtil/AssemblyReferenceCollection.cs +++ b/src/Tasks/ManifestUtil/AssemblyReferenceCollection.cs @@ -2,9 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.Runtime.InteropServices; using System.Collections; using System.Collections.Generic; +using System.Runtime.InteropServices; #nullable disable diff --git a/src/Tasks/ManifestUtil/DeployManifest.cs b/src/Tasks/ManifestUtil/DeployManifest.cs index de29d6ac5b2..228f7edbeda 100644 --- a/src/Tasks/ManifestUtil/DeployManifest.cs +++ b/src/Tasks/ManifestUtil/DeployManifest.cs @@ -2,16 +2,16 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; +using System.Collections.Generic; using System.ComponentModel; -using System.Runtime.InteropServices; using System.Globalization; using System.IO; +using System.Runtime.InteropServices; using System.Xml; using System.Xml.Serialization; +using Microsoft.Build.Shared.FileSystem; using Microsoft.Build.Utilities; using FrameworkNameVersioning = System.Runtime.Versioning.FrameworkName; -using System.Collections.Generic; -using Microsoft.Build.Shared.FileSystem; #nullable disable diff --git a/src/Tasks/ManifestUtil/OutputMessage.cs b/src/Tasks/ManifestUtil/OutputMessage.cs index 7d0c5bb096c..2e9ff44f6b7 100644 --- a/src/Tasks/ManifestUtil/OutputMessage.cs +++ b/src/Tasks/ManifestUtil/OutputMessage.cs @@ -1,12 +1,12 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Utilities; using System; using System.Collections; using System.Collections.Generic; using System.Globalization; using System.Runtime.InteropServices; +using Microsoft.Build.Utilities; #nullable disable diff --git a/src/Tasks/ManifestUtil/PathUtil.cs b/src/Tasks/ManifestUtil/PathUtil.cs index 8394babb735..1428e5a01f8 100644 --- a/src/Tasks/ManifestUtil/PathUtil.cs +++ b/src/Tasks/ManifestUtil/PathUtil.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Shared; using System; using System.IO; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Tasks/ManifestUtil/Util.cs b/src/Tasks/ManifestUtil/Util.cs index 0a8f9a2654c..5e96abc3314 100644 --- a/src/Tasks/ManifestUtil/Util.cs +++ b/src/Tasks/ManifestUtil/Util.cs @@ -1,9 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.Win32; using System; using System.Collections; using System.Collections.Generic; @@ -17,7 +14,10 @@ using System.Security; using System.Security.Cryptography; using System.Text; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using Microsoft.Build.Shared.FileSystem; +using Microsoft.Win32; #nullable disable diff --git a/src/Tasks/ManifestUtil/mansign2.cs b/src/Tasks/ManifestUtil/mansign2.cs index 23e273cdad6..29c34e47730 100644 --- a/src/Tasks/ManifestUtil/mansign2.cs +++ b/src/Tasks/ManifestUtil/mansign2.cs @@ -3,14 +3,13 @@ using System.Diagnostics.CodeAnalysis; using System.IO; +using System.Runtime.InteropServices; +using System.Runtime.Versioning; using System.Security.Cryptography; -using System.Security.Cryptography.Xml; using System.Security.Cryptography.X509Certificates; +using System.Security.Cryptography.Xml; using System.Text; using System.Xml; -using System.Runtime.InteropServices; -using System.Runtime.Versioning; - using _FILETIME = System.Runtime.InteropServices.ComTypes.FILETIME; #nullable disable diff --git a/src/Tasks/ParserState.cs b/src/Tasks/ParserState.cs index 0f1b0ec7405..d7513a72da8 100644 --- a/src/Tasks/ParserState.cs +++ b/src/Tasks/ParserState.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.Text; using System.Collections.Generic; +using System.Text; #nullable disable diff --git a/src/Tasks/RCWForCurrentContext.cs b/src/Tasks/RCWForCurrentContext.cs index 9c2d4675327..83e90765226 100644 --- a/src/Tasks/RCWForCurrentContext.cs +++ b/src/Tasks/RCWForCurrentContext.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.Runtime.InteropServices; using System.Diagnostics; +using System.Runtime.InteropServices; #nullable disable diff --git a/src/Tasks/RedistList.cs b/src/Tasks/RedistList.cs index 3428a752a0d..2337f450180 100644 --- a/src/Tasks/RedistList.cs +++ b/src/Tasks/RedistList.cs @@ -12,9 +12,9 @@ using System.Linq; using System.Text; using System.Xml; -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; using Microsoft.Build.Shared.FileSystem; +using Microsoft.Build.Utilities; #nullable disable diff --git a/src/Tasks/RemoveDir.cs b/src/Tasks/RemoveDir.cs index 3c9d3c4e9f1..da78951a376 100644 --- a/src/Tasks/RemoveDir.cs +++ b/src/Tasks/RemoveDir.cs @@ -5,9 +5,9 @@ using System.Collections.Generic; using System.IO; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; using Microsoft.Build.Shared.FileSystem; +using Microsoft.Build.Utilities; #nullable disable diff --git a/src/Tasks/ResourceHandling/MSBuildResXReader.cs b/src/Tasks/ResourceHandling/MSBuildResXReader.cs index 9e1cea4fcd4..765a023a102 100644 --- a/src/Tasks/ResourceHandling/MSBuildResXReader.cs +++ b/src/Tasks/ResourceHandling/MSBuildResXReader.cs @@ -1,7 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Shared; using System; using System.Collections.Generic; using System.IO; @@ -9,6 +8,7 @@ using System.Text; using System.Xml; using System.Xml.Linq; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Tasks/RoslynCodeTaskFactory/RoslynCodeTaskFactory.cs b/src/Tasks/RoslynCodeTaskFactory/RoslynCodeTaskFactory.cs index 70c13531635..43dd3c3ed10 100644 --- a/src/Tasks/RoslynCodeTaskFactory/RoslynCodeTaskFactory.cs +++ b/src/Tasks/RoslynCodeTaskFactory/RoslynCodeTaskFactory.cs @@ -1,9 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.Build.Utilities; using System; using System.CodeDom; using System.CodeDom.Compiler; @@ -16,7 +13,10 @@ using System.Text; using System.Xml; using System.Xml.Linq; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using Microsoft.Build.Shared.FileSystem; +using Microsoft.Build.Utilities; #nullable disable diff --git a/src/Tasks/RoslynCodeTaskFactory/RoslynCodeTaskFactoryCompilers.cs b/src/Tasks/RoslynCodeTaskFactory/RoslynCodeTaskFactoryCompilers.cs index ff9fc4289ef..f65af92cfed 100644 --- a/src/Tasks/RoslynCodeTaskFactory/RoslynCodeTaskFactoryCompilers.cs +++ b/src/Tasks/RoslynCodeTaskFactory/RoslynCodeTaskFactoryCompilers.cs @@ -1,11 +1,11 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using System; using System.IO; using System.Linq; +using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; #nullable disable diff --git a/src/Tasks/SdkToolsPathUtility.cs b/src/Tasks/SdkToolsPathUtility.cs index bacccd00dad..35e2efb656e 100644 --- a/src/Tasks/SdkToolsPathUtility.cs +++ b/src/Tasks/SdkToolsPathUtility.cs @@ -3,9 +3,9 @@ using System; using System.IO; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; #nullable disable diff --git a/src/Tasks/StateFileBase.cs b/src/Tasks/StateFileBase.cs index 5c674fb9732..6b18c794e8f 100644 --- a/src/Tasks/StateFileBase.cs +++ b/src/Tasks/StateFileBase.cs @@ -3,10 +3,10 @@ using System; using System.IO; -using Microsoft.Build.Utilities; +using Microsoft.Build.BackEnd; using Microsoft.Build.Shared; using Microsoft.Build.Shared.FileSystem; -using Microsoft.Build.BackEnd; +using Microsoft.Build.Utilities; #nullable disable diff --git a/src/Tasks/StrongNameUtils.cs b/src/Tasks/StrongNameUtils.cs index 2e223cc2c74..7c2fa1a52fd 100644 --- a/src/Tasks/StrongNameUtils.cs +++ b/src/Tasks/StrongNameUtils.cs @@ -5,9 +5,8 @@ using System.Diagnostics; using System.IO; using System.Reflection; -using System.Security; using System.Runtime.InteropServices; - +using System.Security; using Microsoft.Build.Shared; using Microsoft.Build.Utilities; diff --git a/src/Tasks/System.Design.cs b/src/Tasks/System.Design.cs index 2c417146818..15ec2257b17 100644 --- a/src/Tasks/System.Design.cs +++ b/src/Tasks/System.Design.cs @@ -2,13 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.Reflection; +using System.ComponentModel; using System.Globalization; +using System.Reflection; using System.Resources; using System.Threading; -using System.ComponentModel; - #nullable disable namespace Microsoft.Build.Tasks diff --git a/src/Tasks/Telemetry.cs b/src/Tasks/Telemetry.cs index 894fafea3db..71ee653a70a 100644 --- a/src/Tasks/Telemetry.cs +++ b/src/Tasks/Telemetry.cs @@ -1,10 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; using System; using System.Collections.Generic; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; #nullable disable diff --git a/src/Tasks/TlbReference.cs b/src/Tasks/TlbReference.cs index 4f438378071..12a00027180 100644 --- a/src/Tasks/TlbReference.cs +++ b/src/Tasks/TlbReference.cs @@ -2,22 +2,20 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; +using System.Collections.Generic; using System.Diagnostics; using System.IO; +using System.Linq; using System.Reflection; using System.Reflection.Emit; -using System.Collections.Generic; using System.Runtime.InteropServices; using System.Runtime.InteropServices.ComTypes; -using System.Linq; - -// TYPELIBATTR clashes with the one in InteropServices. -using TYPELIBATTR = System.Runtime.InteropServices.ComTypes.TYPELIBATTR; -using UtilitiesProcessorArchitecture = Microsoft.Build.Utilities.ProcessorArchitecture; - using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Microsoft.Build.Utilities; +// TYPELIBATTR clashes with the one in InteropServices. +using TYPELIBATTR = System.Runtime.InteropServices.ComTypes.TYPELIBATTR; +using UtilitiesProcessorArchitecture = Microsoft.Build.Utilities.ProcessorArchitecture; #nullable disable diff --git a/src/Tasks/XamlTaskFactory/RelationsParser.cs b/src/Tasks/XamlTaskFactory/RelationsParser.cs index f6f9f9687c3..f9734a9720f 100644 --- a/src/Tasks/XamlTaskFactory/RelationsParser.cs +++ b/src/Tasks/XamlTaskFactory/RelationsParser.cs @@ -3,8 +3,8 @@ using System; using System.Collections.Generic; -using System.Xml; using System.IO; +using System.Xml; using Microsoft.Build.Shared; #nullable disable diff --git a/src/Tasks/XamlTaskFactory/TaskGenerator.cs b/src/Tasks/XamlTaskFactory/TaskGenerator.cs index 20ee37d6014..394daa631bd 100644 --- a/src/Tasks/XamlTaskFactory/TaskGenerator.cs +++ b/src/Tasks/XamlTaskFactory/TaskGenerator.cs @@ -2,11 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; +using System.CodeDom; using System.Collections.Generic; using System.Configuration; using System.Globalization; -using System.CodeDom; - using Microsoft.Build.Shared; #nullable disable diff --git a/src/Tasks/XamlTaskFactory/TaskParser.cs b/src/Tasks/XamlTaskFactory/TaskParser.cs index 87d63f90391..af2ba073221 100644 --- a/src/Tasks/XamlTaskFactory/TaskParser.cs +++ b/src/Tasks/XamlTaskFactory/TaskParser.cs @@ -4,9 +4,9 @@ using System; using System.Collections.Generic; using System.Globalization; +using System.IO; using System.Text; using System.Xaml; -using System.IO; using Microsoft.Build.Shared; using Microsoft.Build.Shared.FileSystem; using XamlTypes = Microsoft.Build.Framework.XamlTypes; diff --git a/src/Tasks/XamlTaskFactory/XamlDataDrivenToolTask.cs b/src/Tasks/XamlTaskFactory/XamlDataDrivenToolTask.cs index 1d8a2ba8d4e..783513727fa 100644 --- a/src/Tasks/XamlTaskFactory/XamlDataDrivenToolTask.cs +++ b/src/Tasks/XamlTaskFactory/XamlDataDrivenToolTask.cs @@ -2,12 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.Globalization; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using System.Text; +using System.Globalization; using System.Resources; - +using System.Text; using Microsoft.Build.Shared; using Microsoft.Build.Utilities; diff --git a/src/Tasks/XamlTaskFactory/XamlTaskFactory.cs b/src/Tasks/XamlTaskFactory/XamlTaskFactory.cs index 68cb433ad55..66e6834174c 100644 --- a/src/Tasks/XamlTaskFactory/XamlTaskFactory.cs +++ b/src/Tasks/XamlTaskFactory/XamlTaskFactory.cs @@ -13,13 +13,13 @@ namespace Microsoft.Build.Tasks { #if FEATURE_XAMLTASKFACTORY - using Microsoft.Build.Tasks.Xaml; - using System.CodeDom.Compiler; using System.CodeDom; + using System.CodeDom.Compiler; using System.IO; using System.Reflection; using System.Text; using System.Threading; + using Microsoft.Build.Tasks.Xaml; /// /// The task factory provider for XAML tasks. diff --git a/src/Tasks/XslTransformation.cs b/src/Tasks/XslTransformation.cs index eaecfe3dd83..33f00f1f19a 100644 --- a/src/Tasks/XslTransformation.cs +++ b/src/Tasks/XslTransformation.cs @@ -6,8 +6,8 @@ using System.IO; using System.Reflection; using System.Xml; -using System.Xml.Xsl; using System.Xml.XPath; +using System.Xml.Xsl; using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Microsoft.Build.Utilities; diff --git a/src/Tasks/ZipDirectory.cs b/src/Tasks/ZipDirectory.cs index 0832a5e8f4f..89ea647e786 100644 --- a/src/Tasks/ZipDirectory.cs +++ b/src/Tasks/ZipDirectory.cs @@ -1,10 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Framework; using System; using System.IO; using System.IO.Compression; +using Microsoft.Build.Framework; #nullable disable diff --git a/src/UnitTests.Shared/RunnerUtilities.cs b/src/UnitTests.Shared/RunnerUtilities.cs index 4e60b742a8d..48dfd777c71 100644 --- a/src/UnitTests.Shared/RunnerUtilities.cs +++ b/src/UnitTests.Shared/RunnerUtilities.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Shared; using System; using System.Diagnostics; +using Microsoft.Build.Shared; using Xunit.Abstractions; #nullable disable diff --git a/src/Utilities.UnitTests/PlatformManifest_Tests.cs b/src/Utilities.UnitTests/PlatformManifest_Tests.cs index a6d4eee348f..2a0cdb3360d 100644 --- a/src/Utilities.UnitTests/PlatformManifest_Tests.cs +++ b/src/Utilities.UnitTests/PlatformManifest_Tests.cs @@ -5,9 +5,8 @@ using System.Collections.Generic; using System.IO; using System.Linq; - -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; using Shouldly; using Xunit; diff --git a/src/Utilities.UnitTests/ProcessExtensions_Tests.cs b/src/Utilities.UnitTests/ProcessExtensions_Tests.cs index 99917144b38..e92f6c7fffd 100644 --- a/src/Utilities.UnitTests/ProcessExtensions_Tests.cs +++ b/src/Utilities.UnitTests/ProcessExtensions_Tests.cs @@ -1,12 +1,11 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Shouldly; -using Xunit; - -using Microsoft.Build.Shared; using System.Diagnostics; using System.Threading.Tasks; +using Microsoft.Build.Shared; +using Shouldly; +using Xunit; #nullable disable diff --git a/src/Utilities.UnitTests/StringExtensions_Tests.cs b/src/Utilities.UnitTests/StringExtensions_Tests.cs index d7b84659fb1..bc97460ff1d 100644 --- a/src/Utilities.UnitTests/StringExtensions_Tests.cs +++ b/src/Utilities.UnitTests/StringExtensions_Tests.cs @@ -2,11 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; +using Microsoft.Build.Shared; using Shouldly; using Xunit; -using Microsoft.Build.Shared; - #nullable disable namespace Microsoft.Build.UnitTests diff --git a/src/Utilities/ApiContract.cs b/src/Utilities/ApiContract.cs index 854a72e7b17..15213d41e2f 100644 --- a/src/Utilities/ApiContract.cs +++ b/src/Utilities/ApiContract.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; -using System.Xml; using System.Collections.Generic; +using System.Xml; #nullable disable diff --git a/src/Utilities/AssemblyResources.cs b/src/Utilities/AssemblyResources.cs index b1dcdb2eb0a..b2a22970d12 100644 --- a/src/Utilities/AssemblyResources.cs +++ b/src/Utilities/AssemblyResources.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.Resources; -using System.Reflection; using System.Globalization; +using System.Reflection; +using System.Resources; #nullable disable diff --git a/src/Utilities/CommandLineBuilder.cs b/src/Utilities/CommandLineBuilder.cs index 3c87712b9b9..7db0be0b667 100644 --- a/src/Utilities/CommandLineBuilder.cs +++ b/src/Utilities/CommandLineBuilder.cs @@ -5,9 +5,8 @@ using System.Diagnostics; using System.IO; using System.Text; - -using Microsoft.Build.Framework; using System.Text.RegularExpressions; +using Microsoft.Build.Framework; using Microsoft.Build.Shared; #nullable disable diff --git a/src/Utilities/PlatformManifest.cs b/src/Utilities/PlatformManifest.cs index de8f11a3a13..41b423f984b 100644 --- a/src/Utilities/PlatformManifest.cs +++ b/src/Utilities/PlatformManifest.cs @@ -2,9 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. using System; +using System.Collections.Generic; using System.IO; using System.Xml; -using System.Collections.Generic; using Microsoft.Build.Shared; using Microsoft.Build.Shared.FileSystem; diff --git a/src/Utilities/ToolLocationHelper.cs b/src/Utilities/ToolLocationHelper.cs index f6911a285ac..0f344499164 100644 --- a/src/Utilities/ToolLocationHelper.cs +++ b/src/Utilities/ToolLocationHelper.cs @@ -6,19 +6,17 @@ using System.Diagnostics.CodeAnalysis; using System.IO; using System.Linq; +using System.Runtime.Versioning; using System.Text; using System.Xml; - +using Microsoft.Build.Framework; using Microsoft.Build.Shared; +using Microsoft.Build.Shared.FileSystem; +using Microsoft.Build.Tasks.AssemblyFoldersFromConfig; using Microsoft.Win32; - using FrameworkNameVersioning = System.Runtime.Versioning.FrameworkName; -using UtilitiesDotNetFrameworkArchitecture = Microsoft.Build.Utilities.DotNetFrameworkArchitecture; using SharedDotNetFrameworkArchitecture = Microsoft.Build.Shared.DotNetFrameworkArchitecture; -using Microsoft.Build.Shared.FileSystem; -using Microsoft.Build.Tasks.AssemblyFoldersFromConfig; -using System.Runtime.Versioning; -using Microsoft.Build.Framework; +using UtilitiesDotNetFrameworkArchitecture = Microsoft.Build.Utilities.DotNetFrameworkArchitecture; #nullable disable diff --git a/src/Utilities/TrackedDependencies/CanonicalTrackedInputFiles.cs b/src/Utilities/TrackedDependencies/CanonicalTrackedInputFiles.cs index 5eb62b39979..82ed1626244 100644 --- a/src/Utilities/TrackedDependencies/CanonicalTrackedInputFiles.cs +++ b/src/Utilities/TrackedDependencies/CanonicalTrackedInputFiles.cs @@ -4,12 +4,11 @@ #if FEATURE_FILE_TRACKER using System; -using System.Collections.Generic; using System.Collections.Concurrent; +using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.IO; using System.Threading.Tasks; - using Microsoft.Build.Framework; using Microsoft.Build.Shared;