Skip to content

[release/5.0] Add support for repo-defined runtime.json for shared framework build #7643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Anipik merged 1 commit into from
Aug 9, 2021
Merged

[release/5.0] Add support for repo-defined runtime.json for shared framework build #7643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk/src/ProcessSharedFrameworkDeps.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using Microsoft.Extensions.DependencyModel;
using NuGet.Common;
using NuGet.ProjectModel;
using NuGet.RuntimeModel;
using System;
using System.IO;
using System.Linq;
Expand All @@ -29,6 +30,8 @@ public partial class ProcessSharedFrameworkDeps : Task
[Required]
public string BuildTasksAssemblyPath { get; set; }

public string RuntimeIdentifierGraph { get; set; }

public override bool Execute()
{
EnsureInitialized(BuildTasksAssemblyPath);
Expand All @@ -53,7 +56,7 @@ private void ExecuteCore()
}

var manager = new RuntimeGraphManager();
var graph = manager.Collect(lockFile);
RuntimeGraph graph = string.IsNullOrEmpty(RuntimeIdentifierGraph) ? manager.Collect(lockFile) : JsonRuntimeFormat.ReadRuntimeGraph(RuntimeIdentifierGraph);
var expandedGraph = manager.Expand(graph, Runtime);

var trimmedRuntimeLibraries = context.RuntimeLibraries;
Expand Down
1 change: 1 addition & 0 deletions src/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk/targets/framework.sharedfx.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,7 @@
DepsFilePath="$(SharedFrameworkDepsDestinationFile)"
PackagesToRemove="@(TrimPkgsFromDeps)"
Runtime="$(RuntimeGraphGeneratorRuntime)"
RuntimeIdentifierGraph="$(BundledRuntimeIdentifierGraphFile)"
BuildTasksAssemblyPath="$(PackagingTaskDir)Microsoft.DotNet.Build.Tasks.Packaging.dll" />
</Target>

Expand Down