Skip to content

Commit 3e8f255

Browse files
author
Paul van Brenk
committed
update appveyor config to work with vs2017
remove test projects from SLN
1 parent ea95d8d commit 3e8f255

8 files changed

Lines changed: 33 additions & 177 deletions

File tree

‎Nodejs/.nuget/NuGet.exe‎

176 KB
Binary file not shown.

‎Nodejs/.nuget/appveyor.Config‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<solution>
4+
<add key="disableSourceControlIntegration" value="true" />
5+
</solution>
6+
7+
<activePackageSource>
8+
<add key="All" value="(Aggregate source)" />
9+
</activePackageSource>
10+
<packageSources>
11+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
12+
<add key="microbuild" value="https://devdiv.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json"/>
13+
</packageSources>
14+
<disabledPackageSources />
15+
</configuration>

‎Nodejs/NodejsTools.sln‎

Lines changed: 1 addition & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,30 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26202.1
4+
VisualStudioVersion = 15.0.26507.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
88
{5085DF35-3A32-4894-835E-E5A3956D4F57} = {5085DF35-3A32-4894-835E-E5A3956D4F57}
99
{CB61D8BD-48DC-40F4-A4BA-5B68A10A7481} = {CB61D8BD-48DC-40F4-A4BA-5B68A10A7481}
1010
EndProjectSection
1111
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NodejsTests", "Tests\Core\NodejsTests.csproj", "{240A6D2B-1982-4BC5-B1EA-C6CB0492329D}"
13-
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\Tests\Utilities\TestUtilities.csproj", "{D092D54E-FF29-4D32-9AEE-4EF704C92F67}"
15-
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities.UI", "..\Common\Tests\Utilities.UI\TestUtilities.UI.csproj", "{E8150EBC-6B62-40BF-BF91-1DC60149B530}"
17-
ProjectSection(ProjectDependencies) = postProject
18-
{A390E1C0-0D90-4A9E-8413-3E959BB07292} = {A390E1C0-0D90-4A9E-8413-3E959BB07292}
19-
EndProjectSection
20-
EndProject
21-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProfilerTests", "Tests\Profiling\ProfilerTests.csproj", "{F18AF6F7-F534-44BE-B5DE-44D6EFFF947D}"
22-
EndProject
2312
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LogConverter", "Product\LogConverter\LogConverter.csproj", "{9A69745F-546D-40A0-8770-7E5B9ED0C82F}"
2413
EndProject
25-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProfilerUITests", "Tests\Profiling.UI\ProfilerUITests.csproj", "{C88DF887-5CF2-4591-A268-69339D396D88}"
26-
EndProject
27-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities.UI.Nodejs", "Tests\Utilities.UI\TestUtilities.UI.Nodejs.csproj", "{A731C4C3-3741-4080-A946-C47574C1F3BF}"
28-
EndProject
29-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nodejs.Tests.UI", "Tests\Core.UI\Nodejs.Tests.UI.csproj", "{8BA25AF0-477B-435C-8A23-970F2ADCED33}"
30-
EndProject
3114
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InteractiveWindow", "Product\InteractiveWindow\InteractiveWindow.csproj", "{24A3887F-DA50-4989-8D6C-4A5B04D5D457}"
3215
EndProject
3316
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Product", "Product", "{F9719B35-F359-47A7-A2F8-34F42E53C809}"
3417
EndProject
35-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{850AC94A-310F-4F88-A553-2806D7732BD1}"
36-
EndProject
37-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities.Nodejs", "Tests\Utilities.Nodejs\TestUtilities.Nodejs.csproj", "{9E395BA3-765E-4F35-A520-19F1C323D625}"
38-
EndProject
39-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedProjectTests", "..\Common\Tests\SharedProjectTests\SharedProjectTests.csproj", "{F8E4A9D2-7621-491F-9D37-C578E833AC02}"
40-
EndProject
41-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestSccPackage", "..\Common\Tests\SccPackage\TestSccPackage.csproj", "{E75E5DB1-0EA0-4247-A830-FE467C016816}"
42-
EndProject
4318
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjectWizard", "Product\ProjectWizard\ProjectWizard.csproj", "{DBC73DF7-1B4C-48BE-8B48-715297487E7A}"
4419
EndProject
4520
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebRole", "Product\WebRole\WebRole.csproj", "{712D84EC-B2A6-46D1-B030-BA697AE5E554}"
4621
EndProject
4722
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Npm", "Product\Npm\Npm.csproj", "{E5EF4B0A-AB41-4B98-8FA8-98D6348003A8}"
4823
EndProject
49-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NpmTests", "Tests\NpmTests\NpmTests.csproj", "{95494195-DCA4-4633-B78B-2087836C11D0}"
50-
EndProject
5124
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestAdapter", "Product\TestAdapter\TestAdapter.csproj", "{5085DF35-3A32-4894-835E-E5A3956D4F57}"
5225
EndProject
53-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestAdapterTests", "Tests\TestAdapterTests\TestAdapterTests.csproj", "{3FC57837-519D-4980-A8E8-DC5879DDA002}"
54-
EndProject
55-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AzurePublishing.Tests.UI", "Tests\AzurePublishing.UI\AzurePublishing.Tests.UI.csproj", "{F2DCA606-EA73-47B6-940C-0793AC9D07BE}"
56-
EndProject
5726
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PressAnyKey", "Product\PressAnyKey\PressAnyKey.csproj", "{CB61D8BD-48DC-40F4-A4BA-5B68A10A7481}"
5827
EndProject
59-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MockVsTests", "..\Common\Tests\MockVsTests\MockVsTests.csproj", "{A390E1C0-0D90-4A9E-8413-3E959BB07292}"
60-
EndProject
6128
Global
6229
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6330
Debug|x86 = Debug|x86
@@ -68,54 +35,14 @@ Global
6835
{32EC5259-98DA-40CA-9E2D-1B1B2E966F88}.Debug|x86.Build.0 = Debug|x86
6936
{32EC5259-98DA-40CA-9E2D-1B1B2E966F88}.Release|x86.ActiveCfg = Release|x86
7037
{32EC5259-98DA-40CA-9E2D-1B1B2E966F88}.Release|x86.Build.0 = Release|x86
71-
{240A6D2B-1982-4BC5-B1EA-C6CB0492329D}.Debug|x86.ActiveCfg = Debug|x86
72-
{240A6D2B-1982-4BC5-B1EA-C6CB0492329D}.Debug|x86.Build.0 = Debug|x86
73-
{240A6D2B-1982-4BC5-B1EA-C6CB0492329D}.Release|x86.ActiveCfg = Release|x86
74-
{240A6D2B-1982-4BC5-B1EA-C6CB0492329D}.Release|x86.Build.0 = Release|x86
75-
{D092D54E-FF29-4D32-9AEE-4EF704C92F67}.Debug|x86.ActiveCfg = Debug|x86
76-
{D092D54E-FF29-4D32-9AEE-4EF704C92F67}.Debug|x86.Build.0 = Debug|x86
77-
{D092D54E-FF29-4D32-9AEE-4EF704C92F67}.Release|x86.ActiveCfg = Release|x86
78-
{D092D54E-FF29-4D32-9AEE-4EF704C92F67}.Release|x86.Build.0 = Release|x86
79-
{E8150EBC-6B62-40BF-BF91-1DC60149B530}.Debug|x86.ActiveCfg = Debug|x86
80-
{E8150EBC-6B62-40BF-BF91-1DC60149B530}.Debug|x86.Build.0 = Debug|x86
81-
{E8150EBC-6B62-40BF-BF91-1DC60149B530}.Release|x86.ActiveCfg = Release|x86
82-
{E8150EBC-6B62-40BF-BF91-1DC60149B530}.Release|x86.Build.0 = Release|x86
83-
{F18AF6F7-F534-44BE-B5DE-44D6EFFF947D}.Debug|x86.ActiveCfg = Debug|x86
84-
{F18AF6F7-F534-44BE-B5DE-44D6EFFF947D}.Debug|x86.Build.0 = Debug|x86
85-
{F18AF6F7-F534-44BE-B5DE-44D6EFFF947D}.Release|x86.ActiveCfg = Release|x86
86-
{F18AF6F7-F534-44BE-B5DE-44D6EFFF947D}.Release|x86.Build.0 = Release|x86
8738
{9A69745F-546D-40A0-8770-7E5B9ED0C82F}.Debug|x86.ActiveCfg = Debug|x86
8839
{9A69745F-546D-40A0-8770-7E5B9ED0C82F}.Debug|x86.Build.0 = Debug|x86
8940
{9A69745F-546D-40A0-8770-7E5B9ED0C82F}.Release|x86.ActiveCfg = Release|x86
9041
{9A69745F-546D-40A0-8770-7E5B9ED0C82F}.Release|x86.Build.0 = Release|x86
91-
{C88DF887-5CF2-4591-A268-69339D396D88}.Debug|x86.ActiveCfg = Debug|x86
92-
{C88DF887-5CF2-4591-A268-69339D396D88}.Debug|x86.Build.0 = Debug|x86
93-
{C88DF887-5CF2-4591-A268-69339D396D88}.Release|x86.ActiveCfg = Release|x86
94-
{C88DF887-5CF2-4591-A268-69339D396D88}.Release|x86.Build.0 = Release|x86
95-
{A731C4C3-3741-4080-A946-C47574C1F3BF}.Debug|x86.ActiveCfg = Debug|x86
96-
{A731C4C3-3741-4080-A946-C47574C1F3BF}.Debug|x86.Build.0 = Debug|x86
97-
{A731C4C3-3741-4080-A946-C47574C1F3BF}.Release|x86.ActiveCfg = Release|x86
98-
{A731C4C3-3741-4080-A946-C47574C1F3BF}.Release|x86.Build.0 = Release|x86
99-
{8BA25AF0-477B-435C-8A23-970F2ADCED33}.Debug|x86.ActiveCfg = Debug|x86
100-
{8BA25AF0-477B-435C-8A23-970F2ADCED33}.Debug|x86.Build.0 = Debug|x86
101-
{8BA25AF0-477B-435C-8A23-970F2ADCED33}.Release|x86.ActiveCfg = Release|x86
102-
{8BA25AF0-477B-435C-8A23-970F2ADCED33}.Release|x86.Build.0 = Release|x86
10342
{24A3887F-DA50-4989-8D6C-4A5B04D5D457}.Debug|x86.ActiveCfg = Debug|x86
10443
{24A3887F-DA50-4989-8D6C-4A5B04D5D457}.Debug|x86.Build.0 = Debug|x86
10544
{24A3887F-DA50-4989-8D6C-4A5B04D5D457}.Release|x86.ActiveCfg = Release|x86
10645
{24A3887F-DA50-4989-8D6C-4A5B04D5D457}.Release|x86.Build.0 = Release|x86
107-
{9E395BA3-765E-4F35-A520-19F1C323D625}.Debug|x86.ActiveCfg = Debug|Any CPU
108-
{9E395BA3-765E-4F35-A520-19F1C323D625}.Debug|x86.Build.0 = Debug|Any CPU
109-
{9E395BA3-765E-4F35-A520-19F1C323D625}.Release|x86.ActiveCfg = Release|Any CPU
110-
{9E395BA3-765E-4F35-A520-19F1C323D625}.Release|x86.Build.0 = Release|Any CPU
111-
{F8E4A9D2-7621-491F-9D37-C578E833AC02}.Debug|x86.ActiveCfg = Debug|Any CPU
112-
{F8E4A9D2-7621-491F-9D37-C578E833AC02}.Debug|x86.Build.0 = Debug|Any CPU
113-
{F8E4A9D2-7621-491F-9D37-C578E833AC02}.Release|x86.ActiveCfg = Release|Any CPU
114-
{F8E4A9D2-7621-491F-9D37-C578E833AC02}.Release|x86.Build.0 = Release|Any CPU
115-
{E75E5DB1-0EA0-4247-A830-FE467C016816}.Debug|x86.ActiveCfg = Debug|x86
116-
{E75E5DB1-0EA0-4247-A830-FE467C016816}.Debug|x86.Build.0 = Debug|x86
117-
{E75E5DB1-0EA0-4247-A830-FE467C016816}.Release|x86.ActiveCfg = Release|x86
118-
{E75E5DB1-0EA0-4247-A830-FE467C016816}.Release|x86.Build.0 = Release|x86
11946
{DBC73DF7-1B4C-48BE-8B48-715297487E7A}.Debug|x86.ActiveCfg = Debug|Any CPU
12047
{DBC73DF7-1B4C-48BE-8B48-715297487E7A}.Debug|x86.Build.0 = Debug|Any CPU
12148
{DBC73DF7-1B4C-48BE-8B48-715297487E7A}.Release|x86.ActiveCfg = Release|Any CPU
@@ -128,56 +55,26 @@ Global
12855
{E5EF4B0A-AB41-4B98-8FA8-98D6348003A8}.Debug|x86.Build.0 = Debug|x86
12956
{E5EF4B0A-AB41-4B98-8FA8-98D6348003A8}.Release|x86.ActiveCfg = Release|x86
13057
{E5EF4B0A-AB41-4B98-8FA8-98D6348003A8}.Release|x86.Build.0 = Release|x86
131-
{95494195-DCA4-4633-B78B-2087836C11D0}.Debug|x86.ActiveCfg = Debug|x86
132-
{95494195-DCA4-4633-B78B-2087836C11D0}.Debug|x86.Build.0 = Debug|x86
133-
{95494195-DCA4-4633-B78B-2087836C11D0}.Release|x86.ActiveCfg = Release|x86
134-
{95494195-DCA4-4633-B78B-2087836C11D0}.Release|x86.Build.0 = Release|x86
13558
{5085DF35-3A32-4894-835E-E5A3956D4F57}.Debug|x86.ActiveCfg = Debug|Any CPU
13659
{5085DF35-3A32-4894-835E-E5A3956D4F57}.Debug|x86.Build.0 = Debug|Any CPU
13760
{5085DF35-3A32-4894-835E-E5A3956D4F57}.Release|x86.ActiveCfg = Release|Any CPU
13861
{5085DF35-3A32-4894-835E-E5A3956D4F57}.Release|x86.Build.0 = Release|Any CPU
139-
{3FC57837-519D-4980-A8E8-DC5879DDA002}.Debug|x86.ActiveCfg = Debug|x86
140-
{3FC57837-519D-4980-A8E8-DC5879DDA002}.Debug|x86.Build.0 = Debug|x86
141-
{3FC57837-519D-4980-A8E8-DC5879DDA002}.Release|x86.ActiveCfg = Release|x86
142-
{3FC57837-519D-4980-A8E8-DC5879DDA002}.Release|x86.Build.0 = Release|x86
143-
{F2DCA606-EA73-47B6-940C-0793AC9D07BE}.Debug|x86.ActiveCfg = Debug|x86
144-
{F2DCA606-EA73-47B6-940C-0793AC9D07BE}.Debug|x86.Build.0 = Debug|x86
145-
{F2DCA606-EA73-47B6-940C-0793AC9D07BE}.Release|x86.ActiveCfg = Release|x86
146-
{F2DCA606-EA73-47B6-940C-0793AC9D07BE}.Release|x86.Build.0 = Release|x86
14762
{CB61D8BD-48DC-40F4-A4BA-5B68A10A7481}.Debug|x86.ActiveCfg = Debug|x86
14863
{CB61D8BD-48DC-40F4-A4BA-5B68A10A7481}.Debug|x86.Build.0 = Debug|x86
14964
{CB61D8BD-48DC-40F4-A4BA-5B68A10A7481}.Release|x86.ActiveCfg = Release|x86
15065
{CB61D8BD-48DC-40F4-A4BA-5B68A10A7481}.Release|x86.Build.0 = Release|x86
151-
{A390E1C0-0D90-4A9E-8413-3E959BB07292}.Debug|x86.ActiveCfg = Debug|x86
152-
{A390E1C0-0D90-4A9E-8413-3E959BB07292}.Debug|x86.Build.0 = Debug|x86
153-
{A390E1C0-0D90-4A9E-8413-3E959BB07292}.Release|x86.ActiveCfg = Release|x86
154-
{A390E1C0-0D90-4A9E-8413-3E959BB07292}.Release|x86.Build.0 = Release|x86
15566
EndGlobalSection
15667
GlobalSection(SolutionProperties) = preSolution
15768
HideSolutionNode = FALSE
15869
EndGlobalSection
15970
GlobalSection(NestedProjects) = preSolution
16071
{32EC5259-98DA-40CA-9E2D-1B1B2E966F88} = {F9719B35-F359-47A7-A2F8-34F42E53C809}
161-
{240A6D2B-1982-4BC5-B1EA-C6CB0492329D} = {850AC94A-310F-4F88-A553-2806D7732BD1}
162-
{D092D54E-FF29-4D32-9AEE-4EF704C92F67} = {850AC94A-310F-4F88-A553-2806D7732BD1}
163-
{E8150EBC-6B62-40BF-BF91-1DC60149B530} = {850AC94A-310F-4F88-A553-2806D7732BD1}
164-
{F18AF6F7-F534-44BE-B5DE-44D6EFFF947D} = {850AC94A-310F-4F88-A553-2806D7732BD1}
16572
{9A69745F-546D-40A0-8770-7E5B9ED0C82F} = {F9719B35-F359-47A7-A2F8-34F42E53C809}
166-
{C88DF887-5CF2-4591-A268-69339D396D88} = {850AC94A-310F-4F88-A553-2806D7732BD1}
167-
{A731C4C3-3741-4080-A946-C47574C1F3BF} = {850AC94A-310F-4F88-A553-2806D7732BD1}
168-
{8BA25AF0-477B-435C-8A23-970F2ADCED33} = {850AC94A-310F-4F88-A553-2806D7732BD1}
16973
{24A3887F-DA50-4989-8D6C-4A5B04D5D457} = {F9719B35-F359-47A7-A2F8-34F42E53C809}
170-
{9E395BA3-765E-4F35-A520-19F1C323D625} = {850AC94A-310F-4F88-A553-2806D7732BD1}
171-
{F8E4A9D2-7621-491F-9D37-C578E833AC02} = {850AC94A-310F-4F88-A553-2806D7732BD1}
172-
{E75E5DB1-0EA0-4247-A830-FE467C016816} = {850AC94A-310F-4F88-A553-2806D7732BD1}
17374
{DBC73DF7-1B4C-48BE-8B48-715297487E7A} = {F9719B35-F359-47A7-A2F8-34F42E53C809}
17475
{712D84EC-B2A6-46D1-B030-BA697AE5E554} = {F9719B35-F359-47A7-A2F8-34F42E53C809}
17576
{E5EF4B0A-AB41-4B98-8FA8-98D6348003A8} = {F9719B35-F359-47A7-A2F8-34F42E53C809}
176-
{95494195-DCA4-4633-B78B-2087836C11D0} = {850AC94A-310F-4F88-A553-2806D7732BD1}
17777
{5085DF35-3A32-4894-835E-E5A3956D4F57} = {F9719B35-F359-47A7-A2F8-34F42E53C809}
178-
{3FC57837-519D-4980-A8E8-DC5879DDA002} = {850AC94A-310F-4F88-A553-2806D7732BD1}
179-
{F2DCA606-EA73-47B6-940C-0793AC9D07BE} = {850AC94A-310F-4F88-A553-2806D7732BD1}
18078
{CB61D8BD-48DC-40F4-A4BA-5B68A10A7481} = {F9719B35-F359-47A7-A2F8-34F42E53C809}
181-
{A390E1C0-0D90-4A9E-8413-3E959BB07292} = {850AC94A-310F-4F88-A553-2806D7732BD1}
18279
EndGlobalSection
18380
EndGlobal

‎Nodejs/Product/Nodejs/packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="MicroBuild.Core" version="0.2.0" targetFramework="net46" />
34
<package id="Microsoft.ApplicationInsights" version="2.2.0" targetFramework="net46" />
45
<package id="Microsoft.ApplicationInsights.PersistenceChannel" version="1.2.3" targetFramework="net46" />
56
<package id="Microsoft.VisualStudio.Setup.Configuration.Interop" version="1.8.24" targetFramework="net46" developmentDependency="true" />

‎Nodejs/Product/Npm/packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="MicroBuild.Core" version="0.2.0" targetFramework="net46" />
34
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net46" />
45
</packages>

‎Nodejs/Product/TestAdapter/packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="MicroBuild.Core" version="0.2.0" targetFramework="net46" />
34
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net46" />
45
</packages>

‎Nodejs/Setup/BuildRelease.ps1‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ param(
127127
[switch] $skipclean,
128128
[switch] $skipcopy,
129129
[switch] $skipdebug,
130+
[switch] $skipsetup,
130131
[switch] $skipbuild,
131132
[switch] $dev,
132133
[switch] $copytests
@@ -170,6 +171,13 @@ if ($skiptests) {
170171
$global_msbuild_options += "/p:IncludeTests=true"
171172
}
172173

174+
if ($skipsetup) {
175+
$global_msbuild_options += "/p:IncludeSetup=false"
176+
} else {
177+
$global_msbuild_options += "/p:IncludeSetup=true"
178+
}
179+
180+
173181
if ($release -or $mockrelease) {
174182
$global_msbuild_options += "/p:ReleaseBuild=true"
175183
}

‎appveyor.yml‎

Lines changed: 6 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,20 @@
55
- v1.1.x
66
- v1.2.x
77
- v1.3.x
8-
- future
98
skip_tags: true
10-
image: Visual Studio 2015
9+
image: Visual Studio 2017
1110
environment:
1211
matrix:
1312
- nodejs_version: Stable
14-
vs_version: 14.0
13+
vs_version: 15.0
1514
architecture: x64
16-
- nodejs_version: LTS
17-
vs_version: 14.0
18-
architecture: x86
1915
install: &default_install_script
2016
- ps: >-
2117
Install-Product node $env:nodejs_version $env:architecture
2218
2319
node -v
2420
25-
"C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools\VsDevCmd.bat"
21+
"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat"
2622
2723
$node = which node
2824
@@ -37,73 +33,10 @@
3733
3834
msiexec /package C:\projects\nodejstools\Common\Tests\Prerequisites\VSTestHost.msi /quiet
3935
40-
powershell -ExecutionPolicy RemoteSigned C:\projects\nodejstools\Nodejs\Setup\BuildRelease.ps1 .\NTVS_Out -skipcopy -skipdebug -skipclean -vsTarget $env:vs_version
41-
test_script: &default_test_script
42-
- ps: >-
43-
$testsettings_version = $env:vs_version -replace '11.0', '12.0'
36+
c:\projects\nodejstools\Nodejs\.nuget\nuget.exe restore "c:\projects\nodejstools\Nodejs\NodejsTools.sln" -PackagesDirectory c:\projects\nodejstools\Nodejs\packages -ConfigFile c:\projects\nodejstools\Nodejs\.nuget\appveyor.Config
4437
45-
vstest.console /TestCaseFilter:"TestCategory!=AppVeyorIgnore&TestCategory!=Ignore" /logger:Appveyor $("C:\projects\nodejstools\BuildOutput\Release" + $env:vs_version + "\Tests\NpmTests.dll") $("C:\projects\nodejstools\BuildOutput\Release" + $env:vs_version + "\Tests\NodeTests.dll") $("C:\projects\nodejstools\BuildOutput\Release" + $env:vs_version + "\Tests\ProfilerTests.dll") /settings:$("C:\projects\nodejstools\Build\default." + $testsettings_version + "Exp.testsettings")
38+
C:\projects\nodejstools\Nodejs\Setup\BuildRelease.ps1 .\NTVS_Out -skipsetup -skipcopy -skipdebug -skipclean -skiptests -vsTarget $env:vs_version -vsroot "$(${env:programfiles(x86)} + "\Microsoft Visual Studio\2017\Community")"
4639
artifacts: &default_artifacts
4740
- path: NTVS_Out
4841
name: NtvsOut
49-
type: zip
50-
-
51-
version: 1.0.{build}
52-
branches:
53-
only:
54-
- v1.3.x
55-
skip_tags: true
56-
image: Visual Studio 2015
57-
environment:
58-
matrix:
59-
- nodejs_version: 6
60-
vs_version: 14.0
61-
architecture: x64
62-
- nodejs_version: 7
63-
vs_version: 14.0
64-
architecture: x86
65-
install: *default_install_script
66-
build_script: *default_build_script
67-
test_script: *default_test_script
68-
artifacts: *default_artifacts
69-
-
70-
version: 1.0.{build}
71-
branches:
72-
only:
73-
- v1.2.x
74-
skip_tags: true
75-
image: Visual Studio 2015
76-
environment:
77-
matrix:
78-
- nodejs_version: 4
79-
vs_version: 14.0
80-
architecture: x64
81-
- nodejs_version: 5
82-
vs_version: 14.0
83-
architecture: x86
84-
install: *default_install_script
85-
build_script: *default_build_script
86-
test_script: *default_test_script
87-
artifacts: *default_artifacts
88-
-
89-
version: 1.0.{build}
90-
branches:
91-
only:
92-
- v1.1.x
93-
skip_tags: true
94-
image: Visual Studio 2015
95-
environment:
96-
matrix:
97-
- nodejs_version: 4
98-
vs_version: 14.0
99-
architecture: x64
100-
- nodejs_version: 0.12
101-
vs_version: 12.0
102-
architecture: x64
103-
- nodejs_version: 5
104-
vs_version: 14.0
105-
architecture: x86
106-
install: *default_install_script
107-
build_script: *default_build_script
108-
test_script: *default_test_script
109-
artifacts: *default_artifacts
42+
type: zip

0 commit comments

Comments
 (0)