update the patch calculation

Bump prettier from 2.5.1 to 2.6.0

.github/mergify.yml

@@ -8,13 +8,12 @@ pull_request_rules:
   - name: Automatic merge on dependabot PR after success CI
     conditions:
       - author~=^dependabot(|-preview)\[bot\]$
+      - '#commits-behind=0' # Only merge up to date pull requests
       - check-success=build (windows-latest)
       - check-success=build (ubuntu-latest)
       - check-success=build (macos-latest)
     actions:
       merge:
-        method: rebase
-        strict: smart
   - name: Thank contributor
     conditions:
       - merged

.github/workflows/release.yml

@@ -31,7 +31,7 @@ jobs:
       id: gitversion # step id used as reference for output values
       uses: ./gitversion/execute
     - run: |
-        $date = Get-Date -format "yyMMddHHmm"
+        $date = Get-Date -format "yyMMddHH"
         $version = "${{steps.gitversion.outputs.majorMinorPatch}}.$date"
         $major = "${{steps.gitversion.outputs.major}}"
         $minor = "${{steps.gitversion.outputs.minor}}"

dist/azure/gitreleasemanager/setup/task.json

@@ -36,6 +36,14 @@
             "defaultValue": "false",
             "required": false,
             "helpMarkDown": "Include pre-release versions when matching a version"
+        },
+        {
+            "name": "ignoreFailedSources",
+            "type": "boolean",
+            "label": "Treat package source failures as warnings",
+            "defaultValue": "false",
+            "required": false,
+            "helpMarkDown": "Treat package source failures as warnings"
         }
     ]
 }

dist/azure/gitversion/setup/task.json

@@ -36,6 +36,14 @@
             "defaultValue": "false",
             "required": false,
             "helpMarkDown": "Include pre-release versions when matching a version"
+        },
+        {
+            "name": "ignoreFailedSources",
+            "type": "boolean",
+            "label": "Treat package source failures as warnings",
+            "defaultValue": "false",
+            "required": false,
+            "helpMarkDown": "Treat package source failures as warnings"
         }
     ]
 }

docs/examples/azure/gitversion/setup/usage-examples.md

@@ -17,6 +17,10 @@ includePrerelease:
   description: Include pre-release versions when matching a version.
   required: false
   default: false
+ignoreFailedSources:
+  description: Treat package source failures as warnings.
+  required: false
+  default: false
 ```
 
 ---

docs/examples/github/gitversion/setup/usage-examples.md

@@ -17,6 +17,10 @@ includePrerelease:
   description: Include pre-release versions when matching a version.
   required: false
   default: false
+ignoreFailedSources:
+  description: Treat package source failures as warnings.
+  required: false
+  default: false
 ```
 
 ---

gitreleasemanager/setup/action.yml

@@ -16,3 +16,7 @@ inputs:
     description: Include pre-release versions when matching a version
     required: false
     default: 'false'
+  ignoreFailedSources:
+    description: Treat package source failures as warnings.
+    required: false
+    default: 'false'

gitversion/setup/action.yml

@@ -16,3 +16,7 @@ inputs:
     description: Include pre-release versions when matching a version
     required: false
     default: 'false'
+  ignoreFailedSources:
+    description: Treat package source failures as warnings.
+    required: false
+    default: 'false'

package.json

@@ -30,28 +30,30 @@
         "@actions/exec": "^1.1.0",
         "@actions/io": "^1.1.0",
         "@actions/tool-cache": "^1.7.1",
-        "azure-pipelines-task-lib": "^3.1.10",
-        "azure-pipelines-tool-lib": "^1.0.2",
+        "azure-pipelines-task-lib": "^3.2.0",
+        "azure-pipelines-tool-lib": "^1.1.0",
         "inversify": "^6.0.1",
         "typed-rest-client": "^1.8.6",
         "uuid": "^8.3.2"
     },
     "devDependencies": {
-        "@types/node": "^16.11.7",
+        "@types/node": "^17.0.21",
         "@types/q": "^1.5.5",
         "@types/semver-compare": "^1.0.1",
-        "@types/uuid": "^8.3.1",
+        "@types/uuid": "^8.3.4",
         "minimist": "^1.2.5",
-        "prettier": "^2.4.1",
+        "prettier": "^2.6.0",
         "reflect-metadata": "^0.1.13",
         "replace-in-file-webpack-plugin": "^1.0.6",
-        "terser-webpack-plugin": "^5.2.5",
-        "tfx-cli": "^0.9.3",
+        "shelljs": "^0.8.5",
+        "terser-webpack-plugin": "^5.3.1",
+        "tfx-cli": "^0.11.0",
         "trim-newlines": ">=4.0.2",
-        "ts-loader": "^9.2.6",
-        "typescript": "^4.4.4",
-        "underscore": ">=1.12.1",
-        "webpack": "^5.64.0",
-        "webpack-cli": "^4.9.1"
+        "ts-loader": "^9.2.8",
+        "typescript": "^4.6.2",
+        "underscore": ">=1.13.2",
+        "validator": "^13.7.0",
+        "webpack": "^5.70.0",
+        "webpack-cli": "^4.9.2"
     }
 }

src/core/dotnet-tool.ts

@@ -4,16 +4,15 @@ import * as path from 'path'
 import * as http from 'typed-rest-client/HttpClient'
 
 import { inject, injectable } from 'inversify'
-import { TYPES, IExecResult, IBuildAgent } from './models'
+import { TYPES, IExecResult, IBuildAgent, ISetupSettings } from './models'
 import { IVersionManager } from './versionManager'
 
 export interface IDotnetTool {
     disableTelemetry(): void
     toolInstall(
         toolName: string,
-        versionSpec: string,
         checkLatest: boolean,
-        includePre: boolean
+        setupSettings: ISetupSettings
     ): Promise<string>
 }
 
@@ -51,16 +50,17 @@ export class DotnetTool implements IDotnetTool {
 
     public async toolInstall(
         toolName: string,
-        versionSpec: string,
         checkLatest: boolean,
-        includePre: boolean
+        setupSettings: ISetupSettings
     ): Promise<string> {
         console.log('')
         console.log('--------------------------')
-        console.log(`Installing ${toolName} version ` + versionSpec)
+        console.log(
+            `Installing ${toolName} version ` + setupSettings.versionSpec
+        )
         console.log('--------------------------')
 
-        if (this.versionManager.isExplicitVersion(versionSpec)) {
+        if (this.versionManager.isExplicitVersion(setupSettings.versionSpec)) {
             checkLatest = false // check latest doesn't make sense when explicit version
         }
 
@@ -69,16 +69,18 @@ export class DotnetTool implements IDotnetTool {
             //
             // Let's try and resolve the version spec locally first
             //
-            toolPath = this.buildAgent.find(toolName, versionSpec)
+            toolPath = this.buildAgent.find(toolName, setupSettings.versionSpec)
         }
 
         if (!toolPath) {
             let version: string
-            if (this.versionManager.isExplicitVersion(versionSpec)) {
+            if (
+                this.versionManager.isExplicitVersion(setupSettings.versionSpec)
+            ) {
                 //
                 // Explicit version was specified. No need to query for list of versions.
                 //
-                version = versionSpec
+                version = setupSettings.versionSpec
             } else {
                 //
                 // Let's query and resolve the latest version for the versionSpec.
@@ -88,12 +90,12 @@ export class DotnetTool implements IDotnetTool {
                 //
                 version = await this.queryLatestMatch(
                     toolName,
-                    versionSpec,
-                    includePre
+                    setupSettings.versionSpec,
+                    setupSettings.includePrerelease
                 )
                 if (!version) {
                     throw new Error(
-                        `Unable to find ${toolName} version '${versionSpec}'.`
+                        `Unable to find ${toolName} version '${setupSettings.versionSpec}'.`
                     )
                 }
 
@@ -106,7 +108,11 @@ export class DotnetTool implements IDotnetTool {
                 //
                 // Download, extract, cache
                 //
-                toolPath = await this.acquireTool(toolName, version)
+                toolPath = await this.acquireTool(
+                    toolName,
+                    version,
+                    setupSettings.ignoreFailedSources
+                )
             }
         }
 
@@ -170,11 +176,16 @@ export class DotnetTool implements IDotnetTool {
 
     private async acquireTool(
         toolName: string,
-        version: string
+        version: string,
+        ignoreFailedSources: boolean
     ): Promise<string> {
         const tempDirectory = await this.buildAgent.createTempDir()
         let args = ['tool', 'install', toolName, '--tool-path', tempDirectory]
 
+        if (ignoreFailedSources) {
+            args.push('--ignore-failed-sources')
+        }
+
         if (version) {
             version = this.versionManager.cleanVersion(version)
             args = args.concat(['--version', version])

src/core/models.ts

@@ -10,12 +10,14 @@ export const TYPES = {
 
 export enum SetupFields {
     includePrerelease = 'includePrerelease',
-    versionSpec = 'versionSpec'
+    versionSpec = 'versionSpec',
+    ignoreFailedSources = 'ignoreFailedSources'
 }
 
 export interface ISetupSettings {
     [SetupFields.versionSpec]: string
     [SetupFields.includePrerelease]: boolean
+    [SetupFields.ignoreFailedSources]: boolean
 }
 
 export interface IExecResult {

src/core/settings.ts

@@ -6,10 +6,14 @@ export class Settings {
         const includePrerelease = buildAgent.getBooleanInput(
             SetupFields.includePrerelease
         )
+        const ignoreFailedSources = buildAgent.getBooleanInput(
+            SetupFields.ignoreFailedSources
+        )
 
         return {
             versionSpec,
-            includePrerelease
+            includePrerelease,
+            ignoreFailedSources
         }
     }
 }

src/tasks/gitreleasemanager/main.ts

@@ -23,10 +23,7 @@ export async function setup() {
 
         const settings = CommonSettings.getSetupSettings(buildAgent)
 
-        await gitReleaseManagerTool.install(
-            settings.versionSpec,
-            settings.includePrerelease
-        )
+        await gitReleaseManagerTool.install(settings)
 
         buildAgent.setSucceeded(
             'GitVersionManager installed successfully',

src/tasks/gitversion/main.ts

@@ -20,10 +20,7 @@ export async function setup() {
 
         const settings = CommonSettings.getSetupSettings(buildAgent)
 
-        await gitVersionTool.install(
-            settings.versionSpec,
-            settings.includePrerelease
-        )
+        await gitVersionTool.install(settings)
 
         buildAgent.setSucceeded('GitVersion installed successfully', true)
     } catch (error) {

src/tools/gitreleasemanager/tool.ts

@@ -1,6 +1,6 @@
 import path = require('path')
 
-import { TYPES, IBuildAgent, IExecResult } from '../../core/models'
+import { TYPES, IBuildAgent, IExecResult, ISetupSettings } from '../../core/models'
 import { injectable, inject } from 'inversify'
 import { DotnetTool, IDotnetTool } from '../../core/dotnet-tool'
 import { IVersionManager } from '../../core/versionManager'
@@ -16,7 +16,7 @@ import {
 } from './models'
 
 export interface IGitReleaseManagerTool extends IDotnetTool {
-    install(versionSpec: string, includePrerelease: boolean): Promise<void>
+    install(setupSettings: ISetupSettings): Promise<void>
     create(settings: GitReleaseManagerCreateSettings): Promise<IExecResult>
     discard(settings: GitReleaseManagerDiscardSettings): Promise<IExecResult>
     close(settings: GitReleaseManagerCloseSettings): Promise<IExecResult>
@@ -36,15 +36,11 @@ export class GitReleaseManagerTool
         super(buildAgent, versionManager)
     }
 
-    public async install(
-        versionSpec: string,
-        includePrerelease: boolean
-    ): Promise<void> {
+    public async install(setupSettings: ISetupSettings): Promise<void> {
         await this.toolInstall(
             'GitReleaseManager.Tool',
-            versionSpec,
             false,
-            includePrerelease
+            setupSettings
         )
     }
 

src/tools/gitversion/tool.ts

@@ -1,13 +1,13 @@
 import path = require('path')
 
 import { injectable, inject } from 'inversify'
-import { IExecResult, IBuildAgent, TYPES } from '../../core/models'
+import { IExecResult, IBuildAgent, TYPES, ISetupSettings } from '../../core/models'
 import { DotnetTool, IDotnetTool } from '../../core/dotnet-tool'
 import { GitVersionSettings, GitVersionOutput } from './models'
 import { IVersionManager } from '../../core/versionManager'
 
 export interface IGitVersionTool extends IDotnetTool {
-    install(versionSpec: string, includePrerelease: boolean): Promise<void>
+    install(setupSettings: ISetupSettings): Promise<void>
     run(options: GitVersionSettings): Promise<IExecResult>
     writeGitVersionToAgent(gitversion: GitVersionOutput): void
 }
@@ -21,15 +21,11 @@ export class GitVersionTool extends DotnetTool implements IGitVersionTool {
         super(buildAgent, versionManager)
     }
 
-    public async install(
-        versionSpec: string,
-        includePrerelease: boolean
-    ): Promise<void> {
+    public async install(setupSettings: ISetupSettings): Promise<void> {
         await this.toolInstall(
             'GitVersion.Tool',
-            versionSpec,
             false,
-            includePrerelease
+            setupSettings
         )
     }