Skip to content

Commit

Permalink
Merge pull request #852 from jonsequitur/BaseIntermediateOutputPath-fix
Browse files Browse the repository at this point in the history 
replace project-level Common.props imports with Directory.Build.props
  • Loading branch information
@srivatsn
srivatsn authored Feb 28, 2017
2 parents ff8eb93 + ed34cb6 commit 350b396
Show file tree
Hide file tree
Showing 20 changed files with 10 additions and 18 deletions.
3 changes: 3 additions & 0 deletions src/Directory.Build.props
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<Project>
<Import Project="$([MSBuild]::GetPathOfFileAbove('Common.props'))" />
</Project>
2 changes: 1 addition & 1 deletion src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/Microsoft.NET.Build.Tasks.UnitTests.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\Common.props" />

<PropertyGroup>
<MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
<ProjectGuid>{6A698C1D-F604-4295-B6FC-7FC726F9FE5F}</ProjectGuid>
Expand Down
2 changes: 1 addition & 1 deletion src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\Common.props" />

<PropertyGroup>
<MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
<ProjectGuid>{DF7D2697-B3B4-45C2-8297-27245F528A99}</ProjectGuid>
Expand Down
1 change: 0 additions & 1 deletion src/Templates/CSharpNetStandardTemplatesSetup/CSharpNetStandardTemplatesSetup.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
<ProjectRootDir>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\</ProjectRootDir>
</PropertyGroup>
<Import Project="$(ProjectRootDir)Common.props" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down
1 change: 0 additions & 1 deletion src/Templates/CSharpTemplatesSetup/CSharpTemplatesSetup.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
<ProjectRootDir>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\</ProjectRootDir>
</PropertyGroup>
<Import Project="$(ProjectRootDir)Common.props" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down
1 change: 0 additions & 1 deletion src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpClassLibrary/CSharpClassLibrary.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
<ProjectRootDir>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\</ProjectRootDir>
</PropertyGroup>
<Import Project="$(ProjectRootDir)Common.props" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down
1 change: 0 additions & 1 deletion ...ProjectTemplates/CSharp/.NETCore/CSharpConsoleApplication/CSharpConsoleApplication.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
<ProjectRootDir>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\</ProjectRootDir>
</PropertyGroup>
<Import Project="$(ProjectRootDir)Common.props" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down
1 change: 0 additions & 1 deletion src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpUnitTest/CSharpUnitTest.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
<ProjectRootDir>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\</ProjectRootDir>
</PropertyGroup>
<Import Project="$(ProjectRootDir)Common.props" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down
1 change: 0 additions & 1 deletion src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpXUnitTest/CSharpXUnitTest.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
<ProjectRootDir>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\</ProjectRootDir>
</PropertyGroup>
<Import Project="$(ProjectRootDir)Common.props" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down
1 change: 0 additions & 1 deletion ...es/CSharp/.NETStandard/CSharpNetStandardClassLibrary/CSharpNetStandardClassLibrary.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
<ProjectRootDir>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\</ProjectRootDir>
</PropertyGroup>
<Import Project="$(ProjectRootDir)Common.props" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down
1 change: 0 additions & 1 deletion ...jectTemplates/VisualBasic/.NETCore/VisualBasicClassLibrary/VisualBasicClassLibrary.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
<ProjectRootDir>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\</ProjectRootDir>
</PropertyGroup>
<Import Project="$(ProjectRootDir)Common.props" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down
1 change: 0 additions & 1 deletion ...s/VisualBasic/.NETCore/VisualBasicConsoleApplication/VisualBasicConsoleApplication.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
<ProjectRootDir>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\</ProjectRootDir>
</PropertyGroup>
<Import Project="$(ProjectRootDir)Common.props" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down
1 change: 0 additions & 1 deletion ....NETStandard/VisualBasicNetStandardClassLibrary/VisualBasicNetStandardClassLibrary.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
<ProjectRootDir>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\</ProjectRootDir>
</PropertyGroup>
<Import Project="$(ProjectRootDir)Common.props" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down
1 change: 0 additions & 1 deletion ...emplates/VisualBasicNetStandardTemplatesSetup/VisualBasicNetStandardTemplatesSetup.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
<ProjectRootDir>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\</ProjectRootDir>
</PropertyGroup>
<Import Project="$(ProjectRootDir)Common.props" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down
1 change: 0 additions & 1 deletion src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
<ProjectRootDir>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\</ProjectRootDir>
</PropertyGroup>
<Import Project="$(ProjectRootDir)Common.props" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down
3 changes: 3 additions & 0 deletions test/Directory.Build.props
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<Project>
<Import Project="$([MSBuild]::GetPathOfFileAbove('Common.props'))" />
</Project>
1 change: 0 additions & 1 deletion test/Microsoft.NET.Build.Tests/Microsoft.NET.Build.Tests.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\Common.props" />
<PropertyGroup>
<MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
<ProjectGuid>{EC640B7E-332E-40A2-BB6E-5B7EC788F315}</ProjectGuid>
Expand Down
1 change: 0 additions & 1 deletion test/Microsoft.NET.Pack.Tests/Microsoft.NET.Pack.Tests.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\Common.props" />
<PropertyGroup>
<MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
<ProjectGuid>{588516D7-96AD-4447-A1EB-244D737A3C87}</ProjectGuid>
Expand Down
2 changes: 1 addition & 1 deletion test/Microsoft.NET.Publish.Tests/Microsoft.NET.Publish.Tests.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\Common.props" />

<PropertyGroup>
<MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
<ProjectGuid>{7F31F2C6-6395-400C-ABE3-5A1CEF208096}</ProjectGuid>
Expand Down
2 changes: 1 addition & 1 deletion test/Microsoft.NET.TestFramework/Microsoft.NET.TestFramework.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\Common.props" />

<PropertyGroup>
<MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
<ProjectGuid>{A33548A0-F3B0-40C3-8C4D-AD2F00596CD6}</ProjectGuid>
Expand Down

0 comments on commit 350b396

Please sign in to comment.