Skip to content

Commit 48ae917

Browse files
markcowlmarkcowl
committed
Merge pull request Azure#1355 from markcowl/srmerge
Merging SiteRecovery changes for out of band release
2 parents 82452ce + 0548665 commit 48ae917

File tree

115 files changed

+13892
-2846
lines changed

Some content is hidden

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

115 files changed

+13892
-2846
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 94 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1706,6 +1706,74 @@
17061706
<File Id="fil45E326DA0D2C1D13454049F145FE496E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Profile\System.Net.Http.Primitives.dll" />
17071707
</Component>
17081708
</Directory>
1709+
<Directory Id="dirA8A4C5ACA887ED836025D861239F2923" Name="AzureRM.RecoveryServices">
1710+
<Component Id="cmpC96DAF4A31F86D19246E39394F496F83" Guid="*">
1711+
<File Id="fil2D7BE7247B4B446F4AF0DD4322F0D374" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\AzureRM.RecoveryServices.psd1" />
1712+
</Component>
1713+
<Component Id="cmpA77D5875EABE5151973A245C04E3858E" Guid="*">
1714+
<File Id="fil1D8C96CE85AC990C98123BA88257BC6F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Hyak.Common.dll" />
1715+
</Component>
1716+
<Component Id="cmpEDB84317615898A496C0FF620B372C87" Guid="*">
1717+
<File Id="fil56F72CE4FFC9F006CE1B279238995FC8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.ApplicationInsights.dll" />
1718+
</Component>
1719+
<Component Id="cmp5CAA968EE7C749E4480233FD90EDFE63" Guid="*">
1720+
<File Id="filC143DADE40E067E4692D2246F93BA8A4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.Azure.Commands.RecoveryServices.ARM.dll" />
1721+
</Component>
1722+
<Component Id="cmpE7C8C6576C1069564C717CBBBD229F39" Guid="*">
1723+
<File Id="fil5D33856298AF8DC4453258F6359E225A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
1724+
</Component>
1725+
<Component Id="cmpC9F93119DA28BCE2B325C737951EFABA" Guid="*">
1726+
<File Id="fil6AB708B091089C1955DB52953BD1EB6A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.Azure.Common.Authentication.dll" />
1727+
</Component>
1728+
<Component Id="cmp3629350DB44BADB48B9F7787CAEA966A" Guid="*">
1729+
<File Id="filA1190EF3AC4036B753E48AA59B007752" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.Azure.Common.dll" />
1730+
</Component>
1731+
<Component Id="cmpF3A5F7B33754FB70A439E1CFC6358E76" Guid="*">
1732+
<File Id="fil9ACDC10E17A4AE3D8F6F7DA4D3D1B9DB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.Azure.Common.NetFramework.dll" />
1733+
</Component>
1734+
<Component Id="cmpA897C4AAFA31A4DD27E390513E23E222" Guid="*">
1735+
<File Id="fil41C35FC5CDA21CD060F5389083B5195B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.Azure.Management.RecoveryServices.dll" />
1736+
</Component>
1737+
<Component Id="cmpD3312FC95A31A56AC9D86F251A4C4746" Guid="*">
1738+
<File Id="fil4A3D41BE31A41217E17A4E05175FA8B2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
1739+
</Component>
1740+
<Component Id="cmp28F1669150E6E4F533A073C5DC77C058" Guid="*">
1741+
<File Id="fil8A3CA273EA2D6DEDEEFC50A5B37EF593" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll" />
1742+
</Component>
1743+
<Component Id="cmp1A78E4DE7491D05CD1AA7765C2268628" Guid="*">
1744+
<File Id="fil617FAB27AABD8BB99BED42649952C0CB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
1745+
</Component>
1746+
<Component Id="cmp0C081EFABCF903E615F7D5F5055E2ABC" Guid="*">
1747+
<File Id="fil44410B268122FD05C424331AEFD80633" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.Rest.ClientRuntime.dll" />
1748+
</Component>
1749+
<Component Id="cmp9AEA1568AC0D04D21D54F9F85E2B4D9E" Guid="*">
1750+
<File Id="fil82E9FF185DE5AF90EE08E39400321F7C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.Threading.Tasks.dll" />
1751+
</Component>
1752+
<Component Id="cmpB6BB3962536A848F1B766BDAF0B186AA" Guid="*">
1753+
<File Id="fil7EEF5D75666E083F287918F108A2F765" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.Threading.Tasks.Extensions.Desktop.dll" />
1754+
</Component>
1755+
<Component Id="cmpC0D07E6DBBB8578966F6D04DBDAAB131" Guid="*">
1756+
<File Id="filD72B7A11BD15AB1E1EF39783B9BC3A0E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.Threading.Tasks.Extensions.dll" />
1757+
</Component>
1758+
<Component Id="cmp120B011C7E31075166F534DA55A7C20F" Guid="*">
1759+
<File Id="filDAA91DE6090F1059113EF35F61E7DEBD" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.WindowsAzure.Commands.Common.dll" />
1760+
</Component>
1761+
<Component Id="cmp3381926B59D178ADCC5BD2ECBBF6E2E3" Guid="*">
1762+
<File Id="fil879960F5B7249BF10CBB8E1F6CC3EA46" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.WindowsAzure.Management.dll" />
1763+
</Component>
1764+
<Component Id="cmp18299488EE793D4E8A0D4105E6737598" Guid="*">
1765+
<File Id="filBDBE1848413E59B2D1F0E330E1362603" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Newtonsoft.Json.dll" />
1766+
</Component>
1767+
<Component Id="cmp6507BFAC437859C861A9F8D0535A62ED" Guid="*">
1768+
<File Id="filFAA2E60B8E7F95503D60627813D40219" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Security.Cryptography.dll" />
1769+
</Component>
1770+
<Component Id="cmpC00974919B90C9055BED1F2A9DA95441" Guid="*">
1771+
<File Id="fil7FE407391D491872EC38BBE091DFD6A8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\System.Net.Http.Extensions.dll" />
1772+
</Component>
1773+
<Component Id="cmpE300D8B185C427E05E95BA97413F6CC8" Guid="*">
1774+
<File Id="fil3A29806CC321EA39756A69909C112925" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\System.Net.Http.Primitives.dll" />
1775+
</Component>
1776+
</Directory>
17091777
<Directory Id="dir81EE6B6C66E21DBFAFE07FA058F415D6" Name="AzureRM.RedisCache">
17101778
<Component Id="cmp301F9E8FA547D7C9A0DF4FF20F87815D" Guid="*">
17111779
<File Id="fil1A611C57F01D0929B21DD9483DAF7EE0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\AzureRM.RedisCache.psd1" />
@@ -1942,9 +2010,6 @@
19422010
<Component Id="cmp933A0F6A3C758FF31778CD56E1CED198" Guid="*">
19432011
<File Id="fil073476E9B69AA7194553FDE0EE475CBF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.SiteRecovery\Microsoft.WindowsAzure.Management.dll" />
19442012
</Component>
1945-
<Component Id="cmp368F7AA272349F8911057739DF9BDC14" Guid="*">
1946-
<File Id="fil06B77E3D79B460118F38A9C875F746D5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.SiteRecovery\Microsoft.WindowsAzure.Management.Scheduler.dll" />
1947-
</Component>
19482013
<Component Id="cmpC08F41DE6169E9495E44714AEDA50D7D" Guid="*">
19492014
<File Id="fil9E16E9FFE27CA7CB6B456CAFFDA98AE7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.SiteRecovery\Newtonsoft.Json.dll" />
19502015
</Component>
@@ -3779,12 +3844,12 @@
37793844
<Component Id="cmpC0EA9433103A723191792448380E84AB" Guid="*">
37803845
<File Id="filC19D2936401BB415655E1554F85EE97B" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.ApplicationInsights.dll" />
37813846
</Component>
3782-
<Component Id="cmpCA80C6C0F5670291AF2F3560D36B1EA3" Guid="*">
3783-
<File Id="filE640AA6B0606E3DE6875594E25DE82D3" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.Azure.Commands.RecoveryServices.dll" />
3784-
</Component>
37853847
<Component Id="cmp1E1EACEE941A7D7B9B2649BB3AC9ABC3" Guid="*">
37863848
<File Id="fil7BC44111780DA333D7D3C421E0660012" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.Azure.Commands.RecoveryServices.dll-help.xml" />
37873849
</Component>
3850+
<Component Id="cmpB69D649FD24EBC270A2013375C2AF99B" Guid="*">
3851+
<File Id="fil8C7BE3D686B22FA7B371793DE9DFCCDD" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.Azure.Commands.RecoveryServicesRdfe.dll" />
3852+
</Component>
37883853
<Component Id="cmpF2406A263F1B403C803ACB70D2468624" Guid="*">
37893854
<File Id="fil2AB9A3CCA503D5D983784642C1F8E4F4" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.Azure.Common.Authentication.dll" />
37903855
</Component>
@@ -5257,6 +5322,28 @@
52575322
<ComponentRef Id="cmpEBB62AC41F55737CBA5B67CD38320203" />
52585323
<ComponentRef Id="cmpAB89DA9A645E197D78DE69AEF963C260" />
52595324
<ComponentRef Id="cmp103ACA9079CDD574094214F46E76D71B" />
5325+
<ComponentRef Id="cmpC96DAF4A31F86D19246E39394F496F83" />
5326+
<ComponentRef Id="cmpA77D5875EABE5151973A245C04E3858E" />
5327+
<ComponentRef Id="cmpEDB84317615898A496C0FF620B372C87" />
5328+
<ComponentRef Id="cmp5CAA968EE7C749E4480233FD90EDFE63" />
5329+
<ComponentRef Id="cmpE7C8C6576C1069564C717CBBBD229F39" />
5330+
<ComponentRef Id="cmpC9F93119DA28BCE2B325C737951EFABA" />
5331+
<ComponentRef Id="cmp3629350DB44BADB48B9F7787CAEA966A" />
5332+
<ComponentRef Id="cmpF3A5F7B33754FB70A439E1CFC6358E76" />
5333+
<ComponentRef Id="cmpA897C4AAFA31A4DD27E390513E23E222" />
5334+
<ComponentRef Id="cmpD3312FC95A31A56AC9D86F251A4C4746" />
5335+
<ComponentRef Id="cmp28F1669150E6E4F533A073C5DC77C058" />
5336+
<ComponentRef Id="cmp1A78E4DE7491D05CD1AA7765C2268628" />
5337+
<ComponentRef Id="cmp0C081EFABCF903E615F7D5F5055E2ABC" />
5338+
<ComponentRef Id="cmp9AEA1568AC0D04D21D54F9F85E2B4D9E" />
5339+
<ComponentRef Id="cmpB6BB3962536A848F1B766BDAF0B186AA" />
5340+
<ComponentRef Id="cmpC0D07E6DBBB8578966F6D04DBDAAB131" />
5341+
<ComponentRef Id="cmp120B011C7E31075166F534DA55A7C20F" />
5342+
<ComponentRef Id="cmp3381926B59D178ADCC5BD2ECBBF6E2E3" />
5343+
<ComponentRef Id="cmp18299488EE793D4E8A0D4105E6737598" />
5344+
<ComponentRef Id="cmp6507BFAC437859C861A9F8D0535A62ED" />
5345+
<ComponentRef Id="cmpC00974919B90C9055BED1F2A9DA95441" />
5346+
<ComponentRef Id="cmpE300D8B185C427E05E95BA97413F6CC8" />
52605347
<ComponentRef Id="cmp301F9E8FA547D7C9A0DF4FF20F87815D" />
52615348
<ComponentRef Id="cmp5EF3051C386C8DAA602E772A7C258726" />
52625349
<ComponentRef Id="cmpD143AF1A4E05D7D8425777ECA2F5440D" />
@@ -5334,7 +5421,6 @@
53345421
<ComponentRef Id="cmpC66BD3D99AF61BAD98BC08FDEDF8A276" />
53355422
<ComponentRef Id="cmp1025EF574364EC1CCB0EDBF663E7A8B1" />
53365423
<ComponentRef Id="cmp933A0F6A3C758FF31778CD56E1CED198" />
5337-
<ComponentRef Id="cmp368F7AA272349F8911057739DF9BDC14" />
53385424
<ComponentRef Id="cmpC08F41DE6169E9495E44714AEDA50D7D" />
53395425
<ComponentRef Id="cmp273975FE717E0BB68232E0CD3E70AA82" />
53405426
<ComponentRef Id="cmpC49EFF5B153B832A1B30B31544E0C17E" />
@@ -5925,8 +6011,8 @@
59256011
<ComponentRef Id="cmp5A383CDD64BCF64C9DD945784B8734D2" />
59266012
<ComponentRef Id="cmp5FB7157FEA8EDC9D2D10814DA15518AE" />
59276013
<ComponentRef Id="cmpC0EA9433103A723191792448380E84AB" />
5928-
<ComponentRef Id="cmpCA80C6C0F5670291AF2F3560D36B1EA3" />
59296014
<ComponentRef Id="cmp1E1EACEE941A7D7B9B2649BB3AC9ABC3" />
6015+
<ComponentRef Id="cmpB69D649FD24EBC270A2013375C2AF99B" />
59306016
<ComponentRef Id="cmpF2406A263F1B403C803ACB70D2468624" />
59316017
<ComponentRef Id="cmp8BF1C84B7C0D6D25264BEF64FD945354" />
59326018
<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.2'
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.ARM.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)