diff options
-rw-r--r-- | src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds | 4 | ||||
-rw-r--r-- | src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds | 6 | ||||
-rw-r--r-- | src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds | 6 | ||||
-rw-r--r-- | src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.builds | 6 | ||||
-rw-r--r-- | src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds | 6 | ||||
-rw-r--r-- | src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.builds | 6 | ||||
-rw-r--r-- | src/.nuget/builds.targets (renamed from src/.nuget/dir.traversal.targets) | 8 | ||||
-rw-r--r-- | src/.nuget/dir.props | 7 | ||||
-rw-r--r-- | src/.nuget/packages.builds | 21 | ||||
-rw-r--r-- | src/.nuget/packaging.props | 5 |
10 files changed, 33 insertions, 42 deletions
diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds index b14c6b29ab..fc085ab08b 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds +++ b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project Sdk="Microsoft.Build.Traversal"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> @@ -7,5 +7,5 @@ <Project Include="$(MSBuildProjectName).pkgproj" /> </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), builds.targets))\builds.targets" /> </Project> diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds index 679fffeadd..c3acb44409 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project Sdk="Microsoft.Build.Traversal"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <!-- identity project, runtime specific projects are included by props above --> <Project Include="$(MSBuildProjectName).pkgproj" /> </ItemGroup> - - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), builds.targets))\builds.targets" /> </Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds index dd00e039a6..c3acb44409 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds +++ b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project Sdk="Microsoft.Build.Traversal"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <!-- identity project, runtime specific projects are included by props above --> <Project Include="$(MSBuildProjectName).pkgproj" /> </ItemGroup> - - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), builds.targets))\builds.targets" /> </Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.builds b/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.builds index 6318c1c0d1..5d7580412a 100644 --- a/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.builds +++ b/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.builds @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project Sdk="Microsoft.Build.Traversal"> <Import Project="Microsoft.NETCore.Native.props" /> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> @@ -8,6 +8,6 @@ <!-- identity project, runtime specific projects are included by props above --> <Project Include="$(MSBuildProjectName).pkgproj" /> </ItemGroup> - - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), builds.targets))\builds.targets" /> </Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds index dd00e039a6..c3acb44409 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project Sdk="Microsoft.Build.Traversal"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <!-- identity project, runtime specific projects are included by props above --> <Project Include="$(MSBuildProjectName).pkgproj" /> </ItemGroup> - - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), builds.targets))\builds.targets" /> </Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.builds b/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.builds index c55af3a6d3..fc085ab08b 100644 --- a/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.builds +++ b/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.builds @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project Sdk="Microsoft.Build.Traversal"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <!-- identity project, runtime specific projects are included by props above --> <Project Include="$(MSBuildProjectName).pkgproj" /> </ItemGroup> - - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), builds.targets))\builds.targets" /> </Project> diff --git a/src/.nuget/dir.traversal.targets b/src/.nuget/builds.targets index 33d8657d2a..d58f010d39 100644 --- a/src/.nuget/dir.traversal.targets +++ b/src/.nuget/builds.targets @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - - <Import Project="$(MSBuildThisFileDirectory)..\..\dir.traversal.targets" /> - +<Project> <PropertyGroup Condition="'$(BuildIdentityPackage)' == ''"> <BuildIdentityPackage>true</BuildIdentityPackage> @@ -28,8 +25,7 @@ </ItemGroup> <ItemGroup> - <Project Remove="@(Project)" /> - <Project Include="@(_projectsToBuild)" /> + <ProjectReference Include="@(_projectsToBuild)" /> </ItemGroup> </Target> </Project>
\ No newline at end of file diff --git a/src/.nuget/dir.props b/src/.nuget/dir.props index 80081ad025..029b9a4a7d 100644 --- a/src/.nuget/dir.props +++ b/src/.nuget/dir.props @@ -1,6 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" /> +<Project> + + <!-- Packaging projects (.pkgproj) are non-SDK-style, so they need to directly import Directory.Build.props --> + <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" + Condition="'$(MSBuildProjectExtension)' == '.pkgproj'" /> <Import Project="packaging.props" /> <PropertyGroup> diff --git a/src/.nuget/packages.builds b/src/.nuget/packages.builds index b94e14a429..f97790c28f 100644 --- a/src/.nuget/packages.builds +++ b/src/.nuget/packages.builds @@ -1,28 +1,27 @@ -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" /> +<Project Sdk="Microsoft.Build.Traversal"> <Import Project="packaging.props" /> <ItemGroup Condition="'$(__SkipCoreLibBuild)'==''"> - <Project Include="Microsoft.NETCore.Runtime.CoreCLR\Microsoft.NETCore.Runtime.CoreCLR.builds" /> + <ProjectReference Include="Microsoft.NETCore.Runtime.CoreCLR\Microsoft.NETCore.Runtime.CoreCLR.builds" /> </ItemGroup> <ItemGroup Condition="'$(TargetsWindows)'=='true'"> - <Project Include="Microsoft.TargetingPack.Private.CoreCLR\Microsoft.TargetingPack.Private.CoreCLR.pkgproj" /> + <ProjectReference Include="Microsoft.TargetingPack.Private.CoreCLR\Microsoft.TargetingPack.Private.CoreCLR.pkgproj" /> </ItemGroup> <ItemGroup Condition="'$(TargetsWindows)'=='true' OR '$(DotNetBuildFromSource)'=='true'"> - <Project Include="Microsoft.NET.Sdk.IL\Microsoft.NET.Sdk.IL.pkgproj" /> + <ProjectReference Include="Microsoft.NET.Sdk.IL\Microsoft.NET.Sdk.IL.pkgproj" /> </ItemGroup> <ItemGroup Condition="'$(__SkipNativeBuild)'==''"> - <Project Include="Microsoft.NETCore.Jit\Microsoft.NETCore.Jit.builds" /> - <Project Include="Microsoft.NETCore.TestHost\Microsoft.NETCore.TestHost.builds" /> - <Project Include="Microsoft.NETCore.Native\Microsoft.NETCore.Native.builds" /> + <ProjectReference Include="Microsoft.NETCore.Jit\Microsoft.NETCore.Jit.builds" /> + <ProjectReference Include="Microsoft.NETCore.TestHost\Microsoft.NETCore.TestHost.builds" /> + <ProjectReference Include="Microsoft.NETCore.Native\Microsoft.NETCore.Native.builds" /> </ItemGroup> <ItemGroup> - <Project Include="Microsoft.NETCore.ILAsm\Microsoft.NETCore.ILAsm.builds" /> - <Project Include="Microsoft.NETCore.ILDAsm\Microsoft.NETCore.ILDAsm.builds" /> + <ProjectReference Include="Microsoft.NETCore.ILAsm\Microsoft.NETCore.ILAsm.builds" /> + <ProjectReference Include="Microsoft.NETCore.ILDAsm\Microsoft.NETCore.ILDAsm.builds" /> </ItemGroup> <!-- Generate a version.txt file we include in our packages @@ -50,6 +49,4 @@ BeforeTargets="Build"> <MSBuild Targets="Build" Projects="$(CoreclrDir)\src\createVersionFile.proj"/> </Target> - - <Import Project="$(MSBuildThisFileDirectory)..\..\dir.traversal.targets" /> </Project> diff --git a/src/.nuget/packaging.props b/src/.nuget/packaging.props index 9344e4a402..1770963586 100644 --- a/src/.nuget/packaging.props +++ b/src/.nuget/packaging.props @@ -1,10 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <Project> - <PropertyGroup> - <!-- Packaging projects are non-SDK-style and directly import Directory.Build.props. They can also import Microsoft.Common.props. - Make sure Microsoft.Common.props does not import Directory.Build.props again --> - <ImportDirectoryBuildProps>false</ImportDirectoryBuildProps> - </PropertyGroup> <PropertyGroup> <PackageDescriptionFile>$(MSBuildThisFileDirectory)/descriptions.json</PackageDescriptionFile> |