diff options
| -rw-r--r-- | pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.builds | 2 | ||||
| -rw-r--r-- | pkg/Microsoft.NETCore.Targets/Microsoft.NETCore.Targets.builds | 2 | ||||
| -rw-r--r-- | pkg/dir.props | 13 | ||||
| -rw-r--r-- | pkg/dir.traversal.targets | 4 |
4 files changed, 14 insertions, 7 deletions
diff --git a/pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.builds b/pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.builds index a2a9330b70..431f35e358 100644 --- a/pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.builds +++ b/pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.builds @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <ItemGroup Condition="'$(OfficialBuildId)' == '' Or '$(BuildAllConfigurations)' == 'true'"> + <ItemGroup Condition="'$(BuildingAnOfficialBuildLeg)' != 'true' Or '$(BuildAllConfigurations)' == 'true'"> <Project Include="Microsoft.NETCore.Platforms.pkgproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> diff --git a/pkg/Microsoft.NETCore.Targets/Microsoft.NETCore.Targets.builds b/pkg/Microsoft.NETCore.Targets/Microsoft.NETCore.Targets.builds index b9038331ca..0c02cbd297 100644 --- a/pkg/Microsoft.NETCore.Targets/Microsoft.NETCore.Targets.builds +++ b/pkg/Microsoft.NETCore.Targets/Microsoft.NETCore.Targets.builds @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <ItemGroup Condition="'$(OfficialBuildId)' == '' Or '$(BuildAllConfigurations)' == 'true'"> + <ItemGroup Condition="'$(BuildingAnOfficialBuildLeg)' != 'true' Or '$(BuildAllConfigurations)' == 'true'"> <Project Include="Microsoft.NETCore.Targets.pkgproj"/> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> diff --git a/pkg/dir.props b/pkg/dir.props index 17a793349a..495fa71341 100644 --- a/pkg/dir.props +++ b/pkg/dir.props @@ -2,6 +2,13 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> + <PropertyGroup> + <!-- Used to determine if we should build some packages only once across multiple official build legs. + For offline builds we still set OfficialBuildId but we need to build all the packages for a single + leg only, so we also take DotNetBuildOffline into account. --> + <BuildingAnOfficialBuildLeg Condition="'$(BuildingAnOfficialBuildLeg)' == '' AND '$(OfficialBuildId)' != '' AND '$(DotNetBuildOffline)' != 'true'">true</BuildingAnOfficialBuildLeg> + </PropertyGroup> + <!-- Packages opt-in to automatic RID-specific builds by placing a *.RID.props next to their project that defines the OfficialBuildRID item: all RIDs targeted by the package --> <Import Project="$(MSBuildProjectDirectory)\*.rids.props" /> @@ -16,7 +23,7 @@ </BuildRID> </ItemGroup> - <!-- create the "Project" item which is the current $(MSBuildProjectName).pkgproj with meta-data for all + <!-- create the "Project" item which is the current $(MSBuildProjectName).pkgproj with meta-data for all supported RIDs --> <ItemGroup> <_project Include="@(BuildRID)"> @@ -48,10 +55,10 @@ <AdditionalLibPackageExcludes Condition="'$(SymbolFileExtension)' != ''" Include="%2A%2A\%2A$(SymbolFileExtension)" /> <AdditionalSymbolPackageExcludes Condition="'$(LibraryFileExtension)' != ''" Include="%2A%2A\%2A.a;%2A%2A\%2A$(LibraryFileExtension)" /> </ItemGroup> - + <PropertyGroup> <!-- BlockStable on private packages by default --> <BlockStable Condition="'$(BlockStable)' == '' and $(MSBuildProjectName.Contains('Private'))">true</BlockStable> </PropertyGroup> - + </Project> diff --git a/pkg/dir.traversal.targets b/pkg/dir.traversal.targets index 049c8546b5..2e651cb389 100644 --- a/pkg/dir.traversal.targets +++ b/pkg/dir.traversal.targets @@ -2,8 +2,8 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.traversal.targets" /> - - <PropertyGroup Condition="'$(OfficialBuildId)' != ''"> + + <PropertyGroup Condition="'$(BuildingAnOfficialBuildLeg)' == 'true'"> <!-- During an official build, only build identity packages in the AllConfigurations build --> <SkipBuildIdentityPackage Condition="'$(BuildAllConfigurations)' != 'true'">true</SkipBuildIdentityPackage> |