BUGFIX for missing Outbound SR Summary sections

microsoft · Sep 19, 2016 · 72f8f36 · 72f8f36
1 parent b1b9763
commit 72f8f36
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 14 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -8,6 +8,14 @@ All notable changes to AADConnectConfigDocumenter project will be documented in
 
 ------------
 
+### Version 1.16.0919.0
+
+#### Fixed
+
+* Fixed missing Outbound Sync Rule Summary sections.
+
+------------
+
 ### Version 1.16.0915.0
 
 #### Fixed

diff --git a/src/AzureADConnectSyncDocumenter/ConnectorDocumenter.cs b/src/AzureADConnectSyncDocumenter/ConnectorDocumenter.cs
@@ -155,19 +155,18 @@ protected static string GetSyncRuleXPath(string currentConnectorGuid, SyncRuleDo
             Logger.Instance.WriteMethodEntry("Current Connector Guid: '{0}'. Sync Rule Direction: '{1}'.  Sync Rule Report Type: '{2}'.", currentConnectorGuid, direction, reportType);
 
             var xpath = "//synchronizationRule[translate(connector, '" + Documenter.LowercaseLetters + "', '" + Documenter.UppercaseLetters + "') = '" + currentConnectorGuid + "' and direction = '" + direction.ToString() + "'";
-            var standardCondition = "and direction = 'Inbound' " + Documenter.SyncRuleDisabledCondition;
             try
             {
                 switch (reportType)
                 {
                     case SyncRuleDocumenter.SyncRuleReportType.ProvisioningSection:
-                        xpath += " and linkType = 'Provision' " + standardCondition;
+                        xpath += " and linkType = 'Provision' " + Documenter.SyncRuleDisabledCondition;
                         break;
                     case SyncRuleDocumenter.SyncRuleReportType.StickyJoinSection:
-                        xpath += " and linkType = 'StickyJoin' " + standardCondition;
+                        xpath += " and linkType = 'StickyJoin' " + Documenter.SyncRuleDisabledCondition;
                         break;
                     case SyncRuleDocumenter.SyncRuleReportType.ConditionalJoinSection:
-                        xpath += " and linkType = 'Join' " + standardCondition;
+                        xpath += " and linkType = 'Join' " + Documenter.SyncRuleDisabledCondition;
                         xpath += " and (count(synchronizationCriteria/conditions/scope) != 0 or  count(relationshipCriteria/conditions/condition) != 0)";
                         break;
                 }

diff --git a/src/AzureADConnectSyncDocumenter/StyleCop.Cache b/src/AzureADConnectSyncDocumenter/StyleCop.Cache
@@ -148,7 +148,7 @@
     <violations />
   </sourcecode>
   <project key="1174695384">
-    <configuration>CODE_ANALYSIS;DEBUG;TRACE</configuration>
+    <configuration>TRACE</configuration>
   </project>
   <sourcecode name="ActiveDirectoryConnectorDocumenter.cs" parser="StyleCop.CSharp.CsParser">
     <timestamps>
@@ -200,7 +200,7 @@
     <timestamps>
       <styleCop>2016/05/12 20:26:32.000</styleCop>
       <settingsFile>2016/04/20 21:35:08.000</settingsFile>
-      <sourceFile>2016/09/13 09:54:03.635</sourceFile>
+      <sourceFile>2016/09/19 13:11:38.704</sourceFile>
       <parser>2016/05/12 20:26:32.000</parser>
       <StyleCop.CSharp.DocumentationRules>2016/05/12 20:26:32.000</StyleCop.CSharp.DocumentationRules>
       <StyleCop.CSharp.DocumentationRules.FilesHashCode>-26055145</StyleCop.CSharp.DocumentationRules.FilesHashCode>
@@ -407,7 +407,7 @@
     <timestamps>
       <styleCop>2016/05/12 20:26:32.000</styleCop>
       <settingsFile>2016/04/20 21:35:08.000</settingsFile>
-      <sourceFile>2016/09/15 07:25:40.484</sourceFile>
+      <sourceFile>2016/09/19 20:07:41.204</sourceFile>
       <parser>2016/05/12 20:26:32.000</parser>
       <StyleCop.CSharp.DocumentationRules>2016/05/12 20:26:32.000</StyleCop.CSharp.DocumentationRules>
       <StyleCop.CSharp.DocumentationRules.FilesHashCode>-26055145</StyleCop.CSharp.DocumentationRules.FilesHashCode>
@@ -430,7 +430,7 @@
     <timestamps>
       <styleCop>2016/05/12 20:26:32.000</styleCop>
       <settingsFile>2016/04/20 21:35:08.000</settingsFile>
-      <sourceFile>2016/09/15 07:10:33.883</sourceFile>
+      <sourceFile>2016/09/19 16:06:47.897</sourceFile>
       <parser>2016/05/12 20:26:32.000</parser>
       <StyleCop.CSharp.DocumentationRules>2016/05/12 20:26:32.000</StyleCop.CSharp.DocumentationRules>
       <StyleCop.CSharp.DocumentationRules.FilesHashCode>-26055145</StyleCop.CSharp.DocumentationRules.FilesHashCode>

diff --git a/src/AzureADConnectSyncDocumenter/SyncRuleDocumenter.cs b/src/AzureADConnectSyncDocumenter/SyncRuleDocumenter.cs
@@ -301,20 +301,19 @@ protected string GetSyncRuleXPath(string currentConnectorGuid)
             Logger.Instance.WriteMethodEntry("Current Connector Guid: '{0}'.", currentConnectorGuid);
 
             var xpath = "//synchronizationRule[translate(connector, '" + Documenter.LowercaseLetters + "', '" + Documenter.UppercaseLetters + "') = '" + currentConnectorGuid + "' and name = '" + this.SyncRuleName + "'";
-            var commonCriteria = "and direction = 'Inbound' " + Documenter.SyncRuleDisabledCondition;
 
             try
             {
                 switch (this.syncRuleReportType)
                 {
                     case SyncRuleReportType.ProvisioningSection:
-                        xpath += " and linkType = 'Provision' " + commonCriteria;
+                        xpath += " and linkType = 'Provision' " + Documenter.SyncRuleDisabledCondition;
                         break;
                     case SyncRuleReportType.StickyJoinSection:
-                        xpath += " and linkType = 'StickyJoin' " + commonCriteria;
+                        xpath += " and linkType = 'StickyJoin' " + Documenter.SyncRuleDisabledCondition;
                         break;
                     case SyncRuleReportType.ConditionalJoinSection:
-                        xpath += " and linkType = 'Join' " + commonCriteria;
+                        xpath += " and linkType = 'Join' " + Documenter.SyncRuleDisabledCondition;
                         break;
                 }
 

diff --git a/src/VersionInfo.cs b/src/VersionInfo.cs
@@ -22,7 +22,7 @@ internal static class VersionInfo
         ///      Build Number (MMDD)
         ///      Revision (if any on the same day)
         /// </summary>
-        internal const string Version = "1.16.0915.0";
+        internal const string Version = "1.16.0919.0";
 
         /// <summary>
         /// File Version information for the assembly consists of the following four values:
@@ -31,6 +31,6 @@ internal static class VersionInfo
         ///      Build Number (MMDD)
         ///      Revision (if any on the same day)
         /// </summary>
-        internal const string FileVersion = "1.16.0915.0";
+        internal const string FileVersion = "1.16.0919.0";
     }
 }