From 89de0e52d7de9898eb958ec33df4e83ff5a0effb Mon Sep 17 00:00:00 2001
From: John Luo <jt.luo@mail.utoronto.ca>
Date: Wed, 5 Apr 2017 19:27:19 -0700
Subject: [PATCH] Generate package cache for each RID

---
 MetaPackages.sln   | 15 ++++++++++++++-
 build/repo.targets | 20 +++++++++++++++++---
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/MetaPackages.sln b/MetaPackages.sln
index 960c168fd4..a44e361e0a 100644
--- a/MetaPackages.sln
+++ b/MetaPackages.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26228.4
+VisualStudioVersion = 15.0.26323.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED834E68-51C3-4ADE-ACC8-6BA6D4207C09}"
 EndProject
@@ -8,6 +8,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore", "src
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.All", "src\Microsoft.AspNetCore.All\Microsoft.AspNetCore.All.csproj", "{CC8F551E-213A-45E8-AECA-507C4DB4F164}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{97D53BEB-A511-4FBE-B784-AB407D9A219F}"
+	ProjectSection(SolutionItems) = preProject
+		version.props = version.props
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{F92CB7A1-C38E-408C-A7EC-A5C040D041E1}"
+	ProjectSection(SolutionItems) = preProject
+		build\common.props = build\common.props
+		build\dependencies.props = build\dependencies.props
+		build\repo.targets = build\repo.targets
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -29,5 +41,6 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{6F3D43F7-9546-4B41-AF04-CF4708B62051} = {ED834E68-51C3-4ADE-ACC8-6BA6D4207C09}
 		{CC8F551E-213A-45E8-AECA-507C4DB4F164} = {ED834E68-51C3-4ADE-ACC8-6BA6D4207C09}
+		{F92CB7A1-C38E-408C-A7EC-A5C040D041E1} = {97D53BEB-A511-4FBE-B784-AB407D9A219F}
 	EndGlobalSection
 EndGlobal
diff --git a/build/repo.targets b/build/repo.targets
index 58cdeb1cfd..43c77ccc1c 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -9,22 +9,36 @@
   </PropertyGroup>
 
   <Target Name="BuildPackageCache">
+    <GetOSPlatform>
+      <!-- Returns {Linux, macOS, Windows} -->
+      <Output TaskParameter="PlatformName" PropertyName="OSPlatform" />
+    </GetOSPlatform>
 
     <PropertyGroup>
       <MetaPackagePath>$(RepositoryRoot)src\Microsoft.AspNetCore.All\</MetaPackagePath>
       <MetaPackageFile>$(MetaPackagePath)Microsoft.AspNetCore.All.csproj</MetaPackageFile>
       <WorkingDirectory>$(MetaPackagePath)bin\work\</WorkingDirectory>
       <OutputPath>$(MetaPackagePath)bin\packageCache\</OutputPath>
-      <OutputZip>$(RepositoryRoot)artifacts\AspNetCorePackageCache.$(AspNetCoreVersion).zip</OutputZip>
+      <OutputZip Condition="'$(OSPlatform)' == 'Windows'">$(RepositoryRoot)artifacts\AspNetCorePackageCache.win.zip</OutputZip>
+      <OutputZip Condition="'$(OSPlatform)' == 'Linux'">$(RepositoryRoot)artifacts\AspNetCorePackageCache.linux.zip</OutputZip>
+      <OutputZip Condition="'$(OSPlatform)' == 'macOS'">$(RepositoryRoot)artifacts\AspNetCorePackageCache.osx.zip</OutputZip>
     </PropertyGroup>
 
+    <ItemGroup>
+      <RIDs Include="win7-x64" Condition="'$(OSPlatform)' == 'Windows'" />
+      <RIDs Include="win7-x86" Condition="'$(OSPlatform)' == 'Windows'" />
+      <RIDs Include="linux-x64" Condition="'$(OSPlatform)' == 'Linux'" />
+      <RIDs Include="osx-x64" Condition="'$(OSPlatform)' == 'macOS'" />
+    </ItemGroup>
+
     <RemoveDir Directories="$(OutputPath)" />
-    <RemoveDir Directories="$(WorkingDirectory)" />
-    <Exec Command="dotnet cache --entries $(MetaPackageFile) --framework netcoreapp2.0 --runtime win7-x64 --output $(OutputPath) --framework-version 2.0.0-* --working-dir $(WorkingDirectory)" />
+    <RemoveDir Directories="$(WorkingDirectory)-%(RIDs.Identity)" />
+    <Exec Command="dotnet cache --entries $(MetaPackageFile) --framework netcoreapp2.0 --runtime %(RIDs.Identity) --output $(OutputPath) --framework-version 2.0.0-* --working-dir $(WorkingDirectory)-%(RIDs.Identity)" />
 
     <ItemGroup>
       <PackageCacheFiles Include="$(OutputPath)**\*" />
     </ItemGroup>
+
     <ZipArchive File="$(OutputZip)" SourceFiles="@(PackageCacheFiles)" WorkingDirectory="$(OutputPath)" />
   </Target>
 </Project>
\ No newline at end of file