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

Commit a835b97

Browse files
stephentoubstephentoub
committed
Merge pull request #7033 from mellinoe/packagingfix
Split packaging for Clrcompression by appx/non-appx
2 parents f13855b + 377b04d commit a835b97

File tree

4 files changed

+46
-12
lines changed

4 files changed

+46
-12
lines changed

‎src/Native/pkg/runtime.native.System.IO.Compression/runtime.native.System.IO.Compression.builds‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,27 @@
2323
<OSGroup>OSX</OSGroup>
2424
<Platform>amd64</Platform>
2525
</Project>
26-
<Project Include="win\runtime.native.System.IO.Compression.pkgproj">
26+
<Project Include="win7\runtime.native.System.IO.Compression.pkgproj">
2727
<OSGroup>Windows_NT</OSGroup>
2828
<Platform>x86</Platform>
2929
</Project>
30-
<Project Include="win\runtime.native.System.IO.Compression.pkgproj">
30+
<Project Include="win7\runtime.native.System.IO.Compression.pkgproj">
3131
<OSGroup>Windows_NT</OSGroup>
3232
<Platform>amd64</Platform>
3333
</Project>
34-
<Project Include="win\runtime.native.System.IO.Compression.pkgproj">
34+
<Project Include="win7\runtime.native.System.IO.Compression.pkgproj">
35+
<OSGroup>Windows_NT</OSGroup>
36+
<Platform>arm</Platform>
37+
</Project>
38+
<Project Include="win10\runtime.native.System.IO.Compression.pkgproj">
39+
<OSGroup>Windows_NT</OSGroup>
40+
<Platform>x86</Platform>
41+
</Project>
42+
<Project Include="win10\runtime.native.System.IO.Compression.pkgproj">
43+
<OSGroup>Windows_NT</OSGroup>
44+
<Platform>amd64</Platform>
45+
</Project>
46+
<Project Include="win10\runtime.native.System.IO.Compression.pkgproj">
3547
<OSGroup>Windows_NT</OSGroup>
3648
<Platform>arm</Platform>
3749
</Project>

‎src/Native/pkg/runtime.native.System.IO.Compression/runtime.native.System.IO.Compression.pkgproj‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,22 @@
2121
<ProjectReference Include="ubuntu\runtime.native.System.IO.Compression.pkgproj">
2222
<Platform>amd64</Platform>
2323
</ProjectReference>
24-
<ProjectReference Include="win\runtime.native.System.IO.Compression.pkgproj">
24+
<ProjectReference Include="win7\runtime.native.System.IO.Compression.pkgproj">
2525
<Platform>amd64</Platform>
2626
</ProjectReference>
27-
<ProjectReference Include="win\runtime.native.System.IO.Compression.pkgproj">
27+
<ProjectReference Include="win7\runtime.native.System.IO.Compression.pkgproj">
2828
<Platform>arm</Platform>
2929
</ProjectReference>
30-
<ProjectReference Include="win\runtime.native.System.IO.Compression.pkgproj">
30+
<ProjectReference Include="win7\runtime.native.System.IO.Compression.pkgproj">
31+
<Platform>x86</Platform>
32+
</ProjectReference>
33+
<ProjectReference Include="win10\runtime.native.System.IO.Compression.pkgproj">
34+
<Platform>amd64</Platform>
35+
</ProjectReference>
36+
<ProjectReference Include="win10\runtime.native.System.IO.Compression.pkgproj">
37+
<Platform>arm</Platform>
38+
</ProjectReference>
39+
<ProjectReference Include="win10\runtime.native.System.IO.Compression.pkgproj">
3140
<Platform>x86</Platform>
3241
</ProjectReference>
3342
</ItemGroup>

src/Native/pkg/runtime.native.System.IO.Compression/win/runtime.native.System.IO.Compression.pkgproj renamed to src/Native/pkg/runtime.native.System.IO.Compression/win10/runtime.native.System.IO.Compression.pkgproj

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,15 @@
44

55
<PropertyGroup>
66
<Version>4.0.1</Version>
7-
<PackageTargetRuntime>win7-$(PackagePlatform)</PackageTargetRuntime>
7+
<PackageTargetRuntime>win10-$(PackagePlatform)</PackageTargetRuntime>
88
</PropertyGroup>
99

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

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

‎src/Native/pkg/runtime.native.System.IO.Compression/win7/runtime.native.System.IO.Compression.pkgproj‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
4+
5+
<PropertyGroup>
6+
<Version>4.0.1</Version>
7+
<PackageTargetRuntime>win7-$(PackagePlatform)</PackageTargetRuntime>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<File Include="$(WinNativePath)\clrcompression.dll">
12+
<TargetPath>runtimes/win7-$(PackagePlatform)/native</TargetPath>
13+
</File>
14+
</ItemGroup>
15+
16+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
17+
</Project>

0 commit comments

Comments
 (0)