fix: Remove unnecessary Windows.Forms usage

twpol · twpol · commit 6fa5eed2f98f · 2024-07-21T18:00:00.000+01:00
diff --git a/Source/ContentChecker/ContentChecker.csproj b/Source/ContentChecker/ContentChecker.csproj
@@ -3,8 +3,6 @@
     <TargetFrameworks Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFrameworks>
     <TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
     <OutputType>Exe</OutputType>
-    <UseWindowsForms>true</UseWindowsForms>
-    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
     <IsPublishable>False</IsPublishable>
     <AssemblyTitle>Open Rails Content Checker</AssemblyTitle>
     <Description>Open Rails Transport Simulator</Description>
diff --git a/Source/ContentChecker/Loader.cs b/Source/ContentChecker/Loader.cs
@@ -43,7 +43,6 @@
 using System.Linq;
 using System.Text;
 using Microsoft.Xna.Framework.Graphics;
-using System.Windows.Forms;
 
 namespace ContentChecker
 {
@@ -70,7 +69,7 @@ abstract class Loader
         /// <summary> The number of files that were actually loaded </summary>
         public int FilesLoaded { get; protected set; }
         /// <summary> The number of files that were not loaded but skipped </summary>
-        public int FilesSkipped {get; protected set;}
+        public int FilesSkipped { get; protected set; }
 
         /// <summary> The action to take when an additonal file has been identified. This is intended to be set externally </summary>
         protected Action<string, Loader> AddAdditionalFileAction { get; set; }
@@ -158,17 +157,13 @@ protected static GraphicsDevice GetGraphicsDevice()
         {
             if (_graphicsDevice == null)
             {
-                // We use a Windows.Forms Control instead of an xna GAME because it is much easier to use.
-                var _c = new Control();
-
                 // Details probably do not matter too much
                 PresentationParameters parameters = new PresentationParameters()
                 {
                     BackBufferWidth = 100,
                     BackBufferHeight = 100,
                     BackBufferFormat = SurfaceFormat.Color,
                     //DepthStencilFormat = DepthFormat.Depth24,
-                    DeviceWindowHandle = _c.Handle,
                     PresentationInterval = PresentInterval.Immediate,
                     IsFullScreen = false,
                 };
diff --git a/Source/Contrib/SimulatorTester/SimulatorTester.csproj b/Source/Contrib/SimulatorTester/SimulatorTester.csproj
@@ -6,9 +6,6 @@
     <RootNamespace>Orts.SimulatorTester</RootNamespace>
     <AssemblyName>Contrib.SimulatorTester</AssemblyName>
     <ApplicationIcon>..\..\ORTS.ico</ApplicationIcon>
-    <UseWindowsForms>true</UseWindowsForms>
-    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
-    <OutputPath>..\..\..\Program\</OutputPath>
     <IsPublishable>False</IsPublishable>
     <AssemblyTitle>Open Rails Simulator Tester (Contributed)</AssemblyTitle>
     <Description>Open Rails Transport Simulator</Description>
diff --git a/Source/ORTS.Common/ORTS.Common.csproj b/Source/ORTS.Common/ORTS.Common.csproj
@@ -3,8 +3,6 @@
     <TargetFrameworks Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFrameworks>
     <TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
     <OutputType>Library</OutputType>
-    <UseWindowsForms>true</UseWindowsForms>
-    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
     <IsPublishable>False</IsPublishable>
     <AssemblyTitle>Open Rails Common Library</AssemblyTitle>
     <Description>Open Rails Transport Simulator</Description>
diff --git a/Source/ORTS.Common/SystemInfo.cs b/Source/ORTS.Common/SystemInfo.cs
@@ -40,7 +40,7 @@ static SystemInfo()
         {
             Application = new Platform
             {
-                Name = System.Windows.Forms.Application.ProductName,
+                Name = ApplicationInfo.ProductName,
                 Version = VersionInfo.VersionOrBuild,
                 Architecture = RuntimeInformation.ProcessArchitecture.ToString(),
             };
diff --git a/Source/ORTS.Settings/ORTS.Settings.csproj b/Source/ORTS.Settings/ORTS.Settings.csproj
@@ -4,8 +4,6 @@
     <TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
     <OutputType>Library</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <UseWindowsForms>true</UseWindowsForms>
-    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
     <IsPublishable>False</IsPublishable>
     <AssemblyTitle>Open Rails Settings Library</AssemblyTitle>
     <Description>Open Rails Transport Simulator</Description>
diff --git a/Source/ORTS.Settings/UserSettings.cs b/Source/ORTS.Settings/UserSettings.cs
@@ -22,7 +22,6 @@
 using System.Reflection;
 using System.Security.Cryptography;
 using System.Text;
-using System.Windows.Forms;
 using ORTS.Common;
 
 namespace ORTS.Settings
@@ -60,7 +59,7 @@ static UserSettings()
             else
                 SettingsFilePath = null;
 
-            UserDataFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), Application.ProductName);
+            UserDataFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), ApplicationInfo.ProductName);
             // TODO: If using INI file, move these to application directory as well.
             if (!Directory.Exists(UserDataFolder)) Directory.CreateDirectory(UserDataFolder);
             DeletedSaveFolder = Path.Combine(UserDataFolder, "Deleted Saves");
@@ -490,7 +489,7 @@ public UserSettings(IEnumerable<string> options)
             : base(SettingsStore.GetSettingStore(SettingsFilePath, RegistryKey, null))
         {
             CustomDefaultValues["LoggingPath"] = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);
-            CustomDefaultValues["ScreenshotPath"] = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyPictures), Application.ProductName);
+            CustomDefaultValues["ScreenshotPath"] = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyPictures), ApplicationInfo.ProductName);
             CustomDefaultValues["Multiplayer_User"] = Environment.UserName;
             Load(options);
             Folders = new FolderSettings(options);
diff --git a/Source/ORTS.Updater/ORTS.Updater.csproj b/Source/ORTS.Updater/ORTS.Updater.csproj
@@ -4,8 +4,6 @@
     <TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
     <OutputType>Library</OutputType>
-    <UseWindowsForms>true</UseWindowsForms>
-    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
     <IsPublishable>False</IsPublishable>
     <AssemblyTitle>Open Rails Updater Library</AssemblyTitle>
     <Description>Open Rails Transport Simulator</Description>
diff --git a/Source/ORTS.Updater/UpdateManager.cs b/Source/ORTS.Updater/UpdateManager.cs
@@ -33,7 +33,6 @@
 using System.Security.Principal;
 using System.Text;
 using System.Threading;
-using System.Windows.Forms;
 
 namespace ORTS.Updater
 {
@@ -50,6 +49,7 @@ public class UpdateManager
         const string TemporaryDirectoryName = "Open Rails Updater Temporary Files";
 
         public event EventHandler<ProgressChangedEventArgs> ApplyProgressChanged;
+        public event EventHandler<ProceedWithUpdateCheckEventArgs> ProceedWithUpdateCheck;
 
         readonly string BasePath;
         readonly string ProductName;
@@ -463,14 +463,16 @@ void VerifyUpdate()
                     var certificates = GetCertificatesFromFile(files[i]);
                     if (!certificates.Any(c => IsMatchingCertificate(expectedCertificates, c)))
                     {
-                        switch (MessageBox.Show("The downloaded update has no matching cryptographic certificates; proceed with update?\n\nCurrent version's certificates:\n\n" + FormatCertificateSubjectList(expectedCertificates) + "\n\nUpdate version's certificates:\n\n" + FormatCertificateSubjectList(certificates) + "\n\nProceed with update?", Application.ProductName + " " + VersionInfo.VersionOrBuild, MessageBoxButtons.YesNo))
+                        var args = new ProceedWithUpdateCheckEventArgs("The downloaded update has no matching cryptographic certificates; proceed with update?\n\nCurrent version's certificates:\n\n" + FormatCertificateSubjectList(expectedCertificates) + "\n\nUpdate version's certificates:\n\n" + FormatCertificateSubjectList(certificates) + "\n\nProceed with update?");
+                        ProceedWithUpdateCheck(this, args);
+                        if (args.Proceed)
                         {
-                            case DialogResult.Yes:
-                                foreach (var cert in certificates)
-                                    expectedCertificates.Add(cert);
-                                break;
-                            case DialogResult.No:
-                                throw new InvalidDataException("Cryptographic certificates don't match.\n\nCurrent certificates:\n\n" + FormatCertificateSubjectList(expectedCertificates) + "\n\nUpdate certificates:\n\n" + FormatCertificateSubjectList(certificates) + "\n");
+                            foreach (var cert in certificates)
+                                expectedCertificates.Add(cert);
+                        }
+                        else
+                        {
+                            throw new InvalidDataException("Cryptographic certificates don't match.\n\nCurrent certificates:\n\n" + FormatCertificateSubjectList(expectedCertificates) + "\n\nUpdate certificates:\n\n" + FormatCertificateSubjectList(certificates) + "\n");
                         }
                     }
                 }
@@ -640,4 +642,15 @@ public class Update
         [JsonProperty]
         public string Version { get; private set; }
     }
+
+    public class ProceedWithUpdateCheckEventArgs
+    {
+        public string Message;
+        public bool Proceed;
+
+        public ProceedWithUpdateCheckEventArgs(string message)
+        {
+            Message = message;
+        }
+    }
 }
diff --git a/Source/Updater/UpdaterProgress.cs b/Source/Updater/UpdaterProgress.cs
@@ -128,6 +128,13 @@ void UpdaterThread()
                     progressBarUpdater.Value = e.ProgressPercentage;
                 }));
             };
+            updateManager.ProceedWithUpdateCheck += (object sender, ProceedWithUpdateCheckEventArgs e) =>
+            {
+                Invoke((Action)(() =>
+                {
+                    if (MessageBox.Show(e.Message, Application.ProductName + " " + VersionInfo.VersionOrBuild, MessageBoxButtons.YesNo) == DialogResult.Yes) e.Proceed = true;
+                }));
+            };
 
             var channelName = Enumerable.FirstOrDefault(Environment.GetCommandLineArgs(), a => a.StartsWith(UpdateManager.ChannelCommandLine));
             if (channelName != null && channelName.Length > UpdateManager.ChannelCommandLine.Length)

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ static SystemInfo()`
`40`	`40`	`{`
`41`	`41`	`Application = new Platform`
`42`	`42`	`{`
`43`		`- Name = System.Windows.Forms.Application.ProductName,`
	`43`	`+ Name = ApplicationInfo.ProductName,`
`44`	`44`	`Version = VersionInfo.VersionOrBuild,`
`45`	`45`	`Architecture = RuntimeInformation.ProcessArchitecture.ToString(),`
`46`	`46`	`};`