Skip to content

Commit 224a432

Browse files
govertgovert
committed
Remove UI Automation dependency.
Update IntelliSenseServer and package version to 1.0.2
1 parent df5363e commit 224a432

21 files changed

+404
-546
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ TestResults
77

88
## Ignore Visual Studio temporary files, build results, and
99
## files generated by popular Visual Studio add-ons.
10+
.vs/
1011

1112
# User-specific files
1213
*.suo

‎NuGet/ExcelDna.IntelliSense/ExcelDna.IntelliSense.nuspec‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>ExcelDna.IntelliSense</id>
5-
<version>1.0.1</version>
5+
<version>1.0.2</version>
66
<title>Excel-DNA IntelliSense Extension</title>
77
<authors>Excel-DNA Contributors</authors>
88
<owners>Excel-DNA Contributors</owners>
@@ -14,7 +14,6 @@
1414
<tags>excel exceldna udf excel-dna intellisense</tags>
1515
<dependencies>
1616
<dependency id="ExcelDna.Integration" version="0.33.9" />
17-
<dependency id="UIAComWrapper" version="1.1.0.14" />
1817
</dependencies>
1918
</metadata>
2019
<files>

‎Source/ExcelDna.IntelliSense.Host/ExcelDna.IntelliSense.Host-AddIn.xll.config‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<system.diagnostics>
44
<trace autoflush="true" indentsize="4"/>
55
<sources>
6-
<source name="ExcelDna.IntelliSense" switchValue="Off">
6+
<source name="ExcelDna.IntelliSense" switchValue="All">
77
<listeners>
88
<!--<remove name="Default" />-->
9-
<!--<add name="LogDisplay" type="ExcelDna.Logging.LogDisplayTraceListener,ExcelDna.Integration">
9+
<add name="LogDisplay" type="ExcelDna.Logging.LogDisplayTraceListener,ExcelDna.Integration">
1010
<filter type="System.Diagnostics.EventTypeFilter" initializeData="All"/>
11-
</add>-->
12-
<!--<add name="File" type="System.Diagnostics.TextWriterTraceListener" initializeData="ExcelDna.IntelliSense.log" >
11+
</add>
12+
<!-- <add name="File" type="System.Diagnostics.TextWriterTraceListener" initializeData="ExcelDna.IntelliSense.log" >
1313
<filter type="System.Diagnostics.EventTypeFilter" initializeData="All"/>
14-
</add>-->
14+
</add> -->
1515
</listeners>
1616
</source>
1717
</sources>

‎Source/ExcelDna.IntelliSense.Host/Properties/AssemblyInfo.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("Excel-DNA")]
1212
[assembly: AssemblyProduct("Excel-DNA IntelliSense")]
13-
[assembly: AssemblyCopyright("Copyright © Excel-DNA Contributors 2013-2016")]
13+
[assembly: AssemblyCopyright("Copyright © Excel-DNA Contributors 2013-2017")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.1.*")]
36-
[assembly: AssemblyFileVersion("1.0.1.0")]
35+
[assembly: AssemblyVersion("1.0.2.*")]
36+
[assembly: AssemblyFileVersion("1.0.2.0")]

‎Source/ExcelDna.IntelliSense.Host/packages.config‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Excel-DNA" version="0.33.9" targetFramework="net40" />
43
<package id="ExcelDna.AddIn" version="0.33.9" targetFramework="net40" />
54
<package id="ExcelDna.Integration" version="0.33.9" targetFramework="net40" />
6-
<package id="Excel-DNA.Lib" version="0.33.9" targetFramework="net40" />
75
</packages>

‎Source/ExcelDna.IntelliSense.Tools/Properties/AssemblyInfo.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("")]
1212
[assembly: AssemblyProduct("ExcelDna.IntelliSense.Tools")]
13-
[assembly: AssemblyCopyright("Copyright © 2016")]
13+
[assembly: AssemblyCopyright("Copyright © Excel-DNA Contributors 2013-2017")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.1.*")]
36-
[assembly: AssemblyFileVersion("1.0.1.0")]
35+
[assembly: AssemblyVersion("1.0.2.*")]
36+
[assembly: AssemblyFileVersion("1.0.2.0")]

‎Source/ExcelDna.IntelliSense/ExcelDna.IntelliSense.csproj‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@
3838
<HintPath>..\packages\ExcelDna.Integration.0.33.9\lib\ExcelDna.Integration.dll</HintPath>
3939
<Private>False</Private>
4040
</Reference>
41-
<Reference Include="Interop.UIAutomationClient, Version=12.0.20617.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
42-
<HintPath>..\packages\UIAComWrapper.1.1.0.14\lib\net40\Interop.UIAutomationClient.dll</HintPath>
43-
<EmbedInteropTypes>False</EmbedInteropTypes>
44-
</Reference>
4541
<Reference Include="Microsoft.Office.Interop.Excel, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
4642
<EmbedInteropTypes>True</EmbedInteropTypes>
4743
<HintPath>..\packages\ExcelDna.Interop.14.0.1\lib\Microsoft.Office.Interop.Excel.dll</HintPath>
@@ -66,10 +62,6 @@
6662
<Reference Include="Microsoft.CSharp" />
6763
<Reference Include="System.Data" />
6864
<Reference Include="System.Xml" />
69-
<Reference Include="UIAComWrapper, Version=1.1.0.14, Culture=neutral, PublicKeyToken=78cbcf77433a85e5, processorArchitecture=MSIL">
70-
<HintPath>..\packages\UIAComWrapper.1.1.0.14\lib\net40\UIAComWrapper.dll</HintPath>
71-
<Private>True</Private>
72-
</Reference>
7365
<Reference Include="WindowsBase" />
7466
</ItemGroup>
7567
<ItemGroup>
@@ -97,7 +89,6 @@
9789
<Compile Include="UIMonitor\WindowWatcher.cs" />
9890
<Compile Include="Win32Helper.cs" />
9991
<Compile Include="Providers\LoaderNotification.cs" />
100-
<Compile Include="WindowResizer.cs" />
10192
<Compile Include="UIMonitor\WinEvents.cs" />
10293
<Compile Include="UIMonitor\XlCall.cs" />
10394
</ItemGroup>

‎Source/ExcelDna.IntelliSense/IntelliSenseDisplay.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,8 @@ void FunctionListSelectedItemChange(string selectedItemText, Rect selectedItemBo
393393
Logger.Display.Verbose($"IntelliSenseDisplay - PopupListSelectedItemChanged - {selectedItemText} List/Item Bounds: {listBounds} / {selectedItemBounds}");
394394

395395
FunctionInfo functionInfo;
396-
if (_functionInfoMap.TryGetValue(selectedItemText, out functionInfo))
396+
if (!string.IsNullOrEmpty(selectedItemText) &&
397+
_functionInfoMap.TryGetValue(selectedItemText, out functionInfo))
397398
{
398399
// It's ours!
399400
var descriptionLines = GetFunctionDescriptionOrNull(functionInfo);

‎Source/ExcelDna.IntelliSense/IntelliSenseServer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace ExcelDna.IntelliSense
2828
// REMEMBER: COM events are not necessarily safe macro contexts.
2929
public static class IntelliSenseServer
3030
{
31-
const string ServerVersion = "1.0.1"; // TODO: Define and manage this somewhere else
31+
const string ServerVersion = "1.0.2"; // TODO: Define and manage this somewhere else
3232

3333
// NOTE: Do not change these constants in custom versions.
3434
// They are part of the co-operative safety mechanism allowing different add-ins providing IntelliSense to work together safely.

‎Source/ExcelDna.IntelliSense/Properties/AssemblyInfo.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("Excel-DNA")]
1212
[assembly: AssemblyProduct("Excel-DNA IntelliSense")]
13-
[assembly: AssemblyCopyright("Copyright © Excel-DNA Contributors 2013-2016")]
13+
[assembly: AssemblyCopyright("Copyright © Excel-DNA Contributors 2013-2017")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.1.*")]
36-
[assembly: AssemblyFileVersion("1.0.1.0")]
35+
[assembly: AssemblyVersion("1.0.2.*")]
36+
[assembly: AssemblyFileVersion("1.0.2.0")]

0 commit comments

Comments
 (0)