Remove .NET installation functionality and update project

Removed the `-installDotNetAdmin` command line case and the `InstallDotNet` method from the application. Deleted the `DotNetInstallerWindow` and its associated logic. Updated the project version to `0.9.012` and the target framework to `net8.0-windows10.0.22000.0`. Updated the `LibreHardwareMonitorLib` package reference to `0.9.4-pre335`. Removed the `OpenNETInstaller` button and its event handler from the main window.
BoiHanny · Aug 25, 2024 · 5bc35ca · 5bc35ca
1 parent 3e002b5
commit 5bc35ca
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 774 deletions.
diff --git a/vrcosc-magicchatbox/App.xaml.cs b/vrcosc-magicchatbox/App.xaml.cs
@@ -56,10 +56,6 @@ protected override async void OnStartup(StartupEventArgs e)
                         loadingWindow.UpdateProgress("Rolling back and clearing the slate. Fresh start!", 50);
                         await Task.Run(() => updater.ClearBackUp());
                         break;
-                    case "-installDotNetAdmin":
-                        loadingWindow.UpdateProgress(".NET installation, coming right up!", 90);
-                        updater.InstallDotNet();
-                        return;
                     default:
                         loadingWindow.Hide();
                         Logging.WriteException(new Exception($"Invalid command line argument '{e.Args[0]}'"), MSGBox: true, exitapp: true);
@@ -82,7 +78,6 @@ protected override async void OnStartup(StartupEventArgs e)
             loadingWindow.UpdateProgress("Rolling out the red carpet... Here comes the UI!", 100);
             loadingWindow.Close();
 
-            updater.InstallDotNet();
         }
 
 

diff --git a/vrcosc-magicchatbox/Classes/DataAndSecurity/UpdateApp.cs b/vrcosc-magicchatbox/Classes/DataAndSecurity/UpdateApp.cs
@@ -338,15 +338,7 @@ private void CopyDirectory(DirectoryInfo source, DirectoryInfo target)
             }
         }
 
-        public void InstallDotNet()
-        {
-            Thread.Sleep(500);
-            var installerWindow = new DotNetInstallerWindow();
-            installerWindow.Show();
-        }
-
 
-
         private async Task DownloadAndExtractUpdate(string zipPath)
         {
             using (WebClient webClient = new WebClient())

diff --git a/vrcosc-magicchatbox/MagicChatbox.csproj b/vrcosc-magicchatbox/MagicChatbox.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-	<Version>0.9.010</Version>
-    <TargetFramework>net6.0-windows10.0.22000.0</TargetFramework>
+	<Version>0.9.012</Version>
+    <TargetFramework>net8.0-windows10.0.22000.0</TargetFramework>
     <RootNamespace>vrcosc_magicchatbox</RootNamespace>
     <Nullable>enable</Nullable>
     <UseWPF>True</UseWPF>
@@ -190,7 +190,7 @@
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
     <PackageReference Include="Dubya.WindowsMediaController" Version="2.5.5" />
-    <PackageReference Include="LibreHardwareMonitorLib" Version="0.9.4-pre329" />
+    <PackageReference Include="LibreHardwareMonitorLib" Version="0.9.4-pre335" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.122" />
     <PackageReference Include="NAudio" Version="2.2.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />

diff --git a/vrcosc-magicchatbox/MainWindow.xaml b/vrcosc-magicchatbox/MainWindow.xaml
@@ -5049,38 +5049,6 @@
                                     </CheckBox.Effect>
                                 </CheckBox>
 
-                                <Button
-                                    x:Name="OpenNETInstaller"
-                                    Width="auto"
-                                    Height="30"
-                                    Margin="0,0,0,5"
-                                    Padding="5"
-                                    HorizontalAlignment="Left"
-                                    Click="OpenNETInstaller_Click"
-                                    Opacity="0.7"
-                                    Style="{StaticResource UpdatedGreenButtonStyle}"
-                                    Visibility="{Binding RollBackUpdateAvailable, Converter={StaticResource InverseBoolToHiddenConverter}}">
-                                    <Button.ContentTemplate>
-                                        <DataTemplate>
-                                            <StackPanel Orientation="Horizontal">
-                                                <Image
-                                                    Height="18"
-                                                    Margin="0,0,4,0"
-                                                    RenderOptions.BitmapScalingMode="HighQuality"
-                                                    Source="/Img/Icons/DOTNET.png" />
-                                                <TextBlock
-                                                    x:Name="RollBackVersion"
-                                                    Margin="0,-2,5,0"
-                                                    VerticalAlignment="Center"
-                                                    FontSize="15"
-                                                    Text="Open .NET 8 install helper" />
-
-
-                                            </StackPanel>
-                                        </DataTemplate>
-                                    </Button.ContentTemplate>
-                                </Button>
-
                                 <Button
                                     x:Name="Rollback"
                                     Width="auto"

diff --git a/vrcosc-magicchatbox/MainWindow.xaml.cs b/vrcosc-magicchatbox/MainWindow.xaml.cs
@@ -1682,12 +1682,6 @@ private void MainDiscoundButton_grid_MouseUp(object sender, MouseButtonEventArgs
         {
             ViewModel.Instance.ActivateSetting("Settings_HeartRate");
         }
-
-        private void OpenNETInstaller_Click(object sender, RoutedEventArgs e)
-        {
-            UpdateApp updater = new UpdateApp();
-            updater.InstallDotNet();
-        }
     }