Merge pull request #67 from dhrdlicka/feature/dotnet-core-3.0

Fix some .NET Core 3.0 port bugs

Author: daviunic

86BoxManager/FolderSelectDialog.cs

@@ -1,4 +1,5 @@
-using System;
+#if !NETCOREAPP // Not required for .NET Core builds
+using System;
 using System.Reflection;
 using System.Windows.Forms;
 
@@ -50,7 +51,7 @@ private static class VistaDialog
             private readonly static Assembly s_windowsFormsAssembly = typeof(FileDialog).Assembly;
             private readonly static Type s_iFileDialogType = s_windowsFormsAssembly.GetType("System.Windows.Forms.FileDialogNative+IFileDialog");
             private readonly static MethodInfo s_createVistaDialogMethodInfo = typeof(OpenFileDialog).GetMethod("CreateVistaDialog", c_flags);
-            private readonly static MethodInfo s_onBeforeVistaDialogMethodInfo = typeof(OpenFileDialog).GetMethod("OnBeforeVistaDialog", c_flags);
+            private readonly static MethodInfo s_onBeforeVistaDialogMethodInfo = typeof(FileDialog).GetMethod("OnBeforeVistaDialog", c_flags);
             private readonly static MethodInfo s_getOptionsMethodInfo = typeof(FileDialog).GetMethod("GetOptions", c_flags);
             private readonly static MethodInfo s_setOptionsMethodInfo = s_iFileDialogType.GetMethod("SetOptions", c_flags);
             private readonly static uint s_fosPickFoldersBitFlag = (uint)s_windowsFormsAssembly
@@ -107,4 +108,5 @@ private class WindowWrapper : IWin32Window
             public IntPtr Handle { get { return _handle; } }
         }
     }
-}
+}
+#endif

86BoxManager/dlgAbout.Designer.cs

@@ -74,6 +74,25 @@ private void txtName_TextChanged(object sender, EventArgs e)
             }
         }
 
+// .NET Core implements the better Vista-style folder browse dialog in the stock FolderBrowserDialog
+#if NETCOREAPP
+        private void btnBrowse_Click(object sender, EventArgs e)
+        {
+            FolderBrowserDialog dialog = new FolderBrowserDialog
+            {
+                RootFolder = Environment.SpecialFolder.MyComputer,
+                Description = "Select a folder where your virtual machines (configs, nvr folders, etc.) will be located",
+                UseDescriptionForTitle = true
+            };
+
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                txtImportPath.Text = dialog.SelectedPath;
+                txtName.Text = Path.GetFileName(dialog.SelectedPath);
+            }
+        }
+// A custom class is required for Vista-style folder dialogs under the original .NET Framework
+#else
         private void btnBrowse_Click(object sender, EventArgs e)
         {
             FolderSelectDialog dialog = new FolderSelectDialog
@@ -88,6 +107,7 @@ private void btnBrowse_Click(object sender, EventArgs e)
                 txtName.Text = Path.GetFileName(dialog.FileName);
             }
         }
+#endif
 
         private void cbxImport_CheckedChanged(object sender, EventArgs e)
         {

86BoxManager/dlgAddVM.cs

@@ -235,6 +235,47 @@ private void LoadSettings()
             }
         }
 
+// .NET Core implements the better Vista-style folder browse dialog in the stock FolderBrowserDialog
+#if NETCOREAPP
+        private void btnBrowse1_Click(object sender, EventArgs e)
+        {
+            FolderBrowserDialog dialog = new FolderBrowserDialog
+            {
+                RootFolder = Environment.SpecialFolder.MyComputer,
+                Description = "Select a folder where 86Box program files and the roms folder are located",
+                UseDescriptionForTitle = true
+            };
+
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                txtEXEdir.Text  = dialog.SelectedPath;
+                if (!txtEXEdir.Text.EndsWith(@"\")) //Just in case
+                {
+                    txtEXEdir.Text += @"\";
+                }
+            }
+        }
+
+        private void btnBrowse2_Click(object sender, EventArgs e)
+        {
+            FolderBrowserDialog dialog = new FolderBrowserDialog
+            {
+                RootFolder = Environment.SpecialFolder.MyComputer,
+                Description = "Select a folder where your virtual machines (configs, nvr folders, etc.) will be located",
+                UseDescriptionForTitle = true
+            };
+
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                txtCFGdir.Text = dialog.SelectedPath;
+                if (!txtCFGdir.Text.EndsWith(@"\")) //Just in case
+                {
+                    txtCFGdir.Text += @"\";
+                }
+            }
+        }
+// A custom class is required for Vista-style folder dialogs under the original .NET Framework
+#else
         private void btnBrowse1_Click(object sender, EventArgs e)
         {
             FolderSelectDialog dialog = new FolderSelectDialog
@@ -270,6 +311,7 @@ private void btnBrowse2_Click(object sender, EventArgs e)
                 }
             }
         }
+#endif
 
         private void btnDefaults_Click(object sender, EventArgs e)
         {

86BoxManager/dlgSettings.cs

@@ -1,4 +1,4 @@
-#if NETFRAMEWORK
+#if !NETCOREAPP // COM references require .NET framework for now
 using IWshRuntimeLibrary;
 #endif
 using Microsoft.Win32;
@@ -52,8 +52,8 @@ public frmMain()
             LoadSettings();
             LoadVMs();
 
-#if !NETFRAMEWORK
-            createADesktopShortcutToolStripMenuItem.Enabled = false;
+#if NETCOREAPP
+            createADesktopShortcutToolStripMenuItem.Enabled = false; // Requires the original .NET framework
 #endif
         }
 
@@ -1136,7 +1136,7 @@ private void VMOpenFolder()
 
         private void createADesktopShortcutToolStripMenuItem_Click(object sender, EventArgs e)
         {
-#if NETFRAMEWORK
+#if !NETCOREAPP // Requires the original .NET Framework
             VM vm = (VM)lstVMs.SelectedItems[0].Tag;
             WshShell shell = new WshShell();
             string shortcutAddress = Environment.GetFolderPath(Environment.SpecialFolder.Desktop) + @"\" + vm.Name + ".lnk";

86BoxManager/frmMain.cs

@@ -8,6 +8,8 @@
 
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AssemblyName>86Manager</AssemblyName>
+
+    <ApplicationIcon>..\86BoxManager\Resources\86Box.ico</ApplicationIcon>
   </PropertyGroup>
 
   <ItemGroup>

86BoxManagerCore/86BoxManagerCore.csproj

@@ -2,4 +2,5 @@ The following individuals or organizations have contributed at least some code t
 
 David Simunič (@daviunic)
 David Lee (@DL444)
-FolderSelectDialog class by ErikE from stackOverflow
+FolderSelectDialog class by ErikE from stackOverflow
+David Hrdlička (@dhrdlicka)