diff options
author | Niklas Therning <nitherni@microsoft.com> | 2018-09-18 13:21:49 +0300 |
---|---|---|
committer | Niklas Therning <nitherni@microsoft.com> | 2018-09-18 13:21:49 +0300 |
commit | 49f9ed0e66fc2d4cd682821396c6af5e80182048 (patch) | |
tree | 2de750c1ac8a487d7f6d149592a6362ade6a5a77 /pkg/packages.proj | |
parent | f9124d69e41d42196510dd7234b2d53fed48ad4c (diff) | |
parent | 267410d0ab65fabc61d6cd3e0e1c2ebed43ea661 (diff) |
Merge remote-tracking branch 'upstream/master' into bump-corert
Diffstat (limited to 'pkg/packages.proj')
-rw-r--r-- | pkg/packages.proj | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/pkg/packages.proj b/pkg/packages.proj index 51a4d79a1..2234384cb 100644 --- a/pkg/packages.proj +++ b/pkg/packages.proj @@ -17,6 +17,9 @@ <Project Include="$(MSBuildThisFileDirectory)Microsoft.TargetingPack.Private.CoreRT\Microsoft.TargetingPack.Private.CoreRT.builds"> <OSGroup>Windows_NT</OSGroup> </Project> + <Project Include="$(MSBuildThisFileDirectory)Microsoft.DotNet.ILVerification\Microsoft.DotNet.ILVerification.builds"> + <OSGroup>Windows_NT</OSGroup> + </Project> </ItemGroup> <ItemGroup Condition="'$(SkipManagedPackageBuild)' != 'true'"> @@ -25,7 +28,13 @@ <AdditionalProperties>$(AdditionalProperties);BuildIdentityPackage=$(BuildIdentityPackage)</AdditionalProperties> </Project> </ItemGroup> - + + <ItemGroup Condition="'$(SkipManagedPackageBuild)' != 'true' AND '$(ObjWriterBuild)' == 'true'"> + <Project Include="$(MSBuildThisFileDirectory)Microsoft.DotNet.ObjectWriter\Microsoft.DotNet.ObjectWriter.builds"> + <OSGroup>AnyOS</OSGroup> + <AdditionalProperties>$(AdditionalProperties);BuildIdentityPackage=$(BuildIdentityPackage)</AdditionalProperties> + </Project> + </ItemGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> </Project> - |