Merge in 'release/2.1' changes
This commit is contained in:
commit
c4c23b0d59
|
|
@ -9,7 +9,7 @@
|
||||||
|
|
||||||
<!-- Temporary: this target is used to gather version information to pass to submodule builds. This can be removed after we finish merging submodules. -->
|
<!-- Temporary: this target is used to gather version information to pass to submodule builds. This can be removed after we finish merging submodules. -->
|
||||||
<Target Name="GetBaselineArtifactInfo"
|
<Target Name="GetBaselineArtifactInfo"
|
||||||
Condition="'$(IsPackableInNonServicingBuild)' == 'true'"
|
Condition="'$(IsPackableInNonServicingBuild)' == 'true' AND '$(IsPackable)' != 'true' "
|
||||||
Returns="@(ArtifactInfo)"
|
Returns="@(ArtifactInfo)"
|
||||||
BeforeTargets="GetArtifactInfo">
|
BeforeTargets="GetArtifactInfo">
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue