Merge pull request #2014 from salesforcecli/release/2.69.6

Release PR for 2.69.6 as nightly

README.md

@@ -24,7 +24,7 @@ $ npm install -g @salesforce/cli
 $ sf COMMAND
 running command...
 $ sf (--version|-v)
-@salesforce/cli/2.69.5 linux-x64 node-v22.11.0
+@salesforce/cli/2.69.6 linux-x64 node-v22.11.0
 $ sf --help [COMMAND]
 USAGE
   $ sf COMMAND
@@ -1336,7 +1336,7 @@ EXAMPLES
     $ sf data bulk results --job-id 7507i000fake341G --target-org my-scratch
 ```
 
-_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.11.6/src/commands/data/bulk/results.ts)_
+_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.12.0/src/commands/data/bulk/results.ts)_
 
 ## `sf data create file`
 
@@ -1385,7 +1385,7 @@ EXAMPLES
     $ sf data create file --file path/to/astro.png --parent-id a03fakeLoJWPIA3
 ```
 
-_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.11.6/src/commands/data/create/file.ts)_
+_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.12.0/src/commands/data/create/file.ts)_
 
 ## `sf data create record`
 
@@ -1441,30 +1441,33 @@ EXAMPLES
       TracedEntityId=01p17000000R6bLAAS"
 ```
 
-_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.11.6/src/commands/data/create/record.ts)_
+_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.12.0/src/commands/data/create/record.ts)_
 
 ## `sf data delete bulk`
 
 Bulk delete records from an org using a CSV file. Uses Bulk API 2.0.
 
 ```
 USAGE
-  $ sf data delete bulk -o <value> -f <value> -s <value> [--json] [--flags-dir <value>] [--api-version <value>] [-w
-    <value> | -a] [--verbose] [--hard-delete]
+  $ sf data delete bulk -o <value> -s <value> [--json] [--flags-dir <value>] [--api-version <value>] [-w <value> | -a]
+    [--verbose] (--line-ending CRLF|LF -f <value>) [--hard-delete]
 
 FLAGS
-  -a, --async                Run the command asynchronously.
-  -f, --file=<value>         (required) CSV file that contains the IDs of the records to update or delete.
-  -o, --target-org=<value>   (required) Username or alias of the target org. Not required if the `target-org`
-                             configuration variable is already set.
-  -s, --sobject=<value>      (required) API name of the Salesforce object, either standard or custom, that you want to
-                             update or delete records from.
-  -w, --wait=<value>         [default: 0 minutes] Number of minutes to wait for the command to complete before
-                             displaying the results.
-      --api-version=<value>  Override the api version used for api requests made by this command
-      --hard-delete          Mark the records as immediately eligible for deletion by your org. If you don't specify
-                             this flag, the deleted records go into the Recycle Bin.
-      --verbose              Print verbose output of failed records if result is available.
+  -a, --async                 Run the command asynchronously.
+  -f, --file=<value>          (required) CSV file that contains the IDs of the records to update or delete.
+  -o, --target-org=<value>    (required) Username or alias of the target org. Not required if the `target-org`
+                              configuration variable is already set.
+  -s, --sobject=<value>       (required) API name of the Salesforce object, either standard or custom, that you want to
+                              update or delete records from.
+  -w, --wait=<value>          [default: 0 minutes] Number of minutes to wait for the command to complete before
+                              displaying the results.
+      --api-version=<value>   Override the api version used for api requests made by this command
+      --hard-delete           Mark the records as immediately eligible for deletion by your org. If you don't specify
+                              this flag, the deleted records go into the Recycle Bin.
+      --line-ending=<option>  Line ending used in the CSV file. Default value on Windows is `CRLF`; on macOS and Linux
+                              it's `LF`.
+                              <options: CRLF|LF>
+      --verbose               Print verbose output of failed records if result is available.
 
 GLOBAL FLAGS
   --flags-dir=<value>  Import flag values from a directory.
@@ -1499,7 +1502,7 @@ FLAG DESCRIPTIONS
     and can be enabled only by a system administrator.
 ```
 
-_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.11.6/src/commands/data/delete/bulk.ts)_
+_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.12.0/src/commands/data/delete/bulk.ts)_
 
 ## `sf data delete record`
 
@@ -1560,7 +1563,7 @@ EXAMPLES
     $ sf data delete record --use-tooling-api --sobject TraceFlag --record-id 7tf8c
 ```
 
-_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.11.6/src/commands/data/delete/record.ts)_
+_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.12.0/src/commands/data/delete/record.ts)_
 
 ## `sf data delete resume`
 
@@ -1577,7 +1580,7 @@ FLAGS
                              variable is already set.
       --api-version=<value>  Override the api version used for api requests made by this command
       --use-most-recent      Use the ID of the most recently-run bulk job.
-      --wait=<value>         [default: 0 minutes] Number of minutes to wait for the command to complete before
+      --wait=<value>         [default: 5 minutes] Number of minutes to wait for the command to complete before
                              displaying the results.
 
 GLOBAL FLAGS
@@ -1599,7 +1602,7 @@ EXAMPLES
     $ sf data delete resume --use-most-recent --target-org my-scratch
 ```
 
-_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.11.6/src/commands/data/delete/resume.ts)_
+_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.12.0/src/commands/data/delete/resume.ts)_
 
 ## `sf data export bulk`
 
@@ -1673,7 +1676,7 @@ EXAMPLES
       --result-format json --async
 ```
 
-_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.11.6/src/commands/data/export/bulk.ts)_
+_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.12.0/src/commands/data/export/bulk.ts)_
 
 ## `sf data export resume`
 
@@ -1709,7 +1712,7 @@ EXAMPLES
     $ sf data export resume --use-most-recent --target-org my-scratch
 ```
 
-_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.11.6/src/commands/data/export/resume.ts)_
+_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.12.0/src/commands/data/export/resume.ts)_
 
 ## `sf data export tree`
 
@@ -1770,7 +1773,7 @@ EXAMPLES
       my-scratch
 ```
 
-_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.11.6/src/commands/data/export/tree.ts)_
+_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.12.0/src/commands/data/export/tree.ts)_
 
 ## `sf data get record`
 
@@ -1834,7 +1837,7 @@ EXAMPLES
     $ sf data get record --use-tooling-api --sobject TraceFlag --record-id 7tf8c
 ```
 
-_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.11.6/src/commands/data/get/record.ts)_
+_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.12.0/src/commands/data/get/record.ts)_
 
 ## `sf data import bulk`
 
@@ -1854,7 +1857,7 @@ FLAGS
                                    you're importing records.
   -w, --wait=<value>               Time to wait for the command to finish, in minutes.
       --api-version=<value>        Override the api version used for api requests made by this command
-      --column-delimiter=<option>  Column delimiter used in the CSV file. Default is COMMA.
+      --column-delimiter=<option>  Column delimiter used in the CSV file.
                                    <options: BACKQUOTE|CARET|COMMA|PIPE|SEMICOLON|TAB>
       --line-ending=<option>       Line ending used in the CSV file. Default value on Windows is `CRLF`; on macOS and
                                    Linux it's `LF`.
@@ -1892,7 +1895,7 @@ EXAMPLES
     $ sf data import bulk --file accounts.csv --sobject Account --async
 ```
 
-_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.11.6/src/commands/data/import/bulk.ts)_
+_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.12.0/src/commands/data/import/bulk.ts)_
 
 ## `sf data import resume`
 
@@ -1928,7 +1931,7 @@ EXAMPLES
     $ sf data import resume --use-most-recent --target-org my-scratch
 ```
 
-_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.11.6/src/commands/data/import/resume.ts)_
+_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.12.0/src/commands/data/import/resume.ts)_
 
 ## `sf data import tree`
 
@@ -1993,7 +1996,7 @@ FLAG DESCRIPTIONS
     - files(array) - Files: An array of files paths to load
 ```
 
-_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.11.6/src/commands/data/import/tree.ts)_
+_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.12.0/src/commands/data/import/tree.ts)_
 
 ## `sf data query`
 
@@ -2057,7 +2060,7 @@ EXAMPLES
     $ sf data query --query "SELECT Id FROM Contact" --bulk --wait 0
 ```
 
-_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.11.6/src/commands/data/query.ts)_
+_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.12.0/src/commands/data/query.ts)_
 
 ## `sf data query resume`
 
@@ -2070,8 +2073,7 @@ USAGE
 
 FLAGS
   -i, --bulk-query-id=<value>   Job ID of the bulk query.
-  -o, --target-org=<value>      Username or alias of the target org. Not required if the "target-org" configuration
-                                variable is already set.
+  -o, --target-org=<value>      Username or alias of the target org.
   -r, --result-format=<option>  [default: human] Format to display the results; the --json flag overrides this flag.
                                 <options: human|csv|json>
       --api-version=<value>     Override the api version used for api requests made by this command
@@ -2095,7 +2097,7 @@ EXAMPLES
     $ sf data query resume --bulk-query-id 7500x000005BdFzXXX
 ```
 
-_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.11.6/src/commands/data/query/resume.ts)_
+_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.12.0/src/commands/data/query/resume.ts)_
 
 ## `sf data resume`
 
@@ -2132,7 +2134,7 @@ EXAMPLES
     $ sf data resume --job-id 750xx000000005sAAA --batch-id 751xx000000005nAAA
 ```
 
-_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.11.6/src/commands/data/resume.ts)_
+_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.12.0/src/commands/data/resume.ts)_
 
 ## `sf data search`
 
@@ -2182,7 +2184,7 @@ EXAMPLES
     $ sf data search --file query.txt --target-org my-scratch --result-format csv
 ```
 
-_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.11.6/src/commands/data/search.ts)_
+_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.12.0/src/commands/data/search.ts)_
 
 ## `sf data update bulk`
 
@@ -2202,7 +2204,7 @@ FLAGS
                                    are updating.
   -w, --wait=<value>               Time to wait for the command to finish, in minutes.
       --api-version=<value>        Override the api version used for api requests made by this command
-      --column-delimiter=<option>  Column delimiter used in the CSV file. Default is COMMA.
+      --column-delimiter=<option>  Column delimiter used in the CSV file.
                                    <options: BACKQUOTE|CARET|COMMA|PIPE|SEMICOLON|TAB>
       --line-ending=<option>       Line ending used in the CSV file. Default value on Windows is `CRLF`; on macOS and
                                    Linux it's `LF`.
@@ -2243,7 +2245,7 @@ EXAMPLES
     $ sf data update bulk --file accounts.csv --sobject Account --async
 ```
 
-_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.11.6/src/commands/data/update/bulk.ts)_
+_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.12.0/src/commands/data/update/bulk.ts)_
 
 ## `sf data update record`
 
@@ -2305,7 +2307,7 @@ EXAMPLES
       "ExpirationDate=2017-12-01T00:58:04.000+0000"
 ```
 
-_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.11.6/src/commands/data/update/record.ts)_
+_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.12.0/src/commands/data/update/record.ts)_
 
 ## `sf data update resume`
 
@@ -2341,29 +2343,35 @@ EXAMPLES
     $ sf data update resume --use-most-recent --target-org my-scratch
 ```
 
-_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.11.6/src/commands/data/update/resume.ts)_
+_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.12.0/src/commands/data/update/resume.ts)_
 
 ## `sf data upsert bulk`
 
 Bulk upsert records to an org from a CSV file. Uses Bulk API 2.0.
 
 ```
 USAGE
-  $ sf data upsert bulk -o <value> -f <value> -s <value> -i <value> [--json] [--flags-dir <value>] [--api-version
-    <value>] [-w <value> | -a] [--verbose]
+  $ sf data upsert bulk -o <value> -s <value> -i <value> [--json] [--flags-dir <value>] [--api-version <value>] [-w
+    <value> | -a] [--verbose] (--line-ending CRLF|LF -f <value>) [--column-delimiter
+    BACKQUOTE|CARET|COMMA|PIPE|SEMICOLON|TAB]
 
 FLAGS
-  -a, --async                Run the command asynchronously.
-  -f, --file=<value>         (required) CSV file that contains the IDs of the records to update or delete.
-  -i, --external-id=<value>  (required) Name of the external ID field, or the Id field.
-  -o, --target-org=<value>   (required) Username or alias of the target org. Not required if the `target-org`
-                             configuration variable is already set.
-  -s, --sobject=<value>      (required) API name of the Salesforce object, either standard or custom, that you want to
-                             update or delete records from.
-  -w, --wait=<value>         [default: 0 minutes] Number of minutes to wait for the command to complete before
-                             displaying the results.
-      --api-version=<value>  Override the api version used for api requests made by this command
-      --verbose              Print verbose output of failed records if result is available.
+  -a, --async                      Run the command asynchronously.
+  -f, --file=<value>               (required) CSV file that contains the IDs of the records to update or delete.
+  -i, --external-id=<value>        (required) Name of the external ID field, or the Id field.
+  -o, --target-org=<value>         (required) Username or alias of the target org. Not required if the `target-org`
+                                   configuration variable is already set.
+  -s, --sobject=<value>            (required) API name of the Salesforce object, either standard or custom, that you
+                                   want to update or delete records from.
+  -w, --wait=<value>               [default: 0 minutes] Number of minutes to wait for the command to complete before
+                                   displaying the results.
+      --api-version=<value>        Override the api version used for api requests made by this command
+      --column-delimiter=<option>  Column delimiter used in the CSV file.
+                                   <options: BACKQUOTE|CARET|COMMA|PIPE|SEMICOLON|TAB>
+      --line-ending=<option>       Line ending used in the CSV file. Default value on Windows is `CRLF`; on macOS and
+                                   Linux it's `LF`.
+                                   <options: CRLF|LF>
+      --verbose                    Print verbose output of failed records if result is available.
 
 GLOBAL FLAGS
   --flags-dir=<value>  Import flag values from a directory.
@@ -2394,7 +2402,7 @@ EXAMPLES
       my-scratch
 ```
 
-_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.11.6/src/commands/data/upsert/bulk.ts)_
+_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.12.0/src/commands/data/upsert/bulk.ts)_
 
 ## `sf data upsert resume`
 
@@ -2411,7 +2419,7 @@ FLAGS
                              variable is already set.
       --api-version=<value>  Override the api version used for api requests made by this command
       --use-most-recent      Use the ID of the most recently-run bulk job.
-      --wait=<value>         [default: 0 minutes] Number of minutes to wait for the command to complete before
+      --wait=<value>         [default: 5 minutes] Number of minutes to wait for the command to complete before
                              displaying the results.
 
 GLOBAL FLAGS
@@ -2433,7 +2441,7 @@ EXAMPLES
     $ sf data upsert resume --use-most-recent --target-org my-scratch
 ```
 
-_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.11.6/src/commands/data/upsert/resume.ts)_
+_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.12.0/src/commands/data/upsert/resume.ts)_
 
 ## `sf doctor`
 
@@ -2528,7 +2536,7 @@ EXAMPLES
     $ sf force data bulk delete --sobject MyObject__c --file files/delete.csv --wait 5 --target-org my-scratch
 ```
 
-_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.11.6/src/commands/force/data/bulk/delete.ts)_
+_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.12.0/src/commands/force/data/bulk/delete.ts)_
 
 ## `sf force data bulk status`
 
@@ -2565,7 +2573,7 @@ EXAMPLES
     $ sf force data bulk status --job-id 750xx000000005sAAA --batch-id 751xx000000005nAAA --target-org my-scratch
 ```
 
-_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.11.6/src/commands/force/data/bulk/status.ts)_
+_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.12.0/src/commands/force/data/bulk/status.ts)_
 
 ## `sf force data bulk upsert`
 
@@ -2623,7 +2631,7 @@ EXAMPLES
       --target-org my-scratch
 ```
 
-_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.11.6/src/commands/force/data/bulk/upsert.ts)_
+_See code: [@salesforce/plugin-data](https://github.com/salesforcecli/plugin-data/blob/3.12.0/src/commands/force/data/bulk/upsert.ts)_
 
 ## `sf help [COMMAND]`
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/cli",
   "description": "The Salesforce CLI",
-  "version": "2.69.5",
+  "version": "2.69.6",
   "author": "Salesforce",
   "bin": {
     "sf": "./bin/run.js",
@@ -155,7 +155,7 @@
     "@salesforce/plugin-apex": "3.6.5",
     "@salesforce/plugin-api": "1.3.2",
     "@salesforce/plugin-auth": "3.6.76",
-    "@salesforce/plugin-data": "3.11.6",
+    "@salesforce/plugin-data": "3.12.0",
     "@salesforce/plugin-deploy-retrieve": "3.15.15",
     "@salesforce/plugin-info": "3.4.23",
     "@salesforce/plugin-limits": "3.3.41",
@@ -169,7 +169,7 @@
     "@salesforce/plugin-templates": "56.3.31",
     "@salesforce/plugin-trust": "3.7.44",
     "@salesforce/plugin-user": "3.6.3",
-    "@salesforce/sf-plugins-core": "12.0.13",
+    "@salesforce/sf-plugins-core": "12.1.0",
     "ansis": "^3.3.0"
   },
   "pinnedDependencies": [