Skip to content

Commit d9553a0

Browse files
markcowlmarkcowl
committed
Merge pull request #1268 from AsrArmOneSdk/fromFM1
ARM compliance changes for Azure Site Recovery (ASR)
2 parents 56c77e3 + 9f8c671 commit d9553a0

File tree

110 files changed

+13150
-2806
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+13150
-2806
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 94 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1638,6 +1638,74 @@
16381638
<File Id="fil45E326DA0D2C1D13454049F145FE496E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Profile\System.Net.Http.Primitives.dll" />
16391639
</Component>
16401640
</Directory>
1641+
<Directory Id="dirA8A4C5ACA887ED836025D861239F2923" Name="AzureRM.RecoveryServices">
1642+
<Component Id="cmpC96DAF4A31F86D19246E39394F496F83" Guid="*">
1643+
<File Id="fil2D7BE7247B4B446F4AF0DD4322F0D374" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\AzureRM.RecoveryServices.psd1" />
1644+
</Component>
1645+
<Component Id="cmpA77D5875EABE5151973A245C04E3858E" Guid="*">
1646+
<File Id="fil1D8C96CE85AC990C98123BA88257BC6F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Hyak.Common.dll" />
1647+
</Component>
1648+
<Component Id="cmpEDB84317615898A496C0FF620B372C87" Guid="*">
1649+
<File Id="fil56F72CE4FFC9F006CE1B279238995FC8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.ApplicationInsights.dll" />
1650+
</Component>
1651+
<Component Id="cmp24701581A2FF7E953AF4E712D30C78F7" Guid="*">
1652+
<File Id="fil8B85106D82BEA73947AE480C4EB871F8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.Azure.Commands.RecoveryServices.dll" />
1653+
</Component>
1654+
<Component Id="cmpE7C8C6576C1069564C717CBBBD229F39" Guid="*">
1655+
<File Id="fil5D33856298AF8DC4453258F6359E225A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
1656+
</Component>
1657+
<Component Id="cmpC9F93119DA28BCE2B325C737951EFABA" Guid="*">
1658+
<File Id="fil6AB708B091089C1955DB52953BD1EB6A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.Azure.Common.Authentication.dll" />
1659+
</Component>
1660+
<Component Id="cmp3629350DB44BADB48B9F7787CAEA966A" Guid="*">
1661+
<File Id="filA1190EF3AC4036B753E48AA59B007752" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.Azure.Common.dll" />
1662+
</Component>
1663+
<Component Id="cmpF3A5F7B33754FB70A439E1CFC6358E76" Guid="*">
1664+
<File Id="fil9ACDC10E17A4AE3D8F6F7DA4D3D1B9DB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.Azure.Common.NetFramework.dll" />
1665+
</Component>
1666+
<Component Id="cmpA897C4AAFA31A4DD27E390513E23E222" Guid="*">
1667+
<File Id="fil41C35FC5CDA21CD060F5389083B5195B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.Azure.Management.RecoveryServices.dll" />
1668+
</Component>
1669+
<Component Id="cmpD3312FC95A31A56AC9D86F251A4C4746" Guid="*">
1670+
<File Id="fil4A3D41BE31A41217E17A4E05175FA8B2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
1671+
</Component>
1672+
<Component Id="cmp28F1669150E6E4F533A073C5DC77C058" Guid="*">
1673+
<File Id="fil8A3CA273EA2D6DEDEEFC50A5B37EF593" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll" />
1674+
</Component>
1675+
<Component Id="cmp1A78E4DE7491D05CD1AA7765C2268628" Guid="*">
1676+
<File Id="fil617FAB27AABD8BB99BED42649952C0CB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
1677+
</Component>
1678+
<Component Id="cmp0C081EFABCF903E615F7D5F5055E2ABC" Guid="*">
1679+
<File Id="fil44410B268122FD05C424331AEFD80633" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.Rest.ClientRuntime.dll" />
1680+
</Component>
1681+
<Component Id="cmp9AEA1568AC0D04D21D54F9F85E2B4D9E" Guid="*">
1682+
<File Id="fil82E9FF185DE5AF90EE08E39400321F7C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.Threading.Tasks.dll" />
1683+
</Component>
1684+
<Component Id="cmpB6BB3962536A848F1B766BDAF0B186AA" Guid="*">
1685+
<File Id="fil7EEF5D75666E083F287918F108A2F765" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.Threading.Tasks.Extensions.Desktop.dll" />
1686+
</Component>
1687+
<Component Id="cmpC0D07E6DBBB8578966F6D04DBDAAB131" Guid="*">
1688+
<File Id="filD72B7A11BD15AB1E1EF39783B9BC3A0E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.Threading.Tasks.Extensions.dll" />
1689+
</Component>
1690+
<Component Id="cmp120B011C7E31075166F534DA55A7C20F" Guid="*">
1691+
<File Id="filDAA91DE6090F1059113EF35F61E7DEBD" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.WindowsAzure.Commands.Common.dll" />
1692+
</Component>
1693+
<Component Id="cmp3381926B59D178ADCC5BD2ECBBF6E2E3" Guid="*">
1694+
<File Id="fil879960F5B7249BF10CBB8E1F6CC3EA46" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.WindowsAzure.Management.dll" />
1695+
</Component>
1696+
<Component Id="cmp18299488EE793D4E8A0D4105E6737598" Guid="*">
1697+
<File Id="filBDBE1848413E59B2D1F0E330E1362603" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Newtonsoft.Json.dll" />
1698+
</Component>
1699+
<Component Id="cmp6507BFAC437859C861A9F8D0535A62ED" Guid="*">
1700+
<File Id="filFAA2E60B8E7F95503D60627813D40219" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Security.Cryptography.dll" />
1701+
</Component>
1702+
<Component Id="cmpC00974919B90C9055BED1F2A9DA95441" Guid="*">
1703+
<File Id="fil7FE407391D491872EC38BBE091DFD6A8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\System.Net.Http.Extensions.dll" />
1704+
</Component>
1705+
<Component Id="cmpE300D8B185C427E05E95BA97413F6CC8" Guid="*">
1706+
<File Id="fil3A29806CC321EA39756A69909C112925" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\System.Net.Http.Primitives.dll" />
1707+
</Component>
1708+
</Directory>
16411709
<Directory Id="dir81EE6B6C66E21DBFAFE07FA058F415D6" Name="AzureRM.RedisCache">
16421710
<Component Id="cmp301F9E8FA547D7C9A0DF4FF20F87815D" Guid="*">
16431711
<File Id="fil1A611C57F01D0929B21DD9483DAF7EE0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\AzureRM.RedisCache.psd1" />
@@ -1874,9 +1942,6 @@
18741942
<Component Id="cmp933A0F6A3C758FF31778CD56E1CED198" Guid="*">
18751943
<File Id="fil073476E9B69AA7194553FDE0EE475CBF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.SiteRecovery\Microsoft.WindowsAzure.Management.dll" />
18761944
</Component>
1877-
<Component Id="cmp368F7AA272349F8911057739DF9BDC14" Guid="*">
1878-
<File Id="fil06B77E3D79B460118F38A9C875F746D5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.SiteRecovery\Microsoft.WindowsAzure.Management.Scheduler.dll" />
1879-
</Component>
18801945
<Component Id="cmpC08F41DE6169E9495E44714AEDA50D7D" Guid="*">
18811946
<File Id="fil9E16E9FFE27CA7CB6B456CAFFDA98AE7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.SiteRecovery\Newtonsoft.Json.dll" />
18821947
</Component>
@@ -3705,12 +3770,12 @@
37053770
<Component Id="cmpC0EA9433103A723191792448380E84AB" Guid="*">
37063771
<File Id="filC19D2936401BB415655E1554F85EE97B" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.ApplicationInsights.dll" />
37073772
</Component>
3708-
<Component Id="cmpCA80C6C0F5670291AF2F3560D36B1EA3" Guid="*">
3709-
<File Id="filE640AA6B0606E3DE6875594E25DE82D3" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.Azure.Commands.RecoveryServices.dll" />
3710-
</Component>
37113773
<Component Id="cmp1E1EACEE941A7D7B9B2649BB3AC9ABC3" Guid="*">
37123774
<File Id="fil7BC44111780DA333D7D3C421E0660012" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.Azure.Commands.RecoveryServices.dll-help.xml" />
37133775
</Component>
3776+
<Component Id="cmpB69D649FD24EBC270A2013375C2AF99B" Guid="*">
3777+
<File Id="fil8C7BE3D686B22FA7B371793DE9DFCCDD" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.Azure.Commands.RecoveryServicesRdfe.dll" />
3778+
</Component>
37143779
<Component Id="cmpF2406A263F1B403C803ACB70D2468624" Guid="*">
37153780
<File Id="fil2AB9A3CCA503D5D983784642C1F8E4F4" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.Azure.Common.Authentication.dll" />
37163781
</Component>
@@ -5158,6 +5223,28 @@
51585223
<ComponentRef Id="cmpEBB62AC41F55737CBA5B67CD38320203" />
51595224
<ComponentRef Id="cmpAB89DA9A645E197D78DE69AEF963C260" />
51605225
<ComponentRef Id="cmp103ACA9079CDD574094214F46E76D71B" />
5226+
<ComponentRef Id="cmpC96DAF4A31F86D19246E39394F496F83" />
5227+
<ComponentRef Id="cmpA77D5875EABE5151973A245C04E3858E" />
5228+
<ComponentRef Id="cmpEDB84317615898A496C0FF620B372C87" />
5229+
<ComponentRef Id="cmp24701581A2FF7E953AF4E712D30C78F7" />
5230+
<ComponentRef Id="cmpE7C8C6576C1069564C717CBBBD229F39" />
5231+
<ComponentRef Id="cmpC9F93119DA28BCE2B325C737951EFABA" />
5232+
<ComponentRef Id="cmp3629350DB44BADB48B9F7787CAEA966A" />
5233+
<ComponentRef Id="cmpF3A5F7B33754FB70A439E1CFC6358E76" />
5234+
<ComponentRef Id="cmpA897C4AAFA31A4DD27E390513E23E222" />
5235+
<ComponentRef Id="cmpD3312FC95A31A56AC9D86F251A4C4746" />
5236+
<ComponentRef Id="cmp28F1669150E6E4F533A073C5DC77C058" />
5237+
<ComponentRef Id="cmp1A78E4DE7491D05CD1AA7765C2268628" />
5238+
<ComponentRef Id="cmp0C081EFABCF903E615F7D5F5055E2ABC" />
5239+
<ComponentRef Id="cmp9AEA1568AC0D04D21D54F9F85E2B4D9E" />
5240+
<ComponentRef Id="cmpB6BB3962536A848F1B766BDAF0B186AA" />
5241+
<ComponentRef Id="cmpC0D07E6DBBB8578966F6D04DBDAAB131" />
5242+
<ComponentRef Id="cmp120B011C7E31075166F534DA55A7C20F" />
5243+
<ComponentRef Id="cmp3381926B59D178ADCC5BD2ECBBF6E2E3" />
5244+
<ComponentRef Id="cmp18299488EE793D4E8A0D4105E6737598" />
5245+
<ComponentRef Id="cmp6507BFAC437859C861A9F8D0535A62ED" />
5246+
<ComponentRef Id="cmpC00974919B90C9055BED1F2A9DA95441" />
5247+
<ComponentRef Id="cmpE300D8B185C427E05E95BA97413F6CC8" />
51615248
<ComponentRef Id="cmp301F9E8FA547D7C9A0DF4FF20F87815D" />
51625249
<ComponentRef Id="cmp5EF3051C386C8DAA602E772A7C258726" />
51635250
<ComponentRef Id="cmpD143AF1A4E05D7D8425777ECA2F5440D" />
@@ -5235,7 +5322,6 @@
52355322
<ComponentRef Id="cmpC66BD3D99AF61BAD98BC08FDEDF8A276" />
52365323
<ComponentRef Id="cmp1025EF574364EC1CCB0EDBF663E7A8B1" />
52375324
<ComponentRef Id="cmp933A0F6A3C758FF31778CD56E1CED198" />
5238-
<ComponentRef Id="cmp368F7AA272349F8911057739DF9BDC14" />
52395325
<ComponentRef Id="cmpC08F41DE6169E9495E44714AEDA50D7D" />
52405326
<ComponentRef Id="cmp273975FE717E0BB68232E0CD3E70AA82" />
52415327
<ComponentRef Id="cmpC49EFF5B153B832A1B30B31544E0C17E" />
@@ -5824,8 +5910,8 @@
58245910
<ComponentRef Id="cmp5A383CDD64BCF64C9DD945784B8734D2" />
58255911
<ComponentRef Id="cmp5FB7157FEA8EDC9D2D10814DA15518AE" />
58265912
<ComponentRef Id="cmpC0EA9433103A723191792448380E84AB" />
5827-
<ComponentRef Id="cmpCA80C6C0F5670291AF2F3560D36B1EA3" />
58285913
<ComponentRef Id="cmp1E1EACEE941A7D7B9B2649BB3AC9ABC3" />
5914+
<ComponentRef Id="cmpB69D649FD24EBC270A2013375C2AF99B" />
58295915
<ComponentRef Id="cmpF2406A263F1B403C803ACB70D2468624" />
58305916
<ComponentRef Id="cmp8BF1C84B7C0D6D25264BEF64FD945354" />
58315917
<ComponentRef Id="cmp18ED74EDB82DE2351B9655ED86ACA19A" />

‎src/ResourceManager/RecoveryServices/.nuget/packages.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="xunit.runner.console" version="2.0.0" />
4+
</packages>

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

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
#
2+
# Module manifest for module 'Microsoft.Azure.Commands.RecoveryServices'
3+
#
4+
# Generated by: Microsoft Corporation
5+
#
6+
# Generated on: 9/19/2015
7+
#
8+
9+
@{
10+
11+
# Version number of this module.
12+
ModuleVersion = '1.0.1'
13+
14+
# ID used to uniquely identify this module
15+
GUID = '4AA53B7E-FCFE-4E22-979C-9A4E6380DE58'
16+
17+
# Author of this module
18+
Author = 'Microsoft Corporation'
19+
20+
# Company or vendor of this module
21+
CompanyName = 'Microsoft Corporation'
22+
23+
# Copyright statement for this module
24+
Copyright = 'Microsoft Corporation. All rights reserved.'
25+
26+
# Description of the functionality provided by this module
27+
Description = 'Microsoft Azure PowerShell - RecoveryServices cmdlets for Azure Resource Manager'
28+
29+
# Minimum version of the Windows PowerShell engine required by this module
30+
PowerShellVersion = '3.0'
31+
32+
# Name of the Windows PowerShell host required by this module
33+
PowerShellHostName = ''
34+
35+
# Minimum version of the Windows PowerShell host required by this module
36+
PowerShellHostVersion = ''
37+
38+
# Minimum version of the .NET Framework required by this module
39+
DotNetFrameworkVersion = '4.0'
40+
41+
# Minimum version of the common language runtime (CLR) required by this module
42+
CLRVersion='4.0'
43+
44+
# Processor architecture (None, X86, Amd64, IA64) required by this module
45+
ProcessorArchitecture = 'None'
46+
47+
# Modules that must be imported into the global environment prior to importing this module
48+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.1'})
49+
50+
# Assemblies that must be loaded prior to importing this module
51+
RequiredAssemblies = @()
52+
53+
# Script files (.ps1) that are run in the caller's environment prior to importing this module
54+
ScriptsToProcess = @()
55+
56+
# Type files (.ps1xml) to be loaded when importing this module
57+
TypesToProcess = @()
58+
59+
# Format files (.ps1xml) to be loaded when importing this module
60+
FormatsToProcess = @()
61+
62+
# Modules to import as nested modules of the module specified in ModuleToProcess
63+
NestedModules = @(
64+
'.\Microsoft.Azure.Commands.RecoveryServices.dll'
65+
)
66+
67+
# Functions to export from this module
68+
FunctionsToExport = '*'
69+
70+
# Cmdlets to export from this module
71+
CmdletsToExport = '*'
72+
73+
# Variables to export from this module
74+
VariablesToExport = '*'
75+
76+
# Aliases to export from this module
77+
AliasesToExport = @()
78+
79+
# List of all modules packaged with this module
80+
ModuleList = @()
81+
82+
# List of all files packaged with this module
83+
FileList = @()
84+
85+
# Private data to pass to the module specified in ModuleToProcess
86+
PrivateData = ''
87+
88+
}

0 commit comments

Comments
 (0)