diff --git a/src/Framework/AssemblyInfo.cs b/src/Framework/AssemblyInfo.cs index f6fce6d4471..df32bf7d1d5 100644 --- a/src/Framework/AssemblyInfo.cs +++ b/src/Framework/AssemblyInfo.cs @@ -6,9 +6,9 @@ //----------------------------------------------------------------------- using System.Reflection; -using System.Security.Permissions; -using System.Runtime.InteropServices; using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Security.Permissions; using System.Windows.Markup; // A combination of RequestMinimum and RequestOptional causes the permissions granted to diff --git a/src/Framework/BuildEngineResult.cs b/src/Framework/BuildEngineResult.cs index 74c6883d67c..218662bb75a 100644 --- a/src/Framework/BuildEngineResult.cs +++ b/src/Framework/BuildEngineResult.cs @@ -5,10 +5,8 @@ //----------------------------------------------------------------------- using System; -using System.Collections; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using System.Text; namespace Microsoft.Build.Framework { diff --git a/src/Framework/BuildEventArgs.cs b/src/Framework/BuildEventArgs.cs index 1797d5abe01..e9a6083ee9d 100644 --- a/src/Framework/BuildEventArgs.cs +++ b/src/Framework/BuildEventArgs.cs @@ -6,9 +6,8 @@ //----------------------------------------------------------------------- using System; -using System.Runtime.InteropServices; -using System.Runtime.Serialization; using System.IO; +using System.Runtime.Serialization; namespace Microsoft.Build.Framework { @@ -326,7 +325,7 @@ internal virtual void CreateFromStream(BinaryReader reader, int version) [OnDeserializing] private void SetBuildEventContextDefaultBeforeSerialization(StreamingContext sc) { - // Don't want to create a new one here as default all the time as that would be a lot of + // Don't want to create a new one here as default all the time as that would be a lot of // possibly useless allocations _buildEventContext = null; } diff --git a/src/Framework/BuildEventContext.cs b/src/Framework/BuildEventContext.cs index 1396963a4bc..e8ef0f71ea8 100644 --- a/src/Framework/BuildEventContext.cs +++ b/src/Framework/BuildEventContext.cs @@ -2,9 +2,6 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Collections.Generic; -using System.Text; -using System.Globalization; namespace Microsoft.Build.Framework { @@ -220,8 +217,8 @@ public override int GetHashCode() /// Compare a BuildEventContext with this BuildEventContext. /// A build event context is compared in the following way. /// - /// 1. If the object references are the same the contexts are equivalent - /// 2. If the object type is the same and the Id values in the context are the same, the contexts are equivalent + /// 1. If the object references are the same the contexts are equivalent + /// 2. If the object type is the same and the Id values in the context are the same, the contexts are equivalent /// /// /// diff --git a/src/Framework/BuildStartedEventArgs.cs b/src/Framework/BuildStartedEventArgs.cs index 4d35a73a846..829fc590fb7 100644 --- a/src/Framework/BuildStartedEventArgs.cs +++ b/src/Framework/BuildStartedEventArgs.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Runtime.InteropServices; using System; using System.Collections.Generic; diff --git a/src/Framework/BuildStatusEventArgs.cs b/src/Framework/BuildStatusEventArgs.cs index 90184947227..65c2adfe355 100644 --- a/src/Framework/BuildStatusEventArgs.cs +++ b/src/Framework/BuildStatusEventArgs.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Runtime.InteropServices; using System; namespace Microsoft.Build.Framework diff --git a/src/Framework/BuildWarningEventArgs.cs b/src/Framework/BuildWarningEventArgs.cs index fe835d029da..d43190c71e3 100644 --- a/src/Framework/BuildWarningEventArgs.cs +++ b/src/Framework/BuildWarningEventArgs.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Runtime.InteropServices; using System; using System.IO; diff --git a/src/Framework/CriticalBuildMessageEventArgs.cs b/src/Framework/CriticalBuildMessageEventArgs.cs index 80f64af2de3..9f4277d9fd1 100644 --- a/src/Framework/CriticalBuildMessageEventArgs.cs +++ b/src/Framework/CriticalBuildMessageEventArgs.cs @@ -6,9 +6,6 @@ //----------------------------------------------------------------------- using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; namespace Microsoft.Build.Framework { diff --git a/src/Framework/ExternalProjectFinishedEventArgs.cs b/src/Framework/ExternalProjectFinishedEventArgs.cs index cc4bc90edf8..e75970ff8bf 100644 --- a/src/Framework/ExternalProjectFinishedEventArgs.cs +++ b/src/Framework/ExternalProjectFinishedEventArgs.cs @@ -2,7 +2,6 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Text; namespace Microsoft.Build.Framework { diff --git a/src/Framework/ExternalProjectStartedEventArgs.cs b/src/Framework/ExternalProjectStartedEventArgs.cs index 73129568817..374d744ee04 100644 --- a/src/Framework/ExternalProjectStartedEventArgs.cs +++ b/src/Framework/ExternalProjectStartedEventArgs.cs @@ -2,7 +2,6 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Text; namespace Microsoft.Build.Framework { diff --git a/src/Framework/FxCopExclusions/Microsoft.Build.Framework.Suppressions.cs b/src/Framework/FxCopExclusions/Microsoft.Build.Framework.Suppressions.cs index 8f3195f091a..f796f470a4f 100644 --- a/src/Framework/FxCopExclusions/Microsoft.Build.Framework.Suppressions.cs +++ b/src/Framework/FxCopExclusions/Microsoft.Build.Framework.Suppressions.cs @@ -4,7 +4,7 @@ // To Use: // Add add module level suppressions to this file to have them suppressed in the assembly -using System.Diagnostics.CodeAnalysis; + #if CODE_ANALYSIS [module: SuppressMessage("Microsoft.Design", "CA2210:AssembliesShouldHaveValidStrongNames")] diff --git a/src/Framework/IBuildEngine.cs b/src/Framework/IBuildEngine.cs index 1e762742acd..d14aada27ed 100644 --- a/src/Framework/IBuildEngine.cs +++ b/src/Framework/IBuildEngine.cs @@ -1,9 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; using System.Collections; -using System.Runtime.InteropServices; namespace Microsoft.Build.Framework { @@ -55,7 +53,7 @@ bool ContinueOnError } /// - /// Retrieves the line number of the task node within the project file that called it. + /// Retrieves the line number of the task node within the project file that called it. /// int LineNumberOfTaskNode { @@ -63,7 +61,7 @@ int LineNumberOfTaskNode } /// - /// Retrieves the line number of the task node within the project file that called it. + /// Retrieves the line number of the task node within the project file that called it. /// int ColumnNumberOfTaskNode { diff --git a/src/Framework/IBuildEngine2.cs b/src/Framework/IBuildEngine2.cs index ddd10a08608..9bfb2949460 100644 --- a/src/Framework/IBuildEngine2.cs +++ b/src/Framework/IBuildEngine2.cs @@ -1,9 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; using System.Collections; -using System.Runtime.InteropServices; namespace Microsoft.Build.Framework { diff --git a/src/Framework/IBuildEngine3.cs b/src/Framework/IBuildEngine3.cs index b502af85136..3bbbdc70b09 100644 --- a/src/Framework/IBuildEngine3.cs +++ b/src/Framework/IBuildEngine3.cs @@ -4,10 +4,8 @@ // Interface for tasks to communicate with the MSBuild engine. //----------------------------------------------------------------------- -using System; using System.Collections; using System.Collections.Generic; -using System.Text; namespace Microsoft.Build.Framework { diff --git a/src/Framework/IEventSource.cs b/src/Framework/IEventSource.cs index 07943a2cba5..fb553f61766 100644 --- a/src/Framework/IEventSource.cs +++ b/src/Framework/IEventSource.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Runtime.InteropServices; namespace Microsoft.Build.Framework { diff --git a/src/Framework/IGeneratedTask.cs b/src/Framework/IGeneratedTask.cs index 1cd0293df45..008856dbf9b 100644 --- a/src/Framework/IGeneratedTask.cs +++ b/src/Framework/IGeneratedTask.cs @@ -5,11 +5,7 @@ // An interface implemented by tasks that are generated by ITaskFactory instances. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using System.Linq; -using System.Text; namespace Microsoft.Build.Framework { diff --git a/src/Framework/ITask.cs b/src/Framework/ITask.cs index 28f1e6989ca..f3b19c44fca 100644 --- a/src/Framework/ITask.cs +++ b/src/Framework/ITask.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Runtime.InteropServices; namespace Microsoft.Build.Framework { diff --git a/src/Framework/ITaskFactory.cs b/src/Framework/ITaskFactory.cs index 626148c31f8..901eb973a09 100644 --- a/src/Framework/ITaskFactory.cs +++ b/src/Framework/ITaskFactory.cs @@ -7,7 +7,6 @@ using System; using System.Collections.Generic; -using System.Text; namespace Microsoft.Build.Framework { diff --git a/src/Framework/ITaskFactory2.cs b/src/Framework/ITaskFactory2.cs index f824d238d4d..cc5b9178c08 100644 --- a/src/Framework/ITaskFactory2.cs +++ b/src/Framework/ITaskFactory2.cs @@ -5,9 +5,7 @@ // Task factory Instance which will instantiate and execute tasks //----------------------------------------------------------------------- -using System; using System.Collections.Generic; -using System.Text; namespace Microsoft.Build.Framework { diff --git a/src/Framework/ITaskHost.cs b/src/Framework/ITaskHost.cs index 112ea50e0e2..320ce466af6 100644 --- a/src/Framework/ITaskHost.cs +++ b/src/Framework/ITaskHost.cs @@ -1,8 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Runtime.InteropServices; using System.Diagnostics.CodeAnalysis; +using System.Runtime.InteropServices; namespace Microsoft.Build.Framework { diff --git a/src/Framework/ITaskItem.cs b/src/Framework/ITaskItem.cs index 31a909036e2..eac40027aaf 100644 --- a/src/Framework/ITaskItem.cs +++ b/src/Framework/ITaskItem.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; using System.Collections; using System.Runtime.InteropServices; diff --git a/src/Framework/ITaskItem2.cs b/src/Framework/ITaskItem2.cs index ff0c4249cc2..ff72d885bf3 100644 --- a/src/Framework/ITaskItem2.cs +++ b/src/Framework/ITaskItem2.cs @@ -5,10 +5,8 @@ // An improvement to ITaskItem that makes it possible for implementations to avoid losing escaping information. //----------------------------------------------------------------------- -using System; using System.Collections; using System.Runtime.InteropServices; -using System.Collections.Generic; namespace Microsoft.Build.Framework { diff --git a/src/Framework/ProjectFinishedEventArgs.cs b/src/Framework/ProjectFinishedEventArgs.cs index f87733911cc..06d1887e11f 100644 --- a/src/Framework/ProjectFinishedEventArgs.cs +++ b/src/Framework/ProjectFinishedEventArgs.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Runtime.InteropServices; using System; using System.IO; diff --git a/src/Framework/ProjectStartedEventArgs.cs b/src/Framework/ProjectStartedEventArgs.cs index 8954bd0ee65..c1b8c501f72 100644 --- a/src/Framework/ProjectStartedEventArgs.cs +++ b/src/Framework/ProjectStartedEventArgs.cs @@ -1,12 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Runtime.InteropServices; using System; using System.Collections; +using System.Collections.Generic; using System.IO; using System.Runtime.Serialization; -using System.Collections.Generic; namespace Microsoft.Build.Framework { @@ -527,7 +526,7 @@ internal override void CreateFromStream(BinaryReader reader, int version) private void SetDefaultsBeforeSerialization(StreamingContext sc) { _projectId = InvalidProjectId; - // Don't want to set the default before deserialization is completed to a new event context because + // Don't want to set the default before deserialization is completed to a new event context because // that would most likely be a lot of wasted allocations _parentProjectBuildEventContext = null; } diff --git a/src/Framework/TargetFinishedEventArgs.cs b/src/Framework/TargetFinishedEventArgs.cs index 580cfc52fae..c1d0279aebc 100644 --- a/src/Framework/TargetFinishedEventArgs.cs +++ b/src/Framework/TargetFinishedEventArgs.cs @@ -1,10 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Runtime.InteropServices; using System; -using System.IO; using System.Collections; +using System.IO; namespace Microsoft.Build.Framework { diff --git a/src/Framework/TargetStartedEventArgs.cs b/src/Framework/TargetStartedEventArgs.cs index 377c4cc8c99..3951cdddae1 100644 --- a/src/Framework/TargetStartedEventArgs.cs +++ b/src/Framework/TargetStartedEventArgs.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Runtime.InteropServices; using System; using System.IO; diff --git a/src/Framework/TaskFinishedEventArgs.cs b/src/Framework/TaskFinishedEventArgs.cs index e0c32e440f5..679442b2246 100644 --- a/src/Framework/TaskFinishedEventArgs.cs +++ b/src/Framework/TaskFinishedEventArgs.cs @@ -5,7 +5,6 @@ // Event args for target finished event. //----------------------------------------------------------------------- -using System.Runtime.InteropServices; using System; using System.IO; diff --git a/src/Framework/TaskPropertyInfo.cs b/src/Framework/TaskPropertyInfo.cs index 8858ed0b164..745de3b01fd 100644 --- a/src/Framework/TaskPropertyInfo.cs +++ b/src/Framework/TaskPropertyInfo.cs @@ -6,7 +6,6 @@ //----------------------------------------------------------------------- using System; -using System.Reflection; namespace Microsoft.Build.Framework { diff --git a/src/Framework/UnitTests/Attribute_Tests.cs b/src/Framework/UnitTests/Attribute_Tests.cs index 04cb8bbef5c..bfce8d72750 100644 --- a/src/Framework/UnitTests/Attribute_Tests.cs +++ b/src/Framework/UnitTests/Attribute_Tests.cs @@ -1,15 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections; -using System.IO; -using System.Reflection; -using System.Runtime.Serialization; -using System.Runtime.Serialization.Formatters.Binary; - using Microsoft.Build.Framework; using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Reflection; namespace Microsoft.Build.UnitTests { diff --git a/src/Framework/UnitTests/BuildErrorEventArgs_Tests.cs b/src/Framework/UnitTests/BuildErrorEventArgs_Tests.cs index 3a29fabfeb6..c3c519b691c 100644 --- a/src/Framework/UnitTests/BuildErrorEventArgs_Tests.cs +++ b/src/Framework/UnitTests/BuildErrorEventArgs_Tests.cs @@ -5,10 +5,9 @@ // Unit tests for BuildErrorEventArgs //----------------------------------------------------------------------- -using System; - using Microsoft.Build.Framework; using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; namespace Microsoft.Build.UnitTests { diff --git a/src/Framework/UnitTests/BuildFinishedEventArgs_Tests.cs b/src/Framework/UnitTests/BuildFinishedEventArgs_Tests.cs index 5996f7bcd7f..62ffbd1725a 100644 --- a/src/Framework/UnitTests/BuildFinishedEventArgs_Tests.cs +++ b/src/Framework/UnitTests/BuildFinishedEventArgs_Tests.cs @@ -5,10 +5,9 @@ // Unit tests for BuildFinishedEventArgs_Tests //----------------------------------------------------------------------- -using System; - using Microsoft.Build.Framework; using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; namespace Microsoft.Build.UnitTests { diff --git a/src/Framework/UnitTests/BuildMessageEventArgs_Tests.cs b/src/Framework/UnitTests/BuildMessageEventArgs_Tests.cs index c66b9c627f3..c72f465ee03 100644 --- a/src/Framework/UnitTests/BuildMessageEventArgs_Tests.cs +++ b/src/Framework/UnitTests/BuildMessageEventArgs_Tests.cs @@ -5,10 +5,9 @@ // Unit tests for BuildMessageEventArgs_Tests //----------------------------------------------------------------------- -using System; - using Microsoft.Build.Framework; using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; namespace Microsoft.Build.UnitTests { diff --git a/src/Framework/UnitTests/BuildStartedEventArgs_Tests.cs b/src/Framework/UnitTests/BuildStartedEventArgs_Tests.cs index 3169365a8ee..6a7f92d95d0 100644 --- a/src/Framework/UnitTests/BuildStartedEventArgs_Tests.cs +++ b/src/Framework/UnitTests/BuildStartedEventArgs_Tests.cs @@ -5,9 +5,9 @@ // Unit tests for BuildStartedEventArgs //----------------------------------------------------------------------- -using System; using Microsoft.Build.Framework; using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; namespace Microsoft.Build.UnitTests { diff --git a/src/Framework/UnitTests/BuildWarningEventArgs_Tests.cs b/src/Framework/UnitTests/BuildWarningEventArgs_Tests.cs index c5c7cf6f2f8..2c0eecb6646 100644 --- a/src/Framework/UnitTests/BuildWarningEventArgs_Tests.cs +++ b/src/Framework/UnitTests/BuildWarningEventArgs_Tests.cs @@ -5,10 +5,9 @@ // Unit tests for BuildWarningEventArgs //----------------------------------------------------------------------- -using System; - using Microsoft.Build.Framework; using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; namespace Microsoft.Build.UnitTests { diff --git a/src/Framework/UnitTests/CriticalBuildMessageEventArgs_Tests.cs b/src/Framework/UnitTests/CriticalBuildMessageEventArgs_Tests.cs index 2fc45d2a580..6de8de41689 100644 --- a/src/Framework/UnitTests/CriticalBuildMessageEventArgs_Tests.cs +++ b/src/Framework/UnitTests/CriticalBuildMessageEventArgs_Tests.cs @@ -5,9 +5,9 @@ // Unit tests for CriticalBuildMessageEventArgs_Tests //----------------------------------------------------------------------- -using System; using Microsoft.Build.Framework; using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; namespace Microsoft.Build.UnitTests { diff --git a/src/Framework/UnitTests/CustomEventArgSerialization_Tests.cs b/src/Framework/UnitTests/CustomEventArgSerialization_Tests.cs index 57f4bfe1e07..d0e3d78430a 100644 --- a/src/Framework/UnitTests/CustomEventArgSerialization_Tests.cs +++ b/src/Framework/UnitTests/CustomEventArgSerialization_Tests.cs @@ -1,16 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; using System.Collections; using System.Collections.Generic; using System.IO; -using System.Reflection; -using System.Runtime.Serialization; -using System.Runtime.Serialization.Formatters.Binary; - -using Microsoft.Build.Framework; -using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Microsoft.Build.UnitTests { diff --git a/src/Framework/UnitTests/EventArgs_Tests.cs b/src/Framework/UnitTests/EventArgs_Tests.cs index d73c24061b2..733c356e6ab 100644 --- a/src/Framework/UnitTests/EventArgs_Tests.cs +++ b/src/Framework/UnitTests/EventArgs_Tests.cs @@ -5,16 +5,12 @@ // Unit tests for EventArgsTests //----------------------------------------------------------------------- +using Microsoft.Build.Framework; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; -using System.Collections; using System.IO; -using System.Reflection; -using System.Runtime.Serialization; using System.Runtime.Serialization.Formatters.Binary; -using Microsoft.Build.Framework; -using Microsoft.VisualStudio.TestTools.UnitTesting; - namespace Microsoft.Build.UnitTests { /// diff --git a/src/Framework/UnitTests/ExternalProjectFinishedEventArgs_Tests.cs b/src/Framework/UnitTests/ExternalProjectFinishedEventArgs_Tests.cs index f4d3be7c3f1..ae815edaa24 100644 --- a/src/Framework/UnitTests/ExternalProjectFinishedEventArgs_Tests.cs +++ b/src/Framework/UnitTests/ExternalProjectFinishedEventArgs_Tests.cs @@ -5,10 +5,9 @@ // Unit tests for ExternalProjectFinishedEventArgs //----------------------------------------------------------------------- -using System; - using Microsoft.Build.Framework; using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; namespace Microsoft.Build.UnitTests { diff --git a/src/Framework/UnitTests/ExternalProjectStartedEventArgs_Tests.cs b/src/Framework/UnitTests/ExternalProjectStartedEventArgs_Tests.cs index 382a4af1d04..81b41514916 100644 --- a/src/Framework/UnitTests/ExternalProjectStartedEventArgs_Tests.cs +++ b/src/Framework/UnitTests/ExternalProjectStartedEventArgs_Tests.cs @@ -5,10 +5,9 @@ // Unit tests for ExternalProjectStartedEventArgs //----------------------------------------------------------------------- -using System; - using Microsoft.Build.Framework; using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; namespace Microsoft.Build.UnitTests { diff --git a/src/Framework/UnitTests/LoggerException_Tests.cs b/src/Framework/UnitTests/LoggerException_Tests.cs index bbc1fcd7c8a..aa936ffda06 100644 --- a/src/Framework/UnitTests/LoggerException_Tests.cs +++ b/src/Framework/UnitTests/LoggerException_Tests.cs @@ -1,16 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; -using System.Collections; using System.IO; -using System.Reflection; -using System.Runtime.Serialization; using System.Runtime.Serialization.Formatters.Binary; -using Microsoft.Build.Framework; -using Microsoft.VisualStudio.TestTools.UnitTesting; - namespace Microsoft.Build.UnitTests { [TestClass] diff --git a/src/Framework/UnitTests/ProjectFinishedEventArgs_Tests.cs b/src/Framework/UnitTests/ProjectFinishedEventArgs_Tests.cs index 385fe407a84..ab061340947 100644 --- a/src/Framework/UnitTests/ProjectFinishedEventArgs_Tests.cs +++ b/src/Framework/UnitTests/ProjectFinishedEventArgs_Tests.cs @@ -5,10 +5,9 @@ // Unit tests for ProjectFinishedEventArgs //----------------------------------------------------------------------- -using System; - using Microsoft.Build.Framework; using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; namespace Microsoft.Build.UnitTests { diff --git a/src/Framework/UnitTests/ProjectStartedEventArgs_Tests.cs b/src/Framework/UnitTests/ProjectStartedEventArgs_Tests.cs index 829e3d215dc..e940ed5e560 100644 --- a/src/Framework/UnitTests/ProjectStartedEventArgs_Tests.cs +++ b/src/Framework/UnitTests/ProjectStartedEventArgs_Tests.cs @@ -5,11 +5,10 @@ // Unit tests for ProjectStartedEventArgs //----------------------------------------------------------------------- -using System; -using System.Collections; - using Microsoft.Build.Framework; using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections; namespace Microsoft.Build.UnitTests { diff --git a/src/Framework/UnitTests/TargetFinishedEventArgs_Tests.cs b/src/Framework/UnitTests/TargetFinishedEventArgs_Tests.cs index 1c097ce903a..3a12d9b456e 100644 --- a/src/Framework/UnitTests/TargetFinishedEventArgs_Tests.cs +++ b/src/Framework/UnitTests/TargetFinishedEventArgs_Tests.cs @@ -5,11 +5,10 @@ // Unit tests for TargetFinishedEventArgs //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; - using Microsoft.Build.Framework; using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections.Generic; namespace Microsoft.Build.UnitTests { diff --git a/src/Framework/UnitTests/TargetStartedEventArgs_Tests.cs b/src/Framework/UnitTests/TargetStartedEventArgs_Tests.cs index b22486fd1d7..e26512600a8 100644 --- a/src/Framework/UnitTests/TargetStartedEventArgs_Tests.cs +++ b/src/Framework/UnitTests/TargetStartedEventArgs_Tests.cs @@ -5,10 +5,9 @@ // NodePackets which are used for node communication //----------------------------------------------------------------------- -using System; - using Microsoft.Build.Framework; using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; namespace Microsoft.Build.UnitTests { diff --git a/src/Framework/UnitTests/TaskCommandLineEventArgs_Tests.cs b/src/Framework/UnitTests/TaskCommandLineEventArgs_Tests.cs index 3630a26b040..2d154392406 100644 --- a/src/Framework/UnitTests/TaskCommandLineEventArgs_Tests.cs +++ b/src/Framework/UnitTests/TaskCommandLineEventArgs_Tests.cs @@ -5,10 +5,9 @@ // Unit tests for TaskCommandLineEventArgs //----------------------------------------------------------------------- -using System; - using Microsoft.Build.Framework; using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; namespace Microsoft.Build.UnitTests { diff --git a/src/Framework/UnitTests/TaskFinishedEventArgs_Tests.cs b/src/Framework/UnitTests/TaskFinishedEventArgs_Tests.cs index b8318cbc9c1..f883b09bde0 100644 --- a/src/Framework/UnitTests/TaskFinishedEventArgs_Tests.cs +++ b/src/Framework/UnitTests/TaskFinishedEventArgs_Tests.cs @@ -5,10 +5,9 @@ // Unit tests for TaskFinishedEventArgs //----------------------------------------------------------------------- -using System; - using Microsoft.Build.Framework; using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; namespace Microsoft.Build.UnitTests { diff --git a/src/Framework/UnitTests/TaskStartedEventArgs_Tests.cs b/src/Framework/UnitTests/TaskStartedEventArgs_Tests.cs index bba2af9b0d0..737b2082377 100644 --- a/src/Framework/UnitTests/TaskStartedEventArgs_Tests.cs +++ b/src/Framework/UnitTests/TaskStartedEventArgs_Tests.cs @@ -5,10 +5,9 @@ // Unit tests for TaskStartedEventArgs //----------------------------------------------------------------------- -using System; - using Microsoft.Build.Framework; using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; namespace Microsoft.Build.UnitTests { diff --git a/src/Framework/XamlTypes/Argument.cs b/src/Framework/XamlTypes/Argument.cs index 4dbb99b11cd..4b4c94666cf 100644 --- a/src/Framework/XamlTypes/Argument.cs +++ b/src/Framework/XamlTypes/Argument.cs @@ -7,7 +7,6 @@ using System; using System.ComponentModel; -using System.Windows.Markup; namespace Microsoft.Build.Framework.XamlTypes { diff --git a/src/Framework/XamlTypes/BaseProperty.cs b/src/Framework/XamlTypes/BaseProperty.cs index 7e06498d73c..06c7fba2326 100644 --- a/src/Framework/XamlTypes/BaseProperty.cs +++ b/src/Framework/XamlTypes/BaseProperty.cs @@ -10,7 +10,6 @@ using System.ComponentModel; using System.Diagnostics.CodeAnalysis; using System.Windows.Markup; -using System.Xml; namespace Microsoft.Build.Framework.XamlTypes { diff --git a/src/Framework/XamlTypes/Category.cs b/src/Framework/XamlTypes/Category.cs index d44b828eaf1..ba4d8c41e6e 100644 --- a/src/Framework/XamlTypes/Category.cs +++ b/src/Framework/XamlTypes/Category.cs @@ -5,9 +5,7 @@ // Represents a category to which a property can belong to. //-------------------------------------------------------------------------------- -using System; using System.ComponentModel; -using System.Windows.Markup; namespace Microsoft.Build.Framework.XamlTypes { diff --git a/src/Framework/XamlTypes/CategorySchema.cs b/src/Framework/XamlTypes/CategorySchema.cs index fc60cfd68f2..e7edbbca308 100644 --- a/src/Framework/XamlTypes/CategorySchema.cs +++ b/src/Framework/XamlTypes/CategorySchema.cs @@ -5,8 +5,6 @@ // Base type for categories in the property page schema data model. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; namespace Microsoft.Build.Framework.XamlTypes { diff --git a/src/Framework/XamlTypes/DataSource.cs b/src/Framework/XamlTypes/DataSource.cs index 3892cfa1e3b..28841a22d28 100644 --- a/src/Framework/XamlTypes/DataSource.cs +++ b/src/Framework/XamlTypes/DataSource.cs @@ -7,7 +7,6 @@ using System; using System.ComponentModel; -using System.Windows.Markup; namespace Microsoft.Build.Framework.XamlTypes { diff --git a/src/Framework/XamlTypes/DynamicEnumProperty.cs b/src/Framework/XamlTypes/DynamicEnumProperty.cs index ad01fdb1221..0f4742379a9 100644 --- a/src/Framework/XamlTypes/DynamicEnumProperty.cs +++ b/src/Framework/XamlTypes/DynamicEnumProperty.cs @@ -5,10 +5,8 @@ // Represents the schema of a dynamic enumeration property. //----------------------------------------------------------------------- -using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using System.Windows.Markup; namespace Microsoft.Build.Framework.XamlTypes { diff --git a/src/Framework/XamlTypes/ItemType.cs b/src/Framework/XamlTypes/ItemType.cs index a6b84c0a35c..1285c995c56 100644 --- a/src/Framework/XamlTypes/ItemType.cs +++ b/src/Framework/XamlTypes/ItemType.cs @@ -8,7 +8,6 @@ using System; using System.Collections.Generic; using System.ComponentModel; -using System.Windows.Markup; namespace Microsoft.Build.Framework.XamlTypes { diff --git a/src/Framework/XamlTypes/RuleSchema.cs b/src/Framework/XamlTypes/RuleSchema.cs index 0078fb81c95..af288b41823 100644 --- a/src/Framework/XamlTypes/RuleSchema.cs +++ b/src/Framework/XamlTypes/RuleSchema.cs @@ -5,8 +5,6 @@ // Base type for rules in the property page schema data model. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; namespace Microsoft.Build.Framework.XamlTypes { diff --git a/src/Framework/XamlTypes/StringListProperty.cs b/src/Framework/XamlTypes/StringListProperty.cs index 3673affd546..7d177ce8416 100644 --- a/src/Framework/XamlTypes/StringListProperty.cs +++ b/src/Framework/XamlTypes/StringListProperty.cs @@ -5,8 +5,6 @@ // Represents the schema of a list-of-strings property. //----------------------------------------------------------------------- -using System.Collections.Generic; -using System.ComponentModel; namespace Microsoft.Build.Framework.XamlTypes { diff --git a/src/Shared/AssemblyFoldersEx.cs b/src/Shared/AssemblyFoldersEx.cs index 8e658764ee8..06898def56a 100644 --- a/src/Shared/AssemblyFoldersEx.cs +++ b/src/Shared/AssemblyFoldersEx.cs @@ -1,14 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; +using Microsoft.Build.Utilities; using Microsoft.Win32; +using System; using System.Collections; -using System.Globalization; -using System.Diagnostics; -using System.Reflection; using System.Collections.Generic; -using Microsoft.Build.Utilities; using ProcessorArchitecture = System.Reflection.ProcessorArchitecture; namespace Microsoft.Build.Shared diff --git a/src/Shared/AssemblyLoadInfo.cs b/src/Shared/AssemblyLoadInfo.cs index ea4edacfd95..f6756414f35 100644 --- a/src/Shared/AssemblyLoadInfo.cs +++ b/src/Shared/AssemblyLoadInfo.cs @@ -5,10 +5,9 @@ // Wraps location info for an assembly //----------------------------------------------------------------------- +using Microsoft.Build.BackEnd; using System; using System.IO; -using Microsoft.Build.Framework; -using Microsoft.Build.BackEnd; namespace Microsoft.Build.Shared { diff --git a/src/Shared/AssemblyNameComparer.cs b/src/Shared/AssemblyNameComparer.cs index ecd7f35c7d7..7f1df775b6a 100644 --- a/src/Shared/AssemblyNameComparer.cs +++ b/src/Shared/AssemblyNameComparer.cs @@ -5,7 +5,6 @@ //----------------------------------------------------------------------- using System; -using System.Reflection; using System.Collections; using System.Collections.Generic; diff --git a/src/Shared/AssemblyNameExtension.cs b/src/Shared/AssemblyNameExtension.cs index a3d39877ae1..e67c4cf276e 100644 --- a/src/Shared/AssemblyNameExtension.cs +++ b/src/Shared/AssemblyNameExtension.cs @@ -2,13 +2,11 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Text; -using System.Reflection; -using System.Collections; -using System.Globalization; -using System.Diagnostics; using System.Collections.Generic; +using System.Globalization; +using System.Reflection; using System.Runtime.Serialization; +using System.Text; namespace Microsoft.Build.Shared { diff --git a/src/Shared/AssemblyNameReverseVersionComparer.cs b/src/Shared/AssemblyNameReverseVersionComparer.cs index 3c1043219da..814318f43be 100644 --- a/src/Shared/AssemblyNameReverseVersionComparer.cs +++ b/src/Shared/AssemblyNameReverseVersionComparer.cs @@ -5,9 +5,6 @@ // Compare the version numbers only for an AssemblyNameExtension and make sure they are in reverse order. This assumes the names are the same. //----------------------------------------------------------------------- -using System; -using System.Reflection; -using System.Collections; using System.Collections.Generic; namespace Microsoft.Build.Shared diff --git a/src/Shared/BuildEventFileInfo.cs b/src/Shared/BuildEventFileInfo.cs index d31ea94965f..08edb78ea27 100644 --- a/src/Shared/BuildEventFileInfo.cs +++ b/src/Shared/BuildEventFileInfo.cs @@ -3,7 +3,6 @@ using System; using System.Xml; -using System.Xml.Schema; namespace Microsoft.Build.Shared { diff --git a/src/Shared/CanonicalError.cs b/src/Shared/CanonicalError.cs index 2215fb0a997..64a643bfbe7 100644 --- a/src/Shared/CanonicalError.cs +++ b/src/Shared/CanonicalError.cs @@ -2,9 +2,6 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.IO; -using System.Collections; -using System.Diagnostics; using System.Globalization; using System.Text.RegularExpressions; @@ -293,7 +290,7 @@ internal static Parts Parse(string message) // -------------- ------------ ------- ------ ---------------------------------------------- // Origin SubCategory Cat. Code Text // - // To accommodate absolute filenames in Origin, tolerate a colon in the second position + // To accommodate absolute filenames in Origin, tolerate a colon in the second position // as long as its preceded by a letter. // // Localization Note: diff --git a/src/Shared/CollectionHelpers.cs b/src/Shared/CollectionHelpers.cs index 891e3925c4e..3f043bf2314 100644 --- a/src/Shared/CollectionHelpers.cs +++ b/src/Shared/CollectionHelpers.cs @@ -7,9 +7,6 @@ using System; using System.Collections.Generic; -using System.Text; -using System.Collections; -using Microsoft.Build.Shared; namespace Microsoft.Build.Shared { diff --git a/src/Shared/CommunicationsUtilities.cs b/src/Shared/CommunicationsUtilities.cs index 7982232165e..97aa1fcf1a8 100644 --- a/src/Shared/CommunicationsUtilities.cs +++ b/src/Shared/CommunicationsUtilities.cs @@ -6,29 +6,17 @@ // between nodes. //----------------------------------------------------------------------- +using Microsoft.Build.Shared; using System; -using System.Xml; -using System.Diagnostics; -using System.Collections; using System.Collections.Generic; -using System.Collections.Specialized; +using System.Diagnostics; +using System.Globalization; using System.IO; using System.IO.Pipes; -using System.Reflection; using System.Runtime.InteropServices; -using System.Text; -using System.Text.RegularExpressions; -using System.Globalization; -using System.Xml.Serialization; -using System.Security; -using System.Security.Policy; -using System.Security.Permissions; -using System.Security.AccessControl; using System.Security.Principal; using System.Threading; -using Microsoft.Build.Shared; - namespace Microsoft.Build.Internal { /// diff --git a/src/Shared/Constants.cs b/src/Shared/Constants.cs index 88cc6b3760a..9660f0b17f0 100644 --- a/src/Shared/Constants.cs +++ b/src/Shared/Constants.cs @@ -2,7 +2,6 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Reflection; namespace Microsoft.Build.Shared { diff --git a/src/Shared/CopyOnWriteDictionary.cs b/src/Shared/CopyOnWriteDictionary.cs index 893635cf96a..6779d67720e 100644 --- a/src/Shared/CopyOnWriteDictionary.cs +++ b/src/Shared/CopyOnWriteDictionary.cs @@ -5,14 +5,12 @@ // A dictionary that has copy-on-write semantics. //----------------------------------------------------------------------- +using Microsoft.Build.Shared; using System; using System.Collections; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using System.Runtime.InteropServices; using System.Runtime.Serialization; -using Microsoft.Build.Shared; -using Microsoft.Build.Internal; namespace Microsoft.Build.Collections { diff --git a/src/Shared/ErrorUtilities.cs b/src/Shared/ErrorUtilities.cs index 925178abc6e..30f6a3818f7 100644 --- a/src/Shared/ErrorUtilities.cs +++ b/src/Shared/ErrorUtilities.cs @@ -2,11 +2,9 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.IO; using System.Diagnostics; -using System.Configuration; using System.Globalization; -using System.Runtime.CompilerServices; +using System.IO; using System.Threading; #if BUILDINGAPPXTASKS diff --git a/src/Shared/EventArgsFormatting.cs b/src/Shared/EventArgsFormatting.cs index 29b7a194c7c..b1b638b7f86 100644 --- a/src/Shared/EventArgsFormatting.cs +++ b/src/Shared/EventArgsFormatting.cs @@ -1,13 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; using System; using System.Globalization; -using System.Collections.Generic; using System.Text; -using Microsoft.Build.Framework; - namespace Microsoft.Build.Shared { /// diff --git a/src/Shared/ExtensionFoldersRegistryKey.cs b/src/Shared/ExtensionFoldersRegistryKey.cs index 54bfeb7d0a9..be440d320b6 100644 --- a/src/Shared/ExtensionFoldersRegistryKey.cs +++ b/src/Shared/ExtensionFoldersRegistryKey.cs @@ -6,8 +6,6 @@ //----------------------------------------------------------------------- using System; -using Microsoft.Build.Shared; -using Microsoft.Win32; namespace Microsoft.Build.Shared { diff --git a/src/Shared/FileDelegates.cs b/src/Shared/FileDelegates.cs index 5631a190a83..bbe0c8e39a4 100644 --- a/src/Shared/FileDelegates.cs +++ b/src/Shared/FileDelegates.cs @@ -1,10 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; using System.IO; -using System.Diagnostics; -using System.Globalization; namespace Microsoft.Build.Shared { diff --git a/src/Shared/FileMatcher.cs b/src/Shared/FileMatcher.cs index ce3316350b0..223ce4d33d2 100644 --- a/src/Shared/FileMatcher.cs +++ b/src/Shared/FileMatcher.cs @@ -8,10 +8,7 @@ using System; using System.IO; using System.Text; -using System.Diagnostics; using System.Text.RegularExpressions; -using System.Threading; -using System.Globalization; namespace Microsoft.Build.Shared { diff --git a/src/Shared/FileUtilities.cs b/src/Shared/FileUtilities.cs index 1c6da527b4b..60b24a64678 100644 --- a/src/Shared/FileUtilities.cs +++ b/src/Shared/FileUtilities.cs @@ -2,21 +2,17 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.IO; -using System.Security; -using System.Collections; +using System.Collections.Generic; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Globalization; -using System.Text.RegularExpressions; -using System.Text; -using System.Threading; -using System.Runtime.InteropServices; -using System.Collections.Generic; +using System.IO; using System.Linq; using System.Reflection; -using Microsoft.Build.Collections; -using Microsoft.Build.Internal; +using System.Runtime.InteropServices; +using System.Text; +using System.Text.RegularExpressions; +using System.Threading; namespace Microsoft.Build.Shared { diff --git a/src/Shared/FileUtilitiesRegex.cs b/src/Shared/FileUtilitiesRegex.cs index 7b431d997e9..f6666874b27 100644 --- a/src/Shared/FileUtilitiesRegex.cs +++ b/src/Shared/FileUtilitiesRegex.cs @@ -2,11 +2,8 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.IO; -using System.Security; -using System.Collections; -using System.Diagnostics; using System.Globalization; +using System.IO; using System.Text.RegularExpressions; namespace Microsoft.Build.Shared diff --git a/src/Shared/FrameworkLocationHelper.cs b/src/Shared/FrameworkLocationHelper.cs index 708b7a39f45..5223eae365e 100644 --- a/src/Shared/FrameworkLocationHelper.cs +++ b/src/Shared/FrameworkLocationHelper.cs @@ -1,19 +1,15 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Evaluation; +using Microsoft.Win32; using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Configuration; -using System.Diagnostics; -using System.Globalization; using System.IO; using System.Linq; using System.Runtime.Versioning; -using System.Text; -using Microsoft.Build.Evaluation; -using Microsoft.Win32; - using PropertyElement = Microsoft.Build.Evaluation.ToolsetElement.PropertyElement; namespace Microsoft.Build.Shared @@ -559,7 +555,7 @@ internal static string GetPathToDotNetFramework(Version version, DotNetFramework /// Check the registry key and value to see if the .net Framework is installed on the machine. /// /// Registry path to look for the value - /// Key to retrieve the value from + /// Key to retrieve the value from /// True if the registry key is 1 false if it is not there. This method also return true if the complus enviornment variables are set. private static bool CheckForFrameworkInstallation(string registryEntryToCheckInstall, string registryValueToCheckInstall) { @@ -1386,7 +1382,7 @@ public virtual string GetPathToDotNetFrameworkReferenceAssemblies() { if (this.pathToDotNetFrameworkReferenceAssemblies == null) { - // when a user requests the 40 reference assembly path we don't need to read the redist list because we will not be chaining so we may as well just + // when a user requests the 40 reference assembly path we don't need to read the redist list because we will not be chaining so we may as well just // generate the path and save us some time. string referencePath = GenerateReferenceAssemblyPath(FrameworkLocationHelper.programFilesReferenceAssemblyLocation, this.FrameworkName); if (Directory.Exists(referencePath)) diff --git a/src/Shared/FxCopExclusions/Microsoft.Build.Shared.Suppressions.cs b/src/Shared/FxCopExclusions/Microsoft.Build.Shared.Suppressions.cs index b9ec8edc123..f19d07930e4 100644 --- a/src/Shared/FxCopExclusions/Microsoft.Build.Shared.Suppressions.cs +++ b/src/Shared/FxCopExclusions/Microsoft.Build.Shared.Suppressions.cs @@ -5,7 +5,7 @@ // Add module level suppressions to this file to have them suppressed in the assembly // -using System.Diagnostics.CodeAnalysis; + #if CODE_ANALYSIS [module: SuppressMessage("Microsoft.Performance","CA1811:AvoidUncalledPrivateCode", Scope="member", Target="Microsoft.Build.Shared.XMakeAttributes.#GetExplicitMSBuildArchitecture(System.String)", Justification="Source file used by several assemblies and this method is not called by all of them.")] diff --git a/src/Shared/HybridDictionary.cs b/src/Shared/HybridDictionary.cs index 352039bdc6c..aa2f0c56690 100644 --- a/src/Shared/HybridDictionary.cs +++ b/src/Shared/HybridDictionary.cs @@ -5,15 +5,11 @@ // A dictionary which changes its backing store to keep memory use low. //----------------------------------------------------------------------- +using Microsoft.Build.Shared; using System; using System.Collections; using System.Collections.Generic; -using System.Diagnostics; -using System.Globalization; -using System.Linq; -using System.Text; using System.Runtime.Serialization; -using Microsoft.Build.Shared; namespace Microsoft.Build.Collections { diff --git a/src/Shared/IElementLocation.cs b/src/Shared/IElementLocation.cs index 365226df26f..f04b1e230dc 100644 --- a/src/Shared/IElementLocation.cs +++ b/src/Shared/IElementLocation.cs @@ -5,8 +5,6 @@ // An internal interface used to represent element locations for run-time error reporting. //----------------------------------------------------------------------- -using System; -using Microsoft.Build.Framework; using Microsoft.Build.BackEnd; namespace Microsoft.Build.Shared diff --git a/src/Shared/INodeEndpoint.cs b/src/Shared/INodeEndpoint.cs index 71682113b21..119365c6dd3 100644 --- a/src/Shared/INodeEndpoint.cs +++ b/src/Shared/INodeEndpoint.cs @@ -5,9 +5,6 @@ // Interface for node endpoints. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Text; namespace Microsoft.Build.BackEnd { diff --git a/src/Shared/INodePacket.cs b/src/Shared/INodePacket.cs index 013327b7659..a4edcecaa7d 100644 --- a/src/Shared/INodePacket.cs +++ b/src/Shared/INodePacket.cs @@ -5,11 +5,6 @@ // Interface for node packets. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Text; -using System.IO; -using Microsoft.Build.Framework; namespace Microsoft.Build.BackEnd { diff --git a/src/Shared/INodePacketFactory.cs b/src/Shared/INodePacketFactory.cs index d33928943c0..f2c0370e7b8 100644 --- a/src/Shared/INodePacketFactory.cs +++ b/src/Shared/INodePacketFactory.cs @@ -5,9 +5,6 @@ // Interface for the node packet factory. //-----------------------------------------------------------------------using System; -using System.Collections.Generic; -using System.Text; -using Microsoft.Build.Framework; namespace Microsoft.Build.BackEnd { diff --git a/src/Shared/INodePacketHandler.cs b/src/Shared/INodePacketHandler.cs index 7da5d11a8c5..78ad0cce7c6 100644 --- a/src/Shared/INodePacketHandler.cs +++ b/src/Shared/INodePacketHandler.cs @@ -5,8 +5,6 @@ // Interface for node packet handlers. //-----------------------------------------------------------------------using System; -using System.Collections.Generic; -using System.Text; namespace Microsoft.Build.BackEnd { diff --git a/src/Shared/INodePacketTranslatable.cs b/src/Shared/INodePacketTranslatable.cs index 66c7e179a81..01878aa6880 100644 --- a/src/Shared/INodePacketTranslatable.cs +++ b/src/Shared/INodePacketTranslatable.cs @@ -5,9 +5,6 @@ // Interface for objects which can be serialized to packets for inter-node communication. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Text; namespace Microsoft.Build.BackEnd { diff --git a/src/Shared/INodePacketTranslator.cs b/src/Shared/INodePacketTranslator.cs index d74a549d02c..6593f166635 100644 --- a/src/Shared/INodePacketTranslator.cs +++ b/src/Shared/INodePacketTranslator.cs @@ -5,15 +5,11 @@ // Interface for objects which can Translate data for inter-node communication. //----------------------------------------------------------------------- +using Microsoft.Build.Framework; using System; using System.Collections.Generic; using System.Globalization; -using System.Text; using System.IO; -using Microsoft.Build.Collections; -using Microsoft.Build.Execution; -using Microsoft.Build.Shared; -using Microsoft.Build.Framework; namespace Microsoft.Build.BackEnd { diff --git a/src/Shared/InprocTrackingNativeMethods.cs b/src/Shared/InprocTrackingNativeMethods.cs index a3daf078775..632746114cf 100644 --- a/src/Shared/InprocTrackingNativeMethods.cs +++ b/src/Shared/InprocTrackingNativeMethods.cs @@ -6,16 +6,11 @@ //----------------------------------------------------------------------- using System; -using System.Collections.Generic; +using System.IO; using System.Runtime.ConstrainedExecution; using System.Runtime.InteropServices; using System.Runtime.Versioning; -using System.IO; -using System.Linq; using System.Security; -using System.Security.Permissions; -using System.Text; -using System.Threading.Tasks; namespace Microsoft.Build.Shared { diff --git a/src/Shared/InternalErrorException.cs b/src/Shared/InternalErrorException.cs index 8be4ead72e0..561ece05ce9 100644 --- a/src/Shared/InternalErrorException.cs +++ b/src/Shared/InternalErrorException.cs @@ -8,7 +8,7 @@ using System; using System.Diagnostics; -using System.Security.Permissions; // for SecurityPermissionAttribute +// for SecurityPermissionAttribute using System.Runtime.Serialization; namespace Microsoft.Build.Shared diff --git a/src/Shared/InterningBinaryReader.cs b/src/Shared/InterningBinaryReader.cs index a5776c1b3fc..42d0f25204a 100644 --- a/src/Shared/InterningBinaryReader.cs +++ b/src/Shared/InterningBinaryReader.cs @@ -6,12 +6,9 @@ //----------------------------------------------------------------------- using System; -using System.Collections.Generic; -using System.Text; -using System.IO; using System.Diagnostics; -using System.Globalization; - +using System.IO; +using System.Text; using ErrorUtilities = Microsoft.Build.Shared.ErrorUtilities; namespace Microsoft.Build diff --git a/src/Shared/LanguageParser/CSharptokenCharReader.cs b/src/Shared/LanguageParser/CSharptokenCharReader.cs index 3cadf619999..94865e7602c 100644 --- a/src/Shared/LanguageParser/CSharptokenCharReader.cs +++ b/src/Shared/LanguageParser/CSharptokenCharReader.cs @@ -3,11 +3,6 @@ using System; using System.IO; -using System.Text; -using System.Resources; -using System.Reflection; -using System.Collections; -using System.Globalization; namespace Microsoft.Build.Shared.LanguageParser { diff --git a/src/Shared/LanguageParser/CSharptokenEnumerator.cs b/src/Shared/LanguageParser/CSharptokenEnumerator.cs index eaedd296cf8..9f079c1249b 100644 --- a/src/Shared/LanguageParser/CSharptokenEnumerator.cs +++ b/src/Shared/LanguageParser/CSharptokenEnumerator.cs @@ -2,13 +2,8 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.IO; -using System.Text; -using System.Resources; -using System.Reflection; -using System.Collections; -using System.Globalization; using System.Diagnostics; +using System.IO; namespace Microsoft.Build.Shared.LanguageParser { diff --git a/src/Shared/LanguageParser/CSharptokenizer.cs b/src/Shared/LanguageParser/CSharptokenizer.cs index b784e842f12..4df819fe87c 100644 --- a/src/Shared/LanguageParser/CSharptokenizer.cs +++ b/src/Shared/LanguageParser/CSharptokenizer.cs @@ -1,14 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Text; -using System.Resources; -using System.Reflection; using System.Collections; -using System.Globalization; -using System.Diagnostics; +using System.IO; namespace Microsoft.Build.Shared.LanguageParser { diff --git a/src/Shared/LanguageParser/StreamMappedString.cs b/src/Shared/LanguageParser/StreamMappedString.cs index 18964d945d3..d2f32ca0e04 100644 --- a/src/Shared/LanguageParser/StreamMappedString.cs +++ b/src/Shared/LanguageParser/StreamMappedString.cs @@ -4,11 +4,6 @@ using System; using System.IO; using System.Text; -using System.Resources; -using System.Reflection; -using System.Collections; -using System.Globalization; -using System.Diagnostics; namespace Microsoft.Build.Shared.LanguageParser { diff --git a/src/Shared/LanguageParser/VisualBasictokenCharReader.cs b/src/Shared/LanguageParser/VisualBasictokenCharReader.cs index 9faab70db0c..f409167ce25 100644 --- a/src/Shared/LanguageParser/VisualBasictokenCharReader.cs +++ b/src/Shared/LanguageParser/VisualBasictokenCharReader.cs @@ -3,11 +3,6 @@ using System; using System.IO; -using System.Text; -using System.Resources; -using System.Reflection; -using System.Collections; -using System.Globalization; namespace Microsoft.Build.Shared.LanguageParser { diff --git a/src/Shared/LanguageParser/VisualBasictokenEnumerator.cs b/src/Shared/LanguageParser/VisualBasictokenEnumerator.cs index 486f1aedc26..6b2a918a501 100644 --- a/src/Shared/LanguageParser/VisualBasictokenEnumerator.cs +++ b/src/Shared/LanguageParser/VisualBasictokenEnumerator.cs @@ -2,12 +2,8 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.IO; -using System.Text; -using System.Resources; -using System.Reflection; -using System.Collections; using System.Globalization; +using System.IO; namespace Microsoft.Build.Shared.LanguageParser { diff --git a/src/Shared/LanguageParser/VisualBasictokenizer.cs b/src/Shared/LanguageParser/VisualBasictokenizer.cs index ef49547ea8d..379425c84e0 100644 --- a/src/Shared/LanguageParser/VisualBasictokenizer.cs +++ b/src/Shared/LanguageParser/VisualBasictokenizer.cs @@ -1,13 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Text; -using System.Resources; -using System.Reflection; using System.Collections; -using System.Globalization; +using System.IO; namespace Microsoft.Build.Shared.LanguageParser { diff --git a/src/Shared/LanguageParser/token.cs b/src/Shared/LanguageParser/token.cs index 5deedb0a4a6..d153a7ec1c0 100644 --- a/src/Shared/LanguageParser/token.cs +++ b/src/Shared/LanguageParser/token.cs @@ -2,12 +2,6 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.IO; -using System.Text; -using System.Resources; -using System.Reflection; -using System.Collections; -using System.Globalization; namespace Microsoft.Build.Shared.LanguageParser { diff --git a/src/Shared/LanguageParser/tokenChar.cs b/src/Shared/LanguageParser/tokenChar.cs index c119d49c889..6fa545b7e89 100644 --- a/src/Shared/LanguageParser/tokenChar.cs +++ b/src/Shared/LanguageParser/tokenChar.cs @@ -2,11 +2,6 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.IO; -using System.Text; -using System.Resources; -using System.Reflection; -using System.Collections; using System.Globalization; namespace Microsoft.Build.Shared.LanguageParser diff --git a/src/Shared/LanguageParser/tokenCharReader.cs b/src/Shared/LanguageParser/tokenCharReader.cs index 6e9e3d0f884..922d0456c35 100644 --- a/src/Shared/LanguageParser/tokenCharReader.cs +++ b/src/Shared/LanguageParser/tokenCharReader.cs @@ -3,11 +3,6 @@ using System; using System.IO; -using System.Text; -using System.Resources; -using System.Reflection; -using System.Collections; -using System.Globalization; namespace Microsoft.Build.Shared.LanguageParser { diff --git a/src/Shared/LanguageParser/tokenEnumerator.cs b/src/Shared/LanguageParser/tokenEnumerator.cs index 48b82b6be59..8863c3529f7 100644 --- a/src/Shared/LanguageParser/tokenEnumerator.cs +++ b/src/Shared/LanguageParser/tokenEnumerator.cs @@ -1,13 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Text; -using System.Resources; -using System.Reflection; using System.Collections; -using System.Globalization; namespace Microsoft.Build.Shared.LanguageParser { diff --git a/src/Shared/LoadedType.cs b/src/Shared/LoadedType.cs index 7c11ffc0738..9f33d719cf0 100644 --- a/src/Shared/LoadedType.cs +++ b/src/Shared/LoadedType.cs @@ -1,11 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; using System; -using System.IO; using System.Reflection; -using System.Collections.Generic; -using Microsoft.Build.Framework; namespace Microsoft.Build.Shared { diff --git a/src/Shared/LogMessagePacketBase.cs b/src/Shared/LogMessagePacketBase.cs index cec9d20c8f2..6a405fe48e7 100644 --- a/src/Shared/LogMessagePacketBase.cs +++ b/src/Shared/LogMessagePacketBase.cs @@ -6,14 +6,12 @@ // messages across nodes. //----------------------------------------------------------------------- +using Microsoft.Build.BackEnd; +using Microsoft.Build.Framework; using System; using System.Collections.Generic; -using System.Text; using System.IO; using System.Reflection; - -using Microsoft.Build.Framework; -using Microsoft.Build.BackEnd; using TaskEngineAssemblyResolver = Microsoft.Build.BackEnd.Logging.TaskEngineAssemblyResolver; namespace Microsoft.Build.Shared diff --git a/src/Shared/MSBuildNameIgnoreCaseComparer.cs b/src/Shared/MSBuildNameIgnoreCaseComparer.cs index d7ac19d60e6..45c4cbd50bd 100644 --- a/src/Shared/MSBuildNameIgnoreCaseComparer.cs +++ b/src/Shared/MSBuildNameIgnoreCaseComparer.cs @@ -8,12 +8,9 @@ // //----------------------------------------------------------------------- +using Microsoft.Build.Shared; using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Diagnostics; -using Microsoft.Build.Shared; namespace Microsoft.Build.Collections { diff --git a/src/Shared/MetadataConversionUtilities.cs b/src/Shared/MetadataConversionUtilities.cs index 0f6ce114778..9a453635f82 100644 --- a/src/Shared/MetadataConversionUtilities.cs +++ b/src/Shared/MetadataConversionUtilities.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Globalization; using Microsoft.Build.Framework; +using System; namespace Microsoft.Build.Shared { diff --git a/src/Shared/Modifiers.cs b/src/Shared/Modifiers.cs index 43f51106398..240b9810928 100644 --- a/src/Shared/Modifiers.cs +++ b/src/Shared/Modifiers.cs @@ -2,19 +2,10 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.IO; -using System.Security; -using System.Collections; -using System.Diagnostics; +using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using System.Globalization; +using System.IO; using System.Text.RegularExpressions; -using System.Text; -using System.Threading; -using System.Runtime.InteropServices; -using System.Collections.Generic; -using Microsoft.Build.Collections; -using Microsoft.Build.Internal; namespace Microsoft.Build.Shared { diff --git a/src/Shared/NGen.cs b/src/Shared/NGen.cs index 2a82d685c13..bb0146ca651 100644 --- a/src/Shared/NGen.cs +++ b/src/Shared/NGen.cs @@ -5,8 +5,6 @@ // A hack to prevent certain cases of Jitting in our NGen'd assemblies. //----------------------------------------------------------------------- -using System; -using Microsoft.Build.Framework; namespace Microsoft.Build.Shared { diff --git a/src/Shared/NativeMethodsShared.cs b/src/Shared/NativeMethodsShared.cs index e5abf312a30..68c719918fc 100644 --- a/src/Shared/NativeMethodsShared.cs +++ b/src/Shared/NativeMethodsShared.cs @@ -1,21 +1,15 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Win32.SafeHandles; using System; -using System.Collections; using System.Collections.Generic; using System.ComponentModel; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; -using System.IO; -using System.Runtime.ConstrainedExecution; using System.Runtime.InteropServices; -using System.Runtime.Versioning; -using System.Security; -using System.Security.Permissions; using System.Text; using System.Threading; -using Microsoft.Win32.SafeHandles; namespace Microsoft.Build.Shared { diff --git a/src/Shared/NodeBuildComplete.cs b/src/Shared/NodeBuildComplete.cs index 24843fee986..b6f60c650ee 100644 --- a/src/Shared/NodeBuildComplete.cs +++ b/src/Shared/NodeBuildComplete.cs @@ -5,10 +5,6 @@ // A packet which instructs a node that the build is complete. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Diagnostics; namespace Microsoft.Build.BackEnd diff --git a/src/Shared/NodeEndpointOutOfProcBase.cs b/src/Shared/NodeEndpointOutOfProcBase.cs index bdc38a453e4..ce60ab7e152 100644 --- a/src/Shared/NodeEndpointOutOfProcBase.cs +++ b/src/Shared/NodeEndpointOutOfProcBase.cs @@ -5,21 +5,15 @@ // Base class for the implementation of a node endpoint for out-of-proc nodes. //----------------------------------------------------------------------- +using Microsoft.Build.Internal; +using Microsoft.Build.Shared; using System; using System.Collections.Generic; -using System.Globalization; -using System.Text; using System.IO; using System.IO.Pipes; -using System.Threading; -using System.Diagnostics; -using Microsoft.Build.Framework; -using Microsoft.Build.Internal; -using Microsoft.Build.Shared; -using System.Security; using System.Security.AccessControl; using System.Security.Principal; -using System.Security.Permissions; +using System.Threading; namespace Microsoft.Build.BackEnd { @@ -389,7 +383,7 @@ private void PacketPumpProc() catch (IOException e) { // We will get here when: - // 1. The host (OOP main node) connects to us, it immediately checks for user privileges + // 1. The host (OOP main node) connects to us, it immediately checks for user privileges // and if they don't match it disconnects immediately leaving us still trying to read the blank handshake // 2. The host is too old sending us bits we automatically reject in the handshake CommunicationsUtilities.Trace("Client connection failed but we will wait for another connection. Exception: {0}", e.Message); diff --git a/src/Shared/NodeEngineShutdownReason.cs b/src/Shared/NodeEngineShutdownReason.cs index f98681e21a7..509ab7febd2 100644 --- a/src/Shared/NodeEngineShutdownReason.cs +++ b/src/Shared/NodeEngineShutdownReason.cs @@ -4,9 +4,6 @@ // Enumeration of the reasons a node would shut down. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Text; namespace Microsoft.Build.Execution { diff --git a/src/Shared/NodePacketFactory.cs b/src/Shared/NodePacketFactory.cs index ce5475fa1a4..717b11677df 100644 --- a/src/Shared/NodePacketFactory.cs +++ b/src/Shared/NodePacketFactory.cs @@ -5,12 +5,8 @@ // Implementation of INodePacketFactory. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Microsoft.Build.Framework; using Microsoft.Build.Shared; +using System.Collections.Generic; namespace Microsoft.Build.BackEnd { diff --git a/src/Shared/NodePacketTranslator.cs b/src/Shared/NodePacketTranslator.cs index 8198454a8c9..bcf7fc54c4d 100644 --- a/src/Shared/NodePacketTranslator.cs +++ b/src/Shared/NodePacketTranslator.cs @@ -5,19 +5,14 @@ // Implementation of INodePacketTranslator. //----------------------------------------------------------------------- +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using System; using System.Collections.Generic; using System.Diagnostics; -using System.Linq; -using System.Text; +using System.Globalization; using System.IO; -using System.Threading; using System.Runtime.Serialization.Formatters.Binary; -using Microsoft.Build.Collections; -using Microsoft.Build.Execution; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using System.Globalization; namespace Microsoft.Build.BackEnd { diff --git a/src/Shared/NodeShutdown.cs b/src/Shared/NodeShutdown.cs index 745b2502458..43df0d34d73 100644 --- a/src/Shared/NodeShutdown.cs +++ b/src/Shared/NodeShutdown.cs @@ -6,9 +6,6 @@ //----------------------------------------------------------------------- using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; namespace Microsoft.Build.BackEnd { diff --git a/src/Shared/OpportunisticIntern.cs b/src/Shared/OpportunisticIntern.cs index 4ec5cf496d7..711a8f94597 100644 --- a/src/Shared/OpportunisticIntern.cs +++ b/src/Shared/OpportunisticIntern.cs @@ -5,13 +5,13 @@ // Selectively intern strings. //----------------------------------------------------------------------- +using Microsoft.Build.Shared; using System; -using System.Text; -using System.Linq; using System.Collections.Generic; using System.Diagnostics; using System.Globalization; -using Microsoft.Build.Shared; +using System.Linq; +using System.Text; namespace Microsoft.Build { diff --git a/src/Shared/OutOfProcTaskHostTaskResult.cs b/src/Shared/OutOfProcTaskHostTaskResult.cs index ced32befe84..1770b229737 100644 --- a/src/Shared/OutOfProcTaskHostTaskResult.cs +++ b/src/Shared/OutOfProcTaskHostTaskResult.cs @@ -6,11 +6,9 @@ // out-of-proc task host. //----------------------------------------------------------------------- +using Microsoft.Build.BackEnd; using System; using System.Collections.Generic; -using System.Text; - -using Microsoft.Build.BackEnd; namespace Microsoft.Build.Shared { diff --git a/src/Shared/Pair.cs b/src/Shared/Pair.cs index 1e09e27ab3d..d788ab5a276 100644 --- a/src/Shared/Pair.cs +++ b/src/Shared/Pair.cs @@ -5,9 +5,6 @@ // A hack to prevent certain cases of Jitting in our NGen'd assemblies. //----------------------------------------------------------------------- -using System; -using Microsoft.Build.Framework; -using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; namespace Microsoft.Build.Shared diff --git a/src/Shared/ProjectErrorUtilities.cs b/src/Shared/ProjectErrorUtilities.cs index 7dc18b4c380..e49e57f9f19 100644 --- a/src/Shared/ProjectErrorUtilities.cs +++ b/src/Shared/ProjectErrorUtilities.cs @@ -1,10 +1,6 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Diagnostics; -using System.Xml; - /****************************************************************************** * * !! WARNING !! @@ -16,7 +12,8 @@ * ******************************************************************************/ using Microsoft.Build.Debugging; -using Microsoft.Build.Evaluation; +using System; +using System.Diagnostics; using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; namespace Microsoft.Build.Shared diff --git a/src/Shared/ProjectFileErrorUtilities.cs b/src/Shared/ProjectFileErrorUtilities.cs index 960be049f11..810481e6dce 100644 --- a/src/Shared/ProjectFileErrorUtilities.cs +++ b/src/Shared/ProjectFileErrorUtilities.cs @@ -2,7 +2,6 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Xml; using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; diff --git a/src/Shared/ProjectWriter.cs b/src/Shared/ProjectWriter.cs index 381c5115670..78b70e99310 100644 --- a/src/Shared/ProjectWriter.cs +++ b/src/Shared/ProjectWriter.cs @@ -1,11 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; using System.IO; -using System.Xml; using System.Text; using System.Text.RegularExpressions; +using System.Xml; namespace Microsoft.Build.Shared { diff --git a/src/Shared/PropertyParser.cs b/src/Shared/PropertyParser.cs index 1fc03b156a3..ecd28c26782 100644 --- a/src/Shared/PropertyParser.cs +++ b/src/Shared/PropertyParser.cs @@ -1,13 +1,13 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using System; -using System.Text; using System.Collections; using System.Collections.Generic; using System.Globalization; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; +using System.Text; #if BUILD_ENGINE namespace Microsoft.Build.BackEnd diff --git a/src/Shared/ReadOnlyCollection.cs b/src/Shared/ReadOnlyCollection.cs index e18087a07e2..b2a1d8a6f62 100644 --- a/src/Shared/ReadOnlyCollection.cs +++ b/src/Shared/ReadOnlyCollection.cs @@ -5,12 +5,11 @@ // A read-only wrapper around an ICollection<K> //----------------------------------------------------------------------- +using Microsoft.Build.Shared; using System; +using System.Collections; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Collections; -using Microsoft.Build.Shared; namespace Microsoft.Build.Collections { diff --git a/src/Shared/ReadOnlyEmptyCollection.cs b/src/Shared/ReadOnlyEmptyCollection.cs index 1d4ec6120f2..07a43b89409 100644 --- a/src/Shared/ReadOnlyEmptyCollection.cs +++ b/src/Shared/ReadOnlyEmptyCollection.cs @@ -5,11 +5,10 @@ // A read-only wrapper around an empty ICollection<K> //----------------------------------------------------------------------- +using Microsoft.Build.Shared; using System; -using System.Collections.Generic; -using System.Text; using System.Collections; -using Microsoft.Build.Shared; +using System.Collections.Generic; namespace Microsoft.Build.Collections { diff --git a/src/Shared/ReadOnlyEmptyDictionary.cs b/src/Shared/ReadOnlyEmptyDictionary.cs index 572f5d5e15f..25dd6f0c63d 100644 --- a/src/Shared/ReadOnlyEmptyDictionary.cs +++ b/src/Shared/ReadOnlyEmptyDictionary.cs @@ -5,9 +5,9 @@ // Enumerable over a notional read-only empty dictionary //----------------------------------------------------------------------- +using Microsoft.Build.Shared; using System.Collections; using System.Collections.Generic; -using Microsoft.Build.Shared; namespace Microsoft.Build.Collections { diff --git a/src/Shared/ReadOnlyEmptyList.cs b/src/Shared/ReadOnlyEmptyList.cs index 75711c3801d..6710b1a0e77 100644 --- a/src/Shared/ReadOnlyEmptyList.cs +++ b/src/Shared/ReadOnlyEmptyList.cs @@ -5,12 +5,11 @@ // A read-only empty list //----------------------------------------------------------------------- +using Microsoft.Build.Shared; using System.Collections; using System.Collections.Generic; using System.Diagnostics; -using Microsoft.Build.Shared; - namespace Microsoft.Build.Collections { /// diff --git a/src/Shared/RegisteredTaskObjectCacheBase.cs b/src/Shared/RegisteredTaskObjectCacheBase.cs index 31dc0e29251..317945bbf32 100644 --- a/src/Shared/RegisteredTaskObjectCacheBase.cs +++ b/src/Shared/RegisteredTaskObjectCacheBase.cs @@ -7,7 +7,6 @@ using System; using System.Collections.Concurrent; -using System.Collections.Generic; using Microsoft.Build.Framework; #if BUILD_ENGINE diff --git a/src/Shared/RegistryDelegates.cs b/src/Shared/RegistryDelegates.cs index 6580ab6cf1f..aac20e2ddc2 100644 --- a/src/Shared/RegistryDelegates.cs +++ b/src/Shared/RegistryDelegates.cs @@ -1,12 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Diagnostics; -using System.Globalization; using Microsoft.Win32; -using System.Collections; using System.Collections.Generic; namespace Microsoft.Build.Shared diff --git a/src/Shared/RegistryHelper.cs b/src/Shared/RegistryHelper.cs index c196a211e98..e96544e2db9 100644 --- a/src/Shared/RegistryHelper.cs +++ b/src/Shared/RegistryHelper.cs @@ -1,16 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Text; using Microsoft.Win32; -using System.Resources; -using System.Reflection; using System.Collections; -using System.Diagnostics; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using System.Collections.Generic; namespace Microsoft.Build.Shared diff --git a/src/Shared/ResourceUtilities.cs b/src/Shared/ResourceUtilities.cs index 28bbc6da309..e83eb475acc 100644 --- a/src/Shared/ResourceUtilities.cs +++ b/src/Shared/ResourceUtilities.cs @@ -2,16 +2,15 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Resources; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Globalization; -using System.Text.RegularExpressions; +using System.Resources; + #if DEBUG && !BUILDING_DF_LKG -using Microsoft.Build.Framework; + #endif -using System.Reflection; -using System.Text; + #if BUILDINGAPPXTASKS namespace Microsoft.Build.AppxPackage.Shared diff --git a/src/Shared/ReuseableStringBuilder.cs b/src/Shared/ReuseableStringBuilder.cs index 405a2cae04f..8078cefeaff 100644 --- a/src/Shared/ReuseableStringBuilder.cs +++ b/src/Shared/ReuseableStringBuilder.cs @@ -7,13 +7,10 @@ using System; using System.Collections.Concurrent; -using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Globalization; -using System.Reflection; using System.Text; using System.Threading; -using Microsoft.Build.Shared; namespace Microsoft.Build.Shared { diff --git a/src/Shared/StrongNameHelpers.cs b/src/Shared/StrongNameHelpers.cs index b869e9785ff..2dd59437453 100644 --- a/src/Shared/StrongNameHelpers.cs +++ b/src/Shared/StrongNameHelpers.cs @@ -2,11 +2,9 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Security; -using System.Text; +using System.Diagnostics.CodeAnalysis; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using System.Diagnostics.CodeAnalysis; namespace Microsoft.Runtime.Hosting { diff --git a/src/Shared/TaskEngineAssemblyResolver.cs b/src/Shared/TaskEngineAssemblyResolver.cs index f0b8760a791..ed58e5e4847 100644 --- a/src/Shared/TaskEngineAssemblyResolver.cs +++ b/src/Shared/TaskEngineAssemblyResolver.cs @@ -1,14 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Shared; using System; +using System.Diagnostics; using System.IO; using System.Reflection; -using System.Diagnostics; -using System.Globalization; -using System.Security.Permissions; - -using Microsoft.Build.Shared; namespace Microsoft.Build.BackEnd.Logging { diff --git a/src/Shared/TaskHostConfiguration.cs b/src/Shared/TaskHostConfiguration.cs index 29c9704e8a3..c7a737e4b8c 100644 --- a/src/Shared/TaskHostConfiguration.cs +++ b/src/Shared/TaskHostConfiguration.cs @@ -6,15 +6,12 @@ // configure itself for to execute a particular task. //----------------------------------------------------------------------- +using Microsoft.Build.Shared; using System; using System.Collections.Generic; using System.Diagnostics; using System.Globalization; -using System.Linq; using System.Threading; -using System.Text; - -using Microsoft.Build.Shared; namespace Microsoft.Build.BackEnd { diff --git a/src/Shared/TaskHostTaskCancelled.cs b/src/Shared/TaskHostTaskCancelled.cs index 164b5e96c46..b7b256681bc 100644 --- a/src/Shared/TaskHostTaskCancelled.cs +++ b/src/Shared/TaskHostTaskCancelled.cs @@ -6,10 +6,6 @@ // currently executing has been canceled. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; namespace Microsoft.Build.BackEnd { diff --git a/src/Shared/TaskHostTaskComplete.cs b/src/Shared/TaskHostTaskComplete.cs index 523c2d7f703..1f6bbd5e061 100644 --- a/src/Shared/TaskHostTaskComplete.cs +++ b/src/Shared/TaskHostTaskComplete.cs @@ -6,14 +6,10 @@ // needs from the task host on completion of task execution. //----------------------------------------------------------------------- +using Microsoft.Build.Shared; using System; using System.Collections.Generic; using System.Diagnostics; -using System.Linq; -using System.Text; - -using Microsoft.Build.Collections; -using Microsoft.Build.Shared; namespace Microsoft.Build.BackEnd { diff --git a/src/Shared/TaskLoader.cs b/src/Shared/TaskLoader.cs index e41d128f7f5..8c46ebaa41a 100644 --- a/src/Shared/TaskLoader.cs +++ b/src/Shared/TaskLoader.cs @@ -5,8 +5,8 @@ // Class that provides helper methods to abstract the loading of tasks. //----------------------------------------------------------------------- -using System; using Microsoft.Build.Framework; +using System; using System.Reflection; namespace Microsoft.Build.Shared diff --git a/src/Shared/TaskLoggingHelper.cs b/src/Shared/TaskLoggingHelper.cs index 575298f1a39..5bc2f7d9f1b 100644 --- a/src/Shared/TaskLoggingHelper.cs +++ b/src/Shared/TaskLoggingHelper.cs @@ -1,19 +1,16 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using System; using System.Diagnostics; using System.Globalization; using System.IO; using System.Resources; -using System.Text; -using System.Text.RegularExpressions; -using System.Runtime.InteropServices; -using System.Runtime.Remoting.Lifetime; using System.Runtime.Remoting; - -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; +using System.Runtime.Remoting.Lifetime; +using System.Text; #if BUILD_ENGINE namespace Microsoft.Build.BackEnd @@ -1373,7 +1370,7 @@ public override object InitializeLifetimeService() ILease lease = (ILease)base.InitializeLifetimeService(); // Set how long a lease should be initially. Once a lease expires - // the remote object will be disconnected and it will be marked as being available + // the remote object will be disconnected and it will be marked as being available // for garbage collection int initialLeaseTime = 1; @@ -1430,7 +1427,7 @@ public void MarkAsInactive() lock (_locker) { // Clear out the sponsor (who is responsible for keeping the TaskLoggingHelper remoting lease alive until the task is done) - // this will be null if the engineproxy was never sent across an appdomain boundary. + // this will be null if the engineproxy was never sent across an appdomain boundary. if (_sponsor != null) { ILease lease = (ILease)RemotingServices.GetLifetimeService(this); diff --git a/src/Shared/TaskLoggingHelperExtension.cs b/src/Shared/TaskLoggingHelperExtension.cs index b39a83e1c9f..b1ecb0a0ffe 100644 --- a/src/Shared/TaskLoggingHelperExtension.cs +++ b/src/Shared/TaskLoggingHelperExtension.cs @@ -2,9 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Diagnostics; using System.Globalization; -using System.IO; using System.Resources; /* Unmerged change from project 'Microsoft.Build.Tasks' diff --git a/src/Shared/TaskParameter.cs b/src/Shared/TaskParameter.cs index 99619353d4e..c032491edb3 100644 --- a/src/Shared/TaskParameter.cs +++ b/src/Shared/TaskParameter.cs @@ -5,16 +5,13 @@ // Wrapper class to enable serialization of all allowed task parameter types. //----------------------------------------------------------------------- +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using System; using System.Collections; using System.Collections.Generic; using System.Diagnostics; using System.Security; -using System.Security.Permissions; - -using Microsoft.Build.Collections; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; namespace Microsoft.Build.BackEnd { diff --git a/src/Shared/TaskParameterTypeVerifier.cs b/src/Shared/TaskParameterTypeVerifier.cs index 2d64146d8ab..50fb5c05de3 100644 --- a/src/Shared/TaskParameterTypeVerifier.cs +++ b/src/Shared/TaskParameterTypeVerifier.cs @@ -5,8 +5,8 @@ // TaskParameterTypeVerifier verifies the correct type for both input and output parameters. //----------------------------------------------------------------------- -using System; using Microsoft.Build.Framework; +using System; namespace Microsoft.Build.BackEnd { diff --git a/src/Shared/TempFileUtilities.cs b/src/Shared/TempFileUtilities.cs index c1ae101d951..27aa01ed9a8 100644 --- a/src/Shared/TempFileUtilities.cs +++ b/src/Shared/TempFileUtilities.cs @@ -7,15 +7,6 @@ using System; using System.IO; -using System.Security; -using System.Collections; -using System.Diagnostics; -using System.Globalization; -using System.Text.RegularExpressions; -using System.Text; -using System.Threading; -using System.Runtime.InteropServices; -using System.Collections.Generic; namespace Microsoft.Build.Shared { diff --git a/src/Shared/ToolsetElement.cs b/src/Shared/ToolsetElement.cs index 3d7ccebcd52..7af92f880a3 100644 --- a/src/Shared/ToolsetElement.cs +++ b/src/Shared/ToolsetElement.cs @@ -1,15 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Collections; +using Microsoft.Build.Shared; using System; using System.Collections.Generic; using System.Configuration; using System.IO; -using System.Text; -using System.Globalization; -using System.Reflection; -using Microsoft.Build.Collections; -using Microsoft.Build.Shared; namespace Microsoft.Build.Evaluation { diff --git a/src/Shared/Tracing.cs b/src/Shared/Tracing.cs index 4d7484fef1e..4a1d34fe0cd 100644 --- a/src/Shared/Tracing.cs +++ b/src/Shared/Tracing.cs @@ -7,8 +7,6 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Reflection; diff --git a/src/Shared/TypeLoader.cs b/src/Shared/TypeLoader.cs index 0ce638f6c3f..7c23c4c2190 100644 --- a/src/Shared/TypeLoader.cs +++ b/src/Shared/TypeLoader.cs @@ -6,13 +6,11 @@ //----------------------------------------------------------------------- using System; -using System.IO; -using System.Reflection; -using System.Collections; -using System.Globalization; +using System.Collections.Concurrent; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using System.Collections.Concurrent; +using System.IO; +using System.Reflection; namespace Microsoft.Build.Shared { @@ -281,7 +279,7 @@ internal LoadedType GetLoadedTypeByTypeName(string typeName) { Type type = null; - // Maybe we've already cracked open this assembly before. Check to see if the typeName is in the list we don't look for partial matches here + // Maybe we've already cracked open this assembly before. Check to see if the typeName is in the list we don't look for partial matches here // this is an optimization. bool foundType = _typeNameToType.TryGetValue(typeName, out type); if (!foundType) diff --git a/src/Shared/UnitTests/AssemblyNameEx_Tests.cs b/src/Shared/UnitTests/AssemblyNameEx_Tests.cs index aee1c5483b8..389745b1f56 100644 --- a/src/Shared/UnitTests/AssemblyNameEx_Tests.cs +++ b/src/Shared/UnitTests/AssemblyNameEx_Tests.cs @@ -1,20 +1,13 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; +using System.Collections.Generic; +using System.Globalization; using System.IO; using System.Reflection; -using System.Globalization; -using System.Resources; -using System.Text.RegularExpressions; -using Microsoft.Win32; -using System.Collections; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; -using System.Collections.Generic; - -using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Microsoft.Build.UnitTests { diff --git a/src/Shared/UnitTests/BuildEventArgsExtension.cs b/src/Shared/UnitTests/BuildEventArgsExtension.cs index 6010ea07a64..a5ea1017fee 100644 --- a/src/Shared/UnitTests/BuildEventArgsExtension.cs +++ b/src/Shared/UnitTests/BuildEventArgsExtension.cs @@ -5,14 +5,8 @@ // Helper extension to BuildEventArgs //----------------------------------------------------------------------- -using System; -using System.Reflection; -using System.Collections; -using System.Runtime.Serialization; -using System.Runtime.Serialization.Formatters.Binary; -using System.IO; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Framework; +using System; using System.Collections.Generic; using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; diff --git a/src/Shared/UnitTests/CopyOnWriteDictionary_Tests.cs b/src/Shared/UnitTests/CopyOnWriteDictionary_Tests.cs index 30facc6e6c7..a3f949478fd 100644 --- a/src/Shared/UnitTests/CopyOnWriteDictionary_Tests.cs +++ b/src/Shared/UnitTests/CopyOnWriteDictionary_Tests.cs @@ -5,19 +5,12 @@ // Tests for the copy on write dictionary class //----------------------------------------------------------------------- +using Microsoft.Build.Collections; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; -using System.IO; -using System.Collections; using System.Collections.Generic; -using System.Runtime.Serialization; +using System.IO; using System.Runtime.Serialization.Formatters.Binary; -using Microsoft.Build.Evaluation; -using Microsoft.Build.UnitTests; -using Microsoft.Build.Collections; -using Microsoft.Build.Execution; -using Microsoft.Build.Shared; -using Microsoft.Build.Construction; -using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Microsoft.Build.UnitTests.OM.Collections { diff --git a/src/Shared/UnitTests/ErrorUtilities_Tests.cs b/src/Shared/UnitTests/ErrorUtilities_Tests.cs index c35f6fbc076..e7d931670c9 100644 --- a/src/Shared/UnitTests/ErrorUtilities_Tests.cs +++ b/src/Shared/UnitTests/ErrorUtilities_Tests.cs @@ -2,9 +2,9 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. #region Using directives -using System; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; #endregion diff --git a/src/Shared/UnitTests/EscapingUtilities_Tests.cs b/src/Shared/UnitTests/EscapingUtilities_Tests.cs index f382c2bde16..5f9f615dcc1 100644 --- a/src/Shared/UnitTests/EscapingUtilities_Tests.cs +++ b/src/Shared/UnitTests/EscapingUtilities_Tests.cs @@ -2,9 +2,8 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. #region Using directives -using System; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; #endregion diff --git a/src/Shared/UnitTests/FileMatcher_Tests.cs b/src/Shared/UnitTests/FileMatcher_Tests.cs index 7cac54edcc0..0e8594030b1 100644 --- a/src/Shared/UnitTests/FileMatcher_Tests.cs +++ b/src/Shared/UnitTests/FileMatcher_Tests.cs @@ -1,18 +1,13 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; -using System.IO; -using System.Reflection; using System.Collections; -using System.Globalization; +using System.IO; using System.Text.RegularExpressions; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; - namespace Microsoft.Build.UnitTests { [TestClass] diff --git a/src/Shared/UnitTests/FileUtilities_Tests.cs b/src/Shared/UnitTests/FileUtilities_Tests.cs index c641e120b8e..f27e15f2a48 100644 --- a/src/Shared/UnitTests/FileUtilities_Tests.cs +++ b/src/Shared/UnitTests/FileUtilities_Tests.cs @@ -1,16 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections; -using System.Diagnostics; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using System.Text; - -using Microsoft.Build.Collections; using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; using System.IO; -using System.Collections.Generic; namespace Microsoft.Build.UnitTests { diff --git a/src/Shared/UnitTests/HybridDictionary_Tests.cs b/src/Shared/UnitTests/HybridDictionary_Tests.cs index f9e515888ad..8f9375c8ba9 100644 --- a/src/Shared/UnitTests/HybridDictionary_Tests.cs +++ b/src/Shared/UnitTests/HybridDictionary_Tests.cs @@ -5,12 +5,12 @@ // Tests of a dictionary which changes its backing store to keep memory use low. //----------------------------------------------------------------------- -using System.Collections.Generic; using Microsoft.Build.Collections; using Microsoft.VisualStudio.TestTools.UnitTesting; using System; -using System.Linq; using System.Collections; +using System.Collections.Generic; +using System.Linq; namespace Microsoft.Build.UnitTests.OM.Collections { diff --git a/src/Shared/UnitTests/MockEngine.cs b/src/Shared/UnitTests/MockEngine.cs index 4c2eb295715..bb7bc3a4173 100644 --- a/src/Shared/UnitTests/MockEngine.cs +++ b/src/Shared/UnitTests/MockEngine.cs @@ -1,14 +1,14 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections; -using System.Collections.Generic; using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; using Microsoft.Build.Framework; using Microsoft.Build.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections; +using System.Collections.Generic; namespace Microsoft.Build.UnitTests { diff --git a/src/Shared/UnitTests/MockLogger.cs b/src/Shared/UnitTests/MockLogger.cs index 4adf0272765..b4e6183e2d1 100644 --- a/src/Shared/UnitTests/MockLogger.cs +++ b/src/Shared/UnitTests/MockLogger.cs @@ -1,18 +1,14 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; -using System.Collections; using System.Collections.Generic; using System.Globalization; using System.IO; using System.Resources; using System.Text; -using System.Xml; - -using Microsoft.Build.Framework; -using Microsoft.VisualStudio.TestTools.UnitTesting; - using ProjectCollection = Microsoft.Build.Evaluation.ProjectCollection; diff --git a/src/Shared/UnitTests/NativeMethodsShared_Tests.cs b/src/Shared/UnitTests/NativeMethodsShared_Tests.cs index 70e480765f9..b49722b32da 100644 --- a/src/Shared/UnitTests/NativeMethodsShared_Tests.cs +++ b/src/Shared/UnitTests/NativeMethodsShared_Tests.cs @@ -1,15 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; +using System.Diagnostics; using System.IO; using System.Runtime.InteropServices; -using System.Diagnostics; -using System.Text; - -using Microsoft.VisualStudio.TestTools.UnitTesting; - -using Microsoft.Build.Shared; namespace Microsoft.Build.UnitTests { diff --git a/src/Shared/UnitTests/ObjectModelHelpers.cs b/src/Shared/UnitTests/ObjectModelHelpers.cs index 64a06c21283..522b643765b 100644 --- a/src/Shared/UnitTests/ObjectModelHelpers.cs +++ b/src/Shared/UnitTests/ObjectModelHelpers.cs @@ -1,27 +1,22 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Construction; +using Microsoft.Build.Evaluation; +using Microsoft.Build.Execution; +using Microsoft.Build.Framework; +using Microsoft.Build.Logging; +using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; using System.Collections; using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Linq; -using System.Reflection; using System.Text; -using System.Text.RegularExpressions; using System.Xml; - -using Microsoft.VisualStudio.TestTools.UnitTesting; - -using Microsoft.Build.Construction; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Execution; -using Microsoft.Build.Framework; -using Microsoft.Build.Logging; -using Microsoft.Build.Shared; - namespace Microsoft.Build.UnitTests { /* diff --git a/src/Shared/UnitTests/ResourceUtilities_Tests.cs b/src/Shared/UnitTests/ResourceUtilities_Tests.cs index 174a4b18669..bb815e30c1e 100644 --- a/src/Shared/UnitTests/ResourceUtilities_Tests.cs +++ b/src/Shared/UnitTests/ResourceUtilities_Tests.cs @@ -1,12 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -using Microsoft.Build.Framework; using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Microsoft.Build.UnitTests { diff --git a/src/Shared/UnitTests/StreamHelpers.cs b/src/Shared/UnitTests/StreamHelpers.cs index c1ab572ec8f..12407ce7e57 100644 --- a/src/Shared/UnitTests/StreamHelpers.cs +++ b/src/Shared/UnitTests/StreamHelpers.cs @@ -1,10 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; using System.IO; -using System.Reflection; -using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Microsoft.Build.UnitTests { diff --git a/src/Shared/UnitTests/TaskParameter_Tests.cs b/src/Shared/UnitTests/TaskParameter_Tests.cs index f3d94418f4b..30c4fc567b5 100644 --- a/src/Shared/UnitTests/TaskParameter_Tests.cs +++ b/src/Shared/UnitTests/TaskParameter_Tests.cs @@ -6,16 +6,14 @@ // testing its serialization. //----------------------------------------------------------------------- -using System; -using System.Collections; -using System.Collections.Generic; - using Microsoft.Build.BackEnd; using Microsoft.Build.Framework; using Microsoft.Build.UnitTests.BackEnd; using Microsoft.Build.Utilities; - using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections; +using System.Collections.Generic; namespace Microsoft.Build.UnitTests { diff --git a/src/Shared/UnitTests/TypeLoader_Tests.cs b/src/Shared/UnitTests/TypeLoader_Tests.cs index 9a8eaa66e14..9b8232791f0 100644 --- a/src/Shared/UnitTests/TypeLoader_Tests.cs +++ b/src/Shared/UnitTests/TypeLoader_Tests.cs @@ -1,10 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; using System.Reflection; namespace Microsoft.Build.UnitTests diff --git a/src/Shared/UnitTests/XmakeAttributes_Tests.cs b/src/Shared/UnitTests/XmakeAttributes_Tests.cs index 12100e04c84..8abd344cc78 100644 --- a/src/Shared/UnitTests/XmakeAttributes_Tests.cs +++ b/src/Shared/UnitTests/XmakeAttributes_Tests.cs @@ -1,11 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections.Generic; - -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; namespace Microsoft.Build.UnitTests { diff --git a/src/Shared/UnitTests/XmlUtilities_Tests.cs b/src/Shared/UnitTests/XmlUtilities_Tests.cs index f2f5cd641d9..b641c484b45 100644 --- a/src/Shared/UnitTests/XmlUtilities_Tests.cs +++ b/src/Shared/UnitTests/XmlUtilities_Tests.cs @@ -1,12 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections.Generic; - -using Microsoft.VisualStudio.TestTools.UnitTesting; - using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; namespace Microsoft.Build.UnitTests { diff --git a/src/Shared/VersionUtilities.cs b/src/Shared/VersionUtilities.cs index d2922842a57..8e5e214bf96 100644 --- a/src/Shared/VersionUtilities.cs +++ b/src/Shared/VersionUtilities.cs @@ -6,9 +6,7 @@ //----------------------------------------------------------------------- using System; -using Microsoft.Win32; using System.Collections; -using System.Globalization; using System.Collections.Generic; namespace Microsoft.Build.Shared diff --git a/src/Shared/VisualStudioConstants.cs b/src/Shared/VisualStudioConstants.cs index 9e32700f16e..016a874ece6 100644 --- a/src/Shared/VisualStudioConstants.cs +++ b/src/Shared/VisualStudioConstants.cs @@ -5,7 +5,6 @@ // Shared Visual Studio related constants. //----------------------------------------------------------------------- -using System; namespace Microsoft.Build.Shared { diff --git a/src/Shared/XMakeAttributes.cs b/src/Shared/XMakeAttributes.cs index efb5e68048f..6feafa865a0 100644 --- a/src/Shared/XMakeAttributes.cs +++ b/src/Shared/XMakeAttributes.cs @@ -2,10 +2,6 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Collections; -using System.Collections.Generic; -using System.Xml; -using System.Globalization; namespace Microsoft.Build.Shared { diff --git a/src/Shared/XMakeElements.cs b/src/Shared/XMakeElements.cs index d059744d7a7..de4ff176da0 100644 --- a/src/Shared/XMakeElements.cs +++ b/src/Shared/XMakeElements.cs @@ -3,8 +3,6 @@ using System; using System.Collections; -using System.Xml; -using System.Globalization; namespace Microsoft.Build.Shared { diff --git a/src/Shared/XmlUtilities.cs b/src/Shared/XmlUtilities.cs index 106e99c1c06..340d8df13cd 100644 --- a/src/Shared/XmlUtilities.cs +++ b/src/Shared/XmlUtilities.cs @@ -1,10 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Construction; using System; using System.Xml; -using System.Text.RegularExpressions; -using Microsoft.Build.Construction; namespace Microsoft.Build.Shared { diff --git a/src/Utilities/ApiContract.cs b/src/Utilities/ApiContract.cs index dd5d54d4f76..d95a29b2ea4 100644 --- a/src/Utilities/ApiContract.cs +++ b/src/Utilities/ApiContract.cs @@ -6,8 +6,8 @@ //----------------------------------------------------------------------- using System; -using System.Xml; using System.Collections.Generic; +using System.Xml; namespace Microsoft.Build.Utilities { diff --git a/src/Utilities/AppDomainIsolatedTask.cs b/src/Utilities/AppDomainIsolatedTask.cs index 7a0a4b716a6..05cb94f747b 100644 --- a/src/Utilities/AppDomainIsolatedTask.cs +++ b/src/Utilities/AppDomainIsolatedTask.cs @@ -1,14 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; using System; -using System.IO; using System.Resources; using System.Security; -using System.Security.Permissions; -using System.Runtime.InteropServices; - -using Microsoft.Build.Framework; namespace Microsoft.Build.Utilities { @@ -161,7 +157,7 @@ protected string HelpKeywordPrefix public abstract bool Execute(); /// - /// Overridden to give tasks deriving from this class infinite lease time. Otherwise we end up with a limited + /// Overridden to give tasks deriving from this class infinite lease time. Otherwise we end up with a limited /// lease (5 minutes I think) and task instances can expire if they take long time processing. /// [SecurityCritical] diff --git a/src/Utilities/AssemblyFoldersExInfo.cs b/src/Utilities/AssemblyFoldersExInfo.cs index 866893b03f6..3da599c2bf7 100644 --- a/src/Utilities/AssemblyFoldersExInfo.cs +++ b/src/Utilities/AssemblyFoldersExInfo.cs @@ -5,9 +5,9 @@ // Contains information about entries in the AssemblyFoldersEx registry keys. //----------------------------------------------------------------------- -using System; using Microsoft.Build.Shared; using Microsoft.Win32; +using System; namespace Microsoft.Build.Utilities { diff --git a/src/Utilities/AssemblyInfo.cs b/src/Utilities/AssemblyInfo.cs index 7da239d54c4..b38f83440a0 100644 --- a/src/Utilities/AssemblyInfo.cs +++ b/src/Utilities/AssemblyInfo.cs @@ -2,9 +2,9 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System.Reflection; -using System.Security.Permissions; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; +using System.Security.Permissions; #pragma warning disable 618 [assembly: SecurityPermission(SecurityAction.RequestMinimum, Flags = SecurityPermissionFlag.Execution)] diff --git a/src/Utilities/AssemblyResources.cs b/src/Utilities/AssemblyResources.cs index f1005550327..74113a168f7 100644 --- a/src/Utilities/AssemblyResources.cs +++ b/src/Utilities/AssemblyResources.cs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Resources; -using System.Reflection; using System.Globalization; +using System.Reflection; +using System.Resources; namespace Microsoft.Build.Shared { diff --git a/src/Utilities/CommandLineBuilder.cs b/src/Utilities/CommandLineBuilder.cs index d494756495b..34face12ac9 100644 --- a/src/Utilities/CommandLineBuilder.cs +++ b/src/Utilities/CommandLineBuilder.cs @@ -1,15 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using System; using System.Diagnostics; -using System.IO; using System.Text; -using System.Resources; -using System.Globalization; -using Microsoft.Build.Framework; using System.Text.RegularExpressions; -using Microsoft.Build.Shared; namespace Microsoft.Build.Utilities { diff --git a/src/Utilities/FxCopExclusions/Microsoft.Build.Utilities.Suppressions.cs b/src/Utilities/FxCopExclusions/Microsoft.Build.Utilities.Suppressions.cs index 0a30b020544..51c1c75112a 100644 --- a/src/Utilities/FxCopExclusions/Microsoft.Build.Utilities.Suppressions.cs +++ b/src/Utilities/FxCopExclusions/Microsoft.Build.Utilities.Suppressions.cs @@ -5,7 +5,7 @@ // Add module level suppressions to this file to have them suppressed in the assembly // -using System.Diagnostics.CodeAnalysis; + #if CODE_ANALYSIS [module: SuppressMessage("Microsoft.Naming","CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId="0", Scope="module", Target="microsoft.build.utilities.core.dll", Justification="It's been named this way for several versions now.")] diff --git a/src/Utilities/Logger.cs b/src/Utilities/Logger.cs index b9b603ff145..3602353ce15 100644 --- a/src/Utilities/Logger.cs +++ b/src/Utilities/Logger.cs @@ -1,8 +1,6 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Runtime.InteropServices; using Microsoft.Build.Framework; using Microsoft.Build.Shared; diff --git a/src/Utilities/MuxLogger.cs b/src/Utilities/MuxLogger.cs index e92e86cc235..f7dc1ad15c1 100644 --- a/src/Utilities/MuxLogger.cs +++ b/src/Utilities/MuxLogger.cs @@ -5,11 +5,10 @@ // Implementation of the Multiplexing logger. //----------------------------------------------------------------------- -using System; -using System.Collections; -using System.Collections.Generic; using Microsoft.Build.Framework; using Microsoft.Build.Shared; +using System; +using System.Collections.Generic; namespace Microsoft.Build.Utilities { @@ -43,8 +42,8 @@ namespace Microsoft.Build.Utilities /// A new event source will be created so that the logger passed in can be registered to that event source /// If the build started event has already been logged the MUX logger will create a new BuildStartedEvent and send that to the event source. /// - /// UnregisterLoggers: - /// When a build submission is completed the UnregisterLoggers method will be called with the submission ID. + /// UnregisterLoggers: + /// When a build submission is completed the UnregisterLoggers method will be called with the submission ID. /// At this point we will look up the success state of the project finished event for the submission ID and log a build finished event to the logger. /// The event source will be cleaned up. This may be interesting because the unregister will come from a thread other than what is doing the logging. /// This may create a Synchronization issue, if unregister is called while events are being logged. diff --git a/src/Utilities/PlatformManifest.cs b/src/Utilities/PlatformManifest.cs index c867a6880a7..d81a043a071 100644 --- a/src/Utilities/PlatformManifest.cs +++ b/src/Utilities/PlatformManifest.cs @@ -5,11 +5,11 @@ // Loads and stores the contents of Platform.xml //----------------------------------------------------------------------- +using Microsoft.Build.Shared; using System; +using System.Collections.Generic; using System.IO; using System.Xml; -using System.Collections.Generic; -using Microsoft.Build.Shared; namespace Microsoft.Build.Utilities { diff --git a/src/Utilities/ProcessorArchitecture.cs b/src/Utilities/ProcessorArchitecture.cs index a1c580c2176..14a01bf1020 100644 --- a/src/Utilities/ProcessorArchitecture.cs +++ b/src/Utilities/ProcessorArchitecture.cs @@ -1,12 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Shared; using System; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; -using System.Text; -using Microsoft.Build.Shared; namespace Microsoft.Build.Utilities { diff --git a/src/Utilities/SDKManifest.cs b/src/Utilities/SDKManifest.cs index 2d7708139d2..880ea58159d 100644 --- a/src/Utilities/SDKManifest.cs +++ b/src/Utilities/SDKManifest.cs @@ -5,18 +5,14 @@ // Loads and stores contents SDKManifest.xml - The sdkmanifest parser has been factored out from ResolveSDKReference.cs //----------------------------------------------------------------------- +using Microsoft.Build.Shared; using System; using System.Collections.Generic; -using System.IO; -using System.Text.RegularExpressions; -using System.Xml; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.Win32; using System.Collections.ObjectModel; using System.Diagnostics.CodeAnalysis; -using System.Globalization; +using System.IO; using System.Linq; +using System.Xml; namespace Microsoft.Build.Utilities { diff --git a/src/Utilities/TargetPlatformSDK.cs b/src/Utilities/TargetPlatformSDK.cs index 90012124036..2bae98ce99c 100644 --- a/src/Utilities/TargetPlatformSDK.cs +++ b/src/Utilities/TargetPlatformSDK.cs @@ -5,11 +5,11 @@ // Internal representation of a target platform //----------------------------------------------------------------------- +using Microsoft.Build.Shared; using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Globalization; -using Microsoft.Build.Shared; namespace Microsoft.Build.Utilities { diff --git a/src/Utilities/Task.cs b/src/Utilities/Task.cs index 14063979825..267ebe9b57b 100644 --- a/src/Utilities/Task.cs +++ b/src/Utilities/Task.cs @@ -1,12 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Resources; -using System.Runtime.InteropServices; -using Microsoft.Build.Shared; using Microsoft.Build.Framework; +using System.Resources; namespace Microsoft.Build.Utilities { diff --git a/src/Utilities/TaskItem.cs b/src/Utilities/TaskItem.cs index bcd83973901..15ef9c7ba6b 100644 --- a/src/Utilities/TaskItem.cs +++ b/src/Utilities/TaskItem.cs @@ -1,18 +1,13 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Collections; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using System; using System.Collections; using System.Collections.Generic; -using System.Diagnostics; -using System.Globalization; -using System.Runtime.InteropServices; using System.Security; -using System.Security.Permissions; - -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.Build.Collections; namespace Microsoft.Build.Utilities { @@ -408,7 +403,7 @@ public override string ToString() } /// - /// Overridden to give this class infinite lease time. Otherwise we end up with a limited + /// Overridden to give this class infinite lease time. Otherwise we end up with a limited /// lease (5 minutes I think) and instances can expire if they take long time processing. /// [SecurityCritical] diff --git a/src/Utilities/ToolLocationHelper.cs b/src/Utilities/ToolLocationHelper.cs index 5c97022a658..01d72693def 100644 --- a/src/Utilities/ToolLocationHelper.cs +++ b/src/Utilities/ToolLocationHelper.cs @@ -1,22 +1,19 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Text; -using System.Diagnostics.CodeAnalysis; -using System.Globalization; using Microsoft.Build.Shared; -using System.Xml; +using Microsoft.Win32; +using System; using System.Collections; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; +using System.IO; using System.Linq; - +using System.Text; +using System.Xml; using FrameworkNameVersioning = System.Runtime.Versioning.FrameworkName; -using UtilitiesDotNetFrameworkArchitecture = Microsoft.Build.Utilities.DotNetFrameworkArchitecture; using SharedDotNetFrameworkArchitecture = Microsoft.Build.Shared.DotNetFrameworkArchitecture; -using Microsoft.Win32; -using System.Collections.ObjectModel; +using UtilitiesDotNetFrameworkArchitecture = Microsoft.Build.Utilities.DotNetFrameworkArchitecture; namespace Microsoft.Build.Utilities { @@ -146,7 +143,7 @@ public static class ToolLocationHelper private static object s_locker = new Object(); /// - /// Cache the results of calling the GetPathToRefernceAssemblies so that we do not recalculate it every time we call the method + /// Cache the results of calling the GetPathToRefernceAssemblies so that we do not recalculate it every time we call the method /// private static Dictionary> s_cachedReferenceAssemblyPaths; @@ -1569,7 +1566,7 @@ internal static string VersionToDotNetReferenceAssemblies(VersionToPath PathToDo /// /// Generate the list of reference assembly paths for well known .net framework versions /// - /// Target framework moniker class which contains the targetframeworkVersion + /// Target framework moniker class which contains the targetframeworkVersion /// A collection of strings which list the chained reference assembly paths with the highest version being first internal static IList HandleLegacyDotNetFrameworkReferenceAssemblyPaths(VersionToPath PathToDotNetFramework, VersionToPath PathToReferenceAssemblies, FrameworkNameVersioning frameworkName) { @@ -1586,7 +1583,7 @@ internal static IList HandleLegacyDotNetFrameworkReferenceAssemblyPaths( return HandleLegacy35(PathToDotNetFramework, PathToReferenceAssemblies); } - // Don't know the framework send back an empty list because it does not exist + // Don't know the framework send back an empty list because it does not exist return new List(); } @@ -2457,11 +2454,11 @@ private static void GatherSDKListFromRegistry(string registryRoot, Dictionary - /// Get the disk locations to search for sdks under. This can be overridden by an environment variable + /// Get the disk locations to search for sdks under. This can be overridden by an environment variable /// private static void GetDefaultSDKDiskRoots(List diskRoots) { - // The order is important here because we want to look in the users location first before the non privileged location. + // The order is important here because we want to look in the users location first before the non privileged location. // We need this so that a user can also have an sdk installed in a non privileged location string userLocalAppData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData); diff --git a/src/Utilities/ToolTask.cs b/src/Utilities/ToolTask.cs index 85e14fc9af8..96d67deb125 100644 --- a/src/Utilities/ToolTask.cs +++ b/src/Utilities/ToolTask.cs @@ -1,23 +1,19 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using System; -using System.IO; using System.Collections; -using System.Collections.Specialized; using System.Collections.Generic; -using System.Text; -using System.Resources; -using System.Threading; -using System.Reflection; -using System.Diagnostics; +using System.Collections.Specialized; using System.ComponentModel; -using System.Globalization; -using System.Runtime.InteropServices; - -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; +using System.Diagnostics; using System.Diagnostics.CodeAnalysis; +using System.IO; +using System.Resources; +using System.Text; +using System.Threading; namespace Microsoft.Build.Utilities { @@ -1083,7 +1079,7 @@ private void KillToolProcessOnTimeout(Process proc, bool isBeingCancelled) } // wait until the process finishes exiting/getting killed. - // We don't want to wait forever here because the task is already supposed to be dieing, we just want to give it long enough + // We don't want to wait forever here because the task is already supposed to be dieing, we just want to give it long enough // to try and flush what it can and stop. If it cannot do that in a reasonable time frame then we will just ignore it. int timeout = 5000; string timeoutFromEnvironment = Environment.GetEnvironmentVariable("MSBUILDTOOLTASKCANCELPROCESSWAITTIMEOUT"); @@ -1534,7 +1530,7 @@ public override bool Execute() } // Log the environment. We do this up here, - // rather than later where the environment is set, + // rather than later where the environment is set, // so that it appears before the command line is logged. bool alreadyLoggedEnvironmentHeader = false; diff --git a/src/Utilities/TrackedDependencies/CanonicalTrackedFilesHelper.cs b/src/Utilities/TrackedDependencies/CanonicalTrackedFilesHelper.cs index 0da5009ec87..6bff7f2dc2d 100644 --- a/src/Utilities/TrackedDependencies/CanonicalTrackedFilesHelper.cs +++ b/src/Utilities/TrackedDependencies/CanonicalTrackedFilesHelper.cs @@ -1,13 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - using Microsoft.Build.Framework; -using Microsoft.Build.Shared; +using System; namespace Microsoft.Build.Utilities { diff --git a/src/Utilities/TrackedDependencies/CanonicalTrackedInputFiles.cs b/src/Utilities/TrackedDependencies/CanonicalTrackedInputFiles.cs index 9baf642177f..a1d7586b2f7 100644 --- a/src/Utilities/TrackedDependencies/CanonicalTrackedInputFiles.cs +++ b/src/Utilities/TrackedDependencies/CanonicalTrackedInputFiles.cs @@ -1,16 +1,14 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections.Generic; -using System.Text; using Microsoft.Build.Framework; -using System.IO; using Microsoft.Build.Shared; +using System; using System.Collections.Concurrent; -using System.Threading; -using System.Threading.Tasks; +using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; +using System.IO; +using System.Threading.Tasks; namespace Microsoft.Build.Utilities { diff --git a/src/Utilities/TrackedDependencies/CanonicalTrackedOutputFiles.cs b/src/Utilities/TrackedDependencies/CanonicalTrackedOutputFiles.cs index 77db40d02d6..85f1b53b0be 100644 --- a/src/Utilities/TrackedDependencies/CanonicalTrackedOutputFiles.cs +++ b/src/Utilities/TrackedDependencies/CanonicalTrackedOutputFiles.cs @@ -1,15 +1,13 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using System.Text; using System.IO; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; - namespace Microsoft.Build.Utilities { /// diff --git a/src/Utilities/TrackedDependencies/DependencyTableCache.cs b/src/Utilities/TrackedDependencies/DependencyTableCache.cs index 129b27cfbec..1a83718649a 100644 --- a/src/Utilities/TrackedDependencies/DependencyTableCache.cs +++ b/src/Utilities/TrackedDependencies/DependencyTableCache.cs @@ -1,14 +1,13 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using System; -using System.Collections.Generic; using System.Collections; +using System.Collections.Generic; using System.Linq; using System.Text; -using System.IO; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; namespace Microsoft.Build.Utilities { diff --git a/src/Utilities/TrackedDependencies/FileTracker.cs b/src/Utilities/TrackedDependencies/FileTracker.cs index 935edac8cb5..1416db5d895 100644 --- a/src/Utilities/TrackedDependencies/FileTracker.cs +++ b/src/Utilities/TrackedDependencies/FileTracker.cs @@ -1,19 +1,16 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using System; -using System.Collections.Generic; using System.Collections; -using System.Text; +using System.Collections.Generic; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.IO; -using System.Globalization; using System.Linq; - -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using System.Runtime.InteropServices; +using System.Text; namespace Microsoft.Build.Utilities { diff --git a/src/Utilities/TrackedDependencies/FlatTrackingData.cs b/src/Utilities/TrackedDependencies/FlatTrackingData.cs index b6e7d1ec6e3..ee9609552ed 100644 --- a/src/Utilities/TrackedDependencies/FlatTrackingData.cs +++ b/src/Utilities/TrackedDependencies/FlatTrackingData.cs @@ -1,16 +1,14 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using System; using System.Collections; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.IO; using System.Resources; -using System.Text; - -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; namespace Microsoft.Build.Utilities { diff --git a/src/Utilities/TrackedDependencies/NativeMethods.cs b/src/Utilities/TrackedDependencies/NativeMethods.cs index 39b6c7acc10..3beee26e5e7 100644 --- a/src/Utilities/TrackedDependencies/NativeMethods.cs +++ b/src/Utilities/TrackedDependencies/NativeMethods.cs @@ -2,11 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Collections.Generic; -using System.Text; -using System.IO; using System.Runtime.InteropServices; -using System.Globalization; namespace Microsoft.Build.Utilities { diff --git a/src/Utilities/TrackedDependencies/TrackedDependencies.cs b/src/Utilities/TrackedDependencies/TrackedDependencies.cs index 66f501c8a56..420ad637aad 100644 --- a/src/Utilities/TrackedDependencies/TrackedDependencies.cs +++ b/src/Utilities/TrackedDependencies/TrackedDependencies.cs @@ -1,14 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections.Generic; -using System.Collections; -using System.Text; -using System.IO; - using Microsoft.Build.Framework; using Microsoft.Build.Shared; +using System.Collections.Generic; +using System.IO; namespace Microsoft.Build.Utilities { diff --git a/src/Utilities/UnitTests/CanonicalError_Tests.cs b/src/Utilities/UnitTests/CanonicalError_Tests.cs index b5304075de6..9c6e8fcf373 100644 --- a/src/Utilities/UnitTests/CanonicalError_Tests.cs +++ b/src/Utilities/UnitTests/CanonicalError_Tests.cs @@ -1,13 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Reflection; -using System.Collections; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Utilities; using CanonicalError = Microsoft.Build.Shared.CanonicalError; -using System.Text.RegularExpressions; namespace Microsoft.Build.UnitTests { diff --git a/src/Utilities/UnitTests/CommandLineBuilder_Tests.cs b/src/Utilities/UnitTests/CommandLineBuilder_Tests.cs index bd4e958d1f6..61b738cee27 100644 --- a/src/Utilities/UnitTests/CommandLineBuilder_Tests.cs +++ b/src/Utilities/UnitTests/CommandLineBuilder_Tests.cs @@ -1,14 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Reflection; -using System.Collections; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -using System.Text.RegularExpressions; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; namespace Microsoft.Build.UnitTests { diff --git a/src/Utilities/UnitTests/EventArgsFormatting_Tests.cs b/src/Utilities/UnitTests/EventArgsFormatting_Tests.cs index e1495b8f0c2..805fda4ba91 100644 --- a/src/Utilities/UnitTests/EventArgsFormatting_Tests.cs +++ b/src/Utilities/UnitTests/EventArgsFormatting_Tests.cs @@ -1,11 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; namespace Microsoft.Build.UnitTests { diff --git a/src/Utilities/UnitTests/Logger_Tests.cs b/src/Utilities/UnitTests/Logger_Tests.cs index 8c1f662687e..0decb1c5371 100644 --- a/src/Utilities/UnitTests/Logger_Tests.cs +++ b/src/Utilities/UnitTests/Logger_Tests.cs @@ -1,16 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Resources; -using System.Reflection; - -using Microsoft.VisualStudio.TestTools.UnitTesting; - using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; namespace Microsoft.Build.UnitTests { diff --git a/src/Utilities/UnitTests/MockEngine.cs b/src/Utilities/UnitTests/MockEngine.cs index 2c5c54bd396..c7f066a6834 100644 --- a/src/Utilities/UnitTests/MockEngine.cs +++ b/src/Utilities/UnitTests/MockEngine.cs @@ -1,17 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; -using System.IO; -using System.Resources; -using System.Reflection; using System.Collections; using System.Collections.Generic; -using System.Globalization; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; namespace Microsoft.Build.UnitTests { diff --git a/src/Utilities/UnitTests/MockTask.cs b/src/Utilities/UnitTests/MockTask.cs index 16d7c3b099a..e255972bd3d 100644 --- a/src/Utilities/UnitTests/MockTask.cs +++ b/src/Utilities/UnitTests/MockTask.cs @@ -1,14 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Resources; - -using Microsoft.VisualStudio.TestTools.UnitTesting; - -using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; +using System.Resources; namespace Microsoft.Build.UnitTests { diff --git a/src/Utilities/UnitTests/MuxLogger_Tests.cs b/src/Utilities/UnitTests/MuxLogger_Tests.cs index 014ccbc8167..0c8e712203e 100644 --- a/src/Utilities/UnitTests/MuxLogger_Tests.cs +++ b/src/Utilities/UnitTests/MuxLogger_Tests.cs @@ -5,19 +5,15 @@ // Tests for the MuxLogger. //----------------------------------------------------------------------- +using Microsoft.Build.Evaluation; +using Microsoft.Build.Execution; +using Microsoft.Build.Framework; +using Microsoft.Build.UnitTests; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; -using System.Collections.Generic; using System.IO; -using System.Text; using System.Threading; using System.Xml; - -using Microsoft.Build.Framework; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Execution; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.UnitTests; - using MuxLogger = Microsoft.Build.Utilities.MuxLogger; namespace Microsoft.VisualStudio.Build.UnitTest diff --git a/src/Utilities/UnitTests/ProcessorArchitecture_Tests.cs b/src/Utilities/UnitTests/ProcessorArchitecture_Tests.cs index 878eb26a3fa..30f9a55c345 100644 --- a/src/Utilities/UnitTests/ProcessorArchitecture_Tests.cs +++ b/src/Utilities/UnitTests/ProcessorArchitecture_Tests.cs @@ -1,17 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; - -using Microsoft.VisualStudio.TestTools.UnitTesting; - -using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Microsoft.Build.Utilities; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; using BuildUtilities = Microsoft.Build.Utilities; -using System.Runtime.InteropServices; -using System.Reflection; -using System.Diagnostics; namespace Microsoft.Build.UnitTests { diff --git a/src/Utilities/UnitTests/TaskItem_Tests.cs b/src/Utilities/UnitTests/TaskItem_Tests.cs index 4a5e456646f..8214c8451b7 100644 --- a/src/Utilities/UnitTests/TaskItem_Tests.cs +++ b/src/Utilities/UnitTests/TaskItem_Tests.cs @@ -1,17 +1,14 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Reflection; -using System.Collections; -using System.IO; - -using Microsoft.VisualStudio.TestTools.UnitTesting; - using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections; using System.Collections.Generic; +using System.IO; namespace Microsoft.Build.UnitTests { diff --git a/src/Utilities/UnitTests/TaskLoggingHelper_Tests.cs b/src/Utilities/UnitTests/TaskLoggingHelper_Tests.cs index bc78fd5eac4..ec822cd5b83 100644 --- a/src/Utilities/UnitTests/TaskLoggingHelper_Tests.cs +++ b/src/Utilities/UnitTests/TaskLoggingHelper_Tests.cs @@ -1,16 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Resources; -using System.Reflection; - -using Microsoft.VisualStudio.TestTools.UnitTesting; - using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.IO; namespace Microsoft.Build.UnitTests { diff --git a/src/Utilities/UnitTests/ToolLocationHelper_Tests.cs b/src/Utilities/UnitTests/ToolLocationHelper_Tests.cs index c89fc5b8d55..64109c19da8 100644 --- a/src/Utilities/UnitTests/ToolLocationHelper_Tests.cs +++ b/src/Utilities/UnitTests/ToolLocationHelper_Tests.cs @@ -1,24 +1,20 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Linq; -using System.Reflection; -using System.Collections; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Evaluation; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; -using System.Text.RegularExpressions; +using Microsoft.Build.Utilities; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using Microsoft.Win32; +using System; +using System.Collections; using System.Collections.Generic; -using System.Diagnostics; - -using UtilitiesDotNetFrameworkArchitecture = Microsoft.Build.Utilities.DotNetFrameworkArchitecture; -using SharedDotNetFrameworkArchitecture = Microsoft.Build.Shared.DotNetFrameworkArchitecture; +using System.IO; +using System.Linq; using FrameworkNameVersioning = System.Runtime.Versioning.FrameworkName; -using Microsoft.Win32; +using SharedDotNetFrameworkArchitecture = Microsoft.Build.Shared.DotNetFrameworkArchitecture; +using UtilitiesDotNetFrameworkArchitecture = Microsoft.Build.Utilities.DotNetFrameworkArchitecture; namespace Microsoft.Build.UnitTests { diff --git a/src/Utilities/UnitTests/ToolTask_Tests.cs b/src/Utilities/UnitTests/ToolTask_Tests.cs index 60c4c94c3c6..ee26df13873 100644 --- a/src/Utilities/UnitTests/ToolTask_Tests.cs +++ b/src/Utilities/UnitTests/ToolTask_Tests.cs @@ -1,16 +1,13 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Reflection; -using System.Collections; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using Microsoft.Build.Utilities; -using System.Text.RegularExpressions; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; using System.Diagnostics; -using Microsoft.Build.Shared; +using System.IO; namespace Microsoft.Build.UnitTests { diff --git a/src/Utilities/UnitTests/TrackedDependencies/FileTrackerTests.cs b/src/Utilities/UnitTests/TrackedDependencies/FileTrackerTests.cs index e90dfa64596..252f2cb23a8 100644 --- a/src/Utilities/UnitTests/TrackedDependencies/FileTrackerTests.cs +++ b/src/Utilities/UnitTests/TrackedDependencies/FileTrackerTests.cs @@ -1,26 +1,21 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using Microsoft.Build.Tasks; +using Microsoft.Build.Utilities; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; +using System.Collections; using System.Collections.Generic; +using System.Diagnostics; using System.Globalization; -using System.Text; using System.IO; -using System.Xml; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using System.Threading; -using System.Collections; -using System.Diagnostics; -using System.Runtime.InteropServices; - -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Tasks; -using Microsoft.Build.Shared; using System.Linq; - +using System.Runtime.InteropServices; +using System.Threading; using BackEndNativeMethods = Microsoft.Build.BackEnd.NativeMethods; -using ObjectModelHelpers = Microsoft.Build.UnitTests.ObjectModelHelpers; // PLEASE NOTE: This is a UNICODE file as it contains UNICODE characters! diff --git a/src/Utilities/UnitTests/TrackedDependencies/MockEngine.cs b/src/Utilities/UnitTests/TrackedDependencies/MockEngine.cs index 6aef7a74686..941fdc85517 100644 --- a/src/Utilities/UnitTests/TrackedDependencies/MockEngine.cs +++ b/src/Utilities/UnitTests/TrackedDependencies/MockEngine.cs @@ -1,15 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; -using System.IO; -using System.Resources; -using System.Reflection; using System.Collections; -using System.Globalization; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; namespace Microsoft.Build.UnitTests.TrackedDependencies { diff --git a/src/Utilities/UnitTests/TrackedDependencies/TrackedDependenciesTests.cs b/src/Utilities/UnitTests/TrackedDependencies/TrackedDependenciesTests.cs index 78350c89bb9..27f9744cb6f 100644 --- a/src/Utilities/UnitTests/TrackedDependencies/TrackedDependenciesTests.cs +++ b/src/Utilities/UnitTests/TrackedDependencies/TrackedDependenciesTests.cs @@ -1,18 +1,14 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; using System.Collections.Generic; -using System.Text; using System.IO; -using System.Xml; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using System.Threading; -using System.Collections; using System.Resources; - -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; +using System.Threading; namespace Microsoft.Build.UnitTests.TrackedDependencies { diff --git a/src/XMakeBuildEngine/AssemblyInfo.cs b/src/XMakeBuildEngine/AssemblyInfo.cs index 19a8a3569af..3e32402d71e 100644 --- a/src/XMakeBuildEngine/AssemblyInfo.cs +++ b/src/XMakeBuildEngine/AssemblyInfo.cs @@ -6,9 +6,9 @@ //----------------------------------------------------------------------- using System.Reflection; -using System.Security.Permissions; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; +using System.Security.Permissions; #pragma warning disable 618 [assembly: SecurityPermission(SecurityAction.RequestMinimum, Flags = SecurityPermissionFlag.Execution)] diff --git a/src/XMakeBuildEngine/BackEnd/BuildManager/BuildManager.cs b/src/XMakeBuildEngine/BackEnd/BuildManager/BuildManager.cs index 224dd90473e..8e018b8f60b 100644 --- a/src/XMakeBuildEngine/BackEnd/BuildManager/BuildManager.cs +++ b/src/XMakeBuildEngine/BackEnd/BuildManager/BuildManager.cs @@ -6,7 +6,6 @@ //----------------------------------------------------------------------- using System; -using System.Collections; using System.Collections.Generic; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; @@ -24,8 +23,6 @@ using Microsoft.Build.Internal; using Microsoft.Build.Logging; using Microsoft.Build.Shared; -using ForwardingLoggerRecord = Microsoft.Build.Logging.ForwardingLoggerRecord; -using LoggerDescription = Microsoft.Build.Logging.LoggerDescription; namespace Microsoft.Build.Execution { @@ -825,7 +822,7 @@ internal void ExecuteSubmission(BuildSubmission submission, bool allowMainThread // Now create the build request submission.BuildRequest = new BuildRequest( submission.SubmissionId, - Microsoft.Build.BackEnd.BuildRequest.InvalidNodeRequestId, + BackEnd.BuildRequest.InvalidNodeRequestId, newConfiguration.ConfigurationId, submission.BuildRequestData.TargetNames, submission.BuildRequestData.HostServices, @@ -1275,7 +1272,7 @@ private BuildRequestConfiguration ResolveConfiguration(BuildRequestConfiguration resolvedConfiguration.Project = unresolvedConfiguration.Project; _resultsCache.ClearResultsForConfiguration(resolvedConfiguration.ConfigurationId); } - else if (unresolvedConfiguration.Project != null && resolvedConfiguration.Project != null && !Object.ReferenceEquals(unresolvedConfiguration.Project, resolvedConfiguration.Project)) + else if (unresolvedConfiguration.Project != null && resolvedConfiguration.Project != null && !ReferenceEquals(unresolvedConfiguration.Project, resolvedConfiguration.Project)) { // The user passed in a different instance than the one we already had. Throw away any corresponding results. _resultsCache.ClearResultsForConfiguration(resolvedConfiguration.ConfigurationId); @@ -1704,7 +1701,7 @@ private ILoggingService CreateLoggingService(IEnumerable loggers, IEnum LoggerMode loggerMode = (cpuCount == 1 && _buildParameters.UseSynchronousLogging) ? LoggerMode.Synchronous : LoggerMode.Asynchronous; - ILoggingService loggingService = (ILoggingService)Microsoft.Build.BackEnd.Logging.LoggingService.CreateLoggingService(loggerMode, 1 /*This logging service is used for the build manager and the inproc node, therefore it should have the first nodeId*/); + ILoggingService loggingService = (ILoggingService)LoggingService.CreateLoggingService(loggerMode, 1 /*This logging service is used for the build manager and the inproc node, therefore it should have the first nodeId*/); ((IBuildComponent)loggingService).InitializeComponent(this); _componentFactories.ReplaceFactory(BuildComponentType.LoggingService, loggingService as IBuildComponent); @@ -1843,9 +1840,9 @@ private void Dispose(bool disposing) _noNodesActiveEvent = null; } - if (Object.ReferenceEquals(this, BuildManager.s_singletonInstance)) + if (ReferenceEquals(this, s_singletonInstance)) { - BuildManager.s_singletonInstance = null; + s_singletonInstance = null; } _disposed = true; diff --git a/src/XMakeBuildEngine/BackEnd/BuildManager/BuildParameters.cs b/src/XMakeBuildEngine/BackEnd/BuildManager/BuildParameters.cs index 383f01c8650..4d6cd102451 100644 --- a/src/XMakeBuildEngine/BackEnd/BuildManager/BuildParameters.cs +++ b/src/XMakeBuildEngine/BackEnd/BuildManager/BuildParameters.cs @@ -5,26 +5,19 @@ // Class holding the parameters and settings which are global to the build. //----------------------------------------------------------------------- -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Diagnostics.CodeAnalysis; -using System.IO; -using System.Linq; -using System.Text; -using System.Threading; -using System.Globalization; - using Microsoft.Build.BackEnd; using Microsoft.Build.Collections; using Microsoft.Build.Evaluation; using Microsoft.Build.Framework; using Microsoft.Build.Internal; using Microsoft.Build.Shared; - -using ReservedPropertyNames = Microsoft.Build.Internal.ReservedPropertyNames; -using LoggerDescription = Microsoft.Build.Logging.LoggerDescription; +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Diagnostics.CodeAnalysis; +using System.Globalization; +using System.IO; +using System.Threading; using ForwardingLoggerRecord = Microsoft.Build.Logging.ForwardingLoggerRecord; namespace Microsoft.Build.Execution diff --git a/src/XMakeBuildEngine/BackEnd/BuildManager/BuildRequestData.cs b/src/XMakeBuildEngine/BackEnd/BuildManager/BuildRequestData.cs index b768e8d7438..b36859761df 100644 --- a/src/XMakeBuildEngine/BackEnd/BuildManager/BuildRequestData.cs +++ b/src/XMakeBuildEngine/BackEnd/BuildManager/BuildRequestData.cs @@ -5,14 +5,10 @@ // The public class representing the data for a build request. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.IO; -using System.Text; - using Microsoft.Build.Collections; -using Microsoft.Build.Evaluation; using Microsoft.Build.Shared; +using System; +using System.Collections.Generic; namespace Microsoft.Build.Execution { diff --git a/src/XMakeBuildEngine/BackEnd/BuildManager/BuildSubmission.cs b/src/XMakeBuildEngine/BackEnd/BuildManager/BuildSubmission.cs index 2b996920bb9..0084405f0a1 100644 --- a/src/XMakeBuildEngine/BackEnd/BuildManager/BuildSubmission.cs +++ b/src/XMakeBuildEngine/BackEnd/BuildManager/BuildSubmission.cs @@ -5,16 +5,10 @@ // Implementation of the Build Submission. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading; -using System.Runtime.InteropServices; - using Microsoft.Build.BackEnd; using Microsoft.Build.Shared; -using System.Globalization; +using System; +using System.Threading; namespace Microsoft.Build.Execution { diff --git a/src/XMakeBuildEngine/BackEnd/BuildManager/LegacyThreadingData.cs b/src/XMakeBuildEngine/BackEnd/BuildManager/LegacyThreadingData.cs index d27739d584a..ed1b3baa890 100644 --- a/src/XMakeBuildEngine/BackEnd/BuildManager/LegacyThreadingData.cs +++ b/src/XMakeBuildEngine/BackEnd/BuildManager/LegacyThreadingData.cs @@ -5,11 +5,11 @@ // Contains a set of data used for legacy threading semantics //----------------------------------------------------------------------- -using System; -using System.Threading; using Microsoft.Build.BackEnd; using Microsoft.Build.Shared; +using System; using System.Collections.Generic; +using System.Threading; using System.Threading.Tasks; namespace Microsoft.Build.Execution diff --git a/src/XMakeBuildEngine/BackEnd/Components/BuildComponentFactoryCollection.cs b/src/XMakeBuildEngine/BackEnd/Components/BuildComponentFactoryCollection.cs index 632714e8451..e528478004e 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/BuildComponentFactoryCollection.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/BuildComponentFactoryCollection.cs @@ -5,12 +5,9 @@ // A collection of component factories. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using Microsoft.Build.BackEnd.Components.Caching; using Microsoft.Build.Shared; +using System.Collections.Generic; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Components/BuildRequestEngine/BuildRequestConfigurationResponse.cs b/src/XMakeBuildEngine/BackEnd/Components/BuildRequestEngine/BuildRequestConfigurationResponse.cs index cd54b5a8065..0931920a0e7 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/BuildRequestEngine/BuildRequestConfigurationResponse.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/BuildRequestEngine/BuildRequestConfigurationResponse.cs @@ -5,11 +5,6 @@ // Packet used to communicate configuration id back to the node //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Text; -using Microsoft.Build.Shared; -using Microsoft.Build.Framework; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Components/BuildRequestEngine/BuildRequestEngine.cs b/src/XMakeBuildEngine/BackEnd/Components/BuildRequestEngine/BuildRequestEngine.cs index 6b47c562b94..86b3dc668d1 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/BuildRequestEngine/BuildRequestEngine.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/BuildRequestEngine/BuildRequestEngine.cs @@ -5,6 +5,9 @@ // The build request engine. //----------------------------------------------------------------------- +using Microsoft.Build.BackEnd.Logging; +using Microsoft.Build.Execution; +using Microsoft.Build.Shared; using System; using System.Collections.Generic; using System.Diagnostics; @@ -12,11 +15,7 @@ using System.Globalization; using System.IO; using System.Threading; -using System.Threading.Tasks; using System.Threading.Tasks.Dataflow; -using Microsoft.Build.BackEnd.Logging; -using Microsoft.Build.Execution; -using Microsoft.Build.Shared; using BuildAbortedException = Microsoft.Build.Exceptions.BuildAbortedException; namespace Microsoft.Build.BackEnd diff --git a/src/XMakeBuildEngine/BackEnd/Components/BuildRequestEngine/BuildRequestEntry.cs b/src/XMakeBuildEngine/BackEnd/Components/BuildRequestEngine/BuildRequestEntry.cs index f4691bcc77f..0b5e3d02705 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/BuildRequestEngine/BuildRequestEntry.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/BuildRequestEngine/BuildRequestEntry.cs @@ -5,16 +5,13 @@ // Class representing a build request entry in the request engine's queue. //----------------------------------------------------------------------- +using Microsoft.Build.Execution; +using Microsoft.Build.Shared; using System; -using System.IO; using System.Collections.Generic; -using System.Text; -using Microsoft.Build.Shared; -using Microsoft.Build.Execution; using System.Diagnostics; - +using System.IO; using BuildAbortedException = Microsoft.Build.Exceptions.BuildAbortedException; -using ReservedPropertyNames = Microsoft.Build.Internal.ReservedPropertyNames; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Components/BuildRequestEngine/FullyQualifiedBuildRequest.cs b/src/XMakeBuildEngine/BackEnd/Components/BuildRequestEngine/FullyQualifiedBuildRequest.cs index ab56f2f66be..a4bd6e57b65 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/BuildRequestEngine/FullyQualifiedBuildRequest.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/BuildRequestEngine/FullyQualifiedBuildRequest.cs @@ -5,10 +5,8 @@ // Build request which has not had its configuration resolved yet. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Text; using Microsoft.Build.Shared; +using System; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Components/BuildRequestEngine/IBuildRequestEngine.cs b/src/XMakeBuildEngine/BackEnd/Components/BuildRequestEngine/IBuildRequestEngine.cs index 9a78d2d86cf..f934da43cf2 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/BuildRequestEngine/IBuildRequestEngine.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/BuildRequestEngine/IBuildRequestEngine.cs @@ -6,11 +6,8 @@ //----------------------------------------------------------------------- using System; -using System.Collections.Generic; -using System.Text; - -using NodeLoggingContext = Microsoft.Build.BackEnd.Logging.NodeLoggingContext; using BuildResult = Microsoft.Build.Execution.BuildResult; +using NodeLoggingContext = Microsoft.Build.BackEnd.Logging.NodeLoggingContext; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Components/Caching/ConfigCache.cs b/src/XMakeBuildEngine/BackEnd/Components/Caching/ConfigCache.cs index fb861ae0b96..99816d53cad 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Caching/ConfigCache.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Caching/ConfigCache.cs @@ -5,11 +5,9 @@ // Implementation of IConfigCache. //----------------------------------------------------------------------- +using Microsoft.Build.Shared; using System; using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Text; -using Microsoft.Build.Shared; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Components/Caching/IConfigCache.cs b/src/XMakeBuildEngine/BackEnd/Components/Caching/IConfigCache.cs index 391eea2e78e..a540fd40a46 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Caching/IConfigCache.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Caching/IConfigCache.cs @@ -5,9 +5,7 @@ // Interface representing a configuration cache. //----------------------------------------------------------------------- -using System; using System.Collections.Generic; -using System.Text; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Components/Caching/IPropertyCache.cs b/src/XMakeBuildEngine/BackEnd/Components/Caching/IPropertyCache.cs index 2faabcbd2a7..6728d3b4923 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Caching/IPropertyCache.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Caching/IPropertyCache.cs @@ -5,8 +5,6 @@ // Interface for a property cache. //-----------------------------------------------------------------------using System; -using System.Collections.Generic; -using System.Text; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Components/Caching/IResultsCache.cs b/src/XMakeBuildEngine/BackEnd/Components/Caching/IResultsCache.cs index 4ef89426764..c1e6b6d5ba0 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Caching/IResultsCache.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Caching/IResultsCache.cs @@ -5,9 +5,7 @@ // Interface for a results cache. //----------------------------------------------------------------------- -using System; using System.Collections.Generic; -using System.Text; using BuildResult = Microsoft.Build.Execution.BuildResult; diff --git a/src/XMakeBuildEngine/BackEnd/Components/Caching/RegisteredTaskObjectCache.cs b/src/XMakeBuildEngine/BackEnd/Components/Caching/RegisteredTaskObjectCache.cs index 4fefae06cf2..7236586bd26 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Caching/RegisteredTaskObjectCache.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Caching/RegisteredTaskObjectCache.cs @@ -5,9 +5,9 @@ // Implements a cache for registered task objects. //----------------------------------------------------------------------- -using System; using Microsoft.Build.Framework; using Microsoft.Build.Shared; +using System; namespace Microsoft.Build.BackEnd.Components.Caching { diff --git a/src/XMakeBuildEngine/BackEnd/Components/Caching/ResultsCache.cs b/src/XMakeBuildEngine/BackEnd/Components/Caching/ResultsCache.cs index b8869d75b83..293f654437f 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Caching/ResultsCache.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Caching/ResultsCache.cs @@ -5,13 +5,11 @@ // Implementation of the results cache. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Collections.Concurrent; -using System.Diagnostics; -using System.IO; using Microsoft.Build.Execution; using Microsoft.Build.Shared; +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Components/Caching/ResultsCacheResponse.cs b/src/XMakeBuildEngine/BackEnd/Components/Caching/ResultsCacheResponse.cs index d6d0284408e..76359767512 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Caching/ResultsCacheResponse.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Caching/ResultsCacheResponse.cs @@ -7,7 +7,6 @@ using System; using System.Collections.Generic; -using System.Text; using BuildResult = Microsoft.Build.Execution.BuildResult; diff --git a/src/XMakeBuildEngine/BackEnd/Components/Communications/INodeManager.cs b/src/XMakeBuildEngine/BackEnd/Components/Communications/INodeManager.cs index 0a242e414c2..fc9ac63fad3 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Communications/INodeManager.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Communications/INodeManager.cs @@ -5,8 +5,6 @@ // Interface for the node manager. //-----------------------------------------------------------------------using System; -using System.Collections.Generic; -using System.Text; using Microsoft.Build.Execution; namespace Microsoft.Build.BackEnd diff --git a/src/XMakeBuildEngine/BackEnd/Components/Communications/INodeProvider.cs b/src/XMakeBuildEngine/BackEnd/Components/Communications/INodeProvider.cs index f5b2f7e6b1a..cf64bd9110b 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Communications/INodeProvider.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Communications/INodeProvider.cs @@ -5,8 +5,6 @@ // Interface for node providers. //-----------------------------------------------------------------------using System; -using System.Collections.Generic; -using System.Text; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Components/Communications/LogMessagePacket.cs b/src/XMakeBuildEngine/BackEnd/Components/Communications/LogMessagePacket.cs index d87faf474a0..cd5f1e9c549 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Communications/LogMessagePacket.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Communications/LogMessagePacket.cs @@ -5,16 +5,10 @@ // NodePackets which are used for node communication //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Text; -using System.IO; -using System.Reflection; - using Microsoft.Build.Framework; using Microsoft.Build.Shared; +using System.Collections.Generic; using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; -using TaskEngineAssemblyResolver = Microsoft.Build.BackEnd.Logging.TaskEngineAssemblyResolver; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeEndpointInProc.cs b/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeEndpointInProc.cs index ed483862274..9331f521b26 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeEndpointInProc.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeEndpointInProc.cs @@ -5,13 +5,10 @@ // Implementation of a node endpoint for in-proc nodes. //----------------------------------------------------------------------- +using Microsoft.Build.Shared; using System; using System.Collections.Generic; -using System.Text; using System.Threading; -using System.Diagnostics; -using Microsoft.Build.Shared; - using BuildParameters = Microsoft.Build.Execution.BuildParameters; namespace Microsoft.Build.BackEnd diff --git a/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeEndpointOutOfProc.cs b/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeEndpointOutOfProc.cs index 4b0e620e6b5..8a077aad461 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeEndpointOutOfProc.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeEndpointOutOfProc.cs @@ -5,23 +5,8 @@ // Implementation of a node endpoint for out-of-proc nodes. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Text; -using System.IO; -using System.IO.Pipes; -using System.Threading; -using System.Diagnostics; -using Microsoft.Build.Framework; -using Microsoft.Build.Internal; using Microsoft.Build.Shared; -using System.Security; -using System.Security.AccessControl; -using System.Security.Principal; -using System.Security.Permissions; -using BuildParameters = Microsoft.Build.Execution.BuildParameters; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeFailedToLaunchException.cs b/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeFailedToLaunchException.cs index fa0950f92ad..19663e8b53a 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeFailedToLaunchException.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeFailedToLaunchException.cs @@ -6,12 +6,8 @@ //----------------------------------------------------------------------- using System; -using System.Collections.Generic; -using System.Text; using System.Runtime.Serialization; using System.Security.Permissions; -using Microsoft.Build.Shared; -using BackendNativeMethods = Microsoft.Build.BackEnd.NativeMethods; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeInfo.cs b/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeInfo.cs index 6d0392a7e32..a2f14b06d77 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeInfo.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeInfo.cs @@ -4,12 +4,8 @@ // Class containing information about a node. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Text; - using Microsoft.Build.Execution; -using Microsoft.Build.Shared; +using System.Collections.Generic; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeManager.cs b/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeManager.cs index 10a740d9068..483a343631f 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeManager.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeManager.cs @@ -5,16 +5,10 @@ // The class which manages build nodes. //----------------------------------------------------------------------- +using Microsoft.Build.Execution; +using Microsoft.Build.Shared; using System; -using System.Collections; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading; -using System.Diagnostics; -using Microsoft.Build.Shared; -using Microsoft.Build.Exceptions; -using Microsoft.Build.Execution; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Components/Communications/NodePacketTranslatorExtensions.cs b/src/XMakeBuildEngine/BackEnd/Components/Communications/NodePacketTranslatorExtensions.cs index a3f20362f7f..f257060710e 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Communications/NodePacketTranslatorExtensions.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Communications/NodePacketTranslatorExtensions.cs @@ -6,19 +6,8 @@ // can't put in INodePacketTranslator. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; -using System.IO; -using System.Threading; -using System.Runtime.Serialization.Formatters.Binary; using Microsoft.Build.Collections; using Microsoft.Build.Execution; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using System.Globalization; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeProviderInProc.cs b/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeProviderInProc.cs index 28ff82ad940..90e0ffd218f 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeProviderInProc.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeProviderInProc.cs @@ -4,17 +4,12 @@ // Implementation of an in-proc node provider. //----------------------------------------------------------------------- +using Microsoft.Build.Internal; +using Microsoft.Build.Shared; using System; -using System.Collections; -using System.Collections.Generic; +using System.Diagnostics; using System.Globalization; -using System.Text; using System.Threading; -using System.Diagnostics; - -using Microsoft.Build.Internal; -using Microsoft.Build.Shared; - using BuildParameters = Microsoft.Build.Execution.BuildParameters; using NodeEngineShutdownReason = Microsoft.Build.Execution.NodeEngineShutdownReason; diff --git a/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeProviderOutOfProc.cs b/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeProviderOutOfProc.cs index af18d1a7e76..864bf30cb33 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeProviderOutOfProc.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeProviderOutOfProc.cs @@ -5,24 +5,12 @@ // Class implementing INodeProvider for out-of-proc nodes. //----------------------------------------------------------------------- +using Microsoft.Build.Exceptions; +using Microsoft.Build.Internal; +using Microsoft.Build.Shared; using System; using System.Collections.Generic; -using System.Globalization; -using System.Text; -using System.IO; -using System.IO.Pipes; using System.Diagnostics; -using System.Threading; -using System.Runtime.InteropServices; -using System.Security; -using System.Security.AccessControl; -using System.Security.Principal; -using System.Security.Permissions; - -using Microsoft.Build.Shared; -using Microsoft.Build.Framework; -using Microsoft.Build.Exceptions; -using Microsoft.Build.Internal; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeProviderOutOfProcBase.cs b/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeProviderOutOfProcBase.cs index ecffbf608ac..0b1b95b205d 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeProviderOutOfProcBase.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeProviderOutOfProcBase.cs @@ -6,25 +6,18 @@ // and NodeProviderOutOfProcTaskHost. //----------------------------------------------------------------------- +using Microsoft.Build.Exceptions; +using Microsoft.Build.Internal; +using Microsoft.Build.Shared; using System; using System.Collections.Generic; +using System.Diagnostics; using System.Globalization; -using System.Text; using System.IO; using System.IO.Pipes; -using System.Diagnostics; -using System.Threading; using System.Runtime.InteropServices; -using System.Security; -using System.Security.AccessControl; using System.Security.Principal; -using System.Security.Permissions; - -using Microsoft.Build.Shared; -using Microsoft.Build.Framework; -using Microsoft.Build.Exceptions; -using Microsoft.Build.Internal; - +using System.Threading; using BackendNativeMethods = Microsoft.Build.BackEnd.NativeMethods; namespace Microsoft.Build.BackEnd diff --git a/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeProviderOutOfProcTaskHost.cs b/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeProviderOutOfProcTaskHost.cs index 0000db0cfc7..ebf3acf0cb1 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeProviderOutOfProcTaskHost.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeProviderOutOfProcTaskHost.cs @@ -5,27 +5,15 @@ // Class implementing INodeProvider for out-of-proc nodes. //----------------------------------------------------------------------- +using Microsoft.Build.Evaluation; +using Microsoft.Build.Execution; +using Microsoft.Build.Internal; +using Microsoft.Build.Shared; using System; using System.Collections.Generic; -using System.Globalization; -using System.Text; -using System.IO; -using System.IO.Pipes; using System.Diagnostics; +using System.IO; using System.Threading; -using System.Reflection; -using System.Runtime.InteropServices; -using System.Security; -using System.Security.AccessControl; -using System.Security.Principal; -using System.Security.Permissions; - -using Microsoft.Build.Shared; -using Microsoft.Build.Framework; -using Microsoft.Build.Exceptions; -using Microsoft.Build.Internal; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Execution; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Components/Communications/TaskHostNodeManager.cs b/src/XMakeBuildEngine/BackEnd/Components/Communications/TaskHostNodeManager.cs index 51524e1359b..9dd111888a6 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Communications/TaskHostNodeManager.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Communications/TaskHostNodeManager.cs @@ -5,16 +5,9 @@ // The class which manages task host nodes. //----------------------------------------------------------------------- -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading; -using System.Diagnostics; -using Microsoft.Build.Shared; -using Microsoft.Build.Exceptions; using Microsoft.Build.Execution; +using Microsoft.Build.Shared; +using System; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Components/IBuildComponent.cs b/src/XMakeBuildEngine/BackEnd/Components/IBuildComponent.cs index 452f5d19769..a14fd5f9612 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/IBuildComponent.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/IBuildComponent.cs @@ -4,9 +4,6 @@ // Interface for build components. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Text; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Components/IBuildComponentHost.cs b/src/XMakeBuildEngine/BackEnd/Components/IBuildComponentHost.cs index 1f2c36cd8a4..db5507949c3 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/IBuildComponentHost.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/IBuildComponentHost.cs @@ -4,12 +4,9 @@ // Interface for the build component host. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Text; -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; namespace Microsoft.Build.BackEnd diff --git a/src/XMakeBuildEngine/BackEnd/Components/Logging/BaseLoggingContext.cs b/src/XMakeBuildEngine/BackEnd/Components/Logging/BaseLoggingContext.cs index c9fe4a6ba7e..ccd1cda464e 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Logging/BaseLoggingContext.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Logging/BaseLoggingContext.cs @@ -5,15 +5,10 @@ // A base class providing type-safe methods of logging in various contexts. //----------------------------------------------------------------------- -using System; -using System.Collections; -using System.Collections.Generic; -using System.Diagnostics; -using System.Text; -using System.Xml; using Microsoft.Build.Framework; using Microsoft.Build.Shared; - +using System; +using System.Diagnostics; using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; namespace Microsoft.Build.BackEnd.Logging diff --git a/src/XMakeBuildEngine/BackEnd/Components/Logging/BuildEventArgTransportSink.cs b/src/XMakeBuildEngine/BackEnd/Components/Logging/BuildEventArgTransportSink.cs index a82766f51f2..d43c7dcdff7 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Logging/BuildEventArgTransportSink.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Logging/BuildEventArgTransportSink.cs @@ -7,12 +7,9 @@ // //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Text; using Microsoft.Build.Framework; using Microsoft.Build.Shared; -using Microsoft.Build.BackEnd; +using System.Collections.Generic; namespace Microsoft.Build.BackEnd.Logging { diff --git a/src/XMakeBuildEngine/BackEnd/Components/Logging/CentralForwardingLogger.cs b/src/XMakeBuildEngine/BackEnd/Components/Logging/CentralForwardingLogger.cs index 64f05fc4bd2..f462096608d 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Logging/CentralForwardingLogger.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Logging/CentralForwardingLogger.cs @@ -5,10 +5,6 @@ // Forwarding logger which forwards all events //----------------------------------------------------------------------- -using System; -using System.Collections; -using System.Text; -using System.Collections.Generic; using Microsoft.Build.Framework; using Microsoft.Build.Shared; diff --git a/src/XMakeBuildEngine/BackEnd/Components/Logging/EventRedirectorToSink.cs b/src/XMakeBuildEngine/BackEnd/Components/Logging/EventRedirectorToSink.cs index 7e884d1c5ab..18d137ac848 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Logging/EventRedirectorToSink.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Logging/EventRedirectorToSink.cs @@ -5,8 +5,6 @@ // NodePackets which are used for node communication //----------------------------------------------------------------------- -using System; -using System.Diagnostics; using Microsoft.Build.Framework; using Microsoft.Build.Shared; diff --git a/src/XMakeBuildEngine/BackEnd/Components/Logging/EventSourceSink.cs b/src/XMakeBuildEngine/BackEnd/Components/Logging/EventSourceSink.cs index 034000a0663..59b537b6bf4 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Logging/EventSourceSink.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Logging/EventSourceSink.cs @@ -4,10 +4,9 @@ // Sink which will take in a build event and raise it on its internal event source //----------------------------------------------------------------------- -using System; using Microsoft.Build.Framework; using Microsoft.Build.Shared; - +using System; using InternalLoggerException = Microsoft.Build.Exceptions.InternalLoggerException; namespace Microsoft.Build.BackEnd.Logging diff --git a/src/XMakeBuildEngine/BackEnd/Components/Logging/ForwardingLoggerRecord.cs b/src/XMakeBuildEngine/BackEnd/Components/Logging/ForwardingLoggerRecord.cs index 7aac66d17d4..6c2771126d9 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Logging/ForwardingLoggerRecord.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Logging/ForwardingLoggerRecord.cs @@ -5,10 +5,6 @@ // Class describing a central/forwarding logger pair. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using Microsoft.Build.Framework; using Microsoft.Build.Shared; diff --git a/src/XMakeBuildEngine/BackEnd/Components/Logging/ILoggingService.cs b/src/XMakeBuildEngine/BackEnd/Components/Logging/ILoggingService.cs index 482a8e83665..6defda9eabe 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Logging/ILoggingService.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Logging/ILoggingService.cs @@ -4,14 +4,13 @@ // Interface for the logging services. //----------------------------------------------------------------------- +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using System; using System.Collections; using System.Collections.Generic; -using Microsoft.Build.Framework; -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; namespace Microsoft.Build.BackEnd.Logging diff --git a/src/XMakeBuildEngine/BackEnd/Components/Logging/LoggingService.cs b/src/XMakeBuildEngine/BackEnd/Components/Logging/LoggingService.cs index 9016e2c1ed5..e7b3a8451c5 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Logging/LoggingService.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Logging/LoggingService.cs @@ -4,21 +4,14 @@ // Logging service which assists in getting build events to the correct loggers //----------------------------------------------------------------------- +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using System; -using System.Collections; using System.Collections.Generic; using System.Globalization; -using System.IO; using System.Reflection; -using System.Text; using System.Threading; using System.Threading.Tasks.Dataflow; -using Microsoft.Build.BackEnd; -using Microsoft.Build.Collections; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; - -using BuildParameters = Microsoft.Build.Execution.BuildParameters; using InternalLoggerException = Microsoft.Build.Exceptions.InternalLoggerException; using LoggerDescription = Microsoft.Build.Logging.LoggerDescription; diff --git a/src/XMakeBuildEngine/BackEnd/Components/Logging/LoggingServiceFactory.cs b/src/XMakeBuildEngine/BackEnd/Components/Logging/LoggingServiceFactory.cs index 54ce7f75f2b..1ed82d3fd60 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Logging/LoggingServiceFactory.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Logging/LoggingServiceFactory.cs @@ -4,10 +4,6 @@ // Factory to create components of the type LoggingService //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Text; -using Microsoft.Build.BackEnd; using Microsoft.Build.Shared; namespace Microsoft.Build.BackEnd.Logging diff --git a/src/XMakeBuildEngine/BackEnd/Components/Logging/LoggingServiceLogMethods.cs b/src/XMakeBuildEngine/BackEnd/Components/Logging/LoggingServiceLogMethods.cs index 7a6f2f1d7af..05e6ea49678 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Logging/LoggingServiceLogMethods.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Logging/LoggingServiceLogMethods.cs @@ -4,19 +4,12 @@ // Logging service which assists in getting build events to the correct loggers //----------------------------------------------------------------------- +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using System; using System.Collections; using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Reflection; -using System.Text; -using System.Threading; -using Microsoft.Build.BackEnd; -using Microsoft.Build.Collections; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; - using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; diff --git a/src/XMakeBuildEngine/BackEnd/Components/Logging/NodeLoggingContext.cs b/src/XMakeBuildEngine/BackEnd/Components/Logging/NodeLoggingContext.cs index c8b11fab307..0cf49b5a101 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Logging/NodeLoggingContext.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Logging/NodeLoggingContext.cs @@ -5,12 +5,8 @@ // A logging context for nodes. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Text; -using Microsoft.Build.Framework; using Microsoft.Build.Execution; +using Microsoft.Build.Framework; using Microsoft.Build.Shared; namespace Microsoft.Build.BackEnd.Logging diff --git a/src/XMakeBuildEngine/BackEnd/Components/Logging/ProjectLoggingContext.cs b/src/XMakeBuildEngine/BackEnd/Components/Logging/ProjectLoggingContext.cs index 5a0e4c1f978..4ab5ab0dd91 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Logging/ProjectLoggingContext.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Logging/ProjectLoggingContext.cs @@ -5,16 +5,14 @@ // A logging context for projects. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Text; -using Microsoft.Build.Framework; +using Microsoft.Build.Collections; using Microsoft.Build.Execution; -using System.Collections; +using Microsoft.Build.Framework; using Microsoft.Build.Shared; +using System; +using System.Collections; +using System.Collections.Generic; using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; -using Microsoft.Build.Collections; namespace Microsoft.Build.BackEnd.Logging { diff --git a/src/XMakeBuildEngine/BackEnd/Components/Logging/TargetLoggingContext.cs b/src/XMakeBuildEngine/BackEnd/Components/Logging/TargetLoggingContext.cs index e8f77250cb7..0802f6b634c 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Logging/TargetLoggingContext.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Logging/TargetLoggingContext.cs @@ -5,17 +5,13 @@ // A logging context for targets. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Text; -using System.Xml; -using Microsoft.Build.Framework; using Microsoft.Build.Execution; -using Microsoft.Build.Evaluation; +using Microsoft.Build.Framework; using Microsoft.Build.Shared; -using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; +using System; using System.Collections; +using System.Collections.Generic; +using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; namespace Microsoft.Build.BackEnd.Logging { diff --git a/src/XMakeBuildEngine/BackEnd/Components/Logging/TaskLoggingContext.cs b/src/XMakeBuildEngine/BackEnd/Components/Logging/TaskLoggingContext.cs index 70b13836705..d5997044206 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Logging/TaskLoggingContext.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Logging/TaskLoggingContext.cs @@ -5,15 +5,9 @@ // A logging context for tasks. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Text; -using System.Xml; +using Microsoft.Build.Execution; using Microsoft.Build.Framework; using Microsoft.Build.Shared; -using Microsoft.Build.Execution; -using Microsoft.Build.Evaluation; namespace Microsoft.Build.BackEnd.Logging { diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/BatchingEngine.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/BatchingEngine.cs index 8b257d4ed72..7f52f41515c 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/BatchingEngine.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/BatchingEngine.cs @@ -1,18 +1,13 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Xml; -using System.Collections.Generic; -using System.Globalization; -using System.Text; -using System.Text.RegularExpressions; - using Microsoft.Build.Collections; -using ElementLocation = Microsoft.Build.Construction.ElementLocation; using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; using Microsoft.Build.Shared; +using System; +using System.Collections.Generic; +using ElementLocation = Microsoft.Build.Construction.ElementLocation; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/FullTracking.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/FullTracking.cs index 214fcde1bb6..fadd9f84d1f 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/FullTracking.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/FullTracking.cs @@ -5,12 +5,11 @@ // Manages full tracking activation and suspension. //----------------------------------------------------------------------- -using System; -using System.IO; using Microsoft.Build.Collections; using Microsoft.Build.Execution; using Microsoft.Build.Shared; -using TaskLoggingContext = Microsoft.Build.BackEnd.Logging.TaskLoggingContext; +using System; +using System.IO; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IRequestBuilder.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IRequestBuilder.cs index c9e876e870e..e9c1735cc18 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IRequestBuilder.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IRequestBuilder.cs @@ -5,9 +5,6 @@ // Interface for the build request builder component. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Text; using NodeLoggingContext = Microsoft.Build.BackEnd.Logging.NodeLoggingContext; diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IRequestBuilderCallback.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IRequestBuilderCallback.cs index e4fde1250f1..f9b8c109585 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IRequestBuilderCallback.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IRequestBuilderCallback.cs @@ -5,11 +5,8 @@ // Interface used by the TargetBuilder to communicate with the RequestBuilder. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Text; -using Microsoft.Build.Execution; using Microsoft.Build.Collections; +using Microsoft.Build.Execution; using System.Threading.Tasks; namespace Microsoft.Build.BackEnd diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/ITargetBuilder.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/ITargetBuilder.cs index ebecdb4358d..2fa96cf4f68 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/ITargetBuilder.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/ITargetBuilder.cs @@ -5,12 +5,9 @@ // Interface for the target builder. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Text; +using Microsoft.Build.BackEnd.Logging; using System.Threading; using System.Threading.Tasks; -using Microsoft.Build.BackEnd.Logging; using BuildResult = Microsoft.Build.Execution.BuildResult; namespace Microsoft.Build.BackEnd diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/ITargetBuilderCallback.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/ITargetBuilderCallback.cs index 39e11e96721..665cc0e262a 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/ITargetBuilderCallback.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/ITargetBuilderCallback.cs @@ -5,13 +5,9 @@ // Interface for the target builder callback. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Text; -using ElementLocation = Microsoft.Build.Construction.ElementLocation; -using Microsoft.Build.Shared; using Microsoft.Build.Execution; using System.Threading.Tasks; +using ElementLocation = Microsoft.Build.Construction.ElementLocation; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/ITaskBuilder.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/ITaskBuilder.cs index 1d12874712a..f85119cf53d 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/ITaskBuilder.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/ITaskBuilder.cs @@ -5,10 +5,10 @@ // Interface implemented by objects which can build tasks. //----------------------------------------------------------------------- +using Microsoft.Build.Execution; using System; using System.Threading; using System.Threading.Tasks; -using Microsoft.Build.Execution; using TargetLoggingContext = Microsoft.Build.BackEnd.Logging.TargetLoggingContext; namespace Microsoft.Build.BackEnd diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTask.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTask.cs index 97c271f8e52..b486e10639c 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTask.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTask.cs @@ -5,20 +5,11 @@ // Base class for intrinsic tasks. //----------------------------------------------------------------------- +using Microsoft.Build.BackEnd.Logging; +using Microsoft.Build.Execution; +using Microsoft.Build.Shared; using System; using System.Collections.Generic; -using System.Text; - -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using System.Xml; -using System.Reflection; -using System.Globalization; -using System.Collections; -using System.Diagnostics; -using Microsoft.Build.Execution; -using Microsoft.Build.Evaluation; -using Microsoft.Build.BackEnd.Logging; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTasks/CallTarget.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTasks/CallTarget.cs index 2c5f76524bc..ef1835ce535 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTasks/CallTarget.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTasks/CallTarget.cs @@ -1,12 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; using System; using System.Collections; -using System.Collections.Generic; using System.Threading.Tasks; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; // This CallTarget intrinsic task replaces the one on Microsoft.Build.Tasks, which is now deprecated. diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTasks/IntrinsicTaskFactory.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTasks/IntrinsicTaskFactory.cs index 4cb2b29328b..632557b1225 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTasks/IntrinsicTaskFactory.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTasks/IntrinsicTaskFactory.cs @@ -5,14 +5,12 @@ // The task factory for intrinsic tasks. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using System.Text; using Microsoft.Build.Execution; using Microsoft.Build.Framework; using Microsoft.Build.Shared; +using System; +using System.Collections.Generic; +using System.Reflection; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTasks/ItemGroupIntrinsicTask.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTasks/ItemGroupIntrinsicTask.cs index 34658f04ba4..0d56ab096ed 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTasks/ItemGroupIntrinsicTask.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTasks/ItemGroupIntrinsicTask.cs @@ -5,20 +5,17 @@ // Implementation of the ItemGroup intrinsic task. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Text; -using System.Linq; 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 TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; -using ProjectItemInstanceFactory = Microsoft.Build.Execution.ProjectItemInstance.TaskItem.ProjectItemInstanceFactory; +using System; +using System.Collections.Generic; +using System.Linq; +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; namespace Microsoft.Build.BackEnd diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTasks/ItemGroupLoggingHelper.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTasks/ItemGroupLoggingHelper.cs index 981109969fe..3ac3f2cd1ae 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTasks/ItemGroupLoggingHelper.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTasks/ItemGroupLoggingHelper.cs @@ -5,12 +5,12 @@ // Helper class to convert ItemGroup parameters to a string value for logging. //----------------------------------------------------------------------- +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using System; using System.Collections; using System.Collections.Generic; using System.Globalization; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTasks/MSBuild.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTasks/MSBuild.cs index faad7091da6..b9c4e066c94 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTasks/MSBuild.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTasks/MSBuild.cs @@ -1,14 +1,14 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using System; using System.Collections; using System.Collections.Generic; using System.Globalization; using System.IO; using System.Threading.Tasks; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; // NOTE: This is nearly identical to the MSBuild task in Microsoft.Build.Tasks. We are deprecating that task, // so this is the governing implementation. diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTasks/PropertyGroupIntrinsicTask.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTasks/PropertyGroupIntrinsicTask.cs index 9ead6ab0d81..7b71fe97e90 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTasks/PropertyGroupIntrinsicTask.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTasks/PropertyGroupIntrinsicTask.cs @@ -5,12 +5,11 @@ // The PropertyGroup intrinsic task. //----------------------------------------------------------------------- -using System.Collections.Generic; using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; using Microsoft.Build.Framework; using Microsoft.Build.Shared; - +using System.Collections.Generic; using ReservedPropertyNames = Microsoft.Build.Internal.ReservedPropertyNames; using TargetLoggingContext = Microsoft.Build.BackEnd.Logging.TargetLoggingContext; diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/ItemBucket.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/ItemBucket.cs index 5a0bb568d03..e2fcb2d057a 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/ItemBucket.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/ItemBucket.cs @@ -1,18 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Collections; +using Microsoft.Build.Evaluation; +using Microsoft.Build.Execution; +using Microsoft.Build.Shared; using System; -using System.Xml; -using System.Collections; using System.Collections.Generic; -using System.Text; -using System.Text.RegularExpressions; -using System.Globalization; - -using Microsoft.Build.Shared; -using Microsoft.Build.Execution; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Collections; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/Lookup.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/Lookup.cs index f8ce22652c2..e6947145046 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/Lookup.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/Lookup.cs @@ -2,19 +2,14 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Collections; using System.Collections.Generic; -using System.Text; using System.Linq; -using Microsoft.Build.Shared; -using System.Diagnostics; using System.Threading; +using Microsoft.Build.Collections; using Microsoft.Build.Evaluation; -using Microsoft.Build.Framework; using Microsoft.Build.Execution; -using Microsoft.Build.Collections; - -using ReservedPropertyNames = Microsoft.Build.Internal.ReservedPropertyNames; +using Microsoft.Build.Internal; +using Microsoft.Build.Shared; namespace Microsoft.Build.BackEnd { @@ -73,7 +68,7 @@ internal class Lookup /// We have to keep them separate, because the adds and removes etc need to be applied to the table /// below when we leave a scope. /// - private LinkedList _lookupScopes = new LinkedList(); + private LinkedList _lookupScopes = new LinkedList(); /// /// When we are asked for all the items of a certain type using the GetItems() method, we may have to handle items @@ -109,7 +104,7 @@ internal Lookup(ItemDictionary projectItems, PropertyDictio ErrorUtilities.VerifyThrowInternalNull(projectItems, "projectItems"); ErrorUtilities.VerifyThrowInternalNull(properties, "properties"); - Lookup.Scope scope = new Lookup.Scope(this, "Lookup()", projectItems, properties); + Scope scope = new Scope(this, "Lookup()", projectItems, properties); _lookupScopes.AddFirst(scope); _globalsForDebugging = globalsForDebugging; @@ -121,7 +116,7 @@ internal Lookup(ItemDictionary projectItems, PropertyDictio private Lookup(Lookup that) { // Add the same tables from the original - foreach (Lookup.Scope scope in that._lookupScopes) + foreach (Scope scope in that._lookupScopes) { _lookupScopes.AddLast(scope); } @@ -287,7 +282,7 @@ internal Lookup Clone() /// Enters the scope using the specified description. /// Callers keep the scope in order to pass it to LeaveScope. /// - internal Lookup.Scope EnterScope(string description) + internal Scope EnterScope(string description) { // We don't create the tables unless we need them Scope scope = new Scope(this, description, null, null); @@ -301,10 +296,10 @@ internal Lookup.Scope EnterScope(string description) /// and secondary table are merged. This has the effect of "applying" the adds applied to the primary /// table into the secondary table. /// - private void LeaveScope(Lookup.Scope scopeToLeave) + private void LeaveScope(Scope scopeToLeave) { ErrorUtilities.VerifyThrow(_lookupScopes.Count >= 2, "Too many calls to Leave()."); - ErrorUtilities.VerifyThrow(Object.ReferenceEquals(scopeToLeave, _lookupScopes.First.Value), "Attempting to leave with scope '{0}' but scope '{1}' is on top of the stack.", scopeToLeave.Description, _lookupScopes.First.Value.Description); + ErrorUtilities.VerifyThrow(ReferenceEquals(scopeToLeave, _lookupScopes.First.Value), "Attempting to leave with scope '{0}' but scope '{1}' is on top of the stack.", scopeToLeave.Description, _lookupScopes.First.Value.Description); // Our lookup works by stopping the first time it finds an item group of the appropriate type. // So we can't apply an add directly into the table below because that could create a new group diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/RequestBuilder.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/RequestBuilder.cs index 05075b77b33..5a2048bb13d 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/RequestBuilder.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/RequestBuilder.cs @@ -6,34 +6,26 @@ //----------------------------------------------------------------------- using System; -using System.Collections; using System.Collections.Generic; -using System.Diagnostics; +using System.Globalization; using System.IO; using System.Linq; -using System.Reflection; -using System.Text; using System.Threading; using System.Threading.Tasks; -using System.Globalization; -using Microsoft.Build.BackEnd; -using Microsoft.Build.Shared; -using Microsoft.Build.Construction; -using Microsoft.Build.Execution; -using Microsoft.Build.Exceptions; -using Microsoft.Build.Evaluation; +using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Collections; +using Microsoft.Build.Evaluation; +using Microsoft.Build.Exceptions; +using Microsoft.Build.Execution; using Microsoft.Build.Framework; using Microsoft.Build.Internal; +using Microsoft.Build.Shared; #if (!STANDALONEBUILD) using Microsoft.Internal.Performance; #if MSBUILDENABLEVSPROFILING using Microsoft.VisualStudio.Profiler; #endif #endif -using ReservedPropertyNames = Microsoft.Build.Internal.ReservedPropertyNames; -using NodeLoggingContext = Microsoft.Build.BackEnd.Logging.NodeLoggingContext; -using ProjectLoggingContext = Microsoft.Build.BackEnd.Logging.ProjectLoggingContext; namespace Microsoft.Build.BackEnd { @@ -882,7 +874,7 @@ private async Task StartNewBuildRequests(FullyQualifiedBuildReque int handle; if (IsBuilderUsingLegacyThreadingSemantics(_componentHost, _requestEntry)) { - handle = RequestBuilder.WaitWithBuilderThreadStart(handles, true, _componentHost.LegacyThreadingData, _requestEntry.Request.SubmissionId); + handle = WaitWithBuilderThreadStart(handles, true, _componentHost.LegacyThreadingData, _requestEntry.Request.SubmissionId); } else if (_inMSBuildCallback) { @@ -1090,7 +1082,7 @@ private async Task BuildProject() (_requestEntry.RequestConfiguration.ResultsNodeId != _componentHost.BuildParameters.NodeId)) { // This indicates to the system that we will block waiting for a results transfer. We will block here until those results become available. - await BlockOnTargetInProgress(Microsoft.Build.BackEnd.BuildRequest.InvalidGlobalRequestId, null); + await BlockOnTargetInProgress(BackEnd.BuildRequest.InvalidGlobalRequestId, null); // All of the results should now be on this node. ErrorUtilities.VerifyThrow(_requestEntry.RequestConfiguration.ResultsNodeId == _componentHost.BuildParameters.NodeId, "Results for configuration {0} were not retrieved from node {1}", _requestEntry.RequestConfiguration.ConfigurationId, _requestEntry.RequestConfiguration.ResultsNodeId); diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetBuilder.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetBuilder.cs index b1514a05244..a17cf3dbcd7 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetBuilder.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetBuilder.cs @@ -5,21 +5,18 @@ // The standard implementation of ITargetBuilder. //----------------------------------------------------------------------- +using Microsoft.Build.Collections; +using Microsoft.Build.Execution; +using Microsoft.Build.Shared; using System; -using System.Collections.Generic; using System.Collections.Concurrent; -using System.Text; +using System.Collections.Generic; using System.Threading; -using System.Xml; -using Microsoft.Build.Shared; -using Microsoft.Build.Execution; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Collections; +using System.Threading.Tasks; +using BuildAbortedException = Microsoft.Build.Exceptions.BuildAbortedException; using ElementLocation = Microsoft.Build.Construction.ElementLocation; -using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; using ProjectLoggingContext = Microsoft.Build.BackEnd.Logging.ProjectLoggingContext; -using BuildAbortedException = Microsoft.Build.Exceptions.BuildAbortedException; -using System.Threading.Tasks; +using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetEntry.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetEntry.cs index 8654369b42e..b9c6d42a748 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetEntry.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetEntry.cs @@ -7,22 +7,19 @@ //----------------------------------------------------------------------- using System; -using System.Collections; using System.Collections.Generic; using System.Diagnostics; using System.Threading; using System.Threading.Tasks; +using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Collections; +using Microsoft.Build.Construction; using Microsoft.Build.Debugging; using Microsoft.Build.Evaluation; +using Microsoft.Build.Exceptions; using Microsoft.Build.Execution; +using Microsoft.Build.Framework; using Microsoft.Build.Shared; -using ElementLocation = Microsoft.Build.Construction.ElementLocation; -using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; -using MessageImportance = Microsoft.Build.Framework.MessageImportance; -using ProjectLoggingContext = Microsoft.Build.BackEnd.Logging.ProjectLoggingContext; -using TargetLoggingContext = Microsoft.Build.BackEnd.Logging.TargetLoggingContext; -using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; #if MSBUILDENABLEVSPROFILING using Microsoft.VisualStudio.Profiler; @@ -347,7 +344,7 @@ internal List GetDependencies(ProjectLoggingContext project if (!condition) { - _targetResult = new TargetResult(new TaskItem[0] { }, new WorkUnitResult(WorkUnitResultCode.Skipped, WorkUnitActionCode.Continue, null)); + _targetResult = new TargetResult(new ProjectItemInstance.TaskItem[0] { }, new WorkUnitResult(WorkUnitResultCode.Skipped, WorkUnitActionCode.Continue, null)); _state = TargetEntryState.Completed; if (!projectLoggingContext.LoggingService.OnlyLogCriticalEvents) @@ -550,7 +547,7 @@ internal async Task ExecuteTarget(ITaskBuilder taskBuilder, BuildRequestEntry re } // Produce the final results. - List targetOutputItems = new List(); + List targetOutputItems = new List(); try { @@ -613,12 +610,12 @@ internal async Task ExecuteTarget(ITaskBuilder taskBuilder, BuildRequestEntry re } else { - HashSet addedItems = new HashSet(); + HashSet addedItems = new HashSet(); foreach (ItemBucket bucket in batchingBuckets) { - IList itemsToAdd = bucket.Expander.ExpandIntoTaskItemsLeaveEscaped(targetReturns, ExpanderOptions.ExpandAll, targetReturnsLocation); + IList itemsToAdd = bucket.Expander.ExpandIntoTaskItemsLeaveEscaped(targetReturns, ExpanderOptions.ExpandAll, targetReturnsLocation); - foreach (TaskItem item in itemsToAdd) + foreach (ProjectItemInstance.TaskItem item in itemsToAdd) { if (!addedItems.Contains(item)) { @@ -707,7 +704,7 @@ internal List GetErrorTargets(ProjectLoggingContext project // create a result for this target to report when it gets to the Completed state. if (null == _targetResult) { - _targetResult = new TargetResult(new TaskItem[] { }, new WorkUnitResult(WorkUnitResultCode.Failed, WorkUnitActionCode.Stop, null)); + _targetResult = new TargetResult(new ProjectItemInstance.TaskItem[] { }, new WorkUnitResult(WorkUnitResultCode.Failed, WorkUnitActionCode.Stop, null)); } _state = TargetEntryState.Completed; diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetSpecification.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetSpecification.cs index 712db0bbc72..74174d33b20 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetSpecification.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetSpecification.cs @@ -5,12 +5,9 @@ // Implements the TargetSpecification class //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Text; -using ElementLocation = Microsoft.Build.Construction.ElementLocation; using Microsoft.Build.Shared; using System.Diagnostics; +using ElementLocation = Microsoft.Build.Construction.ElementLocation; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetUpToDateChecker.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetUpToDateChecker.cs index 8d16e7fcae6..5e9d9903dfc 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetUpToDateChecker.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetUpToDateChecker.cs @@ -1,28 +1,23 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Collections; +using Microsoft.Build.Evaluation; +using Microsoft.Build.Execution; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using System; -using System.IO; -using System.Xml; using System.Collections; using System.Collections.Generic; -using System.Diagnostics; -using System.Text.RegularExpressions; +using System.IO; using System.Text; -using System.Threading; - -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.Build.Execution; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Collections; using ElementLocation = Microsoft.Build.Construction.ElementLocation; using ProjectItemInstanceFactory = Microsoft.Build.Execution.ProjectItemInstance.TaskItem.ProjectItemInstanceFactory; namespace Microsoft.Build.BackEnd { using ILoggingService = Microsoft.Build.BackEnd.Logging.ILoggingService; - + using ItemVectorPartition = 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. @@ -31,7 +26,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 = Dictionary>>; - using ItemVectorPartition = Dictionary>; /// /// Enumeration of the results of target dependency analysis. diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TaskBuilder.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TaskBuilder.cs index 389565e5d0e..e0826ed59b0 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TaskBuilder.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TaskBuilder.cs @@ -6,25 +6,20 @@ //----------------------------------------------------------------------- using System; -using System.Collections; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using System.IO; using System.Reflection; using System.Threading; using System.Threading.Tasks; +using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Collections; using Microsoft.Build.Construction; using Microsoft.Build.Evaluation; using Microsoft.Build.Exceptions; using Microsoft.Build.Execution; using Microsoft.Build.Framework; +using Microsoft.Build.Internal; using Microsoft.Build.Shared; -using ElementLocation = Microsoft.Build.Construction.ElementLocation; -using ProjectItemInstanceFactory = Microsoft.Build.Execution.ProjectItemInstance.TaskItem.ProjectItemInstanceFactory; -using ReservedPropertyNames = Microsoft.Build.Internal.ReservedPropertyNames; -using TargetLoggingContext = Microsoft.Build.BackEnd.Logging.TargetLoggingContext; -using TaskLoggingContext = Microsoft.Build.BackEnd.Logging.TaskLoggingContext; namespace Microsoft.Build.BackEnd { @@ -1090,7 +1085,7 @@ ItemBucket bucket // This is an output item. // Expand only with properties first, so that expressions like Include="@(foo)" will transfer the metadata of the "foo" items as well, not just their item specs. IList outputItemSpecs = bucket.Expander.ExpandIntoStringListLeaveEscaped(taskParameterAttribute, ExpanderOptions.ExpandPropertiesAndMetadata, taskItemInstance.TaskParameterLocation); - ProjectItemInstanceFactory itemFactory = new ProjectItemInstanceFactory(_buildRequestEntry.RequestConfiguration.Project, itemName); + ProjectItemInstance.TaskItem.ProjectItemInstanceFactory itemFactory = new ProjectItemInstance.TaskItem.ProjectItemInstanceFactory(_buildRequestEntry.RequestConfiguration.Project, itemName); foreach (string outputItemSpec in outputItemSpecs) { diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TaskHost.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TaskHost.cs index 16168b7fcc3..770505f9632 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TaskHost.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TaskHost.cs @@ -5,24 +5,23 @@ // The object tasks use to interact with the rest of the build system. //----------------------------------------------------------------------- +using Microsoft.Build.BackEnd.Components.Caching; +using Microsoft.Build.Collections; +using Microsoft.Build.Execution; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using System; using System.Collections; using System.Collections.Generic; +using System.Diagnostics; using System.Globalization; -using System.Runtime.Remoting.Lifetime; using System.Runtime.Remoting; +using System.Runtime.Remoting.Lifetime; using System.Threading; -using System.Text; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.Build.Execution; -using System.Diagnostics; -using Microsoft.Build.Collections; +using System.Threading.Tasks; using ElementLocation = Microsoft.Build.Construction.ElementLocation; using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; using TaskLoggingContext = Microsoft.Build.BackEnd.Logging.TaskLoggingContext; -using System.Threading.Tasks; -using Microsoft.Build.BackEnd.Components.Caching; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Components/Scheduler/IScheduler.cs b/src/XMakeBuildEngine/BackEnd/Components/Scheduler/IScheduler.cs index d36a4b632aa..3565093fd1c 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Scheduler/IScheduler.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Scheduler/IScheduler.cs @@ -4,10 +4,8 @@ // Interface for the scheduler. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; using Microsoft.Build.Execution; +using System.Collections.Generic; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Components/Scheduler/SchedulableRequest.cs b/src/XMakeBuildEngine/BackEnd/Components/Scheduler/SchedulableRequest.cs index 66ac131a20f..477f858a55f 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Scheduler/SchedulableRequest.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Scheduler/SchedulableRequest.cs @@ -5,11 +5,10 @@ // Class holding data about requests used by the Scheduler. //----------------------------------------------------------------------- +using Microsoft.Build.Execution; +using Microsoft.Build.Shared; using System; using System.Collections.Generic; -using System.Text; -using Microsoft.Build.Shared; -using Microsoft.Build.Execution; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Components/Scheduler/ScheduleResponse.cs b/src/XMakeBuildEngine/BackEnd/Components/Scheduler/ScheduleResponse.cs index 74c8c3bdf51..6b62d26429a 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Scheduler/ScheduleResponse.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Scheduler/ScheduleResponse.cs @@ -4,14 +4,10 @@ // Struct containing a response from a scheduler. //----------------------------------------------------------------------- +using Microsoft.Build.Execution; using System; -using System.Collections.Generic; -using System.Text; using System.Globalization; -using Microsoft.Build.Shared; -using Microsoft.Build.Execution; -using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Components/Scheduler/ScheduleTimeRecord.cs b/src/XMakeBuildEngine/BackEnd/Components/Scheduler/ScheduleTimeRecord.cs index fe2bed3847c..fda86e5e10c 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Scheduler/ScheduleTimeRecord.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Scheduler/ScheduleTimeRecord.cs @@ -5,10 +5,8 @@ // Helper class used to track the time spent by requests in the Scheduler. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Text; using Microsoft.Build.Shared; +using System; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Components/Scheduler/Scheduler.cs b/src/XMakeBuildEngine/BackEnd/Components/Scheduler/Scheduler.cs index feeed2c33e7..07d97a925d3 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Scheduler/Scheduler.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Scheduler/Scheduler.cs @@ -6,7 +6,6 @@ //----------------------------------------------------------------------- using System; -using System.Collections; using System.Collections.Generic; using System.Diagnostics; using System.Globalization; @@ -14,16 +13,12 @@ using System.Linq; using System.Text; using System.Threading; -using Microsoft.Build.Collections; +using Microsoft.Build.BackEnd.Logging; +using Microsoft.Build.Exceptions; using Microsoft.Build.Execution; using Microsoft.Build.Framework; using Microsoft.Build.Shared; -using BuildAbortedException = Microsoft.Build.Exceptions.BuildAbortedException; -using ILoggingService = Microsoft.Build.BackEnd.Logging.ILoggingService; -using NodeLoggingContext = Microsoft.Build.BackEnd.Logging.NodeLoggingContext; -using CommunicationsUtilities = Microsoft.Build.Internal.CommunicationsUtilities; - namespace Microsoft.Build.BackEnd { /// @@ -965,7 +960,7 @@ private void AssignUnscheduledRequestsWithSmallestFileSize(List if (requiredNodeId == InvalidNodeId || idleNodes.Contains(requiredNodeId)) { // Look for a request with the largest source file - System.IO.FileInfo f = new FileInfo(_configCache[unscheduledRequest.BuildRequest.ConfigurationId].ProjectFullPath); + FileInfo f = new FileInfo(_configCache[unscheduledRequest.BuildRequest.ConfigurationId].ProjectFullPath); if (f.Length > sizeOfLargestSourceFile) { sizeOfLargestSourceFile = f.Length; @@ -1354,7 +1349,7 @@ private bool CreateNewNodeIfPossible(List responses, IEnumerab // Although this request has not been scheduled, this configuration may previously have been // scheduled to an existing node. If so, we shouldn't count it in our checks for new node // creation, because it'll only eventually get assigned to its existing node anyway. - if (assignedNodeForConfiguration != Scheduler.InvalidNodeId) + if (assignedNodeForConfiguration != InvalidNodeId) { continue; } @@ -1577,7 +1572,7 @@ private void HandleRequestBlockedByNewRequests(SchedulableRequest parentRequest, { bool affinityMismatch = false; int assignedNodeId = _schedulingData.GetAssignedNodeForRequestConfiguration(request.ConfigurationId); - if (assignedNodeId != Scheduler.InvalidNodeId) + if (assignedNodeId != InvalidNodeId) { if (!_availableNodes[assignedNodeId].CanServiceRequestWithAffinity(GetNodeAffinityForRequest(request))) { diff --git a/src/XMakeBuildEngine/BackEnd/Components/Scheduler/SchedulerCircularDependencyException.cs b/src/XMakeBuildEngine/BackEnd/Components/Scheduler/SchedulerCircularDependencyException.cs index c8f24719c27..01914144e82 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Scheduler/SchedulerCircularDependencyException.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Scheduler/SchedulerCircularDependencyException.cs @@ -8,7 +8,6 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using System.Text; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Components/Scheduler/SchedulingData.cs b/src/XMakeBuildEngine/BackEnd/Components/Scheduler/SchedulingData.cs index fee8201b12a..6036bf786fb 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Scheduler/SchedulingData.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Scheduler/SchedulingData.cs @@ -5,13 +5,10 @@ // Class which maintains the relationships between requests for the Scheduler. //----------------------------------------------------------------------- +using Microsoft.Build.Collections; +using Microsoft.Build.Shared; using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using Microsoft.Build.Shared; -using Microsoft.Build.Collections; -using Microsoft.Build.Execution; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Components/Scheduler/SchedulingPlan.cs b/src/XMakeBuildEngine/BackEnd/Components/Scheduler/SchedulingPlan.cs index e8a05e04953..32ceeda7ff5 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Scheduler/SchedulingPlan.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Scheduler/SchedulingPlan.cs @@ -5,16 +5,14 @@ // Class which maintains the plan used by the Scheduler to efficiently distribute work to multiple nodes. //----------------------------------------------------------------------- +using Microsoft.Build.BackEnd.Logging; +using Microsoft.Build.Execution; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using System; using System.Collections.Generic; using System.Globalization; using System.IO; -using System.Text; -using Microsoft.Build.Construction; -using Microsoft.Build.Execution; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.Build.BackEnd.Logging; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Node/INode.cs b/src/XMakeBuildEngine/BackEnd/Node/INode.cs index e77d2702a05..55ce345a725 100644 --- a/src/XMakeBuildEngine/BackEnd/Node/INode.cs +++ b/src/XMakeBuildEngine/BackEnd/Node/INode.cs @@ -5,8 +5,6 @@ //----------------------------------------------------------------------- using System; -using System.Collections.Generic; -using System.Text; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Node/InProcNode.cs b/src/XMakeBuildEngine/BackEnd/Node/InProcNode.cs index b2927add66c..32292d50787 100644 --- a/src/XMakeBuildEngine/BackEnd/Node/InProcNode.cs +++ b/src/XMakeBuildEngine/BackEnd/Node/InProcNode.cs @@ -5,27 +5,17 @@ // Class implementing an in-proc node. //----------------------------------------------------------------------- -using System; -using System.Collections; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; -using System.Globalization; -using System.Threading; +using Microsoft.Build.BackEnd.Components.Caching; using Microsoft.Build.Execution; -using Microsoft.Build.Evaluation; using Microsoft.Build.Framework; using Microsoft.Build.Internal; using Microsoft.Build.Shared; - -using BuildEventArgTransportSink = Microsoft.Build.BackEnd.Logging.BuildEventArgTransportSink; -using LoggingService = Microsoft.Build.BackEnd.Logging.LoggingService; -using LoggingServiceFactory = Microsoft.Build.BackEnd.Logging.LoggingServiceFactory; +using System; +using System.Collections.Generic; +using System.Threading; using ILoggingService = Microsoft.Build.BackEnd.Logging.ILoggingService; -using NodeLoggingContext = Microsoft.Build.BackEnd.Logging.NodeLoggingContext; using LoggingExceptionDelegate = Microsoft.Build.BackEnd.Logging.LoggingExceptionDelegate; -using Microsoft.Build.BackEnd.Components.Caching; +using NodeLoggingContext = Microsoft.Build.BackEnd.Logging.NodeLoggingContext; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Node/NativeMethods.cs b/src/XMakeBuildEngine/BackEnd/Node/NativeMethods.cs index 2b8110f36d6..2d5db29b124 100644 --- a/src/XMakeBuildEngine/BackEnd/Node/NativeMethods.cs +++ b/src/XMakeBuildEngine/BackEnd/Node/NativeMethods.cs @@ -6,10 +6,6 @@ //----------------------------------------------------------------------- using System; -using System.Collections.Generic; -using System.Text; -using Microsoft.Build.Shared; -using Microsoft.Win32.SafeHandles; using System.Runtime.InteropServices; namespace Microsoft.Build.BackEnd diff --git a/src/XMakeBuildEngine/BackEnd/Node/NodeConfiguration.cs b/src/XMakeBuildEngine/BackEnd/Node/NodeConfiguration.cs index b9e4a2cbf1b..0e9e0e778f9 100644 --- a/src/XMakeBuildEngine/BackEnd/Node/NodeConfiguration.cs +++ b/src/XMakeBuildEngine/BackEnd/Node/NodeConfiguration.cs @@ -6,16 +6,9 @@ //----------------------------------------------------------------------- using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Diagnostics; -using Microsoft.Build.Framework; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Shared; - -using LoggerDescription = Microsoft.Build.Logging.LoggerDescription; using BuildParameters = Microsoft.Build.Execution.BuildParameters; +using LoggerDescription = Microsoft.Build.Logging.LoggerDescription; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Node/OutOfProcNode.cs b/src/XMakeBuildEngine/BackEnd/Node/OutOfProcNode.cs index 397ede13ae4..2a2d4f378e6 100644 --- a/src/XMakeBuildEngine/BackEnd/Node/OutOfProcNode.cs +++ b/src/XMakeBuildEngine/BackEnd/Node/OutOfProcNode.cs @@ -6,24 +6,19 @@ //----------------------------------------------------------------------- using System; -using System.Collections; using System.Collections.Generic; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; -using System.IO; -using System.Linq; -using System.Text; using System.Globalization; +using System.IO; using System.Threading; -using System.Reflection; -using System.Runtime.CompilerServices; using Microsoft.Build.BackEnd; +using Microsoft.Build.BackEnd.Components.Caching; using Microsoft.Build.BackEnd.Logging; 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.Shared; namespace Microsoft.Build.Execution { diff --git a/src/XMakeBuildEngine/BackEnd/Shared/BuildAbortedException.cs b/src/XMakeBuildEngine/BackEnd/Shared/BuildAbortedException.cs index d140825860c..78cdd66e84e 100644 --- a/src/XMakeBuildEngine/BackEnd/Shared/BuildAbortedException.cs +++ b/src/XMakeBuildEngine/BackEnd/Shared/BuildAbortedException.cs @@ -5,12 +5,10 @@ // The exception which gets thrown if the build is aborted gracefully. //----------------------------------------------------------------------- +using Microsoft.Build.Shared; using System; -using System.Collections.Generic; -using System.Text; using System.Runtime.Serialization; using System.Security.Permissions; -using Microsoft.Build.Shared; namespace Microsoft.Build.Exceptions { diff --git a/src/XMakeBuildEngine/BackEnd/Shared/BuildRequest.cs b/src/XMakeBuildEngine/BackEnd/Shared/BuildRequest.cs index aa864ff8f3c..a4244a36ebb 100644 --- a/src/XMakeBuildEngine/BackEnd/Shared/BuildRequest.cs +++ b/src/XMakeBuildEngine/BackEnd/Shared/BuildRequest.cs @@ -5,15 +5,12 @@ // Class containing data for a build request. //----------------------------------------------------------------------- -using System; +using Microsoft.Build.Execution; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using System.Collections.Generic; using System.Diagnostics; -using System.Text; -using Microsoft.Build.Shared; -using Microsoft.Build.Framework; -using Microsoft.Build.Execution; -using Constants = Microsoft.Build.Internal.Constants; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Shared/BuildRequestBlocker.cs b/src/XMakeBuildEngine/BackEnd/Shared/BuildRequestBlocker.cs index 0f3c057722a..acef744a379 100644 --- a/src/XMakeBuildEngine/BackEnd/Shared/BuildRequestBlocker.cs +++ b/src/XMakeBuildEngine/BackEnd/Shared/BuildRequestBlocker.cs @@ -5,9 +5,6 @@ // Class describing what is blocking a build request from continuing. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Text; using System.Diagnostics; namespace Microsoft.Build.BackEnd diff --git a/src/XMakeBuildEngine/BackEnd/Shared/BuildRequestConfiguration.cs b/src/XMakeBuildEngine/BackEnd/Shared/BuildRequestConfiguration.cs index 37f30c1dcbb..9048e88a133 100644 --- a/src/XMakeBuildEngine/BackEnd/Shared/BuildRequestConfiguration.cs +++ b/src/XMakeBuildEngine/BackEnd/Shared/BuildRequestConfiguration.cs @@ -5,22 +5,16 @@ // A configuration for a build request. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Text; -using Microsoft.Build.Construction; -using Microsoft.Build.Logging; -using Microsoft.Build.Shared; -using Microsoft.Build.Execution; using Microsoft.Build.Collections; -using Microsoft.Build.Framework; +using Microsoft.Build.Evaluation; +using Microsoft.Build.Execution; using Microsoft.Build.Internal; +using Microsoft.Build.Shared; +using System; +using System.Collections.Generic; using System.Diagnostics; +using System.Globalization; using System.IO; -using System.Xml; -using Microsoft.Build.BackEnd.Logging; -using Microsoft.Build.Evaluation; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Shared/BuildRequestUnblocker.cs b/src/XMakeBuildEngine/BackEnd/Shared/BuildRequestUnblocker.cs index 70c744bfbea..badbbe11d4c 100644 --- a/src/XMakeBuildEngine/BackEnd/Shared/BuildRequestUnblocker.cs +++ b/src/XMakeBuildEngine/BackEnd/Shared/BuildRequestUnblocker.cs @@ -5,12 +5,8 @@ // Class used to unblock a blocked build request. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Text; -using System.Diagnostics; using Microsoft.Build.Shared; - +using System.Diagnostics; using BuildResult = Microsoft.Build.Execution.BuildResult; namespace Microsoft.Build.BackEnd diff --git a/src/XMakeBuildEngine/BackEnd/Shared/BuildResult.cs b/src/XMakeBuildEngine/BackEnd/Shared/BuildResult.cs index 22004eca01f..a79fe05059e 100644 --- a/src/XMakeBuildEngine/BackEnd/Shared/BuildResult.cs +++ b/src/XMakeBuildEngine/BackEnd/Shared/BuildResult.cs @@ -5,14 +5,13 @@ // A build result. //----------------------------------------------------------------------- +using Microsoft.Build.BackEnd; +using Microsoft.Build.Shared; using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Diagnostics; using System.IO; -using Microsoft.Build.BackEnd; -using Microsoft.Build.Collections; -using Microsoft.Build.Shared; namespace Microsoft.Build.Execution { diff --git a/src/XMakeBuildEngine/BackEnd/Shared/CircularDependencyException.cs b/src/XMakeBuildEngine/BackEnd/Shared/CircularDependencyException.cs index 1f287a32eb7..cda63f87323 100644 --- a/src/XMakeBuildEngine/BackEnd/Shared/CircularDependencyException.cs +++ b/src/XMakeBuildEngine/BackEnd/Shared/CircularDependencyException.cs @@ -6,10 +6,7 @@ //----------------------------------------------------------------------- using System; -using System.Collections.Generic; -using System.Text; using System.Runtime.Serialization; -using Microsoft.Build.Shared; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Shared/ConfigurationMetadata.cs b/src/XMakeBuildEngine/BackEnd/Shared/ConfigurationMetadata.cs index c78ee1668c5..c44ef2f6a28 100644 --- a/src/XMakeBuildEngine/BackEnd/Shared/ConfigurationMetadata.cs +++ b/src/XMakeBuildEngine/BackEnd/Shared/ConfigurationMetadata.cs @@ -5,14 +5,12 @@ // Class used for efficiently indexing BuildRequestConfigurations in the cache. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Text; - using Microsoft.Build.Collections; using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; using Microsoft.Build.Shared; +using System; +using System.Collections.Generic; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Shared/IBuildResults.cs b/src/XMakeBuildEngine/BackEnd/Shared/IBuildResults.cs index 12b77833edb..3a2c44e7b87 100644 --- a/src/XMakeBuildEngine/BackEnd/Shared/IBuildResults.cs +++ b/src/XMakeBuildEngine/BackEnd/Shared/IBuildResults.cs @@ -5,10 +5,9 @@ // The interface for build results. //----------------------------------------------------------------------- +using Microsoft.Build.Execution; using System; using System.Collections.Generic; -using System.Text; -using Microsoft.Build.Execution; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/Shared/ITargetResult.cs b/src/XMakeBuildEngine/BackEnd/Shared/ITargetResult.cs index 400b3e128cd..b7f333e18fb 100644 --- a/src/XMakeBuildEngine/BackEnd/Shared/ITargetResult.cs +++ b/src/XMakeBuildEngine/BackEnd/Shared/ITargetResult.cs @@ -5,11 +5,9 @@ // An interface for target results. //----------------------------------------------------------------------- +using Microsoft.Build.Framework; using System; -using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using System.Text; -using Microsoft.Build.Framework; namespace Microsoft.Build.Execution { diff --git a/src/XMakeBuildEngine/BackEnd/Shared/TargetResult.cs b/src/XMakeBuildEngine/BackEnd/Shared/TargetResult.cs index 6a901ba9470..bc0157f934d 100644 --- a/src/XMakeBuildEngine/BackEnd/Shared/TargetResult.cs +++ b/src/XMakeBuildEngine/BackEnd/Shared/TargetResult.cs @@ -5,18 +5,17 @@ // Represents results for a specific target. //----------------------------------------------------------------------- -using System; -using System.Diagnostics; -using System.IO; -using System.Text; -using System.Globalization; -using System.IO.Compression; using Microsoft.Build.BackEnd; using Microsoft.Build.Collections; using Microsoft.Build.Framework; using Microsoft.Build.Shared; -using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; +using System; +using System.Diagnostics; using System.Diagnostics.CodeAnalysis; +using System.Globalization; +using System.IO; +using System.IO.Compression; +using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; namespace Microsoft.Build.Execution { diff --git a/src/XMakeBuildEngine/BackEnd/Shared/WorkUnitResult.cs b/src/XMakeBuildEngine/BackEnd/Shared/WorkUnitResult.cs index 04c2b2ce78d..a53514a1031 100644 --- a/src/XMakeBuildEngine/BackEnd/Shared/WorkUnitResult.cs +++ b/src/XMakeBuildEngine/BackEnd/Shared/WorkUnitResult.cs @@ -6,8 +6,6 @@ //----------------------------------------------------------------------- using System; -using System.Collections.Generic; -using System.Text; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/BackEnd/TaskExecutionHost/AddInParts/ITaskExecutionHost.cs b/src/XMakeBuildEngine/BackEnd/TaskExecutionHost/AddInParts/ITaskExecutionHost.cs index 1193be9d244..dffcfb859f4 100644 --- a/src/XMakeBuildEngine/BackEnd/TaskExecutionHost/AddInParts/ITaskExecutionHost.cs +++ b/src/XMakeBuildEngine/BackEnd/TaskExecutionHost/AddInParts/ITaskExecutionHost.cs @@ -5,11 +5,11 @@ // Interface representing an object which can execute tasks. //----------------------------------------------------------------------- +using Microsoft.Build.Execution; +using Microsoft.Build.Framework; using System; using System.Collections.Generic; using System.Threading; -using Microsoft.Build.Execution; -using Microsoft.Build.Framework; using ElementLocation = Microsoft.Build.Construction.ElementLocation; using TargetLoggingContext = Microsoft.Build.BackEnd.Logging.TargetLoggingContext; using TaskLoggingContext = Microsoft.Build.BackEnd.Logging.TaskLoggingContext; diff --git a/src/XMakeBuildEngine/BackEnd/TaskExecutionHost/TaskExecutionHost.cs b/src/XMakeBuildEngine/BackEnd/TaskExecutionHost/TaskExecutionHost.cs index 080949fbe26..da0f6b56493 100644 --- a/src/XMakeBuildEngine/BackEnd/TaskExecutionHost/TaskExecutionHost.cs +++ b/src/XMakeBuildEngine/BackEnd/TaskExecutionHost/TaskExecutionHost.cs @@ -5,26 +5,23 @@ // Implementation of ITaskExecutionHost for executing tasks in-proc. //----------------------------------------------------------------------- +using Microsoft.Build.BackEnd.Logging; +using Microsoft.Build.Construction; +using Microsoft.Build.Evaluation; +using Microsoft.Build.Exceptions; +using Microsoft.Build.Execution; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using System; using System.Collections; using System.Collections.Generic; -using System.Collections.ObjectModel; using System.Diagnostics; -using System.Text; -using System.Threading; -using System.Threading.Tasks; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; - -using Microsoft.Build.Execution; -using Microsoft.Build.Exceptions; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Construction; -using Microsoft.Build.BackEnd.Logging; using System.Globalization; using System.Reflection; using System.Runtime.Remoting; - +using System.Text; +using System.Threading; +using System.Threading.Tasks; using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; namespace Microsoft.Build.BackEnd diff --git a/src/XMakeBuildEngine/Collections/ConcurrentQueueExtensions.cs b/src/XMakeBuildEngine/Collections/ConcurrentQueueExtensions.cs index 3738c064367..b2e124b09e0 100644 --- a/src/XMakeBuildEngine/Collections/ConcurrentQueueExtensions.cs +++ b/src/XMakeBuildEngine/Collections/ConcurrentQueueExtensions.cs @@ -5,9 +5,8 @@ // Extension methods for the ConcurrentQueue. //----------------------------------------------------------------------- -using System; -using System.Collections.Concurrent; using Microsoft.Build.Shared; +using System.Collections.Concurrent; namespace Microsoft.Build.Collections { diff --git a/src/XMakeBuildEngine/Collections/ConcurrentStackExtensions.cs b/src/XMakeBuildEngine/Collections/ConcurrentStackExtensions.cs index de5842219f8..e281493f2d1 100644 --- a/src/XMakeBuildEngine/Collections/ConcurrentStackExtensions.cs +++ b/src/XMakeBuildEngine/Collections/ConcurrentStackExtensions.cs @@ -5,9 +5,8 @@ // Extension methods for the ConcurrentStack. //----------------------------------------------------------------------- -using System; -using System.Collections.Concurrent; using Microsoft.Build.Shared; +using System.Collections.Concurrent; namespace Microsoft.Build.Collections { diff --git a/src/XMakeBuildEngine/Collections/CopyOnReadEnumerable.cs b/src/XMakeBuildEngine/Collections/CopyOnReadEnumerable.cs index 498d0828305..56aceeaf9ae 100644 --- a/src/XMakeBuildEngine/Collections/CopyOnReadEnumerable.cs +++ b/src/XMakeBuildEngine/Collections/CopyOnReadEnumerable.cs @@ -5,9 +5,9 @@ // A class which implements IEnumerable by creating an optionally-deep copy of the backing collection. //----------------------------------------------------------------------- +using Microsoft.Build.Shared; using System.Collections; using System.Collections.Generic; -using Microsoft.Build.Shared; namespace Microsoft.Build.Collections { diff --git a/src/XMakeBuildEngine/Collections/CopyOnWritePropertyDictionary.cs b/src/XMakeBuildEngine/Collections/CopyOnWritePropertyDictionary.cs index 80208cc3a35..b7527cc5416 100644 --- a/src/XMakeBuildEngine/Collections/CopyOnWritePropertyDictionary.cs +++ b/src/XMakeBuildEngine/Collections/CopyOnWritePropertyDictionary.cs @@ -5,15 +5,12 @@ // A dictionary over properties or metadata with copy-on-write semantics. //----------------------------------------------------------------------- +using Microsoft.Build.Evaluation; +using Microsoft.Build.Shared; using System; using System.Collections; using System.Collections.Generic; -using System.Threading; using System.Diagnostics; -using Microsoft.Build.Shared; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Framework; -using Microsoft.Build.Internal; namespace Microsoft.Build.Collections { diff --git a/src/XMakeBuildEngine/Collections/HashTableUtility.cs b/src/XMakeBuildEngine/Collections/HashTableUtility.cs index 32ff8d0279e..ffe38970845 100644 --- a/src/XMakeBuildEngine/Collections/HashTableUtility.cs +++ b/src/XMakeBuildEngine/Collections/HashTableUtility.cs @@ -3,7 +3,6 @@ using System; using System.Collections.Generic; -using System.Globalization; namespace Microsoft.Build.Collections { diff --git a/src/XMakeBuildEngine/Collections/ItemDictionary.cs b/src/XMakeBuildEngine/Collections/ItemDictionary.cs index 45e7518d3ee..8f39c43397c 100644 --- a/src/XMakeBuildEngine/Collections/ItemDictionary.cs +++ b/src/XMakeBuildEngine/Collections/ItemDictionary.cs @@ -5,14 +5,12 @@ // Collection of instance or definition items //----------------------------------------------------------------------- +using Microsoft.Build.Evaluation; +using Microsoft.Build.Shared; using System; using System.Collections; using System.Collections.Generic; using System.Diagnostics; -using ObjectModel = System.Collections.ObjectModel; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Shared; -using Microsoft.Build.Internal; namespace Microsoft.Build.Collections { diff --git a/src/XMakeBuildEngine/Collections/LookasideStringInterner.cs b/src/XMakeBuildEngine/Collections/LookasideStringInterner.cs index d78858f32ce..933f734e863 100644 --- a/src/XMakeBuildEngine/Collections/LookasideStringInterner.cs +++ b/src/XMakeBuildEngine/Collections/LookasideStringInterner.cs @@ -5,12 +5,9 @@ // An interner used for serialization. //----------------------------------------------------------------------- +using Microsoft.Build.BackEnd; using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using Microsoft.Build.BackEnd; -using Microsoft.Build.Shared; namespace Microsoft.Build.Collections { diff --git a/src/XMakeBuildEngine/Collections/MultiDictionary.cs b/src/XMakeBuildEngine/Collections/MultiDictionary.cs index 4d4d6eeec25..af4209d76a1 100644 --- a/src/XMakeBuildEngine/Collections/MultiDictionary.cs +++ b/src/XMakeBuildEngine/Collections/MultiDictionary.cs @@ -5,12 +5,10 @@ // A dictionary that can hold more than one distinct value with the same key. //----------------------------------------------------------------------- +using Microsoft.Build.Shared; using System; -using System.Collections.Generic; -using System.Text; -using System.Collections.ObjectModel; using System.Collections; -using Microsoft.Build.Shared; +using System.Collections.Generic; using System.Diagnostics; namespace Microsoft.Build.Collections diff --git a/src/XMakeBuildEngine/Collections/OrdinalIgnoreCaseKeyedComparer.cs b/src/XMakeBuildEngine/Collections/OrdinalIgnoreCaseKeyedComparer.cs index 4e10a5edef9..aa296fc43fa 100644 --- a/src/XMakeBuildEngine/Collections/OrdinalIgnoreCaseKeyedComparer.cs +++ b/src/XMakeBuildEngine/Collections/OrdinalIgnoreCaseKeyedComparer.cs @@ -9,10 +9,6 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Diagnostics; -using Microsoft.Build.Shared; namespace Microsoft.Build.Collections { diff --git a/src/XMakeBuildEngine/Collections/OrdinalKeyedComparer.cs b/src/XMakeBuildEngine/Collections/OrdinalKeyedComparer.cs index ff2788e7c17..383782a690e 100644 --- a/src/XMakeBuildEngine/Collections/OrdinalKeyedComparer.cs +++ b/src/XMakeBuildEngine/Collections/OrdinalKeyedComparer.cs @@ -9,10 +9,6 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Diagnostics; -using Microsoft.Build.Shared; namespace Microsoft.Build.Collections { diff --git a/src/XMakeBuildEngine/Collections/PropertyDictionary.cs b/src/XMakeBuildEngine/Collections/PropertyDictionary.cs index 6b66560d16d..534b05f9d47 100644 --- a/src/XMakeBuildEngine/Collections/PropertyDictionary.cs +++ b/src/XMakeBuildEngine/Collections/PropertyDictionary.cs @@ -5,14 +5,12 @@ // A dictionary over properties or metadata. //----------------------------------------------------------------------- +using Microsoft.Build.Evaluation; +using Microsoft.Build.Shared; using System; using System.Collections; using System.Collections.Generic; -using System.Threading; using System.Diagnostics; -using Microsoft.Build.Shared; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Framework; namespace Microsoft.Build.Collections { diff --git a/src/XMakeBuildEngine/Collections/ReadOnlyConvertingCollection.cs b/src/XMakeBuildEngine/Collections/ReadOnlyConvertingCollection.cs index f68a461ce45..9147368582b 100644 --- a/src/XMakeBuildEngine/Collections/ReadOnlyConvertingCollection.cs +++ b/src/XMakeBuildEngine/Collections/ReadOnlyConvertingCollection.cs @@ -5,13 +5,9 @@ // A read-only collection wrapper which converts values as they are accessed. //----------------------------------------------------------------------- +using Microsoft.Build.Shared; using System; using System.Collections.Generic; -using System.Linq; -using System.Text; - -using Microsoft.Build.Shared; -using Microsoft.Build.Collections; namespace Microsoft.Build.Collections { diff --git a/src/XMakeBuildEngine/Collections/ReadOnlyConvertingDictionary.cs b/src/XMakeBuildEngine/Collections/ReadOnlyConvertingDictionary.cs index 4ce4e5775b8..8910afb75da 100644 --- a/src/XMakeBuildEngine/Collections/ReadOnlyConvertingDictionary.cs +++ b/src/XMakeBuildEngine/Collections/ReadOnlyConvertingDictionary.cs @@ -5,13 +5,9 @@ // A read-only dictionary wrapper which converts values as they are accessed. //----------------------------------------------------------------------- +using Microsoft.Build.Shared; using System; using System.Collections.Generic; -using System.Linq; -using System.Text; - -using Microsoft.Build.Evaluation; -using Microsoft.Build.Shared; namespace Microsoft.Build.Collections { diff --git a/src/XMakeBuildEngine/Collections/RetrievableEntryHashSet/BitHelper.cs b/src/XMakeBuildEngine/Collections/RetrievableEntryHashSet/BitHelper.cs index 48e34eecb2d..bcafd4c937b 100644 --- a/src/XMakeBuildEngine/Collections/RetrievableEntryHashSet/BitHelper.cs +++ b/src/XMakeBuildEngine/Collections/RetrievableEntryHashSet/BitHelper.cs @@ -1,10 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections; using System.Security; -using System.Text; namespace Microsoft.Build.Collections { diff --git a/src/XMakeBuildEngine/Collections/RetrievableEntryHashSet/HashHelpers.cs b/src/XMakeBuildEngine/Collections/RetrievableEntryHashSet/HashHelpers.cs index 93992408b7c..66aaca1d4fd 100644 --- a/src/XMakeBuildEngine/Collections/RetrievableEntryHashSet/HashHelpers.cs +++ b/src/XMakeBuildEngine/Collections/RetrievableEntryHashSet/HashHelpers.cs @@ -2,13 +2,10 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Collections; -using System.Collections.Generic; using System.Diagnostics; #if !SILVERLIGHT using System.Runtime.ConstrainedExecution; #endif -using System.Text; namespace Microsoft.Build.Collections { diff --git a/src/XMakeBuildEngine/Collections/RetrievableEntryHashSet/HashSet.cs b/src/XMakeBuildEngine/Collections/RetrievableEntryHashSet/HashSet.cs index f38237d42bd..c900672c24c 100644 --- a/src/XMakeBuildEngine/Collections/RetrievableEntryHashSet/HashSet.cs +++ b/src/XMakeBuildEngine/Collections/RetrievableEntryHashSet/HashSet.cs @@ -9,8 +9,6 @@ #if !SILVERLIGHT using System.Runtime.Serialization; #endif -using System.Security.Permissions; -using System.Text; using System.Diagnostics.CodeAnalysis; using System.Security; #if SILVERLIGHT diff --git a/src/XMakeBuildEngine/Collections/RetrievableEntryHashSet/HashSetDebugView.cs b/src/XMakeBuildEngine/Collections/RetrievableEntryHashSet/HashSetDebugView.cs index ce3ec5eb1bc..53edf4c3832 100644 --- a/src/XMakeBuildEngine/Collections/RetrievableEntryHashSet/HashSetDebugView.cs +++ b/src/XMakeBuildEngine/Collections/RetrievableEntryHashSet/HashSetDebugView.cs @@ -2,10 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Collections; -using System.Collections.Generic; using System.Diagnostics; -using System.Text; namespace Microsoft.Build.Collections { diff --git a/src/XMakeBuildEngine/Collections/Triple.cs b/src/XMakeBuildEngine/Collections/Triple.cs index e30594a4080..891d199da47 100644 --- a/src/XMakeBuildEngine/Collections/Triple.cs +++ b/src/XMakeBuildEngine/Collections/Triple.cs @@ -5,8 +5,6 @@ // A struct of three objects //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; namespace Microsoft.Build.Collections { diff --git a/src/XMakeBuildEngine/Collections/WeakDictionary.cs b/src/XMakeBuildEngine/Collections/WeakDictionary.cs index 0a919ada19a..63ad92bf56c 100644 --- a/src/XMakeBuildEngine/Collections/WeakDictionary.cs +++ b/src/XMakeBuildEngine/Collections/WeakDictionary.cs @@ -5,12 +5,10 @@ // A dictionary that does not hold strong references to either keys or values //----------------------------------------------------------------------- +using Microsoft.Build.Shared; using System; -using System.Collections.Generic; -using System.Text; -using System.Collections.ObjectModel; using System.Collections; -using Microsoft.Build.Shared; +using System.Collections.Generic; using System.Diagnostics; namespace Microsoft.Build.Collections diff --git a/src/XMakeBuildEngine/Collections/WeakReference.cs b/src/XMakeBuildEngine/Collections/WeakReference.cs index 6d40c4c0279..9f8b9622175 100644 --- a/src/XMakeBuildEngine/Collections/WeakReference.cs +++ b/src/XMakeBuildEngine/Collections/WeakReference.cs @@ -5,13 +5,8 @@ // Strongly typed weak reference //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Text; -using System.Collections.ObjectModel; -using System.Collections; using Microsoft.Build.Shared; -using System.Diagnostics; +using System; namespace Microsoft.Build.Collections { diff --git a/src/XMakeBuildEngine/Collections/WeakValueDictionary.cs b/src/XMakeBuildEngine/Collections/WeakValueDictionary.cs index 717970917c4..3a973504cc2 100644 --- a/src/XMakeBuildEngine/Collections/WeakValueDictionary.cs +++ b/src/XMakeBuildEngine/Collections/WeakValueDictionary.cs @@ -5,11 +5,10 @@ // Dictionary that does not prevent values from being garbage collected. //----------------------------------------------------------------------- +using Microsoft.Build.Shared; using System; using System.Collections.Generic; -using System.Text; using System.Diagnostics; -using Microsoft.Build.Shared; namespace Microsoft.Build.Collections { diff --git a/src/XMakeBuildEngine/Construction/ProjectChooseElement.cs b/src/XMakeBuildEngine/Construction/ProjectChooseElement.cs index 4bfe657baf9..9ce194505d5 100644 --- a/src/XMakeBuildEngine/Construction/ProjectChooseElement.cs +++ b/src/XMakeBuildEngine/Construction/ProjectChooseElement.cs @@ -5,13 +5,11 @@ // Definition of ProjectChooseElement class. //----------------------------------------------------------------------- -using System; +using Microsoft.Build.Collections; +using Microsoft.Build.Shared; using System.Collections.Generic; -using System.Xml; using System.Diagnostics; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.Build.Collections; +using System.Xml; namespace Microsoft.Build.Construction { diff --git a/src/XMakeBuildEngine/Construction/ProjectElement.cs b/src/XMakeBuildEngine/Construction/ProjectElement.cs index 2a96f31db9c..90282e68a27 100644 --- a/src/XMakeBuildEngine/Construction/ProjectElement.cs +++ b/src/XMakeBuildEngine/Construction/ProjectElement.cs @@ -5,17 +5,11 @@ // An unevaluated element in MSBuild XML. //----------------------------------------------------------------------- +using Microsoft.Build.Shared; using System; -using System.Text; using System.Collections.Generic; -using System.Xml; using System.Diagnostics; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using System.Collections.ObjectModel; -using Microsoft.Build.Construction; -using Microsoft.Build.Collections; - +using System.Xml; using ProjectXmlUtilities = Microsoft.Build.Internal.ProjectXmlUtilities; namespace Microsoft.Build.Construction diff --git a/src/XMakeBuildEngine/Construction/ProjectElementContainer.cs b/src/XMakeBuildEngine/Construction/ProjectElementContainer.cs index 0ff7fa85041..797b1e8dcea 100644 --- a/src/XMakeBuildEngine/Construction/ProjectElementContainer.cs +++ b/src/XMakeBuildEngine/Construction/ProjectElementContainer.cs @@ -5,16 +5,11 @@ // A container for project elements. //----------------------------------------------------------------------- +using Microsoft.Build.Shared; using System; -using System.Text; using System.Collections.Generic; -using System.Xml; using System.Diagnostics; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using System.Collections.ObjectModel; -using Microsoft.Build.Construction; -using Microsoft.Build.Collections; +using System.Xml; namespace Microsoft.Build.Construction { diff --git a/src/XMakeBuildEngine/Construction/ProjectExtensionsElement.cs b/src/XMakeBuildEngine/Construction/ProjectExtensionsElement.cs index 75fa33e3d1e..c2e215adbfe 100644 --- a/src/XMakeBuildEngine/Construction/ProjectExtensionsElement.cs +++ b/src/XMakeBuildEngine/Construction/ProjectExtensionsElement.cs @@ -5,15 +5,11 @@ // Represents the ProjectExtensions element in the MSBuild project. //----------------------------------------------------------------------- +using Microsoft.Build.Shared; using System; -using System.Collections.Generic; -using System.Xml; -using System.Reflection; using System.Diagnostics; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; +using System.Xml; -using Utilities = Microsoft.Build.Internal.Utilities; namespace Microsoft.Build.Construction { diff --git a/src/XMakeBuildEngine/Construction/ProjectImportElement.cs b/src/XMakeBuildEngine/Construction/ProjectImportElement.cs index bec6a598f1f..0dda0dc2033 100644 --- a/src/XMakeBuildEngine/Construction/ProjectImportElement.cs +++ b/src/XMakeBuildEngine/Construction/ProjectImportElement.cs @@ -5,13 +5,9 @@ // Definition of ProjectImportElement class. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Xml; -using System.Diagnostics; -using Microsoft.Build.Framework; using Microsoft.Build.Shared; - +using System.Diagnostics; +using System.Xml; using ProjectXmlUtilities = Microsoft.Build.Internal.ProjectXmlUtilities; namespace Microsoft.Build.Construction diff --git a/src/XMakeBuildEngine/Construction/ProjectImportGroupElement.cs b/src/XMakeBuildEngine/Construction/ProjectImportGroupElement.cs index 33ef5a3ff8a..4b923645ed7 100644 --- a/src/XMakeBuildEngine/Construction/ProjectImportGroupElement.cs +++ b/src/XMakeBuildEngine/Construction/ProjectImportGroupElement.cs @@ -5,15 +5,11 @@ // Definition of ProjectImportGroupElement class. //----------------------------------------------------------------------- -using System; +using Microsoft.Build.Collections; +using Microsoft.Build.Shared; using System.Collections.Generic; -using System.Xml; using System.Diagnostics; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.Build.Collections; -using ProjectXmlUtilities = Microsoft.Build.Internal.ProjectXmlUtilities; namespace Microsoft.Build.Construction { diff --git a/src/XMakeBuildEngine/Construction/ProjectItemDefinitionElement.cs b/src/XMakeBuildEngine/Construction/ProjectItemDefinitionElement.cs index 83f8406f0d8..d602ede969f 100644 --- a/src/XMakeBuildEngine/Construction/ProjectItemDefinitionElement.cs +++ b/src/XMakeBuildEngine/Construction/ProjectItemDefinitionElement.cs @@ -5,15 +5,12 @@ // Definition of ProjectItemDefinitionElement class. //----------------------------------------------------------------------- -using System; +using Microsoft.Build.Collections; +using Microsoft.Build.Shared; using System.Collections.Generic; -using System.Xml; using System.Diagnostics; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.Build.Collections; +using System.Xml; -using ProjectXmlUtilities = Microsoft.Build.Internal.ProjectXmlUtilities; namespace Microsoft.Build.Construction { diff --git a/src/XMakeBuildEngine/Construction/ProjectItemDefinitionGroupElement.cs b/src/XMakeBuildEngine/Construction/ProjectItemDefinitionGroupElement.cs index d4d9ef0f5d5..dbb3c2b9582 100644 --- a/src/XMakeBuildEngine/Construction/ProjectItemDefinitionGroupElement.cs +++ b/src/XMakeBuildEngine/Construction/ProjectItemDefinitionGroupElement.cs @@ -5,15 +5,12 @@ // Definition of ProjectItemDefinitionGroupElement class. //----------------------------------------------------------------------- -using System; +using Microsoft.Build.Collections; +using Microsoft.Build.Shared; using System.Collections.Generic; -using System.Xml; using System.Diagnostics; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.Build.Collections; +using System.Xml; -using ProjectXmlUtilities = Microsoft.Build.Internal.ProjectXmlUtilities; namespace Microsoft.Build.Construction { diff --git a/src/XMakeBuildEngine/Construction/ProjectItemElement.cs b/src/XMakeBuildEngine/Construction/ProjectItemElement.cs index 9005441eb04..e991523fbc2 100644 --- a/src/XMakeBuildEngine/Construction/ProjectItemElement.cs +++ b/src/XMakeBuildEngine/Construction/ProjectItemElement.cs @@ -5,15 +5,12 @@ // Definition of ProjectItemElement class. //----------------------------------------------------------------------- +using Microsoft.Build.Collections; +using Microsoft.Build.Shared; using System; using System.Collections.Generic; -using System.Xml; using System.Diagnostics; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.Build.Execution; -using Microsoft.Build.Collections; - +using System.Xml; using ProjectXmlUtilities = Microsoft.Build.Internal.ProjectXmlUtilities; namespace Microsoft.Build.Construction diff --git a/src/XMakeBuildEngine/Construction/ProjectItemGroupElement.cs b/src/XMakeBuildEngine/Construction/ProjectItemGroupElement.cs index 8e3c7080af2..803517a1be9 100644 --- a/src/XMakeBuildEngine/Construction/ProjectItemGroupElement.cs +++ b/src/XMakeBuildEngine/Construction/ProjectItemGroupElement.cs @@ -5,15 +5,12 @@ // Definition of ProjectItemGroupElement class. //----------------------------------------------------------------------- +using Microsoft.Build.Collections; +using Microsoft.Build.Shared; using System; using System.Collections.Generic; -using System.Xml; using System.Diagnostics; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.Build.Collections; -using ProjectXmlUtilities = Microsoft.Build.Internal.ProjectXmlUtilities; namespace Microsoft.Build.Construction { diff --git a/src/XMakeBuildEngine/Construction/ProjectMetadataElement.cs b/src/XMakeBuildEngine/Construction/ProjectMetadataElement.cs index d601b75250f..a12db8e23c5 100644 --- a/src/XMakeBuildEngine/Construction/ProjectMetadataElement.cs +++ b/src/XMakeBuildEngine/Construction/ProjectMetadataElement.cs @@ -5,14 +5,10 @@ // Definition of ProjectMetadataElement class. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Xml; -using System.Diagnostics; using Microsoft.Build.Shared; +using System.Diagnostics; +using System.Xml; -using ProjectXmlUtilities = Microsoft.Build.Internal.ProjectXmlUtilities; -using Utilities = Microsoft.Build.Internal.Utilities; namespace Microsoft.Build.Construction { diff --git a/src/XMakeBuildEngine/Construction/ProjectOnErrorElement.cs b/src/XMakeBuildEngine/Construction/ProjectOnErrorElement.cs index b5f8497eaa4..3b4ecd669d9 100644 --- a/src/XMakeBuildEngine/Construction/ProjectOnErrorElement.cs +++ b/src/XMakeBuildEngine/Construction/ProjectOnErrorElement.cs @@ -5,14 +5,9 @@ // Definition of ProjectOnErrorElement class. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Xml; -using System.Reflection; -using System.Diagnostics; -using Microsoft.Build.Framework; using Microsoft.Build.Shared; - +using System.Diagnostics; +using System.Xml; using ProjectXmlUtilities = Microsoft.Build.Internal.ProjectXmlUtilities; namespace Microsoft.Build.Construction diff --git a/src/XMakeBuildEngine/Construction/ProjectOtherwiseElement.cs b/src/XMakeBuildEngine/Construction/ProjectOtherwiseElement.cs index 1b5384ed47b..9681863a432 100644 --- a/src/XMakeBuildEngine/Construction/ProjectOtherwiseElement.cs +++ b/src/XMakeBuildEngine/Construction/ProjectOtherwiseElement.cs @@ -5,13 +5,10 @@ // Definition of ProjectOtherwiseElement class. //----------------------------------------------------------------------- -using System; +using Microsoft.Build.Collections; +using Microsoft.Build.Shared; using System.Collections.Generic; -using System.Xml; using System.Diagnostics; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.Build.Collections; namespace Microsoft.Build.Construction { diff --git a/src/XMakeBuildEngine/Construction/ProjectOutputElement.cs b/src/XMakeBuildEngine/Construction/ProjectOutputElement.cs index e20773224f0..3e1871809f0 100644 --- a/src/XMakeBuildEngine/Construction/ProjectOutputElement.cs +++ b/src/XMakeBuildEngine/Construction/ProjectOutputElement.cs @@ -5,13 +5,10 @@ // Definition of ProjectOutputElement class. //----------------------------------------------------------------------- +using Microsoft.Build.Shared; using System; -using System.Collections.Generic; -using System.Xml; using System.Diagnostics; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; - +using System.Xml; using ProjectXmlUtilities = Microsoft.Build.Internal.ProjectXmlUtilities; namespace Microsoft.Build.Construction diff --git a/src/XMakeBuildEngine/Construction/ProjectPropertyElement.cs b/src/XMakeBuildEngine/Construction/ProjectPropertyElement.cs index 809628e046e..63264efa833 100644 --- a/src/XMakeBuildEngine/Construction/ProjectPropertyElement.cs +++ b/src/XMakeBuildEngine/Construction/ProjectPropertyElement.cs @@ -5,12 +5,10 @@ // Definition of ProjectPropertyElement class. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Xml; -using System.Diagnostics; -using Microsoft.Build.Shared; using Microsoft.Build.Internal; +using Microsoft.Build.Shared; +using System.Diagnostics; +using System.Xml; namespace Microsoft.Build.Construction { diff --git a/src/XMakeBuildEngine/Construction/ProjectPropertyGroupElement.cs b/src/XMakeBuildEngine/Construction/ProjectPropertyGroupElement.cs index 1ea2f540d24..f329a3e39af 100644 --- a/src/XMakeBuildEngine/Construction/ProjectPropertyGroupElement.cs +++ b/src/XMakeBuildEngine/Construction/ProjectPropertyGroupElement.cs @@ -5,15 +5,12 @@ // Definition of ProjectPropertyGroupElement class. //----------------------------------------------------------------------- +using Microsoft.Build.Collections; +using Microsoft.Build.Shared; using System; using System.Collections.Generic; -using System.Xml; using System.Diagnostics; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.Build.Collections; -using ProjectXmlUtilities = Microsoft.Build.Internal.ProjectXmlUtilities; namespace Microsoft.Build.Construction { diff --git a/src/XMakeBuildEngine/Construction/ProjectRootElement.cs b/src/XMakeBuildEngine/Construction/ProjectRootElement.cs index 46c38b9799a..7930b89bee4 100644 --- a/src/XMakeBuildEngine/Construction/ProjectRootElement.cs +++ b/src/XMakeBuildEngine/Construction/ProjectRootElement.cs @@ -16,7 +16,6 @@ using Microsoft.Build.Collections; using Microsoft.Build.Evaluation; using Microsoft.Build.Framework; -using Microsoft.Build.Internal; using Microsoft.Build.Shared; #if (!STANDALONEBUILD) using Microsoft.Internal.Performance; diff --git a/src/XMakeBuildEngine/Construction/ProjectTargetElement.cs b/src/XMakeBuildEngine/Construction/ProjectTargetElement.cs index 38c7701ffcf..8b8481ce129 100644 --- a/src/XMakeBuildEngine/Construction/ProjectTargetElement.cs +++ b/src/XMakeBuildEngine/Construction/ProjectTargetElement.cs @@ -5,15 +5,13 @@ // Definition of ProjectTargetElement class. //----------------------------------------------------------------------- +using Microsoft.Build.Collections; +using Microsoft.Build.Execution; +using Microsoft.Build.Shared; using System; using System.Collections.Generic; -using System.Xml; using System.Diagnostics; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.Build.Collections; -using Microsoft.Build.Execution; - +using System.Xml; using ProjectXmlUtilities = Microsoft.Build.Internal.ProjectXmlUtilities; namespace Microsoft.Build.Construction diff --git a/src/XMakeBuildEngine/Construction/ProjectTaskElement.cs b/src/XMakeBuildEngine/Construction/ProjectTaskElement.cs index bac3b2b857c..642469cd928 100644 --- a/src/XMakeBuildEngine/Construction/ProjectTaskElement.cs +++ b/src/XMakeBuildEngine/Construction/ProjectTaskElement.cs @@ -5,15 +5,13 @@ // Definition of ProjectTaskElement class. //----------------------------------------------------------------------- +using Microsoft.Build.Collections; +using Microsoft.Build.Shared; using System; using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Xml; using System.Diagnostics; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.Build.Collections; - +using System.Xml; using ProjectXmlUtilities = Microsoft.Build.Internal.ProjectXmlUtilities; namespace Microsoft.Build.Construction diff --git a/src/XMakeBuildEngine/Construction/ProjectUsingTaskBodyElement.cs b/src/XMakeBuildEngine/Construction/ProjectUsingTaskBodyElement.cs index f54a859ba6d..316f6d4643b 100644 --- a/src/XMakeBuildEngine/Construction/ProjectUsingTaskBodyElement.cs +++ b/src/XMakeBuildEngine/Construction/ProjectUsingTaskBodyElement.cs @@ -5,14 +5,10 @@ // Definition of ProjectUsingTaskBodyElement class. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Xml; -using System.Diagnostics; using Microsoft.Build.Shared; - +using System.Diagnostics; +using System.Xml; using ProjectXmlUtilities = Microsoft.Build.Internal.ProjectXmlUtilities; -using Utilities = Microsoft.Build.Internal.Utilities; namespace Microsoft.Build.Construction { diff --git a/src/XMakeBuildEngine/Construction/ProjectUsingTaskElement.cs b/src/XMakeBuildEngine/Construction/ProjectUsingTaskElement.cs index a979859c283..64b6d2f28de 100644 --- a/src/XMakeBuildEngine/Construction/ProjectUsingTaskElement.cs +++ b/src/XMakeBuildEngine/Construction/ProjectUsingTaskElement.cs @@ -5,15 +5,10 @@ // Definition of ProjectUsingTaskElement class. //----------------------------------------------------------------------- +using Microsoft.Build.Shared; using System; -using System.Collections.Generic; -using System.Xml; -using System.Reflection; using System.Diagnostics; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.Build.Collections; - +using System.Xml; using ProjectXmlUtilities = Microsoft.Build.Internal.ProjectXmlUtilities; namespace Microsoft.Build.Construction diff --git a/src/XMakeBuildEngine/Construction/ProjectUsingTaskParameterElement.cs b/src/XMakeBuildEngine/Construction/ProjectUsingTaskParameterElement.cs index a91f679f22a..e31194be714 100644 --- a/src/XMakeBuildEngine/Construction/ProjectUsingTaskParameterElement.cs +++ b/src/XMakeBuildEngine/Construction/ProjectUsingTaskParameterElement.cs @@ -5,12 +5,10 @@ // Definition of ProjectUsingTaskParameterElement class. //----------------------------------------------------------------------- +using Microsoft.Build.Shared; using System; -using System.Collections.Generic; -using System.Xml; using System.Diagnostics; -using Microsoft.Build.Shared; - +using System.Xml; using ProjectXmlUtilities = Microsoft.Build.Internal.ProjectXmlUtilities; namespace Microsoft.Build.Construction diff --git a/src/XMakeBuildEngine/Construction/ProjectWhenElement.cs b/src/XMakeBuildEngine/Construction/ProjectWhenElement.cs index b8e38f3761f..15e63a4b2ce 100644 --- a/src/XMakeBuildEngine/Construction/ProjectWhenElement.cs +++ b/src/XMakeBuildEngine/Construction/ProjectWhenElement.cs @@ -5,15 +5,12 @@ // Definition of ProjectWhenElement class. //----------------------------------------------------------------------- -using System; +using Microsoft.Build.Collections; +using Microsoft.Build.Shared; using System.Collections.Generic; -using System.Xml; using System.Diagnostics; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.Build.Collections; +using System.Xml; -using ProjectXmlUtilities = Microsoft.Build.Internal.ProjectXmlUtilities; namespace Microsoft.Build.Construction { diff --git a/src/XMakeBuildEngine/Construction/Solution/ProjectInSolution.cs b/src/XMakeBuildEngine/Construction/Solution/ProjectInSolution.cs index 5abb10e92ef..ef9b98830bf 100644 --- a/src/XMakeBuildEngine/Construction/Solution/ProjectInSolution.cs +++ b/src/XMakeBuildEngine/Construction/Solution/ProjectInSolution.cs @@ -4,16 +4,15 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.IO; using System.Security; using System.Text; using System.Xml; - -using XMakeAttributes = Microsoft.Build.Shared.XMakeAttributes; -using ProjectFileErrorUtilities = Microsoft.Build.Shared.ProjectFileErrorUtilities; using BuildEventFileInfo = Microsoft.Build.Shared.BuildEventFileInfo; using ErrorUtilities = Microsoft.Build.Shared.ErrorUtilities; -using System.Collections.ObjectModel; +using ProjectFileErrorUtilities = Microsoft.Build.Shared.ProjectFileErrorUtilities; +using XMakeAttributes = Microsoft.Build.Shared.XMakeAttributes; namespace Microsoft.Build.Construction { diff --git a/src/XMakeBuildEngine/Construction/Solution/SolutionFile.cs b/src/XMakeBuildEngine/Construction/Solution/SolutionFile.cs index c9838e067bc..d3eff7644ef 100644 --- a/src/XMakeBuildEngine/Construction/Solution/SolutionFile.cs +++ b/src/XMakeBuildEngine/Construction/Solution/SolutionFile.cs @@ -4,20 +4,19 @@ using System; using System.Collections; 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.Security; +using System.Text; using System.Text.RegularExpressions; - +using System.Xml; +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 VisualStudioConstants = Microsoft.Build.Shared.VisualStudioConstants; namespace Microsoft.Build.Construction { diff --git a/src/XMakeBuildEngine/Construction/Solution/SolutionProjectGenerator.cs b/src/XMakeBuildEngine/Construction/Solution/SolutionProjectGenerator.cs index 5d65603558c..35ad2b3f0dc 100644 --- a/src/XMakeBuildEngine/Construction/Solution/SolutionProjectGenerator.cs +++ b/src/XMakeBuildEngine/Construction/Solution/SolutionProjectGenerator.cs @@ -5,6 +5,9 @@ // Converts a solution file to a set of project instances which can be built. //----------------------------------------------------------------------- +using Microsoft.Build.Execution; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using System; using System.Collections; using System.Collections.Generic; @@ -12,21 +15,13 @@ using System.IO; using System.Text; using System.Xml; - -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.Build.Collections; - +using Constants = Microsoft.Build.Internal.Constants; +using FrameworkName = System.Runtime.Versioning.FrameworkName; +using ILoggingService = Microsoft.Build.BackEnd.Logging.ILoggingService; +using IProperty = Microsoft.Build.Evaluation.IProperty; using Project = Microsoft.Build.Evaluation.Project; using ProjectCollection = Microsoft.Build.Evaluation.ProjectCollection; using ProjectItem = Microsoft.Build.Evaluation.ProjectItem; -using IProperty = Microsoft.Build.Evaluation.IProperty; - -using Constants = Microsoft.Build.Internal.Constants; -using ILoggingService = Microsoft.Build.BackEnd.Logging.ILoggingService; - -using FrameworkName = System.Runtime.Versioning.FrameworkName; -using Microsoft.Build.Execution; namespace Microsoft.Build.Construction { diff --git a/src/XMakeBuildEngine/Construction/UsingTaskParameterGroupElement.cs b/src/XMakeBuildEngine/Construction/UsingTaskParameterGroupElement.cs index 57bdf36c3da..e2a32d53784 100644 --- a/src/XMakeBuildEngine/Construction/UsingTaskParameterGroupElement.cs +++ b/src/XMakeBuildEngine/Construction/UsingTaskParameterGroupElement.cs @@ -5,13 +5,11 @@ // Definition of UsingTaskParameterGroupElement class. //----------------------------------------------------------------------- +using Microsoft.Build.Collections; +using Microsoft.Build.Shared; using System; -using System.Diagnostics; using System.Collections.Generic; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.Build.Collections; - +using System.Diagnostics; using ProjectXmlUtilities = Microsoft.Build.Internal.ProjectXmlUtilities; namespace Microsoft.Build.Construction diff --git a/src/XMakeBuildEngine/Debugger/DebuggerLocalType.cs b/src/XMakeBuildEngine/Debugger/DebuggerLocalType.cs index 0a609ea66b6..345110c6928 100644 --- a/src/XMakeBuildEngine/Debugger/DebuggerLocalType.cs +++ b/src/XMakeBuildEngine/Debugger/DebuggerLocalType.cs @@ -5,9 +5,8 @@ // Description of a local type for a debugger local. //----------------------------------------------------------------------- -using System; using Microsoft.Build.Shared; -using System.Diagnostics; +using System; namespace Microsoft.Build.Debugging { diff --git a/src/XMakeBuildEngine/Debugger/DebuggerManager.cs b/src/XMakeBuildEngine/Debugger/DebuggerManager.cs index 5c908599f46..cd4108146f4 100644 --- a/src/XMakeBuildEngine/Debugger/DebuggerManager.cs +++ b/src/XMakeBuildEngine/Debugger/DebuggerManager.cs @@ -5,18 +5,17 @@ // Provides debugging support for state machines. //----------------------------------------------------------------------- +using Microsoft.Build.Collections; +using Microsoft.Build.Construction; +using Microsoft.Build.Shared; using System; using System.Collections.Generic; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Diagnostics.SymbolStore; -using System.Linq; using System.Reflection; using System.Reflection.Emit; using System.Threading; -using Microsoft.Build.Collections; -using Microsoft.Build.Construction; -using Microsoft.Build.Shared; namespace Microsoft.Build.Debugging { diff --git a/src/XMakeBuildEngine/Definition/BuiltInMetadata.cs b/src/XMakeBuildEngine/Definition/BuiltInMetadata.cs index 7f9936af785..71e0d2946df 100644 --- a/src/XMakeBuildEngine/Definition/BuiltInMetadata.cs +++ b/src/XMakeBuildEngine/Definition/BuiltInMetadata.cs @@ -5,13 +5,10 @@ // Container for built-in metadata. //----------------------------------------------------------------------- +using Microsoft.Build.Shared; using System; using System.Collections.Generic; -using System.Text; using System.Diagnostics; -using Microsoft.Build.Shared; -using Microsoft.Build.Internal; -using Microsoft.Build.Collections; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Definition/Project.cs b/src/XMakeBuildEngine/Definition/Project.cs index 098a2449566..8e8ae406511 100644 --- a/src/XMakeBuildEngine/Definition/Project.cs +++ b/src/XMakeBuildEngine/Definition/Project.cs @@ -5,29 +5,29 @@ // Represents an definition model project. //----------------------------------------------------------------------- +using Microsoft.Build.BackEnd; +using Microsoft.Build.Collections; +using Microsoft.Build.Construction; +using Microsoft.Build.Execution; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using System; using System.Collections.Generic; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; +using System.Globalization; using System.IO; using System.Linq; using System.Text; using System.Threading; using System.Xml; -using Microsoft.Build.BackEnd; -using Microsoft.Build.Collections; -using ObjectModel = System.Collections.ObjectModel; -using Microsoft.Build.Construction; -using Microsoft.Build.Execution; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; using Constants = Microsoft.Build.Internal.Constants; -using Utilities = Microsoft.Build.Internal.Utilities; 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 Utilities = Microsoft.Build.Internal.Utilities; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Definition/ProjectCollection.cs b/src/XMakeBuildEngine/Definition/ProjectCollection.cs index 8cedd54fcd5..19b1d283077 100644 --- a/src/XMakeBuildEngine/Definition/ProjectCollection.cs +++ b/src/XMakeBuildEngine/Definition/ProjectCollection.cs @@ -5,33 +5,27 @@ // A collection of loaded projects. //----------------------------------------------------------------------- +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.Shared; using System; using System.Collections; using System.Collections.Generic; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; -using System.IO; using System.Linq; -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.Shared; -using Microsoft.Build.Internal; - -using Constants = Microsoft.Build.Internal.Constants; using ForwardingLoggerRecord = Microsoft.Build.Logging.ForwardingLoggerRecord; using ILoggingService = Microsoft.Build.BackEnd.Logging.ILoggingService; using InternalLoggerException = Microsoft.Build.Exceptions.InternalLoggerException; using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using LoggerMode = Microsoft.Build.BackEnd.Logging.LoggerMode; using ObjectModel = System.Collections.ObjectModel; -using ReservedPropertyNames = Microsoft.Build.Internal.ReservedPropertyNames; using Utilities = Microsoft.Build.Internal.Utilities; namespace Microsoft.Build.Evaluation diff --git a/src/XMakeBuildEngine/Definition/ProjectCollectionChangedEventArgs.cs b/src/XMakeBuildEngine/Definition/ProjectCollectionChangedEventArgs.cs index ba29f17c966..eef0291697f 100644 --- a/src/XMakeBuildEngine/Definition/ProjectCollectionChangedEventArgs.cs +++ b/src/XMakeBuildEngine/Definition/ProjectCollectionChangedEventArgs.cs @@ -6,9 +6,6 @@ //----------------------------------------------------------------------- using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Definition/ProjectItem.cs b/src/XMakeBuildEngine/Definition/ProjectItem.cs index f7da55e181a..79604ea664f 100644 --- a/src/XMakeBuildEngine/Definition/ProjectItem.cs +++ b/src/XMakeBuildEngine/Definition/ProjectItem.cs @@ -5,14 +5,12 @@ // Represents an evaluated item with a link to its source in the project file. //----------------------------------------------------------------------- -using System.Diagnostics; using Microsoft.Build.Collections; using Microsoft.Build.Construction; -using Microsoft.Build.Execution; using Microsoft.Build.Shared; -using System.Collections.Generic; using System; -using System.Collections; +using System.Collections.Generic; +using System.Diagnostics; using System.Diagnostics.CodeAnalysis; namespace Microsoft.Build.Evaluation diff --git a/src/XMakeBuildEngine/Definition/ProjectItemDefinition.cs b/src/XMakeBuildEngine/Definition/ProjectItemDefinition.cs index 5ba39335f05..66704bcf87b 100644 --- a/src/XMakeBuildEngine/Definition/ProjectItemDefinition.cs +++ b/src/XMakeBuildEngine/Definition/ProjectItemDefinition.cs @@ -5,14 +5,13 @@ // Represents a set of evaluated item definitions all applying to the same item-type. //----------------------------------------------------------------------- -using System.Diagnostics; -using System.Diagnostics.CodeAnalysis; using Microsoft.Build.Collections; using Microsoft.Build.Construction; -using Microsoft.Build.Execution; using Microsoft.Build.Shared; -using System.Collections.Generic; using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Diagnostics.CodeAnalysis; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Definition/ProjectMetadata.cs b/src/XMakeBuildEngine/Definition/ProjectMetadata.cs index 154e5015b01..8b1300391a4 100644 --- a/src/XMakeBuildEngine/Definition/ProjectMetadata.cs +++ b/src/XMakeBuildEngine/Definition/ProjectMetadata.cs @@ -5,12 +5,11 @@ // Wraps a logical metadatum on an item. //----------------------------------------------------------------------- -using System; -using System.Diagnostics; -using Microsoft.Build.Construction; -using Microsoft.Build.Execution; using Microsoft.Build.Collections; +using Microsoft.Build.Construction; using Microsoft.Build.Shared; +using System; +using System.Diagnostics; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Definition/ProjectProperty.cs b/src/XMakeBuildEngine/Definition/ProjectProperty.cs index 70bd6f746c1..e156124f680 100644 --- a/src/XMakeBuildEngine/Definition/ProjectProperty.cs +++ b/src/XMakeBuildEngine/Definition/ProjectProperty.cs @@ -5,13 +5,11 @@ // Wraps a logical property on an item. //----------------------------------------------------------------------- -using System; -using System.Diagnostics; using Microsoft.Build.Collections; using Microsoft.Build.Construction; -using Microsoft.Build.Execution; using Microsoft.Build.Shared; - +using System; +using System.Diagnostics; using ReservedPropertyNames = Microsoft.Build.Internal.ReservedPropertyNames; namespace Microsoft.Build.Evaluation diff --git a/src/XMakeBuildEngine/Definition/ResolvedImport.cs b/src/XMakeBuildEngine/Definition/ResolvedImport.cs index 2da297f82e3..30fb79baff8 100644 --- a/src/XMakeBuildEngine/Definition/ResolvedImport.cs +++ b/src/XMakeBuildEngine/Definition/ResolvedImport.cs @@ -5,9 +5,9 @@ // A hack (leaking into public API) to prevent a certain case of Jitting in our NGen'd assemblies. //----------------------------------------------------------------------- -using System.Diagnostics.CodeAnalysis; using Microsoft.Build.Construction; using Microsoft.Build.Shared; +using System.Diagnostics.CodeAnalysis; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Definition/SubToolset.cs b/src/XMakeBuildEngine/Definition/SubToolset.cs index 31bd9339187..dbd7b0d2d0b 100644 --- a/src/XMakeBuildEngine/Definition/SubToolset.cs +++ b/src/XMakeBuildEngine/Definition/SubToolset.cs @@ -5,15 +5,12 @@ // An object containing properties of a sub-toolset. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Diagnostics; - using Microsoft.Build.BackEnd; using Microsoft.Build.Collections; using Microsoft.Build.Execution; using Microsoft.Build.Shared; - +using System.Collections.Generic; +using System.Diagnostics; using ObjectModel = System.Collections.ObjectModel; namespace Microsoft.Build.Evaluation diff --git a/src/XMakeBuildEngine/Definition/Toolset.cs b/src/XMakeBuildEngine/Definition/Toolset.cs index 97e79a7d785..bf4d78d3a95 100644 --- a/src/XMakeBuildEngine/Definition/Toolset.cs +++ b/src/XMakeBuildEngine/Definition/Toolset.cs @@ -5,13 +5,6 @@ // An object containing properties of a toolset. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Diagnostics.CodeAnalysis; -using System.IO; -using System.Xml; -using System.Linq; using Microsoft.Build.BackEnd; using Microsoft.Build.Collections; using Microsoft.Build.Construction; @@ -20,6 +13,13 @@ using Microsoft.Build.Internal; using Microsoft.Build.Shared; using Microsoft.Win32; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Diagnostics.CodeAnalysis; +using System.IO; +using System.Linq; +using System.Xml; using ILoggingService = Microsoft.Build.BackEnd.Logging.ILoggingService; using ObjectModel = System.Collections.ObjectModel; using ReservedPropertyNames = Microsoft.Build.Internal.ReservedPropertyNames; diff --git a/src/XMakeBuildEngine/Definition/ToolsetConfigurationReader.cs b/src/XMakeBuildEngine/Definition/ToolsetConfigurationReader.cs index 89975c06078..dd5b48ecbb6 100644 --- a/src/XMakeBuildEngine/Definition/ToolsetConfigurationReader.cs +++ b/src/XMakeBuildEngine/Definition/ToolsetConfigurationReader.cs @@ -5,21 +5,13 @@ // A class used to read the Toolset configuration. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Configuration; -using System.IO; -using System.Text; -using System.Globalization; -using System.Reflection; -using Microsoft.Build.Construction; using Microsoft.Build.Collections; +using Microsoft.Build.Construction; using Microsoft.Build.Execution; -using Microsoft.Build.Shared; - +using System.Collections.Generic; +using System.Configuration; using ErrorUtilities = Microsoft.Build.Shared.ErrorUtilities; using InvalidToolsetDefinitionException = Microsoft.Build.Exceptions.InvalidToolsetDefinitionException; -using Microsoft.Build.Internal; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Definition/ToolsetPropertyDefinition.cs b/src/XMakeBuildEngine/Definition/ToolsetPropertyDefinition.cs index e3ace3d9981..2be1b1836ed 100644 --- a/src/XMakeBuildEngine/Definition/ToolsetPropertyDefinition.cs +++ b/src/XMakeBuildEngine/Definition/ToolsetPropertyDefinition.cs @@ -5,13 +5,9 @@ // A property class used internally by the Toolset readers. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; +using Microsoft.Build.Shared; using System.Diagnostics; -using System.Text; - using ErrorUtilities = Microsoft.Build.Shared.ErrorUtilities; -using Microsoft.Build.Shared; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Definition/ToolsetReader.cs b/src/XMakeBuildEngine/Definition/ToolsetReader.cs index b7920eb041e..5e5899f24cc 100644 --- a/src/XMakeBuildEngine/Definition/ToolsetReader.cs +++ b/src/XMakeBuildEngine/Definition/ToolsetReader.cs @@ -5,22 +5,17 @@ // Abstract base class for objects reading toolsets. //----------------------------------------------------------------------- -using System; -using System.Diagnostics; -using System.IO; -using System.Collections.Generic; - -using Microsoft.Build.Shared; using Microsoft.Build.Collections; using Microsoft.Build.Execution; -using Microsoft.Build.Evaluation; -using Microsoft.Win32; - +using Microsoft.Build.Internal; +using Microsoft.Build.Shared; +using System; +using System.Collections.Generic; +using System.IO; using error = Microsoft.Build.Shared.ErrorUtilities; -using InvalidToolsetDefinitionException = Microsoft.Build.Exceptions.InvalidToolsetDefinitionException; using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; +using InvalidToolsetDefinitionException = Microsoft.Build.Exceptions.InvalidToolsetDefinitionException; using ReservedPropertyNames = Microsoft.Build.Internal.ReservedPropertyNames; -using Microsoft.Build.Internal; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Definition/ToolsetRegistryReader.cs b/src/XMakeBuildEngine/Definition/ToolsetRegistryReader.cs index eeb7e9c27d4..3662ed977fb 100644 --- a/src/XMakeBuildEngine/Definition/ToolsetRegistryReader.cs +++ b/src/XMakeBuildEngine/Definition/ToolsetRegistryReader.cs @@ -5,22 +5,17 @@ // Object which reads toolset information from the registry. //----------------------------------------------------------------------- -using Microsoft.Win32; -using System; -using System.Collections.Generic; -using System.IO; -using System.Security; - -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 System.Collections.Generic; +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; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/ElementLocation/ElementLocation.cs b/src/XMakeBuildEngine/ElementLocation/ElementLocation.cs index 1e1cfb6cd97..97faea861e1 100644 --- a/src/XMakeBuildEngine/ElementLocation/ElementLocation.cs +++ b/src/XMakeBuildEngine/ElementLocation/ElementLocation.cs @@ -5,10 +5,9 @@ // The location of an XML node in a file //----------------------------------------------------------------------- -using Microsoft.Build.Shared; -using Microsoft.Build.Framework; using Microsoft.Build.BackEnd; using Microsoft.Build.Collections; +using Microsoft.Build.Shared; using System; using System.Diagnostics; diff --git a/src/XMakeBuildEngine/ElementLocation/RegistryLocation.cs b/src/XMakeBuildEngine/ElementLocation/RegistryLocation.cs index e8a00138a9e..b764bbd38b1 100644 --- a/src/XMakeBuildEngine/ElementLocation/RegistryLocation.cs +++ b/src/XMakeBuildEngine/ElementLocation/RegistryLocation.cs @@ -5,9 +5,8 @@ // The location something in the registry //----------------------------------------------------------------------- -using Microsoft.Build.Shared; -using Microsoft.Build.Framework; using Microsoft.Build.BackEnd; +using Microsoft.Build.Shared; using System; namespace Microsoft.Build.Construction diff --git a/src/XMakeBuildEngine/ElementLocation/XmlAttributeWithLocation.cs b/src/XMakeBuildEngine/ElementLocation/XmlAttributeWithLocation.cs index 7e1118bc69e..2bfab669bd7 100644 --- a/src/XMakeBuildEngine/ElementLocation/XmlAttributeWithLocation.cs +++ b/src/XMakeBuildEngine/ElementLocation/XmlAttributeWithLocation.cs @@ -5,10 +5,9 @@ // Improvement to XmlAttribute that during load attaches location information to itself. //----------------------------------------------------------------------- -using Microsoft.Build.Shared; using System; -using System.Xml; using System.Diagnostics; +using System.Xml; namespace Microsoft.Build.Construction { diff --git a/src/XMakeBuildEngine/ElementLocation/XmlDocumentWithLocation.cs b/src/XMakeBuildEngine/ElementLocation/XmlDocumentWithLocation.cs index 761b7f02075..ae16865867d 100644 --- a/src/XMakeBuildEngine/ElementLocation/XmlDocumentWithLocation.cs +++ b/src/XMakeBuildEngine/ElementLocation/XmlDocumentWithLocation.cs @@ -5,11 +5,10 @@ // Improvement to XmlDocument that during load attaches location information to all elements and attributes. //----------------------------------------------------------------------- +using Microsoft.Build.Shared; using System; using System.IO; using System.Xml; -using Microsoft.Build.Internal; -using Microsoft.Build.Shared; namespace Microsoft.Build.Construction { diff --git a/src/XMakeBuildEngine/ElementLocation/XmlElementWithLocation.cs b/src/XMakeBuildEngine/ElementLocation/XmlElementWithLocation.cs index 59b3feb9286..1265691e9d3 100644 --- a/src/XMakeBuildEngine/ElementLocation/XmlElementWithLocation.cs +++ b/src/XMakeBuildEngine/ElementLocation/XmlElementWithLocation.cs @@ -5,10 +5,9 @@ // Improvement to XmlElement that during load attaches location information to itself. //----------------------------------------------------------------------- -using Microsoft.Build.Shared; using System; -using System.Xml; using System.Diagnostics; +using System.Xml; namespace Microsoft.Build.Construction { diff --git a/src/XMakeBuildEngine/ElementLocation/XmlNameTableThreadSafe.cs b/src/XMakeBuildEngine/ElementLocation/XmlNameTableThreadSafe.cs index 5ef959e3081..246fae87da1 100644 --- a/src/XMakeBuildEngine/ElementLocation/XmlNameTableThreadSafe.cs +++ b/src/XMakeBuildEngine/ElementLocation/XmlNameTableThreadSafe.cs @@ -5,11 +5,8 @@ // XmlNameTable that is thread safe for concurrent users. //----------------------------------------------------------------------- -using Microsoft.Build.Shared; using System; using System.Xml; -using System.Diagnostics; -using System.Threading; namespace Microsoft.Build.Construction { diff --git a/src/XMakeBuildEngine/Errors/InternalLoggerException.cs b/src/XMakeBuildEngine/Errors/InternalLoggerException.cs index fc707fc69da..f7ba47891f4 100644 --- a/src/XMakeBuildEngine/Errors/InternalLoggerException.cs +++ b/src/XMakeBuildEngine/Errors/InternalLoggerException.cs @@ -1,13 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using System; using System.Runtime.Serialization; using System.Security.Permissions; -using Microsoft.Build.Shared; -using Microsoft.Build.Framework; - namespace Microsoft.Build.Exceptions { /// diff --git a/src/XMakeBuildEngine/Errors/InvalidProjectFileException.cs b/src/XMakeBuildEngine/Errors/InvalidProjectFileException.cs index ca816e8ddc8..61b59449512 100644 --- a/src/XMakeBuildEngine/Errors/InvalidProjectFileException.cs +++ b/src/XMakeBuildEngine/Errors/InvalidProjectFileException.cs @@ -1,15 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Shared; using System; -using System.IO; -using System.Xml; using System.Runtime.Serialization; using System.Security.Permissions; -using Microsoft.Build.Shared; -using Microsoft.Build.Evaluation; - namespace Microsoft.Build.Exceptions { /// diff --git a/src/XMakeBuildEngine/Errors/InvalidToolsetDefinitionException.cs b/src/XMakeBuildEngine/Errors/InvalidToolsetDefinitionException.cs index 14b4014a73e..12aa604e886 100644 --- a/src/XMakeBuildEngine/Errors/InvalidToolsetDefinitionException.cs +++ b/src/XMakeBuildEngine/Errors/InvalidToolsetDefinitionException.cs @@ -1,10 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Globalization; - using Microsoft.Build.Shared; +using System; using System.Runtime.Serialization; using System.Security.Permissions; diff --git a/src/XMakeBuildEngine/Errors/RegistryException.cs b/src/XMakeBuildEngine/Errors/RegistryException.cs index c792b526c6a..d2873943644 100644 --- a/src/XMakeBuildEngine/Errors/RegistryException.cs +++ b/src/XMakeBuildEngine/Errors/RegistryException.cs @@ -2,10 +2,8 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Globalization; using System.Runtime.Serialization; -using Microsoft.Build.Shared; namespace Microsoft.Build.Exceptions { diff --git a/src/XMakeBuildEngine/Evaluation/ConditionEvaluator.cs b/src/XMakeBuildEngine/Evaluation/ConditionEvaluator.cs index 950366f756d..4768438eecd 100644 --- a/src/XMakeBuildEngine/Evaluation/ConditionEvaluator.cs +++ b/src/XMakeBuildEngine/Evaluation/ConditionEvaluator.cs @@ -4,19 +4,15 @@ using System; using System.Collections; using System.Collections.Generic; -using System.Collections.Specialized; -using System.Text; using System.Text.RegularExpressions; -using Microsoft.Build.Evaluation; namespace Microsoft.Build.Evaluation { - using ILoggingService = Microsoft.Build.BackEnd.Logging.ILoggingService; + using Microsoft.Build.Shared; using BuildEventContext = Microsoft.Build.Framework.BuildEventContext; - using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; using ElementLocation = Microsoft.Build.Construction.ElementLocation; - using Microsoft.Build.Execution; - using Microsoft.Build.Shared; + using ILoggingService = Microsoft.Build.BackEnd.Logging.ILoggingService; + using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; internal static class ConditionEvaluator { diff --git a/src/XMakeBuildEngine/Evaluation/Conditionals/AndExpressionNode.cs b/src/XMakeBuildEngine/Evaluation/Conditionals/AndExpressionNode.cs index 89edd84c56a..3d5df1752de 100644 --- a/src/XMakeBuildEngine/Evaluation/Conditionals/AndExpressionNode.cs +++ b/src/XMakeBuildEngine/Evaluation/Conditionals/AndExpressionNode.cs @@ -1,10 +1,6 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Collections; -using System.Globalization; -using System.IO; -using System; using Microsoft.Build.Shared; diff --git a/src/XMakeBuildEngine/Evaluation/Conditionals/CharacterUtilities.cs b/src/XMakeBuildEngine/Evaluation/Conditionals/CharacterUtilities.cs index 8e44cb99184..4aac8aa4e20 100644 --- a/src/XMakeBuildEngine/Evaluation/Conditionals/CharacterUtilities.cs +++ b/src/XMakeBuildEngine/Evaluation/Conditionals/CharacterUtilities.cs @@ -1,8 +1,6 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Text; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Evaluation/Conditionals/EqualExpressionNode.cs b/src/XMakeBuildEngine/Evaluation/Conditionals/EqualExpressionNode.cs index 4317057d27b..28d34f217d4 100644 --- a/src/XMakeBuildEngine/Evaluation/Conditionals/EqualExpressionNode.cs +++ b/src/XMakeBuildEngine/Evaluation/Conditionals/EqualExpressionNode.cs @@ -1,12 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Collections; -using System.Globalization; -using System.IO; using System; -using Microsoft.Build.Shared; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Evaluation/Conditionals/FunctionCallExpressionNode.cs b/src/XMakeBuildEngine/Evaluation/Conditionals/FunctionCallExpressionNode.cs index 4cb6c1aa078..65a1e1a3d6d 100644 --- a/src/XMakeBuildEngine/Evaluation/Conditionals/FunctionCallExpressionNode.cs +++ b/src/XMakeBuildEngine/Evaluation/Conditionals/FunctionCallExpressionNode.cs @@ -1,17 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Shared; +using System; using System.Collections; using System.Collections.Generic; -using System.Globalization; using System.IO; -using System; -using System.Text; - -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.Build.Execution; -using Microsoft.Build.Evaluation; using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; namespace Microsoft.Build.Evaluation diff --git a/src/XMakeBuildEngine/Evaluation/Conditionals/GenericExpressionNode.cs b/src/XMakeBuildEngine/Evaluation/Conditionals/GenericExpressionNode.cs index 359261a8d54..b01bf9a4113 100644 --- a/src/XMakeBuildEngine/Evaluation/Conditionals/GenericExpressionNode.cs +++ b/src/XMakeBuildEngine/Evaluation/Conditionals/GenericExpressionNode.cs @@ -1,12 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Collections; -using System.Globalization; -using System.IO; -using System; - using Microsoft.Build.Shared; +using System; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Evaluation/Conditionals/GreaterThanExpressionNode.cs b/src/XMakeBuildEngine/Evaluation/Conditionals/GreaterThanExpressionNode.cs index 00e12fe24f2..17142d953f3 100644 --- a/src/XMakeBuildEngine/Evaluation/Conditionals/GreaterThanExpressionNode.cs +++ b/src/XMakeBuildEngine/Evaluation/Conditionals/GreaterThanExpressionNode.cs @@ -1,12 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Collections; -using System.Globalization; -using System.IO; using System; -using Microsoft.Build.Shared; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Evaluation/Conditionals/GreaterThanOrEqualExpressionNode.cs b/src/XMakeBuildEngine/Evaluation/Conditionals/GreaterThanOrEqualExpressionNode.cs index 7d446be1a60..caee40fd807 100644 --- a/src/XMakeBuildEngine/Evaluation/Conditionals/GreaterThanOrEqualExpressionNode.cs +++ b/src/XMakeBuildEngine/Evaluation/Conditionals/GreaterThanOrEqualExpressionNode.cs @@ -1,12 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Collections; -using System.Globalization; -using System.IO; using System; -using Microsoft.Build.Shared; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Evaluation/Conditionals/IItem.cs b/src/XMakeBuildEngine/Evaluation/Conditionals/IItem.cs index 5f7500336d1..c06912759e7 100644 --- a/src/XMakeBuildEngine/Evaluation/Conditionals/IItem.cs +++ b/src/XMakeBuildEngine/Evaluation/Conditionals/IItem.cs @@ -5,10 +5,6 @@ // Interface representing an item without exposing its type. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Text; -using Microsoft.Build.Collections; using Microsoft.Build.Construction; namespace Microsoft.Build.Evaluation diff --git a/src/XMakeBuildEngine/Evaluation/Conditionals/LessThanExpressionNode.cs b/src/XMakeBuildEngine/Evaluation/Conditionals/LessThanExpressionNode.cs index 1e6d11e37a9..1a90a916b74 100644 --- a/src/XMakeBuildEngine/Evaluation/Conditionals/LessThanExpressionNode.cs +++ b/src/XMakeBuildEngine/Evaluation/Conditionals/LessThanExpressionNode.cs @@ -1,12 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Collections; -using System.Globalization; -using System.IO; using System; -using Microsoft.Build.Shared; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Evaluation/Conditionals/LessThanOrEqualExpressionNode.cs b/src/XMakeBuildEngine/Evaluation/Conditionals/LessThanOrEqualExpressionNode.cs index 4c1b623e229..840df8e4230 100644 --- a/src/XMakeBuildEngine/Evaluation/Conditionals/LessThanOrEqualExpressionNode.cs +++ b/src/XMakeBuildEngine/Evaluation/Conditionals/LessThanOrEqualExpressionNode.cs @@ -1,12 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Collections; -using System.Globalization; -using System.IO; using System; -using Microsoft.Build.Shared; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Evaluation/Conditionals/MultipleComparisonExpressionNode.cs b/src/XMakeBuildEngine/Evaluation/Conditionals/MultipleComparisonExpressionNode.cs index 0f4d3c0aa4a..e086a03653a 100644 --- a/src/XMakeBuildEngine/Evaluation/Conditionals/MultipleComparisonExpressionNode.cs +++ b/src/XMakeBuildEngine/Evaluation/Conditionals/MultipleComparisonExpressionNode.cs @@ -1,10 +1,6 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Collections; -using System.Globalization; -using System.IO; -using System; using Microsoft.Build.Shared; diff --git a/src/XMakeBuildEngine/Evaluation/Conditionals/NotEqualExpressionNode.cs b/src/XMakeBuildEngine/Evaluation/Conditionals/NotEqualExpressionNode.cs index 7277a89a3f4..6cf2a2a27f4 100644 --- a/src/XMakeBuildEngine/Evaluation/Conditionals/NotEqualExpressionNode.cs +++ b/src/XMakeBuildEngine/Evaluation/Conditionals/NotEqualExpressionNode.cs @@ -1,12 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Collections; -using System.Globalization; -using System.IO; using System; -using Microsoft.Build.Shared; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Evaluation/Conditionals/NotExpressionNode.cs b/src/XMakeBuildEngine/Evaluation/Conditionals/NotExpressionNode.cs index 5f5b328101e..82bc6f34a5f 100644 --- a/src/XMakeBuildEngine/Evaluation/Conditionals/NotExpressionNode.cs +++ b/src/XMakeBuildEngine/Evaluation/Conditionals/NotExpressionNode.cs @@ -1,12 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Collections; -using System.Globalization; -using System.IO; -using System; -using Microsoft.Build.Shared; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Evaluation/Conditionals/NumericComparisonExpressionNode.cs b/src/XMakeBuildEngine/Evaluation/Conditionals/NumericComparisonExpressionNode.cs index 33bcefd2607..f6a7c371457 100644 --- a/src/XMakeBuildEngine/Evaluation/Conditionals/NumericComparisonExpressionNode.cs +++ b/src/XMakeBuildEngine/Evaluation/Conditionals/NumericComparisonExpressionNode.cs @@ -1,12 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Collections; -using System.Globalization; -using System.IO; -using System; - using Microsoft.Build.Shared; +using System; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Evaluation/Conditionals/NumericExpressionNode.cs b/src/XMakeBuildEngine/Evaluation/Conditionals/NumericExpressionNode.cs index fc14beb9d19..da564be937c 100644 --- a/src/XMakeBuildEngine/Evaluation/Conditionals/NumericExpressionNode.cs +++ b/src/XMakeBuildEngine/Evaluation/Conditionals/NumericExpressionNode.cs @@ -1,12 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Collections; -using System.Globalization; -using System.IO; -using System; - using Microsoft.Build.Shared; +using System; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Evaluation/Conditionals/OperandExpressionNode.cs b/src/XMakeBuildEngine/Evaluation/Conditionals/OperandExpressionNode.cs index f7b42422605..50940378095 100644 --- a/src/XMakeBuildEngine/Evaluation/Conditionals/OperandExpressionNode.cs +++ b/src/XMakeBuildEngine/Evaluation/Conditionals/OperandExpressionNode.cs @@ -1,12 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Collections; -using System.Globalization; -using System.IO; -using System; -using Microsoft.Build.Shared; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Evaluation/Conditionals/OperatorExpressionNode.cs b/src/XMakeBuildEngine/Evaluation/Conditionals/OperatorExpressionNode.cs index 77cc0a05d84..d7cf43490d1 100644 --- a/src/XMakeBuildEngine/Evaluation/Conditionals/OperatorExpressionNode.cs +++ b/src/XMakeBuildEngine/Evaluation/Conditionals/OperatorExpressionNode.cs @@ -1,12 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Collections; -using System.Globalization; -using System.IO; -using System; - using Microsoft.Build.Shared; +using System; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Evaluation/Conditionals/OrExpressionNode.cs b/src/XMakeBuildEngine/Evaluation/Conditionals/OrExpressionNode.cs index ff18a5e1965..d802ee61792 100644 --- a/src/XMakeBuildEngine/Evaluation/Conditionals/OrExpressionNode.cs +++ b/src/XMakeBuildEngine/Evaluation/Conditionals/OrExpressionNode.cs @@ -1,10 +1,6 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Collections; -using System.Globalization; -using System.IO; -using System; using Microsoft.Build.Shared; diff --git a/src/XMakeBuildEngine/Evaluation/Conditionals/Parser.cs b/src/XMakeBuildEngine/Evaluation/Conditionals/Parser.cs index 502d832621b..aec9630b686 100644 --- a/src/XMakeBuildEngine/Evaluation/Conditionals/Parser.cs +++ b/src/XMakeBuildEngine/Evaluation/Conditionals/Parser.cs @@ -1,14 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Globalization; -using System.Collections; -using System.Xml; -using System; +using Microsoft.Build.Framework; using Microsoft.Build.Shared; +using System; +using System.Collections; using ElementLocation = Microsoft.Build.Construction.ElementLocation; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Framework; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Evaluation/Conditionals/Scanner.cs b/src/XMakeBuildEngine/Evaluation/Conditionals/Scanner.cs index 8f5a8c48381..7edc27022df 100644 --- a/src/XMakeBuildEngine/Evaluation/Conditionals/Scanner.cs +++ b/src/XMakeBuildEngine/Evaluation/Conditionals/Scanner.cs @@ -1,11 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Globalization; +using Microsoft.Build.Shared; using System; using System.Diagnostics; - -using Microsoft.Build.Shared; +using System.Globalization; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Evaluation/Conditionals/StringExpressionNode.cs b/src/XMakeBuildEngine/Evaluation/Conditionals/StringExpressionNode.cs index 7d9f832d041..0353f909f80 100644 --- a/src/XMakeBuildEngine/Evaluation/Conditionals/StringExpressionNode.cs +++ b/src/XMakeBuildEngine/Evaluation/Conditionals/StringExpressionNode.cs @@ -1,12 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Collections; -using System.Globalization; -using System.IO; -using System; - using Microsoft.Build.Shared; +using System; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Evaluation/Evaluator.cs b/src/XMakeBuildEngine/Evaluation/Evaluator.cs index 9908d978c67..284359f3d30 100644 --- a/src/XMakeBuildEngine/Evaluation/Evaluator.cs +++ b/src/XMakeBuildEngine/Evaluation/Evaluator.cs @@ -11,10 +11,8 @@ using System.Diagnostics; using System.IO; using System.Linq; -using System.Xml; using Microsoft.Build.Construction; using Microsoft.Build.Debugging; -using Microsoft.Build.Evaluation; using Microsoft.Build.Shared; using Microsoft.Build.Execution; using ObjectModel = System.Collections.ObjectModel; @@ -26,7 +24,6 @@ #endif using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; -using InvalidToolsetDefinitionException = Microsoft.Build.Exceptions.InvalidToolsetDefinitionException; using ReservedPropertyNames = Microsoft.Build.Internal.ReservedPropertyNames; using Constants = Microsoft.Build.Internal.Constants; using EngineFileUtilities = Microsoft.Build.Internal.EngineFileUtilities; @@ -35,7 +32,6 @@ #if (!STANDALONEBUILD) using Microsoft.Internal.Performance; #endif -using Microsoft.Build.Internal; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Evaluation/EvaluatorMetadataTable.cs b/src/XMakeBuildEngine/Evaluation/EvaluatorMetadataTable.cs index 3562c8c2406..e2358d9f47f 100644 --- a/src/XMakeBuildEngine/Evaluation/EvaluatorMetadataTable.cs +++ b/src/XMakeBuildEngine/Evaluation/EvaluatorMetadataTable.cs @@ -5,12 +5,10 @@ // Represents a set of metadata for the evaluator. //----------------------------------------------------------------------- +using Microsoft.Build.Collections; +using Microsoft.Build.Construction; using System; using System.Collections.Generic; -using System.Text; -using Microsoft.Build.Construction; -using Microsoft.Build.Collections; - using EscapingUtilities = Microsoft.Build.Shared.EscapingUtilities; namespace Microsoft.Build.Evaluation diff --git a/src/XMakeBuildEngine/Evaluation/Expander.cs b/src/XMakeBuildEngine/Evaluation/Expander.cs index c498366fcf4..5b17b12ae5c 100644 --- a/src/XMakeBuildEngine/Evaluation/Expander.cs +++ b/src/XMakeBuildEngine/Evaluation/Expander.cs @@ -5,25 +5,24 @@ // Expands item/property/metadata in expressions. //----------------------------------------------------------------------- +using Microsoft.Build.Collections; +using Microsoft.Build.Execution; +using Microsoft.Build.Shared; +using Microsoft.Win32; using System; using System.Collections; +using System.Collections.Concurrent; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using System.Globalization; using System.IO; +using System.Linq; using System.Reflection; -using System.Text; using System.Text.RegularExpressions; -using System.Linq; -using Microsoft.Build.Execution; -using Microsoft.Build.Shared; -using Microsoft.Win32; using AvailableStaticMethods = Microsoft.Build.Internal.AvailableStaticMethods; using ReservedPropertyNames = Microsoft.Build.Internal.ReservedPropertyNames; -using Microsoft.Build.Collections; using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; using TaskItemFactory = Microsoft.Build.Execution.ProjectItemInstance.TaskItem.TaskItemFactory; -using System.Collections.Concurrent; -using System.Diagnostics.CodeAnalysis; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Evaluation/ExpressionShredder.cs b/src/XMakeBuildEngine/Evaluation/ExpressionShredder.cs index 14bae367684..77fecbdd2c6 100644 --- a/src/XMakeBuildEngine/Evaluation/ExpressionShredder.cs +++ b/src/XMakeBuildEngine/Evaluation/ExpressionShredder.cs @@ -5,15 +5,10 @@ // Implementation a class which splits expressions to MSBuild rules. //----------------------------------------------------------------------- -using System; -using System.Collections; -using System.Security.Permissions; -using System.Diagnostics; - -using Microsoft.Build.Framework; +using Microsoft.Build.Collections; using Microsoft.Build.Shared; +using System; using System.Collections.Generic; -using Microsoft.Build.Collections; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Evaluation/IEvaluatorData.cs b/src/XMakeBuildEngine/Evaluation/IEvaluatorData.cs index 8bafc5848aa..9ec3ca47a71 100644 --- a/src/XMakeBuildEngine/Evaluation/IEvaluatorData.cs +++ b/src/XMakeBuildEngine/Evaluation/IEvaluatorData.cs @@ -5,14 +5,12 @@ // An interface for objects which can have project xml evaluated into them. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Text; +using Microsoft.Build.BackEnd; +using Microsoft.Build.Collections; using Microsoft.Build.Construction; -using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; -using Microsoft.Build.Collections; -using Microsoft.Build.BackEnd; +using System; +using System.Collections.Generic; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Evaluation/IItem.cs b/src/XMakeBuildEngine/Evaluation/IItem.cs index f277e98e62d..2d080fba6f0 100644 --- a/src/XMakeBuildEngine/Evaluation/IItem.cs +++ b/src/XMakeBuildEngine/Evaluation/IItem.cs @@ -5,11 +5,7 @@ // Interface representing an item without exposing its type. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Text; using Microsoft.Build.Collections; -using Microsoft.Build.Construction; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Evaluation/IItemDefinition.cs b/src/XMakeBuildEngine/Evaluation/IItemDefinition.cs index e495cfdb407..94c48690bb8 100644 --- a/src/XMakeBuildEngine/Evaluation/IItemDefinition.cs +++ b/src/XMakeBuildEngine/Evaluation/IItemDefinition.cs @@ -5,9 +5,6 @@ // Interface representing item definition objects for use by the Evaulator. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Text; using Microsoft.Build.Construction; namespace Microsoft.Build.Evaluation diff --git a/src/XMakeBuildEngine/Evaluation/IItemFactory.cs b/src/XMakeBuildEngine/Evaluation/IItemFactory.cs index 17b32071b7a..ca425bb6890 100644 --- a/src/XMakeBuildEngine/Evaluation/IItemFactory.cs +++ b/src/XMakeBuildEngine/Evaluation/IItemFactory.cs @@ -5,11 +5,9 @@ // Interface for an object which can create items for the Expander //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Text; using Microsoft.Build.Construction; using Microsoft.Build.Shared; +using System.Collections.Generic; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Evaluation/IItemProvider.cs b/src/XMakeBuildEngine/Evaluation/IItemProvider.cs index 9d6a500ac7b..703442e6b2f 100644 --- a/src/XMakeBuildEngine/Evaluation/IItemProvider.cs +++ b/src/XMakeBuildEngine/Evaluation/IItemProvider.cs @@ -5,10 +5,7 @@ // Interface for an item provider which can be used with the Expander //----------------------------------------------------------------------- -using System; using System.Collections.Generic; -using System.Text; -using Microsoft.Build.Shared; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Evaluation/IMetadataTable.cs b/src/XMakeBuildEngine/Evaluation/IMetadataTable.cs index 70964320bf9..28ef33cf639 100644 --- a/src/XMakeBuildEngine/Evaluation/IMetadataTable.cs +++ b/src/XMakeBuildEngine/Evaluation/IMetadataTable.cs @@ -5,11 +5,6 @@ // Interface for a table of metadata. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Text; -using Microsoft.Build.Collections; -using Microsoft.Build.Shared; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Evaluation/IMetadatum.cs b/src/XMakeBuildEngine/Evaluation/IMetadatum.cs index 4449818587f..01d682e1e6e 100644 --- a/src/XMakeBuildEngine/Evaluation/IMetadatum.cs +++ b/src/XMakeBuildEngine/Evaluation/IMetadatum.cs @@ -5,11 +5,6 @@ // Interface representing a piece of metadata. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Text; -using Microsoft.Build.Collections; -using Microsoft.Build.Construction; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Evaluation/IProperty.cs b/src/XMakeBuildEngine/Evaluation/IProperty.cs index b00a4cf07f8..88c5856a80a 100644 --- a/src/XMakeBuildEngine/Evaluation/IProperty.cs +++ b/src/XMakeBuildEngine/Evaluation/IProperty.cs @@ -5,9 +5,6 @@ // Interface for properties //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Text; using Microsoft.Build.Collections; namespace Microsoft.Build.Evaluation diff --git a/src/XMakeBuildEngine/Evaluation/IPropertyProvider.cs b/src/XMakeBuildEngine/Evaluation/IPropertyProvider.cs index d5e2aadde16..726a825b9c5 100644 --- a/src/XMakeBuildEngine/Evaluation/IPropertyProvider.cs +++ b/src/XMakeBuildEngine/Evaluation/IPropertyProvider.cs @@ -5,9 +5,6 @@ // Generic Interface for a property provider usable with the expander //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Text; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Evaluation/IToolsetProvider.cs b/src/XMakeBuildEngine/Evaluation/IToolsetProvider.cs index a11a71bef06..d4e06dc0127 100644 --- a/src/XMakeBuildEngine/Evaluation/IToolsetProvider.cs +++ b/src/XMakeBuildEngine/Evaluation/IToolsetProvider.cs @@ -5,10 +5,7 @@ // Interface for classes providing access to toolsets. //----------------------------------------------------------------------- -using System; using System.Collections.Generic; -using System.Linq; -using System.Text; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Evaluation/IntrinsicFunctions.cs b/src/XMakeBuildEngine/Evaluation/IntrinsicFunctions.cs index 4f14f002df6..fc267faa17a 100644 --- a/src/XMakeBuildEngine/Evaluation/IntrinsicFunctions.cs +++ b/src/XMakeBuildEngine/Evaluation/IntrinsicFunctions.cs @@ -5,19 +5,12 @@ // Definition of functions which can be accessed from MSBuild files. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Text; -using System.IO; -using System.Reflection; - -using Microsoft.Build.Collections; -using Microsoft.Build.Execution; using Microsoft.Build.Internal; using Microsoft.Build.Shared; -using System.Collections.Concurrent; using Microsoft.Win32; - +using System; +using System.Collections.Generic; +using System.IO; // Needed for DoesTaskHostExistForParameters using NodeProviderOutOfProcTaskHost = Microsoft.Build.BackEnd.NodeProviderOutOfProcTaskHost; diff --git a/src/XMakeBuildEngine/Evaluation/ItemsAndMetadataPair.cs b/src/XMakeBuildEngine/Evaluation/ItemsAndMetadataPair.cs index 2803103f1c8..3fdee4111a0 100644 --- a/src/XMakeBuildEngine/Evaluation/ItemsAndMetadataPair.cs +++ b/src/XMakeBuildEngine/Evaluation/ItemsAndMetadataPair.cs @@ -5,11 +5,7 @@ // Implementation a class which splits expressions to MSBuild rules. //----------------------------------------------------------------------- -using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Evaluation/MetadataReference.cs b/src/XMakeBuildEngine/Evaluation/MetadataReference.cs index 7525e6c61ff..36408601862 100644 --- a/src/XMakeBuildEngine/Evaluation/MetadataReference.cs +++ b/src/XMakeBuildEngine/Evaluation/MetadataReference.cs @@ -5,11 +5,6 @@ // This struct represents a reference to a piece of item metadata. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Evaluation/Preprocessor.cs b/src/XMakeBuildEngine/Evaluation/Preprocessor.cs index 998698306cc..e80f23c259b 100644 --- a/src/XMakeBuildEngine/Evaluation/Preprocessor.cs +++ b/src/XMakeBuildEngine/Evaluation/Preprocessor.cs @@ -4,17 +4,11 @@ // Helper to create a "preprocessed" or "logical" view of an evaluated Project. //----------------------------------------------------------------------- +using Microsoft.Build.Construction; +using Microsoft.Build.Shared; 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.Framework; -using Microsoft.Build.Shared; -using Microsoft.Build.Internal; -using Microsoft.Build.Collections; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Evaluation/ProjectChangedEventArgs.cs b/src/XMakeBuildEngine/Evaluation/ProjectChangedEventArgs.cs index 9d5b5a8d932..b55a2d2ca0c 100644 --- a/src/XMakeBuildEngine/Evaluation/ProjectChangedEventArgs.cs +++ b/src/XMakeBuildEngine/Evaluation/ProjectChangedEventArgs.cs @@ -5,11 +5,8 @@ // Definition of ProjectCollectionDirtiedEventArgs class. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using Microsoft.Build.Shared; +using System; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Evaluation/ProjectParser.cs b/src/XMakeBuildEngine/Evaluation/ProjectParser.cs index a8a62e1d023..9f92a21debb 100644 --- a/src/XMakeBuildEngine/Evaluation/ProjectParser.cs +++ b/src/XMakeBuildEngine/Evaluation/ProjectParser.cs @@ -9,7 +9,7 @@ using System; using System.Xml; using System.Collections.Generic; -using System.Globalization; + #if (!STANDALONEBUILD) using Microsoft.Internal.Performance; diff --git a/src/XMakeBuildEngine/Evaluation/ProjectRootElementCache.cs b/src/XMakeBuildEngine/Evaluation/ProjectRootElementCache.cs index ae6e8b4ccaa..48289f0aacc 100644 --- a/src/XMakeBuildEngine/Evaluation/ProjectRootElementCache.cs +++ b/src/XMakeBuildEngine/Evaluation/ProjectRootElementCache.cs @@ -5,21 +5,16 @@ // Holds weak references to ProjectRootElement's for design time sharing purposes. //----------------------------------------------------------------------- +using Microsoft.Build.Collections; +using Microsoft.Build.Construction; +using Microsoft.Build.Shared; using System; using System.Collections.Generic; +using System.Diagnostics; +using System.Globalization; using System.IO; -using System.Linq; -using System.Text; 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.BackEnd; - using OutOfProcNode = Microsoft.Build.Execution.OutOfProcNode; namespace Microsoft.Build.Evaluation diff --git a/src/XMakeBuildEngine/Evaluation/ProjectStringCache.cs b/src/XMakeBuildEngine/Evaluation/ProjectStringCache.cs index 716dfbb16f8..c20b8763399 100644 --- a/src/XMakeBuildEngine/Evaluation/ProjectStringCache.cs +++ b/src/XMakeBuildEngine/Evaluation/ProjectStringCache.cs @@ -12,14 +12,13 @@ // //----------------------------------------------------------------------- +using Microsoft.Build.Collections; +using Microsoft.Build.Evaluation; +using Microsoft.Build.Shared; using System; using System.Collections.Generic; using System.Diagnostics; -using System.Linq; using System.Xml; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Shared; -using Microsoft.Build.Collections; namespace Microsoft.Build.Construction { diff --git a/src/XMakeBuildEngine/Evaluation/ProjectXmlChangedEventArgs.cs b/src/XMakeBuildEngine/Evaluation/ProjectXmlChangedEventArgs.cs index 0176aa334b3..bcd7e82944d 100644 --- a/src/XMakeBuildEngine/Evaluation/ProjectXmlChangedEventArgs.cs +++ b/src/XMakeBuildEngine/Evaluation/ProjectXmlChangedEventArgs.cs @@ -5,10 +5,10 @@ // Definition of ProjectCollectionDirtiedEventArgs class. //----------------------------------------------------------------------- -using System; -using System.Globalization; using Microsoft.Build.Construction; using Microsoft.Build.Shared; +using System; +using System.Globalization; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Evaluation/StringMetadataTable.cs b/src/XMakeBuildEngine/Evaluation/StringMetadataTable.cs index 39c341f95e0..7e2eb8432f4 100644 --- a/src/XMakeBuildEngine/Evaluation/StringMetadataTable.cs +++ b/src/XMakeBuildEngine/Evaluation/StringMetadataTable.cs @@ -7,9 +7,6 @@ using System; using System.Collections.Generic; -using System.Text; -using Microsoft.Build.Collections; -using Microsoft.Build.Shared; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/Evaluation/ToolsetProvider.cs b/src/XMakeBuildEngine/Evaluation/ToolsetProvider.cs index 244ee0c6b9a..8b0554aa154 100644 --- a/src/XMakeBuildEngine/Evaluation/ToolsetProvider.cs +++ b/src/XMakeBuildEngine/Evaluation/ToolsetProvider.cs @@ -5,17 +5,13 @@ // Class which can load and hold toolsets. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - +using Microsoft.Build.BackEnd; using Microsoft.Build.Collections; using Microsoft.Build.Execution; using Microsoft.Build.Shared; -using Microsoft.Build.BackEnd; +using System; +using System.Collections.Generic; -using Constants = Microsoft.Build.Internal.Constants; namespace Microsoft.Build.Evaluation { diff --git a/src/XMakeBuildEngine/FxCopExclusions/Microsoft.Build.Suppressions.cs b/src/XMakeBuildEngine/FxCopExclusions/Microsoft.Build.Suppressions.cs index e56b47796d3..d3914ca7466 100644 --- a/src/XMakeBuildEngine/FxCopExclusions/Microsoft.Build.Suppressions.cs +++ b/src/XMakeBuildEngine/FxCopExclusions/Microsoft.Build.Suppressions.cs @@ -5,7 +5,7 @@ // Add module level suppressions to this file to have them suppressed in the assembly // -using System.Diagnostics.CodeAnalysis; + #if CODE_ANALYSIS [module: SuppressMessage("Microsoft.Design","CA1020:AvoidNamespacesWithFewTypes", Scope="namespace", Target="Microsoft.Build.Debugging", Justification="This deserves its own namespace")] diff --git a/src/XMakeBuildEngine/Instance/HostServices.cs b/src/XMakeBuildEngine/Instance/HostServices.cs index 5830e2380ee..e72bcd016e0 100644 --- a/src/XMakeBuildEngine/Instance/HostServices.cs +++ b/src/XMakeBuildEngine/Instance/HostServices.cs @@ -5,11 +5,10 @@ // Implementation of HostServices that mediates access from the build to the host. //----------------------------------------------------------------------- -using Microsoft.Build.Shared; using Microsoft.Build.Framework; -using System.Collections.Generic; +using Microsoft.Build.Shared; using System; -using System.Collections; +using System.Collections.Generic; using System.Diagnostics; namespace Microsoft.Build.Execution diff --git a/src/XMakeBuildEngine/Instance/ProjectInstance.cs b/src/XMakeBuildEngine/Instance/ProjectInstance.cs index 15f4c3c2d40..d2784f78d85 100644 --- a/src/XMakeBuildEngine/Instance/ProjectInstance.cs +++ b/src/XMakeBuildEngine/Instance/ProjectInstance.cs @@ -5,31 +5,28 @@ // Definition of ProjectInstance class. //----------------------------------------------------------------------- +using Microsoft.Build.BackEnd; +using Microsoft.Build.BackEnd.Logging; +using Microsoft.Build.Collections; +using Microsoft.Build.Construction; +using Microsoft.Build.Evaluation; +using Microsoft.Build.Framework; +using Microsoft.Build.Internal; +using Microsoft.Build.Shared; using System; +using System.Collections; using System.Collections.Generic; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Globalization; -using Microsoft.Build.Collections; -using Microsoft.Build.Evaluation; -using Evaluation = Microsoft.Build.Evaluation; -using ObjectModel = System.Collections.ObjectModel; -using Microsoft.Build.Framework; -using Microsoft.Build.BackEnd; -using Microsoft.Build.Construction; -using Microsoft.Build.Shared; -using Microsoft.Build.BackEnd.Logging; -using Microsoft.Build.Internal; -using Utilities = Microsoft.Build.Internal.Utilities; -using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; -using ForwardingLoggerRecord = Microsoft.Build.Logging.ForwardingLoggerRecord; -using ProjectItemInstanceFactory = Microsoft.Build.Execution.ProjectItemInstance.TaskItem.ProjectItemInstanceFactory; -using Microsoft.Build.Debugging; -using System.Xml; using System.IO; -using System.Collections; -using System.Runtime.CompilerServices; using System.Linq; +using System.Runtime.CompilerServices; +using System.Xml; +using ForwardingLoggerRecord = Microsoft.Build.Logging.ForwardingLoggerRecord; +using ObjectModel = System.Collections.ObjectModel; +using ProjectItemInstanceFactory = Microsoft.Build.Execution.ProjectItemInstance.TaskItem.ProjectItemInstanceFactory; +using Utilities = Microsoft.Build.Internal.Utilities; namespace Microsoft.Build.Execution { diff --git a/src/XMakeBuildEngine/Instance/ProjectItemDefinitionInstance.cs b/src/XMakeBuildEngine/Instance/ProjectItemDefinitionInstance.cs index b1e3554e522..814af7ede4c 100644 --- a/src/XMakeBuildEngine/Instance/ProjectItemDefinitionInstance.cs +++ b/src/XMakeBuildEngine/Instance/ProjectItemDefinitionInstance.cs @@ -5,15 +5,14 @@ // Represents a set of item definitions all applying to the same item-type. //----------------------------------------------------------------------- -using System.Diagnostics; -using System.Diagnostics.CodeAnalysis; using Microsoft.Build.Collections; using Microsoft.Build.Construction; using Microsoft.Build.Evaluation; -using Microsoft.Build.Execution; using Microsoft.Build.Shared; -using System.Collections.Generic; using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Diagnostics.CodeAnalysis; namespace Microsoft.Build.Execution { diff --git a/src/XMakeBuildEngine/Instance/ProjectItemGroupTaskInstance.cs b/src/XMakeBuildEngine/Instance/ProjectItemGroupTaskInstance.cs index fdc4731a5fc..11487ef01f8 100644 --- a/src/XMakeBuildEngine/Instance/ProjectItemGroupTaskInstance.cs +++ b/src/XMakeBuildEngine/Instance/ProjectItemGroupTaskInstance.cs @@ -5,14 +5,11 @@ // Wraps an unevaluated itemgroup under a target. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Diagnostics; using Microsoft.Build.Collections; -using Microsoft.Build.Shared; -using Microsoft.Build.Evaluation; - using Microsoft.Build.Construction; +using Microsoft.Build.Shared; +using System.Collections.Generic; +using System.Diagnostics; namespace Microsoft.Build.Execution { diff --git a/src/XMakeBuildEngine/Instance/ProjectItemGroupTaskItemInstance.cs b/src/XMakeBuildEngine/Instance/ProjectItemGroupTaskItemInstance.cs index b772e1f46f5..7a71555f3e3 100644 --- a/src/XMakeBuildEngine/Instance/ProjectItemGroupTaskItemInstance.cs +++ b/src/XMakeBuildEngine/Instance/ProjectItemGroupTaskItemInstance.cs @@ -5,14 +5,11 @@ // Wraps an unevaluated item under an itemgroup in a target. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Diagnostics; using Microsoft.Build.Collections; -using Microsoft.Build.Shared; -using Microsoft.Build.Evaluation; - using Microsoft.Build.Construction; +using Microsoft.Build.Shared; +using System.Collections.Generic; +using System.Diagnostics; namespace Microsoft.Build.Execution { diff --git a/src/XMakeBuildEngine/Instance/ProjectItemGroupTaskMetadataInstance.cs b/src/XMakeBuildEngine/Instance/ProjectItemGroupTaskMetadataInstance.cs index eef9cd90511..fe1351046cc 100644 --- a/src/XMakeBuildEngine/Instance/ProjectItemGroupTaskMetadataInstance.cs +++ b/src/XMakeBuildEngine/Instance/ProjectItemGroupTaskMetadataInstance.cs @@ -5,14 +5,9 @@ // Wraps an unevaluated metadatum under an item in an itemgroup in a target. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Diagnostics; -using Microsoft.Build.Collections; -using Microsoft.Build.Shared; -using Microsoft.Build.Evaluation; - using Microsoft.Build.Construction; +using Microsoft.Build.Shared; +using System.Diagnostics; namespace Microsoft.Build.Execution { diff --git a/src/XMakeBuildEngine/Instance/ProjectItemInstance.cs b/src/XMakeBuildEngine/Instance/ProjectItemInstance.cs index efd1c5ee5b1..93bc5972276 100644 --- a/src/XMakeBuildEngine/Instance/ProjectItemInstance.cs +++ b/src/XMakeBuildEngine/Instance/ProjectItemInstance.cs @@ -5,6 +5,13 @@ // Wraps an evaluated item. //----------------------------------------------------------------------- +using Microsoft.Build.BackEnd; +using Microsoft.Build.Collections; +using Microsoft.Build.Construction; +using Microsoft.Build.Evaluation; +using Microsoft.Build.Framework; +using Microsoft.Build.Internal; +using Microsoft.Build.Shared; using System; using System.Collections; using System.Collections.Generic; @@ -12,13 +19,6 @@ using System.Diagnostics.CodeAnalysis; using System.Globalization; using System.Linq; -using Microsoft.Build.Collections; -using Microsoft.Build.Shared; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Framework; -using Microsoft.Build.Construction; -using Microsoft.Build.BackEnd; -using Microsoft.Build.Internal; namespace Microsoft.Build.Execution { diff --git a/src/XMakeBuildEngine/Instance/ProjectMetadataInstance.cs b/src/XMakeBuildEngine/Instance/ProjectMetadataInstance.cs index bb1c06567b6..1a88d70c2f8 100644 --- a/src/XMakeBuildEngine/Instance/ProjectMetadataInstance.cs +++ b/src/XMakeBuildEngine/Instance/ProjectMetadataInstance.cs @@ -5,14 +5,12 @@ // Wraps an evaluated piece of metadata for build purposes. //----------------------------------------------------------------------- -using System; -using System.Diagnostics; +using Microsoft.Build.BackEnd; using Microsoft.Build.Collections; -using Microsoft.Build.Shared; using Microsoft.Build.Evaluation; -using Microsoft.Build.Framework; -using Microsoft.Build.Construction; -using Microsoft.Build.BackEnd; +using Microsoft.Build.Shared; +using System; +using System.Diagnostics; namespace Microsoft.Build.Execution { diff --git a/src/XMakeBuildEngine/Instance/ProjectOnErrorInstance.cs b/src/XMakeBuildEngine/Instance/ProjectOnErrorInstance.cs index 46512414cb2..7ca02a3f777 100644 --- a/src/XMakeBuildEngine/Instance/ProjectOnErrorInstance.cs +++ b/src/XMakeBuildEngine/Instance/ProjectOnErrorInstance.cs @@ -5,10 +5,9 @@ // Wraps an onerror element. //----------------------------------------------------------------------- -using System.Diagnostics; -using Microsoft.Build.Shared; - using Microsoft.Build.Construction; +using Microsoft.Build.Shared; +using System.Diagnostics; namespace Microsoft.Build.Execution { diff --git a/src/XMakeBuildEngine/Instance/ProjectPropertyGroupTaskInstance.cs b/src/XMakeBuildEngine/Instance/ProjectPropertyGroupTaskInstance.cs index 12858ba6b80..9c604971f25 100644 --- a/src/XMakeBuildEngine/Instance/ProjectPropertyGroupTaskInstance.cs +++ b/src/XMakeBuildEngine/Instance/ProjectPropertyGroupTaskInstance.cs @@ -5,14 +5,11 @@ // Wraps an unevaluated propertygroup under a target. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Diagnostics; using Microsoft.Build.Collections; -using Microsoft.Build.Shared; -using Microsoft.Build.Evaluation; - using Microsoft.Build.Construction; +using Microsoft.Build.Shared; +using System.Collections.Generic; +using System.Diagnostics; namespace Microsoft.Build.Execution { diff --git a/src/XMakeBuildEngine/Instance/ProjectPropertyGroupTaskPropertyInstance.cs b/src/XMakeBuildEngine/Instance/ProjectPropertyGroupTaskPropertyInstance.cs index d570ac4b2ff..c3cbd96c853 100644 --- a/src/XMakeBuildEngine/Instance/ProjectPropertyGroupTaskPropertyInstance.cs +++ b/src/XMakeBuildEngine/Instance/ProjectPropertyGroupTaskPropertyInstance.cs @@ -5,14 +5,9 @@ // Wraps an unevaluated property under an propertygroup in a target. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Diagnostics; -using Microsoft.Build.Collections; -using Microsoft.Build.Shared; -using Microsoft.Build.Evaluation; - using Microsoft.Build.Construction; +using Microsoft.Build.Shared; +using System.Diagnostics; namespace Microsoft.Build.Execution { diff --git a/src/XMakeBuildEngine/Instance/ProjectPropertyInstance.cs b/src/XMakeBuildEngine/Instance/ProjectPropertyInstance.cs index bcf844dac28..6ae5114c7b0 100644 --- a/src/XMakeBuildEngine/Instance/ProjectPropertyInstance.cs +++ b/src/XMakeBuildEngine/Instance/ProjectPropertyInstance.cs @@ -5,15 +5,13 @@ // Wraps an evaluated property for build purposes. //----------------------------------------------------------------------- -using System; -using System.Diagnostics; +using Microsoft.Build.BackEnd; using Microsoft.Build.Collections; using Microsoft.Build.Construction; -using Microsoft.Build.Shared; using Microsoft.Build.Evaluation; -using Microsoft.Build.Framework; -using Microsoft.Build.BackEnd; - +using Microsoft.Build.Shared; +using System; +using System.Diagnostics; using ReservedPropertyNames = Microsoft.Build.Internal.ReservedPropertyNames; namespace Microsoft.Build.Execution diff --git a/src/XMakeBuildEngine/Instance/ProjectTargetInstance.cs b/src/XMakeBuildEngine/Instance/ProjectTargetInstance.cs index 03e833bbe41..8a57e29d227 100644 --- a/src/XMakeBuildEngine/Instance/ProjectTargetInstance.cs +++ b/src/XMakeBuildEngine/Instance/ProjectTargetInstance.cs @@ -5,12 +5,12 @@ // Represents a target for build purposes. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Diagnostics; using Microsoft.Build.Collections; using Microsoft.Build.Construction; using Microsoft.Build.Shared; +using System; +using System.Collections.Generic; +using System.Diagnostics; using ObjectModel = System.Collections.ObjectModel; namespace Microsoft.Build.Execution diff --git a/src/XMakeBuildEngine/Instance/ProjectTargetInstanceChild.cs b/src/XMakeBuildEngine/Instance/ProjectTargetInstanceChild.cs index 3fb3f384768..9a8c6ed31b2 100644 --- a/src/XMakeBuildEngine/Instance/ProjectTargetInstanceChild.cs +++ b/src/XMakeBuildEngine/Instance/ProjectTargetInstanceChild.cs @@ -5,7 +5,6 @@ // Type for TaskInstance and ProjectPropertyGroupTaskInstance and ProjectItemGroupTaskInstance. //----------------------------------------------------------------------- -using Microsoft.Build.Shared; using Microsoft.Build.Construction; diff --git a/src/XMakeBuildEngine/Instance/ProjectTaskInstance.cs b/src/XMakeBuildEngine/Instance/ProjectTaskInstance.cs index e6f8c7f975b..9f493aa186e 100644 --- a/src/XMakeBuildEngine/Instance/ProjectTaskInstance.cs +++ b/src/XMakeBuildEngine/Instance/ProjectTaskInstance.cs @@ -5,12 +5,12 @@ // Wraps a task element. //----------------------------------------------------------------------- -using System.Collections.Generic; -using Microsoft.Build.Construction; using Microsoft.Build.Collections; +using Microsoft.Build.Construction; using Microsoft.Build.Shared; -using System.Diagnostics; using System; +using System.Collections.Generic; +using System.Diagnostics; namespace Microsoft.Build.Execution { diff --git a/src/XMakeBuildEngine/Instance/ProjectTaskInstanceChild.cs b/src/XMakeBuildEngine/Instance/ProjectTaskInstanceChild.cs index 92d8d002c39..ff61a70489a 100644 --- a/src/XMakeBuildEngine/Instance/ProjectTaskInstanceChild.cs +++ b/src/XMakeBuildEngine/Instance/ProjectTaskInstanceChild.cs @@ -5,7 +5,6 @@ // Type for TaskOutputItem and TaskOutputProperty. //----------------------------------------------------------------------- -using Microsoft.Build.Shared; using Microsoft.Build.Construction; diff --git a/src/XMakeBuildEngine/Instance/ProjectTaskOutputItemInstance.cs b/src/XMakeBuildEngine/Instance/ProjectTaskOutputItemInstance.cs index 60d311f9458..0f49c4e0d01 100644 --- a/src/XMakeBuildEngine/Instance/ProjectTaskOutputItemInstance.cs +++ b/src/XMakeBuildEngine/Instance/ProjectTaskOutputItemInstance.cs @@ -5,11 +5,8 @@ // Represents a task output item tag for build purposes. //----------------------------------------------------------------------- -using System.Collections.Generic; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; - using Microsoft.Build.Construction; +using Microsoft.Build.Shared; namespace Microsoft.Build.Execution { diff --git a/src/XMakeBuildEngine/Instance/ProjectTaskOutputPropertyInstance.cs b/src/XMakeBuildEngine/Instance/ProjectTaskOutputPropertyInstance.cs index 11a70089d24..ada36614159 100644 --- a/src/XMakeBuildEngine/Instance/ProjectTaskOutputPropertyInstance.cs +++ b/src/XMakeBuildEngine/Instance/ProjectTaskOutputPropertyInstance.cs @@ -5,8 +5,8 @@ // Represents an output property tag on a task for build purposes //----------------------------------------------------------------------- -using Microsoft.Build.Shared; using Microsoft.Build.Construction; +using Microsoft.Build.Shared; namespace Microsoft.Build.Execution { diff --git a/src/XMakeBuildEngine/Instance/ReflectableTaskPropertyInfo.cs b/src/XMakeBuildEngine/Instance/ReflectableTaskPropertyInfo.cs index eb165b94720..a4f6e228ecd 100644 --- a/src/XMakeBuildEngine/Instance/ReflectableTaskPropertyInfo.cs +++ b/src/XMakeBuildEngine/Instance/ReflectableTaskPropertyInfo.cs @@ -5,13 +5,10 @@ // A reflection-generated TaskPropertyInfo instance. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using System.Text; using Microsoft.Build.Framework; using Microsoft.Build.Shared; +using System; +using System.Reflection; namespace Microsoft.Build.Execution { diff --git a/src/XMakeBuildEngine/Instance/TaskFactories/AssemblyTaskFactory.cs b/src/XMakeBuildEngine/Instance/TaskFactories/AssemblyTaskFactory.cs index b612400343f..91d91b9e51d 100644 --- a/src/XMakeBuildEngine/Instance/TaskFactories/AssemblyTaskFactory.cs +++ b/src/XMakeBuildEngine/Instance/TaskFactories/AssemblyTaskFactory.cs @@ -7,18 +7,13 @@ // MSBuild task host. //----------------------------------------------------------------------- +using Microsoft.Build.Execution; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using System; using System.Collections.Generic; -using System.IO; using System.Reflection; -using System.Text; using System.Threading.Tasks; -using System.Xml; -using Microsoft.Build.Execution; -using Microsoft.Build.Framework; -using Microsoft.Build.Internal; -using Microsoft.Build.Shared; - using ElementLocation = Microsoft.Build.Construction.ElementLocation; using TargetLoggingContext = Microsoft.Build.BackEnd.Logging.TargetLoggingContext; using TaskLoggingContext = Microsoft.Build.BackEnd.Logging.TaskLoggingContext; diff --git a/src/XMakeBuildEngine/Instance/TaskFactories/TaskHostTask.cs b/src/XMakeBuildEngine/Instance/TaskFactories/TaskHostTask.cs index b3d72706d0c..50e5d9047a4 100644 --- a/src/XMakeBuildEngine/Instance/TaskFactories/TaskHostTask.cs +++ b/src/XMakeBuildEngine/Instance/TaskFactories/TaskHostTask.cs @@ -6,20 +6,16 @@ // task host factory feature. //----------------------------------------------------------------------- +using Microsoft.Build.BackEnd.Logging; +using Microsoft.Build.Exceptions; +using Microsoft.Build.Framework; +using Microsoft.Build.Internal; +using Microsoft.Build.Shared; using System; using System.Collections.Generic; using System.Diagnostics; -using System.Linq; using System.Reflection; using System.Threading; -using System.Text; - -using Microsoft.Build.Exceptions; -using Microsoft.Build.Execution; -using Microsoft.Build.Framework; -using Microsoft.Build.Internal; -using Microsoft.Build.Shared; -using Microsoft.Build.BackEnd.Logging; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/Instance/TaskFactoryLoggingHost.cs b/src/XMakeBuildEngine/Instance/TaskFactoryLoggingHost.cs index 6e4c8149015..8dc96d8d89d 100644 --- a/src/XMakeBuildEngine/Instance/TaskFactoryLoggingHost.cs +++ b/src/XMakeBuildEngine/Instance/TaskFactoryLoggingHost.cs @@ -5,14 +5,14 @@ // The host allows task factories access to method to allow them to log message during the construction of the task factories. //----------------------------------------------------------------------- -using System; using Microsoft.Build.Framework; using Microsoft.Build.Shared; +using System; using System.Diagnostics; +using System.Runtime.Remoting; +using System.Runtime.Remoting.Lifetime; using BaseLoggingContext = Microsoft.Build.BackEnd.Logging.BaseLoggingContext; using ElementLocation = Microsoft.Build.Construction.ElementLocation; -using System.Runtime.Remoting.Lifetime; -using System.Runtime.Remoting; namespace Microsoft.Build.BackEnd { diff --git a/src/XMakeBuildEngine/Instance/TaskFactoryWrapper.cs b/src/XMakeBuildEngine/Instance/TaskFactoryWrapper.cs index 143a0076e73..b4dc998ffa3 100644 --- a/src/XMakeBuildEngine/Instance/TaskFactoryWrapper.cs +++ b/src/XMakeBuildEngine/Instance/TaskFactoryWrapper.cs @@ -5,12 +5,12 @@ // Wraps a task factory and provides helper methods to gather the parameters //----------------------------------------------------------------------- -using System; -using System.Reflection; -using System.Collections.Generic; using Microsoft.Build.Collections; using Microsoft.Build.Framework; using Microsoft.Build.Shared; +using System; +using System.Collections.Generic; +using System.Reflection; namespace Microsoft.Build.Execution { diff --git a/src/XMakeBuildEngine/Instance/TaskRegistry.cs b/src/XMakeBuildEngine/Instance/TaskRegistry.cs index 5ad7c40d4a2..4f8eaa3bf66 100644 --- a/src/XMakeBuildEngine/Instance/TaskRegistry.cs +++ b/src/XMakeBuildEngine/Instance/TaskRegistry.cs @@ -5,25 +5,23 @@ // Consults stored task declarations (from UsingTask tags) to return the appropriate Type for a requested task name. //----------------------------------------------------------------------- +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 System; -using System.Diagnostics; using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Diagnostics; using System.IO; using System.Reflection; -using System.Xml; -using Microsoft.Build.Collections; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Construction; -using Microsoft.Build.BackEnd; - 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 TaskEngineAssemblyResolver = Microsoft.Build.BackEnd.Logging.TaskEngineAssemblyResolver; namespace Microsoft.Build.Execution { diff --git a/src/XMakeBuildEngine/Logging/BaseConsoleLogger.cs b/src/XMakeBuildEngine/Logging/BaseConsoleLogger.cs index 34187689126..46820800fb3 100644 --- a/src/XMakeBuildEngine/Logging/BaseConsoleLogger.cs +++ b/src/XMakeBuildEngine/Logging/BaseConsoleLogger.cs @@ -1,17 +1,16 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections.Generic; -using System.Text; using Microsoft.Build.Framework; using Microsoft.Build.Shared; +using System; using System.Collections; +using System.Collections.Generic; using System.Globalization; using System.IO; - -using ColorSetter = Microsoft.Build.Logging.ColorSetter; +using System.Text; using ColorResetter = Microsoft.Build.Logging.ColorResetter; +using ColorSetter = Microsoft.Build.Logging.ColorSetter; using WriteHandler = Microsoft.Build.Logging.WriteHandler; namespace Microsoft.Build.BackEnd.Logging diff --git a/src/XMakeBuildEngine/Logging/ConsoleLogger.cs b/src/XMakeBuildEngine/Logging/ConsoleLogger.cs index adcce71b9e7..ae36d8e5169 100644 --- a/src/XMakeBuildEngine/Logging/ConsoleLogger.cs +++ b/src/XMakeBuildEngine/Logging/ConsoleLogger.cs @@ -1,19 +1,13 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Text; -using System.Collections; -using System.Diagnostics; -using System.Globalization; -using System.IO; - using Microsoft.Build.Framework; using Microsoft.Build.Shared; - +using System; +using System.IO; 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; namespace Microsoft.Build.Logging { diff --git a/src/XMakeBuildEngine/Logging/DistributedLoggers/ConfigurableForwardingLogger.cs b/src/XMakeBuildEngine/Logging/DistributedLoggers/ConfigurableForwardingLogger.cs index 5b08f251411..72ae97b7c99 100644 --- a/src/XMakeBuildEngine/Logging/DistributedLoggers/ConfigurableForwardingLogger.cs +++ b/src/XMakeBuildEngine/Logging/DistributedLoggers/ConfigurableForwardingLogger.cs @@ -1,13 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections; -using System.Text; -using System.Collections.Generic; - using Microsoft.Build.Framework; using Microsoft.Build.Shared; +using System; +using System.Collections.Generic; namespace Microsoft.Build.Logging { diff --git a/src/XMakeBuildEngine/Logging/DistributedLoggers/DistributedFileLogger.cs b/src/XMakeBuildEngine/Logging/DistributedLoggers/DistributedFileLogger.cs index 760cad44967..972fe45f37e 100644 --- a/src/XMakeBuildEngine/Logging/DistributedLoggers/DistributedFileLogger.cs +++ b/src/XMakeBuildEngine/Logging/DistributedLoggers/DistributedFileLogger.cs @@ -1,13 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections; -using System.Text; -using System.IO; - using Microsoft.Build.Framework; using Microsoft.Build.Shared; +using System; +using System.IO; namespace Microsoft.Build.Logging { diff --git a/src/XMakeBuildEngine/Logging/FileLogger.cs b/src/XMakeBuildEngine/Logging/FileLogger.cs index 8645f260931..2eff060ed95 100644 --- a/src/XMakeBuildEngine/Logging/FileLogger.cs +++ b/src/XMakeBuildEngine/Logging/FileLogger.cs @@ -1,14 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections.Generic; -using System.Text; -using System.IO; -using System.Globalization; - using Microsoft.Build.Framework; using Microsoft.Build.Shared; +using System; +using System.IO; +using System.Text; namespace Microsoft.Build.Logging { diff --git a/src/XMakeBuildEngine/Logging/LogFormatter.cs b/src/XMakeBuildEngine/Logging/LogFormatter.cs index bd3c78c65a8..85d9e4dc31c 100644 --- a/src/XMakeBuildEngine/Logging/LogFormatter.cs +++ b/src/XMakeBuildEngine/Logging/LogFormatter.cs @@ -2,13 +2,8 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Collections; using System.Diagnostics; -using System.Text; -using System.IO; -using Microsoft.Build.Framework; using System.Globalization; -using Microsoft.Build.Shared; namespace Microsoft.Build.BackEnd.Logging { diff --git a/src/XMakeBuildEngine/Logging/LoggerDescription.cs b/src/XMakeBuildEngine/Logging/LoggerDescription.cs index e2d20770658..331a16e6129 100644 --- a/src/XMakeBuildEngine/Logging/LoggerDescription.cs +++ b/src/XMakeBuildEngine/Logging/LoggerDescription.cs @@ -1,15 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Reflection; -using System.Text; -using System.IO; - +using Microsoft.Build.BackEnd; using Microsoft.Build.Framework; using Microsoft.Build.Shared; -using Microsoft.Build.BackEnd; - +using System; +using System.IO; +using System.Reflection; using InternalLoggerException = Microsoft.Build.Exceptions.InternalLoggerException; namespace Microsoft.Build.Logging diff --git a/src/XMakeBuildEngine/Logging/NullCentralLogger.cs b/src/XMakeBuildEngine/Logging/NullCentralLogger.cs index 7f5eb1d4d58..4af8b480416 100644 --- a/src/XMakeBuildEngine/Logging/NullCentralLogger.cs +++ b/src/XMakeBuildEngine/Logging/NullCentralLogger.cs @@ -1,9 +1,6 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections.Generic; -using System.Text; using Microsoft.Build.Framework; using Microsoft.Build.Shared; diff --git a/src/XMakeBuildEngine/Logging/ParallelLogger/ParallelConsoleLogger.cs b/src/XMakeBuildEngine/Logging/ParallelLogger/ParallelConsoleLogger.cs index 8f24bfa623f..9dca9ecfabd 100644 --- a/src/XMakeBuildEngine/Logging/ParallelLogger/ParallelConsoleLogger.cs +++ b/src/XMakeBuildEngine/Logging/ParallelLogger/ParallelConsoleLogger.cs @@ -1,19 +1,15 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using System; -using System.Text; using System.Collections; -using System.Diagnostics; -using System.Globalization; -using System.IO; using System.Collections.Generic; - -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; - -using ColorSetter = Microsoft.Build.Logging.ColorSetter; +using System.Globalization; +using System.Text; using ColorResetter = Microsoft.Build.Logging.ColorResetter; +using ColorSetter = Microsoft.Build.Logging.ColorSetter; using WriteHandler = Microsoft.Build.Logging.WriteHandler; namespace Microsoft.Build.BackEnd.Logging diff --git a/src/XMakeBuildEngine/Logging/ParallelLogger/ParallelLoggerHelpers.cs b/src/XMakeBuildEngine/Logging/ParallelLogger/ParallelLoggerHelpers.cs index 7b5714531ee..d2e40e5a904 100644 --- a/src/XMakeBuildEngine/Logging/ParallelLogger/ParallelLoggerHelpers.cs +++ b/src/XMakeBuildEngine/Logging/ParallelLogger/ParallelLoggerHelpers.cs @@ -1,15 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections.Generic; -using System.Collections; -using System.Text; using Microsoft.Build.Framework; using Microsoft.Build.Shared; -using System.IO; -using System.Diagnostics; -using System.Threading; +using System; +using System.Collections.Generic; using System.Globalization; namespace Microsoft.Build.BackEnd.Logging diff --git a/src/XMakeBuildEngine/Logging/SerialConsoleLogger.cs b/src/XMakeBuildEngine/Logging/SerialConsoleLogger.cs index 31d39813cc4..d66e4dd6416 100644 --- a/src/XMakeBuildEngine/Logging/SerialConsoleLogger.cs +++ b/src/XMakeBuildEngine/Logging/SerialConsoleLogger.cs @@ -1,19 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections.Generic; -using System.Text; -using System.Collections; -using System.IO; -using System.Globalization; -using System.Diagnostics; - using Microsoft.Build.Framework; using Microsoft.Build.Shared; - -using ColorSetter = Microsoft.Build.Logging.ColorSetter; +using System; +using System.Collections; using ColorResetter = Microsoft.Build.Logging.ColorResetter; +using ColorSetter = Microsoft.Build.Logging.ColorSetter; using WriteHandler = Microsoft.Build.Logging.WriteHandler; namespace Microsoft.Build.BackEnd.Logging diff --git a/src/XMakeBuildEngine/Resources/AssemblyResources.cs b/src/XMakeBuildEngine/Resources/AssemblyResources.cs index a2e48833100..c5f5f60dbbf 100644 --- a/src/XMakeBuildEngine/Resources/AssemblyResources.cs +++ b/src/XMakeBuildEngine/Resources/AssemblyResources.cs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Resources; -using System.Reflection; using System.Globalization; +using System.Reflection; +using System.Resources; namespace Microsoft.Build.Shared { diff --git a/src/XMakeBuildEngine/Resources/Constants.cs b/src/XMakeBuildEngine/Resources/Constants.cs index 826f05b4e2b..ab1bb12521a 100644 --- a/src/XMakeBuildEngine/Resources/Constants.cs +++ b/src/XMakeBuildEngine/Resources/Constants.cs @@ -1,18 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections; -using System.IO; -using System.Xml; -using System.Globalization; -using System.Collections.Generic; -using System.Reflection; -using System.Threading; -using System.Collections.Concurrent; - using Microsoft.Build.Collections; using Microsoft.Build.Shared; +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.IO; namespace Microsoft.Build.Internal { diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/AssemblyTaskFactory_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/AssemblyTaskFactory_Tests.cs index 78eb44b0bee..85ca62fb313 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/AssemblyTaskFactory_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/AssemblyTaskFactory_Tests.cs @@ -5,21 +5,16 @@ // Tests for the AssemblyTaskFactory //----------------------------------------------------------------------- -using System; -using System.Collections; -using System.Collections.Generic; -using System.Xml; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.BackEnd; +using Microsoft.Build.Construction; using Microsoft.Build.Framework; -using Microsoft.Build.Collections; using Microsoft.Build.Shared; -using System.Reflection; using Microsoft.Build.Utilities; -using Microsoft.Build.Construction; - -using ILoggingService = Microsoft.Build.BackEnd.Logging.ILoggingService; -using LoggingService = Microsoft.Build.BackEnd.Logging.LoggingService; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Reflection; using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; namespace Microsoft.Build.UnitTests.BackEnd diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/BatchingEngine_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/BatchingEngine_Tests.cs index a276fd88af0..6c7bfd275d5 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/BatchingEngine_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/BatchingEngine_Tests.cs @@ -1,21 +1,17 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Xml; -using System.Collections; -using System.Text.RegularExpressions; - -using Microsoft.VisualStudio.TestTools.UnitTesting; - using Microsoft.Build.BackEnd; using Microsoft.Build.Collections; using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; using Microsoft.Build.Framework; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections; using System.Collections.Generic; - +using System.IO; +using System.Xml; using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using ProjectItemInstanceFactory = Microsoft.Build.Execution.ProjectItemInstance.TaskItem.ProjectItemInstanceFactory; diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/BuildEventArgTransportSink_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/BuildEventArgTransportSink_Tests.cs index d8a1ead86d9..d85c3d10cc9 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/BuildEventArgTransportSink_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/BuildEventArgTransportSink_Tests.cs @@ -5,12 +5,12 @@ // Transport sink correctly takes a buildEventArg and sends to the transport layer //----------------------------------------------------------------------- -using System; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; using Microsoft.Build.BackEnd; using Microsoft.Build.BackEnd.Logging; +using Microsoft.Build.Framework; using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; namespace Microsoft.Build.UnitTests.Logging { diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/BuildManager_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/BuildManager_Tests.cs index 0aa63d628ee..da87cf1131e 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/BuildManager_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/BuildManager_Tests.cs @@ -5,30 +5,26 @@ // Unit tests for the BuildManager object. //----------------------------------------------------------------------- -using System; -using System.CodeDom.Compiler; -using System.Collections; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Linq; -using System.Threading; -using System.Xml; -using System.Security; - 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.Logging; using Microsoft.Build.Shared; using Microsoft.Build.Utilities; -using Microsoft.Build.Logging; - -using Microsoft.Build.Construction; - using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.CodeDom.Compiler; +using System.Collections; +using System.Collections.Generic; using System.Diagnostics; +using System.Globalization; +using System.IO; +using System.Linq; +using System.Threading; +using System.Xml; namespace Microsoft.Build.UnitTests.BackEnd { diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/BuildRequestConfigurationResponse_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/BuildRequestConfigurationResponse_Tests.cs index 88c0b2cd010..9a4b56c5ce8 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/BuildRequestConfigurationResponse_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/BuildRequestConfigurationResponse_Tests.cs @@ -5,21 +5,8 @@ // Tests for the BuildRequestConfigurationResponse class. //----------------------------------------------------------------------- -using System; -using System.Xml; -using System.Text; -using System.Collections; -using System.Collections.Generic; -using System.Text.RegularExpressions; -using System.Threading; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.Build.Collections; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Execution; using Microsoft.Build.BackEnd; -using System.IO; +using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Microsoft.Build.UnitTests.BackEnd { diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/BuildRequestConfiguration_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/BuildRequestConfiguration_Tests.cs index ef6c41b064a..ac3eaed9fbf 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/BuildRequestConfiguration_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/BuildRequestConfiguration_Tests.cs @@ -1,22 +1,17 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Linq; -using System.Xml; -using System.Text; -using System.Collections; -using System.Collections.Generic; -using System.Text.RegularExpressions; -using System.Threading; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; +using Microsoft.Build.BackEnd; using Microsoft.Build.Collections; using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; -using Microsoft.Build.BackEnd; +using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections.Generic; using System.IO; +using System.Linq; +using System.Xml; namespace Microsoft.Build.UnitTests.BackEnd { diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/BuildRequestEngine_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/BuildRequestEngine_Tests.cs index 0c28bf9d9a8..7c158bc7e38 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/BuildRequestEngine_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/BuildRequestEngine_Tests.cs @@ -1,28 +1,23 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Xml; -using System.Text; -using System.Collections; -using System.Collections.Generic; -using System.Text.RegularExpressions; -using System.IO; -using System.Threading; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Collections; +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.Shared; using Microsoft.Build.Unittest; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections; +using System.Collections.Generic; +using System.IO; +using System.Threading; +using System.Xml; using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; namespace Microsoft.Build.UnitTests.BackEnd { - using ILoggingService = Microsoft.Build.BackEnd.Logging.ILoggingService; using NodeLoggingContext = Microsoft.Build.BackEnd.Logging.NodeLoggingContext; [TestClass] diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/BuildRequestEntry_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/BuildRequestEntry_Tests.cs index ed3726ff422..88c4fae17a7 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/BuildRequestEntry_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/BuildRequestEntry_Tests.cs @@ -1,22 +1,15 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Xml; -using System.Text; -using System.Collections; -using System.Collections.Generic; -using System.Text.RegularExpressions; -using System.Threading; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; using Microsoft.Build.BackEnd; -using Microsoft.Build.Shared; -using Microsoft.Build.Collections; using Microsoft.Build.Execution; -using Microsoft.Build.Evaluation; -using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using Microsoft.Build.Unittest; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections; +using System.Collections.Generic; namespace Microsoft.Build.UnitTests.BackEnd { diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/BuildRequest_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/BuildRequest_Tests.cs index d444e305231..59c7ad62e78 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/BuildRequest_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/BuildRequest_Tests.cs @@ -1,17 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Xml; -using System.Text; -using System.Collections; -using System.Collections.Generic; -using System.Text.RegularExpressions; -using System.Threading; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; using Microsoft.Build.BackEnd; +using Microsoft.Build.Framework; using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; namespace Microsoft.Build.UnitTests.BackEnd { diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/BuildResult_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/BuildResult_Tests.cs index 79e73942ba8..13e6460b4b9 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/BuildResult_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/BuildResult_Tests.cs @@ -1,23 +1,16 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Xml; -using System.Text; -using System.Collections; -using System.Collections.Generic; -using System.Collections.Concurrent; -using System.Text.RegularExpressions; -using System.Threading; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; -using Microsoft.Build.Exceptions; -using Microsoft.Build.Evaluation; using Microsoft.Build.BackEnd; -using Microsoft.Build.Shared; +using Microsoft.Build.Exceptions; using Microsoft.Build.Execution; -using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using Microsoft.Build.Unittest; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections.Generic; +using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; namespace Microsoft.Build.UnitTests.BackEnd { diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/CentralForwardingLogger_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/CentralForwardingLogger_Tests.cs index ca11eec994d..e64296f1c86 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/CentralForwardingLogger_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/CentralForwardingLogger_Tests.cs @@ -5,11 +5,11 @@ // Test the central forwarding logger //----------------------------------------------------------------------- -using System; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; using Microsoft.Build.BackEnd.Logging; +using Microsoft.Build.Framework; using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; namespace Microsoft.Build.UnitTests.Logging { diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/ConfigurationMetadata_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/ConfigurationMetadata_Tests.cs index bfbf7a4ac13..ebeb4bbf7fb 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/ConfigurationMetadata_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/ConfigurationMetadata_Tests.cs @@ -5,22 +5,14 @@ // Tests for the ConfigurationMetadata class. //----------------------------------------------------------------------- -using System; -using System.Linq; -using System.Xml; -using System.Text; -using System.Collections; -using System.Collections.Generic; -using System.Text.RegularExpressions; -using System.Threading; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.Build.Collections; +using Microsoft.Build.BackEnd; using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; -using Microsoft.Build.BackEnd; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections.Generic; using System.IO; +using System.Xml; namespace Microsoft.Build.UnitTests.BackEnd { diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/CustomTaskHelper.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/CustomTaskHelper.cs index 1cf3fcb0e03..30fcc7b1220 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/CustomTaskHelper.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/CustomTaskHelper.cs @@ -5,15 +5,12 @@ // Helper task for creating custom tasks for unit tests. //----------------------------------------------------------------------- +using Microsoft.Build.Utilities; using System; -using System.Collections.Generic; +using System.CodeDom.Compiler; using System.IO; -using System.Linq; -using System.Text; using System.Reflection; -using System.CodeDom.Compiler; - -using Microsoft.Build.Utilities; +using System.Text; namespace Microsoft.Build.UnitTests.BackEnd { diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/EventRedirectorToSink_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/EventRedirectorToSink_Tests.cs index 290c2c41f10..62c84a2a856 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/EventRedirectorToSink_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/EventRedirectorToSink_Tests.cs @@ -5,11 +5,10 @@ // Verify the event redirector to sink properly forwards message to the attached sink //----------------------------------------------------------------------- -using System; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; using Microsoft.Build.BackEnd.Logging; +using Microsoft.Build.Framework; using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Microsoft.Build.UnitTests.Logging { diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/EventSourceSink_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/EventSourceSink_Tests.cs index 55535f8c18f..ca156df7fef 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/EventSourceSink_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/EventSourceSink_Tests.cs @@ -5,13 +5,12 @@ // Test that events are properly raised and consumed //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; using Microsoft.Build.BackEnd.Logging; +using Microsoft.Build.Framework; using Microsoft.Build.Shared; - +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections.Generic; using InternalLoggerException = Microsoft.Build.Exceptions.InternalLoggerException; namespace Microsoft.Build.UnitTests.Logging diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/FullyQualifiedBuildRequest_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/FullyQualifiedBuildRequest_Tests.cs index 6005ab2e39a..e1223da496c 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/FullyQualifiedBuildRequest_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/FullyQualifiedBuildRequest_Tests.cs @@ -1,20 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Xml; -using System.Text; -using System.Collections; -using System.Collections.Generic; -using System.Text.RegularExpressions; -using System.Threading; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; using Microsoft.Build.BackEnd; -using Microsoft.Build.Shared; -using Microsoft.Build.Collections; using Microsoft.Build.Execution; -using Microsoft.Build.Evaluation; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections.Generic; namespace Microsoft.Build.UnitTests.BackEnd { diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/ITestTaskHost.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/ITestTaskHost.cs index 5a4896f5e00..54588dea92c 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/ITestTaskHost.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/ITestTaskHost.cs @@ -5,9 +5,6 @@ // Interface used by the test task to communicate what the TaskExecutionHost did to it. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Text; using Microsoft.Build.Framework; namespace Microsoft.Build.UnitTests.BackEnd diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/IntrinsicTask_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/IntrinsicTask_Tests.cs index 40d1dd78c5e..71b1379054e 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/IntrinsicTask_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/IntrinsicTask_Tests.cs @@ -1,25 +1,20 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +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.VisualStudio.TestTools.UnitTesting; using System; -using System.Reflection; using System.Collections; using System.Collections.Generic; using System.IO; using System.Linq; -using System.Text.RegularExpressions; using System.Xml; - -using Microsoft.VisualStudio.TestTools.UnitTesting; - -using Microsoft.Build.BackEnd; -using Microsoft.Build.Construction; -using Microsoft.Build.Collections; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Framework; -using Microsoft.Build.Execution; -using Microsoft.Build.Shared; - using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using NodeLoggingContext = Microsoft.Build.BackEnd.Logging.NodeLoggingContext; diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/LoggingContext_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/LoggingContext_Tests.cs index d235ae8a00d..2766ffd0b30 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/LoggingContext_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/LoggingContext_Tests.cs @@ -5,11 +5,9 @@ // Tests for logging contexts. //----------------------------------------------------------------------- -using Microsoft.Build.BackEnd; using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Shared; using Microsoft.VisualStudio.TestTools.UnitTesting; -using System; namespace Microsoft.Build.UnitTests.BackEnd { diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/LoggingServiceFactory_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/LoggingServiceFactory_Tests.cs index d3fa0a6cd0a..e83feb43ea9 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/LoggingServiceFactory_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/LoggingServiceFactory_Tests.cs @@ -5,11 +5,9 @@ // Verify the LoggingService Factory //----------------------------------------------------------------------- -using System; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; -using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.BackEnd; +using Microsoft.Build.BackEnd.Logging; +using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Microsoft.Build.UnitTests.Logging { diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/LoggingService_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/LoggingService_Tests.cs index 8b828453224..32919eea18e 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/LoggingService_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/LoggingService_Tests.cs @@ -5,21 +5,20 @@ // Test the logging service component //----------------------------------------------------------------------- -using System; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; -using Microsoft.Build.BackEnd.Logging; 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.IO; -using System.Threading; -using System.Reflection; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; using System.Collections.Generic; +using System.Reflection; +using System.Threading; namespace Microsoft.Build.UnitTests.Logging { diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/LoggingServicesLogMethod_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/LoggingServicesLogMethod_Tests.cs index fff2f09b0cb..3ac4f15897d 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/LoggingServicesLogMethod_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/LoggingServicesLogMethod_Tests.cs @@ -5,23 +5,22 @@ // Test the logging service component //----------------------------------------------------------------------- -using System; -using Microsoft.VisualStudio.TestTools.UnitTesting; -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.BackEnd.Logging; using Microsoft.Build.Construction; -using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; +using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; -using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; using System.Collections; using System.Collections.Generic; +using System.IO; using System.Xml; - +using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using MockHost = Microsoft.Build.UnitTests.BackEnd.MockHost; +using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; namespace Microsoft.Build.UnitTests.Logging { diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/Lookup_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/Lookup_Tests.cs index 18d507ad13a..995856525e3 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/Lookup_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/Lookup_Tests.cs @@ -1,21 +1,15 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Microsoft.Build.Framework; using Microsoft.Build.BackEnd; using Microsoft.Build.Collections; using Microsoft.Build.Execution; using Microsoft.Build.Shared; -using System.Xml; - using Microsoft.VisualStudio.TestTools.UnitTesting; -using System.Threading; -using System.Diagnostics; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; namespace Microsoft.Build.UnitTests.BackEnd { diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/MSBuild_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/MSBuild_Tests.cs index e0c0be3eb70..2bf479d1743 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/MSBuild_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/MSBuild_Tests.cs @@ -1,19 +1,16 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Reflection; -using System.Collections; -using System.Collections.Generic; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using System.Text.RegularExpressions; - using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections; +using System.Collections.Generic; +using System.IO; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/MockHost.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/MockHost.cs index a3614e792b8..543ff87f99a 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/MockHost.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/MockHost.cs @@ -7,11 +7,9 @@ using Microsoft.Build.BackEnd; using Microsoft.Build.BackEnd.Logging; -using Microsoft.Build.UnitTests.BackEnd; -using System; -using System.Threading; using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; +using System; using LegacyThreadingData = Microsoft.Build.Execution.LegacyThreadingData; namespace Microsoft.Build.UnitTests.BackEnd diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/MockLoggingService.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/MockLoggingService.cs index f3a9773ad0f..09a484c70f2 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/MockLoggingService.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/MockLoggingService.cs @@ -5,15 +5,13 @@ // A mock implementation of ILoggingService used for testing. //----------------------------------------------------------------------- -using System; -using System.Collections; -using System.Collections.Generic; -using System.Text; -using Microsoft.Build.Framework; using Microsoft.Build.BackEnd.Logging; +using Microsoft.Build.Framework; using Microsoft.Build.Logging; using Microsoft.Build.Shared; - +using System; +using System.Collections; +using System.Collections.Generic; using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/MockTaskBuilder.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/MockTaskBuilder.cs index 69f59b800d7..3fdb9fa41b4 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/MockTaskBuilder.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/MockTaskBuilder.cs @@ -5,20 +5,13 @@ // A fake task builder used for testing other components. //----------------------------------------------------------------------- +using Microsoft.Build.BackEnd; +using Microsoft.Build.Execution; using System; using System.Collections.Generic; -using System.Text; using System.Threading; -using System.Linq; -using Microsoft.Build.Framework; -using Microsoft.Build.BackEnd; -using Microsoft.Build.Shared; -using Microsoft.Build.Collections; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Execution; - -using TargetLoggingContext = Microsoft.Build.BackEnd.Logging.TargetLoggingContext; using System.Threading.Tasks; +using TargetLoggingContext = Microsoft.Build.BackEnd.Logging.TargetLoggingContext; namespace Microsoft.Build.UnitTests.BackEnd { diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/NodeEndpointInProc_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/NodeEndpointInProc_Tests.cs index c7b57615ea8..be71c1e24cd 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/NodeEndpointInProc_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/NodeEndpointInProc_Tests.cs @@ -1,19 +1,14 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Xml; -using System.Text; -using System.Collections; -using System.Collections.Generic; -using System.Text.RegularExpressions; -using System.Threading; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; using Microsoft.Build.BackEnd; using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Execution; using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections.Generic; +using System.Threading; using LegacyThreadingData = Microsoft.Build.Execution.LegacyThreadingData; namespace Microsoft.Build.UnitTests.BackEnd diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/NodePacketTranslator_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/NodePacketTranslator_Tests.cs index 5242b8f9123..7cdfae1ddae 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/NodePacketTranslator_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/NodePacketTranslator_Tests.cs @@ -5,20 +5,10 @@ // Tests for the NodePacketTranslator class. //----------------------------------------------------------------------- +using Microsoft.Build.BackEnd; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; -using System.Xml; -using System.Text; -using System.Collections; using System.Collections.Generic; -using System.Text.RegularExpressions; -using System.Threading; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.Build.Collections; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Execution; -using Microsoft.Build.BackEnd; using System.IO; namespace Microsoft.Build.UnitTests.BackEnd diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/NodePackets_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/NodePackets_Tests.cs index e27bb2edcdc..bada7574149 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/NodePackets_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/NodePackets_Tests.cs @@ -5,14 +5,13 @@ // Test the node packets are created properly //----------------------------------------------------------------------- -using System; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; -using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.BackEnd; +using Microsoft.Build.Framework; using Microsoft.Build.Shared; -using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; using System.Collections.Generic; +using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; namespace Microsoft.Build.UnitTests.BackEnd { diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/OnError_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/OnError_Tests.cs index 8a190e0729c..0c3e9f1f8c9 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/OnError_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/OnError_Tests.cs @@ -1,14 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; -using System.Threading; -using System.Collections; +using Microsoft.Build.Framework; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.IO; using System.Xml; using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/RequestBuilder_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/RequestBuilder_Tests.cs index 9c8b9603cb2..b28d112e6c7 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/RequestBuilder_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/RequestBuilder_Tests.cs @@ -1,29 +1,24 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Xml; -using System.Text; -using System.Collections; -using System.Collections.Generic; -using System.Text.RegularExpressions; -using System.Threading; -using System.IO; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; using Microsoft.Build.BackEnd; using Microsoft.Build.BackEnd.Logging; -using Microsoft.Build.Shared; using Microsoft.Build.Collections; using Microsoft.Build.Execution; -using Microsoft.Build.Evaluation; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using Microsoft.Build.Unittest; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections.Generic; +using System.IO; +using System.Threading; using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; namespace Microsoft.Build.UnitTests.BackEnd { - using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using System.Threading.Tasks; + using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; [TestClass] public class RequestBuilder_Tests diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/ResultsCache_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/ResultsCache_Tests.cs index 3a2f6980b17..8bcdee7a9d1 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/ResultsCache_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/ResultsCache_Tests.cs @@ -1,20 +1,14 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Xml; -using System.Text; -using System.Collections; -using System.Collections.Generic; -using System.Text.RegularExpressions; -using System.Threading; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; using Microsoft.Build.BackEnd; -using Microsoft.Build.Shared; using Microsoft.Build.Execution; -using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using Microsoft.Build.Unittest; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections.Generic; namespace Microsoft.Build.UnitTests.BackEnd { diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/Scheduler_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/Scheduler_Tests.cs index f7e6748e504..5814e884b92 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/Scheduler_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/Scheduler_Tests.cs @@ -5,27 +5,20 @@ // Tests for the basic scheduler. //----------------------------------------------------------------------- +using Microsoft.Build.BackEnd; +using Microsoft.Build.Evaluation; +using Microsoft.Build.Execution; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; -using System.Xml; -using System.Text; -using System.Collections; using System.Collections.Generic; -using System.Text.RegularExpressions; -using System.Threading; using System.IO; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; -using Microsoft.Build.BackEnd; -using Microsoft.Build.Shared; -using Microsoft.Build.Collections; -using Microsoft.Build.Execution; -using Microsoft.Build.Evaluation; +using System.Xml; using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; namespace Microsoft.Build.UnitTests.BackEnd { - using ILoggingService = Microsoft.Build.BackEnd.Logging.ILoggingService; - using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using Microsoft.Build.Unittest; /// diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/TargetBuilder_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/TargetBuilder_Tests.cs index d44931c8c33..fabae4c254e 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/TargetBuilder_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/TargetBuilder_Tests.cs @@ -5,28 +5,23 @@ // Unit tests for the TargetBuilder with a mock task builder. //----------------------------------------------------------------------- -using System; -using System.Xml; -using System.Text; -using System.Collections; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text.RegularExpressions; -using System.Threading; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; 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.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections.Generic; +using System.IO; +using System.Threading; +using System.Threading.Tasks; +using System.Xml; 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 NodeLoggingContext = Microsoft.Build.BackEnd.Logging.NodeLoggingContext; +using ProjectLoggingContext = Microsoft.Build.BackEnd.Logging.ProjectLoggingContext; namespace Microsoft.Build.UnitTests.BackEnd { diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/TargetEntry_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/TargetEntry_Tests.cs index c461aa02a04..4a930252c8f 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/TargetEntry_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/TargetEntry_Tests.cs @@ -5,25 +5,22 @@ // Unit tests for the TargetEntry with a mock task builder. //----------------------------------------------------------------------- +using Microsoft.Build.BackEnd; +using Microsoft.Build.BackEnd.Logging; +using Microsoft.Build.Collections; +using Microsoft.Build.Evaluation; +using Microsoft.Build.Execution; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; -using System.Xml; -using System.Text; using System.Collections; using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Text.RegularExpressions; using System.Threading; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using ElementLocation = Microsoft.Build.Construction.ElementLocation; -using Microsoft.Build.Framework; -using Microsoft.Build.BackEnd; -using Microsoft.Build.Shared; -using Microsoft.Build.Collections; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Execution; -using Microsoft.Build.BackEnd.Logging; using System.Threading.Tasks; +using System.Xml; +using ElementLocation = Microsoft.Build.Construction.ElementLocation; namespace Microsoft.Build.UnitTests.BackEnd { diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/TargetResult_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/TargetResult_Tests.cs index 8fb7336e4c0..e66a72d9d9d 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/TargetResult_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/TargetResult_Tests.cs @@ -5,21 +5,12 @@ // Tests for the TargetResult class. //----------------------------------------------------------------------- -using System; -using System.Xml; -using System.Text; -using System.Collections; -using System.Collections.Generic; -using System.Text.RegularExpressions; -using System.Threading; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.BackEnd; -using Microsoft.Build.Unittest; -using Microsoft.Build.Evaluation; using Microsoft.Build.Exceptions; using Microsoft.Build.Execution; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; +using Microsoft.Build.Unittest; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; namespace Microsoft.Build.UnitTests.BackEnd diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/TargetUpToDateChecker_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/TargetUpToDateChecker_Tests.cs index 790c4ee2034..faa17ddeb57 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/TargetUpToDateChecker_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/TargetUpToDateChecker_Tests.cs @@ -1,25 +1,18 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Resources; -using System.Reflection; -using System.Collections; -using System.Collections.Generic; -using System.Xml; -using System.Text; -using System.Globalization; - -using Microsoft.VisualStudio.TestTools.UnitTesting; - using Microsoft.Build.BackEnd; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.Build.Execution; using Microsoft.Build.Collections; using Microsoft.Build.Evaluation; +using Microsoft.Build.Execution; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections.Generic; +using System.IO; using System.Threading; +using System.Xml; namespace Microsoft.Build.UnitTests.BackEnd { diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/TaskBuilderTestTask.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/TaskBuilderTestTask.cs index 455ecb683d2..d7d9f47e7a4 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/TaskBuilderTestTask.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/TaskBuilderTestTask.cs @@ -5,11 +5,10 @@ // A task used to test the TaskExecutionHost. //----------------------------------------------------------------------- +using Microsoft.Build.Framework; using System; using System.Collections; using System.Collections.Generic; -using System.Text; -using Microsoft.Build.Framework; using System.Reflection; namespace Microsoft.Build.UnitTests.BackEnd diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/TaskBuilder_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/TaskBuilder_Tests.cs index c3426589d33..f5bdaafd030 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/TaskBuilder_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/TaskBuilder_Tests.cs @@ -5,11 +5,6 @@ // Unit tests for the task builder object. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.IO; -using System.Threading.Tasks; -using System.Xml; using Microsoft.Build.BackEnd; using Microsoft.Build.Collections; using Microsoft.Build.Evaluation; @@ -17,7 +12,11 @@ using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Microsoft.VisualStudio.TestTools.UnitTesting; - +using System; +using System.Collections.Generic; +using System.IO; +using System.Threading.Tasks; +using System.Xml; using ElementLocation = Microsoft.Build.Construction.ElementLocation; using ILoggingService = Microsoft.Build.BackEnd.Logging.ILoggingService; using LegacyThreadingData = Microsoft.Build.Execution.LegacyThreadingData; diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/TaskExecutionHost_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/TaskExecutionHost_Tests.cs index e14eb9103f7..0a30b4f6c4e 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/TaskExecutionHost_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/TaskExecutionHost_Tests.cs @@ -5,14 +5,6 @@ // Unit tests for the task execution host object. //----------------------------------------------------------------------- -using System; -using System.Collections; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Reflection; -using System.Threading; -using System.Xml; using Microsoft.Build.BackEnd; using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Collections; @@ -22,6 +14,14 @@ using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Reflection; +using System.Threading; +using System.Xml; using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/TaskHostConfiguration_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/TaskHostConfiguration_Tests.cs index c61455034a4..78b3a2deb06 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/TaskHostConfiguration_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/TaskHostConfiguration_Tests.cs @@ -5,18 +5,15 @@ // Unit Tests for TaskHostConfiguration packet. //----------------------------------------------------------------------- -using System; -using System.Text; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using System.Threading; -using Microsoft.VisualStudio.TestTools.UnitTesting; - using Microsoft.Build.BackEnd; using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Microsoft.Build.Utilities; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Threading; namespace Microsoft.Build.UnitTests.BackEnd { diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/TaskHostTaskCancelled_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/TaskHostTaskCancelled_Tests.cs index d39c47e6556..e36a888d726 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/TaskHostTaskCancelled_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/TaskHostTaskCancelled_Tests.cs @@ -5,13 +5,8 @@ // Unit Tests for TaskHostTaskCancelled packet. //----------------------------------------------------------------------- -using System; -using System.Text; -using System.Collections.Generic; -using System.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; - using Microsoft.Build.BackEnd; +using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Microsoft.Build.UnitTests.BackEnd { diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/TaskHostTaskComplete_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/TaskHostTaskComplete_Tests.cs index 312cf6f42d9..97b975ff52d 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/TaskHostTaskComplete_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/TaskHostTaskComplete_Tests.cs @@ -5,17 +5,13 @@ // Unit Tests for TaskHostTaskComplete packet. //----------------------------------------------------------------------- -using System; -using System.Text; -using System.Collections.Generic; -using System.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; - using Microsoft.Build.BackEnd; using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Microsoft.Build.Utilities; - +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections.Generic; using TaskHostPacketHelpers = Microsoft.Build.UnitTests.BackEnd.TaskHostConfiguration_Tests.TaskHostPacketHelpers; namespace Microsoft.Build.UnitTests.BackEnd diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/TaskHost_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/TaskHost_Tests.cs index a2c4fdd3d1d..acfb9c51170 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/TaskHost_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/TaskHost_Tests.cs @@ -5,21 +5,20 @@ // Tests for the TaskHost //----------------------------------------------------------------------- -using System; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; 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.Evaluation; +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 Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections; +using System.Collections.Generic; using System.Threading.Tasks; +using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; namespace Microsoft.Build.UnitTests.BackEnd { diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/TaskItemComparer.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/TaskItemComparer.cs index aa7aeb3f9d6..a8a242470c4 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/TaskItemComparer.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/TaskItemComparer.cs @@ -5,12 +5,9 @@ // Implementation of IComparer on ITaskItems used for testing. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using Microsoft.Build.Framework; using Microsoft.Build.Shared; +using System.Collections.Generic; namespace Microsoft.Build.UnitTests.BackEnd { diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/TaskRegistry_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/TaskRegistry_Tests.cs index 1d992519e03..4e4a935fa7a 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/TaskRegistry_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/TaskRegistry_Tests.cs @@ -5,26 +5,21 @@ // Unit tests for the task execution host object. //----------------------------------------------------------------------- -using System; -using System.Collections; -using System.Collections.Generic; -using System.IO; -using System.Xml; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.BackEnd; using Microsoft.Build.BackEnd.Logging; +using Microsoft.Build.Collections; +using Microsoft.Build.Construction; using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; -using Microsoft.Build.Construction; using Microsoft.Build.Framework; -using Microsoft.Build.Collections; using Microsoft.Build.Shared; -using System.Reflection; - -using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; -using Microsoft.Build.Utilities; using Microsoft.Build.Tasks; -using Microsoft.Build.UnitTests; +using Microsoft.Build.Utilities; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections; +using System.Collections.Generic; +using System.IO; +using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; namespace Microsoft.Build.UnitTests.BackEnd { diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/TranslationHelpers.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/TranslationHelpers.cs index 78a960a9aa7..8cb2def50c2 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/TranslationHelpers.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/TranslationHelpers.cs @@ -5,13 +5,11 @@ // Helper class for serialization tests. //----------------------------------------------------------------------- +using Microsoft.Build.BackEnd; using System; using System.Collections.Generic; -using System.Linq; -using System.Text; using System.IO; -using Microsoft.Build.Framework; -using Microsoft.Build.BackEnd; +using System.Linq; namespace Microsoft.Build.UnitTests.BackEnd { diff --git a/src/XMakeBuildEngine/UnitTests/Collections/CopyOnReadEnumerable_Tests.cs b/src/XMakeBuildEngine/UnitTests/Collections/CopyOnReadEnumerable_Tests.cs index ac5662f6d70..3694aee1db9 100644 --- a/src/XMakeBuildEngine/UnitTests/Collections/CopyOnReadEnumerable_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/Collections/CopyOnReadEnumerable_Tests.cs @@ -5,10 +5,10 @@ // Tests the CopyOnReadEnumerable utility class //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; using Microsoft.Build.Collections; using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections.Generic; namespace Microsoft.Build.UnitTests.OM.Collections { diff --git a/src/XMakeBuildEngine/UnitTests/Collections/FilteringEnumerable_Tests.cs b/src/XMakeBuildEngine/UnitTests/Collections/FilteringEnumerable_Tests.cs index c9e8daac7e8..baa87bcd8ec 100644 --- a/src/XMakeBuildEngine/UnitTests/Collections/FilteringEnumerable_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/Collections/FilteringEnumerable_Tests.cs @@ -5,10 +5,9 @@ // Tests the FilteringEnumerable utility class //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; using Microsoft.Build.Collections; using Microsoft.VisualStudio.TestTools.UnitTesting; +using System.Collections.Generic; namespace Microsoft.Build.UnitTests.OM.Collections { diff --git a/src/XMakeBuildEngine/UnitTests/Collections/MSBuildNameIgnoreCaseComparer_Tests.cs b/src/XMakeBuildEngine/UnitTests/Collections/MSBuildNameIgnoreCaseComparer_Tests.cs index aa5293e6ea8..c3b09749061 100644 --- a/src/XMakeBuildEngine/UnitTests/Collections/MSBuildNameIgnoreCaseComparer_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/Collections/MSBuildNameIgnoreCaseComparer_Tests.cs @@ -5,13 +5,13 @@ // Tests the MSBuildNameIgnoreCaseComparer //----------------------------------------------------------------------- -using System; -using System.Collections; -using System.Collections.Generic; using Microsoft.Build.Collections; -using Microsoft.Build.Shared; using Microsoft.Build.Execution; +using Microsoft.Build.Shared; using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections; +using System.Collections.Generic; namespace Microsoft.Build.UnitTests.OM.Collections { diff --git a/src/XMakeBuildEngine/UnitTests/Collections/MultiDictionary_Tests.cs b/src/XMakeBuildEngine/UnitTests/Collections/MultiDictionary_Tests.cs index b0d051861b7..0009ef2ed8a 100644 --- a/src/XMakeBuildEngine/UnitTests/Collections/MultiDictionary_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/Collections/MultiDictionary_Tests.cs @@ -5,16 +5,10 @@ // Tests for the multi-dictionary class //----------------------------------------------------------------------- -using System.Collections.Generic; using Microsoft.Build.Collections; using Microsoft.VisualStudio.TestTools.UnitTesting; using System; -using Microsoft.Build.Evaluation; -using Microsoft.Build.UnitTests; -using System.Collections; -using Microsoft.Build.Execution; -using Microsoft.Build.Shared; -using Microsoft.Build.Construction; +using System.Collections.Generic; namespace Microsoft.Build.UnitTests.OM.Collections { diff --git a/src/XMakeBuildEngine/UnitTests/Collections/OMcollections_tests.cs b/src/XMakeBuildEngine/UnitTests/Collections/OMcollections_tests.cs index 79fc65141db..891425efbe5 100644 --- a/src/XMakeBuildEngine/UnitTests/Collections/OMcollections_tests.cs +++ b/src/XMakeBuildEngine/UnitTests/Collections/OMcollections_tests.cs @@ -5,19 +5,16 @@ // Tests for several of the collections classes //----------------------------------------------------------------------- -using System.Collections.Generic; using Microsoft.Build.Collections; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using System; using Microsoft.Build.Evaluation; -using Microsoft.Build.UnitTests; -using Microsoft.Build.Framework; -using System.Collections; -using System.Linq; using Microsoft.Build.Execution; using Microsoft.Build.Shared; -using Microsoft.Build.Construction; using Microsoft.Build.UnitTests.BackEnd; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; using ObjectModel = System.Collections.ObjectModel; namespace Microsoft.Build.UnitTests.OM.Collections diff --git a/src/XMakeBuildEngine/UnitTests/Collections/WeakDictionary_Tests.cs b/src/XMakeBuildEngine/UnitTests/Collections/WeakDictionary_Tests.cs index 2767f5969b4..285e8d078f9 100644 --- a/src/XMakeBuildEngine/UnitTests/Collections/WeakDictionary_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/Collections/WeakDictionary_Tests.cs @@ -5,16 +5,10 @@ // Tests for the weak dictionary class //----------------------------------------------------------------------- -using System.Collections.Generic; using Microsoft.Build.Collections; using Microsoft.VisualStudio.TestTools.UnitTesting; using System; -using Microsoft.Build.Evaluation; -using Microsoft.Build.UnitTests; -using System.Collections; -using Microsoft.Build.Execution; -using Microsoft.Build.Shared; -using Microsoft.Build.Construction; +using System.Collections.Generic; namespace Microsoft.Build.UnitTests.OM.Collections { diff --git a/src/XMakeBuildEngine/UnitTests/ConfigureableForwardingLogger_Tests.cs b/src/XMakeBuildEngine/UnitTests/ConfigureableForwardingLogger_Tests.cs index 82c0595c8b0..fcd63b575c7 100644 --- a/src/XMakeBuildEngine/UnitTests/ConfigureableForwardingLogger_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/ConfigureableForwardingLogger_Tests.cs @@ -1,14 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections.Generic; -using System.Text; - -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Framework; using Microsoft.Build.Logging; -using Microsoft.Build.BackEnd.Logging; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System.Collections.Generic; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeBuildEngine/UnitTests/ConsoleLogger_Tests.cs b/src/XMakeBuildEngine/UnitTests/ConsoleLogger_Tests.cs index c027ad5db8a..457a43fb482 100644 --- a/src/XMakeBuildEngine/UnitTests/ConsoleLogger_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/ConsoleLogger_Tests.cs @@ -1,24 +1,19 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Text; -using System.IO; -using System.Reflection; -using System.Collections; -using System.Globalization; -using System.Collections.Generic; - -using Microsoft.VisualStudio.TestTools.UnitTesting; - +using Microsoft.Build.BackEnd.Logging; +using Microsoft.Build.Construction; using Microsoft.Build.Framework; using Microsoft.Build.Logging; -using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Shared; - +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Globalization; +using System.IO; +using System.Text; using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; -using Microsoft.Build.Construction; -using Microsoft.Build.Evaluation; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeBuildEngine/UnitTests/Construction/ElementLocation_Tests.cs b/src/XMakeBuildEngine/UnitTests/Construction/ElementLocation_Tests.cs index a8ca7a55387..b69560d6945 100644 --- a/src/XMakeBuildEngine/UnitTests/Construction/ElementLocation_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/Construction/ElementLocation_Tests.cs @@ -5,22 +5,15 @@ // Tests for the ElementLocation class //----------------------------------------------------------------------- -using System.Collections.Generic; -using Microsoft.Build.Collections; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using System; -using Microsoft.Build.Evaluation; -using Microsoft.Build.UnitTests; -using Microsoft.Build.Framework; -using System.Collections; -using Microsoft.Build.Execution; +using Microsoft.Build.Construction; using Microsoft.Build.Exceptions; using Microsoft.Build.Shared; -using Microsoft.Build.Construction; using Microsoft.Build.UnitTests.BackEnd; -using System.Xml; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; using System.IO; using System.Reflection; +using System.Xml; namespace Microsoft.Build.UnitTests.Construction { diff --git a/src/XMakeBuildEngine/UnitTests/Construction/SolutionFile_Tests.cs b/src/XMakeBuildEngine/UnitTests/Construction/SolutionFile_Tests.cs index a10e34ab631..63669a208dc 100644 --- a/src/XMakeBuildEngine/UnitTests/Construction/SolutionFile_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/Construction/SolutionFile_Tests.cs @@ -1,19 +1,15 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Construction; +using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; -using System.Reflection; using System.Collections; using System.Collections.Generic; using System.IO; -using System.Text.RegularExpressions; - -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; -using Microsoft.Build.Construction; -using Microsoft.Build.Shared; -using ResourceUtilities = Microsoft.Build.Shared.ResourceUtilities; using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; +using ResourceUtilities = Microsoft.Build.Shared.ResourceUtilities; namespace Microsoft.Build.UnitTests.Construction { diff --git a/src/XMakeBuildEngine/UnitTests/Construction/SolutionProjectGenerator_Tests.cs b/src/XMakeBuildEngine/UnitTests/Construction/SolutionProjectGenerator_Tests.cs index 3a3d9f2cb49..98c67f349eb 100644 --- a/src/XMakeBuildEngine/UnitTests/Construction/SolutionProjectGenerator_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/Construction/SolutionProjectGenerator_Tests.cs @@ -1,33 +1,25 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.BackEnd; +using Microsoft.Build.Construction; +using Microsoft.Build.Execution; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; using System.Collections; using System.Collections.Generic; -using System.Reflection; -using System.Text; using System.IO; -using System.Xml; using System.Linq; - -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.BackEnd; -using Microsoft.Build.Framework; -using Microsoft.Build.Construction; -using Microsoft.Build.Execution; -using Microsoft.Build.Shared; -using Microsoft.Build.Unittest; - +using FrameworkLocationHelper = Microsoft.Build.Shared.FrameworkLocationHelper; +using InternalUtilities = Microsoft.Build.Internal.Utilities; +using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; 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; namespace Microsoft.Build.UnitTests.Construction { diff --git a/src/XMakeBuildEngine/UnitTests/Construction/XmlReaderWithoutLocation_Tests.cs b/src/XMakeBuildEngine/UnitTests/Construction/XmlReaderWithoutLocation_Tests.cs index 021abcd7e27..55c6d353abd 100644 --- a/src/XMakeBuildEngine/UnitTests/Construction/XmlReaderWithoutLocation_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/Construction/XmlReaderWithoutLocation_Tests.cs @@ -5,20 +5,10 @@ // Tests for the ElementLocation class //----------------------------------------------------------------------- -using System; -using System.Collections; -using System.Collections.Generic; -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; -using Microsoft.Build.UnitTests.BackEnd; using Microsoft.VisualStudio.TestTools.UnitTesting; -using System.Xml; using System.IO; +using System.Xml; namespace Microsoft.Build.UnitTests.Construction { diff --git a/src/XMakeBuildEngine/UnitTests/Definition/ItemDefinitionGroup_Tests.cs b/src/XMakeBuildEngine/UnitTests/Definition/ItemDefinitionGroup_Tests.cs index d18a8f9b6e1..ca903bab2a2 100644 --- a/src/XMakeBuildEngine/UnitTests/Definition/ItemDefinitionGroup_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/Definition/ItemDefinitionGroup_Tests.cs @@ -1,29 +1,19 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Evaluation; +using Microsoft.Build.Execution; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; +using System.Collections.Generic; using System.IO; using System.Linq; -using System.Resources; using System.Reflection; -using System.Collections; -using System.Collections.Generic; using System.Xml; -using System.Text; -using System.Globalization; - -using Microsoft.VisualStudio.TestTools.UnitTesting; - -using Microsoft.Build.BackEnd; -using Microsoft.Build.Execution; -using Microsoft.Build.Collections; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using System.Threading; - -using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; +using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; namespace Microsoft.Build.UnitTests.Definition { diff --git a/src/XMakeBuildEngine/UnitTests/Definition/ProjectHelpers.cs b/src/XMakeBuildEngine/UnitTests/Definition/ProjectHelpers.cs index 492a106bda4..8c7a8880967 100644 --- a/src/XMakeBuildEngine/UnitTests/Definition/ProjectHelpers.cs +++ b/src/XMakeBuildEngine/UnitTests/Definition/ProjectHelpers.cs @@ -5,14 +5,10 @@ // Helper class to create projects for testing.. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.IO; -using System.Text; -using System.Xml; -using Microsoft.Build.Construction; using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; +using System.IO; +using System.Xml; namespace Microsoft.Build.UnitTests.BackEnd { diff --git a/src/XMakeBuildEngine/UnitTests/Definition/ProjectItem_Tests.cs b/src/XMakeBuildEngine/UnitTests/Definition/ProjectItem_Tests.cs index 575791338f2..04420dd7d1f 100644 --- a/src/XMakeBuildEngine/UnitTests/Definition/ProjectItem_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/Definition/ProjectItem_Tests.cs @@ -5,28 +5,16 @@ // Tests for ProjectInstance internal members //----------------------------------------------------------------------- +using Microsoft.Build.Construction; +using Microsoft.Build.Evaluation; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; -using System.IO; -using System.Linq; -using System.Resources; -using System.Reflection; using System.Collections; using System.Collections.Generic; +using System.IO; +using System.Linq; using System.Xml; -using System.Text; -using System.Globalization; - -using Microsoft.VisualStudio.TestTools.UnitTesting; - -using Microsoft.Build.BackEnd; -using Microsoft.Build.Execution; -using Microsoft.Build.Collections; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Framework; -using System.Threading; -using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using ProjectItemFactory = Microsoft.Build.Evaluation.ProjectItem.ProjectItemFactory; -using Microsoft.Build.Construction; namespace Microsoft.Build.UnitTests.Definition { diff --git a/src/XMakeBuildEngine/UnitTests/Definition/Project_Internal_Tests.cs b/src/XMakeBuildEngine/UnitTests/Definition/Project_Internal_Tests.cs index fcb5b6cabda..96f6c9753c6 100644 --- a/src/XMakeBuildEngine/UnitTests/Definition/Project_Internal_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/Definition/Project_Internal_Tests.cs @@ -5,15 +5,12 @@ // Tests for Project that involve some reference to internal code //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Text; -using System.Xml; -using System.IO; using Microsoft.Build.Evaluation; using Microsoft.Build.Shared; using Microsoft.VisualStudio.TestTools.UnitTesting; - +using System; +using System.IO; +using System.Xml; using InternalUtilities = Microsoft.Build.Internal.Utilities; namespace Microsoft.Build.UnitTests.Definition diff --git a/src/XMakeBuildEngine/UnitTests/Definition/ToolsVersion_Tests.cs b/src/XMakeBuildEngine/UnitTests/Definition/ToolsVersion_Tests.cs index 786055b9bcb..250701ae12f 100644 --- a/src/XMakeBuildEngine/UnitTests/Definition/ToolsVersion_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/Definition/ToolsVersion_Tests.cs @@ -1,25 +1,22 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +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.VisualStudio.TestTools.UnitTesting; using System; -using System.Collections; using System.Collections.Generic; using System.IO; using System.Text.RegularExpressions; using System.Xml; - -using Microsoft.VisualStudio.TestTools.UnitTesting; -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 InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; +using LoggerMode = Microsoft.Build.BackEnd.Logging.LoggerMode; +using LoggingService = Microsoft.Build.BackEnd.Logging.LoggingService; namespace Microsoft.Build.UnitTests.Definition { diff --git a/src/XMakeBuildEngine/UnitTests/Definition/ToolsetConfigurationReaderTestHelper.cs b/src/XMakeBuildEngine/UnitTests/Definition/ToolsetConfigurationReaderTestHelper.cs index c361472a07c..19406db907c 100644 --- a/src/XMakeBuildEngine/UnitTests/Definition/ToolsetConfigurationReaderTestHelper.cs +++ b/src/XMakeBuildEngine/UnitTests/Definition/ToolsetConfigurationReaderTestHelper.cs @@ -2,12 +2,8 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.IO; -using System.Text; -using System.Collections.Generic; using System.Configuration; -using Microsoft.Win32; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using System.IO; using System.Threading; namespace Microsoft.Build.UnitTests diff --git a/src/XMakeBuildEngine/UnitTests/Definition/ToolsetConfigurationReader_Tests.cs b/src/XMakeBuildEngine/UnitTests/Definition/ToolsetConfigurationReader_Tests.cs index d2dcfa7b13d..28b27fa63f8 100644 --- a/src/XMakeBuildEngine/UnitTests/Definition/ToolsetConfigurationReader_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/Definition/ToolsetConfigurationReader_Tests.cs @@ -1,15 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Text; -using System.Collections.Generic; -using System.Configuration; -using Microsoft.Win32; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Evaluation; - +using System.Configuration; using ToolsetConfigurationSection = Microsoft.Build.Evaluation.ToolsetConfigurationSection; namespace Microsoft.Build.UnitTests.Definition diff --git a/src/XMakeBuildEngine/UnitTests/Definition/ToolsetReader_Tests.cs b/src/XMakeBuildEngine/UnitTests/Definition/ToolsetReader_Tests.cs index fc2fa77eb88..e2a16b4c0a3 100644 --- a/src/XMakeBuildEngine/UnitTests/Definition/ToolsetReader_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/Definition/ToolsetReader_Tests.cs @@ -1,23 +1,21 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Collections.Generic; -using System.Configuration; -using Microsoft.Win32; -using System.Text; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Collections; using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; using Microsoft.Build.Internal; using Microsoft.Build.Shared; - -using RegistryKeyWrapper = Microsoft.Build.Internal.RegistryKeyWrapper; -using RegistryException = Microsoft.Build.Exceptions.RegistryException; -using InvalidToolsetDefinitionException = Microsoft.Build.Exceptions.InvalidToolsetDefinitionException; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using Microsoft.Win32; +using System; +using System.Collections.Generic; +using System.Configuration; +using System.IO; using InternalUtilities = Microsoft.Build.Internal.Utilities; +using InvalidToolsetDefinitionException = Microsoft.Build.Exceptions.InvalidToolsetDefinitionException; +using RegistryException = Microsoft.Build.Exceptions.RegistryException; +using RegistryKeyWrapper = Microsoft.Build.Internal.RegistryKeyWrapper; namespace Microsoft.Build.UnitTests.Definition { diff --git a/src/XMakeBuildEngine/UnitTests/Definition/ToolsetRegistryReader_Tests.cs b/src/XMakeBuildEngine/UnitTests/Definition/ToolsetRegistryReader_Tests.cs index 2eb81fa6264..425e9962506 100644 --- a/src/XMakeBuildEngine/UnitTests/Definition/ToolsetRegistryReader_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/Definition/ToolsetRegistryReader_Tests.cs @@ -1,17 +1,15 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections.Generic; -using System.Configuration; -using Microsoft.Win32; -using Microsoft.Build.Evaluation; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Collections; +using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; -using InvalidToolsetDefinitionException = Microsoft.Build.Exceptions.InvalidToolsetDefinitionException; using Microsoft.Build.Internal; -using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using Microsoft.Win32; +using System; +using System.Collections.Generic; +using InvalidToolsetDefinitionException = Microsoft.Build.Exceptions.InvalidToolsetDefinitionException; namespace Microsoft.Build.UnitTests.Definition { diff --git a/src/XMakeBuildEngine/UnitTests/Definition/Toolset_Tests.cs b/src/XMakeBuildEngine/UnitTests/Definition/Toolset_Tests.cs index d90f095e632..9552f9ba555 100644 --- a/src/XMakeBuildEngine/UnitTests/Definition/Toolset_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/Definition/Toolset_Tests.cs @@ -1,23 +1,16 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections; -using System.Collections.Generic; -using System.Configuration; -using System.IO; -using System.Xml; - -using Microsoft.VisualStudio.TestTools.UnitTesting; - using Microsoft.Build.BackEnd; using Microsoft.Build.Collections; -using Microsoft.Build.Framework; using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; using Microsoft.Build.Internal; using Microsoft.Build.UnitTests.BackEnd; -using Microsoft.Build.Unittest; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections; +using System.Collections.Generic; namespace Microsoft.Build.UnitTests.Definition { diff --git a/src/XMakeBuildEngine/UnitTests/EscapingInProjects_Tests.cs b/src/XMakeBuildEngine/UnitTests/EscapingInProjects_Tests.cs index 4a50cef6361..2959b21edb8 100644 --- a/src/XMakeBuildEngine/UnitTests/EscapingInProjects_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/EscapingInProjects_Tests.cs @@ -1,24 +1,19 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Linq; -using System.IO; -using System.Collections.Generic; -using System.Text; -using System.Reflection; - -using Microsoft.VisualStudio.TestTools.UnitTesting; - -using Microsoft.Build.UnitTests; - using Microsoft.Build.Construction; using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -using FileUtilities = Microsoft.Build.Shared.FileUtilities; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Reflection; using EscapingUtilities = Microsoft.Build.Shared.EscapingUtilities; +using FileUtilities = Microsoft.Build.Shared.FileUtilities; using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; using ResourceUtilities = Microsoft.Build.Shared.ResourceUtilities; diff --git a/src/XMakeBuildEngine/UnitTests/Evaluation/Evaluator_Tests.cs b/src/XMakeBuildEngine/UnitTests/Evaluation/Evaluator_Tests.cs index 1b0015fadc2..813b039317c 100644 --- a/src/XMakeBuildEngine/UnitTests/Evaluation/Evaluator_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/Evaluation/Evaluator_Tests.cs @@ -5,30 +5,22 @@ // Tests for evaluation //----------------------------------------------------------------------- +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.VisualStudio.TestTools.UnitTesting; using System; -using System.Xml; -using System.Reflection; using System.Collections; using System.Collections.Generic; -using System.Collections.Specialized; -using System.Linq; -using System.Text.RegularExpressions; -using System.Globalization; using System.IO; +using System.Linq; using System.Net; using System.Threading; - -using Microsoft.VisualStudio.TestTools.UnitTesting; - -using Microsoft.Build.Collections; -using Microsoft.Build.Framework; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Execution; -using Microsoft.Build.BackEnd; -using ProjectHelpers = Microsoft.Build.UnitTests.BackEnd.ProjectHelpers; +using System.Xml; using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; -using Microsoft.Build.Construction; -using Microsoft.Build.Shared; namespace Microsoft.Build.UnitTests.Evaluation { diff --git a/src/XMakeBuildEngine/UnitTests/Evaluation/Expander_Tests.cs b/src/XMakeBuildEngine/UnitTests/Evaluation/Expander_Tests.cs index 175f3c148f4..d26cb98f61b 100644 --- a/src/XMakeBuildEngine/UnitTests/Evaluation/Expander_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/Evaluation/Expander_Tests.cs @@ -1,35 +1,28 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Linq; -using System.Xml; -using System.Reflection; -using System.Collections; -using System.Collections.Generic; -using System.Collections.Specialized; -using System.Text.RegularExpressions; - -using Microsoft.VisualStudio.TestTools.UnitTesting; - +using Microsoft.Build.BackEnd; using Microsoft.Build.Collections; -using Microsoft.Build.Framework; using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; -using Microsoft.Build.BackEnd; +using Microsoft.Build.Framework; +using Microsoft.Build.Internal; using Microsoft.Build.Shared; - -using ProjectHelpers = Microsoft.Build.UnitTests.BackEnd.ProjectHelpers; -using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; -using ProjectItemInstanceFactory = Microsoft.Build.Execution.ProjectItemInstance.TaskItem.ProjectItemInstanceFactory; - -using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException; +using Microsoft.Build.Utilities; +using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Win32; -using System.Text; -using System.IO; -using Microsoft.Build.Internal; +using System; +using System.Collections; +using System.Collections.Generic; using System.Globalization; -using Microsoft.Build.Utilities; +using System.IO; +using System.Linq; +using System.Text; +using System.Xml; +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; namespace Microsoft.Build.UnitTests.Evaluation { diff --git a/src/XMakeBuildEngine/UnitTests/Evaluation/ExpressionShredder_Tests.cs b/src/XMakeBuildEngine/UnitTests/Evaluation/ExpressionShredder_Tests.cs index 445137c44ce..5b088640a60 100644 --- a/src/XMakeBuildEngine/UnitTests/Evaluation/ExpressionShredder_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/Evaluation/ExpressionShredder_Tests.cs @@ -1,16 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Evaluation; +using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; using System.Collections; using System.Collections.Generic; -using System.Text; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; -using Microsoft.Build.Evaluation; -using Microsoft.Build.BackEnd; -using Microsoft.Build.Shared; -using System.Xml; using System.Text.RegularExpressions; namespace Microsoft.Build.UnitTests.Evaluation diff --git a/src/XMakeBuildEngine/UnitTests/Evaluation/Preprocessor_Tests.cs b/src/XMakeBuildEngine/UnitTests/Evaluation/Preprocessor_Tests.cs index 3bf4d252b53..16a9ab449aa 100644 --- a/src/XMakeBuildEngine/UnitTests/Evaluation/Preprocessor_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/Evaluation/Preprocessor_Tests.cs @@ -5,18 +5,12 @@ // Tests for preprocessor //----------------------------------------------------------------------- -using System; -using System.Xml; -using System.Collections.Generic; -using System.Linq; -using System.Globalization; - -using Microsoft.VisualStudio.TestTools.UnitTesting; - -using Microsoft.Build.Framework; -using Microsoft.Build.Evaluation; using Microsoft.Build.Construction; +using Microsoft.Build.Evaluation; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; using System.IO; +using System.Xml; namespace Microsoft.Build.UnitTests.Preprocessor { diff --git a/src/XMakeBuildEngine/UnitTests/Evaluation/ProjectRootElementCache_Tests.cs b/src/XMakeBuildEngine/UnitTests/Evaluation/ProjectRootElementCache_Tests.cs index c9abb00b56f..293f1d94475 100644 --- a/src/XMakeBuildEngine/UnitTests/Evaluation/ProjectRootElementCache_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/Evaluation/ProjectRootElementCache_Tests.cs @@ -5,17 +5,13 @@ // Tests for ProjectRootElementCache //----------------------------------------------------------------------- -using System.Collections.Generic; -using Microsoft.Build.Execution; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Microsoft.Build.Construction; using Microsoft.Build.Evaluation; -using Microsoft.Build.Collections; -using Microsoft.Build.Framework; -using System.Collections; +using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; -using Microsoft.Build.Construction; +using System.Collections.Generic; using System.IO; -using Microsoft.Build.Shared; namespace Microsoft.Build.UnitTests.OM.Evaluation { diff --git a/src/XMakeBuildEngine/UnitTests/Evaluation/ProjectStringCache_Tests.cs b/src/XMakeBuildEngine/UnitTests/Evaluation/ProjectStringCache_Tests.cs index 1396dbc12b6..d2ef98f8598 100644 --- a/src/XMakeBuildEngine/UnitTests/Evaluation/ProjectStringCache_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/Evaluation/ProjectStringCache_Tests.cs @@ -5,13 +5,13 @@ // Tests for ProjectStringCache //----------------------------------------------------------------------- -using System.IO; -using System.Text; -using System.Xml; using Microsoft.Build.Construction; using Microsoft.Build.Evaluation; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System.IO; +using System.Text; +using System.Xml; namespace Microsoft.Build.UnitTests.OM.Evaluation { diff --git a/src/XMakeBuildEngine/UnitTests/EventArgsFormatting_Tests.cs b/src/XMakeBuildEngine/UnitTests/EventArgsFormatting_Tests.cs index 357ef488ce3..f023886caac 100644 --- a/src/XMakeBuildEngine/UnitTests/EventArgsFormatting_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/EventArgsFormatting_Tests.cs @@ -1,10 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Framework; using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeBuildEngine/UnitTests/ExpressionTree_Tests.cs b/src/XMakeBuildEngine/UnitTests/ExpressionTree_Tests.cs index 2736ab5033c..a970fe8dfa9 100644 --- a/src/XMakeBuildEngine/UnitTests/ExpressionTree_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/ExpressionTree_Tests.cs @@ -1,22 +1,16 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Globalization; -using System.Reflection; -using System.Collections; -using System.IO; -using System.Xml; -using System.Collections.Specialized; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Collections; using Microsoft.Build.Construction; -using Microsoft.Build.Framework; using Microsoft.Build.Evaluation; using Microsoft.Build.Exceptions; using Microsoft.Build.Execution; -using System.Collections.Generic; using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections.Generic; +using System.IO; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeBuildEngine/UnitTests/FileLogger_Tests.cs b/src/XMakeBuildEngine/UnitTests/FileLogger_Tests.cs index 423f9f26570..ed8bfa1c057 100644 --- a/src/XMakeBuildEngine/UnitTests/FileLogger_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/FileLogger_Tests.cs @@ -1,17 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Collections.Generic; -using System.Text; - -using Microsoft.VisualStudio.TestTools.UnitTesting; - using Microsoft.Build.Framework; using Microsoft.Build.Logging; using Microsoft.Build.Shared; - +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.IO; using EventSourceSink = Microsoft.Build.BackEnd.Logging.EventSourceSink; using Project = Microsoft.Build.Evaluation.Project; diff --git a/src/XMakeBuildEngine/UnitTests/HashTableUtility_Tests.cs b/src/XMakeBuildEngine/UnitTests/HashTableUtility_Tests.cs index d50a9fc550a..9c90d440aea 100644 --- a/src/XMakeBuildEngine/UnitTests/HashTableUtility_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/HashTableUtility_Tests.cs @@ -1,14 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Xml; -using System.Collections; -using System.Text.RegularExpressions; - -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Collections; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System.Collections.Generic; namespace Microsoft.Build.UnitTests diff --git a/src/XMakeBuildEngine/UnitTests/Instance/HostServices_Tests.cs b/src/XMakeBuildEngine/UnitTests/Instance/HostServices_Tests.cs index cd7affe34a4..8e1db14e9b2 100644 --- a/src/XMakeBuildEngine/UnitTests/Instance/HostServices_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/Instance/HostServices_Tests.cs @@ -5,14 +5,14 @@ // Tests for TaskItem internal members //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.IO; -using System.Xml; using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; using Microsoft.Build.Framework; using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections.Generic; +using System.IO; +using System.Xml; namespace Microsoft.Build.UnitTests.OM.Instance { diff --git a/src/XMakeBuildEngine/UnitTests/Instance/ProjectInstance_Internal_Tests.cs b/src/XMakeBuildEngine/UnitTests/Instance/ProjectInstance_Internal_Tests.cs index da293cc5eed..bb28573c7ce 100644 --- a/src/XMakeBuildEngine/UnitTests/Instance/ProjectInstance_Internal_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/Instance/ProjectInstance_Internal_Tests.cs @@ -5,17 +5,17 @@ // Tests for ProjectInstance internal members //----------------------------------------------------------------------- -using System.Collections.Generic; -using Microsoft.Build.Execution; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Microsoft.Build.Construction; using Microsoft.Build.Evaluation; +using Microsoft.Build.Execution; using Microsoft.Build.Framework; -using System.Collections; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; -using Microsoft.Build.Construction; +using System.Collections; +using System.Collections.Generic; using System.IO; -using System.Xml; using System.Linq; +using System.Xml; namespace Microsoft.Build.UnitTests.OM.Instance { diff --git a/src/XMakeBuildEngine/UnitTests/Instance/ProjectMetadataInstance_Internal_Tests.cs b/src/XMakeBuildEngine/UnitTests/Instance/ProjectMetadataInstance_Internal_Tests.cs index 35c27a0490d..b4a54258030 100644 --- a/src/XMakeBuildEngine/UnitTests/Instance/ProjectMetadataInstance_Internal_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/Instance/ProjectMetadataInstance_Internal_Tests.cs @@ -5,13 +5,11 @@ // Tests for ProjectMetadataInstance internal members //----------------------------------------------------------------------- -using System.Collections.Generic; +using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; +using Microsoft.Build.UnitTests.BackEnd; using Microsoft.VisualStudio.TestTools.UnitTesting; using System; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Construction; -using Microsoft.Build.UnitTests.BackEnd; namespace Microsoft.Build.UnitTests.OM.Instance { diff --git a/src/XMakeBuildEngine/UnitTests/Instance/ProjectPropertyInstance_Internal_Tests.cs b/src/XMakeBuildEngine/UnitTests/Instance/ProjectPropertyInstance_Internal_Tests.cs index a3da7b94656..99bd48bc098 100644 --- a/src/XMakeBuildEngine/UnitTests/Instance/ProjectPropertyInstance_Internal_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/Instance/ProjectPropertyInstance_Internal_Tests.cs @@ -5,14 +5,11 @@ // Tests for ProjectPropertyInstance internal members //----------------------------------------------------------------------- -using System.Collections.Generic; +using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; -using Microsoft.Build.Shared; +using Microsoft.Build.UnitTests.BackEnd; using Microsoft.VisualStudio.TestTools.UnitTesting; using System; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Construction; -using Microsoft.Build.UnitTests.BackEnd; namespace Microsoft.Build.UnitTests.OM.Instance { diff --git a/src/XMakeBuildEngine/UnitTests/Instance/TaskItem_Tests.cs b/src/XMakeBuildEngine/UnitTests/Instance/TaskItem_Tests.cs index 7d82d2c6221..2911fda4636 100644 --- a/src/XMakeBuildEngine/UnitTests/Instance/TaskItem_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/Instance/TaskItem_Tests.cs @@ -5,18 +5,15 @@ // Tests for TaskItem internal members //----------------------------------------------------------------------- -using System.Collections.Generic; -using Microsoft.Build.Execution; -using Microsoft.Build.Shared; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using System; -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.Evaluation; using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using Microsoft.Build.UnitTests.BackEnd; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System.IO; +using System.Xml; +using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; namespace Microsoft.Build.UnitTests.OM.Instance { diff --git a/src/XMakeBuildEngine/UnitTests/InvalidProjectFileException_Tests.cs b/src/XMakeBuildEngine/UnitTests/InvalidProjectFileException_Tests.cs index f54e59834cd..2c1ab2e43aa 100644 --- a/src/XMakeBuildEngine/UnitTests/InvalidProjectFileException_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/InvalidProjectFileException_Tests.cs @@ -1,16 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Exceptions; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; -using System.Reflection; -using System.Collections; -using System.Runtime.Serialization; -using System.Runtime.Serialization.Formatters.Binary; using System.IO; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; -using Microsoft.Build.Exceptions; -using System.Text.RegularExpressions; +using System.Runtime.Serialization.Formatters.Binary; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeBuildEngine/UnitTests/LogFormatter_Tests.cs b/src/XMakeBuildEngine/UnitTests/LogFormatter_Tests.cs index 1d673bc72de..2a7e3515e7b 100644 --- a/src/XMakeBuildEngine/UnitTests/LogFormatter_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/LogFormatter_Tests.cs @@ -1,13 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Reflection; -using System.Collections; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; using Microsoft.Build.BackEnd.Logging; -using System.Text.RegularExpressions; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; using System.Globalization; namespace Microsoft.Build.UnitTests diff --git a/src/XMakeBuildEngine/UnitTests/LoggerDescription_Tests.cs b/src/XMakeBuildEngine/UnitTests/LoggerDescription_Tests.cs index d4c5e7664c2..5c64d713611 100644 --- a/src/XMakeBuildEngine/UnitTests/LoggerDescription_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/LoggerDescription_Tests.cs @@ -1,15 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections.Generic; -using System.Text; +using Microsoft.Build.Framework; +using Microsoft.Build.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; using System.IO; -using Microsoft.Build.Logging; -using Microsoft.Build.Framework; - namespace Microsoft.Build.UnitTests { [TestClass] diff --git a/src/XMakeBuildEngine/UnitTests/LoggerException_Tests.cs b/src/XMakeBuildEngine/UnitTests/LoggerException_Tests.cs index 7ba51581f5b..47ac7c1c65f 100644 --- a/src/XMakeBuildEngine/UnitTests/LoggerException_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/LoggerException_Tests.cs @@ -1,16 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Exceptions; +using Microsoft.Build.Framework; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; -using System.Reflection; -using System.Collections; -using System.Runtime.Serialization; -using System.Runtime.Serialization.Formatters.Binary; using System.IO; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; -using Microsoft.Build.Exceptions; -using System.Text.RegularExpressions; +using System.Runtime.Serialization.Formatters.Binary; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeBuildEngine/UnitTests/MockElementLocation.cs b/src/XMakeBuildEngine/UnitTests/MockElementLocation.cs index 0ed9458de79..7cba4274236 100644 --- a/src/XMakeBuildEngine/UnitTests/MockElementLocation.cs +++ b/src/XMakeBuildEngine/UnitTests/MockElementLocation.cs @@ -6,10 +6,6 @@ //----------------------------------------------------------------------- using Microsoft.Build.Construction; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.Build.BackEnd; -using System; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeBuildEngine/UnitTests/MockTask.cs b/src/XMakeBuildEngine/UnitTests/MockTask.cs index fcdd9fcdbe7..cdfaefabb21 100644 --- a/src/XMakeBuildEngine/UnitTests/MockTask.cs +++ b/src/XMakeBuildEngine/UnitTests/MockTask.cs @@ -1,13 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; using System; -using System.IO; -using System.Reflection; using System.Collections; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; -using Microsoft.Build.Execution; using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; namespace Microsoft.Build.UnitTests diff --git a/src/XMakeBuildEngine/UnitTests/OpportunisticIntern_Tests.cs b/src/XMakeBuildEngine/UnitTests/OpportunisticIntern_Tests.cs index 1aa5e288f5f..655c4e61783 100644 --- a/src/XMakeBuildEngine/UnitTests/OpportunisticIntern_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/OpportunisticIntern_Tests.cs @@ -1,13 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; -using System.Collections.Generic; using System.Text; -using System.IO; -using Microsoft.Build; - -using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeBuildEngine/UnitTests/Parser_Tests.cs b/src/XMakeBuildEngine/UnitTests/Parser_Tests.cs index 74f0b6550d0..ee1b279451c 100644 --- a/src/XMakeBuildEngine/UnitTests/Parser_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/Parser_Tests.cs @@ -1,13 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Globalization; -using System.Reflection; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; using Microsoft.Build.Evaluation; using Microsoft.Build.Exceptions; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Reflection; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeBuildEngine/UnitTests/Scanner_Tests.cs b/src/XMakeBuildEngine/UnitTests/Scanner_Tests.cs index b2acd264358..ef13e55570f 100644 --- a/src/XMakeBuildEngine/UnitTests/Scanner_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/Scanner_Tests.cs @@ -1,13 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Globalization; -using System.Reflection; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; using Microsoft.Build.Evaluation; using Microsoft.Build.Exceptions; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeBuildEngine/UnitTests/TargetsFile_Test.cs b/src/XMakeBuildEngine/UnitTests/TargetsFile_Test.cs index 05bbc854e2f..f00ea61b2a8 100644 --- a/src/XMakeBuildEngine/UnitTests/TargetsFile_Test.cs +++ b/src/XMakeBuildEngine/UnitTests/TargetsFile_Test.cs @@ -5,19 +5,11 @@ // Moved from Orcas Engine //----------------------------------------------------------------------- +using Microsoft.Build.Evaluation; +using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; using System.IO; -using System.Text; -using System.Threading; -using System.Reflection; -using System.Collections; -using System.Collections.Generic; -using System.Diagnostics; - -using Microsoft.VisualStudio.TestTools.UnitTesting; - -using Microsoft.Build.Shared; -using Microsoft.Build.Evaluation; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeBuildEngine/UnitTests/TestUtilities.cs b/src/XMakeBuildEngine/UnitTests/TestUtilities.cs index 9d1c481fd5e..361890a315b 100644 --- a/src/XMakeBuildEngine/UnitTests/TestUtilities.cs +++ b/src/XMakeBuildEngine/UnitTests/TestUtilities.cs @@ -1,12 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using Microsoft.Build.BackEnd; using Microsoft.Build.Execution; +using System; using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem; namespace Microsoft.Build.Unittest diff --git a/src/XMakeBuildEngine/UnitTests/Utilities_Tests.cs b/src/XMakeBuildEngine/UnitTests/Utilities_Tests.cs index 4b89e845351..10c04e7e430 100644 --- a/src/XMakeBuildEngine/UnitTests/Utilities_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/Utilities_Tests.cs @@ -1,34 +1,22 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; -using System.IO; -using System.Xml; -using System.Reflection; using System.Collections; -using System.Collections.Specialized; -using System.Text.RegularExpressions; - -using Microsoft.VisualStudio.TestTools.UnitTesting; - -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; using System.Collections.Generic; - -using Toolset = Microsoft.Build.Evaluation.Toolset; -using Project = Microsoft.Build.Evaluation.Project; -using ProjectCollection = Microsoft.Build.Evaluation.ProjectCollection; - -using InternalUtilities = Microsoft.Build.Internal.Utilities; +using System.IO; 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 Project = Microsoft.Build.Evaluation.Project; +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 MSBuildApp = Microsoft.Build.CommandLine.MSBuildApp; - namespace Microsoft.Build.UnitTests { [TestClass] diff --git a/src/XMakeBuildEngine/Utilities/EngineFileUtilities.cs b/src/XMakeBuildEngine/Utilities/EngineFileUtilities.cs index 790f5852dac..593004ba9b4 100644 --- a/src/XMakeBuildEngine/Utilities/EngineFileUtilities.cs +++ b/src/XMakeBuildEngine/Utilities/EngineFileUtilities.cs @@ -1,11 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections.Generic; -using System.Text; -using System.IO; using Microsoft.Build.Shared; +using System; namespace Microsoft.Build.Internal { diff --git a/src/XMakeBuildEngine/Utilities/RegistryKeyWrapper.cs b/src/XMakeBuildEngine/Utilities/RegistryKeyWrapper.cs index a062fd683c8..b5ea04ac191 100644 --- a/src/XMakeBuildEngine/Utilities/RegistryKeyWrapper.cs +++ b/src/XMakeBuildEngine/Utilities/RegistryKeyWrapper.cs @@ -1,14 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Security; - using Microsoft.Build.Shared; using Microsoft.Win32; +using System; using RegistryException = Microsoft.Build.Exceptions.RegistryException; namespace Microsoft.Build.Internal diff --git a/src/XMakeBuildEngine/Utilities/Utilities.cs b/src/XMakeBuildEngine/Utilities/Utilities.cs index d17d05266fe..cbb9555d788 100644 --- a/src/XMakeBuildEngine/Utilities/Utilities.cs +++ b/src/XMakeBuildEngine/Utilities/Utilities.cs @@ -1,27 +1,15 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Collections; +using Microsoft.Build.Execution; +using Microsoft.Build.Shared; using System; -using System.Xml; -using System.Diagnostics; using System.Collections; using System.Collections.Generic; -using System.Collections.Specialized; using System.IO; -using System.IO.Pipes; -using System.Text; using System.Text.RegularExpressions; -using System.Globalization; -using System.Xml.Serialization; -using System.Security; -using System.Security.Policy; -using System.Security.Permissions; - -using Microsoft.Build.Collections; -using Microsoft.Build.Execution; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.Build.Evaluation; +using System.Xml; using Toolset = Microsoft.Build.Evaluation.Toolset; using XmlElementWithLocation = Microsoft.Build.Construction.XmlElementWithLocation; diff --git a/src/XMakeBuildEngine/Xml/ProjectXmlUtilities.cs b/src/XMakeBuildEngine/Xml/ProjectXmlUtilities.cs index 76ba2e5da65..2a56ed346f5 100644 --- a/src/XMakeBuildEngine/Xml/ProjectXmlUtilities.cs +++ b/src/XMakeBuildEngine/Xml/ProjectXmlUtilities.cs @@ -1,12 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Construction; +using Microsoft.Build.Shared; using System; using System.Collections.Generic; -using System.Text; using System.Xml; -using Microsoft.Build.Shared; -using Microsoft.Build.Construction; namespace Microsoft.Build.Internal { diff --git a/src/XMakeCommandLine/AssemblyResources.cs b/src/XMakeCommandLine/AssemblyResources.cs index b66368debad..3a12aa417ff 100644 --- a/src/XMakeCommandLine/AssemblyResources.cs +++ b/src/XMakeCommandLine/AssemblyResources.cs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Resources; -using System.Reflection; using System.Globalization; +using System.Reflection; +using System.Resources; namespace Microsoft.Build.Shared { diff --git a/src/XMakeCommandLine/CommandLineSwitchException.cs b/src/XMakeCommandLine/CommandLineSwitchException.cs index 7c602cbff41..bd5bef64b0a 100644 --- a/src/XMakeCommandLine/CommandLineSwitchException.cs +++ b/src/XMakeCommandLine/CommandLineSwitchException.cs @@ -2,10 +2,8 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Globalization; using System.Runtime.Serialization; using System.Security.Permissions; - using Microsoft.Build.Shared; namespace Microsoft.Build.CommandLine @@ -96,7 +94,7 @@ internal string CommandLineArg /// /// Serialize the contents of the class. /// - [SecurityPermissionAttribute(SecurityAction.Demand, SerializationFormatter = true)] + [SecurityPermission(SecurityAction.Demand, SerializationFormatter = true)] public override void GetObjectData(SerializationInfo info, StreamingContext context) { base.GetObjectData(info, context); diff --git a/src/XMakeCommandLine/DistributedLoggerRecord.cs b/src/XMakeCommandLine/DistributedLoggerRecord.cs index dd2d0dada2e..e644cc4076d 100644 --- a/src/XMakeCommandLine/DistributedLoggerRecord.cs +++ b/src/XMakeCommandLine/DistributedLoggerRecord.cs @@ -2,7 +2,6 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using Microsoft.Build.Framework; -using Microsoft.Build.Shared; using Microsoft.Build.Logging; namespace Microsoft.Build.CommandLine diff --git a/src/XMakeCommandLine/InitializationException.cs b/src/XMakeCommandLine/InitializationException.cs index 0c723268bda..eb5fb67988e 100644 --- a/src/XMakeCommandLine/InitializationException.cs +++ b/src/XMakeCommandLine/InitializationException.cs @@ -2,11 +2,8 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Reflection; -using System.Globalization; using System.Runtime.Serialization; using System.Security.Permissions; - using Microsoft.Build.Shared; namespace Microsoft.Build.CommandLine @@ -97,7 +94,7 @@ public override string Message /// /// Serialize the contents of the class. /// - [SecurityPermissionAttribute(SecurityAction.Demand, SerializationFormatter = true)] + [SecurityPermission(SecurityAction.Demand, SerializationFormatter = true)] public override void GetObjectData(SerializationInfo info, StreamingContext context) { base.GetObjectData(info, context); @@ -158,7 +155,7 @@ internal static void Throw(string messageResourceName, string invalidSwitch, Exc errorMessage = ResourceUtilities.FormatString(errorMessage, ((e == null) ? String.Empty : e.Message)); } - InitializationException.Throw(errorMessage, invalidSwitch); + Throw(errorMessage, invalidSwitch); } /// diff --git a/src/XMakeCommandLine/NodeEndpointOutOfProcTaskHost.cs b/src/XMakeCommandLine/NodeEndpointOutOfProcTaskHost.cs index b606095a424..f3f27e4cc23 100644 --- a/src/XMakeCommandLine/NodeEndpointOutOfProcTaskHost.cs +++ b/src/XMakeCommandLine/NodeEndpointOutOfProcTaskHost.cs @@ -5,9 +5,6 @@ // Implementation of a node endpoint for out-of-proc nodes. //----------------------------------------------------------------------- -using System; -using System.IO.Pipes; - using Microsoft.Build.BackEnd; using Microsoft.Build.Internal; diff --git a/src/XMakeCommandLine/OutOfProcTaskAppDomainWrapper.cs b/src/XMakeCommandLine/OutOfProcTaskAppDomainWrapper.cs index 88bf7624007..ab0adfeba9c 100644 --- a/src/XMakeCommandLine/OutOfProcTaskAppDomainWrapper.cs +++ b/src/XMakeCommandLine/OutOfProcTaskAppDomainWrapper.cs @@ -6,8 +6,6 @@ //----------------------------------------------------------------------- using System; -using Microsoft.Build.Shared; -using Microsoft.Build.Internal; using Microsoft.Build.Framework; namespace Microsoft.Build.CommandLine diff --git a/src/XMakeCommandLine/OutOfProcTaskAppDomainWrapperBase.cs b/src/XMakeCommandLine/OutOfProcTaskAppDomainWrapperBase.cs index 913ad6e5c28..6c205cf9c26 100644 --- a/src/XMakeCommandLine/OutOfProcTaskAppDomainWrapperBase.cs +++ b/src/XMakeCommandLine/OutOfProcTaskAppDomainWrapperBase.cs @@ -6,24 +6,12 @@ //----------------------------------------------------------------------- using System; -using System.Collections; using System.Collections.Generic; -using System.Diagnostics; -using System.Diagnostics.CodeAnalysis; -using System.IO; -using System.Linq; -using System.Text; -using System.Globalization; -using System.Threading; using System.Reflection; -using System.Runtime.CompilerServices; - +using System.Threading; using Microsoft.Build.BackEnd; -using Microsoft.Build.Execution; using Microsoft.Build.Framework; -using Microsoft.Build.Internal; using Microsoft.Build.Shared; -using System.Runtime.Remoting; namespace Microsoft.Build.CommandLine { diff --git a/src/XMakeCommandLine/OutOfProcTaskHostNode.cs b/src/XMakeCommandLine/OutOfProcTaskHostNode.cs index ee892862ada..4da8274b2ad 100644 --- a/src/XMakeCommandLine/OutOfProcTaskHostNode.cs +++ b/src/XMakeCommandLine/OutOfProcTaskHostNode.cs @@ -9,21 +9,15 @@ using System.Collections; using System.Collections.Generic; using System.Diagnostics; -using System.Diagnostics.CodeAnalysis; -using System.IO; -using System.Linq; -using System.Text; using System.Globalization; +using System.IO; +using System.Runtime.Remoting; using System.Threading; -using System.Reflection; -using System.Runtime.CompilerServices; - using Microsoft.Build.BackEnd; using Microsoft.Build.Execution; using Microsoft.Build.Framework; using Microsoft.Build.Internal; using Microsoft.Build.Shared; -using System.Runtime.Remoting; namespace Microsoft.Build.CommandLine { diff --git a/src/XMakeCommandLine/ProjectSchemaValidationHandler.cs b/src/XMakeCommandLine/ProjectSchemaValidationHandler.cs index 63220ffcf3e..1871a20f692 100644 --- a/src/XMakeCommandLine/ProjectSchemaValidationHandler.cs +++ b/src/XMakeCommandLine/ProjectSchemaValidationHandler.cs @@ -5,8 +5,6 @@ using System.IO; using System.Xml; using System.Xml.Schema; - -using Microsoft.Build.Framework; using Microsoft.Build.Shared; namespace Microsoft.Build.CommandLine diff --git a/src/XMakeCommandLine/UnitTests/CommandLineSwitches_Tests.cs b/src/XMakeCommandLine/UnitTests/CommandLineSwitches_Tests.cs index 986b04e511f..2a9859daba9 100644 --- a/src/XMakeCommandLine/UnitTests/CommandLineSwitches_Tests.cs +++ b/src/XMakeCommandLine/UnitTests/CommandLineSwitches_Tests.cs @@ -1,17 +1,14 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections; -using System.Collections.Generic; -using System.IO; - using Microsoft.Build.CommandLine; using Microsoft.Build.Construction; using Microsoft.Build.Framework; using Microsoft.Build.Shared; - using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections.Generic; +using System.IO; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeCommandLine/UnitTests/ProjectSchemaValidationHandler_Tests.cs b/src/XMakeCommandLine/UnitTests/ProjectSchemaValidationHandler_Tests.cs index f50f4ee5852..e8262995f3c 100644 --- a/src/XMakeCommandLine/UnitTests/ProjectSchemaValidationHandler_Tests.cs +++ b/src/XMakeCommandLine/UnitTests/ProjectSchemaValidationHandler_Tests.cs @@ -1,16 +1,13 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.CommandLine; +using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; using System.IO; using System.Reflection; -using System.Resources; using System.Threading; -using System.Xml; -using Microsoft.Build.CommandLine; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeCommandLine/UnitTests/XMake_Tests.cs b/src/XMakeCommandLine/UnitTests/XMake_Tests.cs index 29972aad994..ee1c78a20f1 100644 --- a/src/XMakeCommandLine/UnitTests/XMake_Tests.cs +++ b/src/XMakeCommandLine/UnitTests/XMake_Tests.cs @@ -1,23 +1,19 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.CommandLine; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; using System.Collections; using System.Collections.Generic; using System.Diagnostics; using System.Globalization; using System.IO; -using System.Reflection; -using System.Text; using System.Threading; -using Microsoft.Build.CommandLine; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.Build.Utilities; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Evaluation; - namespace Microsoft.Build.UnitTests { [TestClass] diff --git a/src/XMakeCommandLine/XMake.cs b/src/XMakeCommandLine/XMake.cs index 13a0e54b9ca..a4c2f5b6ef4 100644 --- a/src/XMakeCommandLine/XMake.cs +++ b/src/XMakeCommandLine/XMake.cs @@ -2,26 +2,23 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Configuration; using System.Collections; using System.Collections.Generic; +using System.Configuration; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Globalization; using System.IO; -using System.Resources; using System.Reflection; using System.Security; using System.Text; using System.Threading; -using System.Xml; - -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.Build.BackEnd; -using Microsoft.Build.Execution; using Microsoft.Build.Evaluation; using Microsoft.Build.Exceptions; +using Microsoft.Build.Execution; +using Microsoft.Build.Framework; +using Microsoft.Build.Logging; +using Microsoft.Build.Shared; #if (!STANDALONEBUILD) using Microsoft.Internal.Performance; #endif @@ -29,12 +26,6 @@ using Microsoft.VisualStudio.Profiler; #endif -using FileLogger = Microsoft.Build.Logging.FileLogger; -using ConsoleLogger = Microsoft.Build.Logging.ConsoleLogger; -using LoggerDescription = Microsoft.Build.Logging.LoggerDescription; -using ForwardingLoggerRecord = Microsoft.Build.Logging.ForwardingLoggerRecord; -using System.Runtime.CompilerServices; - namespace Microsoft.Build.CommandLine { /// @@ -904,7 +895,7 @@ bool detailedSummary globalProperties, loggers, null, - Microsoft.Build.Evaluation.ToolsetDefinitionLocations.ConfigurationFile | Microsoft.Build.Evaluation.ToolsetDefinitionLocations.Registry, + ToolsetDefinitionLocations.ConfigurationFile | ToolsetDefinitionLocations.Registry, cpuCount, onlyLogCriticalEvents ); @@ -925,8 +916,8 @@ bool detailedSummary // If the user has requested that the schema be validated, do that here. if (needToValidateProject && !FileUtilities.IsSolutionFilename(projectFile)) { - Microsoft.Build.Evaluation.Project project = projectCollection.LoadProject(projectFile, globalProperties, toolsVersion); - Microsoft.Build.Evaluation.Toolset toolset = projectCollection.GetToolset((toolsVersion == null) ? project.ToolsVersion : toolsVersion); + Project project = projectCollection.LoadProject(projectFile, globalProperties, toolsVersion); + Toolset toolset = projectCollection.GetToolset((toolsVersion == null) ? project.ToolsVersion : toolsVersion); if (toolset == null) { @@ -967,7 +958,7 @@ bool detailedSummary parameters.MaxNodeCount = cpuCount; parameters.Loggers = projectCollection.Loggers; parameters.ForwardingLoggers = remoteLoggerRecords; - parameters.ToolsetDefinitionLocations = Microsoft.Build.Evaluation.ToolsetDefinitionLocations.ConfigurationFile | Microsoft.Build.Evaluation.ToolsetDefinitionLocations.Registry; + parameters.ToolsetDefinitionLocations = ToolsetDefinitionLocations.ConfigurationFile | ToolsetDefinitionLocations.Registry; parameters.DetailedSummary = detailedSummary; if (!String.IsNullOrEmpty(toolsVersion)) { @@ -1205,7 +1196,7 @@ internal static void SetConsoleUI() try { - codepage = System.Console.OutputEncoding.CodePage; + codepage = Console.OutputEncoding.CodePage; } catch (NotSupportedException) { diff --git a/src/XMakeTasks/Al.cs b/src/XMakeTasks/Al.cs index ca4e638927d..125c4f2615f 100644 --- a/src/XMakeTasks/Al.cs +++ b/src/XMakeTasks/Al.cs @@ -1,17 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Text; -using System.Resources; -using System.Reflection; -using System.Diagnostics; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; +using System; +using System.IO; -using System.Collections; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AppConfig/AppConfig.cs b/src/XMakeTasks/AppConfig/AppConfig.cs index 865c3fcd377..a9391c772e9 100644 --- a/src/XMakeTasks/AppConfig/AppConfig.cs +++ b/src/XMakeTasks/AppConfig/AppConfig.cs @@ -1,13 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Shared; using System; -using System.IO; using System.Xml; -using System.Collections; -using System.Globalization; - -using Microsoft.Build.Shared; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AppConfig/BindingRedirect.cs b/src/XMakeTasks/AppConfig/BindingRedirect.cs index a63e4b9972c..3eb549e333f 100644 --- a/src/XMakeTasks/AppConfig/BindingRedirect.cs +++ b/src/XMakeTasks/AppConfig/BindingRedirect.cs @@ -1,10 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Shared; using System; using System.Xml; -using System.Collections; -using Microsoft.Build.Shared; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AppConfig/DependentAssembly.cs b/src/XMakeTasks/AppConfig/DependentAssembly.cs index 3ab37f13300..12eea52b503 100644 --- a/src/XMakeTasks/AppConfig/DependentAssembly.cs +++ b/src/XMakeTasks/AppConfig/DependentAssembly.cs @@ -1,13 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Shared; using System; -using System.Xml; -using System.Reflection; using System.Collections; using System.Globalization; - -using Microsoft.Build.Shared; +using System.Reflection; +using System.Xml; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AppConfig/RuntimeSection.cs b/src/XMakeTasks/AppConfig/RuntimeSection.cs index 0a7a5506744..29d03b51618 100644 --- a/src/XMakeTasks/AppConfig/RuntimeSection.cs +++ b/src/XMakeTasks/AppConfig/RuntimeSection.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Xml; using System.Collections; +using System.Xml; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AppDomainIsolatedTaskExtension.cs b/src/XMakeTasks/AppDomainIsolatedTaskExtension.cs index a3e5ef8f22a..3fca81386a1 100644 --- a/src/XMakeTasks/AppDomainIsolatedTaskExtension.cs +++ b/src/XMakeTasks/AppDomainIsolatedTaskExtension.cs @@ -1,10 +1,6 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Resources; -using System.Security.Permissions; using Microsoft.Build.Framework; using Microsoft.Build.Shared; diff --git a/src/XMakeTasks/AspNetCompiler.cs b/src/XMakeTasks/AspNetCompiler.cs index 1f541d8f94f..87539ee0362 100644 --- a/src/XMakeTasks/AspNetCompiler.cs +++ b/src/XMakeTasks/AspNetCompiler.cs @@ -1,10 +1,6 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Text; -using Microsoft.Build.Framework; using Microsoft.Build.Utilities; namespace Microsoft.Build.Tasks diff --git a/src/XMakeTasks/AssemblyDependency/AssemblyFoldersExResolver.cs b/src/XMakeTasks/AssemblyDependency/AssemblyFoldersExResolver.cs index 6bc1d3b01e6..1dc780970b6 100644 --- a/src/XMakeTasks/AssemblyDependency/AssemblyFoldersExResolver.cs +++ b/src/XMakeTasks/AssemblyDependency/AssemblyFoldersExResolver.cs @@ -1,18 +1,16 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; using System; using System.Collections; using System.Collections.Generic; using System.IO; -using System.Reflection; using System.Text.RegularExpressions; using System.Threading.Tasks; -using Microsoft.Build.Shared; -using Microsoft.Build.Utilities; -using Microsoft.Build.Framework; using ProcessorArchitecture = System.Reflection.ProcessorArchitecture; -using System.Diagnostics; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AssemblyDependency/AssemblyFoldersResolver.cs b/src/XMakeTasks/AssemblyDependency/AssemblyFoldersResolver.cs index a455c09e104..afb735e0cd2 100644 --- a/src/XMakeTasks/AssemblyDependency/AssemblyFoldersResolver.cs +++ b/src/XMakeTasks/AssemblyDependency/AssemblyFoldersResolver.cs @@ -1,10 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Shared; using System; -using System.Reflection; using System.Collections; -using Microsoft.Build.Shared; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AssemblyDependency/AssemblyInformation.cs b/src/XMakeTasks/AssemblyDependency/AssemblyInformation.cs index 3e0480324cf..1951ee39098 100644 --- a/src/XMakeTasks/AssemblyDependency/AssemblyInformation.cs +++ b/src/XMakeTasks/AssemblyDependency/AssemblyInformation.cs @@ -1,18 +1,14 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Shared; using System; -using System.IO; using System.Collections; using System.Globalization; -using System.Runtime.InteropServices; -using System.Diagnostics; using System.Reflection; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; -using System.Text; +using System.Runtime.InteropServices; using System.Runtime.Versioning; +using System.Text; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AssemblyDependency/AssemblyNameReference.cs b/src/XMakeTasks/AssemblyDependency/AssemblyNameReference.cs index 103fc26b050..784bbfbd2fe 100644 --- a/src/XMakeTasks/AssemblyDependency/AssemblyNameReference.cs +++ b/src/XMakeTasks/AssemblyDependency/AssemblyNameReference.cs @@ -1,16 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Collections; -using System.Globalization; -using System.Runtime.InteropServices; -using System.Diagnostics; -using System.Reflection; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; +using System; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AssemblyDependency/AssemblyResolution.cs b/src/XMakeTasks/AssemblyDependency/AssemblyResolution.cs index 3978c0183d2..43c7366bcb0 100644 --- a/src/XMakeTasks/AssemblyDependency/AssemblyResolution.cs +++ b/src/XMakeTasks/AssemblyDependency/AssemblyResolution.cs @@ -1,19 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Resources; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; -using System.Reflection; -using System.IO; +using System; using System.Collections; using System.Collections.Generic; -using System.Globalization; -using System.Diagnostics; -using System.Runtime.InteropServices; -using System.Text.RegularExpressions; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AssemblyDependency/AssemblyResolutionConstants.cs b/src/XMakeTasks/AssemblyDependency/AssemblyResolutionConstants.cs index 3a349782ad4..65463d5a009 100644 --- a/src/XMakeTasks/AssemblyDependency/AssemblyResolutionConstants.cs +++ b/src/XMakeTasks/AssemblyDependency/AssemblyResolutionConstants.cs @@ -1,18 +1,6 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Resources; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; -using System.Reflection; -using System.IO; -using System.Collections; -using System.Globalization; -using System.Diagnostics; -using System.Runtime.InteropServices; -using System.Text.RegularExpressions; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AssemblyDependency/BadImageReferenceException.cs b/src/XMakeTasks/AssemblyDependency/BadImageReferenceException.cs index 4e8ea9a177a..ccbebed6fa8 100644 --- a/src/XMakeTasks/AssemblyDependency/BadImageReferenceException.cs +++ b/src/XMakeTasks/AssemblyDependency/BadImageReferenceException.cs @@ -2,15 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.IO; -using System.Collections; -using System.Globalization; -using System.Runtime.InteropServices; using System.Runtime.Serialization; -using System.Diagnostics; -using System.Reflection; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AssemblyDependency/CandidateAssemblyFilesResolver.cs b/src/XMakeTasks/AssemblyDependency/CandidateAssemblyFilesResolver.cs index d014f979796..79252df4d34 100644 --- a/src/XMakeTasks/AssemblyDependency/CandidateAssemblyFilesResolver.cs +++ b/src/XMakeTasks/AssemblyDependency/CandidateAssemblyFilesResolver.cs @@ -1,11 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Shared; using System; -using System.Reflection; using System.Collections; -using Microsoft.Build.Shared; using System.Diagnostics; +using System.Reflection; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AssemblyDependency/ConflictLossReason.cs b/src/XMakeTasks/AssemblyDependency/ConflictLossReason.cs index c84d211c0ca..2da18124d67 100644 --- a/src/XMakeTasks/AssemblyDependency/ConflictLossReason.cs +++ b/src/XMakeTasks/AssemblyDependency/ConflictLossReason.cs @@ -1,14 +1,6 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Collections; -using System.Reflection; -using System.Diagnostics; -using System.Globalization; -using Microsoft.Build.Shared; -using Microsoft.Build.Framework; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AssemblyDependency/CopyLocalState.cs b/src/XMakeTasks/AssemblyDependency/CopyLocalState.cs index ece2762f8de..5c867fd070e 100644 --- a/src/XMakeTasks/AssemblyDependency/CopyLocalState.cs +++ b/src/XMakeTasks/AssemblyDependency/CopyLocalState.cs @@ -1,14 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Collections; -using System.Reflection; -using System.Diagnostics; -using System.Globalization; using Microsoft.Build.Shared; -using Microsoft.Build.Framework; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AssemblyDependency/DependencyResolutionException.cs b/src/XMakeTasks/AssemblyDependency/DependencyResolutionException.cs index 9968c033c0e..1821f403622 100644 --- a/src/XMakeTasks/AssemblyDependency/DependencyResolutionException.cs +++ b/src/XMakeTasks/AssemblyDependency/DependencyResolutionException.cs @@ -2,15 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.IO; -using System.Collections; -using System.Globalization; -using System.Runtime.InteropServices; using System.Runtime.Serialization; -using System.Diagnostics; -using System.Reflection; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AssemblyDependency/DirectoryResolver.cs b/src/XMakeTasks/AssemblyDependency/DirectoryResolver.cs index 27a0e7e0fca..776b8103c3a 100644 --- a/src/XMakeTasks/AssemblyDependency/DirectoryResolver.cs +++ b/src/XMakeTasks/AssemblyDependency/DirectoryResolver.cs @@ -1,10 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Shared; using System; -using System.Reflection; using System.Collections; -using Microsoft.Build.Shared; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AssemblyDependency/FrameworkPathResolver.cs b/src/XMakeTasks/AssemblyDependency/FrameworkPathResolver.cs index 2cefcfe3817..ab3fba159f1 100644 --- a/src/XMakeTasks/AssemblyDependency/FrameworkPathResolver.cs +++ b/src/XMakeTasks/AssemblyDependency/FrameworkPathResolver.cs @@ -1,10 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Shared; using System; -using System.Reflection; using System.Collections; -using Microsoft.Build.Shared; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AssemblyDependency/GacResolver.cs b/src/XMakeTasks/AssemblyDependency/GacResolver.cs index 2c4c898c16c..d85eb7f800f 100644 --- a/src/XMakeTasks/AssemblyDependency/GacResolver.cs +++ b/src/XMakeTasks/AssemblyDependency/GacResolver.cs @@ -1,12 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using System; -using System.Reflection; using System.Collections; -using Microsoft.Build.Shared; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AssemblyDependency/GenerateBindingRedirects.cs b/src/XMakeTasks/AssemblyDependency/GenerateBindingRedirects.cs index 12e292cb4b8..0a84c54bf29 100644 --- a/src/XMakeTasks/AssemblyDependency/GenerateBindingRedirects.cs +++ b/src/XMakeTasks/AssemblyDependency/GenerateBindingRedirects.cs @@ -5,18 +5,13 @@ // //------------------------------------------------------------------------------------------------- +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using System; using System.Collections.Generic; using System.Linq; -using System.Xml; -using System.Xml.Linq; - -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; -using System.Diagnostics; -using System.Text; using System.Reflection; +using System.Xml.Linq; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AssemblyDependency/GlobalAssemblyCache.cs b/src/XMakeTasks/AssemblyDependency/GlobalAssemblyCache.cs index c2a18ced3b2..c82685314ee 100644 --- a/src/XMakeTasks/AssemblyDependency/GlobalAssemblyCache.cs +++ b/src/XMakeTasks/AssemblyDependency/GlobalAssemblyCache.cs @@ -1,17 +1,17 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using System; using System.Collections; -using System.IO; -using System.Text; -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.Text; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AssemblyDependency/HintPathResolver.cs b/src/XMakeTasks/AssemblyDependency/HintPathResolver.cs index 197565198e5..2ec128e8c29 100644 --- a/src/XMakeTasks/AssemblyDependency/HintPathResolver.cs +++ b/src/XMakeTasks/AssemblyDependency/HintPathResolver.cs @@ -1,11 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Shared; using System; -using System.IO; -using System.Reflection; using System.Collections; -using Microsoft.Build.Shared; +using System.Reflection; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AssemblyDependency/InstalledAssemblies.cs b/src/XMakeTasks/AssemblyDependency/InstalledAssemblies.cs index 9abd81a7fe2..56a28f2c86c 100644 --- a/src/XMakeTasks/AssemblyDependency/InstalledAssemblies.cs +++ b/src/XMakeTasks/AssemblyDependency/InstalledAssemblies.cs @@ -1,17 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Collections; -using System.Globalization; -using System.Runtime.InteropServices; -using System.Diagnostics; -using System.Reflection; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; -using System.Collections.Generic; +using System; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AssemblyDependency/InvalidReferenceAssemblyNameException.cs b/src/XMakeTasks/AssemblyDependency/InvalidReferenceAssemblyNameException.cs index d1be31a8527..b2513dfdcb4 100644 --- a/src/XMakeTasks/AssemblyDependency/InvalidReferenceAssemblyNameException.cs +++ b/src/XMakeTasks/AssemblyDependency/InvalidReferenceAssemblyNameException.cs @@ -2,14 +2,6 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.IO; -using System.Collections; -using System.Globalization; -using System.Runtime.InteropServices; -using System.Diagnostics; -using System.Reflection; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using System.Runtime.Serialization; namespace Microsoft.Build.Tasks diff --git a/src/XMakeTasks/AssemblyDependency/NoMatchReason.cs b/src/XMakeTasks/AssemblyDependency/NoMatchReason.cs index 309c9371df3..af236df7190 100644 --- a/src/XMakeTasks/AssemblyDependency/NoMatchReason.cs +++ b/src/XMakeTasks/AssemblyDependency/NoMatchReason.cs @@ -1,17 +1,6 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Resources; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using System.Reflection; -using System.IO; -using System.Collections; -using System.Globalization; -using System.Diagnostics; -using System.Runtime.InteropServices; -using System.Text.RegularExpressions; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AssemblyDependency/RawFilenameResolver.cs b/src/XMakeTasks/AssemblyDependency/RawFilenameResolver.cs index f4d3ecfc35f..1d931b31b60 100644 --- a/src/XMakeTasks/AssemblyDependency/RawFilenameResolver.cs +++ b/src/XMakeTasks/AssemblyDependency/RawFilenameResolver.cs @@ -1,11 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Shared; using System; -using System.IO; -using System.Reflection; using System.Collections; -using Microsoft.Build.Shared; +using System.Reflection; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AssemblyDependency/Reference.cs b/src/XMakeTasks/AssemblyDependency/Reference.cs index 5cab716a992..6029327a572 100644 --- a/src/XMakeTasks/AssemblyDependency/Reference.cs +++ b/src/XMakeTasks/AssemblyDependency/Reference.cs @@ -1,15 +1,14 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using System; -using System.IO; using System.Collections; -using System.Reflection; -using System.Diagnostics; -using System.Globalization; using System.Collections.Generic; -using Microsoft.Build.Shared; -using Microsoft.Build.Framework; +using System.Diagnostics; +using System.IO; +using System.Reflection; using System.Runtime.Versioning; namespace Microsoft.Build.Tasks diff --git a/src/XMakeTasks/AssemblyDependency/ReferenceResolutionException.cs b/src/XMakeTasks/AssemblyDependency/ReferenceResolutionException.cs index 3121239f7c8..ca7d6d79637 100644 --- a/src/XMakeTasks/AssemblyDependency/ReferenceResolutionException.cs +++ b/src/XMakeTasks/AssemblyDependency/ReferenceResolutionException.cs @@ -2,14 +2,6 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.IO; -using System.Collections; -using System.Globalization; -using System.Runtime.InteropServices; -using System.Diagnostics; -using System.Reflection; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using System.Runtime.Serialization; namespace Microsoft.Build.Tasks diff --git a/src/XMakeTasks/AssemblyDependency/ResolutionSearchLocation.cs b/src/XMakeTasks/AssemblyDependency/ResolutionSearchLocation.cs index 6375db0d826..bc2cc7da826 100644 --- a/src/XMakeTasks/AssemblyDependency/ResolutionSearchLocation.cs +++ b/src/XMakeTasks/AssemblyDependency/ResolutionSearchLocation.cs @@ -1,17 +1,6 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Resources; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using System.Reflection; -using System.IO; -using System.Collections; -using System.Globalization; -using System.Diagnostics; -using System.Runtime.InteropServices; -using System.Text.RegularExpressions; using Microsoft.Build.Shared; namespace Microsoft.Build.Tasks diff --git a/src/XMakeTasks/AssemblyDependency/ResolveAssemblyReference.cs b/src/XMakeTasks/AssemblyDependency/ResolveAssemblyReference.cs index 35f343199b0..8a5c4444def 100644 --- a/src/XMakeTasks/AssemblyDependency/ResolveAssemblyReference.cs +++ b/src/XMakeTasks/AssemblyDependency/ResolveAssemblyReference.cs @@ -4,23 +4,18 @@ using System; using System.IO; using System.Diagnostics; -using System.Resources; using System.Reflection; using System.Collections; using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; using Microsoft.Build.Shared; -using System.Runtime.Serialization; -using System.Runtime.Serialization.Formatters.Binary; using System.Globalization; using System.Text; #if (!STANDALONEBUILD) using Microsoft.Internal.Performance; #endif -using LogExclusionReason = Microsoft.Build.Tasks.ReferenceTable.LogExclusionReason; using FrameworkNameVersioning = System.Runtime.Versioning.FrameworkName; using SystemProcessorArchitecture = System.Reflection.ProcessorArchitecture; using System.Xml.Linq; diff --git a/src/XMakeTasks/AssemblyDependency/Resolver.cs b/src/XMakeTasks/AssemblyDependency/Resolver.cs index 448f8e750c2..ae82778c855 100644 --- a/src/XMakeTasks/AssemblyDependency/Resolver.cs +++ b/src/XMakeTasks/AssemblyDependency/Resolver.cs @@ -1,11 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Shared; using System; +using System.Collections; using System.IO; using System.Reflection; -using System.Collections; -using Microsoft.Build.Shared; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AssemblyDependency/TaskItemSpecFilenameComparer.cs b/src/XMakeTasks/AssemblyDependency/TaskItemSpecFilenameComparer.cs index 5fc5a6840fb..79cf16cf871 100644 --- a/src/XMakeTasks/AssemblyDependency/TaskItemSpecFilenameComparer.cs +++ b/src/XMakeTasks/AssemblyDependency/TaskItemSpecFilenameComparer.cs @@ -1,11 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; using System; -using System.IO; using System.Collections; -using Microsoft.Build.Framework; using System.Collections.Generic; +using System.IO; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AssemblyDependency/UnificationReason.cs b/src/XMakeTasks/AssemblyDependency/UnificationReason.cs index d4db845b835..d75304ddb64 100644 --- a/src/XMakeTasks/AssemblyDependency/UnificationReason.cs +++ b/src/XMakeTasks/AssemblyDependency/UnificationReason.cs @@ -1,14 +1,6 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Collections; -using System.Reflection; -using System.Diagnostics; -using System.Globalization; -using Microsoft.Build.Shared; -using Microsoft.Build.Framework; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AssemblyDependency/UnificationVersion.cs b/src/XMakeTasks/AssemblyDependency/UnificationVersion.cs index 00006c6570f..79eb947430f 100644 --- a/src/XMakeTasks/AssemblyDependency/UnificationVersion.cs +++ b/src/XMakeTasks/AssemblyDependency/UnificationVersion.cs @@ -2,7 +2,6 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Reflection; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AssemblyDependency/UnifiedAssemblyName.cs b/src/XMakeTasks/AssemblyDependency/UnifiedAssemblyName.cs index 459457ca2f3..a5eaaa693d3 100644 --- a/src/XMakeTasks/AssemblyDependency/UnifiedAssemblyName.cs +++ b/src/XMakeTasks/AssemblyDependency/UnifiedAssemblyName.cs @@ -1,8 +1,6 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Reflection; using Microsoft.Build.Shared; namespace Microsoft.Build.Tasks diff --git a/src/XMakeTasks/AssemblyDependency/WarnOrErrorOnTargetArchitectureMismatchBehavior.cs b/src/XMakeTasks/AssemblyDependency/WarnOrErrorOnTargetArchitectureMismatchBehavior.cs index 3490a10ba49..9f44ddba67b 100644 --- a/src/XMakeTasks/AssemblyDependency/WarnOrErrorOnTargetArchitectureMismatchBehavior.cs +++ b/src/XMakeTasks/AssemblyDependency/WarnOrErrorOnTargetArchitectureMismatchBehavior.cs @@ -5,17 +5,6 @@ // Should a warning or error or nothing be emitted when there is a architecture mismatch //----------------------------------------------------------------------- -using System; -using System.Resources; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using System.Reflection; -using System.IO; -using System.Collections; -using System.Globalization; -using System.Diagnostics; -using System.Runtime.InteropServices; -using System.Text.RegularExpressions; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AssemblyFolder.cs b/src/XMakeTasks/AssemblyFolder.cs index 4b88bcd032e..f4041e11726 100644 --- a/src/XMakeTasks/AssemblyFolder.cs +++ b/src/XMakeTasks/AssemblyFolder.cs @@ -1,15 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Text; -using System.Resources; -using System.Reflection; -using System.Collections; -using System.Diagnostics; using Microsoft.Build.Shared; using Microsoft.Win32; +using System; +using System.Collections; +using System.IO; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AssemblyInfo.cs b/src/XMakeTasks/AssemblyInfo.cs index 0ef1e57fc12..189cade3f5a 100644 --- a/src/XMakeTasks/AssemblyInfo.cs +++ b/src/XMakeTasks/AssemblyInfo.cs @@ -2,10 +2,8 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System.Reflection; -using System.Security; -using System.Security.Permissions; -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/XMakeTasks/AssemblyRegistrationCache.cs b/src/XMakeTasks/AssemblyRegistrationCache.cs index e6cc66d26f1..111f60db85f 100644 --- a/src/XMakeTasks/AssemblyRegistrationCache.cs +++ b/src/XMakeTasks/AssemblyRegistrationCache.cs @@ -1,14 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Shared; using System; using System.Collections; -using System.IO; -using System.Runtime.Serialization; -using System.Runtime.Serialization.Formatters.Binary; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AssemblyRemapping.cs b/src/XMakeTasks/AssemblyRemapping.cs index 4464c354cd2..163275f049a 100644 --- a/src/XMakeTasks/AssemblyRemapping.cs +++ b/src/XMakeTasks/AssemblyRemapping.cs @@ -4,8 +4,8 @@ // Describes a remapping entry pair //----------------------------------------------------------------------- -using System; using Microsoft.Build.Shared; +using System; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AssemblyResources.cs b/src/XMakeTasks/AssemblyResources.cs index 3cb4c73ba6f..7e6862e5a77 100644 --- a/src/XMakeTasks/AssemblyResources.cs +++ b/src/XMakeTasks/AssemblyResources.cs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Resources; -using System.Reflection; using System.Globalization; +using System.Reflection; +using System.Resources; namespace Microsoft.Build.Shared { diff --git a/src/XMakeTasks/AssignCulture.cs b/src/XMakeTasks/AssignCulture.cs index e67b3a97e3e..a26105b641c 100644 --- a/src/XMakeTasks/AssignCulture.cs +++ b/src/XMakeTasks/AssignCulture.cs @@ -1,16 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Diagnostics; -using System.Resources; -using System.Reflection; -using System.Globalization; -using System.Collections; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; +using System; +using System.Collections; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AssignLinkMetadata.cs b/src/XMakeTasks/AssignLinkMetadata.cs index a5d57dc097e..7323e898029 100644 --- a/src/XMakeTasks/AssignLinkMetadata.cs +++ b/src/XMakeTasks/AssignLinkMetadata.cs @@ -10,7 +10,6 @@ using Microsoft.Build.Utilities; using System; using System.Collections.Generic; -using System.IO; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AssignProjectConfiguration.cs b/src/XMakeTasks/AssignProjectConfiguration.cs index e8be474fe5d..19b084217fe 100644 --- a/src/XMakeTasks/AssignProjectConfiguration.cs +++ b/src/XMakeTasks/AssignProjectConfiguration.cs @@ -1,18 +1,14 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using System; using System.Collections; using System.Collections.Generic; -using System.Diagnostics; using System.Diagnostics.CodeAnalysis; -using System.Text; using System.Xml; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.Build.Utilities; - namespace Microsoft.Build.Tasks { public class AssignProjectConfiguration : ResolveProjectBase diff --git a/src/XMakeTasks/AssignTargetPath.cs b/src/XMakeTasks/AssignTargetPath.cs index d3a6a2f9ac6..00da660e20e 100644 --- a/src/XMakeTasks/AssignTargetPath.cs +++ b/src/XMakeTasks/AssignTargetPath.cs @@ -1,16 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Diagnostics; -using System.Resources; -using System.Reflection; -using System.Globalization; -using System.Collections; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; +using System; +using System.Globalization; +using System.IO; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AxImp.cs b/src/XMakeTasks/AxImp.cs index aa9dd751db0..8c85449046f 100644 --- a/src/XMakeTasks/AxImp.cs +++ b/src/XMakeTasks/AxImp.cs @@ -6,15 +6,6 @@ //----------------------------------------------------------------------- using System; -using System.IO; -using System.Collections.Generic; -using System.Text; -using System.Resources; -using System.Reflection; -using System.Diagnostics; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AxReference.cs b/src/XMakeTasks/AxReference.cs index 987ee55bc7a..88d7e6e36ac 100644 --- a/src/XMakeTasks/AxReference.cs +++ b/src/XMakeTasks/AxReference.cs @@ -1,18 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Reflection; -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.Utilities; -using Microsoft.Build.Shared; +using System.IO; +using System.Reflection; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/AxTlbBaseReference.cs b/src/XMakeTasks/AxTlbBaseReference.cs index c768e4cebb5..acc7c2607fc 100644 --- a/src/XMakeTasks/AxTlbBaseReference.cs +++ b/src/XMakeTasks/AxTlbBaseReference.cs @@ -1,21 +1,16 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +// TYPELIBATTR clashes with the one in InteropServices. + +using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; using System; using System.Diagnostics; using System.IO; using System.Reflection; -using System.Runtime.InteropServices; -using System.Runtime.InteropServices.ComTypes; using System.Text; -// 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.Shared; - namespace Microsoft.Build.Tasks { /* diff --git a/src/XMakeTasks/AxTlbBaseTask.cs b/src/XMakeTasks/AxTlbBaseTask.cs index fb745b0b9eb..156e0a3f62f 100644 --- a/src/XMakeTasks/AxTlbBaseTask.cs +++ b/src/XMakeTasks/AxTlbBaseTask.cs @@ -7,14 +7,7 @@ using System; using System.IO; -using System.Collections.Generic; -using System.Text; -using System.Resources; using System.Reflection; -using System.Diagnostics; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/BootstrapperUtil/BootstrapperBuilder.cs b/src/XMakeTasks/BootstrapperUtil/BootstrapperBuilder.cs index 6bba88602c0..920e97c057f 100644 --- a/src/XMakeTasks/BootstrapperUtil/BootstrapperBuilder.cs +++ b/src/XMakeTasks/BootstrapperUtil/BootstrapperBuilder.cs @@ -2,7 +2,6 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using Microsoft.Build.Shared; -using Microsoft.Win32; using System; using System.Collections; using System.Collections.Generic; @@ -13,9 +12,7 @@ using System.Reflection; using System.Runtime.InteropServices; using System.Security.Cryptography.X509Certificates; -using System.Security.Policy; using System.Text; -using System.Web; using System.Xml; using System.Xml.XPath; using System.Xml.Xsl; diff --git a/src/XMakeTasks/BootstrapperUtil/BuildMessage.cs b/src/XMakeTasks/BootstrapperUtil/BuildMessage.cs index 250ad90a8fc..4ed69a9494d 100644 --- a/src/XMakeTasks/BootstrapperUtil/BuildMessage.cs +++ b/src/XMakeTasks/BootstrapperUtil/BuildMessage.cs @@ -1,12 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Shared; using System; -using System.Collections; using System.Globalization; -using System.Runtime.InteropServices; using System.Text.RegularExpressions; -using Microsoft.Build.Shared; namespace Microsoft.Build.Tasks.Deployment.Bootstrapper { diff --git a/src/XMakeTasks/BootstrapperUtil/Interfaces.cs b/src/XMakeTasks/BootstrapperUtil/Interfaces.cs index 712396280b7..aed0bfd2f69 100644 --- a/src/XMakeTasks/BootstrapperUtil/Interfaces.cs +++ b/src/XMakeTasks/BootstrapperUtil/Interfaces.cs @@ -2,7 +2,6 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Collections; using System.Runtime.InteropServices; namespace Microsoft.Build.Tasks.Deployment.Bootstrapper diff --git a/src/XMakeTasks/BootstrapperUtil/NativeMethods.cs b/src/XMakeTasks/BootstrapperUtil/NativeMethods.cs index 08149eda291..08907f653c6 100644 --- a/src/XMakeTasks/BootstrapperUtil/NativeMethods.cs +++ b/src/XMakeTasks/BootstrapperUtil/NativeMethods.cs @@ -2,7 +2,6 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.IO; using System.Runtime.InteropServices; namespace Microsoft.Build.Tasks.Deployment.Bootstrapper diff --git a/src/XMakeTasks/BootstrapperUtil/Package.cs b/src/XMakeTasks/BootstrapperUtil/Package.cs index d46ba80d4eb..5af139b226a 100644 --- a/src/XMakeTasks/BootstrapperUtil/Package.cs +++ b/src/XMakeTasks/BootstrapperUtil/Package.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Xml; using System.Runtime.InteropServices; +using System.Xml; namespace Microsoft.Build.Tasks.Deployment.Bootstrapper { diff --git a/src/XMakeTasks/BootstrapperUtil/PackageCollection.cs b/src/XMakeTasks/BootstrapperUtil/PackageCollection.cs index 64f2457ce39..708d49b271e 100644 --- a/src/XMakeTasks/BootstrapperUtil/PackageCollection.cs +++ b/src/XMakeTasks/BootstrapperUtil/PackageCollection.cs @@ -1,9 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; using System.Collections; -using System.Runtime.InteropServices; using System.Diagnostics; namespace Microsoft.Build.Tasks.Deployment.Bootstrapper diff --git a/src/XMakeTasks/BootstrapperUtil/Product.cs b/src/XMakeTasks/BootstrapperUtil/Product.cs index 5c1f28bf1ff..526d563f88b 100644 --- a/src/XMakeTasks/BootstrapperUtil/Product.cs +++ b/src/XMakeTasks/BootstrapperUtil/Product.cs @@ -6,8 +6,8 @@ using System.Collections.Generic; using System.Diagnostics; using System.Globalization; -using System.Xml; using System.Runtime.InteropServices; +using System.Xml; namespace Microsoft.Build.Tasks.Deployment.Bootstrapper { diff --git a/src/XMakeTasks/BootstrapperUtil/ProductBuilder.cs b/src/XMakeTasks/BootstrapperUtil/ProductBuilder.cs index 0fc5b866e91..d289041452c 100644 --- a/src/XMakeTasks/BootstrapperUtil/ProductBuilder.cs +++ b/src/XMakeTasks/BootstrapperUtil/ProductBuilder.cs @@ -1,10 +1,6 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections; -using System.Globalization; -using System.Runtime.InteropServices; namespace Microsoft.Build.Tasks.Deployment.Bootstrapper { diff --git a/src/XMakeTasks/BootstrapperUtil/ProductCollection.cs b/src/XMakeTasks/BootstrapperUtil/ProductCollection.cs index 118c8d50018..22967ac3748 100644 --- a/src/XMakeTasks/BootstrapperUtil/ProductCollection.cs +++ b/src/XMakeTasks/BootstrapperUtil/ProductCollection.cs @@ -1,9 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; using System.Collections; -using System.Globalization; using System.Runtime.InteropServices; namespace Microsoft.Build.Tasks.Deployment.Bootstrapper diff --git a/src/XMakeTasks/BootstrapperUtil/ResourceUpdater.cs b/src/XMakeTasks/BootstrapperUtil/ResourceUpdater.cs index 9c9c5d98db5..a3563fb507f 100644 --- a/src/XMakeTasks/BootstrapperUtil/ResourceUpdater.cs +++ b/src/XMakeTasks/BootstrapperUtil/ResourceUpdater.cs @@ -5,9 +5,6 @@ using System.Collections; using System.Globalization; using System.IO; -using System.Resources; -using System.Reflection; -using System.Diagnostics; using System.Runtime.InteropServices; using System.Threading; diff --git a/src/XMakeTasks/BootstrapperUtil/Util.cs b/src/XMakeTasks/BootstrapperUtil/Util.cs index fb5558c297f..bd14817ff04 100644 --- a/src/XMakeTasks/BootstrapperUtil/Util.cs +++ b/src/XMakeTasks/BootstrapperUtil/Util.cs @@ -1,13 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Win32; using System; -using System.Diagnostics; using System.Globalization; -using System.IO; -using System.Runtime.InteropServices; -using Microsoft.Win32; -using Microsoft.Build.Shared; namespace Microsoft.Build.Tasks.Deployment.Bootstrapper { diff --git a/src/XMakeTasks/BootstrapperUtil/productvalidationresults.cs b/src/XMakeTasks/BootstrapperUtil/productvalidationresults.cs index ab6a9c76f4e..a261598dd06 100644 --- a/src/XMakeTasks/BootstrapperUtil/productvalidationresults.cs +++ b/src/XMakeTasks/BootstrapperUtil/productvalidationresults.cs @@ -1,9 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; using System.Collections; -using System.Xml; namespace Microsoft.Build.Tasks.Deployment.Bootstrapper { diff --git a/src/XMakeTasks/BootstrapperUtil/xmlvalidationresults.cs b/src/XMakeTasks/BootstrapperUtil/xmlvalidationresults.cs index e113b7d6323..3bdd89d1c49 100644 --- a/src/XMakeTasks/BootstrapperUtil/xmlvalidationresults.cs +++ b/src/XMakeTasks/BootstrapperUtil/xmlvalidationresults.cs @@ -1,9 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; using System.Collections; -using System.Xml; namespace Microsoft.Build.Tasks.Deployment.Bootstrapper { diff --git a/src/XMakeTasks/BuildCacheDisposeWrapper.cs b/src/XMakeTasks/BuildCacheDisposeWrapper.cs index 7b77b617ab7..87de9ad872d 100644 --- a/src/XMakeTasks/BuildCacheDisposeWrapper.cs +++ b/src/XMakeTasks/BuildCacheDisposeWrapper.cs @@ -9,7 +9,6 @@ //----------------------------------------------------------------------- using System; -using Microsoft.Build.Utilities; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/CSharpParserUtilities.cs b/src/XMakeTasks/CSharpParserUtilities.cs index 4229d2f3a78..e8909860f4f 100644 --- a/src/XMakeTasks/CSharpParserUtilities.cs +++ b/src/XMakeTasks/CSharpParserUtilities.cs @@ -1,14 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; +using Microsoft.Build.Shared.LanguageParser; using System.IO; using System.Text; -using System.Resources; -using System.Reflection; - -using System.Collections; -using Microsoft.Build.Shared.LanguageParser; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/CallTarget.cs b/src/XMakeTasks/CallTarget.cs index 7d58eac480c..4ae77193ebc 100644 --- a/src/XMakeTasks/CallTarget.cs +++ b/src/XMakeTasks/CallTarget.cs @@ -1,16 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Xml; -using System.Resources; -using System.Reflection; -using System.Collections; -using System.Diagnostics; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; +using System.Collections; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/CodeTaskFactory.cs b/src/XMakeTasks/CodeTaskFactory.cs index 03948995f26..82ff0ae51bd 100644 --- a/src/XMakeTasks/CodeTaskFactory.cs +++ b/src/XMakeTasks/CodeTaskFactory.cs @@ -5,22 +5,21 @@ // A code task factory which uses code dom to generate tasks //----------------------------------------------------------------------- +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; using System; -using System.Collections.Generic; -using System.Text; +using System.CodeDom; using System.CodeDom.Compiler; -using System.Reflection; -using System.Xml; +using System.Collections.Concurrent; +using System.Collections.Generic; using System.Diagnostics; -using System.IO; - -using Microsoft.Build.Framework; -using System.CodeDom; -using Microsoft.Build.Utilities; -using System.Globalization; using System.Diagnostics.CodeAnalysis; -using Microsoft.Build.Shared; -using System.Collections.Concurrent; +using System.Globalization; +using System.IO; +using System.Reflection; +using System.Text; +using System.Xml; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/ComDependencyWalker.cs b/src/XMakeTasks/ComDependencyWalker.cs index 7502814680a..bf738856e24 100644 --- a/src/XMakeTasks/ComDependencyWalker.cs +++ b/src/XMakeTasks/ComDependencyWalker.cs @@ -2,17 +2,11 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Collections; using System.Collections.Generic; -using System.Text; -using System.Runtime.InteropServices.ComTypes; using System.Globalization; - - -using Microsoft.Build.Shared; - -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; namespace Microsoft.Build.Tasks diff --git a/src/XMakeTasks/ComReference.cs b/src/XMakeTasks/ComReference.cs index eb49e966df4..b214b56050b 100644 --- a/src/XMakeTasks/ComReference.cs +++ b/src/XMakeTasks/ComReference.cs @@ -1,21 +1,14 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; using System; -using System.Collections; using System.Globalization; -using System.IO; -using System.Resources; -using System.Reflection; using System.Runtime.InteropServices.ComTypes; using System.Text; - -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; - -using Marshal = System.Runtime.InteropServices.Marshal; using COMException = System.Runtime.InteropServices.COMException; +using Marshal = System.Runtime.InteropServices.Marshal; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/ComReferenceInfo.cs b/src/XMakeTasks/ComReferenceInfo.cs index 76ae4f20e4e..d12b329ce7d 100644 --- a/src/XMakeTasks/ComReferenceInfo.cs +++ b/src/XMakeTasks/ComReferenceInfo.cs @@ -1,19 +1,16 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; using System.Collections.Generic; 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.Utilities; -using Microsoft.Build.Shared; - namespace Microsoft.Build.Tasks { /// diff --git a/src/XMakeTasks/ComReferenceItemAttributes.cs b/src/XMakeTasks/ComReferenceItemAttributes.cs index 0959fb496ce..02e095fe8fd 100644 --- a/src/XMakeTasks/ComReferenceItemAttributes.cs +++ b/src/XMakeTasks/ComReferenceItemAttributes.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/ComReferenceTypes.cs b/src/XMakeTasks/ComReferenceTypes.cs index e95da9858c1..54dcb04687c 100644 --- a/src/XMakeTasks/ComReferenceTypes.cs +++ b/src/XMakeTasks/ComReferenceTypes.cs @@ -2,7 +2,6 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Globalization; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/ComReferenceWrapperInfo.cs b/src/XMakeTasks/ComReferenceWrapperInfo.cs index b2ed7826e3a..108721e72dc 100644 --- a/src/XMakeTasks/ComReferenceWrapperInfo.cs +++ b/src/XMakeTasks/ComReferenceWrapperInfo.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Reflection; using Microsoft.Build.Shared; +using System.Reflection; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/CombinePath.cs b/src/XMakeTasks/CombinePath.cs index 646aba43200..8b46b4ee939 100644 --- a/src/XMakeTasks/CombinePath.cs +++ b/src/XMakeTasks/CombinePath.cs @@ -1,14 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Collections; -using System.Collections.Generic; -using System.Resources; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; +using System; +using System.Collections.Generic; +using System.IO; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/CommandLineBuilderExtension.cs b/src/XMakeTasks/CommandLineBuilderExtension.cs index 47fd8a24f44..b8fb2a05a17 100644 --- a/src/XMakeTasks/CommandLineBuilderExtension.cs +++ b/src/XMakeTasks/CommandLineBuilderExtension.cs @@ -1,13 +1,13 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; using System; using System.Collections; using System.Globalization; using System.Text; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/ConvertToAbsolutePath.cs b/src/XMakeTasks/ConvertToAbsolutePath.cs index d48d1ff1330..0b6f38f3f43 100644 --- a/src/XMakeTasks/ConvertToAbsolutePath.cs +++ b/src/XMakeTasks/ConvertToAbsolutePath.cs @@ -1,14 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Collections; -using System.Collections.Generic; -using System.Resources; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; +using System; +using System.Collections.Generic; +using System.IO; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/Copy.cs b/src/XMakeTasks/Copy.cs index 96355c40a91..0b38066e66c 100644 --- a/src/XMakeTasks/Copy.cs +++ b/src/XMakeTasks/Copy.cs @@ -1,19 +1,14 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; using System; -using System.IO; -using System.Diagnostics; using System.Collections.Generic; -using System.Resources; -using System.Reflection; -using System.Globalization; -using System.Threading; +using System.IO; using System.Runtime.InteropServices; - -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; +using System.Threading; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/CreateCSharpManifestResourceName.cs b/src/XMakeTasks/CreateCSharpManifestResourceName.cs index 1c52e5e25b5..e144cbcb12e 100644 --- a/src/XMakeTasks/CreateCSharpManifestResourceName.cs +++ b/src/XMakeTasks/CreateCSharpManifestResourceName.cs @@ -1,16 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; using System; using System.IO; using System.Text; -using System.Resources; -using System.Reflection; -using System.Diagnostics; -using System.Globalization; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/CreateItem.cs b/src/XMakeTasks/CreateItem.cs index 0abb7c5b782..fd0538f3015 100644 --- a/src/XMakeTasks/CreateItem.cs +++ b/src/XMakeTasks/CreateItem.cs @@ -1,16 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Diagnostics; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; +using System; using System.Collections; -using System.Globalization; -using System.Reflection; -using System.Resources; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/CreateManifestResourceName.cs b/src/XMakeTasks/CreateManifestResourceName.cs index b12c872ad00..0ae6b2f114e 100644 --- a/src/XMakeTasks/CreateManifestResourceName.cs +++ b/src/XMakeTasks/CreateManifestResourceName.cs @@ -1,18 +1,15 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Globalization; -using System.IO; -using System.Resources; -using System.Reflection; -using System.Diagnostics; -using System.Text; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; +using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; +using System.Globalization; +using System.IO; +using System.Text; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/CreateProperty.cs b/src/XMakeTasks/CreateProperty.cs index 88bdc10bc0a..83d6e0a95b0 100644 --- a/src/XMakeTasks/CreateProperty.cs +++ b/src/XMakeTasks/CreateProperty.cs @@ -1,15 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Diagnostics; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using System.Collections; -using System.Globalization; -using System.Reflection; -using System.Resources; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/CreateVisualBasicManifestResourceName.cs b/src/XMakeTasks/CreateVisualBasicManifestResourceName.cs index 1399fc12576..ec26e0157ee 100644 --- a/src/XMakeTasks/CreateVisualBasicManifestResourceName.cs +++ b/src/XMakeTasks/CreateVisualBasicManifestResourceName.cs @@ -1,16 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; using System; using System.IO; using System.Text; -using System.Resources; -using System.Reflection; -using System.Diagnostics; -using System.Globalization; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/Csc.cs b/src/XMakeTasks/Csc.cs index 9b1953524ed..5e103f9491f 100644 --- a/src/XMakeTasks/Csc.cs +++ b/src/XMakeTasks/Csc.cs @@ -1,21 +1,16 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections.Specialized; -using System.Diagnostics; -using System.Globalization; -using System.IO; -using System.Reflection; -using System.Resources; -using System.Text; - using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Microsoft.Build.Shared.LanguageParser; using Microsoft.Build.Tasks.Hosting; using Microsoft.Build.Tasks.InteropUtilities; using Microsoft.Build.Utilities; +using System; +using System.Diagnostics; +using System.Globalization; +using System.Text; #if (!STANDALONEBUILD) using Microsoft.Internal.Performance; diff --git a/src/XMakeTasks/Culture.cs b/src/XMakeTasks/Culture.cs index a80810140eb..39f1e054835 100644 --- a/src/XMakeTasks/Culture.cs +++ b/src/XMakeTasks/Culture.cs @@ -3,13 +3,6 @@ using System; using System.IO; -using System.Diagnostics; -using System.Resources; -using System.Reflection; -using System.Globalization; -using System.Collections; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/CultureStringUtilities.cs b/src/XMakeTasks/CultureStringUtilities.cs index 80d6a2230ee..85e12cf8c7a 100644 --- a/src/XMakeTasks/CultureStringUtilities.cs +++ b/src/XMakeTasks/CultureStringUtilities.cs @@ -1,9 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Globalization; using System; -using System.Runtime.InteropServices; +using System.Globalization; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/Delegate.cs b/src/XMakeTasks/Delegate.cs index 9def82973f1..fa4cea126bf 100644 --- a/src/XMakeTasks/Delegate.cs +++ b/src/XMakeTasks/Delegate.cs @@ -1,18 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Text; -using Microsoft.Win32; -using System.Resources; -using System.Reflection; -using System.Collections; -using System.Diagnostics; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; +using System; using System.Collections.Generic; +using System.IO; using System.Runtime.Versioning; namespace Microsoft.Build.Tasks diff --git a/src/XMakeTasks/Delete.cs b/src/XMakeTasks/Delete.cs index 55d63fa9598..5576c427de8 100644 --- a/src/XMakeTasks/Delete.cs +++ b/src/XMakeTasks/Delete.cs @@ -1,16 +1,13 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections; -using System.IO; -using System.Resources; -using System.Reflection; -using System.Diagnostics; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; +using System; +using System.Collections; using System.Collections.Generic; +using System.IO; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/Dependencies.cs b/src/XMakeTasks/Dependencies.cs index 4b8b963c4c8..daaba10864b 100644 --- a/src/XMakeTasks/Dependencies.cs +++ b/src/XMakeTasks/Dependencies.cs @@ -3,16 +3,6 @@ using System; using System.Collections; -using System.IO; -using System.Text; -using System.Resources; -using System.Reflection; -using System.Diagnostics; -using System.Globalization; -using System.Runtime.Serialization; -using System.Runtime.Serialization.Formatters.Binary; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/DependencyFile.cs b/src/XMakeTasks/DependencyFile.cs index 1e25807cd68..993c00dbfbd 100644 --- a/src/XMakeTasks/DependencyFile.cs +++ b/src/XMakeTasks/DependencyFile.cs @@ -1,19 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Shared; using System; -using System.Collections; using System.IO; -using System.Text; -using System.Resources; -using System.Reflection; -using System.Diagnostics; -using System.Globalization; -using System.Runtime.Serialization; -using System.Runtime.Serialization.Formatters.Binary; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/Error.cs b/src/XMakeTasks/Error.cs index 1d08e307688..f67b8f5ecb9 100644 --- a/src/XMakeTasks/Error.cs +++ b/src/XMakeTasks/Error.cs @@ -2,12 +2,6 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.IO; -using System.Diagnostics; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using System.Globalization; -using System.Resources; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/ErrorFromResources.cs b/src/XMakeTasks/ErrorFromResources.cs index e0267a490f0..25c36960437 100644 --- a/src/XMakeTasks/ErrorFromResources.cs +++ b/src/XMakeTasks/ErrorFromResources.cs @@ -5,9 +5,9 @@ // Task that logs an error given the appropriate resource string. //----------------------------------------------------------------------- -using System; using Microsoft.Build.Framework; using Microsoft.Build.Shared; +using System; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/Exec.cs b/src/XMakeTasks/Exec.cs index aa9dd6db5be..602a4bb13af 100644 --- a/src/XMakeTasks/Exec.cs +++ b/src/XMakeTasks/Exec.cs @@ -1,20 +1,15 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; using System; using System.Collections.Generic; -using System.Diagnostics; -using System.Text; using System.IO; -using System.Resources; -using System.Reflection; -using System.Globalization; +using System.Text; using System.Text.RegularExpressions; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; - namespace Microsoft.Build.Tasks { /// diff --git a/src/XMakeTasks/ExtractedClassName.cs b/src/XMakeTasks/ExtractedClassName.cs index e870a9deada..a1cce17add0 100644 --- a/src/XMakeTasks/ExtractedClassName.cs +++ b/src/XMakeTasks/ExtractedClassName.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/FileIO/ReadLinesFromFile.cs b/src/XMakeTasks/FileIO/ReadLinesFromFile.cs index 6b7c8cadf5c..9088063787b 100644 --- a/src/XMakeTasks/FileIO/ReadLinesFromFile.cs +++ b/src/XMakeTasks/FileIO/ReadLinesFromFile.cs @@ -1,15 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Collections; -using System.Diagnostics; -using System.Globalization; - using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; +using System; +using System.Collections; +using System.IO; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/FileIO/WriteLinesToFile.cs b/src/XMakeTasks/FileIO/WriteLinesToFile.cs index d5fdb50fa1c..72ad2069efb 100644 --- a/src/XMakeTasks/FileIO/WriteLinesToFile.cs +++ b/src/XMakeTasks/FileIO/WriteLinesToFile.cs @@ -1,16 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using System; using System.IO; using System.Text; -using System.Diagnostics; -using System.Collections; -using System.Globalization; - -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/FileState.cs b/src/XMakeTasks/FileState.cs index c1e7b7ee93a..9a91fdeb0f2 100644 --- a/src/XMakeTasks/FileState.cs +++ b/src/XMakeTasks/FileState.cs @@ -5,10 +5,10 @@ // Cache file state over file name. //----------------------------------------------------------------------- +using Microsoft.Build.Shared; using System; using System.IO; using System.Runtime.InteropServices; -using Microsoft.Build.Shared; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/FindAppConfigFile.cs b/src/XMakeTasks/FindAppConfigFile.cs index 78a595ab870..a68e96c1d08 100644 --- a/src/XMakeTasks/FindAppConfigFile.cs +++ b/src/XMakeTasks/FindAppConfigFile.cs @@ -1,12 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Resources; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; +using System; +using System.IO; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/FindInList.cs b/src/XMakeTasks/FindInList.cs index bc232b0a1d8..ce7941240d5 100644 --- a/src/XMakeTasks/FindInList.cs +++ b/src/XMakeTasks/FindInList.cs @@ -1,12 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Resources; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; +using System; +using System.IO; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/FindInvalidProjectReferences.cs b/src/XMakeTasks/FindInvalidProjectReferences.cs index 127a77fbea7..54412abc310 100644 --- a/src/XMakeTasks/FindInvalidProjectReferences.cs +++ b/src/XMakeTasks/FindInvalidProjectReferences.cs @@ -4,14 +4,9 @@ // Get the reference assembly paths for a given target framework version / moniker. //----------------------------------------------------------------------- -using System; -using System.IO; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; +using System; using System.Collections.Generic; -using FrameworkNameVersioning = System.Runtime.Versioning.FrameworkName; -using SystemProcessorArchitecture = System.Reflection.ProcessorArchitecture; using System.Text.RegularExpressions; namespace Microsoft.Build.Tasks diff --git a/src/XMakeTasks/FormatUrl.cs b/src/XMakeTasks/FormatUrl.cs index c9193d1a5ca..5593cf43aaa 100644 --- a/src/XMakeTasks/FormatUrl.cs +++ b/src/XMakeTasks/FormatUrl.cs @@ -1,11 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Diagnostics; using Microsoft.Build.Framework; using Microsoft.Build.Tasks.Deployment.ManifestUtilities; -using Microsoft.Build.Utilities; +using System; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/FormatVersion.cs b/src/XMakeTasks/FormatVersion.cs index 18c4a2e6e5b..5c82918c496 100644 --- a/src/XMakeTasks/FormatVersion.cs +++ b/src/XMakeTasks/FormatVersion.cs @@ -1,12 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; using System; using System.Globalization; -using System.Diagnostics; -using Microsoft.Build.Framework; -using Microsoft.Build.Tasks.Deployment.ManifestUtilities; -using Microsoft.Build.Utilities; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/FxCopExclusions/Microsoft.Build.Tasks.Suppressions.cs b/src/XMakeTasks/FxCopExclusions/Microsoft.Build.Tasks.Suppressions.cs index 7349ce57fe8..ca1fb182531 100644 --- a/src/XMakeTasks/FxCopExclusions/Microsoft.Build.Tasks.Suppressions.cs +++ b/src/XMakeTasks/FxCopExclusions/Microsoft.Build.Tasks.Suppressions.cs @@ -5,7 +5,7 @@ // Add module level suppressions to this file to have them suppressed in the assembly // -using System.Diagnostics.CodeAnalysis; + #if CODE_ANALYSIS [module: SuppressMessage("Microsoft.Naming","CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId="0", Scope="module", Target="microsoft.build.tasks.core.dll", Justification="Already shipped several versions with a name like this")] diff --git a/src/XMakeTasks/GenerateApplicationManifest.cs b/src/XMakeTasks/GenerateApplicationManifest.cs index 5cf84c4deb9..36f41d6cd96 100644 --- a/src/XMakeTasks/GenerateApplicationManifest.cs +++ b/src/XMakeTasks/GenerateApplicationManifest.cs @@ -1,19 +1,13 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Tasks.Deployment.ManifestUtilities; using System; -using System.Collections.Generic; using System.Diagnostics; using System.Globalization; using System.IO; -using System.Reflection; -using System.Runtime.InteropServices; -using System.Security; -using System.Security.Permissions; using System.Xml; -using Microsoft.Build.Framework; -using Microsoft.Build.Tasks.Deployment.ManifestUtilities; -using Microsoft.Build.Utilities; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/GenerateBootstrapper.cs b/src/XMakeTasks/GenerateBootstrapper.cs index 40571fb59fa..022f655cab9 100644 --- a/src/XMakeTasks/GenerateBootstrapper.cs +++ b/src/XMakeTasks/GenerateBootstrapper.cs @@ -1,17 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Resources; -using System.Reflection; -using System.Diagnostics; -using System.Collections; -using System.Globalization; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; using Microsoft.Build.Tasks.Deployment.Bootstrapper; +using System; +using System.Collections; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/GenerateDeploymentManifest.cs b/src/XMakeTasks/GenerateDeploymentManifest.cs index f65e1860a4c..def7154baef 100644 --- a/src/XMakeTasks/GenerateDeploymentManifest.cs +++ b/src/XMakeTasks/GenerateDeploymentManifest.cs @@ -1,13 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Tasks.Deployment.ManifestUtilities; using System; using System.Diagnostics; -using System.Globalization; using System.IO; -using Microsoft.Build.Framework; -using Microsoft.Build.Tasks.Deployment.ManifestUtilities; -using Microsoft.Build.Utilities; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/GenerateManifestBase.cs b/src/XMakeTasks/GenerateManifestBase.cs index 09edc0d6777..cacfa31ca5e 100644 --- a/src/XMakeTasks/GenerateManifestBase.cs +++ b/src/XMakeTasks/GenerateManifestBase.cs @@ -1,16 +1,13 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Diagnostics; -using System.Globalization; -using System.IO; -using System.Collections; -using System.Security.Cryptography; using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using Microsoft.Build.Tasks.Deployment.ManifestUtilities; using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; +using System; +using System.Globalization; +using System.IO; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/GenerateTrustInfo.cs b/src/XMakeTasks/GenerateTrustInfo.cs index f0d675aa5ea..647469243b5 100644 --- a/src/XMakeTasks/GenerateTrustInfo.cs +++ b/src/XMakeTasks/GenerateTrustInfo.cs @@ -1,15 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections; -using System.Globalization; -using System.IO; -using System.Resources; using Microsoft.Build.Framework; using Microsoft.Build.Tasks.Deployment.ManifestUtilities; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; +using System; +using System.IO; using FrameworkNameVersioning = System.Runtime.Versioning.FrameworkName; namespace Microsoft.Build.Tasks diff --git a/src/XMakeTasks/GetAssemblyIdentity.cs b/src/XMakeTasks/GetAssemblyIdentity.cs index ce5e9eb94f8..21d426f5458 100644 --- a/src/XMakeTasks/GetAssemblyIdentity.cs +++ b/src/XMakeTasks/GetAssemblyIdentity.cs @@ -1,15 +1,14 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; using System; using System.Collections; -using System.Diagnostics; using System.Globalization; using System.Reflection; using System.Text; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/GetFrameworkPath.cs b/src/XMakeTasks/GetFrameworkPath.cs index a27a086cf02..f90a776401b 100644 --- a/src/XMakeTasks/GetFrameworkPath.cs +++ b/src/XMakeTasks/GetFrameworkPath.cs @@ -1,11 +1,6 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Diagnostics; -using System.Resources; -using System.Reflection; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; diff --git a/src/XMakeTasks/GetFrameworkSDKPath.cs b/src/XMakeTasks/GetFrameworkSDKPath.cs index 86dad0be020..3bca65498a0 100644 --- a/src/XMakeTasks/GetFrameworkSDKPath.cs +++ b/src/XMakeTasks/GetFrameworkSDKPath.cs @@ -1,14 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Diagnostics; -using System.Resources; -using System.Reflection; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; +using System; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/GetInstalledSDKLocations.cs b/src/XMakeTasks/GetInstalledSDKLocations.cs index 91bc9614eab..ca53aad3ee2 100644 --- a/src/XMakeTasks/GetInstalledSDKLocations.cs +++ b/src/XMakeTasks/GetInstalledSDKLocations.cs @@ -8,14 +8,10 @@ // //----------------------------------------------------------------------- -using System; -using System.IO; -using System.Diagnostics; -using System.Resources; -using System.Reflection; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; +using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; diff --git a/src/XMakeTasks/GetReferenceAssemblyPaths.cs b/src/XMakeTasks/GetReferenceAssemblyPaths.cs index f7f094817d2..be178755bdf 100644 --- a/src/XMakeTasks/GetReferenceAssemblyPaths.cs +++ b/src/XMakeTasks/GetReferenceAssemblyPaths.cs @@ -4,11 +4,10 @@ // Get the reference assembly paths for a given target framework version / moniker. //----------------------------------------------------------------------- -using System; -using System.IO; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; +using System; using System.Collections.Generic; using FrameworkNameVersioning = System.Runtime.Versioning.FrameworkName; using SystemProcessorArchitecture = System.Reflection.ProcessorArchitecture; diff --git a/src/XMakeTasks/GetSDKReferenceFiles.cs b/src/XMakeTasks/GetSDKReferenceFiles.cs index 4251acb0501..2ac6fce3c4f 100644 --- a/src/XMakeTasks/GetSDKReferenceFiles.cs +++ b/src/XMakeTasks/GetSDKReferenceFiles.cs @@ -5,6 +5,9 @@ // Gathers the reference assemblies from the SDK based on what configuration and architecture a SDK references. //----------------------------------------------------------------------- +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; using System; using System.Collections.Concurrent; using System.Collections.Generic; @@ -16,9 +19,6 @@ using System.Runtime.Serialization.Formatters.Binary; using System.Threading; using System.Threading.Tasks; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.Build.Utilities; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/IAnalyzerHostObject.cs b/src/XMakeTasks/IAnalyzerHostObject.cs index c34d279509a..f9aba72587d 100644 --- a/src/XMakeTasks/IAnalyzerHostObject.cs +++ b/src/XMakeTasks/IAnalyzerHostObject.cs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; using System; using System.Runtime.InteropServices; -using Microsoft.Build.Framework; namespace Microsoft.Build.Tasks.Hosting { diff --git a/src/XMakeTasks/IComReferenceResolver.cs b/src/XMakeTasks/IComReferenceResolver.cs index 6ff2365942b..a99a0be8e35 100644 --- a/src/XMakeTasks/IComReferenceResolver.cs +++ b/src/XMakeTasks/IComReferenceResolver.cs @@ -1,9 +1,6 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Runtime.InteropServices; -using System.Runtime.InteropServices.ComTypes; // TYPELIBATTR clashes with the one in InteropServices. using TYPELIBATTR = System.Runtime.InteropServices.ComTypes.TYPELIBATTR; diff --git a/src/XMakeTasks/ICscHostObject.cs b/src/XMakeTasks/ICscHostObject.cs index 03194abe4d1..b19b0937fe8 100644 --- a/src/XMakeTasks/ICscHostObject.cs +++ b/src/XMakeTasks/ICscHostObject.cs @@ -1,10 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; using System; -using System.Text; using System.Runtime.InteropServices; -using Microsoft.Build.Framework; namespace Microsoft.Build.Tasks.Hosting { diff --git a/src/XMakeTasks/ICscHostObject2.cs b/src/XMakeTasks/ICscHostObject2.cs index e243bda6eb2..16943e10e29 100644 --- a/src/XMakeTasks/ICscHostObject2.cs +++ b/src/XMakeTasks/ICscHostObject2.cs @@ -3,7 +3,6 @@ using System; using System.Runtime.InteropServices; -using Microsoft.Build.Framework; namespace Microsoft.Build.Tasks.Hosting { diff --git a/src/XMakeTasks/ICscHostObject3.cs b/src/XMakeTasks/ICscHostObject3.cs index 2502953beb6..cd3d9615b8d 100644 --- a/src/XMakeTasks/ICscHostObject3.cs +++ b/src/XMakeTasks/ICscHostObject3.cs @@ -3,7 +3,6 @@ using System; using System.Runtime.InteropServices; -using Microsoft.Build.Framework; namespace Microsoft.Build.Tasks.Hosting { diff --git a/src/XMakeTasks/ICscHostObject4.cs b/src/XMakeTasks/ICscHostObject4.cs index 1a88692c404..a3b152accda 100644 --- a/src/XMakeTasks/ICscHostObject4.cs +++ b/src/XMakeTasks/ICscHostObject4.cs @@ -3,7 +3,6 @@ using System; using System.Runtime.InteropServices; -using Microsoft.Build.Framework; namespace Microsoft.Build.Tasks.Hosting { diff --git a/src/XMakeTasks/IVbcHostObject.cs b/src/XMakeTasks/IVbcHostObject.cs index 1802a636b1b..65d8bf61825 100644 --- a/src/XMakeTasks/IVbcHostObject.cs +++ b/src/XMakeTasks/IVbcHostObject.cs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; using System; using System.Runtime.InteropServices; -using Microsoft.Build.Framework; namespace Microsoft.Build.Tasks.Hosting { diff --git a/src/XMakeTasks/IVbcHostObject2.cs b/src/XMakeTasks/IVbcHostObject2.cs index 27703a1cb77..128137a3fa9 100644 --- a/src/XMakeTasks/IVbcHostObject2.cs +++ b/src/XMakeTasks/IVbcHostObject2.cs @@ -3,7 +3,6 @@ using System; using System.Runtime.InteropServices; -using Microsoft.Build.Framework; namespace Microsoft.Build.Tasks.Hosting { diff --git a/src/XMakeTasks/IVbcHostObject3.cs b/src/XMakeTasks/IVbcHostObject3.cs index e2703a173e7..e377514294c 100644 --- a/src/XMakeTasks/IVbcHostObject3.cs +++ b/src/XMakeTasks/IVbcHostObject3.cs @@ -3,7 +3,6 @@ using System; using System.Runtime.InteropServices; -using Microsoft.Build.Framework; namespace Microsoft.Build.Tasks.Hosting { diff --git a/src/XMakeTasks/IVbcHostObject4.cs b/src/XMakeTasks/IVbcHostObject4.cs index 6cfb5cdc4fd..cfe99628ebd 100644 --- a/src/XMakeTasks/IVbcHostObject4.cs +++ b/src/XMakeTasks/IVbcHostObject4.cs @@ -3,7 +3,6 @@ using System; using System.Runtime.InteropServices; -using Microsoft.Build.Framework; namespace Microsoft.Build.Tasks.Hosting { diff --git a/src/XMakeTasks/IVbcHostObject5.cs b/src/XMakeTasks/IVbcHostObject5.cs index d20292d6bb1..e23faaba89b 100644 --- a/src/XMakeTasks/IVbcHostObject5.cs +++ b/src/XMakeTasks/IVbcHostObject5.cs @@ -3,7 +3,6 @@ using System; using System.Runtime.InteropServices; -using Microsoft.Build.Framework; namespace Microsoft.Build.Tasks.Hosting { diff --git a/src/XMakeTasks/IVbcHostObjectFreeThreaded.cs b/src/XMakeTasks/IVbcHostObjectFreeThreaded.cs index d78cb42b509..471381abaca 100644 --- a/src/XMakeTasks/IVbcHostObjectFreeThreaded.cs +++ b/src/XMakeTasks/IVbcHostObjectFreeThreaded.cs @@ -2,10 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Collections.Generic; -using System.Linq; using System.Runtime.InteropServices; -using System.Text; namespace Microsoft.Build.Tasks.Hosting { diff --git a/src/XMakeTasks/InstalledSDKResolver.cs b/src/XMakeTasks/InstalledSDKResolver.cs index 673d19c925b..02437c64a17 100644 --- a/src/XMakeTasks/InstalledSDKResolver.cs +++ b/src/XMakeTasks/InstalledSDKResolver.cs @@ -5,13 +5,12 @@ // Resolve reference which have SDKName metadata on them //----------------------------------------------------------------------- +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using System; -using System.Reflection; using System.Collections; -using Microsoft.Build.Shared; using System.Collections.Generic; using System.IO; -using Microsoft.Build.Framework; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/InvalidParameterValueException.cs b/src/XMakeTasks/InvalidParameterValueException.cs index 64d6316fc61..df65f3840b5 100644 --- a/src/XMakeTasks/InvalidParameterValueException.cs +++ b/src/XMakeTasks/InvalidParameterValueException.cs @@ -2,15 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.IO; -using System.Collections; -using System.Globalization; -using System.Runtime.InteropServices; -using System.Diagnostics; -using System.Reflection; using System.Runtime.Serialization; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/LC.cs b/src/XMakeTasks/LC.cs index 8b2ce4bebd4..940e9b68504 100644 --- a/src/XMakeTasks/LC.cs +++ b/src/XMakeTasks/LC.cs @@ -1,11 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; +using System.IO; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/ListOperators/FindUnderPath.cs b/src/XMakeTasks/ListOperators/FindUnderPath.cs index a764866bfc0..4420910f4b6 100644 --- a/src/XMakeTasks/ListOperators/FindUnderPath.cs +++ b/src/XMakeTasks/ListOperators/FindUnderPath.cs @@ -1,13 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections; -using System.Globalization; - using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; +using System; +using System.Collections; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/ListOperators/RemoveDuplicates.cs b/src/XMakeTasks/ListOperators/RemoveDuplicates.cs index 2cd0513a20d..1572eb34a29 100644 --- a/src/XMakeTasks/ListOperators/RemoveDuplicates.cs +++ b/src/XMakeTasks/ListOperators/RemoveDuplicates.cs @@ -1,12 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections; - using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; +using System; +using System.Collections; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/MSBuild.cs b/src/XMakeTasks/MSBuild.cs index 167968d5f1e..4672522939b 100644 --- a/src/XMakeTasks/MSBuild.cs +++ b/src/XMakeTasks/MSBuild.cs @@ -1,18 +1,14 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; using System; -using System.IO; -using System.Xml; -using System.Resources; -using System.Reflection; using System.Collections; using System.Collections.Generic; -using System.Diagnostics; using System.Globalization; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; +using System.IO; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/MakeDir.cs b/src/XMakeTasks/MakeDir.cs index 7228919676b..689820b2f44 100644 --- a/src/XMakeTasks/MakeDir.cs +++ b/src/XMakeTasks/MakeDir.cs @@ -1,16 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Diagnostics; -using System.Resources; -using System.Reflection; -using System.Collections; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; +using System; +using System.Collections; using System.Collections.Generic; +using System.IO; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/ManagedCompiler.cs b/src/XMakeTasks/ManagedCompiler.cs index 5470e4da5a7..8b81077d1c3 100644 --- a/src/XMakeTasks/ManagedCompiler.cs +++ b/src/XMakeTasks/ManagedCompiler.cs @@ -1,24 +1,14 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; using System; using System.Collections; -using System.Collections.Generic; -using System.Collections.Specialized; -using System.Diagnostics; using System.Globalization; using System.IO; -using System.Linq; -using System.Reflection; -using System.Resources; using System.Text; -using System.Text.RegularExpressions; -using System.Threading; -using System.Threading.Tasks; - -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.Build.Utilities; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/ManifestUtil/ApplicationManifest.cs b/src/XMakeTasks/ManifestUtil/ApplicationManifest.cs index efa007e2395..afd82c9765c 100644 --- a/src/XMakeTasks/ManifestUtil/ApplicationManifest.cs +++ b/src/XMakeTasks/ManifestUtil/ApplicationManifest.cs @@ -1,6 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Shared; using System; using System.Collections.Generic; using System.ComponentModel; @@ -9,7 +10,6 @@ using System.Runtime.InteropServices; using System.Xml; using System.Xml.Serialization; -using Microsoft.Build.Shared; namespace Microsoft.Build.Tasks.Deployment.ManifestUtilities { diff --git a/src/XMakeTasks/ManifestUtil/AssemblyIdentity.cs b/src/XMakeTasks/ManifestUtil/AssemblyIdentity.cs index dddd9fdb459..5b9b56912d7 100644 --- a/src/XMakeTasks/ManifestUtil/AssemblyIdentity.cs +++ b/src/XMakeTasks/ManifestUtil/AssemblyIdentity.cs @@ -5,11 +5,9 @@ using System; using System.Collections.Generic; using System.ComponentModel; -using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Globalization; using System.IO; -using System.Reflection; using System.Runtime.InteropServices; using System.Text; using System.Text.RegularExpressions; diff --git a/src/XMakeTasks/ManifestUtil/AssemblyManifest.cs b/src/XMakeTasks/ManifestUtil/AssemblyManifest.cs index fb39281c90d..0160ceef141 100644 --- a/src/XMakeTasks/ManifestUtil/AssemblyManifest.cs +++ b/src/XMakeTasks/ManifestUtil/AssemblyManifest.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; using System.ComponentModel; using System.Runtime.InteropServices; using System.Xml.Serialization; diff --git a/src/XMakeTasks/ManifestUtil/AssemblyReferenceCollection.cs b/src/XMakeTasks/ManifestUtil/AssemblyReferenceCollection.cs index 774e77e6e09..bb96f9c5180 100644 --- a/src/XMakeTasks/ManifestUtil/AssemblyReferenceCollection.cs +++ b/src/XMakeTasks/ManifestUtil/AssemblyReferenceCollection.cs @@ -2,8 +2,8 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Runtime.InteropServices; using System.Collections; +using System.Runtime.InteropServices; namespace Microsoft.Build.Tasks.Deployment.ManifestUtilities { diff --git a/src/XMakeTasks/ManifestUtil/ComImporter.cs b/src/XMakeTasks/ManifestUtil/ComImporter.cs index e674cd64081..04ecae49183 100644 --- a/src/XMakeTasks/ManifestUtil/ComImporter.cs +++ b/src/XMakeTasks/ManifestUtil/ComImporter.cs @@ -3,8 +3,6 @@ using Microsoft.Win32; using System; -using System.IO; -using System.Collections; using System.Collections.Generic; using System.Globalization; using System.Resources; diff --git a/src/XMakeTasks/ManifestUtil/CompatibleFramework.cs b/src/XMakeTasks/ManifestUtil/CompatibleFramework.cs index 483d7f180d8..d237af0d66f 100644 --- a/src/XMakeTasks/ManifestUtil/CompatibleFramework.cs +++ b/src/XMakeTasks/ManifestUtil/CompatibleFramework.cs @@ -1,10 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; using System.ComponentModel; using System.Runtime.InteropServices; -using System.Text.RegularExpressions; using System.Xml; using System.Xml.Serialization; diff --git a/src/XMakeTasks/ManifestUtil/CompatibleFrameworkCollection.cs b/src/XMakeTasks/ManifestUtil/CompatibleFrameworkCollection.cs index a4f0f42037a..de102c6308c 100644 --- a/src/XMakeTasks/ManifestUtil/CompatibleFrameworkCollection.cs +++ b/src/XMakeTasks/ManifestUtil/CompatibleFrameworkCollection.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; using System.Collections; using System.Collections.Generic; using System.Runtime.InteropServices; diff --git a/src/XMakeTasks/ManifestUtil/Constants.cs b/src/XMakeTasks/ManifestUtil/Constants.cs index 227775923c5..f559bdf342a 100644 --- a/src/XMakeTasks/ManifestUtil/Constants.cs +++ b/src/XMakeTasks/ManifestUtil/Constants.cs @@ -2,8 +2,6 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Globalization; -using System.IO; namespace Microsoft.Build.Tasks.Deployment.ManifestUtilities { diff --git a/src/XMakeTasks/ManifestUtil/DeployManifest.cs b/src/XMakeTasks/ManifestUtil/DeployManifest.cs index 3a7bab24b47..257a3b46e08 100644 --- a/src/XMakeTasks/ManifestUtil/DeployManifest.cs +++ b/src/XMakeTasks/ManifestUtil/DeployManifest.cs @@ -1,17 +1,16 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Utilities; 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.Tasks.Deployment.ManifestUtilities; -using Microsoft.Build.Utilities; using FrameworkNameVersioning = System.Runtime.Versioning.FrameworkName; -using System.Collections.Generic; namespace Microsoft.Build.Tasks.Deployment.ManifestUtilities { diff --git a/src/XMakeTasks/ManifestUtil/FileAssociation.cs b/src/XMakeTasks/ManifestUtil/FileAssociation.cs index 53977a28fe5..127a9e8176f 100644 --- a/src/XMakeTasks/ManifestUtil/FileAssociation.cs +++ b/src/XMakeTasks/ManifestUtil/FileAssociation.cs @@ -1,10 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; using System.ComponentModel; using System.Runtime.InteropServices; -using System.Text.RegularExpressions; using System.Xml; using System.Xml.Serialization; diff --git a/src/XMakeTasks/ManifestUtil/FileAssociationCollection.cs b/src/XMakeTasks/ManifestUtil/FileAssociationCollection.cs index 8008871ed7f..4875725e1bb 100644 --- a/src/XMakeTasks/ManifestUtil/FileAssociationCollection.cs +++ b/src/XMakeTasks/ManifestUtil/FileAssociationCollection.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; using System.Collections; using System.Collections.Generic; using System.Runtime.InteropServices; diff --git a/src/XMakeTasks/ManifestUtil/FileReference.cs b/src/XMakeTasks/ManifestUtil/FileReference.cs index 66db68d20bd..0db0c1fd390 100644 --- a/src/XMakeTasks/ManifestUtil/FileReference.cs +++ b/src/XMakeTasks/ManifestUtil/FileReference.cs @@ -4,8 +4,6 @@ using System; using System.Collections; using System.ComponentModel; -using System.Globalization; -using System.IO; using System.Runtime.InteropServices; using System.Text; using System.Xml.Serialization; diff --git a/src/XMakeTasks/ManifestUtil/Manifest.cs b/src/XMakeTasks/ManifestUtil/Manifest.cs index f09a0d417be..e8859c35f68 100644 --- a/src/XMakeTasks/ManifestUtil/Manifest.cs +++ b/src/XMakeTasks/ManifestUtil/Manifest.cs @@ -1,20 +1,16 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Shared; using System; using System.Collections; using System.Collections.Generic; using System.ComponentModel; using System.Diagnostics; -using System.Globalization; using System.IO; -using System.Reflection; using System.Runtime.InteropServices; -using System.Security; -using System.Text; using System.Xml; using System.Xml.Serialization; -using Microsoft.Build.Shared; namespace Microsoft.Build.Tasks.Deployment.ManifestUtilities { diff --git a/src/XMakeTasks/ManifestUtil/ManifestFormatter.cs b/src/XMakeTasks/ManifestUtil/ManifestFormatter.cs index 12cf21a64a7..f3b4965e5d6 100644 --- a/src/XMakeTasks/ManifestUtil/ManifestFormatter.cs +++ b/src/XMakeTasks/ManifestUtil/ManifestFormatter.cs @@ -6,7 +6,6 @@ using System.IO; using System.Text; using System.Xml; -using System.Xml.Serialization; namespace Microsoft.Build.Tasks.Deployment.ManifestUtilities { diff --git a/src/XMakeTasks/ManifestUtil/ManifestWriter.cs b/src/XMakeTasks/ManifestUtil/ManifestWriter.cs index 07302c947e1..f25d2359e70 100644 --- a/src/XMakeTasks/ManifestUtil/ManifestWriter.cs +++ b/src/XMakeTasks/ManifestUtil/ManifestWriter.cs @@ -1,15 +1,13 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Shared; using System; using System.Collections; -using System.Diagnostics; using System.Globalization; using System.IO; using System.Runtime.InteropServices; -using System.Xml; using System.Xml.Serialization; -using Microsoft.Build.Shared; namespace Microsoft.Build.Tasks.Deployment.ManifestUtilities { diff --git a/src/XMakeTasks/ManifestUtil/MetadataReader.cs b/src/XMakeTasks/ManifestUtil/MetadataReader.cs index 98478c4d3ad..54ed02376c3 100644 --- a/src/XMakeTasks/ManifestUtil/MetadataReader.cs +++ b/src/XMakeTasks/ManifestUtil/MetadataReader.cs @@ -2,13 +2,9 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Collections; +using System.Collections.Specialized; using System.Diagnostics.CodeAnalysis; -using System.Reflection; -using System.Globalization; using System.Runtime.InteropServices; -using System.Collections.Specialized; -using Microsoft.Build.Tasks; namespace Microsoft.Build.Tasks.Deployment.ManifestUtilities { diff --git a/src/XMakeTasks/ManifestUtil/NativeMethods.cs b/src/XMakeTasks/ManifestUtil/NativeMethods.cs index 759cf8b93fd..7b9131a90e7 100644 --- a/src/XMakeTasks/ManifestUtil/NativeMethods.cs +++ b/src/XMakeTasks/ManifestUtil/NativeMethods.cs @@ -3,7 +3,6 @@ using System; using System.Runtime.InteropServices; -using System.Text; namespace Microsoft.Build.Tasks.Deployment.ManifestUtilities { diff --git a/src/XMakeTasks/ManifestUtil/PathUtil.cs b/src/XMakeTasks/ManifestUtil/PathUtil.cs index 21e8fbdde52..537b3511048 100644 --- a/src/XMakeTasks/ManifestUtil/PathUtil.cs +++ b/src/XMakeTasks/ManifestUtil/PathUtil.cs @@ -2,10 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Globalization; using System.IO; -using System.Text; -using System.Text.RegularExpressions; namespace Microsoft.Build.Tasks.Deployment.ManifestUtilities { diff --git a/src/XMakeTasks/ManifestUtil/RSAPKCS1SHA256SignatureDescription.cs b/src/XMakeTasks/ManifestUtil/RSAPKCS1SHA256SignatureDescription.cs index 3ecbc91f06d..e92b50697f2 100644 --- a/src/XMakeTasks/ManifestUtil/RSAPKCS1SHA256SignatureDescription.cs +++ b/src/XMakeTasks/ManifestUtil/RSAPKCS1SHA256SignatureDescription.cs @@ -1,7 +1,6 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; using System.Diagnostics.CodeAnalysis; using System.Security.Cryptography; diff --git a/src/XMakeTasks/ManifestUtil/SecurityUtil.cs b/src/XMakeTasks/ManifestUtil/SecurityUtil.cs index abad267e865..5e403b9b08b 100644 --- a/src/XMakeTasks/ManifestUtil/SecurityUtil.cs +++ b/src/XMakeTasks/ManifestUtil/SecurityUtil.cs @@ -1,11 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Win32; using System; -using System.Collections; using System.Collections.Generic; using System.ComponentModel; using System.Deployment.Internal.CodeSigning; @@ -14,6 +10,8 @@ using System.Globalization; using System.IO; using System.Reflection; +using System.Resources; +using System.Runtime.Hosting; using System.Runtime.InteropServices; using System.Security; using System.Security.Cryptography; @@ -21,7 +19,11 @@ using System.Security.Permissions; using System.Security.Policy; using System.Text; +using System.Threading; using System.Xml; +using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; +using Microsoft.Win32; using FrameworkNameVersioning = System.Runtime.Versioning.FrameworkName; namespace Microsoft.Build.Tasks.Deployment.ManifestUtilities @@ -141,15 +143,15 @@ private static PermissionSet GetNamedPermissionSet(string targetZone, ITaskItem[ if (majorVersion == Fx2MajorVersion) { - return SecurityUtilities.XmlToPermissionSet((GetXmlElement(targetZone, majorVersion))); + return XmlToPermissionSet((GetXmlElement(targetZone, majorVersion))); } else if (majorVersion == Fx3MajorVersion) { - return SecurityUtilities.XmlToPermissionSet((GetXmlElement(targetZone, majorVersion))); + return XmlToPermissionSet((GetXmlElement(targetZone, majorVersion))); } else { - return SecurityUtilities.XmlToPermissionSet((GetXmlElement(targetZone, fn))); + return XmlToPermissionSet((GetXmlElement(targetZone, fn))); } } @@ -248,7 +250,7 @@ private static XmlElement GetCurrentCLRPermissions(string targetZone) throw new ArgumentException(String.Empty /* no message */, "targetZone"); } - Evidence evidence = new Evidence(new EvidenceBase[] { new Zone(zone), new System.Runtime.Hosting.ActivationArguments(new System.ApplicationIdentity("")) }, null); + Evidence evidence = new Evidence(new EvidenceBase[] { new Zone(zone), new ActivationArguments(new System.ApplicationIdentity("")) }, null); PermissionSet sandbox = SecurityManager.GetStandardSandbox(evidence); resultInString = sandbox.ToString(); @@ -569,7 +571,7 @@ public static void SignFile(string certThumbprint, Uri timestampUrl, string path /// Version of the .NET Framework for the target. public static void SignFile(string certThumbprint, Uri timestampUrl, string path, string targetFrameworkVersion) { - System.Resources.ResourceManager resources = new System.Resources.ResourceManager("Microsoft.Build.Tasks.Deployment.ManifestUtilities.Strings", typeof(SecurityUtilities).Module.Assembly); + ResourceManager resources = new ResourceManager("Microsoft.Build.Tasks.Deployment.ManifestUtilities.Strings", typeof(SecurityUtilities).Module.Assembly); if (String.IsNullOrEmpty(certThumbprint)) throw new ArgumentNullException("certThumbprint"); @@ -628,11 +630,11 @@ private static bool UseSha256Algorithm(X509Certificate2 cert) public static void SignFile(X509Certificate2 cert, Uri timestampUrl, string path) { // setup resources - System.Resources.ResourceManager resources = new System.Resources.ResourceManager("Microsoft.Build.Tasks.Deployment.ManifestUtilities.Strings", typeof(SecurityUtilities).Module.Assembly); + ResourceManager resources = new ResourceManager("Microsoft.Build.Tasks.Deployment.ManifestUtilities.Strings", typeof(SecurityUtilities).Module.Assembly); SignFileInternal(cert, timestampUrl, path, true, resources); } - private static void SignFileInternal(X509Certificate2 cert, Uri timestampUrl, string path, bool targetFrameworkSupportsSha256, System.Resources.ResourceManager resources) + private static void SignFileInternal(X509Certificate2 cert, Uri timestampUrl, string path, bool targetFrameworkSupportsSha256, ResourceManager resources) { if (cert == null) throw new ArgumentNullException("cert"); @@ -687,7 +689,7 @@ private static void SignFileInternal(X509Certificate2 cert, Uri timestampUrl, st } catch (Exception ex) { - int exceptionHR = System.Runtime.InteropServices.Marshal.GetHRForException(ex); + int exceptionHR = Marshal.GetHRForException(ex); if (exceptionHR == -2147012889 || exceptionHR == -2147012867) { throw new ApplicationException(resources.GetString("SecurityUtil.TimestampUrlNotFound"), ex); @@ -698,7 +700,7 @@ private static void SignFileInternal(X509Certificate2 cert, Uri timestampUrl, st } - private static void SignPEFile(X509Certificate2 cert, System.Uri timestampUrl, string path, System.Resources.ResourceManager resources, bool useSha256) + private static void SignPEFile(X509Certificate2 cert, Uri timestampUrl, string path, ResourceManager resources, bool useSha256) { if (GetPathToTool() == null) throw new ApplicationException(resources.GetString("SecurityUtil.SigntoolNotFound")); @@ -717,7 +719,7 @@ private static void SignPEFile(X509Certificate2 cert, System.Uri timestampUrl, s while (!signTool.HasExited) { - System.Threading.Thread.Sleep(50); + Thread.Sleep(50); } switch (signTool.ExitCode) { diff --git a/src/XMakeTasks/ManifestUtil/TrustInfo.cs b/src/XMakeTasks/ManifestUtil/TrustInfo.cs index ad3c24bf402..44a7de4df85 100644 --- a/src/XMakeTasks/ManifestUtil/TrustInfo.cs +++ b/src/XMakeTasks/ManifestUtil/TrustInfo.cs @@ -3,8 +3,6 @@ using System; using System.Collections; -using System.Collections.Generic; -using System.Collections.Specialized; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Globalization; @@ -12,7 +10,6 @@ using System.Runtime.InteropServices; using System.Security; using System.Security.Permissions; -using System.Text; using System.Xml; namespace Microsoft.Build.Tasks.Deployment.ManifestUtilities diff --git a/src/XMakeTasks/ManifestUtil/Util.cs b/src/XMakeTasks/ManifestUtil/Util.cs index d7ce5f4f45e..b1779b0bec6 100644 --- a/src/XMakeTasks/ManifestUtil/Util.cs +++ b/src/XMakeTasks/ManifestUtil/Util.cs @@ -14,7 +14,6 @@ using System.Security; using System.Security.Cryptography; using System.Text; -using System.Xml; namespace Microsoft.Build.Tasks.Deployment.ManifestUtilities { diff --git a/src/XMakeTasks/ManifestUtil/XmlUtil.cs b/src/XMakeTasks/ManifestUtil/XmlUtil.cs index 85b8988f1ab..1b8fa05ac5b 100644 --- a/src/XMakeTasks/ManifestUtil/XmlUtil.cs +++ b/src/XMakeTasks/ManifestUtil/XmlUtil.cs @@ -8,7 +8,6 @@ using System.Globalization; using System.IO; using System.Reflection; -using System.Security.Policy; using System.Text; using System.Xml; using System.Xml.XPath; diff --git a/src/XMakeTasks/ManifestUtil/mansign.cs b/src/XMakeTasks/ManifestUtil/mansign.cs index 5826a16250f..02159e0e809 100644 --- a/src/XMakeTasks/ManifestUtil/mansign.cs +++ b/src/XMakeTasks/ManifestUtil/mansign.cs @@ -6,16 +6,13 @@ // -using System; -using System.Globalization; using System.IO; +using System.Runtime.InteropServices; 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 _FILETIME = System.Runtime.InteropServices.ComTypes.FILETIME; namespace System.Deployment.Internal.CodeSigning diff --git a/src/XMakeTasks/ManifestUtil/mansign2.cs b/src/XMakeTasks/ManifestUtil/mansign2.cs index 8dee6dbebcf..8f2c442abf0 100644 --- a/src/XMakeTasks/ManifestUtil/mansign2.cs +++ b/src/XMakeTasks/ManifestUtil/mansign2.cs @@ -6,19 +6,16 @@ // mansign.cs // -using System; -using System.Globalization; +using Microsoft.Win32; using System.IO; +using System.Runtime.InteropServices; using System.Security.Cryptography; -using System.Security.Cryptography.Xml; +using System.Security.Cryptography.Pkcs; using System.Security.Cryptography.X509Certificates; +using System.Security.Cryptography.Xml; using System.Text; using System.Xml; -using System.Runtime.InteropServices; -using System.Security.Cryptography.Pkcs; -using Microsoft.Win32; -using _FILETIME = System.Runtime.InteropServices.ComTypes.FILETIME; namespace System.Deployment.Internal.CodeSigning { diff --git a/src/XMakeTasks/Message.cs b/src/XMakeTasks/Message.cs index 8e6d3758966..c71e95bf168 100644 --- a/src/XMakeTasks/Message.cs +++ b/src/XMakeTasks/Message.cs @@ -1,13 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Diagnostics; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using System.Globalization; -using System.Resources; +using System; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/Move.cs b/src/XMakeTasks/Move.cs index 2ec35816e31..a1d2bdcd171 100644 --- a/src/XMakeTasks/Move.cs +++ b/src/XMakeTasks/Move.cs @@ -5,14 +5,13 @@ // Moves files from one place to another. //----------------------------------------------------------------------- -using System; -using System.Collections; -using System.IO; using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Microsoft.Build.Utilities; +using System; +using System.Collections; +using System.IO; using System.Runtime.InteropServices; -using System.ComponentModel; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/NativeMethods.cs b/src/XMakeTasks/NativeMethods.cs index 48717f9e8e8..031f4dd6fb5 100644 --- a/src/XMakeTasks/NativeMethods.cs +++ b/src/XMakeTasks/NativeMethods.cs @@ -1,14 +1,14 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Text; -using System.Runtime.InteropServices; using Microsoft.Build.Shared; -using System.Collections.Generic; +using System; using System.Collections; +using System.Collections.Generic; +using System.IO; using System.Runtime.ExceptionServices; +using System.Runtime.InteropServices; +using System.Text; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/ParserState.cs b/src/XMakeTasks/ParserState.cs index 80148a3affe..ee2aa29ed3d 100644 --- a/src/XMakeTasks/ParserState.cs +++ b/src/XMakeTasks/ParserState.cs @@ -2,11 +2,8 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.IO; -using System.Text; -using System.Resources; -using System.Reflection; using System.Collections; +using System.Text; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/PiaReference.cs b/src/XMakeTasks/PiaReference.cs index 34acd98ca9e..bfd1f577e87 100644 --- a/src/XMakeTasks/PiaReference.cs +++ b/src/XMakeTasks/PiaReference.cs @@ -1,20 +1,14 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Shared; +// TYPELIBATTR clashes with the one in InteropServices. + +using Microsoft.Build.Utilities; using System; using System.IO; -using System.Diagnostics; using System.Reflection; -using System.Text; 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.Utilities; -using Microsoft.Build.Shared; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/RCWForCurrentContext.cs b/src/XMakeTasks/RCWForCurrentContext.cs index c1b4ddcb082..051814a839a 100644 --- a/src/XMakeTasks/RCWForCurrentContext.cs +++ b/src/XMakeTasks/RCWForCurrentContext.cs @@ -6,8 +6,8 @@ //----------------------------------------------------------------------- using System; -using System.Runtime.InteropServices; using System.Diagnostics; +using System.Runtime.InteropServices; namespace Microsoft.Build.Tasks.InteropUtilities { diff --git a/src/XMakeTasks/RedistList.cs b/src/XMakeTasks/RedistList.cs index 876a1369361..142e9ac7b69 100644 --- a/src/XMakeTasks/RedistList.cs +++ b/src/XMakeTasks/RedistList.cs @@ -1,21 +1,19 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; using System; using System.Collections; +using System.Collections.Concurrent; using System.Collections.Generic; -using System.Collections.Specialized; +using System.Collections.ObjectModel; using System.Diagnostics; using System.Globalization; using System.IO; +using System.Linq; using System.Text; using System.Xml; -using Microsoft.Win32; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; -using System.Collections.Concurrent; -using System.Collections.ObjectModel; -using System.Linq; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/RegisterAssembly.cs b/src/XMakeTasks/RegisterAssembly.cs index eac1af26e86..e0f3c7561ee 100644 --- a/src/XMakeTasks/RegisterAssembly.cs +++ b/src/XMakeTasks/RegisterAssembly.cs @@ -1,19 +1,16 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; using System; using System.Diagnostics; using System.IO; -using System.Resources; using System.Reflection; using System.Runtime.InteropServices; -using System.Security; using System.Runtime.InteropServices.ComTypes; - -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Tasks; -using Microsoft.Build.Shared; +using System.Security; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/RemoveDir.cs b/src/XMakeTasks/RemoveDir.cs index 5dd2f6a3703..c460054c4f3 100644 --- a/src/XMakeTasks/RemoveDir.cs +++ b/src/XMakeTasks/RemoveDir.cs @@ -1,16 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; using System; using System.Collections; -using System.Diagnostics; using System.IO; -using System.Globalization; -using System.Reflection; -using System.Resources; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/RequiresFramework35SP1Assembly.cs b/src/XMakeTasks/RequiresFramework35SP1Assembly.cs index 7cbf654be34..6903e22fd5a 100644 --- a/src/XMakeTasks/RequiresFramework35SP1Assembly.cs +++ b/src/XMakeTasks/RequiresFramework35SP1Assembly.cs @@ -1,19 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections; -using System.Collections.Generic; -using System.Diagnostics; -using System.Globalization; -using System.IO; -using System.Reflection; -using System.Resources; -using System.Runtime.InteropServices; using Microsoft.Build.Framework; using Microsoft.Build.Tasks.Deployment.ManifestUtilities; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; +using System; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/ResGen.cs b/src/XMakeTasks/ResGen.cs index fc9b482d327..d1af6a4aeee 100644 --- a/src/XMakeTasks/ResGen.cs +++ b/src/XMakeTasks/ResGen.cs @@ -5,17 +5,13 @@ // ToolTask that wraps ResGen.exe, which transforms resource files. //----------------------------------------------------------------------- +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; using System; -using System.IO; using System.Collections.Generic; +using System.IO; using System.Text; -using System.Resources; -using System.Reflection; -using System.Diagnostics; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; - using CodeDomProvider = System.CodeDom.Compiler.CodeDomProvider; using MSBuildProcessorArchitecture = Microsoft.Build.Utilities.ProcessorArchitecture; diff --git a/src/XMakeTasks/ResGenDependencies.cs b/src/XMakeTasks/ResGenDependencies.cs index dcbf2039c52..32529da6e2b 100644 --- a/src/XMakeTasks/ResGenDependencies.cs +++ b/src/XMakeTasks/ResGenDependencies.cs @@ -1,20 +1,13 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Utilities; using System; using System.Collections; +using System.Diagnostics; using System.IO; -using System.Text; -using System.Xml; using System.Resources; -using System.Reflection; -using System.Diagnostics; -using System.Globalization; -using System.Runtime.Serialization; -using System.Runtime.Serialization.Formatters.Binary; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; +using System.Xml; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/ResolveCodeAnalysisRuleSet.cs b/src/XMakeTasks/ResolveCodeAnalysisRuleSet.cs index 54a6d0983d0..0dbeec7abd5 100644 --- a/src/XMakeTasks/ResolveCodeAnalysisRuleSet.cs +++ b/src/XMakeTasks/ResolveCodeAnalysisRuleSet.cs @@ -5,8 +5,8 @@ // A task to determine the code analysis rule set file. //----------------------------------------------------------------------- -using System.IO; using Microsoft.Build.Framework; +using System.IO; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/ResolveComReference.cs b/src/XMakeTasks/ResolveComReference.cs index 13f229b9fe4..5da280b4e8c 100644 --- a/src/XMakeTasks/ResolveComReference.cs +++ b/src/XMakeTasks/ResolveComReference.cs @@ -1,26 +1,22 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; using System; using System.Collections; +using System.Collections.Generic; using System.Diagnostics; using System.Globalization; using System.IO; -using System.Resources; +using System.Linq; using System.Reflection; using System.Runtime.InteropServices; -using System.Runtime.InteropServices.ComTypes; -using System.Collections.Generic; -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.Utilities; -using Microsoft.Build.Shared; - namespace Microsoft.Build.Tasks { /// diff --git a/src/XMakeTasks/ResolveComReferenceCache.cs b/src/XMakeTasks/ResolveComReferenceCache.cs index 38e2cfa7cca..e8bf69dc976 100644 --- a/src/XMakeTasks/ResolveComReferenceCache.cs +++ b/src/XMakeTasks/ResolveComReferenceCache.cs @@ -1,15 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Shared; using System; using System.Collections; -using System.Diagnostics; -using System.IO; -using System.Runtime.Serialization; -using System.Runtime.Serialization.Formatters.Binary; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/ResolveKeySource.cs b/src/XMakeTasks/ResolveKeySource.cs index 6b97f01baf3..6107f3b1093 100644 --- a/src/XMakeTasks/ResolveKeySource.cs +++ b/src/XMakeTasks/ResolveKeySource.cs @@ -1,19 +1,15 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using Microsoft.Runtime.Hosting; using System; -using System.Diagnostics; +using System.Collections; using System.Globalization; using System.IO; -using System.Reflection; -using System.Collections; -using System.Resources; using System.Security.Cryptography; using System.Security.Cryptography.X509Certificates; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; -using Microsoft.Runtime.Hosting; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/ResolveManifestFiles.cs b/src/XMakeTasks/ResolveManifestFiles.cs index 8e6cdb1c35f..5e538a64e0e 100644 --- a/src/XMakeTasks/ResolveManifestFiles.cs +++ b/src/XMakeTasks/ResolveManifestFiles.cs @@ -1,19 +1,16 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using Microsoft.Build.Tasks.Deployment.ManifestUtilities; +using Microsoft.Build.Utilities; using System; using System.Collections; using System.Collections.Generic; using System.Diagnostics; using System.Globalization; using System.IO; -using System.Reflection; -using System.Resources; -using System.Runtime.InteropServices; -using Microsoft.Build.Framework; -using Microsoft.Build.Tasks.Deployment.ManifestUtilities; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/ResolveNativeReference.cs b/src/XMakeTasks/ResolveNativeReference.cs index 14e0a6a2282..c7f8d7a715a 100644 --- a/src/XMakeTasks/ResolveNativeReference.cs +++ b/src/XMakeTasks/ResolveNativeReference.cs @@ -1,16 +1,13 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Diagnostics; -using System.Resources; -using System.Reflection; -using System.Collections; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Tasks.Deployment.ManifestUtilities; using Microsoft.Build.Shared; +using Microsoft.Build.Tasks.Deployment.ManifestUtilities; +using Microsoft.Build.Utilities; +using System; +using System.Collections; +using System.IO; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/ResolveNonMSBuildProjectOutput.cs b/src/XMakeTasks/ResolveNonMSBuildProjectOutput.cs index ad2dac39b76..fd275554752 100644 --- a/src/XMakeTasks/ResolveNonMSBuildProjectOutput.cs +++ b/src/XMakeTasks/ResolveNonMSBuildProjectOutput.cs @@ -1,18 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; using System; using System.Collections; -using System.Diagnostics; -using System.Globalization; -using System.IO; using System.Reflection; -using System.Resources; -using System.Text; using System.Xml; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/ResolveProjectBase.cs b/src/XMakeTasks/ResolveProjectBase.cs index 40679b4d996..b7d3937bda5 100644 --- a/src/XMakeTasks/ResolveProjectBase.cs +++ b/src/XMakeTasks/ResolveProjectBase.cs @@ -1,17 +1,15 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.IO; -using System.Text; using System.Xml; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; - namespace Microsoft.Build.Tasks { /// diff --git a/src/XMakeTasks/ResolveSDKReference.cs b/src/XMakeTasks/ResolveSDKReference.cs index 53e806e76c7..e1c700d3f16 100644 --- a/src/XMakeTasks/ResolveSDKReference.cs +++ b/src/XMakeTasks/ResolveSDKReference.cs @@ -5,18 +5,16 @@ // Resolves an SDKReference to a full path on disk //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.IO; -using System.Text.RegularExpressions; -using System.Xml; using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Microsoft.Build.Utilities; -using Microsoft.Win32; -using System.Linq; -using System.Globalization; +using System; +using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; +using System.Globalization; +using System.IO; +using System.Linq; +using System.Text.RegularExpressions; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/SGen.cs b/src/XMakeTasks/SGen.cs index 64ac9facaef..0259a71d737 100644 --- a/src/XMakeTasks/SGen.cs +++ b/src/XMakeTasks/SGen.cs @@ -1,19 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections; -using System.IO; -using System.Text; -using System.Resources; -using System.Reflection; -using System.Diagnostics; -using System.Globalization; -using System.Runtime.Serialization; -using System.Runtime.Serialization.Formatters.Binary; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; +using System; +using System.Diagnostics; +using System.IO; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/SdkToolsPathUtility.cs b/src/XMakeTasks/SdkToolsPathUtility.cs index 95bc800eb62..11d369ead20 100644 --- a/src/XMakeTasks/SdkToolsPathUtility.cs +++ b/src/XMakeTasks/SdkToolsPathUtility.cs @@ -5,13 +5,11 @@ // Provide a helper class for tasks to find their tools if they are in the SDK //----------------------------------------------------------------------- +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; using System; -using System.Collections.Generic; -using System.Text; using System.IO; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; -using Microsoft.Build.Framework; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/SignFile.cs b/src/XMakeTasks/SignFile.cs index 1d23e9142db..7f1e97396da 100644 --- a/src/XMakeTasks/SignFile.cs +++ b/src/XMakeTasks/SignFile.cs @@ -2,18 +2,14 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. #region Using directives -using System; -using System.Collections.Generic; -using System.Text; -using System.IO; -using System.Security; -using System.Security.Cryptography; -using System.Security.Cryptography.X509Certificates; -using Microsoft.Build.Tasks.Deployment.ManifestUtilities; -using Microsoft.Build.Utilities; using Microsoft.Build.Framework; using Microsoft.Build.Shared; +using Microsoft.Build.Tasks.Deployment.ManifestUtilities; +using Microsoft.Build.Utilities; +using System; using System.ComponentModel; +using System.IO; +using System.Security.Cryptography; #endregion diff --git a/src/XMakeTasks/StateFileBase.cs b/src/XMakeTasks/StateFileBase.cs index f5b431e4599..45d04918384 100644 --- a/src/XMakeTasks/StateFileBase.cs +++ b/src/XMakeTasks/StateFileBase.cs @@ -1,13 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; using System; using System.IO; -using System.Runtime.Serialization; using System.Runtime.Serialization.Formatters.Binary; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/StrongNameUtils.cs b/src/XMakeTasks/StrongNameUtils.cs index b23641719d0..3b13113de5c 100644 --- a/src/XMakeTasks/StrongNameUtils.cs +++ b/src/XMakeTasks/StrongNameUtils.cs @@ -1,20 +1,16 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Shared; +// TYPELIBATTR clashes with the one in InteropServices. + +using Microsoft.Build.Utilities; using System; using System.Diagnostics; using System.IO; using System.Reflection; -using System.Resources; -using System.Security; 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.Utilities; -using Microsoft.Build.Shared; +using System.Security; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/System.Design.cs b/src/XMakeTasks/System.Design.cs index d0974599fde..d2b6c43120a 100644 --- a/src/XMakeTasks/System.Design.cs +++ b/src/XMakeTasks/System.Design.cs @@ -7,15 +7,10 @@ //------------------------------------------------------------------------------ using System; -using System.Reflection; +using System.ComponentModel; using System.Globalization; using System.Resources; -using System.Text; using System.Threading; -using System.Security.Permissions; - - -using System.ComponentModel; namespace Microsoft.Build.Tasks diff --git a/src/XMakeTasks/SystemState.cs b/src/XMakeTasks/SystemState.cs index 67e0bf9d913..3c278ce91c8 100644 --- a/src/XMakeTasks/SystemState.cs +++ b/src/XMakeTasks/SystemState.cs @@ -1,22 +1,16 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Diagnostics; -using Microsoft.Build.Tasks; -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; -using System.Reflection; +using System; using System.Collections; -using System.IO; -using System.Runtime.Serialization.Formatters.Binary; -using System.Runtime.Serialization; -using System.Security.Permissions; -using System.Globalization; -using System.Collections.Generic; using System.Collections.Concurrent; +using System.Diagnostics; using System.Diagnostics.CodeAnalysis; +using System.IO; +using System.Runtime.Serialization; using System.Runtime.Versioning; +using System.Security.Permissions; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/TaskExtension.cs b/src/XMakeTasks/TaskExtension.cs index 334a90f8fda..e7986e090b1 100644 --- a/src/XMakeTasks/TaskExtension.cs +++ b/src/XMakeTasks/TaskExtension.cs @@ -1,15 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Diagnostics; -using System.Globalization; -using System.IO; -using System.Resources; -using System.Text.RegularExpressions; -using System.Runtime.InteropServices; - -using Microsoft.Build.Framework; + using Microsoft.Build.Shared; using Microsoft.Build.Utilities; diff --git a/src/XMakeTasks/TlbImp.cs b/src/XMakeTasks/TlbImp.cs index ac16bcfb43d..b89da1363b9 100644 --- a/src/XMakeTasks/TlbImp.cs +++ b/src/XMakeTasks/TlbImp.cs @@ -6,16 +6,6 @@ //----------------------------------------------------------------------- using System; -using System.IO; -using System.Collections.Generic; -using System.Text; -using System.Resources; -using System.Reflection; -using System.Diagnostics; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; -using System.Linq; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/TlbReference.cs b/src/XMakeTasks/TlbReference.cs index fb4970c9b38..b87d9203e8d 100644 --- a/src/XMakeTasks/TlbReference.cs +++ b/src/XMakeTasks/TlbReference.cs @@ -1,25 +1,22 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; using System; +using System.Collections.Generic; using System.Diagnostics; using System.IO; +using System.Linq; using System.Reflection; using System.Reflection.Emit; -using System.Security; -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.Utilities; -using Microsoft.Build.Shared; - namespace Microsoft.Build.Tasks { /* diff --git a/src/XMakeTasks/ToolTaskExtension.cs b/src/XMakeTasks/ToolTaskExtension.cs index 0cc27aedcf0..8fd7f3a3520 100644 --- a/src/XMakeTasks/ToolTaskExtension.cs +++ b/src/XMakeTasks/ToolTaskExtension.cs @@ -1,10 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections; using Microsoft.Build.Shared; using Microsoft.Build.Utilities; +using System.Collections; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/Touch.cs b/src/XMakeTasks/Touch.cs index a39b1a81545..79e12b8ae93 100644 --- a/src/XMakeTasks/Touch.cs +++ b/src/XMakeTasks/Touch.cs @@ -1,16 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using System; using System.Collections; using System.Collections.Generic; -using System.Diagnostics; using System.Globalization; -using System.Reflection; -using System.Resources; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/UnitTests/Al_Tests.cs b/src/XMakeTasks/UnitTests/Al_Tests.cs index 5c4e0d6d37d..95573913c79 100644 --- a/src/XMakeTasks/UnitTests/Al_Tests.cs +++ b/src/XMakeTasks/UnitTests/Al_Tests.cs @@ -1,15 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Reflection; -using System.Collections; using Microsoft.Build.Framework; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; -using System.Text.RegularExpressions; -using System.Globalization; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/src/XMakeTasks/UnitTests/AppConfig_Tests.cs b/src/XMakeTasks/UnitTests/AppConfig_Tests.cs index aac2a0d83e5..bf1c2807fbe 100644 --- a/src/XMakeTasks/UnitTests/AppConfig_Tests.cs +++ b/src/XMakeTasks/UnitTests/AppConfig_Tests.cs @@ -1,14 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Tasks; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; using System.Text; using System.Xml; -using Microsoft.Build.Framework; -using Microsoft.Build.Tasks; -using Microsoft.Build.Utilities; - -using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/AspNetCompiler_Tests.cs b/src/XMakeTasks/UnitTests/AspNetCompiler_Tests.cs index e4120ebe6cf..5366a1a07f3 100644 --- a/src/XMakeTasks/UnitTests/AspNetCompiler_Tests.cs +++ b/src/XMakeTasks/UnitTests/AspNetCompiler_Tests.cs @@ -1,18 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Reflection; -using System.Collections; -using Microsoft.Build.Framework; -using Microsoft.Build.Tasks; -using Microsoft.Build.Utilities; using Microsoft.Build.Evaluation; -using System.Text.RegularExpressions; -using System.Globalization; - +using Microsoft.Build.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; +using System.Globalization; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/AssignCulture_Tests.cs b/src/XMakeTasks/UnitTests/AssignCulture_Tests.cs index 0ab3e035a05..42f82bae40f 100644 --- a/src/XMakeTasks/UnitTests/AssignCulture_Tests.cs +++ b/src/XMakeTasks/UnitTests/AssignCulture_Tests.cs @@ -1,13 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Reflection; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Framework; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/AssignLinkMetadata_Tests.cs b/src/XMakeTasks/UnitTests/AssignLinkMetadata_Tests.cs index 3039d843f81..c135a5f0bff 100644 --- a/src/XMakeTasks/UnitTests/AssignLinkMetadata_Tests.cs +++ b/src/XMakeTasks/UnitTests/AssignLinkMetadata_Tests.cs @@ -1,16 +1,15 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Reflection; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Microsoft.Build.Evaluation; +using Microsoft.Build.Execution; using Microsoft.Build.Framework; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; -using Microsoft.Build.Evaluation; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; using System.Collections.Generic; -using Microsoft.Build.Execution; +using System.IO; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/AssignProjectConfiguration_Tests.cs b/src/XMakeTasks/UnitTests/AssignProjectConfiguration_Tests.cs index 49ad31036c3..1041a413a48 100644 --- a/src/XMakeTasks/UnitTests/AssignProjectConfiguration_Tests.cs +++ b/src/XMakeTasks/UnitTests/AssignProjectConfiguration_Tests.cs @@ -1,15 +1,13 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections; -using System.Text; -using System.Xml; - using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Tasks; +using Microsoft.Build.Utilities; using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections; +using System.Xml; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/AssignTargetPath_Tests.cs b/src/XMakeTasks/UnitTests/AssignTargetPath_Tests.cs index 301114d5225..c7e7b0190f1 100644 --- a/src/XMakeTasks/UnitTests/AssignTargetPath_Tests.cs +++ b/src/XMakeTasks/UnitTests/AssignTargetPath_Tests.cs @@ -1,13 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Reflection; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Framework; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; +using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/AxImp_Tests.cs b/src/XMakeTasks/UnitTests/AxImp_Tests.cs index d09bd549ed4..051155b6b94 100644 --- a/src/XMakeTasks/UnitTests/AxImp_Tests.cs +++ b/src/XMakeTasks/UnitTests/AxImp_Tests.cs @@ -1,17 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections.Generic; -using System.Text; -using System.IO; -using System.Reflection; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; using Microsoft.Build.Tasks; -using Microsoft.Build.Utilities; -using System.Text.RegularExpressions; -using System.Globalization; +using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Microsoft.Build.UnitTests.AxTlbImp_Tests { diff --git a/src/XMakeTasks/UnitTests/AxTlbBaseTask_Tests.cs b/src/XMakeTasks/UnitTests/AxTlbBaseTask_Tests.cs index fe04576f65c..10ff54327e7 100644 --- a/src/XMakeTasks/UnitTests/AxTlbBaseTask_Tests.cs +++ b/src/XMakeTasks/UnitTests/AxTlbBaseTask_Tests.cs @@ -1,19 +1,13 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections.Generic; -using System.Text; -using System.IO; -using System.Reflection; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; -using System.Text.RegularExpressions; -using System.Globalization; using Microsoft.Runtime.Hosting; -using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.IO; namespace Microsoft.Build.UnitTests.AxTlbImp_Tests { diff --git a/src/XMakeTasks/UnitTests/CSharpParserUtilitites_Tests.cs b/src/XMakeTasks/UnitTests/CSharpParserUtilitites_Tests.cs index b7025789ae7..9330dd4526c 100644 --- a/src/XMakeTasks/UnitTests/CSharpParserUtilitites_Tests.cs +++ b/src/XMakeTasks/UnitTests/CSharpParserUtilitites_Tests.cs @@ -1,15 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Reflection; -using System.Collections; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; using Microsoft.Build.Tasks; -using Microsoft.Build.Utilities; -using System.Text.RegularExpressions; +using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/CSharpTokenizer_Tests.cs b/src/XMakeTasks/UnitTests/CSharpTokenizer_Tests.cs index bcdf932d435..fbf4f404142 100644 --- a/src/XMakeTasks/UnitTests/CSharpTokenizer_Tests.cs +++ b/src/XMakeTasks/UnitTests/CSharpTokenizer_Tests.cs @@ -1,17 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Shared.LanguageParser; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; using System.IO; -using System.Reflection; -using System.Collections; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; -using Microsoft.Build.Tasks; -using Microsoft.Build.Utilities; -using System.Text.RegularExpressions; - -using Microsoft.Build.Shared.LanguageParser; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/CallTarget_Tests.cs b/src/XMakeTasks/UnitTests/CallTarget_Tests.cs index 115504a92d0..6980f02dd65 100644 --- a/src/XMakeTasks/UnitTests/CallTarget_Tests.cs +++ b/src/XMakeTasks/UnitTests/CallTarget_Tests.cs @@ -1,18 +1,13 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Reflection; -using System.Collections; -using System.Collections.Generic; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; using Microsoft.Build.Framework; -using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; -using System.Text.RegularExpressions; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System.Collections; +using System.Collections.Generic; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/CodeTaskFactoryTests.cs b/src/XMakeTasks/UnitTests/CodeTaskFactoryTests.cs index 0c41e543201..287e54c7253 100644 --- a/src/XMakeTasks/UnitTests/CodeTaskFactoryTests.cs +++ b/src/XMakeTasks/UnitTests/CodeTaskFactoryTests.cs @@ -1,15 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Evaluation; -using System.IO; using System; -using System.Collections.Generic; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using System.CodeDom.Compiler; -using Microsoft.Build.Shared; +using System.IO; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/ComReferenceWalker_Tests.cs b/src/XMakeTasks/UnitTests/ComReferenceWalker_Tests.cs index e02536951e0..69dda847288 100644 --- a/src/XMakeTasks/UnitTests/ComReferenceWalker_Tests.cs +++ b/src/XMakeTasks/UnitTests/ComReferenceWalker_Tests.cs @@ -1,14 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Tasks; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; using System.Collections.Generic; -using System.Text; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Tasks; using System.Runtime.InteropServices.ComTypes; - -using Marshal = System.Runtime.InteropServices.Marshal; using COMException = System.Runtime.InteropServices.COMException; namespace Microsoft.Build.UnitTests diff --git a/src/XMakeTasks/UnitTests/ComReference_Tests.cs b/src/XMakeTasks/UnitTests/ComReference_Tests.cs index 70a685604ed..586aca63a8b 100644 --- a/src/XMakeTasks/UnitTests/ComReference_Tests.cs +++ b/src/XMakeTasks/UnitTests/ComReference_Tests.cs @@ -1,14 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Shared; +using Microsoft.Build.Tasks; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; using System.Collections.Generic; -using System.Text; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; -using Microsoft.Build.Tasks; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/CombinePath_Tests.cs b/src/XMakeTasks/UnitTests/CombinePath_Tests.cs index 5fa2f5c9b9d..911eb6eeda4 100644 --- a/src/XMakeTasks/UnitTests/CombinePath_Tests.cs +++ b/src/XMakeTasks/UnitTests/CombinePath_Tests.cs @@ -1,12 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Framework; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; +using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/CommandLineBuilderExtension_Tests.cs b/src/XMakeTasks/UnitTests/CommandLineBuilderExtension_Tests.cs index 56ae12ab0aa..b168a632cb5 100644 --- a/src/XMakeTasks/UnitTests/CommandLineBuilderExtension_Tests.cs +++ b/src/XMakeTasks/UnitTests/CommandLineBuilderExtension_Tests.cs @@ -1,15 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Reflection; -using System.Collections; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Framework; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; -using System.Text.RegularExpressions; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/CommandLineGenerator_Tests.cs b/src/XMakeTasks/UnitTests/CommandLineGenerator_Tests.cs index bb47a31f06a..34b6311f864 100644 --- a/src/XMakeTasks/UnitTests/CommandLineGenerator_Tests.cs +++ b/src/XMakeTasks/UnitTests/CommandLineGenerator_Tests.cs @@ -1,13 +1,13 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections.Generic; -using System.Windows.Markup; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Framework; using Microsoft.Build.Framework.XamlTypes; using Microsoft.Build.Tasks.Xaml; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections.Generic; +using System.Windows.Markup; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/CommandLine_Support.cs b/src/XMakeTasks/UnitTests/CommandLine_Support.cs index 96ca175df04..98a1a163345 100644 --- a/src/XMakeTasks/UnitTests/CommandLine_Support.cs +++ b/src/XMakeTasks/UnitTests/CommandLine_Support.cs @@ -1,18 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Reflection; -using System.Collections; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; -using System.Text.RegularExpressions; -using System.Globalization; -using System.Text; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Reflection; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/ConvertToAbsolutePath_Tests.cs b/src/XMakeTasks/UnitTests/ConvertToAbsolutePath_Tests.cs index 5619c4eaaa1..055a01fd514 100644 --- a/src/XMakeTasks/UnitTests/ConvertToAbsolutePath_Tests.cs +++ b/src/XMakeTasks/UnitTests/ConvertToAbsolutePath_Tests.cs @@ -1,14 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; - -using Microsoft.VisualStudio.TestTools.UnitTesting; - using Microsoft.Build.Framework; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System.IO; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/Copy_Tests.cs b/src/XMakeTasks/UnitTests/Copy_Tests.cs index 80b1b7d53ad..8d7757b87d8 100644 --- a/src/XMakeTasks/UnitTests/Copy_Tests.cs +++ b/src/XMakeTasks/UnitTests/Copy_Tests.cs @@ -1,18 +1,14 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Reflection; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; using System.Collections.Generic; -using System.Diagnostics; -using System.Runtime.InteropServices; -using System.Text; +using System.IO; using System.Security.AccessControl; namespace Microsoft.Build.UnitTests diff --git a/src/XMakeTasks/UnitTests/CreateCSharpManifestResourceName_Tests.cs b/src/XMakeTasks/UnitTests/CreateCSharpManifestResourceName_Tests.cs index a1d24820b73..58518b56ca0 100644 --- a/src/XMakeTasks/UnitTests/CreateCSharpManifestResourceName_Tests.cs +++ b/src/XMakeTasks/UnitTests/CreateCSharpManifestResourceName_Tests.cs @@ -1,17 +1,13 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Reflection; -using System.Globalization; - -using Microsoft.VisualStudio.TestTools.UnitTesting; - using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.IO; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/CreateItem_Tests.cs b/src/XMakeTasks/UnitTests/CreateItem_Tests.cs index 80f9edfc84d..4d62575b633 100644 --- a/src/XMakeTasks/UnitTests/CreateItem_Tests.cs +++ b/src/XMakeTasks/UnitTests/CreateItem_Tests.cs @@ -1,13 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Reflection; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Framework; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; +using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/CreateProperty_Tests.cs b/src/XMakeTasks/UnitTests/CreateProperty_Tests.cs index e956ede6d24..2d233ab52a1 100644 --- a/src/XMakeTasks/UnitTests/CreateProperty_Tests.cs +++ b/src/XMakeTasks/UnitTests/CreateProperty_Tests.cs @@ -1,14 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Reflection; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Evaluation; -using Microsoft.Build.Framework; -using Microsoft.Build.Tasks; -using Microsoft.Build.Utilities; +using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/CreateVisualBasicManifestResourceName_Tests.cs b/src/XMakeTasks/UnitTests/CreateVisualBasicManifestResourceName_Tests.cs index c75fda8dff9..681958376ad 100644 --- a/src/XMakeTasks/UnitTests/CreateVisualBasicManifestResourceName_Tests.cs +++ b/src/XMakeTasks/UnitTests/CreateVisualBasicManifestResourceName_Tests.cs @@ -1,17 +1,13 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Reflection; -using System.Globalization; - -using Microsoft.VisualStudio.TestTools.UnitTesting; - using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.IO; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/Csc_Tests.cs b/src/XMakeTasks/UnitTests/Csc_Tests.cs index 532c04a5353..fb80c18c65a 100644 --- a/src/XMakeTasks/UnitTests/Csc_Tests.cs +++ b/src/XMakeTasks/UnitTests/Csc_Tests.cs @@ -1,17 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Linq; -using System.Reflection; -using System.Collections; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Framework; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; -using System.Text.RegularExpressions; -using System.Globalization; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/Culture_Tests.cs b/src/XMakeTasks/UnitTests/Culture_Tests.cs index f8cb7a22902..119f9bfec1b 100644 --- a/src/XMakeTasks/UnitTests/Culture_Tests.cs +++ b/src/XMakeTasks/UnitTests/Culture_Tests.cs @@ -1,13 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Reflection; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; using Microsoft.Build.Tasks; -using Microsoft.Build.Utilities; +using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/Delete_Tests.cs b/src/XMakeTasks/UnitTests/Delete_Tests.cs index e4582206cad..f492d7a630e 100644 --- a/src/XMakeTasks/UnitTests/Delete_Tests.cs +++ b/src/XMakeTasks/UnitTests/Delete_Tests.cs @@ -1,13 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Reflection; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Framework; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; +using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/DependentAssembly_Tests.cs b/src/XMakeTasks/UnitTests/DependentAssembly_Tests.cs index 26a5fa853e1..73d41a9925d 100644 --- a/src/XMakeTasks/UnitTests/DependentAssembly_Tests.cs +++ b/src/XMakeTasks/UnitTests/DependentAssembly_Tests.cs @@ -1,14 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections; -using System.Xml; - -using Microsoft.VisualStudio.TestTools.UnitTesting; - -using Microsoft.Build.Framework; using Microsoft.Build.Tasks; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System.Xml; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/ErrorWarningMessage_Tests.cs b/src/XMakeTasks/UnitTests/ErrorWarningMessage_Tests.cs index 75927926681..2528bc0a1ba 100644 --- a/src/XMakeTasks/UnitTests/ErrorWarningMessage_Tests.cs +++ b/src/XMakeTasks/UnitTests/ErrorWarningMessage_Tests.cs @@ -1,15 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Reflection; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Microsoft.Build.Tasks; -using Microsoft.Build.Utilities; -using Microsoft.Build.Exceptions; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/Exec_Tests.cs b/src/XMakeTasks/UnitTests/Exec_Tests.cs index c0eef116beb..d3982f3c786 100644 --- a/src/XMakeTasks/UnitTests/Exec_Tests.cs +++ b/src/XMakeTasks/UnitTests/Exec_Tests.cs @@ -1,16 +1,13 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections.Generic; -using System.IO; -using System.Reflection; -using System.Text; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Framework; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.IO; +using System.Text; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/FileStateTests.cs b/src/XMakeTasks/UnitTests/FileStateTests.cs index 5b48e296b5f..aa193c3d271 100644 --- a/src/XMakeTasks/UnitTests/FileStateTests.cs +++ b/src/XMakeTasks/UnitTests/FileStateTests.cs @@ -1,18 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Reflection; -using System.Collections; -using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Microsoft.Build.Tasks; -using Microsoft.Build.Utilities; -using System.Text.RegularExpressions; -using System.Globalization; - using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.IO; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/FindAppConfigFile_Tests.cs b/src/XMakeTasks/UnitTests/FindAppConfigFile_Tests.cs index 3bbfc806d56..3826b62dc11 100644 --- a/src/XMakeTasks/UnitTests/FindAppConfigFile_Tests.cs +++ b/src/XMakeTasks/UnitTests/FindAppConfigFile_Tests.cs @@ -1,13 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections.Generic; -using System.Text; -using Microsoft.Build.Utilities; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Framework; using Microsoft.Build.Tasks; +using Microsoft.Build.Utilities; +using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/FindInList_Tests.cs b/src/XMakeTasks/UnitTests/FindInList_Tests.cs index 3e1a13c64f0..c2ca3cee1b5 100644 --- a/src/XMakeTasks/UnitTests/FindInList_Tests.cs +++ b/src/XMakeTasks/UnitTests/FindInList_Tests.cs @@ -1,13 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections.Generic; -using System.Text; -using Microsoft.Build.Utilities; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Framework; using Microsoft.Build.Tasks; +using Microsoft.Build.Utilities; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/FindInvalidProjectReferences_Tests.cs b/src/XMakeTasks/UnitTests/FindInvalidProjectReferences_Tests.cs index 5d693630182..b8628f8210b 100644 --- a/src/XMakeTasks/UnitTests/FindInvalidProjectReferences_Tests.cs +++ b/src/XMakeTasks/UnitTests/FindInvalidProjectReferences_Tests.cs @@ -5,19 +5,11 @@ // Tests for the task that resolves an FindInvalidProjectReferences to a full path on disk //----------------------------------------------------------------------- -using System; -using System.IO; -using System.Reflection; -using System.Collections; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Shared; using Microsoft.Build.Tasks; -using System.Text.RegularExpressions; +using Microsoft.Build.Utilities; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System.Collections.Generic; -using System.Diagnostics; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/FindUnderPath_Tests.cs b/src/XMakeTasks/UnitTests/FindUnderPath_Tests.cs index 72931f5c892..d7831fd2635 100644 --- a/src/XMakeTasks/UnitTests/FindUnderPath_Tests.cs +++ b/src/XMakeTasks/UnitTests/FindUnderPath_Tests.cs @@ -1,16 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Reflection; - -using Microsoft.VisualStudio.TestTools.UnitTesting; - using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System.IO; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/GenerateResourceOutOfProc_Tests.cs b/src/XMakeTasks/UnitTests/GenerateResourceOutOfProc_Tests.cs index c27f20359bb..9e61cf3d6e1 100644 --- a/src/XMakeTasks/UnitTests/GenerateResourceOutOfProc_Tests.cs +++ b/src/XMakeTasks/UnitTests/GenerateResourceOutOfProc_Tests.cs @@ -1,18 +1,14 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Reflection; -using System.Collections; -using System.Collections.Generic; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; -using System.Text.RegularExpressions; -using System.Text; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections.Generic; +using System.IO; namespace Microsoft.Build.UnitTests.GenerateResource_Tests.OutOfProc { diff --git a/src/XMakeTasks/UnitTests/GenerateResource_Tests.cs b/src/XMakeTasks/UnitTests/GenerateResource_Tests.cs index ef8719a7479..eb4dc5a4d0b 100644 --- a/src/XMakeTasks/UnitTests/GenerateResource_Tests.cs +++ b/src/XMakeTasks/UnitTests/GenerateResource_Tests.cs @@ -1,16 +1,14 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Reflection; -using System.Collections; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; -using System.Text.RegularExpressions; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.IO; +using System.Reflection; using System.Text; namespace Microsoft.Build.UnitTests.GenerateResource_Tests.InProc diff --git a/src/XMakeTasks/UnitTests/GetInstalledSDKLocations_Tests.cs b/src/XMakeTasks/UnitTests/GetInstalledSDKLocations_Tests.cs index 7a8a718a13c..ef4fd326e4e 100644 --- a/src/XMakeTasks/UnitTests/GetInstalledSDKLocations_Tests.cs +++ b/src/XMakeTasks/UnitTests/GetInstalledSDKLocations_Tests.cs @@ -5,24 +5,13 @@ // Test that we can retrieve the list of SDKs and output them to the project file. //----------------------------------------------------------------------- -using System; -using System.IO; -using System.Reflection; -using System.Globalization; -using System.Resources; -using System.Text.RegularExpressions; -using Microsoft.Win32; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using System.Collections; using Microsoft.Build.Framework; -using Microsoft.Build.Tasks; -using Microsoft.Build.Utilities; -using Microsoft.Build.UnitTests.ResolveAssemblyReference_Tests; using Microsoft.Build.Shared; +using Microsoft.Build.Tasks; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; using System.Collections.Generic; -using Microsoft.Build.Evaluation; -using System.Linq; -using Microsoft.Build.Execution; +using System.IO; namespace Microsoft.Build.UnitTests.GetInstalledSDKLocations_Tests { diff --git a/src/XMakeTasks/UnitTests/GetReferencePaths_Tests.cs b/src/XMakeTasks/UnitTests/GetReferencePaths_Tests.cs index f3ebe4dc7bf..d73230e1c48 100644 --- a/src/XMakeTasks/UnitTests/GetReferencePaths_Tests.cs +++ b/src/XMakeTasks/UnitTests/GetReferencePaths_Tests.cs @@ -5,15 +5,12 @@ // Tests for the task which gets the reference assembly paths for a given target framework version / moniker. //----------------------------------------------------------------------- -using System; -using System.Collections.Generic; -using System.Text; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Tasks; using Microsoft.Build.Shared; -using Microsoft.Build.UnitTests; -using System.IO; +using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.IO; using FrameworkNameVersioning = System.Runtime.Versioning.FrameworkName; namespace Microsoft.Build.UnitTests diff --git a/src/XMakeTasks/UnitTests/GetSDKReference_Tests.cs b/src/XMakeTasks/UnitTests/GetSDKReference_Tests.cs index d1f238bb7c5..777b8e641ab 100644 --- a/src/XMakeTasks/UnitTests/GetSDKReference_Tests.cs +++ b/src/XMakeTasks/UnitTests/GetSDKReference_Tests.cs @@ -6,20 +6,17 @@ // Tests for the task that extracts the list of reference assemblies from the SDK //----------------------------------------------------------------------- +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using Microsoft.Build.Tasks; +using Microsoft.Build.Utilities; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; using System.Collections; using System.Collections.Generic; -using System.Diagnostics; using System.IO; using System.Linq; using System.Threading; -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.VisualStudio.TestTools.UnitTesting; namespace Microsoft.Build.UnitTests.GetSDKReferenceFiles_Tests { diff --git a/src/XMakeTasks/UnitTests/LC_Tests.cs b/src/XMakeTasks/UnitTests/LC_Tests.cs index 43e86b88e4a..a97714dd399 100644 --- a/src/XMakeTasks/UnitTests/LC_Tests.cs +++ b/src/XMakeTasks/UnitTests/LC_Tests.cs @@ -1,11 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; +using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/MSBuild_Tests.cs b/src/XMakeTasks/UnitTests/MSBuild_Tests.cs index b7d4c521458..16f49d7341b 100644 --- a/src/XMakeTasks/UnitTests/MSBuild_Tests.cs +++ b/src/XMakeTasks/UnitTests/MSBuild_Tests.cs @@ -1,18 +1,14 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Reflection; -using System.Collections; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Evaluation; using Microsoft.Build.Framework; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; -using System.Text.RegularExpressions; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.IO; -using Microsoft.Build.Shared; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/MakeDir_Tests.cs b/src/XMakeTasks/UnitTests/MakeDir_Tests.cs index bb9b449f0de..7d6a76dcb9d 100644 --- a/src/XMakeTasks/UnitTests/MakeDir_Tests.cs +++ b/src/XMakeTasks/UnitTests/MakeDir_Tests.cs @@ -1,14 +1,13 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Reflection; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.IO; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/ManagedCompiler_Tests.cs b/src/XMakeTasks/UnitTests/ManagedCompiler_Tests.cs index a87225270a4..1e2722e84f3 100644 --- a/src/XMakeTasks/UnitTests/ManagedCompiler_Tests.cs +++ b/src/XMakeTasks/UnitTests/ManagedCompiler_Tests.cs @@ -1,15 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections.Generic; -using System.IO; -using System.Text; -using Microsoft.Build.Tasks; using Microsoft.Build.Framework; +using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Evaluation; +using System; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/MockCscHostObject.cs b/src/XMakeTasks/UnitTests/MockCscHostObject.cs index ebfd0fe19ea..78191d57791 100644 --- a/src/XMakeTasks/UnitTests/MockCscHostObject.cs +++ b/src/XMakeTasks/UnitTests/MockCscHostObject.cs @@ -1,10 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using Microsoft.Build.Tasks; -using Microsoft.Build.Tasks.Hosting; using Microsoft.Build.Framework; +using Microsoft.Build.Tasks.Hosting; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/MockFaultInjectionHelper.cs b/src/XMakeTasks/UnitTests/MockFaultInjectionHelper.cs index c4b532cb80b..bb5b2b9401a 100644 --- a/src/XMakeTasks/UnitTests/MockFaultInjectionHelper.cs +++ b/src/XMakeTasks/UnitTests/MockFaultInjectionHelper.cs @@ -2,8 +2,6 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.Collections.Generic; -using System.Text; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/MockTypeInfo.cs b/src/XMakeTasks/UnitTests/MockTypeInfo.cs index 7cfefb958f3..89bcdede6a1 100644 --- a/src/XMakeTasks/UnitTests/MockTypeInfo.cs +++ b/src/XMakeTasks/UnitTests/MockTypeInfo.cs @@ -1,15 +1,13 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; using System.Collections.Generic; -using System.Text; using System.Runtime.InteropServices.ComTypes; -using Microsoft.VisualStudio.TestTools.UnitTesting; - +using IFixedTypeInfo = Microsoft.Build.Tasks.IFixedTypeInfo; using Marshal = System.Runtime.InteropServices.Marshal; using VarEnum = System.Runtime.InteropServices.VarEnum; -using IFixedTypeInfo = Microsoft.Build.Tasks.IFixedTypeInfo; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/MockTypeLib.cs b/src/XMakeTasks/UnitTests/MockTypeLib.cs index 05c79d37ca0..0979966ec3d 100644 --- a/src/XMakeTasks/UnitTests/MockTypeLib.cs +++ b/src/XMakeTasks/UnitTests/MockTypeLib.cs @@ -1,14 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Tasks; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; using System.Collections.Generic; -using System.Text; using System.Runtime.InteropServices.ComTypes; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -using Microsoft.Build.Tasks; - using Marshal = System.Runtime.InteropServices.Marshal; namespace Microsoft.Build.UnitTests diff --git a/src/XMakeTasks/UnitTests/MockUnmanagedMemoryHelper.cs b/src/XMakeTasks/UnitTests/MockUnmanagedMemoryHelper.cs index e4e73e475d7..ddb33057a96 100644 --- a/src/XMakeTasks/UnitTests/MockUnmanagedMemoryHelper.cs +++ b/src/XMakeTasks/UnitTests/MockUnmanagedMemoryHelper.cs @@ -1,12 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; using System.Collections.Generic; -using System.Text; -using System.Runtime.InteropServices.ComTypes; -using Microsoft.VisualStudio.TestTools.UnitTesting; - using Marshal = System.Runtime.InteropServices.Marshal; namespace Microsoft.Build.UnitTests diff --git a/src/XMakeTasks/UnitTests/MockVbcHostObject.cs b/src/XMakeTasks/UnitTests/MockVbcHostObject.cs index 5cdaeff5855..474e0810377 100644 --- a/src/XMakeTasks/UnitTests/MockVbcHostObject.cs +++ b/src/XMakeTasks/UnitTests/MockVbcHostObject.cs @@ -1,10 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using Microsoft.Build.Tasks; -using Microsoft.Build.Tasks.Hosting; using Microsoft.Build.Framework; +using Microsoft.Build.Tasks.Hosting; +using System; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/Move_Tests.cs b/src/XMakeTasks/UnitTests/Move_Tests.cs index 8d59295e125..bc682ab7466 100644 --- a/src/XMakeTasks/UnitTests/Move_Tests.cs +++ b/src/XMakeTasks/UnitTests/Move_Tests.cs @@ -1,15 +1,14 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using Microsoft.Build.Tasks; +using Microsoft.Build.Utilities; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; using System.IO; using System.Reflection; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.UnitTests; -using Microsoft.Build.Tasks; -using Microsoft.Build.Shared; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/PropertyParser_Tests.cs b/src/XMakeTasks/UnitTests/PropertyParser_Tests.cs index 8f43d8c3a43..a4fb84230ab 100644 --- a/src/XMakeTasks/UnitTests/PropertyParser_Tests.cs +++ b/src/XMakeTasks/UnitTests/PropertyParser_Tests.cs @@ -1,15 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Reflection; -using System.Collections; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; using Microsoft.Build.Tasks; -using Microsoft.Build.Utilities; -using System.Text.RegularExpressions; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System.Collections; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/ReadLinesFromFile_Tests.cs b/src/XMakeTasks/UnitTests/ReadLinesFromFile_Tests.cs index f12dcc938e4..151c4d6a774 100644 --- a/src/XMakeTasks/UnitTests/ReadLinesFromFile_Tests.cs +++ b/src/XMakeTasks/UnitTests/ReadLinesFromFile_Tests.cs @@ -1,15 +1,14 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Reflection; -using System.Security.AccessControl; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.IO; +using System.Security.AccessControl; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/RemoveDir_Tests.cs b/src/XMakeTasks/UnitTests/RemoveDir_Tests.cs index 5f6053b1528..598cb27c300 100644 --- a/src/XMakeTasks/UnitTests/RemoveDir_Tests.cs +++ b/src/XMakeTasks/UnitTests/RemoveDir_Tests.cs @@ -1,13 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Reflection; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Framework; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; +using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/RemoveDuplicates_Tests.cs b/src/XMakeTasks/UnitTests/RemoveDuplicates_Tests.cs index 78c70c8b17f..79b4343c400 100644 --- a/src/XMakeTasks/UnitTests/RemoveDuplicates_Tests.cs +++ b/src/XMakeTasks/UnitTests/RemoveDuplicates_Tests.cs @@ -1,13 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Reflection; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Framework; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; +using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/ResGenDependencies_Tests.cs b/src/XMakeTasks/UnitTests/ResGenDependencies_Tests.cs index 8c77c105959..069ffc0dd22 100644 --- a/src/XMakeTasks/UnitTests/ResGenDependencies_Tests.cs +++ b/src/XMakeTasks/UnitTests/ResGenDependencies_Tests.cs @@ -1,15 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; +using Microsoft.Build.Shared; +using Microsoft.Build.Tasks; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System.IO; using System.Reflection; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; -using Microsoft.Build.Tasks; -using Microsoft.Build.Utilities; -using System.Resources; -using Microsoft.Build.Shared; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/ResGen_Tests.cs b/src/XMakeTasks/UnitTests/ResGen_Tests.cs index dcacad9d0ff..4ad2eea4245 100644 --- a/src/XMakeTasks/UnitTests/ResGen_Tests.cs +++ b/src/XMakeTasks/UnitTests/ResGen_Tests.cs @@ -1,18 +1,14 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; using System.Collections.Generic; -using System.Text; using System.IO; using System.Reflection; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; -using Microsoft.Build.Tasks; -using Microsoft.Build.Utilities; -using System.Text.RegularExpressions; -using System.Globalization; - +using System.Text; using ResGen = Microsoft.Build.Tasks.GenerateResource.ResGen; namespace Microsoft.Build.UnitTests diff --git a/src/XMakeTasks/UnitTests/ResolveAssemblyReference_Tests.cs b/src/XMakeTasks/UnitTests/ResolveAssemblyReference_Tests.cs index 0d0e6be3810..75badcc1095 100644 --- a/src/XMakeTasks/UnitTests/ResolveAssemblyReference_Tests.cs +++ b/src/XMakeTasks/UnitTests/ResolveAssemblyReference_Tests.cs @@ -1,25 +1,22 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Reflection; -using System.Globalization; -using System.Resources; -using System.Text.RegularExpressions; -using Microsoft.Win32; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using System.Collections; using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; -using Microsoft.Build.UnitTests.ResolveAssemblyReference_Tests; -using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using Microsoft.Win32; +using System; +using System.Collections; using System.Collections.Generic; -using LogExclusionReason = Microsoft.Build.Tasks.ReferenceTable.LogExclusionReason; +using System.Globalization; +using System.IO; +using System.Linq; +using System.Reflection; +using System.Resources; using FrameworkNameVersioning = System.Runtime.Versioning.FrameworkName; using SystemProcessorArchitecture = System.Reflection.ProcessorArchitecture; -using System.Linq; namespace Microsoft.Build.UnitTests.ResolveAssemblyReference_Tests { diff --git a/src/XMakeTasks/UnitTests/ResolveCodeAnalysisRuleSet_Tests.cs b/src/XMakeTasks/UnitTests/ResolveCodeAnalysisRuleSet_Tests.cs index 45dd151e7bf..a4997825d7c 100644 --- a/src/XMakeTasks/UnitTests/ResolveCodeAnalysisRuleSet_Tests.cs +++ b/src/XMakeTasks/UnitTests/ResolveCodeAnalysisRuleSet_Tests.cs @@ -1,11 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using Microsoft.Build.Framework; using Microsoft.Build.Tasks; using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.IO; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/ResolveComReference_Tests.cs b/src/XMakeTasks/UnitTests/ResolveComReference_Tests.cs index a18b979c798..90a47da43e5 100644 --- a/src/XMakeTasks/UnitTests/ResolveComReference_Tests.cs +++ b/src/XMakeTasks/UnitTests/ResolveComReference_Tests.cs @@ -1,23 +1,17 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using Microsoft.Build.Tasks; +using Microsoft.Build.Utilities; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; using System.Collections; -using System.Runtime.InteropServices; -using System.Runtime.InteropServices.ComTypes; 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 Microsoft.Build.Shared; - -using Microsoft.VisualStudio.TestTools.UnitTesting; - namespace Microsoft.Build.UnitTests { /* diff --git a/src/XMakeTasks/UnitTests/ResolveNonMSBuildProjectOutput_Tests.cs b/src/XMakeTasks/UnitTests/ResolveNonMSBuildProjectOutput_Tests.cs index feb0b3fb679..f25d1576fe9 100644 --- a/src/XMakeTasks/UnitTests/ResolveNonMSBuildProjectOutput_Tests.cs +++ b/src/XMakeTasks/UnitTests/ResolveNonMSBuildProjectOutput_Tests.cs @@ -1,15 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections; -using System.Text; -using System.Linq; -using System.Xml; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.Build.Tasks; +using Microsoft.Build.Utilities; using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/ResolveSDKReference_Tests.cs b/src/XMakeTasks/UnitTests/ResolveSDKReference_Tests.cs index 318ff2d42c3..2575a3cc09d 100644 --- a/src/XMakeTasks/UnitTests/ResolveSDKReference_Tests.cs +++ b/src/XMakeTasks/UnitTests/ResolveSDKReference_Tests.cs @@ -6,26 +6,18 @@ // Tests for the task that resolves an SDKReference to a full path on disk //----------------------------------------------------------------------- -using System; -using System.IO; -using System.Reflection; -using System.Globalization; -using System.Resources; -using System.Text.RegularExpressions; -using Microsoft.Win32; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using System.Collections; +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.UnitTests.ResolveAssemblyReference_Tests; -using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections; using System.Collections.Generic; +using System.IO; using SDKReference = Microsoft.Build.Tasks.ResolveSDKReference.SDKReference; -using ProcessorArchitecture = Microsoft.Build.Utilities.ProcessorArchitecture; -using Microsoft.Build.Evaluation; -using System.Linq; -using Microsoft.Build.Execution; namespace Microsoft.Build.UnitTests.ResolveSDKReference_Tests { diff --git a/src/XMakeTasks/UnitTests/SGen_Tests.cs b/src/XMakeTasks/UnitTests/SGen_Tests.cs index 3424f40a12e..4e2e0c5292e 100644 --- a/src/XMakeTasks/UnitTests/SGen_Tests.cs +++ b/src/XMakeTasks/UnitTests/SGen_Tests.cs @@ -1,12 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; using Microsoft.Build.Tasks; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; using System.IO; namespace Microsoft.Build.UnitTests diff --git a/src/XMakeTasks/UnitTests/SdkToolsPathUtility_Tests.cs b/src/XMakeTasks/UnitTests/SdkToolsPathUtility_Tests.cs index df0cc8d25e0..eff91c24723 100644 --- a/src/XMakeTasks/UnitTests/SdkToolsPathUtility_Tests.cs +++ b/src/XMakeTasks/UnitTests/SdkToolsPathUtility_Tests.cs @@ -1,15 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections.Generic; -using System.Text; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Shared; +using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; -using Microsoft.Build.UnitTests; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; using System.IO; -using Microsoft.Build.Tasks; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/StreamHelpers.cs b/src/XMakeTasks/UnitTests/StreamHelpers.cs index 1b773cd63ad..8ae16f61656 100644 --- a/src/XMakeTasks/UnitTests/StreamHelpers.cs +++ b/src/XMakeTasks/UnitTests/StreamHelpers.cs @@ -1,13 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; using System.IO; -using System.Reflection; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; -using Microsoft.Build.Tasks; -using Microsoft.Build.Utilities; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/StreamMappedString_Tests.cs b/src/XMakeTasks/UnitTests/StreamMappedString_Tests.cs index 34f929b1df7..1536eb2b236 100644 --- a/src/XMakeTasks/UnitTests/StreamMappedString_Tests.cs +++ b/src/XMakeTasks/UnitTests/StreamMappedString_Tests.cs @@ -1,16 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Shared.LanguageParser; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; using System.IO; -using System.Reflection; -using System.Collections; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; -using Microsoft.Build.Tasks; -using Microsoft.Build.Utilities; -using System.Text.RegularExpressions; -using Microsoft.Build.Shared.LanguageParser; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/TlbImp_Tests.cs b/src/XMakeTasks/UnitTests/TlbImp_Tests.cs index 7e8e4df3dc4..5d720d8b168 100644 --- a/src/XMakeTasks/UnitTests/TlbImp_Tests.cs +++ b/src/XMakeTasks/UnitTests/TlbImp_Tests.cs @@ -1,17 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Tasks; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; -using System.Collections.Generic; -using System.Text; using System.IO; -using System.Reflection; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; -using Microsoft.Build.Tasks; -using Microsoft.Build.Utilities; -using System.Text.RegularExpressions; -using System.Globalization; namespace Microsoft.Build.UnitTests.AxTlbImp_Tests { diff --git a/src/XMakeTasks/UnitTests/ToolTaskExtension_Tests.cs b/src/XMakeTasks/UnitTests/ToolTaskExtension_Tests.cs index c1ada4f4ee1..4563ab5291c 100644 --- a/src/XMakeTasks/UnitTests/ToolTaskExtension_Tests.cs +++ b/src/XMakeTasks/UnitTests/ToolTaskExtension_Tests.cs @@ -1,17 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Tasks; +using Microsoft.Build.Utilities; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; -using System.Resources; using System.Reflection; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Tasks; -using Microsoft.Build.Shared; - namespace Microsoft.Build.UnitTests { [TestClass] diff --git a/src/XMakeTasks/UnitTests/Touch_Tests.cs b/src/XMakeTasks/UnitTests/Touch_Tests.cs index af9abb2935d..4101d02cb8c 100644 --- a/src/XMakeTasks/UnitTests/Touch_Tests.cs +++ b/src/XMakeTasks/UnitTests/Touch_Tests.cs @@ -1,14 +1,13 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Reflection; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.IO; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/Vbc_Tests.cs b/src/XMakeTasks/UnitTests/Vbc_Tests.cs index 41e6d4229c7..bda767e48d2 100644 --- a/src/XMakeTasks/UnitTests/Vbc_Tests.cs +++ b/src/XMakeTasks/UnitTests/Vbc_Tests.cs @@ -1,18 +1,13 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections; -using System.Globalization; -using System.IO; -using System.Linq; -using System.Reflection; -using System.Text.RegularExpressions; using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.IO; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/VisualBasicParserUtilitites_Tests.cs b/src/XMakeTasks/UnitTests/VisualBasicParserUtilitites_Tests.cs index 3f3ace3228b..c354459a907 100644 --- a/src/XMakeTasks/UnitTests/VisualBasicParserUtilitites_Tests.cs +++ b/src/XMakeTasks/UnitTests/VisualBasicParserUtilitites_Tests.cs @@ -1,15 +1,8 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Reflection; -using System.Collections; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; using Microsoft.Build.Tasks; -using Microsoft.Build.Utilities; -using System.Text.RegularExpressions; +using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/VisualBasicTokenizer_Tests.cs b/src/XMakeTasks/UnitTests/VisualBasicTokenizer_Tests.cs index 92ec457cb03..a1914466251 100644 --- a/src/XMakeTasks/UnitTests/VisualBasicTokenizer_Tests.cs +++ b/src/XMakeTasks/UnitTests/VisualBasicTokenizer_Tests.cs @@ -1,17 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Reflection; -using System.Collections; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; -using Microsoft.Build.Tasks; -using Microsoft.Build.Utilities; -using System.Text.RegularExpressions; - using Microsoft.Build.Shared.LanguageParser; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/WinMDExp_Tests.cs b/src/XMakeTasks/UnitTests/WinMDExp_Tests.cs index c1aa2cb63ab..80a2baed2a6 100644 --- a/src/XMakeTasks/UnitTests/WinMDExp_Tests.cs +++ b/src/XMakeTasks/UnitTests/WinMDExp_Tests.cs @@ -1,16 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.IO; -using System.Reflection; -using System.Collections; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; -using System.Text.RegularExpressions; -using System.Globalization; +using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/WriteCodeFragment_Tests.cs b/src/XMakeTasks/UnitTests/WriteCodeFragment_Tests.cs index 8e0e2617fd4..823c7a841f4 100644 --- a/src/XMakeTasks/UnitTests/WriteCodeFragment_Tests.cs +++ b/src/XMakeTasks/UnitTests/WriteCodeFragment_Tests.cs @@ -5,13 +5,11 @@ // Tests for write code fragment task. //----------------------------------------------------------------------- -using System; -using System.IO; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.Build.Framework; using Microsoft.Build.Tasks; using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.IO; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/XamlDataDrivenToolTask_Tests.cs b/src/XMakeTasks/UnitTests/XamlDataDrivenToolTask_Tests.cs index d8fc886930a..57eb11a4884 100644 --- a/src/XMakeTasks/UnitTests/XamlDataDrivenToolTask_Tests.cs +++ b/src/XMakeTasks/UnitTests/XamlDataDrivenToolTask_Tests.cs @@ -1,28 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Evaluation; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; -using System.Collections; -using System.Collections.Generic; -using System.Text; -using System.Xml; using System.IO; -using System.Runtime.Remoting; -using System.Globalization; using System.Reflection; -using System.CodeDom; -using System.CodeDom.Compiler; -using System.Xaml; - -using Microsoft.CSharp; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; -using Microsoft.Build.Tasks.Xaml; -using Microsoft.VisualStudio.TestTools.UnitTesting; - namespace Microsoft.Build.UnitTests.XamlDataDrivenToolTask_Tests { /// diff --git a/src/XMakeTasks/UnitTests/XamlTaskFactory_Tests.cs b/src/XMakeTasks/UnitTests/XamlTaskFactory_Tests.cs index 0ab7fa64cff..a43ec1a5572 100644 --- a/src/XMakeTasks/UnitTests/XamlTaskFactory_Tests.cs +++ b/src/XMakeTasks/UnitTests/XamlTaskFactory_Tests.cs @@ -1,21 +1,17 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections.Generic; -using System.Text; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.Build.Framework; -using System.Xml; -using System.IO; +using Microsoft.Build.Tasks.Xaml; +using Microsoft.CSharp; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; using System.CodeDom; using System.CodeDom.Compiler; -using System.Linq; -using Microsoft.CSharp; -using System.Reflection; -using Microsoft.Build.Shared; +using System.Collections.Generic; using System.Globalization; -using Microsoft.Build.Tasks.Xaml; +using System.IO; +using System.Reflection; using System.Xaml; namespace Microsoft.Build.UnitTests.XamlTaskFactory_Tests diff --git a/src/XMakeTasks/UnitTests/XamlTestHelpers.cs b/src/XMakeTasks/UnitTests/XamlTestHelpers.cs index 61036ee0c11..2b5f3de93c9 100644 --- a/src/XMakeTasks/UnitTests/XamlTestHelpers.cs +++ b/src/XMakeTasks/UnitTests/XamlTestHelpers.cs @@ -1,11 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using Microsoft.CSharp; +using Microsoft.Build.Evaluation; using Microsoft.Build.Tasks.Xaml; - +using Microsoft.CSharp; using Microsoft.VisualStudio.TestTools.UnitTesting; - using System; using System.CodeDom; using System.CodeDom.Compiler; @@ -13,7 +12,6 @@ using System.IO; using System.Reflection; using System.Xaml; -using Microsoft.Build.Evaluation; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/XmlPeek_Tests.cs b/src/XMakeTasks/UnitTests/XmlPeek_Tests.cs index 2180095c9b4..14817bc64fc 100644 --- a/src/XMakeTasks/UnitTests/XmlPeek_Tests.cs +++ b/src/XMakeTasks/UnitTests/XmlPeek_Tests.cs @@ -6,22 +6,11 @@ // 2008-12-28 // The unit tests for XslTransformation buildtask. -using Microsoft.Build.Framework; using Microsoft.Build.Tasks; -using Microsoft.Build.UnitTests; using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; using Microsoft.VisualStudio.TestTools.UnitTesting; using System; -using System.CodeDom.Compiler; -using System.Collections.Generic; -using System.Reflection; -using System.Reflection.Emit; using System.IO; -using System.Text.RegularExpressions; -using System.Text; -using System.Xml.Xsl; -using System.Xml; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/XmlPoke_Tests.cs b/src/XMakeTasks/UnitTests/XmlPoke_Tests.cs index ad53313f6a1..778a638702d 100644 --- a/src/XMakeTasks/UnitTests/XmlPoke_Tests.cs +++ b/src/XMakeTasks/UnitTests/XmlPoke_Tests.cs @@ -6,22 +6,13 @@ // 2008-12-28 // The unit tests for XslTransformation buildtask. -using Microsoft.Build.Framework; using Microsoft.Build.Tasks; -using Microsoft.Build.UnitTests; using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; using Microsoft.VisualStudio.TestTools.UnitTesting; using System; -using System.CodeDom.Compiler; using System.Collections.Generic; -using System.Reflection; -using System.Reflection.Emit; using System.IO; using System.Text.RegularExpressions; -using System.Text; -using System.Xml.Xsl; -using System.Xml; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnitTests/XslTransformation_Tests.cs b/src/XMakeTasks/UnitTests/XslTransformation_Tests.cs index a82c305c81c..b50593e395c 100644 --- a/src/XMakeTasks/UnitTests/XslTransformation_Tests.cs +++ b/src/XMakeTasks/UnitTests/XslTransformation_Tests.cs @@ -5,22 +5,18 @@ // 2008-12-28 // The unit tests for XslTransformation buildtask. -using Microsoft.Build.Framework; using Microsoft.Build.Tasks; -using Microsoft.Build.UnitTests; using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; using Microsoft.VisualStudio.TestTools.UnitTesting; 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.Text; -using System.Xml.Xsl; using System.Xml; +using System.Xml.Xsl; namespace Microsoft.Build.UnitTests { diff --git a/src/XMakeTasks/UnregisterAssembly.cs b/src/XMakeTasks/UnregisterAssembly.cs index b82442cbdf5..71d384346b7 100644 --- a/src/XMakeTasks/UnregisterAssembly.cs +++ b/src/XMakeTasks/UnregisterAssembly.cs @@ -1,19 +1,15 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using System; -using System.Diagnostics; using System.IO; -using System.Resources; using System.Reflection; using System.Runtime.InteropServices; +using System.Runtime.InteropServices.ComTypes; using System.Security; using System.Threading; -using System.Runtime.InteropServices.ComTypes; - -using Microsoft.Build.Framework; -using Microsoft.Build.Tasks; -using Microsoft.Build.Shared; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/UpdateManifest.cs b/src/XMakeTasks/UpdateManifest.cs index 13ad0a6e716..55689aaeaf4 100644 --- a/src/XMakeTasks/UpdateManifest.cs +++ b/src/XMakeTasks/UpdateManifest.cs @@ -1,15 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Diagnostics; -using System.IO; -using System.Reflection; -using System.Resources; using Microsoft.Build.Framework; using Microsoft.Build.Tasks.Deployment.ManifestUtilities; using Microsoft.Build.Utilities; -using Microsoft.Build.Shared; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/Vbc.cs b/src/XMakeTasks/Vbc.cs index abba77965ba..2c7cd962888 100644 --- a/src/XMakeTasks/Vbc.cs +++ b/src/XMakeTasks/Vbc.cs @@ -5,12 +5,9 @@ using System.Diagnostics; using System.IO; using System.Text; -using System.Collections.Specialized; using System.Collections.Generic; -using System.Resources; -using System.Reflection; using System.Globalization; -using System.Text.RegularExpressions; + #if (!STANDALONEBUILD) using Microsoft.Internal.Performance; diff --git a/src/XMakeTasks/VisualBasicParserUtilities.cs b/src/XMakeTasks/VisualBasicParserUtilities.cs index 44d9c2f8257..a1d6b231a0c 100644 --- a/src/XMakeTasks/VisualBasicParserUtilities.cs +++ b/src/XMakeTasks/VisualBasicParserUtilities.cs @@ -1,14 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; +using Microsoft.Build.Shared.LanguageParser; using System.IO; using System.Text; -using System.Resources; -using System.Reflection; - -using System.Collections; -using Microsoft.Build.Shared.LanguageParser; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/Warning.cs b/src/XMakeTasks/Warning.cs index 3adce9216e5..913e3c29f0e 100644 --- a/src/XMakeTasks/Warning.cs +++ b/src/XMakeTasks/Warning.cs @@ -2,12 +2,6 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.IO; -using System.Diagnostics; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using System.Globalization; -using System.Resources; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/WinMDExp.cs b/src/XMakeTasks/WinMDExp.cs index 296c9973f8f..821abafeffa 100644 --- a/src/XMakeTasks/WinMDExp.cs +++ b/src/XMakeTasks/WinMDExp.cs @@ -5,11 +5,11 @@ // Export a windows metadata file from a dll //----------------------------------------------------------------------- -using System; -using System.IO; -using System.Diagnostics.CodeAnalysis; using Microsoft.Build.Framework; using Microsoft.Build.Shared; +using System; +using System.Diagnostics.CodeAnalysis; +using System.IO; using System.Text; namespace Microsoft.Build.Tasks diff --git a/src/XMakeTasks/WriteCodeFragment.cs b/src/XMakeTasks/WriteCodeFragment.cs index a22daf79201..eb2800ec7b9 100644 --- a/src/XMakeTasks/WriteCodeFragment.cs +++ b/src/XMakeTasks/WriteCodeFragment.cs @@ -5,22 +5,20 @@ // Generates a temporary code file with the specified generated code fragment. //----------------------------------------------------------------------- -using System; -using System.Collections; -using System.Globalization; -using System.IO; using Microsoft.Build.Framework; using Microsoft.Build.Shared; using Microsoft.Build.Utilities; -using System.Runtime.InteropServices; -using System.ComponentModel; +using System; using System.CodeDom; using System.CodeDom.Compiler; -using System.Diagnostics.CodeAnalysis; -using System.Text; +using System.Collections; +using System.Collections.Generic; using System.Configuration; +using System.Diagnostics.CodeAnalysis; +using System.Globalization; +using System.IO; using System.Security; -using System.Collections.Generic; +using System.Text; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/XamlTaskFactory/CommandLineGenerator.cs b/src/XMakeTasks/XamlTaskFactory/CommandLineGenerator.cs index fa47c584135..8312a1d6fe1 100644 --- a/src/XMakeTasks/XamlTaskFactory/CommandLineGenerator.cs +++ b/src/XMakeTasks/XamlTaskFactory/CommandLineGenerator.cs @@ -8,15 +8,15 @@ // //----------------------------------------------------------------------- +using Microsoft.Build.Framework; +using Microsoft.Build.Framework.XamlTypes; +using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Text.RegularExpressions; -using Microsoft.Build.Framework; -using Microsoft.Build.Framework.XamlTypes; -using Microsoft.Build.Shared; -using Microsoft.Build.Utilities; namespace Microsoft.Build.Tasks.Xaml { diff --git a/src/XMakeTasks/XamlTaskFactory/CommandLineToolSwitch.cs b/src/XMakeTasks/XamlTaskFactory/CommandLineToolSwitch.cs index 09ff60e571e..c9b54786792 100644 --- a/src/XMakeTasks/XamlTaskFactory/CommandLineToolSwitch.cs +++ b/src/XMakeTasks/XamlTaskFactory/CommandLineToolSwitch.cs @@ -5,12 +5,10 @@ // Tool switch description class for DataDriven tasks. //----------------------------------------------------------------------- -using System; -using System.Collections; -using System.Collections.Generic; -using System.Text; using Microsoft.Build.Framework; using Microsoft.Build.Shared; +using System; +using System.Collections.Generic; namespace Microsoft.Build.Tasks.Xaml { diff --git a/src/XMakeTasks/XamlTaskFactory/Property.cs b/src/XMakeTasks/XamlTaskFactory/Property.cs index 4f167f97b55..237a2e62a2e 100644 --- a/src/XMakeTasks/XamlTaskFactory/Property.cs +++ b/src/XMakeTasks/XamlTaskFactory/Property.cs @@ -7,8 +7,6 @@ using System; using System.Collections.Generic; -using System.Text; -using System.Collections; namespace Microsoft.Build.Tasks.Xaml { diff --git a/src/XMakeTasks/XamlTaskFactory/RelationsParser.cs b/src/XMakeTasks/XamlTaskFactory/RelationsParser.cs index 78db36c8689..074653ab9cf 100644 --- a/src/XMakeTasks/XamlTaskFactory/RelationsParser.cs +++ b/src/XMakeTasks/XamlTaskFactory/RelationsParser.cs @@ -4,13 +4,11 @@ // Property description class for the XamlTaskFactory parser. //----------------------------------------------------------------------- +using Microsoft.Build.Shared; using System; using System.Collections.Generic; -using System.Text; -using System.Xml; using System.IO; -using Microsoft.Build.Shared; -using Microsoft.Build.Utilities; +using System.Xml; namespace Microsoft.Build.Tasks.Xaml { diff --git a/src/XMakeTasks/XamlTaskFactory/TaskGenerator.cs b/src/XMakeTasks/XamlTaskFactory/TaskGenerator.cs index b77c56add99..386927c2d68 100644 --- a/src/XMakeTasks/XamlTaskFactory/TaskGenerator.cs +++ b/src/XMakeTasks/XamlTaskFactory/TaskGenerator.cs @@ -1,22 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Shared; using System; -using System.Collections; -using System.Collections.Specialized; -using System.Collections.Generic; -using System.Text; -using System.Xml; -using System.IO; -using System.Globalization; using System.CodeDom; -using System.CodeDom.Compiler; -using Microsoft.Build.Shared; -using Microsoft.Build.Utilities; -using Microsoft.Build.Framework; +using System.Collections.Generic; using System.Configuration; -using System.Resources; -using System.Reflection; +using System.Globalization; namespace Microsoft.Build.Tasks.Xaml { diff --git a/src/XMakeTasks/XamlTaskFactory/TaskParser.cs b/src/XMakeTasks/XamlTaskFactory/TaskParser.cs index fa52da25a6c..53224503087 100644 --- a/src/XMakeTasks/XamlTaskFactory/TaskParser.cs +++ b/src/XMakeTasks/XamlTaskFactory/TaskParser.cs @@ -8,16 +8,13 @@ // //----------------------------------------------------------------------- +using Microsoft.Build.Shared; using System; using System.Collections.Generic; using System.Globalization; +using System.IO; using System.Text; using System.Xaml; -using System.Xml; -using System.IO; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; - using XamlTypes = Microsoft.Build.Framework.XamlTypes; namespace Microsoft.Build.Tasks.Xaml diff --git a/src/XMakeTasks/XamlTaskFactory/XamlDataDrivenToolTask.cs b/src/XMakeTasks/XamlTaskFactory/XamlDataDrivenToolTask.cs index 0a5f5bf33c0..677995b90d5 100644 --- a/src/XMakeTasks/XamlTaskFactory/XamlDataDrivenToolTask.cs +++ b/src/XMakeTasks/XamlTaskFactory/XamlDataDrivenToolTask.cs @@ -1,21 +1,14 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; using System; -using System.Globalization; -using System.Collections; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using System.Text; -using System.Threading; -using System.IO; -using System.Runtime.InteropServices; - -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using System.Collections.Specialized; +using System.Globalization; using System.Resources; -using Microsoft.Build.Shared; +using System.Text; namespace Microsoft.Build.Tasks.Xaml { diff --git a/src/XMakeTasks/XamlTaskFactory/XamlTaskFactory.cs b/src/XMakeTasks/XamlTaskFactory/XamlTaskFactory.cs index 275682ef735..a7c25fd8999 100644 --- a/src/XMakeTasks/XamlTaskFactory/XamlTaskFactory.cs +++ b/src/XMakeTasks/XamlTaskFactory/XamlTaskFactory.cs @@ -5,21 +5,19 @@ // The task factory for Xaml data driven tasks. //----------------------------------------------------------------------- +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using Microsoft.Build.Tasks.Xaml; +using Microsoft.Build.Utilities; using System; using System.CodeDom; -using System.Collections.Generic; -using System.Text; using System.CodeDom.Compiler; -using System.Reflection; -using System.Xml; +using System.Collections.Generic; using System.IO; +using System.Reflection; +using System.Text; using System.Threading; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Build.Tasks.Xaml; -using Microsoft.Build.Shared; - namespace Microsoft.Build.Tasks { /// diff --git a/src/XMakeTasks/XmlPeek.cs b/src/XMakeTasks/XmlPeek.cs index b3459e3a75a..100a21459b3 100644 --- a/src/XMakeTasks/XmlPeek.cs +++ b/src/XMakeTasks/XmlPeek.cs @@ -5,22 +5,15 @@ // Returns the value specified by XPath. //----------------------------------------------------------------------- +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; +using Microsoft.Build.Utilities; using System; using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Reflection; -using System.Security; -using System.Security.Permissions; -using System.Text; using System.Xml; -using System.Xml.Xsl; using System.Xml.XPath; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.Build.Utilities; - namespace Microsoft.Build.Tasks { /// diff --git a/src/XMakeTasks/XmlPoke.cs b/src/XMakeTasks/XmlPoke.cs index 33d70cecc0c..4be83da63e6 100644 --- a/src/XMakeTasks/XmlPoke.cs +++ b/src/XMakeTasks/XmlPoke.cs @@ -5,22 +5,13 @@ // Returns the value specified by XPath. //----------------------------------------------------------------------- +using Microsoft.Build.Framework; +using Microsoft.Build.Shared; using System; -using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Reflection; -using System.Security; -using System.Security.Permissions; -using System.Text; using System.Xml; -using System.Xml.Xsl; using System.Xml.XPath; -using Microsoft.Build.Framework; -using Microsoft.Build.Shared; -using Microsoft.Build.Utilities; - namespace Microsoft.Build.Tasks { /// diff --git a/src/XMakeTasks/XslTransformation.cs b/src/XMakeTasks/XslTransformation.cs index 4e1e3a87cfb..1b6d9aa4856 100644 --- a/src/XMakeTasks/XslTransformation.cs +++ b/src/XMakeTasks/XslTransformation.cs @@ -11,14 +11,10 @@ using System; using System.Collections.Generic; using System.IO; -using System.Linq; using System.Reflection; -using System.Security; -using System.Security.Permissions; -using System.Text; using System.Xml; -using System.Xml.Xsl; using System.Xml.XPath; +using System.Xml.Xsl; namespace Microsoft.Build.Tasks { diff --git a/src/XMakeTasks/system.design/stronglytypedresourcebuilder.cs b/src/XMakeTasks/system.design/stronglytypedresourcebuilder.cs index 744e8d825b6..b93685840ee 100644 --- a/src/XMakeTasks/system.design/stronglytypedresourcebuilder.cs +++ b/src/XMakeTasks/system.design/stronglytypedresourcebuilder.cs @@ -24,18 +24,17 @@ ** ===========================================================*/ +using Microsoft.Build.Shared; using System; -using System.IO; -using System.Collections; -using System.Collections.Generic; -using System.Resources; using System.CodeDom; using System.CodeDom.Compiler; -using System.Reflection; -using System.Globalization; -using System.Xml; +using System.Collections; +using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using Microsoft.Build.Shared; +using System.Globalization; +using System.IO; +using System.Reflection; +using System.Resources; /* Plan for the future: