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

Merge pull request #13169 from dotnet-maestro-bot/merge/release/3.0-to-master 

[automated] Merge branch 'release/3.0' => 'master'
This commit is contained in:
Pranav K 2019-08-15 10:44:07 -07:00 committed by GitHub
parent 5e575a3e64 b2a0b02e35
commit 4144eeb459
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj
View File

@ -228,7 +228,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
<RepoTasks.GenerateSharedFrameworkDepsFile <RepoTasks.GenerateSharedFrameworkDepsFile
DepsFilePath="$(ProjectDepsFilePath)" DepsFilePath="$(ProjectDepsFilePath)"
TargetFramework="$(TargetFrameworkMoniker)" TargetFramework="$(TargetFrameworkMoniker)"
FrameworkName="$(SharedFxName)" FrameworkName="$(TargetingPackName)"
FrameworkVersion="$(SharedFxVersion)" FrameworkVersion="$(SharedFxVersion)"
References="@(_RuntimeReference)" References="@(_RuntimeReference)"
RuntimeIdentifier="$(RuntimeIdentifier)" RuntimeIdentifier="$(RuntimeIdentifier)"

2
src/Framework/test/TargetingPackTests.cs
View File

@ -101,7 +101,7 @@ namespace Microsoft.AspNetCore
{ {
var parts = line.Split('|'); var parts = line.Split('|');
Assert.Equal(4, parts.Length); Assert.Equal(4, parts.Length);
Assert.Equal("Microsoft.AspNetCore.App", parts[1]); Assert.Equal("Microsoft.AspNetCore.App.Ref", parts[1]);
if (parts[2].Length > 0) if (parts[2].Length > 0)
{ {
Assert.True(Version.TryParse(parts[2], out _), "Assembly version must be convertable to System.Version"); Assert.True(Version.TryParse(parts[2], out _), "Assembly version must be convertable to System.Version");

6
src/Mvc/Mvc.Razor.RuntimeCompilation/src/CSharpCompiler.cs
View File

@ -211,10 +211,8 @@ namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation
if (string.IsNullOrEmpty(dependencyContextOptions.LanguageVersion)) if (string.IsNullOrEmpty(dependencyContextOptions.LanguageVersion))
{ {
// During preview releases, Roslyn assumes Preview language version for netcoreapp3.0 targeting projects. // If the user does not specify a LanguageVersion, assume CSharp 8.0. This matches the language version Razor 3.0 targets by default.
// We will match the behavior if the project does not specify a value for C# language (e.g. if you're using Razor compilation in a F# project). parseOptions = parseOptions.WithLanguageVersion(LanguageVersion.CSharp8);
// Prior to 3.0 RTM, this value needs to be changed to "Latest". This is tracked via https://github.com/aspnet/AspNetCore/issues/9129
parseOptions = parseOptions.WithLanguageVersion(LanguageVersion.Preview);
} }
else if (LanguageVersionFacts.TryParse(dependencyContextOptions.LanguageVersion, out var languageVersion)) else if (LanguageVersionFacts.TryParse(dependencyContextOptions.LanguageVersion, out var languageVersion))
{ {

2
src/Servers/Kestrel/Core/src/Internal/Http2/Http2Stream.cs
View File

@ -98,7 +98,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2
var (oldState, newState) = ApplyCompletionFlag(StreamCompletionFlags.Aborted); var (oldState, newState) = ApplyCompletionFlag(StreamCompletionFlags.Aborted);
if (oldState != newState) if (oldState != newState)
{ {
Debug.Assert(!_decrementCalled); Debug.Assert(_decrementCalled);
// Don't block on IO. This never faults. // Don't block on IO. This never faults.
_ = _http2Output.WriteRstStreamAsync(Http2ErrorCode.NO_ERROR); _ = _http2Output.WriteRstStreamAsync(Http2ErrorCode.NO_ERROR);
RequestBodyPipe.Writer.Complete(); RequestBodyPipe.Writer.Complete();