From 5dc4a9c2296c09c838c75069f65161005bdf86fd Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Tue, 28 Nov 2023 16:57:04 -0500
Subject: [PATCH 1/8] updates

---
 .../Cosmos.Build.Builder.csproj               |  56 ++++----
 .../ViewModels/MainWindowViewModel.cs         |   3 +-
 .../DependencyInstallationDialog.xaml.cs      |   4 -
 .../Views/MainWindow.xaml                     |   6 +-
 .../Views/MainWindow.xaml.cs                  |  35 ++---
 .../Views/MessageBox.xaml                     |   2 +-
 .../Views/MessageBox.xaml.cs                  |   4 -
 .../Views/OptionsDialog.xaml                  |  58 +++++++++
 .../Views/OptionsDialog.xaml.cs               |  27 ++++
 .../Views/VisualStudioInstanceDialog.xaml.cs  |   4 -
 source/Cosmos.Build.Builder/app.manifest      |  77 +++++++++++
 .../Cosmos.Build.Builder/packages.lock.json   | 122 +++++++++---------
 12 files changed, 264 insertions(+), 134 deletions(-)
 create mode 100644 source/Cosmos.Build.Builder/Views/OptionsDialog.xaml
 create mode 100644 source/Cosmos.Build.Builder/Views/OptionsDialog.xaml.cs
 create mode 100644 source/Cosmos.Build.Builder/app.manifest

diff --git a/source/Cosmos.Build.Builder/Cosmos.Build.Builder.csproj b/source/Cosmos.Build.Builder/Cosmos.Build.Builder.csproj
index d07ceb22a6..f228926884 100644
--- a/source/Cosmos.Build.Builder/Cosmos.Build.Builder.csproj
+++ b/source/Cosmos.Build.Builder/Cosmos.Build.Builder.csproj
@@ -1,34 +1,22 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net472</TargetFramework>
-        <OutputType>WinExe</OutputType>
-        <ApplicationIcon>Resources\Cosmos.ico</ApplicationIcon>
-        <IncludeWpfReferences>True</IncludeWpfReferences>
-        <AppendTargetFrameworkToOutputPath>False</AppendTargetFrameworkToOutputPath>
-        <SignAssembly>False</SignAssembly>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <ApplicationDefinition Include="App.xaml" SubType="Designer" Generator="MSBuild:Compile" />
-        <Page Include="**\*.xaml" Exclude="App.xaml" SubType="Designer" Generator="MSBuild:Compile" />
-        <Compile Update="**\*.xaml.cs" SubType="Designer" DependentUpon="%(Filename)" />
-        <Resource Include="Resources\**" />
-        <UpToDateCheckInput Include="@(ApplicationDefinition)" />
-        <UpToDateCheckInput Include="@(Page)" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <Reference Include="System.Net.Http" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="1.16.30" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-        <PackageReference Include="NuGet.Common" />
-        <PackageReference Include="NuGet.Configuration" />
-        <PackageReference Include="System.Runtime.WindowsRuntime" Version="4.6.0" />
-        <PackageReference Include="WPF-UI" Version="2.0.3" />
-    </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net6.0-windows7.0</TargetFramework>
+    <OutputType>WinExe</OutputType>
+    <ApplicationIcon>Resources\Cosmos.ico</ApplicationIcon>
+     <UseWPF>True</UseWPF>
+    <AppendTargetFrameworkToOutputPath>False</AppendTargetFrameworkToOutputPath>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>
+  <ItemGroup>
+    <Resource Include="Resources\**" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.8.2112" />
+    <PackageReference Include="NuGet.Common" Version="6.8.0" />
+    <PackageReference Include="NuGet.Configuration" Version="6.8.0" />
+    <PackageReference Include="NuGet.Frameworks" Version="6.8.0" />
+    <PackageReference Include="System.Runtime.WindowsRuntime" Version="5.0.0-preview.5.20278.1" />
+    <PackageReference Include="WPF-UI" Version="3.0.0-preview.11" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/source/Cosmos.Build.Builder/ViewModels/MainWindowViewModel.cs b/source/Cosmos.Build.Builder/ViewModels/MainWindowViewModel.cs
index 376c15fc43..779433ac96 100644
--- a/source/Cosmos.Build.Builder/ViewModels/MainWindowViewModel.cs
+++ b/source/Cosmos.Build.Builder/ViewModels/MainWindowViewModel.cs
@@ -82,7 +82,8 @@ private void RetryBuildCommand(object obj)
             MainWindow win = new();
             win.Show();
             _dependencyInstallationDialogService.SetAnotherOwner(win);
-            Window.AppShutdown = false;
+            Window.AppShutdown = false;
+            Window.ShowCloseBuilderDialog = false;
             Window.Close();
             win.DataContext = new MainWindowViewModel(_dependencyInstallationDialogService, _buildDefinition, win);
         }
diff --git a/source/Cosmos.Build.Builder/Views/DependencyInstallationDialog.xaml.cs b/source/Cosmos.Build.Builder/Views/DependencyInstallationDialog.xaml.cs
index cfd596ef05..bd693c611c 100644
--- a/source/Cosmos.Build.Builder/Views/DependencyInstallationDialog.xaml.cs
+++ b/source/Cosmos.Build.Builder/Views/DependencyInstallationDialog.xaml.cs
@@ -8,10 +8,6 @@ public partial class DependencyInstallationDialog : Window
         public DependencyInstallationDialog()
         {
             InitializeComponent();
-            Loaded += (sender, args) =>
-            {
-                Wpf.Ui.Appearance.Watcher.Watch(this, Wpf.Ui.Appearance.BackgroundType.Mica, true);
-            };
         }
     }
 }
diff --git a/source/Cosmos.Build.Builder/Views/MainWindow.xaml b/source/Cosmos.Build.Builder/Views/MainWindow.xaml
index 18510af8f8..8a613aab62 100644
--- a/source/Cosmos.Build.Builder/Views/MainWindow.xaml
+++ b/source/Cosmos.Build.Builder/Views/MainWindow.xaml
@@ -1,11 +1,11 @@
-<ui:UiWindow x:Class="Cosmos.Build.Builder.Views.MainWindow"
+<ui:FluentWindow x:Class="Cosmos.Build.Builder.Views.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
         mc:Ignorable="d"
-        Icon="/Cosmos.Build.Builder;component/Resources/Cosmos.ico"
+        Icon="/Resources/Cosmos.ico"
         MinHeight="480"
         MinWidth="800"
         Title="Cosmos Kit Builder"
@@ -168,4 +168,4 @@
 
         </DockPanel>
     </Grid>
-</ui:UiWindow>
+</ui:FluentWindow>
diff --git a/source/Cosmos.Build.Builder/Views/MainWindow.xaml.cs b/source/Cosmos.Build.Builder/Views/MainWindow.xaml.cs
index c61b724ee7..82e0c7e708 100644
--- a/source/Cosmos.Build.Builder/Views/MainWindow.xaml.cs
+++ b/source/Cosmos.Build.Builder/Views/MainWindow.xaml.cs
@@ -2,23 +2,21 @@
 using System.ComponentModel;
 using System.Windows;
 using System.Windows.Controls;
-using Wpf.Ui.Common;
-using Wpf.Ui.Controls;
 using Clipboard = System.Windows.Clipboard;
 
 namespace Cosmos.Build.Builder.Views
 {
-    public partial class MainWindow : UiWindow
+    public partial class MainWindow : Wpf.Ui.Controls.FluentWindow
     {
         public bool AppShutdown = true;
 
-        public bool AllTasksCompleted;
+        public bool AllTasksCompleted;
+
+        public bool ShowCloseBuilderDialog = true;
 
         public MainWindow()
         {
             InitializeComponent();
-
-            Loaded += (_, _) => Wpf.Ui.Appearance.Watcher.Watch(this);
         }
 
         private void SectionTextCopyHandler(object sender, System.Windows.Input.MouseButtonEventArgs e)
@@ -26,30 +24,25 @@ private void SectionTextCopyHandler(object sender, System.Windows.Input.MouseBut
             Clipboard.SetText(((TextBlock)sender).Text);
         }
 
-        protected override void OnClosing(CancelEventArgs e)
+        protected override async void OnClosing(CancelEventArgs e)
         {
             base.OnClosing(e);
 
-            if (!AllTasksCompleted)
+            if (!AllTasksCompleted && ShowCloseBuilderDialog)
             {
                 e.Cancel = true;
 
                 Wpf.Ui.Controls.MessageBox messageBox = new()
-                {
-                    Content = "You're about to close the builder, however tasks are still running. Do you wish to continue?",
-                    SizeToContent = SizeToContent.Width,
-                    ButtonLeftAppearance = ControlAppearance.Secondary,
-                    ButtonLeftName = "Yes",
-                    ButtonRightAppearance = ControlAppearance.Primary,
-                    ButtonRightName = "No"
+                {
+                    Title = "Warning",
+                    Content = $"You're about to close the builder, however tasks are still running.{Environment.NewLine}Do you wish to continue?",
+                    PrimaryButtonText = "Yes",
+                    CloseButtonText = "No"
                 };
-                messageBox.ButtonLeftClick += (_, _) =>
+                if (await messageBox.ShowDialogAsync() == Wpf.Ui.Controls.MessageBoxResult.Primary)
                 {
-                    messageBox.Close();
-                    Application.Current.Dispatcher.Invoke(() => Application.Current?.MainWindow?.Close());
-                };
-                messageBox.ButtonRightClick += (_, _) => messageBox.Close();
-                messageBox.ShowDialog();
+                    e.Cancel = false;
+                }
             }
         }
 
diff --git a/source/Cosmos.Build.Builder/Views/MessageBox.xaml b/source/Cosmos.Build.Builder/Views/MessageBox.xaml
index dd610e3e79..ed190b8201 100644
--- a/source/Cosmos.Build.Builder/Views/MessageBox.xaml
+++ b/source/Cosmos.Build.Builder/Views/MessageBox.xaml
@@ -1,4 +1,4 @@
-<Window  x:Class="Cosmos.Build.Builder.Views.MessageBox"
+<Window x:Class="Cosmos.Build.Builder.Views.MessageBox"
         x:Name="MessageBoxWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/source/Cosmos.Build.Builder/Views/MessageBox.xaml.cs b/source/Cosmos.Build.Builder/Views/MessageBox.xaml.cs
index cc91705bbf..16f43fb3d8 100644
--- a/source/Cosmos.Build.Builder/Views/MessageBox.xaml.cs
+++ b/source/Cosmos.Build.Builder/Views/MessageBox.xaml.cs
@@ -10,10 +10,6 @@ public partial class MessageBox : Window
         public MessageBox(string Content)
         {
             InitializeComponent();
-            Loaded += (sender, args) =>
-            {
-                Wpf.Ui.Appearance.Watcher.Watch(this, Wpf.Ui.Appearance.BackgroundType.Mica, true);
-            };
 
             if (Content.StartsWith("link:"))
             {
diff --git a/source/Cosmos.Build.Builder/Views/OptionsDialog.xaml b/source/Cosmos.Build.Builder/Views/OptionsDialog.xaml
new file mode 100644
index 0000000000..e83ddbbc11
--- /dev/null
+++ b/source/Cosmos.Build.Builder/Views/OptionsDialog.xaml
@@ -0,0 +1,58 @@
+<Window x:Class="Cosmos.Build.Builder.Views.OptionsDialog"
+        x:Name="optionsDialog"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
+        mc:Ignorable="d"
+        Icon="/Cosmos.Build.Builder;component/Resources/Cosmos.ico"
+        ResizeMode="NoResize"
+        SizeToContent="WidthAndHeight"
+        Title="Choose Build Options"
+        WindowStartupLocation="CenterOwner"
+        Background="{ui:ThemeResource ApplicationBackgroundBrush}"
+        Foreground="{ui:ThemeResource TextFillColorPrimaryBrush}">
+    <Window.Resources>
+        <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+
+        <Style TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
+            <Setter Property="Margin" Value="4" />
+            <Setter Property="MinWidth" Value="48" />
+            <Setter Property="Padding" Value="8,3" />
+        </Style>
+    </Window.Resources>
+
+    <Grid Margin="8"
+          MinWidth="400">
+
+        <StackPanel Grid.Row="0"
+                    Margin="8">
+
+            <ListView MinHeight="196"
+                      MinWidth="256"
+                      ItemsSource="{Binding VisualStudioInstances}"
+                      SelectedItem="{Binding SelectedVisualStudioInstance, Mode=TwoWay}">
+                <ListView.View>
+                    <GridView>
+                        <GridViewColumn Header="ID" DisplayMemberBinding="{Binding ID}" />
+                        <GridViewColumn Header="Name" DisplayMemberBinding="{Binding Name}" />
+                        <GridViewColumn Header="Installation Path" DisplayMemberBinding="{Binding InstallationPath}" />
+                    </GridView>
+                </ListView.View>
+            </ListView>
+
+            <StackPanel Grid.Row="2"
+                        HorizontalAlignment="Right"
+                        Margin="0,8,0,0"
+                        Orientation="Horizontal">
+                <Button Command="{Binding OkCommand}"
+                        CommandParameter="{Binding ElementName=buildOptionsDialog}"
+                        Content="OK" Margin="0,0,5,0"/>
+            </StackPanel>
+
+        </StackPanel>
+
+    </Grid>
+
+</Window>
diff --git a/source/Cosmos.Build.Builder/Views/OptionsDialog.xaml.cs b/source/Cosmos.Build.Builder/Views/OptionsDialog.xaml.cs
new file mode 100644
index 0000000000..518a1080ef
--- /dev/null
+++ b/source/Cosmos.Build.Builder/Views/OptionsDialog.xaml.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace Cosmos.Build.Builder.Views
+{
+    /// <summary>
+    /// Interaction logic for OptionsWindow.xaml
+    /// </summary>
+    public partial class OptionsDialog : Window
+    {
+        public OptionsDialog()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/source/Cosmos.Build.Builder/Views/VisualStudioInstanceDialog.xaml.cs b/source/Cosmos.Build.Builder/Views/VisualStudioInstanceDialog.xaml.cs
index da5a9c8cbe..758fd1c0f4 100644
--- a/source/Cosmos.Build.Builder/Views/VisualStudioInstanceDialog.xaml.cs
+++ b/source/Cosmos.Build.Builder/Views/VisualStudioInstanceDialog.xaml.cs
@@ -8,10 +8,6 @@ public partial class VisualStudioInstanceDialog : Window
         public VisualStudioInstanceDialog()
         {
             InitializeComponent();
-            Loaded += (sender, args) =>
-            {
-                Wpf.Ui.Appearance.Watcher.Watch(this, Wpf.Ui.Appearance.BackgroundType.Mica, true);
-            };
         }
     }
 }
diff --git a/source/Cosmos.Build.Builder/app.manifest b/source/Cosmos.Build.Builder/app.manifest
new file mode 100644
index 0000000000..c21c59b0d7
--- /dev/null
+++ b/source/Cosmos.Build.Builder/app.manifest
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!-- UAC Manifest Options
+             If you want to change the Windows User Account Control level replace the 
+             requestedExecutionLevel node with one of the following.
+
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+            Specifying requestedExecutionLevel element will disable file and registry virtualization. 
+            Remove this element if your application requires this virtualization for backwards
+            compatibility.
+        -->
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- A list of the Windows versions that this application has been tested on
+           and is designed to work with. Uncomment the appropriate elements
+           and Windows will automatically select the most compatible environment. -->
+
+      <!-- Windows Vista -->
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />
+
+      <!-- Windows 7 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
+
+      <!-- Windows 8 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />
+
+      <!-- Windows 8.1 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />
+
+      <!-- Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+
+    </application>
+  </compatibility>
+
+  <!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
+       DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need 
+       to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should 
+       also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config. 
+       
+       Makes the application long-path aware. See https://docs.microsoft.com/windows/win32/fileio/maximum-file-path-limitation -->
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+      <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
+    </windowsSettings>
+  </application>
+
+  <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
+  <!--
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+        />
+    </dependentAssembly>
+  </dependency>
+  -->
+
+</assembly>
diff --git a/source/Cosmos.Build.Builder/packages.lock.json b/source/Cosmos.Build.Builder/packages.lock.json
index 26d86db5ec..5b57019c53 100644
--- a/source/Cosmos.Build.Builder/packages.lock.json
+++ b/source/Cosmos.Build.Builder/packages.lock.json
@@ -1,63 +1,61 @@
-{
-  "version": 1,
-  "dependencies": {
-    ".NETFramework,Version=v4.7.2": {
-      "Microsoft.VisualStudio.Setup.Configuration.Interop": {
-        "type": "Direct",
-        "requested": "[1.16.30, )",
-        "resolved": "1.16.30",
-        "contentHash": "lC6SqNkraWUSY7cyF5GUmXSECoTMwslBc/r1dguChjsi0D0BlF7G6PLsvXD0NFCwnpKlgVzUYrIq7DQakdGerw=="
-      },
-      "Newtonsoft.Json": {
-        "type": "Direct",
-        "requested": "[13.0.1, )",
-        "resolved": "13.0.1",
-        "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A=="
-      },
-      "NuGet.Common": {
-        "type": "Direct",
-        "requested": "[5.9.1, )",
-        "resolved": "5.9.1",
-        "contentHash": "BRX0V8k8QXcEWL33V2HcBU1+eu/Qp5LDJlheYFSZ03hKjlHVHFfLquvUUYLgSNO7tiBxCFe7pTSgO4XanyzteQ==",
-        "dependencies": {
-          "NuGet.Frameworks": "5.9.1"
-        }
-      },
-      "NuGet.Configuration": {
-        "type": "Direct",
-        "requested": "[5.9.1, )",
-        "resolved": "5.9.1",
-        "contentHash": "dpjLDYEuhR1J8L3s9c1qVHEBaWqFI2/x3qRmhqVYDLB5B9ETVe1jVkxLkFQreQVgh+N5cVgtZWx1jGuArj7QaQ==",
-        "dependencies": {
-          "NuGet.Common": "5.9.1"
-        }
-      },
-      "System.Runtime.WindowsRuntime": {
-        "type": "Direct",
-        "requested": "[4.6.0, )",
-        "resolved": "4.6.0",
-        "contentHash": "IWrs1TmbxP65ZZjIglNyvDkFNoV5q2Pofg5WO7I8RKQOpLdFprQSh3xesOoClBqR4JHr4nEB1Xk1MqLPW1jPuQ=="
-      },
-      "WPF-UI": {
-        "type": "Direct",
-        "requested": "[2.0.3, )",
-        "resolved": "2.0.3",
-        "contentHash": "1e9Q8pQGfi9YFp3WavKZjXyLYohIjXxk5q0NqEaamofVgIdxRxwqrkWha584FBUISRBBT/qFOrl97YBl5bs30Q==",
-        "dependencies": {
-          "System.Drawing.Common": "6.0.0"
-        }
-      },
-      "NuGet.Frameworks": {
-        "type": "Transitive",
-        "resolved": "5.9.1",
-        "contentHash": "LuJA875MQpPMdik6KUsDUnEDSXWX+T/sExFikA0A5zGFkEW37weP5b6NxljWlrw4UNOWTgmTeumm802Jwz20sw=="
-      },
-      "System.Drawing.Common": {
-        "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "NfuoKUiP2nUWwKZN6twGqXioIe1zVD0RIj2t976A+czLHr2nY454RwwXs6JU9Htc6mwqL6Dn/nEL3dpVf2jOhg=="
-      }
-    },
-    ".NETFramework,Version=v4.7.2/win7-x86": {}
-  }
+{
+  "version": 1,
+  "dependencies": {
+    "net6.0-windows7.0": {
+      "Microsoft.VisualStudio.Setup.Configuration.Interop": {
+        "type": "Direct",
+        "requested": "[3.8.2112, )",
+        "resolved": "3.8.2112",
+        "contentHash": "5qYOpReBk1mc+c+2L3WCsaWAOPTG8VhF0oP3Spm//nj1ArNhAwnax09cW9lWcfVVGcTY35t/ORoydr3uUb98Ow=="
+      },
+      "Newtonsoft.Json": {
+        "type": "Direct",
+        "requested": "[13.0.3, )",
+        "resolved": "13.0.3",
+        "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ=="
+      },
+      "NuGet.Common": {
+        "type": "Direct",
+        "requested": "[5.9.1, )",
+        "resolved": "5.9.1",
+        "contentHash": "BRX0V8k8QXcEWL33V2HcBU1+eu/Qp5LDJlheYFSZ03hKjlHVHFfLquvUUYLgSNO7tiBxCFe7pTSgO4XanyzteQ==",
+        "dependencies": {
+          "NuGet.Frameworks": "5.9.1"
+        }
+      },
+      "NuGet.Configuration": {
+        "type": "Direct",
+        "requested": "[5.9.1, )",
+        "resolved": "5.9.1",
+        "contentHash": "dpjLDYEuhR1J8L3s9c1qVHEBaWqFI2/x3qRmhqVYDLB5B9ETVe1jVkxLkFQreQVgh+N5cVgtZWx1jGuArj7QaQ==",
+        "dependencies": {
+          "NuGet.Common": "5.9.1",
+          "System.Security.Cryptography.ProtectedData": "4.4.0"
+        }
+      },
+      "NuGet.Frameworks": {
+        "type": "Direct",
+        "requested": "[6.8.0, )",
+        "resolved": "6.8.0",
+        "contentHash": "cN9NyahKgYYScioH4CKn+TYj1eSODxd0RECFnQt6ZmzT6z7PfXlbYpVzbiPsxNgY23iNDMOVkSmOqNZyYxNlQA=="
+      },
+      "System.Runtime.WindowsRuntime": {
+        "type": "Direct",
+        "requested": "[5.0.0-preview.5.20278.1, )",
+        "resolved": "5.0.0-preview.5.20278.1",
+        "contentHash": "XlW8W5MKfW2Acim7MCBIsATlwZX+ZPSE72CKjo9YASDordRIL0+C7X9m1ux/mIAC7BIzp29Iys75IzHz01e1IQ=="
+      },
+      "WPF-UI": {
+        "type": "Direct",
+        "requested": "[3.0.0-preview.11, )",
+        "resolved": "3.0.0-preview.11",
+        "contentHash": "wPTCMHQvjCQT096NzYix5Z+VVvitfmRoDYL+K9V679f7z0eLIts02ehnunjypKkg4w9bO8WCwffktb8+kiRiBQ=="
+      },
+      "System.Security.Cryptography.ProtectedData": {
+        "type": "Transitive",
+        "resolved": "4.4.0",
+        "contentHash": "cJV7ScGW7EhatRsjehfvvYVBvtiSMKgN8bOVI0bQhnF5bU7vnHVIsH49Kva7i7GWaWYvmEzkYVk1TC+gZYBEog=="
+      }
+    }
+  }
 }
\ No newline at end of file

From 55e49de582562bcd1ef5e096068064b0a26047e6 Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Tue, 28 Nov 2023 16:58:26 -0500
Subject: [PATCH 2/8] Delete packages.lock.json

---
 .../Cosmos.Build.Builder/packages.lock.json   | 61 -------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 source/Cosmos.Build.Builder/packages.lock.json

diff --git a/source/Cosmos.Build.Builder/packages.lock.json b/source/Cosmos.Build.Builder/packages.lock.json
deleted file mode 100644
index 5b57019c53..0000000000
--- a/source/Cosmos.Build.Builder/packages.lock.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "version": 1,
-  "dependencies": {
-    "net6.0-windows7.0": {
-      "Microsoft.VisualStudio.Setup.Configuration.Interop": {
-        "type": "Direct",
-        "requested": "[3.8.2112, )",
-        "resolved": "3.8.2112",
-        "contentHash": "5qYOpReBk1mc+c+2L3WCsaWAOPTG8VhF0oP3Spm//nj1ArNhAwnax09cW9lWcfVVGcTY35t/ORoydr3uUb98Ow=="
-      },
-      "Newtonsoft.Json": {
-        "type": "Direct",
-        "requested": "[13.0.3, )",
-        "resolved": "13.0.3",
-        "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ=="
-      },
-      "NuGet.Common": {
-        "type": "Direct",
-        "requested": "[5.9.1, )",
-        "resolved": "5.9.1",
-        "contentHash": "BRX0V8k8QXcEWL33V2HcBU1+eu/Qp5LDJlheYFSZ03hKjlHVHFfLquvUUYLgSNO7tiBxCFe7pTSgO4XanyzteQ==",
-        "dependencies": {
-          "NuGet.Frameworks": "5.9.1"
-        }
-      },
-      "NuGet.Configuration": {
-        "type": "Direct",
-        "requested": "[5.9.1, )",
-        "resolved": "5.9.1",
-        "contentHash": "dpjLDYEuhR1J8L3s9c1qVHEBaWqFI2/x3qRmhqVYDLB5B9ETVe1jVkxLkFQreQVgh+N5cVgtZWx1jGuArj7QaQ==",
-        "dependencies": {
-          "NuGet.Common": "5.9.1",
-          "System.Security.Cryptography.ProtectedData": "4.4.0"
-        }
-      },
-      "NuGet.Frameworks": {
-        "type": "Direct",
-        "requested": "[6.8.0, )",
-        "resolved": "6.8.0",
-        "contentHash": "cN9NyahKgYYScioH4CKn+TYj1eSODxd0RECFnQt6ZmzT6z7PfXlbYpVzbiPsxNgY23iNDMOVkSmOqNZyYxNlQA=="
-      },
-      "System.Runtime.WindowsRuntime": {
-        "type": "Direct",
-        "requested": "[5.0.0-preview.5.20278.1, )",
-        "resolved": "5.0.0-preview.5.20278.1",
-        "contentHash": "XlW8W5MKfW2Acim7MCBIsATlwZX+ZPSE72CKjo9YASDordRIL0+C7X9m1ux/mIAC7BIzp29Iys75IzHz01e1IQ=="
-      },
-      "WPF-UI": {
-        "type": "Direct",
-        "requested": "[3.0.0-preview.11, )",
-        "resolved": "3.0.0-preview.11",
-        "contentHash": "wPTCMHQvjCQT096NzYix5Z+VVvitfmRoDYL+K9V679f7z0eLIts02ehnunjypKkg4w9bO8WCwffktb8+kiRiBQ=="
-      },
-      "System.Security.Cryptography.ProtectedData": {
-        "type": "Transitive",
-        "resolved": "4.4.0",
-        "contentHash": "cJV7ScGW7EhatRsjehfvvYVBvtiSMKgN8bOVI0bQhnF5bU7vnHVIsH49Kva7i7GWaWYvmEzkYVk1TC+gZYBEog=="
-      }
-    }
-  }
-}
\ No newline at end of file

From 1e0ae9e93daef214f106ea348f94dd3d931bac3b Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Tue, 28 Nov 2023 17:04:23 -0500
Subject: [PATCH 3/8] fix

---
 source/Cosmos.Build.Builder/App.xaml.cs       |  9 ++-
 .../Cosmos.Build.Builder.csproj               |  1 +
 .../Cosmos.Build.Builder/packages.lock.json   | 75 +++++++++++++++++++
 3 files changed, 82 insertions(+), 3 deletions(-)
 create mode 100644 source/Cosmos.Build.Builder/packages.lock.json

diff --git a/source/Cosmos.Build.Builder/App.xaml.cs b/source/Cosmos.Build.Builder/App.xaml.cs
index 123a32ba87..66f8685ca1 100644
--- a/source/Cosmos.Build.Builder/App.xaml.cs
+++ b/source/Cosmos.Build.Builder/App.xaml.cs
@@ -8,6 +8,7 @@
 using Cosmos.Build.Builder.Services;
 using Cosmos.Build.Builder.ViewModels;
 using Cosmos.Build.Builder.Views;
+using System.Text;
 
 namespace Cosmos.Build.Builder
 {
@@ -23,14 +24,16 @@ protected override void OnStartup(StartupEventArgs e)
                 Current.Shutdown();
                 return;
             }
+
+            Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
 
-            var configuration = new CommandLineBuilderConfiguration(e.Args);
+            CommandLineBuilderConfiguration configuration = new(e.Args);
 
             BuilderConfiguration = configuration;
 
             MainWindow = new MainWindow();
 
-            var visualStudioService = new VisualStudioService();
+            VisualStudioService visualStudioService = new();
 
             var visualStudioInstances = visualStudioService.GetInstances();
 
@@ -45,7 +48,7 @@ protected override void OnStartup(StartupEventArgs e)
             if (configuration.VsPath != null)
             {
                 visualStudioInstance = visualStudioInstances.FirstOrDefault(
-                    i => String.Equals(
+                    i => string.Equals(
                         Path.GetFullPath(configuration.VsPath),
                         Path.GetFullPath(i.GetInstallationPath()),
                         StringComparison.Ordinal));
diff --git a/source/Cosmos.Build.Builder/Cosmos.Build.Builder.csproj b/source/Cosmos.Build.Builder/Cosmos.Build.Builder.csproj
index f228926884..26e4cfccd4 100644
--- a/source/Cosmos.Build.Builder/Cosmos.Build.Builder.csproj
+++ b/source/Cosmos.Build.Builder/Cosmos.Build.Builder.csproj
@@ -16,6 +16,7 @@
     <PackageReference Include="NuGet.Configuration" Version="6.8.0" />
     <PackageReference Include="NuGet.Frameworks" Version="6.8.0" />
     <PackageReference Include="System.Runtime.WindowsRuntime" Version="5.0.0-preview.5.20278.1" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
     <PackageReference Include="WPF-UI" Version="3.0.0-preview.11" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
diff --git a/source/Cosmos.Build.Builder/packages.lock.json b/source/Cosmos.Build.Builder/packages.lock.json
new file mode 100644
index 0000000000..57efbaeee6
--- /dev/null
+++ b/source/Cosmos.Build.Builder/packages.lock.json
@@ -0,0 +1,75 @@
+{
+  "version": 1,
+  "dependencies": {
+    "net6.0-windows7.0": {
+      "Microsoft.VisualStudio.Setup.Configuration.Interop": {
+        "type": "Direct",
+        "requested": "[3.8.2112, )",
+        "resolved": "3.8.2112",
+        "contentHash": "5qYOpReBk1mc+c+2L3WCsaWAOPTG8VhF0oP3Spm//nj1ArNhAwnax09cW9lWcfVVGcTY35t/ORoydr3uUb98Ow=="
+      },
+      "Newtonsoft.Json": {
+        "type": "Direct",
+        "requested": "[13.0.3, )",
+        "resolved": "13.0.3",
+        "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ=="
+      },
+      "NuGet.Common": {
+        "type": "Direct",
+        "requested": "[6.8.0, )",
+        "resolved": "6.8.0",
+        "contentHash": "voNZyM5L5s0CCDPU//vXKQke0M8y6kGvG+0Ll6gc/xV7Jh1C3/5OhHRzvekxBS6a9DO/lsFhTZtyCkL6n9lHEw==",
+        "dependencies": {
+          "NuGet.Frameworks": "6.8.0"
+        }
+      },
+      "NuGet.Configuration": {
+        "type": "Direct",
+        "requested": "[6.8.0, )",
+        "resolved": "6.8.0",
+        "contentHash": "FFEoY1L9G+C74HfSYt6epHTIuS5xJ8D+d9LZ5nnqhujMoBlQgHphaCTfRlul+e/bNIkAp1fDObzsGlPmu3CKAg==",
+        "dependencies": {
+          "NuGet.Common": "6.8.0",
+          "System.Security.Cryptography.ProtectedData": "4.4.0"
+        }
+      },
+      "NuGet.Frameworks": {
+        "type": "Direct",
+        "requested": "[6.8.0, )",
+        "resolved": "6.8.0",
+        "contentHash": "cN9NyahKgYYScioH4CKn+TYj1eSODxd0RECFnQt6ZmzT6z7PfXlbYpVzbiPsxNgY23iNDMOVkSmOqNZyYxNlQA=="
+      },
+      "System.Runtime.WindowsRuntime": {
+        "type": "Direct",
+        "requested": "[5.0.0-preview.5.20278.1, )",
+        "resolved": "5.0.0-preview.5.20278.1",
+        "contentHash": "XlW8W5MKfW2Acim7MCBIsATlwZX+ZPSE72CKjo9YASDordRIL0+C7X9m1ux/mIAC7BIzp29Iys75IzHz01e1IQ=="
+      },
+      "System.Text.Encoding.CodePages": {
+        "type": "Direct",
+        "requested": "[8.0.0, )",
+        "resolved": "8.0.0",
+        "contentHash": "OZIsVplFGaVY90G2SbpgU7EnCoOO5pw1t4ic21dBF3/1omrJFpAGoNAVpPyMVOC90/hvgkGG3VFqR13YgZMQfg==",
+        "dependencies": {
+          "System.Runtime.CompilerServices.Unsafe": "6.0.0"
+        }
+      },
+      "WPF-UI": {
+        "type": "Direct",
+        "requested": "[3.0.0-preview.11, )",
+        "resolved": "3.0.0-preview.11",
+        "contentHash": "wPTCMHQvjCQT096NzYix5Z+VVvitfmRoDYL+K9V679f7z0eLIts02ehnunjypKkg4w9bO8WCwffktb8+kiRiBQ=="
+      },
+      "System.Runtime.CompilerServices.Unsafe": {
+        "type": "Transitive",
+        "resolved": "6.0.0",
+        "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
+      },
+      "System.Security.Cryptography.ProtectedData": {
+        "type": "Transitive",
+        "resolved": "4.4.0",
+        "contentHash": "cJV7ScGW7EhatRsjehfvvYVBvtiSMKgN8bOVI0bQhnF5bU7vnHVIsH49Kva7i7GWaWYvmEzkYVk1TC+gZYBEog=="
+      }
+    }
+  }
+}
\ No newline at end of file

From c469839fe7dc25525053cf035f0927b0ef6d8fa3 Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Tue, 28 Nov 2023 17:09:54 -0500
Subject: [PATCH 4/8] Update PackageVersions.targets

---
 Build/Targets/PackageVersions.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Build/Targets/PackageVersions.targets b/Build/Targets/PackageVersions.targets
index 7979f5f679..bbd5c7ecc9 100644
--- a/Build/Targets/PackageVersions.targets
+++ b/Build/Targets/PackageVersions.targets
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <ApprovalTestsVersion>3.0.18</ApprovalTestsVersion>
         <AvaloniaVersion>0.7.0</AvaloniaVersion>
-        <NuGetVersion>5.9.1</NuGetVersion>
+        <NuGetVersion>6.8.0</NuGetVersion>
         <NUnitVersion>3.11.0</NUnitVersion>
         <NUnit3TestAdapterVersion>3.12.0</NUnit3TestAdapterVersion>
         <RoslynAnalyzersVersion>2.6.2</RoslynAnalyzersVersion>

From 1ad979294307924bc49b692b457d715270ae11f7 Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Tue, 28 Nov 2023 17:10:48 -0500
Subject: [PATCH 5/8] fix warning

---
 .../Cosmos.Build.Builder.csproj               | 43 ++++++++++---------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/source/Cosmos.Build.Builder/Cosmos.Build.Builder.csproj b/source/Cosmos.Build.Builder/Cosmos.Build.Builder.csproj
index 26e4cfccd4..7f6c596f19 100644
--- a/source/Cosmos.Build.Builder/Cosmos.Build.Builder.csproj
+++ b/source/Cosmos.Build.Builder/Cosmos.Build.Builder.csproj
@@ -1,23 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net6.0-windows7.0</TargetFramework>
-    <OutputType>WinExe</OutputType>
-    <ApplicationIcon>Resources\Cosmos.ico</ApplicationIcon>
-     <UseWPF>True</UseWPF>
-    <AppendTargetFrameworkToOutputPath>False</AppendTargetFrameworkToOutputPath>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
-  </PropertyGroup>
-  <ItemGroup>
-    <Resource Include="Resources\**" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.8.2112" />
-    <PackageReference Include="NuGet.Common" Version="6.8.0" />
-    <PackageReference Include="NuGet.Configuration" Version="6.8.0" />
-    <PackageReference Include="NuGet.Frameworks" Version="6.8.0" />
-    <PackageReference Include="System.Runtime.WindowsRuntime" Version="5.0.0-preview.5.20278.1" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
-    <PackageReference Include="WPF-UI" Version="3.0.0-preview.11" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-  </ItemGroup>
+    <PropertyGroup>
+        <TargetFramework>net6.0-windows7.0</TargetFramework>
+        <OutputType>WinExe</OutputType>
+        <ApplicationIcon>Resources\Cosmos.ico</ApplicationIcon>
+        <UseWPF>True</UseWPF>
+        <AppendTargetFrameworkToOutputPath>False</AppendTargetFrameworkToOutputPath>
+        <ApplicationManifest>app.manifest</ApplicationManifest>
+        <SignAssembly>False</SignAssembly>
+    </PropertyGroup>
+    <ItemGroup>
+        <Resource Include="Resources\**" />
+    </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.8.2112" />
+        <PackageReference Include="NuGet.Common" Version="6.8.0" />
+        <PackageReference Include="NuGet.Configuration" Version="6.8.0" />
+        <PackageReference Include="NuGet.Frameworks" Version="6.8.0" />
+        <PackageReference Include="System.Runtime.WindowsRuntime" Version="5.0.0-preview.5.20278.1" />
+        <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
+        <PackageReference Include="WPF-UI" Version="3.0.0-preview.11" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    </ItemGroup>
 </Project>
\ No newline at end of file

From 5893c1203ddf14a1ecc921c0591afed79bf3f0fe Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Tue, 28 Nov 2023 17:50:33 -0500
Subject: [PATCH 6/8] implement GUI builder configuration

---
 install-VS2022.bat                            |  2 +-
 source/Cosmos.Build.Builder/App.xaml.cs       | 19 +++----
 .../BuilderConfiguration.cs                   | 13 +++++
 .../CommandLineBuilderConfiguration.cs        | 50 -------------------
 .../Dependencies/ReposDependency.cs           |  7 +--
 .../IBuilderConfiguration.cs                  |  2 +-
 .../ViewModels/MainWindowViewModel.cs         |  5 +-
 .../Views/MainWindow.xaml.cs                  |  4 +-
 .../Views/MessageBox.xaml.cs                  |  5 +-
 .../Views/OptionsDialog.xaml                  | 18 ++-----
 .../Views/OptionsDialog.xaml.cs               | 14 ++++++
 .../Views/VisualStudioInstanceDialog.xaml.cs  |  4 +-
 userkit install.bat                           |  3 --
 13 files changed, 52 insertions(+), 94 deletions(-)
 create mode 100644 source/Cosmos.Build.Builder/BuilderConfiguration.cs
 delete mode 100644 source/Cosmos.Build.Builder/CommandLineBuilderConfiguration.cs
 delete mode 100644 userkit install.bat

diff --git a/install-VS2022.bat b/install-VS2022.bat
index 89e18e9707..7d6b7ee776 100644
--- a/install-VS2022.bat
+++ b/install-VS2022.bat
@@ -34,7 +34,7 @@ if %ERRORLEVEL% neq 0 (
   exit /b %ERRORLEVEL%
 )
 
-start "Cosmos Builder" "source\Cosmos.Build.Builder\bin\Debug\Cosmos.Build.Builder.exe" "-VSPATH=%InstallDir%" %*
+start "Cosmos Builder" "source\Cosmos.Build.Builder\bin\Debug\Cosmos.Build.Builder.exe"
 exit
 
 :seven
diff --git a/source/Cosmos.Build.Builder/App.xaml.cs b/source/Cosmos.Build.Builder/App.xaml.cs
index 66f8685ca1..e6917ea987 100644
--- a/source/Cosmos.Build.Builder/App.xaml.cs
+++ b/source/Cosmos.Build.Builder/App.xaml.cs
@@ -26,12 +26,14 @@ protected override void OnStartup(StartupEventArgs e)
             }
 
             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+            MainWindow = new MainWindow();
+
+            // ask for build configuration
+            OptionsDialog options = new();
+            options.ShowDialog();
 
-            CommandLineBuilderConfiguration configuration = new(e.Args);
-
-            BuilderConfiguration = configuration;
+            BuilderConfiguration = options.BuildOptions;
 
-            MainWindow = new MainWindow();
 
             VisualStudioService visualStudioService = new();
 
@@ -45,15 +47,6 @@ protected override void OnStartup(StartupEventArgs e)
 
             ISetupInstance2 visualStudioInstance = null;
 
-            if (configuration.VsPath != null)
-            {
-                visualStudioInstance = visualStudioInstances.FirstOrDefault(
-                    i => string.Equals(
-                        Path.GetFullPath(configuration.VsPath),
-                        Path.GetFullPath(i.GetInstallationPath()),
-                        StringComparison.Ordinal));
-            }
-
             if (visualStudioInstance == null)
             {
                 if (visualStudioInstances.Count == 1)
diff --git a/source/Cosmos.Build.Builder/BuilderConfiguration.cs b/source/Cosmos.Build.Builder/BuilderConfiguration.cs
new file mode 100644
index 0000000000..756bf7ead2
--- /dev/null
+++ b/source/Cosmos.Build.Builder/BuilderConfiguration.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+
+namespace Cosmos.Build.Builder
+{
+    internal class BuilderConfiguration : IBuilderConfiguration
+    {
+        public bool NoVsLaunch { get; set; }
+        public bool UserKit { get; set; }
+        public bool BuildExtensions { get; set; }
+    }
+}
diff --git a/source/Cosmos.Build.Builder/CommandLineBuilderConfiguration.cs b/source/Cosmos.Build.Builder/CommandLineBuilderConfiguration.cs
deleted file mode 100644
index c5472a9267..0000000000
--- a/source/Cosmos.Build.Builder/CommandLineBuilderConfiguration.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-
-namespace Cosmos.Build.Builder
-{
-    internal class CommandLineBuilderConfiguration : IBuilderConfiguration
-    {
-        public bool NoVsLaunch => GetSwitch();
-        public bool UserKit => GetSwitch();
-        public string VsPath => GetOption();
-
-        private readonly Dictionary<string, string> _args;
-
-        public CommandLineBuilderConfiguration(string[] args)
-        {
-            _args = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-
-            foreach (var arg in args)
-            {
-                var keyValue = arg.Split('=');
-
-                if (keyValue.Length > 0)
-                {
-                    var key = keyValue[0].Remove(0, 1);
-
-                    _args.Add(key, null);
-
-                    if (keyValue.Length > 1)
-                    {
-                        _args[key] = keyValue[1];
-                    }
-                }
-            }
-        }
-
-        private bool GetSwitch([CallerMemberName] string name = null) =>
-            _args.ContainsKey(name) && !String.Equals(_args[name], "False", StringComparison.OrdinalIgnoreCase);
-
-        private string GetOption([CallerMemberName] string name = null)
-        {
-            if (_args.TryGetValue(name, out var value))
-            {
-                return value;
-            }
-
-            return null;
-        }
-    }
-}
diff --git a/source/Cosmos.Build.Builder/Dependencies/ReposDependency.cs b/source/Cosmos.Build.Builder/Dependencies/ReposDependency.cs
index 6bc8e7e748..4be1c9718a 100644
--- a/source/Cosmos.Build.Builder/Dependencies/ReposDependency.cs
+++ b/source/Cosmos.Build.Builder/Dependencies/ReposDependency.cs
@@ -19,7 +19,7 @@ public string OtherDependencysThatAreMissing
         {
             get
             {
-                string result = "install ";
+                string result = "";
                 if (!Directory.Exists(Path.GetFullPath(Path.Combine(_cosmosDir, "..", "IL2CPU"))))
                 {
                     result += "IL2CPU Repo, ";
@@ -30,8 +30,9 @@ public string OtherDependencysThatAreMissing
                 }
                 if (!Directory.Exists(Path.GetFullPath(Path.Combine(_cosmosDir, "..", "Common"))))
                 {
-                    result += "Common Repo";
-                }
+                    result += "Common Repo, ";
+                }
+                result = result.Substring(0, result.Length - 2);
                 return result;
             }
         }
diff --git a/source/Cosmos.Build.Builder/IBuilderConfiguration.cs b/source/Cosmos.Build.Builder/IBuilderConfiguration.cs
index 5cd5b44429..0a4b188d70 100644
--- a/source/Cosmos.Build.Builder/IBuilderConfiguration.cs
+++ b/source/Cosmos.Build.Builder/IBuilderConfiguration.cs
@@ -4,6 +4,6 @@ internal interface IBuilderConfiguration
     {
         bool NoVsLaunch { get; }
         bool UserKit { get; }
-        string VsPath { get; }
+        bool BuildExtensions { get; }
     }
 }
diff --git a/source/Cosmos.Build.Builder/ViewModels/MainWindowViewModel.cs b/source/Cosmos.Build.Builder/ViewModels/MainWindowViewModel.cs
index 779433ac96..a83248a043 100644
--- a/source/Cosmos.Build.Builder/ViewModels/MainWindowViewModel.cs
+++ b/source/Cosmos.Build.Builder/ViewModels/MainWindowViewModel.cs
@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
-
+using Cosmos.Build.Builder.BuildTasks;
 using Cosmos.Build.Builder.Collections;
 using Cosmos.Build.Builder.Models;
 using Cosmos.Build.Builder.Services;
@@ -155,7 +155,7 @@ private async Task BuildAsync()
 
                         if (dependency.ShouldInstallByDefault)
                         {
-                            using (var viewModel = new DependencyInstallationDialogViewModel(dependency))
+                            using (DependencyInstallationDialogViewModel viewModel = new(dependency))
                             {
                                 _dependencyInstallationDialogService.ShowDialog(viewModel);
 
@@ -190,7 +190,6 @@ private async Task BuildAsync()
                     if (_buildCancel) { throw new TaskCanceledException(); }
 
                     _logger.NewSection(buildTask.Name);
-
                     await buildTask.RunAsync(_logger).ConfigureAwait(false);
                 }
 
diff --git a/source/Cosmos.Build.Builder/Views/MainWindow.xaml.cs b/source/Cosmos.Build.Builder/Views/MainWindow.xaml.cs
index 82e0c7e708..9dd817870f 100644
--- a/source/Cosmos.Build.Builder/Views/MainWindow.xaml.cs
+++ b/source/Cosmos.Build.Builder/Views/MainWindow.xaml.cs
@@ -2,6 +2,7 @@
 using System.ComponentModel;
 using System.Windows;
 using System.Windows.Controls;
+using Wpf.Ui.Appearance;
 using Clipboard = System.Windows.Clipboard;
 
 namespace Cosmos.Build.Builder.Views
@@ -16,7 +17,8 @@ public partial class MainWindow : Wpf.Ui.Controls.FluentWindow
 
         public MainWindow()
         {
-            InitializeComponent();
+            InitializeComponent();
+            SystemThemeWatcher.Watch(this);
         }
 
         private void SectionTextCopyHandler(object sender, System.Windows.Input.MouseButtonEventArgs e)
diff --git a/source/Cosmos.Build.Builder/Views/MessageBox.xaml.cs b/source/Cosmos.Build.Builder/Views/MessageBox.xaml.cs
index 16f43fb3d8..11b7e60f6e 100644
--- a/source/Cosmos.Build.Builder/Views/MessageBox.xaml.cs
+++ b/source/Cosmos.Build.Builder/Views/MessageBox.xaml.cs
@@ -1,6 +1,5 @@
 using System.Windows;
-using System.Windows.Documents;
-using Wpf.Ui.Controls;
+using Wpf.Ui.Appearance;
 using Hyperlink = System.Windows.Documents.Hyperlink;
 
 namespace Cosmos.Build.Builder.Views
@@ -29,7 +28,7 @@ public MessageBox(string Content)
             {
                 lblMain.Text = Content;
             }
-
+            SystemThemeWatcher.Watch(this);
         }
 
         public static void Show(string Content)
diff --git a/source/Cosmos.Build.Builder/Views/OptionsDialog.xaml b/source/Cosmos.Build.Builder/Views/OptionsDialog.xaml
index e83ddbbc11..5b806b5aac 100644
--- a/source/Cosmos.Build.Builder/Views/OptionsDialog.xaml
+++ b/source/Cosmos.Build.Builder/Views/OptionsDialog.xaml
@@ -29,26 +29,14 @@
         <StackPanel Grid.Row="0"
                     Margin="8">
 
-            <ListView MinHeight="196"
-                      MinWidth="256"
-                      ItemsSource="{Binding VisualStudioInstances}"
-                      SelectedItem="{Binding SelectedVisualStudioInstance, Mode=TwoWay}">
-                <ListView.View>
-                    <GridView>
-                        <GridViewColumn Header="ID" DisplayMemberBinding="{Binding ID}" />
-                        <GridViewColumn Header="Name" DisplayMemberBinding="{Binding Name}" />
-                        <GridViewColumn Header="Installation Path" DisplayMemberBinding="{Binding InstallationPath}" />
-                    </GridView>
-                </ListView.View>
-            </ListView>
+            <CheckBox x:Name="chkBuildExtensions" IsChecked="True">Install Visual Studio Extensions</CheckBox>
+            <CheckBox x:Name="chkBuildUserkit">Build a userkit</CheckBox>
 
             <StackPanel Grid.Row="2"
                         HorizontalAlignment="Right"
                         Margin="0,8,0,0"
                         Orientation="Horizontal">
-                <Button Command="{Binding OkCommand}"
-                        CommandParameter="{Binding ElementName=buildOptionsDialog}"
-                        Content="OK" Margin="0,0,5,0"/>
+                <Button Content="OK" Margin="0,0,5,0" Click="OkButton_Click"/>
             </StackPanel>
 
         </StackPanel>
diff --git a/source/Cosmos.Build.Builder/Views/OptionsDialog.xaml.cs b/source/Cosmos.Build.Builder/Views/OptionsDialog.xaml.cs
index 518a1080ef..5ca896f0eb 100644
--- a/source/Cosmos.Build.Builder/Views/OptionsDialog.xaml.cs
+++ b/source/Cosmos.Build.Builder/Views/OptionsDialog.xaml.cs
@@ -11,6 +11,8 @@
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
+using Cosmos.Build.Builder.BuildTasks;
+using Wpf.Ui.Appearance;
 
 namespace Cosmos.Build.Builder.Views
 {
@@ -19,9 +21,21 @@ namespace Cosmos.Build.Builder.Views
     /// </summary>
     public partial class OptionsDialog : Window
     {
+        internal BuilderConfiguration BuildOptions { get; private set; }
         public OptionsDialog()
         {
             InitializeComponent();
+            SystemThemeWatcher.Watch(this);
+        }
+
+        private void OkButton_Click(object sender, RoutedEventArgs e)
+        {
+            BuildOptions = new()
+            {
+                BuildExtensions = chkBuildExtensions.IsChecked.Value,
+                UserKit = chkBuildUserkit.IsChecked.Value
+            };
+            DialogResult = true;
         }
     }
 }
diff --git a/source/Cosmos.Build.Builder/Views/VisualStudioInstanceDialog.xaml.cs b/source/Cosmos.Build.Builder/Views/VisualStudioInstanceDialog.xaml.cs
index 758fd1c0f4..2b7a4ac055 100644
--- a/source/Cosmos.Build.Builder/Views/VisualStudioInstanceDialog.xaml.cs
+++ b/source/Cosmos.Build.Builder/Views/VisualStudioInstanceDialog.xaml.cs
@@ -1,4 +1,5 @@
 using System.Windows;
+using Wpf.Ui.Appearance;
 using Wpf.Ui.Controls;
 
 namespace Cosmos.Build.Builder.Views
@@ -7,7 +8,8 @@ public partial class VisualStudioInstanceDialog : Window
     {
         public VisualStudioInstanceDialog()
         {
-            InitializeComponent();
+            InitializeComponent();
+            SystemThemeWatcher.Watch(this);
         }
     }
 }
diff --git a/userkit install.bat b/userkit install.bat
deleted file mode 100644
index 3e76ba3b74..0000000000
--- a/userkit install.bat	
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo off
-
-install-VS2022 -USERKIT %*

From c8fcb8ff906e40c7103bcf130f49eb8b5a6b9bb4 Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Tue, 28 Nov 2023 18:09:00 -0500
Subject: [PATCH 7/8] implement disabling extension installation

---
 Setup/Cosmos.iss                                       |  6 ++++--
 .../Cosmos.Build.Builder/BuildTasks/CreateSetupTask.cs | 10 ++++++++--
 source/Cosmos.Build.Builder/CosmosBuildDefinition.cs   |  3 ++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Setup/Cosmos.iss b/Setup/Cosmos.iss
index 915646f059..831104353a 100644
--- a/Setup/Cosmos.iss
+++ b/Setup/Cosmos.iss
@@ -70,7 +70,8 @@ FlatComponentsList=False
 AlwaysShowComponentsList=False
 ShowComponentSizes=False
 LicenseFile=LICENSE.txt
-DisableDirPage=no
+DisableDirPage=no
+WizardStyle=modern
 
 [Messages]
 SelectDirDesc=If the user installing the Cosmos User Kit is not the admin, please choose the users AppData/Roaming directory
@@ -143,12 +144,13 @@ UseRelativePaths=True
 Filename: "{app}\Build\Tools\nuget.exe"; Parameters: "sources Remove -Name ""Cosmos Local Package Feed"""; WorkingDir: "{app}"; Description: "Uninstall Kernel Packages"; StatusMsg: "Uninstalling Kernel Packages"
 Filename: "{app}\Build\Tools\nuget.exe"; Parameters: "sources Add -Name ""Cosmos Local Package Feed"" -Source ""{app}\packages\\"""; WorkingDir: "{app}"; Description: "Install Kernel Packages"; StatusMsg: "Installing Kernel Packages"
 Filename: "{app}\Build\Tools\nuget.exe"; Parameters: "nuget locals all  -Clear"; WorkingDir: "{app}"; Description: "Install Kernel Packages"; StatusMsg: "Clearing nuget cache"
-
+#ifndef DoNotInstallExtensions
 Filename: "{app}\Build\Tools\VSIXBootstrapper.exe"; Parameters: "/q /u:Cosmos.VS.ProjectSystem"; Description: "Remove Cosmos Project System"; StatusMsg: "Removing Visual Studio Extension: Cosmos Project System"
 Filename: "{app}\Build\Tools\VSIXBootstrapper.exe"; Parameters: "/q /u:Cosmos.VS.DebugEngine"; Description: "Remove Cosmos Debug Engine"; StatusMsg: "Removing Visual Studio Extension: Cosmos Debug Engine"
 
 Filename: "{app}\Build\Tools\VSIXBootstrapper.exe"; Parameters: "/q Cosmos.VS.DebugEngine.vsix"; WorkingDir: "{app}\VSIX\"; Description: "Install Cosmos Debug Engine"; StatusMsg: "Installing Visual Studio Extension: Cosmos Debug Engine"
 Filename: "{app}\Build\Tools\VSIXBootstrapper.exe"; Parameters: "/q Cosmos.VS.ProjectSystem.vsix"; WorkingDir: "{app}\VSIX\"; Description: "Install Cosmos Project System"; StatusMsg: "Installing Visual Studio Extension: Cosmos Project System"
+#endif
 
 [UninstallRun]
 Filename: "{app}\Build\Tools\nuget.exe"; Parameters: "sources Remove -Name ""Cosmos Local Package Feed"""; WorkingDir: "{app}"; StatusMsg: "Uninstalling Kernel Packages"
diff --git a/source/Cosmos.Build.Builder/BuildTasks/CreateSetupTask.cs b/source/Cosmos.Build.Builder/BuildTasks/CreateSetupTask.cs
index 1dae672177..8033431dde 100644
--- a/source/Cosmos.Build.Builder/BuildTasks/CreateSetupTask.cs
+++ b/source/Cosmos.Build.Builder/BuildTasks/CreateSetupTask.cs
@@ -19,7 +19,8 @@ public CreateSetupTask(
             IInnoSetupService innoSetupService,
             string scriptFilePath,
             string configuration,
-            string releaseVersion)
+            string releaseVersion,
+            bool InstallExtensions)
             : base(true, false)
         {
             _innoSetupService = innoSetupService;
@@ -30,7 +31,12 @@ public CreateSetupTask(
             {
                 ["BuildConfiguration"] = configuration,
                 ["ChangeSetVersion"] = releaseVersion,
-            };
+            };
+
+            if(!InstallExtensions)
+            {
+                _defines.Add("DoNotInstallExtensions", "1");
+            }
 
             // when building the userkit we want to let innosetup determine the installation location
             // see https://github.com/CosmosOS/Cosmos/issues/2329
diff --git a/source/Cosmos.Build.Builder/CosmosBuildDefinition.cs b/source/Cosmos.Build.Builder/CosmosBuildDefinition.cs
index 9579dee96e..2a66b96182 100644
--- a/source/Cosmos.Build.Builder/CosmosBuildDefinition.cs
+++ b/source/Cosmos.Build.Builder/CosmosBuildDefinition.cs
@@ -163,7 +163,8 @@ void CleanPackage(string aPackage)
                 _innoSetupService,
                 innoSetupScriptPath,
                 App.BuilderConfiguration.UserKit ? "UserKit" : "DevKit",
-                cosmosSetupVersion);
+                cosmosSetupVersion,
+                App.BuilderConfiguration.BuildExtensions);
 
             if (!App.BuilderConfiguration.UserKit)
             {

From 1309c5c126e3e39a2edf1c4b1b0d1aee77feb5d7 Mon Sep 17 00:00:00 2001
From: Misha <106913236+MishaProductions@users.noreply.github.com>
Date: Tue, 28 Nov 2023 18:14:45 -0500
Subject: [PATCH 8/8] Update OptionsDialog.xaml

---
 source/Cosmos.Build.Builder/Views/OptionsDialog.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/Cosmos.Build.Builder/Views/OptionsDialog.xaml b/source/Cosmos.Build.Builder/Views/OptionsDialog.xaml
index 5b806b5aac..49ea97e33d 100644
--- a/source/Cosmos.Build.Builder/Views/OptionsDialog.xaml
+++ b/source/Cosmos.Build.Builder/Views/OptionsDialog.xaml
@@ -10,7 +10,7 @@
         ResizeMode="NoResize"
         SizeToContent="WidthAndHeight"
         Title="Choose Build Options"
-        WindowStartupLocation="CenterOwner"
+        WindowStartupLocation="CenterScreen"
         Background="{ui:ThemeResource ApplicationBackgroundBrush}"
         Foreground="{ui:ThemeResource TextFillColorPrimaryBrush}">
     <Window.Resources>