Version Five

ManagementPack/2016/SMLets.Exchange.Connector/Settings.mpx

@@ -1500,7 +1500,7 @@
         </DisplayString>
         <DisplayString ElementID="SMLets.Exchange.Connector.MessageClassEnum.IPM.Note.SMIME.MultipartSigned">
           <Name>IPM.Note.SMIME.MultipartSigned</Name>
-          <Description>A digitally email message</Description>
+          <Description>A digitally signed email message</Description>
         </DisplayString>
         <DisplayString ElementID="SMLets.Exchange.Connector.MessageClassEnum.IPM.Schedule.Meeting.Request">
           <Name>IPM.Schedule.Meeting.Request</Name>

ManagementPack/2016/SMLetsExchangeConnectorSettingsUI/AdminSettingsWizardData.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -12,6 +12,7 @@
 using Microsoft.EnterpriseManagement.ConnectorFramework;
 using System.Xml;
 using System.Globalization;
+using Microsoft.EnterpriseManagement.UI.Extensions.Shared;
 
 namespace SMLetsExchangeConnectorSettingsUI
 {
@@ -1900,7 +1901,6 @@ public String AzureCognitiveServicesBoundaries
             }
         }
 
-
         public ManagementPackProperty ACSIncidentSentimentDecExtension
         {
             get
@@ -2227,7 +2227,7 @@ public ManagementPackProperty AMLIncidentClassificationPredictionEnumExtension
         {
             get
             {
-                return incidentAMLClassificationPredictionExtensionEnum; ;
+                return incidentAMLClassificationPredictionExtensionEnum;
             }
             set
             {
@@ -3070,16 +3070,16 @@ internal AdminSettingWizardData(EnterpriseManagementObject emoAdminSetting)
             catch { this.IsCiresonAnnouncementsEnabled = false; }
 
             this.SCSMApprovedAnnouncers = emoAdminSetting[smletsExchangeConnectorSettingsClass, "SCSMApprovedAnnouncementUsers"].ToString();
-            try
-            {
-                this.SCSMApprovedGroupGUID = (Guid)emoAdminSetting[null, "SCSMApprovedAnnouncementGroupGUID"].Value;
-                EnterpriseManagementObject ScsmApprovedGroupEmoObject;
-                ScsmApprovedGroupEmoObject = (EnterpriseManagementObject)emg.EntityObjects.GetObject<EnterpriseManagementObject>(this.SCSMApprovedGroupGUID, ObjectQueryOptions.Default);
-                this.SCSMApprovedGroupDisplayName = "CURRENT ANNOUNCEMENT GROUP: " + ScsmApprovedGroupEmoObject.DisplayName;
-            }
-            catch
+            if (emoAdminSetting[smletsExchangeConnectorSettingsClass, "SCSMApprovedAnnouncementGroupGUID"].Value != null)
             {
-                this.SCSMApprovedGroupDisplayName = "NO ANNOUNCEMENT GROUP DEFINED";
+                try
+                {
+                    this.SCSMApprovedAnnouncementGroup = ConsoleContextHelper.Instance.GetInstance((Guid)emoAdminSetting[smletsExchangeConnectorSettingsClass, "SCSMApprovedAnnouncementGroupGUID"].Value);
+                }
+                catch
+                {
+                    //"NO ANNOUNCEMENT GROUP DEFINED";
+                }
             }
 
             //SCOM Integration
@@ -3088,16 +3088,16 @@ internal AdminSettingWizardData(EnterpriseManagementObject emoAdminSetting)
             this.SCOMServer = emoAdminSetting[smletsExchangeConnectorSettingsClass, "SCOMmgmtServer"].ToString();
             this.AuthorizedSCOMApproverType = emoAdminSetting[smletsExchangeConnectorSettingsClass, "SCOMApprovedMemberType"].ToString();
             this.AuthorizedSCOMUsers = emoAdminSetting[smletsExchangeConnectorSettingsClass, "SCOMApprovedUsers"].ToString();
-            try
-            {
-                this.SCOMApprovedGroupGUID = (Guid)emoAdminSetting[null, "SCOMApprovedGroupGUID"].Value;
-                EnterpriseManagementObject ScomApprovedGroupEmoObject;
-                ScomApprovedGroupEmoObject = (EnterpriseManagementObject)emg.EntityObjects.GetObject<EnterpriseManagementObject>(this.SCOMApprovedGroupGUID, ObjectQueryOptions.Default);
-                this.SCOMApprovedGroupDisplayName = "CURRENT APPROVED GROUP: " + ScomApprovedGroupEmoObject.DisplayName;
-            }
-            catch
+            if (emoAdminSetting[smletsExchangeConnectorSettingsClass, "SCOMApprovedGroupGUID"].Value != null)
             {
-                this.SCOMApprovedGroupDisplayName = "NO SCOM GROUP DEFINED";
+                try
+                {
+                    this.SCOMApprovedGroup = ConsoleContextHelper.Instance.GetInstance((Guid)emoAdminSetting[smletsExchangeConnectorSettingsClass, "SCOMApprovedGroupGUID"].Value);
+                }
+                catch
+                {
+                    //"NO SCOM GROUP DEFINED";
+                }
             }
 
             //Artificial Intelligence - Cognitive Services
@@ -3200,7 +3200,6 @@ internal AdminSettingWizardData(EnterpriseManagementObject emoAdminSetting)
                     catch { }
                     try
                     {
-
                         if (irproperty.Id == (Guid)emoAdminSetting[smletsExchangeConnectorSettingsClass, "ACSSentimentScoreIncidentClassExtensionGUID"].Value)
                         {
                             this.ACSIncidentSentimentDecExtension = irproperty;
@@ -3286,7 +3285,6 @@ internal AdminSettingWizardData(EnterpriseManagementObject emoAdminSetting)
                     catch { }
                     try
                     {
-
                         if (srproperty.Id == (Guid)emoAdminSetting[smletsExchangeConnectorSettingsClass, "ACSSentimentScoreServiceRequestClassExtensionGUID"].Value)
                         {
                             this.ACSServiceRequestSentimentDecExtension = srproperty;
@@ -3600,7 +3598,6 @@ public override void AcceptChanges(WizardMode wizardMode)
 
                 }
             }
-
             //Use Custom Rules
             emoAdminSetting[smletsExchangeConnectorSettingsClass, "UseCustomRules"].Value = this.UseCustomRules;
 
@@ -3688,7 +3685,6 @@ public override void AcceptChanges(WizardMode wizardMode)
 
                 }
             }
-
             //Keywords
             emoAdminSetting[smletsExchangeConnectorSettingsClass, "SCSMKeywordFrom"].Value = this.KeywordFrom;
             emoAdminSetting[smletsExchangeConnectorSettingsClass, "SCSMKeywordAcknowledge"].Value = this.KeywordAcknowledge;
@@ -3763,17 +3759,31 @@ public override void AcceptChanges(WizardMode wizardMode)
             }
             emoAdminSetting[smletsExchangeConnectorSettingsClass, "SCSMApprovedAnnouncementUsers"].Value = this.SCSMApprovedAnnouncers;
             //if the Announcement group is set, don't null it
-            try { emoAdminSetting[smletsExchangeConnectorSettingsClass, "SCSMApprovedAnnouncementGroupGUID"].Value = this.SCSMApprovedAnnouncementGroup["Id"]; }
-            catch { }
+            if (this.SCSMApprovedAnnouncementGroup != null)
+            {
+                try { emoAdminSetting[smletsExchangeConnectorSettingsClass, "SCSMApprovedAnnouncementGroupGUID"].Value = this.SCSMApprovedAnnouncementGroup["Id"]; }
+                catch { }
+            }
+            else
+            {
+                emoAdminSetting[smletsExchangeConnectorSettingsClass, "SCSMApprovedAnnouncementGroupGUID"].Value = null;
+            }
 
             //SCOM Integration
             emoAdminSetting[smletsExchangeConnectorSettingsClass, "EnableSCOMIntegration"].Value = this.IsSCOMIntegrationEnabled;
             emoAdminSetting[smletsExchangeConnectorSettingsClass, "SCOMmgmtServer"].Value = this.SCOMServer;
             emoAdminSetting[smletsExchangeConnectorSettingsClass, "SCOMApprovedMemberType"].Value = this.AuthorizedSCOMApproverType;
             emoAdminSetting[smletsExchangeConnectorSettingsClass, "SCOMApprovedUsers"].Value = this.AuthorizedSCOMUsers;
             //if the SCOM approved group is set, don't null it
-            try { emoAdminSetting[smletsExchangeConnectorSettingsClass, "SCOMApprovedGroupGUID"].Value = this.SCOMApprovedGroup["Id"]; }
-            catch { }
+            if (this.SCOMApprovedGroup != null)
+            {
+                try { emoAdminSetting[smletsExchangeConnectorSettingsClass, "SCOMApprovedGroupGUID"].Value = this.SCOMApprovedGroup["Id"]; }
+                catch { }
+            }
+            else
+            {
+                emoAdminSetting[smletsExchangeConnectorSettingsClass, "SCOMApprovedGroupGUID"].Value = null;
+            }
 
             //Artifical Intelligence - enabled/disabled
             emoAdminSetting[smletsExchangeConnectorSettingsClass, "EnableArtificialIntelligence"].Value = this.IsArtificialIntelligenceEnabled;

ManagementPack/2016/SMLetsExchangeConnectorSettingsUI/AdminTaskHandler.cs

@@ -24,10 +24,12 @@ namespace SMLetsExchangeConnectorSettingsUI
 {
     internal class AdminTaskHandler : ConsoleCommand
     {
+        /*
         public AdminTaskHandler()
         {
 
         }
+        */
 
         public override void ExecuteCommand(IList<NavigationModelNodeBase> nodes, NavigationModelNodeTask task, ICollection<string> parameters)
         {
@@ -95,6 +97,5 @@ From BaseManagedEntity
                 RequestViewRefresh();
             }
         }
-
     }
 }

ManagementPack/2016/SMLetsExchangeConnectorSettingsUI/Forms/AboutForm.xaml

@@ -14,7 +14,7 @@
             <!-- Contributors -->
             <TextBlock Margin="0,5,0,0" TextWrapping="Wrap" FontStyle="Italic" Text="SMLets Exchange Connector (PowerShell) Contributors" />
             <TextBlock Margin="10,0" TextWrapping="Wrap" Text="Martin Blomgren, Tom Hendricks, Leigh Kilday, nradler2, Justin Workman, Brad Zima, bennyguk, Jan Schulz,
-                       Peter Miklian, Daniel Polivka" />
+                       Peter Miklian, Daniel Polivka, Alexander Axberg" />
             <!-- Reviewers -->
             <TextBlock Margin="0,5,0,0" TextWrapping="Wrap" FontStyle="Italic" Text="SMLets Exchange Connector (PowerShell) Reviewers" />
             <TextBlock Margin="10,0" TextWrapping="Wrap" Text="Tom Hendricks, Brian Wiest" />

ManagementPack/2016/SMLetsExchangeConnectorSettingsUI/Forms/AboutForm.xaml.cs

@@ -20,7 +20,6 @@ namespace SMLetsExchangeConnectorSettingsUI
     /// <summary>
     /// Interaction logic for AboutForm.xaml
     /// </summary>
-
     public partial class AboutForm : WizardRegularPageBase
     {
         private AboutForm adminSettingWizardData = null;
@@ -32,16 +31,17 @@ public AboutForm(WizardData wizardData)
             this.adminSettingWizardData = this.DataContext as AboutForm;
         }
 
+        /*
         private void WizardRegularPageBase_Loaded(object sender, RoutedEventArgs e)
         {
 
         }
+        */
 
         //take the URL defined in the WPF and open a browser to it
         private void Hyperlink_RequestNavigate(object sender, System.Windows.Navigation.RequestNavigateEventArgs e)
         {
             System.Diagnostics.Process.Start(e.Uri.AbsoluteUri);
         }
-
     }
-}
+}

ManagementPack/2016/SMLetsExchangeConnectorSettingsUI/Forms/AnnouncementsForm.xaml

@@ -1,4 +1,4 @@
-<wpfwiz:WizardRegularPageBase x:Class="SMLetsExchangeConnectorSettingsUI.AnnouncementsForm" 
+<wpfwiz:WizardRegularPageBase x:Class="SMLetsExchangeConnectorSettingsUI.AnnouncementsForm" 
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:sys="clr-namespace:System;assembly=mscorlib"
@@ -55,7 +55,6 @@
             <TextBox Height="50" x:Name="txtApprovedMember" Text="{Binding SCSMApprovedAnnouncers}" IsEnabled="{Binding ElementName=chkAnnouncementIntegration, Path=IsChecked}" TextWrapping="Wrap"/>
             <Label Margin="0,0,0,0" Content="Select the AD group approved for creating Announcements" />
             <Custom:SingleInstancePicker IsEnabled="{Binding ElementName=chkAnnouncementIntegration, Path=IsChecked}" Instance="{Binding SCSMApprovedAnnouncementGroup, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" BaseClassId="E2386B9B-5364-E438-A317-93836B979C56" Margin="0,0,10,0" />
-            <Label Margin="0,0,0,0" Content="{Binding SCSMApprovedGroupDisplayName}" />
         </StackPanel>
     </Grid>
-</wpfwiz:WizardRegularPageBase> 
+</wpfwiz:WizardRegularPageBase>

ManagementPack/2016/SMLetsExchangeConnectorSettingsUI/Forms/AnnouncementsForm.xaml.cs

@@ -20,7 +20,6 @@ namespace SMLetsExchangeConnectorSettingsUI
     /// <summary>
     /// Interaction logic for AnnouncementsForm.xaml
     /// </summary>
-
     public partial class AnnouncementsForm : WizardRegularPageBase
     {
         //1. Create a blank Instance of AdminSettingsWizardData called "settings"
@@ -40,10 +39,12 @@ public AnnouncementsForm(WizardData wizardData)
             //enable Cireson specific controls if the MP is imported per the AdminSettingsWizardData
             if (settings.IsCiresonPortalMPImported == false) { chkPostAnnouncementToCiresonPortal.IsEnabled = false; }
         }
-
+
+        /*
         private void WizardRegularPageBase_Loaded(object sender, RoutedEventArgs e)
         {
 
         }
+        */
     }
 }

ManagementPack/2016/SMLetsExchangeConnectorSettingsUI/Forms/ArtificialIntelligence.xaml.cs

@@ -26,7 +26,6 @@ namespace SMLetsExchangeConnectorSettingsUI
     /// <summary>
     /// Interaction logic for AzureCognitiveServices.xaml
     /// </summary>
-
     public partial class ArtificialIntelligence : WizardRegularPageBase
     {
         //1. Create a blank Instance of AdminSettingsWizardData called "settings"
@@ -110,10 +109,12 @@ public ArtificialIntelligence(WizardData wizardData)
             catch { }
         }
 
+        /*
         private void WizardRegularPageBase_Loaded(object sender, RoutedEventArgs e)
         {
 
         }
+        */
 
         //take the URL defined in the WPF and open a browser to it
         private void Hyperlink_RequestNavigate(object sender, System.Windows.Navigation.RequestNavigateEventArgs e)
@@ -228,4 +229,4 @@ public override void SaveState(SavePageEventArgs e)
             if (acsBoundariesToAddStringArray != null) { settings.AzureCognitiveServicesBoundaries = ACSBoundariesXMLString; }
         }
     }
-}
+}

ManagementPack/2016/SMLetsExchangeConnectorSettingsUI/Forms/AzureSpeech.xaml.cs

@@ -20,7 +20,6 @@ namespace SMLetsExchangeConnectorSettingsUI
     /// <summary>
     /// Interaction logic for AzureSpeech.xaml
     /// </summary>
-
     public partial class AzureSpeech : WizardRegularPageBase
     {
         AdminSettingWizardData settings;
@@ -34,9 +33,11 @@ public AzureSpeech(WizardData wizardData)
             this.adminSettingWizardData = this.DataContext as AzureSpeech;
         }
 
+        /*
         private void WizardRegularPageBase_Loaded(object sender, RoutedEventArgs e)
         {
 
         }
+        */
     }
 }

ManagementPack/2016/SMLetsExchangeConnectorSettingsUI/Forms/AzureTranslate.xaml.cs

@@ -20,7 +20,6 @@ namespace SMLetsExchangeConnectorSettingsUI
     /// <summary>
     /// Interaction logic for AzureTranslate.xaml
     /// </summary>
-
     public partial class AzureTranslate : WizardRegularPageBase
     {
         AdminSettingWizardData settings;
@@ -34,9 +33,11 @@ public AzureTranslate(WizardData wizardData)
             this.adminSettingWizardData = this.DataContext as AzureTranslate;
         }
 
+        /*
         private void WizardRegularPageBase_Loaded(object sender, RoutedEventArgs e)
         {
 
         }
+        */
     }
 }

ManagementPack/2016/SMLetsExchangeConnectorSettingsUI/Forms/AzureVision.xaml.cs

@@ -20,7 +20,6 @@ namespace SMLetsExchangeConnectorSettingsUI
     /// <summary>
     /// Interaction logic for AzureTranslate.xaml
     /// </summary>
-
     public partial class AzureVision : WizardRegularPageBase
     {
         AdminSettingWizardData settings;
@@ -34,9 +33,11 @@ public AzureVision(WizardData wizardData)
             this.adminSettingWizardData = this.DataContext as AzureVision;
         }
 
+        /*
         private void WizardRegularPageBase_Loaded(object sender, RoutedEventArgs e)
         {
 
         }
+        */
     }
 }

ManagementPack/2016/SMLetsExchangeConnectorSettingsUI/Forms/CiresonIntegrationForm.xaml.cs

@@ -20,7 +20,6 @@ namespace SMLetsExchangeConnectorSettingsUI
     /// <summary>
     /// Interaction logic for SettingsUI.xaml
     /// </summary>
-
     public partial class CiresonIntegrationForm : WizardRegularPageBase
     {
         //1. Create a blank Instance of AdminSettingsWizardData called "settings"
@@ -41,9 +40,11 @@ public CiresonIntegrationForm(WizardData wizardData)
             if (settings.IsCiresonPortalMPImported == false) { chkCiresonIntegration.IsEnabled = false; }
         }
 
+        /*
         private void WizardRegularPageBase_Loaded(object sender, RoutedEventArgs e)
         {
 
         }
+        */
     }
 }

ManagementPack/2016/SMLetsExchangeConnectorSettingsUI/Forms/CustomRules.xaml.cs

@@ -24,7 +24,6 @@ namespace SMLetsExchangeConnectorSettingsUI
     /// <summary>
     /// Interaction logic for CustomRules.xaml
     /// </summary>
-
     public partial class CustomRules : WizardRegularPageBase
     {
         //1. Create a blank Instance of AdminSettingsWizardData called "settings"
@@ -65,10 +64,12 @@ public CustomRules(WizardData wizardData)
             catch { }
         }
 
+        /*
         private void WizardRegularPageBase_Loaded(object sender, RoutedEventArgs e)
         {
 
         }
+        */
 
         //create a class so additional custom rule object can be created per row and later worked with as objects
         public class AdditionalCustomRule
@@ -153,4 +154,4 @@ public override void SaveState(SavePageEventArgs e)
             if (customRuleToAddStringArray != null) { settings.MultipleCustomRulesToAdd = customRuleToAddStringArray; }
         }
     }
-}
+}