Skip to content

Commit 275072f

Browse files
sriramvusriramvu
committed
Merge pull request #69 from AsrOneSdk/sriramvu-dev
fixing NuGet dependency instead of DLL, UpdateVmPropertiesInput to VMProperties
2 parents dd70b26 + 9a7a465 commit 275072f

File tree

8 files changed

+29
-26
lines changed

8 files changed

+29
-26
lines changed

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,21 @@
3838
<Prefer32Bit>false</Prefer32Bit>
3939
</PropertyGroup>
4040
<ItemGroup>
41+
<Reference Include="Microsoft.Azure.Common">
42+
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.0.4\lib\net45\Microsoft.Azure.Common.dll</HintPath>
43+
</Reference>
44+
<Reference Include="Microsoft.Azure.Common.NetFramework">
45+
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.0.4\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
46+
</Reference>
4147
<Reference Include="Microsoft.Azure.Utilities.HttpRecorder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4248
</Reference>
4349
<Reference Include="Hyak.Common">
4450
<HintPath>..\..\..\packages\Hyak.Common.1.0.2\lib\portable-net403+win+wpa81\Hyak.Common.dll</HintPath>
4551
</Reference>
46-
<Reference Include="Microsoft.Azure.Common">
47-
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.0.2\lib\net45\Microsoft.Azure.Common.dll</HintPath>
48-
</Reference>
4952
<Reference Include="Microsoft.Azure.Common.Authentication">
5053
<SpecificVersion>False</SpecificVersion>
5154
<HintPath>..\..\..\packages\Microsoft.Azure.Common.Authentication.1.0.8-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
5255
</Reference>
53-
<Reference Include="Microsoft.Azure.Common.NetFramework">
54-
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.0.2\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
55-
</Reference>
5656
<Reference Include="Microsoft.Azure.ResourceManager">
5757
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.12.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
5858
</Reference>
@@ -83,6 +83,9 @@
8383
<SpecificVersion>False</SpecificVersion>
8484
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.0.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
8585
</Reference>
86+
<Reference Include="Microsoft.WindowsAzure.Management.SiteRecovery">
87+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.0.6.0-preview\lib\net40\Microsoft.WindowsAzure.Management.SiteRecovery.dll</HintPath>
88+
</Reference>
8689
<Reference Include="Microsoft.WindowsAzure.Testing, Version=1.0.5417.13285, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8790
<SpecificVersion>False</SpecificVersion>
8891
<HintPath>..\..\..\packages\Hydra.SpecTestSupport.1.0.5417.13285-prerelease\lib\net45\Microsoft.WindowsAzure.Testing.dll</HintPath>

‎src/ServiceManagement/RecoveryServices/Commands.RecoveryServices.Test/packages.config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
4-
<package id="Microsoft.Azure.Common" version="2.0.2" targetFramework="net45" />
4+
<package id="Microsoft.Azure.Common" version="2.0.4" targetFramework="net45" />
55
<package id="Microsoft.Azure.Common.Authentication" version="1.0.8-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
77
<package id="Microsoft.Azure.Common.Extensions" version="0.14.0-preview" targetFramework="net45" />
8+
<package id="Microsoft.Azure.Management.RecoveryServices" version="0.6.0-preview" targetFramework="net45" />
89
<package id="Microsoft.Azure.Management.Resources" version="2.12.0-preview" targetFramework="net45" />
910
<package id="Microsoft.Azure.Test.Framework" version="1.0.5513.27084-prerelease" targetFramework="net45" />
1011
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5513.27084-prerelease" targetFramework="net45" />

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

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,17 @@
5050
<Reference Include="Hyak.Common">
5151
<HintPath>..\..\..\packages\Hyak.Common.1.0.2\lib\portable-net403+win+wpa81\Hyak.Common.dll</HintPath>
5252
</Reference>
53-
<Reference Include="Microsoft.Azure.Common">
54-
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.0.2\lib\net45\Microsoft.Azure.Common.dll</HintPath>
53+
<Reference Include="Microsoft.Azure.Common, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
54+
<SpecificVersion>False</SpecificVersion>
55+
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.0.4\lib\net45\Microsoft.Azure.Common.dll</HintPath>
5556
</Reference>
5657
<Reference Include="Microsoft.Azure.Common.Authentication">
5758
<SpecificVersion>False</SpecificVersion>
5859
<HintPath>..\..\..\packages\Microsoft.Azure.Common.Authentication.1.0.8-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
5960
</Reference>
60-
<Reference Include="Microsoft.Azure.Common.NetFramework">
61-
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.0.2\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
61+
<Reference Include="Microsoft.Azure.Common.NetFramework, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
62+
<SpecificVersion>False</SpecificVersion>
63+
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.0.4\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
6264
</Reference>
6365
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6466
<SpecificVersion>False</SpecificVersion>
@@ -87,6 +89,10 @@
8789
<SpecificVersion>False</SpecificVersion>
8890
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Common.1.4.1\lib\net45\Microsoft.WindowsAzure.Common.NetFramework.dll</HintPath>
8991
</Reference>
92+
<Reference Include="Microsoft.WindowsAzure.Management.SiteRecovery, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
93+
<SpecificVersion>False</SpecificVersion>
94+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.0.6.0-preview\lib\net40\Microsoft.WindowsAzure.Management.SiteRecovery.dll</HintPath>
95+
</Reference>
9096
<Reference Include="Microsoft.WindowsAzure.Management.Storage, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9197
<SpecificVersion>False</SpecificVersion>
9298
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.0.0\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>
@@ -99,10 +105,6 @@
99105
<SpecificVersion>False</SpecificVersion>
100106
<HintPath>lib\Security.Cryptography.dll</HintPath>
101107
</Reference>
102-
<Reference Include="SiteRecovery.Tests, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
103-
<SpecificVersion>False</SpecificVersion>
104-
<HintPath>lib\SiteRecovery.Tests.dll</HintPath>
105-
</Reference>
106108
<Reference Include="System" />
107109
<Reference Include="System.Core" />
108110
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -218,13 +220,9 @@
218220
</ProjectReference>
219221
</ItemGroup>
220222
<ItemGroup>
221-
<Content Include="lib\Microsoft.WindowsAzure.Management.RecoveryServices.Specification.dll">
222-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
223-
</Content>
224223
<Content Include="lib\Security.Cryptography.dll">
225224
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
226225
</Content>
227-
<Content Include="lib\SiteRecovery.Tests.dll" />
228226
<Content Include="Microsoft.Azure.Commands.RecoveryServices.dll-help.xml">
229227
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
230228
</Content>

‎src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/PSRecoveryServicesClient/PSRecoveryServicesVMClient.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public VirtualMachineResponse GetAzureSiteRecoveryVirtualMachine(
5757
public JobResponse UpdateVmProperties(
5858
string protectionContainerId,
5959
string virtualMachineId,
60-
UpdateVmPropertiesInput updateVmPropertiesInput)
60+
VMProperties updateVmPropertiesInput)
6161
{
6262
return this.GetSiteRecoveryClient().Vm.UpdateVmProperties(
6363
protectionContainerId,

‎src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Service/SetAzureSiteRecoveryVM.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@ public override void ExecuteCmdlet()
9292
return;
9393
}
9494

95-
UpdateVmPropertiesInput updateVmPropertiesInput = new UpdateVmPropertiesInput();
96-
updateVmPropertiesInput.RecoveryAzureVmGivenName = this.Name;
97-
updateVmPropertiesInput.RecoveryAzureVmSize = this.Size;
98-
updateVmPropertiesInput.SelectedPrimaryNicId = this.PrimaryNic;
99-
updateVmPropertiesInput.RecoveryAzureNetworkId = this.RecoveryNetworkId;
95+
VMProperties updateVmPropertiesInput = new VMProperties();
96+
updateVmPropertiesInput.RecoveryAzureVMName = this.Name;
97+
updateVmPropertiesInput.RecoveryAzureVMSize = this.Size;
98+
//// updateVmPropertiesInput.SelectedPrimaryNicId = this.PrimaryNic;
99+
updateVmPropertiesInput.SelectedRecoveryAzureNetworkId = this.RecoveryNetworkId;
100100

101101
this.jobResponse = RecoveryServicesClient.UpdateVmProperties(
102102
this.VirtualMachine.ProtectionContainerId,

‎src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/lib/Microsoft.WindowsAzure.Management.RecoveryServices.Specification.dll

-175 KB
Binary file not shown.

‎src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/lib/SiteRecovery.Tests.dll

-552 KB
Binary file not shown.

‎src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/packages.config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
<packages>
33
<package id="BuildTools.StyleCop" version="4.7.49.0" targetFramework="net45" />
44
<package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
5-
<package id="Microsoft.Azure.Common" version="2.0.2" targetFramework="net45" />
5+
<package id="Microsoft.Azure.Common" version="2.0.4" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Authentication" version="1.0.8-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
8+
<package id="Microsoft.Azure.Management.RecoveryServices" version="0.6.0-preview" targetFramework="net45" />
89
<package id="Microsoft.Azure.Management.Resources" version="2.12.0-preview" targetFramework="net45" />
910
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1011
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />

0 commit comments

Comments
 (0)