diff --git a/Libs/Interop.UIAutomationClient.dll b/Libs/Interop.UIAutomationClient.dll deleted file mode 100644 index a1d854f..0000000 Binary files a/Libs/Interop.UIAutomationClient.dll and /dev/null differ diff --git a/Libs/Interop.UIAutomationClient.txt b/Libs/Interop.UIAutomationClient.txt deleted file mode 100644 index 4f6d253..0000000 --- a/Libs/Interop.UIAutomationClient.txt +++ /dev/null @@ -1 +0,0 @@ -From C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\PublicAssemblies \ No newline at end of file diff --git a/UiaComWrapper/AnnotationPattern.cs b/UiaComWrapper/AnnotationPattern.cs index 8e94dbe..898f85d 100644 --- 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 index 2a26869..bdee74d 100644 --- 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 index a550363..a9d21a4 100644 --- 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 index 3e1a93a..91f2e76 100644 --- 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 index 57e626e..daab5a8 100644 --- 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 index fcf25ce..4396690 100644 --- 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 index a4dab25..8298cf8 100644 --- 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 index 2846dae..4b4e66e 100644 --- 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 index bdc6537..6a7491b 100644 --- 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 index 2fe061c..f458762 100644 --- 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 index 4d1da8d..1ab3f16 100644 --- 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 index d6dec0d..90a1b78 100644 --- 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 index 194c173..88e18c7 100644 --- 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 index 810048d..ed7053b 100644 --- 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 index 5b05f3f..421954d 100644 --- 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 index fc573a7..05dd019 100644 --- 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 index f754d45..9c9bf90 100644 --- 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 index 8ea0623..f2e4eb6 100644 --- 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 index 1e528bd..c6132a4 100644 --- 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 index 768313f..7c8b451 100644 --- 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 index a18f01b..b62ecab 100644 --- 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 index 0e8ab6b..57c1855 100644 --- 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 index e7337c6..b5ba620 100644 --- 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 index da85db3..eb8dbc2 100644 --- 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 index 1bd4558..6be60a2 100644 --- 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 index 43190bd..490d2ac 100644 --- 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 index 140a45b..4341e32 100644 --- 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 index 0ba90b7..b64ec73 100644 --- 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 index 2d86359..e470e2e 100644 --- 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 index d3a6ed0..80719a5 100644 --- 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 index c216152..b0808cf 100644 --- 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 index 35ef175..b8dee45 100644 --- 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 index 37705c6..0ae46a7 100644 --- a/UiaComWrapper/UIAComWrapper.csproj +++ b/UiaComWrapper/UIAComWrapper.csproj @@ -55,10 +55,10 @@ - + False False - ..\Libs\Interop.UIAutomationClient.dll + ..\packages\Interop.UIAutomationClient.Signed.10.18362.0\lib\net40\Interop.UIAutomationClient.dll @@ -143,6 +143,7 @@ Always + diff --git a/UiaComWrapper/UIAComWrapper.nuspec b/UiaComWrapper/UIAComWrapper.nuspec index 4a4ff8b..b895965 100644 --- a/UiaComWrapper/UIAComWrapper.nuspec +++ b/UiaComWrapper/UIAComWrapper.nuspec @@ -12,11 +12,13 @@ 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 Copyright Michael Bernstein 2013 UIA + + + - \ No newline at end of file diff --git a/UiaComWrapper/UiaCoreProviderApi.cs b/UiaComWrapper/UiaCoreProviderApi.cs index 1f73f88..d454b58 100644 --- 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 index ad4d1e7..08b3432 100644 --- 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 index 874f25f..f08b0a3 100644 --- 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 index 98442fd..a3e3397 100644 --- 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 index 0654690..28448d6 100644 --- 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 new file mode 100644 index 0000000..e74c587 --- /dev/null +++ b/UiaComWrapper/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/UiaComWrapperTests/ClientSideProvidersTest.cs b/UiaComWrapperTests/ClientSideProvidersTest.cs index aaeb95e..a693fc1 100644 --- 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 index 1f6037f..ae977cb 100644 --- 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 index 42656ba..6f79d7d 100644 --- a/UiaComWrapperTests/UIAComWrapperTests.csproj +++ b/UiaComWrapperTests/UIAComWrapperTests.csproj @@ -1,4 +1,4 @@ - + Debug @@ -58,10 +58,9 @@ - - False + + ..\packages\Interop.UIAutomationClient.Signed.10.18362.0\lib\net40\Interop.UIAutomationClient.dll False - ..\Libs\Interop.UIAutomationClient.dll ..\packages\NUnit.2.6.4\lib\nunit.framework.dll