Adapted for Unity 2021

Assets/Editor/BuildGame.cs

@@ -40,7 +40,7 @@ public static void Windows64()
 
     public static void OSX()
     {
-        BuildPipeline.BuildPlayer(GetScenes(), "Builds/" + BuildName + "_OSX", BuildTarget.StandaloneOSXUniversal, BuildOptions.None);
+        BuildPipeline.BuildPlayer(GetScenes(), "Builds/" + BuildName + "_OSX", BuildTarget.StandaloneOSX, BuildOptions.None);
     }
 
     public static void Linux()

Assets/Editor/UnitTests/Models/Functions/LuaFunctionsTest.cs

@@ -58,11 +58,10 @@ public void Test_LoadScript()
     }
 
     [Test]
-    [ExpectedException(typeof(System.NullReferenceException))]
     public void Test_LoadScript_Null()
     {
         // Try loading a Lua Code from a null text
-        functions.LoadScript(null, string.Empty);
+        Assert.Throws<NullReferenceException>(() => functions.LoadScript(null, string.Empty));
     }
 
     [Test]

Assets/Editor/UnitTests/Models/Power/PowerGridTest.cs

@@ -29,10 +29,9 @@ public void Init()
     }
 
     [Test]
-    [ExpectedException(typeof(ArgumentNullException))]
     public void PlugInArgumentNullException()
     {
-        grid.PlugIn(null);
+        Assert.Throws<ArgumentNullException>(() => grid.PlugIn(null));
     }
 
     [Test]

Assets/Editor/UnitTests/Models/Power/PowerNetworkTest.cs

@@ -30,10 +30,9 @@ public void Init()
     }
 
     [Test]
-    [ExpectedException(typeof(ArgumentNullException))]
     public void PlugInArgumentNullException()
     {
-        powerNetwork.PlugIn(null);
+        Assert.Throws<ArgumentNullException>(() => powerNetwork.PlugIn(null));
     }
 
     [Test]

Assets/Editor/UnitTests/Utilities/DuplicateKeyComparerTest.cs

@@ -216,11 +216,11 @@ public void Compare_AgainstSmallerValue_equalValueAtEnd_True()
      */
 
     [Test]
-    [ExpectedException(typeof(NullReferenceException))]
     public void Compare_NullAgainstNull()
     {
         DuplicateKeyComparer<string> dkc_int = new DuplicateKeyComparer<string>();
-        dkc_int.Compare(null, null);
+        Assert.Throws<NullReferenceException>(() => dkc_int.Compare(null, null));
+
     }
 
     /*
@@ -262,29 +262,27 @@ public void Compare_ValueAgainstNull_equalValueAtEnd_True()
      */
 
     [Test]
-    [ExpectedException(typeof(NullReferenceException))]
     public void Compare_NullAgainstValue()
     {
         string test_string = "test";
         DuplicateKeyComparer<string> dkc_int = new DuplicateKeyComparer<string>();
-        dkc_int.Compare(null, test_string);
+        Assert.Throws<NullReferenceException>(() => dkc_int.Compare(null, test_string));
     }
 
     [Test]
-    [ExpectedException(typeof(NullReferenceException))]
     public void Compare_NullAgainstValue_equalValueAtEnd_False()
     {
         string test_string = "test";
         DuplicateKeyComparer<string> dkc_int = new DuplicateKeyComparer<string>(false);
-        dkc_int.Compare(null, test_string);
+        Assert.Throws<NullReferenceException>(() => dkc_int.Compare(null, test_string));
     }
 
     [Test]
-    [ExpectedException(typeof(NullReferenceException))]
     public void Compare_NullAgainstValue_equalValueAtEnd_True()
     {
         string test_string = "test";
         DuplicateKeyComparer<string> dkc_int = new DuplicateKeyComparer<string>(true);
-        dkc_int.Compare(null, test_string);
+        Assert.Throws<NullReferenceException>(() => dkc_int.Compare(null, test_string));
+
     }
 }

Assets/Editor/UnitTests/Utilities/ModUtilsTest.cs

@@ -93,10 +93,9 @@ public void Test_Round()
     }
 
     [Test]
-    [ExpectedException(typeof(ArgumentOutOfRangeException))]
     public void Test_Round_NegitiveDigits()
     {
         float value_2 = 9.9998f;
-        ModUtils.Round(value_2, -2);
+        Assert.Throws<ArgumentOutOfRangeException>(() => ModUtils.Round(value_2, -2));
     }
 }

Assets/Editor/UnitTests/Utilities/ParametersEditorTest.cs

@@ -7,6 +7,7 @@
 // ====================================================
 #endregion
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Text;
 using System.Xml;
@@ -147,8 +148,8 @@ public void ParameterCopyConstructorDoesDeepCopy()
     [Test]
     public void ParameterChangeFloatValue()
     {
-        param1["gas_limit"].ChangeFloatValue(1.0f);
-        Assert.That(param1["gas_limit"].ToString(), Is.EqualTo("1.2"));
+        param1["gas_limit"].ChangeFloatValue(1.2f);
+        Assert.That(param1["gas_limit"].ToString(), Is.EqualTo(1.2f.ToString(CultureInfo.CurrentCulture)));
     }
 
     [Test]