From a2a6004a61199c4dd9ab389d20a0d5e21efce046 Mon Sep 17 00:00:00 2001 From: ZZYZX Date: Sun, 15 Apr 2018 01:59:58 +0300 Subject: [PATCH] Fixed (?): The new .NET 4.6.x JIT method inlining was fucking with GetCallingAssembly-based plugin detection --- Build/Updater.ini | 2 +- Source/Core/Builder.csproj | 1 + .../Controls/CollapsibleSplitContainer.cs | 4 ++-- Source/Core/General/UpdateChecker.cs | 2 +- Source/Core/Plugins/Plug.cs | 19 ++++++++++--------- Source/Core/Plugins/PluginManager.cs | 3 ++- Source/Core/Properties/AssemblyInfo.cs | 4 ++-- Source/Plugins/AutomapMode/AutomapMode.csproj | 6 ++++-- .../BuilderEffects/BuilderEffects.csproj | 9 +++++---- .../Plugins/BuilderModes/BuilderModes.csproj | 6 ++++-- .../BuilderModes/General/BuilderPlug.cs | 7 ++++--- .../BuilderModes/Properties/AssemblyInfo.cs | 2 +- Source/Plugins/ColorPicker/ColorPicker.csproj | 6 ++++-- .../CommentsPanel/CommentsPanel.csproj | 6 ++++-- Source/Plugins/NodesViewer/NodesViewer.csproj | 5 +++-- .../SoundPropagation.csproj | 6 ++++-- .../StairSectorBuilder.csproj | 6 ++++-- Source/Plugins/TagExplorer/TagExplorer.csproj | 6 ++++-- Source/Plugins/TagRange/TagRange.csproj | 9 +++++---- .../VisplaneExplorer/VisplaneExplorer.csproj | 5 +++-- 20 files changed, 68 insertions(+), 46 deletions(-) diff --git a/Build/Updater.ini b/Build/Updater.ini index 981d57d0..d9b74203 100755 --- a/Build/Updater.ini +++ b/Build/Updater.ini @@ -1,4 +1,4 @@ URL http://devbuilds.drdteam.org/gzdbbf/ FileName Builder.exe -UpdateName GZDoom_Builder_Bugfix-r[REVNUM]-[PLATFORM].7z +UpdateName GZDoom_Builder_Bugfix-r[REVNUM].7z UpdaterName GZDB_Updater-[PLATFORM].7z \ No newline at end of file diff --git a/Source/Core/Builder.csproj b/Source/Core/Builder.csproj index a5ddca16..061ac0a7 100644 --- a/Source/Core/Builder.csproj +++ b/Source/Core/Builder.csproj @@ -98,6 +98,7 @@ false true true + TRACE x64 diff --git a/Source/Core/Controls/CollapsibleSplitContainer.cs b/Source/Core/Controls/CollapsibleSplitContainer.cs index b21ed299..fdf332b7 100755 --- a/Source/Core/Controls/CollapsibleSplitContainer.cs +++ b/Source/Core/Controls/CollapsibleSplitContainer.cs @@ -405,8 +405,8 @@ namespace CodeImp.DoomBuilder.Controls } // ISupportInitialize methods. Not needed for .Net 4 and higher - public void BeginInit() { } - public void EndInit() { } + //public void BeginInit() { } + //public void EndInit() { } #endregion } diff --git a/Source/Core/General/UpdateChecker.cs b/Source/Core/General/UpdateChecker.cs index 0f8251f0..6b674f62 100755 --- a/Source/Core/General/UpdateChecker.cs +++ b/Source/Core/General/UpdateChecker.cs @@ -309,7 +309,7 @@ namespace CodeImp.DoomBuilder { response = request.GetResponse(); } - catch(WebException e) + catch(WebException /*e*/) { //General.ErrorLogger.Add(ErrorType.Warning, e.ToString()); return null; diff --git a/Source/Core/Plugins/Plug.cs b/Source/Core/Plugins/Plug.cs index 72d5c4c6..1a712fb3 100755 --- a/Source/Core/Plugins/Plug.cs +++ b/Source/Core/Plugins/Plug.cs @@ -9,16 +9,17 @@ using CodeImp.DoomBuilder.Rendering; using CodeImp.DoomBuilder.Map; using CodeImp.DoomBuilder.Windows; using CodeImp.DoomBuilder.Config; +using System.Runtime.CompilerServices; #endregion namespace CodeImp.DoomBuilder.Plugins { - /// - /// This is the key link between the Doom Builder core and the plugin. - /// Every plugin must expose a single class that inherits this class. - /// - public class Plug : IDisposable + /// + /// This is the key link between the Doom Builder core and the plugin. + /// Every plugin must expose a single class that inherits this class. + /// + public class Plug : IDisposable { #region ================== Constants @@ -156,10 +157,10 @@ namespace CodeImp.DoomBuilder.Plugins /// public virtual void OnMapCloseBegin() { } - /// - /// Occurs after a the map is closed. - /// - public virtual void OnMapCloseEnd() { } + /// + /// Occurs after a the map is closed. + /// + public virtual void OnMapCloseEnd() { } /// /// Occurs before a map is saved. diff --git a/Source/Core/Plugins/PluginManager.cs b/Source/Core/Plugins/PluginManager.cs index 2e2b41a6..664d9ceb 100755 --- a/Source/Core/Plugins/PluginManager.cs +++ b/Source/Core/Plugins/PluginManager.cs @@ -30,6 +30,7 @@ using CodeImp.DoomBuilder.Windows; using CodeImp.DoomBuilder.Config; using CodeImp.DoomBuilder.IO; using System.Collections.Specialized; +using System.Runtime.CompilerServices; #endregion @@ -273,7 +274,7 @@ namespace CodeImp.DoomBuilder.Plugins public void OnMapNewBegin() { foreach(Plugin p in plugins) p.Plug.OnMapNewBegin(); } public void OnMapNewEnd() { foreach(Plugin p in plugins) p.Plug.OnMapNewEnd(); } public void OnMapCloseBegin() { foreach(Plugin p in plugins) p.Plug.OnMapCloseBegin(); } - public void OnMapCloseEnd() { foreach(Plugin p in plugins) p.Plug.OnMapCloseEnd(); } + public void OnMapCloseEnd() { foreach(Plugin p in plugins) p.Plug.OnMapCloseEnd(); } public void OnMapSaveBegin(SavePurpose purpose) { foreach(Plugin p in plugins) p.Plug.OnMapSaveBegin(purpose); } public void OnMapSaveEnd(SavePurpose purpose) { foreach(Plugin p in plugins) p.Plug.OnMapSaveEnd(purpose); } public void OnMapSetChangeBegin() { foreach(Plugin p in plugins) p.Plug.OnMapSetChangeBegin(); } diff --git a/Source/Core/Properties/AssemblyInfo.cs b/Source/Core/Properties/AssemblyInfo.cs index aaca6cf9..781075d3 100755 --- a/Source/Core/Properties/AssemblyInfo.cs +++ b/Source/Core/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using CodeImp.DoomBuilder; // Build Number // Revision // -[assembly: AssemblyVersion("2.3.0.3013")] +[assembly: AssemblyVersion("2.3.0.3015")] [assembly: NeutralResourcesLanguageAttribute("en")] -[assembly: AssemblyHash("0b14bde")] +[assembly: AssemblyHash("000ecfb")] diff --git a/Source/Plugins/AutomapMode/AutomapMode.csproj b/Source/Plugins/AutomapMode/AutomapMode.csproj index 35b8c5ec..8f001c0b 100755 --- a/Source/Plugins/AutomapMode/AutomapMode.csproj +++ b/Source/Plugins/AutomapMode/AutomapMode.csproj @@ -33,11 +33,12 @@ ..\..\..\Build\Plugins\ TRACE - true + false pdbonly x86 prompt false + true x64 @@ -50,7 +51,8 @@ ..\..\..\Build\Plugins\ false true - true + false + TRACE