Skip to content

Commit cc1b0f7

Browse files
ogailogail
committed
Merge pull request #187 from AsrOneSdk/dev
Recovery Services phase2 cmdlets
2 parents b114a0e + 63abe6b commit cc1b0f7

File tree

96 files changed

+25065
-2456
lines changed

Some content is hidden

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

96 files changed

+25065
-2456
lines changed

‎setup/azurecmdfiles.wxi‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1527,15 +1527,24 @@
15271527
<Component Id="cmp8CDB44BA783FF24C94CDFC5D12066BB1" Guid="*">
15281528
<File Id="fil2C73256F76E79B695523A2B3C4C845E9" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.WindowsAzure.Commands.Common.dll" />
15291529
</Component>
1530-
<Component Id="cmpD7A9F76B2346156CA8F83F41A302B714" Guid="*">
1531-
<File Id="fil0218D7505353104A9DB742A55A839351" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.WindowsAzure.Management.dll" />
1530+
<Component Id="cmpA0A697DEB7822A0EC30F3D359EE930A6" Guid="*">
1531+
<File Id="fil528A48BB87B57E0D131C279CAD156D2B" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.WindowsAzure.Common.dll" />
1532+
</Component>
1533+
<Component Id="cmpBE209ED6509A7E857FD9F9078051DC6A" Guid="*">
1534+
<File Id="fil96FD7FA0CBEE96E0C0239408CD5651A9" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.WindowsAzure.Common.NetFramework.dll" />
15321535
</Component>
15331536
<Component Id="cmp4D3E383B38EF4392E70E981B7CA033D7" Guid="*">
15341537
<File Id="fil3D6B846AC421D38C5A9CB40A58B058B6" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.WindowsAzure.Management.SiteRecovery.dll" />
15351538
</Component>
1539+
<Component Id="cmp50D44814DFFEA762A53D9DEDCE48F689" Guid="*">
1540+
<File Id="fil80C14207B99E14F4567B92038EDC8715" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.WindowsAzure.Management.Storage.dll" />
1541+
</Component>
15361542
<Component Id="cmp439E7C155DEEFC3877653E4ED11F66AC" Guid="*">
15371543
<File Id="filE3D7ECC5C92739687FAA34CCE9DFB4A3" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Newtonsoft.Json.dll" />
15381544
</Component>
1545+
<Component Id="cmp9B4CB06D327ECA8FA60032F98004D8BA" Guid="*">
1546+
<File Id="filC935CDA00FB3E840369825B599C84E28" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Security.Cryptography.dll" />
1547+
</Component>
15391548
<Component Id="cmp5278A11908DC26651A78E55522C71DF3" Guid="*">
15401549
<File Id="fil3C9995984C13EAB542D813B85C917916" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\System.Net.Http.Extensions.dll" />
15411550
</Component>
@@ -1545,6 +1554,11 @@
15451554
<Component Id="cmp2A0B3E88742D800F88F70A714BAC94B5" Guid="*">
15461555
<File Id="fil8B5C2678B7FAC0061799DCBFF4AFE27E" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\System.Net.Http.Primitives.dll" />
15471556
</Component>
1557+
<Directory Id="dirB2E733E5A07F5CBD9FFA437A83782545" Name="lib">
1558+
<Component Id="cmpE3495C0DD75A31199E40EAA7E5128E6C" Guid="*">
1559+
<File Id="fil269C9C56525316A4AB13CC9240BF5FE6" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\lib\Security.Cryptography.dll" />
1560+
</Component>
1561+
</Directory>
15481562
</Directory>
15491563
<Directory Id="dir5A14F7172D6373ACE47493BAD054EEF3" Name="Services">
15501564
<Component Id="cmp5F55270F607737A772BFBE2D8F6B76E4" Guid="*">
@@ -2953,12 +2967,16 @@
29532967
<ComponentRef Id="cmpFFEE4D9645AEA846AF41897FD2135E02" />
29542968
<ComponentRef Id="cmp2F6E4C6B8006898EFE87C88921C1B6BA" />
29552969
<ComponentRef Id="cmp8CDB44BA783FF24C94CDFC5D12066BB1" />
2956-
<ComponentRef Id="cmpD7A9F76B2346156CA8F83F41A302B714" />
2970+
<ComponentRef Id="cmpA0A697DEB7822A0EC30F3D359EE930A6" />
2971+
<ComponentRef Id="cmpBE209ED6509A7E857FD9F9078051DC6A" />
29572972
<ComponentRef Id="cmp4D3E383B38EF4392E70E981B7CA033D7" />
2973+
<ComponentRef Id="cmp50D44814DFFEA762A53D9DEDCE48F689" />
29582974
<ComponentRef Id="cmp439E7C155DEEFC3877653E4ED11F66AC" />
2975+
<ComponentRef Id="cmp9B4CB06D327ECA8FA60032F98004D8BA" />
29592976
<ComponentRef Id="cmp5278A11908DC26651A78E55522C71DF3" />
29602977
<ComponentRef Id="cmp4ED39EDE761ED68263635882802FB1B5" />
29612978
<ComponentRef Id="cmp2A0B3E88742D800F88F70A714BAC94B5" />
2979+
<ComponentRef Id="cmpE3495C0DD75A31199E40EAA7E5128E6C" />
29622980
<ComponentRef Id="cmp5F55270F607737A772BFBE2D8F6B76E4" />
29632981
<ComponentRef Id="cmp9EF03D7C53CEE400751AD1905625B82B" />
29642982
<ComponentRef Id="cmpC4F524A9EBF63DAC78B9678CF113D652" />

‎src/Common/Commands.Common/Properties/Resources.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/ServiceManagement/RecoveryServices/Commands.RecoveryServices.Test/Commands.RecoveryServices.Test.csproj‎

Lines changed: 66 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\..\..\packages\xunit.core.2.0.0-beta5-build2785\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid\xunit.core.props" Condition="Exists('..\..\..\packages\xunit.core.2.0.0-beta5-build2785\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid\xunit.core.props')" />
4+
<Import Project="..\..\..\packages\xunit.runner.visualstudio.0.99.9-build1021\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\..\packages\xunit.runner.visualstudio.0.99.9-build1021\build\net20\xunit.runner.visualstudio.props')" />
35
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
46
<PropertyGroup>
57
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -36,6 +38,8 @@
3638
<Prefer32Bit>false</Prefer32Bit>
3739
</PropertyGroup>
3840
<ItemGroup>
41+
<Reference Include="Microsoft.Azure.Utilities.HttpRecorder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
42+
</Reference>
3943
<Reference Include="Hyak.Common">
4044
<HintPath>..\..\..\packages\Hyak.Common.1.0.2\lib\portable-net403+win+wpa81\Hyak.Common.dll</HintPath>
4145
</Reference>
@@ -79,8 +83,13 @@
7983
<SpecificVersion>False</SpecificVersion>
8084
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.0.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
8185
</Reference>
82-
<Reference Include="Microsoft.WindowsAzure.Management.SiteRecovery">
83-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.0.4.0-preview\lib\net40\Microsoft.WindowsAzure.Management.SiteRecovery.dll</HintPath>
86+
<Reference Include="Microsoft.WindowsAzure.Management.SiteRecovery, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
87+
<SpecificVersion>False</SpecificVersion>
88+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.0.5.0-preview\lib\net40\Microsoft.WindowsAzure.Management.SiteRecovery.dll</HintPath>
89+
</Reference>
90+
<Reference Include="Microsoft.WindowsAzure.Testing, Version=1.0.5417.13285, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
91+
<SpecificVersion>False</SpecificVersion>
92+
<HintPath>..\..\..\packages\Hydra.SpecTestSupport.1.0.5417.13285-prerelease\lib\net45\Microsoft.WindowsAzure.Testing.dll</HintPath>
8493
</Reference>
8594
<Reference Include="Newtonsoft.Json">
8695
<HintPath>..\..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -108,9 +117,14 @@
108117
<Reference Include="Microsoft.CSharp" />
109118
<Reference Include="System.Data" />
110119
<Reference Include="System.Xml" />
111-
<Reference Include="xunit, Version=1.9.2.1705, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
112-
<SpecificVersion>False</SpecificVersion>
113-
<HintPath>..\..\..\packages\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
120+
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
121+
<HintPath>..\..\..\packages\xunit.abstractions.2.0.0-beta5-build2785\lib\net35\xunit.abstractions.dll</HintPath>
122+
</Reference>
123+
<Reference Include="xunit.assert">
124+
<HintPath>..\..\..\packages\xunit.assert.2.0.0-beta5-build2785\lib\portable-net45+aspnetcore50+win+wpa81+wp80+monoandroid+monotouch10\xunit.assert.dll</HintPath>
125+
</Reference>
126+
<Reference Include="xunit.core">
127+
<HintPath>..\..\..\packages\xunit.core.2.0.0-beta5-build2785\lib\portable-net45+aspnetcore50+win+wpa81+wp80+monotouch+monoandroid\xunit.core.dll</HintPath>
114128
</Reference>
115129
</ItemGroup>
116130
<ItemGroup>
@@ -119,19 +133,63 @@
119133
<Compile Include="Properties\AssemblyInfo.cs" />
120134
</ItemGroup>
121135
<ItemGroup>
122-
<None Include="packages.config" />
136+
<None Include="packages.config">
137+
<SubType>Designer</SubType>
138+
</None>
123139
<None Include="ScenarioTests\RecoveryServicesTests.ps1">
124140
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
125141
</None>
126142
<None Include="ScenarioTests\vaultSettings.vaultcredentials">
127143
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
128144
</None>
145+
<None Include="SessionRecords\Microsoft.Azure.Commands.RecoveryServices.Test.ScenarioTests.RecoveryServicesTests\RecoveryServicesAzureNetworkMappingTest.json">
146+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
147+
</None>
148+
<None Include="SessionRecords\Microsoft.Azure.Commands.RecoveryServices.Test.ScenarioTests.RecoveryServicesTests\RecoveryServicesCommitPFOTest.json">
149+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
150+
</None>
151+
<None Include="SessionRecords\Microsoft.Azure.Commands.RecoveryServices.Test.ScenarioTests.RecoveryServicesTests\RecoveryServicesDisableProtectionTest.json">
152+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
153+
</None>
154+
<None Include="SessionRecords\Microsoft.Azure.Commands.RecoveryServices.Test.ScenarioTests.RecoveryServicesTests\RecoveryServicesE2E_CreateAndAssociateTest.json">
155+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
156+
</None>
157+
<None Include="SessionRecords\Microsoft.Azure.Commands.RecoveryServices.Test.ScenarioTests.RecoveryServicesTests\RecoveryServicesE2E_DeleteAndDissociateTest.json">
158+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
159+
</None>
160+
<None Include="SessionRecords\Microsoft.Azure.Commands.RecoveryServices.Test.ScenarioTests.RecoveryServicesTests\RecoveryServicesEnableProtectionTest.json">
161+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
162+
</None>
129163
<None Include="SessionRecords\Microsoft.Azure.Commands.RecoveryServices.Test.ScenarioTests.RecoveryServicesTests\RecoveryServicesEnumerationTests.json">
130164
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
131165
</None>
166+
<None Include="SessionRecords\Microsoft.Azure.Commands.RecoveryServices.Test.ScenarioTests.RecoveryServicesTests\RecoveryServicesFailbackTest.json">
167+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
168+
</None>
169+
<None Include="SessionRecords\Microsoft.Azure.Commands.RecoveryServices.Test.ScenarioTests.RecoveryServicesTests\RecoveryServicesNetworkMappingTest.json">
170+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
171+
</None>
172+
<None Include="SessionRecords\Microsoft.Azure.Commands.RecoveryServices.Test.ScenarioTests.RecoveryServicesTests\RecoveryServicesNetworkUnMappingTest.json">
173+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
174+
</None>
175+
<None Include="SessionRecords\Microsoft.Azure.Commands.RecoveryServices.Test.ScenarioTests.RecoveryServicesTests\RecoveryServicesPFOTest.json">
176+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
177+
</None>
132178
<None Include="SessionRecords\Microsoft.Azure.Commands.RecoveryServices.Test.ScenarioTests.RecoveryServicesTests\RecoveryServicesProtectionTests.json">
133179
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
134180
</None>
181+
<None Include="SessionRecords\Microsoft.Azure.Commands.RecoveryServices.Test.ScenarioTests.RecoveryServicesTests\RecoveryServicesRRAfterFailbackTest.json">
182+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
183+
</None>
184+
<None Include="SessionRecords\Microsoft.Azure.Commands.RecoveryServices.Test.ScenarioTests.RecoveryServicesTests\RecoveryServicesRRAfterFailoverTest.json">
185+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
186+
</None>
187+
<None Include="SessionRecords\Microsoft.Azure.Commands.RecoveryServices.Test.ScenarioTests.RecoveryServicesTests\RecoveryServicesStorageMappingTest.json">
188+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
189+
</None>
190+
<None Include="SessionRecords\Microsoft.Azure.Commands.RecoveryServices.Test.ScenarioTests.RecoveryServicesTests\RecoveryServicesStorageUnMappingTest.json">
191+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
192+
</None>
135193
</ItemGroup>
136194
<ItemGroup>
137195
<ProjectReference Include="..\..\..\Common\Commands.Common\Commands.Common.csproj">
@@ -157,6 +215,8 @@
157215
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
158216
</PropertyGroup>
159217
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
218+
<Error Condition="!Exists('..\..\..\packages\xunit.runner.visualstudio.0.99.9-build1021\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.runner.visualstudio.0.99.9-build1021\build\net20\xunit.runner.visualstudio.props'))" />
219+
<Error Condition="!Exists('..\..\..\packages\xunit.core.2.0.0-beta5-build2785\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.core.2.0.0-beta5-build2785\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid\xunit.core.props'))" />
160220
</Target>
161221
<Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
162222
<Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">

0 commit comments

Comments
 (0)