Skip to content

Commit 879ce96

Browse files
dotnet-maestro[bot]BrennanConroy
dotnet-maestro[bot]
and
BrennanConroy
authored
[master] Update dependencies from dotnet/arcade dotnet/aspnetcore-tooling (#18574)
* Update dependencies from https://github.com/dotnet/arcade build 20200124.5 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20074.5 - Microsoft.DotNet.GenAPI - 5.0.0-beta.20074.5 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20074.5 Dependency coherency updates - Microsoft.CSharp - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.Win32.Registry - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.Win32.SystemEvents - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.ComponentModel.Annotations - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Diagnostics.EventLog - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Drawing.Common - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.IO.Pipelines - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Net.Http.WinHttpHandler - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Net.WebSockets.WebSocketProtocol - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Reflection.Metadata - 1.8.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Runtime.CompilerServices.Unsafe - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Cryptography.Cng - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Cryptography.Pkcs - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Cryptography.Xml - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Permissions - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Principal.Windows - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.ServiceProcess.ServiceController - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Text.Encodings.Web - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Text.Json - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Threading.Channels - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Windows.Extensions - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.NETCore.Platforms - 3.1.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/arcade build 20200124.6 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20074.6 - Microsoft.DotNet.GenAPI - 5.0.0-beta.20074.6 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20074.6 Dependency coherency updates - Microsoft.CSharp - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.Win32.Registry - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.Win32.SystemEvents - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.ComponentModel.Annotations - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Diagnostics.EventLog - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Drawing.Common - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.IO.Pipelines - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Net.Http.WinHttpHandler - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Net.WebSockets.WebSocketProtocol - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Reflection.Metadata - 1.8.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Runtime.CompilerServices.Unsafe - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Cryptography.Cng - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Cryptography.Pkcs - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Cryptography.Xml - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Permissions - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Principal.Windows - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.ServiceProcess.ServiceController - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Text.Encodings.Web - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Text.Json - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Threading.Channels - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Windows.Extensions - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.NETCore.Platforms - 3.1.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/aspnetcore-tooling build 20200124.7 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-alpha.1.20074.7 - Microsoft.AspNetCore.Razor.Language - 5.0.0-alpha.1.20074.7 - Microsoft.CodeAnalysis.Razor - 5.0.0-alpha.1.20074.7 - Microsoft.NET.Sdk.Razor - 5.0.0-alpha.1.20074.7 Dependency coherency updates - Microsoft.AspNetCore.Analyzer.Testing - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.AspNetCore.BenchmarkRunner.Sources - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.ActivatorUtilities.Sources - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Caching.Abstractions - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Caching.Memory - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Caching.SqlServer - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Caching.StackExchangeRedis - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.CommandLineUtils.Sources - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.Abstractions - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.AzureKeyVault - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.Binder - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.CommandLine - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.EnvironmentVariables - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.FileExtensions - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.Ini - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.Json - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.KeyPerFile - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.UserSecrets - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.Xml - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.DependencyInjection.Abstractions - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.DependencyInjection - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.DiagnosticAdapter - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Diagnostics.HealthChecks - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.FileProviders.Abstractions - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.FileProviders.Composite - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.FileProviders.Embedded - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.FileProviders.Physical - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.FileSystemGlobbing - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.HashCodeCombiner.Sources - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Hosting.Abstractions - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Hosting - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.HostFactoryResolver.Sources - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Http - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Localization.Abstractions - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Localization - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.Abstractions - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.AzureAppServices - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.Configuration - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.Console - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.Debug - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.EventSource - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.EventLog - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.TraceSource - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.Testing - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.ObjectPool - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Options.ConfigurationExtensions - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Options.DataAnnotations - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Options - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.ParameterDefaultValue.Sources - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Primitives - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.TypeNameHelper.Sources - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.ValueStopwatch.Sources - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.WebEncoders - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Internal.Extensions.Refs - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.JSInterop - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Mono.WebAssembly.Interop - 5.0.0-preview3.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.CSharp - 5.0.0-alpha.1.20073.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-alpha.1.20073.8 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Win32.Registry - 5.0.0-alpha.1.20073.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.Win32.SystemEvents - 5.0.0-alpha.1.20073.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.ComponentModel.Annotations - 5.0.0-alpha.1.20073.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Diagnostics.EventLog - 5.0.0-alpha.1.20073.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Drawing.Common - 5.0.0-alpha.1.20073.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.IO.Pipelines - 5.0.0-alpha.1.20073.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Net.Http.WinHttpHandler - 5.0.0-alpha.1.20073.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Net.WebSockets.WebSocketProtocol - 5.0.0-alpha.1.20073.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Reflection.Metadata - 5.0.0-alpha.1.20073.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Runtime.CompilerServices.Unsafe - 5.0.0-alpha.1.20073.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Cryptography.Cng - 5.0.0-alpha.1.20073.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Cryptography.Pkcs - 5.0.0-alpha.1.20073.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Cryptography.Xml - 5.0.0-alpha.1.20073.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Permissions - 5.0.0-alpha.1.20073.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Principal.Windows - 5.0.0-alpha.1.20073.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.ServiceProcess.ServiceController - 5.0.0-alpha.1.20073.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Text.Encodings.Web - 5.0.0-alpha.1.20073.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Text.Json - 5.0.0-alpha.1.20073.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Threading.Channels - 5.0.0-alpha.1.20073.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Windows.Extensions - 5.0.0-alpha.1.20073.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.Extensions.DependencyModel - 5.0.0-alpha.1.20073.8 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.App.Ref - 5.0.0-alpha.1.20073.8 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.App.Internal - 5.0.0-alpha.1.20073.8 (parent: Microsoft.Extensions.Logging) - NETStandard.Library.Ref - 2.1.0-alpha.1.20073.8 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.Platforms - 5.0.0-alpha.1.20073.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Internal.AspNetCore.Analyzers - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.AspNetCore.Testing - 5.0.0-alpha.1.20074.2 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Net.Compilers.Toolset - 3.5.0-beta2-20074-05 (parent: Microsoft.Extensions.Logging) * Update dependencies from https://github.com/dotnet/aspnetcore-tooling build 20200125.1 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-alpha.1.20075.1 - Microsoft.AspNetCore.Razor.Language - 5.0.0-alpha.1.20075.1 - Microsoft.CodeAnalysis.Razor - 5.0.0-alpha.1.20075.1 - Microsoft.NET.Sdk.Razor - 5.0.0-alpha.1.20075.1 Dependency coherency updates - Microsoft.AspNetCore.Analyzer.Testing - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.AspNetCore.BenchmarkRunner.Sources - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.ActivatorUtilities.Sources - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Caching.Abstractions - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Caching.Memory - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Caching.SqlServer - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Caching.StackExchangeRedis - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.CommandLineUtils.Sources - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.Abstractions - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.AzureKeyVault - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.Binder - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.CommandLine - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.EnvironmentVariables - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.FileExtensions - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.Ini - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.Json - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.KeyPerFile - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.UserSecrets - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.Xml - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.DependencyInjection.Abstractions - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.DependencyInjection - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.DiagnosticAdapter - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Diagnostics.HealthChecks - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.FileProviders.Abstractions - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.FileProviders.Composite - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.FileProviders.Embedded - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.FileProviders.Physical - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.FileSystemGlobbing - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.HashCodeCombiner.Sources - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Hosting.Abstractions - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Hosting - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.HostFactoryResolver.Sources - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Http - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Localization.Abstractions - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Localization - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.Abstractions - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.AzureAppServices - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.Configuration - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.Console - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.Debug - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.EventSource - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.EventLog - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.TraceSource - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.Testing - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.ObjectPool - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Options.ConfigurationExtensions - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Options.DataAnnotations - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Options - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.ParameterDefaultValue.Sources - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Primitives - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.TypeNameHelper.Sources - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.ValueStopwatch.Sources - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.WebEncoders - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Internal.Extensions.Refs - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.JSInterop - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Mono.WebAssembly.Interop - 5.0.0-preview3.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.CSharp - 5.0.0-alpha.1.20074.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-alpha.1.20074.8 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Win32.Registry - 5.0.0-alpha.1.20074.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.Win32.SystemEvents - 5.0.0-alpha.1.20074.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.ComponentModel.Annotations - 5.0.0-alpha.1.20074.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Diagnostics.EventLog - 5.0.0-alpha.1.20074.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Drawing.Common - 5.0.0-alpha.1.20074.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.IO.Pipelines - 5.0.0-alpha.1.20074.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Net.Http.WinHttpHandler - 5.0.0-alpha.1.20074.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Net.WebSockets.WebSocketProtocol - 5.0.0-alpha.1.20074.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Reflection.Metadata - 5.0.0-alpha.1.20074.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Runtime.CompilerServices.Unsafe - 5.0.0-alpha.1.20074.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Cryptography.Cng - 5.0.0-alpha.1.20074.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Cryptography.Pkcs - 5.0.0-alpha.1.20074.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Cryptography.Xml - 5.0.0-alpha.1.20074.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Permissions - 5.0.0-alpha.1.20074.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Security.Principal.Windows - 5.0.0-alpha.1.20074.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.ServiceProcess.ServiceController - 5.0.0-alpha.1.20074.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Text.Encodings.Web - 5.0.0-alpha.1.20074.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Text.Json - 5.0.0-alpha.1.20074.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Threading.Channels - 5.0.0-alpha.1.20074.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Windows.Extensions - 5.0.0-alpha.1.20074.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.Extensions.DependencyModel - 5.0.0-alpha.1.20074.8 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.App.Ref - 5.0.0-alpha.1.20074.8 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.App.Internal - 5.0.0-alpha.1.20074.8 (parent: Microsoft.Extensions.Logging) - NETStandard.Library.Ref - 2.1.0-alpha.1.20074.8 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.Platforms - 5.0.0-alpha.1.20074.8 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Internal.AspNetCore.Analyzers - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.AspNetCore.Testing - 5.0.0-alpha.1.20075.1 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Net.Compilers.Toolset - 3.5.0-beta2-20074-05 (parent: Microsoft.Extensions.Logging) * Update SDK and fix Json tests * templates Co-authored-by: Brennan <[email protected]>
1 parent 58a107b commit 879ce96

File tree

11 files changed

+395
-330
lines changed

11 files changed

+395
-330
lines changed

‎eng/Version.Details.xml

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

‎eng/Versions.props

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

‎eng/common/cross/build-rootfs.sh

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ __UbuntuPackages="build-essential"
2525
__AlpinePackages="alpine-base"
2626
__AlpinePackages+=" build-base"
2727
__AlpinePackages+=" linux-headers"
28-
__AlpinePackages+=" lldb-dev"
29-
__AlpinePackages+=" llvm-dev"
28+
__AlpinePackagesEdgeTesting=" lldb-dev"
29+
__AlpinePackagesEdgeMain=" llvm9-libs"
30+
__AlpinePackagesEdgeMain+=" python3"
3031

3132
# symlinks fixer
3233
__UbuntuPackages+=" symlinks"
@@ -199,13 +200,23 @@ if [[ "$__LinuxCodeName" == "alpine" ]]; then
199200
tar -xf $__ApkToolsDir/apk-tools-$__ApkToolsVersion-x86_64-linux.tar.gz -C $__ApkToolsDir
200201
mkdir -p $__RootfsDir/usr/bin
201202
cp -v /usr/bin/qemu-$__QEMUArch-static $__RootfsDir/usr/bin
203+
202204
$__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk \
203205
-X http://dl-cdn.alpinelinux.org/alpine/v$__AlpineVersion/main \
204206
-X http://dl-cdn.alpinelinux.org/alpine/v$__AlpineVersion/community \
205-
-X http://dl-cdn.alpinelinux.org/alpine/edge/testing \
206-
-X http://dl-cdn.alpinelinux.org/alpine/edge/main \
207207
-U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \
208208
add $__AlpinePackages
209+
210+
$__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk \
211+
-X http://dl-cdn.alpinelinux.org/alpine/edge/main \
212+
-U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \
213+
add $__AlpinePackagesEdgeMain
214+
215+
$__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk \
216+
-X http://dl-cdn.alpinelinux.org/alpine/edge/testing \
217+
-U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \
218+
add $__AlpinePackagesEdgeTesting
219+
209220
rm -r $__ApkToolsDir
210221
elif [[ -n $__LinuxCodeName ]]; then
211222
qemu-debootstrap --arch $__UbuntuArch $__LinuxCodeName $__RootfsDir $__UbuntuRepo

‎eng/common/enable-cross-org-publishing.ps1

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@ param(
22
[string] $token
33
)
44

5+
56
. $PSScriptRoot\pipeline-logging-functions.ps1
67

7-
Write-PipelineSetVariable -Name 'VSS_NUGET_ACCESSTOKEN' -Value $token
8-
Write-PipelineSetVariable -Name 'VSS_NUGET_URI_PREFIXES' -Value 'https://dnceng.pkgs.visualstudio.com/;https://pkgs.dev.azure.com/dnceng/;https://devdiv.pkgs.visualstudio.com/;https://pkgs.dev.azure.com/devdiv/'
8+
# Write-PipelineSetVariable will no-op if a variable named $ci is not defined
9+
# Since this script is only ever called in AzDO builds, just universally set it
10+
$ci = $true
11+
12+
Write-PipelineSetVariable -Name 'VSS_NUGET_ACCESSTOKEN' -Value $token -IsMultiJobVariable $false
13+
Write-PipelineSetVariable -Name 'VSS_NUGET_URI_PREFIXES' -Value 'https://dnceng.pkgs.visualstudio.com/;https://pkgs.dev.azure.com/dnceng/;https://devdiv.pkgs.visualstudio.com/;https://pkgs.dev.azure.com/devdiv/' -IsMultiJobVariable $false

‎eng/common/templates/post-build/post-build.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,3 +221,29 @@ stages:
221221
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json'
222222
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json'
223223
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental-symbols/nuget/v3/index.json'
224+
225+
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
226+
parameters:
227+
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
228+
dependsOn: ${{ parameters.publishDependsOn }}
229+
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
230+
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
231+
stageName: 'Net_Eng_Services_Int_Publish'
232+
channelName: '.NET Eng Services - Int'
233+
channelId: 678
234+
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
235+
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
236+
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'
237+
238+
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
239+
parameters:
240+
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
241+
dependsOn: ${{ parameters.publishDependsOn }}
242+
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
243+
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
244+
stageName: 'Net_Eng_Services_Prod_Publish'
245+
channelName: '.NET Eng Services - Prod'
246+
channelId: 679
247+
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
248+
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
249+
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'

‎global.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "5.0.100-alpha1-015536"
3+
"version": "5.0.100-alpha.1.20063.3"
44
},
55
"tools": {
6-
"dotnet": "5.0.100-alpha1-015752",
6+
"dotnet": "5.0.100-alpha.1.20063.3",
77
"runtimes": {
88
"dotnet/x64": [
99
"$(MicrosoftNETCoreAppInternalPackageVersion)"
@@ -25,7 +25,7 @@
2525
},
2626
"msbuild-sdks": {
2727
"Yarn.MSBuild": "1.15.2",
28-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20068.1",
29-
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20068.1"
28+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20074.6",
29+
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20074.6"
3030
}
3131
}

‎src/Mvc/Mvc.Core/src/Formatters/SystemTextJsonOutputFormatter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public sealed override async Task WriteResponseBodyAsync(OutputFormatterWriteCon
7777
// For polymorphic scenarios where the user declares a return type, but returns a derived type,
7878
// we want to serialize all the properties on the derived type. This keeps parity with
7979
// the behavior you get when the user does not declare the return type and with Json.Net at least at the top level.
80-
var objectType = context.Object?.GetType() ?? context.ObjectType;
80+
var objectType = context.Object?.GetType() ?? context.ObjectType ?? typeof(object);
8181
await JsonSerializer.SerializeAsync(writeStream, context.Object, objectType, SerializerOptions);
8282

8383
// The transcoding streams use Encoders and Decoders that have internal buffers. We need to flush these

‎src/ProjectTemplates/Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
<Description>Single Page Application templates for ASP.NET Core</Description>
77
<PackageTags>$(PackageTags);spa</PackageTags>
88
<IsShippingPackage>true</IsShippingPackage>
9+
<!-- By default Pack will exclude files that start with '.', we want to include those files -->
10+
<NoDefaultExcludes>true</NoDefaultExcludes>
911
</PropertyGroup>
1012

1113
<PropertyGroup>

‎src/SignalR/clients/csharp/Client.Core/src/HubConnection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ private async Task StopAsyncCore(bool disposing)
539539
/// </returns>
540540
public IAsyncEnumerable<TResult> StreamAsyncCore<TResult>(string methodName, object[] args, CancellationToken cancellationToken = default)
541541
{
542-
var cts = cancellationToken.CanBeCanceled ? CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, default) : new CancellationTokenSource();
542+
var cts = cancellationToken.CanBeCanceled ? CancellationTokenSource.CreateLinkedTokenSource(cancellationToken) : new CancellationTokenSource();
543543
var stream = CastIAsyncEnumerable<TResult>(methodName, args, cts);
544544
var cancelableStream = AsyncEnumerableAdapters.MakeCancelableTypedAsyncEnumerable(stream, cts);
545545
return cancelableStream;

‎src/SignalR/common/Protocols.Json/src/Protocol/JsonHubProtocol.cs

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,14 @@ private void WriteCompletionMessage(CompletionMessage message, Utf8JsonWriter wr
509509
else if (message.HasResult)
510510
{
511511
writer.WritePropertyName(ResultPropertyNameBytes);
512-
JsonSerializer.Serialize(writer, message.Result, message.Result?.GetType(), _payloadSerializerOptions);
512+
if (message.Result == null)
513+
{
514+
writer.WriteNullValue();
515+
}
516+
else
517+
{
518+
JsonSerializer.Serialize(writer, message.Result, message.Result?.GetType(), _payloadSerializerOptions);
519+
}
513520
}
514521
}
515522

@@ -523,7 +530,14 @@ private void WriteStreamItemMessage(StreamItemMessage message, Utf8JsonWriter wr
523530
WriteInvocationId(message, writer);
524531

525532
writer.WritePropertyName(ItemPropertyNameBytes);
526-
JsonSerializer.Serialize(writer, message.Item, message.Item?.GetType(), _payloadSerializerOptions);
533+
if (message.Item == null)
534+
{
535+
writer.WriteNullValue();
536+
}
537+
else
538+
{
539+
JsonSerializer.Serialize(writer, message.Item, message.Item?.GetType(), _payloadSerializerOptions);
540+
}
527541
}
528542

529543
private void WriteInvocationMessage(InvocationMessage message, Utf8JsonWriter writer)
@@ -564,7 +578,14 @@ private void WriteArguments(object[] arguments, Utf8JsonWriter writer)
564578
writer.WriteStartArray(ArgumentsPropertyNameBytes);
565579
foreach (var argument in arguments)
566580
{
567-
JsonSerializer.Serialize(writer, argument, argument?.GetType(), _payloadSerializerOptions);
581+
if (argument == null)
582+
{
583+
writer.WriteNullValue();
584+
}
585+
else
586+
{
587+
JsonSerializer.Serialize(writer, argument, argument?.GetType(), _payloadSerializerOptions);
588+
}
568589
}
569590
writer.WriteEndArray();
570591
}

‎src/SignalR/server/Core/src/Internal/DefaultHubDispatcher.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ await SendInvocationError(hubMethodInvocationMessage.InvocationId, connection,
275275
{
276276
if (descriptor.OriginalParameterTypes[parameterPointer] == typeof(CancellationToken))
277277
{
278-
cts = CancellationTokenSource.CreateLinkedTokenSource(connection.ConnectionAborted, default);
278+
cts = CancellationTokenSource.CreateLinkedTokenSource(connection.ConnectionAborted);
279279
arguments[parameterPointer] = cts.Token;
280280
}
281281
else if (isStreamCall && ReflectionHelper.IsStreamingType(descriptor.OriginalParameterTypes[parameterPointer], mustBeDirectType: true))
@@ -308,7 +308,7 @@ await SendInvocationError(hubMethodInvocationMessage.InvocationId, connection,
308308
return;
309309
}
310310

311-
cts = cts ?? CancellationTokenSource.CreateLinkedTokenSource(connection.ConnectionAborted, default);
311+
cts = cts ?? CancellationTokenSource.CreateLinkedTokenSource(connection.ConnectionAborted);
312312
connection.ActiveRequestCancellationSources.TryAdd(hubMethodInvocationMessage.InvocationId, cts);
313313
var enumerable = descriptor.FromReturnedStream(result, cts.Token);
314314

0 commit comments

Comments
 (0)