From dca800d9f201c1cd4c26a41082552201167f61aa Mon Sep 17 00:00:00 2001 From: jonsequitur Date: Thu, 9 Feb 2017 17:15:09 -0800 Subject: [PATCH 1/3] replace project-level Common.props imports with Directory.Build.props --- .../NetFrameworkProject/NetFrameworkProject.csproj | 2 +- src/Directory.Build.props | 5 +++++ .../Microsoft.NET.Build.Tasks.UnitTests.csproj | 2 +- .../Microsoft.NET.Build.Tasks.csproj | 2 +- .../CSharpNetStandardTemplatesSetup.csproj | 1 - .../CSharpTemplatesSetup/CSharpTemplatesSetup.csproj | 1 - .../.NETCore/CSharpClassLibrary/CSharpClassLibrary.csproj | 1 - .../CSharpConsoleApplication/CSharpConsoleApplication.csproj | 1 - .../CSharp/.NETCore/CSharpUnitTest/CSharpUnitTest.csproj | 1 - .../CSharp/.NETCore/CSharpXUnitTest/CSharpXUnitTest.csproj | 1 - .../CSharpNetStandardClassLibrary.csproj | 1 - .../VisualBasicClassLibrary/VisualBasicClassLibrary.csproj | 1 - .../VisualBasicConsoleApplication.csproj | 1 - .../VisualBasicNetStandardClassLibrary.csproj | 1 - .../VisualBasicNetStandardTemplatesSetup.csproj | 1 - .../VisualBasicTemplatesSetup.csproj | 1 - test/Directory.Build.props | 5 +++++ .../Microsoft.NET.Build.Tests.csproj | 1 - .../Microsoft.NET.Pack.Tests/Microsoft.NET.Pack.Tests.csproj | 1 - .../Microsoft.NET.Publish.Tests.csproj | 2 +- .../Microsoft.NET.TestFramework.csproj | 2 +- 21 files changed, 15 insertions(+), 19 deletions(-) create mode 100644 src/Directory.Build.props create mode 100644 test/Directory.Build.props diff --git a/TestAssets/TestProjects/ProjectConstruction/NetFrameworkProject/NetFrameworkProject.csproj b/TestAssets/TestProjects/ProjectConstruction/NetFrameworkProject/NetFrameworkProject.csproj index 94db01943045..5c8f18ad760a 100644 --- a/TestAssets/TestProjects/ProjectConstruction/NetFrameworkProject/NetFrameworkProject.csproj +++ b/TestAssets/TestProjects/ProjectConstruction/NetFrameworkProject/NetFrameworkProject.csproj @@ -1,6 +1,6 @@ - + Debug AnyCPU diff --git a/src/Directory.Build.props b/src/Directory.Build.props new file mode 100644 index 000000000000..47dde1676bd0 --- /dev/null +++ b/src/Directory.Build.props @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/Microsoft.NET.Build.Tasks.UnitTests.csproj b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/Microsoft.NET.Build.Tasks.UnitTests.csproj index cd86f7ede1b1..3ce738e03a3c 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/Microsoft.NET.Build.Tasks.UnitTests.csproj +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/Microsoft.NET.Build.Tasks.UnitTests.csproj @@ -1,6 +1,6 @@  - + 11.0 {6A698C1D-F604-4295-B6FC-7FC726F9FE5F} diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj index 6bc20fa261a0..449b34494a5e 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj +++ b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj @@ -1,6 +1,6 @@  - + 11.0 {DF7D2697-B3B4-45C2-8297-27245F528A99} diff --git a/src/Templates/CSharpNetStandardTemplatesSetup/CSharpNetStandardTemplatesSetup.csproj b/src/Templates/CSharpNetStandardTemplatesSetup/CSharpNetStandardTemplatesSetup.csproj index b1eaf5ad4597..df6726651506 100644 --- a/src/Templates/CSharpNetStandardTemplatesSetup/CSharpNetStandardTemplatesSetup.csproj +++ b/src/Templates/CSharpNetStandardTemplatesSetup/CSharpNetStandardTemplatesSetup.csproj @@ -5,7 +5,6 @@ 15.0 $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\ - Debug diff --git a/src/Templates/CSharpTemplatesSetup/CSharpTemplatesSetup.csproj b/src/Templates/CSharpTemplatesSetup/CSharpTemplatesSetup.csproj index 2a1884899a81..886469ad48de 100644 --- a/src/Templates/CSharpTemplatesSetup/CSharpTemplatesSetup.csproj +++ b/src/Templates/CSharpTemplatesSetup/CSharpTemplatesSetup.csproj @@ -5,7 +5,6 @@ 15.0 $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\ - Debug diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpClassLibrary/CSharpClassLibrary.csproj b/src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpClassLibrary/CSharpClassLibrary.csproj index 196e47c5b18d..4e5adb3771d3 100644 --- a/src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpClassLibrary/CSharpClassLibrary.csproj +++ b/src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpClassLibrary/CSharpClassLibrary.csproj @@ -5,7 +5,6 @@ 15.0 $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\ - Debug diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpConsoleApplication/CSharpConsoleApplication.csproj b/src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpConsoleApplication/CSharpConsoleApplication.csproj index afefab79d6c5..ae5cbbf0c57f 100644 --- a/src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpConsoleApplication/CSharpConsoleApplication.csproj +++ b/src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpConsoleApplication/CSharpConsoleApplication.csproj @@ -5,7 +5,6 @@ 15.0 $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\ - Debug diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpUnitTest/CSharpUnitTest.csproj b/src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpUnitTest/CSharpUnitTest.csproj index 0eb23e767356..fac21634d4a3 100644 --- a/src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpUnitTest/CSharpUnitTest.csproj +++ b/src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpUnitTest/CSharpUnitTest.csproj @@ -5,7 +5,6 @@ 15.0 $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\ - Debug diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpXUnitTest/CSharpXUnitTest.csproj b/src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpXUnitTest/CSharpXUnitTest.csproj index 39d728bcb16f..e744eca76bfd 100644 --- a/src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpXUnitTest/CSharpXUnitTest.csproj +++ b/src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpXUnitTest/CSharpXUnitTest.csproj @@ -5,7 +5,6 @@ 15.0 $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\ - Debug diff --git a/src/Templates/ProjectTemplates/CSharp/.NETStandard/CSharpNetStandardClassLibrary/CSharpNetStandardClassLibrary.csproj b/src/Templates/ProjectTemplates/CSharp/.NETStandard/CSharpNetStandardClassLibrary/CSharpNetStandardClassLibrary.csproj index 8e183da3d843..2f45871b820b 100644 --- a/src/Templates/ProjectTemplates/CSharp/.NETStandard/CSharpNetStandardClassLibrary/CSharpNetStandardClassLibrary.csproj +++ b/src/Templates/ProjectTemplates/CSharp/.NETStandard/CSharpNetStandardClassLibrary/CSharpNetStandardClassLibrary.csproj @@ -5,7 +5,6 @@ 15.0 $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\ - Debug diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicClassLibrary/VisualBasicClassLibrary.csproj b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicClassLibrary/VisualBasicClassLibrary.csproj index c7e21b6fbf5f..b662673c620e 100644 --- a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicClassLibrary/VisualBasicClassLibrary.csproj +++ b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicClassLibrary/VisualBasicClassLibrary.csproj @@ -5,7 +5,6 @@ 15.0 $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\ - Debug diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicConsoleApplication/VisualBasicConsoleApplication.csproj b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicConsoleApplication/VisualBasicConsoleApplication.csproj index 2c22f5813c9c..ac11a28f09f0 100644 --- a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicConsoleApplication/VisualBasicConsoleApplication.csproj +++ b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicConsoleApplication/VisualBasicConsoleApplication.csproj @@ -5,7 +5,6 @@ 15.0 $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\ - Debug diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETStandard/VisualBasicNetStandardClassLibrary/VisualBasicNetStandardClassLibrary.csproj b/src/Templates/ProjectTemplates/VisualBasic/.NETStandard/VisualBasicNetStandardClassLibrary/VisualBasicNetStandardClassLibrary.csproj index 7fa51b806cc2..f80b3c276e79 100644 --- a/src/Templates/ProjectTemplates/VisualBasic/.NETStandard/VisualBasicNetStandardClassLibrary/VisualBasicNetStandardClassLibrary.csproj +++ b/src/Templates/ProjectTemplates/VisualBasic/.NETStandard/VisualBasicNetStandardClassLibrary/VisualBasicNetStandardClassLibrary.csproj @@ -5,7 +5,6 @@ 15.0 $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\ - Debug diff --git a/src/Templates/VisualBasicNetStandardTemplatesSetup/VisualBasicNetStandardTemplatesSetup.csproj b/src/Templates/VisualBasicNetStandardTemplatesSetup/VisualBasicNetStandardTemplatesSetup.csproj index 7326ca0b85a2..82e981ea6a4d 100644 --- a/src/Templates/VisualBasicNetStandardTemplatesSetup/VisualBasicNetStandardTemplatesSetup.csproj +++ b/src/Templates/VisualBasicNetStandardTemplatesSetup/VisualBasicNetStandardTemplatesSetup.csproj @@ -5,7 +5,6 @@ 15.0 $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\ - Debug diff --git a/src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj b/src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj index 98042bdfa21b..978b87ff6cb9 100644 --- a/src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj +++ b/src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj @@ -5,7 +5,6 @@ 15.0 $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\ - Debug diff --git a/test/Directory.Build.props b/test/Directory.Build.props new file mode 100644 index 000000000000..47dde1676bd0 --- /dev/null +++ b/test/Directory.Build.props @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/test/Microsoft.NET.Build.Tests/Microsoft.NET.Build.Tests.csproj b/test/Microsoft.NET.Build.Tests/Microsoft.NET.Build.Tests.csproj index 862358c54065..f5a012d17981 100644 --- a/test/Microsoft.NET.Build.Tests/Microsoft.NET.Build.Tests.csproj +++ b/test/Microsoft.NET.Build.Tests/Microsoft.NET.Build.Tests.csproj @@ -1,6 +1,5 @@  - 11.0 {EC640B7E-332E-40A2-BB6E-5B7EC788F315} diff --git a/test/Microsoft.NET.Pack.Tests/Microsoft.NET.Pack.Tests.csproj b/test/Microsoft.NET.Pack.Tests/Microsoft.NET.Pack.Tests.csproj index 73b74dcfc3a9..41053d39887a 100644 --- a/test/Microsoft.NET.Pack.Tests/Microsoft.NET.Pack.Tests.csproj +++ b/test/Microsoft.NET.Pack.Tests/Microsoft.NET.Pack.Tests.csproj @@ -1,6 +1,5 @@  - 11.0 {588516D7-96AD-4447-A1EB-244D737A3C87} diff --git a/test/Microsoft.NET.Publish.Tests/Microsoft.NET.Publish.Tests.csproj b/test/Microsoft.NET.Publish.Tests/Microsoft.NET.Publish.Tests.csproj index 54143e322f60..fbd134a41cb7 100644 --- a/test/Microsoft.NET.Publish.Tests/Microsoft.NET.Publish.Tests.csproj +++ b/test/Microsoft.NET.Publish.Tests/Microsoft.NET.Publish.Tests.csproj @@ -1,6 +1,6 @@  - + 11.0 {7F31F2C6-6395-400C-ABE3-5A1CEF208096} diff --git a/test/Microsoft.NET.TestFramework/Microsoft.NET.TestFramework.csproj b/test/Microsoft.NET.TestFramework/Microsoft.NET.TestFramework.csproj index fd37c0e3c528..07d8a311c02a 100644 --- a/test/Microsoft.NET.TestFramework/Microsoft.NET.TestFramework.csproj +++ b/test/Microsoft.NET.TestFramework/Microsoft.NET.TestFramework.csproj @@ -1,6 +1,6 @@  - + 11.0 {A33548A0-F3B0-40C3-8C4D-AD2F00596CD6} From fe7de1618cf798791737b7fae85d41e8f15476d5 Mon Sep 17 00:00:00 2001 From: jonsequitur Date: Fri, 10 Feb 2017 14:19:24 -0800 Subject: [PATCH 2/3] replace GetDirectoryNameOfFileAbove with GetPathOfFileAbove --- src/Directory.Build.props | 6 ++---- test/Directory.Build.props | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 47dde1676bd0..235b525380e3 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,5 +1,3 @@ - - - - + + \ No newline at end of file diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 47dde1676bd0..235b525380e3 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -1,5 +1,3 @@ - - - - + + \ No newline at end of file From ed34cb6a407e8d5d29411598c52509b9cbb7e272 Mon Sep 17 00:00:00 2001 From: jonsequitur Date: Sat, 25 Feb 2017 17:27:09 -0800 Subject: [PATCH 3/3] undo import removed from test project --- .../NetFrameworkProject/NetFrameworkProject.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TestAssets/TestProjects/ProjectConstruction/NetFrameworkProject/NetFrameworkProject.csproj b/TestAssets/TestProjects/ProjectConstruction/NetFrameworkProject/NetFrameworkProject.csproj index 5c8f18ad760a..94db01943045 100644 --- a/TestAssets/TestProjects/ProjectConstruction/NetFrameworkProject/NetFrameworkProject.csproj +++ b/TestAssets/TestProjects/ProjectConstruction/NetFrameworkProject/NetFrameworkProject.csproj @@ -1,6 +1,6 @@ - + Debug AnyCPU