Skip to content

Commit 10c5048

Browse files
mousetrapsmousetraps
committed
Update NTVS to acccount for shared project changes
- Fix #79 - unit test debugging broken in VS2015 (use an environment variable to propogate the process ID of devenv.exe) - add references to new projects - Update code to account for UIThread moving into a service - Add BuildTasks project - Update code to use new Lambda converter Close #140
1 parent 7b8c5e0 commit 10c5048

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+942
-244
lines changed

‎Build/Common.Build.CSharp.targets

+42-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<PropertyGroup Condition="$(SuppressCommonAssemblyVersion)">
77
<DefineConstants>$(DefineConstants);SUPPRESS_COMMON_ASSEMBLY_VERSION</DefineConstants>
88
</PropertyGroup>
9-
9+
1010
<!--
1111
Returns the paths and names required for generating a vsixmanifest file.
1212
The default targets for this occasionally return the wrong files depending
@@ -28,7 +28,7 @@
2828
<!--
2929
Transforms our ConditionalEmbeddedResource into EmbeddedResource item
3030
groups with textual replacements in the .resx file.
31-
31+
3232
Currently the search and replace just updates the VS target version and
3333
the build root.
3434
-->
@@ -42,7 +42,7 @@
4242
Overwrite="true"/>
4343

4444
<Message Text="Written to @(ConditionalEmbeddedResource->'$(IntermediateOutputPath)%(Filename).xform.resx')" Importance="normal" />
45-
45+
4646
<ItemGroup>
4747
<FileWrites Include="@(ConditionalEmbeddedResource->'$(IntermediateOutputPath)%(Filename).xform.resx')" />
4848
<EmbeddedResource Include="@(ConditionalEmbeddedResource->'$(IntermediateOutputPath)%(Filename).xform.resx')">
@@ -54,4 +54,43 @@
5454
</ItemGroup>
5555
</Target>
5656

57+
<!--
58+
Processes {Lambda} converters in WPF XAML files and generates code for them.
59+
-->
60+
61+
<PropertyGroup>
62+
<BuildTasksProjectDir>$(BuildRoot)\Tools\BuildTasks</BuildTasksProjectDir>
63+
<BuildTasksAssembly>$(BuildOutputRoot)\ToolBinaries\BuildTasks\Microsoft.VisualStudioTools.BuildTasks.dll</BuildTasksAssembly>
64+
</PropertyGroup>
65+
<ItemGroup>
66+
<BuildTasksSourceFiles Include="$(BuildTasksProjectDir)\*.csproj"/>
67+
<BuildTasksSourceFiles Include="$(BuildTasksProjectDir)\**\*.cs"/>
68+
</ItemGroup>
69+
70+
<!-- Use Exec rather than MSBuild here to completely isolate the task build - otherwise it interferes with the main build.
71+
To avoid spawning a new msbuild.exe process again and again unnecessarily, do a quick up-to-date check (effectively
72+
duplicating the one done by .csproj) on the target. -->
73+
<Target Name="BuildBuildTasks" Inputs="@(BuildTasksSourceFiles)" Outputs="$(BuildTasksAssembly)">
74+
<Exec Command='"$(MSBuildBinPath)\msbuild.exe" "$(BuildRoot)\Tools\BuildTasks\BuildTasks.csproj"'/>
75+
</Target>
76+
77+
<UsingTask AssemblyFile="$(BuildTasksAssembly)" TaskName="Microsoft.VisualStudioTools.BuildTasks.ExtractLambdasFromXaml"/>
78+
79+
<Target Name="ExtractLambdasFromXaml"
80+
DependsOnTargets="BuildBuildTasks"
81+
Inputs="@(Page)"
82+
Outputs="@(Page->'$(IntermediateOutputPath)%(Filename).g.lambdas$(DefaultLanguageSourceExtension)')">
83+
<ExtractLambdasFromXaml InputFileName="@(Page->'%(FullPath)')" OutputFileName="$(IntermediateOutputPath)%(Filename).g.lambdas$(DefaultLanguageSourceExtension)" Language="$(Language)">
84+
<Output TaskParameter="OutputFileName" ItemName="Compile"/>
85+
<Output TaskParameter="OutputFileName" ItemName="FileWrites"/>
86+
</ExtractLambdasFromXaml>
87+
</Target>
88+
89+
<PropertyGroup>
90+
<CoreCompileDependsOn>
91+
ExtractLambdasFromXaml;
92+
$(CoreCompileDependsOn)
93+
</CoreCompileDependsOn>
94+
</PropertyGroup>
95+
5796
</Project>

‎Nodejs/NodejsTools.sln

+15-111
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.30501.0
4+
VisualStudioVersion = 12.0.31101.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nodejs", "Product\Nodejs\Nodejs.csproj", "{32EC5259-98DA-40CA-9E2D-1B1B2E966F88}"
77
ProjectSection(ProjectDependencies) = postProject
@@ -66,117 +66,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JSAnalysisTests", "Tests\An
6666
EndProject
6767
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AnalysisDriver", "Tests\AnalysisDriver\AnalysisDriver.csproj", "{F83AC573-0546-4BC5-A3F3-BA0261636778}"
6868
EndProject
69+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MockVsTests", "..\Common\Tests\MockVsTests\MockVsTests.csproj", "{A390E1C0-0D90-4A9E-8413-3E959BB07292}"
70+
EndProject
71+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildTasks", "..\Tools\BuildTasks\BuildTasks.csproj", "{E5F7D6B9-8D5A-416D-8F16-2BDC3576A5A3}"
72+
EndProject
6973
Global
70-
GlobalSection(TeamFoundationVersionControl) = preSolution
71-
SccNumberOfProjects = 27
72-
SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
73-
SccTeamFoundationServer = http://vstfdevdiv:8080/devdiv2
74-
SccLocalPath0 = .
75-
SccProjectUniqueName1 = Product\\InteractiveWindow\\InteractiveWindow.csproj
76-
SccProjectTopLevelParentUniqueName1 = NodejsTools.sln
77-
SccProjectName1 = Product/InteractiveWindow
78-
SccLocalPath1 = Product\\InteractiveWindow
79-
SccProjectUniqueName2 = Product\\ReferenceGenerator\\ReferenceGenerator.csproj
80-
SccProjectTopLevelParentUniqueName2 = NodejsTools.sln
81-
SccProjectName2 = Product/ReferenceGenerator
82-
SccLocalPath2 = Product\\ReferenceGenerator
83-
SccProjectUniqueName3 = Product\\LogConverter\\LogConverter.csproj
84-
SccProjectTopLevelParentUniqueName3 = NodejsTools.sln
85-
SccProjectName3 = Product/LogConverter
86-
SccLocalPath3 = Product\\LogConverter
87-
SccProjectUniqueName4 = Product\\Profiling\\Profiling.csproj
88-
SccProjectTopLevelParentUniqueName4 = NodejsTools.sln
89-
SccProjectName4 = Product/Profiling
90-
SccLocalPath4 = Product\\Profiling
91-
SccProjectUniqueName5 = Tests\\Profiling\\ProfilerTests.csproj
92-
SccProjectTopLevelParentUniqueName5 = NodejsTools.sln
93-
SccProjectName5 = Tests/Profiling
94-
SccLocalPath5 = Tests\\Profiling
95-
SccProjectUniqueName6 = Tests\\Profiling.UI\\ProfilerUITests.csproj
96-
SccProjectTopLevelParentUniqueName6 = NodejsTools.sln
97-
SccProjectName6 = Tests/Profiling.UI
98-
SccLocalPath6 = Tests\\Profiling.UI
99-
SccProjectUniqueName7 = Tests\\Utilities.UI\\TestUtilities.UI.Nodejs.csproj
100-
SccProjectTopLevelParentUniqueName7 = NodejsTools.sln
101-
SccProjectName7 = Tests/Utilities.UI
102-
SccLocalPath7 = Tests\\Utilities.UI
103-
SccProjectUniqueName8 = Tests\\Core.UI\\Nodejs.Tests.UI.csproj
104-
SccProjectTopLevelParentUniqueName8 = NodejsTools.sln
105-
SccProjectName8 = Tests/Core.UI
106-
SccLocalPath8 = Tests\\Core.UI
107-
SccProjectUniqueName9 = ..\\Common\\Tests\\Utilities\\TestUtilities.csproj
108-
SccProjectTopLevelParentUniqueName9 = NodejsTools.sln
109-
SccProjectName9 = ../Common/Tests/Utilities
110-
SccLocalPath9 = ..\\Common\\Tests\\Utilities
111-
SccProjectUniqueName10 = ..\\Common\\Tests\\Utilities.UI\\TestUtilities.UI.csproj
112-
SccProjectTopLevelParentUniqueName10 = NodejsTools.sln
113-
SccProjectName10 = ../Common/Tests/Utilities.UI
114-
SccLocalPath10 = ..\\Common\\Tests\\Utilities.UI
115-
SccProjectUniqueName11 = Tests\\Utilities.Nodejs\\TestUtilities.Nodejs.csproj
116-
SccProjectTopLevelParentUniqueName11 = NodejsTools.sln
117-
SccProjectName11 = Tests/Utilities.Nodejs
118-
SccLocalPath11 = Tests\\Utilities.Nodejs
119-
SccProjectUniqueName12 = Tests\\Core\\NodejsTests.csproj
120-
SccProjectTopLevelParentUniqueName12 = NodejsTools.sln
121-
SccProjectName12 = Tests/Core
122-
SccLocalPath12 = Tests\\Core
123-
SccProjectUniqueName13 = ..\\Common\\Tests\\SharedProjectTests\\SharedProjectTests.csproj
124-
SccProjectTopLevelParentUniqueName13 = NodejsTools.sln
125-
SccProjectName13 = ../Common/Tests/SharedProjectTests
126-
SccLocalPath13 = ..\\Common\\Tests\\SharedProjectTests
127-
SccProjectUniqueName14 = Product\\Nodejs\\Nodejs.csproj
128-
SccProjectTopLevelParentUniqueName14 = NodejsTools.sln
129-
SccProjectName14 = Product/Nodejs
130-
SccLocalPath14 = Product\\Nodejs
131-
SccProjectUniqueName15 = ..\\Common\\Tests\\SccPackage\\TestSccPackage.csproj
132-
SccProjectTopLevelParentUniqueName15 = NodejsTools.sln
133-
SccProjectName15 = ../Common/Tests/SccPackage
134-
SccLocalPath15 = ..\\Common\\Tests\\SccPackage
135-
SccProjectUniqueName16 = Product\\ProjectWizard\\ProjectWizard.csproj
136-
SccProjectTopLevelParentUniqueName16 = NodejsTools.sln
137-
SccProjectName16 = Product/ProjectWizard
138-
SccLocalPath16 = Product\\ProjectWizard
139-
SccProjectUniqueName17 = Product\\WebRole\\WebRole.csproj
140-
SccProjectTopLevelParentUniqueName17 = NodejsTools.sln
141-
SccProjectName17 = Product/WebRole
142-
SccLocalPath17 = Product\\WebRole
143-
SccProjectUniqueName18 = Product\\Npm\\Npm.csproj
144-
SccProjectTopLevelParentUniqueName18 = NodejsTools.sln
145-
SccProjectName18 = Product/Npm
146-
SccLocalPath18 = Product\\Npm
147-
SccProjectUniqueName19 = Tests\\NpmTests\\NpmTests.csproj
148-
SccProjectTopLevelParentUniqueName19 = NodejsTools.sln
149-
SccProjectName19 = Tests/NpmTests
150-
SccLocalPath19 = Tests\\NpmTests
151-
SccProjectUniqueName20 = Product\\TestAdapter\\TestAdapter.csproj
152-
SccProjectTopLevelParentUniqueName20 = NodejsTools.sln
153-
SccProjectName20 = Product/TestAdapter
154-
SccLocalPath20 = Product\\TestAdapter
155-
SccProjectUniqueName21 = Tests\\TestAdapterTests\\TestAdapterTests.csproj
156-
SccProjectTopLevelParentUniqueName21 = NodejsTools.sln
157-
SccProjectName21 = Tests/TestAdapterTests
158-
SccLocalPath21 = Tests\\TestAdapterTests
159-
SccProjectUniqueName22 = Tests\\AzurePublishing.UI\\AzurePublishing.Tests.UI.csproj
160-
SccProjectTopLevelParentUniqueName22 = NodejsTools.sln
161-
SccProjectName22 = Tests/AzurePublishing.UI
162-
SccLocalPath22 = Tests\\AzurePublishing.UI
163-
SccProjectUniqueName23 = Product\\PressAnyKey\\PressAnyKey.csproj
164-
SccProjectTopLevelParentUniqueName23 = NodejsTools.sln
165-
SccProjectName23 = Product/PressAnyKey
166-
SccLocalPath23 = Product\\PressAnyKey
167-
SccProjectUniqueName24 = Tests\\AnalysisTests\\JSAnalysisTests.csproj
168-
SccProjectTopLevelParentUniqueName24 = NodejsTools.sln
169-
SccProjectName24 = Tests/AnalysisTests
170-
SccLocalPath24 = Tests\\AnalysisTests
171-
SccProjectUniqueName25 = Product\\Analysis\\Analysis.csproj
172-
SccProjectTopLevelParentUniqueName25 = NodejsTools.sln
173-
SccProjectName25 = Product/Analysis
174-
SccLocalPath25 = Product\\Analysis
175-
SccProjectUniqueName26 = Tests\\AnalysisDriver\\AnalysisDriver.csproj
176-
SccProjectTopLevelParentUniqueName26 = NodejsTools.sln
177-
SccProjectName26 = Tests/AnalysisDriver
178-
SccLocalPath26 = Tests\\AnalysisDriver
179-
EndGlobalSection
18074
GlobalSection(SolutionConfigurationPlatforms) = preSolution
18175
Debug|x86 = Debug|x86
18276
Release|x86 = Release|x86
@@ -286,6 +180,14 @@ Global
286180
{F83AC573-0546-4BC5-A3F3-BA0261636778}.Debug|x86.Build.0 = Debug|x86
287181
{F83AC573-0546-4BC5-A3F3-BA0261636778}.Release|x86.ActiveCfg = Release|x86
288182
{F83AC573-0546-4BC5-A3F3-BA0261636778}.Release|x86.Build.0 = Release|x86
183+
{A390E1C0-0D90-4A9E-8413-3E959BB07292}.Debug|x86.ActiveCfg = Debug|x86
184+
{A390E1C0-0D90-4A9E-8413-3E959BB07292}.Debug|x86.Build.0 = Debug|x86
185+
{A390E1C0-0D90-4A9E-8413-3E959BB07292}.Release|x86.ActiveCfg = Release|x86
186+
{A390E1C0-0D90-4A9E-8413-3E959BB07292}.Release|x86.Build.0 = Release|x86
187+
{E5F7D6B9-8D5A-416D-8F16-2BDC3576A5A3}.Debug|x86.ActiveCfg = Debug|x86
188+
{E5F7D6B9-8D5A-416D-8F16-2BDC3576A5A3}.Debug|x86.Build.0 = Debug|x86
189+
{E5F7D6B9-8D5A-416D-8F16-2BDC3576A5A3}.Release|x86.ActiveCfg = Release|x86
190+
{E5F7D6B9-8D5A-416D-8F16-2BDC3576A5A3}.Release|x86.Build.0 = Release|x86
289191
EndGlobalSection
290192
GlobalSection(SolutionProperties) = preSolution
291193
HideSolutionNode = FALSE
@@ -317,5 +219,7 @@ Global
317219
{CB61D8BD-48DC-40F4-A4BA-5B68A10A7481} = {F9719B35-F359-47A7-A2F8-34F42E53C809}
318220
{C2FA3ADC-95A6-47ED-9010-A86EDE081A73} = {850AC94A-310F-4F88-A553-2806D7732BD1}
319221
{F83AC573-0546-4BC5-A3F3-BA0261636778} = {850AC94A-310F-4F88-A553-2806D7732BD1}
222+
{A390E1C0-0D90-4A9E-8413-3E959BB07292} = {850AC94A-310F-4F88-A553-2806D7732BD1}
223+
{E5F7D6B9-8D5A-416D-8F16-2BDC3576A5A3} = {F9719B35-F359-47A7-A2F8-34F42E53C809}
320224
EndGlobalSection
321225
EndGlobal

‎Nodejs/Prerequisites/DisableSkipVerification.reg

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Windows Registry Editor Version 5.00
2323
[-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\NpmTests,B03F5F7F11D50A3A]
2424
[-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\ProfilerTests,B03F5F7F11D50A3A]
2525
[-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\ProfilingUITests,B03F5F7F11D50A3A]
26+
[-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\ReferenceGenerator,B03F5F7F11D50A3A]
2627
[-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\ReplWindowUITests,B03F5F7F11D50A3A]
2728
[-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\SharedProjectTests,B03F5F7F11D50A3A]
2829
[-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\TestAdapterTests,B03F5F7F11D50A3A]
@@ -54,6 +55,7 @@ Windows Registry Editor Version 5.00
5455
[-HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\NpmTests,B03F5F7F11D50A3A]
5556
[-HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\ProfilerTests,B03F5F7F11D50A3A]
5657
[-HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\ProfilingUITests,B03F5F7F11D50A3A]
58+
[-HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\ReferenceGenerator,B03F5F7F11D50A3A]
5759
[-HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\ReplWindowUITests,B03F5F7F11D50A3A]
5860
[-HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\SharedProjectTests,B03F5F7F11D50A3A]
5961
[-HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\TestAdapterTests,B03F5F7F11D50A3A]

‎Nodejs/Prerequisites/DisableSkipVerificationX86.reg

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Windows Registry Editor Version 5.00
2323
[-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\NpmTests,B03F5F7F11D50A3A]
2424
[-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\ProfilerTests,B03F5F7F11D50A3A]
2525
[-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\ProfilingUITests,B03F5F7F11D50A3A]
26+
[-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\ReferenceGenerator,B03F5F7F11D50A3A]
2627
[-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\ReplWindowUITests,B03F5F7F11D50A3A]
2728
[-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\SharedProjectTests,B03F5F7F11D50A3A]
2829
[-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\TestAdapterTests,B03F5F7F11D50A3A]

‎Nodejs/Prerequisites/EnableSkipVerification.reg

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Windows Registry Editor Version 5.00
2323
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\NpmTests,B03F5F7F11D50A3A]
2424
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\ProfilerTests,B03F5F7F11D50A3A]
2525
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\ProfilingUITests,B03F5F7F11D50A3A]
26+
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\ReferenceGenerator,B03F5F7F11D50A3A]
2627
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\ReplWindowUITests,B03F5F7F11D50A3A]
2728
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\SharedProjectTests,B03F5F7F11D50A3A]
2829
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\TestAdapterTests,B03F5F7F11D50A3A]
@@ -54,6 +55,7 @@ Windows Registry Editor Version 5.00
5455
[HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\NpmTests,B03F5F7F11D50A3A]
5556
[HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\ProfilerTests,B03F5F7F11D50A3A]
5657
[HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\ProfilingUITests,B03F5F7F11D50A3A]
58+
[HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\ReferenceGenerator,B03F5F7F11D50A3A]
5759
[HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\ReplWindowUITests,B03F5F7F11D50A3A]
5860
[HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\SharedProjectTests,B03F5F7F11D50A3A]
5961
[HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\TestAdapterTests,B03F5F7F11D50A3A]

‎Nodejs/Prerequisites/EnableSkipVerificationX86.reg

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Windows Registry Editor Version 5.00
2323
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\NpmTests,B03F5F7F11D50A3A]
2424
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\ProfilerTests,B03F5F7F11D50A3A]
2525
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\ProfilingUITests,B03F5F7F11D50A3A]
26+
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\ReferenceGenerator,B03F5F7F11D50A3A]
2627
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\ReplWindowUITests,B03F5F7F11D50A3A]
2728
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\SharedProjectTests,B03F5F7F11D50A3A]
2829
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\TestAdapterTests,B03F5F7F11D50A3A]

‎Nodejs/Prerequisites/generate.js

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ var assemblies = [
1313
'DebuggerUITests',
1414
'JSAnalysisTests',
1515
'ProfilingUITests',
16+
'ReferenceGenerator',
1617
'ReplWindowUITests',
1718
'TestSccPackage',
1819
'SharedProjectTests',

‎Nodejs/Product/Nodejs/BaseNodeProjectFactory.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
namespace Microsoft.NodejsTools {
2828
[Guid(Guids.NodejsBaseProjectFactoryString)]
2929
class BaseNodeProjectFactory : ProjectFactory {
30-
public BaseNodeProjectFactory(NodejsProjectPackage package) : base(package) {
30+
public BaseNodeProjectFactory(NodejsProjectPackage package)
31+
: base((IServiceProvider)package) {
3132
}
3233

3334
internal override ProjectNode CreateProject() {
34-
NodejsProjectNode project = new NodejsProjectNode((NodejsProjectPackage)Package);
35-
project.SetSite((IOleServiceProvider)((IServiceProvider)Package).GetService(typeof(IOleServiceProvider)));
35+
NodejsProjectNode project = new NodejsProjectNode((NodejsProjectPackage)Site);
3636
return project;
3737
}
3838

‎Nodejs/Product/Nodejs/Commands/DiagnosticsCommand.cs

+7-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@ namespace Microsoft.NodejsTools.Commands {
3232
/// Provides the command for starting a file or the start item of a project in the REPL window.
3333
/// </summary>
3434
internal sealed class DiagnosticsCommand : Command {
35+
private readonly IServiceProvider _serviceProvider;
36+
37+
public DiagnosticsCommand(IServiceProvider serviceProvider) {
38+
_serviceProvider = serviceProvider;
39+
}
40+
3541
public override void DoCommand(object sender, EventArgs args) {
3642
var dlg = new DiagnosticsForm("Gathering data...");
3743

@@ -124,7 +130,7 @@ private string GetData() {
124130

125131
try {
126132
res.AppendLine("Logged events/stats:");
127-
var inMemLogger = NodejsPackage.ComponentModel.GetService<InMemoryLogger>();
133+
var inMemLogger = NodejsPackage.Instance.GetComponentModel().GetService<InMemoryLogger>();
128134
res.AppendLine(inMemLogger.ToString());
129135
res.AppendLine();
130136
} catch (Exception ex) {

‎Nodejs/Product/Nodejs/Debugger/DataTips/DataTipTextManagerEvents.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@
2222
namespace Microsoft.NodejsTools.Debugger.DataTips {
2323
internal class DataTipTextManagerEvents : IVsTextManagerEvents {
2424
private readonly IVsEditorAdaptersFactoryService _editorAdaptersFactory;
25+
private readonly IServiceProvider _serviceProvider;
2526

2627
public DataTipTextManagerEvents(IServiceProvider serviceProvider) {
28+
_serviceProvider = serviceProvider;
2729
var componentModel = (IComponentModel)serviceProvider.GetService(typeof(SComponentModel));
2830
_editorAdaptersFactory = componentModel.GetService<IVsEditorAdaptersFactoryService>();
2931
}
@@ -34,7 +36,7 @@ public void OnRegisterMarkerType(int iMarkerType) {
3436
public void OnRegisterView(IVsTextView pView) {
3537
var wpfTextView = _editorAdaptersFactory.GetWpfTextView(pView);
3638
if (wpfTextView != null && wpfTextView.TextBuffer.ContentType.IsOfType(NodejsConstants.Nodejs)) {
37-
new DataTipTextViewFilter(pView);
39+
new DataTipTextViewFilter(_serviceProvider, pView);
3840
}
3941
}
4042

‎Nodejs/Product/Nodejs/Debugger/DataTips/DataTipTextViewFilter.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ internal sealed class DataTipTextViewFilter : IOleCommandTarget, IVsTextViewFilt
3232
private readonly IWpfTextView _wpfTextView;
3333
private readonly IOleCommandTarget _next;
3434

35-
public DataTipTextViewFilter(IVsTextView vsTextView) {
35+
public DataTipTextViewFilter(System.IServiceProvider serviceProvider, IVsTextView vsTextView) {
3636
_debugger = (IVsDebugger)NodejsPackage.GetGlobalService(typeof(IVsDebugger));
3737
vsTextView.GetBuffer(out _vsTextLines);
3838

39-
var editorAdaptersFactory = NodejsPackage.ComponentModel.GetService<IVsEditorAdaptersFactoryService>();
39+
var editorAdaptersFactory = serviceProvider.GetComponentModel().GetService<IVsEditorAdaptersFactoryService>();
4040
_wpfTextView = editorAdaptersFactory.GetWpfTextView(vsTextView);
4141

4242
ErrorHandler.ThrowOnFailure(vsTextView.AddCommandFilter(this, out _next));

0 commit comments

Comments
 (0)