Skip to content

Commit 8b4442e

Browse files
Mpdreamzclaude
andcommitted
Fix MinVer 7 CLI flag and AOT smoke test
- MinVer 7: -d/--default-pre-release-phase is deprecated; switch to -p/--default-pre-release-identifiers with 'canary.0' in Targets.fs - CI smoke test: run the native binary directly from the publish output instead of `dotnet tool install` — the root package is only assembled in the coordinating build job, so install would fail in the per-RID matrix legs - dotnet-tools.json: add rollForward: false to all tool entries Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
1 parent 0d12c9d commit 8b4442e

3 files changed

Lines changed: 15 additions & 10 deletions

File tree

.github/workflows/ci.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,12 @@ jobs:
7171
- name: AOT smoke test — ${{ matrix.rid }}
7272
shell: bash
7373
run: |
74-
# Install the just-packed per-RID native tool and verify it produces expected output.
75-
VERSION=$(dotnet minver -d=canary -m=0.1)
76-
NUPKG="build/output/editorconfig-tool.${{ matrix.rid }}.${VERSION}.nupkg"
77-
dotnet tool install --global --add-source build/output editorconfig-tool --version "${VERSION}"
78-
OUTPUT=$(editorconfig .editorconfig)
74+
# Run the native binary directly from the publish output (no `dotnet tool install`
75+
# needed — the root package only exists in the coordinating build job).
76+
EXT=""
77+
[[ "$RUNNER_OS" == "Windows" ]] && EXT=".exe"
78+
BINARY="src/EditorConfig.App/bin/Release/net10.0/${{ matrix.rid }}/publish/EditorConfig.App${EXT}"
79+
OUTPUT=$("$BINARY" .editorconfig)
7980
echo "editorconfig output: $OUTPUT"
8081
echo "$OUTPUT" | grep -q "indent_style" || (echo "ERROR: expected indent_style in output" && exit 1)
8182

build/scripts/Targets.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ let private restoreTools = lazy(exec "dotnet" ["tool"; "restore"])
1717
let private currentVersion =
1818
lazy(
1919
restoreTools.Value |> ignore
20-
let r = Proc.Start("dotnet", "minver", "-d=canary", "-m=0.1")
20+
let r = Proc.Start("dotnet", "minver", "-p", "canary.0", "-m", "0.1")
2121
let o = r.ConsoleOut |> Seq.find (fun l -> not(l.Line.StartsWith("MinVer:")))
2222
o.Line
2323
)

dotnet-tools.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,29 @@
66
"version": "7.0.0",
77
"commands": [
88
"minver"
9-
]
9+
],
10+
"rollForward": false
1011
},
1112
"assembly-differ": {
1213
"version": "0.17.0",
1314
"commands": [
1415
"assembly-differ"
15-
]
16+
],
17+
"rollForward": false
1618
},
1719
"release-notes": {
1820
"version": "0.10.0",
1921
"commands": [
2022
"release-notes"
21-
]
23+
],
24+
"rollForward": false
2225
},
2326
"nupkg-validator": {
2427
"version": "0.10.1",
2528
"commands": [
2629
"nupkg-validator"
27-
]
30+
],
31+
"rollForward": false
2832
}
2933
}
3034
}

0 commit comments

Comments
 (0)