huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add support for SDK 2.1.302 (#12)

This commit is contained in:
Mike Harder 2018-06-20 15:53:49 -07:00 committed by GitHub
parent d1afd66362
commit e395b9240a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
AspNetCoreSdkTests/NuGetPackageSource.cs
View File

@ -28,6 +28,12 @@ namespace AspNetCoreSdkTests
SourceArgumentLazy = new Lazy<string>(() => $"--source {GetPackageSourceFromEnvironment()}"), SourceArgumentLazy = new Lazy<string>(() => $"--source {GetPackageSourceFromEnvironment()}"),
}; };
public static NuGetPackageSource EnvironmentVariableAndNuGetOrg { get; } = new NuGetPackageSource
{
Name = nameof(EnvironmentVariableAndNuGetOrg),
SourceArgumentLazy = new Lazy<string>(() => string.Join(" ", EnvironmentVariable.SourceArgument, NuGetOrg.SourceArgument)),
};
private NuGetPackageSource() { } private NuGetPackageSource() { }
public string Name { get; private set; } public string Name { get; private set; }

21
AspNetCoreSdkTests/TemplateTests.cs
View File

@ -109,20 +109,23 @@ namespace AspNetCoreSdkTests
} }
else else
{ {
// Pre-release SDKs require a private nuget feed
var packageSource = (DotNetUtil.SdkVersion == new Version(2, 1, 302)) ? NuGetPackageSource.EnvironmentVariableAndNuGetOrg : NuGetPackageSource.NuGetOrg;
// Self-contained // Self-contained
return new[] return new[]
{ {
// ClassLibrary does not require a package source, even for self-contained deployments // ClassLibrary does not require a package source, even for self-contained deployments
Template.GetInstance<ClassLibraryTemplate>(NuGetPackageSource.None, runtimeIdentifier), Template.GetInstance<ClassLibraryTemplate>(NuGetPackageSource.None, runtimeIdentifier),
Template.GetInstance<ConsoleApplicationTemplate>(NuGetPackageSource.NuGetOrg, runtimeIdentifier), Template.GetInstance<ConsoleApplicationTemplate>(packageSource, runtimeIdentifier),
Template.GetInstance<RazorClassLibraryTemplate>(NuGetPackageSource.NuGetOrg, runtimeIdentifier), Template.GetInstance<RazorClassLibraryTemplate>(packageSource, runtimeIdentifier),
Template.GetInstance<WebTemplate>(NuGetPackageSource.NuGetOrg, runtimeIdentifier), Template.GetInstance<WebTemplate>(packageSource, runtimeIdentifier),
Template.GetInstance<RazorTemplate>(NuGetPackageSource.NuGetOrg, runtimeIdentifier), Template.GetInstance<RazorTemplate>(packageSource, runtimeIdentifier),
Template.GetInstance<MvcTemplate>(NuGetPackageSource.NuGetOrg, runtimeIdentifier), Template.GetInstance<MvcTemplate>(packageSource, runtimeIdentifier),
Template.GetInstance<AngularTemplate>(NuGetPackageSource.NuGetOrg, runtimeIdentifier), Template.GetInstance<AngularTemplate>(packageSource, runtimeIdentifier),
Template.GetInstance<ReactTemplate>(NuGetPackageSource.NuGetOrg, runtimeIdentifier), Template.GetInstance<ReactTemplate>(packageSource, runtimeIdentifier),
Template.GetInstance<ReactReduxTemplate>(NuGetPackageSource.NuGetOrg, runtimeIdentifier), Template.GetInstance<ReactReduxTemplate>(packageSource, runtimeIdentifier),
Template.GetInstance<WebApiTemplate>(NuGetPackageSource.NuGetOrg, runtimeIdentifier), Template.GetInstance<WebApiTemplate>(packageSource, runtimeIdentifier),
}; };
} }
} }

4
AspNetCoreSdkTests/Util/DotNetUtil.cs
View File

@ -34,8 +34,8 @@ namespace AspNetCoreSdkTests.Util
var versionString = Regex.Match(info, @"Version:\W*([0-9.]+)").Groups[1].Value; var versionString = Regex.Match(info, @"Version:\W*([0-9.]+)").Groups[1].Value;
var version = new Version(versionString); var version = new Version(versionString);
// Supported version range is [2.1.300,2.1.301] (inclusive) // Supported version range is [2.1.300,2.1.302] (inclusive)
if (version >= new Version(2, 1, 300) && version <= new Version(2, 1, 301)) if (version >= new Version(2, 1, 300) && version <= new Version(2, 1, 302))
{ {
return version; return version;
} }