Fix type resolution in RulesetStore

osu.Game/Rulesets/RulesetStore.cs

@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets
     /// </summary>
     public class RulesetStore : DatabaseBackedStore
     {
-        private readonly List<Ruleset> instances = new List<Ruleset>();
+        private static readonly Dictionary<Assembly, Type> loaded_assemblies = new Dictionary<Assembly, Type>();
 
         public IEnumerable<RulesetInfo> AllRulesets => Query<RulesetInfo>().Where(r => r.Available);
 
@@ -25,18 +25,9 @@ namespace osu.Game.Rulesets
         {
         }
 
-        private const string ruleset_library_prefix = "osu.Game.Rulesets";
+        static RulesetStore()
-
-        protected override void Prepare(bool reset = false)
         {
-            instances.Clear();
+            AppDomain.CurrentDomain.AssemblyResolve += currentDomain_AssemblyResolve;
-
-            Connection.CreateTable<RulesetInfo>();
-
-            if (reset)
-            {
-                Connection.DeleteAll<RulesetInfo>();
-            }
 
             // todo: don't do this on deploy
             var sln = DebugUtils.GetSolutionPath();
@@ -50,61 +41,75 @@ namespace osu.Game.Rulesets
 
             foreach (string file in Directory.GetFiles(Environment.CurrentDirectory, $"{ruleset_library_prefix}.*.dll"))
                 loadRulesetFromFile(file);
-
-            Connection.BeginTransaction();
-
-            //add all legacy modes in correct order
-            foreach (var r in instances.Where(r => r.LegacyID >= 0).OrderBy(r => r.LegacyID))
-            {
-                Connection.InsertOrReplace(createRulesetInfo(r));
-            }
-
-            //add any other modes
-            foreach (var r in instances.Where(r => r.LegacyID < 0))
-            {
-                var us = createRulesetInfo(r);
-
-                var existing = Query<RulesetInfo>().Where(ri => ri.InstantiationInfo == us.InstantiationInfo).FirstOrDefault();
-
-                if (existing == null)
-                    Connection.Insert(us);
-            }
-
-            //perform a consistency check
-            foreach (var r in Query<RulesetInfo>())
-            {
-                try
-                {
-                    r.CreateInstance();
-                    r.Available = true;
-                }
-                catch
-                {
-                    r.Available = false;
-                }
-
-                Connection.Update(r);
-            }
-
-            Connection.Commit();
         }
 
-        private void loadRulesetFromFile(string file)
+        private static Assembly currentDomain_AssemblyResolve(object sender, ResolveEventArgs args) => loaded_assemblies.Keys.FirstOrDefault(a => a.FullName == args.Name);
+
+        private const string ruleset_library_prefix = "osu.Game.Rulesets";
+
+        protected override void Prepare(bool reset = false)
+        {
+
+            Connection.CreateTable<RulesetInfo>();
+
+            if (reset)
+            {
+                Connection.DeleteAll<RulesetInfo>();
+            }
+
+            var instances = loaded_assemblies.Values.Select(r => (Ruleset)Activator.CreateInstance(r, new RulesetInfo()));
+
+            Connection.RunInTransaction(() =>
+            {
+                //add all legacy modes in correct order
+                foreach (var r in instances.Where(r => r.LegacyID >= 0).OrderBy(r => r.LegacyID))
+                {
+                    Connection.InsertOrReplace(createRulesetInfo(r));
+                }
+
+                //add any other modes
+                foreach (var r in instances.Where(r => r.LegacyID < 0))
+                {
+                    var us = createRulesetInfo(r);
+
+                    var existing = Query<RulesetInfo>().Where(ri => ri.InstantiationInfo == us.InstantiationInfo).FirstOrDefault();
+
+                    if (existing == null)
+                        Connection.Insert(us);
+                }
+            });
+
+            Connection.RunInTransaction(() =>
+            {
+                //perform a consistency check
+                foreach (var r in Query<RulesetInfo>())
+                {
+                    try
+                    {
+                        r.CreateInstance();
+                        r.Available = true;
+                    }
+                    catch
+                    {
+                        r.Available = false;
+                    }
+
+                    Connection.Update(r);
+                }
+            });
+        }
+
+        private static void loadRulesetFromFile(string file)
         {
             var filename = Path.GetFileNameWithoutExtension(file);
 
-            if (instances.Any(i => i.GetType().Namespace == filename))
+            if (loaded_assemblies.Values.Any(t => t.Namespace == filename))
                 return;
 
             try
             {
-                var assembly = Assembly.LoadFile(file);
+                var assembly = Assembly.LoadFrom(file);
-                var rulesets = assembly.GetTypes().Where(t => t.IsSubclassOf(typeof(Ruleset)));
+                loaded_assemblies[assembly] = assembly.GetTypes().First(t => t.IsSubclassOf(typeof(Ruleset)));
-
-                if (rulesets.Count() != 1)
-                    return;
-
-                instances.Add((Ruleset)Activator.CreateInstance(rulesets.First(), new RulesetInfo()));
             }
             catch (Exception) { }
         }