Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix GHSA-h726-x36v-rx45 #16485

Merged
merged 12 commits into from
Jul 19, 2022
Merged

Fix GHSA-h726-x36v-rx45 #16485

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2362f99
Fix GHSA-h726-x36v-rx45
tintse-thxsky-MSFT Jun 23, 2022
c9e3c87
Merge branch 'master' into Microsoft/user/tintse/lodash
Jul 4, 2022
c03b8bb
bumped task version. added comment to the script
tintse-thxsky-MSFT Jul 12, 2022
760d8cf
Merge branch 'master' into Microsoft/user/tintse/lodash
tintse-thxsky-MSFT Jul 12, 2022
4b799a6
Merge branch 'master' into Microsoft/user/tintse/lodash
mpodriezov Jul 13, 2022
aa1fe34
Merge branch 'master' into Microsoft/user/tintse/lodash
tintse-thxsky-MSFT Jul 13, 2022
b0ffb43
add comments to clarify the behavior of the script
tintse-thxsky-MSFT Jul 14, 2022
0dca7d9
Merge branch 'Microsoft/user/tintse/lodash' of https://github.com/tin…
tintse-thxsky-MSFT Jul 14, 2022
62147ea
Merge branch 'master' into Microsoft/user/tintse/lodash
tintse-thxsky-MSFT Jul 18, 2022
7855085
Fixed failings in checks.
tintse-thxsky-MSFT Jul 19, 2022
ab753ef
Merge branch 'Microsoft/user/tintse/lodash' of https://github.com/tin…
tintse-thxsky-MSFT Jul 19, 2022
f94c6f7
Merge branch 'master' into Microsoft/user/tintse/lodash
tintse-thxsky-MSFT Jul 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Tasks/Common/packaging-common/bump-task-version.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Param(
)

# Bump patch version and adjust sprint
# not including task that are deprecated such as NpmV0.
"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
Expand Down
1 change: 0 additions & 1 deletion Tasks/Common/packaging-common/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
"azure-pipelines-task-lib": "2.8.0",
"azure-pipelines-tool-lib": "0.12.0",
"ini": "^1.3.4",
"ip-address": "^5.8.9",
"ltx": "^2.6.2",
"q": "^1.5.0",
"semver": "^5.5.0",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/DotNetCoreCLIV2/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"demands": [],
"version": {
"Major": 2,
"Minor": 202,
"Minor": 208,
"Patch": 0
},
"minimumAgentVersion": "2.115.0",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/DotNetCoreCLIV2/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"demands": [],
"version": {
"Major": 2,
"Minor": 202,
"Minor": 208,
"Patch": 0
},
"minimumAgentVersion": "2.115.0",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/DownloadGitHubNpmPackageV1/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"version": {
"Major": 1,
"Minor": 206,
"Patch": 0
"Patch": 1
tintse-thxsky-MSFT marked this conversation as resolved.
Show resolved Hide resolved
},
"runsOn": [
"Agent",
Expand Down
4 changes: 2 additions & 2 deletions Tasks/DownloadGitHubNpmPackageV1/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"version": {
"Major": 1,
"Minor": 206,
"Patch": 0
"Patch": 1
},
"runsOn": [
"Agent",
Expand Down Expand Up @@ -104,4 +104,4 @@
"WorkingDirectoryNotDirectory": "ms-resource:loc.messages.WorkingDirectoryNotDirectory",
"NGCommon_AreaNotFoundInSps": "ms-resource:loc.messages.NGCommon_AreaNotFoundInSps"
}
}
}
2 changes: 1 addition & 1 deletion Tasks/DownloadGitHubNugetPackageV1/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"version": {
"Major": 1,
"Minor": 207,
"Patch": 0
"Patch": 1
},
"minimumAgentVersion": "2.144.0",
"instanceNameFormat": "dotnet restore",
Expand Down
4 changes: 2 additions & 2 deletions Tasks/DownloadGitHubNugetPackageV1/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"version": {
"Major": 1,
"Minor": 207,
"Patch": 0
"Patch": 1
},
"minimumAgentVersion": "2.144.0",
"instanceNameFormat": "ms-resource:loc.instanceNameFormat",
Expand Down Expand Up @@ -141,4 +141,4 @@
"Warning_UpdatingNuGetVersion": "ms-resource:loc.messages.Warning_UpdatingNuGetVersion",
"NetCore3Update": "ms-resource:loc.messages.NetCore3Update"
}
}
}
2 changes: 1 addition & 1 deletion Tasks/DownloadPackageV0/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"author": "ms-vscs-rm",
"version": {
"Major": 0,
"Minor": 206,
"Minor": 208,
"Patch": 0
},
"demands": [],
Expand Down
2 changes: 1 addition & 1 deletion Tasks/DownloadPackageV1/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"author": "ms-vscs-rm",
"version": {
"Major": 1,
"Minor": 206,
"Minor": 208,
"Patch": 0
},
"demands": [],
Expand Down
2 changes: 1 addition & 1 deletion Tasks/DownloadPackageV1/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,4 +187,4 @@
"Info_Downloading": "ms-resource:loc.messages.Info_Downloading",
"Info_UsingArtifactToolDownload": "ms-resource:loc.messages.Info_UsingArtifactToolDownload"
}
}
}
2 changes: 1 addition & 1 deletion Tasks/MavenV3/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,4 +512,4 @@
"UsingAuthFeed": "ms-resource:loc.messages.UsingAuthFeed",
"NoTestResults": "ms-resource:loc.messages.NoTestResults"
}
}
}
2 changes: 1 addition & 1 deletion Tasks/NpmAuthenticateV0/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 0,
"Minor": 206,
"Minor": 208,
"Patch": 0
},
"runsOn": [
Expand Down
2 changes: 1 addition & 1 deletion Tasks/NpmAuthenticateV0/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 0,
"Minor": 206,
"Minor": 208,
"Patch": 0
},
"runsOn": [
Expand Down
2 changes: 1 addition & 1 deletion Tasks/NpmV1/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 1,
"Minor": 202,
"Minor": 208,
"Patch": 0
},
"runsOn": [
Expand Down
2 changes: 1 addition & 1 deletion Tasks/NpmV1/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 1,
"Minor": 202,
"Minor": 208,
"Patch": 0
},
"runsOn": [
Expand Down
2 changes: 1 addition & 1 deletion Tasks/NuGetCommandV2/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 2,
"Minor": 206,
"Minor": 208,
"Patch": 0
},
"runsOn": [
Expand Down
2 changes: 1 addition & 1 deletion Tasks/NuGetCommandV2/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 2,
"Minor": 206,
"Minor": 208,
"Patch": 0
},
"runsOn": [
Expand Down
2 changes: 1 addition & 1 deletion Tasks/NuGetPublisherV0/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"author": "Lawrence Gripper",
"version": {
"Major": 0,
"Minor": 206,
"Minor": 208,
"Patch": 0
},
"runsOn": [
Expand Down
2 changes: 1 addition & 1 deletion Tasks/NuGetPublisherV0/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"author": "Lawrence Gripper",
"version": {
"Major": 0,
"Minor": 206,
"Minor": 208,
"Patch": 0
},
"runsOn": [
Expand Down
2 changes: 1 addition & 1 deletion Tasks/NuGetToolInstallerV0/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 0,
"Minor": 206,
"Minor": 208,
"Patch": 0
},
"preview": false,
Expand Down
2 changes: 1 addition & 1 deletion Tasks/NuGetToolInstallerV0/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 0,
"Minor": 206,
"Minor": 208,
"Patch": 0
},
"preview": false,
Expand Down
2 changes: 1 addition & 1 deletion Tasks/NuGetToolInstallerV1/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 1,
"Minor": 206,
"Minor": 208,
"Patch": 0
},
"preview": false,
Expand Down
2 changes: 1 addition & 1 deletion Tasks/NuGetToolInstallerV1/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 1,
"Minor": 206,
"Minor": 208,
"Patch": 0
},
"preview": false,
Expand Down
2 changes: 1 addition & 1 deletion Tasks/NuGetV0/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"helpMarkDown": "",
"version": {
"Major": 0,
"Minor": 206,
"Minor": 208,
"Patch": 0
},
"runsOn": [
Expand Down
2 changes: 1 addition & 1 deletion Tasks/NuGetV0/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"helpMarkDown": "ms-resource:loc.helpMarkDown",
"version": {
"Major": 0,
"Minor": 206,
"Minor": 208,
"Patch": 0
},
"runsOn": [
Expand Down
4 changes: 2 additions & 2 deletions Tasks/PipAuthenticateV0/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"category": "Package",
"version": {
"Major": 0,
"Minor": 206,
"Patch": 1
"Minor": 208,
"Patch": 0
},
"runsOn": [
"Agent",
Expand Down
4 changes: 2 additions & 2 deletions Tasks/PipAuthenticateV0/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"category": "Package",
"version": {
"Major": 0,
"Minor": 206,
"Patch": 1
"Minor": 208,
"Patch": 0
},
"runsOn": [
"Agent",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/TwineAuthenticateV0/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"category": "Package",
"version": {
"Major": 0,
"Minor": 206,
"Minor": 208,
"Patch": 0
},
"runsOn": [
Expand Down
2 changes: 1 addition & 1 deletion Tasks/TwineAuthenticateV0/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"category": "Package",
"version": {
"Major": 0,
"Minor": 206,
"Minor": 208,
"Patch": 0
},
"runsOn": ["Agent", "DeploymentGroup"],
Expand Down
2 changes: 1 addition & 1 deletion Tasks/UniversalPackagesV0/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"category": "Package",
"version": {
"Major": 0,
"Minor": 202,
"Minor": 208,
"Patch": 0
},
"runsOn": [
Expand Down
2 changes: 1 addition & 1 deletion Tasks/UniversalPackagesV0/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"category": "Package",
"version": {
"Major": 0,
"Minor": 202,
"Minor": 208,
"Patch": 0
},
"runsOn": [
Expand Down
4 changes: 2 additions & 2 deletions Tasks/UseDotNetV2/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 2,
"Minor": 207,
"Patch": 0
"Patch": 1
},
"satisfies": [
"DotNetCore"
Expand Down Expand Up @@ -190,4 +190,4 @@
"SupportPhaseNotPresentInChannel": "support-phase is not present in the channel with channel-version %s.",
"DepricatedVersionNetCore": "NET Core version you specfied %s is out of support and will be removed from hosted agents soon. Please refer to https://aka.ms/dotnet-core-support for more information about the .NET support policy."
}
}
}
4 changes: 2 additions & 2 deletions Tasks/UseDotNetV2/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 2,
"Minor": 207,
"Patch": 0
"Patch": 1
tintse-thxsky-MSFT marked this conversation as resolved.
Show resolved Hide resolved
},
"satisfies": [
"DotNetCore"
Expand Down Expand Up @@ -190,4 +190,4 @@
"SupportPhaseNotPresentInChannel": "ms-resource:loc.messages.SupportPhaseNotPresentInChannel",
"DepricatedVersionNetCore": "ms-resource:loc.messages.DepricatedVersionNetCore"
}
}
}