Merge branch 'preview' of https://github.com/Azure/azure-powershell into use-connect-and-disconnect-verbs

Author: Maddie Clayton

TestMappings.json

@@ -184,4 +184,4 @@
  "src/ResourceManager/ApplicationInsights/": [
     ".\\src\\ResourceManager\\ApplicationInsights\\Commands.ApplicationInsights.Test\\bin\\Debug\\Microsoft.Azure.Commands.ApplicationInsights.Test.dll"
   ]  
-}
+}

build.proj

@@ -509,6 +509,11 @@
     <Message Importance="high" Text="Running Dependency Analysis..." />
     <Exec Command="$(MSBuildProjectDirectory)\src\Package\StaticAnalysis.exe $(MSBuildProjectDirectory)\src\Package\$(Configuration) $(MSBuildProjectDirectory)\src\Package true $(SkipHelp)" Condition="'$(Latest)' == 'true'"/>
     <Exec Command="$(MSBuildProjectDirectory)\src\Package\StaticAnalysis.exe $(MSBuildProjectDirectory)\src\Stack\$(Configuration) $(MSBuildProjectDirectory)\src\Stack" Condition="'$(Stack)' == 'true'" ContinueOnError="True"/>
+    <OnError ExecuteTargets="StaticAnalysisErrorMessage"/>
+  </Target>
+
+  <Target Name="StaticAnalysisErrorMessage">
+    <Error Text="StaticAnalysis has failed.  Please follow the instructions on this doc: https://github.com/Azure/azure-powershell/blob/preview/documentation/Debugging-StaticAnalysis-Errors.md"/>
   </Target>
 
   <!-- Publish all packages -->

documentation/Using-Azure-TestFramework.md

@@ -144,7 +144,7 @@ To use this option, set the following environment variable before starting Visua
 
 ## Record or Playback Tests
 
-1. Run the test and make sure that you got a generated .json file that matches the test name in the bin folder under *SessionRecords folder
+1. [Run the test](https://github.com/Azure/azure-powershell/wiki/Azure-Powershell-Developer-Guide#running-tests) and make sure that you got a generated .json file that matches the test name in the bin folder under *SessionRecords folder
 2. Copy SessionRecords folder inside the test project and add all *.json files in Visual Studio setting "Copy to Output Directory" property to "Copy if newer"
 3. To assure that the records work fine, delete the connection string (default mode is Playback mode) OR change HttpRecorderMode within the connection string to "Playback"
 

documentation/debugging-staticanalysis-errors.md

@@ -0,0 +1,47 @@
+# Debugging StaticAnalysis Errors
+
+Our StaticAnalysis tools help us ensure our modules follow PowerShell guidelines and prevent breaking changes from occurring outside of breaking change releases.
+
+- [How to know if you have a StaticAnalysis Error](#how-to-know-if-you-have-a-staticanalysis-error)
+- [Where to find StaticAnalysis reports](#where-to-find-staticanalysis-reports)
+- [Types of StaticAnalysis Errors](#types-of-staticanalysis-errors)
+    - [Breaking Changes](#breaking-changes)
+    - [Signature Issues](#signature-issues)
+    - [Help Issues](#help-issues)
+
+## How to know if you have a StaticAnalysis Error
+If your build is failing, click on the Jenkins job inside the PR (marked as "Default" within checks).  Then check the Console Output within the Jenkins job.  If you have this error, then you have failed StaticAnalysis:
+```
+d:\workspace\powershell\build.proj(511,5): error MSB3073: The command "d:\workspace\powershell\src\Package\StaticAnalysis.exe d:\workspace\powershell\src\Package\Debug d:\workspace\powershell\src\Package true false" exited with code 255.
+```
+
+## Where to find StaticAnalysis reports
+
+The StaticAnalysis reports could show up in two different places in the CI build:
+- On the status page in Jenkins, under the Build Artifacts: the relevant files are BreakingChangeIssues.csv, SignatureIssues.csv, and/or HelpIssues.csv.
+- On the status page in Jenkins, click Build Artifacts then navigate to src/Package.  You will see BreakingChangeIssues.csv, SignatureIssues.csv, and/or HelpIssues.csv.
+
+Locally, the StaticAnalysis report will show up under Azure-PowerShell/src/Package. You will see BreakingChangeIssues.csv, SignatureIssues.csv, and/or HelpIssues.csv.  You can generate these files by running
+```
+msbuild build.proj
+```
+
+## Types of StaticAnalysis Errors
+The three most common Static Analysis errors are breaking changes, signature issues, and help issues.  To figure out which type of error is causing the build failure, open each of the relevant .csv files (if the .csv file does not exist, there is no violation detected).  Any issue marked with severity 0 or 1 must be resolved in order for the build to pass.
+
+### Breaking Changes
+If you make a change that could cause a breaking change, it will be listed in BreakingChangeIssues.csv.  Please look at each of these errors, and if they do indeed introduce a breaking change in a non-breaking change release, please revert the change that caused this violation.  Sometimes the error listed in the .csv file can be a false positive (for example, if you change a parameter attribute to span all parameter sets rather than individual parameter sets).  Please read the error thoroughly and examine the relevant code before deciding that an error is a false positive, and contact the Azure PowerShell team if you have questions.  If you are releasing a preview module, are releasing during a breaking change release, or have determined that the error is a false positive, please follow these instructions:
+- Copy each of the errors you would like to suppress directly from the BreakingChangeIssues.csv file output in the Jenkins build
+- Paste each of these error into the [BreakingChangeIssues.csv file](https://github.com/Azure/azure-powershell/blob/preview/tools/StaticAnalysis/Exceptions/BreakingChangeIssues.csv) in our GitHub repo. Note that you will need to edit this file in a text editor rather than Excel to prevent parsing errors.
+- Push the changes to the .csv file and ensure the errors no longer show up in the BreakingChangeIssues.csv file output from the Jenkins build.
+
+We take breaking changes very seriously, so please be mindful about the violations that you suppress in our repo.
+
+### Signature Issues
+Signature issues occur when your cmdlets do not follow PowerShell standards.  Please check [this page](https://github.com/Azure/azure-powershell/wiki/PowerShell-Cmdlet-Design-Guidelines) to ensure you are following PowerShell guidelines.  Issues with severity 0 or 1 must be addressed, while issues with severity 2 are advisory.  If you have an issue with severity 0 or 1 that has been approved by the Azure PowerShell team, you can suppress them following these steps:
+- Copy each of the errors you would like to suppress directly from the SignatureIssues.csv file output in the Jenkins build
+- Paste each of these error into the [SignatureIssues.csv file](https://github.com/Azure/azure-powershell/blob/preview/tools/StaticAnalysis/Exceptions/SignatureIssues.csv) in our GitHub repo. Note that you will need to edit this file in a text editor rather than Excel to prevent parsing errors.
+- Push the changes to the .csv file and ensure the errors no longer show up in the SignatureIssues.csv file output from the Jenkins build.
+
+### Help Issues
+Most help issues that cause StaticAnalysis to fail occur when help has not been added for a particular cmdlet.  If you have not generated help for your new cmdlets, please follow the instructions [here](https://github.com/Azure/azure-powershell/blob/preview/documentation/help-generation.md).  If this is not the issue, follow the steps listed under "Remediation" for each violation listed in HelpIssues.csv.

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

@@ -23,7 +23,7 @@ namespace Microsoft.Azure.Commands.Common.Authentication.Abstractions
     public class ClientFactorySettings : IExtensibleSettings
     {
         /// <summary>
-        /// The user agents in the cusrrent client factory
+        /// The user agents in the current client factory
         /// </summary>
         public IEnumerable<UserAgentSettings> UserAgents { get; }
 

src/ResourceManager/Billing/Commands.Billing/Common/AzureBillingCmdletBase.cs

@@ -29,8 +29,6 @@ public abstract class AzureBillingCmdletBase : AzureRMCmdlet
     {
         private IBillingManagementClient _billingManagementClient;
 
-        private Dictionary<string, List<string>> _defaultRequestHeaders;
-
         /// <summary>
         /// Gets or sets the Billing management client.
         /// </summary>

src/ResourceManager/Consumption/Commands.Consumption/Common/AzureConsumptionCmdletBase.cs

@@ -28,8 +28,6 @@ public abstract class AzureConsumptionCmdletBase : AzureRMCmdlet
     {
         private IConsumptionManagementClient _consumptionManagementClient;
 
-        private Dictionary<string, List<string>> _defaultRequestHeaders;
-
         /// <summary>
         /// Gets or sets the Consumption management client.
         /// </summary>

src/ResourceManager/ContainerInstance/Commands.ContainerInstance/help/New-AzureRmContainerGroup.md

@@ -46,7 +46,7 @@ The **New-AzureRmContainerGroup** cmdlets creates a container group.
 
 ### Example 1
 ```
-PS C:\> New-AzureRmContainerGroup -ResourceGroupName demo -Name mycontainer -Image nginx -OsType Linux -IpAddressType Public -Ports @(8000)
+PS C:\> New-AzureRmContainerGroup -ResourceGroupName demo -Name mycontainer -Image nginx -OsType Linux -IpAddressType Public -Port @(8000)
 
 ResourceGroupName        : demo
 Id                       : /subscriptions/ae43b1e3-c35d-4c8c-bc0d-f148b4c52b78/resourceGroups/demo/providers/Microsoft.ContainerInstance/containerGroups/mycontainer

src/ResourceManager/KeyVault/Commands.KeyVault.Test/Commands.KeyVault.Test.csproj

@@ -362,10 +362,4 @@
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use 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('..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
-  </Target>
 </Project>

src/ResourceManager/KeyVault/Commands.KeyVault/Models/KeyVaultManagementCmdletBase.cs

@@ -12,7 +12,11 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+#if NETSTANDARD
 using Microsoft.Azure.Graph.RBAC.Version1_6.ActiveDirectory;
+#else
+using Microsoft.Azure.ActiveDirectory.GraphClient;
+#endif
 using Microsoft.Azure.Commands.Common.Authentication;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
 using Microsoft.Azure.Commands.Common.Authentication.Models;
@@ -67,7 +71,13 @@ public ActiveDirectoryClient ActiveDirectoryClient
                 if (_activeDirectoryClient == null)
                 {
                     _dataServiceCredential = new DataServiceCredential(AzureSession.Instance.AuthenticationFactory, DefaultProfile.DefaultContext, AzureEnvironment.Endpoint.Graph);
+#if NETSTANDARD
                     _activeDirectoryClient = new ActiveDirectoryClient(DefaultProfile.DefaultContext);
+#else
+                    _activeDirectoryClient = new ActiveDirectoryClient(new Uri(string.Format("{0}/{1}",
+                    DefaultProfile.DefaultContext.Environment.GetEndpoint(AzureEnvironment.Endpoint.Graph), _dataServiceCredential.TenantId)),
+                    () => Task.FromResult(_dataServiceCredential.GetToken()));
+#endif
                 }
                 return this._activeDirectoryClient;
             }
@@ -204,7 +214,13 @@ protected string GetCurrentUsersObjectId()
             string objectId = null;
             if (DefaultContext.Account.Type == AzureAccount.AccountType.User)
             {
-                objectId = ActiveDirectoryClient.GetObjectId(new ADObjectFilterOptions()).ToString();
+#if NETSTANDARD
+                objectId = ActiveDirectoryClient.GetObjectId(new ADObjectFilterOptions {UPN = DefaultContext.Account.Id}).ToString();
+#else
+                var userFetcher = ActiveDirectoryClient.Me.ToUser();
+                var user = userFetcher.ExecuteAsync().Result;
+                objectId = user.ObjectId;
+#endif
             }
 
             return objectId;
@@ -225,9 +241,20 @@ private string GetObjectIdByUpn(string upn)
             string objId = null;
             if (!string.IsNullOrWhiteSpace(upn))
             {
-                var user = ActiveDirectoryClient.FilterUsers(new ADObjectFilterOptions() { SPN = upn }).SingleOrDefault();
+#if NETSTANDARD
+                var user = ActiveDirectoryClient.FilterUsers(new ADObjectFilterOptions() { UPN = upn }).SingleOrDefault();
+#else
+                var user = ActiveDirectoryClient.Users.Where(u => u.UserPrincipalName.Equals(upn, StringComparison.OrdinalIgnoreCase))
+                     .ExecuteAsync().ConfigureAwait(false).GetAwaiter().GetResult().CurrentPage.SingleOrDefault();
+#endif
                 if (user != null)
+                {
+#if NETSTANDARD
                     objId = user.Id.ToString();
+#else
+                    objId = user.ObjectId;
+#endif
+                }
             }
             return objId;
         }
@@ -237,9 +264,15 @@ private string GetObjectIdBySpn(string spn)
             string objId = null;
             if (!string.IsNullOrWhiteSpace(spn))
             {
+#if NETSTANDARD
                 var servicePrincipal = ActiveDirectoryClient.FilterServicePrincipals(new ADObjectFilterOptions() { SPN = spn }).SingleOrDefault();
-                if (servicePrincipal != null)
-                    objId = servicePrincipal.Id.ToString();
+                objId = servicePrincipal?.Id.ToString();
+#else
+                var servicePrincipal = ActiveDirectoryClient.ServicePrincipals.Where(s =>
+                    s.ServicePrincipalNames.Any(n => n.Equals(spn, StringComparison.OrdinalIgnoreCase)))
+                     .ExecuteAsync().GetAwaiter().GetResult().CurrentPage.SingleOrDefault();
+                 objId = servicePrincipal?.ObjectId;
+#endif
             }
             return objId;
         }
@@ -250,23 +283,44 @@ private string GetObjectIdByEmail(string email)
             // In ADFS, Graph cannot handle this particular combination of filters.
             if (!DefaultProfile.DefaultContext.Environment.OnPremise && !string.IsNullOrWhiteSpace(email))
             {
+#if NETSTANDARD
                 var users = ActiveDirectoryClient.FilterUsers(new ADObjectFilterOptions() { Mail = email });
                 if (users != null)
                 {
                     ThrowIfMultipleObjectIds(users, email);
                     var user = users.FirstOrDefault();
                     objId = user?.Id.ToString();
                 }
+#else
+                var users = ActiveDirectoryClient.Users.Where(FilterByEmail(email)).ExecuteAsync().GetAwaiter().GetResult().CurrentPage;
+                if (users != null)
+                {
+                    ThrowIfMultipleObjectIds(users, email);
+                    var user = users.FirstOrDefault();
+                    objId = user?.ObjectId;
+                }
+#endif
             }
             return objId;
         }
 
+#if !NETSTANDARD
+        private Expression<Func<IUser, bool>> FilterByEmail(string email)
+        {
+            return u => u.Mail.Equals(email, StringComparison.OrdinalIgnoreCase) ||
+                u.OtherMails.Any(m => m.Equals(email, StringComparison.OrdinalIgnoreCase));
+        }
+#endif
         private bool ValidateObjectId(string objId)
         {
             bool isValid = false;
             if (!string.IsNullOrWhiteSpace(objId))
             {
+#if NETSTANDARD
                 var objectCollection = ActiveDirectoryClient.GetObjectsByObjectId(new List<string> { objId });
+#else
+                var objectCollection = ActiveDirectoryClient.GetObjectsByObjectIdsAsync(new[] { objId }, new string[] { }).GetAwaiter().GetResult();
+#endif
                 if (objectCollection.Any())
                 {
                     isValid = true;

src/ResourceManager/KeyVault/Commands.KeyVault/Models/ModelExtensions.cs

@@ -12,7 +12,11 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+#if NETSTANDARD
 using Microsoft.Azure.Graph.RBAC.Version1_6.ActiveDirectory;
+#else
+using Microsoft.Azure.ActiveDirectory.GraphClient;
+#endif
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
 using System;
 using System.Collections.Generic;
@@ -97,6 +101,7 @@ public static string GetDisplayNameForADObject(string objectId, ActiveDirectoryC
 
             try
             {
+#if NETSTANDARD
                 var obj = adClient.GetObjectsByObjectId(new List<string> { objectId }).FirstOrDefault();
                 if (obj != null)
                 {
@@ -113,6 +118,25 @@ public static string GetDisplayNameForADObject(string objectId, ActiveDirectoryC
                         upnOrSpn = servicePrincipal.ServicePrincipalNames.FirstOrDefault();
                     }
                 }
+#else
+                var obj = adClient.GetObjectsByObjectIdsAsync(new[] { objectId }, new string[] { }).GetAwaiter().GetResult().FirstOrDefault();
+                if (obj != null)
+                {
+                    if (obj.ObjectType.Equals("user", StringComparison.InvariantCultureIgnoreCase))
+                    {
+                        var user = adClient.Users.GetByObjectId(objectId).ExecuteAsync().GetAwaiter().GetResult();
+                        displayName = user.DisplayName;
+                        upnOrSpn = user.UserPrincipalName;
+                    }
+                    else if (obj.ObjectType.Equals("serviceprincipal", StringComparison.InvariantCultureIgnoreCase))
+                    {
+                        var servicePrincipal = adClient.ServicePrincipals.GetByObjectId(objectId).ExecuteAsync().GetAwaiter().GetResult();
+                        displayName = servicePrincipal.AppDisplayName;
+                        upnOrSpn = servicePrincipal.ServicePrincipalNames.FirstOrDefault();
+                    }
+                }
+
+#endif
             }
             catch
             {

src/ResourceManager/KeyVault/Commands.KeyVault/Models/PSVault.cs

@@ -12,7 +12,11 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+#if NETSTANDARD
 using Microsoft.Azure.Graph.RBAC.Version1_6.ActiveDirectory;
+#else
+using Microsoft.Azure.ActiveDirectory.GraphClient;
+#endif
 using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
 using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
 using Microsoft.Azure.Management.KeyVault.Models;

src/ResourceManager/KeyVault/Commands.KeyVault/Models/PSVaultAccessPolicy.cs

@@ -12,7 +12,11 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+#if NETSTANDARD
 using Microsoft.Azure.Graph.RBAC.Version1_6.ActiveDirectory;
+#else
+using Microsoft.Azure.ActiveDirectory.GraphClient;
+#endif
 using System;
 using System.Collections.Generic;
 using KeyVaultManagement = Microsoft.Azure.Management.KeyVault;

src/ResourceManager/KeyVault/Commands.KeyVault/Models/VaultManagementClient.cs

@@ -12,7 +12,11 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+#if NETSTANDARD
 using Microsoft.Azure.Graph.RBAC.Version1_6.ActiveDirectory;
+#else
+using Microsoft.Azure.ActiveDirectory.GraphClient;
+#endif
 using Microsoft.Azure.Commands.Common.Authentication;
 using Microsoft.Azure.Commands.Common.Authentication.Models;
 using Microsoft.Azure.Commands.ResourceManager.Common.Tags;