From 3539fb2a779afe149912d2a936c7328a96defe84 Mon Sep 17 00:00:00 2001
From: Livar Cunha <licavalc@microsoft.com>
Date: Tue, 23 May 2017 15:57:53 -0700
Subject: [PATCH] Disabling net461 tests for the resolver.

---
 .../MSBuildSdkResolver.cs                        | 16 ++--------------
 ...rosoft.DotNet.MSBuildSdkResolver.Tests.csproj |  4 ++--
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs b/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs
index 67f885b88..76372cf09 100644
--- a/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs
+++ b/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs
@@ -95,7 +95,8 @@ namespace Microsoft.DotNet.MSBuildSdkResolver
                 return false;
             }
 
-            if (FailsToParseVersions(netcoreSdkVersion, minimumVersion, out netCoreSdkFXVersion, out minimumFXVersion))
+            if (!FXVersion.TryParse(netcoreSdkVersion, out netCoreSdkFXVersion) ||
+                !FXVersion.TryParse(minimumVersion, out minimumFXVersion))
             {
                 return true;
             }
@@ -103,19 +104,6 @@ namespace Microsoft.DotNet.MSBuildSdkResolver
             return FXVersion.Compare(netCoreSdkFXVersion, minimumFXVersion) == -1;
         }
 
-        private bool FailsToParseVersions(
-            string netcoreSdkVersion,
-            string minimumVersion,
-            out FXVersion netCoreSdkFXVersion,
-            out FXVersion minimumFXVersion)
-        {
-            netCoreSdkFXVersion = null;
-            minimumFXVersion = null;
-
-            return !FXVersion.TryParse(netcoreSdkVersion, out netCoreSdkFXVersion) ||
-                !FXVersion.TryParse(minimumVersion, out minimumFXVersion);
-        }
-
         private string ResolveNetcoreSdkDirectory(SdkResolverContext context)
         {
             foreach (string exeDir in GetDotnetExeDirectoryCandidates())
diff --git a/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj b/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj
index 9fe884da1..a21bb4731 100644
--- a/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj
+++ b/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj
@@ -2,8 +2,8 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net461;$(CliTargetFramework)</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">$(CliTargetFramework)</TargetFrameworks>
+    <!-- https://github.com/dotnet/cli/issues/6672: Re-enable net461 as a TFM for tests. -->
+    <TargetFrameworks>$(CliTargetFramework)</TargetFrameworks>
     <RuntimeFrameworkVersion>$(CLI_SharedFrameworkVersion)</RuntimeFrameworkVersion>
     <OutputType>Exe</OutputType>
     <AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>