Skip to content

Commit 927ddab

Browse files
[master] Update dependencies from dotnet/runtime dotnet/efcore (#24717)
* Update dependencies from https://github.com/dotnet/runtime build 20200808.3 System.ComponentModel.Annotations , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Extensions.Internal.Transport , Microsoft.Extensions.Http , Microsoft.Extensions.Hosting , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting.Abstractions , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.Platforms , Microsoft.Win32.Registry , Microsoft.Win32.SystemEvents , Microsoft.NETCore.App.Internal , Microsoft.NETCore.App.Ref , System.Drawing.Common , System.Text.Encodings.Web , System.Text.Json , System.Threading.Channels , System.Windows.Extensions , System.ServiceProcess.ServiceController , System.Security.Principal.Windows , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.WebSockets.WebSocketProtocol , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.CompilerServices.Unsafe , System.Security.AccessControl , System.Security.Cryptography.Cng , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions From Version 5.0.0-rc.1.20406.11 -> To Version 5.0.0-rc.1.20408.3 * Update dependencies from https://github.com/dotnet/runtime build 20200809.3 System.ComponentModel.Annotations , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Extensions.Internal.Transport , Microsoft.Extensions.Http , Microsoft.Extensions.Hosting , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting.Abstractions , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.Platforms , Microsoft.Win32.Registry , Microsoft.Win32.SystemEvents , Microsoft.NETCore.App.Internal , Microsoft.NETCore.App.Ref , System.Drawing.Common , System.Text.Encodings.Web , System.Text.Json , System.Threading.Channels , System.Windows.Extensions , System.ServiceProcess.ServiceController , System.Security.Principal.Windows , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.WebSockets.WebSocketProtocol , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.CompilerServices.Unsafe , System.Security.AccessControl , System.Security.Cryptography.Cng , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions From Version 5.0.0-rc.1.20406.11 -> To Version 5.0.0-rc.1.20409.3 * Update dependencies from https://github.com/dotnet/efcore build 20200810.1 Microsoft.EntityFrameworkCore.Tools , Microsoft.EntityFrameworkCore.SqlServer , dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.InMemory From Version 5.0.0-rc.1.20406.4 -> To Version 5.0.0-rc.1.20410.1 * Update dependencies from https://github.com/dotnet/efcore build 20200810.2 Microsoft.EntityFrameworkCore.Tools , Microsoft.EntityFrameworkCore.SqlServer , dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.InMemory From Version 5.0.0-rc.1.20406.4 -> To Version 5.0.0-rc.1.20410.2 * React to S.T.Json changes * Update LangVersion=9.0 in the repo to use T? * Remove LangVersion project project files Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Pranav K <[email protected]>
1 parent 56be06b commit 927ddab

File tree

18 files changed

+217
-230
lines changed

18 files changed

+217
-230
lines changed

eng/Version.Details.xml

Lines changed: 142 additions & 142 deletions
Large diffs are not rendered by default.

eng/Versions.props

Lines changed: 71 additions & 71 deletions
Large diffs are not rendered by default.

eng/targets/CSharp.Common.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22

33
<PropertyGroup>
4-
<LangVersion>8.0</LangVersion>
4+
<LangVersion>9.0</LangVersion>
55

66
<!-- Enables Strict mode for Roslyn compiler -->
77
<Features>strict</Features>

src/Grpc/test/testassets/InteropClient/InteropClient.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<OutputType>Exe</OutputType>
55
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
66
<Nullable>enable</Nullable>
7-
<LangVersion>8.0</LangVersion>
87
</PropertyGroup>
98

109
<ItemGroup>

src/Grpc/test/testassets/InteropWebsite/InteropWebsite.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
66
<GenerateUserSecretsAttribute>false</GenerateUserSecretsAttribute>
77
<Nullable>enable</Nullable>
8-
<LangVersion>8.0</LangVersion>
98
</PropertyGroup>
109

1110
<ItemGroup>

src/Hosting/Hosting/src/Microsoft.AspNetCore.Hosting.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
99
<PackageTags>aspnetcore;hosting</PackageTags>
1010
<IsPackable>false</IsPackable>
11-
<LangVersion>9.0</LangVersion>
1211
</PropertyGroup>
1312

1413
<ItemGroup>

src/Hosting/samples/GenericWebHost/GenericWebHost.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
6-
<LangVersion>latest</LangVersion>
76
<SignAssembly>true</SignAssembly>
87
</PropertyGroup>
98

src/Http/Authentication.Abstractions/src/Microsoft.AspNetCore.Authentication.Abstractions.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<PackageTags>aspnetcore;authentication;security</PackageTags>
99
<IsPackable>false</IsPackable>
1010
<Nullable>enable</Nullable>
11-
<LangVersion>Preview</LangVersion>
1211
</PropertyGroup>
1312

1413
<ItemGroup>

src/Http/Http.Extensions/src/HttpRequestJsonExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public static class HttpRequestJsonExtensions
2727
/// <param name="request">The request to read from.</param>
2828
/// <param name="cancellationToken">A <see cref="CancellationToken"/> used to cancel the operation.</param>
2929
/// <returns>The task object representing the asynchronous operation.</returns>
30-
public static ValueTask<TValue> ReadFromJsonAsync<TValue>(
30+
public static ValueTask<TValue?> ReadFromJsonAsync<TValue>(
3131
this HttpRequest request,
3232
CancellationToken cancellationToken = default)
3333
{
@@ -43,7 +43,7 @@ public static ValueTask<TValue> ReadFromJsonAsync<TValue>(
4343
/// <param name="options">The serializer options use when deserializing the content.</param>
4444
/// <param name="cancellationToken">A <see cref="CancellationToken"/> used to cancel the operation.</param>
4545
/// <returns>The task object representing the asynchronous operation.</returns>
46-
public static async ValueTask<TValue> ReadFromJsonAsync<TValue>(
46+
public static async ValueTask<TValue?> ReadFromJsonAsync<TValue>(
4747
this HttpRequest request,
4848
JsonSerializerOptions? options,
4949
CancellationToken cancellationToken = default)

src/Http/Http.Extensions/test/HttpRequestJsonExtensionsTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public async Task ReadFromJsonAsyncGeneric_Utf16Encoding_ReturnValue()
110110
var result = await context.Request.ReadFromJsonAsync<Dictionary<string, string>>();
111111

112112
// Assert
113-
Assert.Equal("激光這兩個字是甚麼意思", result["name"]);
113+
Assert.Equal("激光這兩個字是甚麼意思", result!["name"]);
114114
}
115115

116116
[Fact]

src/Http/Http/src/Microsoft.AspNetCore.Http.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<PackageTags>aspnetcore</PackageTags>
1111
<IsPackable>false</IsPackable>
1212
<Nullable>enable</Nullable>
13-
<LangVersion>preview</LangVersion>
1413
</PropertyGroup>
1514

1615
<ItemGroup>

src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ Microsoft.AspNetCore.Routing.RouteCollection</Description>
2121
-->
2222
<ILEmitSaveAssemblies Condition="'$(ILEmitSaveAssemblies)'==''">false</ILEmitSaveAssemblies>
2323
<DefineConstants Condition="'$(ILEmitSaveAssemblies)'=='true'">IL_EMIT_SAVE_ASSEMBLIES;$(DefineConstants)</DefineConstants>
24-
<LangVersion>preview</LangVersion>
2524
</PropertyGroup>
2625

2726
<ItemGroup>

src/Http/WebUtilities/src/Microsoft.AspNetCore.WebUtilities.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<PackageTags>aspnetcore</PackageTags>
1111
<IsPackable>false</IsPackable>
1212
<Nullable>enable</Nullable>
13-
<LangVersion>Preview</LangVersion>
1413
</PropertyGroup>
1514

1615
<ItemGroup>

src/Mvc/Mvc.Core/test/Microsoft.AspNetCore.Mvc.Core.Test.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<PropertyGroup>
44
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
55
<RootNamespace>Microsoft.AspNetCore.Mvc</RootNamespace>
6-
<LangVersion>9.0</LangVersion>
76
</PropertyGroup>
87

98
<ItemGroup>

src/Mvc/test/Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<PropertyGroup>
44
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
55
<UseSharedCompilation>false</UseSharedCompilation>
6-
<LangVersion>9.0</LangVersion>
76
</PropertyGroup>
87

98
<ItemGroup>

src/Mvc/test/WebSites/FormatterWebSite/FormatterWebSite.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
<PropertyGroup>
44
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
5-
<LangVersion>9.0</LangVersion>
65
</PropertyGroup>
76

87
<ItemGroup>

src/Mvc/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
<PropertyGroup>
44
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
5-
<LangVersion>9.0</LangVersion>
65
</PropertyGroup>
76

87
<ItemGroup>

src/Servers/Kestrel/stress/HttpStress.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
<PropertyGroup>
44
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
5-
<LangVersion>preview</LangVersion>
65
<AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>
76
<IsTestAssetProject>true</IsTestAssetProject>
87
</PropertyGroup>

0 commit comments

Comments
 (0)