moved tools to separate folders

This commit is contained in:
Artur Stolear
2020-02-07 22:38:58 +02:00
parent 7dee6ba225
commit f17101e556
17 changed files with 338 additions and 250 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1,5 +1,5 @@
import { IBuildAgent, TYPES, SetupOptions } from "../../core/common"; import { IBuildAgent, TYPES, SetupOptions } from "../../core/common";
import { IGitReleaseManagerTool, GitReleaseManagerTool } from "../../tools/gitreleasemanager"; import { IGitReleaseManagerTool, GitReleaseManagerTool } from "../../tools/gitreleasemanager/gitreleasemanager-tool";
import container from "../../core/ioc"; import container from "../../core/ioc";

View File

@@ -1,5 +1,6 @@
import { IBuildAgent, TYPES, SetupOptions } from "../../core/common"; import { IBuildAgent, TYPES, SetupOptions } from "../../core/common";
import { IGitVersionTool, IGitVersionArguments, IGitVersion, GitVersionTool } from "../../tools/gitversion"; import { IGitVersionTool, GitVersionTool } from "../../tools/gitversion/gitversion-tool";
import { IGitVersionInput, IGitVersionOutput } from "../../tools/gitversion/models";
import container from "../../core/ioc"; import container from "../../core/ioc";
@@ -26,11 +27,11 @@ export async function setup() {
export async function run() { export async function run() {
try { try {
const inputOptions: IGitVersionArguments = gitVersionTool.getGitVersionOptions(); const inputOptions: IGitVersionInput = gitVersionTool.getGitVersionOptions();
const result = await gitVersionTool.run(inputOptions); const result = await gitVersionTool.run(inputOptions);
const gitversion = JSON.parse(result.stdout) as IGitVersion; const gitversion = JSON.parse(result.stdout) as IGitVersionOutput;
gitVersionTool.writeGitVersionToAgent(gitversion); gitVersionTool.writeGitVersionToAgent(gitversion);
if (result.code === 0) { if (result.code === 0) {

View File

@@ -1,6 +1,6 @@
import { TYPES, IBuildAgent } from "../core/common"; import { TYPES, IBuildAgent } from "../../core/common";
import { injectable, inject } from "inversify"; import { injectable, inject } from "inversify";
import { IDotnetTool } from "../core/dotnet-tool"; import { IDotnetTool } from "../../core/dotnet-tool";
export interface IGitReleaseManagerTool { export interface IGitReleaseManagerTool {
install(versionSpec: string, includePrerelease: boolean): Promise<void>; install(versionSpec: string, includePrerelease: boolean): Promise<void>;

View File

@@ -1,68 +1,14 @@
import path = require("path"); import path = require("path");
import { injectable, inject } from "inversify"; import { injectable, inject } from "inversify";
import { IExecResult, IBuildAgent, TYPES } from "../core/common"; import { IExecResult, IBuildAgent, TYPES } from "../../core/common";
import { IDotnetTool } from "../core/dotnet-tool"; import { IDotnetTool } from "../../core/dotnet-tool";
import { IGitVersionInput, IGitVersionOutput, GitVersionRunOptions } from "./models";
export interface IGitVersionArguments {
targetPath: string;
useConfigFile: boolean;
configFilePath: string;
updateAssemblyInfo: boolean;
updateAssemblyInfoFilename: string;
additionalArguments: string;
srcDir: string;
}
export const GitVersionRunOptions = {
targetPath: "targetPath",
useConfigFile: "useConfigFile",
configFilePath: "configFilePath",
updateAssemblyInfo: "configFilePath",
updateAssemblyInfoFilename: "configFilePath",
additionalArguments: "additionalArguments",
};
export interface IGitVersion {
Major: number;
Minor: number;
Patch: number;
PreReleaseTag: string;
PreReleaseTagWithDash: string;
PreReleaseLabel: string;
PreReleaseNumber: number;
WeightedPreReleaseNumber: number;
BuildMetaData: number;
BuildMetaDataPadded: string;
FullBuildMetaData: string;
MajorMinorPatch: string;
SemVer: string;
LegacySemVer: string;
LegacySemVerPadded: string;
AssemblySemVer: string;
AssemblySemFileVer: string;
FullSemVer: string;
InformationalVersion: string;
BranchName: string;
Sha: string;
ShortSha: string;
NuGetVersionV2: string;
NuGetVersion: string;
NuGetPreReleaseTagV2: string;
NuGetPreReleaseTag: string;
VersionSourceSha: string;
CommitsSinceVersionSource: number;
CommitsSinceVersionSourcePadded: string;
CommitDate: string;
}
export interface IGitVersionTool { export interface IGitVersionTool {
install(versionSpec: string, includePrerelease: boolean): Promise<void>; install(versionSpec: string, includePrerelease: boolean): Promise<void>;
run(options: IGitVersionArguments): Promise<IExecResult>; run(options: IGitVersionInput): Promise<IExecResult>;
writeGitVersionToAgent(gitversion: IGitVersion): void; writeGitVersionToAgent(gitversion: IGitVersionOutput): void;
getGitVersionOptions(): IGitVersionArguments; getGitVersionOptions(): IGitVersionInput;
} }
@injectable() @injectable()
@@ -83,7 +29,7 @@ export class GitVersionTool implements IGitVersionTool {
await this.dotnetTool.toolInstall("GitVersion.Tool", versionSpec, false, includePrerelease); await this.dotnetTool.toolInstall("GitVersion.Tool", versionSpec, false, includePrerelease);
} }
public run(options: IGitVersionArguments): Promise<IExecResult> { public run(options: IGitVersionInput): Promise<IExecResult> {
const workDir = this.getRepoDir(options.targetPath); const workDir = this.getRepoDir(options.targetPath);
const args = this.getArguments(workDir, options); const args = this.getArguments(workDir, options);
@@ -106,7 +52,7 @@ export class GitVersionTool implements IGitVersionTool {
return workDir.replace(/\\/g, "/"); return workDir.replace(/\\/g, "/");
} }
private getArguments(workDir: string, options: IGitVersionArguments): string[] { private getArguments(workDir: string, options: IGitVersionInput): string[] {
const args = [ const args = [
workDir, workDir,
"/output", "/output",
@@ -141,7 +87,7 @@ export class GitVersionTool implements IGitVersionTool {
return args; return args;
} }
public getGitVersionOptions(): IGitVersionArguments { public getGitVersionOptions(): IGitVersionInput {
const targetPath = this.buildAgent.getInput(GitVersionRunOptions.targetPath); const targetPath = this.buildAgent.getInput(GitVersionRunOptions.targetPath);
@@ -166,7 +112,7 @@ export class GitVersionTool implements IGitVersionTool {
}; };
} }
public writeGitVersionToAgent(gitversion: IGitVersion): void { public writeGitVersionToAgent(gitversion: IGitVersionOutput): void {
this.buildAgent.setOutput("major", gitversion.Major.toString()); this.buildAgent.setOutput("major", gitversion.Major.toString());
this.buildAgent.setOutput("minor", gitversion.Minor.toString()); this.buildAgent.setOutput("minor", gitversion.Minor.toString());

View File

@@ -0,0 +1,51 @@
export const GitVersionRunOptions = {
targetPath: "targetPath",
useConfigFile: "useConfigFile",
configFilePath: "configFilePath",
updateAssemblyInfo: "configFilePath",
updateAssemblyInfoFilename: "configFilePath",
additionalArguments: "additionalArguments",
};
export interface IGitVersionInput {
targetPath: string;
useConfigFile: boolean;
configFilePath: string;
updateAssemblyInfo: boolean;
updateAssemblyInfoFilename: string;
additionalArguments: string;
srcDir: string;
}
export interface IGitVersionOutput {
Major: number;
Minor: number;
Patch: number;
PreReleaseTag: string;
PreReleaseTagWithDash: string;
PreReleaseLabel: string;
PreReleaseNumber: number;
WeightedPreReleaseNumber: number;
BuildMetaData: number;
BuildMetaDataPadded: string;
FullBuildMetaData: string;
MajorMinorPatch: string;
SemVer: string;
LegacySemVer: string;
LegacySemVerPadded: string;
AssemblySemVer: string;
AssemblySemFileVer: string;
FullSemVer: string;
InformationalVersion: string;
BranchName: string;
Sha: string;
ShortSha: string;
NuGetVersionV2: string;
NuGetVersion: string;
NuGetPreReleaseTagV2: string;
NuGetPreReleaseTag: string;
VersionSourceSha: string;
CommitsSinceVersionSource: number;
CommitsSinceVersionSourcePadded: string;
CommitDate: string;
}