diff --git a/build.proj b/build.proj
index 154efbec1622..498e0da6fb0c 100644
--- a/build.proj
+++ b/build.proj
@@ -173,7 +173,7 @@
Microsoft.Powershell.*.dll,System*.dll,Microsoft.VisualBasic.dll,Microsoft.CSharp.dll,Microsoft.CodeAnalysis.dll,Microsoft.CodeAnalysis.CSharp.dll
- System.Security.Cryptography.ProtectedData.dll,System.Configuration.ConfigurationManager.dll,System.Runtime.CompilerServices.Unsafe.dll,System.IO.FileSystem.AccessControl.dll,System.Buffers.dll,System.Text.Encodings.Web.dll,System.CodeDom.dll,System.Management.dll
+ System.Security.Cryptography.ProtectedData.dll,System.Configuration.ConfigurationManager.dll,System.Runtime.CompilerServices.Unsafe.dll,System.IO.FileSystem.AccessControl.dll,System.Buffers.dll,System.Text.Encodings.Web.dll,System.CodeDom.dll,System.Management.dll,System.Text.Json.dll,System.Threading.Tasks.Extensions.dll
diff --git a/src/Storage/Storage.Management/Az.Storage.psd1 b/src/Storage/Storage.Management/Az.Storage.psd1
index 627e6ac74a67..ac929357d333 100644
--- a/src/Storage/Storage.Management/Az.Storage.psd1
+++ b/src/Storage/Storage.Management/Az.Storage.psd1
@@ -68,7 +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',
- 'System.Text.Json.dll','System.Threading.Tasks.Extensions.dll'
+ 'Azure.Core.dll', 'Microsoft.Bcl.AsyncInterfaces.dll',
+ 'System.Text.Json.dll', 'System.Threading.Tasks.Extensions.dll'
# Script files (.ps1) that are run in the caller's environment prior to importing this module.
# ScriptsToProcess = @()
diff --git a/src/Storage/Storage/Storage.csproj b/src/Storage/Storage/Storage.csproj
index 947c6fd6ccc8..9b3a077de340 100644
--- a/src/Storage/Storage/Storage.csproj
+++ b/src/Storage/Storage/Storage.csproj
@@ -1,4 +1,4 @@
-
+
Storage
@@ -11,6 +11,10 @@
Microsoft.WindowsAzure.Commands.$(PsModuleName)
+
+
+
+
@@ -20,9 +24,12 @@
-
-
-
+
+
+
+
+
+
$(RepoSrc)lib\Microsoft.Azure.Storage.DataMovement.dll
diff --git a/src/lib/Azure.Core/NetcoreAssemblies/System.Numerics.Vectors.dll b/src/lib/Azure.Core/NetcoreAssemblies/System.Numerics.Vectors.dll
new file mode 100644
index 000000000000..10205772c39d
Binary files /dev/null and b/src/lib/Azure.Core/NetcoreAssemblies/System.Numerics.Vectors.dll differ
diff --git a/src/lib/Azure.Core/NetcoreAssemblies/System.Runtime.CompilerServices.Unsafe.dll b/src/lib/Azure.Core/NetcoreAssemblies/System.Runtime.CompilerServices.Unsafe.dll
new file mode 100644
index 000000000000..be64036f12fe
Binary files /dev/null and b/src/lib/Azure.Core/NetcoreAssemblies/System.Runtime.CompilerServices.Unsafe.dll differ
diff --git a/src/lib/Azure.Core/NetcoreAssemblies/System.Text.Encodings.Web.dll b/src/lib/Azure.Core/NetcoreAssemblies/System.Text.Encodings.Web.dll
new file mode 100644
index 000000000000..cbf4938528c8
Binary files /dev/null and b/src/lib/Azure.Core/NetcoreAssemblies/System.Text.Encodings.Web.dll differ
diff --git a/src/lib/Azure.Core/NetcoreAssemblies/System.Threading.Tasks.Extensions.dll b/src/lib/Azure.Core/NetcoreAssemblies/System.Threading.Tasks.Extensions.dll
new file mode 100644
index 000000000000..ff691490b4a3
Binary files /dev/null and b/src/lib/Azure.Core/NetcoreAssemblies/System.Threading.Tasks.Extensions.dll differ
diff --git a/src/lib/Azure.Core/PreloadAssemblies/System.Diagnostics.DiagnosticSource.4.0.4.0.dll b/src/lib/Azure.Core/PreloadAssemblies/System.Diagnostics.DiagnosticSource.4.0.4.0.dll
new file mode 100644
index 000000000000..a2b54fb042de
Binary files /dev/null and b/src/lib/Azure.Core/PreloadAssemblies/System.Diagnostics.DiagnosticSource.4.0.4.0.dll differ
diff --git a/src/lib/Azure.Core/PreloadAssemblies/System.Diagnostics.DiagnosticSource.dll b/src/lib/Azure.Core/PreloadAssemblies/System.Diagnostics.DiagnosticSource.dll
new file mode 100644
index 000000000000..917a04adfb4e
Binary files /dev/null and b/src/lib/Azure.Core/PreloadAssemblies/System.Diagnostics.DiagnosticSource.dll differ
diff --git a/src/lib/Azure.Core/PreloadAssemblies/System.Memory.dll b/src/lib/Azure.Core/PreloadAssemblies/System.Memory.dll
new file mode 100644
index 000000000000..bdfc501e9647
Binary files /dev/null and b/src/lib/Azure.Core/PreloadAssemblies/System.Memory.dll differ
diff --git a/src/lib/Azure.Core/PreloadAssemblies/System.Numerics.Vectors.dll b/src/lib/Azure.Core/PreloadAssemblies/System.Numerics.Vectors.dll
new file mode 100644
index 000000000000..a808165accf4
Binary files /dev/null and b/src/lib/Azure.Core/PreloadAssemblies/System.Numerics.Vectors.dll differ
diff --git a/src/lib/Azure.Core/PreloadAssemblies/System.Runtime.CompilerServices.Unsafe.4.0.5.0.dll b/src/lib/Azure.Core/PreloadAssemblies/System.Runtime.CompilerServices.Unsafe.4.0.5.0.dll
new file mode 100644
index 000000000000..0c27a0e21c7e
Binary files /dev/null and b/src/lib/Azure.Core/PreloadAssemblies/System.Runtime.CompilerServices.Unsafe.4.0.5.0.dll differ
diff --git a/src/lib/Azure.Core/PreloadAssemblies/System.Runtime.CompilerServices.Unsafe.dll b/src/lib/Azure.Core/PreloadAssemblies/System.Runtime.CompilerServices.Unsafe.dll
new file mode 100644
index 000000000000..3156239266db
Binary files /dev/null and b/src/lib/Azure.Core/PreloadAssemblies/System.Runtime.CompilerServices.Unsafe.dll differ
diff --git a/src/lib/Azure.Core/PreloadAssemblies/System.Security.AccessControl.dll b/src/lib/Azure.Core/PreloadAssemblies/System.Security.AccessControl.dll
new file mode 100644
index 000000000000..e8074324cd13
Binary files /dev/null and b/src/lib/Azure.Core/PreloadAssemblies/System.Security.AccessControl.dll differ
diff --git a/src/lib/Azure.Core/PreloadAssemblies/System.Security.Permissions.dll b/src/lib/Azure.Core/PreloadAssemblies/System.Security.Permissions.dll
new file mode 100644
index 000000000000..d1af38f0f8b7
Binary files /dev/null and b/src/lib/Azure.Core/PreloadAssemblies/System.Security.Permissions.dll differ
diff --git a/src/lib/Azure.Core/PreloadAssemblies/System.Security.Principal.Windows.dll b/src/lib/Azure.Core/PreloadAssemblies/System.Security.Principal.Windows.dll
new file mode 100644
index 000000000000..afd187c14918
Binary files /dev/null and b/src/lib/Azure.Core/PreloadAssemblies/System.Security.Principal.Windows.dll differ
diff --git a/src/lib/Azure.Core/PreloadAssemblies/System.Text.Encodings.Web.dll b/src/lib/Azure.Core/PreloadAssemblies/System.Text.Encodings.Web.dll
new file mode 100644
index 000000000000..f31e26c725f8
Binary files /dev/null and b/src/lib/Azure.Core/PreloadAssemblies/System.Text.Encodings.Web.dll differ
diff --git a/src/lib/Azure.Core/PreloadAssemblies/System.Xml.ReaderWriter.dll b/src/lib/Azure.Core/PreloadAssemblies/System.Xml.ReaderWriter.dll
new file mode 100644
index 000000000000..022e63a21a86
Binary files /dev/null and b/src/lib/Azure.Core/PreloadAssemblies/System.Xml.ReaderWriter.dll differ
diff --git a/tools/StaticAnalysis/DependencyAnalyzer/DependencyAnalyzer.cs b/tools/StaticAnalysis/DependencyAnalyzer/DependencyAnalyzer.cs
index 883bc7168d48..d463a2696c36 100644
--- a/tools/StaticAnalysis/DependencyAnalyzer/DependencyAnalyzer.cs
+++ b/tools/StaticAnalysis/DependencyAnalyzer/DependencyAnalyzer.cs
@@ -384,7 +384,7 @@ private void ProcessDirectory(string directoryPath)
foreach (var file in Directory.GetFiles(directoryPath).Where(file => file.EndsWith(".dll")))
{
var assembly = CreateAssemblyRecord(file);
- if (!IsFrameworkAssembly(assembly.Name))
+ if (assembly?.Name != null && !IsFrameworkAssembly(assembly.Name))
{
_assemblies[assembly.Name] = assembly;
AddSharedAssembly(assembly);
diff --git a/tools/StaticAnalysis/Exceptions/Az.Storage/MissingAssemblies.csv b/tools/StaticAnalysis/Exceptions/Az.Storage/MissingAssemblies.csv
index 4926fc3d8c2c..195bb445ee66 100644
--- a/tools/StaticAnalysis/Exceptions/Az.Storage/MissingAssemblies.csv
+++ b/tools/StaticAnalysis/Exceptions/Az.Storage/MissingAssemblies.csv
@@ -2,4 +2,14 @@
"Az.Storage","Mono.Posix.NETStandard","1.0.0.0","Microsoft.WindowsAzure.Storage.DataMovement","0","3000","Missing assembly Mono.Posix.NETStandard referenced from Microsoft.WindowsAzure.Storage.DataMovement","Ensure that the assembly is included in the Wix file or directory"
"Az.Storage","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.Storage","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.Storage","Mono.Posix.NETStandard","1.0.0.0","Microsoft.Azure.Storage.DataMovement","0","3000","Missing assembly Mono.Posix.NETStandard referenced from Microsoft.Azure.Storage.DataMovement","Ensure that the assembly is included in the Wix file or directory"
\ No newline at end of file
+"Az.Storage","Mono.Posix.NETStandard","1.0.0.0","Microsoft.Azure.Storage.DataMovement","0","3000","Missing assembly Mono.Posix.NETStandard referenced from Microsoft.Azure.Storage.DataMovement","Ensure that the assembly is included in the Wix file or directory"
+"c:\zd\azure-powershell\artifacts\Debug\Az.Storage","System.Buffers","4.0.2.0","Azure.Core","0","3000","Missing assembly System.Buffers referenced from Azure.Core","Ensure that the assembly is included in the Wix file or directory"
+"c:\zd\azure-powershell\artifacts\Debug\Az.Storage","System.Buffers","4.0.2.0","Azure.Storage.Blobs","0","3000","Missing assembly System.Buffers referenced from Azure.Storage.Blobs","Ensure that the assembly is included in the Wix file or directory"
+"c:\zd\azure-powershell\artifacts\Debug\Az.Storage","System.Buffers","4.0.2.0","Azure.Storage.Common","0","3000","Missing assembly System.Buffers referenced from Azure.Storage.Common","Ensure that the assembly is included in the Wix file or directory"
+"c:\zd\azure-powershell\artifacts\Debug\Az.Storage","System.Buffers","4.0.2.0","Azure.Storage.Files.DataLake","0","3000","Missing assembly System.Buffers referenced from Azure.Storage.Files.DataLake","Ensure that the assembly is included in the Wix file or directory"
+"c:\zd\azure-powershell\artifacts\Debug\Az.Storage","System.Text.Encodings.Web","4.0.4.0","System.Text.Json","0","3000","Missing assembly System.Text.Encodings.Web referenced from System.Text.Json","Ensure that the assembly is included in the Wix file or directory"
+"c:\zd\azure-powershell\artifacts\Debug\Az.Storage","System.Numerics.Vectors","4.1.3.0","System.Text.Json","0","3000","Missing assembly System.Numerics.Vectors referenced from System.Text.Json","Ensure that the assembly is included in the Wix file or directory"
+"c:\zd\azure-powershell\artifacts\Debug\Az.Storage","System.Buffers","4.0.2.0","System.Text.Json","0","3000","Missing assembly System.Buffers referenced from System.Text.Json","Ensure that the assembly is included in the Wix file or directory"
+"c:\zd\azure-powershell\artifacts\Debug\Az.Storage","System.Runtime.CompilerServices.Unsafe","4.0.5.0","System.Text.Json","0","3000","Missing assembly System.Runtime.CompilerServices.Unsafe referenced from System.Text.Json","Ensure that the assembly is included in the Wix file or directory"
+"Az.Storage","System.Text.Encodings.Web","4.0.4.0","System.Text.Json","0","3000","Missing assembly System.Text.Encodings.Web referenced from System.Text.Json","Ensure that the assembly is included in the Wix file or directory"
+"Az.Storage","System.Runtime.CompilerServices.Unsafe","4.0.5.0","System.Text.Json","0","3000","Missing assembly System.Runtime.CompilerServices.Unsafe referenced from System.Text.Json","Ensure that the assembly is included in the Wix file or directory"