diff --git a/Microsoft.Dynamics365.UIAutomation.Api.UCI/Elements/Telemetry.cs b/Microsoft.Dynamics365.UIAutomation.Api.UCI/Elements/Telemetry.cs
index be2609be..f91de07b 100644
--- a/Microsoft.Dynamics365.UIAutomation.Api.UCI/Elements/Telemetry.cs
+++ b/Microsoft.Dynamics365.UIAutomation.Api.UCI/Elements/Telemetry.cs
@@ -7,7 +7,11 @@
 using System.Linq;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+#if !NET462
+using Nancy.Json;
+#else
 using System.Web.Script.Serialization;
+#endif
 using Newtonsoft.Json;
 using Microsoft.ApplicationInsights.DataContracts;
 
diff --git a/Microsoft.Dynamics365.UIAutomation.Api.UCI/Microsoft.Dynamics365.UIAutomation.Api.UCI.csproj b/Microsoft.Dynamics365.UIAutomation.Api.UCI/Microsoft.Dynamics365.UIAutomation.Api.UCI.csproj
index 89c15206..449d5b61 100644
--- a/Microsoft.Dynamics365.UIAutomation.Api.UCI/Microsoft.Dynamics365.UIAutomation.Api.UCI.csproj
+++ b/Microsoft.Dynamics365.UIAutomation.Api.UCI/Microsoft.Dynamics365.UIAutomation.Api.UCI.csproj
@@ -1,135 +1,40 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{AFCB5BB5-4512-4019-A911-5D56CFF4F3D0}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Microsoft.Dynamics365.UIAutomation.Api.UCI</RootNamespace>
-    <AssemblyName>Microsoft.Dynamics365.UIAutomation.Api.UCI</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <LangVersion>7.2</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+  <PropertyGroup>
+    <TargetFrameworks>net6.0;net462;netcoreapp3.1</TargetFrameworks>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <LangVersion>7.2</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.ApplicationInsights, Version=2.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.ApplicationInsights.2.11.0\lib\net46\Microsoft.ApplicationInsights.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Otp.NET, Version=1.2.1.0, Culture=neutral, PublicKeyToken=38a48df817e173a6, processorArchitecture=MSIL">
-      <HintPath>..\packages\Otp.NET.1.2.1\lib\net45\Otp.NET.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Buffers.4.4.0\lib\netstandard1.1\System.Buffers.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Core" />
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.6.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Memory.4.5.3\lib\netstandard1.1\System.Memory.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-    <Reference Include="WebDriver, Version=3.141.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Selenium.WebDriver.3.141.0\lib\net45\WebDriver.dll</HintPath>
-    </Reference>
-    <Reference Include="WebDriver.Support, Version=3.141.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Selenium.Support.3.141.0\lib\net45\WebDriver.Support.dll</HintPath>
-    </Reference>
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Controls\CompositeControl.cs" />
-    <Compile Include="Controls\DateTimeControl.cs" />
-    <Compile Include="Controls\Field.cs" />
-    <Compile Include="Controls\LookupItem.cs" />
-    <Compile Include="Controls\MultiValueOptionSet.cs" />
-    <Compile Include="Controls\BooleanItem.cs" />
-    <Compile Include="Controls\OptionSet.cs" />
-    <Compile Include="DTO\FormNotification.cs" />
-    <Compile Include="DTO\FormContextType.cs" />
-    <Compile Include="DTO\FormNotificationType.cs" />
-    <Compile Include="DTO\KeyPerformanceIndicator.cs" />
-    <Compile Include="Elements\BusinessProcessFlow.cs" />
-    <Compile Include="Elements\CommandBar.cs" />
-    <Compile Include="Elements\Subgrid.cs" />
-    <Compile Include="Elements\Telemetry.cs" />
-    <Compile Include="Elements\Dashboard.cs" />
-    <Compile Include="Elements\Dialog.cs" />
-    <Compile Include="Elements\Entity.cs" />
-    <Compile Include="Elements\GlobalSearch.cs" />
-    <Compile Include="Elements\Lookup.cs" />
-    <Compile Include="Elements\Grid.cs" />
-    <Compile Include="Elements\QuickCreate.cs" />
-    <Compile Include="Elements\OnlineLogin.cs" />
-    <Compile Include="Elements\Navigation.cs" />
-    <Compile Include="Elements\RelatedGrid.cs" />
-    <Compile Include="Elements\Timeline.cs" />
-    <Compile Include="LoginRedirectEventArgs.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="WebClient.cs" />
-    <Compile Include="XrmApp.cs" />
-    <Compile Include="DTO\AppElementReference.cs" />
-    <Compile Include="DTO\ElementReference.cs" />
-    <Compile Include="DTO\GridItem.cs" />
-    <Compile Include="DTO\ListItem.cs" />
+    <ProjectReference Include="..\Microsoft.Dynamics365.UIAutomation.Api\Microsoft.Dynamics365.UIAutomation.Api.csproj" />
+    <ProjectReference Include="..\Microsoft.Dynamics365.UIAutomation.Browser\Microsoft.Dynamics365.UIAutomation.Browser.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.21.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Otp.NET" Version="1.2.2" />
+    <PackageReference Include="Selenium.Support" Version="4.5.1" />
+    <PackageReference Include="Selenium.WebDriver" Version="4.5.1" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
+	<PackageReference Include="System.Memory" Version="4.5.5">
+		<IncludeAssets>none</IncludeAssets>
+	</PackageReference>
+	<PackageReference Include="System.Buffers" Version="4.5.1">
+		<IncludeAssets>none</IncludeAssets>
+	</PackageReference>
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
+	<Reference Include="System.Web" />
+	<Reference Include="System.Web.Extensions" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.Dynamics365.UIAutomation.Api\Microsoft.Dynamics365.UIAutomation.Api.csproj">
-      <Project>{dfe2c141-f1aa-4d4b-8df8-0fb93023cf45}</Project>
-      <Name>Microsoft.Dynamics365.UIAutomation.Api</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.Dynamics365.UIAutomation.Browser\Microsoft.Dynamics365.UIAutomation.Browser.csproj">
-      <Project>{c9748803-f3cb-4531-b313-bc24d4d0bf0c}</Project>
-      <Name>Microsoft.Dynamics365.UIAutomation.Browser</Name>
-    </ProjectReference>
+    <Compile Remove="Controls\CrmControls.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/Microsoft.Dynamics365.UIAutomation.Api.UCI/packages.config b/Microsoft.Dynamics365.UIAutomation.Api.UCI/packages.config
deleted file mode 100644
index 10664e4d..00000000
--- a/Microsoft.Dynamics365.UIAutomation.Api.UCI/packages.config
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.ApplicationInsights" version="2.11.0" targetFramework="net46" />
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />
-  <package id="Otp.NET" version="1.2.1" targetFramework="net46" />
-  <package id="Selenium.Support" version="3.141.0" targetFramework="net46" />
-  <package id="Selenium.WebDriver" version="3.141.0" targetFramework="net46" />
-  <package id="System.Buffers" version="4.4.0" targetFramework="net46" />
-  <package id="System.Diagnostics.DiagnosticSource" version="4.6.0" targetFramework="net46" />
-  <package id="System.Memory" version="4.5.3" targetFramework="net46" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net46" />
-</packages>
\ No newline at end of file
diff --git a/Microsoft.Dynamics365.UIAutomation.Api/Microsoft.Dynamics365.UIAutomation.Api.csproj b/Microsoft.Dynamics365.UIAutomation.Api/Microsoft.Dynamics365.UIAutomation.Api.csproj
index 1a440f8a..8751200f 100644
--- a/Microsoft.Dynamics365.UIAutomation.Api/Microsoft.Dynamics365.UIAutomation.Api.csproj
+++ b/Microsoft.Dynamics365.UIAutomation.Api/Microsoft.Dynamics365.UIAutomation.Api.csproj
@@ -1,136 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{DFE2C141-F1AA-4D4B-8DF8-0FB93023CF45}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Microsoft.Dynamics365.UIAutomation.Api</RootNamespace>
-    <AssemblyName>Microsoft.Dynamics365.UIAutomation.Api</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <LangVersion>7.2</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+	<TargetFrameworks>net6.0;net462;netcoreapp3.1</TargetFrameworks>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <LangVersion>7.2</LangVersion>
   </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>false</SignAssembly>
-  </PropertyGroup>
   <PropertyGroup>
     <AssemblyOriginatorKeyFile />
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-    <Reference Include="WebDriver, Version=3.141.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Selenium.WebDriver.3.141.0\lib\net45\WebDriver.dll</HintPath>
-    </Reference>
-    <Reference Include="WebDriver.Support, Version=3.141.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Selenium.Support.3.141.0\lib\net45\WebDriver.Support.dll</HintPath>
-    </Reference>
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
+    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Controls\CompositeControl.cs" />
-    <Compile Include="Controls\Field.cs" />
-    <Compile Include="Controls\LookupItem.cs" />
-    <Compile Include="Controls\MultiValueOptionSet.cs" />
-    <Compile Include="Controls\DateTimeControl.cs" />
-    <Compile Include="Controls\TwoOption.cs" />
-    <Compile Include="Controls\OptionSet.cs" />
-    <Compile Include="DTOs\PerformanceNavigationTiming.cs" />
-    <Compile Include="DTOs\PerformanceResource.cs" />
-    <Compile Include="DTOs\AppNotification.cs" />
-    <Compile Include="DTOs\ElementReference.cs" />
-    <Compile Include="DTOs\GridItem.cs" />
-    <Compile Include="DTOs\InstanceInfo.cs" />
-    <Compile Include="DTOs\Link.cs" />
-    <Compile Include="DTOs\ListItem.cs" />
-    <Compile Include="DTOs\PerformanceMarker.cs" />
-    <Compile Include="LoginRedirectEventArgs.cs" />
-    <Compile Include="Office365Browser.cs" />
-    <Compile Include="Pages\Office365.cs" />
-    <Compile Include="Pages\WindowPerformanceNavigation.cs" />
-    <Compile Include="Pages\Administration.cs" />
-    <Compile Include="Pages\Dashboard.cs" />
-    <Compile Include="Pages\GlobalSearch.cs" />
-    <Compile Include="Pages\LoginDialog.cs" />
-    <Compile Include="Pages\Office365Navigation.cs" />
-    <Compile Include="Pages\Office365XrmInstancePicker.cs" />
-    <Compile Include="Pages\CommandBar.cs" />
-    <Compile Include="Pages\Dialog.cs" />
-    <Compile Include="Pages\Entity.cs" />
-    <Compile Include="Pages\Grid.cs" />
-    <Compile Include="Pages\GuidedHelp.cs" />
-    <Compile Include="Pages\Lookup.cs" />
-    <Compile Include="Pages\Mobile.cs" />
-    <Compile Include="Pages\Navigation.cs" />
-    <Compile Include="Pages\BusinessProcessFlow.cs" />
-    <Compile Include="Pages\Notfication.cs" />
-    <Compile Include="Pages\PerformanceCenter.cs" />
-    <Compile Include="Pages\Processes.cs" />
-    <Compile Include="Pages\QuickCreate.cs" />
-    <Compile Include="Pages\Document.cs" />
-    <Compile Include="Pages\ActivityFeed.cs" />
-    <Compile Include="Pages\RelatedGrid.cs" />
-    <Compile Include="Pages\Report.cs" />
-    <Compile Include="Pages\WindowPerformanceResource.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ReportEventArgs.cs" />
-    <Compile Include="Browser.cs" />
-    <Compile Include="XrmPage.cs" />
+    <ProjectReference Include="..\Microsoft.Dynamics365.UIAutomation.Browser\Microsoft.Dynamics365.UIAutomation.Browser.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Selenium.Support" Version="4.5.1" />
+    <PackageReference Include="Selenium.WebDriver" Version="4.5.1" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
+	<PackageReference Include="Nancy" Version="2.0.0" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
+	<Reference Include="System.Web.Extensions" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.Dynamics365.UIAutomation.Browser\Microsoft.Dynamics365.UIAutomation.Browser.csproj">
-      <Project>{c9748803-f3cb-4531-b313-bc24d4d0bf0c}</Project>
-      <Name>Microsoft.Dynamics365.UIAutomation.Browser</Name>
-    </ProjectReference>
+    <Compile Remove="Controls\CrmControls.cs" />
   </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/Microsoft.Dynamics365.UIAutomation.Api/Pages/PerformanceCenter.cs b/Microsoft.Dynamics365.UIAutomation.Api/Pages/PerformanceCenter.cs
index e4b411d9..6850c2c3 100644
--- a/Microsoft.Dynamics365.UIAutomation.Api/Pages/PerformanceCenter.cs
+++ b/Microsoft.Dynamics365.UIAutomation.Api/Pages/PerformanceCenter.cs
@@ -1,6 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
+#if !NET462
+using Nancy.Json;
+#else
+using System.Web.Script.Serialization;
+#endif
 using Microsoft.Dynamics365.UIAutomation.Browser;
 using Newtonsoft.Json.Linq;
 using OpenQA.Selenium;
@@ -8,7 +13,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Web.Script.Serialization;
 
 namespace Microsoft.Dynamics365.UIAutomation.Api
 {
@@ -110,7 +114,7 @@ public BrowserCommandResult<Dictionary<string, object>> GetMarkersRaw()
 
                 jsSerializer.RegisterConverters(new[] { new DynamicJsonConverter() });
 
-                var jsonObj = (Dictionary<string, object>)jsSerializer.Deserialize(jsonResults, typeof(Dictionary<string, object>));
+                var jsonObj = (Dictionary<string, object>)jsSerializer.Deserialize<Dictionary<string, object>>(jsonResults);
 
                 return jsonObj;
             });
diff --git a/Microsoft.Dynamics365.UIAutomation.Api/packages.config b/Microsoft.Dynamics365.UIAutomation.Api/packages.config
deleted file mode 100644
index 2c229364..00000000
--- a/Microsoft.Dynamics365.UIAutomation.Api/packages.config
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
-  <package id="Selenium.Support" version="3.141.0" targetFramework="net46" />
-  <package id="Selenium.WebDriver" version="3.141.0" targetFramework="net46" />
-</packages>
-<!--Copyright (c) Microsoft Corporation. All rights reserved.
-    Licensed under the MIT license.-->
\ No newline at end of file
diff --git a/Microsoft.Dynamics365.UIAutomation.Browser/BrowserOptions.cs b/Microsoft.Dynamics365.UIAutomation.Browser/BrowserOptions.cs
index cda6874f..76f077f4 100644
--- a/Microsoft.Dynamics365.UIAutomation.Browser/BrowserOptions.cs
+++ b/Microsoft.Dynamics365.UIAutomation.Browser/BrowserOptions.cs
@@ -252,10 +252,7 @@ public virtual InternetExplorerOptions ToInternetExplorer()
 
         public virtual FirefoxOptions ToFireFox()
         {
-            var options = new FirefoxOptions()
-            {
-                UseLegacyImplementation = false
-            };
+            var options = new FirefoxOptions();
 
             if (!string.IsNullOrEmpty(DownloadsPath))
             {
@@ -273,8 +270,8 @@ public virtual EdgeOptions ToEdge()
             var options = new EdgeOptions()
             {
                 PageLoadStrategy = PageLoadStrategy.Normal,
-                UseInPrivateBrowsing = PrivateMode
             };
+            options.AddArgument("inprivate");
 
             return options;
         }
diff --git a/Microsoft.Dynamics365.UIAutomation.Browser/DynamicJsonConverter.cs b/Microsoft.Dynamics365.UIAutomation.Browser/DynamicJsonConverter.cs
index 2a6f8e75..a779a776 100644
--- a/Microsoft.Dynamics365.UIAutomation.Browser/DynamicJsonConverter.cs
+++ b/Microsoft.Dynamics365.UIAutomation.Browser/DynamicJsonConverter.cs
@@ -8,7 +8,11 @@
 using System.Dynamic;
 using System.Linq;
 using System.Text;
+#if !NET462
+using Nancy.Json;
+#else
 using System.Web.Script.Serialization;
+#endif
 
 namespace Microsoft.Dynamics365.UIAutomation.Browser
 {
diff --git a/Microsoft.Dynamics365.UIAutomation.Browser/Extensions/SeleniumExtensions.cs b/Microsoft.Dynamics365.UIAutomation.Browser/Extensions/SeleniumExtensions.cs
index 89aeae84..d9c422de 100644
--- a/Microsoft.Dynamics365.UIAutomation.Browser/Extensions/SeleniumExtensions.cs
+++ b/Microsoft.Dynamics365.UIAutomation.Browser/Extensions/SeleniumExtensions.cs
@@ -6,6 +6,12 @@
 using OpenQA.Selenium.Interactions;
 using OpenQA.Selenium.Support.Events;
 using OpenQA.Selenium.Support.UI;
+using SeleniumExtras.WaitHelpers;
+#if !NET462
+using Nancy.Json;
+#else
+using System.Web.Script.Serialization;
+#endif
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -14,13 +20,12 @@
 using System.Drawing;
 using System.IO;
 using System.Linq;
-using System.Web.Script.Serialization;
 
 namespace Microsoft.Dynamics365.UIAutomation.Browser
 {
     public static class SeleniumExtensions
     {
-        #region Click
+#region Click
 
         public static void Click(this IWebElement element, bool ignoreStaleElementException)
         {
@@ -70,12 +75,12 @@ public static void Hover(this IWebElement element, IWebDriver driver, bool ignor
             }
         }
 
-        #endregion Click
+#endregion Click
 
         public static void Click(this IWebDriver driver, IWebElement element, Func<Point> offsetFunc = null, bool ignoreStaleElementException = true)
             => driver.Perform(a => a.Click(), element, offsetFunc, ignoreStaleElementException);
 
-        #region Double Click
+#region Double Click
 
         public static void DoubleClick(this IWebDriver driver, IWebElement element, Func<Point> offsetFunc = null, bool ignoreStaleElementException = true)
             => driver.Perform(a => a.DoubleClick(), element, offsetFunc, ignoreStaleElementException);
@@ -102,9 +107,9 @@ public static void Perform(this IWebDriver driver, Func<Actions, Actions> action
         }
 
         
-        #endregion
+#endregion
 
-        #region Script Execution
+#region Script Execution
 
         [DebuggerNonUserCode]
         public static object ExecuteScript(this IWebDriver driver, string script, params object[] args)
@@ -168,9 +173,9 @@ private static string SanitizeReturnStatement(string script)
             return script;
         }
 
-        #endregion Script Execution
+#endregion Script Execution
 
-        #region Browser Options
+#region Browser Options
 
         [DebuggerNonUserCode]
         public static void ResetZoom(this IWebDriver driver)
@@ -179,9 +184,9 @@ public static void ResetZoom(this IWebDriver driver)
             element.SendKeys(Keys.Control + "0");
         }
 
-        #endregion Browser Options
+#endregion Browser Options
 
-        #region Screenshot
+#region Screenshot
 
         [DebuggerNonUserCode]
         public static Screenshot TakeScreenshot(this IWebDriver driver)
@@ -195,22 +200,9 @@ public static Screenshot TakeScreenshot(this IWebDriver driver)
             return screenshotDriver.GetScreenshot();
         }
 
-        [DebuggerNonUserCode]
-        public static Bitmap TakeScreenshot(this IWebDriver driver, By by)
-        {
-            var screenshot = TakeScreenshot(driver);
-            var bmpScreen = new Bitmap(new MemoryStream(screenshot.AsByteArray));
-
-            // Measure the location of a specific element
-            IWebElement element = driver.FindElement(by);
-            var crop = new Rectangle(element.Location, element.Size);
-
-            return bmpScreen.Clone(crop, bmpScreen.PixelFormat);
-        }
-
-        #endregion Screenshot
+#endregion Screenshot
 
-        #region Elements
+#region Elements
 
         public static bool HasAttribute(this IWebElement element, string attributeName)
             => element.GetAttribute(attributeName) != null;
@@ -276,9 +268,9 @@ public static void ClearFocus(this IWebDriver driver)
             driver.FindElement(By.TagName("body")).Click();
         }
 
-        #endregion Elements
+#endregion Elements
 
-        #region Waits
+#region Waits
 
         public static bool WaitForPageToLoad(this IWebDriver driver, TimeSpan? timeout = null)
         {
@@ -634,9 +626,9 @@ public static bool RepeatUntil(this IWebDriver driver, Action action, Predicate<
             return success;
         }
 
-        #endregion Waits
+#endregion Waits
 
-        #region Args / Tracing
+#region Args / Tracing
 
         public static string ToTraceString(this FindElementEventArgs e)
         {
@@ -657,6 +649,6 @@ public static string ToTraceString(this FindElementEventArgs e)
             return method;
         }
 
-        #endregion Args / Tracing
+#endregion Args / Tracing
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Dynamics365.UIAutomation.Browser/Microsoft.Dynamics365.UIAutomation.Browser.csproj b/Microsoft.Dynamics365.UIAutomation.Browser/Microsoft.Dynamics365.UIAutomation.Browser.csproj
index 0808752a..0abcacc4 100644
--- a/Microsoft.Dynamics365.UIAutomation.Browser/Microsoft.Dynamics365.UIAutomation.Browser.csproj
+++ b/Microsoft.Dynamics365.UIAutomation.Browser/Microsoft.Dynamics365.UIAutomation.Browser.csproj
@@ -1,119 +1,47 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{C9748803-F3CB-4531-B313-BC24D4D0BF0C}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Microsoft.Dynamics365.UIAutomation.Browser</RootNamespace>
-    <AssemblyName>Microsoft.Dynamics365.UIAutomation.Browser</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <LangVersion>7.2</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <TargetFrameworks>net6.0;net462;netcoreapp3.1</TargetFrameworks>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <LangVersion>7.2</LangVersion>
   </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>false</SignAssembly>
-  </PropertyGroup>
   <PropertyGroup>
     <AssemblyOriginatorKeyFile />
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-    <Reference Include="WebDriver, Version=3.141.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Selenium.WebDriver.3.141.0\lib\net45\WebDriver.dll</HintPath>
-    </Reference>
-    <Reference Include="WebDriver.Support, Version=3.141.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Selenium.Support.3.141.0\lib\net45\WebDriver.Support.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="BrowserActionLogger.cs" />
-    <Compile Include="BrowserCommand.cs" />
-    <Compile Include="BrowserCommandOptions.cs" />
-    <Compile Include="BrowserCommandResult.cs" />
-    <Compile Include="BrowserCredentials.cs" />
-    <Compile Include="BrowserDriverFactory.cs" />
-    <Compile Include="BrowserInitializeEventArgs.cs" />
-    <Compile Include="BrowserInitiationSource.cs" />
-    <Compile Include="BrowserOptions.cs" />
-    <Compile Include="BrowserPage.cs" />
-    <Compile Include="BrowserType.cs" />
-    <Compile Include="Constants.cs" />
-    <Compile Include="DelegateBrowserCommand.cs" />
-    <Compile Include="DTOs\BrowserRecordingEvent.cs" />
-    <Compile Include="DynamicJsonConverter.cs" />
-    <Compile Include="Element.cs" />
-    <Compile Include="Extensions\DictionaryExtensions.cs" />
-    <Compile Include="Extensions\RelativePositions.cs" />
-    <Compile Include="Extensions\SeleniumExtensions.cs" />
-    <Compile Include="Extensions\StringExtensions.cs" />
-    <Compile Include="Logs\StringFormater.cs" />
-    <Compile Include="Extensions\TimeExtensions.cs" />
-    <Compile Include="ICommandResult.cs" />
-    <Compile Include="InteractiveBrowser.cs" />
-    <Compile Include="Logs\TracingService.cs" />
-    <Compile Include="NavigationOperation.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
+    <Compile Update="Properties\Resources.Designer.cs">
       <DependentUpon>Resources.resx</DependentUpon>
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
+    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\Recorder.js" />
+  <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
+    <PackageReference Include="SeleniumExtras.WaitHelpers" Version="1.0.2" />
+	<PackageReference Include="Nancy" Version="2.0.0" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
+	<Reference Include="System.Web.Extensions" />
+	<PackageReference Include="DotNetSeleniumExtras.WaitHelpers" Version="3.11.0" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+	<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
+    <EmbeddedResource Update="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Selenium.Support" Version="4.5.1" />
+    <PackageReference Include="Selenium.WebDriver" Version="4.5.1" />
+	  <PackageReference Include="System.Net.Http" Version="4.3.4" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Microsoft.Dynamics365.UIAutomation.Browser/Properties/Resources.Designer.cs b/Microsoft.Dynamics365.UIAutomation.Browser/Properties/Resources.Designer.cs
index 348d3562..1854006f 100644
--- a/Microsoft.Dynamics365.UIAutomation.Browser/Properties/Resources.Designer.cs
+++ b/Microsoft.Dynamics365.UIAutomation.Browser/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace Microsoft.Dynamics365.UIAutomation.Browser.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", "4.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 {
@@ -61,7 +61,10 @@ internal Resources() {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to if (typeof (Recorder) === &quot;undefined&quot;) { Recorder = { __namespace: true } }
+        ///   Looks up a localized string similar to // Copyright (c) Microsoft Corporation. All rights reserved.
+        ///// Licensed under the MIT license.
+        ///
+        ///if (typeof (Recorder) === &quot;undefined&quot;) { Recorder = { __namespace: true } }
         ///
         ///Recorder.ELEMENT_NODE = 1;
         ///
@@ -71,9 +74,7 @@ internal Resources() {
         ///        if (document.addEventListener) {
         ///            document.addEventListener(&apos;mouseup&apos;, Recorder.clickHandler, false);
         ///            document.addEventListener(&apos;keypress&apos;, Recorder.keyHandler, false);
-        ///            document.addEventListener(&apos;change&apos;, Recorder.changeHandler, false);
-        ///        }
-        ///        else if ( [rest of string was truncated]&quot;;.
+        ///          [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string Recorder {
             get {
diff --git a/Microsoft.Dynamics365.UIAutomation.Browser/packages.config b/Microsoft.Dynamics365.UIAutomation.Browser/packages.config
deleted file mode 100644
index 2abb7554..00000000
--- a/Microsoft.Dynamics365.UIAutomation.Browser/packages.config
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Copyright (c) Microsoft Corporation. All rights reserved.
-    Licensed under the MIT license.-->
-<packages>
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />
-  <package id="Selenium.Support" version="3.141.0" targetFramework="net46" />
-  <package id="Selenium.WebDriver" version="3.141.0" targetFramework="net46" />
-</packages>
\ No newline at end of file
diff --git a/Microsoft.Dynamics365.UIAutomation.Sample/Microsoft.Dynamics365.UIAutomation.Sample.csproj b/Microsoft.Dynamics365.UIAutomation.Sample/Microsoft.Dynamics365.UIAutomation.Sample.csproj
index f218872b..af511ac1 100644
--- a/Microsoft.Dynamics365.UIAutomation.Sample/Microsoft.Dynamics365.UIAutomation.Sample.csproj
+++ b/Microsoft.Dynamics365.UIAutomation.Sample/Microsoft.Dynamics365.UIAutomation.Sample.csproj
@@ -1,274 +1,46 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{A075B87E-DCA5-4A2A-909B-932E2F5F98B4}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Microsoft.Dynamics365.UIAutomation.Sample</RootNamespace>
-    <AssemblyName>Microsoft.Dynamics365.UIAutomation.Sample</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
-    <IsCodedUITest>False</IsCodedUITest>
-    <TestProjectType>UnitTest</TestProjectType>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <LangVersion>7.2</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <TargetFramework>net6.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <LangVersion>7.2</LangVersion>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.ApplicationInsights, Version=2.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.ApplicationInsights.2.11.0\lib\net46\Microsoft.ApplicationInsights.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Buffers.4.4.0\lib\netstandard1.1\System.Buffers.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.6.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Memory.4.5.3\lib\netstandard1.1\System.Memory.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="WebDriver, Version=3.141.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Selenium.WebDriver.3.141.0\lib\net45\WebDriver.dll</HintPath>
-    </Reference>
-    <Reference Include="WebDriver.Support, Version=3.141.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Selenium.Support.3.141.0\lib\net45\WebDriver.Support.dll</HintPath>
-    </Reference>
-  </ItemGroup>
   <Choose>
     <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
       <ItemGroup>
         <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
       </ItemGroup>
     </When>
-    <Otherwise>
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework">
-          <Private>False</Private>
-        </Reference>
-      </ItemGroup>
-    </Otherwise>
+    <Otherwise />
   </Choose>
   <ItemGroup>
-    <Compile Include="AzureDevOps\UCI\CreateAccount.cs" />
-    <Compile Include="SharedAPI\AzureInsights\UploadTelemetryUCI.cs" />
-    <Compile Include="SharedAPI\AzureInsights\OpenLead.cs" />
-    <Compile Include="SharedAPI\BrowserTests\BrowserTests.cs" />
-    <Compile Include="UCI\ApiTests\BrowserCommand_Tests.cs" />
-    <Compile Include="UCI\ApiTests\TestsBase_Tests.cs" />
-    <Compile Include="UCI\BusinessProcessFlow\BusinessProcessFlowNextStage.cs" />
-    <Compile Include="UCI\BusinessProcessFlow\SwitchBusinessProcessFlow.cs" />
-    <Compile Include="UCI\CommandBar\CommandButton.cs" />
-    <Compile Include="UCI\CommandBar\AssignAccount.cs" />
-    <Compile Include="UCI\CommandBar\CloseOpportunity.cs" />
-    <Compile Include="UCI\CommandBar\DuplicateDetection.cs" />
-    <Compile Include="UCI\CommandBar\SelectDashboard.cs" />
-    <Compile Include="ConsoleTraceListener.cs" />
-    <Compile Include="UCI\Controls\Grid.cs" />
-    <Compile Include="UCI\Create\CreateAccount.cs" />
-    <Compile Include="UCI\Create\CreateCase.cs" />
-    <Compile Include="UCI\Create\CreateContact.cs" />
-    <Compile Include="UCI\Create\CreateLead.cs" />
-    <Compile Include="UCI\Create\CreateActivity.cs" />
-    <Compile Include="UCI\Create\CreateOpportunity.cs" />
-    <Compile Include="UCI\Login\LoginWhitoutTestBase.cs" />
-    <Compile Include="UCI\Navigation\AreasAndSubAreas.cs" />
-    <Compile Include="UCI\FormNotifications\ReadFormNotifications.cs" />
-    <Compile Include="UCI\Labs\TestsBase\1_Lab_TestsClass.cs" />
-    <Compile Include="UCI\Labs\TestsBase\3_Lab_TestsBase_CreateApp.cs" />
-    <Compile Include="UCI\Labs\TestsBase\2_Lab_TestsBase_ReadConfigParameters.cs" />
-    <Compile Include="UCI\Labs\TestsBase\4_Lab_TestsBase_CreateApp_AllTestsUsesDefaultOptions.cs" />
-    <Compile Include="UCI\Labs\TestsBase\5_Lab_TestsBase_CreateApp_AllTestsUsesMyCustomOptions.cs" />
-    <Compile Include="UCI\Labs\TestsBase\6_Lab_TestsBase_CreateApp_NavigateToSameApp_InAllTests.cs" />
-    <Compile Include="UCI\Labs\TestsBase\7_Lab_TestsBase_CreateApp_NavigateToSameArea_InAllTests.cs" />
-    <Compile Include="UCI\Labs\TestsBase\0_Lab_TestsBase_QuickStart.cs" />
-    <Compile Include="UCI\Labs\TestsBase\TestsBase.cs" />
-    <Compile Include="UCI\Delete\DeleteAccount.cs" />
-    <Compile Include="UCI\Delete\DeleteCase.cs" />
-    <Compile Include="UCI\Delete\DeleteContact.cs" />
-    <Compile Include="UCI\Delete\DeleteLead.cs" />
-    <Compile Include="UCI\Delete\DeleteOpportunity.cs" />
-    <Compile Include="UCI\GetValue.cs" />
-    <Compile Include="UCI\GlobalSearch\GlobalCategorizedSearch.cs" />
-    <Compile Include="UCI\GlobalSearch\GlobalRelevanceSearch.cs" />
-    <Compile Include="UCI\Login\Login.cs" />
-    <Compile Include="UCI\Navigation\FormSelector.cs" />
-    <Compile Include="UCI\Navigation\GlobalSearch.cs" />
-    <Compile Include="UCI\Navigation\GoBackUCI.cs" />
-    <Compile Include="UCI\Navigation\OpenNavigation.cs" />
-    <Compile Include="UCI\Navigation\PortalAdmin.cs" />
-    <Compile Include="UCI\QuickCreate\QuickCreate.cs" />
-    <Compile Include="UCI\Validate\CheckFieldRequired.cs" />
-    <Compile Include="UCI\Read\HighlightAccount.cs" />
-    <Compile Include="UCI\Read\OpenAccount.cs" />
-    <Compile Include="UCI\Read\OpenCase.cs" />
-    <Compile Include="UCI\Read\OpenContact.cs" />
-    <Compile Include="UCI\Read\OpenLead.cs" />
-    <Compile Include="UCI\Read\OpenOpportunity.cs" />
-    <Compile Include="UCI\SetValue.cs" />
-    <Compile Include="UCI\SpecialConfigurationTests\RandomAccountTest.cs" />
-    <Compile Include="UCI\Timeline\AddActivity.cs" />
-    <Compile Include="UCI\Timeline\AddNote.cs" />
-    <Compile Include="UCI\Timeline\AddPost.cs" />
-    <Compile Include="UCI\Update\UpdateAccount.cs" />
-    <Compile Include="UCI\Update\UpdateCase.cs" />
-    <Compile Include="UCI\Update\UpdateContact.cs" />
-    <Compile Include="UCI\Update\UpdateLead.cs" />
-    <Compile Include="UCI\Update\UpdateOpportunity.cs" />
-    <Compile Include="Web\BusinessProcessFlow\BusinessProcessFlow.cs" />
-    <Compile Include="Web\CommandBar\CommandButton.cs" />
-    <Compile Include="Web\Delete\DeleteAccount.cs" />
-    <Compile Include="Web\Delete\DeleteCase.cs" />
-    <Compile Include="Web\Delete\DeleteContact.cs" />
-    <Compile Include="Web\Delete\DeleteLead.cs" />
-    <Compile Include="Web\Delete\DeleteOpportunity.cs" />
-    <Compile Include="Web\Dialogs\CloseWarning.cs" />
-    <Compile Include="Web\AddConnection.cs" />
-    <Compile Include="Web\Entity\SubGrid.cs" />
-    <Compile Include="Web\Entity\TestBase.cs" />
-    <Compile Include="Web\Entity\Account.cs" />
-    <Compile Include="Web\Navigation\AreasAndSubAreas.cs" />
-    <Compile Include="Web\ValidationTests\CreateUser.cs" />
-    <Compile Include="Web\ValidationTests\CreateWorkflow.cs" />
-    <Compile Include="Web\ValidationTests\OpenO365App.cs" />
-    <Compile Include="Web\ValidationTests\ValidationVersion.cs" />
-    <Compile Include="Web\Create\CreateCase.cs" />
-    <Compile Include="Web\DashBoard\Dashboard.cs" />
-    <Compile Include="Web\Dialogs\Assign.cs" />
-    <Compile Include="Web\Dialogs\CloseOpportunity.cs" />
-    <Compile Include="Web\Dialogs\Delete.cs" />
-    <Compile Include="Web\Dialogs\DuplicateDetection.cs" />
-    <Compile Include="Web\Dialogs\RunWorkFlow.cs" />
-    <Compile Include="Web\Dialogs\SelectBusinessProcessFlow.cs" />
-    <Compile Include="Web\Create\CreateAccount.cs" />
-    <Compile Include="Web\Create\CreateContact.cs" />
-    <Compile Include="Web\Create\CreateLead.cs" />
-    <Compile Include="Web\Create\CreateOpportunity.cs" />
-    <Compile Include="Web\EndUserScenerio.cs" />
-    <Compile Include="Web\LeadSubgrid.cs" />
-    <Compile Include="Web\Read\OpenAccount.cs" />
-    <Compile Include="Web\Read\OpenContact.cs" />
-    <Compile Include="Web\Read\OpenLead.cs" />
-    <Compile Include="Web\Read\OpenOpportunity.cs" />
-    <Compile Include="Web\QuickCreate\QuickCreateAccount.cs" />
-    <Compile Include="Web\RelatedTest.cs" />
-    <Compile Include="Web\Entity\Entity.cs" />
-    <Compile Include="Web\Entity\GetValue.cs" />
-    <Compile Include="Web\Entity\RecordWall.cs" />
-    <Compile Include="Web\Entity\SetValue.cs" />
-    <Compile Include="Web\GlobalSearch\GlobalSearchXrm.cs" />
-    <Compile Include="Web\Navigation\AdvancedFind.cs" />
-    <Compile Include="Web\Navigation\GlobalSearch.cs" />
-    <Compile Include="Web\Navigation\GuidedHelp.cs" />
-    <Compile Include="Web\Navigation\Options.cs" />
-    <Compile Include="Web\Navigation\Portal.cs" />
-    <Compile Include="Web\Navigation\QuickCreate.cs" />
-    <Compile Include="Web\Navigation\SignOut.cs" />
-    <Compile Include="Web\NegativeScenarios\BusinessProcessFlow\InvalidBusinessProcessFlow.cs" />
-    <Compile Include="Web\NegativeScenarios\BusinessProcessFlow\InvalidNextStage.cs" />
-    <Compile Include="Web\NegativeScenarios\BusinessProcessFlow\InvalidPreviousStage.cs" />
-    <Compile Include="Web\NegativeScenarios\BusinessProcessFlow\InvalidSelectBusinessProcessFlow.cs" />
-    <Compile Include="Web\NegativeScenarios\CommandBar\InvalidClickCommand.cs" />
-    <Compile Include="Web\NegativeScenarios\DashBoard\InvalidSwitchDashBoard.cs" />
-    <Compile Include="Web\NegativeScenarios\Dialogs\InvalidRunWorkFlow.cs" />
-    <Compile Include="Web\NegativeScenarios\Entity\InvalidCollapseTab.cs" />
-    <Compile Include="Web\NegativeScenarios\Entity\InvalidExpandTab.cs" />
-    <Compile Include="Web\NegativeScenarios\Entity\InvalidOpenEntity.cs" />
-    <Compile Include="Web\NegativeScenarios\Entity\InvalidSelectTab.cs" />
-    <Compile Include="Web\NegativeScenarios\GlobalSearch\InvalidFilterWith.cs" />
-    <Compile Include="Web\NegativeScenarios\GlobalSearch\InvalidSearchOpenRecord.cs" />
-    <Compile Include="Web\NegativeScenarios\Grid\InvalidFilterByLetter.cs" />
-    <Compile Include="Web\NegativeScenarios\Grid\InvalidSort.cs" />
-    <Compile Include="Web\NegativeScenarios\Grid\InvalidSwitchChart.cs" />
-    <Compile Include="Web\NegativeScenarios\InvalidOpenArea.cs" />
-    <Compile Include="Web\NegativeScenarios\InvalidOpenRecord.cs" />
-    <Compile Include="Web\NegativeScenarios\InvalidSetValue.cs" />
-    <Compile Include="Web\NegativeScenarios\InvalidSubArea.cs" />
-    <Compile Include="Web\NegativeScenarios\InvalidSwitchView.cs" />
-    <Compile Include="Web\NegativeScenarios\Navigation\InvalidQuickCreate.cs" />
-    <Compile Include="Web\NegativeScenarios\RelatedGrid\InvalidRelatedArea.cs" />
-    <Compile Include="Web\NegativeScenarios\RelatedGrid\InvalidRelatedClickCommand.cs" />
-    <Compile Include="Web\NegativeScenarios\RelatedGrid\InvalidRelatedOpenGrid.cs" />
-    <Compile Include="Web\NegativeScenarios\RelatedGrid\InvalidRelatedSort.cs" />
-    <Compile Include="Web\NegativeScenarios\RelatedGrid\InvalidRelatedSwitchView.cs" />
-    <Compile Include="Web\Notification\Notifications.cs" />
-    <Compile Include="Web\Read\OpenCase.cs" />
-    <Compile Include="Web\Update\UpdateAccount.cs" />
-    <Compile Include="Web\Update\UpdateCase.cs" />
-    <Compile Include="Web\Update\UpdateContact.cs" />
-    <Compile Include="Web\Update\UpdateLead.cs" />
-    <Compile Include="Web\Update\UpdateOpportunity.cs" />
-    <Compile Include="Web\Reports\Reports.cs" />
-    <Compile Include="Web\TakeScreenshot\ScreenShot.cs" />
-    <Compile Include="SharedAPI\AzureInsights\Telemetry.cs" />
-    <Compile Include="TestSettings.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SharedAPI\AzureInsights\UploadTelemetry.cs" />
-    <Compile Include="Web\Views\Views.cs" />
+    <ProjectReference Include="..\Microsoft.Dynamics365.UIAutomation.Api.UCI\Microsoft.Dynamics365.UIAutomation.Api.UCI.csproj" />
+    <ProjectReference Include="..\Microsoft.Dynamics365.UIAutomation.Api\Microsoft.Dynamics365.UIAutomation.Api.csproj" />
+    <ProjectReference Include="..\Microsoft.Dynamics365.UIAutomation.Browser\Microsoft.Dynamics365.UIAutomation.Browser.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.build.config" />
-    <None Include="app.config">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="AzureDevOps\EasyRepro.runsettings" />
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="UCI\UnifiedInterface.orderedtest" />
-    <None Include="Web\WebClient.orderedtest" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.21.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Selenium.Firefox.WebDriver" Version="0.27.0" />
+    <PackageReference Include="Selenium.Support" Version="4.5.1" />
+    <PackageReference Include="Selenium.WebDriver" Version="4.5.1" />
+    <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="107.0.5304.6200" />
+    <PackageReference Include="System.Buffers" Version="4.5.1" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
+    <PackageReference Include="System.Memory" Version="4.5.5" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
+    <PackageReference Include="xunit" Version="2.4.2" />
   </ItemGroup>
-  <ItemGroup />
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.Dynamics365.UIAutomation.Api.UCI\Microsoft.Dynamics365.UIAutomation.Api.UCI.csproj">
-      <Project>{afcb5bb5-4512-4019-a911-5d56cff4f3d0}</Project>
-      <Name>Microsoft.Dynamics365.UIAutomation.Api.UCI</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.Dynamics365.UIAutomation.Api\Microsoft.Dynamics365.UIAutomation.Api.csproj">
-      <Project>{dfe2c141-f1aa-4d4b-8df8-0fb93023cf45}</Project>
-      <Name>Microsoft.Dynamics365.UIAutomation.Api</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.Dynamics365.UIAutomation.Browser\Microsoft.Dynamics365.UIAutomation.Browser.csproj">
-      <Project>{c9748803-f3cb-4531-b313-bc24d4d0bf0c}</Project>
-      <Name>Microsoft.Dynamics365.UIAutomation.Browser</Name>
-    </ProjectReference>
+    <Compile Remove="UCI\BusinessProcessFlow\BusinessProcessFlowActions.cs" />
+    <Compile Remove="UCI\GlobalSearch\GlobalSearch.cs" />
   </ItemGroup>
+  <Target Name="CopyCustomContent" AfterTargets="AfterBuild">
+	<Copy SourceFiles="app.config" DestinationFiles="$(OutDir)//testhost.dll.config" />
+  </Target>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
       <ItemGroup>
@@ -287,22 +59,6 @@
       </ItemGroup>
     </When>
   </Choose>
-  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Selenium.Firefox.WebDriver.0.26.0\build\Selenium.Firefox.WebDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.Firefox.WebDriver.0.26.0\build\Selenium.Firefox.WebDriver.targets'))" />
-    <Error Condition="!Exists('..\packages\Selenium.WebDriver.ChromeDriver.93.0.4577.6300\build\Selenium.WebDriver.ChromeDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.WebDriver.ChromeDriver.93.0.4577.6300\build\Selenium.WebDriver.ChromeDriver.targets'))" />
-  </Target>
   <Import Project="..\packages\Selenium.Firefox.WebDriver.0.26.0\build\Selenium.Firefox.WebDriver.targets" Condition="Exists('..\packages\Selenium.Firefox.WebDriver.0.26.0\build\Selenium.Firefox.WebDriver.targets')" />
   <Import Project="..\packages\Selenium.WebDriver.ChromeDriver.93.0.4577.6300\build\Selenium.WebDriver.ChromeDriver.targets" Condition="Exists('..\packages\Selenium.WebDriver.ChromeDriver.93.0.4577.6300\build\Selenium.WebDriver.ChromeDriver.targets')" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/Microsoft.Dynamics365.UIAutomation.Sample/app.config b/Microsoft.Dynamics365.UIAutomation.Sample/app.config
index c2d7bc7a..02036891 100644
--- a/Microsoft.Dynamics365.UIAutomation.Sample/app.config
+++ b/Microsoft.Dynamics365.UIAutomation.Sample/app.config
@@ -2,18 +2,6 @@
 <!--Copyright (c) Microsoft Corporation. All rights reserved.
     Licensed under the MIT license.-->
 <configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
   <appSettings>
     <add key="OnlineUsername" value="" />
     <add key="OnlinePassword" value="" />
@@ -28,47 +16,4 @@
     <add key="RemoteBrowserType" value="Chrome" />
     <add key="RemoteHubServer" value="http://1.1.1.1:4444/wd/hub" />
   </appSettings>
-  <system.web>
-    <membership defaultProvider="ClientAuthenticationMembershipProvider">
-      <providers>
-        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
-      </providers>
-    </membership>
-    <roleManager defaultProvider="ClientRoleProvider" enabled="true">
-      <providers>
-        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
-      </providers>
-    </roleManager>
-  </system.web>
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
-  </startup>
-  <system.diagnostics>
-    <sources>  
-      <source name="BrowserAutomation" switchName="sourceSwitch">  
-        <listeners>  
-          <add name="console" />
-          <!--<add name="uiTestTraces" />-->
-        </listeners>  
-      </source>  
-    </sources>  
-    <switches>  
-      <add name="sourceSwitch" value="Verbose" />  
-    </switches>  
-    <trace autoflush="true" indentsize="4">
-      <listeners>
-        <add name="console" />
-        <!--<add name="uiTestTraces" />-->
-      </listeners>
-    </trace>
-    <sharedListeners>
-      <!-- 
-      Do not work for more than one test in VS Test Fremework, but work fine for NUnit:
-      <add name="console" type="System.Diagnostics.ConsoleTraceListener"/>  
-      see more: https://stackoverflow.com/questions/36327531/why-are-messages-sent-to-trace-source-missing-from-all-but-the-first-unit-test, 
-      A Custom TraceListener solve this problem: --> 
-      <add name="console" type="Microsoft.Dynamics365.UIAutomation.Sample.ConsoleTraceListener, Microsoft.Dynamics365.UIAutomation.Sample" /> 
-      <!--<add name="uiTestTraces" type="System.Diagnostics.TextWriterTraceListener" initializeData="ui-tests-traces.log" />-->  
-    </sharedListeners> 
-  </system.diagnostics>  
 </configuration>
\ No newline at end of file
diff --git a/Microsoft.Dynamics365.UIAutomation.Sample/packages.config b/Microsoft.Dynamics365.UIAutomation.Sample/packages.config
deleted file mode 100644
index 13fc49ab..00000000
--- a/Microsoft.Dynamics365.UIAutomation.Sample/packages.config
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Copyright (c) Microsoft Corporation. All rights reserved.
-    Licensed under the MIT license.-->
-<packages>
-  <package id="Microsoft.ApplicationInsights" version="2.11.0" targetFramework="net46" />
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net46" />
-  <package id="Selenium.Firefox.WebDriver" version="0.26.0" targetFramework="net46" />
-  <package id="Selenium.Support" version="3.141.0" targetFramework="net46" />
-  <package id="Selenium.WebDriver" version="3.141.0" targetFramework="net46" />
-  <package id="Selenium.WebDriver.ChromeDriver" version="93.0.4577.6300" targetFramework="net46" />
-  <package id="System.Buffers" version="4.4.0" targetFramework="net46" />
-  <package id="System.Diagnostics.DiagnosticSource" version="4.6.0" targetFramework="net46" />
-  <package id="System.Memory" version="4.5.3" targetFramework="net46" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net46" />
-</packages>
\ No newline at end of file