Resolve conflicts

Author: azdevxps

build.proj

@@ -79,16 +79,16 @@
   <UsingTask TaskName="VerifyAuthenticodeSignatureTask" AssemblyFile="$(BuildTasksPath)\Microsoft.Azure.Build.Tasks.dll" />
   <UsingTask TaskName="SmartTestingTask" AssemblyFile="$(BuildTasksPath)\Microsoft.Azure.Build.Tasks.dll" />
   <UsingTask TaskName="SetEnvVar" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll" >  
-	  <ParameterGroup>
-	    <EnvName ParameterType="System.String" Required="true" />
-		  <EnvValue ParameterType="System.String" Required="true" />
+    <ParameterGroup>
+      <EnvName ParameterType="System.String" Required="true" />
+      <EnvValue ParameterType="System.String" Required="true" />
     </ParameterGroup>
     <Task>
-		  <Using Namespace="System"/>
-		  <Code Type="Fragment" Language="cs">  
-			<![CDATA[System.Environment.SetEnvironmentVariable(EnvName, EnvValue);]]>
-		  </Code>  
-	  </Task>  
+      <Using Namespace="System"/>
+      <Code Type="Fragment" Language="cs">  
+      <![CDATA[System.Environment.SetEnvironmentVariable(EnvName, EnvValue);]]>
+      </Code>  
+    </Task>  
   </UsingTask>  <!--
   CI build related
   -->
@@ -196,17 +196,17 @@
     <MakeDir Directories="$(PackageDirectory)" />
     <Exec ContinueOnError="false" 
       Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot; . $(LibraryToolsFolder)\CreateMappings.ps1 -RootPath $(LibrarySourceFolder) -OutputFile $(PackageDirectory)\groupMapping.json -WarningFile $(PackageDirectory)\groupMappingWarnings.json -RulesFile $(LibraryToolsFolder)\CreateMappings_rules.json &quot;" Condition="'$(Latest)' == 'true'"/>
-	
+  
     <MSBuild
       Projects="@(CmdletSolutionsToBuild)"
       Targets="Build"
       Properties="Configuration=$(Configuration);Platform=Any CPU"
       BuildInParallel="$(BuildInParallel)"
       ContinueOnError="false" />     
 
-    <Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\GenerateHelp.ps1 -ValidateMarkdownHelp -GenerateMamlHelp -BuildConfig $(Configuration) &quot;"
-    	ContinueOnError="false"
-    	Condition=" '$(SkipHelp)' == 'false' and '$(Latest)' == 'true'"/>
+    <Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;$ProgressPreference = 'SilentlyContinue';. $(LibraryToolsFolder)\GenerateHelp.ps1 -ValidateMarkdownHelp -GenerateMamlHelp -BuildConfig $(Configuration) &quot;"
+      ContinueOnError="false"
+      Condition=" '$(SkipHelp)' == 'false' and '$(Latest)' == 'true'"/>
     <CallTarget Targets="BuildSetupTest"/>
  <!-- moved copy tasks -->
 
@@ -234,7 +234,7 @@
       DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)"
       Condition=" '$(CodeSign)' == 'true' "/>
 
-    <CallTarget Targets="CodeSignBinaries" Condition=" '$(CodeSign)' == 'true' " />	
+    <CallTarget Targets="CodeSignBinaries" Condition=" '$(CodeSign)' == 'true' " /> 
 
 
     <Copy SourceFiles="$(LibrarySourceFolder)\Package\$(Configuration)\AzureRM.psd1"
@@ -535,4 +535,4 @@
     <Message Importance="high" Text="Running live tests..." />
     <CallTarget Targets="LiveTests"/>
   </Target>
-</Project>
+</Project>

setup/azurecmd.wxs

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
 
-  <?define productName="Microsoft Azure PowerShell - October 2017" ?>
+  <?define productName="Microsoft Azure PowerShell - November 2017" ?>
   <?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
   <?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
 
-  <?define version="4.4.1" ?>
+  <?define version="5.0.0" ?>
 
   <Product Id="*"
            Name="$(var.productName)"

setup/azurecmdfiles.wxi

@@ -77,6 +77,7 @@ public class AzureEnvironment : IAzureEnvironment
                     AzureKeyVaultServiceEndpointResourceId = AzureEnvironmentConstants.ChinaKeyVaultServiceEndpointResourceId,
                     AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix = null,
                     AzureDataLakeStoreFileSystemEndpointSuffix = null,
+                    DataLakeEndpointResourceId = null,
                     GraphEndpointResourceId = AzureEnvironmentConstants.ChinaGraphEndpoint,
                     BatchEndpointResourceId = AzureEnvironmentConstants.ChinaBatchEndpointResourceId,
                     AdTenant = "Common"
@@ -102,6 +103,7 @@ public class AzureEnvironment : IAzureEnvironment
                     AzureKeyVaultServiceEndpointResourceId = AzureEnvironmentConstants.USGovernmentKeyVaultServiceEndpointResourceId,
                     AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix = null,
                     AzureDataLakeStoreFileSystemEndpointSuffix = null,
+                    DataLakeEndpointResourceId = null,
                     GraphEndpointResourceId = AzureEnvironmentConstants.USGovernmentGraphEndpoint,
                     BatchEndpointResourceId = AzureEnvironmentConstants.USGovernmentBatchEndpointResourceId,
                     AdTenant = "Common"
@@ -127,6 +129,7 @@ public class AzureEnvironment : IAzureEnvironment
                     AzureKeyVaultServiceEndpointResourceId = AzureEnvironmentConstants.GermanAzureKeyVaultServiceEndpointResourceId,
                     AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix = null,
                     AzureDataLakeStoreFileSystemEndpointSuffix = null,
+                    DataLakeEndpointResourceId = null,
                     GraphEndpointResourceId = AzureEnvironmentConstants.GermanGraphEndpoint,
                     BatchEndpointResourceId = AzureEnvironmentConstants.GermanBatchEndpointResourceId,
                     AdTenant = "Common"

src/Common/Commands.Common.Authentication.Abstractions/AzureEnvironment.cs

@@ -15,7 +15,7 @@
 using Newtonsoft.Json;
 using System;
 
-namespace Microsoft.WindowsAzure.Commands.Common
+namespace Microsoft.Azure.Commands.Common.Authentication.Abstractions
 {
     public class AzurePSDataCollectionProfile
     {

src/Common/Commands.Common/AzurePSDataCollectionProfile.cs renamed to src/Common/Commands.Common.Authentication.Abstractions/AzurePSDataCollectionProfile.cs

@@ -101,9 +101,12 @@
     <Compile Include="AuthenticationStore.cs" />
     <Compile Include="Authentication\AadAuthenticationException.cs" />
     <Compile Include="AzureAccount.cs" />
+    <Compile Include="AzurePSDataCollectionProfile.cs" />
     <Compile Include="AzureRmProfileProvider.cs" />
     <Compile Include="AzureSMProfileProvider.cs" />
     <Compile Include="ContextSaveMode.cs" />
+    <Compile Include="DataCollectionController.cs" />
+    <Compile Include="DiskDataStore.cs" />
     <Compile Include="Extensions\AzureAccountExtensions.cs" />
     <Compile Include="AzureEnvironmentConstants.cs" />
     <Compile Include="Extensions\AzureContextExtensions.cs" />
@@ -157,6 +160,7 @@
     <Compile Include="Settings\UserAgentSettings.cs" />
     <Compile Include="Settings\HandlerSettings.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Utilities\FileUtilities.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

src/Common/Commands.Common.Authentication.Abstractions/Commands.Common.Authentication.Abstractions.csproj

@@ -1,9 +1,4 @@
-using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
-using Microsoft.WindowsAzure.Commands.Common.Properties;
-using Newtonsoft.Json;
-using System;
-using System.IO;
-// ----------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------------
 //
 // Copyright Microsoft Corporation
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +12,11 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-namespace Microsoft.WindowsAzure.Commands.Common
+using Newtonsoft.Json;
+using System;
+using System.IO;
+
+namespace Microsoft.Azure.Commands.Common.Authentication.Abstractions
 {
     public abstract class DataCollectionController
     {

src/Common/Commands.Common/DataCollectionController.cs renamed to src/Common/Commands.Common.Authentication.Abstractions/DataCollectionController.cs

@@ -12,14 +12,13 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Commands.Common.Authentication;
+using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Properties;
 using System;
 using System.IO;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
-using Microsoft.WindowsAzure.Commands.Common.Properties;
 
-namespace Microsoft.WindowsAzure.Commands.Common
+namespace Microsoft.Azure.Commands.Common.Authentication.Abstractions
 {
     /// <summary>
     /// A ddata store based on the managed windows file system functions (System.IO)
@@ -192,7 +191,11 @@ public X509Certificate2 GetCertificate(string thumbprint)
             }
             else
             {
-                Validate.ValidateStringIsNullOrEmpty(thumbprint, "certificate thumbprint");
+                if (string.IsNullOrEmpty(thumbprint))
+                {
+                    throw new ArgumentException(string.Format(Resources.InvalidOrEmptyArgumentMessage, "certificate thumbprint"));
+                }
+
                 X509Certificate2Collection certificates;
                 if (TryFindCertificatesInStore(thumbprint, StoreLocation.CurrentUser, out certificates) ||
                     TryFindCertificatesInStore(thumbprint, StoreLocation.LocalMachine, out certificates))
@@ -212,7 +215,11 @@ public X509Certificate2 GetCertificate(string thumbprint)
         /// <param name="cert">The certificate to add</param>
         public void AddCertificate(X509Certificate2 certificate)
         {
-            Validate.ValidateNullArgument(certificate, Resources.InvalidCertificate);
+            if (certificate == null)
+            {
+                throw new ArgumentException(Resources.InvalidCertificate);
+            }
+
             X509StoreWrapper(StoreName.My, StoreLocation.CurrentUser, (store) =>
             {
                 store.Open(OpenFlags.ReadWrite);

src/Common/Commands.Common/DiskDataStore.cs renamed to src/Common/Commands.Common.Authentication.Abstractions/DiskDataStore.cs

@@ -120,6 +120,9 @@ public static bool TryGetEndpointString(this IAzureEnvironment environment, stri
                     case AzureEnvironment.Endpoint.AzureDataLakeStoreFileSystemEndpointSuffix:
                         propertyValue = environment.AzureDataLakeStoreFileSystemEndpointSuffix;
                         break;
+                    case AzureEnvironment.Endpoint.DataLakeEndpointResourceId:
+                        propertyValue = environment.DataLakeEndpointResourceId;
+                        break;
                     case AzureEnvironment.Endpoint.ActiveDirectory:
                         propertyValue = environment.ActiveDirectoryAuthority;
                         break;
@@ -444,6 +447,10 @@ public static void CopyFrom(this IAzureEnvironment environment, IAzureEnvironmen
                     environment.AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix =
                          other.AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix;
                 }
+                if (other.IsEndpointSet(AzureEnvironment.Endpoint.DataLakeEndpointResourceId))
+                {
+                    environment.DataLakeEndpointResourceId = other.DataLakeEndpointResourceId;
+                }
                 if (other.IsEndpointSet(AzureEnvironment.Endpoint.AzureKeyVaultServiceEndpointResourceId))
                 {
                     environment.AzureKeyVaultServiceEndpointResourceId =
@@ -540,6 +547,10 @@ public static void Update(this IAzureEnvironment environment, IAzureEnvironment
                     environment.AzureKeyVaultServiceEndpointResourceId =
                          other.AzureKeyVaultServiceEndpointResourceId;
                 }
+                if (other.IsEndpointSet(AzureEnvironment.Endpoint.DataLakeEndpointResourceId))
+                {
+                    environment.DataLakeEndpointResourceId = other.DataLakeEndpointResourceId;
+                }
 
                 foreach (var profile in other.VersionProfiles)
                 {

src/Common/Commands.Common.Authentication.Abstractions/Extensions/AzureEnvironmentExtensions.cs

@@ -129,9 +129,15 @@
   <data name="InvalidDnsName" xml:space="preserve">
     <value>"{0}" is an invalid DNS name for {1}</value>
   </data>
+  <data name="InvalidOrEmptyArgumentMessage" xml:space="preserve">
+    <value>{0} is invalid or empty.</value>
+  </data>
   <data name="NoInternetConnection" xml:space="preserve">
     <value>Please connect to internet before executing this cmdlet</value>
   </data>
+  <data name="PathDoesNotExist" xml:space="preserve">
+    <value>Path {0} doesn't exist.</value>
+  </data>
   <data name="ProfileLockReadDisposed" xml:space="preserve">
     <value>Attempted to read from the Azure PowerShell context after it was disposed.  Please reload the module and try this operation again.</value>
   </data>
@@ -180,4 +186,7 @@
   <data name="SessionNotInitialized" xml:space="preserve">
     <value>The Azure PowerShell session has not been properly initialized.  Please import the module and try again.</value>
   </data>
+  <data name="x86InProgramFiles" xml:space="preserve">
+    <value>(x86)</value>
+  </data>
 </root>

src/Common/Commands.Common.Authentication.Abstractions/Properties/Resources.Designer.cs

@@ -12,18 +12,15 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Commands.Common.Authentication;
-using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
-using Microsoft.Azure.Commands.Common.Authentication.Models;
-using Microsoft.WindowsAzure.Commands.Common.Properties;
+using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Properties;
 using System;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Text;
 
-namespace Microsoft.WindowsAzure.Commands.Common
+namespace Microsoft.Azure.Commands.Common.Authentication.Abstractions
 {
     /// <summary>
     /// File utilities using the data store
@@ -111,7 +108,7 @@ public static string GetWithProgramFilesPath(string directoryName, bool throwIfN
                     programFilesPath += Resources.x86InProgramFiles;
                     if (throwIfNotFound)
                     {
-                        Validate.ValidateDirectoryExists(Path.Combine(programFilesPath, directoryName));
+                        ValidateDirectoryExists(Path.Combine(programFilesPath, directoryName));
                     }
                     return Path.Combine(programFilesPath, directoryName);
                 }
@@ -120,7 +117,7 @@ public static string GetWithProgramFilesPath(string directoryName, bool throwIfN
                     programFilesPath = programFilesPath.Replace(Resources.x86InProgramFiles, String.Empty);
                     if (throwIfNotFound)
                     {
-                        Validate.ValidateDirectoryExists(Path.Combine(programFilesPath, directoryName));
+                        ValidateDirectoryExists(Path.Combine(programFilesPath, directoryName));
                     }
                     return Path.Combine(programFilesPath, directoryName);
                 }
@@ -167,7 +164,7 @@ public static void DirectoryCopy(string sourceDirName, string destDirName, bool
         /// <param name="pathName">The path to the file that will be created</param>
         public static void EnsureDirectoryExists(string pathName)
         {
-            Validate.ValidateStringIsNullOrEmpty(pathName, "Settings directory");
+            ValidateStringIsNullOrEmpty(pathName, "Settings directory");
             string directoryPath = Path.GetDirectoryName(pathName);
             if (!DataStore.DirectoryExists(directoryPath))
             {
@@ -368,5 +365,34 @@ public static string GetModuleFolderName(AzureModule module)
         {
             return module.ToString().Replace("Azure", "");
         }
+
+        private static void ValidateDirectoryExists(string directory, string exceptionMessage = null)
+        {
+            string msg = string.Format(Resources.PathDoesNotExist, directory);
+            if (!DataStore.DirectoryExists(directory))
+            {
+                if (!string.IsNullOrEmpty(exceptionMessage))
+                {
+                    msg = exceptionMessage;
+                }
+
+                throw new FileNotFoundException(msg);
+            }
+        }
+
+        private static void ValidateStringIsNullOrEmpty(string data, string messageData, bool useDefaultMessage = true)
+        {
+            if (string.IsNullOrEmpty(data))
+            {
+                if (useDefaultMessage)
+                {
+                    throw new ArgumentException(string.Format(Resources.InvalidOrEmptyArgumentMessage, messageData));
+                }
+                else
+                {
+                    throw new ArgumentException(messageData);
+                }
+            }
+        }
     }
 }

src/Common/Commands.Common.Authentication.Abstractions/Properties/Resources.resx

@@ -14,7 +14,6 @@
 
 using Microsoft.IdentityModel.Clients.ActiveDirectory;
 using Microsoft.Rest.Azure.Authentication;
-using Microsoft.WindowsAzure.Commands.Common;
 using System.Security;
 using System.Threading.Tasks;