diff --git a/src/Storage/Storage.Management/Az.Storage.psd1 b/src/Storage/Storage.Management/Az.Storage.psd1 index de4092d76eba..078cc51ec9e6 100644 --- a/src/Storage/Storage.Management/Az.Storage.psd1 +++ b/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 = @() diff --git a/src/lib/Azure.Core/NetCoreAssemblies/Azure.Core.dll b/src/lib/Azure.Core/NetCoreAssemblies/Azure.Core.dll new file mode 100644 index 000000000000..e52829cd90e5 Binary files /dev/null and b/src/lib/Azure.Core/NetCoreAssemblies/Azure.Core.dll differ diff --git a/src/lib/Azure.Core/NetCoreAssemblies/Microsoft.Bcl.AsyncInterfaces.dll b/src/lib/Azure.Core/NetCoreAssemblies/Microsoft.Bcl.AsyncInterfaces.dll new file mode 100644 index 000000000000..0a784888baf1 Binary files /dev/null and b/src/lib/Azure.Core/NetCoreAssemblies/Microsoft.Bcl.AsyncInterfaces.dll differ diff --git a/src/lib/Azure.Core/NetcoreAssemblies/System.Numerics.Vectors.dll b/src/lib/Azure.Core/NetCoreAssemblies/System.Numerics.Vectors.dll similarity index 100% rename from src/lib/Azure.Core/NetcoreAssemblies/System.Numerics.Vectors.dll rename to 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 similarity index 100% rename from src/lib/Azure.Core/NetcoreAssemblies/System.Runtime.CompilerServices.Unsafe.dll rename to 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 similarity index 100% rename from src/lib/Azure.Core/NetcoreAssemblies/System.Text.Encodings.Web.dll rename to src/lib/Azure.Core/NetCoreAssemblies/System.Text.Encodings.Web.dll diff --git a/src/lib/Azure.Core/NetCoreAssemblies/System.Text.Json.dll b/src/lib/Azure.Core/NetCoreAssemblies/System.Text.Json.dll new file mode 100644 index 000000000000..0491dede3bf6 Binary files /dev/null and b/src/lib/Azure.Core/NetCoreAssemblies/System.Text.Json.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 similarity index 100% rename from src/lib/Azure.Core/NetcoreAssemblies/System.Threading.Tasks.Extensions.dll rename to src/lib/Azure.Core/NetCoreAssemblies/System.Threading.Tasks.Extensions.dll diff --git a/src/lib/Azure.Core/PreloadAssemblies/Azure.Core.dll b/src/lib/Azure.Core/PreloadAssemblies/Azure.Core.dll new file mode 100644 index 000000000000..e52829cd90e5 Binary files /dev/null and b/src/lib/Azure.Core/PreloadAssemblies/Azure.Core.dll differ diff --git a/src/lib/Azure.Core/PreloadAssemblies/Microsoft.Bcl.AsyncInterfaces.dll b/src/lib/Azure.Core/PreloadAssemblies/Microsoft.Bcl.AsyncInterfaces.dll new file mode 100644 index 000000000000..0a784888baf1 Binary files /dev/null and b/src/lib/Azure.Core/PreloadAssemblies/Microsoft.Bcl.AsyncInterfaces.dll differ diff --git a/src/lib/Azure.Core/PreloadAssemblies/System.Text.Json.dll b/src/lib/Azure.Core/PreloadAssemblies/System.Text.Json.dll new file mode 100644 index 000000000000..0491dede3bf6 Binary files /dev/null and b/src/lib/Azure.Core/PreloadAssemblies/System.Text.Json.dll differ diff --git a/src/lib/Azure.Core/PreloadAssemblies/System.Threading.Tasks.Extensions.dll b/src/lib/Azure.Core/PreloadAssemblies/System.Threading.Tasks.Extensions.dll new file mode 100644 index 000000000000..ff691490b4a3 Binary files /dev/null and b/src/lib/Azure.Core/PreloadAssemblies/System.Threading.Tasks.Extensions.dll differ diff --git a/tools/CheckAssemblies.ps1 b/tools/CheckAssemblies.ps1 index 9f5874b10dab..1e5262ba3d53 100644 --- a/tools/CheckAssemblies.ps1 +++ b/tools/CheckAssemblies.ps1 @@ -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 } }