Skip to content

Commit 9c2f7f1

Browse files
committed
Fixup white-space(s) and new-line(s) in MSBuild SDK files
Follow EditorConfig rules
1 parent 8f62a49 commit 9c2f7f1

File tree

77 files changed

+428
-433
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+428
-433
lines changed

src/Layout/redist/MSBuildImports/Current/Microsoft.Common.CrossTargeting.targets/ImportAfter/Microsoft.TestPlatform.CrossTargeting.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
66
created a backup copy. Incorrect changes to this file will make it
77
impossible to load or build your projects from the command-line or the IDE.
88
9-
Copyright (c) .NET Foundation. All rights reserved.
9+
Copyright (c) .NET Foundation. All rights reserved.
1010
***********************************************************************************************
1111
-->
1212
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
@@ -18,7 +18,7 @@ Copyright (c) .NET Foundation. All rights reserved.
1818
<!--
1919
===================================================================================
2020
DispatchToInnerBuildsWithVSTestTarget
21-
21+
2222
Builds this project with /t:$(InnerVSTestTargets) /p:TargetFramework=X for each
2323
value X in $(TargetFrameworks)
2424

src/Layout/redist/MSBuildImports/Current/Microsoft.Common.targets/ImportAfter/Microsoft.TestPlatform.ImportAfter.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
66
created a backup copy. Incorrect changes to this file will make it
77
impossible to load or build your projects from the command-line or the IDE.
88
9-
Copyright (c) .NET Foundation. All rights reserved.
9+
Copyright (c) .NET Foundation. All rights reserved.
1010
***********************************************************************************************
1111
-->
1212

src/Layout/redist/MSBuildImports/Current/SolutionFile/ImportAfter/Microsoft.NuGet.ImportAfter.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
66
created a backup copy. Incorrect changes to this file will make it
77
impossible to load or build your projects from the command-line or the IDE.
88
9-
Copyright (c) .NET Foundation. All rights reserved.
9+
Copyright (c) .NET Foundation. All rights reserved.
1010
***********************************************************************************************
1111
-->
1212
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

src/Tasks/Common/targets/Microsoft.NET.DefaultPackageConflictOverrides.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
66
created a backup copy. Incorrect changes to this file will make it
77
impossible to load or build your projects from the command-line or the IDE.
88
9-
Copyright (c) .NET Foundation. All rights reserved.
9+
Copyright (c) .NET Foundation. All rights reserved.
1010
***********************************************************************************************
1111
-->
1212
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

src/Tasks/Microsoft.NET.Build.Extensions.Tasks/msbuildExtensions-ver/Microsoft.Common.targets/ImportAfter/Microsoft.NET.Build.Extensions.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
66
created a backup copy. Incorrect changes to this file will make it
77
impossible to load or build your projects from the command-line or the IDE.
88
9-
Copyright (c) .NET Foundation. All rights reserved.
9+
Copyright (c) .NET Foundation. All rights reserved.
1010
***********************************************************************************************
1111
-->
1212
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

src/Tasks/Microsoft.NET.Build.Extensions.Tasks/msbuildExtensions-ver/SolutionFile/ImportAfter/Microsoft.NET.Sdk.Solution.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Copyright (c) .NET Foundation. All rights reserved.
1212
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1313

1414
<Import Project="$(MSBuildSDKsPath)\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.Common.targets" />
15-
15+
1616
<!--
1717
============================================================
1818
_CheckForSolutionLevelRuntimeIdentifier

src/Tasks/Microsoft.NET.Build.Extensions.Tasks/msbuildExtensions/Microsoft/Microsoft.NET.Build.Extensions/Microsoft.NET.Build.Extensions.ConflictResolution.targets

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
66
created a backup copy. Incorrect changes to this file will make it
77
impossible to load or build your projects from the command-line or the IDE.
88
9-
Copyright (c) .NET Foundation. All rights reserved.
9+
Copyright (c) .NET Foundation. All rights reserved.
1010
***********************************************************************************************
1111
-->
1212
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1313

1414
<PropertyGroup Condition="'$(DisableHandlePackageFileConflicts)' != 'true'">
1515
<!-- Non-SDK using project.json or PackageReference, run after references are read from the lock/assets file -->
1616
<_HandlePackageFileConflictsAfter>ResolveNuGetPackageAssets</_HandlePackageFileConflictsAfter>
17-
17+
1818
<!-- In case ResolveNuGetPackageAssets is not run (eg: packages.config), ensure we run before targets that consume references -->
1919
<_HandlePackageFileConflictsBefore>ResolveAssemblyReferences</_HandlePackageFileConflictsBefore>
2020
</PropertyGroup>
2121

2222
<Import Project="Microsoft.NET.DefaultPackageConflictOverrides.targets" />
23-
23+
2424
<UsingTask TaskName="ResolvePackageFileConflicts" AssemblyFile="$(MicrosoftNETBuildExtensionsTasksAssembly)" />
2525
<Target Name="_HandlePackageFileConflicts"
2626
BeforeTargets="$(_HandlePackageFileConflictsBefore)"
@@ -40,7 +40,7 @@ Copyright (c) .NET Foundation. All rights reserved.
4040

4141
<!-- Replace Reference / ReferenceCopyLocalPaths with the filtered lists.
4242
We must remove all and include rather than just remove since removal is based
43-
only on ItemSpec and duplicate ItemSpecs may exist with different metadata
43+
only on ItemSpec and duplicate ItemSpecs may exist with different metadata
4444
(eg: HintPath) -->
4545
<ItemGroup>
4646
<Reference Remove="@(Reference)" />

src/Tasks/Microsoft.NET.Build.Extensions.Tasks/msbuildExtensions/Microsoft/Microsoft.NET.Build.Extensions/Microsoft.NET.Build.Extensions.NETFramework.targets

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ Copyright (c) .NET Foundation. All rights reserved.
110110

111111
<_UpdatedReference Remove="@(_UpdatedReference)" />
112112
</ItemGroup>
113-
113+
114114
<!-- Facade assemblies should override simple name references. However, we want to preserve custom metadata
115115
on those simple name references (for example for aliases). That's what this task does. -->
116116
<AddFacadesToReferences References="@(Reference)"
@@ -131,7 +131,7 @@ Copyright (c) .NET Foundation. All rights reserved.
131131
4.0.0.0. However, with the fix to dotnet/sdk#2221, ResolveAssemblyReference now sees a conflicting version for
132132
the assembly, and suggests a redirect to 4.0.3.0. With automatic binding redirection, this overrides the redirect
133133
to 4.0.0.0, which causes a runtime failure.
134-
134+
135135
So here we disable any suggested binding redirect for System.IO.Compression.ZipFile. Assemblies in the unification
136136
table generally should not need binding redirects, so it should be OK to do this for 4.7.2 and forward, and on 4.7.1
137137
the assembly isn't in the unification table so this allows the original workaround redirect to be preserved. -->
@@ -142,7 +142,7 @@ Copyright (c) .NET Foundation. All rights reserved.
142142
<ItemGroup>
143143
<SuggestedBindingRedirects Remove="System.IO.Compression.ZipFile, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
144144
</ItemGroup>
145-
145+
146146
</Target>
147-
147+
148148
</Project>

src/Tasks/Microsoft.NET.Build.Extensions.Tasks/msbuildExtensions/Microsoft/Microsoft.NET.Build.Extensions/Microsoft.NET.Build.Extensions.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
66
created a backup copy. Incorrect changes to this file will make it
77
impossible to load or build your projects from the command-line or the IDE.
88
9-
Copyright (c) .NET Foundation. All rights reserved.
9+
Copyright (c) .NET Foundation. All rights reserved.
1010
***********************************************************************************************
1111
-->
1212
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.AfterCommon.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
66
created a backup copy. Incorrect changes to this file will make it
77
impossible to load or build your projects from the command-line or the IDE.
88
9-
Copyright (c) .NET Foundation. All rights reserved.
9+
Copyright (c) .NET Foundation. All rights reserved.
1010
***********************************************************************************************
1111
-->
1212
<Project>

0 commit comments

Comments
 (0)