Use DotnetMuxer to locate dotnet and simplify workflows

kzu · kzu · commit 9c6c75e68095 · 2026-07-04T22:07:14.000-03:00
- Add DotnetMuxer helper (from .NET Foundation) to find the active dotnet
- Update Program.cs to report the resolved dotnet path
- Update go.csproj: adjust RIDs, remove unconditional AOT, update descriptions
- Refactor build.yml: run publish for RIDs + pack
- Simplify publish.yml: remove native-aot matrix job, streamline publish/pack/push
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,8 +21,6 @@ on:
 
 env:
   DOTNET_NOLOGO: true
-  PackOnBuild: true
-  GeneratePackageOnBuild: true
   VersionPrefix: 42.42.${{ github.run_number }}
   VersionLabel: ${{ github.ref }}
   GH_TOKEN: ${{ secrets.GH_TOKEN }}
@@ -69,14 +67,21 @@ jobs:
         uses: devlooped/actions-dotnet-env@v1
 
       - name: 🙏 build
-        run: |
-          dotnet build -m:1 -bl:build.binlog -p:RuntimeIdentifiers=any
-          dotnet build src/go/go.csproj -bl:runtime.binlog -p:RuntimeIdentifiers=any -r any
+        run: dotnet build -m:1 -bl:build.binlog
 
       - name: 🧪 test
         shell: pwsh
         run: dnx --yes retest -- --no-build
 
+      - name: 🙏 publish
+        shell: pwsh
+        run: |
+          $rids = dotnet msbuild src/go/go.csproj -getproperty:RuntimeIdentifiers 
+          $rids | %{ $_.Split(';') } | %{ $_.Trim() } | ? { $_ } | %{ dotnet publish src/go/go.csproj -r $_ }
+
+      - name: 📦 pack
+        run: dotnet pack src/go/go.csproj --no-build -m:1 -bl:pack.binlog
+
       - name: 🐛 logs
         uses: actions/upload-artifact@v4
         if: runner.debug && always()
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -14,63 +14,10 @@ env:
   GH_TOKEN: ${{ secrets.GH_TOKEN }}
   MSBUILDTERMINALLOGGER: auto
   SLEET_FEED_URL: https://api.nuget.org/v3/index.json
-
-defaults:
-  run:
-    shell: pwsh
-
+      
 jobs:
-  native-aot:
-    name: native-aot-${{ matrix.rid }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-latest
-            rid: linux-x64
-          - os: ubuntu-24.04-arm
-            rid: linux-arm64
-          - os: windows-latest
-            rid: win-x64
-          - os: windows-11-arm
-            rid: win-arm64
-          - os: macos-15-intel
-            rid: osx-x64
-          - os: macos-latest
-            rid: osx-arm64
-    steps:
-      - name: 🤘 checkout
-        uses: actions/checkout@v4
-
-      - name: ⚙ dotnet
-        uses: devlooped/actions-dotnet-env@v1
-
-      - name: 📦 pack
-        run: |
-          dotnet pack src/go/go.csproj -c $env:Configuration -r ${{ matrix.rid }} -bl:"pack-${{ matrix.rid }}.binlog"
-
-      - name: 📤 package
-        uses: actions/upload-artifact@v4
-        with:
-          name: package-${{ matrix.rid }}
-          path: bin/*.${{ matrix.rid }}.*.nupkg
-          retention-days: 30
-          if-no-files-found: error
-
-      - name: 🐛 logs
-        uses: actions/upload-artifact@v4
-        if: runner.debug && always()
-        with:
-          name: logs-${{ matrix.rid }}
-          path: '*.binlog'
-
   publish:
-    needs: native-aot
     runs-on: ${{ vars.PUBLISH_AGENT || 'ubuntu-latest' }}
-    env:
-      NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
-      SLEET_CONNECTION: ${{ secrets.SLEET_CONNECTION }}
     steps:
       - name: 🤘 checkout
         uses: actions/checkout@v4
@@ -87,79 +34,33 @@ jobs:
       - name: 🧪 test
         run: dnx --yes retest -- --no-build
 
-      - name: 📦 pointer
+      - name: 🙏 publish
+        shell: pwsh
         run: |
-          dotnet pack src/go/go.csproj -c $env:Configuration -bl:pointer-pack.binlog
+          $rids = dotnet msbuild src/go/go.csproj -getproperty:RuntimeIdentifiers 
+          $rids | %{ $_.Split(';') } | %{ $_.Trim() } | ? { $_ } | %{ dotnet publish src/go/go.csproj -r $_ }
 
-      - name: 📦 fallback
-        run: |
-          dotnet pack src/go/go.csproj -c $env:Configuration -r any -bl:any-pack.binlog
-
-      - name: 📤 package
-        uses: actions/upload-artifact@v4
-        with:
-          name: package-any
-          path: bin/*.nupkg
-          retention-days: 30
-          if-no-files-found: error
-
-      - name: 📥 packages
-        uses: actions/download-artifact@v4
-        with:
-          pattern: package-*
-          path: bin
-          merge-multiple: true
+      - name: 📦 pack
+        run: dotnet pack src/go/go.csproj --no-build -m:1 -bl:pack.binlog
 
       - name: 🐛 logs
         uses: actions/upload-artifact@v4
         if: runner.debug && always()
         with:
-          name: logs-publish
+          name: logs
           path: '*.binlog'
 
       - name: 🚀 nuget
+        env:
+          NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
         if: ${{ env.NUGET_API_KEY != '' && github.event.action != 'prereleased' }}
-        run: |
-          $packages = @(Get-ChildItem bin -Filter *.nupkg | Where-Object Name -NotLike '*.symbols.nupkg' | Sort-Object Name)
-          $runtimePackagePattern = '^go\.(win-x64|win-arm64|linux-x64|linux-arm64|osx-x64|osx-arm64|any)\..+\.nupkg$'
-          $runtimePackages = @($packages | Where-Object Name -Match $runtimePackagePattern)
-          $pointerPackages = @($packages | Where-Object Name -NotMatch $runtimePackagePattern)
-
-          if ($runtimePackages.Count -eq 0) { throw 'No RID-specific or fallback packages found.' }
-          if ($pointerPackages.Count -eq 0) { throw 'No top-level pointer package found.' }
-
-          foreach ($package in $runtimePackages) {
-            dotnet nuget push $package.FullName -s https://api.nuget.org/v3/index.json -k $env:NUGET_API_KEY --skip-duplicate
-          }
-
-          foreach ($package in $pointerPackages) {
-            dotnet nuget push $package.FullName -s https://api.nuget.org/v3/index.json -k $env:NUGET_API_KEY --skip-duplicate
-          }
+        working-directory: bin
+        run: dotnet nuget push *.nupkg -s https://api.nuget.org/v3/index.json -k ${{secrets.NUGET_API_KEY}} --skip-duplicate
 
       - name: 🚀 sleet
+        env:
+          SLEET_CONNECTION: ${{ secrets.SLEET_CONNECTION }}
         if: env.SLEET_CONNECTION != ''
         run: |
-          $packages = @(Get-ChildItem bin -Filter *.nupkg | Where-Object Name -NotLike '*.symbols.nupkg' | Sort-Object Name)
-          $runtimePackagePattern = '^go\.(win-x64|win-arm64|linux-x64|linux-arm64|osx-x64|osx-arm64|any)\..+\.nupkg$'
-          $runtimePackages = @($packages | Where-Object Name -Match $runtimePackagePattern)
-          $pointerPackages = @($packages | Where-Object Name -NotMatch $runtimePackagePattern)
-
-          if ($runtimePackages.Count -eq 0) { throw 'No RID-specific or fallback packages found.' }
-          if ($pointerPackages.Count -eq 0) { throw 'No top-level pointer package found.' }
-
-          $runtimePath = Join-Path $env:RUNNER_TEMP runtime-packages
-          $pointerPath = Join-Path $env:RUNNER_TEMP pointer-package
-          New-Item -ItemType Directory -Force -Path $runtimePath, $pointerPath | Out-Null
-
-          Copy-Item -Path $runtimePackages.FullName -Destination $runtimePath
-          Copy-Item -Path $pointerPackages.FullName -Destination $pointerPath
-
-          $sleetVersion = (Invoke-RestMethod -Uri $env:SLEET_FEED_URL).'sleet:version'
-          if ($sleetVersion) {
-            dotnet tool update sleet -g --allow-downgrade --version $sleetVersion
-          } else {
-            dotnet tool update sleet -g --allow-downgrade
-          }
-
-          sleet push $runtimePath --config none -f --verbose -p "SLEET_FEED_CONTAINER=nuget" -p "SLEET_FEED_CONNECTIONSTRING=$env:SLEET_CONNECTION" -p "SLEET_FEED_TYPE=azure"
-          sleet push $pointerPath --config none -f --verbose -p "SLEET_FEED_CONTAINER=nuget" -p "SLEET_FEED_CONNECTIONSTRING=$env:SLEET_CONNECTION" -p "SLEET_FEED_TYPE=azure"
+          dotnet tool update sleet -g --allow-downgrade --version $(curl -s --compressed ${{ vars.SLEET_FEED_URL }} | jq '.["sleet:version"]' -r)        
+          sleet push bin --config none -f --verbose -p "SLEET_FEED_CONTAINER=nuget" -p "SLEET_FEED_CONNECTIONSTRING=${{ secrets.SLEET_CONNECTION }}" -p "SLEET_FEED_TYPE=azure" || echo "No packages found"
diff --git a/src/go/DotnetMuxer.cs b/src/go/DotnetMuxer.cs
@@ -0,0 +1,36 @@
+﻿// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Runtime.InteropServices;
+
+namespace Devlooped;
+
+public static class DotnetMuxer
+{
+    public static FileInfo? Path { get; }
+
+    static DotnetMuxer()
+    {
+        var muxerFileName = ExecutableName("dotnet");
+        var fxDepsFile = GetDataFromAppDomain("FX_DEPS_FILE");
+
+        if (string.IsNullOrEmpty(fxDepsFile))
+            return;
+
+        var muxerDir = new FileInfo(fxDepsFile).Directory?.Parent?.Parent?.Parent;
+        if (muxerDir == null)
+            return;
+
+        var muxerCandidate = new FileInfo(System.IO.Path.Combine(muxerDir.FullName, muxerFileName));
+        if (muxerCandidate.Exists)
+            Path = muxerCandidate;
+    }
+
+    public static string? GetDataFromAppDomain(string propertyName)
+        => AppContext.GetData(propertyName) as string;
+
+    public static string ExecutableName(this string withoutExtension)
+        => RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
+            ? withoutExtension + ".exe"
+            : withoutExtension;
+}
diff --git a/src/go/Program.cs b/src/go/Program.cs
@@ -1,7 +1,19 @@
-﻿if (args is ["--help" or "-h" or "-?"])
+﻿using Devlooped;
+
+if (args is ["--help" or "-h" or "-?"])
 {
-    Console.WriteLine("go");
+    Console.WriteLine("Locates the dotnet executable used to run this tool.");
+    Console.WriteLine();
+    Console.WriteLine("Usage: go [--help]");
     return 0;
 }
 
+var path = DotnetMuxer.Path?.FullName;
+if (path is null)
+{
+    Console.Error.WriteLine("dotnet executable not found.");
+    return 1;
+}
+
+Console.WriteLine(path);
 return 0;
diff --git a/src/go/go.csproj b/src/go/go.csproj
@@ -8,35 +8,32 @@
     <RootNamespace>Devlooped</RootNamespace>
     <SignAssembly>false</SignAssembly>
     <EnableDefaultNoneItems>false</EnableDefaultNoneItems>
-    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
 
-    <Description>A dotnet global tool.</Description>
+    <Description>A dotnet global tool that locates the dotnet executable.</Description>
     <PackageId>go</PackageId>
     <PackAsTool>true</PackAsTool>
-    <PackBuildOutput>false</PackBuildOutput>
     <PackageReadmeFile>readme.md</PackageReadmeFile>
     <PackageTags>dotnet dotnet-tool</PackageTags>
     <PackageProjectUrl>https://github.com/devlooped/go</PackageProjectUrl>
 
-    <!-- Allow running on whatever latest version users have. See https://docs.microsoft.com/en-us/dotnet/core/versions/selection#framework-dependent-apps-roll-forward -->
-    <!-- Useful for RID=any -->
-    <RollForward>LatestMajor</RollForward>
-    <RuntimeIdentifiers>win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64;any</RuntimeIdentifiers>
-
-    <PublishAot>true</PublishAot>
-    <StripSymbols>true</StripSymbols>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(RuntimeIdentifier)' == 'any'">
-    <PublishAot>false</PublishAot>
+    <RuntimeIdentifier Condition="$(BuildingInsideVisualStudio) == 'true'">win-x64</RuntimeIdentifier>
+    <RuntimeIdentifiers>
+      linux-x64;
+      linux-arm64;
+      osx-arm64;
+      osx-x64;
+      win-x64;
+      win-arm64
+    </RuntimeIdentifiers>
+    <PublishSelfContained>false</PublishSelfContained>
   </PropertyGroup>
 
   <ItemGroup>
     <None Include="readme.md" PackagePath="readme.md" Pack="true" />
     <None Include="Properties\*.*" />
   </ItemGroup>
 
-  <Target Name="RenderHelp" AfterTargets="Build" Condition="$(NoHelp) != 'true' and $(DesignTimeBuild) != 'true' and '$(PublishAot)' != 'true' and '$(RuntimeIdentifier)' == ''">
+  <Target Name="RenderHelp" AfterTargets="Build" Condition="$(NoHelp) != 'true' and $(DesignTimeBuild) != 'true' and '$(RuntimeIdentifier)' == ''">
     <WriteLinesToFile Lines="```shell" Overwrite="true" Encoding="UTF-8" File="$(MSBuildProjectDirectory)\help.md" />
     <Exec Command="dotnet &quot;$(TargetPath)&quot; --help &gt;&gt; &quot;$(MSBuildProjectDirectory)\help.md&quot;" StdOutEncoding="UTF-8" EnvironmentVariables="NO_COLOR=true" />
     <WriteLinesToFile Lines="```" Overwrite="false" Encoding="UTF-8" File="$(MSBuildProjectDirectory)\help.md" />
diff --git a/src/go/help.md b/src/go/help.md
@@ -1,3 +1,5 @@
 ﻿```shell
-go
+Locates the dotnet executable used to run this tool.
+
+Usage: go [--help]
 ```
