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
34 changes: 26 additions & 8 deletions src/Build/Evaluation/Conditionals/Token.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,31 @@ internal sealed class Token
/// </summary>
internal enum TokenType
{
Comma, LeftParenthesis, RightParenthesis,
LessThan, GreaterThan, LessThanOrEqualTo, GreaterThanOrEqualTo,
And, Or,
EqualTo, NotEqualTo, Not,
Property, String, Numeric, ItemList, ItemMetadata, Function,
EndOfInput
};
Comma,
LeftParenthesis,
RightParenthesis,

LessThan,
GreaterThan,
LessThanOrEqualTo,
GreaterThanOrEqualTo,

And,
Or,

EqualTo,
NotEqualTo,
Not,

Property,
String,
Numeric,
ItemList,
ItemMetadata,
Function,

EndOfInput,
}

private TokenType _tokenType;
private string _tokenString;
Expand Down Expand Up @@ -154,4 +172,4 @@ internal string String
}
}
}
}
}
4 changes: 3 additions & 1 deletion src/Build/Graph/ProjectInterpretation.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ private ProjectInterpretation()

internal enum ProjectType
{
OuterBuild, InnerBuild, NonMultitargeting
OuterBuild,
InnerBuild,
NonMultitargeting,
}

internal readonly struct ReferenceInfo
Expand Down
7 changes: 6 additions & 1 deletion src/Tasks.UnitTests/ResolveComReference_Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -753,7 +753,12 @@ public void AxReferenceKnowsItsRCWPiaExists_IncludeVersion()
CheckAxReferenceRCWTlbExists(RcwStyle.PreexistingPia /* pass in the PIA reference */, true /* include version in the interop name */);
}

private enum RcwStyle { GenerateTlb, PreexistingTlb, PreexistingPia };
private enum RcwStyle
{
GenerateTlb,
PreexistingTlb,
PreexistingPia,
}

/// <summary>
/// Helper method that will new up an AX and matching TLB reference, and verify that the AX reference
Expand Down
6 changes: 4 additions & 2 deletions src/Tasks/BootstrapperUtil/Product.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@ namespace Microsoft.Build.Tasks.Deployment.Bootstrapper
{
internal enum CopyAllFilesType
{
CopyAllFilesFalse, CopyAllFilesTrue, CopyAllFilesIfNotHomeSite
};
CopyAllFilesFalse,
CopyAllFilesTrue,
CopyAllFilesIfNotHomeSite,
}

/// <summary>
/// This class represents a product in the found by the BootstrapperBuilder in the Path property.
Expand Down
6 changes: 5 additions & 1 deletion src/Tasks/FormatVersion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@ namespace Microsoft.Build.Tasks
/// </comment>
public sealed class FormatVersion : TaskExtension
{
private enum _FormatType { Version, Path }
private enum _FormatType
{
Version,
Path,
}

private _FormatType _formatType = _FormatType.Version;

Expand Down
6 changes: 5 additions & 1 deletion src/Tasks/GenerateApplicationManifest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@ namespace Microsoft.Build.Tasks
/// </summary>
public sealed class GenerateApplicationManifest : GenerateManifestBase
{
private enum _ManifestType { Native, ClickOnce }
private enum _ManifestType
{
Native,
ClickOnce,
}

private ITaskItem[] _dependencies;
private ITaskItem[] _files;
Expand Down
15 changes: 13 additions & 2 deletions src/Tasks/GenerateManifestBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,19 @@ namespace Microsoft.Build.Tasks
/// </summary>
public abstract class GenerateManifestBase : Task
{
private enum AssemblyType { Unspecified, Managed, Native, Satellite };
private enum DependencyType { Install, Prerequisite };
private enum AssemblyType
{
Unspecified,
Managed,
Native,
Satellite,
}

private enum DependencyType
{
Install,
Prerequisite,
}

private string _processorArchitecture;
private int _startTime;
Expand Down
7 changes: 5 additions & 2 deletions src/Tasks/StrongNameUtils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,11 @@ namespace Microsoft.Build.Tasks
/// </summary>
internal enum StrongNameLevel
{
None, DelaySigned, FullySigned, Unknown
};
None,
DelaySigned,
FullySigned,
Unknown,
}

/// <summary>
/// Strong naming utilities.
Expand Down