Skip to content

Recovery Services bug fixes #196

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 33 commits into from
Feb 26, 2015
Merged

Recovery Services bug fixes #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
999a856
bug1645997: Get-AzureSiteRecoveryVaultSettingsFile fails with Null re…
sriramvu Feb 17, 2015
263b122
Merge branch 'dev' of https://github.com/AsrOneSdk/azure-powershell i…
sriramvu Feb 20, 2015
6f969fa
synced setup/azurecmdfiles.wxi
sriramvu Feb 23, 2015
2b901f5
PrimaryNic to PrimaryNetworkId
sriramvu Feb 23, 2015
47c6bbe
updated few recorded JSONs
sriramvu Feb 23, 2015
d098ba4
Installed latest Recovery Services NuGet 0.5.0
sriramvu Feb 23, 2015
4e95183
Merge branch 'dev' of https://github.com/AsrOneSdk/azure-powershell i…
sriramvu Feb 23, 2015
a589395
Merge branch 'dev' of https://github.com/AsrOneSdk/azure-powershell i…
sriramvu Feb 24, 2015
d4b71bd
Revert "Reverting Storage account related validation changes."
NehaRaje Feb 24, 2015
83ac9eb
Merge branch 'sriramvu-dev' of https://github.com/AsrOneSdk/azure-pow…
sriramvu Feb 24, 2015
73d92d6
new line at the end
sriramvu Feb 24, 2015
7729912
Merge branch 'dev' of https://github.com/AsrOneSdk/azure-powershell i…
sriramvu Feb 24, 2015
556ae67
reverted the change left in Resources.Designer.cs
sriramvu Feb 24, 2015
c9ae2df
updated fix for bug 1645997 and a resx tag fix
sriramvu Feb 25, 2015
f83355b
reduced the scope for selectedVault
sriramvu Feb 25, 2015
a4e3683
Revert "PrimaryNic to PrimaryNetworkId"
sriramvu Feb 25, 2015
15e97f5
Merge pull request #52 from AsrOneSdk/sriramvu-dev
sanjkuma Feb 25, 2015
2589f70
UFO/Vault/site changes and help file updation.
sanjkuma Feb 25, 2015
e617358
Merge branch 'dev' of https://github.com/AsrOneSdk/azure-powershell i…
sanjkuma Feb 26, 2015
d403d80
Merge branch 'dev' into neha-dev
NehaRaje Feb 26, 2015
424d1fd
Commands.websites fix
sriramvu Feb 26, 2015
70ea2e6
Updated hydra package to 0.5.1
sanjkuma Feb 26, 2015
be377f5
Merge branch 'dev' of https://github.com/AsrOneSdk/azure-powershell i…
sanjkuma Feb 26, 2015
241381c
Merge pull request #53 from AsrOneSdk/sanjkuma-dev
sriramvu Feb 26, 2015
a2b3133
bug1822377
sriramvu Feb 26, 2015
5e5e5a7
removing quotes
sriramvu Feb 26, 2015
07750ad
Adding warning for location being invalid.
NehaRaje Feb 26, 2015
b603326
Merge pull request #55 from AsrOneSdk/sriramvu-dev
sanjkuma Feb 26, 2015
d590357
Taking offline pr comments
NehaRaje Feb 26, 2015
955f28c
Correction of error statement in resx file
NehaRaje Feb 26, 2015
0815cbb
Merge pull request #54 from AsrOneSdk/neha-dev
sriramvu Feb 26, 2015
3ff62b5
A minor fix
NehaRaje Feb 26, 2015
fb22670
Merge pull request #56 from AsrOneSdk/neha-dev
sriramvu Feb 26, 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
2 changes: 1 addition & 1 deletion src/Common/Commands.Common/Properties/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 9 additions & 12 deletions src/ResourceManager/Websites/Commands.Websites/Commands.Websites.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,16 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Hyak.Common">
<HintPath>..\..\..\packages\Hyak.Common.1.0.1\lib\portable-net403+win+wpa81\Hyak.Common.dll</HintPath>
<HintPath>..\..\..\packages\Hyak.Common.1.0.2\lib\net45\Hyak.Common.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Common">
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.0.1\lib\net45\Microsoft.Azure.Common.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.0.2\lib\net45\Microsoft.Azure.Common.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Common.Extensions, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Common.Extensions.0.13.0-preview\lib\net45\Microsoft.Azure.Common.Extensions.dll</HintPath>
<Reference Include="Microsoft.Azure.Common.Authentication">
<HintPath>..\..\..\packages\Microsoft.Azure.Common.Authentication.1.0.10-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Common.NetFramework">
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.0.1\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.0.2\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Gallery, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand All @@ -80,13 +79,11 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.12.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
</Reference>
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.11.10918.1222\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory">
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.12.111071459\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
</Reference>
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms, Version=2.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.11.10918.1222\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms">
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.12.111071459\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down
3 changes: 1 addition & 2 deletions src/ResourceManager/Websites/Commands.Websites/Models.Websites/WebsitesBaseClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
using Microsoft.WindowsAzure.Commands.Utilities.Common;
using Microsoft.Azure.Commands.Websites.Utilities;


namespace Microsoft.Azure.Commands.Websites.Models.Websites
{
public abstract class WebsitesBaseClient : AzurePSCmdlet
Expand All @@ -33,7 +32,7 @@ public WebsitesClient WebsitesClient
{
if (_websitesClient == null)
{
_websitesClient = new WebsitesClient(CurrentContext);
_websitesClient = new WebsitesClient(this.Profile.Context);
}
return _websitesClient;
}
Expand Down
4 changes: 2 additions & 2 deletions src/ResourceManager/Websites/Commands.Websites/Utilities/WebsitesClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
using Microsoft.Azure.Management.WebSites;
using System.Net;
using Hyak.Common;
using Microsoft.Azure.Common.Extensions.Models;
using Microsoft.Azure.Common.Extensions;
using Microsoft.Azure.Common.Authentication.Models;
using Microsoft.Azure.Common.Authentication;
using Microsoft.Azure.Management.WebSites.Models;

namespace Microsoft.Azure.Commands.Websites.Utilities
Expand Down
8 changes: 4 additions & 4 deletions src/ResourceManager/Websites/Commands.Websites/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Hyak.Common" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.Azure.Common" version="2.0.1" targetFramework="net45" />
<package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
<package id="Microsoft.Azure.Common" version="2.0.2" targetFramework="net45" />
<package id="Microsoft.Azure.Common.Authentication" version="1.0.10-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.Common.Extensions" version="0.13.0-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Gallery" version="2.6.0-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Graph.RBAC" version="1.6.0-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Authorization" version="0.16.0-preview" targetFramework="net45" />
Expand All @@ -12,7 +12,7 @@
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.11.10918.1222" targetFramework="net45" />
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.12.111071459" targetFramework="net45" />
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.Management" version="4.0.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
Expand Down
2 changes: 1 addition & 1 deletion ...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 @@ -85,7 +85,7 @@
</Reference>
<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.0-preview\lib\net40\Microsoft.WindowsAzure.Management.SiteRecovery.dll</HintPath>
<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 Down
2 changes: 1 addition & 1 deletion src/ServiceManagement/RecoveryServices/Commands.RecoveryServices.Test/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<package id="Microsoft.Azure.Common.Authentication" version="1.0.8-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.Common.Extensions" version="0.14.0-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.RecoveryServices" version="0.5.0-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.RecoveryServices" version="0.5.1-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Resources" version="2.12.0-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Test.Framework" version="1.0.5513.27084-prerelease" targetFramework="net45" />
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5513.27084-prerelease" targetFramework="net45" />
Expand Down
2 changes: 1 addition & 1 deletion ...iceManagement/RecoveryServices/Commands.RecoveryServices/Commands.RecoveryServices.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
</Reference>
<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.0-preview\lib\net40\Microsoft.WindowsAzure.Management.SiteRecovery.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.0.5.1-preview\lib\net40\Microsoft.WindowsAzure.Management.SiteRecovery.dll</HintPath>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Management.Storage, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down
Loading