From c39eddbc819d8e8dfb5a6de0d886fbf0b4d6ef78 Mon Sep 17 00:00:00 2001
From: Artur Stolear <arturcic@gmail.com>
Date: Sun, 9 Feb 2020 00:49:14 +0200
Subject: [PATCH] moved targetDirectory filed to common base

---
 src/tools/gitreleasemanager/models.ts   | 6 ++----
 src/tools/gitreleasemanager/settings.ts | 8 +++-----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/tools/gitreleasemanager/models.ts b/src/tools/gitreleasemanager/models.ts
index 80ae18a..d76eeb4 100644
--- a/src/tools/gitreleasemanager/models.ts
+++ b/src/tools/gitreleasemanager/models.ts
@@ -2,6 +2,7 @@ export enum CommonFields {
     repository = "repository",
     owner = "owner",
     token = "token",
+    targetDirectory = "targetDirectory",
 }
 
 export enum CreateFields {
@@ -10,19 +11,18 @@ export enum CreateFields {
     inputFileName = "inputFileName",
     isPreRelease = "isPreRelease",
     commit = "commit",
-    targetDirectory = "targetDirectory",
     assets = "assets",
 }
 
 export enum DiscardFields {
     milestone = "milestone",
-    targetDirectory = "targetDirectory",
 }
 
 export interface GitReleaseManagerSettings {
     [CommonFields.repository]: string;
     [CommonFields.owner]: string;
     [CommonFields.token]: string;
+    [CommonFields.targetDirectory]: string;
 }
 
 export interface GitReleaseManagerCreateSettings extends GitReleaseManagerSettings {
@@ -31,11 +31,9 @@ export interface GitReleaseManagerCreateSettings extends GitReleaseManagerSettin
     [CreateFields.inputFileName]: string;
     [CreateFields.isPreRelease]: boolean;
     [CreateFields.commit]: string;
-    [CreateFields.targetDirectory]: string;
     [CreateFields.assets]?: string[];
 }
 
 export interface GitReleaseManagerDiscardSettings extends GitReleaseManagerSettings {
     [DiscardFields.milestone]: string;
-    [DiscardFields.targetDirectory]: string;
 }
\ No newline at end of file
diff --git a/src/tools/gitreleasemanager/settings.ts b/src/tools/gitreleasemanager/settings.ts
index a150d47..d76f730 100644
--- a/src/tools/gitreleasemanager/settings.ts
+++ b/src/tools/gitreleasemanager/settings.ts
@@ -9,7 +9,6 @@ export class Settings {
         const inputFileName = buildAgent.getInput(CreateFields.inputFileName);
         const isPreRelease = buildAgent.getBooleanInput(CreateFields.isPreRelease);
         const commit = buildAgent.getInput(CreateFields.commit);
-        const targetDirectory = buildAgent.getInput(CreateFields.targetDirectory);
         const assets = buildAgent.getListInput(CreateFields.assets);
 
         const commonSettings = Settings.getCommonSettings(buildAgent);
@@ -20,20 +19,17 @@ export class Settings {
             inputFileName,
             isPreRelease,
             commit,
-            targetDirectory,
             assets
         }
     }
 
     public static getDiscardSettings(buildAgent: IBuildAgent) : GitReleaseManagerDiscardSettings {
         const milestone = buildAgent.getInput(DiscardFields.milestone);
-        const targetDirectory = buildAgent.getInput(CreateFields.targetDirectory);
 
         const commonSettings = Settings.getCommonSettings(buildAgent);
         return {
             ...commonSettings,
             milestone,
-            targetDirectory,
         }
     }
 
@@ -41,11 +37,13 @@ export class Settings {
         const owner = buildAgent.getInput(CommonFields.owner, true);
         const repository = buildAgent.getInput(CommonFields.repository, true);
         const token = buildAgent.getInput(CommonFields.token, true);
+        const targetDirectory = buildAgent.getInput(CommonFields.targetDirectory);
 
         return {
             owner,
             repository,
-            token
+            token,
+            targetDirectory,
         };
     }
 }
\ No newline at end of file