Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Split packaging for Clrcompression by appx/non-appx #7033

Merged
stephentoub merged 2 commits into from
Mar 18, 2016
Merged

Split packaging for Clrcompression by appx/non-appx #7033

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d17001
Split packaging for Clrcompression by appx/non-appx
Mar 18, 2016
377b04d
Add win10 to io.compression builds file
Mar 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Split packaging for Clrcompression by appx/non-appx
  • Loading branch information
@mellinoe
Ian Hays authored and mellinoe committed Mar 18, 2016
commit 9d17001c4ae1594568cb2956aae66e678d624986
6 changes: 3 additions & 3 deletions ...tive/pkg/runtime.native.System.IO.Compression/runtime.native.System.IO.Compression.builds
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
<OSGroup>OSX</OSGroup>
<Platform>amd64</Platform>
</Project>
<Project Include="win\runtime.native.System.IO.Compression.pkgproj">
<Project Include="win7\runtime.native.System.IO.Compression.pkgproj">
<OSGroup>Windows_NT</OSGroup>
<Platform>x86</Platform>
</Project>
<Project Include="win\runtime.native.System.IO.Compression.pkgproj">
<Project Include="win7\runtime.native.System.IO.Compression.pkgproj">
<OSGroup>Windows_NT</OSGroup>
<Platform>amd64</Platform>
</Project>
<Project Include="win\runtime.native.System.IO.Compression.pkgproj">
<Project Include="win7\runtime.native.System.IO.Compression.pkgproj">
<OSGroup>Windows_NT</OSGroup>
<Platform>arm</Platform>
</Project>
Expand Down
15 changes: 12 additions & 3 deletions ...ive/pkg/runtime.native.System.IO.Compression/runtime.native.System.IO.Compression.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,22 @@
<ProjectReference Include="ubuntu\runtime.native.System.IO.Compression.pkgproj">
<Platform>amd64</Platform>
</ProjectReference>
<ProjectReference Include="win\runtime.native.System.IO.Compression.pkgproj">
<ProjectReference Include="win7\runtime.native.System.IO.Compression.pkgproj">
<Platform>amd64</Platform>
</ProjectReference>
<ProjectReference Include="win\runtime.native.System.IO.Compression.pkgproj">
<ProjectReference Include="win7\runtime.native.System.IO.Compression.pkgproj">
<Platform>arm</Platform>
</ProjectReference>
<ProjectReference Include="win\runtime.native.System.IO.Compression.pkgproj">
<ProjectReference Include="win7\runtime.native.System.IO.Compression.pkgproj">
<Platform>x86</Platform>
</ProjectReference>
<ProjectReference Include="win10\runtime.native.System.IO.Compression.pkgproj">
<Platform>amd64</Platform>
</ProjectReference>
<ProjectReference Include="win10\runtime.native.System.IO.Compression.pkgproj">
<Platform>arm</Platform>
</ProjectReference>
<ProjectReference Include="win10\runtime.native.System.IO.Compression.pkgproj">
<Platform>x86</Platform>
</ProjectReference>
</ItemGroup>
Expand Down
8 changes: 2 additions & 6 deletions ...time.native.System.IO.Compression.pkgproj → ...time.native.System.IO.Compression.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,15 @@

<PropertyGroup>
<Version>4.0.1</Version>
<PackageTargetRuntime>win7-$(PackagePlatform)</PackageTargetRuntime>
<PackageTargetRuntime>win10-$(PackagePlatform)</PackageTargetRuntime>
</PropertyGroup>

<!-- These paths are not built in CoreFx, enable when fixing https://github.com/dotnet/corefx/issues/826 -->
<ItemGroup>
<File Include="$(WinNativePath)clrcompression.dll">
<TargetPath>runtimes/win7-$(PackagePlatform)/native</TargetPath>
</File>
<!-- use Win10 temporarily as the distinguishing factor, in reality the distinction is app-container vs not. -->
<File Include="$(WinNativePath)..\..\NetCoreForCoreCLR\native\clrcompression.dll">
<TargetPath>runtimes/win10-$(PackagePlatform)/native</TargetPath>
</File>
</ItemGroup>

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
</Project>
17 changes: 17 additions & 0 deletions ...kg/runtime.native.System.IO.Compression/win7/runtime.native.System.IO.Compression.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<Version>4.0.1</Version>
<PackageTargetRuntime>win7-$(PackagePlatform)</PackageTargetRuntime>
</PropertyGroup>

<ItemGroup>
<File Include="$(WinNativePath)\clrcompression.dll">
<TargetPath>runtimes/win7-$(PackagePlatform)/native</TargetPath>
</File>
</ItemGroup>

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>