ics-builder 4.1.89 → 4.1.93

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ics-builder",
-	"version": "4.1.89",
+	"version": "4.1.93",
 	"description": "",
 	"main": "./src/app.js",
 	"preferGlobal": true,

package/src/builder/api/csprojFile.js

@@ -1,47 +1,37 @@
 "use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CsprojFile = void 0;
-var xml2js = require("xml2js");
-var fs = require("fs");
-var CsprojFile = /** @class */ (function () {
-    function CsprojFile(_path) {
-        this._path = _path;
+var xmlFile_1 = require("./xmlFile");
+var CsprojFile = /** @class */ (function (_super) {
+    __extends(CsprojFile, _super);
+    function CsprojFile() {
+        return _super !== null && _super.apply(this, arguments) || this;
     }
-    CsprojFile.prototype._readFile = function () {
-        var _this = this;
-        var file = fs.readFileSync(this._path);
-        xml2js.parseString(file, function (err, result) { return _this._xmlObj = result; });
-    };
-    CsprojFile.prototype.addPostBuildCopy = function (copyToPath) {
+    CsprojFile.prototype.setPublishPath = function (publishPath) {
         if (!this._xmlObj)
             this._readFile();
         if (!this._xmlObj.Project)
             this._xmlObj.Project = {};
-        this._xmlObj.Project.Target = {
-            $: {
-                Name: "CopyTarget",
-                AfterTargets: "PostBuildEvent"
-            },
-            ItemGroup: {
-                OutputFiles: {
-                    $: {
-                        Include: "$(TargetDir)\\*.*"
-                    }
-                }
-            },
-            Copy: {
-                $: {
-                    SourceFiles: "@(OutputFiles)",
-                    DestinationFolder: copyToPath,
-                }
-            }
-        };
-    };
-    CsprojFile.prototype.save = function (path) {
-        var builder = new xml2js.Builder();
-        var xml = builder.buildObject(this._xmlObj);
-        fs.writeFileSync(path, xml);
+        if (!this._xmlObj.Project.PropertyGroup)
+            this._xmlObj.Project.PropertyGroup = {};
+        var propertyGroup = Array.isArray(this._xmlObj.Project.PropertyGroup)
+            ? this._xmlObj.Project.PropertyGroup[0]
+            : this._xmlObj.Project.PropertyGroup;
+        propertyGroup.PublishDir = publishPath;
     };
     return CsprojFile;
-}());
+}(xmlFile_1.XmlFile));
 exports.CsprojFile = CsprojFile;

package/src/builder/api/net5Builder.js

@@ -21,6 +21,7 @@ var utils_1 = require("../../utils");
 var dotnetUtils_1 = require("../../dotnetUtils");
 var packageStructureManager_1 = require("../../services/packageStructure/packageStructureManager");
 var csprojFile_1 = require("./csprojFile");
+var webConfigFile_1 = require("./webConfigFile");
 var Net5ApiBuilder = /** @class */ (function (_super) {
     __extends(Net5ApiBuilder, _super);
     function Net5ApiBuilder(config) {
@@ -51,20 +52,22 @@ var Net5ApiBuilder = /** @class */ (function (_super) {
         var slnDir = path.dirname(coreModule.Project);
         var configuration = ((_a = this.config.api) === null || _a === void 0 ? void 0 : _a.configuration) || "Debug";
         var tempSlnPath = path.join(slnDir, slnName + ".sln");
-        var tempProjects = [];
         try {
             dotnetUtils_1.DotnetUtils.createTempSln(slnDir, slnName);
             for (var _i = 0, _b = this.modules; _i < _b.length; _i++) {
                 var m = _b[_i];
+                utils_1.Utils.copyFile(m.Project, m.TempProject);
                 var csproj = new csprojFile_1.CsprojFile(m.Project);
-                csproj.addPostBuildCopy(m.OutputPath);
-                var tempProjPath = this.getTempProjPath(m.Project);
-                tempProjects.push(tempProjPath);
-                csproj.save(tempProjPath);
+                csproj.setPublishPath(m.OutputPath);
+                csproj.save(m.Project);
             }
-            dotnetUtils_1.DotnetUtils.addProjectsToSln(tempSlnPath, tempProjects);
+            dotnetUtils_1.DotnetUtils.addProjectsToSln(tempSlnPath, this.modules.map(function (m) { return m.Project; }));
             dotnetUtils_1.DotnetUtils.restoreNugetPackages(tempSlnPath);
             dotnetUtils_1.DotnetUtils.publish(tempSlnPath, configuration);
+            var webConfigFilePath = path.join(coreModule.OutputPath, "web.config");
+            var webConfigFile = new webConfigFile_1.WebConfigFile(webConfigFilePath);
+            webConfigFile.addDotnetProcessPath();
+            webConfigFile.save();
             this.modules.filter(function (m) { return !m.IsCoreModule; }).forEach(function (m) {
                 var projectDir = path.dirname(m.Project);
                 _this.copyModuleConfig(projectDir, m.OutputPath, _this.configFile);
@@ -72,13 +75,12 @@ var Net5ApiBuilder = /** @class */ (function (_super) {
         }
         finally {
             utils_1.Utils.deleteFile(tempSlnPath);
-            tempProjects.forEach(function (p) { return utils_1.Utils.deleteFile(p); });
+            this.modules.forEach(function (m) {
+                utils_1.Utils.copyFile(m.TempProject, m.Project);
+                utils_1.Utils.deleteFile(m.TempProject);
+            });
         }
     };
-    Net5ApiBuilder.prototype.getTempProjPath = function (projPath) {
-        var dir = path.dirname(projPath);
-        return path.join(dir, utils_1.Utils.getFileName(projPath) + "_temp.csproj");
-    };
     Net5ApiBuilder.prototype.collectModuleInfo = function (pkg) {
         var _this = this;
         packageStructureManager_1.packageStructureManager.getModuleSourcePaths(pkg, "api", this.config).forEach(function (_a) {
@@ -132,6 +134,8 @@ var ApiModuleInfo = /** @class */ (function () {
         this.Package = pkg;
         this.Module = module;
         this.Project = project;
+        var dir = path.dirname(project);
+        this.TempProject = path.join(dir, utils_1.Utils.getFileName(project) + "_temp.csproj");
         this.IsCoreModule = module.name == "_core" && pkg == "mdt";
         this.OutputPath = this.IsCoreModule
             ? buildApiFolder

package/src/builder/api/webConfigFile.js

@@ -0,0 +1,33 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebConfigFile = void 0;
+var xmlFile_1 = require("./xmlFile");
+var WebConfigFile = /** @class */ (function (_super) {
+    __extends(WebConfigFile, _super);
+    function WebConfigFile() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    WebConfigFile.prototype.addDotnetProcessPath = function () {
+        if (!this._xmlObj)
+            this._readFile();
+        var aspNetCoreSectionOptions = this._xmlObj.configuration.location["system.webServer"].aspNetCore.$;
+        aspNetCoreSectionOptions.processPath = "dotnet";
+        aspNetCoreSectionOptions.arguments = ".\\Mdt.WebApi.dll";
+        aspNetCoreSectionOptions.stdoutLogEnabled = "false";
+    };
+    return WebConfigFile;
+}(xmlFile_1.XmlFile));
+exports.WebConfigFile = WebConfigFile;

package/src/builder/api/xmlFile.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.XmlFile = void 0;
+var xml2js = require("xml2js");
+var fs = require("fs");
+var XmlFile = /** @class */ (function () {
+    function XmlFile(_path) {
+        this._path = _path;
+    }
+    XmlFile.prototype._readFile = function () {
+        var _this = this;
+        var file = fs.readFileSync(this._path);
+        xml2js.parseString(file, { explicitArray: false }, function (err, result) { return _this._xmlObj = result; });
+    };
+    XmlFile.prototype.save = function (path) {
+        if (path === void 0) { path = null; }
+        var builder = new xml2js.Builder();
+        var xml = builder.buildObject(this._xmlObj);
+        fs.writeFileSync(path !== null && path !== void 0 ? path : this._path, xml);
+    };
+    return XmlFile;
+}());
+exports.XmlFile = XmlFile;