Build 0.18.0.0

Barotrauma/BarotraumaShared/SharedSource/Utils/AssemblyInfo.cs

@@ -1,7 +1,11 @@
 using System;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 
+[assembly:InternalsVisibleTo("WindowsTest"),
+          InternalsVisibleTo("MacTest"),
+          InternalsVisibleTo("LinuxTest")]
 public static class AssemblyInfo
 {
     public static readonly string GitRevision;

Barotrauma/BarotraumaShared/SharedSource/Utils/ReflectionUtils.cs

@@ -7,9 +7,14 @@ namespace Barotrauma
 {
     public static class ReflectionUtils
     {
+        private static Type[] cachedNonAbstractTypes;
         public static IEnumerable<Type> GetDerivedNonAbstract<T>()
         {
-            return Assembly.GetEntryAssembly().GetTypes().Where(t => t.IsSubclassOf(typeof(T)) && !t.IsAbstract);
+            if (cachedNonAbstractTypes == null)
+            {
+                cachedNonAbstractTypes = Assembly.GetEntryAssembly().GetTypes().Where(t => !t.IsAbstract).ToArray();
+            }
+            return cachedNonAbstractTypes.Where(t => t.IsSubclassOf(typeof(T)));
         }
     }
 }

Barotrauma/BarotraumaShared/SharedSource/Utils/SaveUtil.cs

@@ -480,7 +480,7 @@ namespace Barotrauma
             int read = 0;
 
             // FIXME workaround for .NET6 causing save decompression to fail
-#if NET6_0 && LINUX
+#if NET6_0
             for (int i = 0; i < amount; i++)
             {
                 int result = zipStream.ReadByte();