Bug fix to correctly load reflection based checks for the CodeFactory SDK version on none command libraries.

Author: sgiffinlcd

src/CodeFactoryVisualStudio/CodeFactory.VisualStudio.Loader/SdkSupport.cs

@@ -4,6 +4,7 @@
 //*****************************************************************************
 
 using System;
+using System.IO;
 using System.Linq;
 using System.Reflection;
 
@@ -29,6 +30,13 @@ public static class SdkSupport
  /// </summary>
  public const string NuGetSdkVersion = "1.22320.1";
 
+ /// <summary>
+ /// The name of the assembly type for the CodeFactory SDK version attribute.
+ /// </summary>
+ public const string CodeFactorySdkVersionAttributeName = "AssemblyCFSdkVersion";
+
+ public const string CodeFactoryAssemblyName = "CodeFactory";
+
  /// <summary>
  /// Checks the assembly to see if it was created by a CodeFactory SDK. If so it checks the version to confirms it can be used by the runtime.
  /// </summary>
@@ -37,27 +45,21 @@ public static void SupportedAssembly(Assembly sourceAssembly)
  {
  if (sourceAssembly == null) return ;
 
+ //Adding a assembly resolver if the child assembly needs to be loaded
+ AppDomain.CurrentDomain.ReflectionOnlyAssemblyResolve += CurrentDomain_ReflectionOnlyAssemblyResolve;
+
+ Assembly workAssembly = sourceAssembly;
+ 
  bool cfAssembly = false;
  try
  {
- cfAssembly = sourceAssembly.GetReferencedAssemblies().Any( a=> a.Name == "CodeFactory");
-
- var sdkVersionObject = sourceAssembly.GetCustomAttributes(typeof(AssemblyCFSdkVersion), false);
+ cfAssembly = workAssembly.GetReferencedAssemblies().Any(a => a.Name == CodeFactoryAssemblyName);
 
- if (sdkVersionObject == null)
- {
- if(cfAssembly) throw new UnsupportedSdkLibraryException(sourceAssembly.FullName, "0.0.0.0", MinVersion,
- MaxVersion);
+ var customAttributes = CustomAttributeData.GetCustomAttributes(workAssembly);
 
- return;
- }
+ var versionSdk = customAttributes.FirstOrDefault(c => c.AttributeType.Name == CodeFactorySdkVersionAttributeName);
 
- 
- var sdkVersion = sdkVersionObject[0] as AssemblyCFSdkVersion;
-
- if (sdkVersion == null) return;
-
- var rawVersion = sdkVersion.Value;
+ var rawVersion = versionSdk?.ConstructorArguments.FirstOrDefault().Value as string;
 
  if (string.IsNullOrEmpty(rawVersion)) return;
 
@@ -67,7 +69,7 @@ public static void SupportedAssembly(Assembly sourceAssembly)
  int maxVersion = Convert.ToInt32(MaxVersion.Replace(".", ""));
 
  if (libraryVersion < minVersion || libraryVersion > maxVersion)
- throw new UnsupportedSdkLibraryException(sourceAssembly.FullName, rawVersion, MinVersion,
+ throw new UnsupportedSdkLibraryException(workAssembly.FullName, rawVersion, MinVersion,
  MaxVersion);
 
  }
@@ -77,10 +79,45 @@ public static void SupportedAssembly(Assembly sourceAssembly)
  }
  catch (Exception)
  {
- if(cfAssembly) throw new UnsupportedSdkLibraryException(sourceAssembly.FullName, "0.0.0.0", MinVersion,
- MaxVersion);
+ if (cfAssembly)
+ throw new UnsupportedSdkLibraryException(workAssembly.FullName, "0.0.0.0", MinVersion,
+ MaxVersion);
+ }
+ finally
+ {
+ //Removing our delegate from the assembly resolver.
+ AppDomain.CurrentDomain.ReflectionOnlyAssemblyResolve -= CurrentDomain_ReflectionOnlyAssemblyResolve;
+ }
+
+ }
+
+ /// <summary>
+ /// Event handler that resolves assemblies that are not in the reflection only context.
+ /// </summary>
+ /// <param name="sender">Application domain that needs to resolve.</param>
+ /// <param name="args">Resolve arguments that contains the information needed for resolution.</param>
+ /// <returns>The reflection only assembly or null if it cannot be loaded.</returns>
+ private static Assembly CurrentDomain_ReflectionOnlyAssemblyResolve(object sender, ResolveEventArgs args)
+ {
+ var assemblies = AppDomain.CurrentDomain.GetAssemblies();
+
+ var loadedAssembly = assemblies.FirstOrDefault(a => a.FullName == args.Name);
+
+ if (loadedAssembly != null)
+ {
+ return Assembly.ReflectionOnlyLoadFrom(loadedAssembly.Location);
  }
 
+ var filenamePosition = args.Name.IndexOf(',');
+ var fileName =$"{args.Name.Substring(0,filenamePosition)}.dll";
+
+ var directoryPath = Path.GetDirectoryName(args.RequestingAssembly.Location);
+
+ if (string.IsNullOrEmpty(directoryPath)) return null;
+
+ var filePath = Path.Combine(directoryPath, fileName);
+
+ return !File.Exists(filePath) ? null : Assembly.ReflectionOnlyLoadFrom(filePath);
  }
  }
 }