Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/Common.globalconfig
Original file line number Diff line number Diff line change
Expand Up @@ -846,7 +846,7 @@ dotnet_diagnostic.SA1133.severity = suggestion
dotnet_diagnostic.SA1134.severity = suggestion

# Using directive should be qualified
dotnet_diagnostic.SA1135.severity = suggestion
dotnet_diagnostic.SA1135.severity = warning

# Enum values should be on separate lines
dotnet_diagnostic.SA1136.severity = suggestion
Expand Down
2 changes: 1 addition & 1 deletion src/Build/BackEnd/BuildManager/BuildParameters.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

namespace Microsoft.Build.Execution
{
using Utilities = Internal.Utilities;
using Utilities = Microsoft.Build.Internal.Utilities;

/// <summary>
/// This class represents all of the settings which must be specified to start a build.
Expand Down
4 changes: 2 additions & 2 deletions src/Build/BackEnd/Components/RequestBuilder/Lookup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

namespace Microsoft.Build.BackEnd
{
using ItemsMetadataUpdateDictionary = Dictionary<ProjectItemInstance, Lookup.MetadataModifications>;
using ItemTypeToItemsMetadataUpdateDictionary = Dictionary<string, Dictionary<ProjectItemInstance, Lookup.MetadataModifications>>;
using ItemsMetadataUpdateDictionary = System.Collections.Generic.Dictionary<Microsoft.Build.Execution.ProjectItemInstance, Microsoft.Build.BackEnd.Lookup.MetadataModifications>;
using ItemTypeToItemsMetadataUpdateDictionary = System.Collections.Generic.Dictionary<string, System.Collections.Generic.Dictionary<Microsoft.Build.Execution.ProjectItemInstance, Microsoft.Build.BackEnd.Lookup.MetadataModifications>>;

/// <summary>
/// Contains a list of item and property collections, optimized to allow
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ namespace Microsoft.Build.BackEnd
// For instance, if items were generated from an expression @(Foo->'%(Filename).obj'), then
// the inner dictionary would have a key of "@(Foo->'%(Filename).obj')", in which would be
// contained a list of the items which were created/transformed using that pattern.
using ItemVectorPartitionCollection = Dictionary<string, Dictionary<string, IList<ProjectItemInstance>>>;
using ItemVectorPartition = Dictionary<string, IList<ProjectItemInstance>>;
using ItemVectorPartitionCollection = System.Collections.Generic.Dictionary<string, System.Collections.Generic.Dictionary<string, System.Collections.Generic.IList<Microsoft.Build.Execution.ProjectItemInstance>>>;
using ItemVectorPartition = System.Collections.Generic.Dictionary<string, System.Collections.Generic.IList<Microsoft.Build.Execution.ProjectItemInstance>>;

/// <summary>
/// Enumeration of the results of target dependency analysis.
Expand Down
2 changes: 1 addition & 1 deletion src/Build/BackEnd/Node/INode.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace Microsoft.Build.BackEnd
{
using NodeEngineShutdownReason = Execution.NodeEngineShutdownReason;
using NodeEngineShutdownReason = Microsoft.Build.Execution.NodeEngineShutdownReason;

#region Delegates
/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion src/Build/Definition/Project.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

namespace Microsoft.Build.Evaluation
{
using Utilities = Internal.Utilities;
using Utilities = Microsoft.Build.Internal.Utilities;

/// <summary>
/// Represents an evaluated project with design time semantics.
Expand Down
2 changes: 1 addition & 1 deletion src/Build/Definition/ProjectCollection.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

namespace Microsoft.Build.Evaluation
{
using Utilities = Internal.Utilities;
using Utilities = Microsoft.Build.Internal.Utilities;

/// <summary>
/// Flags for controlling the toolset initialization.
Expand Down