Remove Obsoleted methods for 5.0 (dotnet/extensions#2562)

ryanbrandenburg · web-flow · commit 3ab9051a117c · 2020-01-03T09:34:44.000-08:00
Remove Obsoleted methods for 5.0 \n\nCommit migrated from dotnet/extensions@582427c
diff --git a/src/Localization/Abstractions/ref/Microsoft.Extensions.Localization.Abstractions.netcoreapp.cs b/src/Localization/Abstractions/ref/Microsoft.Extensions.Localization.Abstractions.netcoreapp.cs
@@ -8,8 +8,6 @@ public partial interface IStringLocalizer
         Microsoft.Extensions.Localization.LocalizedString this[string name] { get; }
         Microsoft.Extensions.Localization.LocalizedString this[string name, params object[] arguments] { get; }
         System.Collections.Generic.IEnumerable<Microsoft.Extensions.Localization.LocalizedString> GetAllStrings(bool includeParentCultures);
-        [System.ObsoleteAttribute("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")]
-        Microsoft.Extensions.Localization.IStringLocalizer WithCulture(System.Globalization.CultureInfo culture);
     }
     public partial interface IStringLocalizerFactory
     {
@@ -43,7 +41,5 @@ public StringLocalizer(Microsoft.Extensions.Localization.IStringLocalizerFactory
         public virtual Microsoft.Extensions.Localization.LocalizedString this[string name] { get { throw null; } }
         public virtual Microsoft.Extensions.Localization.LocalizedString this[string name, params object[] arguments] { get { throw null; } }
         public System.Collections.Generic.IEnumerable<Microsoft.Extensions.Localization.LocalizedString> GetAllStrings(bool includeParentCultures) { throw null; }
-        [System.ObsoleteAttribute("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")]
-        public virtual Microsoft.Extensions.Localization.IStringLocalizer WithCulture(System.Globalization.CultureInfo culture) { throw null; }
     }
 }
diff --git a/src/Localization/Abstractions/ref/Microsoft.Extensions.Localization.Abstractions.netstandard2.0.cs b/src/Localization/Abstractions/ref/Microsoft.Extensions.Localization.Abstractions.netstandard2.0.cs
@@ -8,8 +8,6 @@ public partial interface IStringLocalizer
         Microsoft.Extensions.Localization.LocalizedString this[string name] { get; }
         Microsoft.Extensions.Localization.LocalizedString this[string name, params object[] arguments] { get; }
         System.Collections.Generic.IEnumerable<Microsoft.Extensions.Localization.LocalizedString> GetAllStrings(bool includeParentCultures);
-        [System.ObsoleteAttribute("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")]
-        Microsoft.Extensions.Localization.IStringLocalizer WithCulture(System.Globalization.CultureInfo culture);
     }
     public partial interface IStringLocalizerFactory
     {
@@ -43,7 +41,5 @@ public StringLocalizer(Microsoft.Extensions.Localization.IStringLocalizerFactory
         public virtual Microsoft.Extensions.Localization.LocalizedString this[string name] { get { throw null; } }
         public virtual Microsoft.Extensions.Localization.LocalizedString this[string name, params object[] arguments] { get { throw null; } }
         public System.Collections.Generic.IEnumerable<Microsoft.Extensions.Localization.LocalizedString> GetAllStrings(bool includeParentCultures) { throw null; }
-        [System.ObsoleteAttribute("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")]
-        public virtual Microsoft.Extensions.Localization.IStringLocalizer WithCulture(System.Globalization.CultureInfo culture) { throw null; }
     }
 }
diff --git a/src/Localization/Abstractions/src/IStringLocalizer.cs b/src/Localization/Abstractions/src/IStringLocalizer.cs
@@ -35,13 +35,5 @@ public interface IStringLocalizer
         /// </param>
         /// <returns>The strings.</returns>
         IEnumerable<LocalizedString> GetAllStrings(bool includeParentCultures);
-
-        /// <summary>
-        /// Creates a new <see cref="IStringLocalizer"/> for a specific <see cref="CultureInfo"/>.
-        /// </summary>
-        /// <param name="culture">The <see cref="CultureInfo"/> to use.</param>
-        /// <returns>A culture-specific <see cref="IStringLocalizer"/>.</returns>
-        [Obsolete("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")]
-        IStringLocalizer WithCulture(CultureInfo culture);
     }
 }
diff --git a/src/Localization/Abstractions/src/StringLocalizerOfT.cs b/src/Localization/Abstractions/src/StringLocalizerOfT.cs
@@ -29,10 +29,6 @@ public StringLocalizer(IStringLocalizerFactory factory)
             _localizer = factory.Create(typeof(TResourceSource));
         }
 
-        /// <inheritdoc />
-        [Obsolete("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")]
-        public virtual IStringLocalizer WithCulture(CultureInfo culture) => _localizer.WithCulture(culture);
-
         /// <inheritdoc />
         public virtual LocalizedString this[string name]
         {
diff --git a/src/Localization/Localization/ref/Microsoft.Extensions.Localization.netcoreapp.cs b/src/Localization/Localization/ref/Microsoft.Extensions.Localization.netcoreapp.cs
@@ -36,8 +36,6 @@ public ResourceManagerStringLocalizer(System.Resources.ResourceManager resourceM
         public virtual System.Collections.Generic.IEnumerable<Microsoft.Extensions.Localization.LocalizedString> GetAllStrings(bool includeParentCultures) { throw null; }
         protected System.Collections.Generic.IEnumerable<Microsoft.Extensions.Localization.LocalizedString> GetAllStrings(bool includeParentCultures, System.Globalization.CultureInfo culture) { throw null; }
         protected string GetStringSafely(string name, System.Globalization.CultureInfo culture) { throw null; }
-        [System.ObsoleteAttribute("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")]
-        public Microsoft.Extensions.Localization.IStringLocalizer WithCulture(System.Globalization.CultureInfo culture) { throw null; }
     }
     public partial class ResourceManagerStringLocalizerFactory : Microsoft.Extensions.Localization.IStringLocalizerFactory
     {
@@ -52,14 +50,6 @@ public ResourceManagerStringLocalizerFactory(Microsoft.Extensions.Options.IOptio
         protected virtual string GetResourcePrefix(string location, string baseName, string resourceLocation) { throw null; }
         protected virtual Microsoft.Extensions.Localization.RootNamespaceAttribute GetRootNamespaceAttribute(System.Reflection.Assembly assembly) { throw null; }
     }
-    [System.ObsoleteAttribute("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")]
-    public partial class ResourceManagerWithCultureStringLocalizer : Microsoft.Extensions.Localization.ResourceManagerStringLocalizer
-    {
-        public ResourceManagerWithCultureStringLocalizer(System.Resources.ResourceManager resourceManager, System.Reflection.Assembly resourceAssembly, string baseName, Microsoft.Extensions.Localization.IResourceNamesCache resourceNamesCache, System.Globalization.CultureInfo culture, Microsoft.Extensions.Logging.ILogger logger) : base (default(System.Resources.ResourceManager), default(System.Reflection.Assembly), default(string), default(Microsoft.Extensions.Localization.IResourceNamesCache), default(Microsoft.Extensions.Logging.ILogger)) { }
-        public override Microsoft.Extensions.Localization.LocalizedString this[string name] { get { throw null; } }
-        public override Microsoft.Extensions.Localization.LocalizedString this[string name, params object[] arguments] { get { throw null; } }
-        public override System.Collections.Generic.IEnumerable<Microsoft.Extensions.Localization.LocalizedString> GetAllStrings(bool includeParentCultures) { throw null; }
-    }
     public partial class ResourceNamesCache : Microsoft.Extensions.Localization.IResourceNamesCache
     {
         public ResourceNamesCache() { }
diff --git a/src/Localization/Localization/ref/Microsoft.Extensions.Localization.netstandard2.0.cs b/src/Localization/Localization/ref/Microsoft.Extensions.Localization.netstandard2.0.cs
@@ -36,8 +36,6 @@ public ResourceManagerStringLocalizer(System.Resources.ResourceManager resourceM
         public virtual System.Collections.Generic.IEnumerable<Microsoft.Extensions.Localization.LocalizedString> GetAllStrings(bool includeParentCultures) { throw null; }
         protected System.Collections.Generic.IEnumerable<Microsoft.Extensions.Localization.LocalizedString> GetAllStrings(bool includeParentCultures, System.Globalization.CultureInfo culture) { throw null; }
         protected string GetStringSafely(string name, System.Globalization.CultureInfo culture) { throw null; }
-        [System.ObsoleteAttribute("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")]
-        public Microsoft.Extensions.Localization.IStringLocalizer WithCulture(System.Globalization.CultureInfo culture) { throw null; }
     }
     public partial class ResourceManagerStringLocalizerFactory : Microsoft.Extensions.Localization.IStringLocalizerFactory
     {
@@ -52,14 +50,6 @@ public ResourceManagerStringLocalizerFactory(Microsoft.Extensions.Options.IOptio
         protected virtual string GetResourcePrefix(string location, string baseName, string resourceLocation) { throw null; }
         protected virtual Microsoft.Extensions.Localization.RootNamespaceAttribute GetRootNamespaceAttribute(System.Reflection.Assembly assembly) { throw null; }
     }
-    [System.ObsoleteAttribute("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")]
-    public partial class ResourceManagerWithCultureStringLocalizer : Microsoft.Extensions.Localization.ResourceManagerStringLocalizer
-    {
-        public ResourceManagerWithCultureStringLocalizer(System.Resources.ResourceManager resourceManager, System.Reflection.Assembly resourceAssembly, string baseName, Microsoft.Extensions.Localization.IResourceNamesCache resourceNamesCache, System.Globalization.CultureInfo culture, Microsoft.Extensions.Logging.ILogger logger) : base (default(System.Resources.ResourceManager), default(System.Reflection.Assembly), default(string), default(Microsoft.Extensions.Localization.IResourceNamesCache), default(Microsoft.Extensions.Logging.ILogger)) { }
-        public override Microsoft.Extensions.Localization.LocalizedString this[string name] { get { throw null; } }
-        public override Microsoft.Extensions.Localization.LocalizedString this[string name, params object[] arguments] { get { throw null; } }
-        public override System.Collections.Generic.IEnumerable<Microsoft.Extensions.Localization.LocalizedString> GetAllStrings(bool includeParentCultures) { throw null; }
-    }
     public partial class ResourceNamesCache : Microsoft.Extensions.Localization.IResourceNamesCache
     {
         public ResourceNamesCache() { }
diff --git a/src/Localization/Localization/src/ResourceManagerStringLocalizer.cs b/src/Localization/Localization/src/ResourceManagerStringLocalizer.cs
@@ -146,30 +146,6 @@ public virtual LocalizedString this[string name]
             }
         }
 
-        /// <summary>
-        /// Creates a new <see cref="ResourceManagerStringLocalizer"/> for a specific <see cref="CultureInfo"/>.
-        /// </summary>
-        /// <param name="culture">The <see cref="CultureInfo"/> to use.</param>
-        /// <returns>A culture-specific <see cref="ResourceManagerStringLocalizer"/>.</returns>
-        [Obsolete("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")]
-        public IStringLocalizer WithCulture(CultureInfo culture)
-        {
-            return culture == null
-                ? new ResourceManagerStringLocalizer(
-                    _resourceManager,
-                    _resourceStringProvider,
-                    _resourceBaseName,
-                    _resourceNamesCache,
-                    _logger)
-                : new ResourceManagerWithCultureStringLocalizer(
-                    _resourceManager,
-                    _resourceStringProvider,
-                    _resourceBaseName,
-                    _resourceNamesCache,
-                    culture,
-                    _logger);
-        }
-
         /// <inheritdoc />
         public virtual IEnumerable<LocalizedString> GetAllStrings(bool includeParentCultures) =>
             GetAllStrings(includeParentCultures, CultureInfo.CurrentUICulture);
diff --git a/src/Localization/Localization/src/ResourceManagerWithCultureStringLocalizer.cs b/src/Localization/Localization/src/ResourceManagerWithCultureStringLocalizer.cs
diff --git a/src/Localization/Localization/test/Microsoft.Extensions.Localization.Tests/StringLocalizerOfTTest.cs b/src/Localization/Localization/test/Microsoft.Extensions.Localization.Tests/StringLocalizerOfTTest.cs
@@ -33,28 +33,6 @@ public void Constructor_ResolvesLocalizerFromFactory()
             factory.Verify(mock => mock.Create(typeof(object)), Times.Once());
         }
 
-        [Fact]
-        public void WithCulture_InvokesWithCultureFromInnerLocalizer()
-        {
-            // Arrange
-            var factory = new Mock<IStringLocalizerFactory>();
-            var innerLocalizer = new Mock<IStringLocalizer>();
-            factory.Setup(mock => mock.Create(typeof(object)))
-                .Returns(innerLocalizer.Object);
-
-            var localizer = new StringLocalizer<object>(factory.Object);
-
-            // Act
-#pragma warning disable CS0618
-            localizer.WithCulture(CultureInfo.GetCultureInfo("fr-FR"));
-#pragma warning restore CS0618
-
-            // Assert
-#pragma warning disable CS0618
-            innerLocalizer.Verify(mock => mock.WithCulture(CultureInfo.GetCultureInfo("fr-FR")), Times.Once());
-#pragma warning restore CS0618
-        }
-
         [Fact]
         public void Indexer_ThrowsAnExceptionForNullName()
         {

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,6 @@ public partial interface IStringLocalizer`
`8`	`8`	`Microsoft.Extensions.Localization.LocalizedString this[string name] { get; }`
`9`	`9`	`Microsoft.Extensions.Localization.LocalizedString this[string name, params object[] arguments] { get; }`
`10`	`10`	`System.Collections.Generic.IEnumerable<Microsoft.Extensions.Localization.LocalizedString> GetAllStrings(bool includeParentCultures);`
`11`		- [System.ObsoleteAttribute("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")]
`12`		`- Microsoft.Extensions.Localization.IStringLocalizer WithCulture(System.Globalization.CultureInfo culture);`
`13`	`11`	`}`
`14`	`12`	`public partial interface IStringLocalizerFactory`
`15`	`13`	`{`
`@@ -43,7 +41,5 @@ public StringLocalizer(Microsoft.Extensions.Localization.IStringLocalizerFactory`
`43`	`41`	`public virtual Microsoft.Extensions.Localization.LocalizedString this[string name] { get { throw null; } }`
`44`	`42`	`public virtual Microsoft.Extensions.Localization.LocalizedString this[string name, params object[] arguments] { get { throw null; } }`
`45`	`43`	`public System.Collections.Generic.IEnumerable<Microsoft.Extensions.Localization.LocalizedString> GetAllStrings(bool includeParentCultures) { throw null; }`
`46`		- [System.ObsoleteAttribute("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")]
`47`		`- public virtual Microsoft.Extensions.Localization.IStringLocalizer WithCulture(System.Globalization.CultureInfo culture) { throw null; }`
`48`	`44`	`}`
`49`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,13 +35,5 @@ public interface IStringLocalizer`
`35`	`35`	`/// </param>`
`36`	`36`	`/// <returns>The strings.</returns>`
`37`	`37`	`IEnumerable<LocalizedString> GetAllStrings(bool includeParentCultures);`
`38`		`-`
`39`		`- /// <summary>`
`40`		`- /// Creates a new <see cref="IStringLocalizer"/> for a specific <see cref="CultureInfo"/>.`
`41`		`- /// </summary>`
`42`		`- /// <param name="culture">The <see cref="CultureInfo"/> to use.</param>`
`43`		`- /// <returns>A culture-specific <see cref="IStringLocalizer"/>.</returns>`
`44`		- [Obsolete("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")]
`45`		`- IStringLocalizer WithCulture(CultureInfo culture);`
`46`	`38`	`}`
`47`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,10 +29,6 @@ public StringLocalizer(IStringLocalizerFactory factory)`
`29`	`29`	`_localizer = factory.Create(typeof(TResourceSource));`
`30`	`30`	`}`
`31`	`31`
`32`		`- /// <inheritdoc />`
`33`		- [Obsolete("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")]
`34`		`- public virtual IStringLocalizer WithCulture(CultureInfo culture) => _localizer.WithCulture(culture);`
`35`		`-`
`36`	`32`	`/// <inheritdoc />`
`37`	`33`	`public virtual LocalizedString this[string name]`
`38`	`34`	`{`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,6 @@ public ResourceManagerStringLocalizer(System.Resources.ResourceManager resourceM`
`36`	`36`	`public virtual System.Collections.Generic.IEnumerable<Microsoft.Extensions.Localization.LocalizedString> GetAllStrings(bool includeParentCultures) { throw null; }`
`37`	`37`	`protected System.Collections.Generic.IEnumerable<Microsoft.Extensions.Localization.LocalizedString> GetAllStrings(bool includeParentCultures, System.Globalization.CultureInfo culture) { throw null; }`
`38`	`38`	`protected string GetStringSafely(string name, System.Globalization.CultureInfo culture) { throw null; }`
`39`		- [System.ObsoleteAttribute("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")]
`40`		`- public Microsoft.Extensions.Localization.IStringLocalizer WithCulture(System.Globalization.CultureInfo culture) { throw null; }`
`41`	`39`	`}`
`42`	`40`	`public partial class ResourceManagerStringLocalizerFactory : Microsoft.Extensions.Localization.IStringLocalizerFactory`
`43`	`41`	`{`
`@@ -52,14 +50,6 @@ public ResourceManagerStringLocalizerFactory(Microsoft.Extensions.Options.IOptio`
`52`	`50`	`protected virtual string GetResourcePrefix(string location, string baseName, string resourceLocation) { throw null; }`
`53`	`51`	`protected virtual Microsoft.Extensions.Localization.RootNamespaceAttribute GetRootNamespaceAttribute(System.Reflection.Assembly assembly) { throw null; }`
`54`	`52`	`}`
`55`		- [System.ObsoleteAttribute("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")]
`56`		`- public partial class ResourceManagerWithCultureStringLocalizer : Microsoft.Extensions.Localization.ResourceManagerStringLocalizer`
`57`		`- {`
`58`		- public ResourceManagerWithCultureStringLocalizer(System.Resources.ResourceManager resourceManager, System.Reflection.Assembly resourceAssembly, string baseName, Microsoft.Extensions.Localization.IResourceNamesCache resourceNamesCache, System.Globalization.CultureInfo culture, Microsoft.Extensions.Logging.ILogger logger) : base (default(System.Resources.ResourceManager), default(System.Reflection.Assembly), default(string), default(Microsoft.Extensions.Localization.IResourceNamesCache), default(Microsoft.Extensions.Logging.ILogger)) { }
`59`		`- public override Microsoft.Extensions.Localization.LocalizedString this[string name] { get { throw null; } }`
`60`		`- public override Microsoft.Extensions.Localization.LocalizedString this[string name, params object[] arguments] { get { throw null; } }`
`61`		`- public override System.Collections.Generic.IEnumerable<Microsoft.Extensions.Localization.LocalizedString> GetAllStrings(bool includeParentCultures) { throw null; }`
`62`		`- }`
`63`	`53`	`public partial class ResourceNamesCache : Microsoft.Extensions.Localization.IResourceNamesCache`
`64`	`54`	`{`
`65`	`55`	`public ResourceNamesCache() { }`