Release and Prerelease artifact paths seperated

Blind-Striker · Oct 9, 2019 · 0f4b593 · 0f4b593
1 parent cb93fd6
commit 0f4b593
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 10 deletions.
diff --git a/build.cake b/build.cake
@@ -9,7 +9,9 @@ var packProject = Argument<string>("packProject", "all");
 
 // Variables
 var royaleNugetOutput = "./artifacts/Pekka.RoyaleApi.Client";
+var royaleNugetOutputPre = "./artifacts/Pekka.RoyaleApi.Client-Pre";
 var clashRoyaleNugetOutput = "./artifacts/Pekka.ClashRoyaleApi.Client";
+var clashRoyaleNugetOutputPre = "./artifacts/Pekka.ClashRoyaleApi.Client-Pre";
 
 var testResults = "results.trx";
 
@@ -100,20 +102,20 @@ Task("nuget-pack")
         if(packProject == "royale")
         {
             NugetPack(royaleApiPath, royaleApiCsProjPath, royaleNugetOutput, false);
-            NugetPack(royaleApiPath, royaleApiCsProjPath, royaleNugetOutput, true);
+            NugetPack(royaleApiPath, royaleApiCsProjPath, royaleNugetOutputPre, true);
         }
         else if (packProject == "clash")
         {
             NugetPack(clashRoyaleApiPath, clashRoyaleApiCsProjPath , clashRoyaleNugetOutput, false);
-            NugetPack(clashRoyaleApiPath, clashRoyaleApiCsProjPath , clashRoyaleNugetOutput, true);
+            NugetPack(clashRoyaleApiPath, clashRoyaleApiCsProjPath , clashRoyaleNugetOutputPre, true);
         }
         else
         {
             NugetPack(royaleApiPath, royaleApiCsProjPath, royaleNugetOutput, false);
-            NugetPack(royaleApiPath, royaleApiCsProjPath, royaleNugetOutput, true);
+            NugetPack(royaleApiPath, royaleApiCsProjPath, royaleNugetOutputPre, true);
 
             NugetPack(clashRoyaleApiPath, clashRoyaleApiCsProjPath , clashRoyaleNugetOutput, false);
-            NugetPack(clashRoyaleApiPath, clashRoyaleApiCsProjPath , clashRoyaleNugetOutput, true);
+            NugetPack(clashRoyaleApiPath, clashRoyaleApiCsProjPath , clashRoyaleNugetOutputPre, true);
         }
     });
 
@@ -145,7 +147,7 @@ private void NugetPack(string projectPath, string csProjPath, string outputPath,
 
     var settings = new DotNetCorePackSettings();
     settings.Configuration = configuration;
-    settings.OutputDirectory = royaleNugetOutput;
+    settings.OutputDirectory = outputPath;
     settings.MSBuildSettings = new DotNetCoreMSBuildSettings();
     settings.MSBuildSettings.SetVersion(GetProjectVersion(csProjPath, !packBeta));
 

diff --git a/build/azure-pipelines.clash.artifact.yml b/build/azure-pipelines.clash.artifact.yml
@@ -38,5 +38,11 @@ steps:
   - task: PublishBuildArtifacts@1
     displayName: "Publish Artifact: Pekka.ClashRoyaleApi.Client"
     inputs:
-      PathtoPublish: artifacts/
-      ArtifactName: Pekka.ClashRoyaleApi.Client
+      PathtoPublish: artifacts/Pekka.ClashRoyaleApi.Client
+      ArtifactName: Pekka.ClashRoyaleApi.Client
+
+  - task: PublishBuildArtifacts@1
+    displayName: "Publish Artifact: Pekka.RoyaleApi.Client Pre Release"
+    inputs:
+      PathtoPublish: artifacts/Pekka.ClashRoyaleApi.Client-Pre
+      ArtifactName: Pekka.ClashRoyaleApi.Client-Pre
diff --git a/build/azure-pipelines.royale.artifact.yml b/build/azure-pipelines.royale.artifact.yml
@@ -13,7 +13,7 @@ pr: none
 pool:
   vmImage: ubuntu-16.04
 variables:
-  Version.MajorMinor: 3.0.0
+  Version.MajorMinor: 3.0.1
   Version.Revision: $[counter(variables['Version.MajorMinor'], 0)]
 steps:
   - bash: "sudo apt install nuget && mkdir ./testrunner && sudo chmod -R 777 ./testrunner && ls"
@@ -38,5 +38,11 @@ steps:
   - task: PublishBuildArtifacts@1
     displayName: "Publish Artifact: Pekka.RoyaleApi.Client"
     inputs:
-      PathtoPublish: artifacts/
-      ArtifactName: Pekka.RoyaleApi.Client
+      PathtoPublish: artifacts/Pekka.RoyaleApi.Client
+      ArtifactName: Pekka.RoyaleApi.Client
+
+  - task: PublishBuildArtifacts@1
+    displayName: "Publish Artifact: Pekka.RoyaleApi.Client Pre Release"
+    inputs:
+      PathtoPublish: artifacts/Pekka.RoyaleApi.Client-Pre
+      ArtifactName: Pekka.RoyaleApi.Client-Pre