Merge pull request #311 from MabOneSdk/dev1

Incorporated PR comments

Author: sudhakar4171

setup/azurecmdfiles.wxi

@@ -2002,9 +2002,6 @@
                         <Component Id="cmp131A9DE83A67006D51F1314A42E399CA" Guid="*">
                             <File Id="filA2C0D97A8033046D96249BA12C24D9D4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\AzureRM.RecoveryServices.Backup.psd1" />
                         </Component>
-                        <Component Id="cmpEB886EAAAF58ED0808ACCABDCC7707CA" Guid="*">
-                            <File Id="filB0E96893813842B67380A6863ABBCC0D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\AzureRM.RecoveryServices.psd1" />
-                        </Component>
                         <Component Id="cmpB35FF47D728C871816F14A3529260DE9" Guid="*">
                             <File Id="fil4BCDE7803B14A0BC88A83E82379716A7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Hyak.Common.dll" />
                         </Component>
@@ -2032,9 +2029,6 @@
                         <Component Id="cmpB7B864E9C70EE65B799C79119DF7E80B" Guid="*">
                             <File Id="fil53BEB99E0373F87AA8C1DE1E39F13115" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers.dll" />
                         </Component>
-                        <Component Id="cmp298EE60DD6AAA12C33CA9E9EDDE4D674" Guid="*">
-                            <File Id="filCA9A0EEBDB33D088D4D0EB9555189CD6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Commands.RecoveryServices.Backup.HydraAdapter.dll" />
-                        </Component>
                         <Component Id="cmp8826130AB84A23A8748B2E58087F1733" Guid="*">
                             <File Id="filBDEE1F034CEDF43D3B10E1DCA9DF81C0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Commands.RecoveryServices.Backup.Logger.dll" />
                         </Component>
@@ -2044,6 +2038,9 @@
                         <Component Id="cmp3CBA7972F4711484D7FFF19457023268" Guid="*">
                             <File Id="filFEB151053DDC35E6643F363B07EC1EE3" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Commands.RecoveryServices.Backup.Providers.dll" />
                         </Component>
+                        <Component Id="cmpB57F8F8298BF0638BFC679D217D71961" Guid="*">
+                            <File Id="fil0D19F831018B79D88CF568D14CC27CA3" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Commands.RecoveryServices.Backup.ServiceClientAdapter.dll" />
+                        </Component>
                         <Component Id="cmpDD61A35D79AF0DB08D533DDD646150DC" Guid="*">
                             <File Id="filF23BA348008E142BB0CEBEBDBD6F0B09" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
                         </Component>
@@ -5717,7 +5714,6 @@
             <ComponentRef Id="cmpC00974919B90C9055BED1F2A9DA95441" />
             <ComponentRef Id="cmpE300D8B185C427E05E95BA97413F6CC8" />
             <ComponentRef Id="cmp131A9DE83A67006D51F1314A42E399CA" />
-            <ComponentRef Id="cmpEB886EAAAF58ED0808ACCABDCC7707CA" />
             <ComponentRef Id="cmpB35FF47D728C871816F14A3529260DE9" />
             <ComponentRef Id="cmp99A277F4A4EF20D7BFBB171691A4B7E7" />
             <ComponentRef Id="cmp1675F88279F58B72A180AF1411111337" />
@@ -5727,10 +5723,10 @@
             <ComponentRef Id="cmpC9D832735AB0EF3B4F1309E307393863" />
             <ComponentRef Id="cmp7E42CC4AEA15FEF46E621AD38CC09F5A" />
             <ComponentRef Id="cmpB7B864E9C70EE65B799C79119DF7E80B" />
-            <ComponentRef Id="cmp298EE60DD6AAA12C33CA9E9EDDE4D674" />
             <ComponentRef Id="cmp8826130AB84A23A8748B2E58087F1733" />
             <ComponentRef Id="cmp705D3AFB5E86339823E569C4645A139F" />
             <ComponentRef Id="cmp3CBA7972F4711484D7FFF19457023268" />
+            <ComponentRef Id="cmpB57F8F8298BF0638BFC679D217D71961" />
             <ComponentRef Id="cmpDD61A35D79AF0DB08D533DDD646150DC" />
             <ComponentRef Id="cmp577E28EE57A416E3052CEE1BD21E5990" />
             <ComponentRef Id="cmp403248FE1CECDB2218740975E268E81C" />

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Commands.RecoveryServices.Backup.Helpers.csproj

@@ -36,7 +36,7 @@
     <Reference Include="Microsoft.Azure.Common">
       <HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Azure.Management.RecoveryServices.Backup, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Azure.Management.RecoveryServices.Backup, Version=0.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.Backup.0.1.0-preview\lib\net40\Microsoft.Azure.Management.RecoveryServices.Backup.dll</HintPath>
     </Reference>
@@ -52,23 +52,19 @@
   <ItemGroup>
     <Compile Include="Conversions\JobConversions.cs" />
     <Compile Include="Conversions\RecoveryPointConversions.cs" />
-    <Compile Include="Utils.cs" />
+    <Compile Include="HelperUtils.cs" />
     <Compile Include="Validations\PolicyValidations.cs" />
     <Compile Include="Conversions\SchedulePolicyConversions.cs" />
     <Compile Include="Conversions\RetentionPolicyConversions.cs" />
     <Compile Include="Conversions\ConversionHelpers.cs" />
-    <Compile Include="HydraHelpers.cs" />
+    <Compile Include="ServiceClientHelpers.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Common\Commands.Common\Commands.Common.csproj">
       <Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
       <Name>Commands.Common</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Commands.RecoveryServices.Backup.HydraAdapter\Commands.RecoveryServices.Backup.HydraAdapter.csproj">
-      <Project>{b758fec1-35c1-4f93-a954-66dd33f6e0ec}</Project>
-      <Name>Commands.RecoveryServices.Backup.HydraAdapter</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Commands.RecoveryServices.Backup.Logger\Commands.RecoveryServices.Backup.Logger.csproj">
       <Project>{5e675749-6139-464a-904c-59c0ffdfec82}</Project>
       <Name>Commands.RecoveryServices.Backup.Logger</Name>