merged conflicts from updatecmdlets2

Author: robertla

src/ServiceManagement/RemoteApp/Commands.RemoteApp/Collection/UpdateAzureRemoteAppCollection.cs

@@ -34,13 +34,8 @@ public class UpdateAzureRemoteAppCollection : RdsCmdlet
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "The name of the RemoteApp template image."
         )]
-        [ValidatePattern(TemplateImageNameValidatorString)]
         public string ImageName { get; set; }
 
-        [Parameter(Mandatory = false,
-            HelpMessage = "Immediately log off users after update has successfully completed")]
-        public SwitchParameter ForceLogoffWhenUpdateComplete { get; set; }
-
         public override void ExecuteCmdlet()
         {
             CollectionCreationDetails details = null;

src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.Designer.cs

@@ -30,7 +30,9 @@ public abstract partial class RdsCmdlet
 
         protected const string UserPrincipalValdatorString = UserNameValidatorString + "@" + DomainNameValidatorString;
 
-        protected const string TemplateImageNameValidatorString = @"^[()A-Za-z][() ._\-A-Za-z0-9]{1,61}[A-Z-a-z0-9()]$";
+        protected const string ListTemplateImageNameValidatorString = @"^[()A-Za-z][() ._\-A-Za-z0-9]{1,61}[A-Z-a-z0-9()]$";
+
+        protected const string TemplateImageNameValidatorString = @"^[A-Za-z][ ._\-A-Za-z0-9]{1,61}[A-Z-a-z0-9]$";
 
         protected const string IPv4ValidatorString = @"^(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])$";
 

src/ServiceManagement/RemoteApp/Commands.RemoteApp/Common/RemoteAppRegEx.cs

@@ -27,7 +27,7 @@ public class GetAzureRemoteAppTemplateImage : GoldImage
             Position = 0,
             ValueFromPipeline = true,
             HelpMessage = "Template image name. Wildcards are permitted.")]
-        [ValidateNotNullOrEmpty()]
+        [ValidatePattern(ListTemplateImageNameValidatorString)]
         public string ImageName { get; set; }
 
         private bool showAllImages = false;

src/ServiceManagement/RemoteApp/Commands.RemoteApp/TemplateImage/GetAzureRemoteAppTemplateImage.cs

@@ -43,6 +43,7 @@ public class NewAzureRemoteAppTemplateImage : GoldImage
             Position = 0,
             ValueFromPipeline = true,
             HelpMessage = "Template image name")]
+        [ValidatePattern(TemplateImageNameValidatorString)]
         public string ImageName { get; set; }
 
         [Parameter(Mandatory = true,

src/ServiceManagement/RemoteApp/Commands.RemoteApp/TemplateImage/NewAzureRemoteAppTemplateImage.cs

@@ -27,7 +27,7 @@ public class RemoveAzureRemoteAppTemplateImage : GoldImage
             Position = 0,
             ValueFromPipeline = true,
             HelpMessage = "Template image name")]
-
+        [ValidatePattern(TemplateImageNameValidatorString)]
         public string ImageName { get; set; }
 
         public override void ExecuteCmdlet()

src/ServiceManagement/RemoteApp/Commands.RemoteApp/TemplateImage/RemoveAzureRemoteAppTemplateImage.cs

@@ -27,6 +27,7 @@ public class RenameAzureRemoteAppTemplateImage : GoldImage
             Position = 0,
             ValueFromPipeline = true,
             HelpMessage = "Template image name")]
+        [ValidatePattern(TemplateImageNameValidatorString)]
         public string ImageName { get; set; }
 
         [Parameter(Mandatory = true,