Update to prefer assemblyDescriptor to assemblyDescriptorRef if specified