From f8009ac2d8fb4aa828c6a72955246aeccfc2b68e Mon Sep 17 00:00:00 2001 From: Manish Vasani Date: Tue, 7 Apr 2020 13:39:48 -0700 Subject: [PATCH] Fix release build - conditionally exclude usings only used for DEBUG only code --- .../Portable/Collections/ImmutableArrayExtensions.cs | 5 ++++- .../Portable/InternalUtilities/EnumerableExtensions.cs | 5 ++++- .../Core/Portable/InternalUtilities/StringTable.cs | 5 ++++- .../WorkCoordinator.NormalPriorityProcessor.cs | 5 ++++- .../BinaryExpression/AbstractBinaryExpressionWrapper.cs | 5 ++++- src/Workspaces/Core/Portable/Remote/RemoteHostClient.cs | 5 ++++- .../Simplification/AbstractSimplificationService.cs | 5 ++++- .../SQLite/v1/SQLitePersistentStorage.Accessor.cs | 5 ++++- .../SQLite/v2/SQLitePersistentStorage.Accessor.cs | 5 ++++- .../Core/Portable/SymbolKey/SymbolKeyResolution.cs | 5 ++++- .../Solution/SolutionState.CompilationTracker.State.cs | 5 ++++- src/Workspaces/Remote/Core/Services/SolutionCreator.cs | 5 ++++- src/Workspaces/Remote/Core/TestUtils.cs | 9 ++++++--- .../VirtualChars/VirtualCharSequence.Chunks.cs | 5 ++++- .../Core/FlowAnalysis/LValueFlowCaptureProvider.cs | 5 ++++- .../Workspace/Core/Extensions/DocumentExtensions.cs | 7 +++++-- 16 files changed, 67 insertions(+), 19 deletions(-) diff --git a/src/Compilers/Core/Portable/Collections/ImmutableArrayExtensions.cs b/src/Compilers/Core/Portable/Collections/ImmutableArrayExtensions.cs index 00752dfe1435f..c0549d75634b6 100644 --- a/src/Compilers/Core/Portable/Collections/ImmutableArrayExtensions.cs +++ b/src/Compilers/Core/Portable/Collections/ImmutableArrayExtensions.cs @@ -10,11 +10,14 @@ using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.IO; -using System.Linq; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using Microsoft.CodeAnalysis.PooledObjects; +#if DEBUG +using System.Linq; +#endif + namespace Microsoft.CodeAnalysis { /// diff --git a/src/Compilers/Core/Portable/InternalUtilities/EnumerableExtensions.cs b/src/Compilers/Core/Portable/InternalUtilities/EnumerableExtensions.cs index 9277ec8013bba..13f6e7e017144 100644 --- a/src/Compilers/Core/Portable/InternalUtilities/EnumerableExtensions.cs +++ b/src/Compilers/Core/Portable/InternalUtilities/EnumerableExtensions.cs @@ -9,13 +9,16 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Collections.ObjectModel; -using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Linq; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; +#if DEBUG +using System.Diagnostics; +#endif + namespace Roslyn.Utilities { internal static partial class EnumerableExtensions diff --git a/src/Compilers/Core/Portable/InternalUtilities/StringTable.cs b/src/Compilers/Core/Portable/InternalUtilities/StringTable.cs index 76d0343bb4d5e..89d36f2c33f5d 100644 --- a/src/Compilers/Core/Portable/InternalUtilities/StringTable.cs +++ b/src/Compilers/Core/Portable/InternalUtilities/StringTable.cs @@ -5,12 +5,15 @@ #nullable enable using System; -using System.Diagnostics; using System.Text; using System.Threading; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis; +#if DEBUG +using System.Diagnostics; +#endif + namespace Roslyn.Utilities { /// diff --git a/src/Features/Core/Portable/SolutionCrawler/WorkCoordinator.NormalPriorityProcessor.cs b/src/Features/Core/Portable/SolutionCrawler/WorkCoordinator.NormalPriorityProcessor.cs index 401481c9815a9..c8a471eb9453b 100644 --- a/src/Features/Core/Portable/SolutionCrawler/WorkCoordinator.NormalPriorityProcessor.cs +++ b/src/Features/Core/Portable/SolutionCrawler/WorkCoordinator.NormalPriorityProcessor.cs @@ -6,7 +6,6 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Collections.Immutable; -using System.Diagnostics; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.ErrorReporting; @@ -16,6 +15,10 @@ using Microsoft.CodeAnalysis.Shared.TestHooks; using Roslyn.Utilities; +#if DEBUG +using System.Diagnostics; +#endif + namespace Microsoft.CodeAnalysis.SolutionCrawler { internal sealed partial class SolutionCrawlerRegistrationService diff --git a/src/Features/Core/Portable/Wrapping/BinaryExpression/AbstractBinaryExpressionWrapper.cs b/src/Features/Core/Portable/Wrapping/BinaryExpression/AbstractBinaryExpressionWrapper.cs index 767bb82d10c2b..3c4ee84153164 100644 --- a/src/Features/Core/Portable/Wrapping/BinaryExpression/AbstractBinaryExpressionWrapper.cs +++ b/src/Features/Core/Portable/Wrapping/BinaryExpression/AbstractBinaryExpressionWrapper.cs @@ -3,12 +3,15 @@ // See the LICENSE file in the project root for more information. using System.Collections.Immutable; -using System.Diagnostics; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.LanguageServices; using Microsoft.CodeAnalysis.PooledObjects; +#if DEBUG +using System.Diagnostics; +#endif + namespace Microsoft.CodeAnalysis.Wrapping.BinaryExpression { using Microsoft.CodeAnalysis.Indentation; diff --git a/src/Workspaces/Core/Portable/Remote/RemoteHostClient.cs b/src/Workspaces/Core/Portable/Remote/RemoteHostClient.cs index 599d8345333a3..ce13352d04924 100644 --- a/src/Workspaces/Core/Portable/Remote/RemoteHostClient.cs +++ b/src/Workspaces/Core/Portable/Remote/RemoteHostClient.cs @@ -6,7 +6,6 @@ using System; using System.Collections.Generic; -using System.Diagnostics; using System.IO; using System.Threading; using System.Threading.Tasks; @@ -14,6 +13,10 @@ using Microsoft.CodeAnalysis.PooledObjects; using Roslyn.Utilities; +#if DEBUG +using System.Diagnostics; +#endif + namespace Microsoft.CodeAnalysis.Remote { /// diff --git a/src/Workspaces/Core/Portable/Simplification/AbstractSimplificationService.cs b/src/Workspaces/Core/Portable/Simplification/AbstractSimplificationService.cs index 484a45c3655f1..3a523efbc3590 100644 --- a/src/Workspaces/Core/Portable/Simplification/AbstractSimplificationService.cs +++ b/src/Workspaces/Core/Portable/Simplification/AbstractSimplificationService.cs @@ -14,10 +14,13 @@ using Microsoft.CodeAnalysis.Internal.Log; using Microsoft.CodeAnalysis.Options; using Microsoft.CodeAnalysis.Shared.Collections; -using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; +#if DEBUG +using Microsoft.CodeAnalysis.Shared.Extensions; +#endif + namespace Microsoft.CodeAnalysis.Simplification { internal abstract class AbstractSimplificationService : ISimplificationService diff --git a/src/Workspaces/Core/Portable/Storage/SQLite/v1/SQLitePersistentStorage.Accessor.cs b/src/Workspaces/Core/Portable/Storage/SQLite/v1/SQLitePersistentStorage.Accessor.cs index b8163794c4554..5d4fa2aee8e6f 100644 --- a/src/Workspaces/Core/Portable/Storage/SQLite/v1/SQLitePersistentStorage.Accessor.cs +++ b/src/Workspaces/Core/Portable/Storage/SQLite/v1/SQLitePersistentStorage.Accessor.cs @@ -4,7 +4,6 @@ using System; using System.Collections.Generic; -using System.Diagnostics; using System.IO; using System.Linq; using System.Threading; @@ -14,6 +13,10 @@ using Microsoft.CodeAnalysis.Storage; using Roslyn.Utilities; +#if DEBUG +using System.Diagnostics; +#endif + namespace Microsoft.CodeAnalysis.SQLite.v1 { internal partial class SQLitePersistentStorage diff --git a/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage.Accessor.cs b/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage.Accessor.cs index 247ea21c0d496..407333d443999 100644 --- a/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage.Accessor.cs +++ b/src/Workspaces/Core/Portable/Storage/SQLite/v2/SQLitePersistentStorage.Accessor.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System; -using System.Diagnostics; using System.IO; using System.Threading; using System.Threading.Tasks; @@ -11,6 +10,10 @@ using Microsoft.CodeAnalysis.Storage; using Roslyn.Utilities; +#if DEBUG +using System.Diagnostics; +#endif + namespace Microsoft.CodeAnalysis.SQLite.v2 { internal partial class SQLitePersistentStorage diff --git a/src/Workspaces/Core/Portable/SymbolKey/SymbolKeyResolution.cs b/src/Workspaces/Core/Portable/SymbolKey/SymbolKeyResolution.cs index 92b7253d06a51..ca267d8b6f850 100644 --- a/src/Workspaces/Core/Portable/SymbolKey/SymbolKeyResolution.cs +++ b/src/Workspaces/Core/Portable/SymbolKey/SymbolKeyResolution.cs @@ -3,9 +3,12 @@ // See the LICENSE file in the project root for more information. using System.Collections.Immutable; -using System.Diagnostics; using System.Threading; +#if DEBUG +using System.Diagnostics; +#endif + namespace Microsoft.CodeAnalysis { /// diff --git a/src/Workspaces/Core/Portable/Workspace/Solution/SolutionState.CompilationTracker.State.cs b/src/Workspaces/Core/Portable/Workspace/Solution/SolutionState.CompilationTracker.State.cs index c5c6d14fccc58..03466e2521705 100644 --- a/src/Workspaces/Core/Portable/Workspace/Solution/SolutionState.CompilationTracker.State.cs +++ b/src/Workspaces/Core/Portable/Workspace/Solution/SolutionState.CompilationTracker.State.cs @@ -6,11 +6,14 @@ using System; using System.Collections.Immutable; -using System.Diagnostics; using System.Linq; using Microsoft.CodeAnalysis; using Roslyn.Utilities; +#if DEBUG +using System.Diagnostics; +#endif + namespace Microsoft.CodeAnalysis { internal partial class SolutionState diff --git a/src/Workspaces/Remote/Core/Services/SolutionCreator.cs b/src/Workspaces/Remote/Core/Services/SolutionCreator.cs index 4d47088b74ba5..9615ea8fde357 100644 --- a/src/Workspaces/Remote/Core/Services/SolutionCreator.cs +++ b/src/Workspaces/Remote/Core/Services/SolutionCreator.cs @@ -10,7 +10,6 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.Diagnostics; -using Microsoft.CodeAnalysis.Remote.DebugUtil; using Microsoft.CodeAnalysis.Serialization; using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; @@ -19,6 +18,10 @@ using Microsoft.CodeAnalysis.Options; using Microsoft.CodeAnalysis.ErrorReporting; +#if DEBUG +using Microsoft.CodeAnalysis.Remote.DebugUtil; +#endif + namespace Microsoft.CodeAnalysis.Remote { /// diff --git a/src/Workspaces/Remote/Core/TestUtils.cs b/src/Workspaces/Remote/Core/TestUtils.cs index a6e4172a48611..9727cbf2a5b1c 100644 --- a/src/Workspaces/Remote/Core/TestUtils.cs +++ b/src/Workspaces/Remote/Core/TestUtils.cs @@ -3,14 +3,17 @@ // See the LICENSE file in the project root for more information. using System.Collections.Generic; -using System.Diagnostics; using System.Linq; -using System.Text; using System.Threading; using System.Threading.Tasks; -using Microsoft.CodeAnalysis.Internal.Log; using Microsoft.CodeAnalysis.Serialization; +#if DEBUG +using System.Diagnostics; +using System.Text; +using Microsoft.CodeAnalysis.Internal.Log; +#endif + namespace Microsoft.CodeAnalysis.Remote.DebugUtil { internal static class TestUtils diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/VirtualCharSequence.Chunks.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/VirtualCharSequence.Chunks.cs index b70382d8817d7..e21431534b407 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/VirtualCharSequence.Chunks.cs +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/EmbeddedLanguages/VirtualChars/VirtualCharSequence.Chunks.cs @@ -3,10 +3,13 @@ // See the LICENSE file in the project root for more information. using System.Collections.Immutable; -using System.Diagnostics; using System.Text; using Microsoft.CodeAnalysis.Text; +#if DEBUG +using System.Diagnostics; +#endif + namespace Microsoft.CodeAnalysis.EmbeddedLanguages.VirtualChars { internal partial struct VirtualCharSequence diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/FlowAnalysis/LValueFlowCaptureProvider.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/FlowAnalysis/LValueFlowCaptureProvider.cs index 3b33d41e4206b..d48eaaef0197d 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/FlowAnalysis/LValueFlowCaptureProvider.cs +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/FlowAnalysis/LValueFlowCaptureProvider.cs @@ -3,10 +3,13 @@ // See the LICENSE file in the project root for more information. using System.Collections.Immutable; -using System.Diagnostics; using Microsoft.CodeAnalysis.Operations; using Microsoft.CodeAnalysis.PooledObjects; +#if DEBUG +using System.Diagnostics; +#endif + namespace Microsoft.CodeAnalysis.FlowAnalysis { /// diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/Extensions/DocumentExtensions.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/Extensions/DocumentExtensions.cs index 013e81d1f8ced..eb8314464a832 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/Extensions/DocumentExtensions.cs +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/Extensions/DocumentExtensions.cs @@ -6,8 +6,6 @@ using System; using System.Collections.Generic; -using System.Collections.Immutable; -using System.Diagnostics; using System.Linq; using System.Threading; using System.Threading.Tasks; @@ -18,6 +16,11 @@ using Microsoft.CodeAnalysis.Text; using Roslyn.Utilities; +#if DEBUG +using System.Collections.Immutable; +using System.Diagnostics; +#endif + namespace Microsoft.CodeAnalysis.Shared.Extensions { internal static partial class DocumentExtensions