insidegui · insidegui · Jun 9, 2026 · Jun 9, 2026 · Jun 9, 2026 · Jun 9, 2026
diff --git a/.gitignore b/.gitignore
@@ -23,4 +23,5 @@ Sharing.h
 Tests/Private
 Design/Icon
 Build/
-MockServer/
+MockServer/
+CIProjectVersion.xcconfig
diff --git a/Scripts/check_guest_app_deployment_target.sh b/Scripts/check_guest_app_deployment_target.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env zsh
+
+# This script prevents raising the deployment target for VirtualBuddyGuest without placing the corresponding legacy archive in data/LegacyGuest,
+# ensuring that older releases are always made available to users running legacy guest OSes
+
+set -e
+
+source "Scripts/legacy_guest_env.zsh"
+
+# This only runs for builds using Managed configurations (Beta configurations are also managed)
+if [[ "$CONFIGURATION" == *"Managed"* || "$CONFIGURATION" == *"Beta"* ]]; then
+    EXPECTED_GUEST_ARCHIVE="${SRCROOT}/${LEGACY_GUEST_ARCHIVE_DIR}/VirtualBuddyGuest_minOS_${LATEST_LEGACY_GUEST_APP_ARCHIVE_DEPLOYMENT_TARGET}.dmg"
+
+    if [ ! -f "${EXPECTED_GUEST_ARCHIVE}" ]; then
+        echo "error: The deployment target for VirtualBuddyGuest has been raised to ${MACOSX_DEPLOYMENT_TARGET} without a legacy archive being created for the latest version that supported ${LATEST_LEGACY_GUEST_APP_ARCHIVE_DEPLOYMENT_TARGET}. Please use dmgdist against a notarized build of VirtualBuddyGuest to generate an archive and register it with vctool before proceeding with this release."
+        exit 1
+    fi
+fi
diff --git a/Scripts/legacy_guest_env.zsh b/Scripts/legacy_guest_env.zsh
@@ -0,0 +1,9 @@
+#!/usr/bin/env zsh
+
+# Path to legacy guest app archive directory relative to VirtualBuddy repo root
+export LEGACY_GUEST_ARCHIVE_DIR=data/LegacyGuestApp
+
+# The deployment target for the latest VirtualBuddyGuest app archive
+# If a managed build is attempted with a different value without an archive
+# existing with this version number suffix, the build fails.
+export LATEST_LEGACY_GUEST_APP_ARCHIVE_DEPLOYMENT_TARGET="14.0"
diff --git a/VirtualBuddy.xcodeproj/project.pbxproj b/VirtualBuddy.xcodeproj/project.pbxproj
diff --git a/VirtualBuddy.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/VirtualBuddy.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/VirtualBuddy.xcodeproj/xcshareddata/xcodecloud/manifest.json b/VirtualBuddy.xcodeproj/xcshareddata/xcodecloud/manifest.json
@@ -0,0 +1,9 @@
+{
+  "id" : "8e11e5f0-93f5-45e9-8b15-57ea4662691e",
+  "targets" : [
+    {
+      "id" : "E4EC8AE8-A4E2-4AA2-9A6A-2E1FADB38BC2",
+      "name" : "VirtualBuddy"
+    }
+  ]
+}
diff --git a/VirtualBuddy.xcodeproj/xcshareddata/xcschemes/DeepLinkSecurity.xcscheme b/VirtualBuddy.xcodeproj/xcshareddata/xcschemes/DeepLinkSecurity.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "2650"
+   LastUpgradeVersion = "2700"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/VirtualBuddy.xcodeproj/xcshareddata/xcschemes/VirtualBuddy (Dev Release).xcscheme b/VirtualBuddy.xcodeproj/xcshareddata/xcschemes/VirtualBuddy (Dev Release).xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "2650"
+   LastUpgradeVersion = "2700"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/VirtualBuddy.xcodeproj/xcshareddata/xcschemes/VirtualBuddy (Managed - Beta).xcscheme b/VirtualBuddy.xcodeproj/xcshareddata/xcschemes/VirtualBuddy (Managed - Beta).xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "2650"
+   LastUpgradeVersion = "2700"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -55,6 +55,10 @@
             argument = "-VBAPIEnvironment local"
             isEnabled = "NO">
          </CommandLineArgument>
+         <CommandLineArgument
+            argument = "-VBForceBuiltInSoftwareCatalog YES"
+            isEnabled = "NO">
+         </CommandLineArgument>
          <CommandLineArgument
             argument = "-VBDisableMemoryLeakAssertions YES"
             isEnabled = "NO">
@@ -65,9 +69,33 @@
          </CommandLineArgument>
          <CommandLineArgument
             argument = "-WHVerbosePacketLogging YES"
+            isEnabled = "NO">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "-VerboseUILoggingEnabled YES"
             isEnabled = "YES">
          </CommandLineArgument>
+         <CommandLineArgument
+            argument = "-VBForceVirtualInstallationBackend YES"
+            isEnabled = "NO">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "-VBAllowAllGuestAppVersions YES"
+            isEnabled = "NO">
+         </CommandLineArgument>
       </CommandLineArguments>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "VI_TEST_MODE"
+            value = "1"
+            isEnabled = "NO">
+         </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "VB_TOOL"
+            value = "vctool"
+            isEnabled = "NO">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Beta_Release"

diff --git a/VirtualBuddy.xcodeproj/xcshareddata/xcschemes/VirtualBuddy (Managed).xcscheme b/VirtualBuddy.xcodeproj/xcshareddata/xcschemes/VirtualBuddy (Managed).xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "2650"
+   LastUpgradeVersion = "2700"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/VirtualBuddy.xcodeproj/xcshareddata/xcschemes/VirtualBuddy.xcscheme b/VirtualBuddy.xcodeproj/xcshareddata/xcschemes/VirtualBuddy.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "2650"
+   LastUpgradeVersion = "2700"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/VirtualBuddy.xcodeproj/xcshareddata/xcschemes/VirtualBuddyGuest.xcscheme b/VirtualBuddy.xcodeproj/xcshareddata/xcschemes/VirtualBuddyGuest.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "2650"
+   LastUpgradeVersion = "2700"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/VirtualBuddy.xcodeproj/xcshareddata/xcschemes/VirtualCore.xcscheme b/VirtualBuddy.xcodeproj/xcshareddata/xcschemes/VirtualCore.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "2650"
+   LastUpgradeVersion = "2700"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/VirtualBuddy.xcodeproj/xcshareddata/xcschemes/VirtualInstallation.xcscheme b/VirtualBuddy.xcodeproj/xcshareddata/xcschemes/VirtualInstallation.xcscheme
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "2700"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "F4EFB5622FDB2A0D00AF2A63"
+               BuildableName = "VirtualInstallation.framework"
+               ReferencedContainer = "container:VirtualBuddy.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES"
+      queueDebuggingEnabled = "No">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "F4EFB5622FDB2A0D00AF2A63"
+            BuildableName = "VirtualInstallation.framework"
+            ReferencedContainer = "container:VirtualBuddy.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/VirtualBuddy.xcodeproj/xcshareddata/xcschemes/VirtualInstallationService.xcscheme b/VirtualBuddy.xcodeproj/xcshareddata/xcschemes/VirtualInstallationService.xcscheme
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "2700"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "F4EFB5B32FDB2BD300AF2A63"
+               BuildableName = "VirtualInstallationService.xpc"
+               ReferencedContainer = "container:VirtualBuddy.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES"
+      queueDebuggingEnabled = "No">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "F4EFB5B32FDB2BD300AF2A63"
+            BuildableName = "VirtualInstallationService.xpc"
+            ReferencedContainer = "container:VirtualBuddy.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/VirtualBuddy.xcodeproj/xcshareddata/xcschemes/VirtualUI.xcscheme b/VirtualBuddy.xcodeproj/xcshareddata/xcschemes/VirtualUI.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "2650"
+   LastUpgradeVersion = "2700"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/VirtualBuddy.xcodeproj/xcshareddata/xcschemes/VirtualWormhole.xcscheme b/VirtualBuddy.xcodeproj/xcshareddata/xcschemes/VirtualWormhole.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "2650"
+   LastUpgradeVersion = "2700"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/VirtualBuddy.xcodeproj/xcshareddata/xcschemes/vctool.xcscheme b/VirtualBuddy.xcodeproj/xcshareddata/xcschemes/vctool.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "2650"
+   LastUpgradeVersion = "2700"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/VirtualBuddy/Bootstrap/VirtualBuddyAppDelegate.swift b/VirtualBuddy/Bootstrap/VirtualBuddyAppDelegate.swift
@@ -37,20 +37,22 @@ import SwiftUI
     private var cancellables = Set<AnyCancellable>()
 
     func applicationDidFinishLaunching(_ notification: Notification) {
-        GuestAdditionsDiskImage.current.$state.sink { state in
+        GuestAdditionsDiskImage.default.$state.sink { state in
             switch state {
             case .ready:
-                self.logger.debug("Guest disk image ready")
+                self.logger.debug("Default guest disk image ready")
+            case .downloading:
+                self.logger.debug("Default guest disk image downloading")
             case .installing:
-                self.logger.debug("Guest disk image installing")
+                self.logger.debug("Default guest disk image installing")
             case .installFailed(let error):
-                self.logger.debug("Guest disk image installation failed - \(error, privacy: .public)")
+                self.logger.debug("Default guest disk image installation failed - \(error, privacy: .public)")
             }
         }
         .store(in: &cancellables)
 
         Task {
-            try? await GuestAdditionsDiskImage.current.installIfNeeded()
+            try? await GuestAdditionsDiskImage.default.installIfNeeded()
         }
 
         #if DEBUG

diff --git a/VirtualBuddy/CommandLine/vctool/CatalogCommand.swift b/VirtualBuddy/CommandLine/vctool/CatalogCommand.swift
@@ -9,7 +9,8 @@ struct CatalogCommand: AsyncParsableCommand {
         subcommands: [
             ImageCommand.self,
             GroupCommand.self,
-            MigrateCommand.self
+            MigrateCommand.self,
+            LegacyGuestAppCommand.self
         ]
     )
 }