Remove use of Net8Check app setting

Ryochan7 · Dec 16, 2023 · cf4b950 · cf4b950
1 parent 03c9d4a
commit cf4b950
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 55 deletions.
diff --git a/DS4Windows/DS4Control/DTOXml/AppSettingsDTO.cs b/DS4Windows/DS4Control/DTOXml/AppSettingsDTO.cs
@@ -618,26 +618,6 @@ public InputDeviceOptions DeviceOptions
             get; set;
         }
 
-        [XmlIgnore]
-        public bool Net8Check
-        {
-            get; private set;
-        }
-
-        [XmlElement("Net8Check")]
-        public string Net8CheckString
-        {
-            get => Net8Check.ToString();
-            set
-            {
-                Net8Check = XmlDataUtilities.StrToBool(value);
-            }
-        }
-        public bool ShouldSerializeNet8CheckString()
-        {
-            return Net8Check == true;
-        }
-
         [XmlIgnore]
         public LightbarDS4WinInfo LightbarInfo1
         {
@@ -857,7 +837,6 @@ public void MapFrom(BackingStore source)
             AutoProfileRevertDefaultProfile = source.autoProfileRevertDefaultProfile;
             AutoProfileSwitchNotifyChoice = source.autoProfileSwitchNotifyChoice;
             AbsRegionDisplay = source.absDisplayEDID;
-            Net8Check = source.net8Check;
 
             DeviceOptions = new InputDeviceOptions()
             {
@@ -962,8 +941,6 @@ public void MapTo(BackingStore destination)
                 destination.absDisplayEDID = AbsRegionDisplay;
             }
 
-            destination.net8Check = Net8Check;
-
             destination.deviceOptions.DS4DeviceOpts.Enabled = DeviceOptions.DS4SupportSettings.Enabled;
             destination.deviceOptions.DualSenseOpts.Enabled = DeviceOptions.DualSenseSupportSettings.Enabled;
             destination.deviceOptions.SwitchProDeviceOpts.Enabled = DeviceOptions.SwitchProSupportSettings.Enabled;

diff --git a/DS4Windows/DS4Control/ScpUtil.cs b/DS4Windows/DS4Control/ScpUtil.cs
@@ -2550,12 +2550,6 @@ public static DS4TriggerOutputMode GetOutputDS4TriggerMode(int index)
             return m_Config.outputDS4TriggerMode[index];
         }
 
-        public static bool Net8Check
-        {
-            get => m_Config.net8Check;
-            set => m_Config.net8Check = value;
-        }
-
         public static string[] LaunchProgram => m_Config.launchProgram;
         public static string[] ProfilePath => m_Config.profilePath;
         public static string[] OlderProfilePath => m_Config.olderProfilePath;
@@ -3585,7 +3579,6 @@ public void setSZOutCurveMode(int index, int value)
         public AppThemeChoice useCurrentTheme;
         public string fakeExeFileName = string.Empty;
         public string absDisplayEDID = string.Empty;
-        public bool net8Check = false;
 
         public ControlServiceDeviceOptions deviceOptions =
             new ControlServiceDeviceOptions();

diff --git a/DS4Windows/DS4Forms/MainWindow.xaml.cs b/DS4Windows/DS4Forms/MainWindow.xaml.cs
@@ -217,26 +217,6 @@ public void LateChecks(ArgumentParser parser)
                 //{
                 //    return;
                 //}
-
-                // Temporary nag check for the .NET 8 Desktop Runtime
-                // TODO: Remove routine before starting work on DS4Windows 3.3
-                //if (!Global.Net8Check && !mainWinVM.IsNET8Available())
-                //{
-                //    Dispatcher.Invoke(() =>
-                //    {
-                //        string message = string.Format(Translations.Strings.Net8NotInstalledWinNotice, Environment.Is64BitProcess ? "x64" : "x86");
-                //        Net8NoticeWindow noticeWin = new Net8NoticeWindow(message);
-                //        if ((bool)noticeWin.ShowDialog())
-                //        {
-                //            Global.Net8Check = true;
-                //        }
-                //    });
-                //}
-                //else if (!Global.Net8Check)
-                //{
-                //    // Flag not set but .NET 8 runtime was found. Set flag in config
-                //    Global.Net8Check = true;
-                //}
             });
             Util.LogAssistBackgroundTask(tempTask);
         }

diff --git a/DS4Windows/DS4Forms/ViewModels/MainWindowsViewModel.cs b/DS4Windows/DS4Forms/ViewModels/MainWindowsViewModel.cs
@@ -180,10 +180,5 @@ public bool IsNET8Available()
         {
             return DS4Windows.Util.IsNet8DesktopRuntimeAvailable();
         }
-
-        public void SetNet8Check(bool status)
-        {
-            Global.Net8Check = status;
-        }
     }
 }