More publish

OctopusDeploy · Sep 6, 2024 · f8b3f16 · f8b3f16
1 parent 828c266
commit f8b3f16
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/build/Build.cs b/build/Build.cs
@@ -236,15 +236,22 @@ public Build()
                                 if (OperatingSystem.IsWindows())
                                 {
                                     var path = SourceDirectory / "Calamari.FullFrameworkTools"  / "bin" / Configuration / Frameworks.Net462 ;
-                                    CopyDirectoryRecursively(path, (PublishDirectory / "Calamari"  / Frameworks.Net462  / "Calamari.FullFrameworkTools"), DirectoryExistsPolicy.Merge);
-                                    CopyDirectoryRecursively(path, (PublishDirectory / "Calamari"  / Frameworks.Net60 / "Calamari.FullFrameworkTools"), DirectoryExistsPolicy.Merge);
-
+                                    CopyDirectoryRecursively(path, (PublishDirectory / "Calamari"  / Frameworks.Net462  / "Calamari.FullFrameworkTools"), DirectoryExistsPolicy.Merge, FileExistsPolicy.Overwrite);
+                                    CopyDirectoryRecursively(path, (PublishDirectory / "Calamari"  / Frameworks.Net60 / "Calamari.FullFrameworkTools"), DirectoryExistsPolicy.Merge, FileExistsPolicy.Overwrite);
                                 }
 
                                 // Create the self-contained Calamari packages for each runtime ID defined in Calamari.csproj
-                      foreach (var rid in GetRuntimeIdentifiers(Solution.GetProject(RootProjectName)!)!)
-                          DoPublish(RootProjectName, Frameworks.Net60, nugetVersion, rid);
-                  });
+                                foreach (var rid in GetRuntimeIdentifiers(Solution.GetProject(RootProjectName)!)!)
+                                {
+                                    var publishPath = DoPublish(RootProjectName, Frameworks.Net60, nugetVersion, rid);
+
+                                    if (rid == FixedRuntimes.Windows && OperatingSystem.IsWindows())
+                                    {
+                                        var path = SourceDirectory / "Calamari.FullFrameworkTools" / "bin" / Configuration / Frameworks.Net462;
+                                        CopyDirectoryRecursively(path, (publishPath / "Calamari.FullFrameworkTools"), DirectoryExistsPolicy.Merge, FileExistsPolicy.Overwrite);
+                                    }
+                                }
+                            });
 
         Target PublishCalamariFlavourProjects =>
             _ => _