Update controls and tests projects to 1803

2020-04-21 11:56:00 +03:00 · 2020-04-21 11:56:00 +03:00 · 7f3abd7f7d
--- a/.gitignore
+++ b/.gitignore
@ -1,6 +1,7 @@
 packages
 bin
 obj
+.vs

 *.suo
 *.csproj.user
--- a/Controls/Chart/Chart.UWP/Chart.UWP.csproj
+++ b/Controls/Chart/Chart.UWP/Chart.UWP.csproj
@ -20,8 +20,8 @@
    <AssemblyName>Telerik.UI.Xaml.Chart.UWP</AssemblyName>
    <DefaultLanguage>en-US</DefaultLanguage>
    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion>10.0.17134.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
    <FileAlignment>512</FileAlignment>
    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@ -522,20 +522,8 @@
    <PRIResource Include="$(MSBuildThisFileDirectory)Resources\Neutral.resw" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.ApplicationInsights">
-      <Version>1.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.ApplicationInsights.PersistenceChannel">
-      <Version>1.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.ApplicationInsights.WindowsApps">
-      <Version>1.0.0</Version>
-    </PackageReference>
    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>5.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="StyleCop.MSBuild">
-      <Version>4.7.55</Version>
+      <Version>6.2.10</Version>
    </PackageReference>
  </ItemGroup>
  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
--- a/Controls/Chart/Chart.UWP/Visualization/Palettes/ChartPalette.cs
+++ b/Controls/Chart/Chart.UWP/Visualization/Palettes/ChartPalette.cs
@ -14,7 +14,6 @@ namespace Telerik.UI.Xaml.Controls.Chart
    /// Defines the palette semantic for a <see cref="RadChartBase"/> instance.
    /// The palette contains several <see cref="PaletteEntryCollection"/> instances, one for each <see cref="PaletteVisualPart"/> value.
    /// </summary>
-    [Bindable]
    public class ChartPalette : DependencyObject
    {
        internal const string PieFamily = "Pie";
--- a/Controls/Core.UWP/Core.UWP.csproj
+++ b/Controls/Core.UWP/Core.UWP.csproj
@ -23,8 +23,8 @@
    <AssemblyName>Telerik.Core</AssemblyName>
    <DefaultLanguage>en-US</DefaultLanguage>
    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion>10.0.17134.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
    <EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
    <GenerateLibraryLayout>true</GenerateLibraryLayout>
@ -171,23 +171,12 @@
    <Compile Include="WeakEvents\WeakEventListener.cs" />
    <Compile Include="WeakEvents\WeakReferenceList.cs" />
  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.Runtime.WindowsRuntime.UI.Xaml">
-      <HintPath>$(WINDIR)\Microsoft.NET\Framework64\v4.0.30319\System.Runtime.WindowsRuntime.UI.Xaml.dll</HintPath>
-    </Reference>
-  </ItemGroup>
  <ItemGroup>
    <Content Include="Properties\default.rd.xml" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore">
-      <Version>5.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.NETCore.Portable.Compatibility">
-      <Version>1.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="StyleCop.MSBuild">
-      <Version>4.7.55</Version>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
+      <Version>6.2.10</Version>
    </PackageReference>
  </ItemGroup>
  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
--- a/Controls/Data.UWP/Data.UWP.csproj
+++ b/Controls/Data.UWP/Data.UWP.csproj
@ -24,8 +24,8 @@
    <FileAlignment>512</FileAlignment>
    <DefaultLanguage>en-US</DefaultLanguage>
    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion>10.0.17134.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
    <EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
    <GenerateLibraryLayout>true</GenerateLibraryLayout>
@ -129,6 +129,7 @@
    <Compile Include="Data\Engine\Groups\Descriptions\CollectionViewGroupDescription.cs" />
    <Compile Include="Data\Engine\IncrementalLoading\PlaceholderInfoType.cs" />
    <Compile Include="Data\Engine\DataProviders\ViewChangingEventArgs.cs" />
+    <Compile Include="Data\Engine\ISupportInitialize.cs" />
    <Compile Include="Data\Engine\ItemReorderPlacement.cs" />
    <Compile Include="Data\IDataViewCollection.cs" />
    <Compile Include="Data\IncrementalLoading\BatchLoadingEventArgs.cs" />
@ -262,7 +263,6 @@
    <Compile Include="Data\Engine\HierarchyAdapter\IHierarchyAdapter.cs" />
    <Compile Include="Data\Engine\HierarchyAdapter\TotalsPosition.cs" />
    <Compile Include="Data\Engine\IncrementalLoading\PlaceholderInfo.cs" />
-    <Compile Include="Data\Engine\ISupportInitialize.cs" />
    <Compile Include="Data\Engine\IValueProvider.cs" />
    <Compile Include="Data\Engine\OperationExecutionStrategy.cs" />
    <Compile Include="Data\Engine\OperationRequestInfo.cs" />
@ -310,14 +310,8 @@
    <Content Include="Properties\default.rd.xml" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore">
-      <Version>5.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.NETCore.Portable.Compatibility">
-      <Version>1.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="StyleCop.MSBuild">
-      <Version>4.7.55</Version>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
+      <Version>6.2.10</Version>
    </PackageReference>
  </ItemGroup>
  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
--- a/Controls/Data.UWP/Data/Engine/ISupportInitialize.cs
+++ b/Controls/Data.UWP/Data/Engine/ISupportInitialize.cs
@ -1,9 +1,9 @@
-namespace System.ComponentModel
-{
-    internal interface ISupportInitialize
-    { 
-        void BeginInit();
+//namespace System.ComponentModel
+//{
+//    internal interface ISupportInitialize
+//    { 
+//        void BeginInit();

-        void EndInit();
-    }
-}
+//        void EndInit();
+//    }
+//}
--- a/Controls/DataControls/DataControls.UWP/DataControls.UWP.csproj
+++ b/Controls/DataControls/DataControls.UWP/DataControls.UWP.csproj
@ -20,8 +20,8 @@
    <AssemblyName>Telerik.UI.Xaml.Controls.Data.UWP</AssemblyName>
    <DefaultLanguage>en-US</DefaultLanguage>
    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion>10.0.17134.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
    <FileAlignment>512</FileAlignment>
    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@ -409,10 +409,7 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>5.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="StyleCop.MSBuild">
-      <Version>4.7.55</Version>
+      <Version>6.2.10</Version>
    </PackageReference>
  </ItemGroup>
  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
--- a/Controls/DataVisualization/DataVisualization.UWP/DataVisualization.UWP.csproj
+++ b/Controls/DataVisualization/DataVisualization.UWP/DataVisualization.UWP.csproj
@ -20,8 +20,8 @@
    <AssemblyName>Telerik.UI.Xaml.DataVisualization.UWP</AssemblyName>
    <DefaultLanguage>en-US</DefaultLanguage>
    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion>10.0.17134.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
    <FileAlignment>512</FileAlignment>
    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@ -149,20 +149,8 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.ApplicationInsights">
-      <Version>1.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.ApplicationInsights.PersistenceChannel">
-      <Version>1.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.ApplicationInsights.WindowsApps">
-      <Version>1.0.0</Version>
-    </PackageReference>
    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>5.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="StyleCop.MSBuild">
-      <Version>4.7.55</Version>
+      <Version>6.2.10</Version>
    </PackageReference>
  </ItemGroup>
  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
--- a/Controls/Grid/Grid.UWP/Grid.UWP.csproj
+++ b/Controls/Grid/Grid.UWP/Grid.UWP.csproj
@ -21,8 +21,8 @@
    <AssemblyName>Telerik.UI.Xaml.Grid.UWP</AssemblyName>
    <DefaultLanguage>en-US</DefaultLanguage>
    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion>10.0.17134.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
    <FileAlignment>512</FileAlignment>
    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@ -471,20 +471,8 @@
    <Content Include="Assets\Reorder\ic_reorder_light.scale-240.png" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.ApplicationInsights">
-      <Version>1.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.ApplicationInsights.PersistenceChannel">
-      <Version>1.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.ApplicationInsights.WindowsApps">
-      <Version>1.0.0</Version>
-    </PackageReference>
    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>5.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="StyleCop.MSBuild">
-      <Version>4.7.55</Version>
+      <Version>6.2.10</Version>
    </PackageReference>
  </ItemGroup>
  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
--- a/Controls/Input/Input.UWP/Input.UWP.csproj
+++ b/Controls/Input/Input.UWP/Input.UWP.csproj
@ -20,8 +20,8 @@
    <AssemblyName>Telerik.UI.Xaml.Input.UWP</AssemblyName>
    <DefaultLanguage>en-US</DefaultLanguage>
    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion>10.0.17134.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
    <FileAlignment>512</FileAlignment>
    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@ -280,10 +280,7 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>5.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="StyleCop.MSBuild">
-      <Version>4.7.55</Version>
+      <Version>6.2.10</Version>
    </PackageReference>
  </ItemGroup>
  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
--- a/Controls/Primitives/Primitives.UWP/Common/RadDependencyObject.cs
+++ b/Controls/Primitives/Primitives.UWP/Common/RadDependencyObject.cs
@ -8,7 +8,6 @@ namespace Telerik.UI.Xaml.Controls.Primitives
    /// <summary>
    /// Represents an extended <see cref="DependencyObject"/> that recognizes whether a property is changed internally within the class or programmatically by the user.
    /// </summary>
-    [Bindable]
    public abstract class RadDependencyObject : DependencyObject
    {
        private byte internalPropertyChange;
--- a/Controls/Primitives/Primitives.UWP/Primitives.UWP.csproj
+++ b/Controls/Primitives/Primitives.UWP/Primitives.UWP.csproj
@ -21,8 +21,8 @@
    <AssemblyName>Telerik.UI.Xaml.Primitives.UWP</AssemblyName>
    <DefaultLanguage>en-US</DefaultLanguage>
    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion>10.0.17134.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
    <FileAlignment>512</FileAlignment>
    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@ -423,16 +423,7 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>5.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="StyleCop.MSBuild">
-      <Version>4.7.55</Version>
-    </PackageReference>
-    <PackageReference Include="System.Numerics.Vectors">
-      <Version>4.1.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Numerics.Vectors.WindowsRuntime">
-      <Version>4.0.0</Version>
+      <Version>6.2.10</Version>
    </PackageReference>
  </ItemGroup>
  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
--- a/UnitTests/UAP.Tests/Chart.Tests/Chart.Tests.csproj
+++ b/UnitTests/UAP.Tests/Chart.Tests/Chart.Tests.csproj
@ -11,8 +11,8 @@
    <AssemblyName>Chart.Tests</AssemblyName>
    <DefaultLanguage>en-US</DefaultLanguage>
    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion>10.0.17134.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
    <FileAlignment>512</FileAlignment>
    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@ -173,8 +173,17 @@
    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
  </ItemGroup>
  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk">
+      <Version>16.6.0-preview-20200318-01</Version>
+    </PackageReference>
    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>5.0.0</Version>
+      <Version>6.2.10</Version>
+    </PackageReference>
+    <PackageReference Include="MSTest.TestAdapter">
+      <Version>2.1.1</Version>
+    </PackageReference>
+    <PackageReference Include="MSTest.TestFramework">
+      <Version>2.1.1</Version>
    </PackageReference>
  </ItemGroup>
  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
--- a/UnitTests/UAP.Tests/Chart.Tests/DataBinding/DataPointBindingTests.cs
+++ b/UnitTests/UAP.Tests/Chart.Tests/DataBinding/DataPointBindingTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using System.Collections.Generic;
 using System.Dynamic;
--- a/UnitTests/UAP.Tests/Chart.Tests/ElementTree/ElementCollectionTests.cs
+++ b/UnitTests/UAP.Tests/Chart.Tests/ElementTree/ElementCollectionTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Telerik.Core;

 namespace Telerik.UI.Xaml.Controls.Chart.Tests
--- a/UnitTests/UAP.Tests/Chart.Tests/Math/RadRectTests.cs
+++ b/UnitTests/UAP.Tests/Chart.Tests/Math/RadRectTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Telerik.Core;

 namespace Telerik.UI.Xaml.Controls.Chart.Tests
--- a/UnitTests/UAP.Tests/Chart.Tests/PieChart/Doughnut/DoughnutSeriesHitTestTests.cs
+++ b/UnitTests/UAP.Tests/Chart.Tests/PieChart/Doughnut/DoughnutSeriesHitTestTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Telerik.Charting;
 using Windows.Foundation;

--- a/UnitTests/UAP.Tests/Chart.Tests/PropertyStore/PropertyBagTests.cs
+++ b/UnitTests/UAP.Tests/Chart.Tests/PropertyStore/PropertyBagTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Telerik.Charting;
 using Telerik.Core;

--- a/UnitTests/UAP.Tests/DataControls.Tests/DataControls.Tests.csproj
+++ b/UnitTests/UAP.Tests/DataControls.Tests/DataControls.Tests.csproj
@ -11,8 +11,8 @@
    <AssemblyName>DataControls.Tests</AssemblyName>
    <DefaultLanguage>en-US</DefaultLanguage>
    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion>10.0.17134.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
    <FileAlignment>512</FileAlignment>
    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@ -175,8 +175,17 @@
    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
  </ItemGroup>
  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk">
+      <Version>16.6.0-preview-20200318-01</Version>
+    </PackageReference>
    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>5.0.0</Version>
+      <Version>6.2.10</Version>
+    </PackageReference>
+    <PackageReference Include="MSTest.TestAdapter">
+      <Version>2.1.1</Version>
+    </PackageReference>
+    <PackageReference Include="MSTest.TestFramework">
+      <Version>2.1.1</Version>
    </PackageReference>
  </ItemGroup>
  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
--- a/UnitTests/UAP.Tests/DataControls.Tests/DataForm/EntityPropertyTests.cs
+++ b/UnitTests/UAP.Tests/DataControls.Tests/DataForm/EntityPropertyTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Reflection;
 using Telerik.Data.Core;

--- a/UnitTests/UAP.Tests/DataControls.Tests/ListView/Layout/GridLayoutTests.cs
+++ b/UnitTests/UAP.Tests/DataControls.Tests/ListView/Layout/GridLayoutTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
--- a/UnitTests/UAP.Tests/Grid.Tests/Data/CompactLayoutTests.cs
+++ b/UnitTests/UAP.Tests/Grid.Tests/Data/CompactLayoutTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using System.Collections.Generic;
 using System.Linq;
--- a/UnitTests/UAP.Tests/Grid.Tests/Data/DataLoading/BatchLoadingProviderTests.cs
+++ b/UnitTests/UAP.Tests/Grid.Tests/Data/DataLoading/BatchLoadingProviderTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
--- a/UnitTests/UAP.Tests/Grid.Tests/Data/DataProviders/DataProviderBaseTests.cs
+++ b/UnitTests/UAP.Tests/Grid.Tests/Data/DataProviders/DataProviderBaseTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
--- a/UnitTests/UAP.Tests/Grid.Tests/Data/DataProviders/LocalDataSourceProviderTests.CollectionAndPropertyChanged.cs
+++ b/UnitTests/UAP.Tests/Grid.Tests/Data/DataProviders/LocalDataSourceProviderTests.CollectionAndPropertyChanged.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
--- a/UnitTests/UAP.Tests/Grid.Tests/Data/DataProviders/LocalDataSourceProviderTests.DescriptionInitialization.cs
+++ b/UnitTests/UAP.Tests/Grid.Tests/Data/DataProviders/LocalDataSourceProviderTests.DescriptionInitialization.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using Telerik.Data.Core;

--- a/UnitTests/UAP.Tests/Grid.Tests/Data/DataProviders/LocalDataSourceProviderTests.Setup.cs
+++ b/UnitTests/UAP.Tests/Grid.Tests/Data/DataProviders/LocalDataSourceProviderTests.Setup.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using System.Collections;
 using System.Collections.Generic;
--- a/UnitTests/UAP.Tests/Grid.Tests/Data/DataProviders/LocalDataSourceProviderTests.Status.cs
+++ b/UnitTests/UAP.Tests/Grid.Tests/Data/DataProviders/LocalDataSourceProviderTests.Status.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Collections.Generic;
 using Telerik.Core.Data;
 using Telerik.Data.Core;
--- a/UnitTests/UAP.Tests/Grid.Tests/Data/DataProviders/LocalDataSourceProviderTests.cs
+++ b/UnitTests/UAP.Tests/Grid.Tests/Data/DataProviders/LocalDataSourceProviderTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
--- a/UnitTests/UAP.Tests/Grid.Tests/Data/DataSourceView/EnumerableDataSourceViewTests.cs
+++ b/UnitTests/UAP.Tests/Grid.Tests/Data/DataSourceView/EnumerableDataSourceViewTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Telerik.Data.Core;

 namespace Telerik.UI.Xaml.Controls.Grid.Tests
--- a/UnitTests/UAP.Tests/Grid.Tests/Data/DataSourceView/GenericDataSourceViewTests.cs
+++ b/UnitTests/UAP.Tests/Grid.Tests/Data/DataSourceView/GenericDataSourceViewTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Telerik.Data.Core;

 namespace Telerik.UI.Xaml.Controls.Grid.Tests
--- a/UnitTests/UAP.Tests/Grid.Tests/Data/Fields/ContainerNodeTests.cs
+++ b/UnitTests/UAP.Tests/Grid.Tests/Data/Fields/ContainerNodeTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Telerik.Data.Core.Fields;

 namespace Telerik.UI.Xaml.Controls.Grid.Tests
--- a/UnitTests/UAP.Tests/Grid.Tests/Data/Fields/Desciptions/PropertyInfoFieldDescriptionTests.cs
+++ b/UnitTests/UAP.Tests/Grid.Tests/Data/Fields/Desciptions/PropertyInfoFieldDescriptionTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using System.Collections.Generic;
 using System.Reflection;
--- a/UnitTests/UAP.Tests/Grid.Tests/Data/Fields/FieldInfoHelperTests.cs
+++ b/UnitTests/UAP.Tests/Grid.Tests/Data/Fields/FieldInfoHelperTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using Telerik.Data.Core.Fields;

--- a/UnitTests/UAP.Tests/Grid.Tests/Data/Fields/FieldInfoNodeTests.cs
+++ b/UnitTests/UAP.Tests/Grid.Tests/Data/Fields/FieldInfoNodeTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Telerik.Data.Core.Fields;

 namespace Telerik.UI.Xaml.Controls.Grid.Tests
--- a/UnitTests/UAP.Tests/Grid.Tests/Data/Fields/Providers/EmptyFieldDescriptionsDataTests.cs
+++ b/UnitTests/UAP.Tests/Grid.Tests/Data/Fields/Providers/EmptyFieldDescriptionsDataTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Telerik.Data.Core.Fields;

 namespace Telerik.UI.Xaml.Controls.Grid.Tests
--- a/UnitTests/UAP.Tests/Grid.Tests/Data/Fields/Providers/EnumerableFieldDescriptionsExtractorTests.cs
+++ b/UnitTests/UAP.Tests/Grid.Tests/Data/Fields/Providers/EnumerableFieldDescriptionsExtractorTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using System.Linq;
 using Telerik.Data.Core.Fields;
--- a/UnitTests/UAP.Tests/Grid.Tests/Data/Fields/Providers/FieldDescriptionProviderBaseTests.cs
+++ b/UnitTests/UAP.Tests/Grid.Tests/Data/Fields/Providers/FieldDescriptionProviderBaseTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using Telerik.Data.Core.Fields;

--- a/UnitTests/UAP.Tests/Grid.Tests/Data/Fields/Providers/FieldDescriptionsDataTests.cs
+++ b/UnitTests/UAP.Tests/Grid.Tests/Data/Fields/Providers/FieldDescriptionsDataTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using Telerik.Data.Core.Fields;

--- a/UnitTests/UAP.Tests/Grid.Tests/Data/Fields/Providers/GetDescriptionsDataCompletedEventArgsTests.cs
+++ b/UnitTests/UAP.Tests/Grid.Tests/Data/Fields/Providers/GetDescriptionsDataCompletedEventArgsTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using Telerik.Data.Core.Fields;

--- a/UnitTests/UAP.Tests/Grid.Tests/Data/Fields/Providers/LocalDataSourceFieldDescriptionsProviderTests.cs
+++ b/UnitTests/UAP.Tests/Grid.Tests/Data/Fields/Providers/LocalDataSourceFieldDescriptionsProviderTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Linq;
 using Telerik.Data.Core;
 using Telerik.Data.Core.Fields;
--- a/UnitTests/UAP.Tests/Grid.Tests/Data/Fields/Providers/LocalFieldDescriptionsProviderBaseTests.cs
+++ b/UnitTests/UAP.Tests/Grid.Tests/Data/Fields/Providers/LocalFieldDescriptionsProviderBaseTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using System.Collections.Generic;
 using System.Linq;
--- a/UnitTests/UAP.Tests/Grid.Tests/Data/GrandTotalComparerTests.cs
+++ b/UnitTests/UAP.Tests/Grid.Tests/Data/GrandTotalComparerTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Collections.Generic;
 using System.Linq;
 using Telerik.Core;
--- a/UnitTests/UAP.Tests/Grid.Tests/Data/Groups/Descriptions/PropertyAggregateDescriptionBaseTests.cs
+++ b/UnitTests/UAP.Tests/Grid.Tests/Data/Groups/Descriptions/PropertyAggregateDescriptionBaseTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using Telerik.Data.Core;

--- a/UnitTests/UAP.Tests/Grid.Tests/Data/Groups/Descriptions/PropertyGroupDescriptionBaseTests.cs
+++ b/UnitTests/UAP.Tests/Grid.Tests/Data/Groups/Descriptions/PropertyGroupDescriptionBaseTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using Telerik.Data.Core;

--- a/UnitTests/UAP.Tests/Grid.Tests/Data/Helpers/INotifyPropertyChangedExtensions.cs
+++ b/UnitTests/UAP.Tests/Grid.Tests/Data/Helpers/INotifyPropertyChangedExtensions.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
--- a/UnitTests/UAP.Tests/Grid.Tests/Data/MockUps/FakeAggregatesResultProviderMock.cs
+++ b/UnitTests/UAP.Tests/Grid.Tests/Data/MockUps/FakeAggregatesResultProviderMock.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Telerik.Data.Core;

 namespace Telerik.UI.Xaml.Controls.Grid.Tests
--- a/UnitTests/UAP.Tests/Grid.Tests/Data/OutlineLayoutTests.cs
+++ b/UnitTests/UAP.Tests/Grid.Tests/Data/OutlineLayoutTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using System.Collections.Generic;
 using System.Linq;
--- a/UnitTests/UAP.Tests/Grid.Tests/Data/PivotEngineTests.cs
+++ b/UnitTests/UAP.Tests/Grid.Tests/Data/PivotEngineTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using System.Collections.Generic;
 using System.Linq;
--- a/UnitTests/UAP.Tests/Grid.Tests/Data/PropertyFilterDescriptionTests.cs
+++ b/UnitTests/UAP.Tests/Grid.Tests/Data/PropertyFilterDescriptionTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Telerik.Data.Core;

 namespace Telerik.UI.Xaml.Controls.Grid.Tests
--- a/UnitTests/UAP.Tests/Grid.Tests/Data/PropertyGroupDescriptionTests.cs
+++ b/UnitTests/UAP.Tests/Grid.Tests/Data/PropertyGroupDescriptionTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using Telerik.Data.Core;

--- a/UnitTests/UAP.Tests/Grid.Tests/Data/Sort/PropertySortDescriptionTests.cs
+++ b/UnitTests/UAP.Tests/Grid.Tests/Data/Sort/PropertySortDescriptionTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Telerik.Data.Core;

 namespace Telerik.UI.Xaml.Controls.Grid.Tests
--- a/UnitTests/UAP.Tests/Grid.Tests/Grid.Tests.csproj
+++ b/UnitTests/UAP.Tests/Grid.Tests/Grid.Tests.csproj
@ -11,8 +11,8 @@
    <AssemblyName>Grid.Tests</AssemblyName>
    <DefaultLanguage>en-US</DefaultLanguage>
    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion>10.0.17134.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
    <FileAlignment>512</FileAlignment>
    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@ -109,14 +109,11 @@
    <UseVSHostingProcess>false</UseVSHostingProcess>
    <ErrorReport>prompt</ErrorReport>
  </PropertyGroup>
+  <PropertyGroup>
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
+  </PropertyGroup>
  <ItemGroup>
-    <!--A reference to the entire .Net Framework and Windows SDK are automatically included-->
-    <SDKReference Include="MSTestFramework.Universal, Version=$(UnitTestPlatformVersion)">
-      <Name>MSTest for Managed Projects</Name>
-    </SDKReference>
-    <SDKReference Include="TestPlatform.Universal, Version=$(UnitTestPlatformVersion)">
-      <Name>Microsoft Visual Studio Test Core</Name>
-    </SDKReference>
+    <SDKReference Include="TestPlatform.Universal, Version=$(UnitTestPlatformVersion)" />
  </ItemGroup>
  <ItemGroup>
    <Compile Include="Data\CompactLayoutTests.cs" />
@ -231,8 +228,17 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk">
+      <Version>16.6.0-preview-20200318-01</Version>
+    </PackageReference>
    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>5.0.0</Version>
+      <Version>6.2.10</Version>
+    </PackageReference>
+    <PackageReference Include="MSTest.TestAdapter">
+      <Version>2.1.1</Version>
+    </PackageReference>
+    <PackageReference Include="MSTest.TestFramework">
+      <Version>2.1.1</Version>
    </PackageReference>
  </ItemGroup>
  <ItemGroup>
--- a/UnitTests/UAP.Tests/Grid.Tests/View/Filtering/BooleanFilterDescriptorTests.cs
+++ b/UnitTests/UAP.Tests/Grid.Tests/View/Filtering/BooleanFilterDescriptorTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using Telerik.Data.Core;
 using Telerik.Data.Core.Fields;
--- a/UnitTests/UAP.Tests/Grid.Tests/View/Filtering/DateTimeFilterDescriptorTests.cs
+++ b/UnitTests/UAP.Tests/Grid.Tests/View/Filtering/DateTimeFilterDescriptorTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using System.Collections.Generic;
 using System.Linq;
--- a/UnitTests/UAP.Tests/Grid.Tests/View/Filtering/NumericalFilterDescriptorTests.cs
+++ b/UnitTests/UAP.Tests/Grid.Tests/View/Filtering/NumericalFilterDescriptorTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using System.Collections;
 using System.Collections.Generic;
--- a/UnitTests/UAP.Tests/Grid.Tests/View/Filtering/TextFilterDescriptorTests.cs
+++ b/UnitTests/UAP.Tests/Grid.Tests/View/Filtering/TextFilterDescriptorTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using Telerik.Data.Core;
 using Telerik.Data.Core.Fields;
--- a/UnitTests/UAP.Tests/Input.Tests/AutoCompleteBox/ContainsProviderTests.cs
+++ b/UnitTests/UAP.Tests/Input.Tests/AutoCompleteBox/ContainsProviderTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Collections;
 using System.Collections.ObjectModel;
 using Telerik.UI.Xaml.Controls.Input.AutoCompleteBox;
--- a/UnitTests/UAP.Tests/Input.Tests/AutoCompleteBox/StartsWithProviderTests.cs
+++ b/UnitTests/UAP.Tests/Input.Tests/AutoCompleteBox/StartsWithProviderTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Collections;
 using System.Collections.ObjectModel;
 using Telerik.UI.Xaml.Controls.Input.AutoCompleteBox;
--- a/UnitTests/UAP.Tests/Input.Tests/Calendar/Services/DateRangeCollectionTests.cs
+++ b/UnitTests/UAP.Tests/Input.Tests/Calendar/Services/DateRangeCollectionTests.cs
@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using System.Collections.Generic;
 using System.Linq;
--- a/UnitTests/UAP.Tests/Input.Tests/Input.Tests.csproj
+++ b/UnitTests/UAP.Tests/Input.Tests/Input.Tests.csproj
@ -11,8 +11,8 @@
    <AssemblyName>Input.Tests</AssemblyName>
    <DefaultLanguage>en-US</DefaultLanguage>
    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion>10.0.17134.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
    <FileAlignment>512</FileAlignment>
    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@ -168,8 +168,17 @@
    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
  </ItemGroup>
  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk">
+      <Version>16.6.0-preview-20200318-01</Version>
+    </PackageReference>
    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>5.0.0</Version>
+      <Version>6.2.10</Version>
+    </PackageReference>
+    <PackageReference Include="MSTest.TestAdapter">
+      <Version>2.1.1</Version>
+    </PackageReference>
+    <PackageReference Include="MSTest.TestFramework">
+      <Version>2.1.1</Version>
    </PackageReference>
  </ItemGroup>
  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">