From cd658dd0de45638f313e701d450bd3bc22cc7fdc Mon Sep 17 00:00:00 2001 From: Bartosz Klonowski Date: Wed, 6 Jan 2021 11:59:36 +0100 Subject: [PATCH] Add assembly location to the enhanced MSB4064 error The enhanced MSB4064 error message has previously been implemented without assembly location. It has been added by this commit. Note that assembly parameter used for the error message has been replaced with loadedAssembly parameter, due to having the null name property. --- src/Build/BackEnd/TaskExecutionHost/TaskExecutionHost.cs | 3 ++- src/Build/Resources/Strings.resx | 2 +- src/Build/Resources/xlf/Strings.cs.xlf | 4 ++-- src/Build/Resources/xlf/Strings.de.xlf | 4 ++-- src/Build/Resources/xlf/Strings.en.xlf | 4 ++-- src/Build/Resources/xlf/Strings.es.xlf | 4 ++-- src/Build/Resources/xlf/Strings.fr.xlf | 4 ++-- src/Build/Resources/xlf/Strings.it.xlf | 4 ++-- src/Build/Resources/xlf/Strings.ja.xlf | 4 ++-- src/Build/Resources/xlf/Strings.ko.xlf | 4 ++-- src/Build/Resources/xlf/Strings.pl.xlf | 4 ++-- src/Build/Resources/xlf/Strings.pt-BR.xlf | 4 ++-- src/Build/Resources/xlf/Strings.ru.xlf | 4 ++-- src/Build/Resources/xlf/Strings.tr.xlf | 4 ++-- src/Build/Resources/xlf/Strings.zh-Hans.xlf | 4 ++-- src/Build/Resources/xlf/Strings.zh-Hant.xlf | 4 ++-- 16 files changed, 31 insertions(+), 30 deletions(-) diff --git a/src/Build/BackEnd/TaskExecutionHost/TaskExecutionHost.cs b/src/Build/BackEnd/TaskExecutionHost/TaskExecutionHost.cs index 12c626421d0..78c28243abb 100644 --- a/src/Build/BackEnd/TaskExecutionHost/TaskExecutionHost.cs +++ b/src/Build/BackEnd/TaskExecutionHost/TaskExecutionHost.cs @@ -1104,7 +1104,8 @@ out parameterSet "UnexpectedTaskAttribute", parameterName, _taskName, - _taskFactoryWrapper.TaskFactoryLoadedType.Assembly.AssemblyName + _taskFactoryWrapper.TaskFactoryLoadedType.LoadedAssembly.FullName, + _taskFactoryWrapper.TaskFactoryLoadedType.LoadedAssembly.Location ); } } diff --git a/src/Build/Resources/Strings.resx b/src/Build/Resources/Strings.resx index 4f6b22a1ae8..8d034951cd6 100644 --- a/src/Build/Resources/Strings.resx +++ b/src/Build/Resources/Strings.resx @@ -1224,7 +1224,7 @@ {StrBegin="MSB4091: "} - MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from {2}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. + MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from assembly: {2} from the path: {3}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. {StrBegin="MSB4064: "} diff --git a/src/Build/Resources/xlf/Strings.cs.xlf b/src/Build/Resources/xlf/Strings.cs.xlf index 0dc054ecaac..7b1a0b7273a 100644 --- a/src/Build/Resources/xlf/Strings.cs.xlf +++ b/src/Build/Resources/xlf/Strings.cs.xlf @@ -1626,8 +1626,8 @@ {StrBegin="MSB4091: "} - MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from {2}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. - MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from {2}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. + MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from assembly: {2} from the path: {3}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. + MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from assembly: {2} from the path: {3}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. {StrBegin="MSB4064: "} diff --git a/src/Build/Resources/xlf/Strings.de.xlf b/src/Build/Resources/xlf/Strings.de.xlf index 811a0edd222..c3045ed0f84 100644 --- a/src/Build/Resources/xlf/Strings.de.xlf +++ b/src/Build/Resources/xlf/Strings.de.xlf @@ -1626,8 +1626,8 @@ {StrBegin="MSB4091: "} - MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from {2}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. - MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from {2}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. + MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from assembly: {2} from the path: {3}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. + MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from assembly: {2} from the path: {3}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. {StrBegin="MSB4064: "} diff --git a/src/Build/Resources/xlf/Strings.en.xlf b/src/Build/Resources/xlf/Strings.en.xlf index be457b6a802..ff48f4b8a02 100644 --- a/src/Build/Resources/xlf/Strings.en.xlf +++ b/src/Build/Resources/xlf/Strings.en.xlf @@ -1671,8 +1671,8 @@ {StrBegin="MSB4091: "} - MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from {2}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. - MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from {2}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. + MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from assembly: {2} from the path: {3}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. + MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from assembly: {2} from the path: {3}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. {StrBegin="MSB4064: "} diff --git a/src/Build/Resources/xlf/Strings.es.xlf b/src/Build/Resources/xlf/Strings.es.xlf index e126f0489d6..1eb465c8d3f 100644 --- a/src/Build/Resources/xlf/Strings.es.xlf +++ b/src/Build/Resources/xlf/Strings.es.xlf @@ -1626,8 +1626,8 @@ {StrBegin="MSB4091: "} - MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from {2}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. - MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from {2}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. + MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from assembly: {2} from the path: {3}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. + MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from assembly: {2} from the path: {3}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. {StrBegin="MSB4064: "} diff --git a/src/Build/Resources/xlf/Strings.fr.xlf b/src/Build/Resources/xlf/Strings.fr.xlf index beb4a7bd9cd..818415426fe 100644 --- a/src/Build/Resources/xlf/Strings.fr.xlf +++ b/src/Build/Resources/xlf/Strings.fr.xlf @@ -1626,8 +1626,8 @@ {StrBegin="MSB4091: "} - MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from {2}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. - MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from {2}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. + MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from assembly: {2} from the path: {3}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. + MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from assembly: {2} from the path: {3}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. {StrBegin="MSB4064: "} diff --git a/src/Build/Resources/xlf/Strings.it.xlf b/src/Build/Resources/xlf/Strings.it.xlf index 4bd181e2568..078b2ff88c1 100644 --- a/src/Build/Resources/xlf/Strings.it.xlf +++ b/src/Build/Resources/xlf/Strings.it.xlf @@ -1626,8 +1626,8 @@ {StrBegin="MSB4091: "} - MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from {2}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. - MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from {2}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. + MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from assembly: {2} from the path: {3}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. + MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from assembly: {2} from the path: {3}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. {StrBegin="MSB4064: "} diff --git a/src/Build/Resources/xlf/Strings.ja.xlf b/src/Build/Resources/xlf/Strings.ja.xlf index 2a12e2c6be7..f665818376b 100644 --- a/src/Build/Resources/xlf/Strings.ja.xlf +++ b/src/Build/Resources/xlf/Strings.ja.xlf @@ -1626,8 +1626,8 @@ {StrBegin="MSB4091: "} - MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from {2}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. - MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from {2}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. + MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from assembly: {2} from the path: {3}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. + MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from assembly: {2} from the path: {3}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. {StrBegin="MSB4064: "} diff --git a/src/Build/Resources/xlf/Strings.ko.xlf b/src/Build/Resources/xlf/Strings.ko.xlf index f2cff0f2b36..be0f2e91d91 100644 --- a/src/Build/Resources/xlf/Strings.ko.xlf +++ b/src/Build/Resources/xlf/Strings.ko.xlf @@ -1626,8 +1626,8 @@ {StrBegin="MSB4091: "} - MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from {2}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. - MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from {2}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. + MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from assembly: {2} from the path: {3}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. + MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from assembly: {2} from the path: {3}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. {StrBegin="MSB4064: "} diff --git a/src/Build/Resources/xlf/Strings.pl.xlf b/src/Build/Resources/xlf/Strings.pl.xlf index a6bc03bc9ef..7d0e2ba4195 100644 --- a/src/Build/Resources/xlf/Strings.pl.xlf +++ b/src/Build/Resources/xlf/Strings.pl.xlf @@ -1626,8 +1626,8 @@ {StrBegin="MSB4091: "} - MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from {2}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. - MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from {2}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. + MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from assembly: {2} from the path: {3}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. + MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from assembly: {2} from the path: {3}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. {StrBegin="MSB4064: "} diff --git a/src/Build/Resources/xlf/Strings.pt-BR.xlf b/src/Build/Resources/xlf/Strings.pt-BR.xlf index 02dc5b8d247..e38f07d6602 100644 --- a/src/Build/Resources/xlf/Strings.pt-BR.xlf +++ b/src/Build/Resources/xlf/Strings.pt-BR.xlf @@ -1626,8 +1626,8 @@ {StrBegin="MSB4091: "} - MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from {2}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. - MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from {2}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. + MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from assembly: {2} from the path: {3}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. + MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from assembly: {2} from the path: {3}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. {StrBegin="MSB4064: "} diff --git a/src/Build/Resources/xlf/Strings.ru.xlf b/src/Build/Resources/xlf/Strings.ru.xlf index 1f6e443db2c..a18288c37d7 100644 --- a/src/Build/Resources/xlf/Strings.ru.xlf +++ b/src/Build/Resources/xlf/Strings.ru.xlf @@ -1626,8 +1626,8 @@ {StrBegin="MSB4091: "} - MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from {2}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. - MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from {2}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. + MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from assembly: {2} from the path: {3}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. + MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from assembly: {2} from the path: {3}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. {StrBegin="MSB4064: "} diff --git a/src/Build/Resources/xlf/Strings.tr.xlf b/src/Build/Resources/xlf/Strings.tr.xlf index 78a512d2aad..261b1a16337 100644 --- a/src/Build/Resources/xlf/Strings.tr.xlf +++ b/src/Build/Resources/xlf/Strings.tr.xlf @@ -1626,8 +1626,8 @@ {StrBegin="MSB4091: "} - MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from {2}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. - MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from {2}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. + MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from assembly: {2} from the path: {3}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. + MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from assembly: {2} from the path: {3}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. {StrBegin="MSB4064: "} diff --git a/src/Build/Resources/xlf/Strings.zh-Hans.xlf b/src/Build/Resources/xlf/Strings.zh-Hans.xlf index c2e247a5e56..2f6ffb02c2f 100644 --- a/src/Build/Resources/xlf/Strings.zh-Hans.xlf +++ b/src/Build/Resources/xlf/Strings.zh-Hans.xlf @@ -1626,8 +1626,8 @@ {StrBegin="MSB4091: "} - MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from {2}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. - MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from {2}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. + MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from assembly: {2} from the path: {3}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. + MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from assembly: {2} from the path: {3}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. {StrBegin="MSB4064: "} diff --git a/src/Build/Resources/xlf/Strings.zh-Hant.xlf b/src/Build/Resources/xlf/Strings.zh-Hant.xlf index 50ca499d5df..a6b5a221bda 100644 --- a/src/Build/Resources/xlf/Strings.zh-Hant.xlf +++ b/src/Build/Resources/xlf/Strings.zh-Hant.xlf @@ -1626,8 +1626,8 @@ {StrBegin="MSB4091: "} - MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from {2}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. - MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from {2}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. + MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from assembly: {2} from the path: {3}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. + MSB4064: The "{0}" parameter is not supported by the "{1}" task loaded from assembly: {2} from the path: {3}. Verify that the parameter exists on the task, the UsingTask points to the correct assembly and it is a settable public instance property. {StrBegin="MSB4064: "}