Restore fix for #2546

This reverts commit 4bfa875.

src/Microsoft.Dnx.Runtime/Internal/FrameworkNameHelper.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using System.Linq;
 using System.Runtime.Versioning;
 using NuGet;
 
@@ -13,10 +14,17 @@ public static FrameworkName ParseFrameworkName(string targetFramework)
         {
             if (targetFramework.Contains("+"))
             {
-                var portableProfile = NetPortableProfile.Parse(targetFramework);
+                var profile = targetFramework;
+                if (targetFramework.StartsWith("portable-"))
+                {
+                    // Strip the "portable-" prefix before passing to the profile parser
+                    profile = profile.Substring(9);
+                }
+                var portableProfile = NetPortableProfile.Parse(profile);
 
+                // Only support it if it parsed to a real PCL number
                 if (portableProfile != null &&
-                    portableProfile.FrameworkName.Profile != targetFramework)
+                    portableProfile.FrameworkName.Profile != profile)
                 {
                     return portableProfile.FrameworkName;
                 }
@@ -36,15 +44,31 @@ public static FrameworkName ParseFrameworkName(string targetFramework)
 
         public static string MakeDefaultTargetFrameworkDefine(Tuple<string, FrameworkName> frameworkDefinition)
         {
-            var shortName = frameworkDefinition.Item1;
+            var shortName = VersionUtility.GetShortFrameworkName(frameworkDefinition.Item2);
             var targetFramework = frameworkDefinition.Item2;
 
-            if (VersionUtility.IsPortableFramework(targetFramework))
+            if (targetFramework.IsPortableFramework())
             {
                 return null;
             }
 
-            return shortName.ToUpperInvariant();
+            var candidateName = shortName.ToUpperInvariant();
+
+            // Replace '-', '.', and '+' in the candidate name with '_' because TFMs with profiles use those (like "net40-client")
+            // and we want them representable as defines (i.e. "NET40_CLIENT")
+            candidateName = candidateName.Replace('-', '_').Replace('+', '_').Replace('.', '_');
+
+            // We require the following from our Target Framework Define names
+            // Starts with A-Z or _
+            // Contains only A-Z, 0-9 and _
+            if (!string.IsNullOrEmpty(candidateName) &&
+                (char.IsLetter(candidateName[0]) || candidateName[0] == '_') &&
+                candidateName.All(c => Char.IsLetterOrDigit(c) || c == '_'))
+            {
+                return candidateName;
+            }
+
+            return null;
         }
     }
 }

src/Microsoft.Dnx.Runtime/NuGet/Utility/VersionUtility.cs

@@ -63,7 +63,7 @@ public static class VersionUtility
             { UapFrameworkIdentifier, UapFrameworkIdentifier },
 
             { SilverlightFrameworkIdentifier, "sl" },
-            { NetCoreFrameworkIdentifier, "win"},
+            { NetCoreFrameworkIdentifier, "netcore"},
             { WindowsFrameworkIdentifier, "win"},
             { PortableFrameworkIdentifier, "portable" },
             { WindowsPhoneFrameworkIdentifier, "wp"},

test/Microsoft.Dnx.CommonTestUtils/project.json

@@ -1,22 +1,23 @@
 {
-  "dependencies": {
-    "Microsoft.Dnx.Runtime": "1.0.0-*",
-    "Microsoft.Dnx.Runtime.Sources": "1.0.0-*",
-    "xunit.runner.aspnet": "2.0.0-aspnet-*"
-  },
+    "dependencies": {
+        "Microsoft.Dnx.Runtime": "1.0.0-*",
+        "Microsoft.Dnx.Runtime.Sources": "1.0.0-*",
+        "xunit.runner.aspnet": "2.0.0-aspnet-*",
+        "Newtonsoft.Json": "6.0.6"
+    },
 
-  "frameworks": {
-    "dnx451": {
-      "frameworkAssemblies": {
-        "System.IO.Compression.FileSystem": ""
-      }
+    "frameworks": {
+        "dnx451": {
+            "frameworkAssemblies": {
+                "System.IO.Compression.FileSystem": ""
+            }
+        },
+        "dnxcore50": {
+            "dependencies": {
+                "System.IO.Compression.ZipFile": "4.0.0-*"
+            }
+        }
     },
-    "dnxcore50": {
-      "dependencies": {
-        "System.IO.Compression.ZipFile": "4.0.0-*"
-      }
-    }
-  },
 
     "commands": {
         "test": "xunit.runner.aspnet"

test/Microsoft.Dnx.Runtime.Tests/FrameworkNameHelperFacts.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Versioning;
+using System.Threading.Tasks;
+using Microsoft.Dnx.Runtime.Helpers;
+using Xunit;
+
+namespace Microsoft.Dnx.Runtime.Tests
+{
+    public class FrameworkNameHelperFacts
+    {
+        [Theory]
+
+        // Short names
+        [InlineData("dnx451", "DNX,Version=v4.5.1")]
+        [InlineData("dnxcore50", "DNXCore,Version=v5.0")]
+        [InlineData("net451", ".NETFramework,Version=v4.5.1")]
+
+        // With profiles
+        [InlineData("net40-client", ".NETFramework,Version=v4.0,Profile=Client")]
+
+        // Full names
+        [InlineData(".NETFramework,Version=v4.5.1", ".NETFramework,Version=v4.5.1")]
+        [InlineData(".NETPortable,Version=v4.5,Profile=Profile123", ".NETPortable,Version=v4.5,Profile=Profile123")]
+
+        // Portable names
+        [InlineData("portable-Profile123", ".NETPortable,Version=v0.0,Profile=Profile123")]
+        [InlineData("portable-Profile49", ".NETPortable,Version=v0.0,Profile=Profile49")]
+        [InlineData("portable45-Profile49", ".NETPortable,Version=v4.5,Profile=Profile49")]
+
+        // We only support full profile names.
+        [InlineData("portable-net45+wp8", "Unsupported,Version=v0.0")]
+        public void CorrectlyParsesFrameworkNames(string input, string fullName)
+        {
+            Assert.Equal(
+                new FrameworkName(fullName),
+                FrameworkNameHelper.ParseFrameworkName(input));
+        }
+    }
+}

test/Microsoft.Dnx.Runtime.Tests/ProjectExtensionsFacts.cs

@@ -58,6 +58,28 @@ public void GetCompilerOptionsCombinesTargetFrameworkIfNotNull()
             Assert.Equal("x86", options.Platform);
         }
 
+        [Theory]
+        [InlineData("net40", "NET40")]
+        [InlineData(".NETFramework,Version=v4.0", "NET40")]
+        [InlineData(".NETFramework,Version=v4.0,Profile=Client", "NET40_CLIENT")]
+        [InlineData("DOTNET5.1", "DOTNET5_1")]
+        [InlineData(".NETPortable,Version=v4.5,Profile=Profile123", null)]
+        [InlineData("portable-net45+win81", null)]
+        public void GetCompilerOptionsGeneratesTFMDefineForShortName(string tfm, string define)
+        {
+            // Arrange
+            var projectContent = @"{ ""frameworks"": { """ + tfm + @""": {} } }";
+            var project = ProjectUtilities.GetProject(projectContent, "TestProj", "project.json");
+            var targetFramework = FrameworkNameHelper.ParseFrameworkName(tfm);
+
+            // Act
+            var options = project.GetCompilerOptions(targetFramework, configurationName: "Debug");
+
+            // Assert
+            var expectedDefines = define == null ? new[] { "DEBUG", "TRACE" } : new[] { "DEBUG", "TRACE", define };
+            Assert.Equal(expectedDefines, options.Defines);
+        }
+
         [Fact]
         public void GetCompilerOptionsCombinesConfigurationAndTargetFrameworkfNotNull()
         {