Merge branch 'master' of https://github.com/MscrmTools/XrmToolBox.git

MscrmTools · May 9, 2017 · 6646045 · 6646045
2 parents 901cbd4 + 886d85c
commit 6646045
Show file tree

Hide file tree

Showing 9 changed files with 1,750 additions and 101 deletions.
diff --git a/XrmToolBox.AutoUpdater/AutoUpdater.cs b/XrmToolBox.AutoUpdater/AutoUpdater.cs
@@ -61,12 +61,22 @@ private void AutoUpdater_Load(object sender, System.EventArgs e)
 
         private void button1_Click(object sender, EventArgs e)
         {
-            Process.Start(xrmtoolboxExecutablePath);
+            if (xrmtoolboxExecutablePath != null)
+            {
+                Process.Start(xrmtoolboxExecutablePath);
+            }
             Close();
         }
 
         private void Client_DownloadFileCompleted(object sender, AsyncCompletedEventArgs e)
         {
+            if (e.Error != null)
+            {
+                pbDownloadFile.Value = 100;
+                pbDownloadFile.Style = ProgressBarStyle.Continuous;
+                lblProgress.Text = e.Error.Message.ToString();
+                return;
+            }
             pbDownloadFile.Value = 100;
             pbDownloadFile.Style = ProgressBarStyle.Marquee;
 

diff --git a/XrmToolBox.Extensibility/XrmToolBox.Extensibility.csproj b/XrmToolBox.Extensibility/XrmToolBox.Extensibility.csproj
@@ -65,12 +65,12 @@
       <HintPath>..\packages\Microsoft.IdentityModel.6.1.7600.16394\lib\net35\Microsoft.IdentityModel.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=3.10.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.10.305161347\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
+    <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.24.304111323, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.24.304111323\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform, Version=3.10.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.10.305161347\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll</HintPath>
+    <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform, Version=2.24.304111323, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.24.304111323\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Xrm.Sdk, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

diff --git a/XrmToolBox.PluginsStore/StoreForm - Copier.Designer.cs b/XrmToolBox.PluginsStore/StoreForm - Copier.Designer.cs