Merge pull request #1369 from dotnet/fix1368

Build nbgv CLI tool for .NET 9 and 10

Author: AArnott

.github/workflows/build.yml

@@ -66,7 +66,11 @@ jobs:
       run: dotnet pack -c ${{ env.BUILDCONFIGURATION }} --no-build -p:PackLKG=true /bl:"${{ runner.temp }}/_artifacts/build_logs/msbuild_lkg.binlog"
       working-directory: src/Nerdbank.GitVersioning.Tasks
     - name: 📢 Publish nbgv tool
-      run: dotnet publish -c ${{ env.BUILDCONFIGURATION }} -o ../nerdbank-gitversioning.npm/out/nbgv.cli/tools/net8.0/any /bl:"${{ runner.temp }}/_artifacts/build_logs/nbgv_publish.binlog"
+      shell: pwsh
+      run: |
+        dotnet publish -f net8.0 -c ${{ env.BUILDCONFIGURATION }} -o ../nerdbank-gitversioning.npm/out/nbgv.cli/tools/net8.0/any /bl:"${{ runner.temp }}/_artifacts/build_logs/nbgv_publish_net8.binlog"
+        dotnet publish -f net9.0 -c ${{ env.BUILDCONFIGURATION }} -o ../nerdbank-gitversioning.npm/out/nbgv.cli/tools/net9.0/any /bl:"${{ runner.temp }}/_artifacts/build_logs/nbgv_publish_net9.binlog"
+        dotnet publish -f net10.0 -c ${{ env.BUILDCONFIGURATION }} -o ../nerdbank-gitversioning.npm/out/nbgv.cli/tools/net10.0/any /bl:"${{ runner.temp }}/_artifacts/build_logs/nbgv_publish_net10.binlog"
       working-directory: src/nbgv
     - name: 🛠️ Build nerdbank-gitversioning NPM package
       run: yarn build

Directory.Packages.props

@@ -30,7 +30,6 @@
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
     <PackageVersion Include="NuGet.PackageManagement" Version="7.6.0" />
     <PackageVersion Include="System.CommandLine" Version="2.0.5" />
-    <PackageVersion Include="System.Diagnostics.Tools" Version="4.3.0" />
     <PackageVersion Include="System.Drawing.Common" Version="9.0.14" />
     <PackageVersion Include="System.Memory" Version="4.6.3" />
     <PackageVersion Include="System.Runtime.Loader" Version="4.3.0" />

build.ps1

@@ -31,7 +31,17 @@ try {
     }
 
     if ($PSCmdlet.ShouldProcess('src/nbgv', 'dotnet publish')) {
-        dotnet publish src/nbgv -c $Configuration -o src/nerdbank-gitversioning.npm/out/nbgv.cli/tools/net8.0/any
+        dotnet publish src/nbgv -f net8.0 -c $Configuration -o src/nerdbank-gitversioning.npm/out/nbgv.cli/tools/net8.0/any
+        if ($LASTEXITCODE -ne 0) {
+            throw "dotnet publish failed"
+        }
+
+        dotnet publish src/nbgv -f net9.0 -c $Configuration -o src/nerdbank-gitversioning.npm/out/nbgv.cli/tools/net9.0/any
+        if ($LASTEXITCODE -ne 0) {
+            throw "dotnet publish failed"
+        }
+
+        dotnet publish src/nbgv -f net10.0 -c $Configuration -o src/nerdbank-gitversioning.npm/out/nbgv.cli/tools/net10.0/any
         if ($LASTEXITCODE -ne 0) {
             throw "dotnet publish failed"
         }

src/nbgv/nbgv.csproj

@@ -4,7 +4,7 @@
     <ToolCommandName>nbgv</ToolCommandName>
     <PackAsTool>True</PackAsTool>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <RootNamespace>Nerdbank.GitVersioning.Tool</RootNamespace>
     <Description>A .NET Core Tool that can install, read and set version information based on git history, using Nerdbank.GitVersioning.</Description>
   </PropertyGroup>
@@ -13,7 +13,6 @@
     <PackageReference Include="NuGet.PackageManagement" />
     <PackageReference Include="System.CommandLine" />
     <PackageReference Include="Nerdbank.GitVersioning.LKG" PrivateAssets="all" />
-    <PackageReference Include="System.Diagnostics.Tools" />
     <PackageReference Include="Microsoft.Build" />
   </ItemGroup>
 

src/nerdbank-gitversioning.npm/ts/core.ts

@@ -1,9 +1,50 @@
+import * as fs from 'fs';
 import * as path from 'path';
+import { execSync } from 'child_process';
 
 const nbgvPath = 'nbgv.cli';
+const preferredFrameworks = ["net10.0", "net9.0", "net8.0"];
+
+function getInstalledRuntimeMajors(dotnetCommand: string): Set<number> {
+    try {
+        const output = execSync(`${dotnetCommand} --list-runtimes`, { encoding: 'utf8' });
+        const majors = new Set<number>();
+        for (const line of output.split(/\r?\n/)) {
+            const match = line.match(/^Microsoft\.NETCore\.App\s+(\d+)\./);
+            if (match) {
+                majors.add(Number(match[1]));
+            }
+        }
+
+        return majors;
+    } catch {
+        return new Set<number>();
+    }
+}
+
+function getFrameworkMajor(targetFramework: string): number | undefined {
+    const match = targetFramework.match(/^net(\d+)\.0$/);
+    return match ? Number(match[1]) : undefined;
+}
 
 export function getNbgvCommand(dotnetCommand?: string): string {
     var command = dotnetCommand || 'dotnet';
-    const nbgvDll = path.join(__dirname, nbgvPath, "tools", "net8.0", "any", "nbgv.dll");
-    return `${command} "${nbgvDll}"`;
+    const installedRuntimes = getInstalledRuntimeMajors(command);
+
+    for (const targetFramework of preferredFrameworks) {
+        const nbgvDll = path.join(__dirname, nbgvPath, "tools", targetFramework, "any", "nbgv.dll");
+        const major = getFrameworkMajor(targetFramework);
+        if (fs.existsSync(nbgvDll) && major !== undefined && installedRuntimes.has(major)) {
+            return `${command} "${nbgvDll}"`;
+        }
+    }
+
+    for (const targetFramework of preferredFrameworks) {
+        const nbgvDll = path.join(__dirname, nbgvPath, "tools", targetFramework, "any", "nbgv.dll");
+        if (fs.existsSync(nbgvDll)) {
+            return `${command} "${nbgvDll}"`;
+        }
+    }
+
+    throw new Error(`Could not find nbgv tool under any of: ${preferredFrameworks.join(', ')}`);
 }