Build netcoreapp targeting pack nupkg (dotnet/core-setup#5085)

* Build netcoreapp targeting pack nupkg

Copies the Microsoft.NETCore.App packaging project and:

Removes package dependencies and runtime.json.

Stops "runtime.<rid>.Microsoft.NETCore.App.Ref" nupkgs from being created.

Moves ref => data.

Sets PackageType to Data.

Includes platform manifest.

Commit migrated from https://github.com/dotnet/core-setup/commit/9ec8e7ea44f00acf1520e558f510fd0dbcb8b8ab

diff --git a/src/installer/pkg/projects/Microsoft.NETCore.App.Ref/Microsoft.NETCore.App.Ref.builds b/src/installer/pkg/projects/Microsoft.NETCore.App.Ref/Microsoft.NETCore.App.Ref.builds
new file mode 100644 (file)
index 0000000..74b865c
--- /dev/null
+++ b/src/installer/pkg/projects/Microsoft.NETCore.App.Ref/Microsoft.NETCore.App.Ref.builds
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <HasRuntimePackages>false</HasRuntimePackages>
+  </PropertyGroup>
+
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+
+  <ItemGroup>
+    <Project Include="$(MSBuildProjectName).pkgproj" />
+  </ItemGroup>
+
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>

diff --git a/src/installer/pkg/projects/Microsoft.NETCore.App.Ref/Microsoft.NETCore.App.Ref.pkgproj b/src/installer/pkg/projects/Microsoft.NETCore.App.Ref/Microsoft.NETCore.App.Ref.pkgproj
new file mode 100644 (file)
index 0000000..77a83fe
--- /dev/null
+++ b/src/installer/pkg/projects/Microsoft.NETCore.App.Ref/Microsoft.NETCore.App.Ref.pkgproj
@@ -0,0 +1,42 @@
+<?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>
+    <PackageType>Data</PackageType>
+    <Version>$(SharedFrameworkNugetVersion)</Version>
+    <OmitDependencies>true</OmitDependencies>
+    <SkipValidatePackage>true</SkipValidatePackage>
+
+    <!-- Include the platform manifest in the data dir. -->
+    <PlatformManifestTargetPath>data/</PlatformManifestTargetPath>
+
+    <!-- Exclude runtime.json from the package. -->
+    <IncludeRuntimeJson>false</IncludeRuntimeJson>
+    <IsLineupPackage>false</IsLineupPackage>
+
+    <!-- Remove package dependencies. -->
+    <ExcludeLineupReference>true</ExcludeLineupReference>
+    <PackProjectDependencies>false</PackProjectDependencies>
+  </PropertyGroup>
+
+  <!-- Redistribute package content from other nuget packages. -->
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.NETCore.App\src\Microsoft.NETCore.App.depproj" />
+  </ItemGroup>
+
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+
+  <Target Name="GetPackageReport" />
+
+  <Target Name="MoveRefToData"
+          AfterTargets="ExpandProjectReferences">
+    <ItemGroup>
+      <!-- Move all refs into the data dir. Leave files like LICENSE.TXT in the root. -->
+      <File
+        Condition="$([System.String]::new('%(File.TargetPath)').StartsWith('ref'))"
+        TargetPath="data/" />
+    </ItemGroup>
+  </Target>
+
+</Project>

diff --git a/src/installer/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj b/src/installer/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj
index ae1e549..7ca3db2 100644 (file)
--- a/src/installer/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj
+++ b/src/installer/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj
@@ -2,21 +2,15 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
 
-  <UsingTask TaskName="GenerateFileVersionProps" AssemblyFile="$(LocalBuildToolsTaskDir)core-setup.tasks.dll"/>
-
   <PropertyGroup>
     <Version>$(SharedFrameworkNugetVersion)</Version>
     <OmitDependencies>true</OmitDependencies>
     <SkipValidatePackage>true</SkipValidatePackage>
     <ShouldCreateLayout>false</ShouldCreateLayout>
-    <PropsFile>$(IntermediateOutputPath)$(MSBuildProjectName).props</PropsFile>
-    <PlatformManifestFile>$(IntermediateOutputPath)$(MSBuildProjectName).PlatformManifest.txt</PlatformManifestFile>
     <PreventImplementationReference Condition="'$(PackageTargetRuntime)' != ''">true</PreventImplementationReference>
-    <!-- During an official build when we can guarantee that all RID-specific dependencies have been built,
-         restore all of those dependencies and gather the prospective content of the RID-specific Core.App
-         packages.  This is needed so that we have a complete platform manifest in the shipping version of
-         the Microsoft.NETCore.App (RID-agnostic/identity package). -->
-    <IncludeAllRuntimePackagesInPlatformManifest Condition="'$(BuildFullPlatformManifest)' == 'true'">true</IncludeAllRuntimePackagesInPlatformManifest>
+    <BuildTargetPath>build/$(NETCoreAppFramework)</BuildTargetPath>
+    <PlatformManifestTargetPath>$(BuildTargetPath)</PlatformManifestTargetPath>
+    <FileVersionPropsTargetPath>$(BuildTargetPath)</FileVersionPropsTargetPath>
   </PropertyGroup>
 
   <!-- Identity / Reference package content -->
@@ -30,14 +24,8 @@
        <TargetFramework>$(NETCoreAppFramework)</TargetFramework>
     </Dependency>
 
-    <File Include="$(PropsFile)">
-      <TargetPath>build/$(NETCoreAppFramework)</TargetPath>
-    </File>
-    <File Include="$(PlatformManifestFile)">
-      <TargetPath>build/$(NETCoreAppFramework)</TargetPath>
-    </File>
     <File Include="$(MSBuildProjectName).targets">
-      <TargetPath>build/$(NETCoreAppFramework)</TargetPath>
+      <TargetPath>$(BuildTargetPath)</TargetPath>
     </File>
   </ItemGroup>
 
@@ -48,25 +36,6 @@
     </ProjectReference>
   </ItemGroup>
 
-  <Target Name="GenerateFileVersionProps" BeforeTargets="GenerateNuSpec" Condition="'$(PackageTargetRuntime)' == ''">
-    <MSBuild Projects="@(ProjectReference)"
-             Condition="'%(ProjectReference.PackageTargetRuntime)' == '$(PackageRID)' OR
-                        '%(ProjectReference.BuidOnRID)' == '$(PackageRID)' OR
-                        ('$(IncludeAllRuntimePackagesInPlatformManifest)' == 'true' AND
-                         '%(ProjectReference.PackageTargetRuntime)' != '' AND
-                         '%(ProjectReference.ExcludeFromPlatformManifest)' != 'true')"
-             Targets="GetPackageFiles">
-      <Output TaskParameter="TargetOutputs" ItemName="SharedFrameworkRuntimeFiles" />
-    </MSBuild>
-
-    <GenerateFileVersionProps Files="@(SharedFrameworkRuntimeFiles)"
-                              PackageId="$(Id)"
-                              PackageVersion="$(Version)"
-                              PlatformManifestFile="$(PlatformManifestFile)"
-                              PropsFile="$(PropsFile)"
-                              PreferredPackages="$(Id);@(RuntimeDependency)" />
-  </Target>
-
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 
   <Target Name="GetPackageReport" />

diff --git a/src/installer/pkg/projects/descriptions.json b/src/installer/pkg/projects/descriptions.json
index cc5aa5f..6cecbe1 100644 (file)
--- a/src/installer/pkg/projects/descriptions.json
+++ b/src/installer/pkg/projects/descriptions.json
@@ -1,7 +1,7 @@
 [
     {
         "Name": "RuntimePackage",
-        "Description": "Internal implementation package not meant for direct consumption.  Please do not reference directly.",
+        "Description": "Internal implementation package not meant for direct consumption. Please do not reference directly.",
         "CommonTypes": [ ]
     },
     {
@@ -38,5 +38,10 @@
         "Name": "Microsoft.NETCore.App",
         "Description": "A set of .NET APIs that are included in the default .NET Core application model.",
         "CommonTypes": [ ]
+    },
+    {
+        "Name": "Microsoft.NETCore.App.Ref",
+        "Description": "A set of .NET APIs that are included in the default .NET Core application model. Contains reference assemblies, documentation, and other design-time assets.",
+        "CommonTypes": [ ]
     }
 ]

diff --git a/src/installer/pkg/projects/dir.props b/src/installer/pkg/projects/dir.props
index 9b49bdb..b240b5b 100644 (file)
--- a/src/installer/pkg/projects/dir.props
+++ b/src/installer/pkg/projects/dir.props
@@ -16,6 +16,8 @@
 
     <IncludeSourceFilesInPackage Condition="'$(DotNetBuildFromSource)' == 'true'">false</IncludeSourceFilesInPackage>
     <IncludeSourceFilesInPackage Condition="'$(IncludeSourceFilesInPackage)' == ''">true</IncludeSourceFilesInPackage>
+
+    <PackProjectDependencies>true</PackProjectDependencies>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(PackageTargetRuntime)' == ''">

diff --git a/src/installer/pkg/projects/dir.targets b/src/installer/pkg/projects/dir.targets
index a34982c..03da4f3 100644 (file)
--- a/src/installer/pkg/projects/dir.targets
+++ b/src/installer/pkg/projects/dir.targets
@@ -1,6 +1,8 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\dir.targets" />
 
+  <UsingTask TaskName="GenerateFileVersionProps" AssemblyFile="$(LocalBuildToolsTaskDir)core-setup.tasks.dll"/>
+
   <PropertyGroup>
     <RestorePackages>true</RestorePackages>
     <PrereleaseResolveNuGetPackages>true</PrereleaseResolveNuGetPackages>
@@ -107,7 +109,9 @@
     </ItemGroup>
   </Target>
 
-  <Target Name="GetDependenciesToPackage" AfterTargets="ExpandProjectReferences">
+  <Target Name="GetDependenciesToPackage"
+          Condition="'$(PackProjectDependencies)' == 'true'"
+          AfterTargets="ExpandProjectReferences">
     <!-- allow projects to provide dependencies -->
     <MSBuild Targets="GetDependenciesToPackage"
              BuildInParallel="$(BuildInParallel)"
@@ -118,4 +122,62 @@
     </MSBuild>
   </Target>
 
+  <!--
+    Creates the platform manifest and props file. Set properties "IncludePlatformManifestFile" and
+    "IncludeFileVersionPropsFile" to true to include them, respectively.
+  -->
+  <Target Name="GenerateFileVersionProps">
+    <PropertyGroup>
+      <PropsFile>$(IntermediateOutputPath)$(MSBuildProjectName).props</PropsFile>
+      <PlatformManifestFile>$(IntermediateOutputPath)$(MSBuildProjectName).PlatformManifest.txt</PlatformManifestFile>
+
+      <!-- During an official build when we can guarantee that all RID-specific dependencies have been built,
+          restore all of those dependencies and gather the prospective content of the RID-specific Core.App
+          packages.  This is needed so that we have a complete platform manifest in the shipping version of
+          the Microsoft.NETCore.App (RID-agnostic/identity package). -->
+      <IncludeAllRuntimePackagesInPlatformManifest
+        Condition="'$(IncludeAllRuntimePackagesInPlatformManifest)' == '' AND
+                   '$(BuildFullPlatformManifest)' == 'true'">true</IncludeAllRuntimePackagesInPlatformManifest>
+    </PropertyGroup>
+
+    <MSBuild Projects="@(ProjectReference)"
+             Condition="'%(ProjectReference.PackageTargetRuntime)' == '$(PackageRID)' OR
+                        '%(ProjectReference.BuidOnRID)' == '$(PackageRID)' OR
+                        ('$(IncludeAllRuntimePackagesInPlatformManifest)' == 'true' AND
+                         '%(ProjectReference.PackageTargetRuntime)' != '' AND
+                         '%(ProjectReference.ExcludeFromPlatformManifest)' != 'true')"
+             Targets="GetPackageFiles">
+      <Output TaskParameter="TargetOutputs" ItemName="SharedFrameworkRuntimeFiles" />
+    </MSBuild>
+
+    <GenerateFileVersionProps Files="@(SharedFrameworkRuntimeFiles)"
+                              PackageId="$(Id)"
+                              PackageVersion="$(Version)"
+                              PlatformManifestFile="$(PlatformManifestFile)"
+                              PropsFile="$(PropsFile)"
+                              PreferredPackages="$(Id);@(RuntimeDependency)" />
+  </Target>
+
+  <Target Name="IncludeFileVersionPropsFile"
+          DependsOnTargets="GenerateFileVersionProps"
+          BeforeTargets="GetFiles"
+          Condition="'$(PackageTargetRuntime)' == '' AND '$(FileVersionPropsTargetPath)' != ''">
+    <ItemGroup>
+      <File Include="$(PropsFile)">
+        <TargetPath>$(FileVersionPropsTargetPath)</TargetPath>
+      </File>
+    </ItemGroup>
+  </Target>
+
+  <Target Name="IncludePlatformManifestFile"
+          DependsOnTargets="GenerateFileVersionProps"
+          BeforeTargets="GetFiles"
+          Condition="'$(PackageTargetRuntime)' == '' AND '$(PlatformManifestTargetPath)' != ''">
+    <ItemGroup>
+      <File Include="$(PlatformManifestFile)">
+        <TargetPath>$(PlatformManifestTargetPath)</TargetPath>
+      </File>
+    </ItemGroup>
+  </Target>
+
 </Project>
\ No newline at end of file

diff --git a/tools-local/tasks/GenerateFileVersionProps.cs b/tools-local/tasks/GenerateFileVersionProps.cs
index a679f5b..7e89cf6 100644 (file)
--- a/tools-local/tasks/GenerateFileVersionProps.cs
+++ b/tools-local/tasks/GenerateFileVersionProps.cs
@@ -98,6 +98,7 @@ namespace Microsoft.DotNet.Build.Tasks
             var manifestFileName = Path.GetFileName(PlatformManifestFile);
             itemGroup.AddItem(PlatformManifestsItem, $"$(MSBuildThisFileDirectory){manifestFileName}");
 
+            Directory.CreateDirectory(Path.GetDirectoryName(PlatformManifestFile));
             using (var manifestWriter = File.CreateText(PlatformManifestFile))
             {
                 foreach (var fileData in fileVersions)