From b6bdca96c1d8d892c31fb77977510f69ea3c05a6 Mon Sep 17 00:00:00 2001
From: Ryland <ryalan@microsoft.com>
Date: Mon, 15 Apr 2019 16:13:44 -0700
Subject: [PATCH] Make BamlMapTable's KnownAssemblyInfoRecord an instance field

---
 .../System/Windows/Markup/BamlMapTable.cs          | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/BamlMapTable.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/BamlMapTable.cs
index 85091bfa48f..1fd3aee067e 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/BamlMapTable.cs
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/BamlMapTable.cs
@@ -79,10 +79,10 @@ internal BamlMapTable(XamlTypeMapper xamlTypeMapper)
             _xamlTypeMapper = xamlTypeMapper;
 
             // Setup the assembly record for the known types of controls
-            KnownAssemblyInfoRecord = new BamlAssemblyInfoRecord();
-            KnownAssemblyInfoRecord.AssemblyId = -1;
-            KnownAssemblyInfoRecord.Assembly = ReflectionHelper.LoadAssembly(_frameworkAssembly, string.Empty);
-            KnownAssemblyInfoRecord.AssemblyFullName = KnownAssemblyInfoRecord.Assembly.FullName;
+            _knownAssemblyInfoRecord = new BamlAssemblyInfoRecord();
+            _knownAssemblyInfoRecord.AssemblyId = -1;
+            _knownAssemblyInfoRecord.Assembly = ReflectionHelper.LoadAssembly(_frameworkAssembly, string.Empty);
+            _knownAssemblyInfoRecord.AssemblyFullName = _knownAssemblyInfoRecord.Assembly.FullName;
         }
 
 #endregion Constructor
@@ -995,7 +995,7 @@ internal BamlAssemblyInfoRecord GetAssemblyInfoFromId(short id)
             // case return the known assembly info record.
             if (id == -1)
             {
-                return KnownAssemblyInfoRecord;
+                return _knownAssemblyInfoRecord;
             }
             else
             {
@@ -1803,7 +1803,6 @@ private Hashtable ConverterCache
 
         private const string _coreAssembly                 = "PresentationCore";
         private const string _frameworkAssembly            = "PresentationFramework";
-        private static BamlAssemblyInfoRecord KnownAssemblyInfoRecord;
 
         private static string[] _knownStrings =
         {
@@ -1830,6 +1829,9 @@ private Hashtable ConverterCache
         // XamlTypeMapper associated with this map table.  There is always a one-to-one correspondence.
         XamlTypeMapper _xamlTypeMapper;
 
+        // The assembly record for the known types of controls
+        BamlAssemblyInfoRecord _knownAssemblyInfoRecord;
+
 #if !PBTCOMPILER
         // Temporary cache of Known Type Converters for each baml reading session.
         Hashtable _converterCache = null;