Skip to content

Commit 1de96c2

Browse files
fixed tls issues (#6910)
1 parent e04490d commit 1de96c2

File tree

9 files changed

+15
-11
lines changed

9 files changed

+15
-11
lines changed

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": 2
19+
"Patch": 3
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": 2
19+
"Patch": 3
2020
},
2121
"demands": [
2222
"azureps"

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": 111
16+
"Patch": 112
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": 111
16+
"Patch": 112
1717
},
1818
"demands": [
1919
"azureps"

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": 2
20+
"Patch": 3
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": 2
20+
"Patch": 3
2121
},
2222
"releaseNotes": "ms-resource:loc.releaseNotes",
2323
"demands": [

Tasks/Common/TlsHelper_/TlsHelper_.psm1

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,20 @@ function Add-Tls12InSession {
55
param()
66

77
try {
8-
if ([Net.ServicePointManager]::SecurityProtocol -notcontains 'Tls12') {
9-
[Net.ServicePointManager]::SecurityProtocol += [Net.SecurityProtocolType]3072
8+
if ([Net.ServicePointManager]::SecurityProtocol.ToString().Split(',').Trim() -notcontains 'Tls12') {
9+
$securityProtocol=@()
10+
$securityProtocol+=[Net.ServicePointManager]::SecurityProtocol
11+
$securityProtocol+=[Net.SecurityProtocolType]3072
12+
[Net.ServicePointManager]::SecurityProtocol=$securityProtocol
13+
1014
Write-Host (Get-VstsLocString -Key TLS12AddedInSession)
1115
}
1216
else {
1317
Write-Verbose 'TLS 1.2 already present in session.'
1418
}
1519
}
1620
catch {
17-
Write-VstsTaskError -Message (Get-VstsLocString -Key "UnableToAddTls12InSession" -ArgumentList $($_.Exception.Message))
21+
Write-Host (Get-VstsLocString -Key "UnableToAddTls12InSession" -ArgumentList $($_.Exception.Message))
1822
}
1923
}
2024

Tasks/SqlAzureDacpacDeployment/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": 1,
19-
"Patch": 28
19+
"Patch": 29
2020
},
2121
"demands": [
2222
"sqlpackage"

Tasks/SqlAzureDacpacDeployment/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": 1,
19-
"Patch": 28
19+
"Patch": 29
2020
},
2121
"demands": [
2222
"sqlpackage"

0 commit comments

Comments
 (0)