Merge branch 'dev1' of https://github.com/MabOneSdk/azure-powershell into pikumar-dev1

# Conflicts:
#	src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/DpmPsBackupProvider.cs

Author: pikumarmsft16

setup/azurecmdfiles.wxi

@@ -2056,12 +2056,12 @@
                         <Component Id="cmp403248FE1CECDB2218740975E268E81C" Guid="*">
                             <File Id="fil6311352FB4850E9DAC49E5FCCA907E9B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Common.NetFramework.dll" />
                         </Component>
+                        <Component Id="cmpCB1E57631ACC09C97C35F61440812F1A" Guid="*">
+                            <File Id="filEE16C6D829A48ED4F843D5F901CFD331" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Management.RecoveryServices.Backup.dll" />
+                        </Component>
                         <Component Id="cmp16B849AA6669D83462B54D42D739CCCC" Guid="*">
                             <File Id="filE7E1056326FD5C43C9A9CDEBA5395825" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Management.RecoveryServices.dll" />
                         </Component>
-                        <Component Id="cmpC96F162D3A5B03822697EB2BE5B4D5EB" Guid="*">
-                            <File Id="filBF5932AC23F8EBCB6F98F17FF84774EF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Management.RecoveryServicesBackupManagement.dll" />
-                        </Component>
                         <Component Id="cmp13B3F08D31DD4410B1934B82517CAC9A" Guid="*">
                             <File Id="fil97E71F00473E72ABEB532AE5705FDBF6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Azure.ResourceManager.dll" />
                         </Component>
@@ -5735,8 +5735,8 @@
             <ComponentRef Id="cmpDD61A35D79AF0DB08D533DDD646150DC" />
             <ComponentRef Id="cmp577E28EE57A416E3052CEE1BD21E5990" />
             <ComponentRef Id="cmp403248FE1CECDB2218740975E268E81C" />
+            <ComponentRef Id="cmpCB1E57631ACC09C97C35F61440812F1A" />
             <ComponentRef Id="cmp16B849AA6669D83462B54D42D739CCCC" />
-            <ComponentRef Id="cmpC96F162D3A5B03822697EB2BE5B4D5EB" />
             <ComponentRef Id="cmp13B3F08D31DD4410B1934B82517CAC9A" />
             <ComponentRef Id="cmpA2EFAF047A9595A3CA7DFC6031140F27" />
             <ComponentRef Id="cmp902DC2364C6FF451A60B4D115B5DC7A9" />

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/Properties/Resources.Designer.cs

@@ -417,7 +417,7 @@ Please contact Microsoft for further assistant.</value>
     <value>Please provide Container of containerType as Windows and backupManagementType as MARS. Provided Container has containerType {0} and backupManagementType {1} which is invalid.</value>
   </data>
   <data name="GetRPErrorInputDatesShouldBeInUTC" xml:space="preserve">
-    <value>Both EndDate and StartDate should be in UTC format</value>
+    <value>Please specify startdate and enddate in UTC format</value>
   </data>
   <data name="BackupManagementTypeNotExpectedForWorkloadType" xml:space="preserve">
     <value>BackupManagementType is not expected for WorkloadType: {0}</value>

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/Properties/Resources.resx

@@ -173,11 +173,4 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <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>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
 </Project>