Renumber and-deprecation warning FS3885 → FS3887 after rebase

Upstream main took FS3885 (parsLetBangCannotBeLastInCE) and FS3886
(tcListLiteralWithSingleTupleElement) for unrelated warnings during
the rebase window. Our chkAndKeywordDeprecatedWithFileOrderAuto is
now numbered FS3887. Updates:

- docs (migration, release-notes, design): all FS3885 / 3885 → FS3887.
- docs/release-notes/.FSharp.Compiler.Service/11.0.100.md: move our
  entry from "Breaking Changes" (where the rebase merge-3-way landed
  it) back to "Added" — opt-in flag with default off is not a breaking
  change. Update FS3885 → FS3887 in the entry text.
- tests/file-order-auto-test/deprecation-test/run-all.sh: assertions
  and grep patterns updated to FS3887.
- tests/file-order-auto-test/fcs-ide-smoke-test/Program.fs: ErrorNumber
  filter and labels updated to 3887.
- tests/file-order-auto-test/oss-sweep/RESULTS.md: reproduction
  instructions reference --nowarn:3887.

Build clean, deprecation fixture 3/3, inference 4/4, fsi 2/2,
error-corpus 6/6.

Author: bryancostanich

docs/file-order-auto-design.md

@@ -268,7 +268,7 @@ which we haven't implemented).
 | FCS | `src/Compiler/Service/IncrementalBuild.fs` | `computeReorderedFileNames` runs the same logic for `IncrementalBuilder` |
 | MSBuild | `src/FSharp.Build/Microsoft.FSharp.NetSdk.props` + `Targets` + `Fsc.fs` | `FSharpAutoFileOrder=true` → `--file-order-auto+` |
 | Compiler options | `src/Compiler/Driver/CompilerOptions.fs` | flag parsing, default-on/off, help text |
-| Localized strings | `src/Compiler/FSComp.txt` + 13× `xlf` | `optsFileOrderAuto`, FS3885 message |
+| Localized strings | `src/Compiler/FSComp.txt` + 13× `xlf` | `optsFileOrderAuto`, FS3887 message |
 
 ## The chain of refinements (TL;DR)
 

docs/file-order-auto-migration.md

@@ -72,7 +72,7 @@ make types mutually recursive, see [Migrating off `and`](#migrating-off-and).
 ## Migrating off `and`
 
 When `--file-order-auto+` is set, every `and`-joined type declaration emits
-warning **FS3885**:
+warning **FS3887**:
 
 > The 'and' keyword for mutually recursive types is unnecessary when using
 > `--file-order-auto`. Consider placing types in separate declarations. This
@@ -89,13 +89,13 @@ cycle group automatically.
 The warning is suppressable like any other:
 
 ```xml
-<NoWarn>3885</NoWarn>
+<NoWarn>3887</NoWarn>
 ```
 
 or
 
 ```bash
-fsc --file-order-auto+ --nowarn:3885 ...
+fsc --file-order-auto+ --nowarn:3887 ...
 ```
 
 ## How it works (briefly)

docs/file-order-auto-release-notes.md

@@ -16,9 +16,9 @@ to maintain `.fsproj` file ordering by hand.
   and Find-All-References work end-to-end on auto-ordered projects.
 - **Cycle group synthesis** (build path only): a set of files that mutually
   reference each other gets compiled as one synthetic recursive namespace.
-- **`and`-keyword deprecation** (warning **FS3885**): under `--file-order-auto+`,
+- **`and`-keyword deprecation** (warning **FS3887**): under `--file-order-auto+`,
   `type X = ... and Y = ...` now produces a deprecation warning. Suppressable
-  via `--nowarn:3885` or `<NoWarn>3885</NoWarn>`. The warning is silent in
+  via `--nowarn:3887` or `<NoWarn>3887</NoWarn>`. The warning is silent in
   manual mode.
 
 ## What hasn't changed
@@ -76,9 +76,9 @@ the regression sweep at `tests/file-order-auto-test/`.
 | `inference-tests/` | SRTP, record/union disambiguation, operator overloads (4/4). |
 | `fsi-tests/` | `.fsi`/`.fs` pairing with partial coverage and ordering constraints (2/2). |
 | `error-corpus/` | Six error categories, byte-for-byte parity manual vs auto (6/6). |
-| `deprecation-test/` | FS3885 fires/suppresses correctly (3/3). |
+| `deprecation-test/` | FS3887 fires/suppresses correctly (3/3). |
 | `fcs-smoke-test/` | `FSharpChecker.ParseAndCheckProject` reorders via OtherOptions. |
-| `fcs-ide-smoke-test/` | Completions, Go-to-Def, Find-References, FS3885 via FCS. |
+| `fcs-ide-smoke-test/` | Completions, Go-to-Def, Find-References, FS3887 via FCS. |
 | `oss-sweep/` | 13 real-world OSS projects under `--file-order-auto+`. **Auto-mode adds zero errors over baseline for every buildable target.** See [`tests/file-order-auto-test/oss-sweep/RESULTS.md`](../tests/file-order-auto-test/oss-sweep/RESULTS.md). |
 
 ### OSS sweep results

docs/release-notes/.FSharp.Compiler.Service/11.0.100.md

@@ -40,10 +40,10 @@
 
 * Added warning FS3884 when a function or delegate value is used as an interpolated string argument. ([PR #19289](https://github.com/dotnet/fsharp/pull/19289))
 * Add `#version;;` directive to F# Interactive to display version and environment information. ([Issue #13307](https://github.com/dotnet/fsharp/issues/13307), [PR #19332](https://github.com/dotnet/fsharp/pull/19332))
+* Add opt-in `--file-order-auto+` flag (and `<FSharpAutoFileOrder>` MSBuild property) for dependency-based source-file ordering. Off by default; when enabled, the compiler reorders project sources by their declaration/reference graph before type checking, supports cycle groups via synthesised recursive namespaces (build path), and emits warning FS3887 for `and`-joined type chains. FCS support included. ([PR #19647](https://github.com/dotnet/fsharp/pull/19647))
 
 ### Changed
 
 * Improvements in error and warning messages: new error FS3885 when `let!`/`use!` is the final expression in a computation expression; new warning FS3886 when a list literal contains a single tuple element (likely missing `;` separator); improved wording for FS0003, FS0025, FS0039, FS0072, FS0247, FS0597, FS0670, FS3082, and SRTP operator-not-in-scope hints. ([PR #19398](https://github.com/dotnet/fsharp/pull/19398))
 
 ### Breaking Changes
-* Add opt-in `--file-order-auto+` flag (and `<FSharpAutoFileOrder>` MSBuild property) for dependency-based source-file ordering. Off by default; when enabled, the compiler reorders project sources by their declaration/reference graph before type checking, supports cycle groups via synthesised recursive namespaces (build path), and emits warning FS3885 for `and`-joined type chains. FCS support included. ([PR #19647](https://github.com/dotnet/fsharp/pull/19647))

tests/file-order-auto-test/deprecation-test/run-all.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
-# Validates the FS3885 ('and' keyword) deprecation warning behaves correctly:
+# Validates the FS3887 ('and' keyword) deprecation warning behaves correctly:
 #   - manual mode: silent (warning gated on cenv.fileOrderAuto)
 #   - auto mode: warning fires once per `and`-joined declaration tail
-#   - auto mode + --nowarn:3885: silent
+#   - auto mode + --nowarn:3887: silent
 
 set -u
 
@@ -21,16 +21,16 @@ fail=0
 tmpout=$(mktemp)
 trap 'rm -f "$tmpout" out_dep_*.dll' EXIT
 
-count_3885 () {
-    grep -c "FS3885" "$1" || true
+count_3887 () {
+    grep -c "FS3887" "$1" || true
 }
 
 assert () {
     local label="$1"
     local expected="$2"
     local got="$3"
     if [ "$expected" = "$got" ]; then
-        echo "  PASS: $label (FS3885 count=$got)"
+        echo "  PASS: $label (FS3887 count=$got)"
         pass=$((pass + 1))
     else
         echo "  FAIL: $label (expected $expected, got $got)"
@@ -40,17 +40,17 @@ assert () {
 
 echo "--- manual mode (no flag) ---"
 $FSC $COMMON_FLAGS -o:out_dep_manual.dll "$SRC" 2>&1 | tee "$tmpout" >/dev/null
-assert "manual mode emits no FS3885" 0 "$(count_3885 "$tmpout")"
+assert "manual mode emits no FS3887" 0 "$(count_3887 "$tmpout")"
 
 echo "--- auto mode (--file-order-auto+) ---"
 $FSC $COMMON_FLAGS --file-order-auto+ -o:out_dep_auto.dll "$SRC" 2>&1 | tee "$tmpout" >/dev/null
 # AndUsage.fs has two `and`-joined groups, each contributes one warning
 # (only the tail entries trigger; first head doesn't).
-assert "auto mode emits FS3885 for each and-tail (expect 2)" 2 "$(count_3885 "$tmpout")"
+assert "auto mode emits FS3887 for each and-tail (expect 2)" 2 "$(count_3887 "$tmpout")"
 
-echo "--- auto mode + --nowarn:3885 ---"
-$FSC $COMMON_FLAGS --file-order-auto+ --nowarn:3885 -o:out_dep_suppress.dll "$SRC" 2>&1 | tee "$tmpout" >/dev/null
-assert "--nowarn:3885 suppresses FS3885" 0 "$(count_3885 "$tmpout")"
+echo "--- auto mode + --nowarn:3887 ---"
+$FSC $COMMON_FLAGS --file-order-auto+ --nowarn:3887 -o:out_dep_suppress.dll "$SRC" 2>&1 | tee "$tmpout" >/dev/null
+assert "--nowarn:3887 suppresses FS3887" 0 "$(count_3887 "$tmpout")"
 
 echo ""
 echo "=== Results: $pass passed, $fail failed ==="

tests/file-order-auto-test/fcs-ide-smoke-test/Program.fs

@@ -1,7 +1,7 @@
 module FcsIdeSmokeTest.Program
 
 // Exercises IDE-style FCS APIs against an auto-ordered project to confirm
-// IntelliSense, Go-to-Definition, Find All References, and the FS3885
+// IntelliSense, Go-to-Definition, Find All References, and the FS3887
 // deprecation warning all flow through the IncrementalBuilder hook added
 // in Track 05 Phase 2.
 
@@ -173,7 +173,7 @@ let main _ =
             assertTrue "FindReferences hits FileA (use site)" (refsInA >= 1)
 
     printfn ""
-    printfn "=== FS3885: `and` keyword deprecation under --file-order-auto+ ==="
+    printfn "=== FS3887: `and` keyword deprecation under --file-order-auto+ ==="
     // Stand-up a separate single-file project to keep the deprecation case isolated.
     let andDir =
         let d = Path.Combine(Path.GetTempPath(), "fcs-ide-and-test")
@@ -195,9 +195,9 @@ and Forest = Tree list
     let andProj = checker.ParseAndCheckProject(andOptions) |> Async.RunSynchronously
     let warnings =
         andProj.Diagnostics
-        |> Array.filter (fun d -> d.ErrorNumber = 3885)
-    printfn "  FS3885 warnings: %d" warnings.Length
-    assertTrue "FS3885 surfaces under auto-order when `and` is used" (warnings.Length >= 1)
+        |> Array.filter (fun d -> d.ErrorNumber = 3887)
+    printfn "  FS3887 warnings: %d" warnings.Length
+    assertTrue "FS3887 surfaces under auto-order when `and` is used" (warnings.Length >= 1)
 
     printfn ""
     if failed = 0 then

tests/file-order-auto-test/oss-sweep/RESULTS.md

@@ -53,7 +53,7 @@ dotnet tool install -g paket
 FSC=$(pwd)/../fsharp/artifacts/bin/fsc/Release/net10.0/fsc.dll  # adjust
 dotnet build <project>.fsproj -c Release \
     -p:DotnetFscCompilerPath="$FSC" \
-    -p:OtherFlags="--file-order-auto+ --nowarn:3885"
+    -p:OtherFlags="--file-order-auto+ --nowarn:3887"
 ```
 
 ## What was needed to make this work