diff --git a/AspNetCoreSdkTests/TemplateTests.cs b/AspNetCoreSdkTests/TemplateTests.cs index 6ef37d32dd..93f0237b23 100644 --- a/AspNetCoreSdkTests/TemplateTests.cs +++ b/AspNetCoreSdkTests/TemplateTests.cs @@ -130,7 +130,7 @@ namespace AspNetCoreSdkTests NuGetPackageSource.NuGetOrg : NuGetPackageSource.None; // Pre-release SDKs require a private nuget feed - var onlinePackageSource = (DotNetUtil.SdkVersion.IsPrerelease || DotNetUtil.SdkVersion == new SemanticVersion(2, 1, 402)) ? + var onlinePackageSource = DotNetUtil.IsPreReleaseSdk ? NuGetPackageSource.EnvironmentVariableAndNuGetOrg : NuGetPackageSource.NuGetOrg; if (runtimeIdentifier == RuntimeIdentifier.None) diff --git a/AspNetCoreSdkTests/Util/DotNetUtil.cs b/AspNetCoreSdkTests/Util/DotNetUtil.cs index b8d41f5a7f..19d3541745 100644 --- a/AspNetCoreSdkTests/Util/DotNetUtil.cs +++ b/AspNetCoreSdkTests/Util/DotNetUtil.cs @@ -33,6 +33,11 @@ namespace AspNetCoreSdkTests.Util public static SemanticVersion RuntimeVersion => _versions.Value.RuntimeVersion; + public static bool IsPreReleaseSdk => + SdkVersion.IsPrerelease || + SdkVersion == new SemanticVersion(2, 1, 401) || + SdkVersion == new SemanticVersion(2, 1, 402); + public static string TargetFrameworkMoniker => $"netcoreapp{RuntimeVersion.Major}.{RuntimeVersion.Minor}"; private static (SemanticVersion SdkVersion, SemanticVersion RuntimeVersion) GetVersions()