From f52077f599f0d3b4545d8f87a0c3d15217b33069 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 5 Aug 2020 18:42:25 -0700 Subject: [PATCH] [master] Update dependencies from dotnet/runtime dotnet/efcore (#24496) * React to SDK changes * Skip instead of quar * Rely on transitive Microsoft.Bcl.AsyncInterfaces since it's now part of DependencyInjection. - This was introduced as part of: https://github.com/dotnet/runtime/pull/40189 - Prior to this we'd get version conflicts for our referenced Bcl.AsyncInterfaces. * Update global.json - move to RC1 SDK * React to runtime nullability changes with DataAnnotations. - ValidationResult was updated to declare its nullability: https://github.com/dotnet/runtime/commit/a9009db46e315d0eb862c6925cca19798b947163#diff-8e86bc8fee3eb0242c5b8368dfabe065 * Stop using HttpRequestMessage.Properties in favor of non-obsoleted HttpRequestMessage.Options. - Introduced in https://github.com/dotnet/runtime/commit/3eda592cf49e3b8fb64ea0cc595fdae83a50dd83 * Stop using more HttpRequestMessage.Properties in Component's web assembly project. - Introduced in dotnet/runtime@3eda592 * Update dependencies from https://github.com/dotnet/runtime build 20200804.16 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.20370.4 -> To Version 5.0.0-rc.1.20404.16 * Ignitor to 5.0 * Constants * Update dependencies from https://github.com/dotnet/efcore build 20200805.3 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.20372.13 -> To Version 5.0.0-rc.1.20405.3 Co-authored-by: dotnet-maestro[bot] Co-authored-by: Pranav K Co-authored-by: wtgodbe Co-authored-by: N. Taylor Mullen Co-authored-by: Justin Kotalik --- eng/Version.Details.xml | 284 +++++++++--------- eng/Versions.props | 142 ++++----- global.json | 4 +- .../EditContextDataAnnotationsExtensions.cs | 11 +- src/Components/Ignitor/src/Ignitor.csproj | 5 +- ...WebAssemblyHttpRequestMessageExtensions.cs | 13 +- .../src/Handlers/RedirectHandler.cs | 7 +- .../BuildIncrementalismTest.cs | 1 - .../integrationtests/BuildIntegrationTest.cs | 11 +- .../BuildIntrospectionTest.cs | 4 - .../BuildServerIntegrationTest.cs | 2 +- .../BuildWithComponentsIntegrationTest.cs | 2 +- ...soft.AspNetCore.SignalR.Client.Core.csproj | 6 +- 13 files changed, 248 insertions(+), 244 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2995c7f564..23f8be4193 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,297 +13,297 @@ https://github.com/dotnet/blazor cc449601d638ffaab58ae9487f0fd010bb178a12 - + https://github.com/dotnet/efcore - 59734ea22f29d22f8d0c1673c59a99c54ec4e78d + 9f2d1dcb202e8dd9e2d979daf7481c8e0a8394b6 - + https://github.com/dotnet/efcore - 59734ea22f29d22f8d0c1673c59a99c54ec4e78d + 9f2d1dcb202e8dd9e2d979daf7481c8e0a8394b6 - + https://github.com/dotnet/efcore - 59734ea22f29d22f8d0c1673c59a99c54ec4e78d + 9f2d1dcb202e8dd9e2d979daf7481c8e0a8394b6 - + https://github.com/dotnet/efcore - 59734ea22f29d22f8d0c1673c59a99c54ec4e78d + 9f2d1dcb202e8dd9e2d979daf7481c8e0a8394b6 - + https://github.com/dotnet/efcore - 59734ea22f29d22f8d0c1673c59a99c54ec4e78d + 9f2d1dcb202e8dd9e2d979daf7481c8e0a8394b6 - + https://github.com/dotnet/efcore - 59734ea22f29d22f8d0c1673c59a99c54ec4e78d + 9f2d1dcb202e8dd9e2d979daf7481c8e0a8394b6 - + https://github.com/dotnet/efcore - 59734ea22f29d22f8d0c1673c59a99c54ec4e78d + 9f2d1dcb202e8dd9e2d979daf7481c8e0a8394b6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 - + https://github.com/dotnet/runtime - 0e0e648770e54b12c2fa81a77538ce1a72fca8af + b497143c168c8df00f070e95a4c6fee4092d2ea6 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 3ac9563017..55da9dcac9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,82 +64,82 @@ 3.8.0-2.20379.3 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 - 5.0.0-rc.1.20370.4 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 + 5.0.0-rc.1.20404.16 - 5.0.0-rc.1.20370.4 + 5.0.0-rc.1.20404.16 3.2.0 - 5.0.0-rc.1.20372.13 - 5.0.0-rc.1.20372.13 - 5.0.0-rc.1.20372.13 - 5.0.0-rc.1.20372.13 - 5.0.0-rc.1.20372.13 - 5.0.0-rc.1.20372.13 - 5.0.0-rc.1.20372.13 + 5.0.0-rc.1.20405.3 + 5.0.0-rc.1.20405.3 + 5.0.0-rc.1.20405.3 + 5.0.0-rc.1.20405.3 + 5.0.0-rc.1.20405.3 + 5.0.0-rc.1.20405.3 + 5.0.0-rc.1.20405.3 - netcoreapp3.0 + net5.0 false $(DefineConstants);IGNITOR true diff --git a/src/Components/WebAssembly/WebAssembly/src/Http/WebAssemblyHttpRequestMessageExtensions.cs b/src/Components/WebAssembly/WebAssembly/src/Http/WebAssemblyHttpRequestMessageExtensions.cs index 6abac268cc..12987cbac6 100644 --- a/src/Components/WebAssembly/WebAssembly/src/Http/WebAssemblyHttpRequestMessageExtensions.cs +++ b/src/Components/WebAssembly/WebAssembly/src/Http/WebAssemblyHttpRequestMessageExtensions.cs @@ -12,6 +12,9 @@ namespace Microsoft.AspNetCore.Components.WebAssembly.Http /// public static class WebAssemblyHttpRequestMessageExtensions { + private static readonly HttpRequestOptionsKey> FetchRequestOptionsKey = new HttpRequestOptionsKey>("WebAssemblyFetchOptions"); + private static readonly HttpRequestOptionsKey WebAssemblyEnableStreamingResponseKey = new HttpRequestOptionsKey("WebAssemblyEnableStreamingResponse"); + /// /// Configures a value for the 'credentials' option for the HTTP request. /// @@ -126,17 +129,15 @@ namespace Microsoft.AspNetCore.Components.WebAssembly.Http throw new ArgumentNullException(nameof(requestMessage)); } - const string FetchRequestOptionsKey = "WebAssemblyFetchOptions"; IDictionary fetchOptions; - - if (requestMessage.Properties.TryGetValue(FetchRequestOptionsKey, out var entry)) + if (requestMessage.Options.TryGetValue(FetchRequestOptionsKey, out var entry)) { - fetchOptions = (IDictionary)entry; + fetchOptions = entry; } else { fetchOptions = new Dictionary(StringComparer.Ordinal); - requestMessage.Properties[FetchRequestOptionsKey] = fetchOptions; + requestMessage.Options.Set(FetchRequestOptionsKey, fetchOptions); } fetchOptions[name] = value; @@ -161,7 +162,7 @@ namespace Microsoft.AspNetCore.Components.WebAssembly.Http throw new ArgumentNullException(nameof(requestMessage)); } - requestMessage.Properties["WebAssemblyEnableStreamingResponse"] = streamingEnabled; + requestMessage.Options.Set(WebAssemblyEnableStreamingResponseKey, streamingEnabled); return requestMessage; } diff --git a/src/Mvc/Mvc.Testing/src/Handlers/RedirectHandler.cs b/src/Mvc/Mvc.Testing/src/Handlers/RedirectHandler.cs index 2ab8014948..8d2b6a4115 100644 --- a/src/Mvc/Mvc.Testing/src/Handlers/RedirectHandler.cs +++ b/src/Mvc/Mvc.Testing/src/Handlers/RedirectHandler.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -152,9 +152,10 @@ namespace Microsoft.AspNetCore.Mvc.Testing.Handlers redirect.Content = originalContent; } - foreach (var property in response.RequestMessage.Properties) + foreach (var property in response.RequestMessage.Options) { - redirect.Properties.Add(property.Key, property.Value); + var key = new HttpRequestOptionsKey(property.Key); + redirect.Options.Set(key, property.Value); } } diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildIncrementalismTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildIncrementalismTest.cs index e651cad69f..700c190385 100644 --- a/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildIncrementalismTest.cs +++ b/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildIncrementalismTest.cs @@ -113,7 +113,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests Assert.BuildFailed(result); - // This needs to be relative path. Tracked by https://github.com/aspnet/Razor/issues/2187. var filePath = Path.Combine(Project.DirectoryPath, "Views", "Home", "Index.cshtml"); var location = filePath + "(1,2)"; if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildIntegrationTest.cs index b6d14278a4..7f7e829b06 100644 --- a/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildIntegrationTest.cs +++ b/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildIntegrationTest.cs @@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests public Task Build_SimpleMvc_UsingDotnetMSBuildAndWithoutBuildServer_CanBuildSuccessfully() => Build_SimpleMvc_WithoutBuildServer_CanBuildSuccessfully(MSBuildProcessKind.Dotnet); - [ConditionalFact] + [ConditionalFact(Skip = "https://github.com/dotnet/aspnetcore/issues/24427")] [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] [InitializeTestProject("SimpleMvc")] public Task Build_SimpleMvc_UsingDesktopMSBuildAndWithoutBuildServer_CanBuildSuccessfully() @@ -96,7 +96,14 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests Assert.BuildFailed(result); // Verifying that the error correctly gets mapped to the original source - Assert.BuildError(result, "CS1503", location: Path.Combine("Views", "Home", "Index.cshtml") + "(1,27)"); + var filePath = Path.Combine(Project.DirectoryPath, "Views", "Home", "Index.cshtml"); + var location = filePath + "(1,27)"; + if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) + { + // Absolute paths on OSX don't work well. + location = null; + } + Assert.BuildError(result, "CS1503", location); // Compilation failed without creating the views assembly Assert.FileExists(result, IntermediateOutputPath, "SimpleMvc.dll"); diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildIntrospectionTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildIntrospectionTest.cs index 670c032036..de73ff376a 100644 --- a/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildIntrospectionTest.cs +++ b/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildIntrospectionTest.cs @@ -216,8 +216,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests var result = await DotnetMSBuild("_IntrospectContentItems"); Assert.BuildPassed(result); - var launchSettingsPath = Path.Combine("Properties", "launchSettings.json"); - Assert.BuildOutputContainsLine(result, $"Content: {launchSettingsPath} CopyToOutputDirectory=PreserveNewest CopyToPublishDirectory=Never ExcludeFromSingleFile=true"); Assert.BuildOutputContainsLine(result, "Content: appsettings.json CopyToOutputDirectory=PreserveNewest CopyToPublishDirectory=PreserveNewest ExcludeFromSingleFile=true"); Assert.BuildOutputContainsLine(result, "Content: appsettings.Development.json CopyToOutputDirectory=PreserveNewest CopyToPublishDirectory=PreserveNewest ExcludeFromSingleFile=true"); } @@ -230,8 +228,6 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests var result = await DotnetMSBuild("_IntrospectContentItems", "/p:ExcludeConfigFilesFromBuildOutput=true"); Assert.BuildPassed(result); - var launchSettingsPath = Path.Combine("Properties", "launchSettings.json"); - Assert.BuildOutputContainsLine(result, $"Content: {launchSettingsPath} CopyToOutputDirectory= CopyToPublishDirectory=Never ExcludeFromSingleFile=true"); Assert.BuildOutputContainsLine(result, "Content: appsettings.json CopyToOutputDirectory= CopyToPublishDirectory=PreserveNewest ExcludeFromSingleFile=true"); Assert.BuildOutputContainsLine(result, "Content: appsettings.Development.json CopyToOutputDirectory= CopyToPublishDirectory=PreserveNewest ExcludeFromSingleFile=true"); } diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildServerIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildServerIntegrationTest.cs index 005ac4ccf6..9b1510ee09 100644 --- a/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildServerIntegrationTest.cs +++ b/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildServerIntegrationTest.cs @@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests public Task Build_SimpleMvc_WithServer_UsingDotnetMSBuild_CanBuildSuccessfully() => Build_SimpleMvc_CanBuildSuccessfully(MSBuildProcessKind.Dotnet); - [ConditionalFact] + [ConditionalFact(Skip = "https://github.com/dotnet/aspnetcore/issues/24427")] [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] [InitializeTestProject("SimpleMvc")] public Task Build_SimpleMvc_WithServer_UsingDesktopMSBuild_CanBuildSuccessfully() diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildWithComponentsIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildWithComponentsIntegrationTest.cs index fa6e78c7d7..f0a1c87c32 100644 --- a/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildWithComponentsIntegrationTest.cs +++ b/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/BuildWithComponentsIntegrationTest.cs @@ -19,7 +19,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests [InitializeTestProject("MvcWithComponents")] public Task Build_Components_WithDotNetCoreMSBuild_Works() => Build_ComponentsWorks(MSBuildProcessKind.Dotnet); - [ConditionalFact] + [ConditionalFact(Skip = "https://github.com/dotnet/aspnetcore/issues/24427")] [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)] [InitializeTestProject("MvcWithComponents")] public Task Build_Components_WithDesktopMSBuild_Works() => Build_ComponentsWorks(MSBuildProcessKind.Desktop); diff --git a/src/SignalR/clients/csharp/Client.Core/src/Microsoft.AspNetCore.SignalR.Client.Core.csproj b/src/SignalR/clients/csharp/Client.Core/src/Microsoft.AspNetCore.SignalR.Client.Core.csproj index 3f808a9395..71e4f7fd20 100644 --- a/src/SignalR/clients/csharp/Client.Core/src/Microsoft.AspNetCore.SignalR.Client.Core.csproj +++ b/src/SignalR/clients/csharp/Client.Core/src/Microsoft.AspNetCore.SignalR.Client.Core.csproj @@ -1,4 +1,4 @@ - + Client for ASP.NET Core SignalR @@ -27,10 +27,6 @@ - - - -