ics-builder 4.2.5 → 4.2.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/package.json +1 -1
  2. package/src/builder/api/dotnetApiBuilder.js +1 -2
  3. package/src/builder/ui/customUiBuilder.js +4 -2
  4. package/src/dotnetUtils.js +1 -2
  5. package/src/services/commandManager.js +1 -1
  6. package/src/testRunners/apiTestRunner.js +1 -2
  7. package/src/utils.js +2 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ics-builder",
3
- "version": "4.2.5",
3
+ "version": "4.2.8",
4
4
  "description": "",
5
5
  "main": "./src/app.js",
6
6
  "preferGlobal": true,
package/src/builder/api/dotnetApiBuilder.js CHANGED
@@ -130,8 +130,7 @@ var DotnetApiBuilder = /** @class */ (function (_super) {
130
130
  DotnetApiBuilder.prototype.msbuild = function (project, targets, props) {
131
131
  var args = targets.map(function (t) { return "/t:" + t; }).join(" ") + " " + props.map(function (p) { return "/p:" + p; }).join(" ");
132
132
  utils_1.Utils.exec("msbuild /restore /nologo /clp:ErrorsOnly;WarningsOnly /verbosity:quiet " + project + " " + args, {
133
- silent: false,
134
- skipLog: true
133
+ silent: false
135
134
  });
136
135
  };
137
136
  DotnetApiBuilder.prototype.clearCache = function (folderPath) {
package/src/builder/ui/customUiBuilder.js CHANGED
@@ -16,6 +16,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
16
16
  exports.CustomUiBuilder = void 0;
17
17
  var path = require("path");
18
18
  var utils_1 = require("../../utils");
19
+ var yaml = require("yamljs");
19
20
  var baseBuilder_1 = require("../baseBuilder");
20
21
  var CustomUiBuilder = /** @class */ (function (_super) {
21
22
  __extends(CustomUiBuilder, _super);
@@ -27,13 +28,14 @@ var CustomUiBuilder = /** @class */ (function (_super) {
27
28
  this.config.packages.forEach(function (pkg) {
28
29
  var _a, _b, _c, _d;
29
30
  var packageDir = path.join(_this.config.paths.source, pkg.name);
30
- var pkgInfo = pkg.packageInfo;
31
+ var packageYamlPath = path.join(packageDir, "package.yml");
32
+ var pkgInfo = utils_1.Utils.ensurePath(packageYamlPath) ? yaml.load(packageYamlPath) : {};
31
33
  var buildDir = path.join(packageDir, (((_b = (_a = pkgInfo === null || pkgInfo === void 0 ? void 0 : pkgInfo.builder) === null || _a === void 0 ? void 0 : _a.ui) === null || _b === void 0 ? void 0 : _b.path) || "").replace(pkg.name, ""));
32
34
  var cmd = ((_d = (_c = pkgInfo === null || pkgInfo === void 0 ? void 0 : pkgInfo.builder) === null || _c === void 0 ? void 0 : _c.ui) === null || _d === void 0 ? void 0 : _d.cmd) || "";
33
35
  var envArgs = _this.prepareEnvArgs();
34
36
  if (envArgs.length)
35
37
  cmd = _this.prepareCmd(cmd, envArgs);
36
- utils_1.Utils.exec(cmd, { cwd: buildDir, skipLog: true });
38
+ utils_1.Utils.exec(cmd, { cwd: buildDir });
37
39
  });
38
40
  };
39
41
  CustomUiBuilder.prototype.prepareEnvArgs = function () {
package/src/dotnetUtils.js CHANGED
@@ -19,8 +19,7 @@ var DotnetUtils = /** @class */ (function () {
19
19
  if (outputPath)
20
20
  command += " -o " + outputPath;
21
21
  utils_1.Utils.exec(command, {
22
- silent: false,
23
- skipLog: true
22
+ silent: false
24
23
  });
25
24
  };
26
25
  DotnetUtils.addProjectsToSln = function (slnFilePath, projects, dropSlnOnFail) {
package/src/services/commandManager.js CHANGED
@@ -90,7 +90,7 @@ var CommandManager = /** @class */ (function () {
90
90
  }
91
91
  return;
92
92
  }
93
- utils_1.Logger.warn("No executable commands recieved");
93
+ utils_1.Logger.warn("No executable commands received");
94
94
  };
95
95
  CommandManager.prototype.runBuilder = function (args) {
96
96
  return __awaiter(this, void 0, void 0, function () {
package/src/testRunners/apiTestRunner.js CHANGED
@@ -39,8 +39,7 @@ var ApiTestRunner = /** @class */ (function (_super) {
39
39
  var name = path.basename(p, ".csproj");
40
40
  var logPath = path.join(_this.config.resultPath, name + ".trx");
41
41
  utils_1.Utils.exec("dotnet test " + p + " -p:DefineConstants=TEST --logger:\"trx;LogFileName=" + _this.config.resultPath + "\"", {
42
- silent: false,
43
- skipLog: true
42
+ silent: false
44
43
  });
45
44
  });
46
45
  };
package/src/utils.js CHANGED
@@ -33,14 +33,14 @@ var Utils = /** @class */ (function () {
33
33
  function Utils() {
34
34
  }
35
35
  Utils.exec = function (cmd, options) {
36
- var _a = __assign({}, options), skipLog = _a.skipLog, skipError = _a.skipError, _b = _a.logCmd, logCmd = _b === void 0 ? true : _b, cmdOptions = __rest(_a, ["skipLog", "skipError", "logCmd"]);
36
+ var _a = __assign({}, options), skipError = _a.skipError, _b = _a.logCmd, logCmd = _b === void 0 ? true : _b, cmdOptions = __rest(_a, ["skipError", "logCmd"]);
37
37
  logCmd && Logger.info(cmd);
38
38
  try {
39
39
  var result = shell.exec(cmd, __assign({}, cmdOptions));
40
40
  if (result.code !== 0 && !skipError) {
41
41
  if (options === null || options === void 0 ? void 0 : options.onProcessExit)
42
42
  options.onProcessExit();
43
- Logger.error(skipLog ? "" : result.stderr || result.stdout);
43
+ Logger.error(result.stderr || result.stdout || "Command execution ended with code " + result.code);
44
44
  }
45
45
  return result;
46
46
  }