Skip to content

Commit 229f022

Browse files
hyonholeehyonholee
committed
Merge branch 'dev' of https://github.com/AzureRT/azure-powershell into dev
2 parents 41952e4 + db5b827 commit 229f022

File tree

5 files changed

+8
-86
lines changed

5 files changed

+8
-86
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 0 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -424,15 +424,6 @@
424424
<Component Id="cmp4B5A611FF761BA928A53E0E56FB58D78" Guid="*">
425425
<File Id="filC0B34604D99CDA8D27ABE83B32E7EC4F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Batch\Microsoft.Azure.ResourceManager.dll" />
426426
</Component>
427-
<Component Id="cmpAA90187095E5AA5387ECB19F691F5BB3" Guid="*">
428-
<File Id="fil35E846093D2F7E71B72D899F4C691DC6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Batch\Microsoft.Data.Edm.dll" />
429-
</Component>
430-
<Component Id="cmp21A3A51E9F4CEE163E61AAB46ECC1AA4" Guid="*">
431-
<File Id="fil56735A30757F600A1227FFEC41D7E470" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Batch\Microsoft.Data.OData.dll" />
432-
</Component>
433-
<Component Id="cmp910CAC5301CCF2C18FB054DA61B50348" Guid="*">
434-
<File Id="fil4AE7A06E433E850F1DFCFA72F18E8498" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Batch\Microsoft.Data.Services.Client.dll" />
435-
</Component>
436427
<Component Id="cmpD762051962F7D3051FBC9CF971AE9325" Guid="*">
437428
<File Id="filD170B3D4C2E8B2B0B678728E72F55510" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Batch\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
438429
</Component>
@@ -1043,9 +1034,6 @@
10431034
<Component Id="cmp5CA8859F1C394CC8A63A4EB72FC74FC5" Guid="*">
10441035
<File Id="filEC6AAF54BEC495014A7CFFC0EE6735FC" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Dns\System.Net.Http.Primitives.dll" />
10451036
</Component>
1046-
<Component Id="cmp1C6E67BF7E6A2932D8205DEE8EEBD5BD" Guid="*">
1047-
<File Id="fil314E3FA63E77056454C11E4C8D25F794" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Dns\System.Spatial.dll" />
1048-
</Component>
10491037
</Directory>
10501038
<Directory Id="dir875FB1A75D2DE0680E79C9DE6850ECDB" Name="AzureRM.HDInsight">
10511039
<Component Id="cmp9D190B38C7D3A893B21DFAB4A757C98B" Guid="*">
@@ -1182,15 +1170,6 @@
11821170
<Component Id="cmpFB65291F937077CCA80689CFC3727B1A" Guid="*">
11831171
<File Id="fil87446160E4B0238E50AB62B792E935C1" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.Azure.ResourceManager.dll" />
11841172
</Component>
1185-
<Component Id="cmpBE9F3609F315D89DE19004AC7E629A12" Guid="*">
1186-
<File Id="filFED788047F438C9397D43C0F1F5AA7A6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.Data.Edm.dll" />
1187-
</Component>
1188-
<Component Id="cmp45E9D11A1E7E15837ADBF6220B8DFD7E" Guid="*">
1189-
<File Id="fil68988BF4794EF93E735022A7BFF20997" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.Data.OData.dll" />
1190-
</Component>
1191-
<Component Id="cmp95FB8932F45A41F4AF974FB6F565B75C" Guid="*">
1192-
<File Id="filFA94C707722DFF90E974DB5BC3D375E1" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.Data.Services.Client.dll" />
1193-
</Component>
11941173
<Component Id="cmpC9466F4B506234EBA66C4F1204C0CD5D" Guid="*">
11951174
<File Id="fil923B64CC593E3BC837C3F9B6227E8342" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
11961175
</Component>
@@ -1221,9 +1200,6 @@
12211200
<Component Id="cmp7781002FCC3D1B3F0519A286C3E916E9" Guid="*">
12221201
<File Id="fil7A9F66CF061583CA28B0DA562E249A8B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Newtonsoft.Json.dll" />
12231202
</Component>
1224-
<Component Id="cmp09C89A8B21C5D2C4595F1D35C982F73B" Guid="*">
1225-
<File Id="filF161B346D39B2AA99CBA7434BC7AD7C6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\System.Spatial.dll" />
1226-
</Component>
12271203
</Directory>
12281204
<Directory Id="dirA5BF4C5FC88CC5FD4E43A0FA840806C7" Name="AzureRM.KeyVault">
12291205
<Component Id="cmpFEE86D031CEC182D160B80C5EC00914F" Guid="*">
@@ -3283,15 +3259,6 @@
32833259
<Component Id="cmp63E7146E10A0CADBB072FDBAAEC2FDB2" Guid="*">
32843260
<File Id="fil92D5EE3C92A0580B16CAF05E40354F28" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\HDInsight\Microsoft.Azure.ResourceManager.dll" />
32853261
</Component>
3286-
<Component Id="cmpF2A2CF41D51D7B7599694EC16CFEB929" Guid="*">
3287-
<File Id="fil747B54862A32E5698E1DEA8A65F213E8" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\HDInsight\Microsoft.Data.Edm.dll" />
3288-
</Component>
3289-
<Component Id="cmpFC1978EF7F3366DA07E6556C3996E222" Guid="*">
3290-
<File Id="filEEA2DF7E7352E4B31BEAF60992A0924C" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\HDInsight\Microsoft.Data.OData.dll" />
3291-
</Component>
3292-
<Component Id="cmp28569D5EC54C4DFB98F0AA7AEAA80A06" Guid="*">
3293-
<File Id="filA5775C65133C1C715F12B6455DF2B579" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\HDInsight\Microsoft.Data.Services.Client.dll" />
3294-
</Component>
32953262
<Component Id="cmp60E2E53B6F8278E75ED2802429D310E1" Guid="*">
32963263
<File Id="fil52ED89C7AE2A63FA4E00898DC11F7BE4" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\HDInsight\Microsoft.Hadoop.Client.dll" />
32973264
</Component>
@@ -3364,9 +3331,6 @@
33643331
<Component Id="cmpB5F241C0863E789EFB3F330351AF23A0" Guid="*">
33653332
<File Id="fil60AA319E7F0F95D6BB5C58BA1A9AA2C2" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\HDInsight\System.Net.Http.Primitives.dll" />
33663333
</Component>
3367-
<Component Id="cmp403B76F26F2AB3EBEC4773C05C428394" Guid="*">
3368-
<File Id="fil373F065124C23A72C9E236C56A1E1A9E" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\HDInsight\System.Spatial.dll" />
3369-
</Component>
33703334
</Directory>
33713335
<Directory Id="dir4501232E94E5832FB137CF7EEB279CFB" Name="ManagedCache">
33723336
<Component Id="cmpB01EC52324F9B87FF652ADBB432533AB" Guid="*">
@@ -3408,15 +3372,6 @@
34083372
<Component Id="cmpF337D07C78C9EA8AF46D4FBA46E2B659" Guid="*">
34093373
<File Id="fil9E957A7E9D6730B23D2E5694BBFEF91B" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\ManagedCache\Microsoft.Azure.ResourceManager.dll" />
34103374
</Component>
3411-
<Component Id="cmp5C260DEA6AC958F28815FC05C0529EBE" Guid="*">
3412-
<File Id="filCB564CD4C19E4F4280D4D2205A9D2A6A" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\ManagedCache\Microsoft.Data.Edm.dll" />
3413-
</Component>
3414-
<Component Id="cmp451B04CD73B2F71A2D07A8A8DF6CBAAF" Guid="*">
3415-
<File Id="fil7B6869F0C4B2481323EF6A307E909A51" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\ManagedCache\Microsoft.Data.OData.dll" />
3416-
</Component>
3417-
<Component Id="cmp37AEE55609EF0179FA6CCAC3F5BEA6B6" Guid="*">
3418-
<File Id="fil4C54C1F9ABFB82A4884B25B943ED8BEF" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\ManagedCache\Microsoft.Data.Services.Client.dll" />
3419-
</Component>
34203375
<Component Id="cmpA9DCE4C4AAA52757D207BD0F466BC24A" Guid="*">
34213376
<File Id="fil755594D034F6EFF5587AAFF9015BC357" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\ManagedCache\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
34223377
</Component>
@@ -3528,9 +3483,6 @@
35283483
<Component Id="cmp7903310D9ED46439ADA5543A8B0ACF26" Guid="*">
35293484
<File Id="fil7BE11710378AE344174EB73DDA54B833" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\ManagedCache\System.Net.Http.Primitives.dll" />
35303485
</Component>
3531-
<Component Id="cmp934EB819CA37436B5319766B852D644F" Guid="*">
3532-
<File Id="filEB2DFF7B431F3A391BD8990DCE85F5AF" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\ManagedCache\System.Spatial.dll" />
3533-
</Component>
35343486
</Directory>
35353487
<Directory Id="dirB6EAA00795A4255275D859D02C9B7987" Name="Networking">
35363488
<Component Id="cmpAB9D9954A1CC38F64EDAC5266657C35E" Guid="*">
@@ -4777,15 +4729,6 @@
47774729
<Component Id="cmp0EDB1564DE086E770DD3ECB2B7FEB447" Guid="*">
47784730
<File Id="filFC54762F4AB73FDEEF6DA3A02DAF9397" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\TrafficManager\Microsoft.Azure.ResourceManager.dll" />
47794731
</Component>
4780-
<Component Id="cmp263057B18638FB187A5700638569DE42" Guid="*">
4781-
<File Id="fil03F32EBDEB2A94F91C1C2533AB02F408" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\TrafficManager\Microsoft.Data.Edm.dll" />
4782-
</Component>
4783-
<Component Id="cmpC2DA894C31CA50679503117C1719C189" Guid="*">
4784-
<File Id="fil7F5AE1A7477E8B8705B6EAC22A60497A" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\TrafficManager\Microsoft.Data.OData.dll" />
4785-
</Component>
4786-
<Component Id="cmp524041AD63DF03362C068747CEA96CBE" Guid="*">
4787-
<File Id="filD77EE0318ADD1D79ED86BE1EE07B76E2" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\TrafficManager\Microsoft.Data.Services.Client.dll" />
4788-
</Component>
47894732
<Component Id="cmpADB0A5D432BB28B37D303E63BD6437D0" Guid="*">
47904733
<File Id="fil00B011D80F30A072C1DC6161DD67B701" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\TrafficManager\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
47914734
</Component>
@@ -4840,9 +4783,6 @@
48404783
<Component Id="cmp437552C69C46293AC9C3C5D9957B2610" Guid="*">
48414784
<File Id="fil4B6AC28013BAB58497CB01750F26CE4D" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\TrafficManager\System.Net.Http.Primitives.dll" />
48424785
</Component>
4843-
<Component Id="cmp6951A3BE95CF83713141413FC01F01B7" Guid="*">
4844-
<File Id="fil78208B5FC7418691723B644AA1EC2C58" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\TrafficManager\System.Spatial.dll" />
4845-
</Component>
48464786
</Directory>
48474787
</Directory>
48484788
</Directory>
@@ -4987,9 +4927,6 @@
49874927
<ComponentRef Id="cmp0660CA6282A998031B7B868E7AA9BFFE" />
49884928
<ComponentRef Id="cmp557AD28EA410808B3805EFE4AA73C977" />
49894929
<ComponentRef Id="cmp4B5A611FF761BA928A53E0E56FB58D78" />
4990-
<ComponentRef Id="cmpAA90187095E5AA5387ECB19F691F5BB3" />
4991-
<ComponentRef Id="cmp21A3A51E9F4CEE163E61AAB46ECC1AA4" />
4992-
<ComponentRef Id="cmp910CAC5301CCF2C18FB054DA61B50348" />
49934930
<ComponentRef Id="cmpD762051962F7D3051FBC9CF971AE9325" />
49944931
<ComponentRef Id="cmpB11D8DF03DCC6DF2571C30776714A652" />
49954932
<ComponentRef Id="cmpEC720F6E3871A33FE098F6CEB7617D8F" />
@@ -5190,7 +5127,6 @@
51905127
<ComponentRef Id="cmp1EF453FBA41501E23AAA6802E73E9233" />
51915128
<ComponentRef Id="cmp0808A2318368CE9A17D91C37E59D1104" />
51925129
<ComponentRef Id="cmp5CA8859F1C394CC8A63A4EB72FC74FC5" />
5193-
<ComponentRef Id="cmp1C6E67BF7E6A2932D8205DEE8EEBD5BD" />
51945130
<ComponentRef Id="cmp9D190B38C7D3A893B21DFAB4A757C98B" />
51955131
<ComponentRef Id="cmp04AE56BE6D07E336F237E3D542B1F69D" />
51965132
<ComponentRef Id="cmp6808C337F61F07015FF34B00DDA3D4E7" />
@@ -5235,9 +5171,6 @@
52355171
<ComponentRef Id="cmp19A1422310791548B2EE9CC01D0E80AB" />
52365172
<ComponentRef Id="cmpAB0BE651457D19885EE5BD5615E283A9" />
52375173
<ComponentRef Id="cmpFB65291F937077CCA80689CFC3727B1A" />
5238-
<ComponentRef Id="cmpBE9F3609F315D89DE19004AC7E629A12" />
5239-
<ComponentRef Id="cmp45E9D11A1E7E15837ADBF6220B8DFD7E" />
5240-
<ComponentRef Id="cmp95FB8932F45A41F4AF974FB6F565B75C" />
52415174
<ComponentRef Id="cmpC9466F4B506234EBA66C4F1204C0CD5D" />
52425175
<ComponentRef Id="cmp734CB1D0853F1EC3CC1EA7E5A0C5D408" />
52435176
<ComponentRef Id="cmpFC33C3BBB9DE3FDA41AAC3F0C1652F45" />
@@ -5248,7 +5181,6 @@
52485181
<ComponentRef Id="cmpE2870DA9D9EABA49600629B6564747C7" />
52495182
<ComponentRef Id="cmpD0CBA309930AE994CD67A5EB7C9B5B10" />
52505183
<ComponentRef Id="cmp7781002FCC3D1B3F0519A286C3E916E9" />
5251-
<ComponentRef Id="cmp09C89A8B21C5D2C4595F1D35C982F73B" />
52525184
<ComponentRef Id="cmpFEE86D031CEC182D160B80C5EC00914F" />
52535185
<ComponentRef Id="cmpAB04FC1EEE889CA90013762F64086BFF" />
52545186
<ComponentRef Id="cmp4714276292444ADF7D34F509F31C8102" />
@@ -5920,9 +5852,6 @@
59205852
<ComponentRef Id="cmp524E28243CC9788C41819437014F3F7D" />
59215853
<ComponentRef Id="cmp0165D93E848BF589D3E0D3863617F9F0" />
59225854
<ComponentRef Id="cmp63E7146E10A0CADBB072FDBAAEC2FDB2" />
5923-
<ComponentRef Id="cmpF2A2CF41D51D7B7599694EC16CFEB929" />
5924-
<ComponentRef Id="cmpFC1978EF7F3366DA07E6556C3996E222" />
5925-
<ComponentRef Id="cmp28569D5EC54C4DFB98F0AA7AEAA80A06" />
59265855
<ComponentRef Id="cmp60E2E53B6F8278E75ED2802429D310E1" />
59275856
<ComponentRef Id="cmpD5B9EE259A4CDEA7EAC00BA0091C1476" />
59285857
<ComponentRef Id="cmp92AC7835568FE24FCE3B6A164449D551" />
@@ -5947,7 +5876,6 @@
59475876
<ComponentRef Id="cmp5851F3FD2B1BC67F7317793A7E1DA181" />
59485877
<ComponentRef Id="cmp25AA66AC9287E1B016E67611359195B6" />
59495878
<ComponentRef Id="cmpB5F241C0863E789EFB3F330351AF23A0" />
5950-
<ComponentRef Id="cmp403B76F26F2AB3EBEC4773C05C428394" />
59515879
<ComponentRef Id="cmpB01EC52324F9B87FF652ADBB432533AB" />
59525880
<ComponentRef Id="cmpB47082650A3E15796EEFB9414EDA4945" />
59535881
<ComponentRef Id="cmp8012F0215BB802A4015A5806B7E769F6" />
@@ -5961,9 +5889,6 @@
59615889
<ComponentRef Id="cmp8E18C5784C3EFBC582E3939340E3CD6D" />
59625890
<ComponentRef Id="cmp52E4780277F8BEC67754F72B580F93A6" />
59635891
<ComponentRef Id="cmpF337D07C78C9EA8AF46D4FBA46E2B659" />
5964-
<ComponentRef Id="cmp5C260DEA6AC958F28815FC05C0529EBE" />
5965-
<ComponentRef Id="cmp451B04CD73B2F71A2D07A8A8DF6CBAAF" />
5966-
<ComponentRef Id="cmp37AEE55609EF0179FA6CCAC3F5BEA6B6" />
59675892
<ComponentRef Id="cmpA9DCE4C4AAA52757D207BD0F466BC24A" />
59685893
<ComponentRef Id="cmp1990614812866B1F94DEAFC26A5DADF1" />
59695894
<ComponentRef Id="cmpCB56FA3168A825E2E637AADB54A2FF85" />
@@ -6001,7 +5926,6 @@
60015926
<ComponentRef Id="cmp778481F5B466AD6013B4210ED68B3172" />
60025927
<ComponentRef Id="cmp55295A0B8E60D13D174BE7545CE6CC5F" />
60035928
<ComponentRef Id="cmp7903310D9ED46439ADA5543A8B0ACF26" />
6004-
<ComponentRef Id="cmp934EB819CA37436B5319766B852D644F" />
60055929
<ComponentRef Id="cmpAB9D9954A1CC38F64EDAC5266657C35E" />
60065930
<ComponentRef Id="cmpB2A7275C2B928AA4B05A2C6CCAEDB373" />
60075931
<ComponentRef Id="cmpE341C9178CD349DCB605EB78561663C9" />
@@ -6392,9 +6316,6 @@
63926316
<ComponentRef Id="cmp0DBA9B291A7405C6A2536BF95D2BB5F2" />
63936317
<ComponentRef Id="cmp60C52F8E3D2C4A2FBFA3AC5E7544E17F" />
63946318
<ComponentRef Id="cmp0EDB1564DE086E770DD3ECB2B7FEB447" />
6395-
<ComponentRef Id="cmp263057B18638FB187A5700638569DE42" />
6396-
<ComponentRef Id="cmpC2DA894C31CA50679503117C1719C189" />
6397-
<ComponentRef Id="cmp524041AD63DF03362C068747CEA96CBE" />
63986319
<ComponentRef Id="cmpADB0A5D432BB28B37D303E63BD6437D0" />
63996320
<ComponentRef Id="cmpFE6FBB91E9CD50DF93CD91D34D39E1CD" />
64006321
<ComponentRef Id="cmp49D41D961F1729298835FA55BF445BBC" />
@@ -6413,7 +6334,6 @@
64136334
<ComponentRef Id="cmp95E0D72A3E27A384023782F86C3DE16F" />
64146335
<ComponentRef Id="cmp0398CB806B4098B30E7FB0A02E7AD98C" />
64156336
<ComponentRef Id="cmp437552C69C46293AC9C3C5D9957B2610" />
6416-
<ComponentRef Id="cmp6951A3BE95CF83713141413FC01F01B7" />
64176337
</ComponentGroup>
64186338
</Fragment>
64196339
</Include>

‎src/ResourceManager/Compute/Commands.Compute.Test/Common/ComputeTestController.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ private void SetupManagementClients(RestTestFramework.MockContext context)
161161
NetworkManagementClient = this.GetNetworkManagementClientClient(context);
162162
ComputeManagementClient = GetComputeManagementClient(context);
163163
AuthorizationManagementClient = GetAuthorizationManagementClient();
164-
GraphClient = GetGraphClient();
164+
// GraphClient = GetGraphClient();
165165

166166
helper.SetupManagementClients(
167167
ResourceManagementClient,
@@ -171,8 +171,8 @@ private void SetupManagementClients(RestTestFramework.MockContext context)
171171
//eventsClient,
172172
NetworkManagementClient,
173173
ComputeManagementClient,
174-
AuthorizationManagementClient,
175-
GraphClient);
174+
AuthorizationManagementClient);
175+
// GraphClient);
176176
}
177177

178178
private GraphRbacManagementClient GetGraphClient()

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/PIRTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -342,12 +342,12 @@ public void AzurePlatformVMImageScenarioTest()
342342

343343
private void SwitchToPublisher()
344344
{
345-
vmPowershellCmdlets.SetDefaultAzureSubscription(publisher);
345+
vmPowershellCmdlets.SetDefaultAzureSubscription(publisherSubId);
346346
}
347347

348348
private void SwitchToNormalUser()
349349
{
350-
vmPowershellCmdlets.SetDefaultAzureSubscription(normaluser);
350+
vmPowershellCmdlets.SetDefaultAzureSubscription(normaluserSubId);
351351
}
352352

353353
private void WaitForReplicationComplete(string imageName)

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ protected static void ReImportSubscription()
341341
{
342342
// Re-import the subscription.
343343
vmPowershellCmdlets.ImportAzurePublishSettingsFile();
344-
vmPowershellCmdlets.SetDefaultAzureSubscription(CredentialHelper.DefaultSubscriptionName);
344+
vmPowershellCmdlets.SetDefaultAzureSubscription(defaultAzureSubscription.SubscriptionId);
345345
vmPowershellCmdlets.SetAzureSubscription(defaultAzureSubscription.SubscriptionId, defaultAzureSubscription.CurrentStorageAccountName);
346346
}
347347

0 commit comments

Comments
 (0)