Merge pull request #7 from Azure/erich/storage-core

Update the way to load Azure.Core assemblies for Storage

Author: blueww

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

@@ -67,9 +67,7 @@ RequiredAssemblies = 'Microsoft.Azure.Management.Storage.dll',
                'Microsoft.Azure.DocumentDB.Core.dll', 'Microsoft.OData.Core.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',
-               'System.Text.Json.dll', 'System.Threading.Tasks.Extensions.dll'
+               'Azure.Storage.Common.dll', 'Azure.Storage.Files.DataLake.dll'
 
 # Script files (.ps1) that are run in the caller's environment prior to importing this module.
 # ScriptsToProcess = @()

src/lib/Azure.Core/NetCoreAssemblies/Azure.Core.dll

@@ -11,6 +11,22 @@
 # limitations under the License.
 # ----------------------------------------------------------------------------------
 
+
+function Get-PreloadAssemblies{
+    param(
+        [Parameter(Mandatory=$True)]
+        [string] $ModuleFolder
+    )
+
+    $preloadAssemblies = @()
+    $preloadFolderName =  $PSEdition -eq 'Core' ? "NetCoreAssemblies" : "PreloadAssemblies"
+    $preloadFolder = [System.IO.Path]::Combine($ModuleFolder, $preloadFolderName)
+    if(Test-Path $preloadFolder){
+        $preloadAssemblies = (Get-ChildItem $preloadFolder -Filter "*.dll").Name | ForEach-Object { $_ -replace ".dll", ""}
+    }
+    $preloadAssemblies
+}
+
 param(
     [ValidateNotNullOrEmpty()]
     [ValidateSet('Debug', 'Release')]
@@ -38,6 +54,7 @@ foreach ($ModuleManifest in $ModuleManifestFiles) {
         $LoadedAssemblies += $ModuleMetadata.RequiredAssemblies
     }
 
+    $LoadedAssemblies += Get-PreloadAssemblies $ModuleManifest.Directory
     $LoadedAssemblies += $ModuleMetadata.NestedModules
 
     if ($ModuleMetadata.RequiredModules) {
@@ -58,6 +75,7 @@ foreach ($ModuleManifest in $ModuleManifestFiles) {
                 }
                 $LoadedAssemblies += $ModuleMetadata.NestedModules
             }
+            $LoadedAssemblies += Get-PreloadAssemblies $RequiredModuleManifest.Directory
         }
     }