Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 18 additions & 1 deletion src/NuGet.Core/NuGet.Build.Tasks.Pack/PackTaskLogic.cs
Original file line number Diff line number Diff line change
Expand Up @@ -219,13 +219,30 @@ public PackageBuilder GetPackageBuilder(IPackTaskRequest<IMSBuildItem> request)
.ToDictionary(msbuildItem => msbuildItem.Identity,
msbuildItem => msbuildItem.GetProperty("ProjectVersion"), PathUtility.GetStringComparerBasedOnOS());
}

var aliases = new Dictionary<string, string>();
foreach (var tfm in assetsFile.PackageSpec.TargetFrameworks)
{
aliases[tfm.TargetAlias] = tfm.FrameworkName.GetShortFolderName();
}

var nuGetFrameworkComparer = new NuGetFrameworkFullComparer();
var frameworksWithSuppressedDependencies = new HashSet<NuGetFramework>(nuGetFrameworkComparer);
if (request.FrameworksWithSuppressedDependencies != null && request.FrameworksWithSuppressedDependencies.Any())
{
frameworksWithSuppressedDependencies =
new HashSet<NuGetFramework>(request.FrameworksWithSuppressedDependencies
.Select(t => NuGetFramework.Parse(t.Identity)).ToList(), nuGetFrameworkComparer);
.Select(t =>
{
if (aliases.TryGetValue(t.Identity, out string translated))
{
return NuGetFramework.Parse(translated);
}
else
{
return NuGetFramework.Parse(t.Identity);
}
}).ToList(), nuGetFrameworkComparer);
}

PopulateProjectAndPackageReferences(builder,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,42 @@ public void PackCommand_PackNewDefaultProject_NupkgExists()
}
}

[PlatformFact(Platform.Windows)]
public void PackCommand_PackToolUsingAlias_DoesNotWarnAboutNoExactMatchInDependencyGroupAndLibRefDirectories()
{
// Ref: https://github.com/NuGet/Home/issues/10097
using (var testDirectory = msbuildFixture.CreateTestDirectory())
{
// Arrange
var projectName = "ConsoleApp1";
var workingDirectory = Path.Combine(testDirectory, projectName);
msbuildFixture.CreateDotnetNewProject(testDirectory.Path, projectName, " console");
var projectFile = Path.Combine(workingDirectory, $"{projectName}.csproj");
using (var stream = new FileStream(projectFile, FileMode.Open, FileAccess.ReadWrite))
{
var xml = XDocument.Load(stream);

ProjectFileUtils.AddProperty(xml, "PackAsTool", "true");
ProjectFileUtils.ChangeProperty(xml, "TargetFramework", "myalias");

var tfmProps = new Dictionary<string, string>();
tfmProps["TargetFrameworkIdentifier"] = ".NETCoreApp";
tfmProps["TargetFrameworkVersion"] = "v3.1";
tfmProps["TargetFrameworkMoniker"] = ".NETCoreApp,Version=v3.1";
ProjectFileUtils.AddProperties(xml, tfmProps, " '$(TargetFramework)' == 'myalias' ");

ProjectFileUtils.WriteXmlToFile(xml, stream);
}

// Act
msbuildFixture.RestoreProject(workingDirectory, projectName, string.Empty);
var result = msbuildFixture.PackProject(workingDirectory, projectName, $"-o {workingDirectory}");

// Assert
result.AllOutput.Should().NotContain("NU5128");
}
}

[PlatformFact(Platform.Windows)]
public void PackCommand_PackNewDefaultProject_IncludeSymbolsWithSnupkg()
{
Expand Down