Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Users/suaggar/webdeploytlsguidancemsg #6779

Merged
merged 3 commits into from
Mar 26, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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": "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."
}
5 changes: 3 additions & 2 deletions Tasks/AzureRmWebAppDeployment/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"version": {
"Major": 4,
"Minor": 0,
"Patch": 2
"Patch": 3
},
"releaseNotes": "What's new in version 4.* (preview)<br />Supports Kudu Zip Deploy<br />Supports App Service Environments<br />Improved UI for discovering different App service types supported by the task<br/>Click [here](https://aka.ms/azurermwebdeployreadme) for more Information.",
"minimumAgentVersion": "2.104.1",
Expand Down Expand Up @@ -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" : "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."
}
}
5 changes: 3 additions & 2 deletions Tasks/AzureRmWebAppDeployment/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"version": {
"Major": 4,
"Minor": 0,
"Patch": 2
"Patch": 3
},
"releaseNotes": "ms-resource:loc.releaseNotes",
"minimumAgentVersion": "2.104.1",
Expand Down Expand Up @@ -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"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"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."
}
5 changes: 5 additions & 0 deletions Tasks/Common/webdeployment-common/module.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"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."
}
}
3 changes: 3 additions & 0 deletions Tasks/Common/webdeployment-common/msdeployutility.ts
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,9 @@ export function redirectMSDeployErrorToConsole() {
else if(errorFileContent.indexOf("FILE_IN_USE") !== -1) {
tl.warning(tl.loc("Trytodeploywebappagainwithrenamefileoptionselected"));
}
else if(errorFileContent.indexOf("transport connection") != -1){
errorFileContent = errorFileContent + tl.loc("Updatemachinetoenablesecuretlsprotocol");
}

tl.error(errorFileContent);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 <DependentUpon> 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": "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."
}
5 changes: 3 additions & 2 deletions Tasks/IISWebAppDeploymentOnMachineGroup/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"version": {
"Major": 0,
"Minor": 0,
"Patch": 35
"Patch": 36
},
"demands": [],
"minimumAgentVersion": "2.104.1",
Expand Down Expand Up @@ -179,6 +179,7 @@
"FailedToApplyTransformationReason1": "1. Whether the Transformation is already applied for the MSBuild generated package during build. If yes, remove the <DependentUpon> 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" : "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."
}
}
5 changes: 3 additions & 2 deletions Tasks/IISWebAppDeploymentOnMachineGroup/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"version": {
"Major": 0,
"Minor": 0,
"Patch": 35
"Patch": 36
},
"demands": [],
"minimumAgentVersion": "2.104.1",
Expand Down Expand Up @@ -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"
}
}