From c3af33a023663fe515f8b8942eab67d9e0442ff9 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Thu, 29 Aug 2019 09:20:15 -0700 Subject: [PATCH 1/6] Update manually generated reference for RenderTreeFrame (#13522) Fixes https://github.com/aspnet/AspNetCore/issues/13504 --- ...etCore.Components.netstandard2.0.Manual.cs | 85 +++++++++++-------- 1 file changed, 48 insertions(+), 37 deletions(-) diff --git a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs index ed14f101cd..0f6b699935 100644 --- a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs +++ b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs @@ -1,47 +1,58 @@ // 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; +using System.Runtime.InteropServices; +using Microsoft.AspNetCore.Components.Rendering; + namespace Microsoft.AspNetCore.Components.RenderTree { // https://github.com/dotnet/arcade/pull/2033 - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Explicit)] + [StructLayout(LayoutKind.Explicit, Pack = 4)] public readonly partial struct RenderTreeFrame { - [System.Runtime.InteropServices.FieldOffsetAttribute(8)] - public readonly int AttributeEventHandlerId; - [System.Runtime.InteropServices.FieldOffsetAttribute(16)] - public readonly string AttributeName; - [System.Runtime.InteropServices.FieldOffsetAttribute(24)] - public readonly object AttributeValue; - [System.Runtime.InteropServices.FieldOffsetAttribute(12)] - public readonly int ComponentId; - [System.Runtime.InteropServices.FieldOffsetAttribute(16)] - public readonly System.Action ComponentReferenceCaptureAction; - [System.Runtime.InteropServices.FieldOffsetAttribute(8)] - public readonly int ComponentReferenceCaptureParentFrameIndex; - [System.Runtime.InteropServices.FieldOffsetAttribute(8)] - public readonly int ComponentSubtreeLength; - [System.Runtime.InteropServices.FieldOffsetAttribute(16)] - public readonly System.Type ComponentType; - [System.Runtime.InteropServices.FieldOffsetAttribute(16)] - public readonly string ElementName; - [System.Runtime.InteropServices.FieldOffsetAttribute(24)] - public readonly System.Action ElementReferenceCaptureAction; - [System.Runtime.InteropServices.FieldOffsetAttribute(16)] - public readonly string ElementReferenceCaptureId; - [System.Runtime.InteropServices.FieldOffsetAttribute(8)] - public readonly int ElementSubtreeLength; - [System.Runtime.InteropServices.FieldOffsetAttribute(4)] - public readonly Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrameType FrameType; - [System.Runtime.InteropServices.FieldOffsetAttribute(16)] - public readonly string MarkupContent; - [System.Runtime.InteropServices.FieldOffsetAttribute(8)] - public readonly int RegionSubtreeLength; - [System.Runtime.InteropServices.FieldOffsetAttribute(0)] - public readonly int Sequence; - [System.Runtime.InteropServices.FieldOffsetAttribute(16)] - public readonly string TextContent; - public Microsoft.AspNetCore.Components.IComponent Component { get { throw null; } } - public override string ToString() { throw null; } + [FieldOffset(0)] public readonly int Sequence; + + [FieldOffset(4)] public readonly RenderTreeFrameType FrameType; + + [FieldOffset(8)] public readonly int ElementSubtreeLength; + + [FieldOffset(16)] public readonly string ElementName; + + [FieldOffset(24)] public readonly object ElementKey; + + [FieldOffset(16)] public readonly string TextContent; + + [FieldOffset(8)] public readonly ulong AttributeEventHandlerId; + + [FieldOffset(16)] public readonly string AttributeName; + + [FieldOffset(24)] public readonly object AttributeValue; + + [FieldOffset(32)] public readonly string AttributeEventUpdatesAttributeName; + + [FieldOffset(8)] public readonly int ComponentSubtreeLength; + + [FieldOffset(12)] public readonly int ComponentId; + + [FieldOffset(16)] public readonly Type ComponentType; + + [FieldOffset(32)] public readonly object ComponentKey; + + public IComponent Component => null; + + [FieldOffset(8)] public readonly int RegionSubtreeLength; + + [FieldOffset(16)] public readonly string ElementReferenceCaptureId; + + [FieldOffset(24)] public readonly Action ElementReferenceCaptureAction; + + [FieldOffset(8)] public readonly int ComponentReferenceCaptureParentFrameIndex; + + [FieldOffset(16)] public readonly Action ComponentReferenceCaptureAction; + + [FieldOffset(16)] public readonly string MarkupContent; + + public override string ToString() => null; } } From 78b46768d7eab55dc90361b42fa4372ce2256134 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 7 Aug 2019 09:49:27 -0700 Subject: [PATCH 2/6] Lazyily initialize Https port in HttpsRedirectionMiddleware --- .../src/HttpsRedirectionMiddleware.cs | 64 ++++++++++--------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/src/Middleware/HttpsPolicy/src/HttpsRedirectionMiddleware.cs b/src/Middleware/HttpsPolicy/src/HttpsRedirectionMiddleware.cs index 1e860a0e87..021a030e17 100644 --- a/src/Middleware/HttpsPolicy/src/HttpsRedirectionMiddleware.cs +++ b/src/Middleware/HttpsPolicy/src/HttpsRedirectionMiddleware.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; @@ -15,9 +15,10 @@ namespace Microsoft.AspNetCore.HttpsPolicy { public class HttpsRedirectionMiddleware { + private const int PortNotFound = -1; + private readonly RequestDelegate _next; - private bool _portEvaluated = false; - private int? _httpsPort; + private readonly Lazy _httpsPort; private readonly int _statusCode; private readonly IServerAddressesFeature _serverAddressesFeature; @@ -42,8 +43,14 @@ namespace Microsoft.AspNetCore.HttpsPolicy throw new ArgumentNullException(nameof(options)); } var httpsRedirectionOptions = options.Value; - _httpsPort = httpsRedirectionOptions.HttpsPort; - _portEvaluated = _httpsPort.HasValue; + if (httpsRedirectionOptions.HttpsPort.HasValue) + { + _httpsPort = new Lazy(() => httpsRedirectionOptions.HttpsPort.Value); + } + else + { + _httpsPort = new Lazy(TryGetHttpsPort); + } _statusCode = httpsRedirectionOptions.RedirectStatusCode; _logger = loggerFactory.CreateLogger(); } @@ -70,7 +77,13 @@ namespace Microsoft.AspNetCore.HttpsPolicy /// public Task Invoke(HttpContext context) { - if (context.Request.IsHttps || !TryGetHttpsPort(out var port)) + if (context.Request.IsHttps) + { + return _next(context); + } + + var port = _httpsPort.Value; + if (port == PortNotFound) { return _next(context); } @@ -101,7 +114,8 @@ namespace Microsoft.AspNetCore.HttpsPolicy return Task.CompletedTask; } - private bool TryGetHttpsPort(out int port) + // Returns PortNotFound (-1) if we were unable to determine the port. + private int TryGetHttpsPort() { // The IServerAddressesFeature will not be ready until the middleware is Invoked, // Order for finding the HTTPS port: @@ -109,59 +123,47 @@ namespace Microsoft.AspNetCore.HttpsPolicy // 2. HTTPS_PORT environment variable // 3. IServerAddressesFeature // 4. Fail if not set - - port = -1; - - if (_portEvaluated) + var nullablePort = _config.GetValue("HTTPS_PORT"); + if (nullablePort.HasValue) { - port = _httpsPort ?? port; - return _httpsPort.HasValue; - } - _portEvaluated = true; - - _httpsPort = _config.GetValue("HTTPS_PORT"); - if (_httpsPort.HasValue) - { - port = _httpsPort.Value; + var port = nullablePort.Value; _logger.PortLoadedFromConfig(port); - return true; + return port; } if (_serverAddressesFeature == null) { _logger.FailedToDeterminePort(); - return false; + return PortNotFound; } - int? httpsPort = null; foreach (var address in _serverAddressesFeature.Addresses) { var bindingAddress = BindingAddress.Parse(address); if (bindingAddress.Scheme.Equals("https", StringComparison.OrdinalIgnoreCase)) { // If we find multiple different https ports specified, throw - if (httpsPort.HasValue && httpsPort != bindingAddress.Port) + if (nullablePort.HasValue && nullablePort != bindingAddress.Port) { _logger.FailedMultiplePorts(); - return false; + return PortNotFound; } else { - httpsPort = bindingAddress.Port; + nullablePort = bindingAddress.Port; } } } - if (httpsPort.HasValue) + if (nullablePort.HasValue) { - _httpsPort = httpsPort; - port = _httpsPort.Value; + var port = nullablePort.Value; _logger.PortFromServer(port); - return true; + return port; } _logger.FailedToDeterminePort(); - return false; + return PortNotFound; } } } From 3e07811d7b123f6eebfe09edaebe4c038025fc6c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2019 03:22:05 +0000 Subject: [PATCH 3/6] Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190829.7 (#13570) - Microsoft.EntityFrameworkCore.Tools - 3.0.0-rc1.19429.7 - Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-rc1.19429.7 - dotnet-ef - 3.0.0-rc1.19429.7 - Microsoft.EntityFrameworkCore - 3.0.0-rc1.19429.7 - Microsoft.EntityFrameworkCore.InMemory - 3.0.0-rc1.19429.7 - Microsoft.EntityFrameworkCore.Relational - 3.0.0-rc1.19429.7 - Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-rc1.19429.7 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a841516464..c0596a204f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,33 +29,33 @@ https://github.com/aspnet/AspNetCore-Tooling dab77485d72ed4e533c8cdd0267fa834fe894b6d - + https://github.com/aspnet/EntityFrameworkCore - 0da39bba933d60b3475ea2899d9d5d43657882c7 + 9be06a02488700aa5b35dfc8c2a3907ba3605371 - + https://github.com/aspnet/EntityFrameworkCore - 0da39bba933d60b3475ea2899d9d5d43657882c7 + 9be06a02488700aa5b35dfc8c2a3907ba3605371 - + https://github.com/aspnet/EntityFrameworkCore - 0da39bba933d60b3475ea2899d9d5d43657882c7 + 9be06a02488700aa5b35dfc8c2a3907ba3605371 - + https://github.com/aspnet/EntityFrameworkCore - 0da39bba933d60b3475ea2899d9d5d43657882c7 + 9be06a02488700aa5b35dfc8c2a3907ba3605371 - + https://github.com/aspnet/EntityFrameworkCore - 0da39bba933d60b3475ea2899d9d5d43657882c7 + 9be06a02488700aa5b35dfc8c2a3907ba3605371 - + https://github.com/aspnet/EntityFrameworkCore - 0da39bba933d60b3475ea2899d9d5d43657882c7 + 9be06a02488700aa5b35dfc8c2a3907ba3605371 - + https://github.com/aspnet/EntityFrameworkCore - 0da39bba933d60b3475ea2899d9d5d43657882c7 + 9be06a02488700aa5b35dfc8c2a3907ba3605371 https://github.com/aspnet/Extensions diff --git a/eng/Versions.props b/eng/Versions.props index 9c0d5d0590..01a0928949 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -151,13 +151,13 @@ 3.0.0-rc1.19428.4 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.6 - 3.0.0-rc1.19428.6 - 3.0.0-rc1.19428.6 - 3.0.0-rc1.19428.6 - 3.0.0-rc1.19428.6 - 3.0.0-rc1.19428.6 - 3.0.0-rc1.19428.6 + 3.0.0-rc1.19429.7 + 3.0.0-rc1.19429.7 + 3.0.0-rc1.19429.7 + 3.0.0-rc1.19429.7 + 3.0.0-rc1.19429.7 + 3.0.0-rc1.19429.7 + 3.0.0-rc1.19429.7 3.0.0-rc1.19428.6 3.0.0-rc1.19428.6 From e773036ec64210474d6a0669df1085294c15087a Mon Sep 17 00:00:00 2001 From: John Luo Date: Fri, 30 Aug 2019 03:56:53 -0700 Subject: [PATCH 4/6] Update Microsoft.Data.SqlClient version (#13530) --- eng/Signing.props | 3 ++- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/eng/Signing.props b/eng/Signing.props index c9d7dac5a8..829cd569e9 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -105,10 +105,11 @@ + diff --git a/eng/Versions.props b/eng/Versions.props index 01a0928949..1fb365038d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -251,7 +251,7 @@ $(XunitVersion) $(XunitVersion) $(XunitVersion) - 1.0.19189.1-Preview + 1.0.19239.1 From 5358a6f33e512c63daf4e5eb6a04060796503785 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2019 13:21:27 +0000 Subject: [PATCH 5/6] [release/3.0] Update dependencies from 2 repositories (#13577) * Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190829.8 - Microsoft.NET.Sdk.Razor - 3.0.0-rc1.19429.8 - Microsoft.CodeAnalysis.Razor - 3.0.0-rc1.19429.8 - Microsoft.AspNetCore.Razor.Language - 3.0.0-rc1.19429.8 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.0-rc1.19429.8 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190829.10 - Microsoft.EntityFrameworkCore.Tools - 3.0.0-rc1.19429.10 - Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-rc1.19429.10 - dotnet-ef - 3.0.0-rc1.19429.10 - Microsoft.EntityFrameworkCore - 3.0.0-rc1.19429.10 - Microsoft.EntityFrameworkCore.InMemory - 3.0.0-rc1.19429.10 - Microsoft.EntityFrameworkCore.Relational - 3.0.0-rc1.19429.10 - Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-rc1.19429.10 Dependency coherency updates - Microsoft.AspNetCore.Analyzer.Testing - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Abstractions - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Memory - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.SqlServer - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Abstractions - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Binder - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.CommandLine - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.FileExtensions - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Ini - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Json - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.KeyPerFile - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.UserSecrets - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Xml - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DiagnosticAdapter - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Abstractions - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Composite - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Embedded - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Physical - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileSystemGlobbing - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting.Abstractions - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Http - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization.Abstractions - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Abstractions - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.AzureAppServices - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Configuration - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Console - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Debug - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventSource - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventLog - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.TraceSource - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Testing - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ObjectPool - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.DataAnnotations - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Primitives - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.TypeNameHelper.Sources - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ValueStopwatch.Sources - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.WebEncoders - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Internal.Extensions.Refs - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.JSInterop - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Mono.WebAssembly.Interop - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-rc1-19428-14 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyModel - 3.0.0-rc1-19428-14 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.App.Ref - 3.0.0-rc1-19428-14 (parent: Microsoft.Extensions.Logging) - NETStandard.Library.Ref - 2.1.0-rc1-19428-14 (parent: Microsoft.Extensions.Logging) - Internal.AspNetCore.Analyzers - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.Testing - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Net.Compilers.Toolset - 3.3.1-beta3-19429-03 (parent: Microsoft.Extensions.Logging) --- eng/Version.Details.xml | 308 ++++++++++++++++++++-------------------- eng/Versions.props | 154 ++++++++++---------- 2 files changed, 231 insertions(+), 231 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c0596a204f..802ddae53a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,285 +13,285 @@ https://github.com/aspnet/Blazor 46d3c36a3b1655c86e122065c4f896c50d986ff0 - + https://github.com/aspnet/AspNetCore-Tooling - dab77485d72ed4e533c8cdd0267fa834fe894b6d + 4aa61a13b2a50b9849c3828d8b048dfb9861111f - + https://github.com/aspnet/AspNetCore-Tooling - dab77485d72ed4e533c8cdd0267fa834fe894b6d + 4aa61a13b2a50b9849c3828d8b048dfb9861111f - + https://github.com/aspnet/AspNetCore-Tooling - dab77485d72ed4e533c8cdd0267fa834fe894b6d + 4aa61a13b2a50b9849c3828d8b048dfb9861111f - + https://github.com/aspnet/AspNetCore-Tooling - dab77485d72ed4e533c8cdd0267fa834fe894b6d + 4aa61a13b2a50b9849c3828d8b048dfb9861111f - + https://github.com/aspnet/EntityFrameworkCore - 9be06a02488700aa5b35dfc8c2a3907ba3605371 + 06d8ad53f58f1c449b3d6036ecad13cdb887ef72 - + https://github.com/aspnet/EntityFrameworkCore - 9be06a02488700aa5b35dfc8c2a3907ba3605371 + 06d8ad53f58f1c449b3d6036ecad13cdb887ef72 - + https://github.com/aspnet/EntityFrameworkCore - 9be06a02488700aa5b35dfc8c2a3907ba3605371 + 06d8ad53f58f1c449b3d6036ecad13cdb887ef72 - + https://github.com/aspnet/EntityFrameworkCore - 9be06a02488700aa5b35dfc8c2a3907ba3605371 + 06d8ad53f58f1c449b3d6036ecad13cdb887ef72 - + https://github.com/aspnet/EntityFrameworkCore - 9be06a02488700aa5b35dfc8c2a3907ba3605371 + 06d8ad53f58f1c449b3d6036ecad13cdb887ef72 - + https://github.com/aspnet/EntityFrameworkCore - 9be06a02488700aa5b35dfc8c2a3907ba3605371 + 06d8ad53f58f1c449b3d6036ecad13cdb887ef72 - + https://github.com/aspnet/EntityFrameworkCore - 9be06a02488700aa5b35dfc8c2a3907ba3605371 + 06d8ad53f58f1c449b3d6036ecad13cdb887ef72 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 https://github.com/dotnet/corefx @@ -381,25 +381,25 @@ https://github.com/dotnet/corefx d341fd37dcb2c22e382adccdc06770cf8f160577 - + https://github.com/dotnet/core-setup - 1c0f7e38cc371a298353a459c53138f23ba40a2a + 0175edb2b0d0c5f541560f4056bb7633d1445688 - + https://github.com/dotnet/core-setup - 1c0f7e38cc371a298353a459c53138f23ba40a2a + 0175edb2b0d0c5f541560f4056bb7633d1445688 - + https://github.com/dotnet/core-setup - 1c0f7e38cc371a298353a459c53138f23ba40a2a + 0175edb2b0d0c5f541560f4056bb7633d1445688 - + https://github.com/dotnet/core-setup - 1c0f7e38cc371a298353a459c53138f23ba40a2a + 0175edb2b0d0c5f541560f4056bb7633d1445688 @@ -408,9 +408,9 @@ https://github.com/dotnet/corefx d341fd37dcb2c22e382adccdc06770cf8f160577 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 https://github.com/dotnet/arcade @@ -424,13 +424,13 @@ https://github.com/dotnet/arcade 2de3acc671fc624191672a45564f9ef130af5cd4 - + https://github.com/aspnet/Extensions - 1983ee879cc4d8e7922b0af8fba82fca2739c3c4 + 9b9a6d47dba7a965a94fd38e67a298cfc6d2b813 - + https://github.com/dotnet/roslyn - c82648d8964d1e683f92b7daa91beef2fdc5fb72 + 4d9190ea3daac1ccf7a92aa4e0a169ab29ca8f9f diff --git a/eng/Versions.props b/eng/Versions.props index 1fb365038d..a3b1623e29 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,12 +55,12 @@ 1.0.0-beta.19425.1 - 3.3.1-beta3-19428-02 + 3.3.1-beta3-19429-03 - 3.0.0-rc1-19427-13 - 3.0.0-rc1-19427-13 - 3.0.0-rc1-19427-13 - 2.1.0-rc1-19427-13 + 3.0.0-rc1-19428-14 + 3.0.0-rc1-19428-14 + 3.0.0-rc1-19428-14 + 2.1.0-rc1-19428-14 1.0.0-rc1.19420.10 4.6.0-rc1.19420.10 @@ -89,80 +89,80 @@ 3.0.0-preview9.19426.1 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 - 3.0.0-rc1.19428.4 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 - 3.0.0-rc1.19429.7 - 3.0.0-rc1.19429.7 - 3.0.0-rc1.19429.7 - 3.0.0-rc1.19429.7 - 3.0.0-rc1.19429.7 - 3.0.0-rc1.19429.7 - 3.0.0-rc1.19429.7 + 3.0.0-rc1.19429.10 + 3.0.0-rc1.19429.10 + 3.0.0-rc1.19429.10 + 3.0.0-rc1.19429.10 + 3.0.0-rc1.19429.10 + 3.0.0-rc1.19429.10 + 3.0.0-rc1.19429.10 - 3.0.0-rc1.19428.6 - 3.0.0-rc1.19428.6 - 3.0.0-rc1.19428.6 - 3.0.0-rc1.19428.6 + 3.0.0-rc1.19429.8 + 3.0.0-rc1.19429.8 + 3.0.0-rc1.19429.8 + 3.0.0-rc1.19429.8