Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multitarget testhost #2493

Merged
merged 8 commits into from
Jul 29, 2020
Merged

Multitarget testhost #2493

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
01ba85f
Build multiple test hosts and use them
nohwnd Jul 27, 2020
5a30eda
Add testhost executables to nugets
nohwnd Jul 28, 2020
1b5b143
Fix net451 path
nohwnd Jul 28, 2020
cbdf2bd
Fix run
nohwnd Jul 28, 2020
cfce986
Use multitarget only for known tfms
nohwnd Jul 28, 2020
0da9aa9
Add acceptance test
nohwnd Jul 28, 2020
e288cc3
Add comment to test
nohwnd Jul 28, 2020
6404426
Fix errors that were introduced because I made the /Framework param work
nohwnd Jul 29, 2020
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
Prev Previous commit
Next Next commit
Fix net451 path
  • Loading branch information
@nohwnd
nohwnd committed Jul 28, 2020
commit 1b5b143500eab5bd10a247d14b2c613105af931a
10 changes: 4 additions & 6 deletions src/Microsoft.TestPlatform.TestHostProvider/Hosting/DefaultTestHostManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,14 +137,12 @@ public virtual TestProcessStartInfo GetTestHostProcessStartInfo(
TestRunnerConnectionInfo connectionInfo)
{
var targetFrameworkMoniker = this.targetFramework.Name.Replace(".NETFramework,Version=v", string.Empty).Replace(".", string.Empty);
if (targetFrameworkMoniker == "451")
{
// This is the default host, it does not need any suffix.
targetFrameworkMoniker = string.Empty;
}

// Default host is net451 and is named testhost.exe it does not need any suffix.
var targetFrameworkSuffix = targetFrameworkMoniker == "451" ? string.Empty : $".net{targetFrameworkMoniker}";

// Default test host manager supports shared test sources
var testHostProcessName = string.Format(this.architecture == Architecture.X86 ? X86TestHostProcessName : X64TestHostProcessName, $".net{targetFrameworkMoniker}");
var testHostProcessName = string.Format(this.architecture == Architecture.X86 ? X86TestHostProcessName : X64TestHostProcessName, targetFrameworkSuffix);
var currentWorkingDirectory = Path.Combine(Path.GetDirectoryName(typeof(DefaultTestHostManager).GetTypeInfo().Assembly.Location), "..//");
var argumentsString = " " + connectionInfo.ToCommandLineOptions();

Expand Down