Disabling net461 tests for the resolver.

Author: Livar Cunha

src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs

@@ -95,27 +95,15 @@ private bool IsNetCoreSDKSmallerThanTheMinimumVersion(string netcoreSdkVersion,
                 return false;
             }
 
-            if (FailsToParseVersions(netcoreSdkVersion, minimumVersion, out netCoreSdkFXVersion, out minimumFXVersion))
+            if (!FXVersion.TryParse(netcoreSdkVersion, out netCoreSdkFXVersion) ||
+                !FXVersion.TryParse(minimumVersion, out minimumFXVersion))
             {
                 return true;
             }
 
             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())

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>