Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
(vsix) add unit tests support for Vsix
  • Loading branch information
arturcic committed Aug 26, 2019
commit 973416389e93d375f55e1d3ca064e028c2b475a3
17 changes: 13 additions & 4 deletions build/pack.cake
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,14 @@ Task("Build")
.IsDependentOn("Clean")
.Does<BuildParameters>((parameters) =>
{
// build .Net code
Build(parameters.Configuration);

var workDir = "./src/GitVersionVsixTask";
// build typescript code
NpmSet(new NpmSetSettings { WorkingDirectory = workDir, LogLevel = NpmLogLevel.Silent, Key = "progress", Value = "false" });
NpmInstall(new NpmInstallSettings { WorkingDirectory = workDir, LogLevel = NpmLogLevel.Silent });
NpmRunScript(new NpmRunScriptSettings { WorkingDirectory = workDir, LogLevel = NpmLogLevel.Silent, ScriptName = "build" });
});

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

foreach(var framework in frameworks)
{
Expand All @@ -42,7 +50,6 @@ Task("Test")
{
actions.Add(() =>
{
var testResultsPath = parameters.Paths.Directories.TestResultsOutput + "/";
var projectName = $"{project.GetFilenameWithoutExtension()}.{framework}";
var settings = new DotNetCoreTestSettings {
Framework = framework,
Expand Down Expand Up @@ -79,6 +86,11 @@ Task("Test")
};

Parallel.Invoke(options, actions.ToArray());

var workDir = "./src/GitVersionVsixTask";
var npmSettings = new NpmRunScriptSettings { WorkingDirectory = workDir, LogLevel = NpmLogLevel.Silent, ScriptName = "test" };
npmSettings.Arguments.Add($"--reporter-options mochaFile={MakeAbsolute(new FilePath($"{testResultsPath}vsix.results.xml"))}");
NpmRunScript(npmSettings);
}
})
.ReportError(exception =>
Expand Down Expand Up @@ -204,9 +216,6 @@ Task("Pack-Vsix")
UpdateTaskVersion(new FilePath(workDir + "/GitVersionTask/task.json"), taskId, parameters.Version.GitVersion);

// build and pack
NpmSet(new NpmSetSettings { WorkingDirectory = workDir, LogLevel = NpmLogLevel.Silent, Key = "progress", Value = "false" });
NpmInstall(new NpmInstallSettings { WorkingDirectory = workDir, LogLevel = NpmLogLevel.Silent });
NpmRunScript(new NpmRunScriptSettings { WorkingDirectory = workDir, LogLevel = NpmLogLevel.Silent, ScriptName = "build" });

var settings = new TfxExtensionCreateSettings
{
Expand Down
Loading