Merge pull request #11 from cloudscribe/dev

resolve #10, bump version

Author: joeaudette

src/cloudscribe.Web.Localization/GlobalResourceManagerStringLocalizer.cs

@@ -21,14 +21,16 @@ public class GlobalResourceManagerStringLocalizer : IStringLocalizer
         private readonly ConcurrentDictionary<string, object> _missingManifestCache = new ConcurrentDictionary<string, object>();
         private readonly IResourceNamesCache _resourceNamesCache;
         private readonly ResourceManager _resourceManager;
-        private readonly AssemblyWrapper _resourceAssemblyWrapper;
+        private readonly Assembly _resourceAssembly;
         private readonly string _resourceBaseName;
 
         private readonly ResourceManager _globalResourceManager;
         private readonly GlobalResourceOptions _globalResourceOptions;
 
+        
+
         /// <summary>
-        /// Creates a new <see cref="HybridResourceManagerStringLocalizer"/>.
+        /// Creates a new <see cref="GlobalResourceManagerStringLocalizer"/>.
         /// </summary>
         /// <param name="resourceManager">The <see cref="System.Resources.ResourceManager"/> to read strings from.</param>
         /// <param name="resourceAssembly">The <see cref="Assembly"/> that contains the strings as embedded resources.</param>
@@ -44,41 +46,15 @@ public GlobalResourceManagerStringLocalizer(
             GlobalResourceOptions globalResourceOptions,
             ResourceManager globalResourceManager = null
             )
-            : this(
-                  resourceManager, 
-                  new AssemblyWrapper(resourceAssembly), 
-                  baseName, 
-                  resourceNamesCache,
-                  globalResourceOptions,
-                  globalResourceManager
-                  )
-        {
-            if (resourceAssembly == null)
-            {
-                throw new ArgumentNullException(nameof(resourceAssembly));
-            }
-        }
-
-        /// <summary>
-        /// Intended for testing purposes only.
-        /// </summary>
-        public GlobalResourceManagerStringLocalizer(
-            ResourceManager resourceManager,
-            AssemblyWrapper resourceAssemblyWrapper,
-            string baseName,
-            IResourceNamesCache resourceNamesCache,
-            GlobalResourceOptions globalResourceOptions,
-            ResourceManager globalResourceManager = null
-            )
         {
             if (resourceManager == null)
             {
                 throw new ArgumentNullException(nameof(resourceManager));
             }
 
-            if (resourceAssemblyWrapper == null)
+            if (resourceAssembly == null)
             {
-                throw new ArgumentNullException(nameof(resourceAssemblyWrapper));
+                throw new ArgumentNullException(nameof(resourceAssembly));
             }
 
             if (baseName == null)
@@ -91,7 +67,7 @@ public GlobalResourceManagerStringLocalizer(
                 throw new ArgumentNullException(nameof(resourceNamesCache));
             }
 
-            _resourceAssemblyWrapper = resourceAssemblyWrapper;
+            _resourceAssembly = resourceAssembly;
             _resourceManager = resourceManager;
             _resourceBaseName = baseName;
             _resourceNamesCache = resourceNamesCache;
@@ -143,15 +119,15 @@ public IStringLocalizer WithCulture(CultureInfo culture)
             return culture == null
                 ? new GlobalResourceManagerStringLocalizer(
                     _resourceManager,
-                    _resourceAssemblyWrapper.Assembly,
+                    _resourceAssembly,
                     _resourceBaseName,
                     _resourceNamesCache,
                     _globalResourceOptions,
                     _globalResourceManager
                     )
                 : new GlobalResourceManagerWithCultureStringLocalizer(
                     _resourceManager,
-                    _resourceAssemblyWrapper.Assembly,
+                    _resourceAssembly,
                     _resourceBaseName,
                     _resourceNamesCache,
                     culture,
@@ -307,11 +283,11 @@ private IList<string> GetResourceNamesForCulture(CultureInfo culture)
         {
             var resourceStreamName = GetResourceStreamName(culture);
 
-            var cacheKey = $"assembly={_resourceAssemblyWrapper.FullName};resourceStreamName={resourceStreamName}";
+            var cacheKey = $"assembly={_resourceAssembly.FullName};resourceStreamName={resourceStreamName}";
 
             var cultureResourceNames = _resourceNamesCache.GetOrAdd(cacheKey, _ =>
             {
-                using (var cultureResourceStream = _resourceAssemblyWrapper.GetManifestResourceStream(resourceStreamName))
+                using (var cultureResourceStream = _resourceAssembly.GetManifestResourceStream(resourceStreamName))
                 {
                     if (cultureResourceStream == null)
                     {

src/cloudscribe.Web.Localization/GlobalResourceManagerStringLocalizerFactory.cs

@@ -21,7 +21,7 @@ public class GlobalResourceManagerStringLocalizerFactory : IStringLocalizerFacto
         private readonly IResourceNamesCache _resourceNamesCache = new ResourceNamesCache();
         private readonly ConcurrentDictionary<string, GlobalResourceManagerStringLocalizer> _localizerCache =
             new ConcurrentDictionary<string, GlobalResourceManagerStringLocalizer>();
-        private readonly IHostingEnvironment _hostingEnvironment;
+        private readonly IWebHostEnvironment _hostingEnvironment;
         private readonly string _resourcesRelativePath;
         private readonly GlobalResourceOptions globalResourceOptions;
 
@@ -31,7 +31,7 @@ public class GlobalResourceManagerStringLocalizerFactory : IStringLocalizerFacto
         /// <param name="hostingEnvironment">The <see cref="IHostingEnvironment"/>.</param>
         /// <param name="localizationOptions">The <see cref="IOptions{LocalizationOptions}"/>.</param>
         public GlobalResourceManagerStringLocalizerFactory(
-            IHostingEnvironment hostingEnvironment,
+            IWebHostEnvironment hostingEnvironment,
             IOptions<LocalizationOptions> localizationOptions,
             IOptions<GlobalResourceOptions> globalResourceOptionsAccessor
             )

src/cloudscribe.Web.Localization/cloudscribe.Web.Localization.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>more flexible localization for ASP.NET Core</Description>
-    <Version>3.0.2</Version>
+    <Version>3.0.3</Version>
     <Authors>Joe Audette</Authors>
     <TargetFrameworks>netcoreapp3.0</TargetFrameworks>
     <PackageId>cloudscribe.Web.Localization</PackageId>