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

Jump to bottom

Aborting test run when source and target frameworks/architectures are incompatible #1789

Merged
merged 30 commits into from
Feb 13, 2019
Merged

Aborting test run when source and target frameworks/architectures are incompatible #1789

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
f60b214
ExceptionWhenTargetingDiffFramworksPlat
vagisha-nidhi Oct 9, 2018
0a8e968
Acceptance tests updated
vagisha-nidhi Oct 23, 2018
ce5de2f
Merge branch 'master' of https://github.com/Microsoft/vstest into Tar…
vagisha-nidhi Oct 29, 2018
37fa219
Message change in conflict dlls
vagisha-nidhi Oct 29, 2018
75e2164
Changes in methods
vagisha-nidhi Dec 1, 2018
92fe52c
Merge branch 'master' of https://github.com/Microsoft/vstest into Tar…
vagisha-nidhi Dec 1, 2018
9943636
minor fix in test
vagisha-nidhi Dec 1, 2018
30ebd14
fix in test
vagisha-nidhi Dec 6, 2018
e6230ba
improved error message
vagisha-nidhi Dec 21, 2018
3fa02c1
PR comments
vagisha-nidhi Dec 31, 2018
ce59bb3
fix acceptance test
vagisha-nidhi Jan 2, 2019
d7057e2
Merge branch 'master' of https://github.com/Microsoft/vstest into Tar…
vagisha-nidhi Jan 2, 2019
220c955
Refactoring InferRunSettingsHelper
vagisha-nidhi Jan 14, 2019
c9740ea
Refactor
vagisha-nidhi Jan 14, 2019
e4f233f
Merge branch 'master' into TargetingDifferentFrameworks
vagisha-nidhi Jan 14, 2019
2e66caa
Tests updated
vagisha-nidhi Jan 14, 2019
550b4cc
Merge branch 'TargetingDifferentFrameworks' of https://github.com/vag…
vagisha-nidhi Jan 14, 2019
10bc3f3
Update TestRequestManager.cs
vagisha-nidhi Jan 16, 2019
ed39fbd
Restructured and Added test
vagisha-nidhi Jan 16, 2019
58b3dfa
Merge branch 'TargetingDifferentFrameworks' of https://github.com/vag…
vagisha-nidhi Jan 16, 2019
bc8c120
Update TestRequestManager.cs
vagisha-nidhi Jan 16, 2019
e850846
minor change
vagisha-nidhi Jan 21, 2019
b033b87
Merge branch 'TargetingDifferentFrameworks' of https://github.com/vag…
vagisha-nidhi Jan 21, 2019
3d5b844
minor change
vagisha-nidhi Jan 23, 2019
615fbac
Merge branch 'master' into TargetingDifferentFrameworks
vagisha-nidhi Jan 31, 2019
35ba9e5
Merge branch 'master' of https://github.com/Microsoft/vstest into Tar…
vagisha-nidhi Feb 12, 2019
1ddc150
Merge branch 'master' into TargetingDifferentFrameworks
vagisha-nidhi Feb 12, 2019
6bcc76c
Modified logic in IsFrameworkIncompatible
vagisha-nidhi Feb 12, 2019
7836605
Merge branch 'TargetingDifferentFrameworks' of https://github.com/vag…
vagisha-nidhi Feb 12, 2019
53b609b
Removing unused variable
vagisha-nidhi Feb 13, 2019
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
Message change in conflict dlls
  • Loading branch information
@vagisha-nidhi
vagisha-nidhi committed Oct 29, 2018
commit 37fa21977c0329c547f4459358ff493c3f19de32
2 changes: 1 addition & 1 deletion src/vstest.console/Resources/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,6 +719,6 @@
<value>Logger argument '{0}' is not valid.</value>
</data>
<data name="ConflictInFrameworkPlatform" xml:space="preserve">
<value>Conflicts in framework/platform identifier of provided sources.</value>
<value>The given test sources target multiple frameworks/platforms that are incompatible. Please make sure the sources target the same framework and platform.</value>
</data>
</root>
2 changes: 1 addition & 1 deletion src/vstest.console/Resources/xlf/Resources.cs.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1638,7 +1638,7 @@
<note />
</trans-unit>
<trans-unit id="ConflictInFrameworkPlatform">
<source>Conflicts in framework/platform identifier of provided sources.</source>
<source>The given test sources target multiple frameworks/platforms that are incompatible. Please make sure the sources target the same framework and platform.</source>
<target state="new">Conflicts in framework/platform identifier of provided sources.</target>
<note></note>
</trans-unit>
Expand Down
2 changes: 1 addition & 1 deletion src/vstest.console/Resources/xlf/Resources.de.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1638,7 +1638,7 @@
<note />
</trans-unit>
<trans-unit id="ConflictInFrameworkPlatform">
<source>Conflicts in framework/platform identifier of provided sources.</source>
<source>The given test sources target multiple frameworks/platforms that are incompatible. Please make sure the sources target the same framework and platform.</source>
<target state="new">Conflicts in framework/platform identifier of provided sources.</target>
<note></note>
</trans-unit>
Expand Down
2 changes: 1 addition & 1 deletion src/vstest.console/Resources/xlf/Resources.es.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1643,7 +1643,7 @@
<note />
</trans-unit>
<trans-unit id="ConflictInFrameworkPlatform">
<source>Conflicts in framework/platform identifier of provided sources.</source>
<source>The given test sources target multiple frameworks/platforms that are incompatible. Please make sure the sources target the same framework and platform.</source>
<target state="new">Conflicts in framework/platform identifier of provided sources.</target>
<note></note>
</trans-unit>
Expand Down
2 changes: 1 addition & 1 deletion src/vstest.console/Resources/xlf/Resources.fr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1638,7 +1638,7 @@
<note />
</trans-unit>
<trans-unit id="ConflictInFrameworkPlatform">
<source>Conflicts in framework/platform identifier of provided sources.</source>
<source>The given test sources target multiple frameworks/platforms that are incompatible. Please make sure the sources target the same framework and platform.</source>
<target state="new">Conflicts in framework/platform identifier of provided sources.</target>
<note></note>
</trans-unit>
Expand Down
2 changes: 1 addition & 1 deletion src/vstest.console/Resources/xlf/Resources.it.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1638,7 +1638,7 @@
<note />
</trans-unit>
<trans-unit id="ConflictInFrameworkPlatform">
<source>Conflicts in framework/platform identifier of provided sources.</source>
<source>The given test sources target multiple frameworks/platforms that are incompatible. Please make sure the sources target the same framework and platform.</source>
<target state="new">Conflicts in framework/platform identifier of provided sources.</target>
<note></note>
</trans-unit>
Expand Down
2 changes: 1 addition & 1 deletion src/vstest.console/Resources/xlf/Resources.ja.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1638,7 +1638,7 @@
<note />
</trans-unit>
<trans-unit id="ConflictInFrameworkPlatform">
<source>Conflicts in framework/platform identifier of provided sources.</source>
<source>The given test sources target multiple frameworks/platforms that are incompatible. Please make sure the sources target the same framework and platform.</source>
<target state="new">Conflicts in framework/platform identifier of provided sources.</target>
<note></note>
</trans-unit>
Expand Down
2 changes: 1 addition & 1 deletion src/vstest.console/Resources/xlf/Resources.ko.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1638,7 +1638,7 @@
<note />
</trans-unit>
<trans-unit id="ConflictInFrameworkPlatform">
<source>Conflicts in framework/platform identifier of provided sources.</source>
<source>The given test sources target multiple frameworks/platforms that are incompatible. Please make sure the sources target the same framework and platform.</source>
<target state="new">Conflicts in framework/platform identifier of provided sources.</target>
<note></note>
</trans-unit>
Expand Down
2 changes: 1 addition & 1 deletion src/vstest.console/Resources/xlf/Resources.pl.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1636,7 +1636,7 @@
<note />
</trans-unit>
<trans-unit id="ConflictInFrameworkPlatform">
<source>Conflicts in framework/platform identifier of provided sources.</source>
<source>The given test sources target multiple frameworks/platforms that are incompatible. Please make sure the sources target the same framework and platform.</source>
<target state="new">Conflicts in framework/platform identifier of provided sources.</target>
<note></note>
</trans-unit>
Expand Down
2 changes: 1 addition & 1 deletion src/vstest.console/Resources/xlf/Resources.pt-BR.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1636,7 +1636,7 @@
<note />
</trans-unit>
<trans-unit id="ConflictInFrameworkPlatform">
<source>Conflicts in framework/platform identifier of provided sources.</source>
<source>The given test sources target multiple frameworks/platforms that are incompatible. Please make sure the sources target the same framework and platform.</source>
<target state="new">Conflicts in framework/platform identifier of provided sources.</target>
<note></note>
</trans-unit>
Expand Down
2 changes: 1 addition & 1 deletion src/vstest.console/Resources/xlf/Resources.ru.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1638,7 +1638,7 @@
<note />
</trans-unit>
<trans-unit id="ConflictInFrameworkPlatform">
<source>Conflicts in framework/platform identifier of provided sources.</source>
<source>The given test sources target multiple frameworks/platforms that are incompatible. Please make sure the sources target the same framework and platform.</source>
<target state="new">Conflicts in framework/platform identifier of provided sources.</target>
<note></note>
</trans-unit>
Expand Down
2 changes: 1 addition & 1 deletion src/vstest.console/Resources/xlf/Resources.tr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1638,7 +1638,7 @@
<note />
</trans-unit>
<trans-unit id="ConflictInFrameworkPlatform">
<source>Conflicts in framework/platform identifier of provided sources.</source>
<source>The given test sources target multiple frameworks/platforms that are incompatible. Please make sure the sources target the same framework and platform.</source>
<target state="new">Conflicts in framework/platform identifier of provided sources.</target>
<note></note>
</trans-unit>
Expand Down
2 changes: 1 addition & 1 deletion src/vstest.console/Resources/xlf/Resources.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,7 +820,7 @@
<note></note>
</trans-unit>
<trans-unit id="ConflictInFrameworkPlatform">
<source>Conflicts in framework/platform identifier of provided sources.</source>
<source>The given test sources target multiple frameworks/platforms that are incompatible. Please make sure the sources target the same framework and platform.</source>
<target state="new">Conflicts in framework/platform identifier of provided sources.</target>
<note></note>
</trans-unit>
Expand Down
2 changes: 1 addition & 1 deletion src/vstest.console/Resources/xlf/Resources.zh-Hans.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1638,7 +1638,7 @@
<note />
</trans-unit>
<trans-unit id="ConflictInFrameworkPlatform">
<source>Conflicts in framework/platform identifier of provided sources.</source>
<source>The given test sources target multiple frameworks/platforms that are incompatible. Please make sure the sources target the same framework and platform.</source>
<target state="new">Conflicts in framework/platform identifier of provided sources.</target>
<note></note>
</trans-unit>
Expand Down
2 changes: 1 addition & 1 deletion src/vstest.console/Resources/xlf/Resources.zh-Hant.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1638,7 +1638,7 @@
<note />
</trans-unit>
<trans-unit id="ConflictInFrameworkPlatform">
<source>Conflicts in framework/platform identifier of provided sources.</source>
<source>The given test sources target multiple frameworks/platforms that are incompatible. Please make sure the sources target the same framework and platform.</source>
<target state="new">Conflicts in framework/platform identifier of provided sources.</target>
<note></note>
</trans-unit>
Expand Down
2 changes: 1 addition & 1 deletion test/Microsoft.TestPlatform.AcceptanceTests/ExecutionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ public void UnhandleExceptionExceptionShouldBeLoggedToDiagLogFile(RunnerInfo run
public void IncompatibleSourcesWarningShouldBeDisplayedInTheConsole(RunnerInfo runnerInfo)
{
AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
var expectedErrorContains = @"Conflicts in framework/platform identifier of provided sources.";
var expectedErrorContains = @"The given test sources target multiple frameworks/platforms that are incompatible. Please make sure the sources target the same framework and platform.";
var assemblyPaths =
this.BuildMultipleAssemblyPath("SimpleTestProject3.dll", "SimpleTestProjectx86.dll").Trim('\"');
var arguments = PrepareArguments(assemblyPaths, this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue, runnerInfo.InIsolationValue);
Expand Down