From c1415e9615943bc475e60f18113112bd123dfa26 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 14 Aug 2020 21:17:20 +0000 Subject: [PATCH 01/22] Update dependencies from https://github.com/dotnet/efcore build 20200814.2 (#24917) [release/3.1] Update dependencies from dotnet/efcore - Coherency Updates: - Microsoft.AspNetCore.Analyzer.Testing: from 3.1.8-servicing.20413.8 to 3.1.8-servicing.20414.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.BenchmarkRunner.Sources: from 3.1.8-servicing.20413.8 to 3.1.8-servicing.20414.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ActivatorUtilities.Sources: from 3.1.8-servicing.20413.8 to 3.1.8-servicing.20414.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Memory: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.SqlServer: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.StackExchangeRedis: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.CommandLineUtils.Sources: from 3.1.8-servicing.20413.8 to 3.1.8-servicing.20414.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.AzureKeyVault: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Binder: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.CommandLine: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.EnvironmentVariables: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.FileExtensions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Ini: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Json: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.KeyPerFile: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.UserSecrets: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Xml: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DiagnosticAdapter: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Composite: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Embedded: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Physical: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileSystemGlobbing: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HashCodeCombiner.Sources: from 3.1.8-servicing.20413.8 to 3.1.8-servicing.20414.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HostFactoryResolver.Sources: from 3.1.8-servicing.20413.8 to 3.1.8-servicing.20414.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Http: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.AzureAppServices: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Configuration: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Console: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Debug: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventSource: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventLog: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.TraceSource: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Testing: from 3.1.8-servicing.20413.8 to 3.1.8-servicing.20414.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ObjectPool: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.ConfigurationExtensions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.DataAnnotations: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ParameterDefaultValue.Sources: from 3.1.8-servicing.20413.8 to 3.1.8-servicing.20414.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Primitives: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.TypeNameHelper.Sources: from 3.1.8-servicing.20413.8 to 3.1.8-servicing.20414.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ValueStopwatch.Sources: from 3.1.8-servicing.20413.8 to 3.1.8-servicing.20414.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.WebEncoders: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.JSInterop: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App.Runtime.win-x64: from 3.1.8 to 3.1.8 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyModel: from 3.1.0 to 3.1.6 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.App.Internal: from 3.1.8-servicing.20412.2 to 3.1.8-servicing.20413.3 (parent: Microsoft.Extensions.Logging) - Internal.AspNetCore.Analyzers: from 3.1.8-servicing.20413.8 to 3.1.8-servicing.20414.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.Testing: from 3.1.8-servicing.20413.8 to 3.1.8-servicing.20414.1 (parent: Microsoft.EntityFrameworkCore) - Updates: - Microsoft.EntityFrameworkCore.Tools: from 3.1.8 to 3.1.8 - Microsoft.EntityFrameworkCore.InMemory: from 3.1.8 to 3.1.8 - Microsoft.EntityFrameworkCore: from 3.1.8 to 3.1.8 - Microsoft.EntityFrameworkCore.Sqlite: from 3.1.8 to 3.1.8 - Microsoft.EntityFrameworkCore.SqlServer: from 3.1.8 to 3.1.8 - Microsoft.EntityFrameworkCore.Relational: from 3.1.8 to 3.1.8 - dotnet-ef: from 3.1.8 to 3.1.8 - Microsoft.AspNetCore.Analyzer.Testing: from 3.1.8-servicing.20413.8 to 3.1.8-servicing.20414.1 - Microsoft.AspNetCore.BenchmarkRunner.Sources: from 3.1.8-servicing.20413.8 to 3.1.8-servicing.20414.1 - Microsoft.Extensions.ActivatorUtilities.Sources: from 3.1.8-servicing.20413.8 to 3.1.8-servicing.20414.1 - Microsoft.Extensions.Caching.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Caching.Memory: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Caching.SqlServer: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Caching.StackExchangeRedis: from 3.1.8 to 3.1.8 - Microsoft.Extensions.CommandLineUtils.Sources: from 3.1.8-servicing.20413.8 to 3.1.8-servicing.20414.1 - Microsoft.Extensions.Configuration.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.AzureKeyVault: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.Binder: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.CommandLine: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.EnvironmentVariables: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.FileExtensions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.Ini: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.Json: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.KeyPerFile: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.UserSecrets: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.Xml: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration: from 3.1.8 to 3.1.8 - Microsoft.Extensions.DependencyInjection.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.DependencyInjection: from 3.1.8 to 3.1.8 - Microsoft.Extensions.DiagnosticAdapter: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Diagnostics.HealthChecks: from 3.1.8 to 3.1.8 - Microsoft.Extensions.FileProviders.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.FileProviders.Composite: from 3.1.8 to 3.1.8 - Microsoft.Extensions.FileProviders.Embedded: from 3.1.8 to 3.1.8 - Microsoft.Extensions.FileProviders.Physical: from 3.1.8 to 3.1.8 - Microsoft.Extensions.FileSystemGlobbing: from 3.1.8 to 3.1.8 - Microsoft.Extensions.HashCodeCombiner.Sources: from 3.1.8-servicing.20413.8 to 3.1.8-servicing.20414.1 - Microsoft.Extensions.Hosting.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Hosting: from 3.1.8 to 3.1.8 - Microsoft.Extensions.HostFactoryResolver.Sources: from 3.1.8-servicing.20413.8 to 3.1.8-servicing.20414.1 - Microsoft.Extensions.Http: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Localization.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Localization: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.AzureAppServices: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.Configuration: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.Console: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.Debug: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.EventSource: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.EventLog: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.TraceSource: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.Testing: from 3.1.8-servicing.20413.8 to 3.1.8-servicing.20414.1 - Microsoft.Extensions.ObjectPool: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Options.ConfigurationExtensions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Options.DataAnnotations: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Options: from 3.1.8 to 3.1.8 - Microsoft.Extensions.ParameterDefaultValue.Sources: from 3.1.8-servicing.20413.8 to 3.1.8-servicing.20414.1 - Microsoft.Extensions.Primitives: from 3.1.8 to 3.1.8 - Microsoft.Extensions.TypeNameHelper.Sources: from 3.1.8-servicing.20413.8 to 3.1.8-servicing.20414.1 - Microsoft.Extensions.ValueStopwatch.Sources: from 3.1.8-servicing.20413.8 to 3.1.8-servicing.20414.1 - Microsoft.Extensions.WebEncoders: from 3.1.8 to 3.1.8 - Microsoft.JSInterop: from 3.1.8 to 3.1.8 - Microsoft.NETCore.App.Runtime.win-x64: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging: from 3.1.8 to 3.1.8 - Microsoft.Extensions.DependencyModel: from 3.1.0 to 3.1.6 - Microsoft.NETCore.App.Internal: from 3.1.8-servicing.20412.2 to 3.1.8-servicing.20413.3 - Internal.AspNetCore.Analyzers: from 3.1.8-servicing.20413.8 to 3.1.8-servicing.20414.1 - Microsoft.AspNetCore.Testing: from 3.1.8-servicing.20413.8 to 3.1.8-servicing.20414.1 --- NuGet.config | 6 +- eng/Version.Details.xml | 168 ++++++++++++++++++++-------------------- eng/Versions.props | 28 +++---- 3 files changed, 101 insertions(+), 101 deletions(-) diff --git a/NuGet.config b/NuGet.config index fc61a5f85a67..66f871dea06e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,9 +3,9 @@ - - - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 609ac361456a..12e62e68b618 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,259 +35,259 @@ https://github.com/dotnet/efcore - 85061a017ee445ef7c8d49b7256e16881aa19db8 + d95eab0c3fe701572c260ebfc992ceb9f6aa325d https://github.com/dotnet/efcore - 85061a017ee445ef7c8d49b7256e16881aa19db8 + d95eab0c3fe701572c260ebfc992ceb9f6aa325d https://github.com/dotnet/efcore - 85061a017ee445ef7c8d49b7256e16881aa19db8 + d95eab0c3fe701572c260ebfc992ceb9f6aa325d https://github.com/dotnet/efcore - 85061a017ee445ef7c8d49b7256e16881aa19db8 + d95eab0c3fe701572c260ebfc992ceb9f6aa325d https://github.com/dotnet/efcore - 85061a017ee445ef7c8d49b7256e16881aa19db8 + d95eab0c3fe701572c260ebfc992ceb9f6aa325d https://github.com/dotnet/efcore - 85061a017ee445ef7c8d49b7256e16881aa19db8 + d95eab0c3fe701572c260ebfc992ceb9f6aa325d https://github.com/dotnet/efcore - 85061a017ee445ef7c8d49b7256e16881aa19db8 + d95eab0c3fe701572c260ebfc992ceb9f6aa325d - + https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 - + https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 - + https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 - + https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 - + https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 - + https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 - + https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 - + https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 - + https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 - + https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://dev.azure.com/dnceng/internal/_git/dotnet-corefx @@ -377,9 +377,9 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - - https://github.com/dotnet/core-setup - 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + 3acd9b0cd16596bad450c82be08780875a73c05c @@ -392,15 +392,15 @@ --> https://github.com/dotnet/core-setup - 9a599ffefec5df0619e5154a8e5c14eba09dc5e6 + d0bc85c7c6047fcf43a99ea5f02da5136c118cce https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - 9a599ffefec5df0619e5154a8e5c14eba09dc5e6 + d0bc85c7c6047fcf43a99ea5f02da5136c118cce @@ -414,9 +414,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-corefx 36b8b8e26a8e2e06e000f59e19910d117bf0025b - + https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/arcade @@ -430,9 +430,9 @@ https://github.com/dotnet/arcade 1a55276ab9d16792cec595ba870df39a9d97d5ca - + https://github.com/dotnet/extensions - c633aee8cb9b04369d78e57ad6548d6369215447 + b45cb4b9ee1c086e74317a840c68c0a612f8a309 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 91b6b168a749..45d5dd411e92 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,8 +68,8 @@ 3.4.1-beta4-20127-10 - 3.1.0 - 3.1.8-servicing.20412.2 + 3.1.6 + 3.1.8-servicing.20413.3 3.1.0 3.1.8 2.1.0 @@ -102,16 +102,16 @@ 3.2.0 - 3.1.8-servicing.20413.8 - 3.1.8-servicing.20413.8 - 3.1.8-servicing.20413.8 - 3.1.8-servicing.20413.8 - 3.1.8-servicing.20413.8 + 3.1.8-servicing.20414.1 + 3.1.8-servicing.20414.1 + 3.1.8-servicing.20414.1 + 3.1.8-servicing.20414.1 + 3.1.8-servicing.20414.1 3.1.8 3.1.8 3.1.8 3.1.8 - 3.1.8-servicing.20413.8 + 3.1.8-servicing.20414.1 3.1.8 3.1.8 3.1.8 @@ -134,10 +134,10 @@ 3.1.8 3.1.8 3.1.8 - 3.1.8-servicing.20413.8 + 3.1.8-servicing.20414.1 3.1.8 3.1.8 - 3.1.8-servicing.20413.8 + 3.1.8-servicing.20414.1 3.1.8 3.1.8 3.1.8 @@ -149,16 +149,16 @@ 3.1.8 3.1.8 3.1.8 - 3.1.8-servicing.20413.8 + 3.1.8-servicing.20414.1 3.1.8 3.1.8 3.1.8 3.1.8 3.1.8 - 3.1.8-servicing.20413.8 + 3.1.8-servicing.20414.1 3.1.8 - 3.1.8-servicing.20413.8 - 3.1.8-servicing.20413.8 + 3.1.8-servicing.20414.1 + 3.1.8-servicing.20414.1 3.1.8 3.1.0-rtm.19565.4 3.1.8 From 253489c3e67725ee5f65222259b6f6c8791adbf3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 15 Aug 2020 01:34:36 +0000 Subject: [PATCH 02/22] Update dependencies from https://github.com/dotnet/efcore build 20200814.6 (#24923) [release/3.1] Update dependencies from dotnet/efcore - Coherency Updates: - Microsoft.AspNetCore.Analyzer.Testing: from 3.1.8-servicing.20414.1 to 3.1.8-servicing.20414.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.BenchmarkRunner.Sources: from 3.1.8-servicing.20414.1 to 3.1.8-servicing.20414.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ActivatorUtilities.Sources: from 3.1.8-servicing.20414.1 to 3.1.8-servicing.20414.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Memory: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.SqlServer: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.StackExchangeRedis: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.CommandLineUtils.Sources: from 3.1.8-servicing.20414.1 to 3.1.8-servicing.20414.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.AzureKeyVault: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Binder: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.CommandLine: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.EnvironmentVariables: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.FileExtensions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Ini: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Json: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.KeyPerFile: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.UserSecrets: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Xml: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DiagnosticAdapter: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Composite: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Embedded: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Physical: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileSystemGlobbing: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HashCodeCombiner.Sources: from 3.1.8-servicing.20414.1 to 3.1.8-servicing.20414.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HostFactoryResolver.Sources: from 3.1.8-servicing.20414.1 to 3.1.8-servicing.20414.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Http: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.AzureAppServices: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Configuration: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Console: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Debug: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventSource: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventLog: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.TraceSource: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Testing: from 3.1.8-servicing.20414.1 to 3.1.8-servicing.20414.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ObjectPool: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.ConfigurationExtensions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.DataAnnotations: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ParameterDefaultValue.Sources: from 3.1.8-servicing.20414.1 to 3.1.8-servicing.20414.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Primitives: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.TypeNameHelper.Sources: from 3.1.8-servicing.20414.1 to 3.1.8-servicing.20414.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ValueStopwatch.Sources: from 3.1.8-servicing.20414.1 to 3.1.8-servicing.20414.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.WebEncoders: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.JSInterop: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App.Runtime.win-x64: from 3.1.8 to 3.1.8 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App.Internal: from 3.1.8-servicing.20413.3 to 3.1.8-servicing.20414.1 (parent: Microsoft.Extensions.Logging) - Internal.AspNetCore.Analyzers: from 3.1.8-servicing.20414.1 to 3.1.8-servicing.20414.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.Testing: from 3.1.8-servicing.20414.1 to 3.1.8-servicing.20414.2 (parent: Microsoft.EntityFrameworkCore) - Updates: - Microsoft.EntityFrameworkCore.Tools: from 3.1.8 to 3.1.8 - Microsoft.EntityFrameworkCore.InMemory: from 3.1.8 to 3.1.8 - Microsoft.EntityFrameworkCore: from 3.1.8 to 3.1.8 - Microsoft.EntityFrameworkCore.Sqlite: from 3.1.8 to 3.1.8 - Microsoft.EntityFrameworkCore.SqlServer: from 3.1.8 to 3.1.8 - Microsoft.EntityFrameworkCore.Relational: from 3.1.8 to 3.1.8 - dotnet-ef: from 3.1.8 to 3.1.8 - Microsoft.AspNetCore.Analyzer.Testing: from 3.1.8-servicing.20414.1 to 3.1.8-servicing.20414.2 - Microsoft.AspNetCore.BenchmarkRunner.Sources: from 3.1.8-servicing.20414.1 to 3.1.8-servicing.20414.2 - Microsoft.Extensions.ActivatorUtilities.Sources: from 3.1.8-servicing.20414.1 to 3.1.8-servicing.20414.2 - Microsoft.Extensions.Caching.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Caching.Memory: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Caching.SqlServer: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Caching.StackExchangeRedis: from 3.1.8 to 3.1.8 - Microsoft.Extensions.CommandLineUtils.Sources: from 3.1.8-servicing.20414.1 to 3.1.8-servicing.20414.2 - Microsoft.Extensions.Configuration.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.AzureKeyVault: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.Binder: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.CommandLine: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.EnvironmentVariables: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.FileExtensions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.Ini: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.Json: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.KeyPerFile: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.UserSecrets: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.Xml: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration: from 3.1.8 to 3.1.8 - Microsoft.Extensions.DependencyInjection.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.DependencyInjection: from 3.1.8 to 3.1.8 - Microsoft.Extensions.DiagnosticAdapter: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Diagnostics.HealthChecks: from 3.1.8 to 3.1.8 - Microsoft.Extensions.FileProviders.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.FileProviders.Composite: from 3.1.8 to 3.1.8 - Microsoft.Extensions.FileProviders.Embedded: from 3.1.8 to 3.1.8 - Microsoft.Extensions.FileProviders.Physical: from 3.1.8 to 3.1.8 - Microsoft.Extensions.FileSystemGlobbing: from 3.1.8 to 3.1.8 - Microsoft.Extensions.HashCodeCombiner.Sources: from 3.1.8-servicing.20414.1 to 3.1.8-servicing.20414.2 - Microsoft.Extensions.Hosting.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Hosting: from 3.1.8 to 3.1.8 - Microsoft.Extensions.HostFactoryResolver.Sources: from 3.1.8-servicing.20414.1 to 3.1.8-servicing.20414.2 - Microsoft.Extensions.Http: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Localization.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Localization: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.AzureAppServices: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.Configuration: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.Console: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.Debug: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.EventSource: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.EventLog: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.TraceSource: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.Testing: from 3.1.8-servicing.20414.1 to 3.1.8-servicing.20414.2 - Microsoft.Extensions.ObjectPool: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Options.ConfigurationExtensions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Options.DataAnnotations: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Options: from 3.1.8 to 3.1.8 - Microsoft.Extensions.ParameterDefaultValue.Sources: from 3.1.8-servicing.20414.1 to 3.1.8-servicing.20414.2 - Microsoft.Extensions.Primitives: from 3.1.8 to 3.1.8 - Microsoft.Extensions.TypeNameHelper.Sources: from 3.1.8-servicing.20414.1 to 3.1.8-servicing.20414.2 - Microsoft.Extensions.ValueStopwatch.Sources: from 3.1.8-servicing.20414.1 to 3.1.8-servicing.20414.2 - Microsoft.Extensions.WebEncoders: from 3.1.8 to 3.1.8 - Microsoft.JSInterop: from 3.1.8 to 3.1.8 - Microsoft.NETCore.App.Runtime.win-x64: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging: from 3.1.8 to 3.1.8 - Microsoft.NETCore.App.Internal: from 3.1.8-servicing.20413.3 to 3.1.8-servicing.20414.1 - Internal.AspNetCore.Analyzers: from 3.1.8-servicing.20414.1 to 3.1.8-servicing.20414.2 - Microsoft.AspNetCore.Testing: from 3.1.8-servicing.20414.1 to 3.1.8-servicing.20414.2 --- NuGet.config | 6 +- eng/Version.Details.xml | 162 ++++++++++++++++++++-------------------- eng/Versions.props | 26 +++---- 3 files changed, 97 insertions(+), 97 deletions(-) diff --git a/NuGet.config b/NuGet.config index 66f871dea06e..9657f14ac2a4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,9 +3,9 @@ - - - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 12e62e68b618..fb28c6d0354e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,259 +35,259 @@ https://github.com/dotnet/efcore - d95eab0c3fe701572c260ebfc992ceb9f6aa325d + d5c09c466b6ec16599f1435ca4ac3e78d39c871c https://github.com/dotnet/efcore - d95eab0c3fe701572c260ebfc992ceb9f6aa325d + d5c09c466b6ec16599f1435ca4ac3e78d39c871c https://github.com/dotnet/efcore - d95eab0c3fe701572c260ebfc992ceb9f6aa325d + d5c09c466b6ec16599f1435ca4ac3e78d39c871c https://github.com/dotnet/efcore - d95eab0c3fe701572c260ebfc992ceb9f6aa325d + d5c09c466b6ec16599f1435ca4ac3e78d39c871c https://github.com/dotnet/efcore - d95eab0c3fe701572c260ebfc992ceb9f6aa325d + d5c09c466b6ec16599f1435ca4ac3e78d39c871c https://github.com/dotnet/efcore - d95eab0c3fe701572c260ebfc992ceb9f6aa325d + d5c09c466b6ec16599f1435ca4ac3e78d39c871c https://github.com/dotnet/efcore - d95eab0c3fe701572c260ebfc992ceb9f6aa325d + d5c09c466b6ec16599f1435ca4ac3e78d39c871c - + https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 - + https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 - + https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 - + https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 - + https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 - + https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 - + https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 - + https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 - + https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 - + https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://dev.azure.com/dnceng/internal/_git/dotnet-corefx @@ -392,15 +392,15 @@ --> https://github.com/dotnet/core-setup - d0bc85c7c6047fcf43a99ea5f02da5136c118cce + e4ad874203c52d1b5e9e2f0dcfaed2d03c8adcda https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - d0bc85c7c6047fcf43a99ea5f02da5136c118cce + e4ad874203c52d1b5e9e2f0dcfaed2d03c8adcda @@ -414,9 +414,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-corefx 36b8b8e26a8e2e06e000f59e19910d117bf0025b - + https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/arcade @@ -430,9 +430,9 @@ https://github.com/dotnet/arcade 1a55276ab9d16792cec595ba870df39a9d97d5ca - + https://github.com/dotnet/extensions - b45cb4b9ee1c086e74317a840c68c0a612f8a309 + b2039820b86e46189766099d9324468814bec063 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 45d5dd411e92..48a6793e5b8a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,7 +69,7 @@ 3.4.1-beta4-20127-10 3.1.6 - 3.1.8-servicing.20413.3 + 3.1.8-servicing.20414.1 3.1.0 3.1.8 2.1.0 @@ -102,16 +102,16 @@ 3.2.0 - 3.1.8-servicing.20414.1 - 3.1.8-servicing.20414.1 - 3.1.8-servicing.20414.1 - 3.1.8-servicing.20414.1 - 3.1.8-servicing.20414.1 + 3.1.8-servicing.20414.2 + 3.1.8-servicing.20414.2 + 3.1.8-servicing.20414.2 + 3.1.8-servicing.20414.2 + 3.1.8-servicing.20414.2 3.1.8 3.1.8 3.1.8 3.1.8 - 3.1.8-servicing.20414.1 + 3.1.8-servicing.20414.2 3.1.8 3.1.8 3.1.8 @@ -134,10 +134,10 @@ 3.1.8 3.1.8 3.1.8 - 3.1.8-servicing.20414.1 + 3.1.8-servicing.20414.2 3.1.8 3.1.8 - 3.1.8-servicing.20414.1 + 3.1.8-servicing.20414.2 3.1.8 3.1.8 3.1.8 @@ -149,16 +149,16 @@ 3.1.8 3.1.8 3.1.8 - 3.1.8-servicing.20414.1 + 3.1.8-servicing.20414.2 3.1.8 3.1.8 3.1.8 3.1.8 3.1.8 - 3.1.8-servicing.20414.1 + 3.1.8-servicing.20414.2 3.1.8 - 3.1.8-servicing.20414.1 - 3.1.8-servicing.20414.1 + 3.1.8-servicing.20414.2 + 3.1.8-servicing.20414.2 3.1.8 3.1.0-rtm.19565.4 3.1.8 From 01650cdb7fd0b139a0f00c0efbe6f87a8634adc3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 15 Aug 2020 04:43:27 +0000 Subject: [PATCH 03/22] Update dependencies from https://github.com/dotnet/efcore build 20200814.9 (#24930) [release/3.1] Update dependencies from dotnet/efcore - Coherency Updates: - Microsoft.AspNetCore.Analyzer.Testing: from 3.1.8-servicing.20414.2 to 3.1.8-servicing.20414.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.BenchmarkRunner.Sources: from 3.1.8-servicing.20414.2 to 3.1.8-servicing.20414.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ActivatorUtilities.Sources: from 3.1.8-servicing.20414.2 to 3.1.8-servicing.20414.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Memory: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.SqlServer: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.StackExchangeRedis: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.CommandLineUtils.Sources: from 3.1.8-servicing.20414.2 to 3.1.8-servicing.20414.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.AzureKeyVault: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Binder: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.CommandLine: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.EnvironmentVariables: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.FileExtensions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Ini: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Json: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.KeyPerFile: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.UserSecrets: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Xml: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DiagnosticAdapter: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Composite: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Embedded: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Physical: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileSystemGlobbing: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HashCodeCombiner.Sources: from 3.1.8-servicing.20414.2 to 3.1.8-servicing.20414.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HostFactoryResolver.Sources: from 3.1.8-servicing.20414.2 to 3.1.8-servicing.20414.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Http: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.AzureAppServices: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Configuration: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Console: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Debug: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventSource: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventLog: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.TraceSource: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Testing: from 3.1.8-servicing.20414.2 to 3.1.8-servicing.20414.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ObjectPool: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.ConfigurationExtensions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.DataAnnotations: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ParameterDefaultValue.Sources: from 3.1.8-servicing.20414.2 to 3.1.8-servicing.20414.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Primitives: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.TypeNameHelper.Sources: from 3.1.8-servicing.20414.2 to 3.1.8-servicing.20414.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ValueStopwatch.Sources: from 3.1.8-servicing.20414.2 to 3.1.8-servicing.20414.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.WebEncoders: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.JSInterop: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App.Runtime.win-x64: from 3.1.8 to 3.1.8 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App.Internal: from 3.1.8-servicing.20414.1 to 3.1.8-servicing.20414.2 (parent: Microsoft.Extensions.Logging) - Internal.AspNetCore.Analyzers: from 3.1.8-servicing.20414.2 to 3.1.8-servicing.20414.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.Testing: from 3.1.8-servicing.20414.2 to 3.1.8-servicing.20414.4 (parent: Microsoft.EntityFrameworkCore) - Updates: - Microsoft.EntityFrameworkCore.Tools: from 3.1.8 to 3.1.8 - Microsoft.EntityFrameworkCore.InMemory: from 3.1.8 to 3.1.8 - Microsoft.EntityFrameworkCore: from 3.1.8 to 3.1.8 - Microsoft.EntityFrameworkCore.Sqlite: from 3.1.8 to 3.1.8 - Microsoft.EntityFrameworkCore.SqlServer: from 3.1.8 to 3.1.8 - Microsoft.EntityFrameworkCore.Relational: from 3.1.8 to 3.1.8 - dotnet-ef: from 3.1.8 to 3.1.8 - Microsoft.AspNetCore.Analyzer.Testing: from 3.1.8-servicing.20414.2 to 3.1.8-servicing.20414.4 - Microsoft.AspNetCore.BenchmarkRunner.Sources: from 3.1.8-servicing.20414.2 to 3.1.8-servicing.20414.4 - Microsoft.Extensions.ActivatorUtilities.Sources: from 3.1.8-servicing.20414.2 to 3.1.8-servicing.20414.4 - Microsoft.Extensions.Caching.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Caching.Memory: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Caching.SqlServer: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Caching.StackExchangeRedis: from 3.1.8 to 3.1.8 - Microsoft.Extensions.CommandLineUtils.Sources: from 3.1.8-servicing.20414.2 to 3.1.8-servicing.20414.4 - Microsoft.Extensions.Configuration.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.AzureKeyVault: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.Binder: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.CommandLine: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.EnvironmentVariables: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.FileExtensions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.Ini: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.Json: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.KeyPerFile: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.UserSecrets: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.Xml: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration: from 3.1.8 to 3.1.8 - Microsoft.Extensions.DependencyInjection.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.DependencyInjection: from 3.1.8 to 3.1.8 - Microsoft.Extensions.DiagnosticAdapter: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Diagnostics.HealthChecks: from 3.1.8 to 3.1.8 - Microsoft.Extensions.FileProviders.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.FileProviders.Composite: from 3.1.8 to 3.1.8 - Microsoft.Extensions.FileProviders.Embedded: from 3.1.8 to 3.1.8 - Microsoft.Extensions.FileProviders.Physical: from 3.1.8 to 3.1.8 - Microsoft.Extensions.FileSystemGlobbing: from 3.1.8 to 3.1.8 - Microsoft.Extensions.HashCodeCombiner.Sources: from 3.1.8-servicing.20414.2 to 3.1.8-servicing.20414.4 - Microsoft.Extensions.Hosting.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Hosting: from 3.1.8 to 3.1.8 - Microsoft.Extensions.HostFactoryResolver.Sources: from 3.1.8-servicing.20414.2 to 3.1.8-servicing.20414.4 - Microsoft.Extensions.Http: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Localization.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Localization: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.AzureAppServices: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.Configuration: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.Console: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.Debug: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.EventSource: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.EventLog: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.TraceSource: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.Testing: from 3.1.8-servicing.20414.2 to 3.1.8-servicing.20414.4 - Microsoft.Extensions.ObjectPool: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Options.ConfigurationExtensions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Options.DataAnnotations: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Options: from 3.1.8 to 3.1.8 - Microsoft.Extensions.ParameterDefaultValue.Sources: from 3.1.8-servicing.20414.2 to 3.1.8-servicing.20414.4 - Microsoft.Extensions.Primitives: from 3.1.8 to 3.1.8 - Microsoft.Extensions.TypeNameHelper.Sources: from 3.1.8-servicing.20414.2 to 3.1.8-servicing.20414.4 - Microsoft.Extensions.ValueStopwatch.Sources: from 3.1.8-servicing.20414.2 to 3.1.8-servicing.20414.4 - Microsoft.Extensions.WebEncoders: from 3.1.8 to 3.1.8 - Microsoft.JSInterop: from 3.1.8 to 3.1.8 - Microsoft.NETCore.App.Runtime.win-x64: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging: from 3.1.8 to 3.1.8 - Microsoft.NETCore.App.Internal: from 3.1.8-servicing.20414.1 to 3.1.8-servicing.20414.2 - Internal.AspNetCore.Analyzers: from 3.1.8-servicing.20414.2 to 3.1.8-servicing.20414.4 - Microsoft.AspNetCore.Testing: from 3.1.8-servicing.20414.2 to 3.1.8-servicing.20414.4 --- NuGet.config | 6 +- eng/Version.Details.xml | 162 ++++++++++++++++++++-------------------- eng/Versions.props | 26 +++---- 3 files changed, 97 insertions(+), 97 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9657f14ac2a4..a070fbcf11d3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,9 +3,9 @@ - - - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb28c6d0354e..7682d9c628a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,259 +35,259 @@ https://github.com/dotnet/efcore - d5c09c466b6ec16599f1435ca4ac3e78d39c871c + 8fb1dad5f3586d8e3f1522219ae4de25d1d5fc34 https://github.com/dotnet/efcore - d5c09c466b6ec16599f1435ca4ac3e78d39c871c + 8fb1dad5f3586d8e3f1522219ae4de25d1d5fc34 https://github.com/dotnet/efcore - d5c09c466b6ec16599f1435ca4ac3e78d39c871c + 8fb1dad5f3586d8e3f1522219ae4de25d1d5fc34 https://github.com/dotnet/efcore - d5c09c466b6ec16599f1435ca4ac3e78d39c871c + 8fb1dad5f3586d8e3f1522219ae4de25d1d5fc34 https://github.com/dotnet/efcore - d5c09c466b6ec16599f1435ca4ac3e78d39c871c + 8fb1dad5f3586d8e3f1522219ae4de25d1d5fc34 https://github.com/dotnet/efcore - d5c09c466b6ec16599f1435ca4ac3e78d39c871c + 8fb1dad5f3586d8e3f1522219ae4de25d1d5fc34 https://github.com/dotnet/efcore - d5c09c466b6ec16599f1435ca4ac3e78d39c871c + 8fb1dad5f3586d8e3f1522219ae4de25d1d5fc34 - + https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 - + https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 - + https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 - + https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 - + https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 - + https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 - + https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 - + https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 - + https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 - + https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://dev.azure.com/dnceng/internal/_git/dotnet-corefx @@ -392,15 +392,15 @@ --> https://github.com/dotnet/core-setup - e4ad874203c52d1b5e9e2f0dcfaed2d03c8adcda + 07abf29837e67600985eac4956e937955281d23c https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - e4ad874203c52d1b5e9e2f0dcfaed2d03c8adcda + 07abf29837e67600985eac4956e937955281d23c @@ -414,9 +414,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-corefx 36b8b8e26a8e2e06e000f59e19910d117bf0025b - + https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/arcade @@ -430,9 +430,9 @@ https://github.com/dotnet/arcade 1a55276ab9d16792cec595ba870df39a9d97d5ca - + https://github.com/dotnet/extensions - b2039820b86e46189766099d9324468814bec063 + d7dd3dd2bad597a566915d6c8065fdffefef4be7 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 48a6793e5b8a..871064ce7fdf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,7 +69,7 @@ 3.4.1-beta4-20127-10 3.1.6 - 3.1.8-servicing.20414.1 + 3.1.8-servicing.20414.2 3.1.0 3.1.8 2.1.0 @@ -102,16 +102,16 @@ 3.2.0 - 3.1.8-servicing.20414.2 - 3.1.8-servicing.20414.2 - 3.1.8-servicing.20414.2 - 3.1.8-servicing.20414.2 - 3.1.8-servicing.20414.2 + 3.1.8-servicing.20414.4 + 3.1.8-servicing.20414.4 + 3.1.8-servicing.20414.4 + 3.1.8-servicing.20414.4 + 3.1.8-servicing.20414.4 3.1.8 3.1.8 3.1.8 3.1.8 - 3.1.8-servicing.20414.2 + 3.1.8-servicing.20414.4 3.1.8 3.1.8 3.1.8 @@ -134,10 +134,10 @@ 3.1.8 3.1.8 3.1.8 - 3.1.8-servicing.20414.2 + 3.1.8-servicing.20414.4 3.1.8 3.1.8 - 3.1.8-servicing.20414.2 + 3.1.8-servicing.20414.4 3.1.8 3.1.8 3.1.8 @@ -149,16 +149,16 @@ 3.1.8 3.1.8 3.1.8 - 3.1.8-servicing.20414.2 + 3.1.8-servicing.20414.4 3.1.8 3.1.8 3.1.8 3.1.8 3.1.8 - 3.1.8-servicing.20414.2 + 3.1.8-servicing.20414.4 3.1.8 - 3.1.8-servicing.20414.2 - 3.1.8-servicing.20414.2 + 3.1.8-servicing.20414.4 + 3.1.8-servicing.20414.4 3.1.8 3.1.0-rtm.19565.4 3.1.8 From 96e1537d9e275d6069277528590adc53ce472968 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 15 Aug 2020 22:31:11 +0000 Subject: [PATCH 04/22] Update dependencies from https://github.com/dotnet/efcore build 20200815.2 (#24939) [release/3.1] Update dependencies from dotnet/efcore - Coherency Updates: - Microsoft.AspNetCore.Analyzer.Testing: from 3.1.8-servicing.20414.4 to 3.1.8-servicing.20415.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.BenchmarkRunner.Sources: from 3.1.8-servicing.20414.4 to 3.1.8-servicing.20415.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ActivatorUtilities.Sources: from 3.1.8-servicing.20414.4 to 3.1.8-servicing.20415.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Memory: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.SqlServer: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.StackExchangeRedis: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.CommandLineUtils.Sources: from 3.1.8-servicing.20414.4 to 3.1.8-servicing.20415.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.AzureKeyVault: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Binder: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.CommandLine: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.EnvironmentVariables: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.FileExtensions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Ini: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Json: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.KeyPerFile: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.UserSecrets: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Xml: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DiagnosticAdapter: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Composite: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Embedded: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Physical: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileSystemGlobbing: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HashCodeCombiner.Sources: from 3.1.8-servicing.20414.4 to 3.1.8-servicing.20415.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HostFactoryResolver.Sources: from 3.1.8-servicing.20414.4 to 3.1.8-servicing.20415.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Http: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.AzureAppServices: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Configuration: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Console: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Debug: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventSource: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventLog: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.TraceSource: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Testing: from 3.1.8-servicing.20414.4 to 3.1.8-servicing.20415.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ObjectPool: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.ConfigurationExtensions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.DataAnnotations: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ParameterDefaultValue.Sources: from 3.1.8-servicing.20414.4 to 3.1.8-servicing.20415.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Primitives: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.TypeNameHelper.Sources: from 3.1.8-servicing.20414.4 to 3.1.8-servicing.20415.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ValueStopwatch.Sources: from 3.1.8-servicing.20414.4 to 3.1.8-servicing.20415.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.WebEncoders: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.JSInterop: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Internal.AspNetCore.Analyzers: from 3.1.8-servicing.20414.4 to 3.1.8-servicing.20415.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.Testing: from 3.1.8-servicing.20414.4 to 3.1.8-servicing.20415.2 (parent: Microsoft.EntityFrameworkCore) - Updates: - Microsoft.EntityFrameworkCore.Tools: from 3.1.8 to 3.1.8 - Microsoft.EntityFrameworkCore.InMemory: from 3.1.8 to 3.1.8 - Microsoft.EntityFrameworkCore: from 3.1.8 to 3.1.8 - Microsoft.EntityFrameworkCore.Sqlite: from 3.1.8 to 3.1.8 - Microsoft.EntityFrameworkCore.SqlServer: from 3.1.8 to 3.1.8 - Microsoft.EntityFrameworkCore.Relational: from 3.1.8 to 3.1.8 - dotnet-ef: from 3.1.8 to 3.1.8 - Microsoft.AspNetCore.Analyzer.Testing: from 3.1.8-servicing.20414.4 to 3.1.8-servicing.20415.2 - Microsoft.AspNetCore.BenchmarkRunner.Sources: from 3.1.8-servicing.20414.4 to 3.1.8-servicing.20415.2 - Microsoft.Extensions.ActivatorUtilities.Sources: from 3.1.8-servicing.20414.4 to 3.1.8-servicing.20415.2 - Microsoft.Extensions.Caching.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Caching.Memory: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Caching.SqlServer: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Caching.StackExchangeRedis: from 3.1.8 to 3.1.8 - Microsoft.Extensions.CommandLineUtils.Sources: from 3.1.8-servicing.20414.4 to 3.1.8-servicing.20415.2 - Microsoft.Extensions.Configuration.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.AzureKeyVault: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.Binder: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.CommandLine: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.EnvironmentVariables: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.FileExtensions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.Ini: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.Json: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.KeyPerFile: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.UserSecrets: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.Xml: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration: from 3.1.8 to 3.1.8 - Microsoft.Extensions.DependencyInjection.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.DependencyInjection: from 3.1.8 to 3.1.8 - Microsoft.Extensions.DiagnosticAdapter: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Diagnostics.HealthChecks: from 3.1.8 to 3.1.8 - Microsoft.Extensions.FileProviders.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.FileProviders.Composite: from 3.1.8 to 3.1.8 - Microsoft.Extensions.FileProviders.Embedded: from 3.1.8 to 3.1.8 - Microsoft.Extensions.FileProviders.Physical: from 3.1.8 to 3.1.8 - Microsoft.Extensions.FileSystemGlobbing: from 3.1.8 to 3.1.8 - Microsoft.Extensions.HashCodeCombiner.Sources: from 3.1.8-servicing.20414.4 to 3.1.8-servicing.20415.2 - Microsoft.Extensions.Hosting.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Hosting: from 3.1.8 to 3.1.8 - Microsoft.Extensions.HostFactoryResolver.Sources: from 3.1.8-servicing.20414.4 to 3.1.8-servicing.20415.2 - Microsoft.Extensions.Http: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Localization.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Localization: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.AzureAppServices: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.Configuration: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.Console: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.Debug: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.EventSource: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.EventLog: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.TraceSource: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.Testing: from 3.1.8-servicing.20414.4 to 3.1.8-servicing.20415.2 - Microsoft.Extensions.ObjectPool: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Options.ConfigurationExtensions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Options.DataAnnotations: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Options: from 3.1.8 to 3.1.8 - Microsoft.Extensions.ParameterDefaultValue.Sources: from 3.1.8-servicing.20414.4 to 3.1.8-servicing.20415.2 - Microsoft.Extensions.Primitives: from 3.1.8 to 3.1.8 - Microsoft.Extensions.TypeNameHelper.Sources: from 3.1.8-servicing.20414.4 to 3.1.8-servicing.20415.2 - Microsoft.Extensions.ValueStopwatch.Sources: from 3.1.8-servicing.20414.4 to 3.1.8-servicing.20415.2 - Microsoft.Extensions.WebEncoders: from 3.1.8 to 3.1.8 - Microsoft.JSInterop: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging: from 3.1.8 to 3.1.8 - Internal.AspNetCore.Analyzers: from 3.1.8-servicing.20414.4 to 3.1.8-servicing.20415.2 - Microsoft.AspNetCore.Testing: from 3.1.8-servicing.20414.4 to 3.1.8-servicing.20415.2 --- NuGet.config | 4 +- eng/Version.Details.xml | 156 ++++++++++++++++++++-------------------- eng/Versions.props | 24 +++---- 3 files changed, 92 insertions(+), 92 deletions(-) diff --git a/NuGet.config b/NuGet.config index a070fbcf11d3..a0f59b0ddf38 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,8 +3,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7682d9c628a0..8bc6c09a11be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,259 +35,259 @@ https://github.com/dotnet/efcore - 8fb1dad5f3586d8e3f1522219ae4de25d1d5fc34 + ef87bbd36dc2826a875de0f9b5d6b567196ef8d3 https://github.com/dotnet/efcore - 8fb1dad5f3586d8e3f1522219ae4de25d1d5fc34 + ef87bbd36dc2826a875de0f9b5d6b567196ef8d3 https://github.com/dotnet/efcore - 8fb1dad5f3586d8e3f1522219ae4de25d1d5fc34 + ef87bbd36dc2826a875de0f9b5d6b567196ef8d3 https://github.com/dotnet/efcore - 8fb1dad5f3586d8e3f1522219ae4de25d1d5fc34 + ef87bbd36dc2826a875de0f9b5d6b567196ef8d3 https://github.com/dotnet/efcore - 8fb1dad5f3586d8e3f1522219ae4de25d1d5fc34 + ef87bbd36dc2826a875de0f9b5d6b567196ef8d3 https://github.com/dotnet/efcore - 8fb1dad5f3586d8e3f1522219ae4de25d1d5fc34 + ef87bbd36dc2826a875de0f9b5d6b567196ef8d3 https://github.com/dotnet/efcore - 8fb1dad5f3586d8e3f1522219ae4de25d1d5fc34 + ef87bbd36dc2826a875de0f9b5d6b567196ef8d3 - + https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 - + https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 - + https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 - + https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 - + https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 - + https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 - + https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 - + https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 - + https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 - + https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://dev.azure.com/dnceng/internal/_git/dotnet-corefx @@ -414,9 +414,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-corefx 36b8b8e26a8e2e06e000f59e19910d117bf0025b - + https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/arcade @@ -430,9 +430,9 @@ https://github.com/dotnet/arcade 1a55276ab9d16792cec595ba870df39a9d97d5ca - + https://github.com/dotnet/extensions - d7dd3dd2bad597a566915d6c8065fdffefef4be7 + 21cd8e05c2b0dcac143a2644516961594380e810 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 871064ce7fdf..15cdccb67bb4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -102,16 +102,16 @@ 3.2.0 - 3.1.8-servicing.20414.4 - 3.1.8-servicing.20414.4 - 3.1.8-servicing.20414.4 - 3.1.8-servicing.20414.4 - 3.1.8-servicing.20414.4 + 3.1.8-servicing.20415.2 + 3.1.8-servicing.20415.2 + 3.1.8-servicing.20415.2 + 3.1.8-servicing.20415.2 + 3.1.8-servicing.20415.2 3.1.8 3.1.8 3.1.8 3.1.8 - 3.1.8-servicing.20414.4 + 3.1.8-servicing.20415.2 3.1.8 3.1.8 3.1.8 @@ -134,10 +134,10 @@ 3.1.8 3.1.8 3.1.8 - 3.1.8-servicing.20414.4 + 3.1.8-servicing.20415.2 3.1.8 3.1.8 - 3.1.8-servicing.20414.4 + 3.1.8-servicing.20415.2 3.1.8 3.1.8 3.1.8 @@ -149,16 +149,16 @@ 3.1.8 3.1.8 3.1.8 - 3.1.8-servicing.20414.4 + 3.1.8-servicing.20415.2 3.1.8 3.1.8 3.1.8 3.1.8 3.1.8 - 3.1.8-servicing.20414.4 + 3.1.8-servicing.20415.2 3.1.8 - 3.1.8-servicing.20414.4 - 3.1.8-servicing.20414.4 + 3.1.8-servicing.20415.2 + 3.1.8-servicing.20415.2 3.1.8 3.1.0-rtm.19565.4 3.1.8 From b086ebd43f81e744e63a78c73852401f1e4c2e65 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 16 Aug 2020 01:38:31 +0000 Subject: [PATCH 05/22] Update dependencies from https://github.com/dotnet/efcore build 20200815.3 (#24942) [release/3.1] Update dependencies from dotnet/efcore - Coherency Updates: - Microsoft.AspNetCore.Analyzer.Testing: from 3.1.8-servicing.20415.2 to 3.1.8-servicing.20415.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.BenchmarkRunner.Sources: from 3.1.8-servicing.20415.2 to 3.1.8-servicing.20415.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ActivatorUtilities.Sources: from 3.1.8-servicing.20415.2 to 3.1.8-servicing.20415.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Memory: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.SqlServer: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.StackExchangeRedis: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.CommandLineUtils.Sources: from 3.1.8-servicing.20415.2 to 3.1.8-servicing.20415.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.AzureKeyVault: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Binder: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.CommandLine: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.EnvironmentVariables: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.FileExtensions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Ini: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Json: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.KeyPerFile: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.UserSecrets: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Xml: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DiagnosticAdapter: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Composite: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Embedded: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Physical: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileSystemGlobbing: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HashCodeCombiner.Sources: from 3.1.8-servicing.20415.2 to 3.1.8-servicing.20415.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HostFactoryResolver.Sources: from 3.1.8-servicing.20415.2 to 3.1.8-servicing.20415.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Http: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.AzureAppServices: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Configuration: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Console: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Debug: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventSource: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventLog: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.TraceSource: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Testing: from 3.1.8-servicing.20415.2 to 3.1.8-servicing.20415.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ObjectPool: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.ConfigurationExtensions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.DataAnnotations: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ParameterDefaultValue.Sources: from 3.1.8-servicing.20415.2 to 3.1.8-servicing.20415.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Primitives: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.TypeNameHelper.Sources: from 3.1.8-servicing.20415.2 to 3.1.8-servicing.20415.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ValueStopwatch.Sources: from 3.1.8-servicing.20415.2 to 3.1.8-servicing.20415.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.WebEncoders: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.JSInterop: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App.Runtime.win-x64: from 3.1.8 to 3.1.8 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App.Internal: from 3.1.8-servicing.20414.2 to 3.1.8-servicing.20415.1 (parent: Microsoft.Extensions.Logging) - Internal.AspNetCore.Analyzers: from 3.1.8-servicing.20415.2 to 3.1.8-servicing.20415.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.Testing: from 3.1.8-servicing.20415.2 to 3.1.8-servicing.20415.5 (parent: Microsoft.EntityFrameworkCore) - Updates: - Microsoft.EntityFrameworkCore.Tools: from 3.1.8 to 3.1.8 - Microsoft.EntityFrameworkCore.InMemory: from 3.1.8 to 3.1.8 - Microsoft.EntityFrameworkCore: from 3.1.8 to 3.1.8 - Microsoft.EntityFrameworkCore.Sqlite: from 3.1.8 to 3.1.8 - Microsoft.EntityFrameworkCore.SqlServer: from 3.1.8 to 3.1.8 - Microsoft.EntityFrameworkCore.Relational: from 3.1.8 to 3.1.8 - dotnet-ef: from 3.1.8 to 3.1.8 - Microsoft.AspNetCore.Analyzer.Testing: from 3.1.8-servicing.20415.2 to 3.1.8-servicing.20415.5 - Microsoft.AspNetCore.BenchmarkRunner.Sources: from 3.1.8-servicing.20415.2 to 3.1.8-servicing.20415.5 - Microsoft.Extensions.ActivatorUtilities.Sources: from 3.1.8-servicing.20415.2 to 3.1.8-servicing.20415.5 - Microsoft.Extensions.Caching.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Caching.Memory: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Caching.SqlServer: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Caching.StackExchangeRedis: from 3.1.8 to 3.1.8 - Microsoft.Extensions.CommandLineUtils.Sources: from 3.1.8-servicing.20415.2 to 3.1.8-servicing.20415.5 - Microsoft.Extensions.Configuration.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.AzureKeyVault: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.Binder: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.CommandLine: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.EnvironmentVariables: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.FileExtensions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.Ini: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.Json: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.KeyPerFile: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.UserSecrets: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.Xml: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration: from 3.1.8 to 3.1.8 - Microsoft.Extensions.DependencyInjection.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.DependencyInjection: from 3.1.8 to 3.1.8 - Microsoft.Extensions.DiagnosticAdapter: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Diagnostics.HealthChecks: from 3.1.8 to 3.1.8 - Microsoft.Extensions.FileProviders.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.FileProviders.Composite: from 3.1.8 to 3.1.8 - Microsoft.Extensions.FileProviders.Embedded: from 3.1.8 to 3.1.8 - Microsoft.Extensions.FileProviders.Physical: from 3.1.8 to 3.1.8 - Microsoft.Extensions.FileSystemGlobbing: from 3.1.8 to 3.1.8 - Microsoft.Extensions.HashCodeCombiner.Sources: from 3.1.8-servicing.20415.2 to 3.1.8-servicing.20415.5 - Microsoft.Extensions.Hosting.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Hosting: from 3.1.8 to 3.1.8 - Microsoft.Extensions.HostFactoryResolver.Sources: from 3.1.8-servicing.20415.2 to 3.1.8-servicing.20415.5 - Microsoft.Extensions.Http: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Localization.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Localization: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.AzureAppServices: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.Configuration: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.Console: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.Debug: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.EventSource: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.EventLog: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.TraceSource: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.Testing: from 3.1.8-servicing.20415.2 to 3.1.8-servicing.20415.5 - Microsoft.Extensions.ObjectPool: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Options.ConfigurationExtensions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Options.DataAnnotations: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Options: from 3.1.8 to 3.1.8 - Microsoft.Extensions.ParameterDefaultValue.Sources: from 3.1.8-servicing.20415.2 to 3.1.8-servicing.20415.5 - Microsoft.Extensions.Primitives: from 3.1.8 to 3.1.8 - Microsoft.Extensions.TypeNameHelper.Sources: from 3.1.8-servicing.20415.2 to 3.1.8-servicing.20415.5 - Microsoft.Extensions.ValueStopwatch.Sources: from 3.1.8-servicing.20415.2 to 3.1.8-servicing.20415.5 - Microsoft.Extensions.WebEncoders: from 3.1.8 to 3.1.8 - Microsoft.JSInterop: from 3.1.8 to 3.1.8 - Microsoft.NETCore.App.Runtime.win-x64: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging: from 3.1.8 to 3.1.8 - Microsoft.NETCore.App.Internal: from 3.1.8-servicing.20414.2 to 3.1.8-servicing.20415.1 - Internal.AspNetCore.Analyzers: from 3.1.8-servicing.20415.2 to 3.1.8-servicing.20415.5 - Microsoft.AspNetCore.Testing: from 3.1.8-servicing.20415.2 to 3.1.8-servicing.20415.5 --- NuGet.config | 6 +- eng/Version.Details.xml | 162 ++++++++++++++++++++-------------------- eng/Versions.props | 26 +++---- 3 files changed, 97 insertions(+), 97 deletions(-) diff --git a/NuGet.config b/NuGet.config index a0f59b0ddf38..22bda83dc63e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,9 +3,9 @@ - - - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8bc6c09a11be..e3cd3fa2d760 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,259 +35,259 @@ https://github.com/dotnet/efcore - ef87bbd36dc2826a875de0f9b5d6b567196ef8d3 + 0d799b8a1f5d721241f32885e456a0efe93f1e74 https://github.com/dotnet/efcore - ef87bbd36dc2826a875de0f9b5d6b567196ef8d3 + 0d799b8a1f5d721241f32885e456a0efe93f1e74 https://github.com/dotnet/efcore - ef87bbd36dc2826a875de0f9b5d6b567196ef8d3 + 0d799b8a1f5d721241f32885e456a0efe93f1e74 https://github.com/dotnet/efcore - ef87bbd36dc2826a875de0f9b5d6b567196ef8d3 + 0d799b8a1f5d721241f32885e456a0efe93f1e74 https://github.com/dotnet/efcore - ef87bbd36dc2826a875de0f9b5d6b567196ef8d3 + 0d799b8a1f5d721241f32885e456a0efe93f1e74 https://github.com/dotnet/efcore - ef87bbd36dc2826a875de0f9b5d6b567196ef8d3 + 0d799b8a1f5d721241f32885e456a0efe93f1e74 https://github.com/dotnet/efcore - ef87bbd36dc2826a875de0f9b5d6b567196ef8d3 + 0d799b8a1f5d721241f32885e456a0efe93f1e74 - + https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d - + https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d - + https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d - + https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d - + https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d - + https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d - + https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d - + https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d - + https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d - + https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://dev.azure.com/dnceng/internal/_git/dotnet-corefx @@ -392,15 +392,15 @@ --> https://github.com/dotnet/core-setup - 07abf29837e67600985eac4956e937955281d23c + f375e037fec56a07f0cb8cde2c1ac60e8e1e5bb2 https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - 07abf29837e67600985eac4956e937955281d23c + f375e037fec56a07f0cb8cde2c1ac60e8e1e5bb2 @@ -414,9 +414,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-corefx 36b8b8e26a8e2e06e000f59e19910d117bf0025b - + https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/arcade @@ -430,9 +430,9 @@ https://github.com/dotnet/arcade 1a55276ab9d16792cec595ba870df39a9d97d5ca - + https://github.com/dotnet/extensions - 21cd8e05c2b0dcac143a2644516961594380e810 + e5aad5e60d9bdfb450592be19d3706716bcaea0d https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 15cdccb67bb4..8d1cebdb06e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,7 +69,7 @@ 3.4.1-beta4-20127-10 3.1.6 - 3.1.8-servicing.20414.2 + 3.1.8-servicing.20415.1 3.1.0 3.1.8 2.1.0 @@ -102,16 +102,16 @@ 3.2.0 - 3.1.8-servicing.20415.2 - 3.1.8-servicing.20415.2 - 3.1.8-servicing.20415.2 - 3.1.8-servicing.20415.2 - 3.1.8-servicing.20415.2 + 3.1.8-servicing.20415.5 + 3.1.8-servicing.20415.5 + 3.1.8-servicing.20415.5 + 3.1.8-servicing.20415.5 + 3.1.8-servicing.20415.5 3.1.8 3.1.8 3.1.8 3.1.8 - 3.1.8-servicing.20415.2 + 3.1.8-servicing.20415.5 3.1.8 3.1.8 3.1.8 @@ -134,10 +134,10 @@ 3.1.8 3.1.8 3.1.8 - 3.1.8-servicing.20415.2 + 3.1.8-servicing.20415.5 3.1.8 3.1.8 - 3.1.8-servicing.20415.2 + 3.1.8-servicing.20415.5 3.1.8 3.1.8 3.1.8 @@ -149,16 +149,16 @@ 3.1.8 3.1.8 3.1.8 - 3.1.8-servicing.20415.2 + 3.1.8-servicing.20415.5 3.1.8 3.1.8 3.1.8 3.1.8 3.1.8 - 3.1.8-servicing.20415.2 + 3.1.8-servicing.20415.5 3.1.8 - 3.1.8-servicing.20415.2 - 3.1.8-servicing.20415.2 + 3.1.8-servicing.20415.5 + 3.1.8-servicing.20415.5 3.1.8 3.1.0-rtm.19565.4 3.1.8 From bde7569d08fca3e8c05344c45df8d2a8cba6dfcc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 17 Aug 2020 20:24:15 +0000 Subject: [PATCH 06/22] Update dependencies from https://github.com/dotnet/efcore build 20200817.3 (#24971) [release/3.1] Update dependencies from dotnet/efcore - Updates: - Microsoft.EntityFrameworkCore.Tools: from 3.1.8 to 3.1.8 - Microsoft.EntityFrameworkCore.InMemory: from 3.1.8 to 3.1.8 - Microsoft.EntityFrameworkCore: from 3.1.8 to 3.1.8 - Microsoft.EntityFrameworkCore.Sqlite: from 3.1.8 to 3.1.8 - Microsoft.EntityFrameworkCore.SqlServer: from 3.1.8 to 3.1.8 - Microsoft.EntityFrameworkCore.Relational: from 3.1.8 to 3.1.8 - dotnet-ef: from 3.1.8 to 3.1.8 --- NuGet.config | 2 +- eng/Version.Details.xml | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 22bda83dc63e..5f61b5c3b229 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e3cd3fa2d760..7cbd6fa36bfd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,31 +35,31 @@ https://github.com/dotnet/efcore - 0d799b8a1f5d721241f32885e456a0efe93f1e74 + f6ec5bbb971a5faeb8251e21ed352a8b03a2952c https://github.com/dotnet/efcore - 0d799b8a1f5d721241f32885e456a0efe93f1e74 + f6ec5bbb971a5faeb8251e21ed352a8b03a2952c https://github.com/dotnet/efcore - 0d799b8a1f5d721241f32885e456a0efe93f1e74 + f6ec5bbb971a5faeb8251e21ed352a8b03a2952c https://github.com/dotnet/efcore - 0d799b8a1f5d721241f32885e456a0efe93f1e74 + f6ec5bbb971a5faeb8251e21ed352a8b03a2952c https://github.com/dotnet/efcore - 0d799b8a1f5d721241f32885e456a0efe93f1e74 + f6ec5bbb971a5faeb8251e21ed352a8b03a2952c https://github.com/dotnet/efcore - 0d799b8a1f5d721241f32885e456a0efe93f1e74 + f6ec5bbb971a5faeb8251e21ed352a8b03a2952c https://github.com/dotnet/efcore - 0d799b8a1f5d721241f32885e456a0efe93f1e74 + f6ec5bbb971a5faeb8251e21ed352a8b03a2952c https://github.com/dotnet/extensions From e54e335f98391a2d7585c84a3370a8205f40a833 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 17 Aug 2020 15:24:16 -0700 Subject: [PATCH 07/22] Helix pass in -nopath for dotnet-install (#24968) --- eng/helix/content/InstallDotNet.ps1 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/helix/content/InstallDotNet.ps1 b/eng/helix/content/InstallDotNet.ps1 index 7e8786643355..778e24dbd24e 100644 --- a/eng/helix/content/InstallDotNet.ps1 +++ b/eng/helix/content/InstallDotNet.ps1 @@ -28,8 +28,8 @@ param( & $PSScriptRoot\Download.ps1 "https://dot.net/v1/dotnet-install.ps1" $PSScriptRoot\dotnet-install.ps1 Write-Host "Download of dotnet-install.ps1 complete..." -Write-Host "Installing SDK...& $PSScriptRoot\dotnet-install.ps1 -Architecture $arch -Version $sdkVersion -InstallDir $installDir" -Invoke-Expression "& $PSScriptRoot\dotnet-install.ps1 -Architecture $arch -Version $sdkVersion -InstallDir $installDir" -Write-Host "Installing Runtime...& $PSScriptRoot\dotnet-install.ps1 -Architecture $arch -Runtime dotnet -Version $runtimeVersion -InstallDir $installDir" -Invoke-Expression "& $PSScriptRoot\dotnet-install.ps1 -Architecture $arch -Runtime dotnet -Version $runtimeVersion -InstallDir $installDir" -Write-Host "InstallDotNet.ps1 complete..." \ No newline at end of file +Write-Host "Installing SDK...& $PSScriptRoot\dotnet-install.ps1 -Architecture $arch -Version $sdkVersion -InstallDir $installDir -NoPath" +Invoke-Expression "& $PSScriptRoot\dotnet-install.ps1 -Architecture $arch -Version $sdkVersion -InstallDir $installDir -NoPath" +Write-Host "Installing Runtime...& $PSScriptRoot\dotnet-install.ps1 -Architecture $arch -Runtime dotnet -Version $runtimeVersion -InstallDir $installDir -NoPath" +Invoke-Expression "& $PSScriptRoot\dotnet-install.ps1 -Architecture $arch -Runtime dotnet -Version $runtimeVersion -InstallDir $installDir -NoPath" +Write-Host "InstallDotNet.ps1 complete..." From 7652481cdea507768ddacb5db8df2c311361ea06 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 17 Aug 2020 23:22:12 +0000 Subject: [PATCH 08/22] Update dependencies from https://github.com/dotnet/efcore build 20200817.5 (#24976) [master] Update dependencies from dotnet/efcore - Updates: - Microsoft.EntityFrameworkCore.Tools: from 5.0.0-rc.1.20417.2 to 5.0.0-rc.1.20417.5 - Microsoft.EntityFrameworkCore.SqlServer: from 5.0.0-rc.1.20417.2 to 5.0.0-rc.1.20417.5 - dotnet-ef: from 5.0.0-rc.1.20417.2 to 5.0.0-rc.1.20417.5 - Microsoft.EntityFrameworkCore: from 5.0.0-rc.1.20417.2 to 5.0.0-rc.1.20417.5 - Microsoft.EntityFrameworkCore.Relational: from 5.0.0-rc.1.20417.2 to 5.0.0-rc.1.20417.5 - Microsoft.EntityFrameworkCore.Sqlite: from 5.0.0-rc.1.20417.2 to 5.0.0-rc.1.20417.5 - Microsoft.EntityFrameworkCore.InMemory: from 5.0.0-rc.1.20417.2 to 5.0.0-rc.1.20417.5 --- 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 e98ae620474a..8465e7322e17 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,33 +13,33 @@ https://github.com/dotnet/blazor cc449601d638ffaab58ae9487f0fd010bb178a12 - + https://github.com/dotnet/efcore - 5099d918192f5df031e1ff5e3beea9cb361c605a + 10d9bb9fe327c920418df8c10f3035a758c2beaf - + https://github.com/dotnet/efcore - 5099d918192f5df031e1ff5e3beea9cb361c605a + 10d9bb9fe327c920418df8c10f3035a758c2beaf - + https://github.com/dotnet/efcore - 5099d918192f5df031e1ff5e3beea9cb361c605a + 10d9bb9fe327c920418df8c10f3035a758c2beaf - + https://github.com/dotnet/efcore - 5099d918192f5df031e1ff5e3beea9cb361c605a + 10d9bb9fe327c920418df8c10f3035a758c2beaf - + https://github.com/dotnet/efcore - 5099d918192f5df031e1ff5e3beea9cb361c605a + 10d9bb9fe327c920418df8c10f3035a758c2beaf - + https://github.com/dotnet/efcore - 5099d918192f5df031e1ff5e3beea9cb361c605a + 10d9bb9fe327c920418df8c10f3035a758c2beaf - + https://github.com/dotnet/efcore - 5099d918192f5df031e1ff5e3beea9cb361c605a + 10d9bb9fe327c920418df8c10f3035a758c2beaf https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index d5dfb4a496f9..60589876f094 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,13 +133,13 @@ 3.2.0 - 5.0.0-rc.1.20417.2 - 5.0.0-rc.1.20417.2 - 5.0.0-rc.1.20417.2 - 5.0.0-rc.1.20417.2 - 5.0.0-rc.1.20417.2 - 5.0.0-rc.1.20417.2 - 5.0.0-rc.1.20417.2 + 5.0.0-rc.1.20417.5 + 5.0.0-rc.1.20417.5 + 5.0.0-rc.1.20417.5 + 5.0.0-rc.1.20417.5 + 5.0.0-rc.1.20417.5 + 5.0.0-rc.1.20417.5 + 5.0.0-rc.1.20417.5 3.2.0 - 5.0.0-rc.1.20417.5 - 5.0.0-rc.1.20417.5 - 5.0.0-rc.1.20417.5 - 5.0.0-rc.1.20417.5 - 5.0.0-rc.1.20417.5 - 5.0.0-rc.1.20417.5 - 5.0.0-rc.1.20417.5 + 6.0.0-alpha.1.20417.8 + 6.0.0-alpha.1.20417.8 + 6.0.0-alpha.1.20417.8 + 6.0.0-alpha.1.20417.8 + 6.0.0-alpha.1.20417.8 + 6.0.0-alpha.1.20417.8 + 6.0.0-alpha.1.20417.8 - + https://github.com/dotnet/runtime - 0862d48a9c9fbda879206b194a16d8e607deac42 + 907f7da59b40c80941b02ac2a46650adf3f606bc - + https://github.com/dotnet/runtime - 0862d48a9c9fbda879206b194a16d8e607deac42 + 907f7da59b40c80941b02ac2a46650adf3f606bc - + https://github.com/dotnet/runtime - 0862d48a9c9fbda879206b194a16d8e607deac42 + 907f7da59b40c80941b02ac2a46650adf3f606bc - + https://github.com/dotnet/runtime - 0862d48a9c9fbda879206b194a16d8e607deac42 + 907f7da59b40c80941b02ac2a46650adf3f606bc - + https://github.com/dotnet/runtime - 0862d48a9c9fbda879206b194a16d8e607deac42 + 907f7da59b40c80941b02ac2a46650adf3f606bc - + https://github.com/dotnet/runtime - 0862d48a9c9fbda879206b194a16d8e607deac42 + 907f7da59b40c80941b02ac2a46650adf3f606bc - + https://github.com/dotnet/runtime - 0862d48a9c9fbda879206b194a16d8e607deac42 + 907f7da59b40c80941b02ac2a46650adf3f606bc - + https://github.com/dotnet/runtime - 0862d48a9c9fbda879206b194a16d8e607deac42 + 907f7da59b40c80941b02ac2a46650adf3f606bc - + https://github.com/dotnet/runtime - 0862d48a9c9fbda879206b194a16d8e607deac42 + 907f7da59b40c80941b02ac2a46650adf3f606bc - + https://github.com/dotnet/runtime - 0862d48a9c9fbda879206b194a16d8e607deac42 + 907f7da59b40c80941b02ac2a46650adf3f606bc - + https://github.com/dotnet/runtime - 0862d48a9c9fbda879206b194a16d8e607deac42 + 907f7da59b40c80941b02ac2a46650adf3f606bc - + https://github.com/dotnet/runtime - 0862d48a9c9fbda879206b194a16d8e607deac42 + 907f7da59b40c80941b02ac2a46650adf3f606bc - + https://github.com/dotnet/runtime - 0862d48a9c9fbda879206b194a16d8e607deac42 + 907f7da59b40c80941b02ac2a46650adf3f606bc - + https://github.com/dotnet/runtime - 0862d48a9c9fbda879206b194a16d8e607deac42 + 907f7da59b40c80941b02ac2a46650adf3f606bc - + https://github.com/dotnet/runtime - 0862d48a9c9fbda879206b194a16d8e607deac42 + 907f7da59b40c80941b02ac2a46650adf3f606bc - + https://github.com/dotnet/runtime - 0862d48a9c9fbda879206b194a16d8e607deac42 + 907f7da59b40c80941b02ac2a46650adf3f606bc https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index eca78eb6329c..e19722253c94 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,72 +64,72 @@ 3.8.0-2.20407.3 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 - 5.0.0-rc.1.20416.7 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20417.14 - 5.0.0-rc.1.20416.7 + 5.0.0-rc.1.20417.14 3.2.0 From 411e7bef75a766e390ab0df51b8b0f07527f2894 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 18 Aug 2020 08:57:47 -0700 Subject: [PATCH 11/22] Sync shared code from runtime (#24996) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- src/Shared/runtime/Quic/Implementations/Mock/MockConnection.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Shared/runtime/Quic/Implementations/Mock/MockConnection.cs b/src/Shared/runtime/Quic/Implementations/Mock/MockConnection.cs index cba2f936ef8d..b97f4876bfa7 100644 --- a/src/Shared/runtime/Quic/Implementations/Mock/MockConnection.cs +++ b/src/Shared/runtime/Quic/Implementations/Mock/MockConnection.cs @@ -74,7 +74,7 @@ internal override async ValueTask ConnectAsync(CancellationToken cancellationTok } Socket socket = new Socket(_remoteEndPoint!.AddressFamily, SocketType.Stream, ProtocolType.Tcp); - await socket.ConnectAsync(_remoteEndPoint).ConfigureAwait(false); + await socket.ConnectAsync(_remoteEndPoint, cancellationToken).ConfigureAwait(false); socket.NoDelay = true; _localEndPoint = (IPEndPoint?)socket.LocalEndPoint; From c2bc6406dc57e325339d2da9757ea42fed926dd4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 18 Aug 2020 18:45:44 +0000 Subject: [PATCH 12/22] Update dependencies from https://github.com/dotnet/arcade build 20200817.6 (#25005) [master] Update dependencies from dotnet/arcade - Updates: - Microsoft.DotNet.Arcade.Sdk: from 5.0.0-beta.20411.8 to 5.0.0-beta.20417.6 - Microsoft.DotNet.Helix.Sdk: from 5.0.0-beta.20411.8 to 5.0.0-beta.20417.6 --- eng/Version.Details.xml | 8 +++--- eng/common/cross/toolchain.cmake | 4 ++- .../templates/post-build/post-build.yml | 26 +++++++++---------- global.json | 4 +-- 4 files changed, 22 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c914e484b726..ccaeca714720 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -305,13 +305,13 @@ https://github.com/dotnet/runtime 907f7da59b40c80941b02ac2a46650adf3f606bc - + https://github.com/dotnet/arcade - ecec08a0eebbd92bb9538e351d475582551d9092 + 83fda4b3f6d93e713749fd1b27c4a6d40b118b13 - + https://github.com/dotnet/arcade - ecec08a0eebbd92bb9538e351d475582551d9092 + 83fda4b3f6d93e713749fd1b27c4a6d40b118b13 https://github.com/dotnet/roslyn diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 2566707997b0..137736c0a272 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -19,7 +19,9 @@ if(TARGET_ARCH_NAME STREQUAL "armel") endif() elseif(TARGET_ARCH_NAME STREQUAL "arm") set(CMAKE_SYSTEM_PROCESSOR armv7l) - if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv6-alpine-linux-musleabihf) + if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv7-alpine-linux-musleabihf) + set(TOOLCHAIN "armv7-alpine-linux-musleabihf") + elseif(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv6-alpine-linux-musleabihf) set(TOOLCHAIN "armv6-alpine-linux-musleabihf") else() set(TOOLCHAIN "arm-linux-gnueabihf") diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 0e79a546b553..e814d5e0334a 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -39,6 +39,7 @@ parameters: NetEngLatestChannelId: 2 NetEngValidationChannelId: 9 NetDev5ChannelId: 131 + NetDev6ChannelId: 1296 GeneralTestingChannelId: 529 NETCoreToolingDevChannelId: 548 NETCoreToolingReleaseChannelId: 549 @@ -46,7 +47,6 @@ parameters: NETCoreExperimentalChannelId: 562 NetEngServicesIntChannelId: 678 NetEngServicesProdChannelId: 679 - Net5Preview7ChannelId: 1065 Net5Preview8ChannelId: 1155 Net5RC1ChannelId: 1157 NetCoreSDK313xxChannelId: 759 @@ -115,7 +115,7 @@ stages: inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1 arguments: -PromoteToChannels "$(TargetChannels)" - -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview7ChannelId}},${{parameters.Net5Preview8ChannelId}},${{parameters.Net5RC1ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}} + -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.NetDev6ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview8ChannelId}},${{parameters.Net5RC1ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}} - job: displayName: NuGet Validation @@ -276,13 +276,13 @@ stages: dependsOn: ${{ parameters.publishDependsOn }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'Net5_Preview7_Publish' - channelName: '.NET 5 Preview 7' - akaMSChannelName: 'net5/preview7' - channelId: ${{ parameters.Net5Preview7ChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' + stageName: 'NetCore_Dev6_Publish' + channelName: '.NET 6 Dev' + akaMSChannelName: 'net6/dev' + channelId: ${{ parameters.NetDev6ChannelId }} + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-symbols/nuget/v3/index.json' - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml parameters: @@ -298,7 +298,7 @@ stages: shippingFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-symbols/nuget/v3/index.json' - - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} dependsOn: ${{ parameters.publishDependsOn }} @@ -308,9 +308,9 @@ stages: channelName: '.NET 5 RC 1' akaMSChannelName: 'net5/rc1' channelId: ${{ parameters.Net5RC1ChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-symbols/nuget/v3/index.json' + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: diff --git a/global.json b/global.json index d810659eaf81..89bda8ddbdd0 100644 --- a/global.json +++ b/global.json @@ -30,7 +30,7 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.15.2", - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20411.8", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20411.8" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20417.6", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20417.6" } } From a4eca3b4aa5e7d2782fbb76ca183ede57ba823c8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 18 Aug 2020 19:19:50 +0000 Subject: [PATCH 13/22] Update dependencies from https://github.com/dotnet/efcore build 20200818.5 (#25007) [release/3.1] Update dependencies from dotnet/efcore - Coherency Updates: - Microsoft.AspNetCore.Analyzer.Testing: from 3.1.8-servicing.20415.5 to 3.1.8-servicing.20418.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.BenchmarkRunner.Sources: from 3.1.8-servicing.20415.5 to 3.1.8-servicing.20418.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ActivatorUtilities.Sources: from 3.1.8-servicing.20415.5 to 3.1.8-servicing.20418.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Memory: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.SqlServer: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.StackExchangeRedis: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.CommandLineUtils.Sources: from 3.1.8-servicing.20415.5 to 3.1.8-servicing.20418.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.AzureKeyVault: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Binder: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.CommandLine: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.EnvironmentVariables: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.FileExtensions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Ini: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Json: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.KeyPerFile: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.UserSecrets: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Xml: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DiagnosticAdapter: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Composite: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Embedded: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Physical: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileSystemGlobbing: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HashCodeCombiner.Sources: from 3.1.8-servicing.20415.5 to 3.1.8-servicing.20418.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HostFactoryResolver.Sources: from 3.1.8-servicing.20415.5 to 3.1.8-servicing.20418.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Http: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Abstractions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.AzureAppServices: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Configuration: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Console: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Debug: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventSource: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventLog: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.TraceSource: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Testing: from 3.1.8-servicing.20415.5 to 3.1.8-servicing.20418.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ObjectPool: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.ConfigurationExtensions: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.DataAnnotations: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ParameterDefaultValue.Sources: from 3.1.8-servicing.20415.5 to 3.1.8-servicing.20418.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Primitives: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.TypeNameHelper.Sources: from 3.1.8-servicing.20415.5 to 3.1.8-servicing.20418.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ValueStopwatch.Sources: from 3.1.8-servicing.20415.5 to 3.1.8-servicing.20418.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.WebEncoders: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.JSInterop: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging: from 3.1.8 to 3.1.8 (parent: Microsoft.EntityFrameworkCore) - Internal.AspNetCore.Analyzers: from 3.1.8-servicing.20415.5 to 3.1.8-servicing.20418.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.Testing: from 3.1.8-servicing.20415.5 to 3.1.8-servicing.20418.2 (parent: Microsoft.EntityFrameworkCore) - Updates: - Microsoft.EntityFrameworkCore.Tools: from 3.1.8 to 3.1.8 - Microsoft.EntityFrameworkCore.InMemory: from 3.1.8 to 3.1.8 - Microsoft.EntityFrameworkCore: from 3.1.8 to 3.1.8 - Microsoft.EntityFrameworkCore.Sqlite: from 3.1.8 to 3.1.8 - Microsoft.EntityFrameworkCore.SqlServer: from 3.1.8 to 3.1.8 - Microsoft.EntityFrameworkCore.Relational: from 3.1.8 to 3.1.8 - dotnet-ef: from 3.1.8 to 3.1.8 - Microsoft.AspNetCore.Analyzer.Testing: from 3.1.8-servicing.20415.5 to 3.1.8-servicing.20418.2 - Microsoft.AspNetCore.BenchmarkRunner.Sources: from 3.1.8-servicing.20415.5 to 3.1.8-servicing.20418.2 - Microsoft.Extensions.ActivatorUtilities.Sources: from 3.1.8-servicing.20415.5 to 3.1.8-servicing.20418.2 - Microsoft.Extensions.Caching.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Caching.Memory: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Caching.SqlServer: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Caching.StackExchangeRedis: from 3.1.8 to 3.1.8 - Microsoft.Extensions.CommandLineUtils.Sources: from 3.1.8-servicing.20415.5 to 3.1.8-servicing.20418.2 - Microsoft.Extensions.Configuration.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.AzureKeyVault: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.Binder: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.CommandLine: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.EnvironmentVariables: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.FileExtensions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.Ini: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.Json: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.KeyPerFile: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.UserSecrets: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration.Xml: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Configuration: from 3.1.8 to 3.1.8 - Microsoft.Extensions.DependencyInjection.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.DependencyInjection: from 3.1.8 to 3.1.8 - Microsoft.Extensions.DiagnosticAdapter: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Diagnostics.HealthChecks: from 3.1.8 to 3.1.8 - Microsoft.Extensions.FileProviders.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.FileProviders.Composite: from 3.1.8 to 3.1.8 - Microsoft.Extensions.FileProviders.Embedded: from 3.1.8 to 3.1.8 - Microsoft.Extensions.FileProviders.Physical: from 3.1.8 to 3.1.8 - Microsoft.Extensions.FileSystemGlobbing: from 3.1.8 to 3.1.8 - Microsoft.Extensions.HashCodeCombiner.Sources: from 3.1.8-servicing.20415.5 to 3.1.8-servicing.20418.2 - Microsoft.Extensions.Hosting.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Hosting: from 3.1.8 to 3.1.8 - Microsoft.Extensions.HostFactoryResolver.Sources: from 3.1.8-servicing.20415.5 to 3.1.8-servicing.20418.2 - Microsoft.Extensions.Http: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Localization.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Localization: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.Abstractions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.AzureAppServices: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.Configuration: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.Console: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.Debug: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.EventSource: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.EventLog: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.TraceSource: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging.Testing: from 3.1.8-servicing.20415.5 to 3.1.8-servicing.20418.2 - Microsoft.Extensions.ObjectPool: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Options.ConfigurationExtensions: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Options.DataAnnotations: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Options: from 3.1.8 to 3.1.8 - Microsoft.Extensions.ParameterDefaultValue.Sources: from 3.1.8-servicing.20415.5 to 3.1.8-servicing.20418.2 - Microsoft.Extensions.Primitives: from 3.1.8 to 3.1.8 - Microsoft.Extensions.TypeNameHelper.Sources: from 3.1.8-servicing.20415.5 to 3.1.8-servicing.20418.2 - Microsoft.Extensions.ValueStopwatch.Sources: from 3.1.8-servicing.20415.5 to 3.1.8-servicing.20418.2 - Microsoft.Extensions.WebEncoders: from 3.1.8 to 3.1.8 - Microsoft.JSInterop: from 3.1.8 to 3.1.8 - Microsoft.Extensions.Logging: from 3.1.8 to 3.1.8 - Internal.AspNetCore.Analyzers: from 3.1.8-servicing.20415.5 to 3.1.8-servicing.20418.2 - Microsoft.AspNetCore.Testing: from 3.1.8-servicing.20415.5 to 3.1.8-servicing.20418.2 --- NuGet.config | 4 +- eng/Version.Details.xml | 156 ++++++++++++++++++++-------------------- eng/Versions.props | 24 +++---- 3 files changed, 92 insertions(+), 92 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5f61b5c3b229..35ceae3e7d0a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,8 +3,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7cbd6fa36bfd..2aa6866fe081 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,259 +35,259 @@ https://github.com/dotnet/efcore - f6ec5bbb971a5faeb8251e21ed352a8b03a2952c + 0bfdd04e8931d98f7887943c4b93397b618fe854 https://github.com/dotnet/efcore - f6ec5bbb971a5faeb8251e21ed352a8b03a2952c + 0bfdd04e8931d98f7887943c4b93397b618fe854 https://github.com/dotnet/efcore - f6ec5bbb971a5faeb8251e21ed352a8b03a2952c + 0bfdd04e8931d98f7887943c4b93397b618fe854 https://github.com/dotnet/efcore - f6ec5bbb971a5faeb8251e21ed352a8b03a2952c + 0bfdd04e8931d98f7887943c4b93397b618fe854 https://github.com/dotnet/efcore - f6ec5bbb971a5faeb8251e21ed352a8b03a2952c + 0bfdd04e8931d98f7887943c4b93397b618fe854 https://github.com/dotnet/efcore - f6ec5bbb971a5faeb8251e21ed352a8b03a2952c + 0bfdd04e8931d98f7887943c4b93397b618fe854 https://github.com/dotnet/efcore - f6ec5bbb971a5faeb8251e21ed352a8b03a2952c + 0bfdd04e8931d98f7887943c4b93397b618fe854 - + https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f - + https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f - + https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f - + https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f - + https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f - + https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f - + https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f - + https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f - + https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f - + https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://dev.azure.com/dnceng/internal/_git/dotnet-corefx @@ -414,9 +414,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-corefx 36b8b8e26a8e2e06e000f59e19910d117bf0025b - + https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/arcade @@ -430,9 +430,9 @@ https://github.com/dotnet/arcade 1a55276ab9d16792cec595ba870df39a9d97d5ca - + https://github.com/dotnet/extensions - e5aad5e60d9bdfb450592be19d3706716bcaea0d + a74155578bf2f1e27bc06b363a7225981fcce52f https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 8d1cebdb06e6..010c9da7cb69 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -102,16 +102,16 @@ 3.2.0 - 3.1.8-servicing.20415.5 - 3.1.8-servicing.20415.5 - 3.1.8-servicing.20415.5 - 3.1.8-servicing.20415.5 - 3.1.8-servicing.20415.5 + 3.1.8-servicing.20418.2 + 3.1.8-servicing.20418.2 + 3.1.8-servicing.20418.2 + 3.1.8-servicing.20418.2 + 3.1.8-servicing.20418.2 3.1.8 3.1.8 3.1.8 3.1.8 - 3.1.8-servicing.20415.5 + 3.1.8-servicing.20418.2 3.1.8 3.1.8 3.1.8 @@ -134,10 +134,10 @@ 3.1.8 3.1.8 3.1.8 - 3.1.8-servicing.20415.5 + 3.1.8-servicing.20418.2 3.1.8 3.1.8 - 3.1.8-servicing.20415.5 + 3.1.8-servicing.20418.2 3.1.8 3.1.8 3.1.8 @@ -149,16 +149,16 @@ 3.1.8 3.1.8 3.1.8 - 3.1.8-servicing.20415.5 + 3.1.8-servicing.20418.2 3.1.8 3.1.8 3.1.8 3.1.8 3.1.8 - 3.1.8-servicing.20415.5 + 3.1.8-servicing.20418.2 3.1.8 - 3.1.8-servicing.20415.5 - 3.1.8-servicing.20415.5 + 3.1.8-servicing.20418.2 + 3.1.8-servicing.20418.2 3.1.8 3.1.0-rtm.19565.4 3.1.8 From 2ca239d5e4f1e6f7352fdb6ff8a762801dcf7f22 Mon Sep 17 00:00:00 2001 From: Aristarkh Zagorodnikov Date: Tue, 18 Aug 2020 22:39:45 +0300 Subject: [PATCH 14/22] Implement support for multiple sockets for systemd activation (#24118) --- .../KestrelServerOptionsSystemdExtensions.cs | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/Servers/Kestrel/Core/src/Systemd/KestrelServerOptionsSystemdExtensions.cs b/src/Servers/Kestrel/Core/src/Systemd/KestrelServerOptionsSystemdExtensions.cs index 6def39159de2..bf8f0fe69437 100644 --- a/src/Servers/Kestrel/Core/src/Systemd/KestrelServerOptionsSystemdExtensions.cs +++ b/src/Servers/Kestrel/Core/src/Systemd/KestrelServerOptionsSystemdExtensions.cs @@ -11,11 +11,12 @@ namespace Microsoft.AspNetCore.Hosting public static class KestrelServerOptionsSystemdExtensions { // SD_LISTEN_FDS_START https://www.freedesktop.org/software/systemd/man/sd_listen_fds.html - private const ulong SdListenFdsStart = 3; + private const int SdListenFdsStart = 3; private const string ListenPidEnvVar = "LISTEN_PID"; + private const string ListenFdsEnvVar = "LISTEN_FDS"; /// - /// Open file descriptor (SD_LISTEN_FDS_START) initialized by systemd socket-based activation logic if available. + /// Open file descriptors (starting from SD_LISTEN_FDS_START) initialized by systemd socket-based activation logic if available. /// /// /// The . @@ -26,7 +27,7 @@ public static KestrelServerOptions UseSystemd(this KestrelServerOptions options) } /// - /// Open file descriptor (SD_LISTEN_FDS_START) initialized by systemd socket-based activation logic if available. + /// Open file descriptors (starting from SD_LISTEN_FDS_START) initialized by systemd socket-based activation logic if available. /// Specify callback to configure endpoint-specific settings. /// /// @@ -36,7 +37,16 @@ public static KestrelServerOptions UseSystemd(this KestrelServerOptions options, { if (string.Equals(Process.GetCurrentProcess().Id.ToString(CultureInfo.InvariantCulture), Environment.GetEnvironmentVariable(ListenPidEnvVar), StringComparison.Ordinal)) { - options.ListenHandle(SdListenFdsStart, configure); + // This matches sd_listen_fds behavior that requires %LISTEN_FDS% to be present and in range [1;INT_MAX-SD_LISTEN_FDS_START] + if (int.TryParse(Environment.GetEnvironmentVariable(ListenFdsEnvVar), NumberStyles.None, NumberFormatInfo.InvariantInfo, out var listenFds) + && listenFds > 0 + && listenFds <= int.MaxValue - SdListenFdsStart) + { + for (var handle = SdListenFdsStart; handle < SdListenFdsStart + listenFds; ++handle) + { + options.ListenHandle((ulong)handle, configure); + } + } } return options; From ffdec02b9258f18b53ef7c9376a3e7f366b1e5d0 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 18 Aug 2020 16:05:01 -0700 Subject: [PATCH 15/22] [release/3.1] Unpin System.IO.Pipelines and System.Runtime.CompilerServices.Unsafe versions (#25014) - see #24937 - add CPD for Microsoft.Internal.Extensions.Refs - move System.IO.Pipelines version to latest Co-authored-by: William Godbe --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2aa6866fe081..20953966e263 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,7 +13,7 @@ https://github.com/dotnet/blazor cc449601d638ffaab58ae9487f0fd010bb178a12 - + https://github.com/dotnet/corefx 66409e392d64ed96e5d3a5fda712d9baf51196ed @@ -317,9 +317,9 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - + https://github.com/dotnet/corefx - 8a3ffed558ddf943c1efa87d693227722d6af094 + 059a4a19e602494bfbed473dbbb18f2dbfbd0878 https://github.com/dotnet/corefx @@ -333,7 +333,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-corefx 059a4a19e602494bfbed473dbbb18f2dbfbd0878 - + https://github.com/dotnet/corefx 8a3ffed558ddf943c1efa87d693227722d6af094 @@ -381,8 +381,8 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup 3acd9b0cd16596bad450c82be08780875a73c05c - - + + https://github.com/dotnet/Extensions 3acd9b0cd16596bad450c82be08780875a73c05c diff --git a/eng/Versions.props b/eng/Versions.props index 010c9da7cb69..27f5099d0add 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,7 +81,7 @@ 4.7.0 4.7.0 4.7.0 - 4.7.1 + 4.7.2 4.7.0 4.7.1 1.8.1 From 4995bbf109d8c16faa6cc3dd8e8104f7b5f72008 Mon Sep 17 00:00:00 2001 From: Ajay Bhargav B Date: Tue, 18 Aug 2020 20:10:55 -0700 Subject: [PATCH 16/22] Use '~' to represent non-HTML characters in HTML projected document (#25027) --- ...iveWithViewImports_DesignTime.codegen.html | 2 +- .../BasicComponent_DesignTime.codegen.html | 12 +- .../Basic_DesignTime.codegen.html | 12 +- ...completeDirectives_DesignTime.codegen.html | 22 +-- .../InheritsViewModel_DesignTime.codegen.html | 4 +- ...itsWithViewImports_DesignTime.codegen.html | 4 +- .../InjectWithModel_DesignTime.codegen.html | 6 +- ...njectWithSemicolon_DesignTime.codegen.html | 10 +- .../Inject_DesignTime.codegen.html | 2 +- ...alidNamespaceAtEOF_DesignTime.codegen.html | 2 +- ...ormedPageDirective_DesignTime.codegen.html | 2 +- ...xpressionTagHelper_DesignTime.codegen.html | 8 +- .../Model_DesignTime.codegen.html | 2 +- .../MultipleModels_DesignTime.codegen.html | 4 +- .../PageWithNamespace_DesignTime.codegen.html | 4 +- ...adingPageDirective_DesignTime.codegen.html | 2 +- ...sWithRouteTemplate_DesignTime.codegen.html | 20 +-- ...rPagesWithoutModel_DesignTime.codegen.html | 32 ++-- .../RazorPages_DesignTime.codegen.html | 40 ++--- .../Sections_DesignTime.codegen.html | 16 +- .../UsingDirectives_DesignTime.codegen.html | 8 +- ...ComponentTagHelper_DesignTime.codegen.html | 10 +- .../ViewWithNamespace_DesignTime.codegen.html | 2 +- .../_ViewImports_DesignTime.codegen.html | 2 +- .../src/RazorHtmlWriter.cs | 6 +- ...TagHelperDirective_DesignTime.codegen.html | 2 +- ...AttributeDirective_DesignTime.codegen.html | 8 +- .../Await_DesignTime.codegen.html | 36 ++-- .../Blocks_DesignTime.codegen.html | 50 +++--- .../CSharp7_DesignTime.codegen.html | 64 +++---- .../CSharp8_DesignTime.codegen.html | 104 +++++------ .../CodeBlockAtEOF_DesignTime.codegen.html | 2 +- ...ockWithTextElement_DesignTime.codegen.html | 8 +- .../CodeBlock_DesignTime.codegen.html | 10 +- ...ditionalAttributes_DesignTime.codegen.html | 24 +-- .../DesignTime_DesignTime.codegen.html | 16 +- .../EmptyCodeBlock_DesignTime.codegen.html | 2 +- ...ExplicitExpression_DesignTime.codegen.html | 2 +- ...itExpressionInCode_DesignTime.codegen.html | 6 +- ...ImplicitExpression_DesignTime.codegen.html | 2 +- ...citExpressionAtEOF_DesignTime.codegen.html | 2 +- ...pressionWithMarkup_DesignTime.codegen.html | 2 +- ...ExplicitExpression_DesignTime.codegen.html | 2 +- .../ExpressionsInCode_DesignTime.codegen.html | 22 +-- ...ctionsBlockMinimal_DesignTime.codegen.html | 10 +- .../FunctionsBlock_DesignTime.codegen.html | 18 +- .../HiddenSpansInCode_DesignTime.codegen.html | 6 +- .../Implements_DesignTime.codegen.html | 8 +- ...citExpressionAtEOF_DesignTime.codegen.html | 2 +- ...ImplicitExpression_DesignTime.codegen.html | 6 +- ...completeDirectives_DesignTime.codegen.html | 36 ++-- .../Inherits_DesignTime.codegen.html | 4 +- .../InlineBlocks_DesignTime.codegen.html | 4 +- .../Instrumented_DesignTime.codegen.html | 52 +++--- .../MarkupInCodeBlock_DesignTime.codegen.html | 10 +- ...arkup_InCodeBlocks_DesignTime.codegen.html | 72 ++++---- .../NestedCSharp_DesignTime.codegen.html | 12 +- .../NestedCodeBlocks_DesignTime.codegen.html | 8 +- .../NoLinePragmas_DesignTime.codegen.html | 52 +++--- ...itionalExpressions_DesignTime.codegen.html | 20 +-- .../OpenedIf_DesignTime.codegen.html | 2 +- .../ParserError_DesignTime.codegen.html | 10 +- .../RazorComments_DesignTime.codegen.html | 26 +-- ...TagHelperDirective_DesignTime.codegen.html | 2 +- .../Sections_DesignTime.codegen.html | 22 +-- .../SimpleUnspacedIf_DesignTime.codegen.html | 6 +- ...trolFlowStatements_DesignTime.codegen.html | 162 +++++++++--------- .../StringLiterals_DesignTime.codegen.html | 8 +- .../Tags_DesignTime.codegen.html | 6 +- .../Templates_DesignTime.codegen.html | 68 ++++---- ...edExpressionInCode_DesignTime.codegen.html | 6 +- .../Usings_DesignTime.codegen.html | 24 +-- 72 files changed, 630 insertions(+), 630 deletions(-) diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_DesignTime.codegen.html index e2017f6ce6f8..672af16a9f7d 100644 --- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_DesignTime.codegen.html @@ -1 +1 @@ - \ No newline at end of file +~~~~~~~~~~ ~~~~~~~~~~~~~~ \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.html index e7b0219a389d..212a52af7b23 100644 --- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.html @@ -1,9 +1,9 @@ - -
+~~~~~~~~~~~ ~~~~~~~~~~~ +
Hello world - + ~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~
- - - +~~~~~~~~~~ ~ + ~~~~ ~~~~~~~~~~~~~~~~~~~~~~ ~ +~ diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.html index 08d042e89793..1d05c8edd11c 100644 --- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.html @@ -1,8 +1,8 @@ -
+
Hello world - + ~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~
- - - -

+~~ + ~~~ ~~~ ~ ~~~~~~ +~ +

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.html index 85fabc0abd8a..41bd21fb73e0 100644 --- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.html @@ -1,15 +1,15 @@ - +~~ ~~~~~ ~~~~ ~~~~~ ~~~~~~~~ ~~~~ ~~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~ ~~~~~~ ~~ - - - " +~~~~~ +~~~~~ +~~~~~ " - - +~~~~~~ +~~~~~~ - - - +~~~~~~~ +~~~~~~~ +~~~~~~~ ~~~~~~~~~~~~~~~~~ - - +~~~~~~~~~~ +~~~~~~~~~~ diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.html index 6adf1586e10f..7c8f96178083 100644 --- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.html @@ -1,2 +1,2 @@ - - +~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~ ~~~~~~~ diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.html index b1214751a93b..cc39225641f6 100644 --- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.html @@ -1,2 +1,2 @@ - - +~~~~~ +~~~~~~ ~~~~~~~ diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.html index b05e435fdae9..b9ccc4dd9435 100644 --- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.html @@ -1,3 +1,3 @@ - - - +~~~~~~ ~~~~~~~ +~~~~~~~ ~~~~~ ~~~~~~~~~~~~~~ +~~~~~~~ ~~~~~~~~~~~~~~~~~ ~~~~ diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.html index 0c20f0ce0ce5..6b3f658f9627 100644 --- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.html @@ -1,5 +1,5 @@ - - - - - +~~~~~~ ~~~~~~~ +~~~~~~~ ~~~~~ ~~~~~~~~~~~~~~~ +~~~~~~~ ~~~~~~~~~~~~~~~~~ ~~~~~ +~~~~~~~ ~~~~~ ~~~~~~~~~~~~~~~ ~ +~~~~~~~ ~~~~~~~~~~~~~~~~~ ~~~~~ ~ diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.html index 8a218bdd8dad..579717aaec4e 100644 --- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.html @@ -1 +1 @@ - +~~~~~~~ ~~~~~ ~~~~~~~~~~~~~~ diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.html index c72931e132ba..8a36a67848ae 100644 --- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.html @@ -1 +1 @@ - Test. \ No newline at end of file +~~~~~~~~~~ Test. \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.codegen.html index 9645bac584dd..ef573d0f478c 100644 --- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.codegen.html @@ -1,4 +1,4 @@ - "foo +~~~~~ "foo

About Us

We are awesome.

\ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.html index 4649d9d2d64b..0109819d0a0f 100644 --- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.html @@ -1,6 +1,6 @@ - +~~~~~~ ~~~~~~~~ - +~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~ - - + + diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.html index 1638a82fb44c..9eb7434ef14a 100644 --- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.html @@ -1 +1 @@ - +~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.html index 4a2f4743cfc7..338f2c39940e 100644 --- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.html @@ -1,2 +1,2 @@ - - +~~~~~~ ~~~~~~~~~~~~~~~~~~~~~ +~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.html index 6742b0a9e33d..f3527d34b88c 100644 --- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.html @@ -1,3 +1,3 @@ - - +~~~~~ +~~~~~~~~~~ ~~~~~~~~~~~~~~

Hi There!

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.codegen.html index 8f9ba3e6233b..e1debaeb457f 100644 --- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.codegen.html @@ -1,2 +1,2 @@
Some text here.
- +~~~~~ diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.html index dbfd76ba01f2..6ea17442f79b 100644 --- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.html @@ -1,13 +1,13 @@ - +~~~~~ ~~~~~~~~ - - +~~~~~~ ~~~~~~~~ +~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - - - - - +~~~~~~~~~~ ~ + ~~~~~~ ~~~~~ ~~~~~~~~ ~ ~~~~~~~~~ + ~ + ~~~~~~ ~~~~~~ ~~~~ ~ ~~~~ ~~~~ ~ + ~ +~ -

New Customer

+

New Customer ~~~~~~~~~~~

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.html index ae827b127094..1788ff55ca6f 100644 --- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.html @@ -1,28 +1,28 @@ - +~~~~~ - - +~~~~~~~~~~~~~ ~~~ ~~~~~~~~ +~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - - - - - +~~~~~~~~~~ ~ + ~~~~~~ ~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~ ~~~~~~~~~ + ~ + ~~~~ ~ ~~~~~~~~~~~~~~ + ~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ - + ~~~~~~ ~~~~~~ ~~~~ ~ ~~~~ ~~~~ ~ - - - - - + ~~~~~~ ~~~~~ ~~~~~~~~ + ~ + ~~~~~~ ~~~~~~ ~~~~ ~ ~~~~ ~~~~ ~ + ~ +~

New Customer

- +
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.html index dc0c2ec4e1b7..3bc18cff89a6 100644 --- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.html @@ -1,32 +1,32 @@ - +~~~~~ - - - +~~~~~~ ~~~~~~~~ +~~~~~~~~~~~~~ ~~~ ~~~~~~~~ +~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - - - - - - - +~~~~~~~~~~ ~ + ~~~~~~ ~~~~~ ~~~~~~~~ ~ ~~~~~~~~~ + ~ + ~~~~~~ ~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~ ~~~~~~~~~ + ~ + ~~~~ ~ ~~~~~~~~~~~~~~ + ~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ - - + ~~~~~~ ~~~~~~ ~~~~ ~ ~~~~ ~~~~ ~ + ~ - - - - - + ~~~~~~ ~~~~~ ~~~~~~~~ + ~ + ~~~~~~ ~~~~~~ ~~~~ ~ ~~~~ ~~~~ ~ + ~ +~

New Customer

- +
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.html index 849f18b01572..1dc5378382f5 100644 --- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.html @@ -1,14 +1,14 @@ - +~~~~~~ ~~~~~~~~ - +~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~ - - - +~~ + ~~~~~~ ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~
Some body
- +~~~~~~~~ ~~~~~~~~ ~
This is in Section 1
- - \ No newline at end of file + +~ \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.codegen.html index 52fe51a13096..38bab0bda99b 100644 --- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.codegen.html @@ -1,4 +1,4 @@ - - - - \ No newline at end of file +~~~~~~ ~~~~~~~~~~~~~~~~~~~~~ +~~~~~~ ~~~~~~~~~~~~~~~~~~ +~~~~~~ ~~~~~~ +~~~~~~ ~~~~~~ \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.html index 5b456be824f8..e3c647d97a4f 100644 --- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.html @@ -1,6 +1,6 @@ - - - - +~~~~~~~~~~~~~ ~~~ ~~~~~~~~ +~~ + ~~~ ~~~ ~ ~~~~~~~~ +~ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.html index 835b3a68caea..30c2f53307d5 100644 --- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.html @@ -1,2 +1,2 @@ - +~~~~~~~~~~ ~~~~~~~~~~~~~~

Hi There!

diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.html index 262e601e9cc7..f53681d3d2e4 100644 --- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.html @@ -1 +1 @@ - \ No newline at end of file +~~~~~~~ ~~~~~~~~~~~~~~~~~~~ ~~~~~~ \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorHtmlWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorHtmlWriter.cs index 6d29531efb9f..d8c06a379dcf 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorHtmlWriter.cs +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorHtmlWriter.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; @@ -141,7 +141,7 @@ private void WriteToken(SyntaxToken token) return; } - // We're in non-HTML context. Let's replace all non-whitespace chars with a space. + // We're in non-HTML context. Let's replace all non-whitespace chars with a tilde(~). foreach (var c in content) { if (char.IsWhiteSpace(c)) @@ -150,7 +150,7 @@ private void WriteToken(SyntaxToken token) } else { - Builder.Append(' '); + Builder.Append('~'); } } } diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.codegen.html index 0da46f2152d1..9798fda642fa 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.codegen.html @@ -1 +1 @@ - +~~~~~~~~~~~~~ ~~~ ~~~~~~~~~~~~~ diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective_DesignTime.codegen.html index fd82d1980659..bc07a83107e3 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective_DesignTime.codegen.html @@ -1,6 +1,6 @@ - - - - +~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~ +~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~ Hello World \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.codegen.html index 22593ca1ef47..9206eae15e5b 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.codegen.html @@ -1,26 +1,26 @@ - - - - - - +~~~~~~~~~~ ~ + ~~~~~~ ~~~~~ ~~~~~~~~~~~~ ~~~~~ + ~ + ~~~~~~ ~~~~~~ + ~ +~

Basic Asynchronous Expression Test

-

Basic Asynchronous Expression:

-

Basic Asynchronous Template:

-

Basic Asynchronous Statement:

-

Basic Asynchronous Statement Nested:

-

Basic Incomplete Asynchronous Statement:

+

Basic Asynchronous Expression: ~~~~~~ ~~~~~

+

Basic Asynchronous Template: ~~~~~~~ ~~~~~~

+

Basic Asynchronous Statement: ~~ ~~~~~ ~~~~~~ ~

+

Basic Asynchronous Statement Nested: ~~ ~~~~~~ ~~~~~ ~

+

Basic Incomplete Asynchronous Statement: ~~~~~~

Advanced Asynchronous Expression Test

-

Advanced Asynchronous Expression:

-

Advanced Asynchronous Expression Extended:

-

Advanced Asynchronous Template:

-

Advanced Asynchronous Statement:

-

Advanced Asynchronous Statement Extended:

-

Advanced Asynchronous Statement Nested:

-

Advanced Incomplete Asynchronous Statement:

+

Advanced Asynchronous Expression: ~~~~~~ ~~~~~~ ~~

+

Advanced Asynchronous Expression Extended: ~~~~~~ ~~~~~~~~~~ ~~

+

Advanced Asynchronous Template: ~~~~~~~ ~~~~~~~~~~ ~~~~~~

+

Advanced Asynchronous Statement: ~~ ~~~~~ ~~~~~~~~~~~~~~ ~~~~~~ ~~~~~~~~~ ~

+

Advanced Asynchronous Statement Extended: ~~ ~~~~~ ~~~~~~~~~~ ~~ ~

+

Advanced Asynchronous Statement Nested: ~~ ~~~~~~ ~~~~~~~~~~~~~~ ~~~~~~ ~

+

Advanced Incomplete Asynchronous Statement: ~~~~~~ ~~~~~~~~~~~~~

\ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.codegen.html index dc08c79219d9..b36df6862afd 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.codegen.html @@ -1,37 +1,37 @@ - - - +~~ + ~~~ ~ ~ ~~ +~ - -

Hello from C#, #

- - +~~~~~~~~ ~~ ~~~ ~ +

Hello from C#, #~~~~

+ ~ ~~ ~~ +~ - +~~~~~ ~~ ~~~ ~

We wrote 10 lines!

- +~ - - +~~~~~~~~~~ ~ + ~~~~ ~~~

No really, we wrote 10 lines!

- - + ~~~~~~ + ~~~~~~~~

Actually, we didn't...

- - + ~~~~~~ +~ - -

Hello again from C#, #

- +~~~~~~~~ ~ ~ ~~ ~ ~~ ~~~ ~ ~~ ~~ ~ +

Hello again from C#, #~~~~

+~ - +~~~~ ~

That time, we wrote 5 lines!

- -

Oh no! An error occurred:

- +~ ~~~~~~~~~~~~~~~ ~~~ ~ +

Oh no! An error occurred: ~~~~~~~~~~~~~

+~ -

i is now

+

i is now ~~

- +~~~~~~~~~ ~~~~~~~~~ ~

This block is locked, for your security!

- \ No newline at end of file +~ \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.codegen.html index a2aad32abe93..d3e8f46d6bae 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.codegen.html @@ -1,43 +1,43 @@ - - - - - + ~~ + ~~~ ~~~~~~~~~~ ~ ~~~ ~~~~~~~~~~~~~~~~~~ ~~~~~~~ ~~~~~~~~~~ ~~~~~~ ~~~~~~~~~ ~~~~~~ ~~~~~~~~~ + ~ + ~~~~~~ ~~~~~ ~ ~~~~~~~~ ~~~~~~ ~~~~~ + ~~ - + ~~ ~~~~ ~~ ~~~ ~~ ~ ~~~~ ~~~~ ~~~~~~ ~~~~~ ~~ - - - - - + ~~~ ~~~~~~~ ~ ~~~~~~~~~~~~ + ~~~~ ~~~~~~~~~~~~~~~~~~~ ~ ~~~~~~~~~~~~~~~~ + ~~~~~~ ~~~~~~~~~~~~~~~~ ~ ~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~ ~~~~~~~~~~~ ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ - - - - - - - + ~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~ ~~~ ~~~ ~~~~~~~ + ~ + ~~ ~~~~~~~~~~~~ ~~ ~~~~ ~~~~~~ + ~ + ~~ ~~ ~~~~~~~~~ + ~ + ~

- Here's a very unique number: + Here's a very unique number: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

- + ~~~~~~~~~ ~~~~~~~ ~~~~~ ~~~~~~~~~~~~~ ~~ ~~~~~ ~~~~~~ ~~
- - - - - - - - - - - - + ~~~~~~~ ~~~~~~~~~~~~~ + ~ + ~~~~ ~~~ ~~~~ + ~~ ~~ ~~~~~~~~~ + ~~~~~~ + ~~~~ ~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~ + ~~ ~~ ~~~~ ~~~~~~~~~ + ~~~~~~ + ~~~~ ~~~~~ + ~~ ~~ ~~~~ ~~~~ ~~ ~~~~~~~~~ + ~~~~~~ + ~ \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.codegen.html index 2e0ee4dc6ebb..25245b195da1 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.codegen.html @@ -1,67 +1,67 @@ - +~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~ - - - - - +~~ + ~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~ + ~ + ~~~~~~ ~~~~~ + ~ - - + ~~~~~ ~~~~~~~ ~~~~ ~~~ ~~ ~~~~~~~~~~~~~~~~~~~~~ + ~ - + ~ - - + ~~~~~ ~~~~~ ~ ~~~~~ + ~~~~~ ~~~ ~~~~~~~~~~ ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - - - - - - + ~~~ ~~~~~ ~ ~~~~~~~~~~~~~~~~~~~~~~ + ~~~ ~~~~~~~~ ~ ~~~~~~~~~~ + ~~~~~~ ~~~~~~~~ ~~~~~~~~~ + ~ + ~~~~~~ ~~~~~~~~~~~~~~~ + ~ +~ - - +~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~ - - - - - - +~~~~~~~~~~ ~~~~~~ +~ + ~~~~~~~~~~~~~~ ~~ ~~~~ ~~~~~~~~ + ~~~~~~~~~~~~~~~ ~~ ~~~~ ~~~~~~~~~ + ~ ~~ ~~~~ ~~~~~~~~ +~~ - - - - +~~~~~~ ~~~~~~~ ~~~~ ~~~ ~~ ~~~~~~~~~~~~~~~~~~~~~ +~ + ~~~~ +~ - - - +~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~ - - - - - - +~~~~~~~~~~ ~ + ~~~~ ~~~~~~~~ + ~ + ~~~~~~ + ~~~~~~ + ~ - - - - - + ~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~ + ~ + ~~~ ~~~~~~~~~~~ ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~ + ~ - + ~~~~~~~ ~~~~~~ ~~~~~~ ~ ~~~~ ~~~~ ~ - + ~~~~~~~ ~~~~~~~~~ ~~~~~~ ~ ~~~~ ~~~~ ~ - + ~~~~~~~ ~~~~~~~~~~~ ~~~~~~~~ ~~~~~~~~~~~ ~ ~~~~ ~~~~ ~ - - - - - \ No newline at end of file + ~~~~~~~ ~~~~~ ~~~~~ + ~ + ~~~~~~ ~~~~~~~ ~~~~ ~ ~~~~ ~~~~ ~ + ~ +~ \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.codegen.html index 136d06384a4c..68db24f6303b 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.codegen.html @@ -1 +1 @@ - \ No newline at end of file +~~ \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.codegen.html index a6e01f1a0e64..738f635fb736 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.codegen.html @@ -1,4 +1,4 @@ - - foo - bar - +~~ + ~~~ ~ ~ ~~ foo + ~~~ ~ ~ ~~ bar ~~~~~~ +~ diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.codegen.html index f857199dcf16..9a924676bc4d 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.codegen.html @@ -1,5 +1,5 @@ - - - - - \ No newline at end of file +~~ + ~~~~~~~ ~ ~ ~~ ~ ~~ ~~~ ~~~~ ~ + ~~~~~~~~~~~~~~~~~~~~~~ ~~~~ ~~~ ~~ ~ ~~~~~~~~~~~~ ~ ~~~~~~~~ + ~ +~ \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.codegen.html index 46a4402680ba..6d16f3df2c5f 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.codegen.html @@ -1,15 +1,15 @@ - - - +~~ + ~~~ ~~ ~ ~~~~~ + ~~~ ~~~ ~ ~~~~~~ -

-

-

- - -

+

+

+

+ + +

- - + + - \ No newline at end of file +~ \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.codegen.html index be5ba4979a03..a8754ea813a0 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.codegen.html @@ -1,15 +1,15 @@

- -

Bar Biz

+~~~~~~~~~~~~~~~ +~~~~~~

Bar ~~~~ Biz

~

- +~~~~~~~~ ~~~~~~ ~

Foo

- - \ No newline at end of file + ~~~~ +~ \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.codegen.html index 9ebe0e3a7822..99a7f08ac047 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.codegen.html @@ -1,3 +1,3 @@ This is markup - \ No newline at end of file +~~~ \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.codegen.html index 9ebe0e3a7822..99a7f08ac047 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.codegen.html @@ -1,3 +1,3 @@ This is markup - \ No newline at end of file +~~~ \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.codegen.html index 1568f6aa34f3..0c15e1469835 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.codegen.html @@ -1,3 +1,3 @@ - - - \ No newline at end of file +~~ + ~ +~ \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.codegen.html index 76ee36910b47..758fb714e81e 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.codegen.html @@ -1,3 +1,3 @@ This is markup - ! \ No newline at end of file +~! \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.codegen.html index 6eaf3f7aa0bd..d166c19f55a0 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.codegen.html @@ -1,3 +1,3 @@ This is markup - \ No newline at end of file +~~ \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.codegen.html index fc593178498f..b410eec8a5e2 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.codegen.html @@ -1 +1 @@ -
\ No newline at end of file +
~~~
\ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.codegen.html index 33b749a2f937..152cef197aeb 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.codegen.html @@ -1 +1 @@ -1 + 1 = \ No newline at end of file +1 + 1 = ~~~~~~ \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.codegen.html index de86958addfc..557c25099c9c 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.codegen.html @@ -1,16 +1,16 @@ - - - - +~~ + ~~~~~~ ~~~ ~ ~~~~~ + ~~~~~~ ~~~ ~ ~~~~~~ +~ - - - +~~~~~~~ ~~ ~~~~~ ~ + ~~~~ +~ ~~~~ ~

Foo is Null!

- +~

- - - +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~ + ~~~~~~~~~~~~~~~~~~ ~~~~~ +~

\ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.codegen.html index 6393f9703b5f..2a7f3ddff8a3 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.codegen.html @@ -1,7 +1,7 @@ - - - - - \ No newline at end of file + ~~~~~~~~~~~ +~~~~~~ ~~~~~~~~~~ ~~~~~~ ~ + ~~~~~~ ~~~~~ ~ ~~~~ +~ +~ \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.codegen.html index 46d84b460b85..896d2c841527 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.codegen.html @@ -1,12 +1,12 @@ - +~~~~~~~~~~ ~ - +~ - - - - - - +~~~~~~~~~~ ~ + ~~~~~~ ~~~~~ ~ ~~~ ~~~~~~~~~ + ~~~~~~~ ~~~ ~~~~~~~~~~~ ~ + ~~~~~~ ~~~~~~~~~~~~~ + ~ +~ -Here's a random number: \ No newline at end of file +Here's a random number: ~~~~~~~~~~~~ \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.codegen.html index 13484a1b456c..88647e0895ab 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.codegen.html @@ -1,3 +1,3 @@ - - - \ No newline at end of file +~~ + ~~~~ +~ \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_DesignTime.codegen.html index d0776340e1a6..8d87a8e68a75 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_DesignTime.codegen.html @@ -1,5 +1,5 @@ - +~~~~~~~~~~~ ~~~~~~~~~~~ - - - \ No newline at end of file +~~~~~~~~~~ ~ + ~~~~ ~~~~~~~~~~~~~~~~~~~~~ ~ ~ +~ \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.codegen.html index f1c2edafa225..28138a2cddf2 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.codegen.html @@ -1,3 +1,3 @@ This is markup - \ No newline at end of file +~ \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.codegen.html index c3ca733a2bc7..b8f7cde9f741 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.codegen.html @@ -1,3 +1,3 @@ - -

This is item #

- \ No newline at end of file +~~~~~~~~ ~ ~ ~~ ~ ~~ ~~~ ~~~~ ~ +

This is item #~~

+~ \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.html index b7d08f385618..d932435cea17 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.html @@ -1,25 +1,25 @@ - +~~ ~~~~~ ~~~~ ~~~~~ ~~~~~~~~ ~~~~ ~~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~ ~~~~~~ ~~ - - - +~~~~~~~~~~~~~ +~~~~~~~~~~~~~ +~~~~~~~~~~~~~ ~ - - - +~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~ ~ - - - +~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~ ~ - - +~~~~~~~~~ +~~~~~~~~~ - - +~~~~~~~~~~ +~~~~~~~~~~ - - +~~~~~~~~ +~~~~~~~~ - { - \ No newline at end of file +~~~~~~~~ { +~~~~~~~~~~ ~ \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.codegen.html index b60ac0100e38..9cd1d59959a7 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.codegen.html @@ -1,3 +1,3 @@ - +~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~ - \ No newline at end of file +~~~~~~ \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.codegen.html index 3b6fa1cd0620..18ebd6d308e5 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.codegen.html @@ -1,3 +1,3 @@ - (string link) { - +~~~~~~~~ ~~~~(string link) { + } \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.codegen.html index 111d1f7474ce..1c44204c9352 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.codegen.html @@ -1,38 +1,38 @@ - - -

Bar

- Hello, World +~~ + ~~~ ~ ~ ~~ + ~~~ ~~~ ~ ~

Bar

~ + ~~Hello, World

Hello, World

- +~ - -

Hello from C#, #

- - +~~~~~~~~ ~~ ~~~ ~ +

Hello from C#, #~~~~

+ ~ ~~ ~~ +~ - +~~~~~ ~~ ~~~ ~

We wrote 10 lines!

- +~ - - +~~~~~~~~~~ ~ + ~~~~ ~~~

No really, we wrote 10 lines!

- - + ~~~~~~ + ~~~~~~~~

Actually, we didn't...

- - + ~~~~~~ +~ - -

Hello again from C#, #

- +~~~~~~~~ ~ ~ ~~ ~ ~~ ~~~ ~ ~~ ~~ ~ +

Hello again from C#, #~~~~

+~ - +~~~~ ~

That time, we wrote 5 lines!

- -

Oh no! An error occurred:

- +~ ~~~~~~~~~~~~~~~ ~~~ ~ +

Oh no! An error occurred: ~~~~~~~~~~~~~

+~ - +~~~~~~~~~ ~~~~~~~~~ ~

This block is locked, for your security!

- \ No newline at end of file +~ \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.codegen.html index 9148ce732370..ad3e1315f2bd 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.codegen.html @@ -1,5 +1,5 @@ - - -

Hello from C#, #

- - +~~ + ~~~~~~~ ~ ~ ~~ ~ ~~ ~~~ ~~~~ ~ +

Hello from C#, #~~~~~~~~~~~~~~~

+ ~ +~ diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks_DesignTime.codegen.html index 4b346c914a4b..554040f8c49a 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks_DesignTime.codegen.html @@ -1,45 +1,45 @@ - - - - - - - - -
- - - - - - - - - - +~~ + ~~~ ~~~~~~ ~ ~~~ ~~~~~~~~ + ~ + ~~~ ~~~~~~~~ ~ ~~~~ ~ ~~~~~~~~~ ~~~ ~ ~~~ ~ + ~~ + + ~~~~ ~~~~~~~~~~~~~~~~ ~~~~~~~ + ~ +
~~~~~~~~~~~~
+ ~ +~ + +~~ ~~~~~~~~~~~~~~~~~~~~ ~ +~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~ + +~~~~~~~~~~ ~ + ~~~~ ~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~ + ~ + ~~~ ~~~~~~~~~ ~ ~~~~~ ~~~~~~~~~~~~~~~
-

Happy birthday !

+

Happy birthday ~~~~~~~~~~~~!

    - - -
  • Happy birthday!
    • - + ~~~~ ~~~~ ~ ~ ~~ ~ ~ ~~~~~~~~~~ ~ ~~~ ~~~~ + ~ +
  • ~~~~ Happy birthday!
    • + ~
- - - - + ~~ ~~~~~~~~~~~ ~ ~~~ + ~ + ~~~~~~~ + ~

Secret message

- - - - - - - - \ No newline at end of file + ~ + + ~~~~~ ~~~~~~ + ~ + ~~~~~~ ~~~~~~ ~~~~ ~ ~~~~ ~~~~ ~ + ~~~~~~ ~~~ ~~~ ~ ~~~~ ~~~~ ~ + ~ +~ \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.codegen.html index c1b9240ee07a..1a78d3888c91 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.codegen.html @@ -1,8 +1,8 @@ - - - +~~ + ~~~~~~~~ ~~~~ ~~~~~~ ~~ ~~~~~~~~~~~~~ + ~
- . + ~~~~~~~~~~~~~~~~~.
- - \ No newline at end of file + ~ +~ \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.codegen.html index c56380dfcb99..966b588e290f 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.codegen.html @@ -1,4 +1,4 @@ - - - - \ No newline at end of file +~~~~~~~~ ~ + ~~~~~~~~ ~ + ~ +~ \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.codegen.html index b7c02278c1d0..494393779b10 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.codegen.html @@ -1,38 +1,38 @@ - - - +~~ + ~~~ ~ ~ ~~ +~ - -

Hello from C#, #

- - +~~~~~~~~ ~~ ~~~ ~ +

Hello from C#, #~~~~

+ ~ ~~ ~~ +~ - +~~~~~ ~~ ~~~ ~

We wrote 10 lines!

- +~ - - +~~~~~~~~~~ ~ + ~~~~ ~~~

No really, we wrote 10 lines!

- - + ~~~~~~ + ~~~~~~~~

Actually, we didn't...

- - + ~~~~~~ +~ - -

Hello again from C#, #

- +~~~~~~~~ ~ ~ ~~ ~ ~~ ~~~ ~ ~~ ~~ ~ +

Hello again from C#, #~~~~

+~ - +~~~~ ~

That time, we wrote 5 lines!

- -

Oh no! An error occurred:

- +~ ~~~~~~~~~~~~~~~ ~~~ ~ +

Oh no! An error occurred: ~~~~~~~~~~~~~

+~ - -

i is now

+~~ ~~~~ ~~~ ~~ ~~~~~~~~~~ ~~ ~~ ~~ +

i is now ~~

- +~~~~~~~~~ ~~~~~~~~~ ~

This block is locked, for your security!

- \ No newline at end of file +~ \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.codegen.html index 7ad423b1f29e..e40e3c6f4954 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.codegen.html @@ -1,11 +1,11 @@ - - - - - - +~~ + ~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~ - - - - \ No newline at end of file +~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.codegen.html index 1675f6438378..42ba9c64b06a 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.codegen.html @@ -1,5 +1,5 @@ - +~~~ ~~~~~~ ~ \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.codegen.html index d0076463280f..61e3b424cb11 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.codegen.html @@ -1,5 +1,5 @@ - - - - - \ No newline at end of file +~~ +~~ +~~~ ~ ~~~~ +~~~ ~ ~~~~ +~ \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.codegen.html index f851e2e59774..d4faa3491649 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.codegen.html @@ -1,18 +1,18 @@ - -

This should be shown

+~~~~~~ ~~ ~~~ ~~~~~ ~~ ~~ ~~~~~~~~~~ +

This should ~~ ~~~ ~~ be shown

- - - - - - - +~~ + ~~ ~~~~~ ~~~ ~~~~~~~~~~~~~ ~~~~~ ~~ + ~~~~~~~~~ ~~~ ~ ~~ ~~~ ~~~~~~~~~~~~~ ~~~~~ ~~ ~~~~~ + ~~~~~~ ~~ ~~~~~ ~ + ~~~~~ ~~~~ + ~ +~ - -

But this should show the comment syntax:

+~~ ~~~ ~~~ ~ ~~~ ~~~ ~~~~ ~ +

But this should show the comment syntax: ~~~~

- +~~~~~~~~~ - + diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.codegen.html index 77def406f5ff..1460ade1eacc 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.codegen.html @@ -1 +1 @@ - +~~~~~~~~~~~~~~~~ ~~ ~~~~~~~~~~~~ diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.html index 72ff37f26cb5..b47779a0df74 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.html @@ -1,17 +1,17 @@ - - - +~~ + ~~~~~~ ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~
This is in the Body> - -
This is in Section 2
- +~~~~~~~~ ~~~~~~~~ ~ +
This is in Section 2
+~ - +~~~~~~~~ ~~~~~~~~ ~
This is in Section 1
- +~ - - - \ No newline at end of file +~~~~~~~~ ~~~~~~~~~~~~~~~ ~ + ~~ ~~~~~~~~~~~~~ ~~~~~~~ ~ ~ ~~~~~~~ ~ +~ \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.codegen.html index 11a63ced54cf..221eda5a6c0f 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.codegen.html @@ -1,4 +1,4 @@ - - +~~~ ~~~~~~ +~
- \ No newline at end of file +~ \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_DesignTime.codegen.html index 3d06dc8b909c..897f7e85741e 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_DesignTime.codegen.html @@ -1,102 +1,102 @@

Before Text

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +~~ + ~~ ~~~~~~~~~~~~~~~~~~~~~~~~ ~ ~ ~~ ~~ ~~~~~~~~~~ ~~~~ ~~ ~~~~~~~~~ ~~ ~~~ ~~~~ ~~~~~~~~~~~~~ + + ~~~~~~ ~~~~~ + ~ + ~~ ~~~~~~~~~~~~~~~~~~~~~~~~ ~ ~ ~~ ~~ + ~~~~~~ ~~~~~~~~ ~~~~ ~~ ~~~~~~~~~ ~~ ~~~ + ~~~~ ~~ ~~~~~~~~~~~~~~~~~~~~~~~~ ~ ~ ~~ ~~ + ~~~~~~ ~~~~~~~~ ~~~~ ~~ ~~~~~~~~~ ~~ ~~~ + ~~~~ + ~~~~~~ ~~~~~~~~~~~~~ + ~ + + ~~~ ~~~~ ~ ~ ~~ ~ ~ ~~~ ~~~~ + ~~ ~~~~~~~~~~~~ ~ ~~~~~~ + ~~~~ + + ~~~~~~~~ ~~~~ ~~~~ ~~ ~~~~~ ~~~~~~~~~~ + ~~~~~ + + ~~ + ~~~~~~~~~~~~~ + ~~~~~ ~~~~~~~~~~~~~~~ ~~ ~~~ + + ~~~~~ ~~~~~~~~~~~~~~~ ~~ ~~~ + ~~~~~~~~~~~~~~~ + + ~~~~~ ~~~~ ~~~~~~ ~ ~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~~~ + + ~~~~~ ~~~~~~ + ~~~~~~~~~~~~~~~ +~ + +~~~~~~~~~~ ~ + ~~~~~~ ~~~~~~ ~~~~~ + ~ + ~~~ ~ ~ ~~~ + + ~~ ~~~~~~~~~~~~~~~~~~~~~~~~ ~ ~ ~~ ~~ + ~~~~~~ ~~~~~~~~ ~~~~ ~~ ~~~~~~~~~ ~~ ~~~ + ~~~~ + ~~~~~~ ~~~ ~~~~~ ~~~~~~~~~ ~~ ~~~~~ - - - + ~~~ ~~~~ ~ ~ ~~ ~ ~ ~~~ ~~~~ + ~~ ~~~~~~~~~~~~ ~ ~~~~~~ + ~~~~ - - + ~~~~~~~ ~~~~ ~~~~ ~~ ~~~~~ ~~~~~~~~~~ + ~~~~~ - - - + ~~ + ~~~~~~~~~~~~~ + ~~~~~ ~~~~~~~~~~~~~~~ ~~ ~~~ - - + ~~~~~ ~~~~~~~~~~~~~~~ ~~ ~~~ + ~~~~~~~~~~~~~~~ - - + ~~~~~ ~~~~ ~~~~~~ ~ ~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~~~ - - - + ~~~~ ~~~~~~ + ~~~~~~~~~~~~~~~ + ~ - + ~~~ ~~~~~~~~~~~~ ~ ~~ - - - - + ~~~~~~ ~~~~ ~~~~~~~~~~~~~~~~ + ~ + ~~ ~~~~~~ ~~~~~~~~~~~~~~~ + ~ - +~ - - +~~~~ ~~~~ ~ ~ ~~ ~ ~ ~~~ ~~~~ + ~~ - - +~~~~~~~~ ~~~~ ~~~~ ~~ ~~~~~ ~~~~~~~~~~ + ~~~~~ - - - +~~~ + ~~~~~~~~~~~~~ +~~~~~ ~~~~~~~~~~~~~~~ ~~ ~~~ - - +~~~~~~ ~~~~~~~~~~~~~~~ ~~ ~~~ + ~~~~~~~~~~~~~~~ - - - +~~~~~~ ~~~~ ~~~~~~ ~ ~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~ ~~~~~~~ ~~~ ~~~~~~ ~~~~ + ~~~~~~~~~~~~~~~~~~~ - - +~~~~~ ~~~~~~ + ~~~~~~~~~~~~~~~ -

Hello!

+~~~ ~~~~~~ ~~~~~~~~~~~~~~~~

Hello!

- -

The time is

+~~~ ~~~~~~ + ~~

The time is ~~~~~~~~~~~~~

After Text

\ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.codegen.html index b47c6a931ccb..823fe9a3eed3 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.codegen.html @@ -83,7 +83,7 @@

This is line 83

This is line 84


- +~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~ ~

This is line 1 nested

This is line 2 nested

This is line 3 nested

@@ -159,7 +159,7 @@

This is line 73 nested

This is line 74 nested

This is line 75 nested

- +~

This is line 1

This is line 2

This is line 3

@@ -203,7 +203,7 @@

This is line 41

This is line 42

This is line 43

hi! - +~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~ ~

This is line 1 nested

This is line 2 nested

This is line 3 nested

@@ -234,4 +234,4 @@

This is line 28 nested

This is line 29 nested

30

- ! \ No newline at end of file +~! \ No newline at end of file diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.codegen.html index 419c13c11c9b..0dfbab3b0cdc 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.codegen.html +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.codegen.html @@ -1,6 +1,6 @@ - - - +~~ + +~