Skip to content

Commit 901f8c8

Browse files
committed
Apply code review feedback
1 parent 46662e0 commit 901f8c8

File tree

2 files changed

+20
-10
lines changed

2 files changed

+20
-10
lines changed

src/Tasks/Microsoft.NET.Build.Tasks/ApplyImplicitVersions.cs

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,12 @@ protected override void ExecuteCore()
3131

3232
var packageReferencesToUpdate = new List<ITaskItem>();
3333

34-
var implicitReferencesForThisFramework = ImplicitPackageReferenceVersions
35-
.Select(item => new ImplicitPackageReferenceVersion(item))
36-
.Where(item => item.TargetFrameworkVersion == this.TargetFrameworkVersion)
37-
.ToDictionary(implicitVersion => implicitVersion.Name);
34+
var implicitVersionTable = GetApplicableImplicitVersionTable();
3835

3936
foreach (var packageReference in PackageReferences)
4037
{
4138
ImplicitPackageReferenceVersion implicitVersion;
42-
if (implicitReferencesForThisFramework.TryGetValue(packageReference.ItemSpec, out implicitVersion))
39+
if (implicitVersionTable.TryGetValue(packageReference.ItemSpec, out implicitVersion))
4340
{
4441
string versionOnPackageReference = packageReference.GetMetadata(MetadataKeys.Version);
4542
if (string.IsNullOrEmpty(versionOnPackageReference))
@@ -63,6 +60,22 @@ protected override void ExecuteCore()
6360
SdkBuildWarnings = buildWarnings.ToArray();
6461
}
6562

63+
private Dictionary<string, ImplicitPackageReferenceVersion> GetApplicableImplicitVersionTable()
64+
{
65+
var result = new Dictionary<string, ImplicitPackageReferenceVersion>();
66+
foreach (var item in ImplicitPackageReferenceVersions)
67+
{
68+
var implicitPackageReferenceVersion = new ImplicitPackageReferenceVersion(item);
69+
70+
if (implicitPackageReferenceVersion.TargetFrameworkVersion == this.TargetFrameworkVersion)
71+
{
72+
result.Add(implicitPackageReferenceVersion.Name, implicitPackageReferenceVersion);
73+
}
74+
}
75+
76+
return result;
77+
}
78+
6679
private sealed class ImplicitPackageReferenceVersion
6780
{
6881
private ITaskItem _item;

src/Tasks/Microsoft.NET.Build.Tasks/CheckForImplicitPackageReferenceOverrides.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,8 @@ protected override void ExecuteCore()
3636
if (item.GetMetadata(MetadataKeys.IsImplicitlyDefined).Equals("true", StringComparison.OrdinalIgnoreCase))
3737
{
3838
itemsToRemove.Add(item);
39-
string message = string.Format(CultureInfo.CurrentCulture, Strings.PackageReferenceOverrideWarning,
40-
item.ItemSpec,
41-
MoreInformationLink);
42-
43-
Log.LogWarning(message);
39+
40+
Log.LogWarning(Strings.PackageReferenceOverrideWarning, item.ItemSpec, MoreInformationLink);
4441
}
4542
else
4643
{

0 commit comments

Comments
 (0)