Remove UI Automation dependency.

Update IntelliSenseServer and package version to 1.0.2
Excel-DNA · May 19, 2017 · 224a432 · 224a432
1 parent df5363e
commit 224a432
Show file tree

Hide file tree

Showing 21 changed files with 404 additions and 546 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@ TestResults
 
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
+.vs/
 
 # User-specific files
 *.suo

diff --git a/NuGet/ExcelDna.IntelliSense/ExcelDna.IntelliSense.nuspec b/NuGet/ExcelDna.IntelliSense/ExcelDna.IntelliSense.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
  <metadata>
  <id>ExcelDna.IntelliSense</id>
- <version>1.0.1</version>
+ <version>1.0.2</version>
  <title>Excel-DNA IntelliSense Extension</title>
  <authors>Excel-DNA Contributors</authors>
  <owners>Excel-DNA Contributors</owners>
@@ -14,7 +14,6 @@
  <tags>excel exceldna udf excel-dna intellisense</tags>
  <dependencies>
  <dependency id="ExcelDna.Integration" version="0.33.9" />
- <dependency id="UIAComWrapper" version="1.1.0.14" />
  </dependencies>
  </metadata>
  <files>

diff --git a/Source/ExcelDna.IntelliSense.Host/ExcelDna.IntelliSense.Host-AddIn.xll.config b/Source/ExcelDna.IntelliSense.Host/ExcelDna.IntelliSense.Host-AddIn.xll.config
@@ -3,15 +3,15 @@
  <system.diagnostics>
  <trace autoflush="true" indentsize="4"/>
  <sources>
- <source name="ExcelDna.IntelliSense" switchValue="Off">
+ <source name="ExcelDna.IntelliSense" switchValue="All">
  <listeners>
  <!--<remove name="Default" />-->
- <!--<add name="LogDisplay" type="ExcelDna.Logging.LogDisplayTraceListener,ExcelDna.Integration">
+ <add name="LogDisplay" type="ExcelDna.Logging.LogDisplayTraceListener,ExcelDna.Integration">
  <filter type="System.Diagnostics.EventTypeFilter" initializeData="All"/>
- </add>-->
- <!--<add name="File" type="System.Diagnostics.TextWriterTraceListener" initializeData="ExcelDna.IntelliSense.log" >
+ </add>
+ <!-- <add name="File" type="System.Diagnostics.TextWriterTraceListener" initializeData="ExcelDna.IntelliSense.log" >
  <filter type="System.Diagnostics.EventTypeFilter" initializeData="All"/>
- </add>-->
+ </add> -->
  </listeners>
  </source>
  </sources>

diff --git a/Source/ExcelDna.IntelliSense.Host/Properties/AssemblyInfo.cs b/Source/ExcelDna.IntelliSense.Host/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Excel-DNA")]
 [assembly: AssemblyProduct("Excel-DNA IntelliSense")]
-[assembly: AssemblyCopyright("Copyright © Excel-DNA Contributors 2013-2016")]
+[assembly: AssemblyCopyright("Copyright © Excel-DNA Contributors 2013-2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // 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("1.0.1.*")]
-[assembly: AssemblyFileVersion("1.0.1.0")]
+[assembly: AssemblyVersion("1.0.2.*")]
+[assembly: AssemblyFileVersion("1.0.2.0")]
diff --git a/Source/ExcelDna.IntelliSense.Host/packages.config b/Source/ExcelDna.IntelliSense.Host/packages.config
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
- <package id="Excel-DNA" version="0.33.9" targetFramework="net40" />
  <package id="ExcelDna.AddIn" version="0.33.9" targetFramework="net40" />
  <package id="ExcelDna.Integration" version="0.33.9" targetFramework="net40" />
- <package id="Excel-DNA.Lib" version="0.33.9" targetFramework="net40" />
 </packages>
diff --git a/Source/ExcelDna.IntelliSense.Tools/Properties/AssemblyInfo.cs b/Source/ExcelDna.IntelliSense.Tools/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("ExcelDna.IntelliSense.Tools")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
+[assembly: AssemblyCopyright("Copyright © Excel-DNA Contributors 2013-2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // 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("1.0.1.*")]
-[assembly: AssemblyFileVersion("1.0.1.0")]
+[assembly: AssemblyVersion("1.0.2.*")]
+[assembly: AssemblyFileVersion("1.0.2.0")]
diff --git a/Source/ExcelDna.IntelliSense/ExcelDna.IntelliSense.csproj b/Source/ExcelDna.IntelliSense/ExcelDna.IntelliSense.csproj
@@ -38,10 +38,6 @@
  <HintPath>..\packages\ExcelDna.Integration.0.33.9\lib\ExcelDna.Integration.dll</HintPath>
  <Private>False</Private>
  </Reference>
- <Reference Include="Interop.UIAutomationClient, Version=12.0.20617.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <HintPath>..\packages\UIAComWrapper.1.1.0.14\lib\net40\Interop.UIAutomationClient.dll</HintPath>
- <EmbedInteropTypes>False</EmbedInteropTypes>
- </Reference>
  <Reference Include="Microsoft.Office.Interop.Excel, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
  <EmbedInteropTypes>True</EmbedInteropTypes>
  <HintPath>..\packages\ExcelDna.Interop.14.0.1\lib\Microsoft.Office.Interop.Excel.dll</HintPath>
@@ -66,10 +62,6 @@
  <Reference Include="Microsoft.CSharp" />
  <Reference Include="System.Data" />
  <Reference Include="System.Xml" />
- <Reference Include="UIAComWrapper, Version=1.1.0.14, Culture=neutral, PublicKeyToken=78cbcf77433a85e5, processorArchitecture=MSIL">
- <HintPath>..\packages\UIAComWrapper.1.1.0.14\lib\net40\UIAComWrapper.dll</HintPath>
- <Private>True</Private>
- </Reference>
  <Reference Include="WindowsBase" />
  </ItemGroup>
  <ItemGroup>
@@ -97,7 +89,6 @@
  <Compile Include="UIMonitor\WindowWatcher.cs" />
  <Compile Include="Win32Helper.cs" />
  <Compile Include="Providers\LoaderNotification.cs" />
- <Compile Include="WindowResizer.cs" />
  <Compile Include="UIMonitor\WinEvents.cs" />
  <Compile Include="UIMonitor\XlCall.cs" />
  </ItemGroup>

diff --git a/Source/ExcelDna.IntelliSense/IntelliSenseDisplay.cs b/Source/ExcelDna.IntelliSense/IntelliSenseDisplay.cs
@@ -393,7 +393,8 @@ void FunctionListSelectedItemChange(string selectedItemText, Rect selectedItemBo
  Logger.Display.Verbose($"IntelliSenseDisplay - PopupListSelectedItemChanged - {selectedItemText} List/Item Bounds: {listBounds} / {selectedItemBounds}");
 
  FunctionInfo functionInfo;
- if (_functionInfoMap.TryGetValue(selectedItemText, out functionInfo))
+ if (!string.IsNullOrEmpty(selectedItemText) &&
+ _functionInfoMap.TryGetValue(selectedItemText, out functionInfo))
  {
  // It's ours!
  var descriptionLines = GetFunctionDescriptionOrNull(functionInfo);

diff --git a/Source/ExcelDna.IntelliSense/IntelliSenseServer.cs b/Source/ExcelDna.IntelliSense/IntelliSenseServer.cs
@@ -28,7 +28,7 @@ namespace ExcelDna.IntelliSense
  // REMEMBER: COM events are not necessarily safe macro contexts.
  public static class IntelliSenseServer
  {
- const string ServerVersion = "1.0.1"; // TODO: Define and manage this somewhere else
+ const string ServerVersion = "1.0.2"; // TODO: Define and manage this somewhere else
 
  // NOTE: Do not change these constants in custom versions. 
  // They are part of the co-operative safety mechanism allowing different add-ins providing IntelliSense to work together safely.

diff --git a/Source/ExcelDna.IntelliSense/Properties/AssemblyInfo.cs b/Source/ExcelDna.IntelliSense/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Excel-DNA")]
 [assembly: AssemblyProduct("Excel-DNA IntelliSense")]
-[assembly: AssemblyCopyright("Copyright © Excel-DNA Contributors 2013-2016")]
+[assembly: AssemblyCopyright("Copyright © Excel-DNA Contributors 2013-2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // 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("1.0.1.*")]
-[assembly: AssemblyFileVersion("1.0.1.0")]
+[assembly: AssemblyVersion("1.0.2.*")]
+[assembly: AssemblyFileVersion("1.0.2.0")]
diff --git a/Source/ExcelDna.IntelliSense/SingleThreadSynchronizationContext.cs b/Source/ExcelDna.IntelliSense/SingleThreadSynchronizationContext.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Threading;
 
 namespace ExcelDna.IntelliSense

diff --git a/Source/ExcelDna.IntelliSense/UIMonitor/ExcelToolTipWatcher.cs b/Source/ExcelDna.IntelliSense/UIMonitor/ExcelToolTipWatcher.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Threading;
-using System.Windows;
 
 namespace ExcelDna.IntelliSense
 {
@@ -77,11 +75,6 @@ public void Dispose()
  Logger.WindowWatcher.Info($"ExcelToolTip Dispose Begin");
  _windowWatcher.ExcelToolTipWindowChanged -= _windowWatcher_ExcelToolTipWindowChanged;
  _windowWatcher = null;
-
- //_syncContextAuto.Send(delegate
- //{
- // Debug.Print("Disposing ExcelToolTipWatcher - In Automation context");
- //}, null);
  Logger.WindowWatcher.Info($"ExcelToolTip Dispose End");
  }
  }