Azure stack sign pipeline error (#13999)

* Fix assembly issue

* Fix pack issue

src/Storage/Storage.Management/Az.Storage.psd1

@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.2.1'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.0.1'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'Microsoft.Azure.Management.Storage.dll', 
@@ -68,8 +68,8 @@ RequiredAssemblies = 'Microsoft.Azure.Management.Storage.dll',
                'Microsoft.OData.Edm.dll', 'Microsoft.Spatial.dll', 
                'Microsoft.Azure.KeyVault.Core.dll', 'Azure.Storage.Blobs.dll', 
                'Azure.Storage.Common.dll', 'Azure.Storage.Files.DataLake.dll',
+               'Azure.core.dll', 'Microsoft.Bcl.AsyncInterfaces.dll',
                'Azure.Storage.Queues.dll', 'Azure.Storage.Files.Shares.dll'
-
 # Script files (.ps1) that are run in the caller's environment prior to importing this module.
 # ScriptsToProcess = @()
 

tools/ExpandModules.ps1

@@ -35,7 +35,7 @@ $tmp = Join-Path -Path (Get-Item $Artifacts).FullName -ChildPath "tmp"
 
 try {
     foreach ($artifact in (Get-ChildItem -Path $Artifacts -Filter "*.nupkg").FullName) {
-        $module_name = (((Get-Item -Path $artifact).Name) -split("\.([0-9])+"))[0]
+        $module_name = (Get-Item -Path $artifact).Name
         $zip_artifact = Join-Path -Path (Get-Item $Artifacts).FullName -ChildPath $module_name".zip"
 
         Write-Output "Renaming package $artifact to zip archive $zip_artifact"

tools/PackModules.ps1

@@ -112,11 +112,20 @@ if (!(Test-Path -Path $tmp)) {
 
 try {
     foreach ($artifact in Get-ChildItem $tmp -Directory) {
-        $module_name = ($artifact).Name
-        Write-Output "Repackaging $module_name"
-        Update-NugetPackage -TempRepoPath (Get-Item $Artifacts).FullName -ModuleName $module_name -DirPath $tmp"\"$module_name -NugetExe $NugetExe
-        Write-Output "Removing $tmp\$module_name"
-        Remove-Item -Recurse $tmp"\"$module_name -Force -ErrorAction Stop  
+        $artifactDir = ($artifact).Name
+        $tokens = $artifactDir.split(".")
+        if($tokens.length -gt 1) {
+            # Az.n.n.n.nuget or Az.module.n.n.n.nuget
+            if($tokens.length -gt 5) {
+                $module_name = $tokens[0]+"."+$tokens[1]
+            } else {
+                $module_name = $tokens[0]
+            }
+        } else {
+            $module_name = $artifactDir
+        }
+        Write-Output "Repackaging $module_name under $artifactDir"
+        Update-NugetPackage -TempRepoPath (Get-Item $Artifacts).FullName -ModuleName $module_name -DirPath $tmp"\"$artifactDir -NugetExe $NugetExe
     } 
 } catch {
     $Errors = $_

tools/StaticAnalysis/DependencyAnalyzer/DependencyAnalyzer.cs

@@ -181,7 +181,8 @@ namespace StaticAnalysis.DependencyAnalyzer
             "System.Security.AccessControl",
             "System.Security.Principal.Windows",
             "System.Data.SqlClient",
-            "System.Security.Cryptography.ProtectedData"
+            "System.Security.Cryptography.ProtectedData",
+            "System.Text.Json"
         };
 
         private readonly Dictionary<string, AssemblyRecord> _assemblies =