Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/build/TestFx.Versions.targets
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.9.0-preview-20201123-04</TestPlatformVersion>
<TestPlatformVersion Condition=" '$(TestPlatformVersion)' == '' ">16.9.0-preview-20201214-05</TestPlatformVersion>
<MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
</PropertyGroup>
</Project>
1 change: 1 addition & 0 deletions src/Adapter/MSTest.CoreAdapter/MSTest.CoreAdapter.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
<Compile Include="ObjectModel\AdapterSettingsException.cs" />
<Compile Include="ObjectModel\TestAssemblySettings.cs" />
<Compile Include="ObjectModel\TestFailedException.cs" />
<Compile Include="Properties\TypesToLoadAttribute.cs" />
<Compile Include="TestMethodFilter.cs" />
<Compile Include="Execution\TestMethodRunner.cs" />
<Compile Include="Execution\TypeCache.cs" />
Expand Down
1 change: 0 additions & 1 deletion src/Adapter/MSTest.CoreAdapter/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: NeutralResourcesLanguage("en")]
[assembly: TypesToLoad(typeof(MSTestDiscoverer), typeof(MSTestExecutor))]

// Version information for an assembly consists of the following four values:
//
Expand Down
26 changes: 26 additions & 0 deletions src/Adapter/MSTest.CoreAdapter/Properties/TypesToLoadAttribute.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System;

using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter;
using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;

[assembly: TypesToLoad(typeof(MSTestDiscoverer), typeof(MSTestExecutor))]

namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities
{
/// <summary>
/// Custom Attribute to specify the exact types which should be loaded from assembly
/// </summary>
[AttributeUsage(AttributeTargets.Assembly, Inherited = false, AllowMultiple = false)]
internal sealed class TypesToLoadAttribute : Attribute
{
public TypesToLoadAttribute(params Type[] types)
{
this.Types = types;
}

public Type[] Types { get; }
}
}
2 changes: 1 addition & 1 deletion src/Adapter/PlatformServices.Desktop/packages.config
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.9.0-preview-20201123-04" targetFramework="net45" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.0-preview-20201214-05" 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
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.9.0-preview-20201123-04" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.0-preview-20201214-05" 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
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.9.0-preview-20201123-04" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.0-preview-20201214-05" 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
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.9.0-preview-20201123-04" targetFramework="net451" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.0-preview-20201214-05" 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/CLITestBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,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.9.0-preview-20201123-04";
private const string TestPlatformCLIPackage = @"Microsoft.TestPlatform.16.9.0-preview-20201214-05";
private const string VstestConsoleRelativePath = @"tools\net451\Common7\IDE\Extensions\TestPlatform\vstest.console.exe";

private static VsTestConsoleWrapper vsTestConsoleWrapper;
Expand Down
6 changes: 3 additions & 3 deletions test/E2ETests/Automation.CLI/packages.config
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.TestPlatform" version="16.9.0-preview-20201123-04" targetFramework="net46" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.0-preview-20201123-04" targetFramework="net46" />
<package id="Microsoft.TestPlatform.TranslationLayer" version="16.9.0-preview-20201123-04" targetFramework="net46" />
<package id="Microsoft.TestPlatform" version="16.9.0-preview-20201214-05" targetFramework="net46" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.0-preview-20201214-05" targetFramework="net46" />
<package id="Microsoft.TestPlatform.TranslationLayer" version="16.9.0-preview-20201214-05" targetFramework="net46" />
<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
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.9.0-preview-20201123-04" targetFramework="net452" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.0-preview-20201214-05" 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
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.9.0-preview-20201123-04" targetFramework="net451" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.0-preview-20201214-05" 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
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.9.0-preview-20201123-04" targetFramework="net452" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.0-preview-20201214-05" 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
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.0.0" targetFramework="net452" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.0-preview-20201123-04" targetFramework="net452" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.9.0-preview-20201214-05" 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