addressing CR feedback: using nameof, discarding redundant parameter …

…set clauses
Azure · May 1, 2017 · 5884995 · 5884995
1 parent dec4736
commit 5884995
Show file tree

Hide file tree

Showing 8 changed files with 85 additions and 119 deletions.
diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault.Test/Resource.Designer.cs b/src/ResourceManager/KeyVault/Commands.KeyVault.Test/Resource.Designer.cs
diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands.KeyVault.csproj b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands.KeyVault.csproj
@@ -263,10 +263,6 @@
       <Project>{3819d8a7-c62c-4c47-8ddd-0332d9ce1252}</Project>
       <Name>Commands.ResourceManager.Common</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Profile\Commands.Profile\Commands.Profile.csproj">
-      <Project>{142d7b0b-388a-4ceb-a228-7f6d423c5c2e}</Project>
-      <Name>Commands.Profile</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\Resources\Commands.Resources\Commands.Resources.csproj">
       <Project>{e1f5201d-6067-430e-b303-4e367652991b}</Project>
       <Name>Commands.Resources</Name>

diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/BackupAzureKeyVaultKey.cs b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/BackupAzureKeyVaultKey.cs
@@ -85,13 +85,7 @@ public class BackupAzureKeyVaultKey : KeyVaultCmdletBase
         [Parameter( Mandatory = false,
                     Position = 2,
                     ValueFromPipelineByPropertyName = true,
-                    ParameterSetName = ByKeyNameParameterSet,
                     HelpMessage = "Output file. The output file to store the backed up key blob in. If not present, a default filename is chosen.")]
-        [Parameter( Mandatory = false,
-                    Position = 2,
-                    ValueFromPipelineByPropertyName = true,
-                    ParameterSetName = ByKeyObjectParameterSet,
-                    HelpMessage = "Output file. The output file to store the backed up key blob in. If not present, a default filename is chosen." )]
         [ValidateNotNullOrEmpty]
         public string OutputFile { get; set; }
 
@@ -101,12 +95,6 @@ public class BackupAzureKeyVaultKey : KeyVaultCmdletBase
         [Parameter( Mandatory = false,
                     Position = 3,
                     ValueFromPipelineByPropertyName = true,
-                    ParameterSetName = ByKeyNameParameterSet,
-                    HelpMessage = "Overwrite the given file if it exists" )]
-        [Parameter( Mandatory = false,
-                    Position = 3,
-                    ValueFromPipelineByPropertyName = true,
-                    ParameterSetName = ByKeyObjectParameterSet,
                     HelpMessage = "Overwrite the given file if it exists" )]
         public SwitchParameter Force { get; set; }
 

diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/BackupAzureKeyVaultSecret.cs b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/BackupAzureKeyVaultSecret.cs
@@ -86,12 +86,6 @@ public class BackupAzureKeyVaultSecret : KeyVaultCmdletBase
         [Parameter( Mandatory = false,
                     Position = 2,
                     ValueFromPipelineByPropertyName = true,
-                    ParameterSetName = BySecretNameParameterSet,
-                    HelpMessage = "Output file. The output file to store the backed up secret blob in. If not present, a default filename is chosen." )]
-        [Parameter( Mandatory = false,
-                    Position = 2,
-                    ValueFromPipelineByPropertyName = true,
-                    ParameterSetName = BySecretObjectParameterSet,
                     HelpMessage = "Output file. The output file to store the backed up secret blob in. If not present, a default filename is chosen." )]
         [ValidateNotNullOrEmpty]
         public string OutputFile { get; set; }
@@ -102,12 +96,6 @@ public class BackupAzureKeyVaultSecret : KeyVaultCmdletBase
         [Parameter( Mandatory = false,
                     Position = 3,
                     ValueFromPipelineByPropertyName = true,
-                    ParameterSetName = BySecretNameParameterSet,
-                    HelpMessage = "Overwrite the given file if it exists" )]
-        [Parameter( Mandatory = false,
-                    Position = 3,
-                    ValueFromPipelineByPropertyName = true,
-                    ParameterSetName = BySecretObjectParameterSet,
                     HelpMessage = "Overwrite the given file if it exists" )]
         public SwitchParameter Force { get; set; }
 

diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/RestoreAzureKeyVaultSecret.cs b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/RestoreAzureKeyVaultSecret.cs
@@ -12,11 +12,11 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Commands.KeyVault.Models;
 using System.IO;
 using System.Management.Automation;
-using KeyVaultProperties = Microsoft.Azure.Commands.KeyVault.Properties;
 using Microsoft.Azure.Commands.Common.Authentication;
+using Microsoft.Azure.Commands.KeyVault.Models;
+using KeyVaultProperties = Microsoft.Azure.Commands.KeyVault.Properties;
 
 namespace Microsoft.Azure.Commands.KeyVault
 {

diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault/Models/KeyVaultCmdletBase.cs b/src/ResourceManager/KeyVault/Commands.KeyVault/Models/KeyVaultCmdletBase.cs
@@ -13,11 +13,9 @@
 // ----------------------------------------------------------------------------------
 
 using System;
-using System.IO;
+using System.Collections.Generic;
 using Microsoft.Azure.Commands.Common.Authentication;
 using Microsoft.Azure.Commands.ResourceManager.Common;
-using System.Collections.Generic;
-using System.Net.Http;
 
 namespace Microsoft.Azure.Commands.KeyVault.Models
 {