[master] Update dependencies from aspnet/AspNetCore-Tooling (#18112)

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20200103.1

- Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-alpha.1.20053.1
- Microsoft.AspNetCore.Razor.Language - 5.0.0-alpha.1.20053.1
- Microsoft.CodeAnalysis.Razor - 5.0.0-alpha.1.20053.1
- Microsoft.NET.Sdk.Razor - 5.0.0-alpha.1.20053.1

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.ActivatorUtilities.Sources - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Caching.Abstractions - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Caching.Memory - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Caching.SqlServer - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Caching.StackExchangeRedis - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.CommandLineUtils.Sources - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Configuration.Abstractions - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Configuration.AzureKeyVault - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Configuration.Binder - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Configuration.CommandLine - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Configuration.FileExtensions - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Configuration.Ini - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Configuration.Json - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Configuration.KeyPerFile - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Configuration.UserSecrets - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Configuration.Xml - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Configuration - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.DependencyInjection.Abstractions - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.DependencyInjection - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.DiagnosticAdapter - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Diagnostics.HealthChecks - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.FileProviders.Abstractions - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.FileProviders.Composite - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.FileProviders.Embedded - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.FileProviders.Physical - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.FileSystemGlobbing - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.HashCodeCombiner.Sources - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Hosting.Abstractions - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Hosting - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.HostFactoryResolver.Sources - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Http - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Localization.Abstractions - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Localization - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Logging.Abstractions - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Logging.AzureAppServices - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Logging.Configuration - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Logging.Console - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Logging.Debug - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Logging.EventSource - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Logging.EventLog - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Logging.TraceSource - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Logging.Testing - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.ObjectPool - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Options.ConfigurationExtensions - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Options.DataAnnotations - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Options - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Primitives - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.TypeNameHelper.Sources - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.ValueStopwatch.Sources - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.WebEncoders - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Internal.Extensions.Refs - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.JSInterop - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Mono.WebAssembly.Interop - 5.0.0-preview3.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.Extensions.Logging - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Internal.AspNetCore.Analyzers - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)
- Microsoft.AspNetCore.Testing - 5.0.0-alpha.1.20053.1 (parent: Microsoft.AspNetCore.Razor.Language)

* fix up

* refs

Co-authored-by: Brennan <[email protected]>

Author: dotnet-maestro[bot]

eng/Version.Details.xml

@@ -13,8 +13,6 @@ public HtmlLocalizer(Microsoft.Extensions.Localization.IStringLocalizer localize
         public virtual Microsoft.Extensions.Localization.LocalizedString GetString(string name, params object[] arguments) { throw null; }
         protected virtual Microsoft.AspNetCore.Mvc.Localization.LocalizedHtmlString ToHtmlString(Microsoft.Extensions.Localization.LocalizedString result) { throw null; }
         protected virtual Microsoft.AspNetCore.Mvc.Localization.LocalizedHtmlString ToHtmlString(Microsoft.Extensions.Localization.LocalizedString result, object[] arguments) { throw null; }
-        [System.ObsoleteAttribute("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")]
-        public virtual Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer WithCulture(System.Globalization.CultureInfo culture) { throw null; }
     }
     public static partial class HtmlLocalizerExtensions
     {
@@ -36,8 +34,6 @@ public HtmlLocalizer(Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizerFactory
         public virtual System.Collections.Generic.IEnumerable<Microsoft.Extensions.Localization.LocalizedString> GetAllStrings(bool includeParentCultures) { throw null; }
         public virtual Microsoft.Extensions.Localization.LocalizedString GetString(string name) { throw null; }
         public virtual Microsoft.Extensions.Localization.LocalizedString GetString(string name, params object[] arguments) { throw null; }
-        [System.ObsoleteAttribute("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")]
-        public virtual Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer WithCulture(System.Globalization.CultureInfo culture) { throw null; }
     }
     public partial interface IHtmlLocalizer
     {
@@ -46,8 +42,6 @@ public partial interface IHtmlLocalizer
         System.Collections.Generic.IEnumerable<Microsoft.Extensions.Localization.LocalizedString> GetAllStrings(bool includeParentCultures);
         Microsoft.Extensions.Localization.LocalizedString GetString(string name);
         Microsoft.Extensions.Localization.LocalizedString GetString(string name, params object[] arguments);
-        [System.ObsoleteAttribute("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")]
-        Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer WithCulture(System.Globalization.CultureInfo culture);
     }
     public partial interface IHtmlLocalizerFactory
     {
@@ -79,8 +73,6 @@ public void Contextualize(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewCon
         public System.Collections.Generic.IEnumerable<Microsoft.Extensions.Localization.LocalizedString> GetAllStrings(bool includeParentCultures) { throw null; }
         public Microsoft.Extensions.Localization.LocalizedString GetString(string name) { throw null; }
         public Microsoft.Extensions.Localization.LocalizedString GetString(string name, params object[] values) { throw null; }
-        [System.ObsoleteAttribute("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")]
-        public Microsoft.AspNetCore.Mvc.Localization.IHtmlLocalizer WithCulture(System.Globalization.CultureInfo culture) { throw null; }
     }
 }
 namespace Microsoft.Extensions.DependencyInjection

eng/Versions.props

@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using Microsoft.Extensions.Localization;
 
 namespace Microsoft.AspNetCore.Mvc.Localization
@@ -84,20 +83,6 @@ public virtual LocalizedString GetString(string name, params object[] arguments)
         public virtual IEnumerable<LocalizedString> GetAllStrings(bool includeParentCultures) =>
             _localizer.GetAllStrings(includeParentCultures);
 
-        /// <inheritdoc />
-        [Obsolete("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")]
-        public virtual IHtmlLocalizer WithCulture(CultureInfo culture)
-        {
-            if (culture == null)
-            {
-                throw new ArgumentNullException(nameof(culture));
-            }
-
-#pragma warning disable CS0618 // Type or member is obsolete
-            return new HtmlLocalizer(_localizer.WithCulture(culture));
-#pragma warning restore CS0618 // Type or member is obsolete
-        }
-
         /// <summary>
         /// Creates a new <see cref="LocalizedHtmlString"/> for a <see cref="LocalizedString"/>.
         /// </summary>

src/Mvc/Mvc.Localization/ref/Microsoft.AspNetCore.Mvc.Localization.netcoreapp.cs

@@ -79,19 +79,5 @@ public virtual LocalizedString GetString(string name, params object[] arguments)
         /// <inheritdoc />
         public virtual IEnumerable<LocalizedString> GetAllStrings(bool includeParentCultures) =>
             _localizer.GetAllStrings(includeParentCultures);
-
-        /// <inheritdoc />
-        [Obsolete("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")]
-        public virtual IHtmlLocalizer WithCulture(CultureInfo culture)
-        {
-            if (culture == null)
-            {
-                throw new ArgumentNullException(nameof(culture));
-            }
-
-#pragma warning disable CS0618 // Type or member is obsolete
-            return _localizer.WithCulture(culture);
-#pragma warning restore CS0618 // Type or member is obsolete
-        }
     }
 }

src/Mvc/Mvc.Localization/src/HtmlLocalizer.cs

@@ -53,13 +53,5 @@ public interface IHtmlLocalizer
         /// </param>
         /// <returns>The strings.</returns>
         IEnumerable<LocalizedString> GetAllStrings(bool includeParentCultures);
-
-        /// <summary>
-        /// Creates a new <see cref="IHtmlLocalizer"/> for a specific <see cref="CultureInfo"/>.
-        /// </summary>
-        /// <param name="culture">The <see cref="CultureInfo"/> to use.</param>
-        /// <returns>A culture-specific <see cref="IHtmlLocalizer"/>.</returns>
-        [Obsolete("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")]
-        IHtmlLocalizer WithCulture(CultureInfo culture);
     }
 }

src/Mvc/Mvc.Localization/src/HtmlLocalizerOfT.cs

@@ -79,13 +79,6 @@ public virtual LocalizedHtmlString this[string key]
         /// <inheritdoc />
         public LocalizedString GetString(string name, params object[] values) => _localizer.GetString(name, values);
 
-        /// <inheritdoc />
-        [Obsolete("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")]
-
-#pragma warning disable CS0618 // Type or member is obsolete
-        public IHtmlLocalizer WithCulture(CultureInfo culture) => _localizer.WithCulture(culture);
-#pragma warning restore CS0618 // Type or member is obsolete
-
         /// <inheritdoc />
         public IEnumerable<LocalizedString> GetAllStrings(bool includeParentCultures) =>
             _localizer.GetAllStrings(includeParentCultures);

src/Mvc/Mvc.Localization/src/IHtmlLocalizer.cs

@@ -207,14 +207,12 @@ public void HtmlLocalizer_Html_ReturnsLocalizedHtmlString()
         public void HtmlLocalizer_WithCulture_ReturnsLocalizedHtmlString()
         {
             // Arrange
-            var stringLocalizer = new TestStringLocalizer();
+            var stringLocalizer = new TestStringLocalizer(new CultureInfo("fr"));
 
             var htmlLocalizer = new HtmlLocalizer(stringLocalizer);
 
             // Act
-#pragma warning disable CS0618 // Type or member is obsolete
-            var actualLocalizedHtmlString = htmlLocalizer.WithCulture(new CultureInfo("fr"))["John"];
-#pragma warning restore CS0618 // Type or member is obsolete
+            var actualLocalizedHtmlString = htmlLocalizer["John"];
 
             // Assert
             Assert.Equal("Bonjour John", actualLocalizedHtmlString.Value);

src/Mvc/Mvc.Localization/src/ViewLocalizer.cs

@@ -266,7 +266,7 @@ public void ViewLocalizer_HtmlWithArguments_ReturnsLocalizedHtmlString()
         public void ViewLocalizer_WithCulture_ReturnsLocalizedHtmlString()
         {
             // Arrange
-            var stringLocalizer = new TestStringLocalizer();
+            var stringLocalizer = new TestStringLocalizer(new CultureInfo("fr"));
             var htmlLocalizer = new HtmlLocalizer(stringLocalizer);
             var hostingEnvironment = new Mock<IWebHostEnvironment>();
             hostingEnvironment.Setup(a => a.ApplicationName).Returns("TestApplication");
@@ -280,9 +280,7 @@ public void ViewLocalizer_WithCulture_ReturnsLocalizedHtmlString()
             viewLocalizer.Contextualize(viewContext);
 
             // Act
-#pragma warning disable CS0618 // Type or member is obsolete
-            var actualLocalizedString = viewLocalizer.WithCulture(new CultureInfo("fr"))["John"];
-#pragma warning restore CS0618 // Type or member is obsolete
+            var actualLocalizedString = htmlLocalizer["John"];
 
             // Assert
             Assert.Equal("Bonjour John", actualLocalizedString.Value);