Merge branch 'main' into feature/WindowsUPMConfigFix

# Conflicts:
#	dist/index.js.map

dist/index.js

@@ -6552,6 +6552,7 @@ class ImageTag {
             android: 'android',
             ios: 'ios',
             tvos: 'appletv',
+            visionos: 'visionos',
             facebook: 'facebook',
         };
     }
@@ -6569,7 +6570,7 @@ class ImageTag {
         }
     }
     static getTargetPlatformToTargetPlatformSuffixMap(platform, version, providerStrategy) {
-        const { generic, webgl, mac, windows, windowsIl2cpp, wsaPlayer, linux, linuxIl2cpp, android, ios, tvos, facebook } = ImageTag.targetPlatformSuffixes;
+        const { generic, webgl, mac, windows, windowsIl2cpp, wsaPlayer, linux, linuxIl2cpp, android, ios, tvos, visionos, facebook, } = ImageTag.targetPlatformSuffixes;
         const [major, minor] = version.split('.').map((digit) => Number(digit));
         // @see: https://docs.unity3d.com/ScriptReference/BuildTarget.html
         switch (platform) {
@@ -6617,10 +6618,15 @@ class ImageTag {
             case platform_1.default.types.XboxOne:
                 return windows;
             case platform_1.default.types.tvOS:
-                if (process.platform !== 'win32') {
+                if (process.platform !== 'win32' && process.platform !== 'darwin') {
-                    throw new Error(`tvOS can only be built on a windows base OS`);
+                    throw new Error(`tvOS can only be built on Windows or macOS base OS`);
                 }
                 return tvos;
+            case platform_1.default.types.VisionOS:
+                if (process.platform !== 'darwin') {
+                    throw new Error(`visionOS can only be built on a macOS base OS`);
+                }
+                return visionos;
             case platform_1.default.types.Switch:
                 return windows;
             // Unsupported
@@ -7400,7 +7406,10 @@ class SetupMac {
                 moduleArgument.push('--module', 'ios');
                 break;
             case 'tvOS':
-                moduleArgument.push('--module', 'tvos');
+                moduleArgument.push('--module', 'appletv');
+                break;
+            case 'VisionOS':
+                moduleArgument.push('--module', 'visionos');
                 break;
             case 'StandaloneOSX':
                 moduleArgument.push('--module', 'mac-il2cpp');
@@ -7614,6 +7623,7 @@ class Platform {
             PS4: 'PS4',
             XboxOne: 'XboxOne',
             tvOS: 'tvOS',
+            VisionOS: 'VisionOS',
             Switch: 'Switch',
             // Unsupported
             Lumin: 'Lumin',

src/model/image-tag.ts

@@ -58,6 +58,7 @@ class ImageTag {
       android: 'android',
       ios: 'ios',
       tvos: 'appletv',
+      visionos: 'visionos',
       facebook: 'facebook',
     };
   }
@@ -82,8 +83,21 @@ class ImageTag {
     version: string,
     providerStrategy: string,
   ): string {
-    const { generic, webgl, mac, windows, windowsIl2cpp, wsaPlayer, linux, linuxIl2cpp, android, ios, tvos, facebook } =
+    const {
-      ImageTag.targetPlatformSuffixes;
+      generic,
+      webgl,
+      mac,
+      windows,
+      windowsIl2cpp,
+      wsaPlayer,
+      linux,
+      linuxIl2cpp,
+      android,
+      ios,
+      tvos,
+      visionos,
+      facebook,
+    } = ImageTag.targetPlatformSuffixes;
 
     const [major, minor] = version.split('.').map((digit) => Number(digit));
 
@@ -136,11 +150,17 @@ class ImageTag {
       case Platform.types.XboxOne:
         return windows;
       case Platform.types.tvOS:
-        if (process.platform !== 'win32') {
+        if (process.platform !== 'win32' && process.platform !== 'darwin') {
-          throw new Error(`tvOS can only be built on a windows base OS`);
+          throw new Error(`tvOS can only be built on Windows or macOS base OS`);
         }
 
         return tvos;
+      case Platform.types.VisionOS:
+        if (process.platform !== 'darwin') {
+          throw new Error(`visionOS can only be built on a macOS base OS`);
+        }
+
+        return visionos;
       case Platform.types.Switch:
         return windows;
 

src/model/platform-setup/setup-mac.ts

@@ -101,7 +101,10 @@ class SetupMac {
         moduleArgument.push('--module', 'ios');
         break;
       case 'tvOS':
-        moduleArgument.push('--module', 'tvos');
+        moduleArgument.push('--module', 'appletv');
+        break;
+      case 'VisionOS':
+        moduleArgument.push('--module', 'visionos');
         break;
       case 'StandaloneOSX':
         moduleArgument.push('--module', 'mac-il2cpp');

src/model/platform.ts

@@ -16,6 +16,7 @@ class Platform {
       PS4: 'PS4',
       XboxOne: 'XboxOne',
       tvOS: 'tvOS',
+      VisionOS: 'VisionOS',
       Switch: 'Switch',
 
       // Unsupported