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 1 commit
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
14 changes: 12 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,18 @@ 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;
if (testRid == "unix")
{
testRid = "ubuntu";
Comment thread
Anipik marked this conversation as resolved.
Outdated
}
else if (testRid == "freebsd")
{
testRid = "debian";

@ericstj ericstj Mar 10, 2021 •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

What made you choose debian here? https://github.com/dotnet/runtime/blob/3eddf4a06b0755747f8e8d659264694eef1f31ee/src/libraries/Microsoft.NETCore.Platforms/pkg/runtimeGroups.props#L59-L60

I'm a bit surprised we have any packages shipping freebsd assets, I thought freebsd was just a community driven source-build project.

@ericstj ericstj Mar 11, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Consider handling through https://github.com/dotnet/runtime/blob/89fbdcafcc09af0e1c2d86783eb8e8b93a743968/src/libraries/pkg/test/testPackages.proj#L18

@safern safern Mar 11, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

cc: @wfurt regarding packages shipping freebsd assets.

}
string testArch = "-x64";
if (!rids.Contains(testRid + testArch))
rids.Add(testRid + testArch);
}
}
return string.Join(";", rids);
Expand Down