@@ -19,7 +19,14 @@ Task("Build")
19
19
. IsDependentOn ( "Clean" )
20
20
. Does < BuildParameters > ( ( parameters ) =>
21
21
{
22
+ // build .Net code
22
23
Build ( parameters . Configuration ) ;
24
+
25
+ var workDir = "./src/GitVersionVsixTask" ;
26
+ // build typescript code
27
+ NpmSet ( new NpmSetSettings { WorkingDirectory = workDir , LogLevel = NpmLogLevel . Silent , Key = "progress" , Value = "false" } ) ;
28
+ NpmInstall ( new NpmInstallSettings { WorkingDirectory = workDir , LogLevel = NpmLogLevel . Silent } ) ;
29
+ NpmRunScript ( new NpmRunScriptSettings { WorkingDirectory = workDir , LogLevel = NpmLogLevel . Silent , ScriptName = "build" } ) ;
23
30
} ) ;
24
31
25
32
#endregion
@@ -32,6 +39,7 @@ Task("Test")
32
39
. Does < BuildParameters > ( ( parameters ) =>
33
40
{
34
41
var frameworks = new [ ] { parameters . CoreFxVersion , parameters . FullFxVersion } ;
42
+ var testResultsPath = parameters . Paths . Directories . TestResultsOutput + "/" ;
35
43
36
44
foreach ( var framework in frameworks )
37
45
{
@@ -42,7 +50,6 @@ Task("Test")
42
50
{
43
51
actions . Add ( ( ) =>
44
52
{
45
- var testResultsPath = parameters . Paths . Directories . TestResultsOutput + "/" ;
46
53
var projectName = $ "{ project . GetFilenameWithoutExtension ( ) } .{ framework } ";
47
54
var settings = new DotNetCoreTestSettings {
48
55
Framework = framework ,
@@ -79,6 +86,11 @@ Task("Test")
79
86
} ;
80
87
81
88
Parallel . Invoke ( options , actions . ToArray ( ) ) ;
89
+
90
+ var workDir = "./src/GitVersionVsixTask" ;
91
+ var npmSettings = new NpmRunScriptSettings { WorkingDirectory = workDir , LogLevel = NpmLogLevel . Silent , ScriptName = "test" } ;
92
+ npmSettings . Arguments . Add ( $ "--reporter-options mochaFile={ MakeAbsolute ( new FilePath ( $ "{ testResultsPath } vsix.results.xml") ) } ") ;
93
+ NpmRunScript ( npmSettings ) ;
82
94
}
83
95
} )
84
96
. ReportError ( exception =>
@@ -204,9 +216,6 @@ Task("Pack-Vsix")
204
216
UpdateTaskVersion ( new FilePath ( workDir + "/GitVersionTask/task.json" ) , taskId , parameters . Version . GitVersion ) ;
205
217
206
218
// build and pack
207
- NpmSet ( new NpmSetSettings { WorkingDirectory = workDir , LogLevel = NpmLogLevel . Silent , Key = "progress" , Value = "false" } ) ;
208
- NpmInstall ( new NpmInstallSettings { WorkingDirectory = workDir , LogLevel = NpmLogLevel . Silent } ) ;
209
- NpmRunScript ( new NpmRunScriptSettings { WorkingDirectory = workDir , LogLevel = NpmLogLevel . Silent , ScriptName = "build" } ) ;
210
219
211
220
var settings = new TfxExtensionCreateSettings
212
221
{
0 commit comments