install .net 9 on runners while we wait for them to be updated

elastic · Dec 25, 2024 · 3ee10ee · 3ee10ee
1 parent e5eb2f0
commit 3ee10ee
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 80 deletions.
diff --git a/.github/actions/bootstrap/action.yml b/.github/actions/bootstrap/action.yml
@@ -18,6 +18,9 @@ runs:
       run: |
         git fetch --prune --unshallow --tags
         git tag --list
+    - uses: actions/setup-dotnet@v4
+      with:
+        global-json-file: global.json
 
     - id: dotnet
       shell: bash

diff --git a/src/docs-builder/Cli/ArgsFilter.cs b/src/docs-builder/Cli/ArgsFilter.cs
diff --git a/src/docs-builder/Program.cs b/src/docs-builder/Program.cs
@@ -10,8 +10,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
-var arguments = Arguments.Filter(args);
-
 var services = new ServiceCollection();
 services.AddGitHubActionsCore();
 services.AddLogging(x =>
@@ -33,14 +31,12 @@
 await using var serviceProvider = services.BuildServiceProvider();
 var logger = serviceProvider.GetRequiredService<ILogger<Program>>();
 ConsoleApp.ServiceProvider = serviceProvider;
-if (!arguments.IsHelp)
+var isHelp = args.Contains("-h") || args.Contains("--help");
+if (!isHelp)
 	ConsoleApp.Log = msg => logger.LogInformation(msg);
 ConsoleApp.LogError = msg => logger.LogError(msg);
 
 var app = ConsoleApp.Create();
 app.Add<Commands>();
 
-await app.RunAsync(arguments.Args).ConfigureAwait(false);
-
-
-//internal static partial class ConsoleApp;
+await app.RunAsync(args).ConfigureAwait(false);
diff --git a/src/docs-generator/Cli/ArgsFilter.cs b/src/docs-generator/Cli/ArgsFilter.cs
diff --git a/src/docs-generator/Program.cs b/src/docs-generator/Program.cs
@@ -14,9 +14,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
-
-var arguments = Arguments.Filter(args);
-
 var services = new ServiceCollection();
 services.AddGitHubActionsCore();
 services.AddLogging(x =>
@@ -35,11 +32,12 @@
 await using var serviceProvider = services.BuildServiceProvider();
 var logger = serviceProvider.GetRequiredService<ILogger<Program>>();
 ConsoleApp.ServiceProvider = serviceProvider;
-if (!arguments.IsHelp)
+var isHelp = args.Contains("-h") || args.Contains("--help");
+if (!isHelp)
 	ConsoleApp.Log = msg => logger.LogInformation(msg);
 ConsoleApp.LogError = msg => logger.LogError(msg);
 
 var app = ConsoleApp.Create();
 app.Add<Commands>();
 
-await app.RunAsync(arguments.Args).ConfigureAwait(false);
+await app.RunAsync(args).ConfigureAwait(false);