From a5d9016e7ae780bc5b38aeb852ef94a8193fe8f1 Mon Sep 17 00:00:00 2001 From: John Nyingi Date: Fri, 11 Jun 2021 14:20:55 +0300 Subject: [PATCH 01/17] #54008 Issue Fix Passing name of the Template --- .../gen/LoggerMessageGenerator.Parser.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/LoggerMessageGenerator.Parser.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/LoggerMessageGenerator.Parser.cs index 03c5ad2cf57624..8542778705243a 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/LoggerMessageGenerator.Parser.cs +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/LoggerMessageGenerator.Parser.cs @@ -323,7 +323,7 @@ public IReadOnlyList GetLogClasses(IEnumerable Date: Fri, 11 Jun 2021 16:58:38 +0300 Subject: [PATCH 02/17] Added Test Added Logger Fix TestCase --- .../LoggerMessageGeneratorParserTests.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/LoggerMessageGeneratorParserTests.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/LoggerMessageGeneratorParserTests.cs index e3e62f72b10cf7..76d6cfcc8d161d 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/LoggerMessageGeneratorParserTests.cs +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/LoggerMessageGeneratorParserTests.cs @@ -93,6 +93,7 @@ partial class C Assert.Single(diagnostics); Assert.Equal(DiagnosticDescriptors.TemplateHasNoCorrespondingArgument.Id, diagnostics[0].Id); + Assert.Contains("Argument 'foo' is not referenced from the logging message", diagnostics[0].GetMessage(), StringComparison.InvariantCulture); } [Fact] From aed8d1178e02289fb1ce3ba15bbe801ff8c8ec50 Mon Sep 17 00:00:00 2001 From: John Nyingi Date: Sat, 12 Jun 2021 22:19:36 +0300 Subject: [PATCH 03/17] Update Tests Matching test chase with expected case --- .../LoggerMessageGeneratorParserTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/LoggerMessageGeneratorParserTests.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/LoggerMessageGeneratorParserTests.cs index 76d6cfcc8d161d..bb158e9f175396 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/LoggerMessageGeneratorParserTests.cs +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/LoggerMessageGeneratorParserTests.cs @@ -93,7 +93,7 @@ partial class C Assert.Single(diagnostics); Assert.Equal(DiagnosticDescriptors.TemplateHasNoCorrespondingArgument.Id, diagnostics[0].Id); - Assert.Contains("Argument 'foo' is not referenced from the logging message", diagnostics[0].GetMessage(), StringComparison.InvariantCulture); + Assert.Contains("Template 'foo' is not provided as argument to the logging method", diagnostics[0].GetMessage(), StringComparison.InvariantCulture); } [Fact] From 69dcd1a65b6f5001dfe4aa36e13afd6d220547fc Mon Sep 17 00:00:00 2001 From: John Nyingi Date: Sun, 13 Jun 2021 21:38:04 +0300 Subject: [PATCH 04/17] Update strings resx --- .../gen/Resources/Strings.resx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/Strings.resx b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/Strings.resx index 13a23bcd2118b8..d1891fa930c1e4 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/Strings.resx +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/Strings.resx @@ -177,7 +177,7 @@ Argument is not referenced from the logging message - Template {0} is not provided as argument to the logging method + Template '{0}' is not provided as argument to the logging method Logging template has no corresponding method argument @@ -219,4 +219,4 @@ Generating more than 6 arguments is not supported - \ No newline at end of file + From 44900005aa2fd793fdd0631039a76fa566573e33 Mon Sep 17 00:00:00 2001 From: John Nyingi Date: Sun, 13 Jun 2021 21:40:27 +0300 Subject: [PATCH 05/17] Update Strings.cs.xlf --- .../gen/Resources/xlf/Strings.cs.xlf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.cs.xlf b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.cs.xlf index 8a6e5be5b381c6..f11c79ddf53fbc 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.cs.xlf +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.cs.xlf @@ -153,8 +153,8 @@ - Template {0} is not provided as argument to the logging method - Template {0} is not provided as argument to the logging method + Template '{0}' is not provided as argument to the logging method + Template '{0}' is not provided as argument to the logging method @@ -164,4 +164,4 @@ - \ No newline at end of file + From 302a5185d5bb8d520730e2489596a34ee31a0a3a Mon Sep 17 00:00:00 2001 From: John Nyingi Date: Sun, 13 Jun 2021 21:41:36 +0300 Subject: [PATCH 06/17] Update Strings.de.xlf --- .../gen/Resources/xlf/Strings.de.xlf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.de.xlf b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.de.xlf index 835dfbbc7fbf1a..3493cbf5ffbc13 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.de.xlf +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.de.xlf @@ -153,8 +153,8 @@ - Template {0} is not provided as argument to the logging method - Template {0} is not provided as argument to the logging method + Template '{0}' is not provided as argument to the logging method + Template '{0}' is not provided as argument to the logging method @@ -164,4 +164,4 @@ - \ No newline at end of file + From d2236a0c272e0daf0a8964f21bfe037df7bf4080 Mon Sep 17 00:00:00 2001 From: John Nyingi Date: Sun, 13 Jun 2021 21:42:26 +0300 Subject: [PATCH 07/17] Update Strings.es.xlf --- .../gen/Resources/xlf/Strings.es.xlf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.es.xlf b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.es.xlf index 0db7b4e17b3667..6848e885fb24dd 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.es.xlf +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.es.xlf @@ -153,8 +153,8 @@ - Template {0} is not provided as argument to the logging method - Template {0} is not provided as argument to the logging method + Template '{0}' is not provided as argument to the logging method + Template '{0}' is not provided as argument to the logging method @@ -164,4 +164,4 @@ - \ No newline at end of file + From 8d4758a30694144007595096f690f334f4ec18cd Mon Sep 17 00:00:00 2001 From: John Nyingi Date: Sun, 13 Jun 2021 21:43:02 +0300 Subject: [PATCH 08/17] Update Strings.fr.xlf --- .../gen/Resources/xlf/Strings.fr.xlf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.fr.xlf b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.fr.xlf index 757ff655a6b142..7938224a4ee00b 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.fr.xlf +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.fr.xlf @@ -153,8 +153,8 @@ - Template {0} is not provided as argument to the logging method - Template {0} is not provided as argument to the logging method + Template '{0}' is not provided as argument to the logging method + Template '{0}' is not provided as argument to the logging method @@ -164,4 +164,4 @@ - \ No newline at end of file + From fb5387ffb2504cc30d26911bc0d98b70ceaf42a5 Mon Sep 17 00:00:00 2001 From: John Nyingi Date: Sun, 13 Jun 2021 21:44:08 +0300 Subject: [PATCH 09/17] Update Strings.it.xlf --- .../gen/Resources/xlf/Strings.it.xlf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.it.xlf b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.it.xlf index 8717aa30c3c287..19f0fd82ced408 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.it.xlf +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.it.xlf @@ -153,8 +153,8 @@ - Template {0} is not provided as argument to the logging method - Template {0} is not provided as argument to the logging method + Template '{0}' is not provided as argument to the logging method + Template '{0}' is not provided as argument to the logging method @@ -164,4 +164,4 @@ - \ No newline at end of file + From 646bdb9f926a937e4bed8e6bb6128919bae8c133 Mon Sep 17 00:00:00 2001 From: John Nyingi Date: Sun, 13 Jun 2021 21:45:55 +0300 Subject: [PATCH 10/17] Update Strings.ja.xlf --- .../gen/Resources/xlf/Strings.ja.xlf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.ja.xlf b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.ja.xlf index 9ed2e744c66a4c..05e8a429437d07 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.ja.xlf +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.ja.xlf @@ -153,8 +153,8 @@ - Template {0} is not provided as argument to the logging method - Template {0} is not provided as argument to the logging method + Template '{0}' is not provided as argument to the logging method + Template '{0}' is not provided as argument to the logging method @@ -164,4 +164,4 @@ - \ No newline at end of file + From 5fe833a41eeb2b949e95d46865fd56ee86273a51 Mon Sep 17 00:00:00 2001 From: John Nyingi Date: Sun, 13 Jun 2021 21:46:24 +0300 Subject: [PATCH 11/17] Update Strings.ko.xlf --- .../gen/Resources/xlf/Strings.ko.xlf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.ko.xlf b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.ko.xlf index 5b7bbb9010784c..b77da90c244e1d 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.ko.xlf +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.ko.xlf @@ -153,8 +153,8 @@ - Template {0} is not provided as argument to the logging method - Template {0} is not provided as argument to the logging method + Template '{0}' is not provided as argument to the logging method + Template '{0}' is not provided as argument to the logging method @@ -164,4 +164,4 @@ - \ No newline at end of file + From f8710baca951c05ddc6262b8cf0e0941040df61c Mon Sep 17 00:00:00 2001 From: John Nyingi Date: Sun, 13 Jun 2021 21:47:01 +0300 Subject: [PATCH 12/17] Update Strings.pl.xlf --- .../gen/Resources/xlf/Strings.pl.xlf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.pl.xlf b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.pl.xlf index eed366ed41893d..13e7290cacf775 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.pl.xlf +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.pl.xlf @@ -153,8 +153,8 @@ - Template {0} is not provided as argument to the logging method - Template {0} is not provided as argument to the logging method + Template '{0}' is not provided as argument to the logging method + Template '{0}' is not provided as argument to the logging method @@ -164,4 +164,4 @@ - \ No newline at end of file + From a8f7f15363d44b8b38c950f99c7ce6863f236dba Mon Sep 17 00:00:00 2001 From: John Nyingi Date: Sun, 13 Jun 2021 21:47:39 +0300 Subject: [PATCH 13/17] Update Strings.pt-BR.xlf --- .../gen/Resources/xlf/Strings.pt-BR.xlf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.pt-BR.xlf b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.pt-BR.xlf index c33ad19bb8cd91..6950e340745356 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.pt-BR.xlf +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.pt-BR.xlf @@ -153,8 +153,8 @@ - Template {0} is not provided as argument to the logging method - Template {0} is not provided as argument to the logging method + Template '{0}' is not provided as argument to the logging method + Template '{0}' is not provided as argument to the logging method @@ -164,4 +164,4 @@ - \ No newline at end of file + From 6be8d9ffd7014d494d0c4fb9e173d45f033e6786 Mon Sep 17 00:00:00 2001 From: John Nyingi Date: Sun, 13 Jun 2021 21:48:09 +0300 Subject: [PATCH 14/17] Update Strings.ru.xlf --- .../gen/Resources/xlf/Strings.ru.xlf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.ru.xlf b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.ru.xlf index 37548b1750a5cc..c70ed0221e6c96 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.ru.xlf +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.ru.xlf @@ -153,8 +153,8 @@ - Template {0} is not provided as argument to the logging method - Template {0} is not provided as argument to the logging method + Template '{0}' is not provided as argument to the logging method + Template '{0}' is not provided as argument to the logging method @@ -164,4 +164,4 @@ - \ No newline at end of file + From e551116fad2a6e020349908777acac6af7890372 Mon Sep 17 00:00:00 2001 From: John Nyingi Date: Sun, 13 Jun 2021 21:48:40 +0300 Subject: [PATCH 15/17] Update Strings.tr.xlf --- .../gen/Resources/xlf/Strings.tr.xlf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.tr.xlf b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.tr.xlf index dccdbd55e57aa9..3aef3683ac3e0f 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.tr.xlf +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.tr.xlf @@ -153,8 +153,8 @@ - Template {0} is not provided as argument to the logging method - Template {0} is not provided as argument to the logging method + Template '{0}' is not provided as argument to the logging method + Template '{0}' is not provided as argument to the logging method @@ -164,4 +164,4 @@ - \ No newline at end of file + From 7b9d0b1201dc99dcd01cc38eaf92fa157746be88 Mon Sep 17 00:00:00 2001 From: John Nyingi Date: Sun, 13 Jun 2021 21:49:09 +0300 Subject: [PATCH 16/17] Update Strings.zh-Hans.xlf --- .../gen/Resources/xlf/Strings.zh-Hans.xlf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.zh-Hans.xlf b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.zh-Hans.xlf index 98b2d4b7185e9b..319e98613ff779 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.zh-Hans.xlf +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.zh-Hans.xlf @@ -153,8 +153,8 @@ - Template {0} is not provided as argument to the logging method - Template {0} is not provided as argument to the logging method + Template '{0}' is not provided as argument to the logging method + Template '{0}' is not provided as argument to the logging method @@ -164,4 +164,4 @@ - \ No newline at end of file + From 0966a4c38186774f8e132fbe8faa1726e368f395 Mon Sep 17 00:00:00 2001 From: John Nyingi Date: Sun, 13 Jun 2021 21:49:35 +0300 Subject: [PATCH 17/17] Update Strings.zh-Hant.xlf --- .../gen/Resources/xlf/Strings.zh-Hant.xlf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.zh-Hant.xlf b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.zh-Hant.xlf index 0a54ae2ca73273..4286caaabcd005 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.zh-Hant.xlf +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.zh-Hant.xlf @@ -153,8 +153,8 @@ - Template {0} is not provided as argument to the logging method - Template {0} is not provided as argument to the logging method + Template '{0}' is not provided as argument to the logging method + Template '{0}' is not provided as argument to the logging method @@ -164,4 +164,4 @@ - \ No newline at end of file +