Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove trailing whitespace #9396

Merged
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions eng/AfterSigning.targets
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project>
<Target Name="CopyAMD64Symbols" Condition="'$(OfficialBuild)' == 'true' AND '$(ArcadeBuildFromSource)' != 'true'" BeforeTargets="Build">
<Copy
<Copy
SourceFiles="$(ArtifactsBinDir)MSBuild\x64\Release\net472\MSBuild.pdb"
DestinationFolder="$(ArtifactsSymStoreDirectory)\MSBuild\net472\amd64"
/>
<Copy
<Copy
SourceFiles="$(ArtifactsBinDir)MSBuildTaskHost\x64\Release\net35\MSBuildTaskHost.pdb"
DestinationFolder="$(ArtifactsSymStoreDirectory)\MSBuildTaskHost\net35\amd64"
/>
</Target>
</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public void ProjectWhitespaceFormatting()
// Note that there are two spaces after the <ItemGroup> tag on the second line
string content = ObjectModelHelpers.CleanupFileContents(@"
<Project DefaultTargets=`Build` ToolsVersion=`msbuilddefaulttoolsversion` xmlns=`msbuildnamespace`>
<ItemGroup>
<ItemGroup>
<ProjectReference Include=`..\CLREXE\CLREXE.vcxproj`>
<Project>{3699f81b-2d03-46c5-abd7-e88a4c946f28}</Project>
</ProjectReference>
Expand Down
14 changes: 7 additions & 7 deletions src/Build.OM.UnitTests/Construction/SolutionFile_Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ public void ParseSolution_VC()
});
}
/// <summary>
/// Test that a project with the C++ project guid and an arbitrary extension is seen as valid --
/// we assume that all C++ projects except .vcproj are MSBuild format.
/// Test that a project with the C++ project guid and an arbitrary extension is seen as valid --
/// we assume that all C++ projects except .vcproj are MSBuild format.
/// </summary>
[Fact]
public void ParseSolution_VC2()
Expand Down Expand Up @@ -238,7 +238,7 @@ public void VersionTooLow()
});
}
/// <summary>
/// Test to parse a very basic .sln file to validate that description property in a solution file
/// Test to parse a very basic .sln file to validate that description property in a solution file
/// is properly handled.
/// </summary>
[Fact]
Expand Down Expand Up @@ -496,8 +496,8 @@ public void SharedProjects()
}

/// <summary>
/// Tests situation where there's a nonexistent project listed in the solution folders. We should
/// error with a useful message.
/// Tests situation where there's a nonexistent project listed in the solution folders. We should
/// error with a useful message.
/// </summary>
[Fact]
public void MissingNestedProject()
Expand Down Expand Up @@ -840,7 +840,7 @@ public void ParseInvalidSolutionConfigurations3()
});
}
/// <summary>
/// Make sure the project configurations in solution configurations get parsed correctly
/// Make sure the project configurations in solution configurations get parsed correctly
/// for a simple mixed C#/VC solution
/// </summary>
[Fact]
Expand Down Expand Up @@ -938,7 +938,7 @@ public void ParseProjectConfigurationsInSolutionConfigurations1()
}

/// <summary>
/// Make sure the project configurations in solution configurations get parsed correctly
/// Make sure the project configurations in solution configurations get parsed correctly
/// for a more tricky solution
/// </summary>
[Fact]
Expand Down
16 changes: 8 additions & 8 deletions src/Build.OM.UnitTests/Definition/ProjectItemDefinition_Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ public void ExpandBuiltInMetadataAtPointOfUse_UseInBatching()

/// <summary>
/// Built-in metadata is prohibited in item definition conditions.
/// Ideally it would also be late evaluated, but that's too difficult.
/// Ideally it would also be late evaluated, but that's too difficult.
/// </summary>
[Fact]
public void ExpandBuiltInMetadataAtPointOfUse_BuiltInProhibitedOnItemDefinitionMetadataCondition()
Expand All @@ -478,7 +478,7 @@ public void ExpandBuiltInMetadataAtPointOfUse_BuiltInProhibitedOnItemDefinitionM
}
/// <summary>
/// Built-in metadata is prohibited in item definition conditions.
/// Ideally it would also be late evaluated, but that's too difficult.
/// Ideally it would also be late evaluated, but that's too difficult.
/// </summary>
[Fact]
public void ExpandBuiltInMetadataAtPointOfUse_UnquotedBuiltInProhibitedOnItemDefinitionMetadataCondition()
Expand All @@ -500,7 +500,7 @@ public void ExpandBuiltInMetadataAtPointOfUse_UnquotedBuiltInProhibitedOnItemDef
}
/// <summary>
/// Built-in metadata is prohibited in item definition conditions.
/// Ideally it would also be late evaluated, but that's too difficult.
/// Ideally it would also be late evaluated, but that's too difficult.
/// </summary>
[Fact]
public void ExpandBuiltInMetadataAtPointOfUse_BuiltInProhibitedOnItemDefinitionCondition()
Expand All @@ -522,7 +522,7 @@ public void ExpandBuiltInMetadataAtPointOfUse_BuiltInProhibitedOnItemDefinitionC
}
/// <summary>
/// Built-in metadata is prohibited in item definition conditions.
/// Ideally it would also be late evaluated, but that's too difficult.
/// Ideally it would also be late evaluated, but that's too difficult.
/// </summary>
[Fact]
public void ExpandBuiltInMetadataAtPointOfUse_BuiltInProhibitedOnItemDefinitionGroupCondition()
Expand All @@ -544,7 +544,7 @@ public void ExpandBuiltInMetadataAtPointOfUse_BuiltInProhibitedOnItemDefinitionG
}
/// <summary>
/// Built-in metadata is prohibited in item definition conditions.
/// Ideally it would also be late evaluated, but that's too difficult.
/// Ideally it would also be late evaluated, but that's too difficult.
/// </summary>
[Fact]
public void ExpandBuiltInMetadataAtPointOfUse_QualifiedBuiltInProhibitedOnItemDefinitionMetadataCondition()
Expand All @@ -566,7 +566,7 @@ public void ExpandBuiltInMetadataAtPointOfUse_QualifiedBuiltInProhibitedOnItemDe
}
/// <summary>
/// Built-in metadata is prohibited in item definition conditions.
/// Ideally it would also be late evaluated, but that's too difficult.
/// Ideally it would also be late evaluated, but that's too difficult.
/// </summary>
[Fact]
public void ExpandBuiltInMetadataAtPointOfUse_QualifiedBuiltInProhibitedOnItemDefinitionCondition()
Expand All @@ -588,7 +588,7 @@ public void ExpandBuiltInMetadataAtPointOfUse_QualifiedBuiltInProhibitedOnItemDe
}
/// <summary>
/// Built-in metadata is prohibited in item definition conditions.
/// Ideally it would also be late evaluated, but that's too difficult.
/// Ideally it would also be late evaluated, but that's too difficult.
/// </summary>
[Fact]
public void ExpandBuiltInMetadataAtPointOfUse_QualifiedBuiltInProhibitedOnItemDefinitionGroupCondition()
Expand All @@ -610,7 +610,7 @@ public void ExpandBuiltInMetadataAtPointOfUse_QualifiedBuiltInProhibitedOnItemDe
}
/// <summary>
/// Built-in metadata is prohibited in item definition conditions.
/// Ideally it would also be late evaluated, but that's too difficult.
/// Ideally it would also be late evaluated, but that's too difficult.
/// </summary>
[Fact]
public void ExpandBuiltInMetadataAtPointOfUse_UnquotedQualifiedBuiltInProhibitedOnItemDefinitionCondition()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,22 +120,22 @@ public class TestCollectionGroup : IDisposable
<When Condition=""'$(Configuration)'=='Foo'"">
<PropertyGroup>
<p>vFoo</p>
</PropertyGroup>
</PropertyGroup>
</When>
<When Condition='false'>
<PropertyGroup>
<p>vFalse</p>
</PropertyGroup>
</When>
</PropertyGroup>
</When>
<When Condition='true'>
<PropertyGroup>
<p>vTrue</p>
</PropertyGroup>
</When>
</PropertyGroup>
</When>
<Otherwise>
<PropertyGroup>
<p>vOtherwise</p>
</PropertyGroup>
</PropertyGroup>
</Otherwise>
</Choose>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace Microsoft.Build.UnitTests.OM.ObjectModelRemoting
/// <summary>
/// The C# does not really provide a easy way to efficiently implement inheritance in cases like this
/// for abstract classes or interface, when there is a hierarchy, it is not way to share the implementation.
/// Like if one have IFoo and IBar : IFoo (or as we do abstractFoo, abstractBar:abstractFoo)
/// Like if one have IFoo and IBar : IFoo (or as we do abstractFoo, abstractBar:abstractFoo)
/// we can provide implementation for IFoo, but we can not use that for implementations for IBar.
/// Since no multiple inheritance or other suitable mechanism for code share across classes is supported by C#,
/// Instead IBar implementation should fully implement both IFoo and IBar interfaces.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public override Project CreateLinkedObject(IImportHolder holder)

// all bellow are very inefficient,
// in reality we do cache these collections until invalidated and use lazy access for dictionaries.
// TODO: Might bring that infrastructure here as well ...
// TODO: Might bring that infrastructure here as well ...
public IDictionary<string, string> GlobalProperties => this.Source.GlobalProperties;
public ICollection<string> ItemTypes => this.Source.ItemTypes;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ namespace Microsoft.Build.UnitTests.OM.ObjectModelRemoting
For the ExternalProjectsProvider mock infrastructure we'll try to use very similar model as in the actual implementation in VS.

Typical flow for "linked object" of type "Foo"
[ --- Client Collection ] [ Server collection (can be different process) ]
[ --- Client Collection ] [ Server collection (can be different process) ]
(Foo) localView <=> (FooLink) link <=> FooLinkRemoter (Proxy) <=~connection mechanism~=> FooLinkRemoter(stub) <=> (Real object)

FooLinkRemoter would be whatever ExternalProviders see useful to provide FooLink implementation and is compatable with connection mechanism
it might be completely different interface since some link types would be either inefficient or impossible to serialize for example and pass cross process.

Here we can cheat a little bit, since we run both Client and Server collection in the same process so we can ignore connection mechanism (typically some
form of serialization/deserialization) and just give the "client" link implementation the same Remoter object we create on the "server"

Expand Down
56 changes: 28 additions & 28 deletions src/Build.UnitTests/BackEnd/AssemblyTaskFactory_Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public void GoodTaskNameButNotInInfo()
}
/// <summary>
/// Make sure we get an internal error when we call the initialize factory on the public method.
/// This is done because we cannot properly initialize the task factory using the public interface and keep
/// This is done because we cannot properly initialize the task factory using the public interface and keep
/// backwards compatibility with orcas and whidbey.
/// </summary>
[Fact]
Expand All @@ -111,7 +111,7 @@ public void CallPublicInitializeFactory()
}
/// <summary>
/// Make sure we get an internal error when we call the ITaskFactory2 version of initialize factory.
/// This is done because we cannot properly initialize the task factory using the public interface and keep
/// This is done because we cannot properly initialize the task factory using the public interface and keep
/// backwards compatibility with orcas and whidbey.
/// </summary>
[Fact]
Expand Down Expand Up @@ -166,8 +166,8 @@ public void CreatableByTaskFactoryNullTaskName()
});
}
/// <summary>
/// Make sure that when an explicitly matching identity is specified (e.g. the identity is non-empty),
/// it still counts as correct.
/// Make sure that when an explicitly matching identity is specified (e.g. the identity is non-empty),
/// it still counts as correct.
/// </summary>
[Fact]
public void CreatableByTaskFactoryMatchingIdentity()
Expand All @@ -186,7 +186,7 @@ public void CreatableByTaskFactoryMatchingIdentity()
}

/// <summary>
/// Verify that if the task identity parameters don't match the factory identity, TaskNameCreatableByFactory
/// Verify that if the task identity parameters don't match the factory identity, TaskNameCreatableByFactory
/// returns false.
/// </summary>
[Fact]
Expand Down Expand Up @@ -263,7 +263,7 @@ public void VerifyGoodTaskInstantiation()
}

/// <summary>
/// Verify a good task that does not use the task host can be created when passed "don't care"
/// Verify a good task that does not use the task host can be created when passed "don't care"
/// for the task invocation task host parameters.
/// </summary>
[Fact]
Expand Down Expand Up @@ -294,8 +294,8 @@ public void VerifyMatchingTaskParametersDontLaunchTaskHost1()
}

/// <summary>
/// Verify a good task that does not use the task host can be created when passed task host
/// parameters that explicitly match the current process.
/// Verify a good task that does not use the task host can be created when passed task host
/// parameters that explicitly match the current process.
/// </summary>
[Fact]
public void VerifyMatchingTaskParametersDontLaunchTaskHost2()
Expand Down Expand Up @@ -325,7 +325,7 @@ public void VerifyMatchingTaskParametersDontLaunchTaskHost2()
}

/// <summary>
/// Verify a good task that does not use the task host can be created when passed "don't care"
/// Verify a good task that does not use the task host can be created when passed "don't care"
/// for the task invocation task host parameters.
/// </summary>
[Fact]
Expand Down Expand Up @@ -358,8 +358,8 @@ public void VerifyMatchingUsingTaskParametersDontLaunchTaskHost1()
}

/// <summary>
/// Verify a good task that does not use the task host can be created when passed task host
/// parameters that explicitly match the current process.
/// Verify a good task that does not use the task host can be created when passed task host
/// parameters that explicitly match the current process.
/// </summary>
[Fact]
public void VerifyMatchingUsingTaskParametersDontLaunchTaskHost2()
Expand Down Expand Up @@ -391,8 +391,8 @@ public void VerifyMatchingUsingTaskParametersDontLaunchTaskHost2()
}

/// <summary>
/// Verify a good task that uses the task host can be created when passed task host
/// parameters that explicitly do not match the current process.
/// Verify a good task that uses the task host can be created when passed task host
/// parameters that explicitly do not match the current process.
/// </summary>
[Fact]
public void VerifyMatchingParametersDontLaunchTaskHost()
Expand Down Expand Up @@ -426,8 +426,8 @@ public void VerifyMatchingParametersDontLaunchTaskHost()
}

/// <summary>
/// Verify a good task that uses the task host can be created when passed task host
/// parameters that explicitly do not match the current process.
/// Verify a good task that uses the task host can be created when passed task host
/// parameters that explicitly do not match the current process.
/// </summary>
[Fact]
public void VerifyNonmatchingUsingTaskParametersLaunchTaskHost()
Expand Down Expand Up @@ -459,8 +459,8 @@ public void VerifyNonmatchingUsingTaskParametersLaunchTaskHost()
}

/// <summary>
/// Verify a good task that uses the task host can be created when passed task host
/// parameters that explicitly do not match the current process.
/// Verify a good task that uses the task host can be created when passed task host
/// parameters that explicitly do not match the current process.
/// </summary>
[Fact]
public void VerifyNonmatchingTaskParametersLaunchTaskHost()
Expand Down Expand Up @@ -490,8 +490,8 @@ public void VerifyNonmatchingTaskParametersLaunchTaskHost()
}

/// <summary>
/// Verify a good task that uses the task host can be created when passed task host
/// parameters that explicitly do not match the current process.
/// Verify a good task that uses the task host can be created when passed task host
/// parameters that explicitly do not match the current process.
/// </summary>
[Fact]
public void VerifyNonmatchingParametersLaunchTaskHost()
Expand Down Expand Up @@ -525,8 +525,8 @@ public void VerifyNonmatchingParametersLaunchTaskHost()
}

/// <summary>
/// Verify a good task that uses the task host can be created when the task factory is
/// explicitly instructed to launch the task host.
/// Verify a good task that uses the task host can be created when the task factory is
/// explicitly instructed to launch the task host.
/// </summary>
[Fact]
public void VerifyExplicitlyLaunchTaskHost()
Expand Down Expand Up @@ -554,8 +554,8 @@ public void VerifyExplicitlyLaunchTaskHost()
}

/// <summary>
/// Verify a good task that uses the task host can be created when the task factory is
/// explicitly instructed to launch the task host.
/// Verify a good task that uses the task host can be created when the task factory is
/// explicitly instructed to launch the task host.
/// </summary>
[Fact]
public void VerifyExplicitlyLaunchTaskHostEvenIfParametersMatch1()
Expand Down Expand Up @@ -587,8 +587,8 @@ public void VerifyExplicitlyLaunchTaskHostEvenIfParametersMatch1()
}

/// <summary>
/// Verify a good task that uses the task host can be created when the task factory is
/// explicitly instructed to launch the task host.
/// Verify a good task that uses the task host can be created when the task factory is
/// explicitly instructed to launch the task host.
/// </summary>
[Fact]
public void VerifyExplicitlyLaunchTaskHostEvenIfParametersMatch2()
Expand Down Expand Up @@ -620,8 +620,8 @@ public void VerifyExplicitlyLaunchTaskHostEvenIfParametersMatch2()
}

/// <summary>
/// Verify a good task that uses the task host can be created when the task factory is
/// explicitly instructed to launch the task host.
/// Verify a good task that uses the task host can be created when the task factory is
/// explicitly instructed to launch the task host.
/// </summary>
[Fact]
public void VerifySameFactoryCanGenerateDifferentTaskInstances()
Expand Down Expand Up @@ -677,7 +677,7 @@ public void VerifySameFactoryCanGenerateDifferentTaskInstances()
}

/// <summary>
/// Abstract out the creation of the new AssemblyTaskFactory with default task, and
/// Abstract out the creation of the new AssemblyTaskFactory with default task, and
/// with some basic validation.
/// </summary>
private void SetupTaskFactory(IDictionary<string, string> factoryParameters, bool explicitlyLaunchTaskHost)
Expand Down
Loading