Merge pull request #1614 from erwinvanhunen/dev

Fixes issue with Graph cmdlets

Author: erwinvanhunen

Commands/Base/PnPGraphCmdlet.cs

@@ -4,8 +4,10 @@
 using SharePointPnP.PowerShell.Commands.Properties;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Management.Automation;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -16,6 +18,7 @@ namespace SharePointPnP.PowerShell.Commands.Base
     /// </summary>
     public abstract class PnPGraphCmdlet : PSCmdlet
     {
+        private Assembly newtonsoftAssembly;
         public String AccessToken
         {
             get
@@ -49,11 +52,48 @@ public String AccessToken
             }
         }
 
+        private string AssemblyDirectory
+        {
+            get
+            {
+                string codeBase = Assembly.GetExecutingAssembly().CodeBase;
+                UriBuilder uri = new UriBuilder(codeBase);
+                string path = Uri.UnescapeDataString(uri.Path);
+                return Path.GetDirectoryName(path);
+            }
+        }
+
+        private void FixAssemblyResolving()
+        {
+            newtonsoftAssembly = System.Reflection.Assembly.LoadFrom(Path.Combine(AssemblyDirectory, "NewtonSoft.Json.dll"));
+            System.AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
+
+        }
+
+        private System.Reflection.Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
+        {
+
+            if (args.Name.StartsWith("Newtonsoft.Json"))
+            {
+                return newtonsoftAssembly;
+            }
+            foreach (var assembly in System.AppDomain.CurrentDomain.GetAssemblies())
+            {
+                if (assembly.FullName == args.Name)
+                {
+                    return assembly;
+                }
+            }
+            return null;
+        }
+
         protected override void BeginProcessing()
         {
 
             base.BeginProcessing();
 
+            FixAssemblyResolving();
+
 #if !NETSTANDARD2_0
 
             if (SPOnlineConnection.CurrentConnection != null && SPOnlineConnection.CurrentConnection.ConnectionMethod == Model.ConnectionMethod.GraphDeviceLogin)
@@ -99,5 +139,10 @@ protected override void ProcessRecord()
         {
             ExecuteCmdlet();
         }
+
+        protected override void EndProcessing()
+        {
+            System.AppDomain.CurrentDomain.AssemblyResolve -= CurrentDomain_AssemblyResolve;
+        }
     }
 }

Commands/Properties/AssemblyInfo.cs

@@ -44,6 +44,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.27.1806.0")]
-[assembly: AssemblyFileVersion("2.27.1806.0")]
+[assembly: AssemblyVersion("2.27.1806.1")]
+[assembly: AssemblyFileVersion("2.27.1806.1")]
 [assembly: InternalsVisibleTo("SharePointPnP.PowerShell.Tests")]