Refactoring shared item groups between deb and pkg to the same location.

build/package/Installer.DEB.proj

@@ -35,8 +35,8 @@
 
       <!-- Create layout: Aspnet runtime -->
       <Copy
-        DestinationFiles="@(AspNetRuntimeFiles ->'$(LayoutPackageRootDir)/%(RecursiveDir)%(Filename)%(Extension)')"
-        SourceFiles="@(AspNetRuntimeFiles)"
+        DestinationFiles="@(AspNetRuntimeFilesInput ->'$(LayoutPackageRootDir)/%(RecursiveDir)%(Filename)%(Extension)')"
+        SourceFiles="@(AspNetRuntimeFilesInput)"
         OverwriteReadOnlyFiles="True"
         SkipUnchangedFiles="False"
         UseHardlinksIfPossible="False" />

build/package/Installer.DEB.targets

@@ -42,11 +42,9 @@
       <ManpagesDirectory>$(RepoRoot)/Documentation/manpages</ManpagesDirectory>
       <EndToEndTestProject>$(RepoRoot)/test/EndToEnd/EndToEnd.csproj</EndToEndTestProject>
       <CLISdkRoot>$(OutputDirectory)/sdk</CLISdkRoot>
-      <AspNetRuntimeRoot>$(AspNetRuntimePackageStorePublishDirectory)</AspNetRuntimeRoot>
     </PropertyGroup>
 
     <ItemGroup>
-      <AspNetRuntimeFiles Include="$(AspNetRuntimeRoot)/**/*" />
       <CLISdkFiles Include="$(CLISdkRoot)/**/*" />
       <SdkDebManPageFiles Include="$(ManpagesDirectory)/**/*" />
     </ItemGroup>

build/package/Installer.PKG.targets

@@ -80,13 +80,8 @@
             DependsOnTargets="Init;Layout;SetupPkgInputsOutputs"
             Condition=" '$(OSName)' == 'osx' ">
 
-      <!-- Adding the ASP.NET runtime package store to the pkg -->
-      <ItemGroup>
-        <AspNetRuntimePackageStoreFiles Include="$(AspNetRuntimePackageStorePublishDirectory)/**/*" />
-      </ItemGroup>
-
-      <Copy SourceFiles="@(AspNetRuntimePackageStoreFiles)"
-            DestinationFiles="@(AspNetRuntimePackageStoreFiles->'$(SdkLayoutOutputDirectory)/%(RecursiveDir)%(FileName)%(Extension)')" />
+      <Copy SourceFiles="@(AspNetRuntimeFilesInput)"
+            DestinationFiles="@(AspNetRuntimeFilesInput->'$(SdkLayoutOutputDirectory)/%(RecursiveDir)%(FileName)%(Extension)')" />
 
       <Exec Command="pkgbuild
                      --root '$(SdkLayoutOutputDirectory)'

build/package/Layout.targets

@@ -16,6 +16,8 @@
       <CombinedFrameworkSdkInput Include="$(OutputDirectory)/sdk/**/*" />
       <CombinedFrameworkSdkInput Include="$(OutputDirectory)/additionalDeps/**/*" />
       <CombinedFrameworkSdkInput Include="$(OutputDirectory)/store/**/*" />
+
+      <AspNetRuntimeFilesInput Include="$(AspNetRuntimePackageStorePublishDirectory)/**/*" />
     </ItemGroup>
 
     <MakeRelative