From b53179267a385e040a4127b0887d5d86287fd447 Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Thu, 2 Apr 2020 20:30:18 +0000 Subject: [PATCH 1/8] Merged PR 6773: Fix routing policy exit destination **Description** An infinite loop can happen in routing if there is a catch all route with host name matching. This problem is caused by the DFA matcher builder giving an incorrect exit destination to policies. Currently the exit destination is the catch all state, so the policy will transition to itself when there is no match. It will run again, transition to itself again, run again, etc. This causes the policy to run forever. What should happen is the host name policy fails, it transitions to the final state with no candidates, and the route matcher does not match any endpoints. The browser is returned a 404 status. **Customer Impact** This problem shows up in this situation: 1. If a customer has configured a catch all route in their app 2. The catch all route has host matching 3. A browser makes a request to the server that matches the catch all route but doesn't match the host name The route matcher will run forever, using up a threadpool thread. When threadpool threads are exhausted the server will stop responding. **Regression?** No. **Risk** Medium. The fix is simple but route matching is complex, and routing runs with every request. --- .../Routing/src/Matching/DfaMatcherBuilder.cs | 7 ++-- .../HostMatcherPolicyIntegrationTestBase.cs | 32 +++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/src/Http/Routing/src/Matching/DfaMatcherBuilder.cs b/src/Http/Routing/src/Matching/DfaMatcherBuilder.cs index b5b3721b23..180d91a177 100644 --- a/src/Http/Routing/src/Matching/DfaMatcherBuilder.cs +++ b/src/Http/Routing/src/Matching/DfaMatcherBuilder.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; @@ -429,7 +429,10 @@ namespace Microsoft.AspNetCore.Routing.Matching candidates, endpointSelectorPolicies?.ToArray() ?? Array.Empty(), JumpTableBuilder.Build(currentDefaultDestination, currentExitDestination, pathEntries), - BuildPolicy(currentExitDestination, node.NodeBuilder, policyEntries)); + // Use the final exit destination when building the policy state. + // We don't want to use either of the current destinations because they refer routing states, + // and a policy state should never transition back to a routing state. + BuildPolicy(exitDestination, node.NodeBuilder, policyEntries)); return currentStateIndex; diff --git a/src/Http/Routing/test/UnitTests/Matching/HostMatcherPolicyIntegrationTestBase.cs b/src/Http/Routing/test/UnitTests/Matching/HostMatcherPolicyIntegrationTestBase.cs index e3cb4732b6..2feddaace0 100644 --- a/src/Http/Routing/test/UnitTests/Matching/HostMatcherPolicyIntegrationTestBase.cs +++ b/src/Http/Routing/test/UnitTests/Matching/HostMatcherPolicyIntegrationTestBase.cs @@ -273,6 +273,38 @@ namespace Microsoft.AspNetCore.Routing.Matching MatcherAssert.AssertMatch(httpContext, endpoint); } + [Fact] + public async Task Match_CatchAllRouteWithMatchingHost_Success() + { + // Arrange + var endpoint = CreateEndpoint("/{**path}", hosts: new string[] { "contoso.com", }); + + var matcher = CreateMatcher(endpoint); + var httpContext = CreateContext("/hello", "contoso.com"); + + // Act + await matcher.MatchAsync(httpContext); + + // Assert + MatcherAssert.AssertMatch(httpContext, endpoint, new { path = "hello" }); + } + + [Fact] + public async Task Match_CatchAllRouteFailureHost_NoMatch() + { + // Arrange + var endpoint = CreateEndpoint("/{**path}", hosts: new string[] { "contoso.com", }); + + var matcher = CreateMatcher(endpoint); + var httpContext = CreateContext("/hello", "nomatch.com"); + + // Act + await matcher.MatchAsync(httpContext); + + // Assert + MatcherAssert.AssertNotMatch(httpContext); + } + private static Matcher CreateMatcher(params RouteEndpoint[] endpoints) { var services = new ServiceCollection() From 23c02ef9a982258b0687aefb18df799d0b87ddde Mon Sep 17 00:00:00 2001 From: Pranav Krishnamoorthy Date: Tue, 14 Apr 2020 22:38:24 +0000 Subject: [PATCH 2/8] Merged PR 7269: Avoid caching JsonSerializer Avoid caching JsonSerializer --- .../src/NewtonsoftJsonOutputFormatter.cs | 50 ++++++++++++++++--- .../test/NewtonsoftJsonOutputFormatterTest.cs | 34 +++++++++++++ 2 files changed, 77 insertions(+), 7 deletions(-) diff --git a/src/Mvc/Mvc.NewtonsoftJson/src/NewtonsoftJsonOutputFormatter.cs b/src/Mvc/Mvc.NewtonsoftJson/src/NewtonsoftJsonOutputFormatter.cs index b6889c1c2d..e98d4477bd 100644 --- a/src/Mvc/Mvc.NewtonsoftJson/src/NewtonsoftJsonOutputFormatter.cs +++ b/src/Mvc/Mvc.NewtonsoftJson/src/NewtonsoftJsonOutputFormatter.cs @@ -20,10 +20,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters { private readonly IArrayPool _charPool; private readonly MvcOptions _mvcOptions; - - // Perf: JsonSerializers are relatively expensive to create, and are thread safe. We cache - // the serializer and invalidate it when the settings change. - private JsonSerializer _serializer; + private JsonSerializerSettings _serializerSettings; /// /// Initializes a new instance. @@ -99,12 +96,13 @@ namespace Microsoft.AspNetCore.Mvc.Formatters /// The used during serialization and deserialization. protected virtual JsonSerializer CreateJsonSerializer() { - if (_serializer == null) + if (_serializerSettings == null) { - _serializer = JsonSerializer.Create(SerializerSettings); + // Lock the serializer settings once the first serialization has been initiated. + _serializerSettings = ShallowCopy(SerializerSettings); } - return _serializer; + return JsonSerializer.Create(_serializerSettings); } /// @@ -166,5 +164,43 @@ namespace Microsoft.AspNetCore.Mvc.Formatters } } } + + private static JsonSerializerSettings ShallowCopy(JsonSerializerSettings settings) + { + var copiedSettings = new JsonSerializerSettings + { + FloatParseHandling = settings.FloatParseHandling, + FloatFormatHandling = settings.FloatFormatHandling, + DateParseHandling = settings.DateParseHandling, + DateTimeZoneHandling = settings.DateTimeZoneHandling, + DateFormatHandling = settings.DateFormatHandling, + Formatting = settings.Formatting, + MaxDepth = settings.MaxDepth, + DateFormatString = settings.DateFormatString, + Context = settings.Context, + Error = settings.Error, + SerializationBinder = settings.SerializationBinder, + TraceWriter = settings.TraceWriter, + Culture = settings.Culture, + ReferenceResolverProvider = settings.ReferenceResolverProvider, + EqualityComparer = settings.EqualityComparer, + ContractResolver = settings.ContractResolver, + ConstructorHandling = settings.ConstructorHandling, + TypeNameAssemblyFormatHandling = settings.TypeNameAssemblyFormatHandling, + MetadataPropertyHandling = settings.MetadataPropertyHandling, + TypeNameHandling = settings.TypeNameHandling, + PreserveReferencesHandling = settings.PreserveReferencesHandling, + Converters = settings.Converters, + DefaultValueHandling = settings.DefaultValueHandling, + NullValueHandling = settings.NullValueHandling, + ObjectCreationHandling = settings.ObjectCreationHandling, + MissingMemberHandling = settings.MissingMemberHandling, + ReferenceLoopHandling = settings.ReferenceLoopHandling, + CheckAdditionalContent = settings.CheckAdditionalContent, + StringEscapeHandling = settings.StringEscapeHandling, + }; + + return copiedSettings; + } } } diff --git a/src/Mvc/Mvc.NewtonsoftJson/test/NewtonsoftJsonOutputFormatterTest.cs b/src/Mvc/Mvc.NewtonsoftJson/test/NewtonsoftJsonOutputFormatterTest.cs index a04c79c638..67fdde1b22 100644 --- a/src/Mvc/Mvc.NewtonsoftJson/test/NewtonsoftJsonOutputFormatterTest.cs +++ b/src/Mvc/Mvc.NewtonsoftJson/test/NewtonsoftJsonOutputFormatterTest.cs @@ -324,6 +324,40 @@ namespace Microsoft.AspNetCore.Mvc.Formatters stream.Verify(v => v.Flush(), Times.Never()); } + [Fact] + public async Task SerializingWithPreserveReferenceHandling() + { + // Arrange + var expected = "{\"$id\":\"1\",\"fullName\":\"John\",\"age\":35}"; + var user = new User { FullName = "John", age = 35 }; + + var settings = new JsonSerializerSettings + { + ContractResolver = new DefaultContractResolver + { + NamingStrategy = new CamelCaseNamingStrategy(), + }, + PreserveReferencesHandling = PreserveReferencesHandling.All, + }; + var formatter = new TestableJsonOutputFormatter(settings); + + for (var i = 0; i < 3; i++) + { + // Act + var context = GetOutputFormatterContext(user, typeof(User)); + await formatter.WriteResponseBodyAsync(context, Encoding.UTF8); + + // Assert + var body = context.HttpContext.Response.Body; + + Assert.NotNull(body); + body.Position = 0; + + var content = new StreamReader(body, Encoding.UTF8).ReadToEnd(); + Assert.Equal(expected, content); + } + } + private class TestableJsonOutputFormatter : NewtonsoftJsonOutputFormatter { public TestableJsonOutputFormatter(JsonSerializerSettings serializerSettings) From c53e15e8339deaf278e975e9bc27a0a84d5b354f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 15 Apr 2020 18:12:52 +0000 Subject: [PATCH 3/8] Merged PR 6988: [internal/release/3.1] Update dependencies from 1 repositories This pull request updates the following dependencies [marker]: <> (Begin:7bf32a0c-3505-43af-42b0-08d79559e63d) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - **Subscription**: 7bf32a0c-3505-43af-42b0-08d79559e63d - **Build**: 20200414.7 - **Date Produced**: 4/15/2020 5:37 AM - **Commit**: 06ade7a064cbdcf80aa6457541c1a99b7e39b5a8 - **Branch**: refs/heads/internal/release/3.1 - **Updates**: - **Microsoft.AspNetCore.Mvc.Razor.Extensions**: from 3.1.3 to 3.1.4 - **Microsoft.AspNetCore.Razor.Language**: from 3.1.3 to 3.1.4 - **Microsoft.CodeAnalysis.Razor**: from 3.1.3 to 3.1.4 - **Microsoft.NET.Sdk.Razor**: from 3.1.3 to 3.1.4 [marker]: <> (End:7bf32a0c-3505-43af-42b0-08d79559e63d) [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) - **Microsoft.AspNetCore.Analyzer.Testing**: from 3.1.4-servicing.20181.5 to 3.1.4-servicing.20202.2 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.AspNetCore.BenchmarkRunner.Sources**: from 3.1.4-servicing.20181.5 to 3.1.4-servicing.20202.2 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.ActivatorUtilities.Sources**: from 3.1.4-servicing.20181.5 to 3.1.4-servicing.20202.2 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.CommandLineUtils.Sources**: from 3.1.4-servicing.20181.5 to 3.1.4-servicing.20202.2 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.HashCodeCombiner.Sources**: from 3.1.4-servicing.20181.5 to 3.1.4-servicing.20202.2 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.HostFactoryResolver.Sources**: from 3.1.4-servicing.20181.5 to 3.1.4-servicing.20202.2 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Logging.Testing**: from 3.1.4-servicing.20181.5 to 3.1.4-servicing.20202.2 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.ParameterDefaultValue.Sources**: from 3.1.4-servicing.20181.5 to 3.1.4-servicing.20202.2 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.TypeNameHelper.Sources**: from 3.1.4-servicing.20181.5 to 3.1.4-servicing.20202.2 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.ValueStopwatch.Sources**: from 3.1.4-servicing.20181.5 to 3.1.4-servicing.20202.2 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.NETCore.App.Internal**: from 3.1.4-servicing.20181.2 to 3.1.4-servicing.20202.1 (parent: Microsoft.Extensions.Logging) - **Internal.AspNetCore.Analyzers**: from 3.1.4-servicing.20181.5 to 3.1.4-servicing.20202.2 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.AspNetCore.Testing**: from 3.1.4-servicing.20181.5 to 3.1.4-servicing.202 ... --- NuGet.config | 6 ++--- eng/Version.Details.xml | 50 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++++++++-------------- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/NuGet.config b/NuGet.config index d3a2804e2a..bb31b0bcf9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,11 +3,11 @@ - - - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 94b3b13f14..6bd969ff7c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,21 +13,21 @@ https://github.com/aspnet/Blazor 7868699de745fd30a654c798a99dc541b77b95c0 - - https://github.com/dotnet/aspnetcore-tooling - 5ecfad7e0515ee580f7e1b51d1558fc2a1d27ee5 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling + 06ade7a064cbdcf80aa6457541c1a99b7e39b5a8 - - https://github.com/dotnet/aspnetcore-tooling - 5ecfad7e0515ee580f7e1b51d1558fc2a1d27ee5 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling + 06ade7a064cbdcf80aa6457541c1a99b7e39b5a8 - - https://github.com/dotnet/aspnetcore-tooling - 5ecfad7e0515ee580f7e1b51d1558fc2a1d27ee5 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling + 06ade7a064cbdcf80aa6457541c1a99b7e39b5a8 - - https://github.com/dotnet/aspnetcore-tooling - 5ecfad7e0515ee580f7e1b51d1558fc2a1d27ee5 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling + 06ade7a064cbdcf80aa6457541c1a99b7e39b5a8 https://github.com/dotnet/efcore @@ -57,15 +57,15 @@ https://github.com/dotnet/efcore 7c74e87eccf3a1785ff73d77b769226e6b2ab458 - + https://github.com/dotnet/extensions cf044102f01a3402a680fa58cabea8a9ca53aa3d - + https://github.com/dotnet/extensions cf044102f01a3402a680fa58cabea8a9ca53aa3d - + https://github.com/dotnet/extensions cf044102f01a3402a680fa58cabea8a9ca53aa3d @@ -85,7 +85,7 @@ https://github.com/dotnet/extensions cf044102f01a3402a680fa58cabea8a9ca53aa3d - + https://github.com/dotnet/extensions cf044102f01a3402a680fa58cabea8a9ca53aa3d @@ -177,7 +177,7 @@ https://github.com/dotnet/extensions cf044102f01a3402a680fa58cabea8a9ca53aa3d - + https://github.com/dotnet/extensions cf044102f01a3402a680fa58cabea8a9ca53aa3d @@ -189,7 +189,7 @@ https://github.com/dotnet/extensions cf044102f01a3402a680fa58cabea8a9ca53aa3d - + https://github.com/dotnet/extensions cf044102f01a3402a680fa58cabea8a9ca53aa3d @@ -237,7 +237,7 @@ https://github.com/dotnet/extensions cf044102f01a3402a680fa58cabea8a9ca53aa3d - + https://github.com/dotnet/extensions cf044102f01a3402a680fa58cabea8a9ca53aa3d @@ -261,7 +261,7 @@ https://github.com/dotnet/extensions cf044102f01a3402a680fa58cabea8a9ca53aa3d - + https://github.com/dotnet/extensions cf044102f01a3402a680fa58cabea8a9ca53aa3d @@ -269,11 +269,11 @@ https://github.com/dotnet/extensions cf044102f01a3402a680fa58cabea8a9ca53aa3d - + https://github.com/dotnet/extensions cf044102f01a3402a680fa58cabea8a9ca53aa3d - + https://github.com/dotnet/extensions cf044102f01a3402a680fa58cabea8a9ca53aa3d @@ -389,7 +389,7 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup 57d5bbb58f17a8cb3a82c81839c9379b4fcfe0d8 @@ -409,7 +409,7 @@ https://github.com/dotnet/corefx 282d5b9f83e7a4e7fe0cef268f4f8f85e6162510 - + https://github.com/dotnet/extensions cf044102f01a3402a680fa58cabea8a9ca53aa3d @@ -425,7 +425,7 @@ https://github.com/dotnet/arcade 1a55276ab9d16792cec595ba870df39a9d97d5ca - + https://github.com/dotnet/extensions cf044102f01a3402a680fa58cabea8a9ca53aa3d diff --git a/eng/Versions.props b/eng/Versions.props index 082dc20102..c560f7df58 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,7 +67,7 @@ 3.4.1-beta4-20127-10 3.1.4 - 3.1.4-servicing.20181.2 + 3.1.4-servicing.20202.1 3.1.0 3.1.4 2.1.0 @@ -99,16 +99,16 @@ 3.1.0-preview4.19605.1 - 3.1.4-servicing.20181.5 - 3.1.4-servicing.20181.5 - 3.1.4-servicing.20181.5 - 3.1.4-servicing.20181.5 - 3.1.4-servicing.20181.5 + 3.1.4-servicing.20202.2 + 3.1.4-servicing.20202.2 + 3.1.4-servicing.20202.2 + 3.1.4-servicing.20202.2 + 3.1.4-servicing.20202.2 3.1.4 3.1.4 3.1.4 3.1.4 - 3.1.4-servicing.20181.5 + 3.1.4-servicing.20202.2 3.1.4 3.1.4 3.1.4 @@ -131,10 +131,10 @@ 3.1.4 3.1.4 3.1.4 - 3.1.4-servicing.20181.5 + 3.1.4-servicing.20202.2 3.1.4 3.1.4 - 3.1.4-servicing.20181.5 + 3.1.4-servicing.20202.2 3.1.4 3.1.4 3.1.4 @@ -146,16 +146,16 @@ 3.1.4 3.1.4 3.1.4 - 3.1.4-servicing.20181.5 + 3.1.4-servicing.20202.2 3.1.4 3.1.4 3.1.4 3.1.4 3.1.4 - 3.1.4-servicing.20181.5 + 3.1.4-servicing.20202.2 3.1.4 - 3.1.4-servicing.20181.5 - 3.1.4-servicing.20181.5 + 3.1.4-servicing.20202.2 + 3.1.4-servicing.20202.2 3.1.4 3.1.0-rtm.19565.4 3.1.4 @@ -168,10 +168,10 @@ 3.1.4 3.1.4 - 3.1.3 - 3.1.3 - 3.1.3 - 3.1.3 + 3.1.4 + 3.1.4 + 3.1.4 + 3.1.4 - - - - + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6bd969ff7c..a497b1b1d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -30,264 +30,264 @@ 06ade7a064cbdcf80aa6457541c1a99b7e39b5a8 - https://github.com/dotnet/efcore - 7c74e87eccf3a1785ff73d77b769226e6b2ab458 + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + 87b24bd1cdd8eaa0851dc0c525c8f12926321c3b - https://github.com/dotnet/efcore - 7c74e87eccf3a1785ff73d77b769226e6b2ab458 + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + 87b24bd1cdd8eaa0851dc0c525c8f12926321c3b - https://github.com/dotnet/efcore - 7c74e87eccf3a1785ff73d77b769226e6b2ab458 + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + 87b24bd1cdd8eaa0851dc0c525c8f12926321c3b - https://github.com/dotnet/efcore - 7c74e87eccf3a1785ff73d77b769226e6b2ab458 + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + 87b24bd1cdd8eaa0851dc0c525c8f12926321c3b - https://github.com/dotnet/efcore - 7c74e87eccf3a1785ff73d77b769226e6b2ab458 + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + 87b24bd1cdd8eaa0851dc0c525c8f12926321c3b - https://github.com/dotnet/efcore - 7c74e87eccf3a1785ff73d77b769226e6b2ab458 + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + 87b24bd1cdd8eaa0851dc0c525c8f12926321c3b - https://github.com/dotnet/efcore - 7c74e87eccf3a1785ff73d77b769226e6b2ab458 + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + 87b24bd1cdd8eaa0851dc0c525c8f12926321c3b - - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 - - https://github.com/dotnet/corefx - 0f7f38c4fd323b26da10cce95f857f77f0f09b48 + + https://dev.azure.com/dnceng/internal/_git/dotnet-corefx + c4164928b270ee2369808ab347d33423ef765216 https://github.com/dotnet/corefx @@ -317,17 +317,17 @@ https://github.com/dotnet/corefx 8a3ffed558ddf943c1efa87d693227722d6af094 - - https://github.com/dotnet/corefx - 0f7f38c4fd323b26da10cce95f857f77f0f09b48 + + https://dev.azure.com/dnceng/internal/_git/dotnet-corefx + c4164928b270ee2369808ab347d33423ef765216 - - https://github.com/dotnet/corefx - 0f7f38c4fd323b26da10cce95f857f77f0f09b48 + + https://dev.azure.com/dnceng/internal/_git/dotnet-corefx + c4164928b270ee2369808ab347d33423ef765216 - - https://github.com/dotnet/corefx - 0f7f38c4fd323b26da10cce95f857f77f0f09b48 + + https://dev.azure.com/dnceng/internal/_git/dotnet-corefx + c4164928b270ee2369808ab347d33423ef765216 https://github.com/dotnet/corefx @@ -357,41 +357,41 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - - https://github.com/dotnet/corefx - 0f7f38c4fd323b26da10cce95f857f77f0f09b48 + + https://dev.azure.com/dnceng/internal/_git/dotnet-corefx + c4164928b270ee2369808ab347d33423ef765216 - https://github.com/dotnet/corefx - 282d5b9f83e7a4e7fe0cef268f4f8f85e6162510 + https://dev.azure.com/dnceng/internal/_git/dotnet-corefx + c4164928b270ee2369808ab347d33423ef765216 - - https://github.com/dotnet/corefx - 0f7f38c4fd323b26da10cce95f857f77f0f09b48 + + https://dev.azure.com/dnceng/internal/_git/dotnet-corefx + c4164928b270ee2369808ab347d33423ef765216 https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - https://github.com/dotnet/core-setup - 57d5bbb58f17a8cb3a82c81839c9379b4fcfe0d8 + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + 009061358022e51c62bef1daa3535a08ca122750 - https://github.com/dotnet/core-setup - 57d5bbb58f17a8cb3a82c81839c9379b4fcfe0d8 + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + 009061358022e51c62bef1daa3535a08ca122750 https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - - https://github.com/dotnet/core-setup - 57d5bbb58f17a8cb3a82c81839c9379b4fcfe0d8 + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + 009061358022e51c62bef1daa3535a08ca122750 @@ -406,12 +406,12 @@ - https://github.com/dotnet/corefx - 282d5b9f83e7a4e7fe0cef268f4f8f85e6162510 + https://dev.azure.com/dnceng/internal/_git/dotnet-corefx + c4164928b270ee2369808ab347d33423ef765216 - - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 https://github.com/dotnet/arcade @@ -425,13 +425,13 @@ https://github.com/dotnet/arcade 1a55276ab9d16792cec595ba870df39a9d97d5ca - - https://github.com/dotnet/extensions - cf044102f01a3402a680fa58cabea8a9ca53aa3d + + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 7cc2a109d98493cf617de56709ec188fa5cd3fc1 https://github.com/dotnet/roslyn d8180a5ecafb92adcfbfe8cf9199eb23be1a1ccf - \ No newline at end of file + diff --git a/eng/Versions.props b/eng/Versions.props index c560f7df58..b3f174d11d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,12 +67,12 @@ 3.4.1-beta4-20127-10 3.1.4 - 3.1.4-servicing.20202.1 + 3.1.4-servicing.20214.5 3.1.0 3.1.4 2.1.0 - 1.1.0 + 1.1.1 4.7.0 4.7.0 4.7.0 @@ -80,9 +80,9 @@ 4.7.0 4.7.0 4.7.1 - 4.7.0 - 4.7.0 - 1.8.0 + 4.7.1 + 4.7.1 + 1.8.1 4.7.1 4.7.0 4.7.0 @@ -90,25 +90,25 @@ 4.7.0 4.7.0 4.7.0 - 4.7.0 + 4.7.1 4.7.2 - 4.7.0 + 4.7.1 4.7.0 3.1.1 3.1.0-preview4.19605.1 - 3.1.4-servicing.20202.2 - 3.1.4-servicing.20202.2 - 3.1.4-servicing.20202.2 - 3.1.4-servicing.20202.2 - 3.1.4-servicing.20202.2 + 3.1.4-servicing.20214.9 + 3.1.4-servicing.20214.9 + 3.1.4-servicing.20214.9 + 3.1.4-servicing.20214.9 + 3.1.4-servicing.20214.9 3.1.4 3.1.4 3.1.4 3.1.4 - 3.1.4-servicing.20202.2 + 3.1.4-servicing.20214.9 3.1.4 3.1.4 3.1.4 @@ -131,10 +131,10 @@ 3.1.4 3.1.4 3.1.4 - 3.1.4-servicing.20202.2 + 3.1.4-servicing.20214.9 3.1.4 3.1.4 - 3.1.4-servicing.20202.2 + 3.1.4-servicing.20214.9 3.1.4 3.1.4 3.1.4 @@ -146,16 +146,16 @@ 3.1.4 3.1.4 3.1.4 - 3.1.4-servicing.20202.2 + 3.1.4-servicing.20214.9 3.1.4 3.1.4 3.1.4 3.1.4 3.1.4 - 3.1.4-servicing.20202.2 + 3.1.4-servicing.20214.9 3.1.4 - 3.1.4-servicing.20202.2 - 3.1.4-servicing.20202.2 + 3.1.4-servicing.20214.9 + 3.1.4-servicing.20214.9 3.1.4 3.1.0-rtm.19565.4 3.1.4 @@ -271,4 +271,4 @@ https://dotnetcli.blob.core.windows.net/dotnet/ https://dotnetclimsrc.blob.core.windows.net/dotnet/ - \ No newline at end of file + From 67e04394e98d5bfa6a5684d471a72fcbe30fd587 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 16 Apr 2020 17:36:54 +0000 Subject: [PATCH 5/8] Merged PR 7373: [internal/release/3.1] Update dependencies from 1 repositories This pull request updates the following dependencies [marker]: <> (Begin:7bf32a0c-3505-43af-42b0-08d79559e63d) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - **Subscription**: 7bf32a0c-3505-43af-42b0-08d79559e63d - **Build**: 20200415.2 - **Date Produced**: 4/15/2020 6:12 PM - **Commit**: a49970f2f15efb27b91541bb4b94581693c92b8d - **Branch**: refs/heads/internal/release/3.1 - **Updates**: - **Microsoft.AspNetCore.Mvc.Razor.Extensions**: from 3.1.4 to 3.1.4 - **Microsoft.AspNetCore.Razor.Language**: from 3.1.4 to 3.1.4 - **Microsoft.CodeAnalysis.Razor**: from 3.1.4 to 3.1.4 - **Microsoft.NET.Sdk.Razor**: from 3.1.4 to 3.1.4 [marker]: <> (End:7bf32a0c-3505-43af-42b0-08d79559e63d) --- NuGet.config | 2 +- eng/Version.Details.xml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index bf2ad9f773..923a78b74b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,7 +8,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a497b1b1d0..8783b81196 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,19 +15,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - 06ade7a064cbdcf80aa6457541c1a99b7e39b5a8 + a49970f2f15efb27b91541bb4b94581693c92b8d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - 06ade7a064cbdcf80aa6457541c1a99b7e39b5a8 + a49970f2f15efb27b91541bb4b94581693c92b8d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - 06ade7a064cbdcf80aa6457541c1a99b7e39b5a8 + a49970f2f15efb27b91541bb4b94581693c92b8d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - 06ade7a064cbdcf80aa6457541c1a99b7e39b5a8 + a49970f2f15efb27b91541bb4b94581693c92b8d https://dev.azure.com/dnceng/internal/_git/dotnet-efcore From 2cad2edc3f46d0fef3323f4f785a4afa5a2d7e3b Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 21 Apr 2020 20:27:42 +0000 Subject: [PATCH 6/8] Merged PR 7488: Downgrade WinHttpHandler to 4.7.0 --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8783b81196..f87fe07b61 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -317,9 +317,9 @@ https://github.com/dotnet/corefx 8a3ffed558ddf943c1efa87d693227722d6af094 - - https://dev.azure.com/dnceng/internal/_git/dotnet-corefx - c4164928b270ee2369808ab347d33423ef765216 + + https://github.com/dotnet/corefx + 0f7f38c4fd323b26da10cce95f857f77f0f09b48 https://dev.azure.com/dnceng/internal/_git/dotnet-corefx diff --git a/eng/Versions.props b/eng/Versions.props index b3f174d11d..4e18dc4295 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,7 +80,7 @@ 4.7.0 4.7.0 4.7.1 - 4.7.1 + 4.7.0 4.7.1 1.8.1 4.7.1 From 335829259d3ae9b3c77b64289ef92d9ecfa1653e Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Wed, 22 Apr 2020 20:52:23 +0000 Subject: [PATCH 7/8] Merged PR 7529: Update dependencies from efcore Update dependencies from efcore --- NuGet.config | 8 +- eng/Version.Details.xml | 178 ++++++++++++++++++++-------------------- eng/Versions.props | 26 +++--- 3 files changed, 106 insertions(+), 106 deletions(-) diff --git a/NuGet.config b/NuGet.config index 923a78b74b..bcf6930145 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,10 @@ - - - - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f87fe07b61..674880a1b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -31,263 +31,263 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 87b24bd1cdd8eaa0851dc0c525c8f12926321c3b + 0e7e329a24deae8d22ccf9829957dc8cb10152c5 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 87b24bd1cdd8eaa0851dc0c525c8f12926321c3b + 0e7e329a24deae8d22ccf9829957dc8cb10152c5 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 87b24bd1cdd8eaa0851dc0c525c8f12926321c3b + 0e7e329a24deae8d22ccf9829957dc8cb10152c5 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 87b24bd1cdd8eaa0851dc0c525c8f12926321c3b + 0e7e329a24deae8d22ccf9829957dc8cb10152c5 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 87b24bd1cdd8eaa0851dc0c525c8f12926321c3b + 0e7e329a24deae8d22ccf9829957dc8cb10152c5 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 87b24bd1cdd8eaa0851dc0c525c8f12926321c3b + 0e7e329a24deae8d22ccf9829957dc8cb10152c5 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 87b24bd1cdd8eaa0851dc0c525c8f12926321c3b + 0e7e329a24deae8d22ccf9829957dc8cb10152c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://dev.azure.com/dnceng/internal/_git/dotnet-corefx - c4164928b270ee2369808ab347d33423ef765216 + 059a4a19e602494bfbed473dbbb18f2dbfbd0878 https://github.com/dotnet/corefx @@ -323,11 +323,11 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-corefx - c4164928b270ee2369808ab347d33423ef765216 + 059a4a19e602494bfbed473dbbb18f2dbfbd0878 https://dev.azure.com/dnceng/internal/_git/dotnet-corefx - c4164928b270ee2369808ab347d33423ef765216 + 059a4a19e602494bfbed473dbbb18f2dbfbd0878 https://github.com/dotnet/corefx @@ -359,15 +359,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-corefx - c4164928b270ee2369808ab347d33423ef765216 + 059a4a19e602494bfbed473dbbb18f2dbfbd0878 https://dev.azure.com/dnceng/internal/_git/dotnet-corefx - c4164928b270ee2369808ab347d33423ef765216 + 059a4a19e602494bfbed473dbbb18f2dbfbd0878 https://dev.azure.com/dnceng/internal/_git/dotnet-corefx - c4164928b270ee2369808ab347d33423ef765216 + 059a4a19e602494bfbed473dbbb18f2dbfbd0878 https://github.com/dotnet/corefx @@ -375,7 +375,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 009061358022e51c62bef1daa3535a08ca122750 + 0c2e69caa609d5164e16df91d6d646eb9ed74640 https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 009061358022e51c62bef1daa3535a08ca122750 + 0c2e69caa609d5164e16df91d6d646eb9ed74640 https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 009061358022e51c62bef1daa3535a08ca122750 + 0c2e69caa609d5164e16df91d6d646eb9ed74640 @@ -407,11 +407,11 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-corefx - c4164928b270ee2369808ab347d33423ef765216 + 059a4a19e602494bfbed473dbbb18f2dbfbd0878 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://github.com/dotnet/arcade @@ -425,9 +425,9 @@ https://github.com/dotnet/arcade 1a55276ab9d16792cec595ba870df39a9d97d5ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 7cc2a109d98493cf617de56709ec188fa5cd3fc1 + 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 4e18dc4295..ea87e5032f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,7 +67,7 @@ 3.4.1-beta4-20127-10 3.1.4 - 3.1.4-servicing.20214.5 + 3.1.4-servicing.20221.3 3.1.0 3.1.4 2.1.0 @@ -99,16 +99,16 @@ 3.1.0-preview4.19605.1 - 3.1.4-servicing.20214.9 - 3.1.4-servicing.20214.9 - 3.1.4-servicing.20214.9 - 3.1.4-servicing.20214.9 - 3.1.4-servicing.20214.9 + 3.1.4-servicing.20221.11 + 3.1.4-servicing.20221.11 + 3.1.4-servicing.20221.11 + 3.1.4-servicing.20221.11 + 3.1.4-servicing.20221.11 3.1.4 3.1.4 3.1.4 3.1.4 - 3.1.4-servicing.20214.9 + 3.1.4-servicing.20221.11 3.1.4 3.1.4 3.1.4 @@ -131,10 +131,10 @@ 3.1.4 3.1.4 3.1.4 - 3.1.4-servicing.20214.9 + 3.1.4-servicing.20221.11 3.1.4 3.1.4 - 3.1.4-servicing.20214.9 + 3.1.4-servicing.20221.11 3.1.4 3.1.4 3.1.4 @@ -146,16 +146,16 @@ 3.1.4 3.1.4 3.1.4 - 3.1.4-servicing.20214.9 + 3.1.4-servicing.20221.11 3.1.4 3.1.4 3.1.4 3.1.4 3.1.4 - 3.1.4-servicing.20214.9 + 3.1.4-servicing.20221.11 3.1.4 - 3.1.4-servicing.20214.9 - 3.1.4-servicing.20214.9 + 3.1.4-servicing.20221.11 + 3.1.4-servicing.20221.11 3.1.4 3.1.0-rtm.19565.4 3.1.4 From 35628a67800a3e269eb375989d2fffa9d67b8dbf Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 22 Apr 2020 23:59:27 +0000 Subject: [PATCH 8/8] Merged PR 7537: [internal/release/3.1] Update dependencies from 1 repositories This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) - **System.Net.Http.WinHttpHandler**: from 4.7.0 to 4.7.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:7bf32a0c-3505-43af-42b0-08d79559e63d) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - **Subscription**: 7bf32a0c-3505-43af-42b0-08d79559e63d - **Build**: 20200422.2 - **Date Produced**: 4/22/2020 7:47 PM - **Commit**: a8242d79df31dbff528c185dd62c290b7cc262de - **Branch**: refs/heads/internal/release/3.1 - **Updates**: - **Microsoft.AspNetCore.Mvc.Razor.Extensions**: from 3.1.4 to 3.1.4 - **Microsoft.AspNetCore.Razor.Language**: from 3.1.4 to 3.1.4 - **Microsoft.CodeAnalysis.Razor**: from 3.1.4 to 3.1.4 - **Microsoft.NET.Sdk.Razor**: from 3.1.4 to 3.1.4 - **System.Net.Http.WinHttpHandler**: from 4.7.0 to 4.7.1 [marker]: <> (End:7bf32a0c-3505-43af-42b0-08d79559e63d) --- NuGet.config | 2 +- eng/Version.Details.xml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index bcf6930145..9b63a8f022 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,7 +8,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 674880a1b1..037cb728dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,19 +15,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - a49970f2f15efb27b91541bb4b94581693c92b8d + a8242d79df31dbff528c185dd62c290b7cc262de https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - a49970f2f15efb27b91541bb4b94581693c92b8d + a8242d79df31dbff528c185dd62c290b7cc262de https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - a49970f2f15efb27b91541bb4b94581693c92b8d + a8242d79df31dbff528c185dd62c290b7cc262de https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - a49970f2f15efb27b91541bb4b94581693c92b8d + a8242d79df31dbff528c185dd62c290b7cc262de https://dev.azure.com/dnceng/internal/_git/dotnet-efcore