1.11.10 (#68)

- Introduced the `SE_PLUGIN_THROW_ON_FAILED_METHOD_VERIFICATION` environment variable for internal testing with new game versions No functional change.
viktor-ferenczi · Oct 7, 2024 · 688952f · 688952f
1 parent 314dcaa
commit 688952f
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 7 deletions.
diff --git a/ClientPlugin/Properties/AssemblyInfo.cs b/ClientPlugin/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.11.9.0")]
-[assembly: AssemblyFileVersion("1.11.9.0")]
+[assembly: AssemblyVersion("1.11.10.0")]
+[assembly: AssemblyFileVersion("1.11.10.0")]
diff --git a/DedicatedPlugin/Properties/AssemblyInfo.cs b/DedicatedPlugin/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.11.9.0")]
-[assembly: AssemblyFileVersion("1.11.9.0")]
+[assembly: AssemblyVersion("1.11.10.0")]
+[assembly: AssemblyFileVersion("1.11.10.0")]
diff --git a/Shared/Patches/PatchHelpers.cs b/Shared/Patches/PatchHelpers.cs
@@ -26,6 +26,7 @@ public static bool HarmonyPatchAll(IPluginLogger log, Harmony harmony)
             if (Common.Plugin.Config.DetectCodeChanges && Environment.GetEnvironmentVariable("SE_PLUGIN_DISABLE_METHOD_VERIFICATION") == null)
             {
                 log.Debug("Scanning for conflicting code changes");
+                var throwOnFailedVerification = Environment.GetEnvironmentVariable("SE_PLUGIN_THROW_ON_FAILED_METHOD_VERIFICATION") != null;
                 try
                 {
                     var codeChanges = EnsureCode.Verify().ToList();
@@ -34,12 +35,24 @@ public static bool HarmonyPatchAll(IPluginLogger log, Harmony harmony)
                         log.Critical("Detected conflicting code changes:");
                         foreach (var codeChange in codeChanges)
                             log.Info(codeChange.ToString());
+
+                        if (throwOnFailedVerification)
+                        {
+                            throw new Exception("Detected conflicting code changes");
+                        }
+
                         return false;
                     }
                 }
                 catch (Exception ex)
                 {
                     log.Critical(ex, "Failed to scan for conflicting code changes");
+
+                    if (throwOnFailedVerification)
+                    {
+                        throw;
+                    }
+
                     return false;
                 }
             }

diff --git a/TorchPlugin/Properties/AssemblyInfo.cs b/TorchPlugin/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.11.9.0")]
-[assembly: AssemblyFileVersion("1.11.9.0")]
+[assembly: AssemblyVersion("1.11.10.0")]
+[assembly: AssemblyFileVersion("1.11.10.0")]
diff --git a/TorchPlugin/manifest.xml b/TorchPlugin/manifest.xml
@@ -3,5 +3,5 @@
   <Name>PerformanceImprovements</Name>
   <Guid>c2cf3ed2-c6ac-4dbd-ab9a-613a1ef67784</Guid>
   <Repository>PerformanceImprovements</Repository>
-  <Version>v1.11.9.0</Version>
+  <Version>v1.11.10.0</Version>
 </PluginManifest>