Release 1.25.1

Closes #350

Version.cs

@@ -6,6 +6,6 @@ using TweetDuck;
 
 namespace TweetDuck {
 	internal static class Version {
-		public const string Tag = "1.25";
+		public const string Tag = "1.25.1";
 	}
 }

bld/gen_upd.iss

@@ -71,16 +71,21 @@ Type: filesandordirs; Name: "{localappdata}\{#MyAppName}\GPUCache"
 Type: files; Name: "{app}\CEFSHARP-LICENSE.txt"
 Type: files; Name: "{app}\LICENSE.txt"
 Type: files; Name: "{app}\README.txt"
-Type: files; Name: "{app}\natives_blob.bin"
 Type: files; Name: "{app}\cef.pak"
 Type: files; Name: "{app}\cef_100_percent.pak"
 Type: files; Name: "{app}\cef_200_percent.pak"
 Type: files; Name: "{app}\cef_extensions.pak"
 Type: files; Name: "{app}\devtools_resources.pak"
+Type: files; Name: "{app}\natives_blob.bin"
+Type: files; Name: "{app}\api-ms-win-*.dll"
+Type: files; Name: "{app}\dbgshim.dll"
+Type: files; Name: "{app}\mscordaccore_x86_x86_6.*.dll"
+Type: files; Name: "{app}\ucrtbase.dll"
 Type: filesandordirs; Name: "{app}\guide"
 Type: filesandordirs; Name: "{app}\plugins\official"
 Type: filesandordirs; Name: "{app}\resources"
 Type: filesandordirs; Name: "{app}\scripts"
+Type: filesandordirs; Name: "{app}\swiftshader"
 
 [Code]
 function TDIsUninstallable: Boolean; forward;

windows/TweetDuck/Program.cs

@@ -45,6 +45,7 @@ namespace TweetDuck {
 		internal static void SetupWinForms() {
 			Win.Application.EnableVisualStyles();
 			Win.Application.SetCompatibleTextRenderingDefault(false);
+			Win.LegacyWinForms.EnsureValid();
 		}
 
 		[STAThread]

windows/TweetDuck/TweetDuck.csproj

@@ -78,6 +78,7 @@
     <ResourcesPlugins Remove="$(SolutionDir)resources\Plugins\.debug\**\*.*" />
     <ResourcesPlugins Remove="$(SolutionDir)resources\Plugins\emoji-keyboard\emoji-instructions.txt" />
     <ResourcesPluginsDebug Include="$(SolutionDir)resources\Plugins\.debug\**\*.*" Visible="false" />
+    <Redist Include="$(SolutionDir)bld\Redist\*.*" Visible="false" />
   </ItemGroup>
   
   <PropertyGroup>
@@ -124,6 +125,7 @@
     <Copy SourceFiles="@(ResourcesContent)" DestinationFiles="@(ResourcesContent->'$(TargetDir)\resources\%(RecursiveDir)%(Filename)%(Extension)')" />
     <Copy SourceFiles="@(ResourcesGuide)" DestinationFiles="@(ResourcesGuide->'$(TargetDir)\guide\%(RecursiveDir)%(Filename)%(Extension)')" />
     <Copy SourceFiles="@(ResourcesPlugins)" DestinationFiles="@(ResourcesPlugins->'$(TargetDir)\plugins\official\%(RecursiveDir)%(Filename)%(Extension)')" />
+    <Copy SourceFiles="@(Redist)" DestinationFolder="$(TargetDir)" />
     <Exec Command="powershell -NoProfile -ExecutionPolicy Unrestricted -File &quot;$(ProjectDir)Resources\PostBuild.ps1&quot; &quot;$(TargetDir)\&quot;" IgnoreExitCode="false" />
   </Target>
   

windows/TweetLib.WinForms.Legacy/Windows/Forms/Command2.cs

@@ -4,9 +4,15 @@ using System.Reflection;
 namespace System.Windows.Forms {
 	internal sealed class Command2 {
 		private static readonly Type Type = typeof(Form).Assembly.GetType("System.Windows.Forms.Command");
-		private static readonly ConstructorInfo Constructor = Type.GetConstructor(new Type[] { typeof(ICommandExecutor) }) ?? throw new NullReferenceException();
-		private static readonly MethodInfo DisposeMethod = Type.GetMethod("Dispose", BindingFlags.Instance | BindingFlags.Public) ?? throw new NullReferenceException();
-		private static readonly PropertyInfo IDProperty = Type.GetProperty("ID") ?? throw new NullReferenceException();
+		private static readonly ConstructorInfo Constructor = Type.GetConstructor(new Type[] { typeof(ICommandExecutor) });
+		private static readonly MethodInfo DisposeMethod = Type.GetMethod("Dispose", BindingFlags.Instance | BindingFlags.Public);
+		private static readonly PropertyInfo IDProperty = Type.GetProperty("ID");
+
+		internal static void EnsureValid() {
+			if (Constructor == null || DisposeMethod == null || IDProperty == null) {
+				throw new InvalidOperationException();
+			}
+		}
 		
 		public int ID { get; }
 

windows/TweetLib.WinForms.Legacy/Windows/Forms/ContextMenu.cs

@@ -7,7 +7,13 @@ using System.Runtime.InteropServices;
 
 namespace System.Windows.Forms {
 	public sealed class ContextMenu : Menu {
-		private static readonly FieldInfo NotifyIconWindowField = typeof(NotifyIcon).GetField("window", BindingFlags.Instance | BindingFlags.NonPublic) ?? throw new InvalidOperationException();
+		private static readonly FieldInfo NotifyIconWindowField = typeof(NotifyIcon).GetField("_window", BindingFlags.Instance | BindingFlags.NonPublic);
+
+		internal static void EnsureValid() {
+			if (NotifyIconWindowField == null) {
+				throw new InvalidOperationException();
+			}
+		}
 
 		public event EventHandler Popup;
 

windows/TweetLib.WinForms.Legacy/Windows/Forms/LegacyWinForms.cs

@@ -0,0 +1,8 @@
+namespace System.Windows.Forms; 
+
+public static class LegacyWinForms {
+	public static void EnsureValid() {
+		Command2.EnsureValid();
+		ContextMenu.EnsureValid();
+	}
+}