Revert "Merge pull request #812 from GitTools/bug/prerelease"

This reverts commit a6b18fd71f.

src/tasks/gitreleasemanager/addasset.ts

@@ -1,4 +1,4 @@
 import 'reflect-metadata'
 import { addAsset } from './main'
 
-await addAsset()
+addAsset()

src/tasks/gitreleasemanager/close.ts

@@ -1,4 +1,4 @@
 import 'reflect-metadata'
 import { close } from './main'
 
-await close()
+close()

src/tasks/gitreleasemanager/create.ts

@@ -1,4 +1,4 @@
 import 'reflect-metadata'
 import { create } from './main'
 
-await create()
+create()

src/tasks/gitreleasemanager/discard.ts

@@ -1,4 +1,4 @@
 import 'reflect-metadata'
 import { discard } from './main'
 
-await discard()
+discard()

src/tasks/gitreleasemanager/main.ts

@@ -1,26 +1,34 @@
 import { IBuildAgent, TYPES } from '../../core/models'
-import { IGitReleaseManagerTool, GitReleaseManagerTool } from '../../tools/gitreleasemanager/tool'
-import { IGitReleaseManagerSettingsProvider } from '../../tools/gitreleasemanager/models'
-import { GitReleaseManagerSettingsProvider } from '../../tools/gitreleasemanager/settings'
+import {
+    IGitReleaseManagerTool,
+    GitReleaseManagerTool
+} from '../../tools/gitreleasemanager/tool'
+import { Settings as CommonSettings } from '../../core/settings'
+import { Settings } from '../../tools/gitreleasemanager/settings'
 
 import container from '../../core/ioc'
 
-container.bind<IGitReleaseManagerTool>(TYPES.IGitReleaseManagerTool).to(GitReleaseManagerTool)
-container.bind<IGitReleaseManagerSettingsProvider>(TYPES.IGitReleaseManagerSettingsProvider).to(GitReleaseManagerSettingsProvider)
+container
+    .bind<IGitReleaseManagerTool>(TYPES.IGitReleaseManagerTool)
+    .to(GitReleaseManagerTool)
 
+const gitReleaseManagerTool = container.get<IGitReleaseManagerTool>(
+    TYPES.IGitReleaseManagerTool
+)
 const buildAgent = container.get<IBuildAgent>(TYPES.IBuildAgent)
-const gitReleaseManagerTool = container.get<IGitReleaseManagerTool>(TYPES.IGitReleaseManagerTool)
-const settingsProvider = container.get<IGitReleaseManagerSettingsProvider>(TYPES.IGitReleaseManagerSettingsProvider)
 
 export async function setup() {
     try {
         gitReleaseManagerTool.disableTelemetry()
 
-        const settings = settingsProvider.getSetupSettings()
+        const settings = CommonSettings.getSetupSettings(buildAgent)
 
         await gitReleaseManagerTool.install(settings)
 
-        buildAgent.setSucceeded('GitVersionManager installed successfully', true)
+        buildAgent.setSucceeded(
+            'GitVersionManager installed successfully',
+            true
+        )
     } catch (error) {
         buildAgent.setFailed(error.message, true)
     }
@@ -30,11 +38,14 @@ export async function create() {
     try {
         gitReleaseManagerTool.disableTelemetry()
 
-        const settings = settingsProvider.getCreateSettings()
+        const settings = Settings.getCreateSettings(buildAgent)
 
         await gitReleaseManagerTool.create(settings)
 
-        buildAgent.setSucceeded('GitVersionManager created release successfully', true)
+        buildAgent.setSucceeded(
+            'GitVersionManager created release successfully',
+            true
+        )
     } catch (error) {
         buildAgent.setFailed(error.message, true)
     }
@@ -44,11 +55,14 @@ export async function discard() {
     try {
         gitReleaseManagerTool.disableTelemetry()
 
-        const settings = settingsProvider.getDiscardSettings()
+        const settings = Settings.getDiscardSettings(buildAgent)
 
         await gitReleaseManagerTool.discard(settings)
 
-        buildAgent.setSucceeded('GitVersionManager discarded release successfully', true)
+        buildAgent.setSucceeded(
+            'GitVersionManager discarded release successfully',
+            true
+        )
     } catch (error) {
         buildAgent.setFailed(error.message, true)
     }
@@ -58,11 +72,14 @@ export async function close() {
     try {
         gitReleaseManagerTool.disableTelemetry()
 
-        const settings = settingsProvider.getCloseSettings()
+        const settings = Settings.getCloseSettings(buildAgent)
 
         await gitReleaseManagerTool.close(settings)
 
-        buildAgent.setSucceeded('GitVersionManager closed release successfully', true)
+        buildAgent.setSucceeded(
+            'GitVersionManager closed release successfully',
+            true
+        )
     } catch (error) {
         buildAgent.setFailed(error.message, true)
     }
@@ -72,11 +89,14 @@ export async function open() {
     try {
         gitReleaseManagerTool.disableTelemetry()
 
-        const settings = settingsProvider.getOpenSettings()
+        const settings = Settings.getOpenSettings(buildAgent)
 
         await gitReleaseManagerTool.open(settings)
 
-        buildAgent.setSucceeded('GitVersionManager opened release successfully', true)
+        buildAgent.setSucceeded(
+            'GitVersionManager opened release successfully',
+            true
+        )
     } catch (error) {
         buildAgent.setFailed(error.message, true)
     }
@@ -86,11 +106,14 @@ export async function publish() {
     try {
         gitReleaseManagerTool.disableTelemetry()
 
-        const settings = settingsProvider.getPublishSettings()
+        const settings = Settings.getPublishSettings(buildAgent)
 
         await gitReleaseManagerTool.publish(settings)
 
-        buildAgent.setSucceeded('GitVersionManager published release successfully', true)
+        buildAgent.setSucceeded(
+            'GitVersionManager published release successfully',
+            true
+        )
     } catch (error) {
         buildAgent.setFailed(error.message, true)
     }
@@ -100,11 +123,14 @@ export async function addAsset() {
     try {
         gitReleaseManagerTool.disableTelemetry()
 
-        const settings = settingsProvider.getAddAssetSettings()
+        const settings = Settings.getAddAssetSettings(buildAgent)
 
         await gitReleaseManagerTool.addAsset(settings)
 
-        buildAgent.setSucceeded('GitVersionManager added assets to release successfully', true)
+        buildAgent.setSucceeded(
+            'GitVersionManager added assets to release successfully',
+            true
+        )
     } catch (error) {
         buildAgent.setFailed(error.message, true)
     }

src/tasks/gitreleasemanager/open.ts

@@ -1,4 +1,4 @@
 import 'reflect-metadata'
 import { open } from './main'
 
-await open()
+open()

src/tasks/gitreleasemanager/publish.ts

@@ -1,4 +1,4 @@
 import 'reflect-metadata'
 import { publish } from './main'
 
-await publish()
+publish()

src/tasks/gitreleasemanager/setup.ts

@@ -1,4 +1,4 @@
 import 'reflect-metadata'
 import { setup } from './main'
 
-await setup()
+setup()

src/tasks/gitversion/execute.ts

@@ -1,4 +1,4 @@
 import 'reflect-metadata'
 import { run } from './main'
 
-await run()
+run()

src/tasks/gitversion/main.ts

@@ -1,23 +1,24 @@
 import { IBuildAgent, TYPES } from '../../core/models'
+import { Settings as CommonSettings } from '../../core/settings'
+import { Settings } from '../../tools/gitversion/settings'
 import { IGitVersionTool, GitVersionTool } from '../../tools/gitversion/tool'
-import { GitVersionSettings, GitVersionOutput, IGitVersionSettingsProvider } from '../../tools/gitversion/models'
-import { GitVersionSettingsProvider } from '../../tools/gitversion/settings'
+import {
+    GitVersionSettings,
+    GitVersionOutput
+} from '../../tools/gitversion/models'
 
 import container from '../../core/ioc'
 
 container.bind<IGitVersionTool>(TYPES.IGitVersionTool).to(GitVersionTool)
-container.bind<IGitVersionSettingsProvider>(TYPES.IGitVersionSettingsProvider).to(GitVersionSettingsProvider)
 
-const buildAgent = container.get<IBuildAgent>(TYPES.IBuildAgent)
 const gitVersionTool = container.get<IGitVersionTool>(TYPES.IGitVersionTool)
-const settingsProvider = container.get<IGitVersionSettingsProvider>(TYPES.IGitVersionSettingsProvider)
+const buildAgent = container.get<IBuildAgent>(TYPES.IBuildAgent)
 
 export async function setup() {
     try {
         gitVersionTool.disableTelemetry()
-        console.log(`Agent: '${buildAgent.agentName}'`)
 
-        const settings = settingsProvider.getSetupSettings()
+        const settings = CommonSettings.getSetupSettings(buildAgent)
 
         await gitVersionTool.install(settings)
 
@@ -30,13 +31,17 @@ export async function setup() {
 export async function run() {
     try {
         gitVersionTool.disableTelemetry()
-        console.log(`Agent: '${buildAgent.agentName}'`)
 
-        const settings: GitVersionSettings = settingsProvider.getGitVersionSettings()
+        const settings: GitVersionSettings = Settings.getGitVersionSettings(
+            buildAgent
+        )
 
         const result = await gitVersionTool.run(settings)
         const { stdout } = result
-        const jsonOutput = stdout.substring(stdout.lastIndexOf('{'), stdout.lastIndexOf('}') + 1)
+        const jsonOutput = stdout.substring(
+            stdout.lastIndexOf('{'),
+            stdout.lastIndexOf('}') + 1
+        )
 
         const gitversion = JSON.parse(jsonOutput) as GitVersionOutput
         gitVersionTool.writeGitVersionToAgent(gitversion)

src/tasks/gitversion/setup.ts

@@ -1,4 +1,4 @@
 import 'reflect-metadata'
 import { setup } from './main'
 
-await setup()
+setup()