Reintroduce the AzureWebApp netcoreshim

build/Build.cs

@@ -3,10 +3,8 @@
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
-using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-using Calamari.ConsolidateCalamariPackages;
 using NuGet.Packaging;
 using Nuke.Common;
 using Nuke.Common.CI.TeamCity;
@@ -17,6 +15,7 @@
 using Nuke.Common.Tools.GitVersion;
 using Nuke.Common.Tools.NuGet;
 using Nuke.Common.Utilities.Collections;
+using Octopus.Calamari.ConsolidatedPackage;
 using Serilog;
 using static Nuke.Common.IO.FileSystemTasks;
 using static Nuke.Common.Tools.DotNet.DotNetTasks;
@@ -112,7 +111,7 @@ public Build()
         static AbsolutePath LocalPackagesDirectory => RootDirectory / "../LocalPackages";
         static AbsolutePath ConsolidateCalamariPackagesProject => SourceDirectory / "Calamari.ConsolidateCalamariPackages.Tests" / "Calamari.ConsolidateCalamariPackages.Tests.csproj";
         static AbsolutePath ConsolidatedPackageDirectory => ArtifactsDirectory / "consolidated";
-        static AbsolutePath LegacyCalamariDirectory = PublishDirectory / "Calamari.Legacy";
+        static AbsolutePath LegacyCalamariDirectory => PublishDirectory / "Calamari.Legacy";
 
         Lazy<string> NugetVersion { get; }
 
@@ -189,6 +188,7 @@ public Build()
 
         Target Publish =>
             _ => _.DependsOn(Compile)
+                  .DependsOn(PublishAzureWebAppNetCoreShim)
                   .Executes(() =>
                             {
                                 if (!OperatingSystem.IsWindows())
@@ -329,11 +329,10 @@ void PublishPackage(CalamariPackageMetadata calamariPackageMetadata)
             }
 
             File.Copy(RootDirectory / "global.json", outputDirectory / "global.json");
-
         }
-
-        static void StageLegacyCalamariAssemblies(CalamariPackageMetadata[] packagesToPublish) {
 
+        static void StageLegacyCalamariAssemblies(CalamariPackageMetadata[] packagesToPublish)
+        {
             if (!OperatingSystem.IsWindows())
             {
                 Log.Warning($"Skipping the bundling of Calamari projects into the Calamari.Legacy bundle. "
@@ -367,6 +366,33 @@ void CompressCalamariProject(Project project)
             ProjectCompressionTasks.Add(compressionTask);
         }
 
+        Target PublishAzureWebAppNetCoreShim =>
+            _ => _.DependsOn(Compile)
+                  .Executes(() =>
+                            {
+                                if (!OperatingSystem.IsWindows())
+                                {
+                                    Log.Warning("Unable to build Calamari.AzureWebApp.NetCoreShim as it's a Full Framework application and can only be compiled on Windows");
+                                    return;
+                                }
+
+                                var project = Solution.GetProject("Calamari.AzureWebApp.NetCoreShim");
+
+                                var outputPath = PublishDirectory / project.Name;
+
+                                DotNetPublish(s => s
+                                                   .SetConfiguration(Configuration)
+                                                   .SetProject(project.Path)
+                                                   .SetFramework(Frameworks.Net462)
+                                                   .EnableNoBuild()
+                                                   .SetOutput(outputPath));
+
+                                var archivePath = SourceDirectory / "Calamari.AzureWebApp" / "netcoreshim" / "netcoreshim.zip";
+                                archivePath.DeleteFile();
+
+                                outputPath.CompressTo(archivePath);
+                            });
+
         Target PackLegacyCalamari =>
             _ => _.DependsOn(Publish)
                   .DependsOn(PublishCalamariFlavourProjects)
@@ -376,6 +402,7 @@ void CompressCalamariProject(Project project)
                                 {
                                     return;
                                 }
+
                                 Log.Verbose($"Compressing Calamari.Legacy");
                                 LegacyCalamariDirectory.ZipTo(ArtifactsDirectory / $"Calamari.Legacy.{NugetVersion.Value}.zip");
                             });
@@ -419,6 +446,12 @@ void CompressCalamariProject(Project project)
                                 foreach (var project in commonProjects)
                                     packageActions.Add(() => SignAndPack(project.ToString(), dotNetCorePackSettings));
 
+                                // Pack the Consolidation Library
+                                var consolidateCalamariPackagesProjectName = "Calamari.ConsolidateCalamariPackages";
+                                var consolidationCalamariProject = Solution.Projects.First(project => project.Name == consolidateCalamariPackagesProjectName);
+                                packageActions.Add(() => SignAndPack(consolidationCalamariProject, dotNetCorePackSettings));
+
+
                                 var sourceProjectPath =
                                     SourceDirectory / "Calamari.CloudAccounts" / "Calamari.CloudAccounts.csproj";
                                 packageActions.Add(() => SignAndPack(sourceProjectPath,
@@ -609,7 +642,8 @@ AbsolutePath DoPublish(string project, string framework, string version, string?
                                 .SetVersion(NugetVersion.Value)
                                 .SetVerbosity(BuildVerbosity)
                                 .SetRuntime(runtimeId)
-                                .SetVersion(version));
+                                .SetVersion(version)
+                                .EnableSelfContained());
 
             if (WillSignBinaries)
                 Signing.SignAndTimestampBinaries(publishedTo, AzureKeyVaultUrl, AzureKeyVaultAppId,
@@ -685,8 +719,8 @@ void DoPackage(string project, string framework, string version, string? runtime
         void SetOctopusServerCalamariVersion(string projectFile)
         {
             var text = File.ReadAllText(projectFile);
-            text = Regex.Replace(text, @"<PackageReference Include=""Calamari.Consolidated"" Version=""([\S])+""",
-                                 $"<PackageReference Include=\"Calamari.Consolidated\" Version=\"{NugetVersion.Value}\"");
+            text = Regex.Replace(text, @"<PackageReference Include=""Calamari.Consolidated"" Version=""([\S])+"" />",
+                                 $"<PackageReference Include=\"Calamari.Consolidated\" Version=\"{NugetVersion.Value}\" />");
             File.WriteAllText(projectFile, text);
         }
 
@@ -711,11 +745,7 @@ IReadOnlyCollection<string> GetRuntimeIdentifiers(Project? project)
             return runtimes ?? Array.Empty<string>();
         }
 
-        static List<string> GetCalamariFlavours()
-        {
-            return IsLocalBuild && !OperatingSystem.IsWindows()
-                ? MigratedCalamariFlavours.CrossPlatformFlavours
-                : MigratedCalamariFlavours.Flavours;
-        }
+        //All libraries/flavours now support .NET Core
+        static List<string> GetCalamariFlavours() => CalamariPackages.Flavours;
     }
-}
+}

source/Calamari.AzureAppService/Json/AppSettings.cs → source/Calamari.Azure/AppServices/AppSettings.cs

@@ -1,11 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
 
-namespace Calamari.AzureAppService.Json
+namespace Calamari.Azure.AppServices
 {
     public class AppSetting
     {
@@ -14,7 +9,7 @@ public class AppSetting
 
         public bool SlotSetting { get; set; }
 
-        internal void Deconstruct(out string name, out string value, out bool isSlotSetting)
+        public void Deconstruct(out string name, out string value, out bool isSlotSetting)
         {
             name = Name;
             value = Value;

source/Calamari.AzureAppService/Azure/AzureTargetSite.cs → source/Calamari.Azure/AppServices/AzureTargetSite.cs

@@ -1,9 +1,13 @@
-using System;
+#nullable enable
+using System;
 using Azure.Core;
 using Azure.ResourceManager.AppService;
+using Calamari.CloudAccounts;
+using Calamari.Common.Plumbing.Logging;
+using Calamari.Common.Plumbing.Variables;
+using Microsoft.Azure.Management.Fluent;
 
-#nullable enable
-namespace Calamari.AzureAppService.Azure
+namespace Calamari.Azure.AppServices
 {
     public class AzureTargetSite
     {
@@ -64,12 +68,33 @@ public ResourceIdentifier CreateResourceIdentifier()
                 ? WebSiteSlotResource.CreateResourceIdentifier(SubscriptionId, ResourceGroupName, Site, Slot)
                 : CreateWebSiteResourceIdentifier();
         }
+
         /// <summary>
         /// Creates a new <see cref="ResourceIdentifier"/> for the root <see cref="WebSiteSlotResource"/>, even if this is targeting a slot.
         /// </summary>
         /// <returns></returns>
         public ResourceIdentifier CreateWebSiteResourceIdentifier()
             => WebSiteResource.CreateResourceIdentifier(SubscriptionId, ResourceGroupName, Site);
+
+        public static AzureTargetSite Create(IAzureAccount account, IVariables variables, ILog? log = null, bool allowEmptyResourceGroupName = false)
+        {
+            var resourceGroupName = variables.Get(AzureVariables.Action.Azure.ResourceGroupName);
+            if (!allowEmptyResourceGroupName && string.IsNullOrEmpty(resourceGroupName))
+                throw new Exception("resource group name must be specified");
+            log?.Verbose($"Using Azure Resource Group '{resourceGroupName}'.");
+
+            var webAppName = variables.Get(AzureVariables.Action.Azure.WebAppName);
+            if (string.IsNullOrEmpty(webAppName))
+                throw new Exception("Web App Name must be specified");
+            log?.Verbose($"Using App Service Name '{webAppName}'.");
+
+            var slotName = variables.Get(AzureVariables.Action.Azure.WebAppSlot);
+            log?.Verbose(string.IsNullOrEmpty(slotName)
+                             ? "No Deployment Slot specified"
+                             : $"Using Deployment Slot '{slotName}'");
+
+            return new AzureTargetSite(account.SubscriptionNumber, resourceGroupName, webAppName, slotName);
+        }
     }
 }
 #nullable restore

source/Calamari.AzureAppService/Json/ConnectionStringsSetting.cs → source/Calamari.Azure/AppServices/ConnectionStringsSetting.cs

@@ -1,7 +1,7 @@
 using System;
 using Azure.ResourceManager.AppService.Models;
 
-namespace Calamari.AzureAppService.Json
+namespace Calamari.Azure.AppServices
 {
     public class ConnectionStringSetting
     {

source/Calamari.AzureAppService/ArmClientExtensions.cs → source/Calamari.Azure/ArmClientExtensions.cs

@@ -1,16 +1,16 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Azure;
 using Azure.ResourceManager;
 using Azure.ResourceManager.AppService;
 using Azure.ResourceManager.AppService.Models;
-using Calamari.AzureAppService.Azure;
-using Calamari.AzureAppService.Json;
+using Calamari.Azure.AppServices;
 using Octopus.CoreUtilities.Extensions;
 
-namespace Calamari.AzureAppService
+namespace Calamari.Azure
 {
     ///<summary>
     /// Provides a set of static methods for interacting with an <see cref="ArmClient"/> using an <see cref="AzureTargetSite"/>.

source/Calamari.Azure/AzureAccountExtensionMethods.cs

@@ -0,0 +1,13 @@
+using Calamari.CloudAccounts;
+using Calamari.Common.Plumbing.Variables;
+
+namespace Calamari.Azure
+{
+    public static class AzureAccountExtensionMethods
+    {
+        public static bool HasAzureAccountJwt(this IVariables variables)
+        {
+            return !string.IsNullOrEmpty(variables.Get(AzureAccountVariables.OpenIDJwt));
+        }
+    }
+}

source/Calamari.Azure/AzureVariables.cs

@@ -0,0 +1,25 @@
+namespace Calamari.Azure
+{
+    public static class AzureVariables
+    {
+        public static class Action
+        {
+            public static class Azure
+            {
+                /// <summary>
+                /// Expected Values:
+                /// Package,
+                /// Container,
+                /// </summary>
+                public static readonly string DeploymentType = "Octopus.Action.Azure.DeploymentType";
+
+                public static readonly string ResourceGroupName = "Octopus.Action.Azure.ResourceGroupName";
+                public static readonly string WebAppName = "Octopus.Action.Azure.WebAppName";
+                public static readonly string WebAppSlot = "Octopus.Action.Azure.DeploymentSlot";
+                public static readonly string AppSettings = "Octopus.Action.Azure.AppSettings";
+                public static readonly string ConnectionStrings = "Octopus.Action.Azure.ConnectionStrings";
+                public static readonly string AsyncZipDeploymentTimeout = "Octopus.Action.Azure.AsyncZipDeploymentTimeout";
+            }
+        }
+    }
+}

source/Calamari.Azure/Calamari.Azure.csproj

@@ -12,6 +12,7 @@
     <ItemGroup>
         <PackageReference Include="Azure.Identity" Version="1.13.1" />
         <PackageReference Include="Azure.ResourceManager" Version="1.11.0" />
+        <PackageReference Include="Azure.ResourceManager.AppService" Version="1.0.2" />
     </ItemGroup>
     <ItemGroup>
       <ProjectReference Include="..\Calamari.CloudAccounts\Calamari.CloudAccounts.csproj" />

source/Calamari.AzureAppService.Tests/AppServiceIntegrationTest.cs

@@ -12,6 +12,7 @@
 using Azure.ResourceManager.AppService.Models;
 using Azure.ResourceManager.Resources;
 using Calamari.Azure;
+using Calamari.Azure.AppServices;
 using Calamari.AzureAppService.Azure;
 using Calamari.AzureAppService.Json;
 using Calamari.CloudAccounts;
@@ -97,7 +98,8 @@ public async Task Setup()
                                                               // We keep them for 14 days just in case we need to do debugging/investigation
                                                               ["LifetimeInDays"] = "14"
                                                           }
-                                                      });
+                                                      },
+                                                      cancellationToken);
 
             ResourceGroupResource = response.Value;
 
@@ -110,7 +112,7 @@ public async Task Setup()
         public virtual async Task Cleanup()
         {
             await ArmClient.GetResourceGroupResource(ResourceGroupResource.CreateResourceIdentifier(SubscriptionId, ResourceGroupName))
-                           .DeleteAsync(WaitUntil.Started);
+                           .DeleteAsync(WaitUntil.Started, cancellationToken: cancellationToken);
         }
 
         protected async Task AssertContent(string hostName, string actualText, string rootPath = null)

source/Calamari.AzureAppService.Tests/AppServiceSettingsBehaviourFixture.cs

@@ -5,6 +5,8 @@
 using Azure;
 using Azure.ResourceManager.AppService.Models;
 using Azure.ResourceManager.Resources;
+using Calamari.Azure;
+using Calamari.Azure.AppServices;
 using Calamari.AzureAppService.Azure;
 using Calamari.AzureAppService.Behaviors;
 using Calamari.AzureAppService.Json;

source/Calamari.AzureAppService.Tests/AzureAppServiceDeployContainerBehaviourFixture.cs

@@ -7,10 +7,13 @@
 using Azure.ResourceManager.AppService;
 using Azure.ResourceManager.AppService.Models;
 using Azure.ResourceManager.Resources;
+using Calamari.Azure;
+using Calamari.Azure.AppServices;
 using Calamari.AzureAppService.Azure;
 using Calamari.AzureAppService.Behaviors;
 using Calamari.Common.Commands;
 using Calamari.Common.Plumbing.Variables;
+using Calamari.Testing;
 using Calamari.Testing.Helpers;
 using FluentAssertions;
 using NUnit.Framework;

source/Calamari.AzureAppService/Behaviors/AzureAppServiceAppSettingsBehaviour.cs

@@ -7,6 +7,7 @@
 using Azure.ResourceManager;
 using Azure.ResourceManager.AppService.Models;
 using Calamari.Azure;
+using Calamari.Azure.AppServices;
 using Calamari.AzureAppService.Azure;
 using Calamari.AzureAppService.Json;
 using Calamari.CloudAccounts;

source/Calamari.AzureAppService/Behaviors/AzureAppServiceContainerDeployBehaviour.cs

@@ -3,6 +3,7 @@
 using Azure.ResourceManager;
 using Azure.ResourceManager.AppService;
 using Calamari.Azure;
+using Calamari.Azure.AppServices;
 using Calamari.AzureAppService.Azure;
 using Calamari.CloudAccounts;
 using Calamari.Common.Commands;

source/Calamari.AzureAppService/Behaviors/AzureAppServiceZipDeployBehaviour.cs

@@ -14,6 +14,7 @@
 using Azure.ResourceManager.AppService;
 using Azure.ResourceManager.Resources;
 using Calamari.Azure;
+using Calamari.Azure.AppServices;
 using Calamari.AzureAppService.Azure;
 using Calamari.CloudAccounts;
 using Calamari.Common.Commands;

source/Calamari.AzureAppService/Behaviors/RestartAzureWebAppBehaviour.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using Calamari.Azure;
+using Calamari.Azure.AppServices;
 using Calamari.AzureAppService.Azure;
 using Calamari.CloudAccounts;
 using Calamari.Common.Commands;

source/Calamari.AzureAppService/Json/SlotSettingsNames.cs

@@ -1,9 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
 
 /*
  * JSON format