Skip to content

Commit

Permalink
TestPlatform version updated to v16.9.1 (#784)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Haplois
Haplois authored Feb 25, 2021
1 parent bab15ef commit 764842c
Show file tree
Hide file tree
Showing 13 changed files with 22 additions and 21 deletions.
2 changes: 1 addition & 1 deletion scripts/build/TestFx.Versions.targets
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<TestPlatformVersion Condition=" '$(TestPlatformVersion)' == '' ">16.10.0-preview-20210211-01</TestPlatformVersion>
<TestPlatformVersion Condition=" '$(TestPlatformVersion)' == '' ">16.9.1</TestPlatformVersion>
<MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
</PropertyGroup>
</Project>
9 changes: 5 additions & 4 deletions src/Adapter/MSTest.CoreAdapter/Extensions/TestCaseExtensions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Extensions
{
using Microsoft.TestPlatform.AdapterUtilities;
using Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.ObjectModel;
using Microsoft.VisualStudio.TestPlatform.ObjectModel;

Expand All @@ -15,8 +16,8 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Extensions
internal static class TestCaseExtensions
{
internal static readonly TestProperty ManagedTypeProperty = TestProperty.Register(
id: ManagedNameConstants.ManagedTypePropertyId,
label: ManagedNameConstants.ManagedTypeLabel,
id: Contants.ManagedTypePropertyId,
label: Contants.ManagedTypeLabel,
category: string.Empty,
description: string.Empty,
valueType: typeof(string),
Expand All @@ -25,8 +26,8 @@ internal static class TestCaseExtensions
owner: typeof(TestCase));

internal static readonly TestProperty ManagedMethodProperty = TestProperty.Register(
id: ManagedNameConstants.ManagedMethodPropertyId,
label: ManagedNameConstants.ManagedMethodLabel,
id: Contants.ManagedMethodPropertyId,
label: Contants.ManagedMethodLabel,
category: string.Empty,
description: string.Empty,
valueType: typeof(string),
Expand Down
2 changes: 1 addition & 1 deletion src/Adapter/PlatformServices.Desktop/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MicroBuild.Core" version="0.2.0" targetFramework="net451" developmentDependency="true" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.10.0-preview-20210211-01" targetFramework="net45" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.1" targetFramework="net45" />
<package id="NuGet.Frameworks" version="5.0.0" targetFramework="net45" />
<package id="StyleCop.Analyzers" version="1.0.0" targetFramework="net45" developmentDependency="true" />
<package id="System.Collections.Immutable" version="1.5.0" targetFramework="net45" />
Expand Down
2 changes: 1 addition & 1 deletion src/Adapter/PlatformServices.Interface/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MicroBuild.Core" version="0.2.0" targetFramework="portable45-net45+win8+wp8+wpa81" developmentDependency="true" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.10.0-preview-20210211-01" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.1" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="StyleCop.Analyzers" version="1.0.0" targetFramework="portable45-net45+win8+wp8+wpa81" developmentDependency="true" />
<package id="System.Collections" version="4.3.0" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="System.ComponentModel" version="4.3.0" targetFramework="portable45-net45+win8+wp8+wpa81" />
Expand Down
2 changes: 1 addition & 1 deletion src/Adapter/PlatformServices.Portable/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MicroBuild.Core" version="0.2.0" targetFramework="portable45-net45+win8+wp8+wpa81" developmentDependency="true" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.10.0-preview-20210211-01" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.1" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="StyleCop.Analyzers" version="1.0.0" targetFramework="portable45-net45+win8+wp8+wpa81" developmentDependency="true" />
<package id="System.Collections" version="4.3.0" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="System.ComponentModel" version="4.3.0" targetFramework="portable45-net45+win8+wp8+wpa81" />
Expand Down
2 changes: 1 addition & 1 deletion test/ComponentTests/PlatformServices.Desktop.Component.Tests/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Castle.Core" version="4.2.1" targetFramework="net451" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.10.0-preview-20210211-01" targetFramework="net451" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.1" targetFramework="net451" />
<package id="Moq" version="4.8.2" targetFramework="net451" />
<package id="NuGet.Frameworks" version="5.0.0" targetFramework="net451" />
<package id="StyleCop.Analyzers" version="1.0.0" targetFramework="net451" developmentDependency="true" />
Expand Down
2 changes: 1 addition & 1 deletion test/E2ETests/Automation.CLI/Automation.CLI.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
<DestinationPath>$(TargetDir)..\..\TestAssets</DestinationPath>
<PackagesPath>$(TestFxRoot)\packages</PackagesPath>
<PostBuildEvent>
xcopy /Y /I "$(PackagesPath)\microsoft.testplatform.adapterutilities.$(TestPlatformVersion)\lib\net45\Microsoft.TestPlatform.AdapterUtilities.dll" "$(DestinationPath)"
xcopy /Y /I "$(PackagesPath)\microsoft.testplatform.adapterutilities.$(TestPlatformVersion)\lib\netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll" "$(DestinationPath)"
xcopy /Y /I "$(PackagesPath)\microsoft.testplatform.adapterutilities.$(TestPlatformVersion)\lib\netstandard1.0\Microsoft.TestPlatform.AdapterUtilities.dll" "$(DestinationPath)\netcoreapp1.1\"
xcopy /Y /I "$(PackagesPath)\microsoft.testplatform.adapterutilities.$(TestPlatformVersion)\lib\netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll" "$(DestinationPath)\netcoreapp2.1\"
xcopy /Y /I "$(SourcePath)MSTest.CoreAdapter\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" "$(DestinationPath)"
Expand Down
2 changes: 1 addition & 1 deletion test/E2ETests/Automation.CLI/CLITestBase.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class CLITestBase
private const string PackagesFolder = "packages";

// This value is automatically updated by "build.ps1" script.
private const string TestPlatformCLIPackage = @"Microsoft.TestPlatform.16.10.0-preview-20210211-01";
private const string TestPlatformCLIPackage = @"Microsoft.TestPlatform.16.9.1";
private const string VstestConsoleRelativePath = @"tools\net451\Common7\IDE\Extensions\TestPlatform\vstest.console.exe";

private static VsTestConsoleWrapper vsTestConsoleWrapper;
Expand Down
8 changes: 4 additions & 4 deletions test/E2ETests/Automation.CLI/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.TestPlatform" version="16.10.0-preview-20210211-01" targetFramework="net46" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.10.0-preview-20210211-01" targetFramework="net46" />
<package id="Microsoft.TestPlatform.TranslationLayer" version="16.10.0-preview-20210211-01" targetFramework="net46" />
<package id="Microsoft.TestPlatform.AdapterUtilities" version="16.10.0-preview-20210211-01" targetFramework="net452" />
<package id="Microsoft.TestPlatform" version="16.9.1" targetFramework="net46" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.1" targetFramework="net46" />
<package id="Microsoft.TestPlatform.TranslationLayer" version="16.9.1" targetFramework="net46" />
<package id="Microsoft.TestPlatform.AdapterUtilities" version="16.9.1" targetFramework="net452" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />
<package id="NuGet.Frameworks" version="5.0.0" targetFramework="net46" />
<package id="StyleCop.Analyzers" version="1.0.0" targetFramework="net46" developmentDependency="true" />
Expand Down
4 changes: 2 additions & 2 deletions test/UnitTests/MSTest.CoreAdapter.Unit.Tests/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<packages>
<package id="Castle.Core" version="3.3.3" targetFramework="net452" />
<package id="FluentAssertions" version="5.10.3" targetFramework="net452" />
<package id="Microsoft.TestPlatform.AdapterUtilities" version="16.10.0-preview-20210211-01" targetFramework="net452" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.10.0-preview-20210211-01" targetFramework="net452" />
<package id="Microsoft.TestPlatform.AdapterUtilities" version="16.9.1" targetFramework="net452" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.1" targetFramework="net452" />
<package id="Moq" version="4.5.21" targetFramework="net452" />
<package id="NuGet.Frameworks" version="5.0.0" targetFramework="net452" />
<package id="StyleCop.Analyzers" version="1.0.0" targetFramework="net452" developmentDependency="true" />
Expand Down
2 changes: 1 addition & 1 deletion test/UnitTests/PlatformServices.Desktop.Unit.Tests/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Castle.Core" version="3.3.3" targetFramework="net451" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.10.0-preview-20210211-01" targetFramework="net451" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.1" targetFramework="net451" />
<package id="Moq" version="4.5.21" targetFramework="net451" />
<package id="NuGet.Frameworks" version="5.0.0" targetFramework="net451" />
<package id="StyleCop.Analyzers" version="1.0.0" targetFramework="net451" developmentDependency="true" />
Expand Down
2 changes: 1 addition & 1 deletion test/UnitTests/PlatformServices.Portable.Unit.Tests/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Castle.Core" version="3.3.3" targetFramework="net452" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.10.0-preview-20210211-01" targetFramework="net452" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.1" targetFramework="net452" />
<package id="Moq" version="4.5.21" targetFramework="net452" />
<package id="NuGet.Frameworks" version="5.0.0" targetFramework="net452" />
<package id="StyleCop.Analyzers" version="1.0.0" targetFramework="net452" developmentDependency="true" />
Expand Down
4 changes: 2 additions & 2 deletions test/UnitTests/PlatformServices.Universal.Unit.Tests/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Castle.Core" version="4.0.0" targetFramework="net452" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.10.0-preview-20210211-01" targetFramework="net452" />
<package id="Microsoft.TestPlatform.AdapterUtilities" version="16.10.0-preview-20210211-01" targetFramework="net452" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.1" targetFramework="net452" />
<package id="Microsoft.TestPlatform.AdapterUtilities" version="16.9.1" targetFramework="net452" />
<package id="Moq" version="4.7.8" targetFramework="net452" />
<package id="NuGet.Frameworks" version="5.0.0" targetFramework="net452" />
<package id="StyleCop.Analyzers" version="1.0.0" targetFramework="net452" developmentDependency="true" />
Expand Down

0 comments on commit 764842c

Please sign in to comment.