Merge pull request #1036 from WildGums/GitHubSync/20260717-203133

GitHubSync update

Author: GeertvanHorrik

deployment/cake/docker-tasks.cake

@@ -37,8 +37,29 @@ public class DockerImagesProcessor : ProcessorBase
 
     private string GetDockerImageName(string projectName)
     {
-        var name = projectName.Replace(".", "-");
-        return name.ToLower();
+        var imageName = string.Empty;
+
+        var appName = BuildContext.DockerImages.DockerAppName;
+        if (!string.IsNullOrWhiteSpace(appName))
+        {
+            imageName = appName.ToLower() + "/";
+
+            if (projectName.StartsWith(appName, StringComparison.OrdinalIgnoreCase))
+            {
+                projectName = projectName.Substring(appName.Length);
+            }
+        }
+
+        projectName = projectName.Trim('.', '-');
+
+        imageName += projectName.Replace(".", "-");
+
+        if (imageName.EndsWith("service", StringComparison.OrdinalIgnoreCase))
+        {
+            imageName = imageName.Substring(0, imageName.Length - "service".Length);
+        }
+
+        return imageName.ToLower();
     }
 
     private string GetDockerImageTag(string projectName, string version)

deployment/cake/docker-variables.cake

@@ -13,6 +13,7 @@ public class DockerImagesContext : BuildContextWithItemsBase
     public string DockerRegistryUrl { get; set; }
     public string DockerRegistryUserName { get; set; }
     public string DockerRegistryPassword { get; set; }
+    public string DockerAppName { get; set; } = string.Empty;
 
     protected override void ValidateContext()
     {
@@ -34,7 +35,8 @@ private DockerImagesContext InitializeDockerImagesContext(BuildContext buildCont
         DockerEngineUrl = buildContext.BuildServer.GetVariable("DockerEngineUrl", showValue: true),
         DockerRegistryUrl = buildContext.BuildServer.GetVariable("DockerRegistryUrl", showValue: true),
         DockerRegistryUserName = buildContext.BuildServer.GetVariable("DockerRegistryUserName", showValue: false),
-        DockerRegistryPassword = buildContext.BuildServer.GetVariable("DockerRegistryPassword", showValue: false)
+        DockerRegistryPassword = buildContext.BuildServer.GetVariable("DockerRegistryPassword", showValue: false),
+        DockerAppName = buildContext.BuildServer.GetVariable("DockerAppName", showValue: true)
     };
 
     return data;

deployment/cake/generic-tasks.cake

@@ -113,7 +113,7 @@ Task("UpdateNuGet")
 
 //-------------------------------------------------------------
 
-Task("RestorePackages")
+Task("RestorePackagesForBuild")
     .IsDependentOn("Prepare")
     .IsDependentOn("UpdateNuGet")
     .ContinueOnError()
@@ -179,6 +179,94 @@ Task("RestorePackages")
 
 //-------------------------------------------------------------
 
+Task("RestorePackagesForPackage")
+    .IsDependentOn("Prepare")
+    .IsDependentOn("UpdateNuGet")
+    .ContinueOnError()
+    .Does<BuildContext>(buildContext =>
+{
+    if (buildContext.General.IsLocalBuild && buildContext.General.MaximizePerformance)
+    {
+        Information("Local build with maximized performance detected, skipping package restore");
+        return;
+    }
+
+    var csharpProjects = new List<FilePath>();
+
+    foreach (var project in buildContext.AllProjects)
+    {
+        if (!ShouldPackageProject(buildContext, project) ||
+            IsTestProject(buildContext, project))
+        {
+            continue;
+        }
+
+        var projectFileName = GetProjectFileName(buildContext, project);
+        if (projectFileName.EndsWith(".csproj"))
+        {
+            Information("Adding '{0}' as C# specific project to restore", project);
+
+            csharpProjects.Add(projectFileName);
+        }
+    }
+
+    var allFiles = new List<FilePath>();
+    allFiles.AddRange(csharpProjects);
+
+	Information($"Found '{allFiles.Count}' projects to restore");
+
+    foreach (var file in allFiles)
+    {
+        RestoreNuGetPackages(buildContext, file);
+    }
+});
+
+//-------------------------------------------------------------
+
+Task("RestorePackagesForDeploy")
+    .IsDependentOn("Prepare")
+    .IsDependentOn("UpdateNuGet")
+    .ContinueOnError()
+    .Does<BuildContext>(buildContext =>
+{
+    if (buildContext.General.IsLocalBuild && buildContext.General.MaximizePerformance)
+    {
+        Information("Local build with maximized performance detected, skipping package restore");
+        return;
+    }
+
+    var csharpProjects = new List<FilePath>();
+
+    foreach (var project in buildContext.AllProjects)
+    {
+        if (!ShouldDeployProject(buildContext, project) ||
+            IsTestProject(buildContext, project))
+        {
+            continue;
+        }
+
+        var projectFileName = GetProjectFileName(buildContext, project);
+        if (projectFileName.EndsWith(".csproj"))
+        {
+            Information("Adding '{0}' as C# specific project to restore", project);
+
+            csharpProjects.Add(projectFileName);
+        }
+    }
+
+    var allFiles = new List<FilePath>();
+    allFiles.AddRange(csharpProjects);
+
+	Information($"Found '{allFiles.Count}' projects to restore");
+
+    foreach (var file in allFiles)
+    {
+        RestoreNuGetPackages(buildContext, file);
+    }
+});
+
+//-------------------------------------------------------------
+
 // Note: it might look weird that this is dependent on restore packages,
 // but to clean, the msbuild projects must be able to load. However, they need
 // some targets files that come in via packages

deployment/cake/tasks.cake

@@ -347,7 +347,7 @@ Task("UpdateInfo")
 
 Task("Build")
     .IsDependentOn("Clean")
-    .IsDependentOn("RestorePackages")
+    .IsDependentOn("RestorePackagesForBuild")
     .IsDependentOn("UpdateInfo")
     //.IsDependentOn("VerifyDependencies")
     .IsDependentOn("CleanupCode")
@@ -624,7 +624,7 @@ Task("Package")
     .IsDependentOn("UpdateInfo")
     // Note: no dependency on 'build' since we might have already built the solution
     // Make sure we have the temporary "project.assets.json" in case we need to package with Visual Studio
-    .IsDependentOn("RestorePackages")
+    .IsDependentOn("RestorePackagesForPackage")
     // Make sure to update if we are running on a new agent so we can sign nuget packages
     .IsDependentOn("UpdateNuGet")
     .IsDependentOn("CodeSign")
@@ -689,7 +689,7 @@ Task("PackageLocal")
 Task("Deploy")
     // Note: no dependency on 'package' since we might have already packaged the solution
     // Make sure we have the temporary "project.assets.json" in case we need to package with Visual Studio
-    .IsDependentOn("RestorePackages")
+    .IsDependentOn("RestorePackagesForDeploy")
     .Does<BuildContext>(async buildContext =>
 {
     await buildContext.BuildServer.BeforeDeployAsync();