Skip to content

Pass VSInstallRoot to Test Adapter #1304

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

Merged
merged 5 commits into from
Oct 4, 2016
Merged

Pass VSInstallRoot to Test Adapter #1304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
057faf1
Sync Lightweight Install Branch with Master (#1232)
mjbvz Aug 30, 2016
d3ffda8
Copy Dlls for Test Adapter into VSIX for VS15 (#1250)
mjbvz Sep 7, 2016
9010db5
Merge branch 'lightweight-install' of https://github.com/Microsoft/no…
mjbvz Sep 7, 2016
f8c9a95
Merge branch 'master' of https://github.com/Microsoft/nodejstools
mjbvz Oct 3, 2016
8910962
Pass VSInstall Root to Test Adapter
mjbvz Oct 4, 2016
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
1 change: 1 addition & 0 deletions Nodejs/Product/Nodejs/NodejsConstants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ internal class NodejsConstants {
internal const string TypeScript = "TypeScript";

internal const string NodeToolsProcessIdEnvironmentVariable = "_NTVS_PID";
internal const string NodeToolsVsInstallRootEnvironmentVariable = "_NTVS_VSINSTALLROOT";

public static string NtvsLocalAppData {
get {
Expand Down
7 changes: 7 additions & 0 deletions Nodejs/Product/Nodejs/NodejsPackage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,13 @@ protected override void Initialize() {
// The variable is inherited by child processes backing Test Explorer, and is used in
// the NTVS test discoverer and test executor to connect back to VS.
Environment.SetEnvironmentVariable(NodejsConstants.NodeToolsProcessIdEnvironmentVariable, Process.GetCurrentProcess().Id.ToString());

#if DEV15
var root = Environment.GetEnvironmentVariable("VsInstallRoot");
if (!string.IsNullOrEmpty(root)) {
Environment.SetEnvironmentVariable(NodejsConstants.NodeToolsVsInstallRootEnvironmentVariable, root);
}
#endif
}

public static LANGPREFERENCES3[] GetNodejsLanguagePreferencesFromTypeScript(IVsTextManager4 textMgr) {
Expand Down
11 changes: 10 additions & 1 deletion Nodejs/Product/TestAdapter/TestDiscoverer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,16 @@ public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discove
ValidateArg.NotNull(discoverySink, "discoverySink");
ValidateArg.NotNull(logger, "logger");

using (var buildEngine = new MSBuild.ProjectCollection()) {
var env = new Dictionary<string, string>();
#if DEV15
var root = Environment.GetEnvironmentVariable(NodejsConstants.NodeToolsVsInstallRootEnvironmentVariable);
if (!string.IsNullOrEmpty(root)) {
env["VsInstallRoot"] = root;
env["MSBuildExtensionsPath32"] = Path.Combine(root, "MSBuild");
}
#endif

using (var buildEngine = new MSBuild.ProjectCollection(env)) {
try {
// Load all the test containers passed in (.njsproj msbuild files)
foreach (string source in sources) {
Expand Down