set version in clean goal - allows for reading version in csproj file…

… from target directory
eitco · Jun 14, 2024 · 69a56d5 · 69a56d5
1 parent 2ff7c60
commit 69a56d5
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/src/main/java/de/eitco/cicd/dotnet/AbstractDotnetMojo.java b/src/main/java/de/eitco/cicd/dotnet/AbstractDotnetMojo.java
@@ -53,6 +53,7 @@ protected DotnetExecutor newExecutor(boolean ignoreResult) {
                 workingDirectory,
                 dotnetExecutable,
                 targetDirectory,
+                projectVersion,
                 getLog(),
                 ignoreResult
         );

diff --git a/src/main/java/de/eitco/cicd/dotnet/BuildMojo.java b/src/main/java/de/eitco/cicd/dotnet/BuildMojo.java
@@ -15,6 +15,6 @@ public class BuildMojo extends AbstractDotnetMojo {
     @Override
     public void execute() throws MojoExecutionException {
 
-        newExecutor().build(projectVersion, assemblyVersion, vendor, configurationName);
+        newExecutor().build(assemblyVersion, vendor, configurationName);
     }
 }
diff --git a/src/main/java/de/eitco/cicd/dotnet/CleanMojo.java b/src/main/java/de/eitco/cicd/dotnet/CleanMojo.java
@@ -1,15 +1,14 @@
 package de.eitco.cicd.dotnet;
 
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 
 @Mojo(name = "clean", defaultPhase = LifecyclePhase.CLEAN)
 public class CleanMojo extends AbstractDotnetMojo {
 
     @Override
-    public void execute() throws MojoExecutionException, MojoFailureException {
+    public void execute() throws MojoExecutionException {
 
         newExecutor().clean();
     }

diff --git a/src/main/java/de/eitco/cicd/dotnet/DotnetExecutor.java b/src/main/java/de/eitco/cicd/dotnet/DotnetExecutor.java
@@ -16,7 +16,7 @@ public record DotnetExecutor(
         File workingDirectory,
         File executable,
         File targetDirectory,
-        Log log,
+        String version, Log log,
         boolean ignoreResult
 ) {
 
@@ -126,7 +126,7 @@ private void retry(int times, List<String> parameters) throws MojoExecutionExcep
         execute(defaultOptions(), parameters, Set.of());
     }
 
-    public void build(String version, String assemblyVersion, String vendor, String configuration) throws MojoExecutionException {
+    public void build(String assemblyVersion, String vendor, String configuration) throws MojoExecutionException {
 
         List<String> parameters = new ArrayList<>(List.of("build", "-p:Version=" + version));
 
@@ -145,7 +145,7 @@ public void build(String version, String assemblyVersion, String vendor, String
         retry(1, parameters);
     }
 
-    public void pack(String version, String vendor, String description, String repositoryUrl) throws MojoExecutionException {
+    public void pack(String vendor, String description, String repositoryUrl) throws MojoExecutionException {
 
         List<String> parameters = new ArrayList<>(List.of(
                 "pack",
@@ -235,6 +235,6 @@ private static void appendCredentials(String username, String apiToken, List<Str
 
     public void clean() throws MojoExecutionException {
 
-        execute("clean");
+        execute("clean", "-p:Version=" + version);
     }
 }
diff --git a/src/main/java/de/eitco/cicd/dotnet/PackMojo.java b/src/main/java/de/eitco/cicd/dotnet/PackMojo.java
@@ -18,6 +18,6 @@ public class PackMojo extends AbstractDotnetMojo {
     @Override
     public void execute() throws MojoExecutionException {
 
-        newExecutor().pack(projectVersion, vendor, description, repositoryUrl);
+        newExecutor().pack(vendor, description, repositoryUrl);
     }
 }