Skip to content

Commit 9734163

Browse files
committed
(vsix) add unit tests support for Vsix
1 parent 6cbe80e commit 9734163

File tree

5 files changed

+447
-22
lines changed

5 files changed

+447
-22
lines changed

build/pack.cake

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,14 @@ Task("Build")
1919
.IsDependentOn("Clean")
2020
.Does<BuildParameters>((parameters) =>
2121
{
22+
// build .Net code
2223
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" });
2330
});
2431

2532
#endregion
@@ -32,6 +39,7 @@ Task("Test")
3239
.Does<BuildParameters>((parameters) =>
3340
{
3441
var frameworks = new[] { parameters.CoreFxVersion, parameters.FullFxVersion };
42+
var testResultsPath = parameters.Paths.Directories.TestResultsOutput + "/";
3543

3644
foreach(var framework in frameworks)
3745
{
@@ -42,7 +50,6 @@ Task("Test")
4250
{
4351
actions.Add(() =>
4452
{
45-
var testResultsPath = parameters.Paths.Directories.TestResultsOutput + "/";
4653
var projectName = $"{project.GetFilenameWithoutExtension()}.{framework}";
4754
var settings = new DotNetCoreTestSettings {
4855
Framework = framework,
@@ -79,6 +86,11 @@ Task("Test")
7986
};
8087

8188
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);
8294
}
8395
})
8496
.ReportError(exception =>
@@ -204,9 +216,6 @@ Task("Pack-Vsix")
204216
UpdateTaskVersion(new FilePath(workDir + "/GitVersionTask/task.json"), taskId, parameters.Version.GitVersion);
205217

206218
// 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" });
210219

211220
var settings = new TfxExtensionCreateSettings
212221
{

0 commit comments

Comments
 (0)