Merge pull request #9636 from wli3/update-sdk-version3

Update SDK to 2.1.400-preview-63110-09 and MicrosoftNETCoreAppPackageVersion to 2.1.2
This commit is contained in:
Daniel Plaisted 2018-07-10 15:39:08 -07:00 committed by GitHub
commit b8b7396c62
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions

View file

@ -10,7 +10,7 @@
<DotnetSqlCachePackageVersion>2.1.1</DotnetSqlCachePackageVersion> <DotnetSqlCachePackageVersion>2.1.1</DotnetSqlCachePackageVersion>
<DotnetUserSecretsPackageVersion>2.1.1</DotnetUserSecretsPackageVersion> <DotnetUserSecretsPackageVersion>2.1.1</DotnetUserSecretsPackageVersion>
<DotnetWatchPackageVersion>2.1.1</DotnetWatchPackageVersion> <DotnetWatchPackageVersion>2.1.1</DotnetWatchPackageVersion>
<MicrosoftNETCoreAppPackageVersion>2.1.1</MicrosoftNETCoreAppPackageVersion> <MicrosoftNETCoreAppPackageVersion>2.1.2</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion> <MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftBuildPackageVersion>15.8.0-preview-000138</MicrosoftBuildPackageVersion> <MicrosoftBuildPackageVersion>15.8.0-preview-000138</MicrosoftBuildPackageVersion>
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion> <MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
@ -23,7 +23,7 @@
<MicrosoftNETCoreCompilersPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftNETCoreCompilersPackageVersion> <MicrosoftNETCoreCompilersPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftNETCoreCompilersPackageVersion>
<MicrosoftCodeAnalysisBuildTasksPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftCodeAnalysisBuildTasksPackageVersion> <MicrosoftCodeAnalysisBuildTasksPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftCodeAnalysisBuildTasksPackageVersion>
<MicrosoftNetCompilersNetcorePackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftNetCompilersNetcorePackageVersion> <MicrosoftNetCompilersNetcorePackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftNetCompilersNetcorePackageVersion>
<MicrosoftNETSdkPackageVersion>2.1.400-preview-63109-04</MicrosoftNETSdkPackageVersion> <MicrosoftNETSdkPackageVersion>2.1.400-preview-63110-09</MicrosoftNETSdkPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion> <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftNETSdkRazorPackageVersion>$(MicrosoftAspNetCoreAppPackageVersion)</MicrosoftNETSdkRazorPackageVersion> <MicrosoftNETSdkRazorPackageVersion>$(MicrosoftAspNetCoreAppPackageVersion)</MicrosoftNETSdkRazorPackageVersion>
<MicrosoftNETSdkWebPackageVersion>2.1.400-preview1-20180705-1834985</MicrosoftNETSdkWebPackageVersion> <MicrosoftNETSdkWebPackageVersion>2.1.400-preview1-20180705-1834985</MicrosoftNETSdkWebPackageVersion>

View file

@ -304,7 +304,7 @@ namespace Microsoft.DotNet.Tests
result.Should().NotBeNull(); result.Should().NotBeNull();
result.Args.Should().Contain("--fx-version 2.1.1"); result.Args.Should().Contain("--fx-version 2.1.2");
} }
[Fact] [Fact]

View file

@ -106,7 +106,7 @@ namespace Microsoft.DotNet.New.Tests
var sharedFxDir = dotnetDir var sharedFxDir = dotnetDir
.GetDirectory("shared", "Microsoft.NETCore.App") .GetDirectory("shared", "Microsoft.NETCore.App")
.EnumerateDirectories() .EnumerateDirectories()
.Single(d => d.Name.StartsWith("2.1.1")); .Single(d => d.Name.StartsWith("2.1.2"));
if (packageName == "microsoft.netcore.app") if (packageName == "microsoft.netcore.app")
{ {