Skip to content

Commit c613b91

Browse files
markcowlmarkcowl
authored
Merge pull request #2516 from hovsepm/dev_clean
[#2306] AzureResourceManager.psd1 is included in several PS packages
2 parents 9bcda5b + 78dcab1 commit c613b91

File tree

10 files changed

+34
-247
lines changed

10 files changed

+34
-247
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -645,9 +645,6 @@
645645
<Component Id="cmpD2516E302D41812368A84BD6010FB066" Guid="*">
646646
<File Id="filEBA6A8A31DD00604D785E38F8379CCC0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\AutoMapper.dll" />
647647
</Component>
648-
<Component Id="cmpD288F9671FEAE346EF3A1FAF2D98C7EC" Guid="*">
649-
<File Id="filE254185AB3866CEF5D2C5C3A835C029A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\AzureResourceManager.psd1" />
650-
</Component>
651648
<Component Id="cmp594709EB2E69BD7173BC8833BE2061B4" Guid="*">
652649
<File Id="filEF7117E1317C1E3E14DF115DF4490BA3" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\AzureRM.Compute.psd1" />
653650
</Component>
@@ -1446,9 +1443,6 @@
14461443
</Component>
14471444
</Directory>
14481445
<Directory Id="dirA5BF4C5FC88CC5FD4E43A0FA840806C7" Name="AzureRM.KeyVault">
1449-
<Component Id="cmpFEE86D031CEC182D160B80C5EC00914F" Guid="*">
1450-
<File Id="fil6DABB515D371B3CE610505D7BF92C2F4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\AzureResourceManager.psd1" />
1451-
</Component>
14521446
<Component Id="cmpAB04FC1EEE889CA90013762F64086BFF" Guid="*">
14531447
<File Id="fil83ACE69C51FD4368547AE421E6E1E09A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\AzureRM.KeyVault.psd1" />
14541448
</Component>
@@ -1595,9 +1589,6 @@
15951589
</Component>
15961590
</Directory>
15971591
<Directory Id="dir95F6A3AD30BFB6FD9198425454B16108" Name="AzureRM.LogicApp">
1598-
<Component Id="cmp24514A3872F0DEB4309BFD9E92C4145F" Guid="*">
1599-
<File Id="filBB544DFF118D197314549481B935B950" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.LogicApp\AzureResourceManager.psd1" />
1600-
</Component>
16011592
<Component Id="cmp2BC048C87A71EBC0CB5EF453100E00AF" Guid="*">
16021593
<File Id="fil6E0EA9169FF3D88A5912B9657A28FFC0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.LogicApp\AzureRM.LogicApp.psd1" />
16031594
</Component>
@@ -1782,9 +1773,6 @@
17821773
<Component Id="cmp70B60DBD32D61BCA5715AB2D64131358" Guid="*">
17831774
<File Id="filF785DC83C86073F482446C70517349AF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Network\AutoMapper.Net4.dll" />
17841775
</Component>
1785-
<Component Id="cmp92653399A1E9659661E74CA982C1D16A" Guid="*">
1786-
<File Id="fil992649F341AABCD20ED06A605644123C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Network\AzureResourceManager.psd1" />
1787-
</Component>
17881776
<Component Id="cmp6E3EAD7F12BD99ACB19E0249804739D9" Guid="*">
17891777
<File Id="fil073D08239CE53D9BDD13AB4040BF2180" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Network\AzureRM.Network.psd1" />
17901778
</Component>
@@ -2758,9 +2746,6 @@
27582746
</Component>
27592747
</Directory>
27602748
<Directory Id="dirBA80E9DB8E2152CE322690719CF18460" Name="AzureRM.Sql">
2761-
<Component Id="cmpABAF8D1829695B54EE167D137802FE49" Guid="*">
2762-
<File Id="filDAC4590B1C55DF4558E19F4A6EEB8A22" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Sql\AzureResourceManager.psd1" />
2763-
</Component>
27642749
<Component Id="cmpDD0209B9F15287C06AF2A301A6DA9C67" Guid="*">
27652750
<File Id="filCA0336774210FEEAEDD1EA24F1465699" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Sql\AzureRM.Resources.psd1" />
27662751
</Component>
@@ -2913,9 +2898,6 @@
29132898
</Component>
29142899
</Directory>
29152900
<Directory Id="dir0F79C72718C45BA510EC2F8CB9AE064F" Name="AzureRM.Storage">
2916-
<Component Id="cmp3D2A9D83FC8C994C373CE6ED8587BDFB" Guid="*">
2917-
<File Id="fil248B3C493A709553BC8A9F07EBC95E8A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Storage\AzureResourceManager.psd1" />
2918-
</Component>
29192901
<Component Id="cmp60521804CF648610DFEE8873C98DF6FE" Guid="*">
29202902
<File Id="filFC489F6B6166573995DC7230724FFC47" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Storage\AzureRM.Resources.psd1" />
29212903
</Component>
@@ -3361,9 +3343,6 @@
33613343
</Component>
33623344
</Directory>
33633345
<Directory Id="dir71903E152B1EC7360B3834768786084D" Name="AzureRM.Websites">
3364-
<Component Id="cmp976F4BB0FDF13DD49710C6F49EC6155E" Guid="*">
3365-
<File Id="fil4CEC7BA75E9E4B270DB19F35611E2C89" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\AzureResourceManager.psd1" />
3366-
</Component>
33673346
<Component Id="cmp31CCE98DB6C5E1DB88E1B384C167D241" Guid="*">
33683347
<File Id="filE79F6A1D30ACBAD2611E711D647AA710" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\AzureRM.Resources.psd1" />
33693348
</Component>
@@ -5695,7 +5674,6 @@
56955674
<ComponentRef Id="cmp3D82D19F427B152BB3BB2BAD217958C2" />
56965675
<ComponentRef Id="cmpFDA0979F65585F21A39465A3177C778A" />
56975676
<ComponentRef Id="cmpD2516E302D41812368A84BD6010FB066" />
5698-
<ComponentRef Id="cmpD288F9671FEAE346EF3A1FAF2D98C7EC" />
56995677
<ComponentRef Id="cmp594709EB2E69BD7173BC8833BE2061B4" />
57005678
<ComponentRef Id="cmp62338AF9F953CEE8318F8EF07FDDF6AD" />
57015679
<ComponentRef Id="cmp30EDC6EA2C80A9FC62537EE1A73B699A" />
@@ -5956,7 +5934,6 @@
59565934
<ComponentRef Id="cmpD0CBA309930AE994CD67A5EB7C9B5B10" />
59575935
<ComponentRef Id="cmp7781002FCC3D1B3F0519A286C3E916E9" />
59585936
<ComponentRef Id="cmp09C89A8B21C5D2C4595F1D35C982F73B" />
5959-
<ComponentRef Id="cmpFEE86D031CEC182D160B80C5EC00914F" />
59605937
<ComponentRef Id="cmpAB04FC1EEE889CA90013762F64086BFF" />
59615938
<ComponentRef Id="cmp4714276292444ADF7D34F509F31C8102" />
59625939
<ComponentRef Id="cmp007494D6DDD084F46271414EDBAE4A28" />
@@ -6005,7 +5982,6 @@
60055982
<ComponentRef Id="cmp55A0977CC2E4CD91F6738FFD78449307" />
60065983
<ComponentRef Id="cmpD29EA01597258746011AE6EF9FC3D15A" />
60075984
<ComponentRef Id="cmp8EE8340753317C13D69F692E7E42B175" />
6008-
<ComponentRef Id="cmp24514A3872F0DEB4309BFD9E92C4145F" />
60095985
<ComponentRef Id="cmp2BC048C87A71EBC0CB5EF453100E00AF" />
60105986
<ComponentRef Id="cmp13747CF5FA04719E8EB6868EAB0E18B7" />
60115987
<ComponentRef Id="cmp0362FE47213976940F462CA25B10B16B" />
@@ -6066,7 +6042,6 @@
60666042
<ComponentRef Id="cmp5786485F44089C42878CE439EB85D475" />
60676043
<ComponentRef Id="cmp33F39A22183184A6B41F85DF085BAD29" />
60686044
<ComponentRef Id="cmp70B60DBD32D61BCA5715AB2D64131358" />
6069-
<ComponentRef Id="cmp92653399A1E9659661E74CA982C1D16A" />
60706045
<ComponentRef Id="cmp6E3EAD7F12BD99ACB19E0249804739D9" />
60716046
<ComponentRef Id="cmp38E15B299E627D81758AE975A1C5588F" />
60726047
<ComponentRef Id="cmp9F97686A6D38F8B72B2FB1D62529AF0F" />
@@ -6384,7 +6359,6 @@
63846359
<ComponentRef Id="cmp273975FE717E0BB68232E0CD3E70AA82" />
63856360
<ComponentRef Id="cmpC49EFF5B153B832A1B30B31544E0C17E" />
63866361
<ComponentRef Id="cmpD67A45515144EEB5AF6F9DD0C4B2BFDA" />
6387-
<ComponentRef Id="cmpABAF8D1829695B54EE167D137802FE49" />
63886362
<ComponentRef Id="cmpDD0209B9F15287C06AF2A301A6DA9C67" />
63896363
<ComponentRef Id="cmpB904935B70928974D5ABC88308A90047" />
63906364
<ComponentRef Id="cmp5C61554BD83089367CC25D6B8087BA72" />
@@ -6435,7 +6409,6 @@
64356409
<ComponentRef Id="cmp56F9151EB19BE7D5CE2655D19ADF5C9A" />
64366410
<ComponentRef Id="cmp39A46C3BD11947E08479BBD49CB20104" />
64376411
<ComponentRef Id="cmpC1352E11D4D3526DFA43840F587B64D9" />
6438-
<ComponentRef Id="cmp3D2A9D83FC8C994C373CE6ED8587BDFB" />
64396412
<ComponentRef Id="cmp60521804CF648610DFEE8873C98DF6FE" />
64406413
<ComponentRef Id="cmp4AFA8C6EDE02E2B9FC026EFD116FAFA7" />
64416414
<ComponentRef Id="cmp926FBB377170F25C198A076240F70BB6" />
@@ -6581,7 +6554,6 @@
65816554
<ComponentRef Id="cmp3AD5835A28E94C8EB2904782C63B95B4" />
65826555
<ComponentRef Id="cmp3CA816B036B1A48C5114288067BD2C34" />
65836556
<ComponentRef Id="cmp8162A7134D4C9EB5D49EC45591995C2B" />
6584-
<ComponentRef Id="cmp976F4BB0FDF13DD49710C6F49EC6155E" />
65856557
<ComponentRef Id="cmp31CCE98DB6C5E1DB88E1B384C167D241" />
65866558
<ComponentRef Id="cmp83791849FA3C29D4D8CCF5D3FFA24FC1" />
65876559
<ComponentRef Id="cmpF679AA745A78D9232AFA533AC5A06B55" />

‎src/Common/Commands.ScenarioTests.Common/EnvironmentSetupHelper.cs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -215,9 +215,10 @@ public void SetupModules(AzureModule mode, params string[] modules)
215215
if (mode == AzureModule.AzureProfile)
216216
{
217217
this.modules.Add(Path.Combine(PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1"));
218+
this.modules.Add(Path.Combine(PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Resources.psd1"));
219+
this.modules.Add(Path.Combine(PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Tags.psd1"));
218220
this.modules.Add(Path.Combine(PackageDirectory, @"Storage\Azure.Storage\Azure.Storage.psd1"));
219221
this.modules.Add(Path.Combine(PackageDirectory, @"ServiceManagement\Azure\Azure.psd1"));
220-
this.modules.Add(Path.Combine(PackageDirectory, @"ResourceManager\AzureResourceManager\AzureResourceManager.psd1"));
221222
}
222223
else if (mode == AzureModule.AzureServiceManagement)
223224
{
@@ -227,7 +228,9 @@ public void SetupModules(AzureModule mode, params string[] modules)
227228
}
228229
else if (mode == AzureModule.AzureResourceManager)
229230
{
230-
this.modules.Add(Path.Combine(PackageDirectory, @"ResourceManager\AzureResourceManager\AzureResourceManager.psd1"));
231+
this.modules.Add(Path.Combine(PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1"));
232+
this.modules.Add(Path.Combine(PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Resources.psd1"));
233+
this.modules.Add(Path.Combine(PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Tags.psd1"));
231234
}
232235
else
233236
{
@@ -244,19 +247,24 @@ public void SetupModulesFromCommon(AzureModule mode, params string[] modules)
244247
if (mode == AzureModule.AzureProfile)
245248
{
246249
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1"));
250+
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Resources.psd1"));
251+
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Tags.psd1"));
247252
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"Storage\Azure.Storage\Azure.Storage.psd1"));
248253
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ServiceManagement\Azure\Azure.psd1"));
249-
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureResourceManager.psd1"));
250254
}
251255
else if (mode == AzureModule.AzureServiceManagement)
252256
{
253257
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1"));
258+
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Resources.psd1"));
259+
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Tags.psd1"));
254260
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"Storage\Azure.Storage\Azure.Storage.psd1"));
255261
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ServiceManagement\Azure\Azure.psd1"));
256262
}
257263
else if (mode == AzureModule.AzureResourceManager)
258264
{
259-
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureResourceManager.psd1"));
265+
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1"));
266+
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Resources.psd1"));
267+
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Tags.psd1"));
260268
}
261269
else
262270
{

‎src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/EnvironmentSetupHelper.cs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,9 @@ public void SetupModules(AzureModule mode, params string[] modules)
262262
if (mode == AzureModule.AzureProfile)
263263
{
264264
this.modules.Add(Path.Combine(PackageDirectory, @"ServiceManagement\Azure\Azure.psd1"));
265-
this.modules.Add(Path.Combine(PackageDirectory, @"ResourceManager\AzureResourceManager\AzureResourceManager.psd1"));
265+
this.modules.Add(Path.Combine(PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1"));
266+
this.modules.Add(Path.Combine(PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Resources.psd1"));
267+
this.modules.Add(Path.Combine(PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Tags.psd1"));
266268
}
267269
else if (mode == AzureModule.AzureServiceManagement)
268270
{
@@ -280,15 +282,19 @@ public void SetupModulesFromCommon(AzureModule mode, params string[] modules)
280282
if (mode == AzureModule.AzureProfile)
281283
{
282284
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ServiceManagement\Azure\Azure.psd1"));
283-
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureResourceManager.psd1"));
285+
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1"));
286+
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Resources.psd1"));
287+
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Tags.psd1"));
284288
}
285289
else if (mode == AzureModule.AzureServiceManagement)
286290
{
287291
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ServiceManagement\Azure\Azure.psd1"));
288292
}
289293
else if (mode == AzureModule.AzureResourceManager)
290294
{
291-
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureResourceManager.psd1"));
295+
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1"));
296+
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Resources.psd1"));
297+
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Tags.psd1"));
292298
}
293299
else
294300
{

0 commit comments

Comments
 (0)