diff --git a/src/Pharmacist.Core/NuGet/NuGetFrameworkHelper.cs b/src/Pharmacist.Core/NuGet/NuGetFrameworkHelper.cs
index c513897..fb8819b 100644
--- a/src/Pharmacist.Core/NuGet/NuGetFrameworkHelper.cs
+++ b/src/Pharmacist.Core/NuGet/NuGetFrameworkHelper.cs
@@ -44,16 +44,16 @@ static NuGetFrameworkHelper()
             _nugetFrameworks["NetStandard1.6"] = new[] { FrameworkConstants.CommonFrameworks.NetStandard16 };
             _nugetFrameworks["NetStandard1.7"] = new[] { FrameworkConstants.CommonFrameworks.NetStandard17 };
             _nugetFrameworks["NetStandard2.0"] = new[] { FrameworkConstants.CommonFrameworks.NetStandard20 };
-            _nugetFrameworks["NetStandard2.1"] = new[] { new NuGetFramework(".NETStandard", new Version(2, 1, 0, 0)) };
+            _nugetFrameworks["NetStandard2.1"] = new[] { FrameworkConstants.CommonFrameworks.NetStandard21 };
             _nugetFrameworks["UAP"] = new[] { FrameworkConstants.CommonFrameworks.UAP10 };
             _nugetFrameworks["UAP10.0"] = new[] { FrameworkConstants.CommonFrameworks.UAP10 };
             _nugetFrameworks["NetCoreApp1.0"] = new[] { FrameworkConstants.CommonFrameworks.NetCoreApp10 };
             _nugetFrameworks["NetCoreApp1.1"] = new[] { FrameworkConstants.CommonFrameworks.NetCoreApp11 };
             _nugetFrameworks["NetCoreApp2.0"] = new[] { FrameworkConstants.CommonFrameworks.NetCoreApp20 };
             _nugetFrameworks["NetCoreApp2.1"] = new[] { FrameworkConstants.CommonFrameworks.NetCoreApp21 };
-            _nugetFrameworks["NetCoreApp2.2"] = new[] { new NuGetFramework(".NETCoreApp", new Version(2, 1, 0, 0)), FrameworkConstants.CommonFrameworks.NetStandard20 };
-            _nugetFrameworks["NetCoreApp3.0"] = new[] { new NuGetFramework(".NETCoreApp", new Version(3, 0, 0, 0)), FrameworkConstants.CommonFrameworks.NetStandard20 };
-            _nugetFrameworks["NetCoreApp3.1"] = new[] { new NuGetFramework(".NETCoreApp", new Version(3, 1, 0, 0)), FrameworkConstants.CommonFrameworks.NetStandard20 };
+            _nugetFrameworks["NetCoreApp2.2"] = new[] { FrameworkConstants.CommonFrameworks.NetCoreApp22, FrameworkConstants.CommonFrameworks.NetStandard20 };
+            _nugetFrameworks["NetCoreApp3.0"] = new[] { FrameworkConstants.CommonFrameworks.NetCoreApp30, FrameworkConstants.CommonFrameworks.NetStandard20 };
+            _nugetFrameworks["NetCoreApp3.1"] = new[] { FrameworkConstants.CommonFrameworks.NetCoreApp31, FrameworkConstants.CommonFrameworks.NetStandard20 };
             _nugetFrameworks["net5.0"] = new[] { FrameworkConstants.CommonFrameworks.Net50, FrameworkConstants.CommonFrameworks.NetStandard20 };
             _nugetFrameworks["MonoAndroid50"] = new[] { new NuGetFramework("MonoAndroid", new Version(5, 0, 0, 0)), FrameworkConstants.CommonFrameworks.NetStandard20 };
             _nugetFrameworks["MonoAndroid51"] = new[] { new NuGetFramework("MonoAndroid", new Version(5, 1, 0, 0)), FrameworkConstants.CommonFrameworks.NetStandard20 };
@@ -87,6 +87,12 @@ static NuGetFrameworkHelper()
             _nugetFrameworks["net472"] = new[] { new NuGetFramework(".NETFramework", new Version(4, 7, 2, 0)) };
             _nugetFrameworks["net48"] = new[] { new NuGetFramework(".NETFramework", new Version(4, 8, 0, 0)) };
 
+            _nugetFrameworks["tizen40"] = new[] { new NuGetFramework("Tizen", new Version(4, 0, 0, 0)) };
+            _nugetFrameworks["tizen50"] = new[] { new NuGetFramework("Tizen", new Version(5, 0, 0, 0)) };
+            _nugetFrameworks["tizen60"] = new[] { new NuGetFramework("Tizen", new Version(6, 0, 0, 0)) };
+            _nugetFrameworks["tizen70"] = new[] { new NuGetFramework("Tizen", new Version(7, 0, 0, 0)) };
+            _nugetFrameworks["tizen80"] = new[] { new NuGetFramework("Tizen", new Version(8, 0, 0, 0)) };
+
             _nugetFrameworks["uap10.0"] = new[] { FrameworkConstants.CommonFrameworks.UAP10, FrameworkConstants.CommonFrameworks.NetStandard20 };
             _nugetFrameworks["uap"] = new[] { FrameworkConstants.CommonFrameworks.UAP10, FrameworkConstants.CommonFrameworks.NetStandard20 };
         }
@@ -104,27 +110,37 @@ public static IReadOnlyList<NuGetFramework> ToFrameworks(this string frameworkNa
                 throw new ArgumentNullException(nameof(frameworkName));
             }
 
-            if (frameworkName.StartsWith("uap", StringComparison.CurrentCultureIgnoreCase))
-            {
-                var versionText = frameworkName.Substring("uap".Length);
-                return new[] { new NuGetFramework("UAP", new Version(versionText)), FrameworkConstants.CommonFrameworks.NetStandard20 };
-            }
+            _nugetFrameworks.TryGetValue(frameworkName, out var framework);
 
-            if (frameworkName.StartsWith("tizen", StringComparison.CurrentCultureIgnoreCase))
+            switch (framework)
             {
-                var versionText = frameworkName.Substring("tizen".Length);
-                return new[] { new NuGetFramework("Tizen", new Version(versionText)), FrameworkConstants.CommonFrameworks.NetStandard20 };
-            }
+                case null when frameworkName.StartsWith("tizen", StringComparison.CurrentCultureIgnoreCase):
+                {
+                    var versionText = frameworkName.Substring("tizen".Length);
+                    return new[] { new NuGetFramework("Tizen", new Version(versionText)), FrameworkConstants.CommonFrameworks.NetStandard20 };
+                }
 
-            if (frameworkName.StartsWith("tizen", StringComparison.CurrentCultureIgnoreCase))
-            {
-                var versionText = frameworkName.Substring("tizen".Length);
-                return new[] { new NuGetFramework("Tizen", new Version(versionText)), FrameworkConstants.CommonFrameworks.NetStandard20 };
-            }
+                case null when frameworkName.StartsWith("uap", StringComparison.CurrentCultureIgnoreCase):
+                {
+                    var versionText = frameworkName.Substring("uap".Length);
+                    return new[] { new NuGetFramework("UAP", new Version(versionText)), FrameworkConstants.CommonFrameworks.NetStandard20 };
+                }
 
-            _nugetFrameworks.TryGetValue(frameworkName, out var framework);
+                case null when frameworkName.StartsWith("netstandard", StringComparison.CurrentCultureIgnoreCase):
+                {
+                    var versionText = frameworkName.Substring("netstandard".Length);
+                    return new[] { new NuGetFramework(".NETStandard", new Version(versionText)) };
+                }
 
-            return framework ?? Array.Empty<NuGetFramework>();
+                case null when frameworkName.StartsWith("NetCoreApp", StringComparison.CurrentCultureIgnoreCase):
+                {
+                    var versionText = frameworkName.Substring("NetCoreApp".Length);
+                    return new[] { new NuGetFramework(".NETCoreApp", new Version(versionText)), FrameworkConstants.CommonFrameworks.NetStandard20 };
+                }
+
+                default:
+                    return framework ?? Array.Empty<NuGetFramework>();
+            }
         }
 
         /// <summary>