diff options
| author | Wes Haggard <weshaggard@users.noreply.github.com> | 2018-05-01 10:15:45 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-01 10:15:45 -0700 |
| commit | 4ab5c2d88a665bf86cdbf59817531a5990629701 (patch) | |
| tree | 218cf944e3403e963d538f8239d7f11f0583d39d /src | |
| parent | 30b5f0e6a589dab5fba4ffec95cf47ea63e24635 (diff) | |
| parent | 007cff42434be688b5ec5de15f9f1b8b15c91acd (diff) | |
| download | coreclr-4ab5c2d88a665bf86cdbf59817531a5990629701.tar.gz coreclr-4ab5c2d88a665bf86cdbf59817531a5990629701.tar.bz2 coreclr-4ab5c2d88a665bf86cdbf59817531a5990629701.zip | |
Merge pull request #17846 from weshaggard/FixSourceBuild
Switch source build property to DotNetBuildFromSource
Diffstat (limited to 'src')
| -rw-r--r-- | src/.nuget/dir.traversal.targets | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/.nuget/dir.traversal.targets b/src/.nuget/dir.traversal.targets index 52a33c42d1..33d8657d2a 100644 --- a/src/.nuget/dir.traversal.targets +++ b/src/.nuget/dir.traversal.targets @@ -6,10 +6,10 @@ <PropertyGroup Condition="'$(BuildIdentityPackage)' == ''"> <BuildIdentityPackage>true</BuildIdentityPackage> - <!-- 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="'$(OfficialBuildId)' != '' AND '$(DotNetBuildOffline)' != 'true'">true</BuildingAnOfficialBuildLeg> + <!-- 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 DotNetBuildFromSource into account. --> + <BuildingAnOfficialBuildLeg Condition="'$(OfficialBuildId)' != '' AND '$(DotNetBuildFromSource)' != 'true'">true</BuildingAnOfficialBuildLeg> <!-- During an official build, only build identity packages on windows x64 legs --> <BuildIdentityPackage Condition="'$(BuildingAnOfficialBuildLeg)' == 'true' AND ('$(OS)' != 'Windows_NT' OR '$(BuildArch)' != 'x64')">false</BuildIdentityPackage> @@ -22,7 +22,7 @@ <ItemGroup> <_projectsToBuild Include="@(Project)" Condition="'%(Project.PackageTargetRuntime)' == '$(PackageRID)'" /> </ItemGroup> - + <ItemGroup Condition="'$(BuildIdentityPackage)' == 'true'"> <_projectsToBuild Include="@(Project)" Condition="'%(Project.PackageTargetRuntime)' == ''" /> </ItemGroup> |