Fix npm pre-release, upgrade stale packages

.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

.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

.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

.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.<run_number> (staged for review,
+#   - internal PRs   -> `npm stage publish` <package.json version>-beta.<run_number> (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') }}

.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

src/Heddle.Generator.IntegrationTests/Heddle.Generator.IntegrationTests.csproj

@@ -13,8 +13,11 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="xunit" Version="2.9.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

src/Heddle.Generator.Tests/Heddle.Generator.Tests.csproj

@@ -12,11 +12,14 @@
   <ItemGroup>
     <!-- Microsoft.CodeAnalysis.CSharp (with CSharpGeneratorDriver) flows transitively from the Heddle runtime
          reference at the matching per-TFM version, avoiding a downgrade conflict. -->
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
     <PackageReference Include="xunit" Version="2.9.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <!-- D19: Verify.SourceGenerators snapshots over CSharpGeneratorDriver (multi-file outputs + diagnostics). -->
-    <PackageReference Include="Verify.Xunit" Version="28.9.0" />
+    <PackageReference Include="Verify.Xunit" Version="31.12.5" />
     <PackageReference Include="Verify.SourceGenerators" Version="2.5.0" />
   </ItemGroup>
 

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",

src/Heddle.LanguageServices.Tests/Heddle.LanguageServices.Tests.csproj

@@ -16,7 +16,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.7.0" />
     <PackageReference Include="xunit" Version="2.9.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

src/Heddle.Performance/Heddle.Performance.csproj

@@ -30,14 +30,14 @@
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.28" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.28" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.29" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.29" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net10.0' ">
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="10.0.9" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="10.0.9" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="10.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="10.0.10" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.10" />
   </ItemGroup>
   <!-- BenchmarkDotNet is pinned per-TFM: 0.15.1+ depends on System.Management 9.x and
        Microsoft.CodeAnalysis 4.14, which dropped net6.0 support (NETSDK "doesn't support net6.0"

src/Heddle.Tests/Heddle.Tests.csproj

@@ -19,12 +19,24 @@
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net48' ">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.7.0" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net10.0' ">
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.7.0" />
   </ItemGroup>
 
@@ -38,10 +50,6 @@
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
     <PackageReference Include="xunit" Version="2.9.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

src/Heddle.Tool.Tests/Heddle.Tool.Tests.csproj

@@ -12,7 +12,10 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageReference Include="xunit" Version="2.9.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

src/Heddle/Heddle.csproj

@@ -23,7 +23,7 @@
     <PackageReference Include="System.Memory" Version="4.6.3" />
     <!-- B2: TemplateOptions.Encoder is System.Text.Encodings.Web.TextEncoder — in-box on net6.0+, but a package
          reference on netstandard2.0 (and its net48 consumers, who resolve it transitively from this nupkg). -->
-    <PackageReference Include="System.Text.Encodings.Web" Version="8.0.0" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="6.0.1" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />