Adding reverse mapping for .NETPlatform

manuelxmarquez · Jun 5, 2015 · 3dda2f7 · 3dda2f7
1 parent 024ad87
commit 3dda2f7
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/Core/Utility/VersionUtility.cs b/src/Core/Utility/VersionUtility.cs
@@ -99,6 +99,7 @@ public static class VersionUtility
 
             // Dotnet
             { NetPlatformFrameworkShortName, NetPlatformFrameworkIdentifier },
+            { NetPlatformFrameworkIdentifier, NetPlatformFrameworkIdentifier },
 
             // UAP
             { UAPFrameworkShortName, UAPFrameworkIdentifier },
@@ -158,7 +159,7 @@ public static class VersionUtility
             { "Xamarin.PlayStation4", "xamarinpsfour" },
             { "Xamarin.PlayStationVita", "xamarinpsvita" },
             { "Xamarin.Xbox360", "xamarinxboxthreesixty" },
-            { "Xamarin.XboxOne", "xamarinxboxone" }
+            { "Xamarin.XboxOne", "xamarinxboxone" },
         };
 
         private static readonly Dictionary<string, string> _identifierToProfileFolder = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase) {

diff --git a/test/Core.Test/VersionUtilityTest.cs b/test/Core.Test/VersionUtilityTest.cs
@@ -1995,5 +1995,25 @@ public void ShortFrameworkNamesAreCorrect(string longName, string version, strin
             var fx = new FrameworkName(longName, Version.Parse(version));
             Assert.Equal(shortName, VersionUtility.GetShortFrameworkName(fx));
         }
+
+        [Theory]
+        [InlineData(".NETPlatform5.0", ".NETPlatform", "5.0")]
+        [InlineData(".NETPlatform50", ".NETPlatform", "5.0")]
+        public void CanParseMixedFrameworkNames(string mixedName, string longName, string version)
+        {
+            var fx = VersionUtility.ParseFrameworkName(mixedName);
+            Assert.Equal(new FrameworkName(longName, Version.Parse(version)), fx);
+        }
+
+        [Theory]
+        [InlineData(".NETPlatform5.0", "dotnet")]
+        [InlineData(".NETPlatform50", "dotnet")]
+        public void CanParseMixedFrameworkNamesToShort(string mixedName, string shortName)
+        {
+            var fx = VersionUtility.ParseFrameworkName(mixedName);
+            var result = VersionUtility.GetShortFrameworkName(fx);
+
+            Assert.Equal(shortName, result);
+        }
     }
 }