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 76f40626016..28a5f6cdf26 100644
--- a/src/Framework/BuildEventArgs.cs
+++ b/src/Framework/BuildEventArgs.cs
@@ -6,7 +6,6 @@
//-----------------------------------------------------------------------
using System;
-using System.Runtime.InteropServices;
using System.Runtime.Serialization;
using System.IO;
diff --git a/src/Framework/BuildEventContext.cs b/src/Framework/BuildEventContext.cs
index 5f754978b5e..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
{
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 f150533d9b9..a0014238138 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 8cc2bc29473..22602a36b31 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 a4183d4ebfd..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
{
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/ITaskItem2.cs b/src/Framework/ITaskItem2.cs
index ff0c4249cc2..0deacc89db2 100644
--- a/src/Framework/ITaskItem2.cs
+++ b/src/Framework/ITaskItem2.cs
@@ -8,7 +8,6 @@
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 199526e12c4..1dbe677dd3d 100644
--- a/src/Framework/ProjectStartedEventArgs.cs
+++ b/src/Framework/ProjectStartedEventArgs.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;
using System.IO;
diff --git a/src/Framework/TargetFinishedEventArgs.cs b/src/Framework/TargetFinishedEventArgs.cs
index 580cfc52fae..5b3588f0a32 100644
--- a/src/Framework/TargetFinishedEventArgs.cs
+++ b/src/Framework/TargetFinishedEventArgs.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;
using System.Collections;
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/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 714485ae2f2..67213889187 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 4d8350eaf1b..4ceb83c0e8d 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 dbd426707b0..a4542a66f5b 100644
--- a/src/Shared/AssemblyFoldersEx.cs
+++ b/src/Shared/AssemblyFoldersEx.cs
@@ -4,9 +4,6 @@
using System;
using Microsoft.Win32;
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;
diff --git a/src/Shared/AssemblyLoadInfo.cs b/src/Shared/AssemblyLoadInfo.cs
index ea4edacfd95..a247d6345db 100644
--- a/src/Shared/AssemblyLoadInfo.cs
+++ b/src/Shared/AssemblyLoadInfo.cs
@@ -7,7 +7,6 @@
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 59676314e95..7d5abeddf9d 100644
--- a/src/Shared/AssemblyNameExtension.cs
+++ b/src/Shared/AssemblyNameExtension.cs
@@ -4,9 +4,7 @@
using System;
using System.Text;
using System.Reflection;
-using System.Collections;
using System.Globalization;
-using System.Diagnostics;
using System.Collections.Generic;
using System.Runtime.Serialization;
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 f540df69ddb..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;
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..85571fb5b00 100644
--- a/src/Shared/CommunicationsUtilities.cs
+++ b/src/Shared/CommunicationsUtilities.cs
@@ -7,23 +7,12 @@
//-----------------------------------------------------------------------
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.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;
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..6d7d9e9b3d8 100644
--- a/src/Shared/CopyOnWriteDictionary.cs
+++ b/src/Shared/CopyOnWriteDictionary.cs
@@ -9,10 +9,8 @@
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..f6268015eed 100644
--- a/src/Shared/ErrorUtilities.cs
+++ b/src/Shared/ErrorUtilities.cs
@@ -4,9 +4,7 @@
using System;
using System.IO;
using System.Diagnostics;
-using System.Configuration;
using System.Globalization;
-using System.Runtime.CompilerServices;
using System.Threading;
#if BUILDINGAPPXTASKS
diff --git a/src/Shared/EventArgsFormatting.cs b/src/Shared/EventArgsFormatting.cs
index 29b7a194c7c..d9dd1b770d3 100644
--- a/src/Shared/EventArgsFormatting.cs
+++ b/src/Shared/EventArgsFormatting.cs
@@ -3,7 +3,6 @@
using System;
using System.Globalization;
-using System.Collections.Generic;
using System.Text;
using Microsoft.Build.Framework;
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..95b0e62ffc8 100644
--- a/src/Shared/FileUtilities.cs
+++ b/src/Shared/FileUtilities.cs
@@ -3,8 +3,6 @@
using System;
using System.IO;
-using System.Security;
-using System.Collections;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
@@ -15,8 +13,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
-using Microsoft.Build.Collections;
-using Microsoft.Build.Internal;
namespace Microsoft.Build.Shared
{
diff --git a/src/Shared/FileUtilitiesRegex.cs b/src/Shared/FileUtilitiesRegex.cs
index 7b431d997e9..64091f31b0a 100644
--- a/src/Shared/FileUtilitiesRegex.cs
+++ b/src/Shared/FileUtilitiesRegex.cs
@@ -3,9 +3,6 @@
using System;
using System.IO;
-using System.Security;
-using System.Collections;
-using System.Diagnostics;
using System.Globalization;
using System.Text.RegularExpressions;
diff --git a/src/Shared/FrameworkLocationHelper.cs b/src/Shared/FrameworkLocationHelper.cs
index 2f53883ecef..2644bab2a4a 100644
--- a/src/Shared/FrameworkLocationHelper.cs
+++ b/src/Shared/FrameworkLocationHelper.cs
@@ -5,12 +5,9 @@
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;
diff --git a/src/Shared/HybridDictionary.cs b/src/Shared/HybridDictionary.cs
index 65ce6b02b16..73364342d16 100644
--- a/src/Shared/HybridDictionary.cs
+++ b/src/Shared/HybridDictionary.cs
@@ -8,10 +8,6 @@
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;
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..efd5b453fb2 100644
--- a/src/Shared/INodePacketTranslator.cs
+++ b/src/Shared/INodePacketTranslator.cs
@@ -8,11 +8,7 @@
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..b6f7c594680 100644
--- a/src/Shared/InprocTrackingNativeMethods.cs
+++ b/src/Shared/InprocTrackingNativeMethods.cs
@@ -6,16 +6,11 @@
//-----------------------------------------------------------------------
using System;
-using System.Collections.Generic;
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..e6de031de08 100644
--- a/src/Shared/InterningBinaryReader.cs
+++ b/src/Shared/InterningBinaryReader.cs
@@ -6,11 +6,9 @@
//-----------------------------------------------------------------------
using System;
-using System.Collections.Generic;
using System.Text;
using System.IO;
using System.Diagnostics;
-using System.Globalization;
using ErrorUtilities = Microsoft.Build.Shared.ErrorUtilities;
diff --git a/src/Shared/LanguageParser/CSharptokenCharReader.cs b/src/Shared/LanguageParser/CSharptokenCharReader.cs
index 76b3b90c666..9b6acfcbb16 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 ec70a0ff137..d3d01f4c042 100644
--- a/src/Shared/LanguageParser/CSharptokenEnumerator.cs
+++ b/src/Shared/LanguageParser/CSharptokenEnumerator.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;
using System.Diagnostics;
namespace Microsoft.Build.Shared.LanguageParser
diff --git a/src/Shared/LanguageParser/CSharptokenizer.cs b/src/Shared/LanguageParser/CSharptokenizer.cs
index b784e842f12..0f0ea0983b7 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;
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..ff90aa03d21 100644
--- a/src/Shared/LanguageParser/VisualBasictokenEnumerator.cs
+++ b/src/Shared/LanguageParser/VisualBasictokenEnumerator.cs
@@ -3,10 +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/VisualBasictokenizer.cs b/src/Shared/LanguageParser/VisualBasictokenizer.cs
index ef49547ea8d..ee2a0699596 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;
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 140a020d9e2..1f510633599 100644
--- a/src/Shared/LoadedType.cs
+++ b/src/Shared/LoadedType.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.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 b7975542318..3e0fa9c7daf 100644
--- a/src/Shared/LogMessagePacketBase.cs
+++ b/src/Shared/LogMessagePacketBase.cs
@@ -8,7 +8,6 @@
using System;
using System.Collections.Generic;
-using System.Text;
using System.IO;
using System.Reflection;
diff --git a/src/Shared/MSBuildNameIgnoreCaseComparer.cs b/src/Shared/MSBuildNameIgnoreCaseComparer.cs
index 6c4ef17ffe3..cd346b5d377 100644
--- a/src/Shared/MSBuildNameIgnoreCaseComparer.cs
+++ b/src/Shared/MSBuildNameIgnoreCaseComparer.cs
@@ -10,9 +10,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/Shared/MetadataConversionUtilities.cs b/src/Shared/MetadataConversionUtilities.cs
index 90a25cba9c6..530dddacf82 100644
--- a/src/Shared/MetadataConversionUtilities.cs
+++ b/src/Shared/MetadataConversionUtilities.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;
using Microsoft.Build.Framework;
namespace Microsoft.Build.Shared
diff --git a/src/Shared/Modifiers.cs b/src/Shared/Modifiers.cs
index 43f51106398..708f23bd7d0 100644
--- a/src/Shared/Modifiers.cs
+++ b/src/Shared/Modifiers.cs
@@ -3,18 +3,9 @@
using System;
using System.IO;
-using System.Security;
-using System.Collections;
-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 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..b50c84c3faf 100644
--- a/src/Shared/NativeMethodsShared.cs
+++ b/src/Shared/NativeMethodsShared.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.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;
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 157cde24f5f..3d40e0a4906 100644
--- a/src/Shared/NodeEndpointOutOfProcBase.cs
+++ b/src/Shared/NodeEndpointOutOfProcBase.cs
@@ -7,19 +7,13 @@
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;
namespace Microsoft.Build.BackEnd
{
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..960e82cba5e 100644
--- a/src/Shared/NodePacketFactory.cs
+++ b/src/Shared/NodePacketFactory.cs
@@ -5,11 +5,7 @@
// Implementation of INodePacketFactory.
//-----------------------------------------------------------------------
-using System;
using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Microsoft.Build.Framework;
using Microsoft.Build.Shared;
namespace Microsoft.Build.BackEnd
diff --git a/src/Shared/NodePacketTranslator.cs b/src/Shared/NodePacketTranslator.cs
index 8198454a8c9..1d955a3824b 100644
--- a/src/Shared/NodePacketTranslator.cs
+++ b/src/Shared/NodePacketTranslator.cs
@@ -8,13 +8,8 @@
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;
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/OutOfProcTaskHostTaskResult.cs b/src/Shared/OutOfProcTaskHostTaskResult.cs
index ced32befe84..967cfe5e66e 100644
--- a/src/Shared/OutOfProcTaskHostTaskResult.cs
+++ b/src/Shared/OutOfProcTaskHostTaskResult.cs
@@ -8,7 +8,6 @@
using System;
using System.Collections.Generic;
-using System.Text;
using Microsoft.Build.BackEnd;
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..eb6c7717874 100644
--- a/src/Shared/ProjectErrorUtilities.cs
+++ b/src/Shared/ProjectErrorUtilities.cs
@@ -3,7 +3,6 @@
using System;
using System.Diagnostics;
-using System.Xml;
/******************************************************************************
*
@@ -16,7 +15,6 @@
*
******************************************************************************/
using Microsoft.Build.Debugging;
-using Microsoft.Build.Evaluation;
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..2efd1e0085a 100644
--- a/src/Shared/ProjectWriter.cs
+++ b/src/Shared/ProjectWriter.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.IO;
using System.Xml;
using System.Text;
diff --git a/src/Shared/ReadOnlyCollection.cs b/src/Shared/ReadOnlyCollection.cs
index e18087a07e2..b563f9a7fad 100644
--- a/src/Shared/ReadOnlyCollection.cs
+++ b/src/Shared/ReadOnlyCollection.cs
@@ -8,7 +8,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Text;
using System.Collections;
using Microsoft.Build.Shared;
diff --git a/src/Shared/ReadOnlyEmptyCollection.cs b/src/Shared/ReadOnlyEmptyCollection.cs
index 1d4ec6120f2..1d80ea5ef95 100644
--- a/src/Shared/ReadOnlyEmptyCollection.cs
+++ b/src/Shared/ReadOnlyEmptyCollection.cs
@@ -7,7 +7,6 @@
using System;
using System.Collections.Generic;
-using System.Text;
using System.Collections;
using Microsoft.Build.Shared;
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/ResourceUtilities.cs b/src/Shared/ResourceUtilities.cs
index 28bbc6da309..9aaa47858de 100644
--- a/src/Shared/ResourceUtilities.cs
+++ b/src/Shared/ResourceUtilities.cs
@@ -6,12 +6,11 @@
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
-using System.Text.RegularExpressions;
+
#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..6e40848b076 100644
--- a/src/Shared/StrongNameHelpers.cs
+++ b/src/Shared/StrongNameHelpers.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.Security;
-using System.Text;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Diagnostics.CodeAnalysis;
diff --git a/src/Shared/TaskEngineAssemblyResolver.cs b/src/Shared/TaskEngineAssemblyResolver.cs
index f0b8760a791..51d45bba6d8 100644
--- a/src/Shared/TaskEngineAssemblyResolver.cs
+++ b/src/Shared/TaskEngineAssemblyResolver.cs
@@ -5,8 +5,6 @@
using System.IO;
using System.Reflection;
using System.Diagnostics;
-using System.Globalization;
-using System.Security.Permissions;
using Microsoft.Build.Shared;
diff --git a/src/Shared/TaskHostConfiguration.cs b/src/Shared/TaskHostConfiguration.cs
index 29c9704e8a3..759fbfe59bd 100644
--- a/src/Shared/TaskHostConfiguration.cs
+++ b/src/Shared/TaskHostConfiguration.cs
@@ -10,9 +10,7 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
-using System.Linq;
using System.Threading;
-using System.Text;
using Microsoft.Build.Shared;
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..4d52f32169f 100644
--- a/src/Shared/TaskHostTaskComplete.cs
+++ b/src/Shared/TaskHostTaskComplete.cs
@@ -9,10 +9,7 @@
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/TaskLoggingHelper.cs b/src/Shared/TaskLoggingHelper.cs
index 1b0fdd43da9..1cd7e4a1bd2 100644
--- a/src/Shared/TaskLoggingHelper.cs
+++ b/src/Shared/TaskLoggingHelper.cs
@@ -7,8 +7,6 @@
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;
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..d3d9f7bad1e 100644
--- a/src/Shared/TaskParameter.cs
+++ b/src/Shared/TaskParameter.cs
@@ -10,9 +10,7 @@
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;
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 7a7d8f56f57..bbe5c972a0c 100644
--- a/src/Shared/ToolsetElement.cs
+++ b/src/Shared/ToolsetElement.cs
@@ -5,9 +5,6 @@
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;
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 005cf489abd..233ce6cba6a 100644
--- a/src/Shared/TypeLoader.cs
+++ b/src/Shared/TypeLoader.cs
@@ -8,8 +8,6 @@
using System;
using System.IO;
using System.Reflection;
-using System.Collections;
-using System.Globalization;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Collections.Concurrent;
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..0bf2c6506f1 100644
--- a/src/Shared/XmlUtilities.cs
+++ b/src/Shared/XmlUtilities.cs
@@ -3,7 +3,6 @@
using System;
using System.Xml;
-using System.Text.RegularExpressions;
using Microsoft.Build.Construction;
namespace Microsoft.Build.Shared
diff --git a/src/Utilities/AppDomainIsolatedTask.cs b/src/Utilities/AppDomainIsolatedTask.cs
index 2caf85f36ce..cde89291ecb 100644
--- a/src/Utilities/AppDomainIsolatedTask.cs
+++ b/src/Utilities/AppDomainIsolatedTask.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.Resources;
using System.Security;
-using System.Security.Permissions;
-using System.Runtime.InteropServices;
using Microsoft.Build.Framework;
diff --git a/src/Utilities/CommandLineBuilder.cs b/src/Utilities/CommandLineBuilder.cs
index d494756495b..7cf3edcd2df 100644
--- a/src/Utilities/CommandLineBuilder.cs
+++ b/src/Utilities/CommandLineBuilder.cs
@@ -3,10 +3,7 @@
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;
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 7878ee54cce..609d3cf39fd 100644
--- a/src/Utilities/MuxLogger.cs
+++ b/src/Utilities/MuxLogger.cs
@@ -6,7 +6,6 @@
//-----------------------------------------------------------------------
using System;
-using System.Collections;
using System.Collections.Generic;
using Microsoft.Build.Framework;
using Microsoft.Build.Shared;
diff --git a/src/Utilities/ProcessorArchitecture.cs b/src/Utilities/ProcessorArchitecture.cs
index a1c580c2176..7229c2842f9 100644
--- a/src/Utilities/ProcessorArchitecture.cs
+++ b/src/Utilities/ProcessorArchitecture.cs
@@ -5,7 +5,6 @@
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..20a1ddede67 100644
--- a/src/Utilities/SDKManifest.cs
+++ b/src/Utilities/SDKManifest.cs
@@ -8,14 +8,10 @@
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.Linq;
namespace Microsoft.Build.Utilities
diff --git a/src/Utilities/Task.cs b/src/Utilities/Task.cs
index 14063979825..449785dd3fb 100644
--- a/src/Utilities/Task.cs
+++ b/src/Utilities/Task.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 System;
-using System.IO;
using System.Resources;
-using System.Runtime.InteropServices;
-using Microsoft.Build.Shared;
using Microsoft.Build.Framework;
namespace Microsoft.Build.Utilities
diff --git a/src/Utilities/TaskItem.cs b/src/Utilities/TaskItem.cs
index e1db60c16bc..10071a9100a 100644
--- a/src/Utilities/TaskItem.cs
+++ b/src/Utilities/TaskItem.cs
@@ -4,11 +4,7 @@
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;
diff --git a/src/Utilities/ToolLocationHelper.cs b/src/Utilities/ToolLocationHelper.cs
index 35ec98f200d..bccfa69cf59 100644
--- a/src/Utilities/ToolLocationHelper.cs
+++ b/src/Utilities/ToolLocationHelper.cs
@@ -5,7 +5,6 @@
using System.IO;
using System.Text;
using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
using Microsoft.Build.Shared;
using System.Xml;
using System.Collections;
@@ -16,7 +15,6 @@
using UtilitiesDotNetFrameworkArchitecture = Microsoft.Build.Utilities.DotNetFrameworkArchitecture;
using SharedDotNetFrameworkArchitecture = Microsoft.Build.Shared.DotNetFrameworkArchitecture;
using Microsoft.Win32;
-using System.Collections.ObjectModel;
namespace Microsoft.Build.Utilities
{
diff --git a/src/Utilities/ToolTask.cs b/src/Utilities/ToolTask.cs
index 82807b821a9..97a0a028a91 100644
--- a/src/Utilities/ToolTask.cs
+++ b/src/Utilities/ToolTask.cs
@@ -9,11 +9,8 @@
using System.Text;
using System.Resources;
using System.Threading;
-using System.Reflection;
using System.Diagnostics;
using System.ComponentModel;
-using System.Globalization;
-using System.Runtime.InteropServices;
using Microsoft.Build.Framework;
using Microsoft.Build.Shared;
diff --git a/src/Utilities/TrackedDependencies/CanonicalTrackedFilesHelper.cs b/src/Utilities/TrackedDependencies/CanonicalTrackedFilesHelper.cs
index 54c97a091a8..e7d2a5d859f 100644
--- a/src/Utilities/TrackedDependencies/CanonicalTrackedFilesHelper.cs
+++ b/src/Utilities/TrackedDependencies/CanonicalTrackedFilesHelper.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.Collections.Generic;
-using System.Linq;
-using System.Text;
using Microsoft.Build.Framework;
-using Microsoft.Build.Shared;
namespace Microsoft.Build.Utilities
{
diff --git a/src/Utilities/TrackedDependencies/CanonicalTrackedInputFiles.cs b/src/Utilities/TrackedDependencies/CanonicalTrackedInputFiles.cs
index c5877cfae87..10c6569fba4 100644
--- a/src/Utilities/TrackedDependencies/CanonicalTrackedInputFiles.cs
+++ b/src/Utilities/TrackedDependencies/CanonicalTrackedInputFiles.cs
@@ -3,12 +3,10 @@
using System;
using System.Collections.Generic;
-using System.Text;
using Microsoft.Build.Framework;
using System.IO;
using Microsoft.Build.Shared;
using System.Collections.Concurrent;
-using System.Threading;
using System.Threading.Tasks;
using System.Diagnostics.CodeAnalysis;
diff --git a/src/Utilities/TrackedDependencies/CanonicalTrackedOutputFiles.cs b/src/Utilities/TrackedDependencies/CanonicalTrackedOutputFiles.cs
index 87adb779b4c..8b2a5faffe0 100644
--- a/src/Utilities/TrackedDependencies/CanonicalTrackedOutputFiles.cs
+++ b/src/Utilities/TrackedDependencies/CanonicalTrackedOutputFiles.cs
@@ -4,7 +4,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
-using System.Text;
using System.IO;
using Microsoft.Build.Framework;
diff --git a/src/Utilities/TrackedDependencies/DependencyTableCache.cs b/src/Utilities/TrackedDependencies/DependencyTableCache.cs
index 129b27cfbec..d971a1f9cab 100644
--- a/src/Utilities/TrackedDependencies/DependencyTableCache.cs
+++ b/src/Utilities/TrackedDependencies/DependencyTableCache.cs
@@ -6,7 +6,6 @@
using System.Collections;
using System.Linq;
using System.Text;
-using System.IO;
using Microsoft.Build.Framework;
using Microsoft.Build.Shared;
diff --git a/src/Utilities/TrackedDependencies/FileTracker.cs b/src/Utilities/TrackedDependencies/FileTracker.cs
index 935edac8cb5..0931132d279 100644
--- a/src/Utilities/TrackedDependencies/FileTracker.cs
+++ b/src/Utilities/TrackedDependencies/FileTracker.cs
@@ -8,12 +8,10 @@
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;
namespace Microsoft.Build.Utilities
{
diff --git a/src/Utilities/TrackedDependencies/FlatTrackingData.cs b/src/Utilities/TrackedDependencies/FlatTrackingData.cs
index b6e7d1ec6e3..510f189da08 100644
--- a/src/Utilities/TrackedDependencies/FlatTrackingData.cs
+++ b/src/Utilities/TrackedDependencies/FlatTrackingData.cs
@@ -7,7 +7,6 @@
using System.Diagnostics.CodeAnalysis;
using System.IO;
using System.Resources;
-using System.Text;
using Microsoft.Build.Framework;
using Microsoft.Build.Shared;
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..c557618ec07 100644
--- a/src/Utilities/TrackedDependencies/TrackedDependencies.cs
+++ b/src/Utilities/TrackedDependencies/TrackedDependencies.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.Generic;
-using System.Collections;
-using System.Text;
using System.IO;
using Microsoft.Build.Framework;
diff --git a/src/XMakeBuildEngine/BackEnd/BuildManager/BuildParameters.cs b/src/XMakeBuildEngine/BackEnd/BuildManager/BuildParameters.cs
index 826991d24a7..62ff84feee9 100644
--- a/src/XMakeBuildEngine/BackEnd/BuildManager/BuildParameters.cs
+++ b/src/XMakeBuildEngine/BackEnd/BuildManager/BuildParameters.cs
@@ -6,13 +6,10 @@
//-----------------------------------------------------------------------
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;
@@ -23,8 +20,6 @@
using Microsoft.Build.Internal;
using Microsoft.Build.Shared;
-using ReservedPropertyNames = Microsoft.Build.Internal.ReservedPropertyNames;
-using LoggerDescription = Microsoft.Build.Logging.LoggerDescription;
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..5afd07995bd 100644
--- a/src/XMakeBuildEngine/BackEnd/BuildManager/BuildRequestData.cs
+++ b/src/XMakeBuildEngine/BackEnd/BuildManager/BuildRequestData.cs
@@ -7,11 +7,8 @@
using System;
using System.Collections.Generic;
-using System.IO;
-using System.Text;
using Microsoft.Build.Collections;
-using Microsoft.Build.Evaluation;
using Microsoft.Build.Shared;
namespace Microsoft.Build.Execution
diff --git a/src/XMakeBuildEngine/BackEnd/BuildManager/BuildSubmission.cs b/src/XMakeBuildEngine/BackEnd/BuildManager/BuildSubmission.cs
index 2b996920bb9..1f36e66aa47 100644
--- a/src/XMakeBuildEngine/BackEnd/BuildManager/BuildSubmission.cs
+++ b/src/XMakeBuildEngine/BackEnd/BuildManager/BuildSubmission.cs
@@ -6,15 +6,10 @@
//-----------------------------------------------------------------------
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;
namespace Microsoft.Build.Execution
{
diff --git a/src/XMakeBuildEngine/BackEnd/Components/BuildComponentFactoryCollection.cs b/src/XMakeBuildEngine/BackEnd/Components/BuildComponentFactoryCollection.cs
index 632714e8451..a4294473684 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/BuildComponentFactoryCollection.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/BuildComponentFactoryCollection.cs
@@ -5,10 +5,7 @@
// 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;
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..353a80b8845 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/BuildRequestEngine/BuildRequestEngine.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/BuildRequestEngine/BuildRequestEngine.cs
@@ -12,7 +12,6 @@
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;
diff --git a/src/XMakeBuildEngine/BackEnd/Components/BuildRequestEngine/BuildRequestEntry.cs b/src/XMakeBuildEngine/BackEnd/Components/BuildRequestEngine/BuildRequestEntry.cs
index f4691bcc77f..c384be00a6a 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/BuildRequestEngine/BuildRequestEntry.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/BuildRequestEngine/BuildRequestEntry.cs
@@ -8,13 +8,11 @@
using System;
using System.IO;
using System.Collections.Generic;
-using System.Text;
using Microsoft.Build.Shared;
using Microsoft.Build.Execution;
using System.Diagnostics;
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..0d64e135557 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/BuildRequestEngine/FullyQualifiedBuildRequest.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/BuildRequestEngine/FullyQualifiedBuildRequest.cs
@@ -6,8 +6,6 @@
//-----------------------------------------------------------------------
using System;
-using System.Collections.Generic;
-using System.Text;
using Microsoft.Build.Shared;
namespace Microsoft.Build.BackEnd
diff --git a/src/XMakeBuildEngine/BackEnd/Components/BuildRequestEngine/IBuildRequestEngine.cs b/src/XMakeBuildEngine/BackEnd/Components/BuildRequestEngine/IBuildRequestEngine.cs
index 9a78d2d86cf..dc6a66078c8 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/BuildRequestEngine/IBuildRequestEngine.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/BuildRequestEngine/IBuildRequestEngine.cs
@@ -6,8 +6,6 @@
//-----------------------------------------------------------------------
using System;
-using System.Collections.Generic;
-using System.Text;
using NodeLoggingContext = Microsoft.Build.BackEnd.Logging.NodeLoggingContext;
using BuildResult = Microsoft.Build.Execution.BuildResult;
diff --git a/src/XMakeBuildEngine/BackEnd/Components/Caching/ConfigCache.cs b/src/XMakeBuildEngine/BackEnd/Components/Caching/ConfigCache.cs
index fb861ae0b96..3bf966a54f8 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/Caching/ConfigCache.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/Caching/ConfigCache.cs
@@ -7,8 +7,6 @@
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/ResultsCache.cs b/src/XMakeBuildEngine/BackEnd/Components/Caching/ResultsCache.cs
index b8869d75b83..def17076bf2 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/Caching/ResultsCache.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/Caching/ResultsCache.cs
@@ -8,8 +8,6 @@
using System;
using System.Collections.Generic;
using System.Collections.Concurrent;
-using System.Diagnostics;
-using System.IO;
using Microsoft.Build.Execution;
using Microsoft.Build.Shared;
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..0fb66e8166a 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/Communications/LogMessagePacket.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/Communications/LogMessagePacket.cs
@@ -5,16 +5,11 @@
// 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 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..8dbaf1e9c76 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeEndpointInProc.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeEndpointInProc.cs
@@ -7,9 +7,7 @@
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;
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..c9635bd7412 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeInfo.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeInfo.cs
@@ -4,12 +4,9 @@
// Class containing information about a node.
//-----------------------------------------------------------------------
-using System;
using System.Collections.Generic;
-using System.Text;
using Microsoft.Build.Execution;
-using Microsoft.Build.Shared;
namespace Microsoft.Build.BackEnd
{
diff --git a/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeManager.cs b/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeManager.cs
index 10a740d9068..de718856f03 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeManager.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeManager.cs
@@ -6,14 +6,8 @@
//-----------------------------------------------------------------------
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..7baf650e14d 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeProviderInProc.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeProviderInProc.cs
@@ -5,10 +5,7 @@
//-----------------------------------------------------------------------
using System;
-using System.Collections;
-using System.Collections.Generic;
using System.Globalization;
-using System.Text;
using System.Threading;
using System.Diagnostics;
diff --git a/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeProviderOutOfProc.cs b/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeProviderOutOfProc.cs
index af18d1a7e76..75f2bb6ec06 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeProviderOutOfProc.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeProviderOutOfProc.cs
@@ -7,20 +7,9 @@
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;
diff --git a/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeProviderOutOfProcBase.cs b/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeProviderOutOfProcBase.cs
index ecffbf608ac..a39d7755af7 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeProviderOutOfProcBase.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeProviderOutOfProcBase.cs
@@ -9,19 +9,14 @@
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;
diff --git a/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeProviderOutOfProcTaskHost.cs b/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeProviderOutOfProcTaskHost.cs
index 4950f0f9def..3e14db2c1dd 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeProviderOutOfProcTaskHost.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeProviderOutOfProcTaskHost.cs
@@ -7,22 +7,11 @@
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.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;
diff --git a/src/XMakeBuildEngine/BackEnd/Components/Communications/TaskHostNodeManager.cs b/src/XMakeBuildEngine/BackEnd/Components/Communications/TaskHostNodeManager.cs
index 51524e1359b..8ae6d4510e5 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/Communications/TaskHostNodeManager.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/Communications/TaskHostNodeManager.cs
@@ -6,14 +6,7 @@
//-----------------------------------------------------------------------
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/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..3b9bcbf5229 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/IBuildComponentHost.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/IBuildComponentHost.cs
@@ -4,9 +4,6 @@
// 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;
diff --git a/src/XMakeBuildEngine/BackEnd/Components/Logging/BaseLoggingContext.cs b/src/XMakeBuildEngine/BackEnd/Components/Logging/BaseLoggingContext.cs
index c9fe4a6ba7e..e3d467e426a 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/Logging/BaseLoggingContext.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/Logging/BaseLoggingContext.cs
@@ -6,11 +6,7 @@
//-----------------------------------------------------------------------
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;
diff --git a/src/XMakeBuildEngine/BackEnd/Components/Logging/BuildEventArgTransportSink.cs b/src/XMakeBuildEngine/BackEnd/Components/Logging/BuildEventArgTransportSink.cs
index a82766f51f2..9c21695c3c4 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;
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/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/LoggingService.cs b/src/XMakeBuildEngine/BackEnd/Components/Logging/LoggingService.cs
index 85fa3ac7035..30d569601ca 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/Logging/LoggingService.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/Logging/LoggingService.cs
@@ -5,20 +5,14 @@
//-----------------------------------------------------------------------
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..f5fb8edea91 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/Logging/LoggingServiceLogMethods.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/Logging/LoggingServiceLogMethods.cs
@@ -8,12 +8,6 @@
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;
diff --git a/src/XMakeBuildEngine/BackEnd/Components/Logging/NodeLoggingContext.cs b/src/XMakeBuildEngine/BackEnd/Components/Logging/NodeLoggingContext.cs
index c8b11fab307..3f329431b36 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/Logging/NodeLoggingContext.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/Logging/NodeLoggingContext.cs
@@ -5,10 +5,6 @@
// 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.Shared;
diff --git a/src/XMakeBuildEngine/BackEnd/Components/Logging/ProjectLoggingContext.cs b/src/XMakeBuildEngine/BackEnd/Components/Logging/ProjectLoggingContext.cs
index 5a0e4c1f978..ff983fc1e1f 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/Logging/ProjectLoggingContext.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/Logging/ProjectLoggingContext.cs
@@ -7,8 +7,6 @@
using System;
using System.Collections.Generic;
-using System.Diagnostics;
-using System.Text;
using Microsoft.Build.Framework;
using Microsoft.Build.Execution;
using System.Collections;
diff --git a/src/XMakeBuildEngine/BackEnd/Components/Logging/TargetLoggingContext.cs b/src/XMakeBuildEngine/BackEnd/Components/Logging/TargetLoggingContext.cs
index e8f77250cb7..e692bdcc436 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/Logging/TargetLoggingContext.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/Logging/TargetLoggingContext.cs
@@ -7,12 +7,8 @@
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.Shared;
using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem;
using System.Collections;
diff --git a/src/XMakeBuildEngine/BackEnd/Components/Logging/TaskLoggingContext.cs b/src/XMakeBuildEngine/BackEnd/Components/Logging/TaskLoggingContext.cs
index 70b13836705..f7274342587 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.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..829ec0c34f5 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/BatchingEngine.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/BatchingEngine.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.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;
diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/FullTracking.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/FullTracking.cs
index 214fcde1bb6..3b9b6562353 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/FullTracking.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/FullTracking.cs
@@ -10,7 +10,6 @@
using Microsoft.Build.Collections;
using Microsoft.Build.Execution;
using Microsoft.Build.Shared;
-using TaskLoggingContext = Microsoft.Build.BackEnd.Logging.TaskLoggingContext;
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..ed67f07bd8b 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IRequestBuilderCallback.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IRequestBuilderCallback.cs
@@ -5,9 +5,6 @@
// 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 System.Threading.Tasks;
diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/ITargetBuilder.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/ITargetBuilder.cs
index ebecdb4358d..3ed90966e46 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/ITargetBuilder.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/ITargetBuilder.cs
@@ -5,9 +5,6 @@
// Interface for the target builder.
//-----------------------------------------------------------------------
-using System;
-using System.Collections.Generic;
-using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Build.BackEnd.Logging;
diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/ITargetBuilderCallback.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/ITargetBuilderCallback.cs
index 39e11e96721..fcfa9a58d73 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/ITargetBuilderCallback.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/ITargetBuilderCallback.cs
@@ -5,11 +5,7 @@
// 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;
diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTask.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTask.cs
index 97c271f8e52..1cea104bcbb 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTask.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTask.cs
@@ -7,17 +7,9 @@
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..5bf3807ce7a 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTasks/CallTarget.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTasks/CallTarget.cs
@@ -3,10 +3,8 @@
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..85005938920 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTasks/IntrinsicTaskFactory.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTasks/IntrinsicTaskFactory.cs
@@ -7,9 +7,7 @@
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;
diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTasks/ItemGroupIntrinsicTask.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTasks/ItemGroupIntrinsicTask.cs
index 34658f04ba4..ed85028368b 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTasks/ItemGroupIntrinsicTask.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTasks/ItemGroupIntrinsicTask.cs
@@ -7,7 +7,6 @@
using System;
using System.Collections.Generic;
-using System.Text;
using System.Linq;
using Microsoft.Build.Collections;
using ElementLocation = Microsoft.Build.Construction.ElementLocation;
@@ -16,7 +15,6 @@
using Microsoft.Build.Shared;
using Microsoft.Build.Evaluation;
-using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem;
using ProjectItemInstanceFactory = Microsoft.Build.Execution.ProjectItemInstance.TaskItem.ProjectItemInstanceFactory;
using EngineFileUtilities = Microsoft.Build.Internal.EngineFileUtilities;
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..75ff8b0a877 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/ItemBucket.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/ItemBucket.cs
@@ -2,12 +2,7 @@
// 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.Collections.Generic;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Globalization;
using Microsoft.Build.Shared;
using Microsoft.Build.Execution;
diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/Lookup.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/Lookup.cs
index ced85b8c4b5..70750db9040 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/Lookup.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/Lookup.cs
@@ -4,13 +4,10 @@
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.Evaluation;
-using Microsoft.Build.Framework;
using Microsoft.Build.Execution;
using Microsoft.Build.Collections;
diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/RequestBuilder.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/RequestBuilder.cs
index 05075b77b33..11a55ff7272 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/RequestBuilder.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/RequestBuilder.cs
@@ -8,17 +8,12 @@
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.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;
@@ -31,7 +26,6 @@
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;
diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetBuilder.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetBuilder.cs
index b94de3c53dd..718b6ac22c4 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetBuilder.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetBuilder.cs
@@ -8,12 +8,9 @@
using System;
using System.Collections.Generic;
using System.Collections.Concurrent;
-using System.Text;
using System.Threading;
-using System.Xml;
using Microsoft.Build.Shared;
using Microsoft.Build.Execution;
-using Microsoft.Build.Evaluation;
using Microsoft.Build.Collections;
using ElementLocation = Microsoft.Build.Construction.ElementLocation;
using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem;
diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetSpecification.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetSpecification.cs
index 712db0bbc72..d119b3d82fc 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetSpecification.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetSpecification.cs
@@ -5,9 +5,6 @@
// 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;
diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetUpToDateChecker.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetUpToDateChecker.cs
index 8d16e7fcae6..f47d237cf1e 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetUpToDateChecker.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetUpToDateChecker.cs
@@ -3,13 +3,9 @@
using System;
using System.IO;
-using System.Xml;
using System.Collections;
using System.Collections.Generic;
-using System.Diagnostics;
-using System.Text.RegularExpressions;
using System.Text;
-using System.Threading;
using Microsoft.Build.Framework;
using Microsoft.Build.Shared;
diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TaskBuilder.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TaskBuilder.cs
index 23c5ea8871d..98c85dbe28b 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TaskBuilder.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TaskBuilder.cs
@@ -9,12 +9,10 @@
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.Collections;
-using Microsoft.Build.Construction;
using Microsoft.Build.Evaluation;
using Microsoft.Build.Exceptions;
using Microsoft.Build.Execution;
diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TaskHost.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TaskHost.cs
index 16168b7fcc3..13222de9f3f 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TaskHost.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TaskHost.cs
@@ -12,7 +12,6 @@
using System.Runtime.Remoting.Lifetime;
using System.Runtime.Remoting;
using System.Threading;
-using System.Text;
using Microsoft.Build.Framework;
using Microsoft.Build.Shared;
using Microsoft.Build.Execution;
diff --git a/src/XMakeBuildEngine/BackEnd/Components/Scheduler/IScheduler.cs b/src/XMakeBuildEngine/BackEnd/Components/Scheduler/IScheduler.cs
index d36a4b632aa..ccd9b6d978c 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/Scheduler/IScheduler.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/Scheduler/IScheduler.cs
@@ -4,9 +4,7 @@
// Interface for the scheduler.
//-----------------------------------------------------------------------
-using System;
using System.Collections.Generic;
-using System.Collections.ObjectModel;
using Microsoft.Build.Execution;
namespace Microsoft.Build.BackEnd
diff --git a/src/XMakeBuildEngine/BackEnd/Components/Scheduler/SchedulableRequest.cs b/src/XMakeBuildEngine/BackEnd/Components/Scheduler/SchedulableRequest.cs
index 66ac131a20f..fd62227e8d9 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/Scheduler/SchedulableRequest.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/Scheduler/SchedulableRequest.cs
@@ -7,7 +7,6 @@
using System;
using System.Collections.Generic;
-using System.Text;
using Microsoft.Build.Shared;
using Microsoft.Build.Execution;
diff --git a/src/XMakeBuildEngine/BackEnd/Components/Scheduler/ScheduleResponse.cs b/src/XMakeBuildEngine/BackEnd/Components/Scheduler/ScheduleResponse.cs
index 74c8c3bdf51..887e3b99383 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/Scheduler/ScheduleResponse.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/Scheduler/ScheduleResponse.cs
@@ -5,13 +5,9 @@
//-----------------------------------------------------------------------
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..46a1a9da4ee 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/Scheduler/ScheduleTimeRecord.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/Scheduler/ScheduleTimeRecord.cs
@@ -6,8 +6,6 @@
//-----------------------------------------------------------------------
using System;
-using System.Collections.Generic;
-using System.Text;
using Microsoft.Build.Shared;
namespace Microsoft.Build.BackEnd
diff --git a/src/XMakeBuildEngine/BackEnd/Components/Scheduler/Scheduler.cs b/src/XMakeBuildEngine/BackEnd/Components/Scheduler/Scheduler.cs
index feeed2c33e7..a9335c942e1 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/Scheduler/Scheduler.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/Scheduler/Scheduler.cs
@@ -14,7 +14,6 @@
using System.Linq;
using System.Text;
using System.Threading;
-using Microsoft.Build.Collections;
using Microsoft.Build.Execution;
using Microsoft.Build.Framework;
using Microsoft.Build.Shared;
@@ -22,7 +21,6 @@
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
{
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..ddfd1f8ccc5 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/Scheduler/SchedulingData.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/Scheduler/SchedulingData.cs
@@ -7,11 +7,8 @@
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..9cb9f4c0535 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/Scheduler/SchedulingPlan.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/Scheduler/SchedulingPlan.cs
@@ -9,8 +9,6 @@
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;
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..a35319570fa 100644
--- a/src/XMakeBuildEngine/BackEnd/Node/InProcNode.cs
+++ b/src/XMakeBuildEngine/BackEnd/Node/InProcNode.cs
@@ -6,22 +6,13 @@
//-----------------------------------------------------------------------
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.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 ILoggingService = Microsoft.Build.BackEnd.Logging.ILoggingService;
using NodeLoggingContext = Microsoft.Build.BackEnd.Logging.NodeLoggingContext;
using LoggingExceptionDelegate = Microsoft.Build.BackEnd.Logging.LoggingExceptionDelegate;
diff --git a/src/XMakeBuildEngine/BackEnd/Node/NodeConfiguration.cs b/src/XMakeBuildEngine/BackEnd/Node/NodeConfiguration.cs
index b9e4a2cbf1b..f05b2827eee 100644
--- a/src/XMakeBuildEngine/BackEnd/Node/NodeConfiguration.cs
+++ b/src/XMakeBuildEngine/BackEnd/Node/NodeConfiguration.cs
@@ -6,13 +6,7 @@
//-----------------------------------------------------------------------
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;
diff --git a/src/XMakeBuildEngine/BackEnd/Node/OutOfProcNode.cs b/src/XMakeBuildEngine/BackEnd/Node/OutOfProcNode.cs
index 397ede13ae4..b42684e8728 100644
--- a/src/XMakeBuildEngine/BackEnd/Node/OutOfProcNode.cs
+++ b/src/XMakeBuildEngine/BackEnd/Node/OutOfProcNode.cs
@@ -11,12 +11,8 @@
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 Microsoft.Build.BackEnd;
using Microsoft.Build.BackEnd.Logging;
using Microsoft.Build.Evaluation;
diff --git a/src/XMakeBuildEngine/BackEnd/Shared/BuildAbortedException.cs b/src/XMakeBuildEngine/BackEnd/Shared/BuildAbortedException.cs
index d140825860c..3ef2d92a4df 100644
--- a/src/XMakeBuildEngine/BackEnd/Shared/BuildAbortedException.cs
+++ b/src/XMakeBuildEngine/BackEnd/Shared/BuildAbortedException.cs
@@ -6,8 +6,6 @@
//-----------------------------------------------------------------------
using System;
-using System.Collections.Generic;
-using System.Text;
using System.Runtime.Serialization;
using System.Security.Permissions;
using Microsoft.Build.Shared;
diff --git a/src/XMakeBuildEngine/BackEnd/Shared/BuildRequest.cs b/src/XMakeBuildEngine/BackEnd/Shared/BuildRequest.cs
index aa864ff8f3c..0e95f2104fe 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 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..0ab289cf3e2 100644
--- a/src/XMakeBuildEngine/BackEnd/Shared/BuildRequestConfiguration.cs
+++ b/src/XMakeBuildEngine/BackEnd/Shared/BuildRequestConfiguration.cs
@@ -8,18 +8,12 @@
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.Internal;
using System.Diagnostics;
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..86a0408f54c 100644
--- a/src/XMakeBuildEngine/BackEnd/Shared/BuildRequestUnblocker.cs
+++ b/src/XMakeBuildEngine/BackEnd/Shared/BuildRequestUnblocker.cs
@@ -5,9 +5,6 @@
// Class used to unblock a blocked build request.
//-----------------------------------------------------------------------
-using System;
-using System.Collections.Generic;
-using System.Text;
using System.Diagnostics;
using Microsoft.Build.Shared;
diff --git a/src/XMakeBuildEngine/BackEnd/Shared/BuildResult.cs b/src/XMakeBuildEngine/BackEnd/Shared/BuildResult.cs
index 22004eca01f..dbd5ef6154d 100644
--- a/src/XMakeBuildEngine/BackEnd/Shared/BuildResult.cs
+++ b/src/XMakeBuildEngine/BackEnd/Shared/BuildResult.cs
@@ -11,7 +11,6 @@
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..9edf350e79d 100644
--- a/src/XMakeBuildEngine/BackEnd/Shared/ConfigurationMetadata.cs
+++ b/src/XMakeBuildEngine/BackEnd/Shared/ConfigurationMetadata.cs
@@ -7,7 +7,6 @@
using System;
using System.Collections.Generic;
-using System.Text;
using Microsoft.Build.Collections;
using Microsoft.Build.Evaluation;
diff --git a/src/XMakeBuildEngine/BackEnd/Shared/IBuildResults.cs b/src/XMakeBuildEngine/BackEnd/Shared/IBuildResults.cs
index 12b77833edb..b5065eeda0e 100644
--- a/src/XMakeBuildEngine/BackEnd/Shared/IBuildResults.cs
+++ b/src/XMakeBuildEngine/BackEnd/Shared/IBuildResults.cs
@@ -7,7 +7,6 @@
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..873e8db121b 100644
--- a/src/XMakeBuildEngine/BackEnd/Shared/ITargetResult.cs
+++ b/src/XMakeBuildEngine/BackEnd/Shared/ITargetResult.cs
@@ -6,9 +6,7 @@
//-----------------------------------------------------------------------
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..a358c7a46dd 100644
--- a/src/XMakeBuildEngine/BackEnd/Shared/TargetResult.cs
+++ b/src/XMakeBuildEngine/BackEnd/Shared/TargetResult.cs
@@ -8,7 +8,6 @@
using System;
using System.Diagnostics;
using System.IO;
-using System.Text;
using System.Globalization;
using System.IO.Compression;
using Microsoft.Build.BackEnd;
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/TaskExecutionHost.cs b/src/XMakeBuildEngine/BackEnd/TaskExecutionHost/TaskExecutionHost.cs
index 080949fbe26..40af87b5b79 100644
--- a/src/XMakeBuildEngine/BackEnd/TaskExecutionHost/TaskExecutionHost.cs
+++ b/src/XMakeBuildEngine/BackEnd/TaskExecutionHost/TaskExecutionHost.cs
@@ -8,7 +8,6 @@
using System;
using System.Collections;
using System.Collections.Generic;
-using System.Collections.ObjectModel;
using System.Diagnostics;
using System.Text;
using System.Threading;
diff --git a/src/XMakeBuildEngine/Collections/ConcurrentQueueExtensions.cs b/src/XMakeBuildEngine/Collections/ConcurrentQueueExtensions.cs
index 3738c064367..c123c6abe6c 100644
--- a/src/XMakeBuildEngine/Collections/ConcurrentQueueExtensions.cs
+++ b/src/XMakeBuildEngine/Collections/ConcurrentQueueExtensions.cs
@@ -5,7 +5,6 @@
// Extension methods for the ConcurrentQueue.
//-----------------------------------------------------------------------
-using System;
using System.Collections.Concurrent;
using Microsoft.Build.Shared;
diff --git a/src/XMakeBuildEngine/Collections/ConcurrentStackExtensions.cs b/src/XMakeBuildEngine/Collections/ConcurrentStackExtensions.cs
index de5842219f8..59556e19c23 100644
--- a/src/XMakeBuildEngine/Collections/ConcurrentStackExtensions.cs
+++ b/src/XMakeBuildEngine/Collections/ConcurrentStackExtensions.cs
@@ -5,7 +5,6 @@
// Extension methods for the ConcurrentStack.
//-----------------------------------------------------------------------
-using System;
using System.Collections.Concurrent;
using Microsoft.Build.Shared;
diff --git a/src/XMakeBuildEngine/Collections/CopyOnWritePropertyDictionary.cs b/src/XMakeBuildEngine/Collections/CopyOnWritePropertyDictionary.cs
index 80208cc3a35..1682623bbc9 100644
--- a/src/XMakeBuildEngine/Collections/CopyOnWritePropertyDictionary.cs
+++ b/src/XMakeBuildEngine/Collections/CopyOnWritePropertyDictionary.cs
@@ -8,12 +8,9 @@
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..743062e137e 100644
--- a/src/XMakeBuildEngine/Collections/ItemDictionary.cs
+++ b/src/XMakeBuildEngine/Collections/ItemDictionary.cs
@@ -9,10 +9,8 @@
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..b89ec2ae9bc 100644
--- a/src/XMakeBuildEngine/Collections/LookasideStringInterner.cs
+++ b/src/XMakeBuildEngine/Collections/LookasideStringInterner.cs
@@ -7,10 +7,7 @@
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..b4821416212 100644
--- a/src/XMakeBuildEngine/Collections/MultiDictionary.cs
+++ b/src/XMakeBuildEngine/Collections/MultiDictionary.cs
@@ -7,8 +7,6 @@
using System;
using System.Collections.Generic;
-using System.Text;
-using System.Collections.ObjectModel;
using System.Collections;
using Microsoft.Build.Shared;
using System.Diagnostics;
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..5b36d28ea5b 100644
--- a/src/XMakeBuildEngine/Collections/PropertyDictionary.cs
+++ b/src/XMakeBuildEngine/Collections/PropertyDictionary.cs
@@ -8,11 +8,9 @@
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..8863eaeee9d 100644
--- a/src/XMakeBuildEngine/Collections/ReadOnlyConvertingCollection.cs
+++ b/src/XMakeBuildEngine/Collections/ReadOnlyConvertingCollection.cs
@@ -7,11 +7,8 @@
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..e1e2f454af2 100644
--- a/src/XMakeBuildEngine/Collections/ReadOnlyConvertingDictionary.cs
+++ b/src/XMakeBuildEngine/Collections/ReadOnlyConvertingDictionary.cs
@@ -7,10 +7,7 @@
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 5df8b28e138..4c623ceeffe 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..1e9ff5c850a 100644
--- a/src/XMakeBuildEngine/Collections/WeakDictionary.cs
+++ b/src/XMakeBuildEngine/Collections/WeakDictionary.cs
@@ -7,8 +7,6 @@
using System;
using System.Collections.Generic;
-using System.Text;
-using System.Collections.ObjectModel;
using System.Collections;
using Microsoft.Build.Shared;
using System.Diagnostics;
diff --git a/src/XMakeBuildEngine/Collections/WeakValueDictionary.cs b/src/XMakeBuildEngine/Collections/WeakValueDictionary.cs
index 717970917c4..567e60b7dc2 100644
--- a/src/XMakeBuildEngine/Collections/WeakValueDictionary.cs
+++ b/src/XMakeBuildEngine/Collections/WeakValueDictionary.cs
@@ -7,7 +7,6 @@
using System;
using System.Collections.Generic;
-using System.Text;
using System.Diagnostics;
using Microsoft.Build.Shared;
diff --git a/src/XMakeBuildEngine/Construction/ProjectChooseElement.cs b/src/XMakeBuildEngine/Construction/ProjectChooseElement.cs
index 4bfe657baf9..b9fc67ab9ca 100644
--- a/src/XMakeBuildEngine/Construction/ProjectChooseElement.cs
+++ b/src/XMakeBuildEngine/Construction/ProjectChooseElement.cs
@@ -5,11 +5,9 @@
// Definition of ProjectChooseElement class.
//-----------------------------------------------------------------------
-using System;
using System.Collections.Generic;
using System.Xml;
using System.Diagnostics;
-using Microsoft.Build.Framework;
using Microsoft.Build.Shared;
using Microsoft.Build.Collections;
diff --git a/src/XMakeBuildEngine/Construction/ProjectElement.cs b/src/XMakeBuildEngine/Construction/ProjectElement.cs
index 2a96f31db9c..e4c80000e2b 100644
--- a/src/XMakeBuildEngine/Construction/ProjectElement.cs
+++ b/src/XMakeBuildEngine/Construction/ProjectElement.cs
@@ -6,15 +6,10 @@
//-----------------------------------------------------------------------
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 ProjectXmlUtilities = Microsoft.Build.Internal.ProjectXmlUtilities;
diff --git a/src/XMakeBuildEngine/Construction/ProjectElementContainer.cs b/src/XMakeBuildEngine/Construction/ProjectElementContainer.cs
index 0ff7fa85041..7d28fda06bd 100644
--- a/src/XMakeBuildEngine/Construction/ProjectElementContainer.cs
+++ b/src/XMakeBuildEngine/Construction/ProjectElementContainer.cs
@@ -6,15 +6,10 @@
//-----------------------------------------------------------------------
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;
namespace Microsoft.Build.Construction
{
diff --git a/src/XMakeBuildEngine/Construction/ProjectExtensionsElement.cs b/src/XMakeBuildEngine/Construction/ProjectExtensionsElement.cs
index 75fa33e3d1e..0aeb2a535ce 100644
--- a/src/XMakeBuildEngine/Construction/ProjectExtensionsElement.cs
+++ b/src/XMakeBuildEngine/Construction/ProjectExtensionsElement.cs
@@ -6,14 +6,10 @@
//-----------------------------------------------------------------------
using System;
-using System.Collections.Generic;
using System.Xml;
-using System.Reflection;
using System.Diagnostics;
-using Microsoft.Build.Framework;
using Microsoft.Build.Shared;
-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..29a8d3778ac 100644
--- a/src/XMakeBuildEngine/Construction/ProjectImportElement.cs
+++ b/src/XMakeBuildEngine/Construction/ProjectImportElement.cs
@@ -5,11 +5,8 @@
// 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 ProjectXmlUtilities = Microsoft.Build.Internal.ProjectXmlUtilities;
diff --git a/src/XMakeBuildEngine/Construction/ProjectImportGroupElement.cs b/src/XMakeBuildEngine/Construction/ProjectImportGroupElement.cs
index 33ef5a3ff8a..53de180f8f2 100644
--- a/src/XMakeBuildEngine/Construction/ProjectImportGroupElement.cs
+++ b/src/XMakeBuildEngine/Construction/ProjectImportGroupElement.cs
@@ -5,15 +5,11 @@
// Definition of ProjectImportGroupElement class.
//-----------------------------------------------------------------------
-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/ProjectItemDefinitionElement.cs b/src/XMakeBuildEngine/Construction/ProjectItemDefinitionElement.cs
index 83f8406f0d8..9bd97b6e2f1 100644
--- a/src/XMakeBuildEngine/Construction/ProjectItemDefinitionElement.cs
+++ b/src/XMakeBuildEngine/Construction/ProjectItemDefinitionElement.cs
@@ -5,15 +5,12 @@
// Definition of ProjectItemDefinitionElement class.
//-----------------------------------------------------------------------
-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/ProjectItemDefinitionGroupElement.cs b/src/XMakeBuildEngine/Construction/ProjectItemDefinitionGroupElement.cs
index d4d9ef0f5d5..e96a00fe610 100644
--- a/src/XMakeBuildEngine/Construction/ProjectItemDefinitionGroupElement.cs
+++ b/src/XMakeBuildEngine/Construction/ProjectItemDefinitionGroupElement.cs
@@ -5,15 +5,12 @@
// Definition of ProjectItemDefinitionGroupElement class.
//-----------------------------------------------------------------------
-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/ProjectItemElement.cs b/src/XMakeBuildEngine/Construction/ProjectItemElement.cs
index 9005441eb04..8cb7e376997 100644
--- a/src/XMakeBuildEngine/Construction/ProjectItemElement.cs
+++ b/src/XMakeBuildEngine/Construction/ProjectItemElement.cs
@@ -9,9 +9,7 @@
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 ProjectXmlUtilities = Microsoft.Build.Internal.ProjectXmlUtilities;
diff --git a/src/XMakeBuildEngine/Construction/ProjectItemGroupElement.cs b/src/XMakeBuildEngine/Construction/ProjectItemGroupElement.cs
index 8e3c7080af2..69a54497778 100644
--- a/src/XMakeBuildEngine/Construction/ProjectItemGroupElement.cs
+++ b/src/XMakeBuildEngine/Construction/ProjectItemGroupElement.cs
@@ -7,13 +7,10 @@
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..b7e7e18a88e 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 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..e0122b894f1 100644
--- a/src/XMakeBuildEngine/Construction/ProjectOnErrorElement.cs
+++ b/src/XMakeBuildEngine/Construction/ProjectOnErrorElement.cs
@@ -5,12 +5,8 @@
// 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 ProjectXmlUtilities = Microsoft.Build.Internal.ProjectXmlUtilities;
diff --git a/src/XMakeBuildEngine/Construction/ProjectOtherwiseElement.cs b/src/XMakeBuildEngine/Construction/ProjectOtherwiseElement.cs
index 1b5384ed47b..9fac201315f 100644
--- a/src/XMakeBuildEngine/Construction/ProjectOtherwiseElement.cs
+++ b/src/XMakeBuildEngine/Construction/ProjectOtherwiseElement.cs
@@ -5,11 +5,8 @@
// Definition of ProjectOtherwiseElement class.
//-----------------------------------------------------------------------
-using System;
using System.Collections.Generic;
-using System.Xml;
using System.Diagnostics;
-using Microsoft.Build.Framework;
using Microsoft.Build.Shared;
using Microsoft.Build.Collections;
diff --git a/src/XMakeBuildEngine/Construction/ProjectOutputElement.cs b/src/XMakeBuildEngine/Construction/ProjectOutputElement.cs
index e20773224f0..0ceaba8fbe3 100644
--- a/src/XMakeBuildEngine/Construction/ProjectOutputElement.cs
+++ b/src/XMakeBuildEngine/Construction/ProjectOutputElement.cs
@@ -6,10 +6,8 @@
//-----------------------------------------------------------------------
using System;
-using System.Collections.Generic;
using System.Xml;
using System.Diagnostics;
-using Microsoft.Build.Framework;
using Microsoft.Build.Shared;
using ProjectXmlUtilities = Microsoft.Build.Internal.ProjectXmlUtilities;
diff --git a/src/XMakeBuildEngine/Construction/ProjectPropertyElement.cs b/src/XMakeBuildEngine/Construction/ProjectPropertyElement.cs
index 809628e046e..5922489691c 100644
--- a/src/XMakeBuildEngine/Construction/ProjectPropertyElement.cs
+++ b/src/XMakeBuildEngine/Construction/ProjectPropertyElement.cs
@@ -5,8 +5,6 @@
// Definition of ProjectPropertyElement class.
//-----------------------------------------------------------------------
-using System;
-using System.Collections.Generic;
using System.Xml;
using System.Diagnostics;
using Microsoft.Build.Shared;
diff --git a/src/XMakeBuildEngine/Construction/ProjectPropertyGroupElement.cs b/src/XMakeBuildEngine/Construction/ProjectPropertyGroupElement.cs
index 1ea2f540d24..7ba62178461 100644
--- a/src/XMakeBuildEngine/Construction/ProjectPropertyGroupElement.cs
+++ b/src/XMakeBuildEngine/Construction/ProjectPropertyGroupElement.cs
@@ -7,13 +7,10 @@
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..7b586269a80 100644
--- a/src/XMakeBuildEngine/Construction/ProjectTargetElement.cs
+++ b/src/XMakeBuildEngine/Construction/ProjectTargetElement.cs
@@ -9,7 +9,6 @@
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;
diff --git a/src/XMakeBuildEngine/Construction/ProjectTaskElement.cs b/src/XMakeBuildEngine/Construction/ProjectTaskElement.cs
index bac3b2b857c..b79937a35d5 100644
--- a/src/XMakeBuildEngine/Construction/ProjectTaskElement.cs
+++ b/src/XMakeBuildEngine/Construction/ProjectTaskElement.cs
@@ -10,7 +10,6 @@
using System.Collections.ObjectModel;
using System.Xml;
using System.Diagnostics;
-using Microsoft.Build.Framework;
using Microsoft.Build.Shared;
using Microsoft.Build.Collections;
diff --git a/src/XMakeBuildEngine/Construction/ProjectUsingTaskBodyElement.cs b/src/XMakeBuildEngine/Construction/ProjectUsingTaskBodyElement.cs
index f54a859ba6d..c254277b42b 100644
--- a/src/XMakeBuildEngine/Construction/ProjectUsingTaskBodyElement.cs
+++ b/src/XMakeBuildEngine/Construction/ProjectUsingTaskBodyElement.cs
@@ -5,14 +5,11 @@
// Definition of ProjectUsingTaskBodyElement class.
//-----------------------------------------------------------------------
-using System;
-using System.Collections.Generic;
using System.Xml;
using System.Diagnostics;
using Microsoft.Build.Shared;
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..eb7c453eb1a 100644
--- a/src/XMakeBuildEngine/Construction/ProjectUsingTaskElement.cs
+++ b/src/XMakeBuildEngine/Construction/ProjectUsingTaskElement.cs
@@ -6,13 +6,9 @@
//-----------------------------------------------------------------------
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 ProjectXmlUtilities = Microsoft.Build.Internal.ProjectXmlUtilities;
diff --git a/src/XMakeBuildEngine/Construction/ProjectUsingTaskParameterElement.cs b/src/XMakeBuildEngine/Construction/ProjectUsingTaskParameterElement.cs
index a91f679f22a..2a3d743c045 100644
--- a/src/XMakeBuildEngine/Construction/ProjectUsingTaskParameterElement.cs
+++ b/src/XMakeBuildEngine/Construction/ProjectUsingTaskParameterElement.cs
@@ -6,7 +6,6 @@
//-----------------------------------------------------------------------
using System;
-using System.Collections.Generic;
using System.Xml;
using System.Diagnostics;
using Microsoft.Build.Shared;
diff --git a/src/XMakeBuildEngine/Construction/ProjectWhenElement.cs b/src/XMakeBuildEngine/Construction/ProjectWhenElement.cs
index b8e38f3761f..f9e77b14583 100644
--- a/src/XMakeBuildEngine/Construction/ProjectWhenElement.cs
+++ b/src/XMakeBuildEngine/Construction/ProjectWhenElement.cs
@@ -5,15 +5,12 @@
// Definition of ProjectWhenElement class.
//-----------------------------------------------------------------------
-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/Solution/SolutionProjectGenerator.cs b/src/XMakeBuildEngine/Construction/Solution/SolutionProjectGenerator.cs
index 5d65603558c..2e1d3fe5b10 100644
--- a/src/XMakeBuildEngine/Construction/Solution/SolutionProjectGenerator.cs
+++ b/src/XMakeBuildEngine/Construction/Solution/SolutionProjectGenerator.cs
@@ -15,7 +15,6 @@
using Microsoft.Build.Framework;
using Microsoft.Build.Shared;
-using Microsoft.Build.Collections;
using Project = Microsoft.Build.Evaluation.Project;
using ProjectCollection = Microsoft.Build.Evaluation.ProjectCollection;
diff --git a/src/XMakeBuildEngine/Construction/UsingTaskParameterGroupElement.cs b/src/XMakeBuildEngine/Construction/UsingTaskParameterGroupElement.cs
index 57bdf36c3da..4966e726b35 100644
--- a/src/XMakeBuildEngine/Construction/UsingTaskParameterGroupElement.cs
+++ b/src/XMakeBuildEngine/Construction/UsingTaskParameterGroupElement.cs
@@ -8,7 +8,6 @@
using System;
using System.Diagnostics;
using System.Collections.Generic;
-using Microsoft.Build.Framework;
using Microsoft.Build.Shared;
using Microsoft.Build.Collections;
diff --git a/src/XMakeBuildEngine/Debugger/DebuggerLocalType.cs b/src/XMakeBuildEngine/Debugger/DebuggerLocalType.cs
index 0a609ea66b6..9de8e6e260c 100644
--- a/src/XMakeBuildEngine/Debugger/DebuggerLocalType.cs
+++ b/src/XMakeBuildEngine/Debugger/DebuggerLocalType.cs
@@ -7,7 +7,6 @@
using System;
using Microsoft.Build.Shared;
-using System.Diagnostics;
namespace Microsoft.Build.Debugging
{
diff --git a/src/XMakeBuildEngine/Debugger/DebuggerManager.cs b/src/XMakeBuildEngine/Debugger/DebuggerManager.cs
index 5c908599f46..756ef4a2e1a 100644
--- a/src/XMakeBuildEngine/Debugger/DebuggerManager.cs
+++ b/src/XMakeBuildEngine/Debugger/DebuggerManager.cs
@@ -10,7 +10,6 @@
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Diagnostics.SymbolStore;
-using System.Linq;
using System.Reflection;
using System.Reflection.Emit;
using System.Threading;
diff --git a/src/XMakeBuildEngine/Definition/BuiltInMetadata.cs b/src/XMakeBuildEngine/Definition/BuiltInMetadata.cs
index 7f9936af785..192159a3d77 100644
--- a/src/XMakeBuildEngine/Definition/BuiltInMetadata.cs
+++ b/src/XMakeBuildEngine/Definition/BuiltInMetadata.cs
@@ -7,11 +7,8 @@
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/ProjectCollection.cs b/src/XMakeBuildEngine/Definition/ProjectCollection.cs
index 8cedd54fcd5..1d94fbeac14 100644
--- a/src/XMakeBuildEngine/Definition/ProjectCollection.cs
+++ b/src/XMakeBuildEngine/Definition/ProjectCollection.cs
@@ -10,9 +10,7 @@
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;
@@ -24,14 +22,12 @@
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..a51d95e9f21 100644
--- a/src/XMakeBuildEngine/Definition/ProjectItem.cs
+++ b/src/XMakeBuildEngine/Definition/ProjectItem.cs
@@ -8,11 +8,9 @@
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.Diagnostics.CodeAnalysis;
namespace Microsoft.Build.Evaluation
diff --git a/src/XMakeBuildEngine/Definition/ProjectItemDefinition.cs b/src/XMakeBuildEngine/Definition/ProjectItemDefinition.cs
index 5ba39335f05..2ab34dac86e 100644
--- a/src/XMakeBuildEngine/Definition/ProjectItemDefinition.cs
+++ b/src/XMakeBuildEngine/Definition/ProjectItemDefinition.cs
@@ -9,7 +9,6 @@
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;
diff --git a/src/XMakeBuildEngine/Definition/ProjectMetadata.cs b/src/XMakeBuildEngine/Definition/ProjectMetadata.cs
index 154e5015b01..3fae3454844 100644
--- a/src/XMakeBuildEngine/Definition/ProjectMetadata.cs
+++ b/src/XMakeBuildEngine/Definition/ProjectMetadata.cs
@@ -8,7 +8,6 @@
using System;
using System.Diagnostics;
using Microsoft.Build.Construction;
-using Microsoft.Build.Execution;
using Microsoft.Build.Collections;
using Microsoft.Build.Shared;
diff --git a/src/XMakeBuildEngine/Definition/ProjectProperty.cs b/src/XMakeBuildEngine/Definition/ProjectProperty.cs
index 70bd6f746c1..f6d0ba6e913 100644
--- a/src/XMakeBuildEngine/Definition/ProjectProperty.cs
+++ b/src/XMakeBuildEngine/Definition/ProjectProperty.cs
@@ -9,7 +9,6 @@
using System.Diagnostics;
using Microsoft.Build.Collections;
using Microsoft.Build.Construction;
-using Microsoft.Build.Execution;
using Microsoft.Build.Shared;
using ReservedPropertyNames = Microsoft.Build.Internal.ReservedPropertyNames;
diff --git a/src/XMakeBuildEngine/Definition/SubToolset.cs b/src/XMakeBuildEngine/Definition/SubToolset.cs
index 31bd9339187..de7f1c008e2 100644
--- a/src/XMakeBuildEngine/Definition/SubToolset.cs
+++ b/src/XMakeBuildEngine/Definition/SubToolset.cs
@@ -5,7 +5,6 @@
// An object containing properties of a sub-toolset.
//-----------------------------------------------------------------------
-using System;
using System.Collections.Generic;
using System.Diagnostics;
diff --git a/src/XMakeBuildEngine/Definition/ToolsetConfigurationReader.cs b/src/XMakeBuildEngine/Definition/ToolsetConfigurationReader.cs
index 89975c06078..e1c1498d223 100644
--- a/src/XMakeBuildEngine/Definition/ToolsetConfigurationReader.cs
+++ b/src/XMakeBuildEngine/Definition/ToolsetConfigurationReader.cs
@@ -5,21 +5,14 @@
// 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.Execution;
-using Microsoft.Build.Shared;
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..73b1e1e4888 100644
--- a/src/XMakeBuildEngine/Definition/ToolsetPropertyDefinition.cs
+++ b/src/XMakeBuildEngine/Definition/ToolsetPropertyDefinition.cs
@@ -5,10 +5,7 @@
// A property class used internally by the Toolset readers.
//-----------------------------------------------------------------------
-using System;
-using System.Collections.Generic;
using System.Diagnostics;
-using System.Text;
using ErrorUtilities = Microsoft.Build.Shared.ErrorUtilities;
using Microsoft.Build.Shared;
diff --git a/src/XMakeBuildEngine/Definition/ToolsetReader.cs b/src/XMakeBuildEngine/Definition/ToolsetReader.cs
index b7920eb041e..1cb84744668 100644
--- a/src/XMakeBuildEngine/Definition/ToolsetReader.cs
+++ b/src/XMakeBuildEngine/Definition/ToolsetReader.cs
@@ -6,15 +6,12 @@
//-----------------------------------------------------------------------
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 error = Microsoft.Build.Shared.ErrorUtilities;
using InvalidToolsetDefinitionException = Microsoft.Build.Exceptions.InvalidToolsetDefinitionException;
diff --git a/src/XMakeBuildEngine/Definition/ToolsetRegistryReader.cs b/src/XMakeBuildEngine/Definition/ToolsetRegistryReader.cs
index eeb7e9c27d4..703bbc50a10 100644
--- a/src/XMakeBuildEngine/Definition/ToolsetRegistryReader.cs
+++ b/src/XMakeBuildEngine/Definition/ToolsetRegistryReader.cs
@@ -5,11 +5,7 @@
// 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;
diff --git a/src/XMakeBuildEngine/ElementLocation/ElementLocation.cs b/src/XMakeBuildEngine/ElementLocation/ElementLocation.cs
index 1e1cfb6cd97..45657c34c67 100644
--- a/src/XMakeBuildEngine/ElementLocation/ElementLocation.cs
+++ b/src/XMakeBuildEngine/ElementLocation/ElementLocation.cs
@@ -6,7 +6,6 @@
//-----------------------------------------------------------------------
using Microsoft.Build.Shared;
-using Microsoft.Build.Framework;
using Microsoft.Build.BackEnd;
using Microsoft.Build.Collections;
using System;
diff --git a/src/XMakeBuildEngine/ElementLocation/RegistryLocation.cs b/src/XMakeBuildEngine/ElementLocation/RegistryLocation.cs
index e8a00138a9e..69af56d6ca5 100644
--- a/src/XMakeBuildEngine/ElementLocation/RegistryLocation.cs
+++ b/src/XMakeBuildEngine/ElementLocation/RegistryLocation.cs
@@ -6,7 +6,6 @@
//-----------------------------------------------------------------------
using Microsoft.Build.Shared;
-using Microsoft.Build.Framework;
using Microsoft.Build.BackEnd;
using System;
diff --git a/src/XMakeBuildEngine/ElementLocation/XmlAttributeWithLocation.cs b/src/XMakeBuildEngine/ElementLocation/XmlAttributeWithLocation.cs
index 7e1118bc69e..83c4c457e2f 100644
--- a/src/XMakeBuildEngine/ElementLocation/XmlAttributeWithLocation.cs
+++ b/src/XMakeBuildEngine/ElementLocation/XmlAttributeWithLocation.cs
@@ -5,7 +5,6 @@
// Improvement to XmlAttribute that during load attaches location information to itself.
//-----------------------------------------------------------------------
-using Microsoft.Build.Shared;
using System;
using System.Xml;
using System.Diagnostics;
diff --git a/src/XMakeBuildEngine/ElementLocation/XmlDocumentWithLocation.cs b/src/XMakeBuildEngine/ElementLocation/XmlDocumentWithLocation.cs
index 761b7f02075..70d19b93f1a 100644
--- a/src/XMakeBuildEngine/ElementLocation/XmlDocumentWithLocation.cs
+++ b/src/XMakeBuildEngine/ElementLocation/XmlDocumentWithLocation.cs
@@ -8,7 +8,6 @@
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..3b52113d044 100644
--- a/src/XMakeBuildEngine/ElementLocation/XmlElementWithLocation.cs
+++ b/src/XMakeBuildEngine/ElementLocation/XmlElementWithLocation.cs
@@ -5,7 +5,6 @@
// Improvement to XmlElement that during load attaches location information to itself.
//-----------------------------------------------------------------------
-using Microsoft.Build.Shared;
using System;
using System.Xml;
using System.Diagnostics;
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/InvalidProjectFileException.cs b/src/XMakeBuildEngine/Errors/InvalidProjectFileException.cs
index ca816e8ddc8..4b45fb57ac5 100644
--- a/src/XMakeBuildEngine/Errors/InvalidProjectFileException.cs
+++ b/src/XMakeBuildEngine/Errors/InvalidProjectFileException.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.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..48730fac3d1 100644
--- a/src/XMakeBuildEngine/Errors/InvalidToolsetDefinitionException.cs
+++ b/src/XMakeBuildEngine/Errors/InvalidToolsetDefinitionException.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;
using Microsoft.Build.Shared;
using System.Runtime.Serialization;
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..a9b9988bf01 100644
--- a/src/XMakeBuildEngine/Evaluation/ConditionEvaluator.cs
+++ b/src/XMakeBuildEngine/Evaluation/ConditionEvaluator.cs
@@ -4,10 +4,7 @@
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
{
@@ -15,7 +12,6 @@ namespace Microsoft.Build.Evaluation
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;
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..7cf8bd71b4d 100644
--- a/src/XMakeBuildEngine/Evaluation/Conditionals/FunctionCallExpressionNode.cs
+++ b/src/XMakeBuildEngine/Evaluation/Conditionals/FunctionCallExpressionNode.cs
@@ -3,15 +3,10 @@
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..bce94d57141 100644
--- a/src/XMakeBuildEngine/Evaluation/Conditionals/GenericExpressionNode.cs
+++ b/src/XMakeBuildEngine/Evaluation/Conditionals/GenericExpressionNode.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.Collections;
-using System.Globalization;
-using System.IO;
using System;
using Microsoft.Build.Shared;
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 61c2caa62f9..0f04aa90adb 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 892fa2a5fa7..b21923762b4 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..49527bfb575 100644
--- a/src/XMakeBuildEngine/Evaluation/Conditionals/NumericComparisonExpressionNode.cs
+++ b/src/XMakeBuildEngine/Evaluation/Conditionals/NumericComparisonExpressionNode.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.Collections;
-using System.Globalization;
-using System.IO;
using System;
using Microsoft.Build.Shared;
diff --git a/src/XMakeBuildEngine/Evaluation/Conditionals/NumericExpressionNode.cs b/src/XMakeBuildEngine/Evaluation/Conditionals/NumericExpressionNode.cs
index fc14beb9d19..1580af46417 100644
--- a/src/XMakeBuildEngine/Evaluation/Conditionals/NumericExpressionNode.cs
+++ b/src/XMakeBuildEngine/Evaluation/Conditionals/NumericExpressionNode.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.Collections;
-using System.Globalization;
-using System.IO;
using System;
using Microsoft.Build.Shared;
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..df017a31724 100644
--- a/src/XMakeBuildEngine/Evaluation/Conditionals/OperatorExpressionNode.cs
+++ b/src/XMakeBuildEngine/Evaluation/Conditionals/OperatorExpressionNode.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.Collections;
-using System.Globalization;
-using System.IO;
using System;
using Microsoft.Build.Shared;
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..627d0b38326 100644
--- a/src/XMakeBuildEngine/Evaluation/Conditionals/Parser.cs
+++ b/src/XMakeBuildEngine/Evaluation/Conditionals/Parser.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.Globalization;
using System.Collections;
-using System.Xml;
using System;
using Microsoft.Build.Shared;
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/StringExpressionNode.cs b/src/XMakeBuildEngine/Evaluation/Conditionals/StringExpressionNode.cs
index 7d9f832d041..5f0f409f544 100644
--- a/src/XMakeBuildEngine/Evaluation/Conditionals/StringExpressionNode.cs
+++ b/src/XMakeBuildEngine/Evaluation/Conditionals/StringExpressionNode.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.Collections;
-using System.Globalization;
-using System.IO;
using System;
using Microsoft.Build.Shared;
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..1cb34b66a86 100644
--- a/src/XMakeBuildEngine/Evaluation/EvaluatorMetadataTable.cs
+++ b/src/XMakeBuildEngine/Evaluation/EvaluatorMetadataTable.cs
@@ -7,7 +7,6 @@
using System;
using System.Collections.Generic;
-using System.Text;
using Microsoft.Build.Construction;
using Microsoft.Build.Collections;
diff --git a/src/XMakeBuildEngine/Evaluation/Expander.cs b/src/XMakeBuildEngine/Evaluation/Expander.cs
index abf3d16a3f4..a25eea572c9 100644
--- a/src/XMakeBuildEngine/Evaluation/Expander.cs
+++ b/src/XMakeBuildEngine/Evaluation/Expander.cs
@@ -11,7 +11,6 @@
using System.Globalization;
using System.IO;
using System.Reflection;
-using System.Text;
using System.Text.RegularExpressions;
using System.Linq;
using Microsoft.Build.Execution;
diff --git a/src/XMakeBuildEngine/Evaluation/ExpressionShredder.cs b/src/XMakeBuildEngine/Evaluation/ExpressionShredder.cs
index 14bae367684..3a3e577d664 100644
--- a/src/XMakeBuildEngine/Evaluation/ExpressionShredder.cs
+++ b/src/XMakeBuildEngine/Evaluation/ExpressionShredder.cs
@@ -6,11 +6,7 @@
//-----------------------------------------------------------------------
using System;
-using System.Collections;
-using System.Security.Permissions;
-using System.Diagnostics;
-using Microsoft.Build.Framework;
using Microsoft.Build.Shared;
using System.Collections.Generic;
using Microsoft.Build.Collections;
diff --git a/src/XMakeBuildEngine/Evaluation/IEvaluatorData.cs b/src/XMakeBuildEngine/Evaluation/IEvaluatorData.cs
index 8bafc5848aa..364bac11fd0 100644
--- a/src/XMakeBuildEngine/Evaluation/IEvaluatorData.cs
+++ b/src/XMakeBuildEngine/Evaluation/IEvaluatorData.cs
@@ -7,9 +7,7 @@
using System;
using System.Collections.Generic;
-using System.Text;
using Microsoft.Build.Construction;
-using Microsoft.Build.Evaluation;
using Microsoft.Build.Execution;
using Microsoft.Build.Collections;
using Microsoft.Build.BackEnd;
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..8e436c75d69 100644
--- a/src/XMakeBuildEngine/Evaluation/IItemFactory.cs
+++ b/src/XMakeBuildEngine/Evaluation/IItemFactory.cs
@@ -5,9 +5,7 @@
// 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;
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..a0a4096b0d8 100644
--- a/src/XMakeBuildEngine/Evaluation/IntrinsicFunctions.cs
+++ b/src/XMakeBuildEngine/Evaluation/IntrinsicFunctions.cs
@@ -7,15 +7,10 @@
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;
// Needed for DoesTaskHostExistForParameters
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/Preprocessor.cs b/src/XMakeBuildEngine/Evaluation/Preprocessor.cs
index 998698306cc..a33814aa1d5 100644
--- a/src/XMakeBuildEngine/Evaluation/Preprocessor.cs
+++ b/src/XMakeBuildEngine/Evaluation/Preprocessor.cs
@@ -6,15 +6,9 @@
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..f37fa436182 100644
--- a/src/XMakeBuildEngine/Evaluation/ProjectChangedEventArgs.cs
+++ b/src/XMakeBuildEngine/Evaluation/ProjectChangedEventArgs.cs
@@ -6,9 +6,6 @@
//-----------------------------------------------------------------------
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using Microsoft.Build.Shared;
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..653372d9477 100644
--- a/src/XMakeBuildEngine/Evaluation/ProjectRootElementCache.cs
+++ b/src/XMakeBuildEngine/Evaluation/ProjectRootElementCache.cs
@@ -8,8 +8,6 @@
using System;
using System.Collections.Generic;
using System.IO;
-using System.Linq;
-using System.Text;
using System.Xml;
using Microsoft.Build.Construction;
@@ -18,7 +16,6 @@
using Microsoft.Build.Shared;
using System.Diagnostics;
using System.Globalization;
-using Microsoft.Build.BackEnd;
using OutOfProcNode = Microsoft.Build.Execution.OutOfProcNode;
diff --git a/src/XMakeBuildEngine/Evaluation/ProjectStringCache.cs b/src/XMakeBuildEngine/Evaluation/ProjectStringCache.cs
index 716dfbb16f8..3014815f632 100644
--- a/src/XMakeBuildEngine/Evaluation/ProjectStringCache.cs
+++ b/src/XMakeBuildEngine/Evaluation/ProjectStringCache.cs
@@ -15,7 +15,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
-using System.Linq;
using System.Xml;
using Microsoft.Build.Evaluation;
using Microsoft.Build.Shared;
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..e069de76ae3 100644
--- a/src/XMakeBuildEngine/Evaluation/ToolsetProvider.cs
+++ b/src/XMakeBuildEngine/Evaluation/ToolsetProvider.cs
@@ -7,15 +7,12 @@
using System;
using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using Microsoft.Build.Collections;
using Microsoft.Build.Execution;
using Microsoft.Build.Shared;
using Microsoft.Build.BackEnd;
-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..86390816616 100644
--- a/src/XMakeBuildEngine/Instance/HostServices.cs
+++ b/src/XMakeBuildEngine/Instance/HostServices.cs
@@ -9,7 +9,6 @@
using Microsoft.Build.Framework;
using System.Collections.Generic;
using System;
-using System.Collections;
using System.Diagnostics;
namespace Microsoft.Build.Execution
diff --git a/src/XMakeBuildEngine/Instance/ProjectInstance.cs b/src/XMakeBuildEngine/Instance/ProjectInstance.cs
index 15f4c3c2d40..388aae347a1 100644
--- a/src/XMakeBuildEngine/Instance/ProjectInstance.cs
+++ b/src/XMakeBuildEngine/Instance/ProjectInstance.cs
@@ -12,7 +12,6 @@
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;
@@ -21,10 +20,8 @@
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;
diff --git a/src/XMakeBuildEngine/Instance/ProjectItemDefinitionInstance.cs b/src/XMakeBuildEngine/Instance/ProjectItemDefinitionInstance.cs
index b1e3554e522..296f6fb6e02 100644
--- a/src/XMakeBuildEngine/Instance/ProjectItemDefinitionInstance.cs
+++ b/src/XMakeBuildEngine/Instance/ProjectItemDefinitionInstance.cs
@@ -10,7 +10,6 @@
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;
diff --git a/src/XMakeBuildEngine/Instance/ProjectItemGroupTaskInstance.cs b/src/XMakeBuildEngine/Instance/ProjectItemGroupTaskInstance.cs
index fdc4731a5fc..289b5fd27fd 100644
--- a/src/XMakeBuildEngine/Instance/ProjectItemGroupTaskInstance.cs
+++ b/src/XMakeBuildEngine/Instance/ProjectItemGroupTaskInstance.cs
@@ -5,12 +5,10 @@
// 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;
diff --git a/src/XMakeBuildEngine/Instance/ProjectItemGroupTaskItemInstance.cs b/src/XMakeBuildEngine/Instance/ProjectItemGroupTaskItemInstance.cs
index b772e1f46f5..d1e4a9ee07a 100644
--- a/src/XMakeBuildEngine/Instance/ProjectItemGroupTaskItemInstance.cs
+++ b/src/XMakeBuildEngine/Instance/ProjectItemGroupTaskItemInstance.cs
@@ -5,12 +5,10 @@
// 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;
diff --git a/src/XMakeBuildEngine/Instance/ProjectItemGroupTaskMetadataInstance.cs b/src/XMakeBuildEngine/Instance/ProjectItemGroupTaskMetadataInstance.cs
index eef9cd90511..0336713462c 100644
--- a/src/XMakeBuildEngine/Instance/ProjectItemGroupTaskMetadataInstance.cs
+++ b/src/XMakeBuildEngine/Instance/ProjectItemGroupTaskMetadataInstance.cs
@@ -5,12 +5,8 @@
// 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;
diff --git a/src/XMakeBuildEngine/Instance/ProjectMetadataInstance.cs b/src/XMakeBuildEngine/Instance/ProjectMetadataInstance.cs
index bb1c06567b6..c3b90aba117 100644
--- a/src/XMakeBuildEngine/Instance/ProjectMetadataInstance.cs
+++ b/src/XMakeBuildEngine/Instance/ProjectMetadataInstance.cs
@@ -10,8 +10,6 @@
using Microsoft.Build.Collections;
using Microsoft.Build.Shared;
using Microsoft.Build.Evaluation;
-using Microsoft.Build.Framework;
-using Microsoft.Build.Construction;
using Microsoft.Build.BackEnd;
namespace Microsoft.Build.Execution
diff --git a/src/XMakeBuildEngine/Instance/ProjectPropertyGroupTaskInstance.cs b/src/XMakeBuildEngine/Instance/ProjectPropertyGroupTaskInstance.cs
index 12858ba6b80..5cdb36f3162 100644
--- a/src/XMakeBuildEngine/Instance/ProjectPropertyGroupTaskInstance.cs
+++ b/src/XMakeBuildEngine/Instance/ProjectPropertyGroupTaskInstance.cs
@@ -5,12 +5,10 @@
// 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;
diff --git a/src/XMakeBuildEngine/Instance/ProjectPropertyGroupTaskPropertyInstance.cs b/src/XMakeBuildEngine/Instance/ProjectPropertyGroupTaskPropertyInstance.cs
index d570ac4b2ff..e3a0bb0acb1 100644
--- a/src/XMakeBuildEngine/Instance/ProjectPropertyGroupTaskPropertyInstance.cs
+++ b/src/XMakeBuildEngine/Instance/ProjectPropertyGroupTaskPropertyInstance.cs
@@ -5,12 +5,8 @@
// 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;
diff --git a/src/XMakeBuildEngine/Instance/ProjectPropertyInstance.cs b/src/XMakeBuildEngine/Instance/ProjectPropertyInstance.cs
index bcf844dac28..b3a5409a21b 100644
--- a/src/XMakeBuildEngine/Instance/ProjectPropertyInstance.cs
+++ b/src/XMakeBuildEngine/Instance/ProjectPropertyInstance.cs
@@ -11,7 +11,6 @@
using Microsoft.Build.Construction;
using Microsoft.Build.Shared;
using Microsoft.Build.Evaluation;
-using Microsoft.Build.Framework;
using Microsoft.Build.BackEnd;
using ReservedPropertyNames = Microsoft.Build.Internal.ReservedPropertyNames;
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/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..4ea3c270c48 100644
--- a/src/XMakeBuildEngine/Instance/ProjectTaskOutputItemInstance.cs
+++ b/src/XMakeBuildEngine/Instance/ProjectTaskOutputItemInstance.cs
@@ -5,8 +5,6 @@
// 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;
diff --git a/src/XMakeBuildEngine/Instance/ReflectableTaskPropertyInfo.cs b/src/XMakeBuildEngine/Instance/ReflectableTaskPropertyInfo.cs
index eb165b94720..c938d22c6b5 100644
--- a/src/XMakeBuildEngine/Instance/ReflectableTaskPropertyInfo.cs
+++ b/src/XMakeBuildEngine/Instance/ReflectableTaskPropertyInfo.cs
@@ -6,10 +6,7 @@
//-----------------------------------------------------------------------
using System;
-using System.Collections.Generic;
-using System.Linq;
using System.Reflection;
-using System.Text;
using Microsoft.Build.Framework;
using Microsoft.Build.Shared;
diff --git a/src/XMakeBuildEngine/Instance/TaskFactories/AssemblyTaskFactory.cs b/src/XMakeBuildEngine/Instance/TaskFactories/AssemblyTaskFactory.cs
index b612400343f..aac1ae557ab 100644
--- a/src/XMakeBuildEngine/Instance/TaskFactories/AssemblyTaskFactory.cs
+++ b/src/XMakeBuildEngine/Instance/TaskFactories/AssemblyTaskFactory.cs
@@ -9,14 +9,10 @@
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;
diff --git a/src/XMakeBuildEngine/Instance/TaskFactories/TaskHostTask.cs b/src/XMakeBuildEngine/Instance/TaskFactories/TaskHostTask.cs
index b3d72706d0c..d3edb6a0962 100644
--- a/src/XMakeBuildEngine/Instance/TaskFactories/TaskHostTask.cs
+++ b/src/XMakeBuildEngine/Instance/TaskFactories/TaskHostTask.cs
@@ -9,13 +9,10 @@
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;
diff --git a/src/XMakeBuildEngine/Instance/TaskRegistry.cs b/src/XMakeBuildEngine/Instance/TaskRegistry.cs
index 5ad7c40d4a2..f1a96387c7b 100644
--- a/src/XMakeBuildEngine/Instance/TaskRegistry.cs
+++ b/src/XMakeBuildEngine/Instance/TaskRegistry.cs
@@ -10,7 +10,6 @@
using System.Collections.Generic;
using System.IO;
using System.Reflection;
-using System.Xml;
using Microsoft.Build.Collections;
using Microsoft.Build.Framework;
using Microsoft.Build.Shared;
diff --git a/src/XMakeBuildEngine/Logging/ConsoleLogger.cs b/src/XMakeBuildEngine/Logging/ConsoleLogger.cs
index adcce71b9e7..af0eefda112 100644
--- a/src/XMakeBuildEngine/Logging/ConsoleLogger.cs
+++ b/src/XMakeBuildEngine/Logging/ConsoleLogger.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.Text;
-using System.Collections;
-using System.Diagnostics;
-using System.Globalization;
using System.IO;
using Microsoft.Build.Framework;
diff --git a/src/XMakeBuildEngine/Logging/DistributedLoggers/ConfigurableForwardingLogger.cs b/src/XMakeBuildEngine/Logging/DistributedLoggers/ConfigurableForwardingLogger.cs
index 5af00d93ac1..4757e7cf30b 100644
--- a/src/XMakeBuildEngine/Logging/DistributedLoggers/ConfigurableForwardingLogger.cs
+++ b/src/XMakeBuildEngine/Logging/DistributedLoggers/ConfigurableForwardingLogger.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;
-using System.Text;
using System.Collections.Generic;
using Microsoft.Build.Framework;
diff --git a/src/XMakeBuildEngine/Logging/DistributedLoggers/DistributedFileLogger.cs b/src/XMakeBuildEngine/Logging/DistributedLoggers/DistributedFileLogger.cs
index 760cad44967..80d1c3b72d9 100644
--- a/src/XMakeBuildEngine/Logging/DistributedLoggers/DistributedFileLogger.cs
+++ b/src/XMakeBuildEngine/Logging/DistributedLoggers/DistributedFileLogger.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;
-using System.Text;
using System.IO;
using Microsoft.Build.Framework;
diff --git a/src/XMakeBuildEngine/Logging/FileLogger.cs b/src/XMakeBuildEngine/Logging/FileLogger.cs
index 8645f260931..fd170864f84 100644
--- a/src/XMakeBuildEngine/Logging/FileLogger.cs
+++ b/src/XMakeBuildEngine/Logging/FileLogger.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.Collections.Generic;
using System.Text;
using System.IO;
-using System.Globalization;
using Microsoft.Build.Framework;
using Microsoft.Build.Shared;
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..acb98bc1b3d 100644
--- a/src/XMakeBuildEngine/Logging/LoggerDescription.cs
+++ b/src/XMakeBuildEngine/Logging/LoggerDescription.cs
@@ -3,7 +3,6 @@
using System;
using System.Reflection;
-using System.Text;
using System.IO;
using Microsoft.Build.Framework;
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..ab4592e55b5 100644
--- a/src/XMakeBuildEngine/Logging/ParallelLogger/ParallelConsoleLogger.cs
+++ b/src/XMakeBuildEngine/Logging/ParallelLogger/ParallelConsoleLogger.cs
@@ -4,9 +4,7 @@
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;
diff --git a/src/XMakeBuildEngine/Logging/ParallelLogger/ParallelLoggerHelpers.cs b/src/XMakeBuildEngine/Logging/ParallelLogger/ParallelLoggerHelpers.cs
index 7b5714531ee..22786a6d80a 100644
--- a/src/XMakeBuildEngine/Logging/ParallelLogger/ParallelLoggerHelpers.cs
+++ b/src/XMakeBuildEngine/Logging/ParallelLogger/ParallelLoggerHelpers.cs
@@ -3,13 +3,8 @@
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.Globalization;
namespace Microsoft.Build.BackEnd.Logging
diff --git a/src/XMakeBuildEngine/Logging/SerialConsoleLogger.cs b/src/XMakeBuildEngine/Logging/SerialConsoleLogger.cs
index 31d39813cc4..9fe5119fdcb 100644
--- a/src/XMakeBuildEngine/Logging/SerialConsoleLogger.cs
+++ b/src/XMakeBuildEngine/Logging/SerialConsoleLogger.cs
@@ -2,12 +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.Collections;
-using System.IO;
-using System.Globalization;
-using System.Diagnostics;
using Microsoft.Build.Framework;
using Microsoft.Build.Shared;
diff --git a/src/XMakeBuildEngine/Resources/Constants.cs b/src/XMakeBuildEngine/Resources/Constants.cs
index 804f69b3068..b52886c1db3 100644
--- a/src/XMakeBuildEngine/Resources/Constants.cs
+++ b/src/XMakeBuildEngine/Resources/Constants.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.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;
diff --git a/src/XMakeBuildEngine/Utilities/EngineFileUtilities.cs b/src/XMakeBuildEngine/Utilities/EngineFileUtilities.cs
index 790f5852dac..586704cce26 100644
--- a/src/XMakeBuildEngine/Utilities/EngineFileUtilities.cs
+++ b/src/XMakeBuildEngine/Utilities/EngineFileUtilities.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.IO;
using Microsoft.Build.Shared;
namespace Microsoft.Build.Internal
diff --git a/src/XMakeBuildEngine/Utilities/RegistryKeyWrapper.cs b/src/XMakeBuildEngine/Utilities/RegistryKeyWrapper.cs
index a062fd683c8..1e1cc208996 100644
--- a/src/XMakeBuildEngine/Utilities/RegistryKeyWrapper.cs
+++ b/src/XMakeBuildEngine/Utilities/RegistryKeyWrapper.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.Generic;
-using System.Globalization;
-using System.IO;
-using System.Security;
using Microsoft.Build.Shared;
using Microsoft.Win32;
diff --git a/src/XMakeBuildEngine/Utilities/Utilities.cs b/src/XMakeBuildEngine/Utilities/Utilities.cs
index d17d05266fe..c6272a838a9 100644
--- a/src/XMakeBuildEngine/Utilities/Utilities.cs
+++ b/src/XMakeBuildEngine/Utilities/Utilities.cs
@@ -3,25 +3,14 @@
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 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..d6200d2086e 100644
--- a/src/XMakeBuildEngine/Xml/ProjectXmlUtilities.cs
+++ b/src/XMakeBuildEngine/Xml/ProjectXmlUtilities.cs
@@ -3,7 +3,6 @@
using System;
using System.Collections.Generic;
-using System.Text;
using System.Xml;
using Microsoft.Build.Shared;
using Microsoft.Build.Construction;
diff --git a/src/XMakeCommandLine/CommandLineSwitchException.cs b/src/XMakeCommandLine/CommandLineSwitchException.cs
index 7c602cbff41..43be568bf3c 100644
--- a/src/XMakeCommandLine/CommandLineSwitchException.cs
+++ b/src/XMakeCommandLine/CommandLineSwitchException.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;
using System.Runtime.Serialization;
using System.Security.Permissions;
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/FxCopExclusions/MsBuild.Suppressions.cs b/src/XMakeCommandLine/FxCopExclusions/MsBuild.Suppressions.cs
index c633486272d..c49cf06b7cd 100644
--- a/src/XMakeCommandLine/FxCopExclusions/MsBuild.Suppressions.cs
+++ b/src/XMakeCommandLine/FxCopExclusions/MsBuild.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","CA1703:ResourceStringsShouldBeSpelledCorrectly", MessageId="wrn", Scope="resource", Target="MSBuild.Strings.resources", Justification="These are correct for the help text, they are file paths extensions and switches")]
diff --git a/src/XMakeCommandLine/InitializationException.cs b/src/XMakeCommandLine/InitializationException.cs
index 0c723268bda..d9cfeaceb6c 100644
--- a/src/XMakeCommandLine/InitializationException.cs
+++ b/src/XMakeCommandLine/InitializationException.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.Reflection;
-using System.Globalization;
using System.Runtime.Serialization;
using System.Security.Permissions;
diff --git a/src/XMakeCommandLine/LogMessagePacket.cs b/src/XMakeCommandLine/LogMessagePacket.cs
index f13f7c4858e..f9e6f248dad 100644
--- a/src/XMakeCommandLine/LogMessagePacket.cs
+++ b/src/XMakeCommandLine/LogMessagePacket.cs
@@ -5,16 +5,11 @@
// 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.BackEnd;
using Microsoft.Build.Framework;
using Microsoft.Build.Shared;
-using TaskEngineAssemblyResolver = Microsoft.Build.BackEnd.Logging.TaskEngineAssemblyResolver;
namespace Microsoft.Build.CommandLine
{
diff --git a/src/XMakeCommandLine/NodeEndpointOutOfProcTaskHost.cs b/src/XMakeCommandLine/NodeEndpointOutOfProcTaskHost.cs
index b606095a424..65a1e70f334 100644
--- a/src/XMakeCommandLine/NodeEndpointOutOfProcTaskHost.cs
+++ b/src/XMakeCommandLine/NodeEndpointOutOfProcTaskHost.cs
@@ -5,8 +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..49f6826d350 100644
--- a/src/XMakeCommandLine/OutOfProcTaskAppDomainWrapperBase.cs
+++ b/src/XMakeCommandLine/OutOfProcTaskAppDomainWrapperBase.cs
@@ -8,22 +8,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 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 9222f44f896..6488dccf703 100644
--- a/src/XMakeCommandLine/OutOfProcTaskHostNode.cs
+++ b/src/XMakeCommandLine/OutOfProcTaskHostNode.cs
@@ -9,14 +9,9 @@
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 Microsoft.Build.BackEnd;
using Microsoft.Build.Execution;
diff --git a/src/XMakeCommandLine/ProjectSchemaValidationHandler.cs b/src/XMakeCommandLine/ProjectSchemaValidationHandler.cs
index 63220ffcf3e..0fdf12e9a04 100644
--- a/src/XMakeCommandLine/ProjectSchemaValidationHandler.cs
+++ b/src/XMakeCommandLine/ProjectSchemaValidationHandler.cs
@@ -6,7 +6,6 @@
using System.Xml;
using System.Xml.Schema;
-using Microsoft.Build.Framework;
using Microsoft.Build.Shared;
namespace Microsoft.Build.CommandLine
diff --git a/src/XMakeCommandLine/XMake.cs b/src/XMakeCommandLine/XMake.cs
index 13a0e54b9ca..7e4c6d24daf 100644
--- a/src/XMakeCommandLine/XMake.cs
+++ b/src/XMakeCommandLine/XMake.cs
@@ -9,16 +9,13 @@
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;
@@ -33,7 +30,6 @@
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
{
diff --git a/src/XMakeTasks/Al.cs b/src/XMakeTasks/Al.cs
index ca4e638927d..1bb90ff4848 100644
--- a/src/XMakeTasks/Al.cs
+++ b/src/XMakeTasks/Al.cs
@@ -3,15 +3,9 @@
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.Collections;
namespace Microsoft.Build.Tasks
{
diff --git a/src/XMakeTasks/AppConfig/AppConfig.cs b/src/XMakeTasks/AppConfig/AppConfig.cs
index d28a1632ffa..8373784944c 100644
--- a/src/XMakeTasks/AppConfig/AppConfig.cs
+++ b/src/XMakeTasks/AppConfig/AppConfig.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.IO;
using System.Xml;
-using System.Collections;
-using System.Globalization;
using Microsoft.Build.Shared;
diff --git a/src/XMakeTasks/AppConfig/BindingRedirect.cs b/src/XMakeTasks/AppConfig/BindingRedirect.cs
index 8c9e83aa1ed..0f472c30a34 100644
--- a/src/XMakeTasks/AppConfig/BindingRedirect.cs
+++ b/src/XMakeTasks/AppConfig/BindingRedirect.cs
@@ -3,7 +3,6 @@
using System;
using System.Xml;
-using System.Collections;
using Microsoft.Build.Shared;
namespace Microsoft.Build.Tasks
diff --git a/src/XMakeTasks/AppConfig/RuntimeSection.cs b/src/XMakeTasks/AppConfig/RuntimeSection.cs
index 8afa82bcc96..df1f08bd905 100644
--- a/src/XMakeTasks/AppConfig/RuntimeSection.cs
+++ b/src/XMakeTasks/AppConfig/RuntimeSection.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.Xml;
using System.Collections;
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 80896b21f87..0f2e4602714 100644
--- a/src/XMakeTasks/AssemblyDependency/AssemblyFoldersExResolver.cs
+++ b/src/XMakeTasks/AssemblyDependency/AssemblyFoldersExResolver.cs
@@ -5,14 +5,12 @@
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 aa8f30a4673..bd35b409dc0 100644
--- a/src/XMakeTasks/AssemblyDependency/AssemblyFoldersResolver.cs
+++ b/src/XMakeTasks/AssemblyDependency/AssemblyFoldersResolver.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;
using System.Collections;
using Microsoft.Build.Shared;
diff --git a/src/XMakeTasks/AssemblyDependency/AssemblyInformation.cs b/src/XMakeTasks/AssemblyDependency/AssemblyInformation.cs
index 3e0480324cf..db45d34a977 100644
--- a/src/XMakeTasks/AssemblyDependency/AssemblyInformation.cs
+++ b/src/XMakeTasks/AssemblyDependency/AssemblyInformation.cs
@@ -2,14 +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.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.Versioning;
diff --git a/src/XMakeTasks/AssemblyDependency/AssemblyResolution.cs b/src/XMakeTasks/AssemblyDependency/AssemblyResolution.cs
index 414f93c94b1..d06c3a7a8c0 100644
--- a/src/XMakeTasks/AssemblyDependency/AssemblyResolution.cs
+++ b/src/XMakeTasks/AssemblyDependency/AssemblyResolution.cs
@@ -2,18 +2,10 @@
// 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.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/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 c15a5cf4d12..fb461f0fa24 100644
--- a/src/XMakeTasks/AssemblyDependency/DirectoryResolver.cs
+++ b/src/XMakeTasks/AssemblyDependency/DirectoryResolver.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;
using System.Collections;
using Microsoft.Build.Shared;
diff --git a/src/XMakeTasks/AssemblyDependency/FrameworkPathResolver.cs b/src/XMakeTasks/AssemblyDependency/FrameworkPathResolver.cs
index 22fd35d4727..7a369962c34 100644
--- a/src/XMakeTasks/AssemblyDependency/FrameworkPathResolver.cs
+++ b/src/XMakeTasks/AssemblyDependency/FrameworkPathResolver.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;
using System.Collections;
using Microsoft.Build.Shared;
diff --git a/src/XMakeTasks/AssemblyDependency/GacResolver.cs b/src/XMakeTasks/AssemblyDependency/GacResolver.cs
index 5d2a1bae846..a591c9e6f98 100644
--- a/src/XMakeTasks/AssemblyDependency/GacResolver.cs
+++ b/src/XMakeTasks/AssemblyDependency/GacResolver.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.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..d815677882b 100644
--- a/src/XMakeTasks/AssemblyDependency/GenerateBindingRedirects.cs
+++ b/src/XMakeTasks/AssemblyDependency/GenerateBindingRedirects.cs
@@ -8,14 +8,10 @@
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;
namespace Microsoft.Build.Tasks
diff --git a/src/XMakeTasks/AssemblyDependency/HintPathResolver.cs b/src/XMakeTasks/AssemblyDependency/HintPathResolver.cs
index d5ee4fef2be..35816b46531 100644
--- a/src/XMakeTasks/AssemblyDependency/HintPathResolver.cs
+++ b/src/XMakeTasks/AssemblyDependency/HintPathResolver.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.Reflection;
using System.Collections;
using Microsoft.Build.Shared;
diff --git a/src/XMakeTasks/AssemblyDependency/InstalledAssemblies.cs b/src/XMakeTasks/AssemblyDependency/InstalledAssemblies.cs
index 9abd81a7fe2..57e2683f178 100644
--- a/src/XMakeTasks/AssemblyDependency/InstalledAssemblies.cs
+++ b/src/XMakeTasks/AssemblyDependency/InstalledAssemblies.cs
@@ -2,16 +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 Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
using Microsoft.Build.Shared;
-using System.Collections.Generic;
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 58e7c2bb42d..d986604bd35 100644
--- a/src/XMakeTasks/AssemblyDependency/RawFilenameResolver.cs
+++ b/src/XMakeTasks/AssemblyDependency/RawFilenameResolver.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.Reflection;
using System.Collections;
using Microsoft.Build.Shared;
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/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 6cb57171cf6..347aee2d4d2 100644
--- a/src/XMakeTasks/AssemblyFolder.cs
+++ b/src/XMakeTasks/AssemblyFolder.cs
@@ -3,11 +3,7 @@
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;
diff --git a/src/XMakeTasks/AssemblyRegistrationCache.cs b/src/XMakeTasks/AssemblyRegistrationCache.cs
index e6cc66d26f1..ea37808416c 100644
--- a/src/XMakeTasks/AssemblyRegistrationCache.cs
+++ b/src/XMakeTasks/AssemblyRegistrationCache.cs
@@ -3,11 +3,6 @@
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/AssignCulture.cs b/src/XMakeTasks/AssignCulture.cs
index a67bf0f965c..3705c75ba58 100644
--- a/src/XMakeTasks/AssignCulture.cs
+++ b/src/XMakeTasks/AssignCulture.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.Diagnostics;
-using System.Resources;
-using System.Reflection;
-using System.Globalization;
using System.Collections;
using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;
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..3d613352fed 100644
--- a/src/XMakeTasks/AssignProjectConfiguration.cs
+++ b/src/XMakeTasks/AssignProjectConfiguration.cs
@@ -4,14 +4,11 @@
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
{
diff --git a/src/XMakeTasks/AssignTargetPath.cs b/src/XMakeTasks/AssignTargetPath.cs
index c38fc956229..bf1fec67304 100644
--- a/src/XMakeTasks/AssignTargetPath.cs
+++ b/src/XMakeTasks/AssignTargetPath.cs
@@ -3,11 +3,7 @@
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;
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/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..3c2de23d185 100644
--- a/src/XMakeTasks/BootstrapperUtil/BuildMessage.cs
+++ b/src/XMakeTasks/BootstrapperUtil/BuildMessage.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.Collections;
using System.Globalization;
-using System.Runtime.InteropServices;
using System.Text.RegularExpressions;
using Microsoft.Build.Shared;
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..3a98f5932c6 100644
--- a/src/XMakeTasks/BootstrapperUtil/Package.cs
+++ b/src/XMakeTasks/BootstrapperUtil/Package.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.Xml;
using System.Runtime.InteropServices;
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/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..d4eb12b86a9 100644
--- a/src/XMakeTasks/BootstrapperUtil/Util.cs
+++ b/src/XMakeTasks/BootstrapperUtil/Util.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.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..1537f942279 100644
--- a/src/XMakeTasks/CSharpParserUtilities.cs
+++ b/src/XMakeTasks/CSharpParserUtilities.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.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..2255ec87e17 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;
namespace Microsoft.Build.Tasks
{
diff --git a/src/XMakeTasks/ComDependencyWalker.cs b/src/XMakeTasks/ComDependencyWalker.cs
index 7502814680a..2e80407e01f 100644
--- a/src/XMakeTasks/ComDependencyWalker.cs
+++ b/src/XMakeTasks/ComDependencyWalker.cs
@@ -2,14 +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 COMException = System.Runtime.InteropServices.COMException;
diff --git a/src/XMakeTasks/ComReferenceInfo.cs b/src/XMakeTasks/ComReferenceInfo.cs
index 76ae4f20e4e..c2e05427f0c 100644
--- a/src/XMakeTasks/ComReferenceInfo.cs
+++ b/src/XMakeTasks/ComReferenceInfo.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.Generic;
using System.IO;
using System.Runtime.InteropServices;
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..df87433e3a0 100644
--- a/src/XMakeTasks/ComReferenceWrapperInfo.cs
+++ b/src/XMakeTasks/ComReferenceWrapperInfo.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.Reflection;
using Microsoft.Build.Shared;
diff --git a/src/XMakeTasks/CombinePath.cs b/src/XMakeTasks/CombinePath.cs
index 646aba43200..22c9ce17da0 100644
--- a/src/XMakeTasks/CombinePath.cs
+++ b/src/XMakeTasks/CombinePath.cs
@@ -3,9 +3,7 @@
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;
diff --git a/src/XMakeTasks/ConvertToAbsolutePath.cs b/src/XMakeTasks/ConvertToAbsolutePath.cs
index d48d1ff1330..bb1405fc649 100644
--- a/src/XMakeTasks/ConvertToAbsolutePath.cs
+++ b/src/XMakeTasks/ConvertToAbsolutePath.cs
@@ -3,11 +3,8 @@
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;
namespace Microsoft.Build.Tasks
diff --git a/src/XMakeTasks/Copy.cs b/src/XMakeTasks/Copy.cs
index 96355c40a91..b0fc910f82f 100644
--- a/src/XMakeTasks/Copy.cs
+++ b/src/XMakeTasks/Copy.cs
@@ -3,11 +3,7 @@
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.Runtime.InteropServices;
diff --git a/src/XMakeTasks/CreateCSharpManifestResourceName.cs b/src/XMakeTasks/CreateCSharpManifestResourceName.cs
index 1c52e5e25b5..23cee4bda54 100644
--- a/src/XMakeTasks/CreateCSharpManifestResourceName.cs
+++ b/src/XMakeTasks/CreateCSharpManifestResourceName.cs
@@ -4,13 +4,8 @@
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..2100e4b4fc1 100644
--- a/src/XMakeTasks/CreateItem.cs
+++ b/src/XMakeTasks/CreateItem.cs
@@ -2,15 +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.Diagnostics;
using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;
using Microsoft.Build.Shared;
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..0a6d8d1f2ff 100644
--- a/src/XMakeTasks/CreateManifestResourceName.cs
+++ b/src/XMakeTasks/CreateManifestResourceName.cs
@@ -4,9 +4,6 @@
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;
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..80b3734bd6e 100644
--- a/src/XMakeTasks/CreateVisualBasicManifestResourceName.cs
+++ b/src/XMakeTasks/CreateVisualBasicManifestResourceName.cs
@@ -4,13 +4,8 @@
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..23122e8f067 100644
--- a/src/XMakeTasks/Csc.cs
+++ b/src/XMakeTasks/Csc.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.Collections.Specialized;
using System.Diagnostics;
using System.Globalization;
-using System.IO;
-using System.Reflection;
-using System.Resources;
using System.Text;
using Microsoft.Build.Framework;
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..1946e88d9a2 100644
--- a/src/XMakeTasks/CultureStringUtilities.cs
+++ b/src/XMakeTasks/CultureStringUtilities.cs
@@ -3,7 +3,6 @@
using System.Globalization;
using System;
-using System.Runtime.InteropServices;
namespace Microsoft.Build.Tasks
{
diff --git a/src/XMakeTasks/Delegate.cs b/src/XMakeTasks/Delegate.cs
index 9def82973f1..75720d83959 100644
--- a/src/XMakeTasks/Delegate.cs
+++ b/src/XMakeTasks/Delegate.cs
@@ -3,14 +3,6 @@
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.Collections.Generic;
using System.Runtime.Versioning;
diff --git a/src/XMakeTasks/Delete.cs b/src/XMakeTasks/Delete.cs
index 55d63fa9598..a4013be0ed8 100644
--- a/src/XMakeTasks/Delete.cs
+++ b/src/XMakeTasks/Delete.cs
@@ -4,9 +4,6 @@
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;
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..781cf6a49f2 100644
--- a/src/XMakeTasks/DependencyFile.cs
+++ b/src/XMakeTasks/DependencyFile.cs
@@ -2,17 +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.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/Exec.cs b/src/XMakeTasks/Exec.cs
index aa9dd6db5be..f1b4440f3ea 100644
--- a/src/XMakeTasks/Exec.cs
+++ b/src/XMakeTasks/Exec.cs
@@ -3,12 +3,8 @@
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.RegularExpressions;
using Microsoft.Build.Framework;
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..857de6e3f2c 100644
--- a/src/XMakeTasks/FileIO/ReadLinesFromFile.cs
+++ b/src/XMakeTasks/FileIO/ReadLinesFromFile.cs
@@ -4,8 +4,6 @@
using System;
using System.IO;
using System.Collections;
-using System.Diagnostics;
-using System.Globalization;
using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;
diff --git a/src/XMakeTasks/FileIO/WriteLinesToFile.cs b/src/XMakeTasks/FileIO/WriteLinesToFile.cs
index d5fdb50fa1c..dc9da793f56 100644
--- a/src/XMakeTasks/FileIO/WriteLinesToFile.cs
+++ b/src/XMakeTasks/FileIO/WriteLinesToFile.cs
@@ -4,12 +4,8 @@
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/FindAppConfigFile.cs b/src/XMakeTasks/FindAppConfigFile.cs
index 78a595ab870..97f2e611437 100644
--- a/src/XMakeTasks/FindAppConfigFile.cs
+++ b/src/XMakeTasks/FindAppConfigFile.cs
@@ -3,9 +3,7 @@
using System;
using System.IO;
-using System.Resources;
using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
using Microsoft.Build.Shared;
namespace Microsoft.Build.Tasks
diff --git a/src/XMakeTasks/FindInList.cs b/src/XMakeTasks/FindInList.cs
index bc232b0a1d8..9376aaf9e69 100644
--- a/src/XMakeTasks/FindInList.cs
+++ b/src/XMakeTasks/FindInList.cs
@@ -3,9 +3,7 @@
using System;
using System.IO;
-using System.Resources;
using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
using Microsoft.Build.Shared;
namespace Microsoft.Build.Tasks
diff --git a/src/XMakeTasks/FindInvalidProjectReferences.cs b/src/XMakeTasks/FindInvalidProjectReferences.cs
index 127a77fbea7..c0b572069f2 100644
--- a/src/XMakeTasks/FindInvalidProjectReferences.cs
+++ b/src/XMakeTasks/FindInvalidProjectReferences.cs
@@ -5,13 +5,8 @@
//-----------------------------------------------------------------------
using System;
-using System.IO;
using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using Microsoft.Build.Shared;
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..b9dfce21b9a 100644
--- a/src/XMakeTasks/FormatUrl.cs
+++ b/src/XMakeTasks/FormatUrl.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.Diagnostics;
using Microsoft.Build.Framework;
using Microsoft.Build.Tasks.Deployment.ManifestUtilities;
-using Microsoft.Build.Utilities;
namespace Microsoft.Build.Tasks
{
diff --git a/src/XMakeTasks/FormatVersion.cs b/src/XMakeTasks/FormatVersion.cs
index 18c4a2e6e5b..6d1a910d2dc 100644
--- a/src/XMakeTasks/FormatVersion.cs
+++ b/src/XMakeTasks/FormatVersion.cs
@@ -3,10 +3,7 @@
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..1c0bbb68d51 100644
--- a/src/XMakeTasks/GenerateApplicationManifest.cs
+++ b/src/XMakeTasks/GenerateApplicationManifest.cs
@@ -2,18 +2,12 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
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..b51e8d15e9f 100644
--- a/src/XMakeTasks/GenerateBootstrapper.cs
+++ b/src/XMakeTasks/GenerateBootstrapper.cs
@@ -2,15 +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.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;
namespace Microsoft.Build.Tasks
diff --git a/src/XMakeTasks/GenerateDeploymentManifest.cs b/src/XMakeTasks/GenerateDeploymentManifest.cs
index f65e1860a4c..03af040a566 100644
--- a/src/XMakeTasks/GenerateDeploymentManifest.cs
+++ b/src/XMakeTasks/GenerateDeploymentManifest.cs
@@ -3,11 +3,8 @@
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..9e5fde88852 100644
--- a/src/XMakeTasks/GenerateManifestBase.cs
+++ b/src/XMakeTasks/GenerateManifestBase.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.Diagnostics;
using System.Globalization;
using System.IO;
-using System.Collections;
-using System.Security.Cryptography;
using Microsoft.Build.Framework;
using Microsoft.Build.Tasks.Deployment.ManifestUtilities;
using Microsoft.Build.Utilities;
diff --git a/src/XMakeTasks/GenerateTrustInfo.cs b/src/XMakeTasks/GenerateTrustInfo.cs
index f0d675aa5ea..1b90aa2a57c 100644
--- a/src/XMakeTasks/GenerateTrustInfo.cs
+++ b/src/XMakeTasks/GenerateTrustInfo.cs
@@ -2,14 +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.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 FrameworkNameVersioning = System.Runtime.Versioning.FrameworkName;
namespace Microsoft.Build.Tasks
diff --git a/src/XMakeTasks/GetAssemblyIdentity.cs b/src/XMakeTasks/GetAssemblyIdentity.cs
index ce5e9eb94f8..5cb2250e58c 100644
--- a/src/XMakeTasks/GetAssemblyIdentity.cs
+++ b/src/XMakeTasks/GetAssemblyIdentity.cs
@@ -3,7 +3,6 @@
using System;
using System.Collections;
-using System.Diagnostics;
using System.Globalization;
using System.Reflection;
using System.Text;
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..f4722287ed5 100644
--- a/src/XMakeTasks/GetFrameworkSDKPath.cs
+++ b/src/XMakeTasks/GetFrameworkSDKPath.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.IO;
-using System.Diagnostics;
-using System.Resources;
-using System.Reflection;
using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;
using Microsoft.Build.Shared;
diff --git a/src/XMakeTasks/GetInstalledSDKLocations.cs b/src/XMakeTasks/GetInstalledSDKLocations.cs
index 91bc9614eab..97118d75f72 100644
--- a/src/XMakeTasks/GetInstalledSDKLocations.cs
+++ b/src/XMakeTasks/GetInstalledSDKLocations.cs
@@ -9,10 +9,6 @@
//-----------------------------------------------------------------------
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;
diff --git a/src/XMakeTasks/GetReferenceAssemblyPaths.cs b/src/XMakeTasks/GetReferenceAssemblyPaths.cs
index f7f094817d2..6a532a455a8 100644
--- a/src/XMakeTasks/GetReferenceAssemblyPaths.cs
+++ b/src/XMakeTasks/GetReferenceAssemblyPaths.cs
@@ -5,7 +5,6 @@
//-----------------------------------------------------------------------
using System;
-using System.IO;
using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;
using Microsoft.Build.Shared;
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..8ac9a1f0b3c 100644
--- a/src/XMakeTasks/ICscHostObject.cs
+++ b/src/XMakeTasks/ICscHostObject.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;
using System.Runtime.InteropServices;
using Microsoft.Build.Framework;
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/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..8d41bda0d91 100644
--- a/src/XMakeTasks/InstalledSDKResolver.cs
+++ b/src/XMakeTasks/InstalledSDKResolver.cs
@@ -6,7 +6,6 @@
//-----------------------------------------------------------------------
using System;
-using System.Reflection;
using System.Collections;
using Microsoft.Build.Shared;
using System.Collections.Generic;
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..6ddd1bbd899 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;
namespace Microsoft.Build.Tasks
{
diff --git a/src/XMakeTasks/ListOperators/FindUnderPath.cs b/src/XMakeTasks/ListOperators/FindUnderPath.cs
index a764866bfc0..c087a9c016e 100644
--- a/src/XMakeTasks/ListOperators/FindUnderPath.cs
+++ b/src/XMakeTasks/ListOperators/FindUnderPath.cs
@@ -3,7 +3,6 @@
using System;
using System.Collections;
-using System.Globalization;
using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;
diff --git a/src/XMakeTasks/ListOperators/RemoveDuplicates.cs b/src/XMakeTasks/ListOperators/RemoveDuplicates.cs
index 2cd0513a20d..8aec54a661b 100644
--- a/src/XMakeTasks/ListOperators/RemoveDuplicates.cs
+++ b/src/XMakeTasks/ListOperators/RemoveDuplicates.cs
@@ -6,7 +6,6 @@
using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;
-using Microsoft.Build.Shared;
namespace Microsoft.Build.Tasks
{
diff --git a/src/XMakeTasks/MSBuild.cs b/src/XMakeTasks/MSBuild.cs
index 2194fb5e9d8..eeba99a2ab4 100644
--- a/src/XMakeTasks/MSBuild.cs
+++ b/src/XMakeTasks/MSBuild.cs
@@ -3,12 +3,8 @@
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;
diff --git a/src/XMakeTasks/MakeDir.cs b/src/XMakeTasks/MakeDir.cs
index 7228919676b..333e9627c93 100644
--- a/src/XMakeTasks/MakeDir.cs
+++ b/src/XMakeTasks/MakeDir.cs
@@ -3,12 +3,8 @@
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.Collections.Generic;
diff --git a/src/XMakeTasks/ManagedCompiler.cs b/src/XMakeTasks/ManagedCompiler.cs
index 5470e4da5a7..a1a94a2dffb 100644
--- a/src/XMakeTasks/ManagedCompiler.cs
+++ b/src/XMakeTasks/ManagedCompiler.cs
@@ -3,18 +3,9 @@
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;
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/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..4b8eadadd57 100644
--- a/src/XMakeTasks/ManifestUtil/DeployManifest.cs
+++ b/src/XMakeTasks/ManifestUtil/DeployManifest.cs
@@ -8,7 +8,6 @@
using System.IO;
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;
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/Manifest.cs b/src/XMakeTasks/ManifestUtil/Manifest.cs
index f09a0d417be..73dc836711b 100644
--- a/src/XMakeTasks/ManifestUtil/Manifest.cs
+++ b/src/XMakeTasks/ManifestUtil/Manifest.cs
@@ -6,12 +6,8 @@
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;
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..03e702562a7 100644
--- a/src/XMakeTasks/ManifestUtil/ManifestWriter.cs
+++ b/src/XMakeTasks/ManifestUtil/ManifestWriter.cs
@@ -3,11 +3,9 @@
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;
diff --git a/src/XMakeTasks/ManifestUtil/MetadataReader.cs b/src/XMakeTasks/ManifestUtil/MetadataReader.cs
index 98478c4d3ad..f399c081920 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.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/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..cefa077cf05 100644
--- a/src/XMakeTasks/ManifestUtil/mansign.cs
+++ b/src/XMakeTasks/ManifestUtil/mansign.cs
@@ -6,8 +6,6 @@
//
-using System;
-using System.Globalization;
using System.IO;
using System.Security.Cryptography;
using System.Security.Cryptography.Xml;
diff --git a/src/XMakeTasks/ManifestUtil/mansign2.cs b/src/XMakeTasks/ManifestUtil/mansign2.cs
index 8dee6dbebcf..994206a32a5 100644
--- a/src/XMakeTasks/ManifestUtil/mansign2.cs
+++ b/src/XMakeTasks/ManifestUtil/mansign2.cs
@@ -6,8 +6,6 @@
// mansign.cs
//
-using System;
-using System.Globalization;
using System.IO;
using System.Security.Cryptography;
using System.Security.Cryptography.Xml;
@@ -18,7 +16,6 @@
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..db6be96aba3 100644
--- a/src/XMakeTasks/Message.cs
+++ b/src/XMakeTasks/Message.cs
@@ -2,12 +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.Diagnostics;
using Microsoft.Build.Framework;
-using Microsoft.Build.Utilities;
-using System.Globalization;
-using System.Resources;
namespace Microsoft.Build.Tasks
{
diff --git a/src/XMakeTasks/Move.cs b/src/XMakeTasks/Move.cs
index 2ec35816e31..b057d41ce04 100644
--- a/src/XMakeTasks/Move.cs
+++ b/src/XMakeTasks/Move.cs
@@ -12,7 +12,6 @@
using Microsoft.Build.Shared;
using Microsoft.Build.Utilities;
using System.Runtime.InteropServices;
-using System.ComponentModel;
namespace Microsoft.Build.Tasks
{
diff --git a/src/XMakeTasks/ParserState.cs b/src/XMakeTasks/ParserState.cs
index 80148a3affe..5022eb7b1bf 100644
--- a/src/XMakeTasks/ParserState.cs
+++ b/src/XMakeTasks/ParserState.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.IO;
using System.Text;
-using System.Resources;
-using System.Reflection;
using System.Collections;
namespace Microsoft.Build.Tasks
diff --git a/src/XMakeTasks/RedistList.cs b/src/XMakeTasks/RedistList.cs
index 876a1369361..c10ee8f443c 100644
--- a/src/XMakeTasks/RedistList.cs
+++ b/src/XMakeTasks/RedistList.cs
@@ -4,13 +4,11 @@
using System;
using System.Collections;
using System.Collections.Generic;
-using System.Collections.Specialized;
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.Text;
using System.Xml;
-using Microsoft.Win32;
using Microsoft.Build.Utilities;
using Microsoft.Build.Shared;
using System.Collections.Concurrent;
diff --git a/src/XMakeTasks/RegisterAssembly.cs b/src/XMakeTasks/RegisterAssembly.cs
index eac1af26e86..0196e3572c4 100644
--- a/src/XMakeTasks/RegisterAssembly.cs
+++ b/src/XMakeTasks/RegisterAssembly.cs
@@ -4,7 +4,6 @@
using System;
using System.Diagnostics;
using System.IO;
-using System.Resources;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Security;
@@ -12,7 +11,6 @@
using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;
-using Microsoft.Build.Tasks;
using Microsoft.Build.Shared;
namespace Microsoft.Build.Tasks
diff --git a/src/XMakeTasks/RemoveDir.cs b/src/XMakeTasks/RemoveDir.cs
index 5dd2f6a3703..450bf4c1d3d 100644
--- a/src/XMakeTasks/RemoveDir.cs
+++ b/src/XMakeTasks/RemoveDir.cs
@@ -3,11 +3,7 @@
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;
diff --git a/src/XMakeTasks/RequiresFramework35SP1Assembly.cs b/src/XMakeTasks/RequiresFramework35SP1Assembly.cs
index 7cbf654be34..7629a9358d3 100644
--- a/src/XMakeTasks/RequiresFramework35SP1Assembly.cs
+++ b/src/XMakeTasks/RequiresFramework35SP1Assembly.cs
@@ -2,18 +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.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/ResGen.cs b/src/XMakeTasks/ResGen.cs
index fc9b482d327..6c9a726e5de 100644
--- a/src/XMakeTasks/ResGen.cs
+++ b/src/XMakeTasks/ResGen.cs
@@ -9,9 +9,6 @@
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;
diff --git a/src/XMakeTasks/ResGenDependencies.cs b/src/XMakeTasks/ResGenDependencies.cs
index dcbf2039c52..b0c2d321b9f 100644
--- a/src/XMakeTasks/ResGenDependencies.cs
+++ b/src/XMakeTasks/ResGenDependencies.cs
@@ -4,17 +4,10 @@
using System;
using System.Collections;
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;
namespace Microsoft.Build.Tasks
{
diff --git a/src/XMakeTasks/ResolveComReferenceCache.cs b/src/XMakeTasks/ResolveComReferenceCache.cs
index 38e2cfa7cca..400ba9e1583 100644
--- a/src/XMakeTasks/ResolveComReferenceCache.cs
+++ b/src/XMakeTasks/ResolveComReferenceCache.cs
@@ -3,12 +3,6 @@
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..eef74d52fe9 100644
--- a/src/XMakeTasks/ResolveKeySource.cs
+++ b/src/XMakeTasks/ResolveKeySource.cs
@@ -2,16 +2,12 @@
// 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.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;
diff --git a/src/XMakeTasks/ResolveManifestFiles.cs b/src/XMakeTasks/ResolveManifestFiles.cs
index 8e6cdb1c35f..8d577f5c1ca 100644
--- a/src/XMakeTasks/ResolveManifestFiles.cs
+++ b/src/XMakeTasks/ResolveManifestFiles.cs
@@ -7,9 +7,6 @@
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;
diff --git a/src/XMakeTasks/ResolveNonMSBuildProjectOutput.cs b/src/XMakeTasks/ResolveNonMSBuildProjectOutput.cs
index ad2dac39b76..fdbd9440970 100644
--- a/src/XMakeTasks/ResolveNonMSBuildProjectOutput.cs
+++ b/src/XMakeTasks/ResolveNonMSBuildProjectOutput.cs
@@ -3,16 +3,10 @@
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..4a45a3bcaf5 100644
--- a/src/XMakeTasks/ResolveProjectBase.cs
+++ b/src/XMakeTasks/ResolveProjectBase.cs
@@ -5,7 +5,6 @@
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.IO;
-using System.Text;
using System.Xml;
using Microsoft.Build.Framework;
diff --git a/src/XMakeTasks/SGen.cs b/src/XMakeTasks/SGen.cs
index 64ac9facaef..29d904509c1 100644
--- a/src/XMakeTasks/SGen.cs
+++ b/src/XMakeTasks/SGen.cs
@@ -2,15 +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.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;
diff --git a/src/XMakeTasks/SdkToolsPathUtility.cs b/src/XMakeTasks/SdkToolsPathUtility.cs
index 95bc800eb62..306855fdc5d 100644
--- a/src/XMakeTasks/SdkToolsPathUtility.cs
+++ b/src/XMakeTasks/SdkToolsPathUtility.cs
@@ -6,8 +6,6 @@
//-----------------------------------------------------------------------
using System;
-using System.Collections.Generic;
-using System.Text;
using System.IO;
using Microsoft.Build.Utilities;
using Microsoft.Build.Shared;
diff --git a/src/XMakeTasks/SignFile.cs b/src/XMakeTasks/SignFile.cs
index 1d23e9142db..3bf80c1fc97 100644
--- a/src/XMakeTasks/SignFile.cs
+++ b/src/XMakeTasks/SignFile.cs
@@ -3,12 +3,8 @@
#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;
diff --git a/src/XMakeTasks/StateFileBase.cs b/src/XMakeTasks/StateFileBase.cs
index f5b431e4599..040d42e862d 100644
--- a/src/XMakeTasks/StateFileBase.cs
+++ b/src/XMakeTasks/StateFileBase.cs
@@ -3,9 +3,7 @@
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;
diff --git a/src/XMakeTasks/StrongNameUtils.cs b/src/XMakeTasks/StrongNameUtils.cs
index b23641719d0..dcf7c14b219 100644
--- a/src/XMakeTasks/StrongNameUtils.cs
+++ b/src/XMakeTasks/StrongNameUtils.cs
@@ -5,13 +5,10 @@
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;
diff --git a/src/XMakeTasks/System.Design.cs b/src/XMakeTasks/System.Design.cs
index d0974599fde..47292c9469e 100644
--- a/src/XMakeTasks/System.Design.cs
+++ b/src/XMakeTasks/System.Design.cs
@@ -7,12 +7,9 @@
//------------------------------------------------------------------------------
using System;
-using System.Reflection;
using System.Globalization;
using System.Resources;
-using System.Text;
using System.Threading;
-using System.Security.Permissions;
using System.ComponentModel;
diff --git a/src/XMakeTasks/SystemState.cs b/src/XMakeTasks/SystemState.cs
index 67e0bf9d913..7517c64beab 100644
--- a/src/XMakeTasks/SystemState.cs
+++ b/src/XMakeTasks/SystemState.cs
@@ -3,17 +3,11 @@
using System;
using System.Diagnostics;
-using Microsoft.Build.Tasks;
-using Microsoft.Build.Utilities;
using Microsoft.Build.Shared;
-using System.Reflection;
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.CodeAnalysis;
using System.Runtime.Versioning;
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/ToolTaskExtension.cs b/src/XMakeTasks/ToolTaskExtension.cs
index 0cc27aedcf0..18732ae9920 100644
--- a/src/XMakeTasks/ToolTaskExtension.cs
+++ b/src/XMakeTasks/ToolTaskExtension.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 Microsoft.Build.Shared;
using Microsoft.Build.Utilities;
diff --git a/src/XMakeTasks/Touch.cs b/src/XMakeTasks/Touch.cs
index a39b1a81545..09af8673542 100644
--- a/src/XMakeTasks/Touch.cs
+++ b/src/XMakeTasks/Touch.cs
@@ -4,12 +4,8 @@
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/UnregisterAssembly.cs b/src/XMakeTasks/UnregisterAssembly.cs
index b82442cbdf5..7b96ba024c9 100644
--- a/src/XMakeTasks/UnregisterAssembly.cs
+++ b/src/XMakeTasks/UnregisterAssembly.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.IO;
-using System.Resources;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Security;
@@ -12,7 +10,6 @@
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 396b7c1a6a3..48ce7f7eeac 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..d83ccfa3805 100644
--- a/src/XMakeTasks/VisualBasicParserUtilities.cs
+++ b/src/XMakeTasks/VisualBasicParserUtilities.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.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/WriteCodeFragment.cs b/src/XMakeTasks/WriteCodeFragment.cs
index a22daf79201..68b51cc8315 100644
--- a/src/XMakeTasks/WriteCodeFragment.cs
+++ b/src/XMakeTasks/WriteCodeFragment.cs
@@ -12,8 +12,6 @@
using Microsoft.Build.Framework;
using Microsoft.Build.Shared;
using Microsoft.Build.Utilities;
-using System.Runtime.InteropServices;
-using System.ComponentModel;
using System.CodeDom;
using System.CodeDom.Compiler;
using System.Diagnostics.CodeAnalysis;
diff --git a/src/XMakeTasks/XamlTaskFactory/CommandLineToolSwitch.cs b/src/XMakeTasks/XamlTaskFactory/CommandLineToolSwitch.cs
index 09ff60e571e..522ec12a2a6 100644
--- a/src/XMakeTasks/XamlTaskFactory/CommandLineToolSwitch.cs
+++ b/src/XMakeTasks/XamlTaskFactory/CommandLineToolSwitch.cs
@@ -6,9 +6,7 @@
//-----------------------------------------------------------------------
using System;
-using System.Collections;
using System.Collections.Generic;
-using System.Text;
using Microsoft.Build.Framework;
using Microsoft.Build.Shared;
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..fc31f4f09ad 100644
--- a/src/XMakeTasks/XamlTaskFactory/RelationsParser.cs
+++ b/src/XMakeTasks/XamlTaskFactory/RelationsParser.cs
@@ -6,11 +6,9 @@
using System;
using System.Collections.Generic;
-using System.Text;
using System.Xml;
using System.IO;
using Microsoft.Build.Shared;
-using Microsoft.Build.Utilities;
namespace Microsoft.Build.Tasks.Xaml
{
diff --git a/src/XMakeTasks/XamlTaskFactory/TaskGenerator.cs b/src/XMakeTasks/XamlTaskFactory/TaskGenerator.cs
index b77c56add99..b034b5e5d88 100644
--- a/src/XMakeTasks/XamlTaskFactory/TaskGenerator.cs
+++ b/src/XMakeTasks/XamlTaskFactory/TaskGenerator.cs
@@ -2,21 +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.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.Configuration;
-using System.Resources;
-using System.Reflection;
namespace Microsoft.Build.Tasks.Xaml
{
diff --git a/src/XMakeTasks/XamlTaskFactory/TaskParser.cs b/src/XMakeTasks/XamlTaskFactory/TaskParser.cs
index fa52da25a6c..97d64cdbfd4 100644
--- a/src/XMakeTasks/XamlTaskFactory/TaskParser.cs
+++ b/src/XMakeTasks/XamlTaskFactory/TaskParser.cs
@@ -13,9 +13,7 @@
using System.Globalization;
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;
diff --git a/src/XMakeTasks/XamlTaskFactory/XamlDataDrivenToolTask.cs b/src/XMakeTasks/XamlTaskFactory/XamlDataDrivenToolTask.cs
index 0a5f5bf33c0..2b58c95f562 100644
--- a/src/XMakeTasks/XamlTaskFactory/XamlDataDrivenToolTask.cs
+++ b/src/XMakeTasks/XamlTaskFactory/XamlDataDrivenToolTask.cs
@@ -3,17 +3,11 @@
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.Resources;
using Microsoft.Build.Shared;
diff --git a/src/XMakeTasks/XamlTaskFactory/XamlTaskFactory.cs b/src/XMakeTasks/XamlTaskFactory/XamlTaskFactory.cs
index 275682ef735..822ed4217b3 100644
--- a/src/XMakeTasks/XamlTaskFactory/XamlTaskFactory.cs
+++ b/src/XMakeTasks/XamlTaskFactory/XamlTaskFactory.cs
@@ -11,7 +11,6 @@
using System.Text;
using System.CodeDom.Compiler;
using System.Reflection;
-using System.Xml;
using System.IO;
using System.Threading;
diff --git a/src/XMakeTasks/XmlPeek.cs b/src/XMakeTasks/XmlPeek.cs
index b3459e3a75a..9cb80cdbf26 100644
--- a/src/XMakeTasks/XmlPeek.cs
+++ b/src/XMakeTasks/XmlPeek.cs
@@ -8,13 +8,7 @@
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;
diff --git a/src/XMakeTasks/XmlPoke.cs b/src/XMakeTasks/XmlPoke.cs
index 33d70cecc0c..243cc235a5a 100644
--- a/src/XMakeTasks/XmlPoke.cs
+++ b/src/XMakeTasks/XmlPoke.cs
@@ -6,20 +6,12 @@
//-----------------------------------------------------------------------
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..e91eb984583 100644
--- a/src/XMakeTasks/XslTransformation.cs
+++ b/src/XMakeTasks/XslTransformation.cs
@@ -11,11 +11,7 @@
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;
diff --git a/src/XMakeTasks/system.design/stronglytypedresourcebuilder.cs b/src/XMakeTasks/system.design/stronglytypedresourcebuilder.cs
index 744e8d825b6..003b3ff8719 100644
--- a/src/XMakeTasks/system.design/stronglytypedresourcebuilder.cs
+++ b/src/XMakeTasks/system.design/stronglytypedresourcebuilder.cs
@@ -33,7 +33,6 @@
using System.CodeDom.Compiler;
using System.Reflection;
using System.Globalization;
-using System.Xml;
using System.Diagnostics.CodeAnalysis;
using Microsoft.Build.Shared;