Merge pull request dotnet/corefx#9105 from ianhays/clrcompression_packagesplit

Make UWP clrcompression package aot specific

Commit migrated from https://github.com/dotnet/corefx/commit/5c1587f8c3abf6b85a2849b81dd37bec5a327466

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

@@ -31,15 +31,15 @@
       <OSGroup>opensuse.13.2</OSGroup>
       <Platform>amd64</Platform>
     </Project>
-    <Project Include="win7\runtime.native.System.IO.Compression.pkgproj">
+    <Project Include="win\runtime.native.System.IO.Compression.pkgproj">
       <OSGroup>Windows_NT</OSGroup>
       <Platform>x86</Platform>
     </Project>
-    <Project Include="win7\runtime.native.System.IO.Compression.pkgproj">
+    <Project Include="win\runtime.native.System.IO.Compression.pkgproj">
       <OSGroup>Windows_NT</OSGroup>
       <Platform>amd64</Platform>
     </Project>
-    <Project Include="win8\runtime.native.System.IO.Compression.pkgproj">
+    <Project Include="win\runtime.native.System.IO.Compression.pkgproj">
       <OSGroup>Windows_NT</OSGroup>
       <Platform>arm</Platform>
     </Project>

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

@@ -9,16 +9,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <RuntimeDependency Include="runtime.win10-amd64.runtime.native.System.IO.Compression">
-      <TargetRuntime>win10-amd64</TargetRuntime>
+  <RuntimeDependency Include="runtime.win10-amd64-aot.runtime.native.System.IO.Compression">
+      <TargetRuntime>win10-amd64-aot</TargetRuntime>
       <Version>4.0.1-$(ExternalExpectedPrerelease)</Version>
     </RuntimeDependency>
-    <RuntimeDependency Include="runtime.win10-arm.runtime.native.System.IO.Compression">
-      <TargetRuntime>win10-arm</TargetRuntime>
+    <RuntimeDependency Include="runtime.win10-arm-aot.runtime.native.System.IO.Compression">
+      <TargetRuntime>win10-arm-aot</TargetRuntime>
       <Version>4.0.1-$(ExternalExpectedPrerelease)</Version>
     </RuntimeDependency>
-    <RuntimeDependency Include="runtime.win10-x86.runtime.native.System.IO.Compression">
-      <TargetRuntime>win10-x86</TargetRuntime>
+    <RuntimeDependency Include="runtime.win10-x86-aot.runtime.native.System.IO.Compression">
+      <TargetRuntime>win10-x86-aot</TargetRuntime>
       <Version>4.0.1-$(ExternalExpectedPrerelease)</Version>
     </RuntimeDependency>
     <!-- make this package installable and noop in a packages.config-based project -->
@@ -46,13 +46,13 @@
     <ProjectReference Include="ubuntu\16.04\runtime.native.System.IO.Compression.pkgproj">
       <Platform>amd64</Platform>
     </ProjectReference>
-    <ProjectReference Include="win7\runtime.native.System.IO.Compression.pkgproj">
+    <ProjectReference Include="win\runtime.native.System.IO.Compression.pkgproj">
       <Platform>x86</Platform>
     </ProjectReference>
-    <ProjectReference Include="win7\runtime.native.System.IO.Compression.pkgproj">
+    <ProjectReference Include="win\runtime.native.System.IO.Compression.pkgproj">
       <Platform>amd64</Platform>
     </ProjectReference>
-    <ProjectReference Include="win8\runtime.native.System.IO.Compression.pkgproj">
+    <ProjectReference Include="win\runtime.native.System.IO.Compression.pkgproj">
       <Platform>arm</Platform>
     </ProjectReference>
   </ItemGroup>

src/libraries/Native/pkg/runtime.native.System.IO.Compression/win/runtime.native.System.IO.Compression.pkgproj

+<?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>
+    <WinVersion Condition="'$(PackagePlatform)'=='arm'">win8</WinVersion>
+    <WinVersion Condition="'$(PackagePlatform)'!='arm'">win7</WinVersion>
+    <PackageTargetRuntime>$(WinVersion)-$(PackagePlatform)</PackageTargetRuntime>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <NativeFile Include="$(WinNativePath)\clrcompression.dll">
+      <TargetPath>runtimes/$(WinVersion)-$(PackagePlatform)/native</TargetPath>
+    </NativeFile>         
+  </ItemGroup>
+
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+</Project>

src/libraries/Native/pkg/runtime.native.System.IO.Compression/win10/runtime.native.System.IO.Compression.pkgproj

@@ -4,12 +4,12 @@
   
   <PropertyGroup>
     <Version>4.0.1</Version>
-    <PackageTargetRuntime>win10-$(PackagePlatform)</PackageTargetRuntime>
+    <PackageTargetRuntime>win10-$(PackagePlatform)-aot</PackageTargetRuntime>
   </PropertyGroup>
 
   <ItemGroup>
     <NativeFile Include="$(WinNativePath)..\..\NetCoreForCoreCLR\native\clrcompression.dll">
-      <TargetPath>runtimes/win10-$(PackagePlatform)/lib/netcore50</TargetPath>
+      <TargetPath>runtimes/win10-$(PackagePlatform)-aot/lib/netcore50</TargetPath>
     </NativeFile>
   </ItemGroup>
 

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

-<?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>
-        <NativeFile Include="$(WinNativePath)\clrcompression.dll">
-            <TargetPath>runtimes/win7-$(PackagePlatform)/native</TargetPath>
-        </NativeFile>
-    </ItemGroup>
-
-    <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>

src/libraries/Native/pkg/runtime.native.System.IO.Compression/win8/runtime.native.System.IO.Compression.pkgproj

-<?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>win8-$(PackagePlatform)</PackageTargetRuntime>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <NativeFile Include="$(WinNativePath)\clrcompression.dll">
-            <TargetPath>runtimes/win8-$(PackagePlatform)/native</TargetPath>
-        </NativeFile>
-    </ItemGroup>
-
-    <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
\ No newline at end of file