feat!: parallel solution merges

GitVersion.yml

@@ -1 +1,4 @@
 mode: mainline
+major-version-bump-message: "(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test)(\\([\\w\\s]*\\))?(!:|:.*\\n\\n.*\\n\\n.*BREAKING.*).*"
+minor-version-bump-message: "(feat)(\\([\\w\\s]*\\))?:"
+patch-version-bump-message: "(build|chore|ci|docs|fix|perf|refactor|revert|style|test)(\\([\\w\\s]*\\))?:(.*\\n\\n.*\\n\\n.*BREAKING.*){0}"

deploy/DevelopmentHub.Deployment.csproj

@@ -27,47 +27,30 @@
     <Copy DestinationFolder="$(OutputPath)PkgFolder" SourceFiles="@(SolutionsToPack)" />
   </Target>
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.2">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.VersionCheckAnalyzer" Version="3.0.0">
+    <PackageReference Include="Microsoft.CodeAnalysis.VersionCheckAnalyzer" Version="3.3.2">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeQuality.Analyzers" Version="3.0.0">
+    <PackageReference Include="Microsoft.CodeQuality.Analyzers" Version="3.3.2">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.CrmSdk.CoreAssemblies" Version="9.0.2.29">
+    <PackageReference Include="Microsoft.CrmSdk.CoreAssemblies" Version="9.0.2.42"/>
+    <PackageReference Include="Microsoft.CrmSdk.Deployment" Version="9.0.2.34"/>
+    <PackageReference Include="Microsoft.CrmSdk.Workflow" Version="9.0.2.42"/>
+    <PackageReference Include="Microsoft.CrmSdk.XrmTooling.CoreAssembly" Version="9.1.0.92"/>
+    <PackageReference Include="Microsoft.CrmSdk.XrmTooling.PackageDeployment" Version="9.1.0.90"/>
+    <PackageReference Include="Microsoft.NetCore.Analyzers" Version="3.3.2">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.CrmSdk.Deployment" Version="9.0.2.29">
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.CrmSdk.Workflow" Version="9.0.2.28">
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.CrmSdk.XrmTooling.CoreAssembly" Version="9.1.0.68">
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.CrmSdk.XrmTooling.PackageDeployment" Version="9.1.0.46">
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="3.19.8">
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.NetCore.Analyzers" Version="3.0.0">
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.NetFramework.Analyzers" Version="3.0.0">
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.20" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3">
+    <PackageReference Include="Microsoft.NetFramework.Analyzers" Version="3.3.2">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Capgemini.PowerApps.PackageDeployerTemplate" Version="0.2.4" />
+    <PackageReference Include="Capgemini.PowerApps.PackageDeployerTemplate" Version="0.3.19" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="PresentationFramework" />

deploy/PackageTemplate.cs

@@ -2,7 +2,11 @@ namespace DevelopmentHub.Deployment
 {
     using System;
     using System.ComponentModel.Composition;
+    using System.Diagnostics;
+    using System.ServiceModel;
     using Capgemini.PowerApps.PackageDeployerTemplate;
+    using Microsoft.Xrm.Sdk;
+    using Microsoft.Xrm.Sdk.Query;
     using Microsoft.Xrm.Tooling.PackageDeployment.CrmPackageExtentionBase;
 
     /// <summary>
@@ -15,7 +19,6 @@ public class PackageTemplate : PackageTemplateBase
         private string azureDevOpsOrganisation;
         private string solutionPublisherPrefix;
         private string azureDevOpsConnectionName;
-        private string approvalsConnectionName;
         private EnvironmentVariableDeploymentService environmentVariableDeploymentSvc;
 
         /// <inheritdoc/>
@@ -91,22 +94,6 @@ protected string AzureDevOpsConnectionName
             }
         }
 
-        /// <summary>
-        /// Gets a value for the approvals connection name used for the Development Hub (if found).
-        /// </summary>
-        protected string ApprovalsConnectionName
-        {
-            get
-            {
-                if (string.IsNullOrEmpty(this.approvalsConnectionName))
-                {
-                    this.approvalsConnectionName = this.GetSetting<string>(nameof(this.ApprovalsConnectionName));
-                }
-
-                return this.approvalsConnectionName;
-            }
-        }
-
         /// <summary>
         /// Gets an <see cref="EnvironmentVariableDeploymentSvc"/>.
         /// </summary>
@@ -131,6 +118,33 @@ public override bool AfterPrimaryImport()
             return base.AfterPrimaryImport();
         }
 
+        /// <inheritdoc/>
+        public override void RunSolutionUpgradeMigrationStep(string solutionName, string oldVersion, string newVersion, Guid oldSolutionId, Guid newSolutionId)
+        {
+            if (string.IsNullOrEmpty(solutionName))
+            {
+                throw new ArgumentException($"'{nameof(solutionName)}' cannot be null or empty", nameof(solutionName));
+            }
+
+            if (string.IsNullOrEmpty(oldVersion))
+            {
+                throw new ArgumentException($"'{nameof(oldVersion)}' cannot be null or empty", nameof(oldVersion));
+            }
+
+            if (string.IsNullOrEmpty(newVersion))
+            {
+                throw new ArgumentException($"'{nameof(newVersion)}' cannot be null or empty", nameof(newVersion));
+            }
+
+            base.RunSolutionUpgradeMigrationStep(solutionName, oldVersion, newVersion, oldSolutionId, newSolutionId);
+
+            if (solutionName == "devhub_DevelopmentHub_Develop" && oldVersion.StartsWith("0.2", StringComparison.OrdinalIgnoreCase))
+            {
+                this.DefaultEnvironmentLifetimes();
+                this.DefaultMergeStrategies();
+            }
+        }
+
         /// <inheritdoc/>
         public override string GetNameOfImport(bool plural) => "Development Hub";
 
@@ -145,6 +159,80 @@ public override UserRequestedImportAction OverrideSolutionImportDecision(string
             return base.OverrideSolutionImportDecision(solutionUniqueName, organizationVersion, packageSolutionVersion, inboundSolutionVersion, deployedSolutionVersion, systemSelectedImportAction);
         }
 
+        private void DefaultEnvironmentLifetimes()
+        {
+            this.PackageLog.Log("Default existing environment lifetimes to 'Static'.");
+
+            var environmentQuery = new QueryByAttribute("devhub_environment");
+            environmentQuery.AddAttributeValue("devhub_lifetime", null);
+
+            var environments = this.CrmServiceAdapter.RetrieveMultiple(environmentQuery);
+            this.PackageLog.Log($"Found {environments.Entities.Count} environments to update.");
+
+            foreach (var environment in environments.Entities)
+            {
+                this.PackageLog.Log($"Updating environment {environment.Id}.");
+
+                environment.Attributes.Add("devhub_lifetime", new OptionSetValue(353400000) /*Static*/);
+                try
+                {
+                    this.CrmSvc.Update(environment);
+                }
+                catch (FaultException<OrganizationServiceFault> ex)
+                {
+                    this.PackageLog.Log($"Failed to update environment {environment.Id}.", TraceEventType.Error, ex);
+                }
+            }
+        }
+
+        private void DefaultMergeStrategies()
+        {
+            this.PackageLog.Log("Default existing solutions to a merge strategy of 'Sequential'.");
+
+            var solutionQuery = new QueryByAttribute("devhub_solution");
+            solutionQuery.AddAttributeValue("devhub_mergestrategy", null);
+            solutionQuery.ColumnSet = new ColumnSet("devhub_stagingenvironment");
+
+            var solutions = this.CrmServiceAdapter.RetrieveMultiple(solutionQuery);
+            this.PackageLog.Log($"Found {solutions.Entities.Count} solutions to update.");
+
+            foreach (var solution in solutions.Entities)
+            {
+                this.PackageLog.Log($"Updating solution {solution.Id}.");
+                solution.Attributes.Add("devhub_mergestrategy", new OptionSetValue(353400000) /*Sequential*/);
+
+                try
+                {
+                    this.CrmSvc.Update(solution);
+                }
+                catch (FaultException<OrganizationServiceFault> ex)
+                {
+                    this.PackageLog.Log($"Failed to update solution {solution.Id}.", TraceEventType.Error, ex);
+                }
+
+                this.PackageLog.Log("Getting solution merges for solution.");
+
+                var solutionMergeQuery = new QueryByAttribute("devhub_solutionmerge");
+                solutionMergeQuery.AddAttributeValue("devhub_targetsolution", solution.Id);
+                var solutionMerges = this.CrmServiceAdapter.RetrieveMultiple(solutionMergeQuery);
+
+                foreach (var solutionMerge in solutionMerges.Entities)
+                {
+                    solutionMerge.Attributes.Add("devhub_environment", solution["devhub_stagingenvironment"]);
+                    solutionMerge.Attributes.Add("devhub_mergestrategy", new OptionSetValue(353400000) /*Sequential*/);
+
+                    try
+                    {
+                        this.CrmSvc.Update(solutionMerge);
+                    }
+                    catch (FaultException<OrganizationServiceFault> ex)
+                    {
+                        this.PackageLog.Log($"Failed to update solution merge {solutionMerge.Id}.", TraceEventType.Error, ex);
+                    }
+                }
+            }
+        }
+
         private void SetDevelopmentHubEnvironmentVariables()
         {
             this.EnvironmentVariableDeploymentSvc.SetEnvironmentVariable("devhub_AzureDevOpsOrganization", this.AzureDevOpsOrganisation);