wastoresh · blueww · Mar 19, 2020 · Mar 18, 2020 · Mar 19, 2020 · Mar 19, 2020
diff --git a/build.proj b/build.proj
@@ -173,7 +173,7 @@
     <!-- Delete powershell runtime files -->
     <PropertyGroup>
       <RuntimeDllsIncludeList>Microsoft.Powershell.*.dll,System*.dll,Microsoft.VisualBasic.dll,Microsoft.CSharp.dll,Microsoft.CodeAnalysis.dll,Microsoft.CodeAnalysis.CSharp.dll</RuntimeDllsIncludeList>
-      <RuntimeDllsExcludeList>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</RuntimeDllsExcludeList>
+      <RuntimeDllsExcludeList>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</RuntimeDllsExcludeList>
     </PropertyGroup>
     <Exec Command="$(PowerShellCoreCommandPrefix) &quot;Get-ChildItem -Path $(RepoArtifacts)/$(Configuration) -Recurse -Include $(RuntimeDllsIncludeList) -Exclude $(RuntimeDllsExcludeList) | Where-Object {$_.FullName -notlike '*PreloadAssemblies*' -and $_.FullName -notlike '*NetCoreAssemblies*'} | Remove-Item -Force&quot;" />
     <Exec Command="$(PowerShellCoreCommandPrefix) &quot;Get-ChildItem -Path $(RepoArtifacts)/$(Configuration) -Recurse -Include 'runtimes' | Remove-Item -Recurse -Force&quot;" Condition="'$(CodeSign)' == 'true'" />

diff --git 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
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>Storage</PsModuleName>
@@ -11,6 +11,10 @@
     <RootNamespace>Microsoft.WindowsAzure.Commands.$(PsModuleName)</RootNamespace>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PreLoadAssemblies Include="$(RepoSrc)lib\Azure.Core\PreloadAssemblies\*.dll" />
+    <NetCoreAssemblies Include="$(RepoSrc)lib\Azure.Core\NetCoreAssemblies\*.dll" />
+  </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Azure.Storage.Blobs" Version="12.4.0" />
@@ -20,9 +24,12 @@
     <PackageReference Include="Microsoft.Azure.Storage.Blob" Version="11.1.1" />
     <PackageReference Include="Microsoft.Azure.Storage.File" Version="11.1.1" />
     <PackageReference Include="Microsoft.Azure.Storage.Queue" Version="11.1.1" />
-  </ItemGroup>    
-
-  <ItemGroup>
+  </ItemGroup>
+  <Target Name="CopyFiles" AfterTargets="Build">
+    <Copy SourceFiles="@(PreLoadAssemblies)" DestinationFolder="$(TargetDir)\PreloadAssemblies" />
+    <Copy SourceFiles="@(NetCoreAssemblies)" DestinationFolder="$(TargetDir)\NetCoreAssemblies" />
+  </Target>
+    <ItemGroup>
     <Reference Include="Microsoft.Azure.Storage.DataMovement">
       <HintPath>$(RepoSrc)lib\Microsoft.Azure.Storage.DataMovement.dll</HintPath>
     </Reference>

diff --git a/src/lib/Azure.Core/NetcoreAssemblies/System.Numerics.Vectors.dll b/src/lib/Azure.Core/NetcoreAssemblies/System.Numerics.Vectors.dll
diff --git a/src/lib/Azure.Core/NetcoreAssemblies/System.Runtime.CompilerServices.Unsafe.dll b/src/lib/Azure.Core/NetcoreAssemblies/System.Runtime.CompilerServices.Unsafe.dll
diff --git a/src/lib/Azure.Core/NetcoreAssemblies/System.Text.Encodings.Web.dll b/src/lib/Azure.Core/NetcoreAssemblies/System.Text.Encodings.Web.dll
diff --git a/src/lib/Azure.Core/NetcoreAssemblies/System.Threading.Tasks.Extensions.dll b/src/lib/Azure.Core/NetcoreAssemblies/System.Threading.Tasks.Extensions.dll
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
diff --git a/src/lib/Azure.Core/PreloadAssemblies/System.Diagnostics.DiagnosticSource.dll b/src/lib/Azure.Core/PreloadAssemblies/System.Diagnostics.DiagnosticSource.dll
diff --git a/src/lib/Azure.Core/PreloadAssemblies/System.Memory.dll b/src/lib/Azure.Core/PreloadAssemblies/System.Memory.dll
diff --git a/src/lib/Azure.Core/PreloadAssemblies/System.Numerics.Vectors.dll b/src/lib/Azure.Core/PreloadAssemblies/System.Numerics.Vectors.dll
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
diff --git a/src/lib/Azure.Core/PreloadAssemblies/System.Runtime.CompilerServices.Unsafe.dll b/src/lib/Azure.Core/PreloadAssemblies/System.Runtime.CompilerServices.Unsafe.dll
diff --git a/src/lib/Azure.Core/PreloadAssemblies/System.Security.AccessControl.dll b/src/lib/Azure.Core/PreloadAssemblies/System.Security.AccessControl.dll
diff --git a/src/lib/Azure.Core/PreloadAssemblies/System.Security.Permissions.dll b/src/lib/Azure.Core/PreloadAssemblies/System.Security.Permissions.dll
diff --git a/src/lib/Azure.Core/PreloadAssemblies/System.Security.Principal.Windows.dll b/src/lib/Azure.Core/PreloadAssemblies/System.Security.Principal.Windows.dll
diff --git a/src/lib/Azure.Core/PreloadAssemblies/System.Text.Encodings.Web.dll b/src/lib/Azure.Core/PreloadAssemblies/System.Text.Encodings.Web.dll
diff --git a/src/lib/Azure.Core/PreloadAssemblies/System.Xml.ReaderWriter.dll b/src/lib/Azure.Core/PreloadAssemblies/System.Xml.ReaderWriter.dll
diff --git 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
@@ -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"
+"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"