Merge pull request #2826 from CosmosOS/impl/builder-improvements

Builder improvements
CosmosOS · Nov 29, 2023 · 78da949 · 78da949
2 parents a78f61d + 1309c5c
commit 78da949
Show file tree

Hide file tree

Showing 23 changed files with 336 additions and 220 deletions.
diff --git 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>

diff --git 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/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
@@ -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,18 @@ protected override void OnStartup(StartupEventArgs e)
                 Current.Shutdown();
                 return;
             }
+
+            Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+            MainWindow = new MainWindow();
+
+            // ask for build configuration
+            OptionsDialog options = new();
+            options.ShowDialog();
 
-            var configuration = new CommandLineBuilderConfiguration(e.Args);
-
-            BuilderConfiguration = configuration;
+            BuilderConfiguration = options.BuildOptions;
 
-            MainWindow = new MainWindow();
 
-            var visualStudioService = new VisualStudioService();
+            VisualStudioService visualStudioService = new();
 
             var visualStudioInstances = visualStudioService.GetInstances();
 
@@ -42,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/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/BuilderConfiguration.cs 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
diff --git a/source/Cosmos.Build.Builder/Cosmos.Build.Builder.csproj b/source/Cosmos.Build.Builder/Cosmos.Build.Builder.csproj
@@ -1,34 +1,24 @@
-<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>
+        <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>
diff --git 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)
             {

diff --git 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
@@ -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
@@ -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;
@@ -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);
         }
@@ -154,7 +155,7 @@ private async Task BuildAsync()
 
                         if (dependency.ShouldInstallByDefault)
                         {
-                            using (var viewModel = new DependencyInstallationDialogViewModel(dependency))
+                            using (DependencyInstallationDialogViewModel viewModel = new(dependency))
                             {
                                 _dependencyInstallationDialogService.ShowDialog(viewModel);
 
@@ -189,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/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
@@ -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>