Target .net 8

Author: xt0rted

CHANGELOG.md

@@ -2,9 +2,9 @@
 
 ## Unreleased
 
-> [!NOTE]
-> This version drops support for .NET Core 3.1 which is no longer supported
-
+- Dropped support for .NET Core 3.1
+- Dropped Support for .NET 6
+- Added support for .NET 8
 - Adjusted globbing so `:` acts like a path separator ([#131](https://github.com/xt0rted/dotnet-run-script/pull/131))
  - `foo:*` will match `foo:bar` but not `foo:bar:baz`
  - `foo:*:baz` will match `foo:bar:baz`

Directory.Build.props

@@ -1,11 +1,12 @@
 <Project>
 
  <PropertyGroup>
- <TargetFrameworks>net6.0</TargetFrameworks>
+ <TargetFramework>net8.0</TargetFramework>
  <LangVersion>latest</LangVersion>
  <ImplicitUsings>enable</ImplicitUsings>
  <Nullable>enable</Nullable>
  <IsPackable>false</IsPackable>
+ <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
  </PropertyGroup>
 
  <PropertyGroup>

README.md

@@ -138,7 +138,7 @@ Arguments passed after the double dash are passed through to each executing scri
 In this example both the `--configuration` and `--framework` options will be passed to each of the four scripts when running them.
 
 ```console
-dotnet r build test:unit test:integration package -- --configuration Release --framework net6.0
+dotnet r build test:unit test:integration package -- --configuration Release --framework net8.0
 ```
 
 ### Globbing or wildcard support

analysis/roslynator.editorconfig

@@ -559,9 +559,6 @@ dotnet_diagnostic.RCS1174.severity = error
 # RCS1175: Unused 'this' parameter
 dotnet_diagnostic.RCS1175.severity = error
 
-# RCS1176: Use 'var' instead of explicit type (when the type is not obvious)
-dotnet_diagnostic.RCS1176.severity = error
-
 # RCS1177: Use 'var' instead of explicit type (in foreach)
 dotnet_diagnostic.RCS1177.severity = error
 
@@ -778,6 +775,9 @@ dotnet_diagnostic.RCS1253.severity = error
 # RCS1254: Normalize format of enum flag value
 dotnet_diagnostic.RCS1254.severity = error
 
+# RCS1264: Use 'var' or explicit type
+dotnet_diagnostic.RCS1264.severity = error
+
 # RCS9001: Use pattern matching
 dotnet_diagnostic.RCS9001.severity = error
 

global.json

@@ -1,8 +1,7 @@
 {
  "sdk": {
- "version": "6.0.420"
+ "version": "8.0.203"
  },
- //"scriptShell": "pwsh",
  "scripts": {
  // project scripts
  "clean": "dotnet r clean:*",
@@ -12,7 +11,6 @@
  "build": "dotnet build",
 
  "test": "dotnet test",
- "test:6": "dotnet r test -- --framework net6.0",
 
  "test:unit": "dotnet r test -- --filter \"category=unit\"",
  "test:int": "dotnet r test -- --filter \"category=integration\"",

src/ArgumentBuilder.cs

@@ -1,3 +1,6 @@
+#pragma warning disable IDISP001 // Dispose created
+#pragma warning disable IDISP003 // Dispose previous before re-assigning
+
 namespace RunScript;
 
 using System.Runtime.CompilerServices;
@@ -79,13 +82,13 @@ public static string EscapeAndConcatenateCommandAndArgArrayForCmdProcessStart(
  }
 
  /// <summary>
- /// Concatinates the command and arguments without any escaping.
+ /// Concatenates the command and arguments without any escaping.
  /// This is meant to be used for display only and not for passing to a new process.
  /// </summary>
  /// <param name="command">The base command.</param>
  /// <param name="args">List of optional arguments.</param>
- /// <returns>A raw concatination of the <paramref name="command"/> and <paramref name="args"/>.</returns>
- public static string ConcatinateCommandAndArgArrayForDisplay(
+ /// <returns>A raw concatenation of the <paramref name="command"/> and <paramref name="args"/>.</returns>
+ public static string ConcatenateCommandAndArgArrayForDisplay(
  string? command,
  string[]? args)
  {

src/CommandBuilder.cs

@@ -2,11 +2,8 @@ namespace RunScript;
 
 using System.Text.RegularExpressions;
 
-internal class CommandBuilder
+internal partial class CommandBuilder
 {
- // This is the same regex used by npm's run-script library
- public static readonly Regex IsCmdCheck = new("(?:^|\\\\)cmd(?:\\.exe)?$", RegexOptions.IgnoreCase);
-
  private readonly IConsoleWriter _writer;
  private readonly IEnvironment _environment;
  private readonly Project _project;
@@ -31,6 +28,10 @@ public CommandBuilder(
 
  public ProcessContext? ProcessContext { get; private set; }
 
+ // This is the same regex used by npm's run-script library
+ [GeneratedRegex("(?:^|\\\\)cmd(?:\\.exe)?$", RegexOptions.IgnoreCase)]
+ public static partial Regex IsCmdCheck();
+
  public void SetUpEnvironment(string? scriptShellOverride)
  {
  var (scriptShell, isCmd) = GetScriptShell(scriptShellOverride ?? _project.ScriptShell);
@@ -61,7 +62,7 @@ public ICommandGroupRunner CreateGroupRunner(CancellationToken cancellationToken
  ? _environment.GetEnvironmentVariable("COMSPEC") ?? "cmd"
  : "sh";
 
- var isCmd = IsCmdCheck.IsMatch(shell);
+ var isCmd = IsCmdCheck().IsMatch(shell);
 
  return (shell, isCmd);
  }

src/CommandGroupRunner.cs

@@ -36,7 +36,11 @@ public virtual ICommandRunner BuildCommand()
 
  public async Task<int> RunAsync(string name, string[]? scriptArgs)
  {
- var scriptNames = ImmutableArray.Create(new[] { "pre" + name, name, "post" + name });
+ var scriptNames = ImmutableArray.Create([
+ "pre" + name,
+ name,
+ "post" + name,
+ ]);
 
  foreach (var subScript in scriptNames.Where(scriptName => _scripts.ContainsKey(scriptName) || scriptName == "env"))
  {

src/CommandRunner.cs

@@ -25,7 +25,7 @@ public async Task<int> RunAsync(string name, string cmd, string[]? args)
  {
  _cancellationToken.ThrowIfCancellationRequested();
 
- _writer.Banner(name, ArgumentBuilder.ConcatinateCommandAndArgArrayForDisplay(cmd, args));
+ _writer.Banner(name, ArgumentBuilder.ConcatenateCommandAndArgArrayForDisplay(cmd, args));
 
  using (var process = new Process())
  {
@@ -36,6 +36,7 @@ public async Task<int> RunAsync(string name, string cmd, string[]? args)
 
  var outStream = new StreamForwarder();
  var errStream = new StreamForwarder();
+
  Task? taskOut = null;
  Task? taskErr = null;
 

src/GlobalCommands.cs

@@ -3,7 +3,7 @@ namespace RunScript;
 internal static class GlobalCommands
 {
  /// <summary>
- /// The help command that lists all the scripts availble in the <g>global.json</g>.
+ /// The help command that lists all the scripts available in the <g>global.json</g>.
  /// </summary>
  /// <param name="writer">The console logger instance to use.</param>
  /// <param name="scripts">The project's scripts.</param>
@@ -28,7 +28,7 @@ public static void PrintAvailableScripts(IConsoleWriter writer, IDictionary<stri
  /// <exception cref="ArgumentNullException"></exception>
  public static void PrintEnvironmentVariables(IConsoleWriter writer, IEnvironment environment)
  {
- if (environment is null) throw new ArgumentNullException(nameof(environment));
+ ArgumentNullException.ThrowIfNull(environment);
 
  writer.Banner("env");