Don't share controller and source collections between instances (#11266)

Author: keveleigh

Assets/MRTK/Core/Providers/UnityInput/UnityJoystickManager.cs

@@ -54,7 +54,7 @@ public UnityJoystickManager(
 
         private const float DeviceRefreshInterval = 3.0f;
 
-        protected static readonly Dictionary<string, GenericJoystickController> ActiveControllers = new Dictionary<string, GenericJoystickController>();
+        protected readonly Dictionary<string, GenericJoystickController> ActiveControllers = new Dictionary<string, GenericJoystickController>();
 
         private float deviceRefreshTimer;
         private string[] lastDeviceList;

Assets/MRTK/Core/Providers/UnityInput/UnityTouchDeviceManager.cs

@@ -50,7 +50,7 @@ public UnityTouchDeviceManager(
             uint priority = DefaultPriority,
             BaseMixedRealityProfile profile = null) : base(inputSystem, name, priority, profile) { }
 
-        private static readonly Dictionary<int, UnityTouchController> ActiveTouches = new Dictionary<int, UnityTouchController>();
+        private readonly Dictionary<int, UnityTouchController> ActiveTouches = new Dictionary<int, UnityTouchController>();
 
         private List<UnityTouchController> touchesToRemove = new List<UnityTouchController>();
 

Assets/MRTK/Providers/OpenXR/Scripts/OpenXREyeGazeDataProvider.cs

@@ -75,7 +75,7 @@ public OpenXREyeGazeDataProvider(
         public event Action OnSaccadeY;
         private void GazeSmoother_OnSaccadeY() => OnSaccadeY?.Invoke();
 
-        private static readonly List<InputDevice> InputDeviceList = new List<InputDevice>();
+        private readonly List<InputDevice> InputDeviceList = new List<InputDevice>();
         private InputDevice eyeTrackingDevice = default(InputDevice);
 
         #region IMixedRealityCapabilityCheck Implementation

Assets/MRTK/Providers/XRSDK/XRSDKDeviceManager.cs

@@ -45,7 +45,7 @@ public virtual bool CheckCapability(MixedRealityCapability capability)
             return (capability == MixedRealityCapability.MotionController);
         }
 
-        protected static readonly Dictionary<InputDevice, GenericXRSDKController> ActiveControllers = new Dictionary<InputDevice, GenericXRSDKController>();
+        protected readonly Dictionary<InputDevice, GenericXRSDKController> ActiveControllers = new Dictionary<InputDevice, GenericXRSDKController>();
 
         private readonly List<InputDevice> inputDevices = new List<InputDevice>();
         private readonly List<InputDevice> inputDevicesSubset = new List<InputDevice>();
@@ -149,7 +149,7 @@ public override void Disable()
             InputDevices.deviceDisconnected -= InputDevices_deviceDisconnected;
 
             var controllersCopy = ActiveControllers.ToReadOnlyCollection();
-            foreach (var controller in controllersCopy)
+            foreach (KeyValuePair<InputDevice, GenericXRSDKController> controller in controllersCopy)
             {
                 RemoveController(controller.Key);
             }