Skip to content

Commit 085faa1

Browse files
markcowlmarkcowl
committed
Merge pull request #1336 from markcowl/siterecofix
Renaming RecoveryServices ARM assembly
2 parents 86ef593 + 47e0246 commit 085faa1

File tree

4 files changed

+110
-8
lines changed

4 files changed

+110
-8
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 105 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1487,6 +1487,74 @@
14871487
<File Id="filA0A7E5264791F02EC6F1F0FD7B40A66E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Network\System.Spatial.dll" />
14881488
</Component>
14891489
</Directory>
1490+
<Directory Id="dir995DA848BB4EC81057DAA5BBA893AA1F" Name="AzureRM.NotificationHubs">
1491+
<Component Id="cmpDAB75931F4DB7BCDDF30F7CEF8F61FB5" Guid="*">
1492+
<File Id="filC5D354ECC7A748ED0855E7BD68F5BBF5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.NotificationHubs\AzureRM.NotificationHubs.psd1" />
1493+
</Component>
1494+
<Component Id="cmp8684AA425BD610EEC2F15925581BF893" Guid="*">
1495+
<File Id="fil0C01002B0A06823ADCED1A7EF2F9153D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.NotificationHubs\Hyak.Common.dll" />
1496+
</Component>
1497+
<Component Id="cmp056C8B4C8FE7271CEC0AD4AD7AAB3018" Guid="*">
1498+
<File Id="fil4F3A2BE47300247FDD2F612BE45B8C43" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.NotificationHubs\Microsoft.ApplicationInsights.dll" />
1499+
</Component>
1500+
<Component Id="cmpB5106B48E2EB7B701A40C3B0D8FA0A2E" Guid="*">
1501+
<File Id="fil4D2A80BCF0E4602A018B991AC888DEF5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.NotificationHubs\Microsoft.Azure.Commands.NotificationHubs.dll" />
1502+
</Component>
1503+
<Component Id="cmp6ECD08486E9BFFFA4F5BE1092972D0AF" Guid="*">
1504+
<File Id="fil6AF6504ED9317A954ACEB6E70DBCB5E2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.NotificationHubs\Microsoft.Azure.Commands.NotificationHubs.dll-help.xml" />
1505+
</Component>
1506+
<Component Id="cmpF7968DE0E82CE5824C98B69162856454" Guid="*">
1507+
<File Id="filCC8DE470231950575F1ABD0B43AD5D42" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.NotificationHubs\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
1508+
</Component>
1509+
<Component Id="cmp3AEDE62E97C131477079C4ED312DDE78" Guid="*">
1510+
<File Id="filFE48F35D617FBF9A1E80D00408582116" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.NotificationHubs\Microsoft.Azure.Common.Authentication.dll" />
1511+
</Component>
1512+
<Component Id="cmp1D28B996F505A9231C2EDDEF3E6C757D" Guid="*">
1513+
<File Id="fil84C48C4C9228BDBCB773382AF23AEF06" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.NotificationHubs\Microsoft.Azure.Common.dll" />
1514+
</Component>
1515+
<Component Id="cmp1FDD90EC716D1D1FBAEB3FED6BD69792" Guid="*">
1516+
<File Id="fil8CE6DDC2467F2FB904DAD4B06104B6BD" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.NotificationHubs\Microsoft.Azure.Common.NetFramework.dll" />
1517+
</Component>
1518+
<Component Id="cmpCA0384929BA2176DDBCA9C605CBDECFD" Guid="*">
1519+
<File Id="fil3C22F827D15AD7A85E987506B3C0C224" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.NotificationHubs\Microsoft.Azure.Management.NotificationHubs.dll" />
1520+
</Component>
1521+
<Component Id="cmp00A626BF687C0B839638474C372F830C" Guid="*">
1522+
<File Id="fil77D4F0AD86DC13146FBE2338D29E7958" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.NotificationHubs\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
1523+
</Component>
1524+
<Component Id="cmp775CB6B7D1F3AD4D55497F602D74AECF" Guid="*">
1525+
<File Id="fil6E17911C52813608A0CEDFC9F6DE5F14" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.NotificationHubs\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll" />
1526+
</Component>
1527+
<Component Id="cmp02101C8205A10465A009DD2D2D0F1390" Guid="*">
1528+
<File Id="fil4CA8F0CA63F798A22950895A16A78B18" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.NotificationHubs\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
1529+
</Component>
1530+
<Component Id="cmp70EF4B668BAC168FD29981CF127B86C5" Guid="*">
1531+
<File Id="fil624F3BFD8FC0BFE924EF19BDF7C3C26B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.NotificationHubs\Microsoft.Rest.ClientRuntime.dll" />
1532+
</Component>
1533+
<Component Id="cmpB094102F26151D0A1F6097A8CEE8CF40" Guid="*">
1534+
<File Id="fil92B06589B8E2B0AC6475F42583F00FCD" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.NotificationHubs\Microsoft.Threading.Tasks.dll" />
1535+
</Component>
1536+
<Component Id="cmpE727598EA987F9F9AC37355BE178AE99" Guid="*">
1537+
<File Id="filCF15203C6CE85CD9A4142608AA3A61D3" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.NotificationHubs\Microsoft.Threading.Tasks.Extensions.Desktop.dll" />
1538+
</Component>
1539+
<Component Id="cmp38813A084B3AA9F2C7B78874749D1972" Guid="*">
1540+
<File Id="fil9141C80FF8B96E3992F6E5545EB1B267" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.NotificationHubs\Microsoft.Threading.Tasks.Extensions.dll" />
1541+
</Component>
1542+
<Component Id="cmpA3A3718DBCD082C91EDD5261795B6FA1" Guid="*">
1543+
<File Id="fil15FA7BDDFB3DAC2E7C0B1667AF3943E2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.NotificationHubs\Microsoft.WindowsAzure.Commands.Common.dll" />
1544+
</Component>
1545+
<Component Id="cmp57857FD15291ADB0C13DC72505EA064D" Guid="*">
1546+
<File Id="fil89902ACB4333C84E8062F29F431E6A09" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.NotificationHubs\Microsoft.WindowsAzure.Management.dll" />
1547+
</Component>
1548+
<Component Id="cmp267BA994EF464029A039971E05D075E0" Guid="*">
1549+
<File Id="filE598A69ECF56C5D50D51A5FF9531E208" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.NotificationHubs\Newtonsoft.Json.dll" />
1550+
</Component>
1551+
<Component Id="cmp275E5D23204FF3DB5A484691FFA2C6F5" Guid="*">
1552+
<File Id="fil39E1A8D02D1ACE4FBC08A42C96512ADC" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.NotificationHubs\System.Net.Http.Extensions.dll" />
1553+
</Component>
1554+
<Component Id="cmp5E9A44B7330C75772463CB17D6D24AA6" Guid="*">
1555+
<File Id="filD08305C30C6ABACB9977D67A887FCE19" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.NotificationHubs\System.Net.Http.Primitives.dll" />
1556+
</Component>
1557+
</Directory>
14901558
<Directory Id="dir295D717AB187C005AAA1BD05D9EE7671" Name="AzureRM.OperationalInsights">
14911559
<Component Id="cmp17459EC3296F82D03FEF8C426C8DA7EA" Guid="*">
14921560
<File Id="filF30732FD3174ABEC7D2103467F25E8E5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.OperationalInsights\AzureRM.OperationalInsights.psd1" />
@@ -1648,8 +1716,8 @@
16481716
<Component Id="cmpEDB84317615898A496C0FF620B372C87" Guid="*">
16491717
<File Id="fil56F72CE4FFC9F006CE1B279238995FC8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.ApplicationInsights.dll" />
16501718
</Component>
1651-
<Component Id="cmp24701581A2FF7E953AF4E712D30C78F7" Guid="*">
1652-
<File Id="fil8B85106D82BEA73947AE480C4EB871F8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.Azure.Commands.RecoveryServices.dll" />
1719+
<Component Id="cmp5CAA968EE7C749E4480233FD90EDFE63" Guid="*">
1720+
<File Id="filC143DADE40E067E4692D2246F93BA8A4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.Azure.Commands.RecoveryServices.ARM.dll" />
16531721
</Component>
16541722
<Component Id="cmpE7C8C6576C1069564C717CBBBD229F39" Guid="*">
16551723
<File Id="fil5D33856298AF8DC4453258F6359E225A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
@@ -2866,6 +2934,9 @@
28662934
<Component Id="cmp42FE31D214E88600BC5DE868A244BA20" Guid="*">
28672935
<File Id="filD6668B53C1E9BB018419C62B94B1EDCC" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Compute\Microsoft.Azure.Common.NetFramework.dll" />
28682936
</Component>
2937+
<Component Id="cmp4DCABA2450B8FD31596D1000125A9FE7" Guid="*">
2938+
<File Id="filA147C61383B2433FF5469F0A3B24D0B5" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Compute\Microsoft.Azure.KeyVault.Core.dll" />
2939+
</Component>
28692940
<Component Id="cmpF0D6E87592CA6F6E966385CB1295DF88" Guid="*">
28702941
<File Id="filE856DCB106BA2652E7357EB19C49E8D8" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Compute\Microsoft.Azure.Management.Storage.dll" />
28712942
</Component>
@@ -3405,6 +3476,9 @@
34053476
<Component Id="cmp4825A8273E6E3207AA24CD61156AEA19" Guid="*">
34063477
<File Id="fil14B10B7D534EC15091037B7B1C32CD12" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Networking\Microsoft.Azure.Common.NetFramework.dll" />
34073478
</Component>
3479+
<Component Id="cmp844772384C0923BF32EEFB91E2724F8B" Guid="*">
3480+
<File Id="fil16581DB56A17EFBFC3998671FA4DCA32" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Networking\Microsoft.Azure.KeyVault.Core.dll" />
3481+
</Component>
34083482
<Component Id="cmp10C99007868B1F2166E9D001E1CEC9B9" Guid="*">
34093483
<File Id="filBAA9F8F29E496F8EEBAB7DA5072F2AC1" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Networking\Microsoft.Azure.Management.Storage.dll" />
34103484
</Component>
@@ -4357,6 +4431,9 @@
43574431
<Component Id="cmpB6B3D29C26A5E102831B92476CC50A1D" Guid="*">
43584432
<File Id="fil97338A2F6E90AC46248EA428088019D8" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Microsoft.Azure.Common.NetFramework.dll" />
43594433
</Component>
4434+
<Component Id="cmp755719BF8C89385B0BC1EC8745FE6612" Guid="*">
4435+
<File Id="fil0C5FDBE4D63F18505B84B13EA1A0D656" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Microsoft.Azure.KeyVault.Core.dll" />
4436+
</Component>
43604437
<Component Id="cmp2C76B7125651272E291DE1C2F956AB55" Guid="*">
43614438
<File Id="fil0CF85006146C9D884F0D8E8D051DCBDE" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Microsoft.Azure.Management.Storage.dll" />
43624439
</Component>
@@ -5174,6 +5251,28 @@
51745251
<ComponentRef Id="cmp22A4A30D24CDED6264D46F12597014F5" />
51755252
<ComponentRef Id="cmp999479ACC191E94DE3C836F45E40CC5D" />
51765253
<ComponentRef Id="cmpFA5D7F947B235DF25AF77E5C80F17A7F" />
5254+
<ComponentRef Id="cmpDAB75931F4DB7BCDDF30F7CEF8F61FB5" />
5255+
<ComponentRef Id="cmp8684AA425BD610EEC2F15925581BF893" />
5256+
<ComponentRef Id="cmp056C8B4C8FE7271CEC0AD4AD7AAB3018" />
5257+
<ComponentRef Id="cmpB5106B48E2EB7B701A40C3B0D8FA0A2E" />
5258+
<ComponentRef Id="cmp6ECD08486E9BFFFA4F5BE1092972D0AF" />
5259+
<ComponentRef Id="cmpF7968DE0E82CE5824C98B69162856454" />
5260+
<ComponentRef Id="cmp3AEDE62E97C131477079C4ED312DDE78" />
5261+
<ComponentRef Id="cmp1D28B996F505A9231C2EDDEF3E6C757D" />
5262+
<ComponentRef Id="cmp1FDD90EC716D1D1FBAEB3FED6BD69792" />
5263+
<ComponentRef Id="cmpCA0384929BA2176DDBCA9C605CBDECFD" />
5264+
<ComponentRef Id="cmp00A626BF687C0B839638474C372F830C" />
5265+
<ComponentRef Id="cmp775CB6B7D1F3AD4D55497F602D74AECF" />
5266+
<ComponentRef Id="cmp02101C8205A10465A009DD2D2D0F1390" />
5267+
<ComponentRef Id="cmp70EF4B668BAC168FD29981CF127B86C5" />
5268+
<ComponentRef Id="cmpB094102F26151D0A1F6097A8CEE8CF40" />
5269+
<ComponentRef Id="cmpE727598EA987F9F9AC37355BE178AE99" />
5270+
<ComponentRef Id="cmp38813A084B3AA9F2C7B78874749D1972" />
5271+
<ComponentRef Id="cmpA3A3718DBCD082C91EDD5261795B6FA1" />
5272+
<ComponentRef Id="cmp57857FD15291ADB0C13DC72505EA064D" />
5273+
<ComponentRef Id="cmp267BA994EF464029A039971E05D075E0" />
5274+
<ComponentRef Id="cmp275E5D23204FF3DB5A484691FFA2C6F5" />
5275+
<ComponentRef Id="cmp5E9A44B7330C75772463CB17D6D24AA6" />
51775276
<ComponentRef Id="cmp17459EC3296F82D03FEF8C426C8DA7EA" />
51785277
<ComponentRef Id="cmp7CE9821E11931CE1140ACA06CF2D38B4" />
51795278
<ComponentRef Id="cmp6D68CAF3787D43356F3C2CB592699D2D" />
@@ -5226,7 +5325,7 @@
52265325
<ComponentRef Id="cmpC96DAF4A31F86D19246E39394F496F83" />
52275326
<ComponentRef Id="cmpA77D5875EABE5151973A245C04E3858E" />
52285327
<ComponentRef Id="cmpEDB84317615898A496C0FF620B372C87" />
5229-
<ComponentRef Id="cmp24701581A2FF7E953AF4E712D30C78F7" />
5328+
<ComponentRef Id="cmp5CAA968EE7C749E4480233FD90EDFE63" />
52305329
<ComponentRef Id="cmpE7C8C6576C1069564C717CBBBD229F39" />
52315330
<ComponentRef Id="cmpC9F93119DA28BCE2B325C737951EFABA" />
52325331
<ComponentRef Id="cmp3629350DB44BADB48B9F7787CAEA966A" />
@@ -5622,6 +5721,7 @@
56225721
<ComponentRef Id="cmp7AAE7BA21799D1BAFA96134E30059981" />
56235722
<ComponentRef Id="cmpBCF3C38FB8142F10977444858EFAF20D" />
56245723
<ComponentRef Id="cmp42FE31D214E88600BC5DE868A244BA20" />
5724+
<ComponentRef Id="cmp4DCABA2450B8FD31596D1000125A9FE7" />
56255725
<ComponentRef Id="cmpF0D6E87592CA6F6E966385CB1295DF88" />
56265726
<ComponentRef Id="cmp9BE4A14F2E050EFD14F849753F4D0C80" />
56275727
<ComponentRef Id="cmpC4B0F527C50AAE1765CBAD30D27B8A40" />
@@ -5799,6 +5899,7 @@
57995899
<ComponentRef Id="cmp68A21E34C1FD71E23B621E0D4CA9BAA1" />
58005900
<ComponentRef Id="cmp6EF74500F8C5864E4C97AF617F709A3D" />
58015901
<ComponentRef Id="cmp4825A8273E6E3207AA24CD61156AEA19" />
5902+
<ComponentRef Id="cmp844772384C0923BF32EEFB91E2724F8B" />
58025903
<ComponentRef Id="cmp10C99007868B1F2166E9D001E1CEC9B9" />
58035904
<ComponentRef Id="cmp376619CF1737E3DFBCF802CFC718DC17" />
58045905
<ComponentRef Id="cmp1604CAE86B20EAEF9965D72B5BA1639A" />
@@ -6093,6 +6194,7 @@
60936194
<ComponentRef Id="cmp4C01FCB6C2D2D2591BAEDBA0D9284C3C" />
60946195
<ComponentRef Id="cmp09F316A7E95457F48227B20D09F687C7" />
60956196
<ComponentRef Id="cmpB6B3D29C26A5E102831B92476CC50A1D" />
6197+
<ComponentRef Id="cmp755719BF8C89385B0BC1EC8745FE6612" />
60966198
<ComponentRef Id="cmp2C76B7125651272E291DE1C2F956AB55" />
60976199
<ComponentRef Id="cmp940CE83AD0420A4BB3435E2A8DC13E30" />
60986200
<ComponentRef Id="cmp5F9F224B35A12C7DAF144BC06205E603" />

‎src/ResourceManager/RecoveryServices/AzureRM.RecoveryServices.psd1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '1.0.1'
12+
ModuleVersion = '1.0.2'
1313

1414
# ID used to uniquely identify this module
1515
GUID = '4AA53B7E-FCFE-4E22-979C-9A4E6380DE58'
@@ -61,7 +61,7 @@ FormatsToProcess = @()
6161

6262
# Modules to import as nested modules of the module specified in ModuleToProcess
6363
NestedModules = @(
64-
'.\Microsoft.Azure.Commands.RecoveryServices.dll'
64+
'.\Microsoft.Azure.Commands.RecoveryServices.ARM.dll'
6565
)
6666

6767
# Functions to export from this module

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<OutputType>Library</OutputType>
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Microsoft.Azure.Commands.RecoveryServices</RootNamespace>
11-
<AssemblyName>Microsoft.Azure.Commands.RecoveryServices</AssemblyName>
11+
<AssemblyName>Microsoft.Azure.Commands.RecoveryServices.ARM</AssemblyName>
1212
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.1.0")]
36-
[assembly: AssemblyFileVersion("1.0.1.0")]
35+
[assembly: AssemblyVersion("1.0.2.0")]
36+
[assembly: AssemblyFileVersion("1.0.2.0")]

0 commit comments

Comments
 (0)