RemoteApp: fixing confirm message mechanism and updated management package version

xamarsinx · xamarsinx · commit af3234fe2ce4 · 2015-08-12T10:40:23.000-07:00
diff --git a/src/ServiceManagement/RemoteApp/Commands.RemoteApp.Test/Commands.RemoteApp.Test.csproj b/src/ServiceManagement/RemoteApp/Commands.RemoteApp.Test/Commands.RemoteApp.Test.csproj
@@ -140,7 +140,7 @@
       <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.WindowsAzure.Management.RemoteApp">
-      <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.RemoteApp.2.0.1\lib\net40\Microsoft.WindowsAzure.Management.RemoteApp.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.RemoteApp.2.0.2\lib\net40\Microsoft.WindowsAzure.Management.RemoteApp.dll</HintPath>
     </Reference>
     <Reference Include="Moq, Version=4.2.1402.2112, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll</HintPath>
diff --git a/src/ServiceManagement/RemoteApp/Commands.RemoteApp.Test/packages.config b/src/ServiceManagement/RemoteApp/Commands.RemoteApp.Test/packages.config
@@ -13,7 +13,7 @@
   <package id="Microsoft.Rest.ClientRuntime" version="1.2.0" targetFramework="net45" />
   <package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="0.9.3" targetFramework="net45" />
   <package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
-  <package id="Microsoft.WindowsAzure.Management.RemoteApp" version="2.0.1" targetFramework="net45" />
+  <package id="Microsoft.WindowsAzure.Management.RemoteApp" version="2.0.2" targetFramework="net45" />
   <package id="Moq" version="4.2.1402.2112" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
   <package id="xunit" version="1.9.2" targetFramework="net45" />
diff --git a/src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.Designer.cs b/src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.Designer.cs
diff --git a/src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.csproj b/src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.csproj
@@ -121,7 +121,7 @@
       <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.0.3\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.WindowsAzure.Management.RemoteApp">
-      <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.RemoteApp.2.0.1\lib\net40\Microsoft.WindowsAzure.Management.RemoteApp.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.RemoteApp.2.0.2\lib\net40\Microsoft.WindowsAzure.Management.RemoteApp.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.WindowsAzure.Management.Storage">
       <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>
@@ -249,4 +249,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.resx b/src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.resx
@@ -262,9 +262,9 @@
     <value>No VM was found for user {0} in collection {1}.</value>
   </data>
   <data name="RestartVmWarningCaption" xml:space="preserve">
-    <value>This operation will logoff all logged-in users on VM</value>
+    <value>Restart VM {0}</value>
   </data>
   <data name="RestartVmWarningMessage" xml:space="preserve">
-    <value>Logged in users on VM: {0}</value>
+    <value>User {0} is on VM {1}. These users also have active sessions on this VM and will be logged off when the VM is rebooted: {2}</value>
   </data>
 </root>
diff --git a/src/ServiceManagement/RemoteApp/Commands.RemoteApp/Vm/RestartAzureRemoteAppVm.cs b/src/ServiceManagement/RemoteApp/Commands.RemoteApp/Vm/RestartAzureRemoteAppVm.cs
@@ -20,7 +20,7 @@
 
 namespace Microsoft.WindowsAzure.Management.RemoteApp.Cmdlets
 {
-    [Cmdlet("Restart", "AzureRemoteAppVM"), OutputType(typeof(TrackingResult))]
+    [Cmdlet("Restart", "AzureRemoteAppVM", SupportsShouldProcess = true, ConfirmImpact = ConfirmImpact.High), OutputType(typeof(TrackingResult))]
     public class RestartAzureRemoteAppVm : RdsCmdlet
     {
         [Parameter(Mandatory = true,
@@ -52,10 +52,6 @@ public class RestartAzureRemoteAppVm : RdsCmdlet
             HelpMessage = "Time to wait before logging off users on the VM (default is 60 seconds)")]
         public int LogoffWaitSeconds { get; set; }
 
-        [Parameter(Mandatory = false,
-            HelpMessage = "Do not ask for confirmation if more users are logged into the VM")]
-        public SwitchParameter DoNotWarn { get; set; }
-
         private RemoteAppVm GetVm(string collectionName, string userUpn)
         {
             CollectionVmsListResult response = null;
@@ -95,26 +91,26 @@ public override void ExecuteCmdlet()
                 return;
             }
 
-            if (!DoNotWarn.IsPresent && vm.LoggedOnUserUpns.Count > 1)
+            if (vm.LoggedOnUserUpns.Count > 1)
             {
-                string loggedInUsers = null;
+                string otherLoggedInUsers = null;
+                string warningCaption = null;
+                string warningMessage = null;
 
                 foreach (string user in vm.LoggedOnUserUpns)
                 {
-                    if (loggedInUsers == null)
-                    {
-                        loggedInUsers = user;
-                    }
-                    else
+                    if (string.Compare(user, UserUpn, true) != 0)
                     {
-                        loggedInUsers += ", " + user;
+                        otherLoggedInUsers += "\n" + user;
                     }
                 }
 
-                if (!ShouldProcess(
-                    string.Format(Commands_RemoteApp.RestartVmWarningMessage, loggedInUsers), 
-                    Commands_RemoteApp.GenericAreYouSureQuestion,
-                    Commands_RemoteApp.RestartVmWarningCaption))
+                warningMessage = string.Format(Commands_RemoteApp.RestartVmWarningMessage, UserUpn, vm.VirtualMachineName, otherLoggedInUsers);
+                warningCaption = string.Format(Commands_RemoteApp.RestartVmWarningCaption, vm.VirtualMachineName);
+
+                WriteWarning(warningMessage);
+
+                if (!ShouldProcess(null, Commands_RemoteApp.GenericAreYouSureQuestion, warningCaption))
                 {
                     return;
                 }
diff --git a/src/ServiceManagement/RemoteApp/Commands.RemoteApp/packages.config b/src/ServiceManagement/RemoteApp/Commands.RemoteApp/packages.config
@@ -18,7 +18,7 @@
   <package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
   <package id="Microsoft.WindowsAzure.Management.Compute" version="12.3.1" targetFramework="net45" />
   <package id="Microsoft.WindowsAzure.Management.Network" version="7.0.3" targetFramework="net45" />
-  <package id="Microsoft.WindowsAzure.Management.RemoteApp" version="2.0.1" targetFramework="net45" />
+  <package id="Microsoft.WindowsAzure.Management.RemoteApp" version="2.0.2" targetFramework="net45" />
   <package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
   <package id="System.Spatial" version="5.6.4" targetFramework="net45" />

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`
`21`	`21`	`namespace Microsoft.WindowsAzure.Management.RemoteApp.Cmdlets`
`22`	`22`	`{`
`23`		`- [Cmdlet("Restart", "AzureRemoteAppVM"), OutputType(typeof(TrackingResult))]`
	`23`	`+ [Cmdlet("Restart", "AzureRemoteAppVM", SupportsShouldProcess = true, ConfirmImpact = ConfirmImpact.High), OutputType(typeof(TrackingResult))]`
`24`	`24`	`public class RestartAzureRemoteAppVm : RdsCmdlet`
`25`	`25`	`{`
`26`	`26`	`[Parameter(Mandatory = true,`
`@@ -52,10 +52,6 @@ public class RestartAzureRemoteAppVm : RdsCmdlet`
`52`	`52`	`HelpMessage = "Time to wait before logging off users on the VM (default is 60 seconds)")]`
`53`	`53`	`public int LogoffWaitSeconds { get; set; }`
`54`	`54`
`55`		`- [Parameter(Mandatory = false,`
`56`		`- HelpMessage = "Do not ask for confirmation if more users are logged into the VM")]`
`57`		`- public SwitchParameter DoNotWarn { get; set; }`
`58`		`-`
`59`	`55`	`private RemoteAppVm GetVm(string collectionName, string userUpn)`
`60`	`56`	`{`
`61`	`57`	`CollectionVmsListResult response = null;`
`@@ -95,26 +91,26 @@ public override void ExecuteCmdlet()`
`95`	`91`	`return;`
`96`	`92`	`}`
`97`	`93`
`98`		`- if (!DoNotWarn.IsPresent && vm.LoggedOnUserUpns.Count > 1)`
	`94`	`+ if (vm.LoggedOnUserUpns.Count > 1)`
`99`	`95`	`{`
`100`		`- string loggedInUsers = null;`
	`96`	`+ string otherLoggedInUsers = null;`
	`97`	`+ string warningCaption = null;`
	`98`	`+ string warningMessage = null;`
`101`	`99`
`102`	`100`	`foreach (string user in vm.LoggedOnUserUpns)`
`103`	`101`	`{`
`104`		`- if (loggedInUsers == null)`
`105`		`- {`
`106`		`- loggedInUsers = user;`
`107`		`- }`
`108`		`- else`
	`102`	`+ if (string.Compare(user, UserUpn, true) != 0)`
`109`	`103`	`{`
`110`		`- loggedInUsers += ", " + user;`
	`104`	`+ otherLoggedInUsers += "\n" + user;`
`111`	`105`	`}`
`112`	`106`	`}`
`113`	`107`
`114`		`- if (!ShouldProcess(`
`115`		`- string.Format(Commands_RemoteApp.RestartVmWarningMessage, loggedInUsers),`
`116`		`- Commands_RemoteApp.GenericAreYouSureQuestion,`
`117`		`- Commands_RemoteApp.RestartVmWarningCaption))`
	`108`	`+ warningMessage = string.Format(Commands_RemoteApp.RestartVmWarningMessage, UserUpn, vm.VirtualMachineName, otherLoggedInUsers);`
	`109`	`+ warningCaption = string.Format(Commands_RemoteApp.RestartVmWarningCaption, vm.VirtualMachineName);`
	`110`	`+`
	`111`	`+ WriteWarning(warningMessage);`
	`112`	`+`
	`113`	`+ if (!ShouldProcess(null, Commands_RemoteApp.GenericAreYouSureQuestion, warningCaption))`
`118`	`114`	`{`
`119`	`115`	`return;`
`120`	`116`	`}`