From 63af4318a326be8fffc489b31bb944b6dcddcf96 Mon Sep 17 00:00:00 2001
From: Ryan Brandenburg <rybrande@microsoft.com>
Date: Mon, 7 Nov 2016 09:58:51 -0800
Subject: [PATCH 1/2] 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;
 
         /// <summary>
@@ -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
             }
         }
 
+        /// <summary>
+        /// Intended for testing purposes only.
+        /// </summary>
+        public ResourceManagerStringLocalizer(
+            ResourceManager resourceManager,
+            AssemblyWrapper resourceAssemblyWrapper,
+            string baseName,
+            IResourceNamesCache resourceNamesCache)
+            : this(
+                  resourceManager,
+                  new AssemblyResourceStringProvider(resourceNamesCache, resourceAssemblyWrapper, baseName),
+                  baseName,
+                  resourceNamesCache)
+        {
+            _resourceAssemblyWrapper = resourceAssemblyWrapper;
+        }
+
         /// <summary>
         /// Intended for testing purposes only.
         /// </summary>

From 5c1844947472a7d72f43f5159a9a59eb49e5c0c3 Mon Sep 17 00:00:00 2001
From: Hisham Bin Ateya <hishamco_2007@yahoo.com>
Date: Mon, 7 Nov 2016 23:00:49 +0300
Subject: [PATCH 2/2] Remove unnecessary code in ResourceManagerStringLocalizer
 (#300)

Remove lines from empty constructors
---
 .../ResourceManagerStringLocalizer.cs                       | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/Microsoft.Extensions.Localization/ResourceManagerStringLocalizer.cs b/src/Microsoft.Extensions.Localization/ResourceManagerStringLocalizer.cs
index 976d612fa7..128c1c1f6a 100644
--- a/src/Microsoft.Extensions.Localization/ResourceManagerStringLocalizer.cs
+++ b/src/Microsoft.Extensions.Localization/ResourceManagerStringLocalizer.cs
@@ -22,7 +22,6 @@ namespace Microsoft.Extensions.Localization
         private readonly IResourceNamesCache _resourceNamesCache;
         private readonly ResourceManager _resourceManager;
         private readonly IResourceStringProvider _resourceStringProvider;
-        private readonly AssemblyWrapper _resourceAssemblyWrapper;
         private readonly string _resourceBaseName;
 
         /// <summary>
@@ -43,10 +42,6 @@ namespace Microsoft.Extensions.Localization
                 baseName,
                 resourceNamesCache)
         {
-            if (resourceAssembly == null)
-            {
-                throw new ArgumentNullException(nameof(resourceAssembly));
-            }
         }
 
         /// <summary>
@@ -63,7 +58,6 @@ namespace Microsoft.Extensions.Localization
                   baseName,
                   resourceNamesCache)
         {
-            _resourceAssemblyWrapper = resourceAssemblyWrapper;
         }
 
         /// <summary>