Skip to content

Commit 742233e

Browse files
authored
Users/arjgupta/tls12support m132 (#6851)
* resolve merge conflicts * minor changes * add loc changes * add loc change
1 parent 7ce413f commit 742233e

File tree

46 files changed

+166
-9
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+166
-9
lines changed

Tasks/AzureCloudPowerShellDeployment/make.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
{
44
"module": "../Common/VstsAzureHelpers_",
55
"type": "ps"
6+
},
7+
{
8+
"module": "../Common/TlsHelper_",
9+
"type": "ps"
610
}
711
],
812
"externals": {

Tasks/AzureCloudPowerShellDeployment/task.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"version": {
1717
"Major": 1,
1818
"Minor": 2,
19-
"Patch": 1
19+
"Patch": 2
2020
},
2121
"demands": [
2222
"azureps"

Tasks/AzureCloudPowerShellDeployment/task.loc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"version": {
1717
"Major": 1,
1818
"Minor": 2,
19-
"Patch": 1
19+
"Patch": 2
2020
},
2121
"demands": [
2222
"azureps"

Tasks/AzureFileCopy/make.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
{
1212
"module": "../Common/Deployment/TelemetryHelper",
1313
"type": "ps"
14+
},
15+
{
16+
"module": "../Common/TlsHelper_",
17+
"type": "ps"
1418
}
1519
],
1620
"externals": {

Tasks/AzureFileCopy/task.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"version": {
1414
"Major": 1,
1515
"Minor": 0,
16-
"Patch": 110
16+
"Patch": 111
1717
},
1818
"demands": [
1919
"azureps"

Tasks/AzureFileCopy/task.loc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"version": {
1414
"Major": 1,
1515
"Minor": 0,
16-
"Patch": 110
16+
"Patch": 111
1717
},
1818
"demands": [
1919
"azureps"

Tasks/AzurePowerShell/make.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
{
44
"module": "../Common/VstsAzureHelpers_",
55
"type": "ps"
6+
},
7+
{
8+
"module": "../Common/TlsHelper_",
9+
"type": "ps"
610
}
711
],
812
"externals": {

Tasks/AzurePowerShell/task.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"version": {
1818
"Major": 3,
1919
"Minor": 0,
20-
"Patch": 1
20+
"Patch": 2
2121
},
2222
"releaseNotes": "This is an early preview. Added support for Fail on standard error and ErrorActionPreference",
2323
"demands": [

Tasks/AzurePowerShell/task.loc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"version": {
1818
"Major": 3,
1919
"Minor": 0,
20-
"Patch": 1
20+
"Patch": 2
2121
},
2222
"releaseNotes": "ms-resource:loc.releaseNotes",
2323
"demands": [
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"loc.messages.UnsupportedTLSError": "Make sure the machine is using TLS 1.2 protocol or higher. Check https://aka.ms/enableTlsv2 for more information on how to enable TLS in your machine.",
3+
"loc.messages.TLS12AddedInSession": "Added TLS 1.2 in session.",
4+
"loc.messages.UnableToAddTls12InSession": "Failed to add TLS 1.2 in current session. Error: '{0}'"
5+
}

0 commit comments

Comments
 (0)