Make UIAComWrapper depend on UIAutomation-Interop, instead of the internally bundled dll.

dsheehan · dsheehan · commit c4b36f897d9d · 2021-01-22T11:05:49.000-05:00
diff --git a/Libs/Interop.UIAutomationClient.dll b/Libs/Interop.UIAutomationClient.dll
diff --git a/Libs/Interop.UIAutomationClient.txt b/Libs/Interop.UIAutomationClient.txt
diff --git a/UiaComWrapper/AnnotationPattern.cs b/UiaComWrapper/AnnotationPattern.cs
@@ -9,6 +9,7 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using UIAComWrapperInternal;
+using UIAutomationClient = Interop.UIAutomationClient;
 
 namespace System.Windows.Automation
 {
diff --git a/UiaComWrapper/Automation.cs b/UiaComWrapper/Automation.cs
@@ -6,7 +6,8 @@
 
 using System;
 using UIAComWrapperInternal;
-using UIAutomationClient;
+using Interop.UIAutomationClient;
+using UIAutomationClient = Interop.UIAutomationClient;
 
 namespace System.Windows.Automation
 {
diff --git a/UiaComWrapper/AutomationElement.cs b/UiaComWrapper/AutomationElement.cs
@@ -8,6 +8,8 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
+using Interop.UIAutomationClient;
+using UIAutomationClient = Interop.UIAutomationClient;
 using UIAComWrapperInternal;
 
 namespace System.Windows.Automation
@@ -596,7 +598,7 @@ public static AutomationElement RootElement
             {
                 try
                 {
-                    UIAutomationClient.IUIAutomationElement element =
+                    IUIAutomationElement element =
                         Automation.Factory.GetRootElementBuildCache(
                             CacheRequest.CurrentNativeCacheRequest);
                     return AutomationElement.Wrap(element);
diff --git a/UiaComWrapper/AutomationElementCollection.cs b/UiaComWrapper/AutomationElementCollection.cs
@@ -8,7 +8,7 @@
 using System;
 using System.Diagnostics;
 using System.Collections;
-using UIAComWrapperInternal;
+using UIAutomationClient = Interop.UIAutomationClient;
 
 namespace System.Windows.Automation
 {
diff --git a/UiaComWrapper/AutomationInteropProvider.cs b/UiaComWrapper/AutomationInteropProvider.cs
@@ -8,7 +8,8 @@
 using System;
 using System.Runtime.InteropServices;
 using UIAComWrapperInternal;
-using UIAutomationClient;
+using Interop.UIAutomationClient;
+using UIAutomationClient = Interop.UIAutomationClient;
 
 namespace System.Windows.Automation.Providers
 {
diff --git a/UiaComWrapper/CacheRequest.cs b/UiaComWrapper/CacheRequest.cs
@@ -9,6 +9,7 @@
 using System.Collections;
 using System.Diagnostics;
 using UIAComWrapperInternal;
+using UIAutomationClient = Interop.UIAutomationClient;
 
 namespace System.Windows.Automation
 {
diff --git a/UiaComWrapper/ClientEventList.cs b/UiaComWrapper/ClientEventList.cs
@@ -9,8 +9,8 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Windows.Automation;
-using UIAutomationClient;
-using StructureChangeType = System.Windows.Automation.StructureChangeType;
+using UIAutomationClient = Interop.UIAutomationClient;
+using IUIAutomationElement = Interop.UIAutomationClient.IUIAutomationElement;
 
 namespace UIAComWrapperInternal
 {
diff --git a/UiaComWrapper/ClientSideProviders.cs b/UiaComWrapper/ClientSideProviders.cs
@@ -11,7 +11,8 @@
 using System.Runtime.InteropServices;
 using System.Windows.Automation.Providers;
 using UIAComWrapperInternal;
-using UIAutomationClient;
+using Interop.UIAutomationClient;
+using UIAutomationClient = Interop.UIAutomationClient;
 
 namespace System.Windows.Automation
 {
diff --git a/UiaComWrapper/Conditions.cs b/UiaComWrapper/Conditions.cs
@@ -10,6 +10,7 @@
 using System.Windows;
 using System.Diagnostics;
 using UIAComWrapperInternal;
+using UIAutomationClient = Interop.UIAutomationClient;
 
 namespace System.Windows.Automation
 {
diff --git a/UiaComWrapper/DockPattern.cs b/UiaComWrapper/DockPattern.cs
@@ -10,6 +10,7 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using UIAComWrapperInternal;
+using UIAutomationClient = Interop.UIAutomationClient;
 
 namespace System.Windows.Automation
 {
diff --git a/UiaComWrapper/DragPattern.cs b/UiaComWrapper/DragPattern.cs
@@ -9,6 +9,7 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using UIAComWrapperInternal;
+using UIAutomationClient = Interop.UIAutomationClient;
 
 namespace System.Windows.Automation
 {
diff --git a/UiaComWrapper/DropTargetPattern.cs b/UiaComWrapper/DropTargetPattern.cs
@@ -9,6 +9,7 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using UIAComWrapperInternal;
+using UIAutomationClient = Interop.UIAutomationClient;
 
 namespace System.Windows.Automation
 {
diff --git a/UiaComWrapper/ExpandCollapsePattern.cs b/UiaComWrapper/ExpandCollapsePattern.cs
@@ -10,6 +10,7 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using UIAComWrapperInternal;
+using UIAutomationClient = Interop.UIAutomationClient;
 
 namespace System.Windows.Automation
 {
diff --git a/UiaComWrapper/GridPattern.cs b/UiaComWrapper/GridPattern.cs
@@ -10,6 +10,7 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using UIAComWrapperInternal;
+using UIAutomationClient = Interop.UIAutomationClient;
 
 namespace System.Windows.Automation
 {
diff --git a/UiaComWrapper/InternalSchema.cs b/UiaComWrapper/InternalSchema.cs
@@ -9,6 +9,7 @@
 using System.Windows.Automation;
 using System.Windows.Automation.Text;
 using System.Windows;
+using UIAutomationClient = Interop.UIAutomationClient;
 
 namespace UIAComWrapperInternal
 {
diff --git a/UiaComWrapper/InvokePattern.cs b/UiaComWrapper/InvokePattern.cs
@@ -8,6 +8,7 @@
 using System;
 using System.Diagnostics;
 using UIAComWrapperInternal;
+using UIAutomationClient = Interop.UIAutomationClient;
 
 namespace System.Windows.Automation
 {
diff --git a/UiaComWrapper/LegacyIAccessiblePattern.cs b/UiaComWrapper/LegacyIAccessiblePattern.cs
@@ -10,6 +10,7 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using UIAComWrapperInternal;
+using UIAutomationClient = Interop.UIAutomationClient;
 
 namespace System.Windows.Automation
 {
diff --git a/UiaComWrapper/MultipleViewPattern.cs b/UiaComWrapper/MultipleViewPattern.cs
@@ -10,6 +10,7 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using UIAComWrapperInternal;
+using UIAutomationClient = Interop.UIAutomationClient;
 
 namespace System.Windows.Automation
 {
diff --git a/UiaComWrapper/ObjectModelPattern.cs b/UiaComWrapper/ObjectModelPattern.cs
@@ -9,6 +9,7 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using UIAComWrapperInternal;
+using UIAutomationClient = Interop.UIAutomationClient;
 
 namespace System.Windows.Automation
 {
diff --git a/UiaComWrapper/ProviderInterfaces.cs b/UiaComWrapper/ProviderInterfaces.cs
@@ -10,7 +10,7 @@
 // Provider interfaces.
 // IRawElementProviderSimple is defined in the interop DLL,
 // since the Client code refers to it.  Everything else is here.
-using UIAutomationClient;
+using Interop.UIAutomationClient;
 using TextPatternRangeEndpoint = System.Windows.Automation.Text.TextPatternRangeEndpoint;
 using TextUnit = System.Windows.Automation.Text.TextUnit;
 
diff --git a/UiaComWrapper/ScrollPattern.cs b/UiaComWrapper/ScrollPattern.cs
@@ -10,6 +10,7 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using UIAComWrapperInternal;
+using UIAutomationClient = Interop.UIAutomationClient;
 
 namespace System.Windows.Automation
 {
diff --git a/UiaComWrapper/SelectionPattern.cs b/UiaComWrapper/SelectionPattern.cs
@@ -10,6 +10,7 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using UIAComWrapperInternal;
+using UIAutomationClient = Interop.UIAutomationClient;
 
 namespace System.Windows.Automation
 {
diff --git a/UiaComWrapper/SpreadsheetPattern.cs b/UiaComWrapper/SpreadsheetPattern.cs
@@ -9,6 +9,7 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using UIAComWrapperInternal;
+using UIAutomationClient = Interop.UIAutomationClient;
 
 namespace System.Windows.Automation
 {
diff --git a/UiaComWrapper/StylesPattern.cs b/UiaComWrapper/StylesPattern.cs
@@ -9,6 +9,7 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using UIAComWrapperInternal;
+using UIAutomationClient = Interop.UIAutomationClient;
 
 namespace System.Windows.Automation
 {
diff --git a/UiaComWrapper/SynchronizedInput.cs b/UiaComWrapper/SynchronizedInput.cs
@@ -10,6 +10,7 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using UIAComWrapperInternal;
+using UIAutomationClient = Interop.UIAutomationClient;
 
 namespace System.Windows.Automation
 {
diff --git a/UiaComWrapper/TablePattern.cs b/UiaComWrapper/TablePattern.cs
@@ -10,6 +10,7 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using UIAComWrapperInternal;
+using UIAutomationClient = Interop.UIAutomationClient;
 
 namespace System.Windows.Automation
 {
diff --git a/UiaComWrapper/TextChildPattern.cs b/UiaComWrapper/TextChildPattern.cs
@@ -10,6 +10,7 @@
 using System.Runtime.InteropServices;
 using System.Windows.Automation.Text;
 using UIAComWrapperInternal;
+using UIAutomationClient = Interop.UIAutomationClient;
 
 namespace System.Windows.Automation
 {
diff --git a/UiaComWrapper/TextPattern.cs b/UiaComWrapper/TextPattern.cs
@@ -10,6 +10,7 @@
 using System.Runtime.InteropServices;
 using System.Windows.Automation.Text;
 using UIAComWrapperInternal;
+using UIAutomationClient = Interop.UIAutomationClient;
 
 namespace System.Windows.Automation
 {
diff --git a/UiaComWrapper/TextRange.cs b/UiaComWrapper/TextRange.cs
@@ -11,6 +11,7 @@
 using System.Globalization;
 using System.Runtime.InteropServices;
 using UIAComWrapperInternal;
+using UIAutomationClient = Interop.UIAutomationClient;
 
 namespace System.Windows.Automation.Text
 {
diff --git a/UiaComWrapper/TogglePattern.cs b/UiaComWrapper/TogglePattern.cs
@@ -10,6 +10,7 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using UIAComWrapperInternal;
+using UIAutomationClient = Interop.UIAutomationClient;
 
 namespace System.Windows.Automation
 {
diff --git a/UiaComWrapper/TransformPattern.cs b/UiaComWrapper/TransformPattern.cs
@@ -9,6 +9,7 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using UIAComWrapperInternal;
+using UIAutomationClient = Interop.UIAutomationClient;
 
 namespace System.Windows.Automation
 {
diff --git a/UiaComWrapper/TreeWalker.cs b/UiaComWrapper/TreeWalker.cs
@@ -10,6 +10,7 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using UIAComWrapperInternal;
+using UIAutomationClient = Interop.UIAutomationClient;
 
 namespace System.Windows.Automation
 {
diff --git a/UiaComWrapper/UIAComWrapper.csproj b/UiaComWrapper/UIAComWrapper.csproj
@@ -55,10 +55,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Accessibility" />
-    <Reference Include="Interop.UIAutomationClient, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Interop.UIAutomationClient, Version=10.0.18362.0, Culture=neutral, PublicKeyToken=0f06aa439ea1c622, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <EmbedInteropTypes>False</EmbedInteropTypes>
-      <HintPath>..\Libs\Interop.UIAutomationClient.dll</HintPath>
+      <HintPath>..\packages\Interop.UIAutomationClient.Signed.10.18362.0\lib\net40\Interop.UIAutomationClient.dll</HintPath>      
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -143,6 +143,7 @@
     <None Include="install.ps1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="packages.config" />
     <None Include="UIAComWrapper.nuspec" />
     <None Include="UIAComWrapper.snk" />
   </ItemGroup>
diff --git a/UiaComWrapper/UIAComWrapper.nuspec b/UiaComWrapper/UIAComWrapper.nuspec
@@ -12,11 +12,13 @@
     <description>The UI Automation COM-to-.NET Adapter makes it possible to use the new Windows Automation API 3.0 COM interfaces, with their improved reliability and performance, while still using the same System.Windows.Automation classes as in earlier versions of UI Automation</description>
     <copyright>Copyright Michael Bernstein 2013</copyright>
     <tags>UIA</tags>
+    <dependencies>
+      <dependency id="Interop.UIAutomationClient.Signed" version="10.18362.0" />
+    </dependencies>
   </metadata>
   <files>
     <file src="UIAComWrapper.dll" target="lib\net40" />
     <file src="UIAComWrapper.pdb" target="lib\net40" />
-    <file src="Interop.UIAutomationClient.dll" target="lib\net40" />
     <file src="install.ps1" target="tools" />
   </files>
 </package>
diff --git a/UiaComWrapper/UiaCoreProviderApi.cs b/UiaComWrapper/UiaCoreProviderApi.cs
@@ -9,7 +9,7 @@
 using System.Runtime.InteropServices;
 using System.Security;
 using System.Windows.Automation.Providers;
-using UIAutomationClient;
+using Interop.UIAutomationClient;
 
 namespace UIAComWrapperInternal
 {
diff --git a/UiaComWrapper/Utility.cs b/UiaComWrapper/Utility.cs
@@ -10,6 +10,7 @@
 using System.Globalization;
 using System.Windows;
 using System.Windows.Automation;
+using UIAutomationClient = Interop.UIAutomationClient;
 
 namespace UIAComWrapperInternal
 {
diff --git a/UiaComWrapper/ValuePattern.cs b/UiaComWrapper/ValuePattern.cs
@@ -10,6 +10,7 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using UIAComWrapperInternal;
+using UIAutomationClient = Interop.UIAutomationClient;
 
 namespace System.Windows.Automation
 {
diff --git a/UiaComWrapper/VirtualizedPatterns.cs b/UiaComWrapper/VirtualizedPatterns.cs
@@ -10,6 +10,7 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using UIAComWrapperInternal;
+using UIAutomationClient = Interop.UIAutomationClient;
 
 namespace System.Windows.Automation
 {
diff --git a/UiaComWrapper/WindowPattern.cs b/UiaComWrapper/WindowPattern.cs
@@ -10,6 +10,7 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using UIAComWrapperInternal;
+using UIAutomationClient = Interop.UIAutomationClient;
 
 namespace System.Windows.Automation
 {
diff --git a/UiaComWrapper/packages.config b/UiaComWrapper/packages.config
@@ -0,0 +1,4 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Interop.UIAutomationClient.Signed" version="10.18362.0" targetFramework="net40" />
+</packages>
diff --git a/UiaComWrapperTests/ClientSideProvidersTest.cs b/UiaComWrapperTests/ClientSideProvidersTest.cs
@@ -2,7 +2,8 @@
 using System.Windows.Automation;
 using System.Windows.Automation.Providers;
 using NUnit.Framework;
-using UIAutomationClient;
+using Interop.UIAutomationClient;
+using UIAutomationClient = Interop.UIAutomationClient;
 
 namespace UIAComWrapperTests
 {
diff --git a/UiaComWrapperTests/MockPatternTest.cs b/UiaComWrapperTests/MockPatternTest.cs
@@ -2,9 +2,10 @@
 using System.Windows.Automation;
 using System.Windows.Automation.Providers;
 using NUnit.Framework;
-using UIAutomationClient;
+using Interop.UIAutomationClient;
 using SupportedTextSelection = System.Windows.Automation.SupportedTextSelection;
 using ZoomUnit = System.Windows.Automation.ZoomUnit;
+using UIAutomationClient = Interop.UIAutomationClient;
 
 namespace UIAComWrapperTests
 {
diff --git a/UiaComWrapperTests/UIAComWrapperTests.csproj b/UiaComWrapperTests/UIAComWrapperTests.csproj

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`using System.Diagnostics;`
`10`	`10`	`using System.Runtime.InteropServices;`
`11`	`11`	`using UIAComWrapperInternal;`
	`12`	`+using UIAutomationClient = Interop.UIAutomationClient;`
`12`	`13`
`13`	`14`	`namespace System.Windows.Automation`
`14`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,8 @@`
`6`	`6`
`7`	`7`	`using System;`
`8`	`8`	`using UIAComWrapperInternal;`
`9`		`-using UIAutomationClient;`
	`9`	`+using Interop.UIAutomationClient;`
	`10`	`+using UIAutomationClient = Interop.UIAutomationClient;`
`10`	`11`
`11`	`12`	`namespace System.Windows.Automation`
`12`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`using System;`
`9`	`9`	`using System.Diagnostics;`
`10`	`10`	`using System.Collections;`
`11`		`-using UIAComWrapperInternal;`
	`11`	`+using UIAutomationClient = Interop.UIAutomationClient;`
`12`	`12`
`13`	`13`	`namespace System.Windows.Automation`
`14`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,8 @@`
`8`	`8`	`using System;`
`9`	`9`	`using System.Runtime.InteropServices;`
`10`	`10`	`using UIAComWrapperInternal;`
`11`		`-using UIAutomationClient;`
	`11`	`+using Interop.UIAutomationClient;`
	`12`	`+using UIAutomationClient = Interop.UIAutomationClient;`
`12`	`13`
`13`	`14`	`namespace System.Windows.Automation.Providers`
`14`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,8 @@`
`11`	`11`	`using System.Runtime.InteropServices;`
`12`	`12`	`using System.Windows.Automation.Providers;`
`13`	`13`	`using UIAComWrapperInternal;`
`14`		`-using UIAutomationClient;`
	`14`	`+using Interop.UIAutomationClient;`
	`15`	`+using UIAutomationClient = Interop.UIAutomationClient;`
`15`	`16`
`16`	`17`	`namespace System.Windows.Automation`
`17`	`18`	`{`