Remember arguments

rasmus · Nov 15, 2023 · d4b1c7b · d4b1c7b
1 parent 730d748
commit d4b1c7b
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 2 deletions.
diff --git a/Source/Bake/Cooking/Composers/DotNetComposer.cs b/Source/Bake/Cooking/Composers/DotNetComposer.cs
@@ -256,6 +256,7 @@ private IEnumerable<Recipe> CreateRecipe(
                     configuration,
                     Platform.Any,
                     path,
+                    properties,
                     new DirectoryArtifact(
                         Path.Combine(visualStudioProject.Directory, path)));
 
@@ -296,6 +297,7 @@ private IEnumerable<Recipe> CreateRecipe(
                     configuration,
                     targetPlatform,
                     path,
+                    properties,
                     new ExecutableArtifact(
                         visualStudioProject.CsProj.ToolCommandName,
                         Path.Combine(

diff --git a/Source/Bake/Cooking/Cooks/DotNet/DotNetPublishCook.cs b/Source/Bake/Cooking/Cooks/DotNet/DotNetPublishCook.cs
@@ -50,7 +50,8 @@ protected override async Task<bool> CookAsync(
                 recipe.Build,
                 recipe.Configuration,
                 recipe.Platform,
-                recipe.Output);
+                recipe.Output,
+                recipe.Properties);
 
             using var toolResult = await _dotNet.PublishAsync(
                 argument,

diff --git a/Source/Bake/Services/Tools/DotNet.cs b/Source/Bake/Services/Tools/DotNet.cs
@@ -269,6 +269,11 @@ public async Task<IToolResult> PublishAsync(
                     });
             }
 
+            foreach (var (property, value) in argument.Properties)
+            {
+                arguments.Add($"-p:{property}={value.ToMsBuildEscaped()}");
+            }
+
             AddIf(!argument.Build, arguments, "--no-build");
             AddIf(argument.PublishSingleFile, arguments, "-p:PublishSingleFile=true");
             AddIf(argument.SelfContained, arguments, "--self-contained", "true");

diff --git a/Source/Bake/Services/Tools/DotNetArguments/DotNetPublishArgument.cs b/Source/Bake/Services/Tools/DotNetArguments/DotNetPublishArgument.cs
@@ -21,6 +21,7 @@
 // SOFTWARE.
 
 using Bake.ValueObjects;
+using System.Collections.Generic;
 
 namespace Bake.Services.Tools.DotNetArguments
 {
@@ -32,6 +33,7 @@ public class DotNetPublishArgument : DotNetArgument
         public string Configuration { get; }
         public Platform Platform { get; }
         public string Output { get; }
+        public Dictionary<string, string> Properties { get; }
 
         public DotNetPublishArgument(
             string filePath,
@@ -40,7 +42,8 @@ public DotNetPublishArgument(
             bool build,
             string configuration,
             Platform platform,
-            string output)
+            string output,
+            Dictionary<string, string> properties)
             : base(filePath)
         {
             PublishSingleFile = publishSingleFile;

diff --git a/Source/Bake/ValueObjects/Recipes/DotNet/DotNetPublishRecipe.cs b/Source/Bake/ValueObjects/Recipes/DotNet/DotNetPublishRecipe.cs
@@ -21,6 +21,7 @@
 // SOFTWARE.
 
 using System;
+using System.Collections.Generic;
 using Bake.ValueObjects.Artifacts;
 using YamlDotNet.Serialization;
 
@@ -50,6 +51,9 @@ public class DotNetPublishRecipe : Recipe
         [YamlMember]
         public string Output { get; [Obsolete] set; }
 
+        [YamlMember]
+        public Dictionary<string, string> Properties { get; [Obsolete] set; }
+
         [Obsolete]
         public DotNetPublishRecipe() { }
 
@@ -61,6 +65,7 @@ public DotNetPublishRecipe(
             string configuration,
             Platform platform,
             string output,
+            Dictionary<string, string> properties,
             params Artifact[] artifacts)
             : base(artifacts)
         {
@@ -72,6 +77,7 @@ public DotNetPublishRecipe(
             Configuration = configuration;
             Platform = platform;
             Output = output;
+            Properties = properties;
 #pragma warning restore CS0612 // Type or member is obsolete
         }
     }