JENKINS-67450

src/main/java/io/jenkins/plugins/dotnet/DotNetSDK.java

@@ -76,7 +76,7 @@ public DotNetSDK(@NonNull String name, @NonNull String home, @CheckForNull List<
   private boolean telemetryOptOut = true;
 
   /**
-   * Determines whether or not the telemetry opt-out is set.
+   * Determines whether the telemetry opt-out is set.
    *
    * @return {@code true} when the telemetry opt-out is set; {@code false} otherwise.
    */
@@ -85,7 +85,7 @@ public boolean isTelemetryOptOut() {
   }
 
   /**
-   * Determines whether or not the telemetry opt-out should be set.
+   * Determines whether the telemetry opt-out should be set.
    *
    * @param telemetryOptOut {@code true} to opt out of telemetry; {@code false} otherwise.
    */
@@ -180,6 +180,7 @@ public boolean createGlobalJson(@NonNull FilePath dir, @NonNull TaskListener lis
    * @param launcher The launcher to use for the verification.
    *
    * @return The full path to the {@code dotnet} executable in this .NET SDK installation.
+   *
    * @throws AbortException       When the executable could not be found.
    * @throws IOException          When an I/O error occurs.
    * @throws InterruptedException When processing is interrupted.
@@ -257,7 +258,7 @@ public FilePath getHomePath(@CheckForNull VirtualChannel channel) {
   }
 
   /**
-   * Determines whether or not any .NET SDKs have been configured.
+   * Determines whether any .NET SDKs have been configured.
    *
    * @return {@code true} when at least one .NET SDK has been configured; otherwise, {@code false}.
    */
@@ -355,6 +356,7 @@ public String getDisplayName() {
      * @param listener  The task listener to use.
      *
      * @return The requested .NET SDK installation.
+     *
      * @throws AbortException       When the SDK installation could not be set up.
      * @throws IOException          Then an I/O error occurs.
      * @throws InterruptedException When processing is interrupted.

src/main/java/io/jenkins/plugins/dotnet/DotNetSDKInstaller.java

@@ -44,6 +44,7 @@ public DotNetSDKInstaller(@CheckForNull String label) {
    * @param log  The task listener to use for output.
    *
    * @return The SDK's installation location.
+   *
    * @throws IOException          When an I/O error occurs during processing.
    * @throws InterruptedException When processing is interrupted.
    */
@@ -72,7 +73,7 @@ public FilePath performInstallation(@NonNull ToolInstallation tool, @NonNull Nod
   private boolean includePreview;
 
   /**
-   * Determines whether or not .NET preview releases should be made available for installation.
+   * Determines whether .NET preview releases should be made available for installation.
    *
    * @return {@code true} if installation of .NET preview releases is allowed, {@code false} otherwise.
    */
@@ -81,7 +82,7 @@ public boolean isIncludePreview() {
   }
 
   /**
-   * Determines whether or not .NET preview releases should be made available for installation.
+   * Determines whether .NET preview releases should be made available for installation.
    *
    * @param includePreview {@code true} to allow installation of .NET preview releases, {@code false} otherwise.
    */
@@ -327,7 +328,7 @@ public ListBoxModel doFillUrlItems(@CheckForNull @QueryParameter String sdk) {
      * Fills a listbox with the names of .NET releases.
      *
      * @param version        The name of the .NET version containing the releases.
-     * @param includePreview Indicates whether or not preview releases should be included.
+     * @param includePreview Indicates whether preview releases should be included.
      *
      * @return A suitably filled listbox model.
      */
@@ -374,7 +375,7 @@ public String getDisplayName() {
     }
 
     /**
-     * Determines whether or not this installer is applicable for the specified type of tool.
+     * Determines whether this installer is applicable for the specified type of tool.
      *
      * @param toolType The type of tool to install.
      *

src/main/java/io/jenkins/plugins/dotnet/DotNetWrapper.java

@@ -79,8 +79,8 @@ public boolean isSpecificSdkVersion() {
    * most recent SDK version available on the system; with this set, a {@code global.json} file will be created to ensure a specific
    * SDK version gets used.
    *
-   * @param specificSdkVersion {@code true} if {@code global.json} should be used to ensure a specific SDK version gets used;
-   *                           {@code false} otherwise.
+   * @param specificSdkVersion {@code true} if {@code global.json} should be used to ensure a specific SDK version gets used; {@code
+   *                           false} otherwise.
    */
   @DataBoundSetter
   public void setSpecificSdkVersion(boolean specificSdkVersion) {
@@ -199,7 +199,7 @@ public String getDisplayName() {
     }
 
     /**
-     * Determines whether or not the .NET wrapper is applicable.
+     * Determines whether the .NET wrapper is applicable.
      *
      * @param item The project context.
      *

src/main/java/io/jenkins/plugins/dotnet/commands/Command.java

@@ -73,7 +73,7 @@ public static DotNetSDK.DescriptorImpl getSdkDescriptor() throws AbortException
    */
   @Override
   public void perform(@NonNull Run<?, ?> run, @NonNull FilePath workspace, @NonNull EnvVars env, @NonNull Launcher launcher, @NonNull TaskListener listener) throws InterruptedException, IOException {
-    final Charset cs = run.getCharset();
+    final Charset cs = this.charset == null ? run.getCharset() : Charset.forName(this.charset);
     final DotNetSDK sdkInstance;
     if (this.sdk == null)
       sdkInstance = null;
@@ -121,12 +121,17 @@ public void perform(@NonNull Run<?, ?> run, @NonNull FilePath workspace, @NonNul
         launcher.launch().cmds(cmdLine).envs(env).stdout(scanner).pwd(workspace).join();
       }
       // TODO: Maybe also add configuration to set the build as either failed or unstable based on return code
-      if (rc != 0)
-        run.setResult(Result.FAILURE);
-      else if (scanner.getErrors() > 0)
-        run.setResult(Result.FAILURE);
-      else if (this.unstableIfWarnings && scanner.getWarnings() > 0)
-        run.setResult(Result.UNSTABLE);
+      if (scanner.getErrors() > 0) {
+        run.setResult(this.unstableIfErrors ? Result.UNSTABLE : Result.FAILURE);
+      }
+      else {
+        if (this.unstableIfWarnings && scanner.getWarnings() > 0) {
+          run.setResult(Result.UNSTABLE);
+        }
+        if (rc != 0) {
+          run.setResult(Result.FAILURE);
+        }
+      }
     }
     catch (Throwable t) {
       Functions.printStackTrace(t, listener.fatalError(Messages.Command_ExecutionFailed()));
@@ -140,6 +145,32 @@ else if (this.unstableIfWarnings && scanner.getWarnings() > 0)
 
   //region Properties
 
+  /** A specific charset to use for the command's output. If {@code null}, the build's default charset will be used. */
+  @CheckForNull
+  private String charset = null;
+
+  /**
+   * Gets the specific charset to use for the command's output.
+   *
+   * @return The specific charset to use for the command's output, or {@code null} to indicate that the build's default charset
+   * should be used.
+   */
+  @CheckForNull
+  public String getCharset() {
+    return this.charset;
+  }
+
+  /**
+   * Sets the specific charset to use for the command's output.
+   *
+   * @param charset The specific charset to use for the command's output, or {@code null} to indicate that the build's default
+   *                charset should be used.
+   */
+  @DataBoundSetter
+  public void setCharset(@CheckForNull String charset) {
+    this.charset = Util.fixEmptyAndTrim(charset);
+  }
+
   /** The name of the SDK to use. */
   @CheckForNull
   protected String sdk;
@@ -164,20 +195,21 @@ public void setSdk(@CheckForNull String sdk) {
     this.sdk = Util.fixEmpty(sdk);
   }
 
-  /** Flag indicating whether or not SDK information should be shown. */
+  /** Flag indicating whether SDK information should be shown. */
   protected boolean showSdkInfo = false;
 
   /**
-   * Determines whether or not SDK information should be shown.
+   * Determines whether SDK information should be shown.
    *
    * @return {@code true} if "{@code dotnet --info}" should be run before the main command; {@code false} otherwise.
    */
+  @SuppressWarnings("unused")
   public boolean isShowSdkInfo() {
     return this.showSdkInfo;
   }
 
   /**
-   * Determines whether or not SDK information should be shown.
+   * Determines whether SDK information should be shown.
    *
    * @param showSdkInfo {@code true} if "{@code dotnet --info}" should be run before the main command; {@code false} otherwise.
    */
@@ -186,35 +218,40 @@ public void setShowSdkInfo(boolean showSdkInfo) {
     this.showSdkInfo = showSdkInfo;
   }
 
-  /** Flag indicating whether or not any build servers started by the main command should be shut down. */
+  /** Flag indicating whether any build servers started by the main command should be shut down. */
   protected boolean shutDownBuildServers = false;
 
-  /** Flag indicating whether or not a specific SDK version should be used. */
+  /** Flag indicating whether a specific SDK version should be used. */
   private boolean specificSdkVersion = false;
 
   /**
-   * Determines whether or not a specific SDK version should be used.
+   * Determines whether a specific SDK version should be used.
    *
-   * @return {@code true} if a {@code global.json} should be created to force the use of the configured .NET SDK (as opposed to
-   * a more recent one that happens to be installed on the build agent); {@code false} otherwise.
+   * @return {@code true} if a {@code global.json} should be created to force the use of the configured .NET SDK (as opposed to a
+   * more recent one that happens to be installed on the build agent); {@code false} otherwise.
    */
+  @SuppressWarnings("unused")
   public boolean isSpecificSdkVersion() {
     return this.specificSdkVersion;
   }
 
   /**
-   * Determines whether or not a specific SDK version should be used.
+   * Determines whether a specific SDK version should be used.
    *
    * @param specificSdkVersion {@code true} if a {@code global.json} should be created to force the use of the configured .NET SDK
    *                           (as opposed to a more recent one that happens to be installed on the build agent); {@code false}
    *                           otherwise.
    */
   @DataBoundSetter
+  @SuppressWarnings("unused")
   public void setSpecificSdkVersion(boolean specificSdkVersion) {
     this.specificSdkVersion = specificSdkVersion;
   }
 
-  /** Flag indicating whether or not the presence of warnings makes the build unstable. */
+  /** Flag indicating whether the presence of errors makes the build unstable (instead of failed). */
+  protected boolean unstableIfErrors = false;
+
+  /** Flag indicating whether the presence of warnings makes the build unstable (instead of successful). */
   protected boolean unstableIfWarnings = false;
 
   /** The working directory to use for the command. This directory is <em>not</em> created by the command execution. */
@@ -227,6 +264,7 @@ public void setSpecificSdkVersion(boolean specificSdkVersion) {
    * @return The working directory to use for the command.
    */
   @CheckForNull
+  @SuppressWarnings("unused")
   public String getWorkDirectory() {
     return this.workDirectory;
   }
@@ -237,6 +275,7 @@ public String getWorkDirectory() {
    * @param workDirectory The working directory to use for the command.
    */
   @DataBoundSetter
+  @SuppressWarnings("unused")
   public void setWorkDirectory(@CheckForNull String workDirectory) {
     this.workDirectory = Util.fixEmpty(workDirectory);
   }

src/main/java/io/jenkins/plugins/dotnet/commands/CommandDescriptor.java

@@ -2,6 +2,7 @@
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
+import hudson.Util;
 import hudson.model.AbstractProject;
 import hudson.model.AutoCompletionCandidates;
 import hudson.tasks.BuildStepDescriptor;
@@ -14,6 +15,9 @@
 import org.jenkinsci.plugins.structs.describable.CustomDescribableModel;
 import org.kohsuke.stapler.QueryParameter;
 
+import java.nio.charset.Charset;
+import java.util.Set;
+
 /** A descriptor for a .NET command. */
 public abstract class CommandDescriptor extends BuildStepDescriptor<Builder> implements CustomDescribableModel {
 
@@ -87,6 +91,28 @@ public final AutoCompletionCandidates doAutoCompleteRuntimesString(@CheckForNull
     return Runtime.getInstance().autoCompleteIdentifier(value);
   }
 
+  /**
+   * Performs validation on a Java charset name.
+   *
+   * @param value The value to validate.
+   *
+   * @return The result of the validation.
+   */
+  @SuppressWarnings("unused")
+  @NonNull
+  public FormValidation doCheckCharset(@CheckForNull @QueryParameter String value) {
+    final String name = Util.fixEmptyAndTrim(value);
+    if (name != null) {
+      try {
+        Charset.forName(value);
+      }
+      catch (Throwable t) {
+        return FormValidation.error(Messages.Command_UnsupportedCharset());
+      }
+    }
+    return FormValidation.ok();
+  }
+
   /**
    * Performs validation on a .NET target framework moniker.
    *
@@ -139,6 +165,29 @@ public FormValidation doCheckRuntimesString(@CheckForNull @QueryParameter String
     return Runtime.getInstance().checkIdentifiers(value);
   }
 
+  /**
+   * Fills a listbox with the names of charsets supported by the running version of Java.
+   *
+   * @return A suitably filled listbox model.
+   */
+  @SuppressWarnings("unused")
+  @NonNull
+  public final ListBoxModel doFillCharsetItems() {
+    final ListBoxModel model = new ListBoxModel();
+    model.add(Messages.Command_SameCharsetAsBuild(), "");
+    for (final Charset cs : Charset.availableCharsets().values()) {
+      final Set<String> aliases = cs.aliases();
+      final String name = cs.displayName();
+      if (aliases == null || aliases.isEmpty()) {
+        model.add(name);
+      }
+      else {
+        model.add(String.format("%s (%s)", name, String.join(" / ", aliases)), name);
+      }
+    }
+    return model;
+  }
+
   /**
    * Fills a listbox with the names of .NET SDKs that have been defined as global tools.
    *
@@ -183,7 +232,7 @@ public final String getMoreOptions() {
   }
 
   /**
-   * Determines whether or not this descriptor is applicable for the specified job type.
+   * Determines whether this descriptor is applicable for the specified job type.
    *
    * @param jobType The job type.
    *