resolve static analysis errors

Author: VeryEarly

src/Accounts/Authentication/Utilities/CustomAssemblyResolver.cs

@@ -30,6 +30,8 @@ public static class CustomAssemblyResolver
                 {"System.Text.Encodings.Web", new Version("4.0.4.0")},
                 {"System.Text.Json", new Version("4.0.0.0")},
                 {"System.Threading.Tasks.Extensions", new Version("4.2.0.0")},
+                {"Microsoft.IdentityModel.Logging", new Version("6.8.0.0")},
+                {"Microsoft.IdentityModel.Tokens", new Version("6.8.0.0")},
                 {"System.Xml.ReaderWriter", new Version("4.1.0.0")}
             };
 

src/ContainerRegistry/ContainerRegistry/Commands/ConnectAzureContainerRegistry.cs

@@ -23,13 +23,10 @@
 
 namespace Microsoft.Azure.Commands.ContainerRegistry
 {
-    [Cmdlet("Connect", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "ContainerRegistry")]
+    [Cmdlet("Connect", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "ContainerRegistry", DefaultParameterSetName = WithoutNameAndPasswordParameterSet)]
     [OutputType(typeof(bool))]
     public class ConnectAzureContainerRegistry : ContainerRegistryCmdletBase
     {
-        private const string WithoutNameAndPasswordParameterSet = "WithoutNameAndPasswordParameterSet";
-        private const string WithNameAndPasswordParameterSet = "WithNameAndPasswordParameterSet";
-
         [Parameter(Mandatory = true, HelpMessage = "Azure Container Registry Name.", ParameterSetName = WithoutNameAndPasswordParameterSet)]
         [Parameter(Mandatory = true, HelpMessage = "Azure Container Registry Name.", ParameterSetName = WithNameAndPasswordParameterSet)]
         [ValidateNotNullOrEmpty]

src/ContainerRegistry/ContainerRegistry/Commands/ImportAzureContainerRegistryImage.cs

@@ -23,7 +23,7 @@
 
 namespace Microsoft.Azure.Commands.ContainerRegistry.Commands
 {
-    [Cmdlet("Import", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "ContainerRegistryImage", SupportsShouldProcess = true)]
+    [Cmdlet("Import", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "ContainerRegistryImage", DefaultParameterSetName = ImportImageByResourceId, SupportsShouldProcess = true)]
     [OutputType(typeof(bool))]
     public class ImportAzureContainerRegistryImage : ContainerRegistryCmdletBase
     {

src/ContainerRegistry/ContainerRegistry/Models/ContainerRegistryCmdletBase.cs

@@ -85,6 +85,9 @@ public abstract class ContainerRegistryCmdletBase : AzureRMCmdlet
         protected const string InvalidRegistryOrReplicationResourceIdErrorMessage = "This is an invalid container registry resource id or replication resource id";
         protected const string InvalidReplicationResourceIdErrorMessage = "This is an invalid replication resource id";
 
+        protected const string WithoutNameAndPasswordParameterSet = "WithoutNameAndPasswordParameterSet";
+        protected const string WithNameAndPasswordParameterSet = "WithNameAndPasswordParameterSet";
+
         protected struct PasswordNameStrings
         {
             internal const string Password = "password";

src/ContainerRegistry/ContainerRegistry/help/Connect-AzContainerRegistry.md

@@ -12,7 +12,7 @@ Login to an azure container registry.
 
 ## SYNTAX
 
-### WithoutNameAndPasswordParameterSet
+### WithoutNameAndPasswordParameterSet (Default)
 ```
 Connect-AzContainerRegistry -Name <String> [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
 ```

src/ContainerRegistry/ContainerRegistry/help/Import-AzContainerRegistryImage.md

@@ -12,7 +12,7 @@ Import image from a public/azure registry to an azure container registry.
 
 ## SYNTAX
 
-### ImportImageByResourceId
+### ImportImageByResourceId (Default)
 ```
 Import-AzContainerRegistryImage -ResourceGroupName <String> -RegistryName <String> -SourceImage <String>
  -SourceRegistryResourceId <String> [-Mode <String>] [-TargetTag <String[]>]

src/lib/NetCorePreloadAssemblies/Microsoft.IdentityModel.Logging.dll

@@ -1,3 +1,5 @@
 "Directory","Assembly Name","Assembly Version","Referencing Assembly","Severity","ProblemId","Description","Remediation"
 "Az.ContainerRegistry","Microsoft.Win32.Registry","4.1.1.0","System.Management.Automation","0","3000","Missing assembly Microsoft.Win32.Registry referenced from System.Management.Automation","Ensure that the assembly is included in the Wix file or directory"
 "Az.ContainerRegistry","Microsoft.PowerShell.CoreCLR.Eventing","6.1.0.0","System.Management.Automation","0","3000","Missing assembly Microsoft.PowerShell.CoreCLR.Eventing referenced from System.Management.Automation","Ensure that the assembly is included in the Wix file or directory"
+"Az.ContainerRegistry","System.IdentityModel.Tokens.Jwt","5.1.2.0","Microsoft.Azure.ContainerRegistry","0","3000","Missing assembly System.IdentityModel.Tokens.Jwt referenced from Microsoft.Azure.ContainerRegistry","Ensure that the assembly is included in the Wix file or directory"
+

src/lib/NetCorePreloadAssemblies/Microsoft.IdentityModel.Tokens.dll

@@ -0,0 +1,3 @@
+"Target","AssemblyName","AssemblyVersion","Severity","ProblemId","Description","Remediation"
+"File version 1.1 in D:\a\1\s\artifacts\Debug\Az.ContainerRegistry\Microsoft.IdentityModel.Logging.dll, File version 5.6 in D:\a\1\s\artifacts\Debug\Az.Attestation\Microsoft.IdentityModel.Logging.dll","Microsoft.IdentityModel.Logging","5.6.0.0","0","7000","Shared assembly conflict, shared assemblies with the same assembly version have differing file versions","Update the assembly reference for Microsoft.IdentityModel.Logging in one of the referring assemblies"
+"File version 5.1 in D:\a\1\s\artifacts\Debug\Az.ContainerRegistry\Microsoft.IdentityModel.Tokens.dll, File version 5.6 in D:\a\1\s\artifacts\Debug\Az.Attestation\Microsoft.IdentityModel.Tokens.dll","Microsoft.IdentityModel.Tokens","5.6.0.0","0","7000","Shared assembly conflict, shared assemblies with the same assembly version have differing file versions","Update the assembly reference for Microsoft.IdentityModel.Tokens in one of the referring assemblies"

src/lib/NetFxPreloadAssemblies/Microsoft.IdentityModel.Logging.dll

@@ -3,3 +3,7 @@
 "Microsoft.Azure.PowerShell.Cmdlets.ContainerRegistry.dll","Microsoft.Azure.Commands.ContainerRegistry.NewAzureContainerRegistryWebhook","New-AzContainerRegistryWebhook","1","8420","Parameter set 'NameResourceGroupParameterSet' of cmdlet 'New-AzContainerRegistryWebhook' contains at least one parameter with a position larger than four, which is discouraged.","Limit the number of positional parameters in a single parameter set to four or fewer."
 "Microsoft.Azure.PowerShell.Cmdlets.ContainerRegistry.dll","Microsoft.Azure.Commands.ContainerRegistry.NewAzureContainerRegistryWebhook","New-AzContainerRegistryWebhook","1","8420","Parameter set 'RegistryObjectParameterSet' of cmdlet 'New-AzContainerRegistryWebhook' contains at least one parameter with a position larger than four, which is discouraged.","Limit the number of positional parameters in a single parameter set to four or fewer."
 "Microsoft.Azure.PowerShell.Cmdlets.ContainerRegistry.dll","Microsoft.Azure.Commands.ContainerRegistry.NewAzureContainerRegistryWebhook","New-AzContainerRegistryWebhook","1","8420","Parameter set 'ResourceIdParameterSet' of cmdlet 'New-AzContainerRegistryWebhook' contains at least one parameter with a position larger than four, which is discouraged.","Limit the number of positional parameters in a single parameter set to four or fewer."
+"Microsoft.Azure.PowerShell.Cmdlets.ContainerRegistry.dll","Microsoft.Azure.Commands.ContainerRegistry.ConnectAzureContainerRegistry","Connect-AzContainerRegistry","1","8100","Connect-AzContainerRegistry Does not support ShouldProcess but the cmdlet verb Connect indicates that it should.","Determine if the cmdlet should implement ShouldProcess and if so determine if it should implement Force / ShouldContinue"
+"Microsoft.Azure.PowerShell.Cmdlets.ContainerRegistry.dll","Microsoft.Azure.Commands.ContainerRegistry.Commands.NewAzureContainerRegistryNetworkRule","New-AzContainerRegistryNetworkRule","1","8100","New-AzContainerRegistryNetworkRule Does not support ShouldProcess but the cmdlet verb New indicates that it should.","Determine if the cmdlet should implement ShouldProcess and if so determine if it should implement Force / ShouldContinue"
+"Microsoft.Azure.PowerShell.Cmdlets.ContainerRegistry.dll","Microsoft.Azure.Commands.ContainerRegistry.Commands.SetAzureContainerRegistryNetworkRuleSet","Set-AzContainerRegistryNetworkRuleSet","1","8100","Set-AzContainerRegistryNetworkRuleSet Does not support ShouldProcess but the cmdlet verb Set indicates that it should.","Determine if the cmdlet should implement ShouldProcess and if so determine if it should implement Force / ShouldContinue"
+