fix!: manual retry needed if master instance paused (#51)

Includes README updates and significant refactoring to move interaction with master environments from code activities to Power Automate.

BREAKING CHANGE: updating to this version requires you to re-enter app registration details on individual environment records. Plug-in steps with secure configuration will be deleted.

.vscode/tasks.json

@@ -22,7 +22,7 @@
                 "powershell",
                 "-ExecutionPolicy ByPass",
                 "-File build.ps1",
-                "--target packs-solution",
+                "--target pack-solution",
                 "--DataverseSolution ${input:solution}",
                 "--SolutionType ${input:solutionType}"
             ],

build/Build.cs

@@ -1,10 +1,8 @@
-using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text.Json;
-using System.Threading.Tasks;
 using System.Xml.Linq;
 using System.Xml.XPath;
 using Nuke.Common;
@@ -15,10 +13,8 @@
 using Nuke.Common.ProjectModel;
 using Nuke.Common.Tooling;
 using Nuke.Common.Tools.DotNet;
-using Nuke.Common.Tools.GitVersion;
 using Nuke.Common.Tools.Npm;
 using Nuke.Common.Utilities.Collections;
-using static Nuke.Common.EnvironmentInfo;
 using static Nuke.Common.IO.FileSystemTasks;
 using static Nuke.Common.IO.PathConstruction;
 using static Nuke.Common.Tools.DotNet.DotNetTasks;

build/Configuration.cs

@@ -1,6 +1,4 @@
-using System;
 using System.ComponentModel;
-using System.Linq;
 using Nuke.Common.Tooling;
 
 [TypeConverter(typeof(TypeConverter<Configuration>))]

build/SolutionConfiguration.cs

@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-
 /// <summary>
 /// Configuration for a Dataverse solution.
 /// </summary>

deploy/PackageTemplate.cs

@@ -1,14 +1,12 @@
 namespace DevelopmentHub.Deployment
 {
     using System;
-    using System.Collections.Generic;
     using System.ComponentModel.Composition;
     using System.Globalization;
     using System.Linq;
     using Microsoft.Xrm.Sdk.Query;
     using Microsoft.Xrm.Tooling.Connector;
     using Microsoft.Xrm.Tooling.PackageDeployment.CrmPackageExtentionBase;
-    using Newtonsoft.Json;
 
     /// <summary>
     /// Import package starter frame.
@@ -21,8 +19,6 @@ public class PackageTemplate : ImportExtension, IDisposable
         private string azureDevOpsProject;
         private string azureDevOpsExtractBuildDefinitionId;
         private string solutionPublisherPrefix;
-        private Guid? servicePrincipalClientId;
-        private string servicePrincipalClientSecret;
         private string azureDevOpsConnectionName;
         private string approvalsConnectionName;
 
@@ -31,7 +27,6 @@ public class PackageTemplate : ImportExtension, IDisposable
         private SolutionDeploymentService solutionDeploymentSvc;
         private FlowDeploymentService flowDeploymentSvc;
         private EnvironmentVariableDeploymentService environmentVariableDeploymentSvc;
-        private PluginStepDeploymentService pluginStepDeploymentSvc;
 
         /// <inheritdoc/>
         public override string GetImportPackageDataFolderName => "PkgFolder";
@@ -122,38 +117,6 @@ protected string SolutionPublisherPrefix
             }
         }
 
-        /// <summary>
-        /// Gets a value for the service principal ID used for the Development Hub (if found).
-        /// </summary>
-        protected Guid? ServicePrincipalClientId
-        {
-            get
-            {
-                if (!this.servicePrincipalClientId.HasValue && Guid.TryParse(this.GetSetting<string>(nameof(this.ServicePrincipalClientId)), out var guid))
-                {
-                    this.servicePrincipalClientId = guid;
-                }
-
-                return this.servicePrincipalClientId;
-            }
-        }
-
-        /// <summary>
-        /// Gets a value for the service principal client secret used for the Development Hub (if found).
-        /// </summary>
-        protected string ServicePrincipalClientSecret
-        {
-            get
-            {
-                if (string.IsNullOrEmpty(this.servicePrincipalClientSecret))
-                {
-                    this.servicePrincipalClientSecret = this.GetSetting<string>(nameof(this.ServicePrincipalClientSecret));
-                }
-
-                return this.servicePrincipalClientSecret;
-            }
-        }
-
         /// <summary>
         /// Gets a value for the Azure DevOps connection name used for the Development Hub (if found).
         /// </summary>
@@ -256,27 +219,10 @@ protected EnvironmentVariableDeploymentService EnvironmentVariableDeploymentSvc
             }
         }
 
-        /// <summary>
-        /// Gets an <see cref="PluginStepDeploymentService"/>.
-        /// </summary>
-        protected PluginStepDeploymentService PluginStepDeploymentSvc
-        {
-            get
-            {
-                if (this.pluginStepDeploymentSvc == null)
-                {
-                    this.pluginStepDeploymentSvc = new PluginStepDeploymentService(this.CrmSvc, this.PackageLog);
-                }
-
-                return this.pluginStepDeploymentSvc;
-            }
-        }
-
         /// <inheritdoc/>
         public override bool AfterPrimaryImport()
         {
             this.SetDevelopmentHubEnvironmentVariables();
-            this.SetDevelopmentHubPluginStepConfigurations();
             this.SetDevelopmentHubFlowConnections();
 
             return true;
@@ -294,7 +240,6 @@ public override bool BeforeImportStage()
         /// <inheritdoc/>
         public override void InitializeCustomExtension()
         {
-            return;
         }
 
         /// <inheritdoc />
@@ -393,19 +338,11 @@ protected T GetSetting<T>(string key)
             return default;
         }
 
-        private string GetInjectSecureConfigSecureConfiguration()
-        {
-            return JsonConvert.SerializeObject(new Dictionary<string, object>
-            {
-                { "ClientId", this.ServicePrincipalClientId },
-                { "ClientSecret", this.ServicePrincipalClientSecret },
-                { "TenantId", this.CrmSvc.TenantId },
-            });
-        }
-
         private void SetDevelopmentHubFlowConnections()
         {
+            this.FlowDeploymentSvc.ActivateFlow(new Guid("db657a26-1d37-eb11-a813-000d3a0b97ca"));
             this.FlowDeploymentSvc.ActivateFlow(new Guid("9bc32b76-754b-ea11-a812-000d3a0b8d0b"));
+            this.FlowDeploymentSvc.ActivateFlow(new Guid("c976585f-06b4-ea11-a812-000d3a86ad99"));
 
             if (!string.IsNullOrEmpty(this.ApprovalsConnectionName))
             {
@@ -418,17 +355,6 @@ private void SetDevelopmentHubFlowConnections()
             }
         }
 
-        private void SetDevelopmentHubPluginStepConfigurations()
-        {
-            var secureConfiguration = this.PluginStepDeploymentSvc.CreateSdkMessageProcessingStepSecureConfig(this.GetInjectSecureConfigSecureConfiguration());
-            var injectConfigPluginSteps = this.PluginStepDeploymentSvc.GetPluginStepsForHandler(new Guid("fdb0db23-769a-e911-a97d-002248010929"), new ColumnSet(false));
-
-            foreach (var step in injectConfigPluginSteps)
-            {
-                this.PluginStepDeploymentSvc.SetPluginSecureConfiguration(step.Id, secureConfiguration);
-            }
-        }
-
         private void SetDevelopmentHubEnvironmentVariables()
         {
             this.EnvironmentVariableDeploymentSvc.SetEnvironmentVariable("devhub_AzureDevOpsOrganization", this.AzureDevOpsOrganisation);

src/common/DevelopmentHub.BusinessLogic/DevelopmentHub.BusinessLogic.projitems

@@ -11,14 +11,11 @@
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)CrmPluginRegistrationAttribute.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\InArgumentExtensions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)IntegratedWorkflowActivity.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)IODataRepositoryFactory.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)IRepositoryFactory.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Logging\ConsoleLogWriter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Logging\ILogWriter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Logging\Severity.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Logging\TracingServiceLogWriter.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)ODataRepositoryFactory.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Plugin.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)RepositoryFactory.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)WorkflowActivity.cs" />