Skip to content

Commit d902301

Browse files
committed
Merge remote-tracking branch 'origin/master' into Localization
2 parents bc6f40e + 36f619e commit d902301

File tree

9 files changed

+80
-70
lines changed

9 files changed

+80
-70
lines changed

Tasks/JavaToolInstallerV1/package-lock.json

Lines changed: 32 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Tasks/JavaToolInstallerV1/task.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 1,
1616
"Minor": 247,
17-
"Patch": 2
17+
"Patch": 4
1818
},
1919
"satisfies": [
2020
"Java",

Tasks/JavaToolInstallerV1/task.loc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 1,
1616
"Minor": 247,
17-
"Patch": 2
17+
"Patch": 4
1818
},
1919
"satisfies": [
2020
"Java",
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Default|1.247.2
2-
Node20_229_14|1.247.3
1+
Default|1.247.4
2+
Node20_229_14|1.247.5

_generated/JavaToolInstallerV1/package-lock.json

Lines changed: 32 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

_generated/JavaToolInstallerV1/task.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 1,
1616
"Minor": 247,
17-
"Patch": 2
17+
"Patch": 4
1818
},
1919
"satisfies": [
2020
"Java",
@@ -229,7 +229,7 @@
229229
"ErrorCleaningFolder": "Folder cleaning error: %s"
230230
},
231231
"_buildConfigMapping": {
232-
"Default": "1.247.2",
233-
"Node20_229_14": "1.247.3"
232+
"Default": "1.247.4",
233+
"Node20_229_14": "1.247.5"
234234
}
235235
}

_generated/JavaToolInstallerV1/task.loc.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 1,
1616
"Minor": 247,
17-
"Patch": 2
17+
"Patch": 4
1818
},
1919
"satisfies": [
2020
"Java",
@@ -229,7 +229,7 @@
229229
"ErrorCleaningFolder": "ms-resource:loc.messages.ErrorCleaningFolder"
230230
},
231231
"_buildConfigMapping": {
232-
"Default": "1.247.2",
233-
"Node20_229_14": "1.247.3"
232+
"Default": "1.247.4",
233+
"Node20_229_14": "1.247.5"
234234
}
235235
}

_generated/JavaToolInstallerV1_Node20/task.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 1,
1616
"Minor": 247,
17-
"Patch": 3
17+
"Patch": 5
1818
},
1919
"satisfies": [
2020
"Java",
@@ -233,7 +233,7 @@
233233
"ErrorCleaningFolder": "Folder cleaning error: %s"
234234
},
235235
"_buildConfigMapping": {
236-
"Default": "1.247.2",
237-
"Node20_229_14": "1.247.3"
236+
"Default": "1.247.4",
237+
"Node20_229_14": "1.247.5"
238238
}
239239
}

_generated/JavaToolInstallerV1_Node20/task.loc.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 1,
1616
"Minor": 247,
17-
"Patch": 3
17+
"Patch": 5
1818
},
1919
"satisfies": [
2020
"Java",
@@ -233,7 +233,7 @@
233233
"ErrorCleaningFolder": "ms-resource:loc.messages.ErrorCleaningFolder"
234234
},
235235
"_buildConfigMapping": {
236-
"Default": "1.247.2",
237-
"Node20_229_14": "1.247.3"
236+
"Default": "1.247.4",
237+
"Node20_229_14": "1.247.5"
238238
}
239239
}

0 commit comments

Comments
 (0)