Try loading jsreport.Client dependent assemblies without specific ver…

…sion Fix #1
jsreport · Nov 12, 2014 · b36d7dc · b36d7dc
1 parent 705b04f
commit b36d7dc
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 8 deletions.
diff --git a/JsReportVSTools/Impl/EmbeddedServerManager.cs b/JsReportVSTools/Impl/EmbeddedServerManager.cs
@@ -60,10 +60,8 @@ public RemoteTask<int> StopAsync()
         /// </summary>
         public override object CreateReportingService()
         {
-            Type reportingServiceType = AppDomain.CurrentDomain.Load("jsreport.Client").GetType("jsreport.Client.ReportingService");
-
-            return Activator.CreateInstance(reportingServiceType, ServerUri);
-        }
+            return Activator.CreateInstance(LoadReportingServiceType(), ServerUri);
+        }     
 
         private string GetMainModuleFilePath(int processId)
         {

diff --git a/JsReportVSTools/Impl/RemoteServerManager.cs b/JsReportVSTools/Impl/RemoteServerManager.cs
@@ -28,9 +28,7 @@ public RemoteTask<int> EnsureStartedAsync()
 
         public override object CreateReportingService()
         {
-            Type reportingServiceType = AppDomain.CurrentDomain.Load("jsreport.Client").GetType("jsreport.Client.ReportingService");
-
-            return Activator.CreateInstance(reportingServiceType, _remoteServerUri, _username, _password);
+            return Activator.CreateInstance(LoadReportingServiceType(), _remoteServerUri, _username, _password);
         }
 
         public string ServerUri { get { return _remoteServerUri; } }

diff --git a/JsReportVSTools/Impl/ReportingServerManagerBase.cs b/JsReportVSTools/Impl/ReportingServerManagerBase.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Security.Permissions;
 using Newtonsoft.Json;
+using System.Reflection;
 
 namespace JsReportVSTools.Impl
 {
@@ -101,6 +102,29 @@ public override object InitializeLifetimeService()
         {
             return null;
         }
+
+        protected Type LoadReportingServiceType()
+        {
+            AppDomain.CurrentDomain.AssemblyResolve -= CurrentDomain_AssemblyResolve;
+            AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
+
+            return AppDomain.CurrentDomain.Load("jsreport.Client").GetType("jsreport.Client.ReportingService");
+        }
+
+        private readonly IList<string> _triedWithoutVersion = new List<string>();
+
+        System.Reflection.Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
+        {
+            string assemblyName = new AssemblyName(args.Name).Name;
+
+            if (_triedWithoutVersion.Contains(assemblyName))
+            {
+                return null;
+            }
+
+            _triedWithoutVersion.Add(assemblyName);
+            return Assembly.Load(assemblyName);
+        }
     }
 
     [Serializable]

diff --git a/JsReportVSTools/source.extension.vsixmanifest b/JsReportVSTools/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="60546472-b12d-4ad6-b5ea-74401d44d9fc" Version="0.2.6" Language="en-US" Publisher="Jan Blaha" />
+    <Identity Id="60546472-b12d-4ad6-b5ea-74401d44d9fc" Version="0.2.7" Language="en-US" Publisher="Jan Blaha" />
     <DisplayName>jsreport visual studio tools beta</DisplayName>
     <Description xml:space="preserve">Extension allowing to use jsreport open source reporting platform inside visual studio. It allows to create any pdf report you can think of without lame designers just using html and javascript.</Description>
     <MoreInfo>http://jsreport.net/</MoreInfo>