From 63af4318a326be8fffc489b31bb944b6dcddcf96 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Mon, 7 Nov 2016 09:58:51 -0800 Subject: [PATCH] Restore AssemblyWrapper constructor --- .../ResourceManagerStringLocalizer.cs | 29 ++++++++++++++----- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/src/Microsoft.Extensions.Localization/ResourceManagerStringLocalizer.cs b/src/Microsoft.Extensions.Localization/ResourceManagerStringLocalizer.cs index cccd45f1a0..976d612fa7 100644 --- a/src/Microsoft.Extensions.Localization/ResourceManagerStringLocalizer.cs +++ b/src/Microsoft.Extensions.Localization/ResourceManagerStringLocalizer.cs @@ -22,6 +22,7 @@ namespace Microsoft.Extensions.Localization private readonly IResourceNamesCache _resourceNamesCache; private readonly ResourceManager _resourceManager; private readonly IResourceStringProvider _resourceStringProvider; + private readonly AssemblyWrapper _resourceAssemblyWrapper; private readonly string _resourceBaseName; /// @@ -37,13 +38,10 @@ namespace Microsoft.Extensions.Localization string baseName, IResourceNamesCache resourceNamesCache) : this( - resourceManager, - new AssemblyResourceStringProvider( - resourceNamesCache, - new AssemblyWrapper(resourceAssembly), - baseName), - baseName, - resourceNamesCache) + resourceManager, + new AssemblyWrapper(resourceAssembly), + baseName, + resourceNamesCache) { if (resourceAssembly == null) { @@ -51,6 +49,23 @@ namespace Microsoft.Extensions.Localization } } + /// + /// Intended for testing purposes only. + /// + public ResourceManagerStringLocalizer( + ResourceManager resourceManager, + AssemblyWrapper resourceAssemblyWrapper, + string baseName, + IResourceNamesCache resourceNamesCache) + : this( + resourceManager, + new AssemblyResourceStringProvider(resourceNamesCache, resourceAssemblyWrapper, baseName), + baseName, + resourceNamesCache) + { + _resourceAssemblyWrapper = resourceAssemblyWrapper; + } + /// /// Intended for testing purposes only. ///