From 87cf876913e3e7470412833d2122e3f6f8cb509c Mon Sep 17 00:00:00 2001 From: Ben Bowen Date: Fri, 12 Jul 2024 15:37:15 -0400 Subject: [PATCH 1/2] Update framework and sdk targets --- Tools/UIRecorder/UIRecorder/App.config | 6 +++--- .../UIRecorder/Properties/Resources.Designer.cs | 2 +- .../UIRecorder/Properties/Settings.Designer.cs | 2 +- .../UIRecorder/WinAppDriverUiRecorder.csproj | 3 ++- Tools/UIRecorder/UIRecorderTemplate/App.config | 14 +++++++------- .../UIRecorderTemplate/UIRecorderTemplate.csproj | 3 ++- Tools/UIRecorder/UIXPathLib/UiXPathLib.vcxproj | 10 +++++----- 7 files changed, 21 insertions(+), 19 deletions(-) diff --git a/Tools/UIRecorder/UIRecorder/App.config b/Tools/UIRecorder/UIRecorder/App.config index 731f6de6..4bfa0056 100644 --- a/Tools/UIRecorder/UIRecorder/App.config +++ b/Tools/UIRecorder/UIRecorder/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/Tools/UIRecorder/UIRecorder/Properties/Resources.Designer.cs b/Tools/UIRecorder/UIRecorder/Properties/Resources.Designer.cs index ec65375b..7327eac4 100644 --- a/Tools/UIRecorder/UIRecorder/Properties/Resources.Designer.cs +++ b/Tools/UIRecorder/UIRecorder/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace WinAppDriverUIRecorder.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/Tools/UIRecorder/UIRecorder/Properties/Settings.Designer.cs b/Tools/UIRecorder/UIRecorder/Properties/Settings.Designer.cs index 88ca395b..96c51541 100644 --- a/Tools/UIRecorder/UIRecorder/Properties/Settings.Designer.cs +++ b/Tools/UIRecorder/UIRecorder/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace WinAppDriverUIRecorder.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.10.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/Tools/UIRecorder/UIRecorder/WinAppDriverUiRecorder.csproj b/Tools/UIRecorder/UIRecorder/WinAppDriverUiRecorder.csproj index 07ec37c3..70bae9e3 100644 --- a/Tools/UIRecorder/UIRecorder/WinAppDriverUiRecorder.csproj +++ b/Tools/UIRecorder/UIRecorder/WinAppDriverUiRecorder.csproj @@ -7,7 +7,7 @@ WinExe WinAppDriverUIRecorder WinAppDriverUIRecorder - v4.6.1 + v4.8 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 @@ -29,6 +29,7 @@ false false true + true diff --git a/Tools/UIRecorder/UIRecorderTemplate/App.config b/Tools/UIRecorder/UIRecorderTemplate/App.config index e8e90f1f..efee217f 100644 --- a/Tools/UIRecorder/UIRecorderTemplate/App.config +++ b/Tools/UIRecorder/UIRecorderTemplate/App.config @@ -1,18 +1,18 @@ - + - + - - + + - - + + - \ No newline at end of file + diff --git a/Tools/UIRecorder/UIRecorderTemplate/UIRecorderTemplate.csproj b/Tools/UIRecorder/UIRecorderTemplate/UIRecorderTemplate.csproj index 77d2dea3..bda65919 100644 --- a/Tools/UIRecorder/UIRecorderTemplate/UIRecorderTemplate.csproj +++ b/Tools/UIRecorder/UIRecorderTemplate/UIRecorderTemplate.csproj @@ -9,11 +9,12 @@ Exe UIRecorderTemplate UIRecorderTemplate - v4.6.1 + v4.8 512 true + AnyCPU diff --git a/Tools/UIRecorder/UIXPathLib/UiXPathLib.vcxproj b/Tools/UIRecorder/UIXPathLib/UiXPathLib.vcxproj index 1ba78f65..6ba1675c 100644 --- a/Tools/UIRecorder/UIXPathLib/UiXPathLib.vcxproj +++ b/Tools/UIRecorder/UIXPathLib/UiXPathLib.vcxproj @@ -23,33 +23,33 @@ {074B6938-AF8C-4C61-9101-C9B11A6DB217} Win32Proj UiXPathLib - 10.0.16299.0 + 10.0 UIXPathLib DynamicLibrary true - v141 + v143 Unicode DynamicLibrary false - v141 + v143 true Unicode DynamicLibrary true - v141 + v143 Unicode DynamicLibrary false - v141 + v143 true Unicode From 8e1dc89e1c672854636c107c9865582e6d0930cc Mon Sep 17 00:00:00 2001 From: Ben Bowen Date: Fri, 12 Jul 2024 16:10:59 -0400 Subject: [PATCH 2/2] Update newtonsoft to resolve vulnerability warning --- .../UIRecorder/UIRecorderTemplate/App.config | 12 +++++------ .../UIRecorder/UIRecorderTemplate/Program.cs | 9 ++++---- .../UIRecorderTemplate.csproj | 21 ++++++++++++++----- .../UIRecorderTemplate/packages.config | 11 +++++----- 4 files changed, 33 insertions(+), 20 deletions(-) diff --git a/Tools/UIRecorder/UIRecorderTemplate/App.config b/Tools/UIRecorder/UIRecorderTemplate/App.config index efee217f..ee039685 100644 --- a/Tools/UIRecorder/UIRecorderTemplate/App.config +++ b/Tools/UIRecorder/UIRecorderTemplate/App.config @@ -1,17 +1,17 @@ - + - + - - + + - - + + diff --git a/Tools/UIRecorder/UIRecorderTemplate/Program.cs b/Tools/UIRecorder/UIRecorderTemplate/Program.cs index 2440c688..f015929f 100644 --- a/Tools/UIRecorder/UIRecorderTemplate/Program.cs +++ b/Tools/UIRecorder/UIRecorderTemplate/Program.cs @@ -23,6 +23,7 @@ using OpenQA.Selenium.Remote; using OpenQA.Selenium; using Microsoft.VisualStudio.TestTools.UnitTesting; +using OpenQA.Selenium.Appium; namespace UIXPathLib { @@ -33,10 +34,10 @@ public class DesktopSession public DesktopSession() { - DesiredCapabilities appCapabilities = new DesiredCapabilities(); - appCapabilities.SetCapability("app", "Root"); - appCapabilities.SetCapability("deviceName", "WindowsPC"); - desktopSession = new WindowsDriver(new Uri(WindowsApplicationDriverUrl), appCapabilities); + AppiumOptions appOptions = new AppiumOptions(); + appOptions.AddAdditionalCapability("app", "Root"); + appOptions.AddAdditionalCapability("deviceName", "WindowsPC"); + desktopSession = new WindowsDriver(new Uri(WindowsApplicationDriverUrl), appOptions); } ~DesktopSession() diff --git a/Tools/UIRecorder/UIRecorderTemplate/UIRecorderTemplate.csproj b/Tools/UIRecorder/UIRecorderTemplate/UIRecorderTemplate.csproj index bda65919..5c135c27 100644 --- a/Tools/UIRecorder/UIRecorderTemplate/UIRecorderTemplate.csproj +++ b/Tools/UIRecorder/UIRecorderTemplate/UIRecorderTemplate.csproj @@ -36,8 +36,11 @@ 4 - - $(SolutionDir)\packages\Appium.WebDriver.4.0.0.1-beta\lib\net45\appium-dotnet-driver.dll + + ..\packages\Appium.WebDriver.4.1.1\lib\net45\Appium.Net.dll + + + ..\packages\Castle.Core.4.3.1\lib\net45\Castle.Core.dll $(SolutionDir)\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll @@ -45,6 +48,12 @@ $(SolutionDir)\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll + + ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll + + + ..\packages\DotNetSeleniumExtras.PageObjects.3.11.0\lib\net45\SeleniumExtras.PageObjects.dll + @@ -55,9 +64,11 @@ - - False - $(SolutionDir)\packages\Selenium.WebDriver.3.11.2\lib\net45\WebDriver.dll + + ..\packages\Selenium.WebDriver.3.141.0\lib\net45\WebDriver.dll + + + ..\packages\Selenium.Support.3.141.0\lib\net45\WebDriver.Support.dll diff --git a/Tools/UIRecorder/UIRecorderTemplate/packages.config b/Tools/UIRecorder/UIRecorderTemplate/packages.config index f60471f1..a122fafa 100644 --- a/Tools/UIRecorder/UIRecorderTemplate/packages.config +++ b/Tools/UIRecorder/UIRecorderTemplate/packages.config @@ -1,10 +1,11 @@  - - + + + - - - + + + \ No newline at end of file