Skip to content

Fix process framework references crash when null RID is passed #50682

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
baronfel merged 7 commits into from
Sep 8, 2025
Merged

Fix process framework references crash when null RID is passed #50682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9bb2cf2
some basic guards against null RID
baronfel Sep 8, 2025
2b2db23
pervasive nullability
baronfel Sep 8, 2025
3c7dae0
Address a bit of feedback
baronfel Sep 8, 2025
13103a3
safety K&R braces
baronfel Sep 8, 2025
33a1ecc
Green up tests
baronfel Sep 8, 2025
9e6eba6
Checkpoint more tests
baronfel Sep 8, 2025
bbb2c31
Add a bunch of test coverage
baronfel Sep 8, 2025
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
16 changes: 7 additions & 9 deletions src/Common/NuGetUtils.NuGet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#nullable disable

using NuGet.Frameworks;
using NuGet.RuntimeModel;

Expand All @@ -27,7 +25,7 @@ public static bool IsPlaceholderFile(string path)
return separator == '\\' || separator == '/';
}

public static string GetLockFileLanguageName(string projectLanguage)
public static string? GetLockFileLanguageName(string? projectLanguage)
{
switch (projectLanguage)
{
Expand All @@ -37,7 +35,7 @@ public static string GetLockFileLanguageName(string projectLanguage)
}
}

public static NuGetFramework ParseFrameworkName(string frameworkName)
public static NuGetFramework? ParseFrameworkName(string? frameworkName)
{
return frameworkName == null ? null : NuGetFramework.Parse(frameworkName);
}
Expand Down Expand Up @@ -75,24 +73,24 @@ bool FileMatchesProjectLanguage()
return IsAnalyzer() && FileMatchesProjectLanguage();
}

public static string GetBestMatchingRid(RuntimeGraph runtimeGraph, string runtimeIdentifier,
public static string? GetBestMatchingRid(RuntimeGraph runtimeGraph, string runtimeIdentifier,
IEnumerable<string> availableRuntimeIdentifiers, out bool wasInGraph)
{
return GetBestMatchingRidWithExclusion(runtimeGraph, runtimeIdentifier,
runtimeIdentifiersToExclude: null,
availableRuntimeIdentifiers, out wasInGraph);
}

public static string GetBestMatchingRidWithExclusion(RuntimeGraph runtimeGraph, string runtimeIdentifier,
IEnumerable<string> runtimeIdentifiersToExclude,
public static string? GetBestMatchingRidWithExclusion(RuntimeGraph runtimeGraph, string runtimeIdentifier,
IEnumerable<string>? runtimeIdentifiersToExclude,
IEnumerable<string> availableRuntimeIdentifiers, out bool wasInGraph)
{
wasInGraph = runtimeGraph.Runtimes.ContainsKey(runtimeIdentifier);

string bestMatch = null;
string? bestMatch = null;

HashSet<string> availableRids = new(availableRuntimeIdentifiers, StringComparer.Ordinal);
HashSet<string> excludedRids = runtimeIdentifiersToExclude switch { null => null, _ => new HashSet<string>(runtimeIdentifiersToExclude, StringComparer.Ordinal) };
HashSet<string>? excludedRids = runtimeIdentifiersToExclude switch { null => null, _ => new HashSet<string>(runtimeIdentifiersToExclude, StringComparer.Ordinal) };
foreach (var candidateRuntimeIdentifier in runtimeGraph.ExpandRuntime(runtimeIdentifier))
{
if (bestMatch == null && availableRids.Contains(candidateRuntimeIdentifier))
Expand Down
Loading