Skip to content

. #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 14, 2015
Merged

. #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d26ba06
Revert "Azure-Powershell pull"
markcowl Jul 14, 2015
1cef2c3
Merge pull request #604 from Azure/revert-482-dev
markcowl Jul 14, 2015
2afe8b3
Merge pull request #603 from huangpf/dev
yugangw-msft Jul 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions ChangeLog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,12 +129,6 @@
* Get-AzureSqlDatabaseRestorePoints
* Changed cmdlets:
* New-AzureSqlDatabase - Can now create Azure Sql Data Warehouse databases
* Azure Recovery Services
* Fixed Storage and Network mapping issues
* Added encryption support for failover changes
* Added Delete vault support
* Provisioned to update VM properties
* Few bug fixes

2015.06.05 version 0.9.3
* Fixed bug in Websites cmdlets related to slots #454
Expand Down
4 changes: 0 additions & 4 deletions setup/azurecmdfiles.wxi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3086,9 +3086,6 @@
<Component Id="cmp1E1EACEE941A7D7B9B2649BB3AC9ABC3" Guid="*">
<File Id="fil7BC44111780DA333D7D3C421E0660012" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.Azure.Commands.RecoveryServices.dll-help.xml" />
</Component>
<Component Id="cmp9C20E0942BCFF51F8948DDE7E47043F9" Guid="*">
<File Id="fil91A18D6C24D483473C8F08BC5DCED268" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.Azure.Commands.RecoveryServices.format.ps1xml" />
</Component>
<Component Id="cmpF2406A263F1B403C803ACB70D2468624" Guid="*">
<File Id="fil2AB9A3CCA503D5D983784642C1F8E4F4" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.Azure.Common.Authentication.dll" />
</Component>
Expand Down Expand Up @@ -5051,7 +5048,6 @@
<ComponentRef Id="cmp5FB7157FEA8EDC9D2D10814DA15518AE" />
<ComponentRef Id="cmpCA80C6C0F5670291AF2F3560D36B1EA3" />
<ComponentRef Id="cmp1E1EACEE941A7D7B9B2649BB3AC9ABC3" />
<ComponentRef Id="cmp9C20E0942BCFF51F8948DDE7E47043F9" />
<ComponentRef Id="cmpF2406A263F1B403C803ACB70D2468624" />
<ComponentRef Id="cmp8BF1C84B7C0D6D25264BEF64FD945354" />
<ComponentRef Id="cmp18ED74EDB82DE2351B9655ED86ACA19A" />
Expand Down
8 changes: 3 additions & 5 deletions ...ent/RecoveryServices/Commands.RecoveryServices.Test/Commands.RecoveryServices.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,9 @@
<Reference Include="Microsoft.WindowsAzure.Management">
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Management.SiteRecovery">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.0.6.0-preview\lib\net40\Microsoft.WindowsAzure.Management.SiteRecovery.dll</HintPath>
<Reference Include="Microsoft.WindowsAzure.Management.SiteRecovery, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.0.5.1-preview\lib\net40\Microsoft.WindowsAzure.Management.SiteRecovery.dll</HintPath>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Testing, Version=1.0.5417.13285, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand All @@ -91,9 +92,6 @@
<Reference Include="Newtonsoft.Json">
<HintPath>..\..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="SiteRecovery.Tests">
<HintPath>..\Commands.RecoveryServices\lib\SiteRecovery.Tests.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand Down
6 changes: 0 additions & 6 deletions ...nt/RecoveryServices/Commands.RecoveryServices.Test/ScenarioTests/RecoveryServicesTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,5 @@ public void CommitRPTest()
{
this.RunPowerShellTest("Test-CommitRP -vaultSettingsFilePath \"" + vaultSettingsFilePath + "\"");
}

[Trait(Category.AcceptanceType, Category.CheckIn)]
public void RecoveryServicesSanE2ETest()
{
this.RunPowerShellTest("Test-SanE2E -vaultSettingsFilePath \"" + vaultSettingsFilePath + "\"");
}
}
}
Loading