Merge branch 'preview' into patch-2

Author: cormacpayne

AzurePowershell.Test.targets

@@ -64,10 +64,9 @@
 			AppDomains="true"
 			ShadowCopy="false"
 			ParallelizeTestCollections="false"
-			ParallelizeAssemblies="true"
+			ParallelizeAssemblies="false"
 			IncludeTraits="AcceptanceType=CheckIn"
 			Html="$(TestOutputDirectory)\AzurePowershellTestResults.html"
-			MaxParallelThreads="10"
 			DiagnosticMessages="false"
 			ContinueOnError="false"
 			Condition=" @(XUnitTests) != '' "/>
@@ -82,10 +81,9 @@
 			AppDomains="true"
 			ShadowCopy="false"
 			ParallelizeTestCollections="false"
-			ParallelizeAssemblies="true"
+			ParallelizeAssemblies="false"
 			ExcludeTraits="RunType=LiveOnly;AcceptanceType=CheckIn"
 			Html="$(TestOutputDirectory)\AzurePowershellAllTestResults.html"
-			MaxParallelThreads="10"
 			DiagnosticMessages="false"
 			ContinueOnError="false"
 			Condition=" @(XUnitTests) != '' "/>

TestMappings.json

@@ -146,6 +146,9 @@
     ".\\src\\ResourceManager\\RecoveryServices\\Commands.RecoveryServices.Backup.Test\\bin\\Debug\\Microsoft.Azure.Commands.RecoveryServices.Backup.Test.dll",
     ".\\src\\ResourceManager\\RecoveryServices\\Commands.RecoveryServices.Test\\bin\\Debug\\Microsoft.Azure.Commands.RecoveryServicesArm.Test.dll"
   ],
+  "src/ResourceManager/RecoveryServices.SiteRecovery/": [
+    ".\\src\\ResourceManager\\RecoveryServices.SiteRecovery\\Commands.RecoveryServices.SiteRecovery.Test\\bin\\Debug\\Microsoft.Azure.Commands.RecoveryServices.SiteRecovery.Test.dll"
+  ],
   "src/ResourceManager/RedisCache/": [
     ".\\src\\ResourceManager\\RedisCache\\Commands.RedisCache.Test\\bin\\Debug\\Microsoft.Azure.Commands.RedisCache.Test.dll"
   ],

build.proj

@@ -642,13 +642,27 @@
   <Target Name="Test" DependsOnTargets="BeforeRunTests">
     <Message Importance="high" Text="Running check in tests..." />
 
+    <CallTarget Targets="BinScopeCheck" />
+
+    <CallTarget Targets="RunPoliCheck" />
+
     <Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;$(MSBuildProjectDirectory)\tools\Modules\Run-UnitTests.ps1 -BuildConfig $(Configuration) -Scope $(Scope) &quot;"
           ContinueOnError="ErrorAndContinue"/>
 
     <!-- Azure / Stack -->
     <CallTarget Targets="InvokeXUnit" />
   </Target>
 
+  <Target Name="BinScopeCheck">
+    <Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;$(MSBuildProjectDirectory)\tools\CheckBinScope.ps1 -BuildConfig $(Configuration) -CIToolsPath $(CIToolsPath) &quot;"
+          ContinueOnError="False"/>
+    <OnError ExecuteTargets="BinScopeErrorMessage"/>
+  </Target>
+
+  <Target Name="BinScopeErrorMessage">
+    <Error Text="Binscope failed, please check the files in src/Package/BinScope"/>
+  </Target>
+
   <!-- Run Full switch with scenario tests -->
   <Target
     Name="FullWithScenarioTests"
@@ -665,4 +679,14 @@
     <CallTarget Targets="LiveTests"/>
   </Target>
 
+  <Target Name="RunPoliCheck">
+    <Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;$(MSBuildProjectDirectory)\tools\CheckPoliCheck.ps1 -BuildConfig $(Configuration) -CIToolsPath $(CIToolsPath) &quot;"
+          ContinueOnError="False"/>
+    <OnError ExecuteTargets="PoliCheckErrorMessage"/>
+  </Target>
+
+  <Target Name="PoliCheckErrorMessage">
+    <Error Text="PoliCheck failed with a Severity 1 issue, please check the report at in src/Package/PoliCheck-Scan.html"/>
+  </Target>
+
 </Project>

src/Common/Commands.Common.Authentication.Abstractions/Settings/AuthenticationFactorySettings.cs

@@ -22,6 +22,8 @@ namespace Microsoft.Azure.Commands.Common.Authentication.Abstractions
     /// </summary>
     public class AuthenticationFactorySettings : IExtensibleSettings
     {
+        public const string CommonAdTenant = "Common";
+
         /// <summary>
         /// The default token cache used for the authentication factory
         /// </summary>