Skip to content

Use ubuntu & debian instead of unix & freebsd #7089

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
Anipik merged 2 commits into from
Mar 12, 2021
Merged

Use ubuntu & debian instead of unix & freebsd #7089

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
674841b
use ubuntu & debian instead of unix & freebsd
Anipik Mar 10, 2021
652cd78
use linux instead of ubuntu
Anipik Mar 11, 2021
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
17 changes: 15 additions & 2 deletions src/Microsoft.DotNet.PackageValidation/GetCompatiblePackageTargetFrameworks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,21 @@ public string GetRidsFromPackage(Package package)
{
if (item.AssetType == AssetType.RuntimeAsset)
{
if (!rids.Contains(item.Rid + "-x64"))
rids.Add(item.Rid + "-x64");
string testRid = item.Rid;
string testArch = "-x64";
if (testRid == "unix")
{
if (!rids.Contains("linux" + testArch))
Copy link
Member

@ericstj ericstj Mar 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: you can avoid all these Contains checks by using a HashSet<string> instead of List<string>.

Copy link
Contributor Author

@Anipik Anipik Mar 12, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will address this change with all the other feedback in the previous pr.

rids.Add("linux" + testArch);

if (!rids.Contains("osx" + testArch))
rids.Add("osx" + testArch);
}
else
{
if (!rids.Contains(testRid + testArch))
rids.Add(testRid + testArch);
}
}
}
return string.Join(";", rids);
Expand Down