Enable "portable" RID graph when targeting .NET 8 and higher #34279
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.IO; | ||
| using System.Linq; | ||
| using System.Security.Cryptography; | ||
| using System.Text; | ||
| using System.Threading.Tasks; | ||
| using Microsoft.Build.Framework; | ||
| using Microsoft.Build.Utilities; | ||
| using Newtonsoft.Json; | ||
| using Newtonsoft.Json.Linq; | ||
|
|
||
| namespace Microsoft.DotNet.Cli.Build | ||
| { | ||
| public class UpdatePortableRuntimeIdentifierGraph : Task | ||
| { | ||
| [Required] | ||
| public string InputFile { get; set; } | ||
|
|
||
| [Required] | ||
| public string OutputFile { get; set; } | ||
|
|
||
|
|
||
| // ItemSpec should be a RID, and "Imports" metadata should be a semicolon-separated list of RIDs that the ItemSpec RID imports | ||
| public ITaskItem[] AdditionalRuntimeIdentifiers { get; set; } | ||
|
|
||
| public override bool Execute() | ||
| { | ||
| JToken json; | ||
|
|
||
| using (var file = File.OpenText(InputFile)) | ||
| using (JsonTextReader reader = new JsonTextReader(file)) | ||
| { | ||
| json = JObject.ReadFrom(reader); | ||
| } | ||
|
|
||
| JObject runtimes = (JObject) json["runtimes"]; | ||
|
|
||
| if (AdditionalRuntimeIdentifiers != null) | ||
| { | ||
| foreach (var rid in AdditionalRuntimeIdentifiers) | ||
| { | ||
| var importedRids = rid.GetMetadata("Imports").Split(';'); | ||
| runtimes.Add(rid.ItemSpec, new JObject(new JProperty("#import", new JArray(importedRids)))); | ||
|
There was a problem hiding this comment. I think this is correct and updates json["runtimes"] rather than making a copy...but can we have a regression test for that? Or perhaps just add json["runtimes"] = runtimes at the end? |
||
| } | ||
| } | ||
|
|
||
| using (var file = File.CreateText(OutputFile)) | ||
| using (var writer = new JsonTextWriter(file) { Formatting = Formatting.Indented }) | ||
| { | ||
| json.WriteTo(writer); | ||
| } | ||
|
|
||
| return true; | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.IO; | ||
| using System.Linq; | ||
| using System.Text; | ||
| using System.Threading.Tasks; | ||
| using FluentAssertions; | ||
| using Microsoft.NET.TestFramework; | ||
| using Microsoft.NET.TestFramework.Assertions; | ||
| using Microsoft.NET.TestFramework.Commands; | ||
| using Microsoft.NET.TestFramework.ProjectConstruction; | ||
| using Xunit; | ||
| using Xunit.Abstractions; | ||
|
|
||
| namespace Microsoft.NET.Build.Tests | ||
| { | ||
| public class RuntimeIdentifierGraphTests : SdkTest | ||
| { | ||
| public RuntimeIdentifierGraphTests(ITestOutputHelper log) : base(log) | ||
| { | ||
| } | ||
|
|
||
| [Theory] | ||
| [InlineData("net7.0", null, true)] | ||
| [InlineData("net8.0", null, false)] | ||
| [InlineData("net7.0", "false", false)] | ||
| [InlineData("net8.0", "true", true)] | ||
| public void ItUsesCorrectRuntimeIdentifierGraph(string targetFramework, string useRidGraphValue, bool shouldUseFullRidGraph) | ||
| { | ||
| var testProject = new TestProject() | ||
| { | ||
| TargetFrameworks = targetFramework, | ||
| IsExe = true | ||
| }; | ||
|
|
||
| if (useRidGraphValue != null) | ||
| { | ||
| testProject.AdditionalProperties["UseRidGraph"] = useRidGraphValue; | ||
| } | ||
|
|
||
| testProject.RecordProperties("RuntimeIdentifierGraphPath"); | ||
|
|
||
| var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework + "_" + (useRidGraphValue ?? "null")); | ||
|
|
||
| var buildCommand = new BuildCommand(testAsset); | ||
|
|
||
| buildCommand.Execute() | ||
| .Should() | ||
| .Pass(); | ||
|
|
||
| var runtimeIdentifierGraphPath = testProject.GetPropertyValues(testAsset.TestRoot)["RuntimeIdentifierGraphPath"]; | ||
|
|
||
| if (shouldUseFullRidGraph) | ||
| { | ||
| Path.GetFileName(runtimeIdentifierGraphPath).Should().Be("RuntimeIdentifierGraph.json"); | ||
| } | ||
| else | ||
| { | ||
| Path.GetFileName(runtimeIdentifierGraphPath).Should().Be("PortableRuntimeIdentifierGraph.json"); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we have a "fast path" here for if AdditionalRuntimeIdentifiers is null? Then it should just be a copy, right?