Skip to content

fix(workflows): use dotnet tool exec for .NET 10+ workflows #263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DecSmith42 merged 1 commit into from
Jan 14, 2026
Merged

fix(workflows): use dotnet tool exec for .NET 10+ workflows #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 38 additions & 12 deletions DecSm.Atom.Module.DevopsWorkflows/Generation/DevopsWorkflowWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,26 +411,52 @@ private void WriteStep(WorkflowModel workflow, WorkflowStepModel step, WorkflowJ
.DistinctBy(x => x.FeedName)
.ToList();

using (WriteSection("- script: dotnet tool update --global DecSm.Atom.Tool"))
WriteLine("displayName: 'Install atom tool'");
// If we know the SetupDotnet step was run for dotnet 10+,
// then we can use the dotnet tool exec command instead of installing the tool to run it
if (setupDotnetSteps.Any(x =>
SemVer.TryParse(x.DotnetVersion?.Replace("x", "0"), out var version) && version.Major >= 10))
{
using (WriteSection("- script: |"))
{
foreach (var feedToAdd in feedsToAdd)
WriteLine(
$"dotnet tool exec decsm.atom.tool -y -- nuget-add --name \"{feedToAdd.FeedName}\" --url \"{feedToAdd.FeedUrl}\"");

WriteLine();
WriteLine("displayName: 'Setup NuGet'");

using (WriteSection("- script: |"))
using (WriteSection("env:"))
{
foreach (var feedToAdd in feedsToAdd)
WriteLine(
$"{AddNugetFeedsStep.GetEnvVarNameForFeed(feedToAdd.FeedName)}: $({feedToAdd.SecretName})");
}

WriteLine();
}
}
else
{
foreach (var feedToAdd in feedsToAdd)
WriteLine($" atom nuget-add --name \"{feedToAdd.FeedName}\" --url \"{feedToAdd.FeedUrl}\"");
using (WriteSection("- script: dotnet tool update --global DecSm.Atom.Tool"))
WriteLine("displayName: 'Install atom tool'");

WriteLine("displayName: 'Setup NuGet'");
WriteLine();

using (WriteSection("env:"))
using (WriteSection("- script: |"))
{
foreach (var feedToAdd in feedsToAdd)
WriteLine(
$"{AddNugetFeedsStep.GetEnvVarNameForFeed(feedToAdd.FeedName)}: $({feedToAdd.SecretName})");
}
WriteLine($" atom nuget-add --name \"{feedToAdd.FeedName}\" --url \"{feedToAdd.FeedUrl}\"");

WriteLine();
WriteLine("displayName: 'Setup NuGet'");

using (WriteSection("env:"))
{
foreach (var feedToAdd in feedsToAdd)
WriteLine(
$"{AddNugetFeedsStep.GetEnvVarNameForFeed(feedToAdd.FeedName)}: $({feedToAdd.SecretName})");
}

WriteLine();
}
}
}

Expand Down
56 changes: 42 additions & 14 deletions DecSm.Atom.Module.GithubWorkflows/Generation/GithubWorkflowWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,29 +492,57 @@ private void WriteStep(WorkflowModel workflow, WorkflowStepModel step, WorkflowJ
.DistinctBy(x => x.FeedName)
.ToList();

using (WriteSection("- name: Install atom tool"))
// If we know the SetupDotnet step was run for dotnet 10+,
// then we can use the dotnet tool exec command instead of installing the tool to run it
if (setupDotnetSteps.Any(x =>
SemVer.TryParse(x.DotnetVersion?.Replace("x", "0"), out var version) && version.Major >= 10))
{
WriteLine("run: dotnet tool update --global DecSm.Atom.Tool");
WriteLine("shell: bash");
}
using (WriteSection("- name: Setup NuGet"))
{
using (WriteSection("run: |"))
{
foreach (var feedToAdd in feedsToAdd)
WriteLine(
$"dotnet tool exec decsm.atom.tool -y -- nuget-add --name \"{feedToAdd.FeedName}\" --url \"{feedToAdd.FeedUrl}\"");
}

WriteLine();
WriteLine("shell: bash");

using (WriteSection("- name: Setup NuGet"))
using (WriteSection("env:"))
{
foreach (var feedToAdd in feedsToAdd)
WriteLine(
$$$"""{{{AddNugetFeedsStep.GetEnvVarNameForFeed(feedToAdd.FeedName)}}}: ${{ secrets.{{{feedToAdd.SecretName}}} }}""");
}
}
}
else
{
using (WriteSection("run: |"))
using (WriteSection("- name: Install atom tool"))
{
foreach (var feedToAdd in feedsToAdd)
WriteLine($" atom nuget-add --name \"{feedToAdd.FeedName}\" --url \"{feedToAdd.FeedUrl}\"");
WriteLine("run: dotnet tool update --global DecSm.Atom.Tool");
WriteLine("shell: bash");
}

WriteLine("shell: bash");
WriteLine();

using (WriteSection("env:"))
using (WriteSection("- name: Setup NuGet"))
{
foreach (var feedToAdd in feedsToAdd)
WriteLine(
$$$"""{{{AddNugetFeedsStep.GetEnvVarNameForFeed(feedToAdd.FeedName)}}}: ${{ secrets.{{{feedToAdd.SecretName}}} }}""");
using (WriteSection("run: |"))
{
foreach (var feedToAdd in feedsToAdd)
WriteLine(
$" atom nuget-add --name \"{feedToAdd.FeedName}\" --url \"{feedToAdd.FeedUrl}\"");
}

WriteLine("shell: bash");

using (WriteSection("env:"))
{
foreach (var feedToAdd in feedsToAdd)
WriteLine(
$$$"""{{{AddNugetFeedsStep.GetEnvVarNameForFeed(feedToAdd.FeedName)}}}: ${{ secrets.{{{feedToAdd.SecretName}}} }}""");
}
}
}
}
Expand Down
Loading