Flatten the dependency graph of Microsoft.AspNetCore.App

.azure/pipelines/jobs/default-build.yml

@@ -63,7 +63,7 @@ jobs:
 - job: ${{ coalesce(parameters.jobName, parameters.agentOs) }}
   displayName: ${{ coalesce(parameters.jobDisplayName, parameters.agentOs) }}
   dependsOn: ${{ parameters.dependsOn }}
-  timeoutInMinutes: 90
+  timeoutInMinutes: 120
   workspace:
     clean: all
   strategy:

Directory.Build.props

@@ -97,7 +97,6 @@
   <Import Project="eng\targets\RuntimeIdentifiers.props" />
   <Import Project="eng\targets\Cpp.Common.props"  Condition="'$(MSBuildProjectExtension)' == '.vcxproj'" />
   <Import Project="eng\targets\CSharp.Common.props"  Condition="'$(MSBuildProjectExtension)' == '.csproj'" />
-  <Import Project="eng\targets\SharedFx.Common.props"  Condition="'$(MSBuildProjectExtension)' == '.shfxproj'" />
   <Import Project="eng\targets\Wix.Common.props"  Condition="'$(MSBuildProjectExtension)' == '.wixproj'" />
 
 </Project>

Directory.Build.targets

@@ -54,6 +54,5 @@
 
   <Import Project="eng\targets\Cpp.Common.targets"  Condition="'$(MSBuildProjectExtension)' == '.vcxproj'" />
   <Import Project="eng\targets\CSharp.Common.targets"  Condition="'$(MSBuildProjectExtension)' == '.csproj'" />
-  <Import Project="eng\targets\SharedFx.Common.targets"  Condition="'$(MSBuildProjectExtension)' == '.shfxproj'" />
   <Import Project="eng\targets\Wix.Common.targets"  Condition="'$(MSBuildProjectExtension)' == '.wixproj'" />
 </Project>

build/Publish.targets

@@ -58,7 +58,7 @@
       Value="$(PackageVersion)" />
   </Target>
 
-  <Target Name="GetFilesToPublish" DependsOnTargets="GetArtifactInfo;GeneratePublishFiles">
+  <Target Name="GetFilesToPublish" DependsOnTargets="GetAllRidPackages;GetArtifactInfo;GeneratePublishFiles">
     <PropertyGroup>
       <BlobBasePath>aspnetcore/Runtime/$(PackageVersion)/</BlobBasePath>
       <NpmBlobBasePath>aspnetcore/npm/</NpmBlobBasePath>
@@ -175,6 +175,11 @@
       <Output TaskParameter="JoinResult" ItemName="_PackageArtifactInfoWithCategory" />
     </RepoTasks.JoinItems>
 
+    <ItemGroup>
+      <_RidSpecificPackages Include="$(SupportedRuntimeIdentifiers)" Exclude="$(SharedFxRid)" />
+      <PackageToPublish Include="$(DependencyPackagesDir)runtime.%(_RidSpecificPackages.Identity).Microsoft.AspNetCore.App.$(SharedFxVersion).nupkg" Category="ship" />
+    </ItemGroup>
+
     <ItemGroup>
       <PackageToPublish Include="%(_PackageArtifactInfoWithCategory.ArtifactPath)" Category="%(_PackageArtifactInfoWithCategory.Category)" />
       <PackageToPublish Include="%(_PackageArtifactInfo.ArtifactPath)" Category="%(_PackageArtifactInfo.Category)" Condition="'%(_PackageArtifactInfo.Category)' != ''" />

build/SharedFx.targets

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <UnitTestFxProject>$(RepositoryRoot)src\Framework\Framework.UnitTests\Framework.UnitTests.csproj</UnitTestFxProject>
+    <UnitTestFxProject>$(RepositoryRoot)src\Framework\test\Microsoft.AspNetCore.App.UnitTests.csproj</UnitTestFxProject>
     <UnitTestFxProject>$([MSBuild]::NormalizePath($(UnitTestFxProject)))</UnitTestFxProject>
     <CodeSignDependsOn Condition="'$(_ProjectsOnly)' != 'true'">$(CodeSignDependsOn);GetSharedFxFilesToSign</CodeSignDependsOn>
     <BuildSharedFxDependsOn>_BuildSharedFxProjects;TestSharedFx</BuildSharedFxDependsOn>

build/artifacts.props

@@ -23,7 +23,7 @@
     <PackageArtifact Include="Microsoft.AspNet.Identity.AspNetCoreCompat" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.App" Category="ship" />
-    <PackageArtifact Include="runtime.$(SharedFxRid).Microsoft.AspNetCore.App" Category="noship" />
+    <PackageArtifact Include="runtime.$(SharedFxRid).Microsoft.AspNetCore.App" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Antiforgery" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.AspNetCoreModule" Category="noship" Condition=" '$(OS)' == 'Windows_NT' " />

build/dependencies.props

@@ -142,7 +142,7 @@
 
     <CastleCorePackageVersion>4.2.1</CastleCorePackageVersion>
     <DevDependency_MicrosoftDotNetBuildTasksFeedPackageVersion>2.2.0-preview1-03124-01</DevDependency_MicrosoftDotNetBuildTasksFeedPackageVersion>
-    <DevDependency_MicrosoftExtensionsDependencyModelPackageVersion>2.0.0</DevDependency_MicrosoftExtensionsDependencyModelPackageVersion>
+    <DevDependency_MicrosoftExtensionsDependencyModelPackageVersion>2.1.0</DevDependency_MicrosoftExtensionsDependencyModelPackageVersion>
     <DevDependency_WindowsAzureStoragePackageVersion>8.7.0</DevDependency_WindowsAzureStoragePackageVersion>
     <FSharpCorePackageVersion>4.2.1</FSharpCorePackageVersion>
     <IdentityServer4PackageVersion>2.3.0-preview1-update2</IdentityServer4PackageVersion>

build/tasks/ProcessSharedFrameworkDeps.cs

@@ -1,12 +1,10 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-// Sourced from  https://github.com/dotnet/core-setup/tree/be8d8e3486b2bf598ed69d39b1629a24caaba45e/tools-local/tasks, needs to be kept in sync
 
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Security.Cryptography;
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
 using Microsoft.Extensions.DependencyModel;
@@ -28,21 +26,22 @@ public class ProcessSharedFrameworkDeps : Task
         public string OutputPath { get; set; }
 
         [Required]
-        public string FrameworkName { get; set; }
+        public string TargetFramework { get; set; }
 
-        // When generating the .deps.json file, these files are used to replace "project" libraries with "packages".
-        public ITaskItem[] ResolvedPackageProjectReferences { get; set; }
+        [Required]
+        public string FrameworkName { get; set; }
 
-        public string[] PackagesToRemove { get; set; }
+        [Required]
+        public string FrameworkVersion { get; set; }
 
         [Required]
-        public string Runtime { get; set; }
+        public string BaseRuntimeIdentifier { get; set; }
 
         public override bool Execute()
         {
             ExecuteCore();
 
-            return true;
+            return !Log.HasLoggedErrors;
         }
 
         private void ExecuteCore()
@@ -61,23 +60,69 @@ private void ExecuteCore()
 
             var manager = new RuntimeGraphManager();
             var graph = manager.Collect(lockFile);
-            var expandedGraph = manager.Expand(graph, Runtime);
-
-            // Remove the runtime entry for the project which generates the original deps.json. For example, there is no Microsoft.AspNetCore.App.dll.
-            var trimmedRuntimeLibraries = RuntimeReference.RemoveSharedFxRuntimeEntry(context.RuntimeLibraries, FrameworkName);
+            var expandedGraph = manager.Expand(graph, BaseRuntimeIdentifier);
 
-            trimmedRuntimeLibraries = ResolveProjectsAsPackages(ResolvedPackageProjectReferences, trimmedRuntimeLibraries);
+            var runtimeFiles = new List<RuntimeFile>();
+            var nativeFiles = new List<RuntimeFile>();
+            var resourceAssemblies = new List<ResourceAssembly>();
 
-            if (PackagesToRemove != null && PackagesToRemove.Any())
+            foreach (var library in context.RuntimeLibraries)
             {
-                trimmedRuntimeLibraries = RuntimeReference.RemoveReferences(trimmedRuntimeLibraries, PackagesToRemove);
+                foreach (var file in library.RuntimeAssemblyGroups.SelectMany(g => g.RuntimeFiles))
+                {
+                    var path = $"runtimes/{context.Target.Runtime}/lib/{TargetFramework}/{Path.GetFileName(file.Path)}";
+                    runtimeFiles.Add(
+                        new RuntimeFile(
+                            path,
+                            file.AssemblyVersion,
+                            file.FileVersion));
+                }
+
+                foreach (var file in library.NativeLibraryGroups.SelectMany(g => g.RuntimeFiles))
+                {
+                    var path = $"runtimes/{context.Target.Runtime}/native/{Path.GetFileName(file.Path)}";
+                    nativeFiles.Add(
+                        new RuntimeFile(
+                            path,
+                            file.AssemblyVersion,
+                            file.FileVersion));
+                }
+
+                resourceAssemblies.AddRange(
+                    library.ResourceAssemblies);
             }
 
+            var runtimePackageName = $"runtime.{context.Target.Runtime}.{FrameworkName}";
+
+            var runtimeLibrary = new RuntimeLibrary("package",
+                runtimePackageName,
+                FrameworkVersion,
+                string.Empty,
+                new[] { new RuntimeAssetGroup(string.Empty, runtimeFiles) },
+                new[] { new RuntimeAssetGroup(string.Empty, nativeFiles) },
+                resourceAssemblies,
+                Array.Empty<Dependency>(),
+                hashPath: null,
+                path: $"{runtimePackageName.ToLowerInvariant()}/{FrameworkVersion}",
+                serviceable: true);
+
+            var targetingPackLibrary = new RuntimeLibrary("package",
+                FrameworkName,
+                FrameworkVersion,
+                string.Empty,
+                Array.Empty<RuntimeAssetGroup>(),
+                Array.Empty<RuntimeAssetGroup>(),
+                resourceAssemblies,
+                new[] { new Dependency(runtimeLibrary.Name, runtimeLibrary.Version) },
+                hashPath: null,
+                path: $"{FrameworkName.ToLowerInvariant()}/{FrameworkVersion}",
+                serviceable: true);
+
             context = new DependencyContext(
                 context.Target,
                 CompilationOptions.Default,
                 Array.Empty<CompilationLibrary>(),
-                trimmedRuntimeLibraries,
+                new[] { targetingPackLibrary, runtimeLibrary },
                 expandedGraph
                 );
 
@@ -86,43 +131,5 @@ private void ExecuteCore()
                 new DependencyContextWriter().Write(context, depsStream);
             }
         }
-
-        private IEnumerable<RuntimeLibrary> ResolveProjectsAsPackages(ITaskItem[] resolvedProjects, IEnumerable<RuntimeLibrary> compilationLibraries)
-        {
-            var projects = resolvedProjects.ToDictionary(k => k.GetMetadata("PackageId"), k => k, StringComparer.OrdinalIgnoreCase);
-
-            foreach (var library in compilationLibraries)
-            {
-                if (projects.TryGetValue(library.Name, out var project))
-                {
-                    Log.LogMessage("Replacing the library entry for {0}", library.Name);
-
-                    var packagePath = project.ItemSpec;
-                    var packageId = library.Name;
-                    var version = library.Version;
-                    string packageHash;
-                    using (var sha512 = SHA512.Create())
-                    {
-                        packageHash = "sha512-" + sha512.ComputeHashAsBase64(File.OpenRead(packagePath), leaveStreamOpen: false);
-                    }
-
-                    yield return new RuntimeLibrary("package",
-                        library.Name,
-                        library.Version,
-                        packageHash,
-                        library.RuntimeAssemblyGroups,
-                        library.NativeLibraryGroups,
-                        library.ResourceAssemblies,
-                        library.Dependencies,
-                        serviceable: true,
-                        path: $"{library.Name}/{library.Version}".ToLowerInvariant(),
-                        hashPath: $"{library.Name}.{library.Version}.nupkg.sha512".ToLowerInvariant());
-                }
-                else
-                {
-                    yield return library;
-                }
-            }
-        }
     }
 }

build/tasks/RepoTasks.tasks

@@ -11,7 +11,6 @@
   <UsingTask TaskName="RepoTasks.JoinItems" AssemblyFile="$(_RepoTaskAssembly)" />
   <UsingTask TaskName="RepoTasks.OrderBy" AssemblyFile="$(_RepoTaskAssembly)" />
   <UsingTask TaskName="RepoTasks.ProcessSharedFrameworkDeps" AssemblyFile="$(_RepoTaskAssembly)" />
-  <UsingTask TaskName="RepoTasks.ResolveVersionRange" AssemblyFile="$(_RepoTaskAssembly)" />
   <UsingTask TaskName="RepoTasks.PublishToAzureBlob" AssemblyFile="$(_RepoTaskAssembly)" />
 
   <!-- tools from dotnet-buildtools -->

build/tasks/Utilities/RuntimeGraphManager.cs

@@ -7,7 +7,6 @@
 using System.IO;
 using System.Linq;
 using Microsoft.Extensions.DependencyModel;
-using NuGet.Frameworks;
 using NuGet.Packaging;
 using NuGet.ProjectModel;
 using NuGet.RuntimeModel;
@@ -63,4 +62,4 @@ private IEnumerable<string> FindImporters(RuntimeGraph runtimeGraph, string runt
             }
         }
     }
-}
+}