Skip to content

Commit c6a65ee

Browse files
author
dragonfly91
committed
Updating RS Backup with latest infra changes
1 parent 1e1c3c0 commit c6a65ee

File tree

11 files changed

+102
-33
lines changed

11 files changed

+102
-33
lines changed

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Cmdlets.csproj

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,25 @@
3838
<SpecificVersion>False</SpecificVersion>
3939
<HintPath>..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
4040
</Reference>
41-
<Reference Include="Microsoft.Azure.Common.Authentication, Version=1.6.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
42-
<SpecificVersion>False</SpecificVersion>
43-
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.6.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
44-
</Reference>
4541
<Reference Include="Microsoft.Azure.Management.RecoveryServicesBackupManagement, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
4642
<SpecificVersion>False</SpecificVersion>
4743
<HintPath>Commands.RecoveryServices.Backup.HydraAdapter\Resources\Microsoft.Azure.Management.RecoveryServicesBackupManagement.dll</HintPath>
4844
</Reference>
49-
<Reference Include="Microsoft.Rest.ClientRuntime, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
45+
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
46+
<SpecificVersion>False</SpecificVersion>
47+
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.2.1.0\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
48+
</Reference>
49+
<Reference Include="Microsoft.WindowsAzure.Management, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5050
<SpecificVersion>False</SpecificVersion>
51-
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.1.8.2\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
51+
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
5252
</Reference>
5353
<Reference Include="Microsoft.WindowsAzure.Management.Scheduler">
5454
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Scheduler.6.0.0\lib\net40\Microsoft.WindowsAzure.Management.Scheduler.dll</HintPath>
5555
</Reference>
56+
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
57+
<SpecificVersion>False</SpecificVersion>
58+
<HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
59+
</Reference>
5660
<Reference Include="System" />
5761
<Reference Include="System.Core" />
5862
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -92,6 +96,10 @@
9296
<Folder Include="Cmdlets\Backup\" />
9397
</ItemGroup>
9498
<ItemGroup>
99+
<ProjectReference Include="..\..\Common\Commands.Common.Authentication\Commands.Common.Authentication.csproj">
100+
<Project>{d3804b64-c0d3-48f8-82ec-1f632f833c9e}</Project>
101+
<Name>Commands.Common.Authentication</Name>
102+
</ProjectReference>
95103
<ProjectReference Include="..\..\Common\Commands.Common\Commands.Common.csproj">
96104
<Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
97105
<Name>Commands.Common</Name>

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/ClientProxy.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// ----------------------------------------------------------------------------------
1414

1515
using Hyak.Common;
16-
using Microsoft.Azure.Common.Authentication;
16+
using Microsoft.Azure.Commands.Common.Authentication;
1717
using System;
1818
using System.Collections.Generic;
1919
using System.Linq;

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/ClientProxyBase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@ public string GetClientRequestId()
6060

6161
public string GetResourceName()
6262
{
63-
return PSRecoveryServicesClient.arsVaultCreds.Name;
63+
return PSRecoveryServicesClient.arsVault.Name;
6464
}
6565

6666
public string GetResourceGroupName()
6767
{
68-
return PSRecoveryServicesClient.arsVaultCreds.ResouceGroupName;
68+
return PSRecoveryServicesClient.arsVault.ResouceGroupName;
6969
}
7070
}
7171
}

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/Commands.RecoveryServices.Backup.HydraAdapter.csproj

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,13 @@
3636
<Reference Include="Microsoft.Azure.Common">
3737
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
3838
</Reference>
39-
<Reference Include="Microsoft.Azure.Common.Authentication">
40-
<HintPath>..\..\..\packages\Microsoft.Azure.Common.Authentication.1.6.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
41-
</Reference>
4239
<Reference Include="Microsoft.Azure.Management.RecoveryServicesBackupManagement, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
4340
<SpecificVersion>False</SpecificVersion>
4441
<HintPath>Resources\Microsoft.Azure.Management.RecoveryServicesBackupManagement.dll</HintPath>
4542
</Reference>
46-
<Reference Include="Microsoft.Rest.ClientRuntime">
47-
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.1.8.2\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
43+
<Reference Include="Microsoft.Rest.ClientRuntime, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
44+
<SpecificVersion>False</SpecificVersion>
45+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.1.0\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
4846
</Reference>
4947
<Reference Include="System" />
5048
<Reference Include="System.Configuration" />
@@ -74,6 +72,10 @@
7472
<Content Include="Resources\Microsoft.Azure.Management.RecoveryServicesBackupManagement.dll" />
7573
</ItemGroup>
7674
<ItemGroup>
75+
<ProjectReference Include="..\..\..\Common\Commands.Common.Authentication\Commands.Common.Authentication.csproj">
76+
<Project>{d3804b64-c0d3-48f8-82ec-1f632f833c9e}</Project>
77+
<Name>Commands.Common.Authentication</Name>
78+
</ProjectReference>
7779
<ProjectReference Include="..\Commands.RecoveryServices.Backup.Models\Commands.RecoveryServices.Backup.Models.csproj">
7880
<Project>{30b92759-50b3-494e-b9f0-ec9a2ce9d57b}</Project>
7981
<Name>Commands.RecoveryServices.Backup.Models</Name>

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/Commands.RecoveryServices.Backup.Test.csproj

Lines changed: 52 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,38 +36,78 @@
3636
<Reference Include="Microsoft.Azure.Common">
3737
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
3838
</Reference>
39-
<Reference Include="Microsoft.Azure.Common.Authentication">
40-
<HintPath>..\..\..\packages\Microsoft.Azure.Common.Authentication.1.6.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
39+
<Reference Include="Microsoft.Azure.Common.NetFramework, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
40+
<SpecificVersion>False</SpecificVersion>
41+
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
4142
</Reference>
4243
<Reference Include="Microsoft.Azure.Management.RecoveryServicesBackupManagement">
4344
<HintPath>..\Commands.RecoveryServices.Backup.HydraAdapter\Resources\Microsoft.Azure.Management.RecoveryServicesBackupManagement.dll</HintPath>
4445
</Reference>
45-
<Reference Include="Microsoft.Azure.Test.Framework, Version=1.0.5568.26003, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
46+
<Reference Include="Microsoft.Azure.ResourceManager">
47+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.19.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
48+
</Reference>
49+
<Reference Include="Microsoft.Azure.Test.Framework, Version=1.0.5799.28345, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4650
<SpecificVersion>False</SpecificVersion>
47-
<HintPath>..\..\..\packages\Microsoft.Azure.Test.Framework.1.0.5799.28345-prerelease\lib\net45\Microsoft.Azure.Test.Framework.dll</HintPath>
51+
<HintPath>..\..\..\packages\Microsoft.Azure.Test.Framework.1.0.5896.19355-prerelease\lib\net45\Microsoft.Azure.Test.Framework.dll</HintPath>
4852
</Reference>
49-
<Reference Include="Microsoft.Azure.Test.HttpRecorder">
50-
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.0.5799.28345-prerelease\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
53+
<Reference Include="Microsoft.Azure.Test.HttpRecorder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
54+
<SpecificVersion>False</SpecificVersion>
55+
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.0.5896.19355-prerelease\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
56+
</Reference>
57+
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.18.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
58+
<SpecificVersion>False</SpecificVersion>
59+
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
5160
</Reference>
5261
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms, Version=2.12.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5362
<SpecificVersion>False</SpecificVersion>
5463
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
5564
</Reference>
65+
<Reference Include="Microsoft.Rest.ClientRuntime, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
66+
<SpecificVersion>False</SpecificVersion>
67+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.1.0\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
68+
</Reference>
69+
<Reference Include="Microsoft.WindowsAzure.Management, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70+
<SpecificVersion>False</SpecificVersion>
71+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
72+
</Reference>
73+
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
74+
<SpecificVersion>False</SpecificVersion>
75+
<HintPath>..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
76+
</Reference>
5677
<Reference Include="System" />
5778
<Reference Include="System.Configuration" />
5879
<Reference Include="System.Core" />
5980
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6081
<SpecificVersion>False</SpecificVersion>
6182
<HintPath>C:\Windows\Microsoft.NET\assembly\GAC_MSIL\System.Management.Automation\v4.0_3.0.0.0__31bf3856ad364e35\System.Management.Automation.dll</HintPath>
6283
</Reference>
84+
<Reference Include="System.Net" />
6385
<Reference Include="System.Net.Http" />
86+
<Reference Include="System.Net.Http.Extensions">
87+
<HintPath>..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Extensions.dll</HintPath>
88+
</Reference>
89+
<Reference Include="System.Net.Http.Primitives">
90+
<HintPath>..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll</HintPath>
91+
</Reference>
92+
<Reference Include="System.Net.Http.WebRequest" />
93+
<Reference Include="System.Runtime.Serialization" />
6494
<Reference Include="System.Xml.Linq" />
6595
<Reference Include="System.Data.DataSetExtensions" />
6696
<Reference Include="Microsoft.CSharp" />
6797
<Reference Include="System.Data" />
6898
<Reference Include="System.Xml" />
69-
<Reference Include="xunit">
70-
<HintPath>..\..\..\packages\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
99+
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
100+
<SpecificVersion>False</SpecificVersion>
101+
<HintPath>..\..\..\packages\xunit.runner.visualstudio.2.1.0\build\_common\xunit.abstractions.dll</HintPath>
102+
</Reference>
103+
<Reference Include="xunit.assert">
104+
<HintPath>..\..\..\packages\xunit.assert.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.assert.dll</HintPath>
105+
</Reference>
106+
<Reference Include="xunit.core">
107+
<HintPath>..\..\..\packages\xunit.extensibility.core.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.core.dll</HintPath>
108+
</Reference>
109+
<Reference Include="xunit.execution.desktop">
110+
<HintPath>..\..\..\packages\xunit.core.2.1.0\build\_desktop\xunit.execution.desktop.dll</HintPath>
71111
</Reference>
72112
</ItemGroup>
73113
<ItemGroup>
@@ -122,6 +162,10 @@
122162
</ItemGroup>
123163
<ItemGroup />
124164
<ItemGroup>
165+
<ProjectReference Include="..\..\..\Common\Commands.Common.Authentication\Commands.Common.Authentication.csproj">
166+
<Project>{d3804b64-c0d3-48f8-82ec-1f632f833c9e}</Project>
167+
<Name>Commands.Common.Authentication</Name>
168+
</ProjectReference>
125169
<ProjectReference Include="..\..\Common\Commands.ScenarioTests.ResourceManager.Common\Commands.ScenarioTests.ResourceManager.Common.csproj">
126170
<Project>{3436a126-edc9-4060-8952-9a1be34cdd95}</Project>
127171
<Name>Commands.ScenarioTests.ResourceManager.Common</Name>

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/TestsBase.cs

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15-
using Microsoft.Azure.Common.Authentication;
1615
using Microsoft.Azure.Test;
1716
using Microsoft.Azure.Test.HttpRecorder;
1817
using Microsoft.WindowsAzure.Commands.ScenarioTest;
@@ -25,6 +24,8 @@
2524
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
2625
using Microsoft.Azure.Management.RecoveryServices.Backup;
2726
using Hyak.Common;
27+
using Microsoft.Azure.Commands.Common.Authentication;
28+
using System.Collections.Generic;
2829

2930
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests
3031
{
@@ -58,6 +59,15 @@ protected void SetupManagementClients()
5859

5960
protected void RunPowerShellTest(string testFolderName, params string[] scripts)
6061
{
62+
Dictionary<string, string> providers = new Dictionary<string, string>();
63+
providers.Add("Microsoft.Resources", null);
64+
providers.Add("Microsoft.Features", null);
65+
providers.Add("Microsoft.Authorization", null);
66+
providers.Add("Microsoft.Compute", null);
67+
var providersToIgnore = new Dictionary<string, string>();
68+
providersToIgnore.Add("Microsoft.Azure.Management.Resources.ResourceManagementClient", "2016-02-01");
69+
HttpMockServer.Matcher = new PermissiveRecordMatcherWithApiExclusion(true, providers, providersToIgnore);
70+
6171
using (UndoContext context = UndoContext.Current)
6272
{
6373
context.Start(TestUtilities.GetCallingClass(2), TestUtilities.GetCurrentMethodName(2));
@@ -139,8 +149,8 @@ public static T GetServiceClient<T>(TestEnvironmentFactory factory, RecoveryServ
139149
PropertyInfo property2 = typeof(T).GetProperty("LongRunningOperationRetryTimeout", typeof(int));
140150
if (property1 != (PropertyInfo)null && property2 != (PropertyInfo)null)
141151
{
142-
property1.SetValue((object)obj2, (object)0);
143-
property2.SetValue((object)obj2, (object)0);
152+
property1.SetValue((object)obj2, (object)-1);
153+
property2.SetValue((object)obj2, (object)-1);
144154
}
145155
}
146156
return obj2;

‎src/ResourceManager/RecoveryServices.Backup/RecoveryServices.Backup.sln

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.31101.0
4+
VisualStudioVersion = 12.0.40629.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManager.Common", "..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj", "{3819D8A7-C62C-4C47-8DDD-0332D9CE1252}"
77
EndProject
@@ -27,6 +27,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTests.Reso
2727
EndProject
2828
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.RecoveryServices.Backup.Logger", "Commands.RecoveryServices.Backup.Logger\Commands.RecoveryServices.Backup.Logger.csproj", "{5E675749-6139-464A-904C-59C0FFDFEC82}"
2929
EndProject
30+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common.Authentication", "..\..\Common\Commands.Common.Authentication\Commands.Common.Authentication.csproj", "{D3804B64-C0D3-48F8-82EC-1F632F833C9E}"
31+
EndProject
3032
Global
3133
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3234
Debug|Any CPU = Debug|Any CPU
@@ -77,6 +79,10 @@ Global
7779
{5E675749-6139-464A-904C-59C0FFDFEC82}.Debug|Any CPU.Build.0 = Debug|Any CPU
7880
{5E675749-6139-464A-904C-59C0FFDFEC82}.Release|Any CPU.ActiveCfg = Release|Any CPU
7981
{5E675749-6139-464A-904C-59C0FFDFEC82}.Release|Any CPU.Build.0 = Release|Any CPU
82+
{D3804B64-C0D3-48F8-82EC-1F632F833C9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
83+
{D3804B64-C0D3-48F8-82EC-1F632F833C9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
84+
{D3804B64-C0D3-48F8-82EC-1F632F833C9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
85+
{D3804B64-C0D3-48F8-82EC-1F632F833C9E}.Release|Any CPU.Build.0 = Release|Any CPU
8086
EndGlobalSection
8187
GlobalSection(SolutionProperties) = preSolution
8288
HideSolutionNode = FALSE

‎src/ResourceManager/RecoveryServices.Backup/RecoveryServicesBackupCmdletBase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
using Hyak.Common;
1616
using Microsoft.Azure.Commands.RecoveryServices.Backup.Properties;
1717
using Microsoft.Azure.Commands.ResourceManager.Common;
18-
using Microsoft.Azure.Common.Authentication;
19-
using Microsoft.Azure.Common.Authentication.Models;
2018
using Microsoft.WindowsAzure.Management.Scheduler;
2119
using System;
2220
using System.Collections.Generic;
@@ -30,6 +28,8 @@
3028
using Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers;
3129
using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
3230
using System.Threading;
31+
using Microsoft.Azure.Commands.Common.Authentication;
32+
using Microsoft.Azure.Commands.Common.Authentication.Models;
3333

3434
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
3535
{

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Common/PSRecoveryServicesClient.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public RecoveryServicesManagementClient GetRecoveryServicesClient
7373
"Microsoft.StyleCop.CSharp.MaintainabilityRules",
7474
"SA1401:FieldsMustBePrivate",
7575
Justification = "For Resource Credentials.")]
76-
public static ARSVault arsVaultCreds = new ARSVault();
76+
public static ARSVault arsVault = new ARSVault();
7777
/// <summary>
7878
/// Recovery Services client.
7979
/// </summary>

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Utilities/Utilities.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,13 +125,13 @@ public static void UpdateCurrentVaultContext(ASRVaultCreds arsVaultCreds)
125125
/// <summary>
126126
/// Updates current Vault context.
127127
/// </summary>
128-
/// <param name="arsVaultCreds">ARS Vault credentials</param>
129-
public static void UpdateCurrentVaultContext(ARSVault arsVaultCreds)
128+
/// <param name="arsVault">ARS Vault</param>
129+
public static void UpdateCurrentVaultContext(ARSVault arsVault)
130130
{
131131
object updateVaultContextOneAtATime = new object();
132132
lock (updateVaultContextOneAtATime)
133133
{
134-
PSRecoveryServicesClient.arsVaultCreds = arsVaultCreds;
134+
PSRecoveryServicesClient.arsVault = arsVault;
135135
}
136136
}
137137

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Vault/SetAzureRmRecoveryServicesVaultContext.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
using System.Linq;
1717
using System.Management.Automation;
1818
using System.Security.Cryptography.X509Certificates;
19-
using Microsoft.Azure.Common.Authentication.Models;
2019
using Microsoft.Azure.Portal.RecoveryServices.Models.Common;
2120

2221
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets

0 commit comments

Comments
 (0)