mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Disabling net461 tests for the resolver.

Browse source
This commit is contained in:
Livar Cunha 2017-05-23 15:57:53 -07:00
parent 37267bf158
commit 3539fb2a77
2 changed files with 4 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs
View file

@ -95,7 +95,8 @@ namespace Microsoft.DotNet.MSBuildSdkResolver
return false; return false;
} }
if (FailsToParseVersions(netcoreSdkVersion, minimumVersion, out netCoreSdkFXVersion, out minimumFXVersion)) if (!FXVersion.TryParse(netcoreSdkVersion, out netCoreSdkFXVersion) ||
!FXVersion.TryParse(minimumVersion, out minimumFXVersion))
{ {
return true; return true;
} }
@ -103,19 +104,6 @@ namespace Microsoft.DotNet.MSBuildSdkResolver
return FXVersion.Compare(netCoreSdkFXVersion, minimumFXVersion) == -1; 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) private string ResolveNetcoreSdkDirectory(SdkResolverContext context)
{ {
foreach (string exeDir in GetDotnetExeDirectoryCandidates()) foreach (string exeDir in GetDotnetExeDirectoryCandidates())

4
test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj
View file

@ -2,8 +2,8 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net461;$(CliTargetFramework)</TargetFrameworks> <!-- https://github.com/dotnet/cli/issues/6672: Re-enable net461 as a TFM for tests. -->
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">$(CliTargetFramework)</TargetFrameworks> <TargetFrameworks>$(CliTargetFramework)</TargetFrameworks>
<RuntimeFrameworkVersion>$(CLI_SharedFrameworkVersion)</RuntimeFrameworkVersion> <RuntimeFrameworkVersion>$(CLI_SharedFrameworkVersion)</RuntimeFrameworkVersion>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>../../tools/Key.snk</AssemblyOriginatorKeyFile>