summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWes Haggard <weshaggard@users.noreply.github.com>2018-05-01 17:15:45 (GMT)
committerGitHub <noreply@github.com>2018-05-01 17:15:45 (GMT)
commit4ab5c2d88a665bf86cdbf59817531a5990629701 (patch)
tree218cf944e3403e963d538f8239d7f11f0583d39d /src
parent30b5f0e6a589dab5fba4ffec95cf47ea63e24635 (diff)
parent007cff42434be688b5ec5de15f9f1b8b15c91acd (diff)
downloadcoreclr-4ab5c2d88a665bf86cdbf59817531a5990629701.zip
coreclr-4ab5c2d88a665bf86cdbf59817531a5990629701.tar.gz
coreclr-4ab5c2d88a665bf86cdbf59817531a5990629701.tar.bz2
Merge pull request #17846 from weshaggard/FixSourceBuild
Switch source build property to DotNetBuildFromSource
Diffstat (limited to 'src')
-rw-r--r--src/.nuget/dir.traversal.targets10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/.nuget/dir.traversal.targets b/src/.nuget/dir.traversal.targets
index 52a33c4..33d8657 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>