diff options
| author | Andon Andonov <andon.andonov@microsoft.com> | 2017-12-19 21:46:27 +0300 |
|---|---|---|
| committer | Andon Andonov <andon.andonov@microsoft.com> | 2017-12-20 01:24:57 +0300 |
| commit | a3cce49758a6afe1d9d9920213605242383e35c1 (patch) | |
| tree | a78f220c7c01f9a5fb71204ef53946a7db8ba294 /pkg | |
| parent | d5ecb0cb9e85eeba829aece223556ee611f7ddf8 (diff) | |
Add package reference for multiple platforms
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.builds | 10 | ||||
| -rw-r--r-- | pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj | 10 | ||||
| -rw-r--r-- | pkg/packages.proj | 15 |
3 files changed, 27 insertions, 8 deletions
diff --git a/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.builds b/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.builds index 3c6ea9fc8..0a0cff604 100644 --- a/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.builds +++ b/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.builds @@ -3,12 +3,12 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> - <Project Include="Microsoft.DotNet.ILCompiler.pkgproj" > - <OSGroup>AnyOS</OSGroup> - </Project> - <!-- Include this to force a build of platform-specific packages--> - <Project Include="$(MSBuildThisFileDirectory)\TargetSpecific\Microsoft.DotNet.ILCompiler.pkgproj" /> + <!-- Only build the metapackage in Windows - in CoreCLR this logic is included in a dir.props file. This is a workaround until CoreRT supports multiple packages --> + <Project Include="Microsoft.DotNet.ILCompiler.pkgproj" Condition="'$(BuildIdentityPackage)' != 'false'"/> + + <!-- Include this to force a build of platform-specific packages --> + <Project Include="$(MSBuildThisFileDirectory)\TargetSpecific\Microsoft.DotNet.ILCompiler.pkgproj"/> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> diff --git a/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj b/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj index fbf37602c..40f3ad025 100644 --- a/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj +++ b/pkg/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj @@ -16,7 +16,15 @@ <!-- The package references are used to generate a runtimes.json for the meta-package--> <ItemGroup> - <ProjectReference Include="TargetSpecific\Microsoft.DotNet.ILCompiler.pkgproj" /> + <ProjectReference Include="TargetSpecific\Microsoft.DotNet.ILCompiler.pkgproj"> + <AdditionalProperties>%(ProjectReference.AdditionalProperties);PackageTargetRuntime=win-x64</AdditionalProperties> + </ProjectReference> + <ProjectReference Include="TargetSpecific\Microsoft.DotNet.ILCompiler.pkgproj"> + <AdditionalProperties>%(ProjectReference.AdditionalProperties);PackageTargetRuntime=linux-x64</AdditionalProperties> + </ProjectReference> + <ProjectReference Include="TargetSpecific\Microsoft.DotNet.ILCompiler.pkgproj"> + <AdditionalProperties>%(ProjectReference.AdditionalProperties);PackageTargetRuntime=osx-x64</AdditionalProperties> + </ProjectReference> </ItemGroup> <ItemGroup> diff --git a/pkg/packages.proj b/pkg/packages.proj index 83764c693..51a4d79a1 100644 --- a/pkg/packages.proj +++ b/pkg/packages.proj @@ -6,12 +6,23 @@ <BuildAllOSGroups Condition="'$(FilterToOSGroup)' != ''">false</BuildAllOSGroups> </PropertyGroup> - <ItemGroup Condition="'$(SkipManagedPackageBuild)' != 'true'"> + <PropertyGroup Condition="'$(OfficialBuildId)' != ''"> + <!-- During an official build, only build identity and targeting packages in the Windows build --> + <BuildIdentityPackage Condition="'$(BuildIdentityPackage)' == '' AND '$(OS)' != 'Windows_NT'">false</BuildIdentityPackage> + <BuildIdentityPackage Condition="'$(BuildIdentityPackage)' == '' AND '$(OS)' == 'Windows_NT' AND '$(BuildArch)' == 'x64'">true</BuildIdentityPackage> + </PropertyGroup> + + <!-- Targeting pack to be consumed by CoreFX - intentionally produce only a Windows x64 version --> + <ItemGroup Condition="'$(SkipManagedPackageBuild)' != 'true' AND '$(BuildIdentityPackage)' != 'false'"> <Project Include="$(MSBuildThisFileDirectory)Microsoft.TargetingPack.Private.CoreRT\Microsoft.TargetingPack.Private.CoreRT.builds"> - <OSGroup>AnyOS</OSGroup> + <OSGroup>Windows_NT</OSGroup> </Project> + </ItemGroup> + + <ItemGroup Condition="'$(SkipManagedPackageBuild)' != 'true'"> <Project Include="$(MSBuildThisFileDirectory)Microsoft.DotNet.ILCompiler\Microsoft.DotNet.ILCompiler.builds"> <OSGroup>AnyOS</OSGroup> + <AdditionalProperties>$(AdditionalProperties);BuildIdentityPackage=$(BuildIdentityPackage)</AdditionalProperties> </Project> </ItemGroup> |