implement disabling extension installation

GermanLetsHackZ · Nov 28, 2023 · c8fcb8f · c8fcb8f
1 parent 5893c12
commit c8fcb8f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
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/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
@@ -163,7 +163,8 @@ void CleanPackage(string aPackage)
                 _innoSetupService,
                 innoSetupScriptPath,
                 App.BuilderConfiguration.UserKit ? "UserKit" : "DevKit",
-                cosmosSetupVersion);
+                cosmosSetupVersion,
+                App.BuilderConfiguration.BuildExtensions);
 
             if (!App.BuilderConfiguration.UserKit)
             {