Merge branch 'version/1.1' into release

Author: Zachary_Kniebel

app/generator/mdj-reverseengineer.js

@@ -575,7 +575,7 @@ function _generateHelixDiagrams(documentationConfiguration, metaball, canvas, cr
         }
         // foundation -> project
         if (sourceLayerID == helixArchitecture.FoundationLayer.ReferenceID) {
-            ___addValidationErrorToMetaball(helixArchitecture.FeatureLayer.LayerIndex);
+            ___addValidationErrorToMetaball(helixArchitecture.FoundationLayer.LayerIndex);
             return { 
                 IsValid: false, 
                 Message: `INVALID: Templates in the Foundation Layer cannot depend on templates in the Project Layer: "${sourceHierarchyModel.JsonTemplate.Path}"->"${targetHierarchyModel.JsonTemplate.Path}"`
@@ -595,7 +595,7 @@ function _generateHelixDiagrams(documentationConfiguration, metaball, canvas, cr
 
         // foundation -> feature
         if (sourceLayerID == helixArchitecture.FoundationLayer.ReferenceID) {
-            ___addValidationErrorToMetaball(helixArchitecture.FeatureLayer.LayerIndex);
+            ___addValidationErrorToMetaball(helixArchitecture.FoundationLayer.LayerIndex);
             return { 
                 IsValid: false, 
                 Message: `INVALID: Templates in the Foundation Layer cannot depend on templates in the Feature Layer: "${sourceHierarchyModel.JsonTemplate.Path}"->"${targetHierarchyModel.JsonTemplate.Path}"`

middlemen/RabbitMQ/SitecoreDXG__RabbitMQ_Middleman__TeamCity_MetaRunner.xml

@@ -6,7 +6,7 @@
       <param name="env.SitecoreDXG.Middlemen.RabbitMQ_AMQP.ConnectionString" value="" spec="text display='normal' description='The RabbitMQ connection string that you wish to use to connect to RabbitMQ (e.g. amqp://localhost)' label='RabbitMQ Connection String' validationMode='not_empty'" />
       <param name="env.SitecoreDXG.Middlemen.RabbitMQ_AMQP.GenerationQueueName" value="" spec="text display='normal' description='The name of the generation queue that you want to submit the serialized architecture queue; by default, the queue that you choose determines the generation action that should occur; the available default queues are the generation_queue__documentation queue (generate HTML documentation) and the generation_queue__mdj queue (generate MDJ file only).' label='Generation Queue Name' validationMode='not_empty'" />
       <param name="env.SitecoreDXG.Middlemen.RabbitMQ_AMQP.ArchitectureGetUrl" value="" spec="text display='normal' description='SitecoreUML Service URL for getting the serialized template architecture of the host Sitecore solution (generally http://&lt;sitecore_url&gt;/sitecoreuml/sitecoredxg/GetTemplateArchitecture)' label='Architecture GET URL' validationMode='not_empty'" />
-      <param name="env.SitecoreDXG.Middlemen.RabbitMQ_AMQP.OptionsData" value="" spec="text description='(Optional) JSON-formatted string object with theoptional DocumentationConfiguration and CompletionHandlers data objects as properties; completion handler objects must have the handler ID and parameters; Should have the following syntax:  |{&quot;DocumentationConfiguration&quot;:{&quot;CommitAuthor&quot;\&quot;...&quot;,&quot;CommitHash&quot;:&quot;...&quot;,&quot;EnvironmentName&quot;:&quot;UAT&quot;,&quot;ProjectName&quot;:&quot;...&quot;,&quot;DeployLink&quot;:&quot;http://...&quot;},&quot;CompletionHandlers&quot;:|[{&quot;ID&quot;:&quot;MyHandler1&quot;,&quot;Params&quot;:{&quot;foo&quot;:&quot;bar&quot;},{&quot;ID&quot;:&quot;MyHandler2&quot;}|]|' label='Completion Handler Data' validationMode='any' display='normal'" />
+      <param name="env.SitecoreDXG.Middlemen.RabbitMQ_AMQP.OptionsData" value="" spec="text description='(Optional) JSON-formatted string object with theoptional DocumentationConfiguration and CompletionHandlers data objects as properties; completion handler objects must have the handler ID and parameters; Should have the following syntax: |'{&quot;DocumentationConfiguration&quot;:{&quot;CommitAuthor&quot;:\&quot;...&quot;,&quot;CommitHash&quot;:&quot;...&quot;,&quot;EnvironmentName&quot;:&quot;UAT&quot;,&quot;ProjectName&quot;:&quot;...&quot;,&quot;DeployLink&quot;:&quot;http://...&quot;},&quot;CompletionHandlers&quot;:|[{&quot;ID&quot;:&quot;MyHandler1&quot;,&quot;Params&quot;:{&quot;foo&quot;:&quot;bar&quot;},{&quot;ID&quot;:&quot;MyHandler2&quot;}|]}|'' label='Options Data' validationMode='any' display='normal'" />
       <param name="env.SitecoreDXG.Middlemen.RabbitMQ_AMQP.ScriptPath" value="" spec="text display='normal' description='The path to the middleman script file on the TeamCity server (customizable for extensibility purposes)' label='Middleman Script Path' validationMode='not_empty'" />
     </parameters>
     <build-runners>
@@ -31,7 +31,7 @@ Write-Output "Options JSON file generated at path $($optionsFilePath)"
 
 Write-Output "Calling SitecoreDXG Middleman..."
 
-node %env.SitecoreDXG.Middlemen.RabbitMQ_AMQP.ScriptPath% %env.SitecoreDXG.Middlemen.RabbitMQ_AMQP.ConnectionString% %env.SitecoreDXG.Middlemen.RabbitMQ_AMQP.ArchitectureGetUrl% %env.SitecoreDXG.Middlemen.RabbitMQ_AMQP.GenerationQueueName% $optionsFilePath
+node "%env.SitecoreDXG.Middlemen.RabbitMQ_AMQP.ScriptPath%" %env.SitecoreDXG.Middlemen.RabbitMQ_AMQP.ConnectionString% %env.SitecoreDXG.Middlemen.RabbitMQ_AMQP.ArchitectureGetUrl% %env.SitecoreDXG.Middlemen.RabbitMQ_AMQP.GenerationQueueName% "$optionsFilePath"
 
 Write-Output "Finished calling SitecoreDXG Middleman..."