Skip to content

Commit

Permalink
locking azure-devops-node-api to 8.0.0 in packaging-common (#10613)
Browse files Browse the repository at this point in the history
* locking version of azure-devops-node-api to 8.0.0, 8.1.1 appears to have issues with the TS version we're using

* reset changes in utility-common

* adding task.loc update to bump-task-version

* bumping loc files

* trivial tweak
  • Loading branch information
jotaylo authored Jun 11, 2019
1 parent 54193c7 commit abe2d8d
Show file tree
Hide file tree
Showing 38 changed files with 128 additions and 149 deletions.
34 changes: 33 additions & 1 deletion Tasks/Common/packaging-common/bump-task-version.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ Param(
[string] $taskRoot = (Join-Path $PSScriptRoot "..\..")
)

"DotNetCoreCLIV2","DownloadPackageV0","DownloadPackageV1","MavenV2","MavenV3","NpmV1","NpmAuthenticateV0","NuGetV0","NuGetCommandV2","NuGetPublisherV0","NuGetToolInstallerV0","NuGetToolInstallerV1","PipAuthenticateV0","TwineAuthenticateV0","UniversalPackagesV0" | % {
# Bump patch version and adjust sprint
"DotNetCoreCLIV2","DownloadPackageV0","DownloadPackageV1","MavenV2","MavenV3","NpmV1","NpmAuthenticateV0","NuGetV0","NuGetCommandV2","NuGetPublisherV0","NuGetToolInstallerV0","NuGetToolInstallerV1","PipAuthenticateV0","TwineAuthenticateV0","UniversalPackagesV0", "UseNodeV1" | % {
$taskLocation = Join-Path "$taskRoot/$_" "task.json"
$taskContent = Get-Content $taskLocation
$task = $taskContent | ConvertFrom-Json
Expand All @@ -25,4 +26,35 @@ Param(
$taskContent[$versionLine+1] = $taskContent[$versionLine+1].Replace(" $($v.Minor),", " $currentSprint,")
$taskContent[$versionLine+2] = $taskContent[$versionLine+2].Replace(" $($v.Patch)", " $newPatch")
$taskContent | Set-Content $taskLocation

$taskLocLocation = Join-Path "$taskRoot/$_" "task.loc.json"
$taskLocContent = Get-Content $taskLocLocation
$versionMatch = $taskLocContent | Select-String '"version":'
$versionLine = $versionMatch.LineNumber
$taskLocContent[$versionLine+1] = $taskLocContent[$versionLine+1].Replace(" $($v.Minor),", " $currentSprint,")
$taskLocContent[$versionLine+2] = $taskLocContent[$versionLine+2].Replace(" $($v.Patch)", " $newPatch")
$taskLocContent | Set-Content $taskLocLocation
}

# Just bump the patch version for these.
"UseDotNetV2" | % {
$taskLocation = Join-Path "$taskRoot/$_" "task.json"
$taskContent = Get-Content $taskLocation
$task = $taskContent | ConvertFrom-Json
$v = $task.version
$newPatch = $v.Patch + 1

Write-Output "${_}: $($v.Major).$($v.Minor).$($v.Patch) to $($v.Major).$($v.Minor).$newPatch"
# Doing an awkward string replace to not interfere with any custom task.json formatting
$versionMatch = $taskContent | Select-String '"version":'
$versionLine = $versionMatch.LineNumber
$taskContent[$versionLine+2] = $taskContent[$versionLine+2].Replace(" $($v.Patch)", " $newPatch")
$taskContent | Set-Content $taskLocation

$taskLocLocation = Join-Path "$taskRoot/$_" "task.loc.json"
$taskLocContent = Get-Content $taskLocLocation
$versionMatch = $taskLocContent | Select-String '"version":'
$versionLine = $versionMatch.LineNumber
$taskLocContent[$versionLine+2] = $taskLocContent[$versionLine+2].Replace(" $($v.Patch)", " $newPatch")
$taskLocContent | Set-Content $taskLocLocation
}
25 changes: 7 additions & 18 deletions Tasks/Common/packaging-common/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Tasks/Common/packaging-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@types/node": "10.12.9",
"@types/q": "1.5.2",
"adm-zip": "^0.4.11",
"azure-devops-node-api": "^8.0.0",
"azure-devops-node-api": "8.0.0",
"azure-pipelines-task-lib": "2.8.0",
"azure-pipelines-tool-lib": "0.12.0",
"ini": "^1.3.4",
Expand Down
4 changes: 2 additions & 2 deletions Tasks/DotNetCoreCLIV2/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"demands": [],
"version": {
"Major": 2,
"Minor": 153,
"Minor": 154,
"Patch": 1
},
"minimumAgentVersion": "2.115.0",
Expand Down Expand Up @@ -558,4 +558,4 @@
"NGCommon_UnableToFindTool": "Unable to find tool %s",
"Warning_UpdatingNuGetVersion": "Updating version of NuGet.exe to %s from %s. Behavior changes or breaking changes might occur as NuGet updates to a new version. If this is not desired, deselect the 'Check for Latest Version' option in the task."
}
}
}
2 changes: 1 addition & 1 deletion Tasks/DotNetCoreCLIV2/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -558,4 +558,4 @@
"NGCommon_UnableToFindTool": "ms-resource:loc.messages.NGCommon_UnableToFindTool",
"Warning_UpdatingNuGetVersion": "ms-resource:loc.messages.Warning_UpdatingNuGetVersion"
}
}
}
4 changes: 2 additions & 2 deletions Tasks/DownloadPackageV0/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"author": "ms-vscs-rm",
"version": {
"Major": 0,
"Minor": 153,
"Minor": 154,
"Patch": 1
},
"demands": [],
Expand Down Expand Up @@ -107,4 +107,4 @@
"OperationFailed": "Failed in %s with error: %s",
"UnsupportedProjectScopedFeeds": "Project-scoped feeds are not supported by this version of the \"Download Package\" task. Please use version 1 or higher."
}
}
}
2 changes: 1 addition & 1 deletion Tasks/DownloadPackageV0/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -107,4 +107,4 @@
"OperationFailed": "ms-resource:loc.messages.OperationFailed",
"UnsupportedProjectScopedFeeds": "ms-resource:loc.messages.UnsupportedProjectScopedFeeds"
}
}
}
4 changes: 2 additions & 2 deletions Tasks/DownloadPackageV1/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"author": "ms-vscs-rm",
"version": {
"Major": 1,
"Minor": 153,
"Minor": 154,
"Patch": 1
},
"demands": [],
Expand Down Expand Up @@ -182,4 +182,4 @@
"Info_Downloading": "Downloading package: %s, version: %s using feed id: %s",
"Info_UsingArtifactToolDownload": "Using artifact tool to download the package"
}
}
}
2 changes: 1 addition & 1 deletion Tasks/DownloadPackageV1/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -182,4 +182,4 @@
"Info_Downloading": "ms-resource:loc.messages.Info_Downloading",
"Info_UsingArtifactToolDownload": "ms-resource:loc.messages.Info_UsingArtifactToolDownload"
}
}
}
6 changes: 3 additions & 3 deletions Tasks/MavenV2/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"author": "Microsoft Corporation",
"version": {
"Major": 2,
"Minor": 153,
"Patch": 0
"Minor": 154,
"Patch": 1
},
"releaseNotes": "Configuration of the SonarQube analysis was moved to the [SonarQube](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarqube) or [SonarCloud](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarcloud) extensions, in task `Prepare Analysis Configuration`",
"demands": [
Expand Down Expand Up @@ -409,4 +409,4 @@
"AuthenticationNotNecessary": "No built-in Maven feeds requiring authentication were found. Disable 'Authenticate built-in Maven feeds' for faster builds.",
"UsingAuthFeed": "Using built-in feed: "
}
}
}
4 changes: 2 additions & 2 deletions Tasks/MavenV2/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"version": {
"Major": 2,
"Minor": 153,
"Patch": 0
"Patch": 1
},
"releaseNotes": "ms-resource:loc.releaseNotes",
"demands": [
Expand Down Expand Up @@ -409,4 +409,4 @@
"AuthenticationNotNecessary": "ms-resource:loc.messages.AuthenticationNotNecessary",
"UsingAuthFeed": "ms-resource:loc.messages.UsingAuthFeed"
}
}
}
4 changes: 2 additions & 2 deletions Tasks/MavenV3/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 3,
"Minor": 153,
"Minor": 154,
"Patch": 1
},
"releaseNotes": "Configuration of the SonarQube analysis was moved to the [SonarQube](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarqube) or [SonarCloud](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarcloud) extensions, in task `Prepare Analysis Configuration`",
Expand Down Expand Up @@ -410,4 +410,4 @@
"UsingAuthFeed": "Using built-in feed: ",
"NoTestResults": "No test result files matching %s were found, so publishing JUnit test results is being skipped."
}
}
}
2 changes: 1 addition & 1 deletion Tasks/MavenV3/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -410,4 +410,4 @@
"UsingAuthFeed": "ms-resource:loc.messages.UsingAuthFeed",
"NoTestResults": "ms-resource:loc.messages.NoTestResults"
}
}
}
6 changes: 3 additions & 3 deletions Tasks/NpmAuthenticateV0/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"author": "Microsoft Corporation",
"version": {
"Major": 0,
"Minor": 153,
"Patch": 0
"Minor": 154,
"Patch": 1
},
"runsOn": [
"Agent",
Expand Down Expand Up @@ -66,4 +66,4 @@
"argumentFormat": ""
}
}
}
}
4 changes: 2 additions & 2 deletions Tasks/NpmAuthenticateV0/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"version": {
"Major": 0,
"Minor": 153,
"Patch": 0
"Patch": 1
},
"runsOn": [
"Agent",
Expand Down Expand Up @@ -66,4 +66,4 @@
"argumentFormat": ""
}
}
}
}
4 changes: 2 additions & 2 deletions Tasks/NpmV1/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 1,
"Minor": 153,
"Minor": 154,
"Patch": 1
},
"runsOn": [
Expand Down Expand Up @@ -196,4 +196,4 @@
"WorkingDirectoryNotDirectory": "Please change your working directory to a valid directory",
"NGCommon_AreaNotFoundInSps": "Unable to locate the '%s' [%s] area. The service containing that area may not be available in your region."
}
}
}
2 changes: 1 addition & 1 deletion Tasks/NpmV1/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -196,4 +196,4 @@
"WorkingDirectoryNotDirectory": "ms-resource:loc.messages.WorkingDirectoryNotDirectory",
"NGCommon_AreaNotFoundInSps": "ms-resource:loc.messages.NGCommon_AreaNotFoundInSps"
}
}
}
Loading

0 comments on commit abe2d8d

Please sign in to comment.