Skip to content

Commit 7ff0c62

Browse files
author
Paul van Brenk
committed
Add signing and clean up name
1 parent 9d48774 commit 7ff0c62

File tree

9 files changed

+36
-49
lines changed

9 files changed

+36
-49
lines changed

‎Nodejs/Product/Nodejs/Nodejs.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.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>
@@ -1232,6 +1233,8 @@
12321233
<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>
12331234
</PropertyGroup>
12341235
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
1236+
<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'))" />
1237+
<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'))" />
12351238
</Target>
12361239
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
12371240
Other similar extension points exist, see Microsoft.Common.targets.
@@ -1268,4 +1271,5 @@
12681271
<Target Name="_DeleteAfterCreatePkgDef" AfterTargets="GeneratePkgDef">
12691272
<Delete Files="@(_CopiedForCreatePkgdef)" />
12701273
</Target>
1274+
<Import Project="..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets" Condition="Exists('..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets')" />
12711275
</Project>

‎Nodejs/Product/Nodejs/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MicroBuild.Core" version="0.2.0" targetFramework="net46" />
3+
<package id="MicroBuild.Core" version="0.2.0" targetFramework="net46" developmentDependency="true" />
44
<package id="Microsoft.ApplicationInsights" version="2.3.0" targetFramework="net46" />
55
<package id="Microsoft.ApplicationInsights.PersistenceChannel" version="1.2.3" targetFramework="net46" />
66
<package id="Microsoft.Diagnostics.Tracing.EventSource.Redist" version="1.1.28" targetFramework="net46" />

‎Nodejs/Product/NodejsToolsVsix/NodejsToolsVsix.csproj‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,42 +48,47 @@
4848
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3bPkgdefProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
4949
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
5050
<VSIXSubPath>.</VSIXSubPath>
51-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
51+
<Private>True</Private>
5252
</ProjectReference>
5353
<ProjectReference Include="..\Nodejs\Nodejs.csproj">
5454
<Project>{32ec5259-98da-40ca-9e2d-1b1b2e966f88}</Project>
5555
<Name>Nodejs</Name>
5656
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3bPkgdefProjectOutputGroup%3bTemplateProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
5757
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
5858
<VSIXSubPath>.</VSIXSubPath>
59-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
59+
<Private>True</Private>
6060
</ProjectReference>
6161
<ProjectReference Include="..\Npm\Npm.csproj">
6262
<Project>{e5ef4b0a-ab41-4b98-8fa8-98d6348003a8}</Project>
6363
<Name>Npm</Name>
6464
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
6565
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
6666
<VSIXSubPath>.</VSIXSubPath>
67-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
68-
<Private>False</Private>
67+
<Private>True</Private>
6968
</ProjectReference>
7069
<ProjectReference Include="..\PressAnyKey\PressAnyKey.csproj">
7170
<Project>{cb61d8bd-48dc-40f4-a4ba-5b68a10a7481}</Project>
7271
<Name>PressAnyKey</Name>
7372
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3b</IncludeOutputGroupsInVSIX>
7473
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
7574
<VSIXSubPath>.</VSIXSubPath>
76-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
75+
<Private>True</Private>
7776
</ProjectReference>
7877
<ProjectReference Include="..\ProjectWizard\ProjectWizard.csproj">
7978
<Project>{DBC73DF7-1B4C-48BE-8B48-715297487E7A}</Project>
8079
<Name>ProjectWizard</Name>
8180
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
8281
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
8382
<VSIXSubPath>.</VSIXSubPath>
84-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
83+
<Private>True</Private>
8584
</ProjectReference>
8685
</ItemGroup>
86+
<ItemGroup>
87+
<FilesToSign Include="$(OutDir)\$(AssemblyName).vsix">
88+
<Authenticode>VsixSHA2</Authenticode>
89+
<InProject>false</InProject>
90+
</FilesToSign>
91+
</ItemGroup>
8792
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
8893
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
8994
<Import Project="..\ProjectAfter.targets" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<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">
33
<Metadata>
44
<Identity Id="90B6AE2E-9BDC-4D22-A670-78978E6AE4DF" Version="|%CurrentProject%;GetVSIXVersion|" Language="en-US" Publisher="Microsoft" />
5-
<DisplayName>Microsoft.VisualStudio.NodejsTools.Targets</DisplayName>
5+
<DisplayName>Node.js Tools MSBuild Targets</DisplayName>
66
<Description xml:space="preserve">MSBuild files for NodejsTools for Visual Studio</Description>
77
<MoreInfo>http://go.microsoft.com/fwlink/?LinkId=785971</MoreInfo>
88
<GettingStartedGuide>http://go.microsoft.com/fwlink/?LinkId=785972</GettingStartedGuide>

‎Nodejs/Product/TestAdapter/TestAdapter.csproj‎

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props" />
34
<PropertyGroup>
45
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
56
<FileUpgradeFlags>
@@ -9,9 +10,12 @@
910
<OldToolsVersion>4.0</OldToolsVersion>
1011
<NuGetPackageImportStamp>
1112
</NuGetPackageImportStamp>
13+
<GeneratePkgDefFile>false</GeneratePkgDefFile>
14+
<IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
15+
<IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
1216
</PropertyGroup>
1317
<Import Project="..\ProjectBefore.settings" />
14-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
18+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
1519
<PropertyGroup>
1620
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
1721
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -99,18 +103,9 @@
99103
<Reference Include="Microsoft.CSharp" />
100104
<Reference Include="WindowsBase" />
101105
</ItemGroup>
102-
<Choose>
103-
<When Condition="$(VSTarget) == '15.0'">
104-
<ItemGroup>
105-
<Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=$(VSTarget).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
106-
</ItemGroup>
107-
</When>
108-
<Otherwise>
109-
<ItemGroup>
110-
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
111-
</ItemGroup>
112-
</Otherwise>
113-
</Choose>
106+
<ItemGroup>
107+
<Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=$(VSTarget).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
108+
</ItemGroup>
114109
<ItemGroup>
115110
<Compile Include="..\..\..\Common\Product\SharedProject\CommonConstants.cs">
116111
<Link>CommonConstants.cs</Link>
@@ -165,29 +160,23 @@
165160
</Compile>
166161
</ItemGroup>
167162
<ItemGroup>
168-
<None Include="app.config" />
169163
<None Include="packages.config" />
170164
</ItemGroup>
171165
<ItemGroup>
172166
<Content Include="TestFrameworks\ExportRunner\exportrunner.js">
173167
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
174-
<IncludeInVSIX>true</IncludeInVSIX>
175168
</Content>
176169
<Content Include="TestFrameworks\find_tests.js">
177170
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
178-
<IncludeInVSIX>true</IncludeInVSIX>
179171
</Content>
180172
<Content Include="TestFrameworks\mocha\mocha.js">
181173
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
182-
<IncludeInVSIX>true</IncludeInVSIX>
183174
</Content>
184175
<Content Include="TestFrameworks\run_tests.js">
185176
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
186-
<IncludeInVSIX>true</IncludeInVSIX>
187177
</Content>
188178
<Content Include="TestFrameworks\Tape\tape.js">
189179
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
190-
<IncludeInVSIX>true</IncludeInVSIX>
191180
</Content>
192181
</ItemGroup>
193182
<ItemGroup>
@@ -206,5 +195,8 @@
206195
<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>
207196
</PropertyGroup>
208197
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
198+
<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'))" />
199+
<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'))" />
209200
</Target>
201+
<Import Project="..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets" />
210202
</Project>

‎Nodejs/Product/TestAdapter/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MicroBuild.Core" version="0.2.0" targetFramework="net46" />
3+
<package id="MicroBuild.Core" version="0.2.0" targetFramework="net46" developmentDependency="true" />
44
<package id="Microsoft.Diagnostics.Tracing.EventSource.Redist" version="1.1.28" targetFramework="net46" />
55
<package id="Microsoft.VisualStudio.RemoteControl" version="14.0.262-masterA5CACE98" targetFramework="net46" />
66
<package id="Microsoft.VisualStudio.Telemetry" version="15.3.795-master67D3E818" targetFramework="net46" />

‎Nodejs/Product/TestAdapterVsix/TestAdapterVsix.csproj‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
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')" />
3+
<Import Project="..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props" />
44
<Import Project="..\ProjectBefore.settings" />
55
<PropertyGroup>
66
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
77
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
88
<NuGetPackageImportStamp>
99
</NuGetPackageImportStamp>
1010
</PropertyGroup>
11-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
11+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
1212
<PropertyGroup>
1313
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
1414
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -36,7 +36,6 @@
3636
<StartArguments>/rootsuffix Exp</StartArguments>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<None Include="app.config" />
4039
<None Include="packages.config" />
4140
<None Include="source.extension.vsixmanifest">
4241
<SubType>Designer</SubType>
@@ -49,16 +48,18 @@
4948
<Name>TestAdapter</Name>
5049
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
5150
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
51+
<VSIXSubPath>.</VSIXSubPath>
52+
<Private>True</Private>
5253
</ProjectReference>
5354
</ItemGroup>
5455
<ItemGroup>
55-
<FilesToSign Include="$(OutDir)\Microsoft.NodejsTools.TestAdapter.vsix">
56+
<FilesToSign Include="$(OutDir)\$(AssemblyName).vsix">
5657
<Authenticode>VsixSHA2</Authenticode>
5758
<InProject>false</InProject>
5859
</FilesToSign>
5960
</ItemGroup>
6061
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
61-
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
62+
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" />
6263
<Import Project="..\ProjectAfter.targets" />
6364
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
6465
<PropertyGroup>

‎Nodejs/Product/TestAdapterVsix/app.config‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<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">
33
<Metadata>
44
<Identity Id="{69795897-7116-44CA-B20F-958C56A5399C}" Version="|%CurrentProject%;GetVSIXVersion|" Language="en-US" Publisher="Microsoft" />
5-
<DisplayName>Microsoft.VisualStudio.NodejsTools.TestAdapter</DisplayName>
5+
<DisplayName>Node.js Test Adapter</DisplayName>
66
<Description xml:space="preserve">Unit test adapter for JavaScript files.</Description>
77
<MoreInfo>http://go.microsoft.com/fwlink/?LinkId=785971</MoreInfo>
88
<GettingStartedGuide>http://go.microsoft.com/fwlink/?LinkId=785972</GettingStartedGuide>

0 commit comments

Comments
 (0)