From 37955bda2e739faa75fffb0a4037cbcbde37a39b Mon Sep 17 00:00:00 2001 From: Sumiran Aggarwal Date: Thu, 22 Mar 2018 21:09:24 +0530 Subject: [PATCH 1/3] ms deploy guidance message for TLS support --- .../Strings/resources.resjson/en-US/resources.resjson | 3 ++- Tasks/AzureRmWebAppDeployment/task.json | 3 ++- Tasks/AzureRmWebAppDeployment/task.loc.json | 3 ++- .../Strings/resources.resjson/en-US/resources.resjson | 3 +++ Tasks/Common/webdeployment-common/module.json | 5 +++++ Tasks/Common/webdeployment-common/msdeployutility.ts | 3 +++ .../Strings/resources.resjson/en-US/resources.resjson | 3 ++- Tasks/IISWebAppDeploymentOnMachineGroup/task.json | 3 ++- Tasks/IISWebAppDeploymentOnMachineGroup/task.loc.json | 3 ++- 9 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 Tasks/Common/webdeployment-common/Strings/resources.resjson/en-US/resources.resjson create mode 100644 Tasks/Common/webdeployment-common/module.json diff --git a/Tasks/AzureRmWebAppDeployment/Strings/resources.resjson/en-US/resources.resjson b/Tasks/AzureRmWebAppDeployment/Strings/resources.resjson/en-US/resources.resjson index 32b2c80e6bd7..2f726652635d 100644 --- a/Tasks/AzureRmWebAppDeployment/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/AzureRmWebAppDeployment/Strings/resources.resjson/en-US/resources.resjson @@ -190,5 +190,6 @@ "loc.messages.PackageDeploymentInitiated": "Package deployment using ZIP Deploy initiated.", "loc.messages.FailedToGetDeploymentLogs": "Failed to get deployment logs. Error: %s", "loc.messages.GoExeNameNotPresent": "Go exe name is not present", - "loc.messages.WarDeploymentRetry": "Retrying war file deployment as it did not expand successfully earlier." + "loc.messages.WarDeploymentRetry": "Retrying war file deployment as it did not expand successfully earlier.", + "loc.messages.Updatemachinetoenablesecuretlsprotocol": "The machine is not TLS 1.2 enabled. Please follow the instructions in the link to make it compatible: https://support.microsoft.com/en-us/help/3206898/enabling-iis-manager-and-web-deploy-after-disabling-ssl3-and-tls-1-0" } \ No newline at end of file diff --git a/Tasks/AzureRmWebAppDeployment/task.json b/Tasks/AzureRmWebAppDeployment/task.json index c7a3f406abe3..54130adc1b8d 100644 --- a/Tasks/AzureRmWebAppDeployment/task.json +++ b/Tasks/AzureRmWebAppDeployment/task.json @@ -535,6 +535,7 @@ "PackageDeploymentInitiated": "Package deployment using ZIP Deploy initiated.", "FailedToGetDeploymentLogs": "Failed to get deployment logs. Error: %s", "GoExeNameNotPresent": "Go exe name is not present", - "WarDeploymentRetry": "Retrying war file deployment as it did not expand successfully earlier." + "WarDeploymentRetry": "Retrying war file deployment as it did not expand successfully earlier.", + "Updatemachinetoenablesecuretlsprotocol" : "The machine is not TLS 1.2 enabled. Please follow the instructions in the link to make it compatible: https://support.microsoft.com/en-us/help/3206898/enabling-iis-manager-and-web-deploy-after-disabling-ssl3-and-tls-1-0" } } diff --git a/Tasks/AzureRmWebAppDeployment/task.loc.json b/Tasks/AzureRmWebAppDeployment/task.loc.json index 226fae697c67..1aa0a7ed14c9 100644 --- a/Tasks/AzureRmWebAppDeployment/task.loc.json +++ b/Tasks/AzureRmWebAppDeployment/task.loc.json @@ -547,6 +547,7 @@ "PackageDeploymentInitiated": "ms-resource:loc.messages.PackageDeploymentInitiated", "FailedToGetDeploymentLogs": "ms-resource:loc.messages.FailedToGetDeploymentLogs", "GoExeNameNotPresent": "ms-resource:loc.messages.GoExeNameNotPresent", - "WarDeploymentRetry": "ms-resource:loc.messages.WarDeploymentRetry" + "WarDeploymentRetry": "ms-resource:loc.messages.WarDeploymentRetry", + "Updatemachinetoenablesecuretlsprotocol": "ms-resource:loc.messages.Updatemachinetoenablesecuretlsprotocol" } } \ No newline at end of file diff --git a/Tasks/Common/webdeployment-common/Strings/resources.resjson/en-US/resources.resjson b/Tasks/Common/webdeployment-common/Strings/resources.resjson/en-US/resources.resjson new file mode 100644 index 000000000000..69de3b9854e9 --- /dev/null +++ b/Tasks/Common/webdeployment-common/Strings/resources.resjson/en-US/resources.resjson @@ -0,0 +1,3 @@ +{ + "loc.messages.Updatemachinetoenablesecuretlsprotocol": "The machine is not TLS 1.2 enabled. Please follow the instructions in the link to make it compatible: https://support.microsoft.com/en-us/help/3206898/enabling-iis-manager-and-web-deploy-after-disabling-ssl3-and-tls-1-0" +} \ No newline at end of file diff --git a/Tasks/Common/webdeployment-common/module.json b/Tasks/Common/webdeployment-common/module.json new file mode 100644 index 000000000000..05735aaae304 --- /dev/null +++ b/Tasks/Common/webdeployment-common/module.json @@ -0,0 +1,5 @@ +{ + "messages":{ + "Updatemachinetoenablesecuretlsprotocol" : "The machine is not TLS 1.2 enabled. Please follow the instructions in the link to make it compatible: https://support.microsoft.com/en-us/help/3206898/enabling-iis-manager-and-web-deploy-after-disabling-ssl3-and-tls-1-0" + } +} \ No newline at end of file diff --git a/Tasks/Common/webdeployment-common/msdeployutility.ts b/Tasks/Common/webdeployment-common/msdeployutility.ts index 00c734e61c97..a8b9850574fd 100644 --- a/Tasks/Common/webdeployment-common/msdeployutility.ts +++ b/Tasks/Common/webdeployment-common/msdeployutility.ts @@ -195,6 +195,9 @@ export function redirectMSDeployErrorToConsole() { else if(errorFileContent.indexOf("FILE_IN_USE") !== -1) { tl.warning(tl.loc("Trytodeploywebappagainwithrenamefileoptionselected")); } + else if(errorFileContent.indexOf("Unable to read data from the transport connection: An existing connection was forcibly closed by the remote host.") != -1){ + errorFileContent = errorFileContent + tl.loc("Updatemachinetoenablesecuretlsprotocol"); + } tl.error(errorFileContent); } diff --git a/Tasks/IISWebAppDeploymentOnMachineGroup/Strings/resources.resjson/en-US/resources.resjson b/Tasks/IISWebAppDeploymentOnMachineGroup/Strings/resources.resjson/en-US/resources.resjson index 89fa486cf3e4..fceeb6d5e181 100644 --- a/Tasks/IISWebAppDeploymentOnMachineGroup/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/IISWebAppDeploymentOnMachineGroup/Strings/resources.resjson/en-US/resources.resjson @@ -72,5 +72,6 @@ "loc.messages.FailedToApplyTransformationReason1": "1. Whether the Transformation is already applied for the MSBuild generated package during build. If yes, remove the tag for each config in the csproj file and rebuild. ", "loc.messages.FailedToApplyTransformationReason2": "2. Ensure that the config file and transformation files are present in the same folder inside the package.", "loc.messages.AutoParameterizationMessage": "ConnectionString attributes in Web.config is parameterized by default. Note that the transformation has no effect on connectionString attributes as the value is overridden during deployment by 'Parameters.xml or 'SetParameters.xml' files. You can disable the auto-parameterization by setting /p:AutoParameterizationWebConfigConnectionStrings=False during MSBuild package generation.", - "loc.messages.PackageDeploymentFailed": "Failed to deploy web package to IIS website." + "loc.messages.PackageDeploymentFailed": "Failed to deploy web package to IIS website.", + "loc.messages.Updatemachinetoenablesecuretlsprotocol": "The machine is not TLS 1.2 enabled. Please follow the instructions in the link to make it compatible: https://support.microsoft.com/en-us/help/3206898/enabling-iis-manager-and-web-deploy-after-disabling-ssl3-and-tls-1-0" } \ No newline at end of file diff --git a/Tasks/IISWebAppDeploymentOnMachineGroup/task.json b/Tasks/IISWebAppDeploymentOnMachineGroup/task.json index 025b179891e3..0fdd5d5b7045 100644 --- a/Tasks/IISWebAppDeploymentOnMachineGroup/task.json +++ b/Tasks/IISWebAppDeploymentOnMachineGroup/task.json @@ -179,6 +179,7 @@ "FailedToApplyTransformationReason1": "1. Whether the Transformation is already applied for the MSBuild generated package during build. If yes, remove the tag for each config in the csproj file and rebuild. ", "FailedToApplyTransformationReason2": "2. Ensure that the config file and transformation files are present in the same folder inside the package.", "AutoParameterizationMessage": "ConnectionString attributes in Web.config is parameterized by default. Note that the transformation has no effect on connectionString attributes as the value is overridden during deployment by 'Parameters.xml or 'SetParameters.xml' files. You can disable the auto-parameterization by setting /p:AutoParameterizationWebConfigConnectionStrings=False during MSBuild package generation.", - "PackageDeploymentFailed": "Failed to deploy web package to IIS website." + "PackageDeploymentFailed": "Failed to deploy web package to IIS website.", + "Updatemachinetoenablesecuretlsprotocol" : "The machine is not TLS 1.2 enabled. Please follow the instructions in the link to make it compatible: https://support.microsoft.com/en-us/help/3206898/enabling-iis-manager-and-web-deploy-after-disabling-ssl3-and-tls-1-0" } } \ No newline at end of file diff --git a/Tasks/IISWebAppDeploymentOnMachineGroup/task.loc.json b/Tasks/IISWebAppDeploymentOnMachineGroup/task.loc.json index 5316b76c4577..fda4c242c9b8 100644 --- a/Tasks/IISWebAppDeploymentOnMachineGroup/task.loc.json +++ b/Tasks/IISWebAppDeploymentOnMachineGroup/task.loc.json @@ -181,6 +181,7 @@ "FailedToApplyTransformationReason1": "ms-resource:loc.messages.FailedToApplyTransformationReason1", "FailedToApplyTransformationReason2": "ms-resource:loc.messages.FailedToApplyTransformationReason2", "AutoParameterizationMessage": "ms-resource:loc.messages.AutoParameterizationMessage", - "PackageDeploymentFailed": "ms-resource:loc.messages.PackageDeploymentFailed" + "PackageDeploymentFailed": "ms-resource:loc.messages.PackageDeploymentFailed", + "Updatemachinetoenablesecuretlsprotocol": "ms-resource:loc.messages.Updatemachinetoenablesecuretlsprotocol" } } \ No newline at end of file From 71b86c1fdbf0a06ca8b0410a24da2335317f9b03 Mon Sep 17 00:00:00 2001 From: Sumiran Aggarwal Date: Fri, 23 Mar 2018 14:12:30 +0530 Subject: [PATCH 2/3] error message change --- .../Strings/resources.resjson/en-US/resources.resjson | 2 +- Tasks/AzureRmWebAppDeployment/task.json | 4 ++-- Tasks/AzureRmWebAppDeployment/task.loc.json | 2 +- .../Strings/resources.resjson/en-US/resources.resjson | 2 +- Tasks/Common/webdeployment-common/module.json | 2 +- .../Strings/resources.resjson/en-US/resources.resjson | 2 +- Tasks/IISWebAppDeploymentOnMachineGroup/task.json | 4 ++-- Tasks/IISWebAppDeploymentOnMachineGroup/task.loc.json | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Tasks/AzureRmWebAppDeployment/Strings/resources.resjson/en-US/resources.resjson b/Tasks/AzureRmWebAppDeployment/Strings/resources.resjson/en-US/resources.resjson index 2f726652635d..f1f31a2bd971 100644 --- a/Tasks/AzureRmWebAppDeployment/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/AzureRmWebAppDeployment/Strings/resources.resjson/en-US/resources.resjson @@ -191,5 +191,5 @@ "loc.messages.FailedToGetDeploymentLogs": "Failed to get deployment logs. Error: %s", "loc.messages.GoExeNameNotPresent": "Go exe name is not present", "loc.messages.WarDeploymentRetry": "Retrying war file deployment as it did not expand successfully earlier.", - "loc.messages.Updatemachinetoenablesecuretlsprotocol": "The machine is not TLS 1.2 enabled. Please follow the instructions in the link to make it compatible: https://support.microsoft.com/en-us/help/3206898/enabling-iis-manager-and-web-deploy-after-disabling-ssl3-and-tls-1-0" + "loc.messages.Updatemachinetoenablesecuretlsprotocol": "Stronger security protocol might be required. Please make sure the machine is using TLS 1.1 or higher. Check the link for more information https://support.microsoft.com/en-us/help/3206898/enabling-iis-manager-and-web-deploy-after-disabling-ssl3-and-tls-1-0" } \ No newline at end of file diff --git a/Tasks/AzureRmWebAppDeployment/task.json b/Tasks/AzureRmWebAppDeployment/task.json index 54130adc1b8d..a165c46d5c38 100644 --- a/Tasks/AzureRmWebAppDeployment/task.json +++ b/Tasks/AzureRmWebAppDeployment/task.json @@ -17,7 +17,7 @@ "version": { "Major": 4, "Minor": 0, - "Patch": 2 + "Patch": 3 }, "releaseNotes": "What's new in version 4.* (preview)
Supports Kudu Zip Deploy
Supports App Service Environments
Improved UI for discovering different App service types supported by the task
Click [here](https://aka.ms/azurermwebdeployreadme) for more Information.", "minimumAgentVersion": "2.104.1", @@ -536,6 +536,6 @@ "FailedToGetDeploymentLogs": "Failed to get deployment logs. Error: %s", "GoExeNameNotPresent": "Go exe name is not present", "WarDeploymentRetry": "Retrying war file deployment as it did not expand successfully earlier.", - "Updatemachinetoenablesecuretlsprotocol" : "The machine is not TLS 1.2 enabled. Please follow the instructions in the link to make it compatible: https://support.microsoft.com/en-us/help/3206898/enabling-iis-manager-and-web-deploy-after-disabling-ssl3-and-tls-1-0" + "Updatemachinetoenablesecuretlsprotocol" : "Stronger security protocol might be required. Please make sure the machine is using TLS 1.1 or higher. Check the link for more information https://support.microsoft.com/en-us/help/3206898/enabling-iis-manager-and-web-deploy-after-disabling-ssl3-and-tls-1-0" } } diff --git a/Tasks/AzureRmWebAppDeployment/task.loc.json b/Tasks/AzureRmWebAppDeployment/task.loc.json index 1aa0a7ed14c9..41ba0617a106 100644 --- a/Tasks/AzureRmWebAppDeployment/task.loc.json +++ b/Tasks/AzureRmWebAppDeployment/task.loc.json @@ -17,7 +17,7 @@ "version": { "Major": 4, "Minor": 0, - "Patch": 2 + "Patch": 3 }, "releaseNotes": "ms-resource:loc.releaseNotes", "minimumAgentVersion": "2.104.1", diff --git a/Tasks/Common/webdeployment-common/Strings/resources.resjson/en-US/resources.resjson b/Tasks/Common/webdeployment-common/Strings/resources.resjson/en-US/resources.resjson index 69de3b9854e9..f38d3334af2e 100644 --- a/Tasks/Common/webdeployment-common/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/Common/webdeployment-common/Strings/resources.resjson/en-US/resources.resjson @@ -1,3 +1,3 @@ { - "loc.messages.Updatemachinetoenablesecuretlsprotocol": "The machine is not TLS 1.2 enabled. Please follow the instructions in the link to make it compatible: https://support.microsoft.com/en-us/help/3206898/enabling-iis-manager-and-web-deploy-after-disabling-ssl3-and-tls-1-0" + "loc.messages.Updatemachinetoenablesecuretlsprotocol": "Stronger security protocol might be required. Please make sure the machine is using TLS 1.1 or higher. Check the link for more information https://support.microsoft.com/en-us/help/3206898/enabling-iis-manager-and-web-deploy-after-disabling-ssl3-and-tls-1-0" } \ No newline at end of file diff --git a/Tasks/Common/webdeployment-common/module.json b/Tasks/Common/webdeployment-common/module.json index 05735aaae304..b363725b6d26 100644 --- a/Tasks/Common/webdeployment-common/module.json +++ b/Tasks/Common/webdeployment-common/module.json @@ -1,5 +1,5 @@ { "messages":{ - "Updatemachinetoenablesecuretlsprotocol" : "The machine is not TLS 1.2 enabled. Please follow the instructions in the link to make it compatible: https://support.microsoft.com/en-us/help/3206898/enabling-iis-manager-and-web-deploy-after-disabling-ssl3-and-tls-1-0" + "Updatemachinetoenablesecuretlsprotocol" : "Stronger security protocol might be required. Please make sure the machine is using TLS 1.1 or higher. Check the link for more information https://support.microsoft.com/en-us/help/3206898/enabling-iis-manager-and-web-deploy-after-disabling-ssl3-and-tls-1-0" } } \ No newline at end of file diff --git a/Tasks/IISWebAppDeploymentOnMachineGroup/Strings/resources.resjson/en-US/resources.resjson b/Tasks/IISWebAppDeploymentOnMachineGroup/Strings/resources.resjson/en-US/resources.resjson index fceeb6d5e181..c0093a09d9f1 100644 --- a/Tasks/IISWebAppDeploymentOnMachineGroup/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/IISWebAppDeploymentOnMachineGroup/Strings/resources.resjson/en-US/resources.resjson @@ -73,5 +73,5 @@ "loc.messages.FailedToApplyTransformationReason2": "2. Ensure that the config file and transformation files are present in the same folder inside the package.", "loc.messages.AutoParameterizationMessage": "ConnectionString attributes in Web.config is parameterized by default. Note that the transformation has no effect on connectionString attributes as the value is overridden during deployment by 'Parameters.xml or 'SetParameters.xml' files. You can disable the auto-parameterization by setting /p:AutoParameterizationWebConfigConnectionStrings=False during MSBuild package generation.", "loc.messages.PackageDeploymentFailed": "Failed to deploy web package to IIS website.", - "loc.messages.Updatemachinetoenablesecuretlsprotocol": "The machine is not TLS 1.2 enabled. Please follow the instructions in the link to make it compatible: https://support.microsoft.com/en-us/help/3206898/enabling-iis-manager-and-web-deploy-after-disabling-ssl3-and-tls-1-0" + "loc.messages.Updatemachinetoenablesecuretlsprotocol": "Stronger security protocol might be required. Please make sure the machine is using TLS 1.1 or higher. Check the link for more information https://support.microsoft.com/en-us/help/3206898/enabling-iis-manager-and-web-deploy-after-disabling-ssl3-and-tls-1-0" } \ No newline at end of file diff --git a/Tasks/IISWebAppDeploymentOnMachineGroup/task.json b/Tasks/IISWebAppDeploymentOnMachineGroup/task.json index 0fdd5d5b7045..643c75bd7de6 100644 --- a/Tasks/IISWebAppDeploymentOnMachineGroup/task.json +++ b/Tasks/IISWebAppDeploymentOnMachineGroup/task.json @@ -15,7 +15,7 @@ "version": { "Major": 0, "Minor": 0, - "Patch": 35 + "Patch": 36 }, "demands": [], "minimumAgentVersion": "2.104.1", @@ -180,6 +180,6 @@ "FailedToApplyTransformationReason2": "2. Ensure that the config file and transformation files are present in the same folder inside the package.", "AutoParameterizationMessage": "ConnectionString attributes in Web.config is parameterized by default. Note that the transformation has no effect on connectionString attributes as the value is overridden during deployment by 'Parameters.xml or 'SetParameters.xml' files. You can disable the auto-parameterization by setting /p:AutoParameterizationWebConfigConnectionStrings=False during MSBuild package generation.", "PackageDeploymentFailed": "Failed to deploy web package to IIS website.", - "Updatemachinetoenablesecuretlsprotocol" : "The machine is not TLS 1.2 enabled. Please follow the instructions in the link to make it compatible: https://support.microsoft.com/en-us/help/3206898/enabling-iis-manager-and-web-deploy-after-disabling-ssl3-and-tls-1-0" + "Updatemachinetoenablesecuretlsprotocol" : "Stronger security protocol might be required. Please make sure the machine is using TLS 1.1 or higher. Check the link for more information https://support.microsoft.com/en-us/help/3206898/enabling-iis-manager-and-web-deploy-after-disabling-ssl3-and-tls-1-0" } } \ No newline at end of file diff --git a/Tasks/IISWebAppDeploymentOnMachineGroup/task.loc.json b/Tasks/IISWebAppDeploymentOnMachineGroup/task.loc.json index fda4c242c9b8..92ada32aea18 100644 --- a/Tasks/IISWebAppDeploymentOnMachineGroup/task.loc.json +++ b/Tasks/IISWebAppDeploymentOnMachineGroup/task.loc.json @@ -15,7 +15,7 @@ "version": { "Major": 0, "Minor": 0, - "Patch": 35 + "Patch": 36 }, "demands": [], "minimumAgentVersion": "2.104.1", From a7f02b4866da68c4f13ac35b6449b75d1c7364b9 Mon Sep 17 00:00:00 2001 From: Sumiran Aggarwal Date: Mon, 26 Mar 2018 13:00:50 +0530 Subject: [PATCH 3/3] addressing PR comments --- .../Strings/resources.resjson/en-US/resources.resjson | 2 +- Tasks/AzureRmWebAppDeployment/task.json | 2 +- .../Strings/resources.resjson/en-US/resources.resjson | 2 +- Tasks/Common/webdeployment-common/module.json | 2 +- Tasks/Common/webdeployment-common/msdeployutility.ts | 2 +- .../Strings/resources.resjson/en-US/resources.resjson | 2 +- Tasks/IISWebAppDeploymentOnMachineGroup/task.json | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Tasks/AzureRmWebAppDeployment/Strings/resources.resjson/en-US/resources.resjson b/Tasks/AzureRmWebAppDeployment/Strings/resources.resjson/en-US/resources.resjson index f1f31a2bd971..edf1bd0f8709 100644 --- a/Tasks/AzureRmWebAppDeployment/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/AzureRmWebAppDeployment/Strings/resources.resjson/en-US/resources.resjson @@ -191,5 +191,5 @@ "loc.messages.FailedToGetDeploymentLogs": "Failed to get deployment logs. Error: %s", "loc.messages.GoExeNameNotPresent": "Go exe name is not present", "loc.messages.WarDeploymentRetry": "Retrying war file deployment as it did not expand successfully earlier.", - "loc.messages.Updatemachinetoenablesecuretlsprotocol": "Stronger security protocol might be required. Please make sure the machine is using TLS 1.1 or higher. Check the link for more information https://support.microsoft.com/en-us/help/3206898/enabling-iis-manager-and-web-deploy-after-disabling-ssl3-and-tls-1-0" + "loc.messages.Updatemachinetoenablesecuretlsprotocol": "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." } \ No newline at end of file diff --git a/Tasks/AzureRmWebAppDeployment/task.json b/Tasks/AzureRmWebAppDeployment/task.json index a165c46d5c38..1c6094e0e93c 100644 --- a/Tasks/AzureRmWebAppDeployment/task.json +++ b/Tasks/AzureRmWebAppDeployment/task.json @@ -536,6 +536,6 @@ "FailedToGetDeploymentLogs": "Failed to get deployment logs. Error: %s", "GoExeNameNotPresent": "Go exe name is not present", "WarDeploymentRetry": "Retrying war file deployment as it did not expand successfully earlier.", - "Updatemachinetoenablesecuretlsprotocol" : "Stronger security protocol might be required. Please make sure the machine is using TLS 1.1 or higher. Check the link for more information https://support.microsoft.com/en-us/help/3206898/enabling-iis-manager-and-web-deploy-after-disabling-ssl3-and-tls-1-0" + "Updatemachinetoenablesecuretlsprotocol" : "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." } } diff --git a/Tasks/Common/webdeployment-common/Strings/resources.resjson/en-US/resources.resjson b/Tasks/Common/webdeployment-common/Strings/resources.resjson/en-US/resources.resjson index f38d3334af2e..377effffde18 100644 --- a/Tasks/Common/webdeployment-common/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/Common/webdeployment-common/Strings/resources.resjson/en-US/resources.resjson @@ -1,3 +1,3 @@ { - "loc.messages.Updatemachinetoenablesecuretlsprotocol": "Stronger security protocol might be required. Please make sure the machine is using TLS 1.1 or higher. Check the link for more information https://support.microsoft.com/en-us/help/3206898/enabling-iis-manager-and-web-deploy-after-disabling-ssl3-and-tls-1-0" + "loc.messages.Updatemachinetoenablesecuretlsprotocol": "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." } \ No newline at end of file diff --git a/Tasks/Common/webdeployment-common/module.json b/Tasks/Common/webdeployment-common/module.json index b363725b6d26..a9f463f4a502 100644 --- a/Tasks/Common/webdeployment-common/module.json +++ b/Tasks/Common/webdeployment-common/module.json @@ -1,5 +1,5 @@ { "messages":{ - "Updatemachinetoenablesecuretlsprotocol" : "Stronger security protocol might be required. Please make sure the machine is using TLS 1.1 or higher. Check the link for more information https://support.microsoft.com/en-us/help/3206898/enabling-iis-manager-and-web-deploy-after-disabling-ssl3-and-tls-1-0" + "Updatemachinetoenablesecuretlsprotocol" : "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." } } \ No newline at end of file diff --git a/Tasks/Common/webdeployment-common/msdeployutility.ts b/Tasks/Common/webdeployment-common/msdeployutility.ts index a8b9850574fd..248d16b20203 100644 --- a/Tasks/Common/webdeployment-common/msdeployutility.ts +++ b/Tasks/Common/webdeployment-common/msdeployutility.ts @@ -195,7 +195,7 @@ export function redirectMSDeployErrorToConsole() { else if(errorFileContent.indexOf("FILE_IN_USE") !== -1) { tl.warning(tl.loc("Trytodeploywebappagainwithrenamefileoptionselected")); } - else if(errorFileContent.indexOf("Unable to read data from the transport connection: An existing connection was forcibly closed by the remote host.") != -1){ + else if(errorFileContent.indexOf("transport connection") != -1){ errorFileContent = errorFileContent + tl.loc("Updatemachinetoenablesecuretlsprotocol"); } diff --git a/Tasks/IISWebAppDeploymentOnMachineGroup/Strings/resources.resjson/en-US/resources.resjson b/Tasks/IISWebAppDeploymentOnMachineGroup/Strings/resources.resjson/en-US/resources.resjson index c0093a09d9f1..c4ea91f493fe 100644 --- a/Tasks/IISWebAppDeploymentOnMachineGroup/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/IISWebAppDeploymentOnMachineGroup/Strings/resources.resjson/en-US/resources.resjson @@ -73,5 +73,5 @@ "loc.messages.FailedToApplyTransformationReason2": "2. Ensure that the config file and transformation files are present in the same folder inside the package.", "loc.messages.AutoParameterizationMessage": "ConnectionString attributes in Web.config is parameterized by default. Note that the transformation has no effect on connectionString attributes as the value is overridden during deployment by 'Parameters.xml or 'SetParameters.xml' files. You can disable the auto-parameterization by setting /p:AutoParameterizationWebConfigConnectionStrings=False during MSBuild package generation.", "loc.messages.PackageDeploymentFailed": "Failed to deploy web package to IIS website.", - "loc.messages.Updatemachinetoenablesecuretlsprotocol": "Stronger security protocol might be required. Please make sure the machine is using TLS 1.1 or higher. Check the link for more information https://support.microsoft.com/en-us/help/3206898/enabling-iis-manager-and-web-deploy-after-disabling-ssl3-and-tls-1-0" + "loc.messages.Updatemachinetoenablesecuretlsprotocol": "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." } \ No newline at end of file diff --git a/Tasks/IISWebAppDeploymentOnMachineGroup/task.json b/Tasks/IISWebAppDeploymentOnMachineGroup/task.json index 643c75bd7de6..cb81d5bcbd69 100644 --- a/Tasks/IISWebAppDeploymentOnMachineGroup/task.json +++ b/Tasks/IISWebAppDeploymentOnMachineGroup/task.json @@ -180,6 +180,6 @@ "FailedToApplyTransformationReason2": "2. Ensure that the config file and transformation files are present in the same folder inside the package.", "AutoParameterizationMessage": "ConnectionString attributes in Web.config is parameterized by default. Note that the transformation has no effect on connectionString attributes as the value is overridden during deployment by 'Parameters.xml or 'SetParameters.xml' files. You can disable the auto-parameterization by setting /p:AutoParameterizationWebConfigConnectionStrings=False during MSBuild package generation.", "PackageDeploymentFailed": "Failed to deploy web package to IIS website.", - "Updatemachinetoenablesecuretlsprotocol" : "Stronger security protocol might be required. Please make sure the machine is using TLS 1.1 or higher. Check the link for more information https://support.microsoft.com/en-us/help/3206898/enabling-iis-manager-and-web-deploy-after-disabling-ssl3-and-tls-1-0" + "Updatemachinetoenablesecuretlsprotocol" : "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." } } \ No newline at end of file