Move NetCore project to use .NET SDK

RuntimePortable.sln

@@ -9,7 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{C40883CD-3
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestCommon", "test\Microsoft.TestCommon\Microsoft.TestCommon.csproj", "{FCCC4CB7-BAF7-4A57-9F89-E5766FE536C0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Http.Formatting.NetCore", "src\System.Net.Http.Formatting.NetCore\System.Net.Http.Formatting.NetCore.csproj", "{C7060639-719B-4BD2-8A37-2F146B5A0668}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http.Formatting.NetCore", "src\System.Net.Http.Formatting.NetCore\System.Net.Http.Formatting.NetCore.csproj", "{C7060639-719B-4BD2-8A37-2F146B5A0668}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http.Formatting.NetCore.Test", "test\System.Net.Http.Formatting.NetCore.Test\System.Net.Http.Formatting.NetCore.Test.csproj", "{8DA61DAC-FF7E-4CA1-93A0-6148DB66FD08}"
 EndProject

packages/repositories.config

@@ -3,7 +3,6 @@
   <repository path="..\src\Microsoft.AspNet.Facebook\packages.config" />
   <repository path="..\src\Microsoft.Web.Helpers\packages.config" />
   <repository path="..\src\Microsoft.Web.WebPages.OAuth\packages.config" />
-  <repository path="..\src\System.Net.Http.Formatting.NetCore\packages.config" />
   <repository path="..\src\System.Net.Http.Formatting\packages.config" />
   <repository path="..\src\System.Web.Http.Owin\packages.config" />
   <repository path="..\src\System.Web.Http.SignalR\packages.config" />

src/Common/Error.cs

@@ -225,11 +225,7 @@ internal static OperationCanceledException OperationCanceled(string messageForma
         /// <returns>The logged <see cref="Exception"/>.</returns>
         internal static ArgumentException InvalidEnumArgument(string parameterName, int invalidValue, Type enumClass)
         {
-#if NETFX_CORE
-            return new ArgumentException(Error.Format(CommonWebApiResources.InvalidEnumArgument, parameterName, invalidValue, enumClass.Name), parameterName);
-#else
             return new InvalidEnumArgumentException(parameterName, invalidValue, enumClass);
-#endif
         }
 
         /// <summary>
@@ -265,5 +261,24 @@ internal static NotSupportedException NotSupported(string messageFormat, params
         {
             return new NotSupportedException(Error.Format(messageFormat, messageArgs));
         }
+
+#if NETFX_CORE // InvalidEnumArgumentException not available in netstandard1.3.
+        internal class InvalidEnumArgumentException : ArgumentException
+        {
+            public InvalidEnumArgumentException() : this(null)
+            { }
+
+            public InvalidEnumArgumentException(string message) : base(message)
+            { }
+
+            public InvalidEnumArgumentException(string message, Exception innerException) : base(message, innerException)
+            { }
+
+            public InvalidEnumArgumentException(string argumentName, int invalidValue, Type enumClass) : base(
+                Error.Format(CommonWebApiResources.InvalidEnumArgument, argumentName, invalidValue, enumClass.Name),
+                argumentName)
+            { }
+        }
+#endif
     }
 }

src/Directory.Build.props

@@ -4,6 +4,6 @@
   <PropertyGroup>
     <IsPackable>true</IsPackable>
     <IsTestProject>false</IsTestProject>
-    <TargetFrameworkVersion Condition="'$(MSBuildProjectName)' != 'System.Net.Http.Formatting.NetStandard'">v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion Condition=" !$(MSBuildProjectName.StartsWith('System.Net.Http.Formatting.Net')) ">v4.5</TargetFrameworkVersion>
   </PropertyGroup>
 </Project>

src/System.Net.Http.Formatting.NetCore/ICloneable.cs

@@ -0,0 +1,9 @@
+// No ICloneable interface in .NET Standard 1.3.
+
+namespace System
+{
+    internal interface ICloneable
+    {
+        object Clone();
+    }
+}