diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 642ca429..2f8ae7af 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -48,7 +48,7 @@ jobs: # Full history so VitePress lastUpdated timestamps work. fetch-depth: 0 - name: Setup Node - uses: actions/setup-node@v6 + uses: actions/setup-node@v7 with: node-version: 24 cache: npm @@ -85,7 +85,7 @@ jobs: cp -R src/Heddle.Language/ace_build/ace/build/src-noconflict/. docs/public/ace/ # ---- Phase 9: the typed WASM demo bundle (module worker + _framework), Roslyn-free ---- - name: Setup .NET - uses: actions/setup-dotnet@v5 + uses: actions/setup-dotnet@v6 with: dotnet-version: 10.0.x - name: Install wasm-tools workload diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 10c72144..b60e5055 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -28,7 +28,7 @@ jobs: steps: - uses: actions/checkout@v7 - name: Setup .NET - uses: actions/setup-dotnet@v5 + uses: actions/setup-dotnet@v6 with: dotnet-version: | 6.0.x @@ -52,7 +52,7 @@ jobs: steps: - uses: actions/checkout@v7 - name: Setup .NET - uses: actions/setup-dotnet@v5 + uses: actions/setup-dotnet@v6 with: dotnet-version: | 6.0.x @@ -86,7 +86,7 @@ jobs: steps: - uses: actions/checkout@v7 - name: Setup .NET - uses: actions/setup-dotnet@v5 + uses: actions/setup-dotnet@v6 with: dotnet-version: | 6.0.x diff --git a/.github/workflows/lsp.yml b/.github/workflows/lsp.yml index cea8c674..bdd28ea6 100644 --- a/.github/workflows/lsp.yml +++ b/.github/workflows/lsp.yml @@ -17,7 +17,7 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v7 - - uses: actions/setup-dotnet@v5 + - uses: actions/setup-dotnet@v6 with: # The multi-targeted test suite runs net6.0/net8.0/net10.0/net48; the runner image # no longer ships the EOL .NET 6 (and may drop 8) runtime, so install them explicitly @@ -32,7 +32,7 @@ jobs: run: dotnet test src/Heddle.Tests/Heddle.Tests.csproj -c Release --no-build - name: Test language services run: dotnet test src/Heddle.LanguageServices.Tests/Heddle.LanguageServices.Tests.csproj -c Release --no-build - - uses: actions/setup-node@v6 + - uses: actions/setup-node@v7 with: node-version: 24 - name: JS editor-artifact harness (highlight / beautify / completions) @@ -45,7 +45,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v7 - - uses: actions/setup-dotnet@v5 + - uses: actions/setup-dotnet@v6 with: global-json-file: global.json # Framework-dependent + R2R per-RID packs cross-pack from one runner (phase 6 D19). @@ -74,7 +74,7 @@ jobs: - uses: actions/setup-dotnet@v4 with: global-json-file: global.json - - uses: actions/setup-node@v6 + - uses: actions/setup-node@v7 with: node-version: 24 - name: Map VS Code target to .NET RID diff --git a/.github/workflows/npm.yml b/.github/workflows/npm.yml index 3c7400cb..b0b0b917 100644 --- a/.github/workflows/npm.yml +++ b/.github/workflows/npm.yml @@ -1,6 +1,6 @@ # Builds the custom Ace editor bundle (@multiarc/ace_heddle) and publishes it to the # public npm registry (npmjs.org) using npm Trusted Publishing (OIDC) — no NPM_TOKEN. -# - internal PRs -> `npm stage publish` 1.0.0-beta. (staged for review, +# - internal PRs -> `npm stage publish` -beta. (staged for review, # NOT publicly installable until a maintainer approves it) # - tag vX.Y.Z -> `npm publish` X.Y.Z (live release, dist-tag "latest") # @@ -29,7 +29,7 @@ jobs: steps: - uses: actions/checkout@v7 - name: Setup Node - uses: actions/setup-node@v6 + uses: actions/setup-node@v7 with: node-version: 24 registry-url: https://registry.npmjs.org @@ -48,7 +48,8 @@ jobs: if: ${{ github.event_name == 'pull_request' }} working-directory: src/Heddle.Language/ace_build/ace/build run: | - npm version --no-git-tag-version 1.0.0-beta.${{ github.run_number }} + BASE_VERSION="$(node -p "require('./package.json').version")" + npm version --no-git-tag-version "${BASE_VERSION}-beta.${{ github.run_number }}" npm stage publish --tag beta - name: Publish release package (tag) if: ${{ startsWith(github.ref, 'refs/tags/v') }} diff --git a/.github/workflows/samples.yml b/.github/workflows/samples.yml index cd5dca1d..bd2b8cf6 100644 --- a/.github/workflows/samples.yml +++ b/.github/workflows/samples.yml @@ -39,7 +39,7 @@ jobs: steps: - uses: actions/checkout@v7 - name: Setup .NET - uses: actions/setup-dotnet@v5 + uses: actions/setup-dotnet@v6 with: dotnet-version: 10.0.x - name: Comparer self-test diff --git a/src/Heddle.Generator.IntegrationTests/Heddle.Generator.IntegrationTests.csproj b/src/Heddle.Generator.IntegrationTests/Heddle.Generator.IntegrationTests.csproj index ab9bff62..cf109fe9 100644 --- a/src/Heddle.Generator.IntegrationTests/Heddle.Generator.IntegrationTests.csproj +++ b/src/Heddle.Generator.IntegrationTests/Heddle.Generator.IntegrationTests.csproj @@ -13,8 +13,11 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/src/Heddle.Generator.Tests/Heddle.Generator.Tests.csproj b/src/Heddle.Generator.Tests/Heddle.Generator.Tests.csproj index 50d8a8f4..80698685 100644 --- a/src/Heddle.Generator.Tests/Heddle.Generator.Tests.csproj +++ b/src/Heddle.Generator.Tests/Heddle.Generator.Tests.csproj @@ -12,11 +12,14 @@ - + - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + - + diff --git a/src/Heddle.Language/package-lock.json b/src/Heddle.Language/package-lock.json index d57b205a..56703905 100644 --- a/src/Heddle.Language/package-lock.json +++ b/src/Heddle.Language/package-lock.json @@ -1,12 +1,12 @@ { "name": "@multiarc/ace_heddle", - "version": "1.0.0", + "version": "2.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@multiarc/ace_heddle", - "version": "1.0.0", + "version": "2.0.0", "license": "Apache-2.0", "devDependencies": { "ace-code": "1.32.6", diff --git a/src/Heddle.Language/package.json b/src/Heddle.Language/package.json index 6d542ea8..d2439599 100644 --- a/src/Heddle.Language/package.json +++ b/src/Heddle.Language/package.json @@ -1,6 +1,6 @@ { "name": "@multiarc/ace_heddle", - "version": "1.0.0", + "version": "2.0.0", "description": "Custom Ace build (https://github.com/ajaxorg/ace) to support Heddle template language", "keywords": [ "heddle", diff --git a/src/Heddle.LanguageServices.Tests/Heddle.LanguageServices.Tests.csproj b/src/Heddle.LanguageServices.Tests/Heddle.LanguageServices.Tests.csproj index 22de70f4..8b0924df 100644 --- a/src/Heddle.LanguageServices.Tests/Heddle.LanguageServices.Tests.csproj +++ b/src/Heddle.LanguageServices.Tests/Heddle.LanguageServices.Tests.csproj @@ -16,7 +16,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Heddle.Performance/Heddle.Performance.csproj b/src/Heddle.Performance/Heddle.Performance.csproj index 5fd9eaa5..ecbefc90 100644 --- a/src/Heddle.Performance/Heddle.Performance.csproj +++ b/src/Heddle.Performance/Heddle.Performance.csproj @@ -30,14 +30,14 @@ - - + + - - - + + + - +