Skip to content

Commit c5ca111

Browse files
author
Paul van Brenk
committed
Separate VSIX for the test adapter
Pull TestAdapter out of NodeTools VSIX
1 parent 8b15b61 commit c5ca111

File tree

18 files changed

+257
-67
lines changed

18 files changed

+257
-67
lines changed

‎Nodejs/NodejsTools.sln‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PressAnyKey", "Product\Pres
2525
EndProject
2626
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Targets", "Product\Targets\Targets.csproj", "{CBA217C4-4338-4E50-9DEC-9227705F8124}"
2727
EndProject
28+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestAdapterVsix", "Product\TestAdapterVsix\TestAdapterVsix.csproj", "{4EB09870-7422-4368-B8C8-74582764EAB3}"
29+
EndProject
2830
Global
2931
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3032
Debug|Any CPU = Debug|Any CPU
@@ -89,6 +91,14 @@ Global
8991
{CBA217C4-4338-4E50-9DEC-9227705F8124}.Release|Any CPU.Build.0 = Release|Any CPU
9092
{CBA217C4-4338-4E50-9DEC-9227705F8124}.Release|x86.ActiveCfg = Release|Any CPU
9193
{CBA217C4-4338-4E50-9DEC-9227705F8124}.Release|x86.Build.0 = Release|Any CPU
94+
{4EB09870-7422-4368-B8C8-74582764EAB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
95+
{4EB09870-7422-4368-B8C8-74582764EAB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
96+
{4EB09870-7422-4368-B8C8-74582764EAB3}.Debug|x86.ActiveCfg = Debug|Any CPU
97+
{4EB09870-7422-4368-B8C8-74582764EAB3}.Debug|x86.Build.0 = Debug|Any CPU
98+
{4EB09870-7422-4368-B8C8-74582764EAB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
99+
{4EB09870-7422-4368-B8C8-74582764EAB3}.Release|Any CPU.Build.0 = Release|Any CPU
100+
{4EB09870-7422-4368-B8C8-74582764EAB3}.Release|x86.ActiveCfg = Release|Any CPU
101+
{4EB09870-7422-4368-B8C8-74582764EAB3}.Release|x86.Build.0 = Release|Any CPU
92102
EndGlobalSection
93103
GlobalSection(SolutionProperties) = preSolution
94104
HideSolutionNode = FALSE
@@ -102,5 +112,6 @@ Global
102112
{5085DF35-3A32-4894-835E-E5A3956D4F57} = {F9719B35-F359-47A7-A2F8-34F42E53C809}
103113
{CB61D8BD-48DC-40F4-A4BA-5B68A10A7481} = {F9719B35-F359-47A7-A2F8-34F42E53C809}
104114
{CBA217C4-4338-4E50-9DEC-9227705F8124} = {F9719B35-F359-47A7-A2F8-34F42E53C809}
115+
{4EB09870-7422-4368-B8C8-74582764EAB3} = {F9719B35-F359-47A7-A2F8-34F42E53C809}
105116
EndGlobalSection
106117
EndGlobal

‎Nodejs/Product/Nodejs/Nodejs.csproj‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1000,22 +1000,6 @@
10001000
<SubType>Designer</SubType>
10011001
</ZipItem>
10021002
<ZipItem Include="Templates\Files\UnitTest\UnitTest.js" />
1003-
<Content Include="TestFrameworks\find_tests.js">
1004-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1005-
<IncludeInVSIX>true</IncludeInVSIX>
1006-
</Content>
1007-
<Content Include="TestFrameworks\run_tests.js">
1008-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1009-
<IncludeInVSIX>true</IncludeInVSIX>
1010-
</Content>
1011-
<Content Include="TestFrameworks\ExportRunner\exportrunner.js">
1012-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1013-
<IncludeInVSIX>true</IncludeInVSIX>
1014-
</Content>
1015-
<Content Include="TestFrameworks\Mocha\mocha.js">
1016-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1017-
<IncludeInVSIX>true</IncludeInVSIX>
1018-
</Content>
10191003
<ZipItem Include="Templates\Files\UnitTest\UnitTest.vstemplate">
10201004
<SubType>Designer</SubType>
10211005
</ZipItem>
@@ -1025,9 +1009,6 @@
10251009
</ZipItem>
10261010
<None Include="Theme\Microsoft.NodejsTools.theme.v14.0.pkgdef" />
10271011
<None Include="Theme\Microsoft.NodejsTools.theme.v15.0.pkgdef" />
1028-
<Content Include="TestFrameworks\Tape\tape.js">
1029-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1030-
</Content>
10311012
<Resource Include="version.txt" />
10321013
<Content Include="VSTemplateStore.pkgdef">
10331014
<IncludeInVSIX>false</IncludeInVSIX>

‎Nodejs/Product/Nodejs/source.extension.vsixmanifest‎

Lines changed: 30 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,32 @@
11
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
2-
<Metadata>
3-
<Identity Id="FE8A8C3D-328A-476D-99F9-2A24B75F8C7F" Version="|%CurrentProject%;GetVSIXVersion|" Language="en-US" Publisher="Microsoft" />
4-
<DisplayName>Node.js Tools</DisplayName>
5-
<Description xml:space="preserve">Provides support for editing and debugging Node.js programs.</Description>
6-
<MoreInfo>http://go.microsoft.com/fwlink/?LinkId=785971</MoreInfo>
7-
<GettingStartedGuide>http://go.microsoft.com/fwlink/?LinkId=785972</GettingStartedGuide>
8-
<Icon>NodeJS.ico</Icon>
9-
<PreviewImage>NodeJS_200x.png</PreviewImage>
10-
<PackageId>Microsoft.VisualStudio.NodejsTools.NodejsTools</PackageId>
11-
</Metadata>
12-
<Installation>
13-
<InstallationTarget Version="[15.0.0,16.0)" Id="Microsoft.VisualStudio.Community" />
14-
<InstallationTarget Version="[15.0.0,16.0)" Id="Microsoft.VisualStudio.Pro" />
15-
<InstallationTarget Version="[15.0.0,16.0)" Id="Microsoft.VisualStudio.Enterprise" />
16-
</Installation>
17-
<Dependencies>
18-
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" Version="4.5" />
19-
</Dependencies>
20-
<Prerequisites>
21-
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
22-
<Prerequisite Id="Microsoft.VisualStudio.Component.JavaScript.TypeScript" Version="[15.0,16.0)" DisplayName="JavaScript and TypeScript language support" />
23-
</Prerequisites>
24-
<Assets>
25-
<Asset Type="Microsoft.VisualStudio.Package" Path="|%CurrentProject%|" d:Source="Project" d:ProjectName="%CurrentProject%" />
26-
<Asset Type="Microsoft.VisualStudio.Assembly" Path="|%CurrentProject%|" />
27-
<Asset Type="Microsoft.VisualStudio.MefComponent" Path="|%CurrentProject%|" />
28-
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="TestAdapter" Path="|TestAdapter|" AssemblyName="|TestAdapter;AssemblyName|" />
29-
<Asset Type="UnitTestExtension" d:Source="Project" d:ProjectName="TestAdapter" Path="|TestAdapter|" AssemblyName="|TestAdapter;AssemblyName|" />
30-
<Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="ProjectWizard" Path="|ProjectWizard|" AssemblyName="|ProjectWizard;AssemblyName|" />
31-
<Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="%CurrentProject%" d:TargetPath="|%CurrentProject%;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
32-
<Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" d:ProjectName="%CurrentProject%" d:TargetPath="|%CurrentProject%;TemplateProjectOutputGroup|" Path="ItemTemplates" d:VsixSubPath="ItemTemplates" />
33-
</Assets>
2+
<Metadata>
3+
<Identity Id="FE8A8C3D-328A-476D-99F9-2A24B75F8C7F" Version="|%CurrentProject%;GetVSIXVersion|" Language="en-US" Publisher="Microsoft" />
4+
<DisplayName>Node.js Tools</DisplayName>
5+
<Description xml:space="preserve">Provides support for editing and debugging Node.js programs.</Description>
6+
<MoreInfo>http://go.microsoft.com/fwlink/?LinkId=785971</MoreInfo>
7+
<GettingStartedGuide>http://go.microsoft.com/fwlink/?LinkId=785972</GettingStartedGuide>
8+
<Icon>NodeJS.ico</Icon>
9+
<PreviewImage>NodeJS_200x.png</PreviewImage>
10+
<PackageId>Microsoft.VisualStudio.NodejsTools.NodejsTools</PackageId>
11+
</Metadata>
12+
<Installation>
13+
<InstallationTarget Version="[15.0.0,16.0)" Id="Microsoft.VisualStudio.Community" />
14+
<InstallationTarget Version="[15.0.0,16.0)" Id="Microsoft.VisualStudio.Pro" />
15+
<InstallationTarget Version="[15.0.0,16.0)" Id="Microsoft.VisualStudio.Enterprise" />
16+
</Installation>
17+
<Dependencies>
18+
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" Version="4.5" />
19+
</Dependencies>
20+
<Prerequisites>
21+
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
22+
<Prerequisite Id="Microsoft.VisualStudio.Component.JavaScript.TypeScript" Version="[15.0,16.0)" DisplayName="JavaScript and TypeScript language support" />
23+
</Prerequisites>
24+
<Assets>
25+
<Asset Type="Microsoft.VisualStudio.Package" Path="|%CurrentProject%|" d:Source="Project" d:ProjectName="%CurrentProject%" />
26+
<Asset Type="Microsoft.VisualStudio.Assembly" Path="|%CurrentProject%|" />
27+
<Asset Type="Microsoft.VisualStudio.MefComponent" Path="|%CurrentProject%|" />
28+
<Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="ProjectWizard" Path="|ProjectWizard|" AssemblyName="|ProjectWizard;AssemblyName|" />
29+
<Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="%CurrentProject%" d:TargetPath="|%CurrentProject%;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
30+
<Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" d:ProjectName="%CurrentProject%" d:TargetPath="|%CurrentProject%;TemplateProjectOutputGroup|" Path="ItemTemplates" d:VsixSubPath="ItemTemplates" />
31+
</Assets>
3432
</PackageManifest>

‎Nodejs/Product/TestAdapter/TestAdapter.csproj‎

Lines changed: 33 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@
4242
<Reference Include="envdte90, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
4343
<EmbedInteropTypes>False</EmbedInteropTypes>
4444
</Reference>
45-
<Reference Include="Microsoft.Diagnostics.Tracing.EventSource, Version=1.1.16.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
46-
<HintPath>..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\lib\net45\Microsoft.Diagnostics.Tracing.EventSource.dll</HintPath>
45+
<Reference Include="Microsoft.Diagnostics.Tracing.EventSource, Version=1.1.28.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
46+
<HintPath>..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.28\lib\net46\Microsoft.Diagnostics.Tracing.EventSource.dll</HintPath>
4747
</Reference>
4848
<Reference Include="Microsoft.VisualStudio.RemoteControl, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
4949
<HintPath>..\..\packages\Microsoft.VisualStudio.RemoteControl.14.0.262-masterA5CACE98\lib\net45\Microsoft.VisualStudio.RemoteControl.dll</HintPath>
5050
</Reference>
5151
<Reference Include="Microsoft.VisualStudio.Telemetry, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
52-
<HintPath>..\..\packages\Microsoft.VisualStudio.Telemetry.15.3.789-masterCC863119\lib\net45\Microsoft.VisualStudio.Telemetry.dll</HintPath>
52+
<HintPath>..\..\packages\Microsoft.VisualStudio.Telemetry.15.3.795-master67D3E818\lib\net45\Microsoft.VisualStudio.Telemetry.dll</HintPath>
5353
</Reference>
5454
<Reference Include="Microsoft.VisualStudio.TestPlatform.ObjectModel">
5555
<HintPath>$(DevEnvDir)CommonExtensions\Microsoft\TestWindow\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll</HintPath>
@@ -76,10 +76,10 @@
7676
<Reference Include="Microsoft.VisualStudio.CoreUtility" />
7777
<Reference Include="Microsoft.VisualStudio.OLE.Interop" />
7878
<Reference Include="Microsoft.VisualStudio.Utilities.Internal, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
79-
<HintPath>..\..\packages\Microsoft.VisualStudio.Utilities.Internal.14.0.72-masterF9EB1D39\lib\net45\Microsoft.VisualStudio.Utilities.Internal.dll</HintPath>
79+
<HintPath>..\..\packages\Microsoft.VisualStudio.Utilities.Internal.14.0.73-master6E8F6515\lib\net45\Microsoft.VisualStudio.Utilities.Internal.dll</HintPath>
8080
</Reference>
81-
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
82-
<HintPath>..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
81+
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
82+
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
8383
</Reference>
8484
<Reference Include="PresentationCore" />
8585
<Reference Include="PresentationFramework" />
@@ -165,7 +165,33 @@
165165
<None Include="packages.config" />
166166
</ItemGroup>
167167
<ItemGroup>
168-
<Content Include="version.txt" />
168+
<Content Include="TestFrameworks\ExportRunner\exportrunner.js">
169+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
170+
<IncludeInVSIX>true</IncludeInVSIX>
171+
</Content>
172+
<Content Include="TestFrameworks\find_tests.js">
173+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
174+
<IncludeInVSIX>true</IncludeInVSIX>
175+
</Content>
176+
<Content Include="TestFrameworks\mocha\mocha.js">
177+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
178+
<IncludeInVSIX>true</IncludeInVSIX>
179+
</Content>
180+
<Content Include="TestFrameworks\run_tests.js">
181+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
182+
<IncludeInVSIX>true</IncludeInVSIX>
183+
</Content>
184+
<Content Include="TestFrameworks\Tape\tape.js">
185+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
186+
<IncludeInVSIX>true</IncludeInVSIX>
187+
</Content>
188+
</ItemGroup>
189+
<ItemGroup>
190+
<FilesToSign Include="$(OutDir)\Microsoft.NodejsTools.TestAdapter.dll">
191+
<Authenticode>Microsoft</Authenticode>
192+
<StrongName>StrongName</StrongName>
193+
<InProject>false</InProject>
194+
</FilesToSign>
169195
</ItemGroup>
170196
<Import Project="$(BuildRoot)\Nodejs\Product\Nodejs\SourceMapping\SourceMapping.proj" />
171197
<Import Project="..\ProjectAfter.settings" />
@@ -175,7 +201,5 @@
175201
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
176202
</PropertyGroup>
177203
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
178-
<Error Condition="!Exists('..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\build\portable-net45+win8+wpa81\Microsoft.Diagnostics.Tracing.EventSource.Redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\build\portable-net45+win8+wpa81\Microsoft.Diagnostics.Tracing.EventSource.Redist.targets'))" />
179204
</Target>
180-
<Import Project="..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\build\portable-net45+win8+wpa81\Microsoft.Diagnostics.Tracing.EventSource.Redist.targets" Condition="Exists('..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\build\portable-net45+win8+wpa81\Microsoft.Diagnostics.Tracing.EventSource.Redist.targets')" />
181205
</Project>

Nodejs/Product/Nodejs/TestFrameworks/ExportRunner/exportrunner.js renamed to Nodejs/Product/TestAdapter/TestFrameworks/ExportRunner/exportrunner.js

File renamed without changes.

Nodejs/Product/Nodejs/TestFrameworks/Tape/tape.js renamed to Nodejs/Product/TestAdapter/TestFrameworks/Tape/tape.js

File renamed without changes.

Nodejs/Product/Nodejs/TestFrameworks/find_tests.js renamed to Nodejs/Product/TestAdapter/TestFrameworks/find_tests.js

File renamed without changes.

Nodejs/Product/Nodejs/TestFrameworks/mocha/mocha.js renamed to Nodejs/Product/TestAdapter/TestFrameworks/mocha/mocha.js

File renamed without changes.

Nodejs/Product/Nodejs/TestFrameworks/run_tests.js renamed to Nodejs/Product/TestAdapter/TestFrameworks/run_tests.js

File renamed without changes.

‎Nodejs/Product/TestAdapter/app.config‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
66
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
7+
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
8+
</dependentAssembly>
9+
<dependentAssembly>
10+
<assemblyIdentity name="Microsoft.Diagnostics.Tracing.EventSource" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
11+
<bindingRedirect oldVersion="0.0.0.0-1.1.28.0" newVersion="1.1.28.0" />
812
</dependentAssembly>
913
</assemblyBinding>
1014
</runtime>

0 commit comments

Comments
 (0)