From 16e64b0f5a23e6999f0a3e05ccd8b87f7ba7ac5a Mon Sep 17 00:00:00 2001 From: Artur Stolear Date: Fri, 22 Nov 2019 19:11:39 +0200 Subject: [PATCH] move to common main --- dist/github/execute/index.js | 125 +++++++++++++++++++++-------------- dist/github/setup/index.js | 102 ++++++++++++++++++++-------- src/azure/execute.ts | 18 +---- src/azure/setup.ts | 18 +---- src/common.ts | 2 +- src/github/execute.ts | 52 ++------------- src/github/setup.ts | 21 +----- src/main.ts | 64 ++++++++++++++++++ 8 files changed, 228 insertions(+), 174 deletions(-) create mode 100644 src/main.ts diff --git a/dist/github/execute/index.js b/dist/github/execute/index.js index 6528c0b..434079f 100644 --- a/dist/github/execute/index.js +++ b/dist/github/execute/index.js @@ -1196,6 +1196,79 @@ module.exports = require("child_process"); /***/ }), +/***/ 131: +/***/ (function(__unusedmodule, exports, __webpack_require__) { + +"use strict"; + +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +Object.defineProperty(exports, "__esModule", { value: true }); +const types_1 = __webpack_require__(639); +function setup(buildAgent, gitVersionTool) { + return __awaiter(this, void 0, void 0, function* () { + try { + buildAgent.exportVariable("DOTNET_CLI_TELEMETRY_OPTOUT", "1"); + const versionSpec = buildAgent.getInput(types_1.SetupOptions.versionSpec); + const includePrerelease = buildAgent.getBooleanInput(types_1.SetupOptions.includePrerelease); + yield gitVersionTool.install(versionSpec, includePrerelease); + buildAgent.setSucceeded("GitVersion installed successfully", true); + } + catch (error) { + buildAgent.setFailed(error.message, true); + } + }); +} +exports.setup = setup; +function run(buildAgent, gitVersionTool) { + return __awaiter(this, void 0, void 0, function* () { + try { + const inputOptions = getGitVersionOptions(buildAgent); + const result = yield gitVersionTool.run(inputOptions); + const gitversion = JSON.parse(result.stdout); + console.log(gitversion.FullSemVer); + if (result.code === 0) { + buildAgent.setSucceeded("GitVersion executed successfully", true); + } + else { + buildAgent.setFailed(result.error.message, true); + } + } + catch (error) { + buildAgent.setFailed(error, true); + } + }); +} +exports.run = run; +function getGitVersionOptions(buildAgent) { + const targetPath = buildAgent.getInput(types_1.RunOptions.targetPath); + const useConfigFile = buildAgent.getBooleanInput(types_1.RunOptions.useConfigFile); + const configFilePath = buildAgent.getInput(types_1.RunOptions.configFilePath); + const updateAssemblyInfo = buildAgent.getBooleanInput(types_1.RunOptions.updateAssemblyInfo); + const updateAssemblyInfoFilename = buildAgent.getInput(types_1.RunOptions.updateAssemblyInfoFilename); + const additionalArguments = buildAgent.getInput(types_1.RunOptions.additionalArguments); + const srcDir = buildAgent.getSourceDir().replace(/\\/g, "/"); + return { + targetPath, + useConfigFile, + configFilePath, + updateAssemblyInfo, + updateAssemblyInfoFilename, + additionalArguments, + srcDir, + }; +} +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZmlsZTovLy9EOi9Qcm9qZWN0cy9PU1MvR2l0VG9vbHMvdXNlLWdpdHZlcnNpb24vc3JjL21haW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFFQSxtQ0FBbUQ7QUFFbkQsU0FBc0IsS0FBSyxDQUFDLFVBQXVCLEVBQUUsY0FBK0I7O1FBQ2hGLElBQUk7WUFFQSxVQUFVLENBQUMsY0FBYyxDQUFDLDZCQUE2QixFQUFFLEdBQUcsQ0FBQyxDQUFDO1lBRTlELE1BQU0sV0FBVyxHQUFHLFVBQVUsQ0FBQyxRQUFRLENBQUMsb0JBQVksQ0FBQyxXQUFXLENBQUMsQ0FBQztZQUNsRSxNQUFNLGlCQUFpQixHQUFHLFVBQVUsQ0FBQyxlQUFlLENBQUMsb0JBQVksQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO1lBRXJGLE1BQU0sY0FBYyxDQUFDLE9BQU8sQ0FBQyxXQUFXLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztZQUU3RCxVQUFVLENBQUMsWUFBWSxDQUFDLG1DQUFtQyxFQUFFLElBQUksQ0FBQyxDQUFDO1NBQ3RFO1FBQUMsT0FBTyxLQUFLLEVBQUU7WUFDWixVQUFVLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLENBQUM7U0FDN0M7SUFDTCxDQUFDO0NBQUE7QUFkRCxzQkFjQztBQUVELFNBQXNCLEdBQUcsQ0FBQyxVQUF1QixFQUFFLGNBQStCOztRQUM5RSxJQUFJO1lBQ0EsTUFBTSxZQUFZLEdBQXVCLG9CQUFvQixDQUFDLFVBQVUsQ0FBQyxDQUFDO1lBRTFFLE1BQU0sTUFBTSxHQUFHLE1BQU0sY0FBYyxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsQ0FBQztZQUV0RCxNQUFNLFVBQVUsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQWdCLENBQUM7WUFDNUQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDLENBQUM7WUFFbkMsSUFBSSxNQUFNLENBQUMsSUFBSSxLQUFLLENBQUMsRUFBRTtnQkFDbkIsVUFBVSxDQUFDLFlBQVksQ0FBQyxrQ0FBa0MsRUFBRSxJQUFJLENBQUMsQ0FBQzthQUNyRTtpQkFBTTtnQkFDSCxVQUFVLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsT0FBTyxFQUFFLElBQUksQ0FBQyxDQUFDO2FBQ3BEO1NBRUo7UUFBQyxPQUFPLEtBQUssRUFBRTtZQUNaLFVBQVUsQ0FBQyxTQUFTLENBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxDQUFDO1NBQ3JDO0lBQ0wsQ0FBQztDQUFBO0FBbEJELGtCQWtCQztBQUVELFNBQVMsb0JBQW9CLENBQUMsVUFBdUI7SUFFakQsTUFBTSxVQUFVLEdBQUcsVUFBVSxDQUFDLFFBQVEsQ0FBQyxrQkFBVSxDQUFDLFVBQVUsQ0FBQyxDQUFDO0lBRTlELE1BQU0sYUFBYSxHQUFHLFVBQVUsQ0FBQyxlQUFlLENBQUMsa0JBQVUsQ0FBQyxhQUFhLENBQUMsQ0FBQztJQUMzRSxNQUFNLGNBQWMsR0FBRyxVQUFVLENBQUMsUUFBUSxDQUFDLGtCQUFVLENBQUMsY0FBYyxDQUFDLENBQUM7SUFFdEUsTUFBTSxrQkFBa0IsR0FBRyxVQUFVLENBQUMsZUFBZSxDQUFDLGtCQUFVLENBQUMsa0JBQWtCLENBQUMsQ0FBQztJQUNyRixNQUFNLDBCQUEwQixHQUFHLFVBQVUsQ0FBQyxRQUFRLENBQUMsa0JBQVUsQ0FBQywwQkFBMEIsQ0FBQyxDQUFDO0lBRTlGLE1BQU0sbUJBQW1CLEdBQUcsVUFBVSxDQUFDLFFBQVEsQ0FBQyxrQkFBVSxDQUFDLG1CQUFtQixDQUFDLENBQUM7SUFFaEYsTUFBTSxNQUFNLEdBQUcsVUFBVSxDQUFDLFlBQVksRUFBRSxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsR0FBRyxDQUFDLENBQUM7SUFFN0QsT0FBTztRQUNILFVBQVU7UUFDVixhQUFhO1FBQ2IsY0FBYztRQUNkLGtCQUFrQjtRQUNsQiwwQkFBMEI7UUFDMUIsbUJBQW1CO1FBQ25CLE1BQU07S0FDVCxDQUFDO0FBQ04sQ0FBQyJ9 + +/***/ }), + /***/ 139: /***/ (function(module, __unusedexports, __webpack_require__) { @@ -7666,61 +7739,15 @@ function isUnixExecutable(stats) { "use strict"; -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; Object.defineProperty(exports, "__esModule", { value: true }); __webpack_require__(307); +const main_1 = __webpack_require__(131); const types_1 = __webpack_require__(639); const ioc_1 = __webpack_require__(768); const gitVersionTool = ioc_1.ioc.get(types_1.TYPES.IGitVersionTool); const buildAgent = ioc_1.ioc.get(types_1.TYPES.IBuildAgent); -function run() { - return __awaiter(this, void 0, void 0, function* () { - try { - const inputOptions = getGitVersionOptions(); - const result = yield gitVersionTool.run(inputOptions); - const gitversion = JSON.parse(result.stdout); - console.log(gitversion.FullSemVer); - if (result.code === 0) { - buildAgent.setSucceeded("GitVersion executed successfully", true); - } - else { - buildAgent.setFailed(result.error.message, true); - } - } - catch (error) { - buildAgent.setFailed(error, true); - } - }); -} -exports.run = run; -function getGitVersionOptions() { - const targetPath = buildAgent.getInput(types_1.RunOptions.targetPath); - const useConfigFile = buildAgent.getBooleanInput(types_1.RunOptions.useConfigFile); - const configFilePath = buildAgent.getInput(types_1.RunOptions.configFilePath); - const updateAssemblyInfo = buildAgent.getBooleanInput(types_1.RunOptions.updateAssemblyInfo); - const updateAssemblyInfoFilename = buildAgent.getInput(types_1.RunOptions.updateAssemblyInfoFilename); - const additionalArguments = buildAgent.getInput(types_1.RunOptions.additionalArguments); - const srcDir = buildAgent.getSourceDir().replace(/\\/g, "/"); - return { - targetPath, - useConfigFile, - configFilePath, - updateAssemblyInfo, - updateAssemblyInfoFilename, - additionalArguments, - srcDir, - }; -} -run(); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlY3V0ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImZpbGU6Ly8vRDovUHJvamVjdHMvT1NTL0dpdFRvb2xzL3VzZS1naXR2ZXJzaW9uL3NyYy9naXRodWIvZXhlY3V0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7OztBQUFBLDRCQUEwQjtBQUcxQixvQ0FBNkM7QUFDN0MsK0JBQTRCO0FBRTVCLE1BQU0sY0FBYyxHQUFHLFNBQUcsQ0FBQyxHQUFHLENBQWtCLGFBQUssQ0FBQyxlQUFlLENBQUMsQ0FBQztBQUN2RSxNQUFNLFVBQVUsR0FBRyxTQUFHLENBQUMsR0FBRyxDQUFjLGFBQUssQ0FBQyxXQUFXLENBQUMsQ0FBQztBQUUzRCxTQUFzQixHQUFHOztRQUNyQixJQUFJO1lBQ0EsTUFBTSxZQUFZLEdBQXVCLG9CQUFvQixFQUFFLENBQUM7WUFFaEUsTUFBTSxNQUFNLEdBQUcsTUFBTSxjQUFjLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxDQUFDO1lBRXRELE1BQU0sVUFBVSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBZ0IsQ0FBQztZQUM1RCxPQUFPLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsQ0FBQztZQUVuQyxJQUFJLE1BQU0sQ0FBQyxJQUFJLEtBQUssQ0FBQyxFQUFFO2dCQUNuQixVQUFVLENBQUMsWUFBWSxDQUFDLGtDQUFrQyxFQUFFLElBQUksQ0FBQyxDQUFDO2FBQ3JFO2lCQUFNO2dCQUNILFVBQVUsQ0FBQyxTQUFTLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLENBQUM7YUFDcEQ7U0FFSjtRQUFDLE9BQU8sS0FBSyxFQUFFO1lBQ1osVUFBVSxDQUFDLFNBQVMsQ0FBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLENBQUM7U0FDckM7SUFDTCxDQUFDO0NBQUE7QUFsQkQsa0JBa0JDO0FBRUQsU0FBUyxvQkFBb0I7SUFFekIsTUFBTSxVQUFVLEdBQUcsVUFBVSxDQUFDLFFBQVEsQ0FBQyxrQkFBVSxDQUFDLFVBQVUsQ0FBQyxDQUFDO0lBRTlELE1BQU0sYUFBYSxHQUFHLFVBQVUsQ0FBQyxlQUFlLENBQUMsa0JBQVUsQ0FBQyxhQUFhLENBQUMsQ0FBQztJQUMzRSxNQUFNLGNBQWMsR0FBRyxVQUFVLENBQUMsUUFBUSxDQUFDLGtCQUFVLENBQUMsY0FBYyxDQUFDLENBQUM7SUFFdEUsTUFBTSxrQkFBa0IsR0FBRyxVQUFVLENBQUMsZUFBZSxDQUFDLGtCQUFVLENBQUMsa0JBQWtCLENBQUMsQ0FBQztJQUNyRixNQUFNLDBCQUEwQixHQUFHLFVBQVUsQ0FBQyxRQUFRLENBQUMsa0JBQVUsQ0FBQywwQkFBMEIsQ0FBQyxDQUFDO0lBRTlGLE1BQU0sbUJBQW1CLEdBQUcsVUFBVSxDQUFDLFFBQVEsQ0FBQyxrQkFBVSxDQUFDLG1CQUFtQixDQUFDLENBQUM7SUFFaEYsTUFBTSxNQUFNLEdBQUcsVUFBVSxDQUFDLFlBQVksRUFBRSxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsR0FBRyxDQUFDLENBQUM7SUFFN0QsT0FBTztRQUNILFVBQVU7UUFDVixhQUFhO1FBQ2IsY0FBYztRQUNkLGtCQUFrQjtRQUNsQiwwQkFBMEI7UUFDMUIsbUJBQW1CO1FBQ25CLE1BQU07S0FDVCxDQUFDO0FBQ04sQ0FBQztBQUVELEdBQUcsRUFBRSxDQUFDIn0= +main_1.run(buildAgent, gitVersionTool); +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlY3V0ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImZpbGU6Ly8vRDovUHJvamVjdHMvT1NTL0dpdFRvb2xzL3VzZS1naXR2ZXJzaW9uL3NyYy9naXRodWIvZXhlY3V0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDRCQUEwQjtBQUcxQixrQ0FBOEI7QUFDOUIsb0NBQWlDO0FBQ2pDLCtCQUE0QjtBQUU1QixNQUFNLGNBQWMsR0FBRyxTQUFHLENBQUMsR0FBRyxDQUFrQixhQUFLLENBQUMsZUFBZSxDQUFDLENBQUM7QUFDdkUsTUFBTSxVQUFVLEdBQUcsU0FBRyxDQUFDLEdBQUcsQ0FBYyxhQUFLLENBQUMsV0FBVyxDQUFDLENBQUM7QUFFM0QsVUFBRyxDQUFDLFVBQVUsRUFBRSxjQUFjLENBQUMsQ0FBQyJ9 /***/ }), diff --git a/dist/github/setup/index.js b/dist/github/setup/index.js index 9bb9a25..c1b2584 100644 --- a/dist/github/setup/index.js +++ b/dist/github/setup/index.js @@ -1196,6 +1196,79 @@ module.exports = require("child_process"); /***/ }), +/***/ 131: +/***/ (function(__unusedmodule, exports, __webpack_require__) { + +"use strict"; + +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +Object.defineProperty(exports, "__esModule", { value: true }); +const types_1 = __webpack_require__(639); +function setup(buildAgent, gitVersionTool) { + return __awaiter(this, void 0, void 0, function* () { + try { + buildAgent.exportVariable("DOTNET_CLI_TELEMETRY_OPTOUT", "1"); + const versionSpec = buildAgent.getInput(types_1.SetupOptions.versionSpec); + const includePrerelease = buildAgent.getBooleanInput(types_1.SetupOptions.includePrerelease); + yield gitVersionTool.install(versionSpec, includePrerelease); + buildAgent.setSucceeded("GitVersion installed successfully", true); + } + catch (error) { + buildAgent.setFailed(error.message, true); + } + }); +} +exports.setup = setup; +function run(buildAgent, gitVersionTool) { + return __awaiter(this, void 0, void 0, function* () { + try { + const inputOptions = getGitVersionOptions(buildAgent); + const result = yield gitVersionTool.run(inputOptions); + const gitversion = JSON.parse(result.stdout); + console.log(gitversion.FullSemVer); + if (result.code === 0) { + buildAgent.setSucceeded("GitVersion executed successfully", true); + } + else { + buildAgent.setFailed(result.error.message, true); + } + } + catch (error) { + buildAgent.setFailed(error, true); + } + }); +} +exports.run = run; +function getGitVersionOptions(buildAgent) { + const targetPath = buildAgent.getInput(types_1.RunOptions.targetPath); + const useConfigFile = buildAgent.getBooleanInput(types_1.RunOptions.useConfigFile); + const configFilePath = buildAgent.getInput(types_1.RunOptions.configFilePath); + const updateAssemblyInfo = buildAgent.getBooleanInput(types_1.RunOptions.updateAssemblyInfo); + const updateAssemblyInfoFilename = buildAgent.getInput(types_1.RunOptions.updateAssemblyInfoFilename); + const additionalArguments = buildAgent.getInput(types_1.RunOptions.additionalArguments); + const srcDir = buildAgent.getSourceDir().replace(/\\/g, "/"); + return { + targetPath, + useConfigFile, + configFilePath, + updateAssemblyInfo, + updateAssemblyInfoFilename, + additionalArguments, + srcDir, + }; +} +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZmlsZTovLy9EOi9Qcm9qZWN0cy9PU1MvR2l0VG9vbHMvdXNlLWdpdHZlcnNpb24vc3JjL21haW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFFQSxtQ0FBbUQ7QUFFbkQsU0FBc0IsS0FBSyxDQUFDLFVBQXVCLEVBQUUsY0FBK0I7O1FBQ2hGLElBQUk7WUFFQSxVQUFVLENBQUMsY0FBYyxDQUFDLDZCQUE2QixFQUFFLEdBQUcsQ0FBQyxDQUFDO1lBRTlELE1BQU0sV0FBVyxHQUFHLFVBQVUsQ0FBQyxRQUFRLENBQUMsb0JBQVksQ0FBQyxXQUFXLENBQUMsQ0FBQztZQUNsRSxNQUFNLGlCQUFpQixHQUFHLFVBQVUsQ0FBQyxlQUFlLENBQUMsb0JBQVksQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO1lBRXJGLE1BQU0sY0FBYyxDQUFDLE9BQU8sQ0FBQyxXQUFXLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztZQUU3RCxVQUFVLENBQUMsWUFBWSxDQUFDLG1DQUFtQyxFQUFFLElBQUksQ0FBQyxDQUFDO1NBQ3RFO1FBQUMsT0FBTyxLQUFLLEVBQUU7WUFDWixVQUFVLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLENBQUM7U0FDN0M7SUFDTCxDQUFDO0NBQUE7QUFkRCxzQkFjQztBQUVELFNBQXNCLEdBQUcsQ0FBQyxVQUF1QixFQUFFLGNBQStCOztRQUM5RSxJQUFJO1lBQ0EsTUFBTSxZQUFZLEdBQXVCLG9CQUFvQixDQUFDLFVBQVUsQ0FBQyxDQUFDO1lBRTFFLE1BQU0sTUFBTSxHQUFHLE1BQU0sY0FBYyxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsQ0FBQztZQUV0RCxNQUFNLFVBQVUsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQWdCLENBQUM7WUFDNUQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDLENBQUM7WUFFbkMsSUFBSSxNQUFNLENBQUMsSUFBSSxLQUFLLENBQUMsRUFBRTtnQkFDbkIsVUFBVSxDQUFDLFlBQVksQ0FBQyxrQ0FBa0MsRUFBRSxJQUFJLENBQUMsQ0FBQzthQUNyRTtpQkFBTTtnQkFDSCxVQUFVLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsT0FBTyxFQUFFLElBQUksQ0FBQyxDQUFDO2FBQ3BEO1NBRUo7UUFBQyxPQUFPLEtBQUssRUFBRTtZQUNaLFVBQVUsQ0FBQyxTQUFTLENBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxDQUFDO1NBQ3JDO0lBQ0wsQ0FBQztDQUFBO0FBbEJELGtCQWtCQztBQUVELFNBQVMsb0JBQW9CLENBQUMsVUFBdUI7SUFFakQsTUFBTSxVQUFVLEdBQUcsVUFBVSxDQUFDLFFBQVEsQ0FBQyxrQkFBVSxDQUFDLFVBQVUsQ0FBQyxDQUFDO0lBRTlELE1BQU0sYUFBYSxHQUFHLFVBQVUsQ0FBQyxlQUFlLENBQUMsa0JBQVUsQ0FBQyxhQUFhLENBQUMsQ0FBQztJQUMzRSxNQUFNLGNBQWMsR0FBRyxVQUFVLENBQUMsUUFBUSxDQUFDLGtCQUFVLENBQUMsY0FBYyxDQUFDLENBQUM7SUFFdEUsTUFBTSxrQkFBa0IsR0FBRyxVQUFVLENBQUMsZUFBZSxDQUFDLGtCQUFVLENBQUMsa0JBQWtCLENBQUMsQ0FBQztJQUNyRixNQUFNLDBCQUEwQixHQUFHLFVBQVUsQ0FBQyxRQUFRLENBQUMsa0JBQVUsQ0FBQywwQkFBMEIsQ0FBQyxDQUFDO0lBRTlGLE1BQU0sbUJBQW1CLEdBQUcsVUFBVSxDQUFDLFFBQVEsQ0FBQyxrQkFBVSxDQUFDLG1CQUFtQixDQUFDLENBQUM7SUFFaEYsTUFBTSxNQUFNLEdBQUcsVUFBVSxDQUFDLFlBQVksRUFBRSxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsR0FBRyxDQUFDLENBQUM7SUFFN0QsT0FBTztRQUNILFVBQVU7UUFDVixhQUFhO1FBQ2IsY0FBYztRQUNkLGtCQUFrQjtRQUNsQiwwQkFBMEI7UUFDMUIsbUJBQW1CO1FBQ25CLE1BQU07S0FDVCxDQUFDO0FBQ04sQ0FBQyJ9 + +/***/ }), + /***/ 139: /***/ (function(module, __unusedexports, __webpack_require__) { @@ -8566,38 +8639,15 @@ module.exports = v4; "use strict"; -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; Object.defineProperty(exports, "__esModule", { value: true }); __webpack_require__(307); +const main_1 = __webpack_require__(131); const types_1 = __webpack_require__(639); const ioc_1 = __webpack_require__(768); const gitVersionTool = ioc_1.ioc.get(types_1.TYPES.IGitVersionTool); const buildAgent = ioc_1.ioc.get(types_1.TYPES.IBuildAgent); -function run() { - return __awaiter(this, void 0, void 0, function* () { - try { - buildAgent.exportVariable("DOTNET_CLI_TELEMETRY_OPTOUT", "1"); - const versionSpec = buildAgent.getInput(types_1.SetupOptions.versionSpec); - const includePrerelease = buildAgent.getBooleanInput(types_1.SetupOptions.includePrerelease); - yield gitVersionTool.install(versionSpec, includePrerelease); - buildAgent.setSucceeded("GitVersion installed successfully", true); - } - catch (error) { - buildAgent.setFailed(error.message, true); - } - }); -} -exports.run = run; -run(); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJmaWxlOi8vL0Q6L1Byb2plY3RzL09TUy9HaXRUb29scy91c2UtZ2l0dmVyc2lvbi9zcmMvZ2l0aHViL3NldHVwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7O0FBQUEsNEJBQTBCO0FBRzFCLG9DQUErQztBQUMvQywrQkFBNEI7QUFFNUIsTUFBTSxjQUFjLEdBQUcsU0FBRyxDQUFDLEdBQUcsQ0FBa0IsYUFBSyxDQUFDLGVBQWUsQ0FBQyxDQUFDO0FBQ3ZFLE1BQU0sVUFBVSxHQUFHLFNBQUcsQ0FBQyxHQUFHLENBQWMsYUFBSyxDQUFDLFdBQVcsQ0FBQyxDQUFDO0FBRTNELFNBQXNCLEdBQUc7O1FBQ3JCLElBQUk7WUFFQSxVQUFVLENBQUMsY0FBYyxDQUFDLDZCQUE2QixFQUFFLEdBQUcsQ0FBQyxDQUFDO1lBRTlELE1BQU0sV0FBVyxHQUFHLFVBQVUsQ0FBQyxRQUFRLENBQUMsb0JBQVksQ0FBQyxXQUFXLENBQUMsQ0FBQztZQUNsRSxNQUFNLGlCQUFpQixHQUFHLFVBQVUsQ0FBQyxlQUFlLENBQUMsb0JBQVksQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO1lBRXJGLE1BQU0sY0FBYyxDQUFDLE9BQU8sQ0FBQyxXQUFXLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztZQUU3RCxVQUFVLENBQUMsWUFBWSxDQUFDLG1DQUFtQyxFQUFFLElBQUksQ0FBQyxDQUFDO1NBQ3RFO1FBQUMsT0FBTyxLQUFLLEVBQUU7WUFDWixVQUFVLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLENBQUM7U0FDN0M7SUFDTCxDQUFDO0NBQUE7QUFkRCxrQkFjQztBQUVELEdBQUcsRUFBRSxDQUFDIn0= +main_1.setup(buildAgent, gitVersionTool); +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJmaWxlOi8vL0Q6L1Byb2plY3RzL09TUy9HaXRUb29scy91c2UtZ2l0dmVyc2lvbi9zcmMvZ2l0aHViL3NldHVwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsNEJBQTBCO0FBRzFCLGtDQUFnQztBQUNoQyxvQ0FBaUM7QUFDakMsK0JBQTRCO0FBRTVCLE1BQU0sY0FBYyxHQUFHLFNBQUcsQ0FBQyxHQUFHLENBQWtCLGFBQUssQ0FBQyxlQUFlLENBQUMsQ0FBQztBQUN2RSxNQUFNLFVBQVUsR0FBRyxTQUFHLENBQUMsR0FBRyxDQUFjLGFBQUssQ0FBQyxXQUFXLENBQUMsQ0FBQztBQUUzRCxZQUFLLENBQUMsVUFBVSxFQUFFLGNBQWMsQ0FBQyxDQUFDIn0= /***/ }), diff --git a/src/azure/execute.ts b/src/azure/execute.ts index 3c3b90c..03b3fa2 100644 --- a/src/azure/execute.ts +++ b/src/azure/execute.ts @@ -1,25 +1,11 @@ import "reflect-metadata"; import { IBuildAgent, IGitVersionTool } from "../interfaces"; +import { run } from "../main"; import { TYPES } from "../types"; import { ioc } from "./ioc"; const gitVersionTool = ioc.get(TYPES.IGitVersionTool); const buildAgent = ioc.get(TYPES.IBuildAgent); -export async function run() { - try { - - const version = "5.1.2"; - const includePrerelease = false; - - buildAgent.exportVariable("DOTNET_CLI_TELEMETRY_OPTOUT", "1"); - await gitVersionTool.install(version, includePrerelease); - - buildAgent.setSucceeded("GitVersion installed successfully", true); - } catch (error) { - buildAgent.setFailed(error.message, true); - } -} - -run(); +run(buildAgent, gitVersionTool); diff --git a/src/azure/setup.ts b/src/azure/setup.ts index 3c3b90c..9b9275f 100644 --- a/src/azure/setup.ts +++ b/src/azure/setup.ts @@ -1,25 +1,11 @@ import "reflect-metadata"; import { IBuildAgent, IGitVersionTool } from "../interfaces"; +import { setup } from "../main"; import { TYPES } from "../types"; import { ioc } from "./ioc"; const gitVersionTool = ioc.get(TYPES.IGitVersionTool); const buildAgent = ioc.get(TYPES.IBuildAgent); -export async function run() { - try { - - const version = "5.1.2"; - const includePrerelease = false; - - buildAgent.exportVariable("DOTNET_CLI_TELEMETRY_OPTOUT", "1"); - await gitVersionTool.install(version, includePrerelease); - - buildAgent.setSucceeded("GitVersion installed successfully", true); - } catch (error) { - buildAgent.setFailed(error.message, true); - } -} - -run(); +setup(buildAgent, gitVersionTool); diff --git a/src/common.ts b/src/common.ts index e58a79a..551f9c3 100644 --- a/src/common.ts +++ b/src/common.ts @@ -7,7 +7,7 @@ import * as http from "typed-rest-client/HttpClient"; import { inject, injectable } from "inversify"; -import { Argument, IBuildAgent, IDotnetTool, IExecResult, IGitVersionOptions, IGitVersionTool, IVersionManager } from "./interfaces"; +import { IBuildAgent, IDotnetTool, IExecResult, IGitVersionOptions, IGitVersionTool, IVersionManager } from "./interfaces"; import { TYPES } from "./types"; @injectable() diff --git a/src/github/execute.ts b/src/github/execute.ts index 7f04588..03b3fa2 100644 --- a/src/github/execute.ts +++ b/src/github/execute.ts @@ -1,55 +1,11 @@ import "reflect-metadata"; -import { IBuildAgent, IGitVersion, IGitVersionOptions, IGitVersionTool } from "../interfaces"; -import { RunOptions, TYPES } from "../types"; +import { IBuildAgent, IGitVersionTool } from "../interfaces"; +import { run } from "../main"; +import { TYPES } from "../types"; import { ioc } from "./ioc"; const gitVersionTool = ioc.get(TYPES.IGitVersionTool); const buildAgent = ioc.get(TYPES.IBuildAgent); -export async function run() { - try { - const inputOptions: IGitVersionOptions = getGitVersionOptions(); - - const result = await gitVersionTool.run(inputOptions); - - const gitversion = JSON.parse(result.stdout) as IGitVersion; - console.log(gitversion.FullSemVer); - - if (result.code === 0) { - buildAgent.setSucceeded("GitVersion executed successfully", true); - } else { - buildAgent.setFailed(result.error.message, true); - } - - } catch (error) { - buildAgent.setFailed(error, true); - } -} - -function getGitVersionOptions(): IGitVersionOptions { - - const targetPath = buildAgent.getInput(RunOptions.targetPath); - - const useConfigFile = buildAgent.getBooleanInput(RunOptions.useConfigFile); - const configFilePath = buildAgent.getInput(RunOptions.configFilePath); - - const updateAssemblyInfo = buildAgent.getBooleanInput(RunOptions.updateAssemblyInfo); - const updateAssemblyInfoFilename = buildAgent.getInput(RunOptions.updateAssemblyInfoFilename); - - const additionalArguments = buildAgent.getInput(RunOptions.additionalArguments); - - const srcDir = buildAgent.getSourceDir().replace(/\\/g, "/"); - - return { - targetPath, - useConfigFile, - configFilePath, - updateAssemblyInfo, - updateAssemblyInfoFilename, - additionalArguments, - srcDir, - }; -} - -run(); +run(buildAgent, gitVersionTool); diff --git a/src/github/setup.ts b/src/github/setup.ts index 54ca537..9b9275f 100644 --- a/src/github/setup.ts +++ b/src/github/setup.ts @@ -1,26 +1,11 @@ import "reflect-metadata"; import { IBuildAgent, IGitVersionTool } from "../interfaces"; -import { SetupOptions, TYPES } from "../types"; +import { setup } from "../main"; +import { TYPES } from "../types"; import { ioc } from "./ioc"; const gitVersionTool = ioc.get(TYPES.IGitVersionTool); const buildAgent = ioc.get(TYPES.IBuildAgent); -export async function run() { - try { - - buildAgent.exportVariable("DOTNET_CLI_TELEMETRY_OPTOUT", "1"); - - const versionSpec = buildAgent.getInput(SetupOptions.versionSpec); - const includePrerelease = buildAgent.getBooleanInput(SetupOptions.includePrerelease); - - await gitVersionTool.install(versionSpec, includePrerelease); - - buildAgent.setSucceeded("GitVersion installed successfully", true); - } catch (error) { - buildAgent.setFailed(error.message, true); - } -} - -run(); +setup(buildAgent, gitVersionTool); diff --git a/src/main.ts b/src/main.ts new file mode 100644 index 0000000..0e8640d --- /dev/null +++ b/src/main.ts @@ -0,0 +1,64 @@ +import { IBuildAgent, IGitVersion, IGitVersionOptions, IGitVersionTool } from "./interfaces"; + +import { RunOptions, SetupOptions } from "./types"; + +export async function setup(buildAgent: IBuildAgent, gitVersionTool: IGitVersionTool) { + try { + + buildAgent.exportVariable("DOTNET_CLI_TELEMETRY_OPTOUT", "1"); + + const versionSpec = buildAgent.getInput(SetupOptions.versionSpec); + const includePrerelease = buildAgent.getBooleanInput(SetupOptions.includePrerelease); + + await gitVersionTool.install(versionSpec, includePrerelease); + + buildAgent.setSucceeded("GitVersion installed successfully", true); + } catch (error) { + buildAgent.setFailed(error.message, true); + } +} + +export async function run(buildAgent: IBuildAgent, gitVersionTool: IGitVersionTool) { + try { + const inputOptions: IGitVersionOptions = getGitVersionOptions(buildAgent); + + const result = await gitVersionTool.run(inputOptions); + + const gitversion = JSON.parse(result.stdout) as IGitVersion; + console.log(gitversion.FullSemVer); + + if (result.code === 0) { + buildAgent.setSucceeded("GitVersion executed successfully", true); + } else { + buildAgent.setFailed(result.error.message, true); + } + + } catch (error) { + buildAgent.setFailed(error, true); + } +} + +function getGitVersionOptions(buildAgent: IBuildAgent ): IGitVersionOptions { + + const targetPath = buildAgent.getInput(RunOptions.targetPath); + + const useConfigFile = buildAgent.getBooleanInput(RunOptions.useConfigFile); + const configFilePath = buildAgent.getInput(RunOptions.configFilePath); + + const updateAssemblyInfo = buildAgent.getBooleanInput(RunOptions.updateAssemblyInfo); + const updateAssemblyInfoFilename = buildAgent.getInput(RunOptions.updateAssemblyInfoFilename); + + const additionalArguments = buildAgent.getInput(RunOptions.additionalArguments); + + const srcDir = buildAgent.getSourceDir().replace(/\\/g, "/"); + + return { + targetPath, + useConfigFile, + configFilePath, + updateAssemblyInfo, + updateAssemblyInfoFilename, + additionalArguments, + srcDir, + }; +}