Skip to content

Commit d3808e4

Browse files
Paul van Brenkpaulvanbrenk
Paul van Brenk
authored and
paulvanbrenk
committed
Split VSIX from dll
Split the VSIX generation from the assembly build, and combine the outputs from REPL and main Nodejs Tools project in a single VSIX
1 parent c5ca111 commit d3808e4

File tree

19 files changed

+337
-125
lines changed

19 files changed

+337
-125
lines changed

‎Nodejs/NodejsTools.sln‎

Lines changed: 23 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -27,78 +27,54 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Targets", "Product\Targets\
2727
EndProject
2828
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestAdapterVsix", "Product\TestAdapterVsix\TestAdapterVsix.csproj", "{4EB09870-7422-4368-B8C8-74582764EAB3}"
2929
EndProject
30+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NodejsToolsVsix", "Product\NodejsToolsVsix\NodejsToolsVsix.csproj", "{F3DB625F-EA2D-420F-BBC7-E4026CC6ECA3}"
31+
EndProject
3032
Global
3133
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3234
Debug|Any CPU = Debug|Any CPU
33-
Debug|x86 = Debug|x86
3435
Release|Any CPU = Release|Any CPU
35-
Release|x86 = Release|x86
3636
EndGlobalSection
3737
GlobalSection(ProjectConfigurationPlatforms) = postSolution
38-
{32EC5259-98DA-40CA-9E2D-1B1B2E966F88}.Debug|Any CPU.ActiveCfg = Debug|x86
39-
{32EC5259-98DA-40CA-9E2D-1B1B2E966F88}.Debug|x86.ActiveCfg = Debug|x86
40-
{32EC5259-98DA-40CA-9E2D-1B1B2E966F88}.Debug|x86.Build.0 = Debug|x86
41-
{32EC5259-98DA-40CA-9E2D-1B1B2E966F88}.Release|Any CPU.ActiveCfg = Release|x86
42-
{32EC5259-98DA-40CA-9E2D-1B1B2E966F88}.Release|x86.ActiveCfg = Release|x86
43-
{32EC5259-98DA-40CA-9E2D-1B1B2E966F88}.Release|x86.Build.0 = Release|x86
44-
{24A3887F-DA50-4989-8D6C-4A5B04D5D457}.Debug|Any CPU.ActiveCfg = Debug|x86
45-
{24A3887F-DA50-4989-8D6C-4A5B04D5D457}.Debug|x86.ActiveCfg = Debug|x86
46-
{24A3887F-DA50-4989-8D6C-4A5B04D5D457}.Debug|x86.Build.0 = Debug|x86
47-
{24A3887F-DA50-4989-8D6C-4A5B04D5D457}.Release|Any CPU.ActiveCfg = Release|x86
48-
{24A3887F-DA50-4989-8D6C-4A5B04D5D457}.Release|x86.ActiveCfg = Release|x86
49-
{24A3887F-DA50-4989-8D6C-4A5B04D5D457}.Release|x86.Build.0 = Release|x86
38+
{32EC5259-98DA-40CA-9E2D-1B1B2E966F88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
39+
{32EC5259-98DA-40CA-9E2D-1B1B2E966F88}.Debug|Any CPU.Build.0 = Debug|Any CPU
40+
{32EC5259-98DA-40CA-9E2D-1B1B2E966F88}.Release|Any CPU.ActiveCfg = Release|Any CPU
41+
{32EC5259-98DA-40CA-9E2D-1B1B2E966F88}.Release|Any CPU.Build.0 = Release|Any CPU
42+
{24A3887F-DA50-4989-8D6C-4A5B04D5D457}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
43+
{24A3887F-DA50-4989-8D6C-4A5B04D5D457}.Debug|Any CPU.Build.0 = Debug|Any CPU
44+
{24A3887F-DA50-4989-8D6C-4A5B04D5D457}.Release|Any CPU.ActiveCfg = Release|Any CPU
45+
{24A3887F-DA50-4989-8D6C-4A5B04D5D457}.Release|Any CPU.Build.0 = Release|Any CPU
5046
{DBC73DF7-1B4C-48BE-8B48-715297487E7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5147
{DBC73DF7-1B4C-48BE-8B48-715297487E7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
52-
{DBC73DF7-1B4C-48BE-8B48-715297487E7A}.Debug|x86.ActiveCfg = Debug|Any CPU
53-
{DBC73DF7-1B4C-48BE-8B48-715297487E7A}.Debug|x86.Build.0 = Debug|Any CPU
5448
{DBC73DF7-1B4C-48BE-8B48-715297487E7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
5549
{DBC73DF7-1B4C-48BE-8B48-715297487E7A}.Release|Any CPU.Build.0 = Release|Any CPU
56-
{DBC73DF7-1B4C-48BE-8B48-715297487E7A}.Release|x86.ActiveCfg = Release|Any CPU
57-
{DBC73DF7-1B4C-48BE-8B48-715297487E7A}.Release|x86.Build.0 = Release|Any CPU
5850
{712D84EC-B2A6-46D1-B030-BA697AE5E554}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5951
{712D84EC-B2A6-46D1-B030-BA697AE5E554}.Debug|Any CPU.Build.0 = Debug|Any CPU
60-
{712D84EC-B2A6-46D1-B030-BA697AE5E554}.Debug|x86.ActiveCfg = Debug|Any CPU
61-
{712D84EC-B2A6-46D1-B030-BA697AE5E554}.Debug|x86.Build.0 = Debug|Any CPU
6252
{712D84EC-B2A6-46D1-B030-BA697AE5E554}.Release|Any CPU.ActiveCfg = Release|Any CPU
6353
{712D84EC-B2A6-46D1-B030-BA697AE5E554}.Release|Any CPU.Build.0 = Release|Any CPU
64-
{712D84EC-B2A6-46D1-B030-BA697AE5E554}.Release|x86.ActiveCfg = Release|Any CPU
65-
{712D84EC-B2A6-46D1-B030-BA697AE5E554}.Release|x86.Build.0 = Release|Any CPU
66-
{E5EF4B0A-AB41-4B98-8FA8-98D6348003A8}.Debug|Any CPU.ActiveCfg = Debug|x86
67-
{E5EF4B0A-AB41-4B98-8FA8-98D6348003A8}.Debug|x86.ActiveCfg = Debug|x86
68-
{E5EF4B0A-AB41-4B98-8FA8-98D6348003A8}.Debug|x86.Build.0 = Debug|x86
69-
{E5EF4B0A-AB41-4B98-8FA8-98D6348003A8}.Release|Any CPU.ActiveCfg = Release|x86
70-
{E5EF4B0A-AB41-4B98-8FA8-98D6348003A8}.Release|x86.ActiveCfg = Release|x86
71-
{E5EF4B0A-AB41-4B98-8FA8-98D6348003A8}.Release|x86.Build.0 = Release|x86
54+
{E5EF4B0A-AB41-4B98-8FA8-98D6348003A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
55+
{E5EF4B0A-AB41-4B98-8FA8-98D6348003A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
56+
{E5EF4B0A-AB41-4B98-8FA8-98D6348003A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
57+
{E5EF4B0A-AB41-4B98-8FA8-98D6348003A8}.Release|Any CPU.Build.0 = Release|Any CPU
7258
{5085DF35-3A32-4894-835E-E5A3956D4F57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7359
{5085DF35-3A32-4894-835E-E5A3956D4F57}.Debug|Any CPU.Build.0 = Debug|Any CPU
74-
{5085DF35-3A32-4894-835E-E5A3956D4F57}.Debug|x86.ActiveCfg = Debug|Any CPU
75-
{5085DF35-3A32-4894-835E-E5A3956D4F57}.Debug|x86.Build.0 = Debug|Any CPU
7660
{5085DF35-3A32-4894-835E-E5A3956D4F57}.Release|Any CPU.ActiveCfg = Release|Any CPU
7761
{5085DF35-3A32-4894-835E-E5A3956D4F57}.Release|Any CPU.Build.0 = Release|Any CPU
78-
{5085DF35-3A32-4894-835E-E5A3956D4F57}.Release|x86.ActiveCfg = Release|Any CPU
79-
{5085DF35-3A32-4894-835E-E5A3956D4F57}.Release|x86.Build.0 = Release|Any CPU
80-
{CB61D8BD-48DC-40F4-A4BA-5B68A10A7481}.Debug|Any CPU.ActiveCfg = Debug|x86
81-
{CB61D8BD-48DC-40F4-A4BA-5B68A10A7481}.Debug|x86.ActiveCfg = Debug|x86
82-
{CB61D8BD-48DC-40F4-A4BA-5B68A10A7481}.Debug|x86.Build.0 = Debug|x86
83-
{CB61D8BD-48DC-40F4-A4BA-5B68A10A7481}.Release|Any CPU.ActiveCfg = Release|x86
84-
{CB61D8BD-48DC-40F4-A4BA-5B68A10A7481}.Release|x86.ActiveCfg = Release|x86
85-
{CB61D8BD-48DC-40F4-A4BA-5B68A10A7481}.Release|x86.Build.0 = Release|x86
62+
{CB61D8BD-48DC-40F4-A4BA-5B68A10A7481}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
63+
{CB61D8BD-48DC-40F4-A4BA-5B68A10A7481}.Debug|Any CPU.Build.0 = Debug|Any CPU
64+
{CB61D8BD-48DC-40F4-A4BA-5B68A10A7481}.Release|Any CPU.ActiveCfg = Release|Any CPU
65+
{CB61D8BD-48DC-40F4-A4BA-5B68A10A7481}.Release|Any CPU.Build.0 = Release|Any CPU
8666
{CBA217C4-4338-4E50-9DEC-9227705F8124}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
8767
{CBA217C4-4338-4E50-9DEC-9227705F8124}.Debug|Any CPU.Build.0 = Debug|Any CPU
88-
{CBA217C4-4338-4E50-9DEC-9227705F8124}.Debug|x86.ActiveCfg = Debug|Any CPU
89-
{CBA217C4-4338-4E50-9DEC-9227705F8124}.Debug|x86.Build.0 = Debug|Any CPU
9068
{CBA217C4-4338-4E50-9DEC-9227705F8124}.Release|Any CPU.ActiveCfg = Release|Any CPU
9169
{CBA217C4-4338-4E50-9DEC-9227705F8124}.Release|Any CPU.Build.0 = Release|Any CPU
92-
{CBA217C4-4338-4E50-9DEC-9227705F8124}.Release|x86.ActiveCfg = Release|Any CPU
93-
{CBA217C4-4338-4E50-9DEC-9227705F8124}.Release|x86.Build.0 = Release|Any CPU
9470
{4EB09870-7422-4368-B8C8-74582764EAB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
9571
{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
9872
{4EB09870-7422-4368-B8C8-74582764EAB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
9973
{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
74+
{F3DB625F-EA2D-420F-BBC7-E4026CC6ECA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
75+
{F3DB625F-EA2D-420F-BBC7-E4026CC6ECA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
76+
{F3DB625F-EA2D-420F-BBC7-E4026CC6ECA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
77+
{F3DB625F-EA2D-420F-BBC7-E4026CC6ECA3}.Release|Any CPU.Build.0 = Release|Any CPU
10278
EndGlobalSection
10379
GlobalSection(SolutionProperties) = preSolution
10480
HideSolutionNode = FALSE
@@ -113,5 +89,6 @@ Global
11389
{CB61D8BD-48DC-40F4-A4BA-5B68A10A7481} = {F9719B35-F359-47A7-A2F8-34F42E53C809}
11490
{CBA217C4-4338-4E50-9DEC-9227705F8124} = {F9719B35-F359-47A7-A2F8-34F42E53C809}
11591
{4EB09870-7422-4368-B8C8-74582764EAB3} = {F9719B35-F359-47A7-A2F8-34F42E53C809}
92+
{F3DB625F-EA2D-420F-BBC7-E4026CC6ECA3} = {F9719B35-F359-47A7-A2F8-34F42E53C809}
11693
EndGlobalSection
11794
EndGlobal

‎Nodejs/Product/InteractiveWindow/InteractiveWindow.csproj‎

Lines changed: 45 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
3+
<Import Project="..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props" Condition="Exists('..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props')" />
34
<PropertyGroup>
45
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
56
<FileUpgradeFlags>
67
</FileUpgradeFlags>
78
<UpgradeBackupLocation>
89
</UpgradeBackupLocation>
910
<OldToolsVersion>4.0</OldToolsVersion>
11+
<NuGetPackageImportStamp>
12+
</NuGetPackageImportStamp>
13+
<IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
14+
<IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
15+
<DeployExtension>False</DeployExtension>
1016
</PropertyGroup>
17+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1118
<Import Project="..\ProjectBefore.settings" />
1219
<PropertyGroup>
1320
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
14-
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
21+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
1522
<SchemaVersion>2.0</SchemaVersion>
1623
<ProjectGuid>{24A3887F-DA50-4989-8D6C-4A5B04D5D457}</ProjectGuid>
1724
<ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -28,9 +35,6 @@
2835
<StartProgram>$(DevEnvDir)devenv.exe</StartProgram>
2936
<StartArguments>/rootsuffix Exp</StartArguments>
3037
</PropertyGroup>
31-
<PropertyGroup Condition=" '$(Platform)' == 'x86' ">
32-
<PlatformTarget>x86</PlatformTarget>
33-
</PropertyGroup>
3438
<PropertyGroup>
3539
<DefineConstants>$(DefineConstants);NTVS_FEATURE_INTERACTIVEWINDOW</DefineConstants>
3640
</PropertyGroup>
@@ -93,6 +97,7 @@
9397
<Compile Include="Properties\AssemblyInfo.cs" />
9498
</ItemGroup>
9599
<ItemGroup>
100+
<None Include="packages.config" />
96101
<None Include="source.extension.vsixmanifest">
97102
<SubType>Designer</SubType>
98103
</None>
@@ -160,24 +165,24 @@
160165
<DesignTime>True</DesignTime>
161166
<DependentUpon>Resources.en.resx</DependentUpon>
162167
</Compile>
163-
<EmbeddedResource Include="Resources.en.resx">
168+
<ConditionalEmbeddedResource Include="Resources.en.resx">
164169
<Generator>ResXFileCodeGenerator</Generator>
165170
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
166171
<SubType>Designer</SubType>
167-
</EmbeddedResource>
168-
<EmbeddedResource Include="Resources.de.resx" />
169-
<EmbeddedResource Include="Resources.cs.resx" />
170-
<EmbeddedResource Include="Resources.es.resx" />
171-
<EmbeddedResource Include="Resources.fr.resx" />
172-
<EmbeddedResource Include="Resources.it.resx" />
173-
<EmbeddedResource Include="Resources.ja.resx" />
174-
<EmbeddedResource Include="Resources.ko.resx" />
175-
<EmbeddedResource Include="Resources.pl.resx" />
176-
<EmbeddedResource Include="Resources.pt-BR.resx" />
177-
<EmbeddedResource Include="Resources.ru.resx" />
178-
<EmbeddedResource Include="Resources.tr.resx" />
179-
<EmbeddedResource Include="Resources.zh-Hans.resx" />
180-
<EmbeddedResource Include="Resources.zh-Hant.resx" />
172+
</ConditionalEmbeddedResource>
173+
<ConditionalEmbeddedResource Include="Resources.de.resx" />
174+
<ConditionalEmbeddedResource Include="Resources.cs.resx" />
175+
<ConditionalEmbeddedResource Include="Resources.es.resx" />
176+
<ConditionalEmbeddedResource Include="Resources.fr.resx" />
177+
<ConditionalEmbeddedResource Include="Resources.it.resx" />
178+
<ConditionalEmbeddedResource Include="Resources.ja.resx" />
179+
<ConditionalEmbeddedResource Include="Resources.ko.resx" />
180+
<ConditionalEmbeddedResource Include="Resources.pl.resx" />
181+
<ConditionalEmbeddedResource Include="Resources.pt-BR.resx" />
182+
<ConditionalEmbeddedResource Include="Resources.ru.resx" />
183+
<ConditionalEmbeddedResource Include="Resources.tr.resx" />
184+
<ConditionalEmbeddedResource Include="Resources.zh-Hans.resx" />
185+
<ConditionalEmbeddedResource Include="Resources.zh-Hant.resx" />
181186
<ConditionalEmbeddedResource Include="VSPackage.de.resx">
182187
<MergeWithCTO>true</MergeWithCTO>
183188
<LogicalName>VSPackage.de.Resources</LogicalName>
@@ -189,6 +194,7 @@
189194
<ConditionalEmbeddedResource Include="VSPackage.cs.resx">
190195
<MergeWithCTO>true</MergeWithCTO>
191196
<LogicalName>VSPackage.cs.Resources</LogicalName>
197+
<SubType>Designer</SubType>
192198
</ConditionalEmbeddedResource>
193199
<ConditionalEmbeddedResource Include="VSPackage.es.resx">
194200
<MergeWithCTO>true</MergeWithCTO>
@@ -235,6 +241,13 @@
235241
<LogicalName>VSPackage.zh-Hant.Resources</LogicalName>
236242
</ConditionalEmbeddedResource>
237243
</ItemGroup>
244+
<ItemGroup>
245+
<FilesToSign Include="$(OutDir)\$(AssemblyName).dll">
246+
<Authenticode>Microsoft</Authenticode>
247+
<StrongName>StrongName</StrongName>
248+
<InProject>false</InProject>
249+
</FilesToSign>
250+
</ItemGroup>
238251
<PropertyGroup>
239252
<UseCodebase>true</UseCodebase>
240253
<RegisterOutputPackage>true</RegisterOutputPackage>
@@ -244,12 +257,19 @@
244257
<DelaySign>true</DelaySign>
245258
</PropertyGroup>
246259
<PropertyGroup>
247-
<CreateVsixContainer>True</CreateVsixContainer>
248-
<CopyVsixExtensionFiles>True</CopyVsixExtensionFiles>
249-
<IsProductComponent>true</IsProductComponent>
250-
<ExtensionInstallationRoot>Extensions</ExtensionInstallationRoot>
251-
<ExtensionInstallationFolder>Microsoft\NodeJsTools\Repl</ExtensionInstallationFolder>
260+
<CreateVsixContainer>False</CreateVsixContainer>
261+
<CopyVsixExtensionFiles>false</CopyVsixExtensionFiles>
252262
</PropertyGroup>
253263
<Import Project="$(BuildRoot)\Common\Product\ReplWindow\ReplWindow.proj" />
254-
<Import Project="..\ProjectAfter.settings" />
264+
<Import Project="$(BuildRoot)\Build\Common.Build.CSharp.targets" />
265+
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
266+
<Import Project="..\ProjectAfter.targets" />
267+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
268+
<PropertyGroup>
269+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
270+
</PropertyGroup>
271+
<Error Condition="!Exists('..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props'))" />
272+
<Error Condition="!Exists('..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets'))" />
273+
</Target>
274+
<Import Project="..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets" Condition="Exists('..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets')" />
255275
</Project>

‎Nodejs/Product/InteractiveWindow/packages.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="MicroBuild.Core" version="0.2.0" targetFramework="net46" developmentDependency="true" />
4+
</packages>

0 commit comments

Comments
 (0)