Skip to content

Commit 900de20

Browse files
committed
Use better name for package references to add
1 parent f9b87e5 commit 900de20

File tree

2 files changed

+22
-11
lines changed

2 files changed

+22
-11
lines changed

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

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public class ResolveFrameworkReferences : TaskBase
4949
public ITaskItem[] PackagesToDownload { get; set; }
5050

5151
[Output]
52-
public ITaskItem[] PackagesToReference { get; set; }
52+
public ITaskItem[] LegacyFrameworkPackages { get; set; }
5353

5454
[Output]
5555
public ITaskItem[] RuntimeFrameworks { get; set; }
@@ -83,7 +83,7 @@ protected override void ExecuteCore()
8383
var frameworkReferenceMap = FrameworkReferences.ToDictionary(fr => fr.ItemSpec);
8484

8585
List<ITaskItem> packagesToDownload = new List<ITaskItem>();
86-
List<ITaskItem> packagesToReference = new List<ITaskItem>();
86+
List<ITaskItem> legacyFrameworkPackages = new List<ITaskItem>();
8787
List<ITaskItem> runtimeFrameworks = new List<ITaskItem>();
8888
List<ITaskItem> targetingPacks = new List<ITaskItem>();
8989
List<ITaskItem> runtimePacks = new List<ITaskItem>();
@@ -97,15 +97,15 @@ protected override void ExecuteCore()
9797

9898
if (frameworkReference != null)
9999
{
100-
if (!string.IsNullOrEmpty(knownFrameworkReference.PackagesToReference))
100+
if (!string.IsNullOrEmpty(knownFrameworkReference.LegacyFrameworkPackages))
101101
{
102-
foreach (var packageAndVersion in knownFrameworkReference.PackagesToReference.Split(';'))
102+
foreach (var packageAndVersion in knownFrameworkReference.LegacyFrameworkPackages.Split(';'))
103103
{
104104
var items = packageAndVersion.Split('/');
105105
TaskItem packageToReference = new TaskItem(items[0]);
106106
packageToReference.SetMetadata(MetadataKeys.Version, items[1]);
107107

108-
packagesToReference.Add(packageToReference);
108+
legacyFrameworkPackages.Add(packageToReference);
109109
}
110110
}
111111
}
@@ -201,9 +201,9 @@ protected override void ExecuteCore()
201201
PackagesToDownload = packagesToDownload.ToArray();
202202
}
203203

204-
if (packagesToReference.Any())
204+
if (legacyFrameworkPackages.Any())
205205
{
206-
PackagesToReference = packagesToReference.ToArray();
206+
LegacyFrameworkPackages = legacyFrameworkPackages.ToArray();
207207
}
208208

209209
if (runtimeFrameworks.Any())
@@ -376,7 +376,18 @@ public KnownFrameworkReference(ITaskItem item)
376376

377377
public string RuntimePackRuntimeIdentifiers => _item.GetMetadata("RuntimePackRuntimeIdentifiers");
378378

379-
public string PackagesToReference => _item.GetMetadata("PackagesToReference");
379+
public string LegacyFrameworkPackages
380+
{
381+
get
382+
{
383+
var packages = _item.GetMetadata("LegacyFrameworkPackages");
384+
if (string.IsNullOrEmpty(packages))
385+
{
386+
packages = _item.GetMetadata("PackagesToReference");
387+
}
388+
return packages;
389+
}
390+
}
380391

381392
public NuGetFramework TargetFramework { get; }
382393
}

src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.TargetingPackResolution.targets

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ Copyright (c) .NET Foundation. All rights reserved.
9191
EnableTargetingPackDownload="$(EnableTargetingPackDownload)">
9292

9393
<Output TaskParameter="PackagesToDownload" ItemName="_PackageToDownload" />
94-
<Output TaskParameter="PackagesToReference" ItemName="_PackageToReference" />
94+
<Output TaskParameter="LegacyFrameworkPackages" ItemName="_LegacyFrameworkPackage" />
9595
<Output TaskParameter="RuntimeFrameworks" ItemName="RuntimeFramework" />
9696
<Output TaskParameter="TargetingPacks" ItemName="TargetingPack" />
9797
<Output TaskParameter="RuntimePacks" ItemName="RuntimePack" />
@@ -142,11 +142,11 @@ Copyright (c) .NET Foundation. All rights reserved.
142142
ExcludeAssets="all" />
143143
</ItemGroup>
144144

145-
<!-- Only add these package references if there are already existing package references,
145+
<!-- Only add these "legacy" package references if there are already existing package references,
146146
as they are only needed in those scenarios (for example supplying the RID graph to
147147
NuGet, or preventing older versions of Framework packages from being used). -->
148148
<ItemGroup Condition="'@(PackageReference)' != '' and '$(DisableImplicitFrameworkReferences)' != 'true'">
149-
<PackageReference Include="@(_PackageToReference)"
149+
<PackageReference Include="@(_LegacyFrameworkPackage)"
150150
IsImplicitlyDefined="true"
151151
PrivateAssets="all"
152152
ExcludeAssets="all" />

0 commit comments

Comments
 (0)