Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into Localization
Browse files Browse the repository at this point in the history
  • Loading branch information
vmapetr committed Oct 23, 2024
2 parents bc6f40e + 36f619e commit d902301
Show file tree
Hide file tree
Showing 9 changed files with 80 additions and 70 deletions.
59 changes: 32 additions & 27 deletions Tasks/JavaToolInstallerV1/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/JavaToolInstallerV1/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 1,
"Minor": 247,
"Patch": 2
"Patch": 4
},
"satisfies": [
"Java",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/JavaToolInstallerV1/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 1,
"Minor": 247,
"Patch": 2
"Patch": 4
},
"satisfies": [
"Java",
Expand Down
4 changes: 2 additions & 2 deletions _generated/JavaToolInstallerV1.versionmap.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Default|1.247.2
Node20_229_14|1.247.3
Default|1.247.4
Node20_229_14|1.247.5
59 changes: 32 additions & 27 deletions _generated/JavaToolInstallerV1/package-lock.json

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

6 changes: 3 additions & 3 deletions _generated/JavaToolInstallerV1/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 1,
"Minor": 247,
"Patch": 2
"Patch": 4
},
"satisfies": [
"Java",
Expand Down Expand Up @@ -229,7 +229,7 @@
"ErrorCleaningFolder": "Folder cleaning error: %s"
},
"_buildConfigMapping": {
"Default": "1.247.2",
"Node20_229_14": "1.247.3"
"Default": "1.247.4",
"Node20_229_14": "1.247.5"
}
}
6 changes: 3 additions & 3 deletions _generated/JavaToolInstallerV1/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 1,
"Minor": 247,
"Patch": 2
"Patch": 4
},
"satisfies": [
"Java",
Expand Down Expand Up @@ -229,7 +229,7 @@
"ErrorCleaningFolder": "ms-resource:loc.messages.ErrorCleaningFolder"
},
"_buildConfigMapping": {
"Default": "1.247.2",
"Node20_229_14": "1.247.3"
"Default": "1.247.4",
"Node20_229_14": "1.247.5"
}
}
6 changes: 3 additions & 3 deletions _generated/JavaToolInstallerV1_Node20/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 1,
"Minor": 247,
"Patch": 3
"Patch": 5
},
"satisfies": [
"Java",
Expand Down Expand Up @@ -233,7 +233,7 @@
"ErrorCleaningFolder": "Folder cleaning error: %s"
},
"_buildConfigMapping": {
"Default": "1.247.2",
"Node20_229_14": "1.247.3"
"Default": "1.247.4",
"Node20_229_14": "1.247.5"
}
}
6 changes: 3 additions & 3 deletions _generated/JavaToolInstallerV1_Node20/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 1,
"Minor": 247,
"Patch": 3
"Patch": 5
},
"satisfies": [
"Java",
Expand Down Expand Up @@ -233,7 +233,7 @@
"ErrorCleaningFolder": "ms-resource:loc.messages.ErrorCleaningFolder"
},
"_buildConfigMapping": {
"Default": "1.247.2",
"Node20_229_14": "1.247.3"
"Default": "1.247.4",
"Node20_229_14": "1.247.5"
}
}

0 comments on commit d902301

Please sign in to comment.