Merge pull request #20 from Glumboi/Experimental

Fix loadFromRemoteSources error
Glumboi · Apr 3, 2023 · 378cadf · 378cadf
2 parents a961056 + ed662a7
commit 378cadf
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 8 deletions.
diff --git a/.fleet/run.json b/.fleet/run.json
@@ -0,0 +1,12 @@
+{
+    "configurations": [
+        {
+            "type": "dotnet",
+            "name": "Main",
+            "projectPath": "D:/Github/GlumSak/EmuSak-Revive.GUI-WPF/EmuSak-Revive.GUI-WPF.csproj",
+            "exePath": "D:/Github/GlumSak/EmuSak-Revive.GUI-WPF/bin/Debug/GlumSak.exe",
+            "args": [],
+        },
+
+    ]
+}
diff --git a/.fleet/settings.json b/.fleet/settings.json
@@ -0,0 +1,3 @@
+{
+    "editor.guides": []
+}
diff --git a/EmuSak-Revive.GUI-WPF/App.config b/EmuSak-Revive.GUI-WPF/App.config
@@ -5,6 +5,9 @@
 			<section name="EmuSak_Revive.GUI_WPF.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
 		</sectionGroup>
 	</configSections>
+	<runtime>
+		<loadFromRemoteSources enabled="true" />
+	</runtime>
 	<startup>
 		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1" />
 	</startup>

diff --git a/EmuSak-Revive.GUI-WPF/MainWindow.xaml.cs b/EmuSak-Revive.GUI-WPF/MainWindow.xaml.cs
@@ -843,7 +843,7 @@ private void CreatePluginListItem(string nameOfPlugin, string pathOfIcon, bool a
             buttonStop.Content = "Stop Plugin";
             buttonStop.Icon = Wpf.Ui.Common.SymbolRegular.Stop24;
             buttonStop.Margin = new Thickness(10, 0, 0, 0);
-            buttonStop.Name = nameOfPlugin;
+            buttonStop.Name = $"Stop{nameOfPlugin}_Button";
             buttonStop.Click += StopPluginButton_Click;
 
             stackPanel.Children.Add(toggleSwitch);

diff --git a/EmuSak-Revive.GUI-WPF/Properties/AssemblyInfo.cs b/EmuSak-Revive.GUI-WPF/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.3.2.0")]
-[assembly: AssemblyFileVersion("2.3.2.0")]
+[assembly: AssemblyVersion("2.3.2.1")]
+[assembly: AssemblyFileVersion("2.3.2.1")]
diff --git a/EmuSak-Revive.Plugins/Plugin.cs b/EmuSak-Revive.Plugins/Plugin.cs
@@ -247,6 +247,7 @@ public void ExecutePlugin()
             try
             {
                 _hookThread = new Thread(HookPlugin);
+                _hookThread.Name = PluginName + " {Thread}";
                 _hookThread.SetApartmentState(ApartmentState.STA);
                 _hookThread.Start();
             }

diff --git a/EmuSak-Revive/.fleet/run.json b/EmuSak-Revive/.fleet/run.json