From 841846f32b640886afef39532b5e5505b335cbfe Mon Sep 17 00:00:00 2001 From: Piotr Puszkiewicz Date: Thu, 2 Mar 2017 20:38:56 -0800 Subject: [PATCH] Standardize on newline between Property|ItemGroup areas --- TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj | 1 + TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj | 1 + .../DotnetAddP2PProjects/Broken/Broken.csproj | 1 + .../EmptyItemGroup/EmptyItemGroup.csproj | 1 + .../DotnetAddP2PProjects/MoreThanOne/a.csproj | 1 + .../DotnetAddP2PProjects/MoreThanOne/b.csproj | 1 + .../WithDoubledRef/WithDoubledRef.csproj | 1 + .../WithExistingRefCondOnItem.csproj | 1 + .../WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj | 1 + .../TestProjectWithUnresolvedPlatformDependency.csproj | 1 + .../dotnet-dependency-tool-invoker.csproj | 2 ++ .../AppWithDepOnToolWithOutputName.csproj | 1 + .../AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj | 1 + .../AppWithDirectDepWithOutputName.csproj | 1 + .../AppWithToolDependency/AppWithToolDependency.csproj | 1 + .../DependencyContextFromTool.csproj | 1 + .../NewtonSoftDependentProject.csproj | 1 + .../SingleTargetApp/SingleTargetApp.csproj | 2 ++ .../SingleTargetGraph/SingleTargetP0/SingleTargetP0.csproj | 3 +++ .../SingleTargetGraph/SingleTargetP1/SingleTargetP1.csproj | 3 +++ .../SingleTargetGraph/SingleTargetP2/SingleTargetP2.csproj | 2 ++ .../PerformanceTestProjects/TwoTargetApp/TwoTargetApp.csproj | 2 ++ .../TwoTargetGraph/TwoTargetP0/TwoTargetP0.csproj | 3 +++ .../TwoTargetGraph/TwoTargetP1/TwoTargetP1.csproj | 3 +++ .../TwoTargetGraph/TwoTargetP2/TwoTargetP2.csproj | 2 ++ .../TwoTargetLargeP0/TwoTargetLargeP0.csproj | 3 +++ .../TwoTargetLargeP1/TwoTargetLargeP1.csproj | 3 +++ .../TwoTargetLargeP2/TwoTargetLargeP2.csproj | 3 +++ .../TwoTargetLargeP3/TwoTargetLargeP3.csproj | 3 +++ .../TwoTargetLargeP4/TwoTargetLargeP4.csproj | 3 +++ .../TwoTargetLargeP5/TwoTargetLargeP5.csproj | 2 ++ .../TwoTargetLargeP6/TwoTargetLargeP6.csproj | 2 ++ .../CSharpProject/CSharpProject.csproj | 3 +++ TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj | 1 + .../TestAppWithSlnAndCsprojInSubDirToRemove/App.csproj | 1 + build_projects/dotnet-cli-build/dotnet-cli-build.csproj | 2 ++ src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj | 1 + .../Microsoft.DotNet.ProjectJsonMigration.csproj | 3 +++ src/dotnet-archive/dotnet-archive.csproj | 5 ++++- src/tool_msbuild/tool_msbuild.csproj | 3 ++- src/tool_nuget/tool_nuget.csproj | 1 + .../Microsoft.DotNet.Tools.Tests.Utilities.csproj | 2 ++ test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj | 4 +++- .../dotnet-list-reference.Tests.csproj | 1 + .../dotnet-remove-reference.Tests.csproj | 1 + tools/Archiver/Archiver.csproj | 3 +++ 46 files changed, 85 insertions(+), 3 deletions(-) diff --git a/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj b/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj index a12a68f6d..f71697c30 100644 --- a/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj +++ b/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj @@ -16,6 +16,7 @@ + + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj index 6b6720e7d..63981a52b 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj @@ -7,6 +7,7 @@ + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/a.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/a.csproj index 15c2eced6..910fe9d35 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/a.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/a.csproj @@ -3,6 +3,7 @@ Library netcoreapp1.0 + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/b.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/b.csproj index 15c2eced6..910fe9d35 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/b.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/b.csproj @@ -3,6 +3,7 @@ Library netcoreapp1.0 + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj index c68609c55..1e64e020d 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj @@ -6,6 +6,7 @@ + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj index 2758b95c1..16e365509 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj @@ -6,6 +6,7 @@ + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj index 35488c294..c7851c862 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj @@ -6,6 +6,7 @@ + diff --git a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/TestProjectWithUnresolvedPlatformDependency.csproj b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/TestProjectWithUnresolvedPlatformDependency.csproj index 8d2d6aae9..a74e1a868 100755 --- a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/TestProjectWithUnresolvedPlatformDependency.csproj +++ b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/TestProjectWithUnresolvedPlatformDependency.csproj @@ -4,6 +4,7 @@ Exe $(PackageTargetFallback);dnxcore50 + diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj index 7e0d81cb4..7222996bc 100644 --- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj +++ b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj @@ -17,11 +17,13 @@ + $(ProjectRuntimeConfigFilePath) + diff --git a/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj b/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj index 177b708cf..a9b3f7cd4 100755 --- a/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj +++ b/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj @@ -7,6 +7,7 @@ + + + diff --git a/TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj b/TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj index 5b1175d71..c1f39d820 100755 --- a/TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj +++ b/TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj @@ -7,6 +7,7 @@ + diff --git a/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj b/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj index cf21abda0..05bc0cfaf 100755 --- a/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj +++ b/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj @@ -11,6 +11,7 @@ + diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/SingleTargetApp.csproj b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/SingleTargetApp.csproj index ebc2be369..4d703151d 100755 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/SingleTargetApp.csproj +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/SingleTargetApp.csproj @@ -6,11 +6,13 @@ netcoreapp1.0 Exe + + + + + + + + + + + + + + + + + + + + + + + + + @@ -41,10 +42,12 @@ + + diff --git a/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj b/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj index bbd64e605..3d080eec3 100755 --- a/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj +++ b/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj @@ -3,6 +3,7 @@ netcoreapp1.0 Exe + diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/App.csproj index 7b66a1185..ce2fa0a6b 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/App.csproj +++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/App.csproj @@ -3,6 +3,7 @@ Exe netcoreapp1.0 + diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj index 423365cd1..2250e9540 100644 --- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj +++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj @@ -8,10 +8,12 @@ bin\$(Configuration) $(PackageTargetFallback);portable-net45+win8+wp8+wpa81 + + diff --git a/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj b/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj index bb434b999..9a2cd2cdf 100644 --- a/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj +++ b/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj @@ -9,6 +9,7 @@ true true + diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj index efdc3fa77..3c0c013f2 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj @@ -9,16 +9,19 @@ true true + PreserveNewest + + diff --git a/src/dotnet-archive/dotnet-archive.csproj b/src/dotnet-archive/dotnet-archive.csproj index baf11b332..a983cefce 100644 --- a/src/dotnet-archive/dotnet-archive.csproj +++ b/src/dotnet-archive/dotnet-archive.csproj @@ -1,16 +1,19 @@  - + $(CliTargetFramework) Exe + + + diff --git a/src/tool_msbuild/tool_msbuild.csproj b/src/tool_msbuild/tool_msbuild.csproj index 62ce1e4e5..ba18663e9 100644 --- a/src/tool_msbuild/tool_msbuild.csproj +++ b/src/tool_msbuild/tool_msbuild.csproj @@ -1,12 +1,13 @@  - + $(CliVersionPrefix) $(CliTargetFramework) false false + diff --git a/src/tool_nuget/tool_nuget.csproj b/src/tool_nuget/tool_nuget.csproj index 19ff7b73e..5a4e4121f 100644 --- a/src/tool_nuget/tool_nuget.csproj +++ b/src/tool_nuget/tool_nuget.csproj @@ -7,6 +7,7 @@ false false + diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj index fcf6a8cfc..c37a13777 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj @@ -10,11 +10,13 @@ true $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + + diff --git a/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj b/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj index b1e4e5329..686afe6a3 100644 --- a/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj +++ b/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj @@ -1,12 +1,13 @@  - + $(CliTargetFramework) $(CLI_SharedFrameworkVersion) Msbuild.Tests.Utilities $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + @@ -15,6 +16,7 @@ + diff --git a/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj b/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj index 6e59dc226..be7c7c2e4 100644 --- a/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj +++ b/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj @@ -14,6 +14,7 @@ + diff --git a/test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj b/test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj index 444afeafb..b3d7f3b16 100644 --- a/test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj +++ b/test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj @@ -14,6 +14,7 @@ + diff --git a/tools/Archiver/Archiver.csproj b/tools/Archiver/Archiver.csproj index 9f168dae6..2a63e855f 100644 --- a/tools/Archiver/Archiver.csproj +++ b/tools/Archiver/Archiver.csproj @@ -6,13 +6,16 @@ Exe $(CLI_SharedFrameworkVersion) + + +