Updating for platform-specific assembly loading

Author: markcowl

src/StorageSync/StorageSync/Az.StorageSync.psd1

@@ -55,53 +55,8 @@ RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.3.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.StorageSync.dll', 
-               '.\Microsoft.Win32.Registry.dll', 
                '.\System.Management.dll',
-               '.\System.CodeDom.dll', 
-               '.\Microsoft.ApplicationInsights.dll', 
-               '.\Microsoft.Azure.PowerShell.Clients.Aks.dll', 
-               '.\Microsoft.Azure.PowerShell.Clients.Compute.dll', 
-               '.\Microsoft.Azure.PowerShell.Clients.KeyVault.dll', 
-               '.\Microsoft.Azure.PowerShell.Clients.Network.dll', 
-               '.\Microsoft.Azure.PowerShell.Clients.Storage.Management.dll', 
-               '.\Microsoft.Azure.PowerShell.Clients.Websites.dll', 
-               '.\Microsoft.Azure.PowerShell.Storage.dll', 
-               '.\Microsoft.Azure.PowerShell.Strategies.dll', 
-               '.\Microsoft.CSharp.dll', 
-               '.\Newtonsoft.Json.dll', 
-               '.\System.Buffers.dll', 
-               '.\System.Collections.Concurrent.dll', 
-               '.\System.Collections.Immutable.dll', 
-               '.\System.Collections.Specialized.dll', 
-               '.\System.ComponentModel.dll', 
-               '.\System.ComponentModel.Primitives.dll', 
-               '.\System.ComponentModel.TypeConverter.dll', 
-               '.\System.Diagnostics.DiagnosticSource.dll', 
-               '.\System.Diagnostics.StackTrace.dll', 
-               '.\System.Dynamic.Runtime.dll', 
-               '.\System.IO.FileSystem.Primitives.dll', 
-               '.\System.Linq.dll', 
-               '.\System.Linq.Expressions.dll', 
-               '.\System.Management.Automation.dll', 
-               '.\System.Numerics.Vectors.dll', 
-               '.\System.ObjectModel.dll', 
-               '.\System.Reflection.Emit.dll', 
-               '.\System.Reflection.Emit.ILGeneration.dll', 
-               '.\System.Reflection.Emit.Lightweight.dll', 
-               '.\System.Reflection.Metadata.dll', 
-               '.\System.Reflection.TypeExtensions.dll', 
-               '.\System.Runtime.CompilerServices.Unsafe.dll', 
-               '.\System.Runtime.Numerics.dll', 
-               '.\System.Runtime.Serialization.Formatters.dll', 
-               '.\System.Runtime.Serialization.Primitives.dll', 
-               '.\System.Security.Cryptography.OpenSsl.dll', 
-               '.\System.Security.Cryptography.Primitives.dll', 
-               '.\System.Security.Principal.Windows.dll', 
-               '.\System.Text.RegularExpressions.dll', 
-               '.\System.Threading.Tasks.Extensions.dll', 
-               '.\System.Xml.ReaderWriter.dll', 
-               '.\System.Xml.XmlDocument.dll', 
-               '.\System.Xml.XmlSerializer.dll'
+               '.\System.CodeDom.dll'
 
 # Script files (.ps1) that are run in the caller's environment prior to importing this module.
 # ScriptsToProcess = @()

src/StorageSync/StorageSync/StartupScripts/LoadPlatformAssemblies.ps1

@@ -0,0 +1,22 @@
+$platformDirectory = Join-Path $PSScriptRoot "PlatformAssemblies"
+if ($PSEdition -eq 'Desktop' -or $IsWindows) {
+    $platformDirectory = Join-Path $platformDirectory "win" 
+}
+elseif ($IsLinux -or $IsMacOs) {
+	$platformDirectory = Join-Path $platformDirectory "unix"
+}
+
+try {
+	 $loadedAssemblies = ([System.AppDomain]::CurrentDomain.GetAssemblies() | ForEach-Object {New-Object -TypeName System.Reflection.AssemblyName -ArgumentList $_.FullName} )
+    if (Test-Path $platformDirectory -ErrorAction Ignore) {
+	    Get-ChildItem -Path $platformDirectory -Filter *.dll -ErrorAction Stop | ForEach-Object {
+            $assemblyName = ([System.Reflection.AssemblyName]::GetAssemblyName($_.FullName))
+            $matches = ($loadedAssemblies | Where-Object {$_.Name -eq $assemblyName.Name})
+            if (-not $matches)
+            {
+                Add-Type -Path $_.FullName -ErrorAction Ignore | Out-Null
+            }
+		}
+    }
+}
+catch {}

src/StorageSync/StorageSync/StorageSync.csproj

@@ -16,6 +16,11 @@
     <PackageReference Include="Microsoft.Win32.Registry" Version="4.5.0" />
     <PackageReference Include="System.Management" Version="4.5.0" />
 	</ItemGroup>
+
+  <ItemGroup>
+    <WinPlatformAssemblies Include="$(RepoSrc)lib\Microsoft.Win32.Registry\win\*.dll" />
+    <UnixPlatformAssemblies Include="$(RepoSrc)lib\Microsoft.Win32.Registry\unix\*.dll" />
+ </ItemGroup>
 
   <ItemGroup>
     <EmbeddedResource Include="Config.json" />
@@ -36,4 +41,15 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <Target Name="CopyFiles" AfterTargets="Build">
+    <Copy SourceFiles="@(WinPlatformAssemblies)" DestinationFolder="$(TargetDir)\PlatformAssemblies\win" />
+    <Copy SourceFiles="@(UnixPlatformAssemblies)" DestinationFolder="$(TargetDir)\PlatformAssemblies\unix" />
+  </Target>
+
+  <ItemGroup>
+    <None Update="StartupScripts\LoadPlatformAssemblies.ps1" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
+
+
 </Project>