Skip to content

Commit afe1a1e

Browse files
committed
use null alias
1 parent f2f28de commit afe1a1e

5 files changed

Lines changed: 5 additions & 5 deletions

File tree

src/NuGet.Core/NuGet.Build.Tasks/GetReferenceNearestTargetFrameworkTask.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ private ITaskItem AssignNearestFrameworkForSingleReference(
169169
// try project fallback frameworks
170170
foreach (var currentProjectTargetFramework in fallbackNuGetFrameworks)
171171
{
172-
nearestNuGetFramework = packageSpec.GetNearestTargetFramework(currentProjectTargetFramework, null);
172+
nearestNuGetFramework = packageSpec.GetNearestTargetFramework(currentProjectTargetFramework, targetAlias: null);
173173

174174
if (nearestNuGetFramework.FrameworkName != null)
175175
{

src/NuGet.Core/NuGet.DependencyResolver.Core/LibraryRangeCacheKey.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace NuGet.DependencyResolver
1717
public LibraryRangeCacheKey(LibraryRange range, NuGetFramework framework, string? alias)
1818
{
1919
Framework = framework;
20-
Alias = alias ?? string.Empty;
20+
Alias = alias ?? string.Empty; // alias may be passed as both null or empty and we need to treat them equivalently.
2121
LibraryRange = range;
2222
}
2323

src/NuGet.Core/NuGet.ProjectModel/PackageSpecExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public static ProjectRestoreMetadataFrameworkInfo GetRestoreMetadataFramework(th
9595
/// <param name="project">The project spec in question.</param>
9696
/// <param name="targetFramework">The pivot target framework.</param>
9797
/// <param name="targetAlias">The alias for disambiguation</param>
98-
public static TargetFrameworkInformation GetNearestTargetFramework(this PackageSpec project, NuGetFramework targetFramework, string targetAlias)
98+
public static TargetFrameworkInformation GetNearestTargetFramework(this PackageSpec project, NuGetFramework targetFramework, string? targetAlias)
9999
{
100100
TargetFrameworkInformation? result = null;
101101
List<TargetFrameworkInformation>? frameworks = null;

src/NuGet.Core/NuGet.ProjectModel/PackageSpecReferenceDependencyProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ internal List<LibraryDependency> GetDependenciesFromSpecRestoreMetadata(PackageS
246246
{
247247
if (targetFrameworkInfo.FrameworkName == null && targetFramework is AssetTargetFallbackFramework atfFramework)
248248
{
249-
targetFrameworkInfo = packageSpec.GetNearestTargetFramework(atfFramework.AsFallbackFramework(), string.Empty);
249+
targetFrameworkInfo = packageSpec.GetNearestTargetFramework(atfFramework.AsFallbackFramework(), targetAlias: null);
250250
}
251251
}
252252

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#nullable enable
2-
static NuGet.ProjectModel.PackageSpecExtensions.GetNearestTargetFramework(this NuGet.ProjectModel.PackageSpec! project, NuGet.Frameworks.NuGetFramework! targetFramework, string! targetAlias) -> NuGet.ProjectModel.TargetFrameworkInformation!
2+
static NuGet.ProjectModel.PackageSpecExtensions.GetNearestTargetFramework(this NuGet.ProjectModel.PackageSpec! project, NuGet.Frameworks.NuGetFramework! targetFramework, string? targetAlias) -> NuGet.ProjectModel.TargetFrameworkInformation!
33
static readonly NuGet.ProjectModel.LockFileFormat.AliasedVersion -> int
44
static readonly NuGet.ProjectModel.LockFileFormat.LegacyVersion -> int
55
~NuGet.ProjectModel.PackageSpecReferenceDependencyProvider.GetLibrary(NuGet.LibraryModel.LibraryRange libraryRange, NuGet.Frameworks.NuGetFramework targetFramework, string alias) -> NuGet.LibraryModel.Library

0 commit comments

Comments
 (0)