diff options
| author | Eric St. John <ericstj@microsoft.com> | 2016-10-04 22:37:01 +0300 |
|---|---|---|
| committer | Eric StJohn <ericstj@microsoft.com> | 2016-10-07 19:18:57 +0300 |
| commit | cd17e98cc1b521d97047893dd7d14344c250341c (patch) | |
| tree | e77232df07e4edeb31830fe4b7d6d2aabb16529f /Packaging.props | |
| parent | ac43f1c56696a925f675715331ac0678781d83ec (diff) | |
Make PKGProj's restore the baseline project.json
PKGProj build depends on harvesting dlls from previously shipped
packages. Rather than force every package in the repo to declare the
version of the last-shipped package in project.json we have a central
copy listing everything. The problem here is that if this project isn't
restored we'll just silently drop assets from the package, which can
cause tests to fail or package build to fail validation. This also
causes a problem for folks that want to just sync the repo and build
a single project without doing a full restore.
To ensure that we'll always have the baseline restored I set this as the
ProjectJson for the pkgproj and ensure that we run restore during
package build.
Diffstat (limited to 'Packaging.props')
| -rw-r--r-- | Packaging.props | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Packaging.props b/Packaging.props index 249a19ef07..4390ad4d76 100644 --- a/Packaging.props +++ b/Packaging.props @@ -24,7 +24,7 @@ <SkipValidatePackageTargetFramework>true</SkipValidatePackageTargetFramework> </PropertyGroup> - <Import Condition="Exists('pkg/baseline/baseline.props')" Project="pkg/baseline/baseline.props" /> + <Import Condition="Exists('pkg/baseline/baseline.props') AND '$(MSBuildProjectExtension)' == '.pkgproj'" Project="pkg/baseline/baseline.props" /> <PropertyGroup Condition="'$(OsEnvironment)'=='Unix'"> <!-- |