Version code support

package.json

@@ -53,7 +53,6 @@
     "which": "^1.2.7",
     "wordwrap": "1.0.0",
     "xcode": "^3.0.1",
-    "xml2js": "^0.6.0",
     "yargs": "^17.7.2",
     "yazl": "^2.5.1"
   },

script/command-parser.ts

@@ -520,6 +520,14 @@ yargs
         description: "Semver expression that specifies the binary app version(s) this release is targeting (e.g. 1.1.0, ~1.2.3).",
         type: "string",
       })
+      .option("buildNumber", {
+        alias: "bn",
+        default: undefined,
+        demand: false,
+        description:
+          'Retarget this release to a specific native build (e.g. "100"). Pass an empty string ("") to reset to wildcard (all builds).',
+        type: "string",
+      })
       .check((argv: any, aliases: { [aliases: string]: string }): any => {
         return isValidRollout(argv);
       });
@@ -666,6 +674,14 @@ yargs
         description: "Percentage of users this release should be available to",
         type: "string",
       })
+      .option("buildNumber", {
+        alias: "bn",
+        default: null,
+        demand: false,
+        description:
+          "Target clients on a specific native build (CFBundleVersion on iOS, versionCode on Android). Requires an exact appVersion (e.g. 1.2.3, not a range) and an existing native release with that build number. If omitted, targets all clients on the specified appVersion.",
+        type: "string",
+      })
       .check((argv: any, aliases: { [aliases: string]: string }): any => {
         return checkValidReleaseOptions(argv);
       });
@@ -860,6 +876,14 @@ yargs
         description: "Option that gets passed to react-native bundler. Can be specified multiple times.",
         type: "array",
       })
+      .option("buildNumber", {
+        alias: "bn",
+        default: null,
+        demand: false,
+        description:
+          "Target clients on a specific native build (CFBundleVersion on iOS, versionCode on Android). Requires an exact appVersion (e.g. 1.2.3, not a range) and an existing native release with that build number. If omitted, targets all clients on the specified appVersion.",
+        type: "string",
+      })
       .check((argv: any, aliases: { [aliases: string]: string }): any => {
         return checkValidReleaseOptions(argv);
       });
@@ -1052,6 +1076,14 @@ yargs
         description: "Option that gets passed to react-native bundler. Can be specified multiple times.",
         type: "array",
       })
+      .option("buildNumber", {
+        alias: "bn",
+        default: null,
+        demand: false,
+        description:
+          "Target clients on a specific native build (CFBundleVersion on iOS, versionCode on Android). Requires an exact appVersion (e.g. 1.2.3, not a range) and an existing native release with that build number. If omitted, targets all clients on the specified appVersion.",
+        type: "string",
+      })
       .check((argv: any) => {
         return checkValidReleaseOptions(argv);
       });
@@ -1084,6 +1116,14 @@ yargs
         description: "Semver expression that specifies the binary app version(s) this release is targeting (e.g. 1.1.0, ~1.2.3).",
         type: "string",
       })
+      .option("buildNumber", {
+        alias: "bn",
+        default: null,
+        demand: false,
+        description:
+          "Targets this release to clients running a specific native binary build — CFBundleVersion on iOS or versionCode on Android. If omitted, auto-detected from the target binary (IPA/APK/AAB). Override when the value is set dynamically (e.g. on CI).",
+        type: "string",
+      })
       .check((argv: any, aliases: { [aliases: string]: string }): any => {
         return checkValidReleaseOptions(argv);
       });
@@ -1411,6 +1451,8 @@ export function createCommand(): cli.ICommand {
           patchCommand.mandatory = argv["mandatory"] as any;
           patchCommand.rollout = getRolloutValue(argv["rollout"] as any);
           patchCommand.appStoreVersion = argv["targetBinaryVersion"] as any;
+          // undefined = not provided (skip); null = reset to wildcard (empty string ""); string = retarget to that build.
+          patchCommand.buildNumber = argv["buildNumber"] !== undefined ? (argv["buildNumber"] as string) || null : undefined;
         }
         break;
 
@@ -1450,6 +1492,7 @@ export function createCommand(): cli.ICommand {
           releaseCommand.appName = arg1;
           releaseCommand.package = arg2;
           releaseCommand.appStoreVersion = arg3;
+          releaseCommand.buildNumber = argv["buildNumber"] as any;
           releaseCommand.deploymentName = argv["deploymentName"] as any;
           releaseCommand.description = argv["description"] ? backslash(argv["description"]) : "";
           releaseCommand.disabled = argv["disabled"] as any;
@@ -1469,6 +1512,7 @@ export function createCommand(): cli.ICommand {
           releaseReactCommand.platform = arg2;
 
           releaseReactCommand.appStoreVersion = argv["targetBinaryVersion"] as any;
+          releaseReactCommand.buildNumber = argv["buildNumber"] as any;
           releaseReactCommand.bundleName = argv["bundleName"] as any;
           releaseReactCommand.deploymentName = argv["deploymentName"] as any;
           releaseReactCommand.disabled = argv["disabled"] as any;
@@ -1505,6 +1549,7 @@ export function createCommand(): cli.ICommand {
           releaseExpoCommand.platform = arg2;
 
           releaseExpoCommand.appStoreVersion = argv["targetBinaryVersion"] as any;
+          releaseExpoCommand.buildNumber = argv["buildNumber"] as any;
           releaseExpoCommand.bundleName = argv["bundleName"] as any;
           releaseExpoCommand.deploymentName = argv["deploymentName"] as any;
           releaseExpoCommand.disabled = argv["disabled"] as any;
@@ -1542,6 +1587,7 @@ export function createCommand(): cli.ICommand {
           releaseBinaryCommand.targetBinary = arg3;
           releaseBinaryCommand.deploymentName = argv["deploymentName"] as any;
           releaseBinaryCommand.appStoreVersion = argv["targetBinaryVersion"] as any;
+          releaseBinaryCommand.buildNumber = argv["buildNumber"] as any;
           releaseBinaryCommand.initial = true;
           releaseBinaryCommand.disabled = true;
           releaseBinaryCommand.mandatory = false;

script/management-sdk.ts

@@ -275,8 +275,9 @@ class AccountManager {
     return this.get(urlEncode([`/apps/${appName}/deployments/${deploymentName}`])).then((res: JsonResponse) => res.body.deployment);
   }
 
-  public getBaseRelease(appName: string, deploymentName: string, appVerison: string): Promise<BaseRelease> {
-    return this.get(urlEncode([`/apps/${appName}/deployments/${deploymentName}/basebundle?appVersion=${appVerison}`])).then(
+  public getBaseRelease(appName: string, deploymentName: string, appVersion: string, buildNumber?: string): Promise<BaseRelease> {
+    const qs = buildNumber ? `?appVersion=${appVersion}&buildNumber=${buildNumber}` : `?appVersion=${appVersion}`;
+    return this.get(urlEncode([`/apps/${appName}/deployments/${deploymentName}/basebundle${qs}`])).then(
       (res: JsonResponse) => res.body.basebundle
     );
   }

script/react-native-utils.ts

@@ -2,7 +2,7 @@ import * as fs from "fs";
 import * as chalk from "chalk";
 import * as path from "path";
 import * as childProcess from "child_process";
-import { coerce, compare, valid } from "semver";
+import { coerce, compare, gte, valid } from "semver";
 import { downloadBlob, extractIPA, fileDoesNotExistOrIsDirectory } from "./utils/file-utils";
 import * as dotenv from "dotenv";
 import { DotenvParseOutput } from "dotenv";
@@ -54,7 +54,7 @@ export async function takeHermesBaseBytecode(
   outputFolder: string,
   bundleName: string
 ): Promise<string | null> {
-  const { bundleBlobUrl } = await sdk.getBaseRelease(command.appName, command.deploymentName, command.appStoreVersion);
+  const { bundleBlobUrl } = await sdk.getBaseRelease(command.appName, command.deploymentName, command.appStoreVersion, command.buildNumber);
   if (!bundleBlobUrl) {
     return null;
   }

script/types/cli.ts

@@ -165,6 +165,7 @@ export interface IPackageInfo {
 export interface IPatchCommand extends ICommand, IPackageInfo {
   appName: string;
   appStoreVersion?: string;
+  buildNumber?: string | null;
   deploymentName: string;
   label: string;
 }
@@ -184,6 +185,7 @@ export interface IRegisterCommand extends ICommand {
 export interface IReleaseBaseCommand extends ICommand, IPackageInfo {
   appName: string;
   appStoreVersion: string;
+  buildNumber?: string;
   deploymentName: string;
   noDuplicateReleaseError?: boolean;
   privateKeyPath?: string;

script/types/rest-definitions.ts

@@ -46,6 +46,7 @@ export interface DownloadReport {
 /*inout*/
 export interface PackageInfo {
   appVersion?: string;
+  buildNumber?: string | null;
   description?: string;
   isDisabled?: boolean;
   isMandatory?: boolean;