From 674841b3c56ada0d96318ff514cf770e5781f57b Mon Sep 17 00:00:00 2001 From: Anipik Date: Wed, 10 Mar 2021 12:46:32 -0800 Subject: [PATCH 1/2] use ubuntu & debian instead of unix & freebsd --- .../GetCompatiblePackageTargetFrameworks.cs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.DotNet.PackageValidation/GetCompatiblePackageTargetFrameworks.cs b/src/Microsoft.DotNet.PackageValidation/GetCompatiblePackageTargetFrameworks.cs index fd0da8aee1a..5aa41f3d4fa 100644 --- a/src/Microsoft.DotNet.PackageValidation/GetCompatiblePackageTargetFrameworks.cs +++ b/src/Microsoft.DotNet.PackageValidation/GetCompatiblePackageTargetFrameworks.cs @@ -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"; + } + else if (testRid == "freebsd") + { + testRid = "debian"; + } + string testArch = "-x64"; + if (!rids.Contains(testRid + testArch)) + rids.Add(testRid + testArch); } } return string.Join(";", rids); From 652cd7849d59abbe7560024a8b261b841a4b747e Mon Sep 17 00:00:00 2001 From: Anipik Date: Wed, 10 Mar 2021 18:49:04 -0800 Subject: [PATCH 2/2] use linux instead of ubuntu --- .../GetCompatiblePackageTargetFrameworks.cs | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/Microsoft.DotNet.PackageValidation/GetCompatiblePackageTargetFrameworks.cs b/src/Microsoft.DotNet.PackageValidation/GetCompatiblePackageTargetFrameworks.cs index 5aa41f3d4fa..4a8bc4377ea 100644 --- a/src/Microsoft.DotNet.PackageValidation/GetCompatiblePackageTargetFrameworks.cs +++ b/src/Microsoft.DotNet.PackageValidation/GetCompatiblePackageTargetFrameworks.cs @@ -141,17 +141,20 @@ public string GetRidsFromPackage(Package package) if (item.AssetType == AssetType.RuntimeAsset) { string testRid = item.Rid; + string testArch = "-x64"; if (testRid == "unix") { - testRid = "ubuntu"; + if (!rids.Contains("linux" + testArch)) + rids.Add("linux" + testArch); + + if (!rids.Contains("osx" + testArch)) + rids.Add("osx" + testArch); } - else if (testRid == "freebsd") + else { - testRid = "debian"; - } - string testArch = "-x64"; - if (!rids.Contains(testRid + testArch)) - rids.Add(testRid + testArch); + if (!rids.Contains(testRid + testArch)) + rids.Add(testRid + testArch); + } } } return string.Join(";", rids);