From cb088ac8ae339a23aa621a67df4572331c8763c0 Mon Sep 17 00:00:00 2001 From: Surayya Huseyn Zada Date: Wed, 10 Jan 2024 13:19:50 +0100 Subject: [PATCH 01/10] log success message when sdk is resolved --- .../BackEnd/SdkResolverService_Tests.cs | 12 +++++++++++- .../Components/SdkResolution/SdkResolverService.cs | 2 ++ src/Build/Resources/Strings.resx | 3 +++ src/Build/Resources/xlf/Strings.cs.xlf | 5 +++++ src/Build/Resources/xlf/Strings.de.xlf | 5 +++++ src/Build/Resources/xlf/Strings.es.xlf | 5 +++++ src/Build/Resources/xlf/Strings.fr.xlf | 5 +++++ src/Build/Resources/xlf/Strings.it.xlf | 5 +++++ src/Build/Resources/xlf/Strings.ja.xlf | 5 +++++ src/Build/Resources/xlf/Strings.ko.xlf | 5 +++++ src/Build/Resources/xlf/Strings.pl.xlf | 5 +++++ src/Build/Resources/xlf/Strings.pt-BR.xlf | 5 +++++ src/Build/Resources/xlf/Strings.ru.xlf | 5 +++++ src/Build/Resources/xlf/Strings.tr.xlf | 5 +++++ src/Build/Resources/xlf/Strings.zh-Hans.xlf | 5 +++++ src/Build/Resources/xlf/Strings.zh-Hant.xlf | 5 +++++ 16 files changed, 81 insertions(+), 1 deletion(-) diff --git a/src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs b/src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs index bb2cf8e7019..65b7ddf7db5 100644 --- a/src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs +++ b/src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs @@ -94,6 +94,8 @@ public void AssertResolutionWarnsIfResolvedVersionIsDifferentFromReferencedVersi result.Path.ShouldBe("path"); + _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SuccededToResolveSDK", sdk.ToString())); + _logger.WarningCount.ShouldBe(1); _logger.Warnings.First().Code.ShouldStartWith("MSB4241"); } @@ -111,7 +113,6 @@ public void AssertResolverThrows() e.Sdk.Name.ShouldBe("1sdkName"); } - [Fact] // Scenario: MockSdkResolverWithResolvableSdkPattern2 is a specific resolver (i.e. resolver with pattern) // and it successfully resolves sdk. @@ -124,6 +125,7 @@ public void AssertSecondResolverWithPatternCanResolve() var result = SdkResolverService.Instance.ResolveSdk(BuildEventContext.InvalidSubmissionId, sdk, _loggingContext, new MockElementLocation("file"), "sln", "projectPath", interactive: false, isRunningInVisualStudio: false, failOnUnresolvedSdk: true); result.Path.ShouldBe("resolverpathwithresolvablesdkpattern2"); + _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SuccededToResolveSDK", sdk.ToString())); _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain("MockSdkResolverWithResolvableSdkPattern2 running"); _logger.BuildMessageEvents.Select(i => i.Message).ShouldNotContain("MockSdkResolver1 running"); _logger.BuildMessageEvents.Select(i => i.Message).ShouldNotContain("MockSdkResolver2 running"); @@ -141,6 +143,7 @@ public void AssertFirstResolverCanResolve() var result = SdkResolverService.Instance.ResolveSdk(BuildEventContext.InvalidSubmissionId, sdk, _loggingContext, new MockElementLocation("file"), "sln", "projectPath", interactive: false, isRunningInVisualStudio: false, failOnUnresolvedSdk: true); result.Path.ShouldBe("resolverpath1"); + _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SuccededToResolveSDK", sdk.ToString())); _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain("MockSdkResolver1 running"); _logger.BuildMessageEvents.Select(i => i.Message).ShouldNotContain("MockSdkResolverWithResolvableSdkPattern1 running"); } @@ -162,6 +165,7 @@ public void AssertFirstResolverWithPatternCantResolveChangeWave17_4() var result = SdkResolverService.Instance.ResolveSdk(BuildEventContext.InvalidSubmissionId, sdk, _loggingContext, new MockElementLocation("file"), "sln", "projectPath", interactive: false, isRunningInVisualStudio: false, failOnUnresolvedSdk: true); result.Path.ShouldBe("resolverpath1"); + _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SuccededToResolveSDK", sdk.ToString())); _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain("MockSdkResolver1 running"); _logger.BuildMessageEvents.Select(i => i.Message).ShouldNotContain("MockSdkResolverWithResolvableSdkPattern1 running"); ChangeWaves.ResetStateForTests(); @@ -180,6 +184,7 @@ public void AssertFirstResolverWithPatternCanResolve() var result = SdkResolverService.Instance.ResolveSdk(BuildEventContext.InvalidSubmissionId, sdk, _loggingContext, new MockElementLocation("file"), "sln", "projectPath", interactive: false, isRunningInVisualStudio: false, failOnUnresolvedSdk: true); result.Path.ShouldBe("resolverpathwithresolvablesdkpattern1"); + _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SuccededToResolveSDK", sdk.ToString())); _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain("MockSdkResolverWithResolvableSdkPattern1 running"); _logger.BuildMessageEvents.Select(i => i.Message).ShouldNotContain("MockSdkResolver1 running"); } @@ -196,6 +201,7 @@ public void AssertFirstResolverErrorsSupressedWhenResolved() var result = SdkResolverService.Instance.ResolveSdk(BuildEventContext.InvalidSubmissionId, sdk, _loggingContext, new MockElementLocation("file"), "sln", "projectPath", interactive: false, isRunningInVisualStudio: false, failOnUnresolvedSdk: true); result.Path.ShouldBe("resolverpath2"); + _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SuccededToResolveSDK", sdk.ToString())); // Both resolvers should run, and no ERROR string. _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain("MockSdkResolver1 running"); @@ -366,6 +372,7 @@ public void SdkResolverCanReturnNoPaths(bool includePropertiesAndItems) ValidateExpectedPropertiesAndItems(includePropertiesAndItems, result); + _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SuccededToResolveSDK", sdk.ToString())); _logger.WarningCount.ShouldBe(0); } @@ -402,6 +409,7 @@ public void SdkResultCanReturnPropertiesAndItems() ValidateExpectedPropertiesAndItems(true, result); + _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SuccededToResolveSDK", sdk.ToString())); _logger.WarningCount.ShouldBe(0); } @@ -454,6 +462,7 @@ public void SdkResultCanReturnMultiplePaths(bool includePropertiesAndItems) ValidateExpectedPropertiesAndItems(includePropertiesAndItems, result); + _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SuccededToResolveSDK", sdk.ToString())); _logger.WarningCount.ShouldBe(0); } @@ -499,6 +508,7 @@ public void AssertResolutionWarnsIfResolvedVersionIsDifferentFromReferencedVersi ValidateExpectedPropertiesAndItems(true, result); + _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SuccededToResolveSDK", sdk.ToString())); _logger.WarningCount.ShouldBe(1); _logger.Warnings.First().Code.ShouldStartWith("MSB4241"); } diff --git a/src/Build/BackEnd/Components/SdkResolution/SdkResolverService.cs b/src/Build/BackEnd/Components/SdkResolution/SdkResolverService.cs index a9e03193f11..0b61eff04f4 100644 --- a/src/Build/BackEnd/Components/SdkResolution/SdkResolverService.cs +++ b/src/Build/BackEnd/Components/SdkResolution/SdkResolverService.cs @@ -355,6 +355,8 @@ private bool TryResolveSdkUsingSpecifiedResolvers( if (result.Success) { + loggingContext.LogComment(MessageImportance.Low, "SuccededToResolveSDK", sdk.ToString()); + LogWarnings(loggingContext, sdkReferenceLocation, result.Warnings); if (!IsReferenceSameVersion(sdk, result.Version)) diff --git a/src/Build/Resources/Strings.resx b/src/Build/Resources/Strings.resx index 632884ce86c..cea0f831182 100644 --- a/src/Build/Resources/Strings.resx +++ b/src/Build/Resources/Strings.resx @@ -1324,6 +1324,9 @@ Could not resolve SDK "{0}". Exactly one of the probing messages below indicates why we could not resolve the SDK. Investigate and resolve that message to correctly specify the SDK. {1} + + SDK "{0}" successfully resolved. + The NuGet-based SDK resolver failed to run because NuGet assemblies could not be located. Check your installation of MSBuild or set the environment variable "{0}" to the folder that contains the required NuGet assemblies. {1} diff --git a/src/Build/Resources/xlf/Strings.cs.xlf b/src/Build/Resources/xlf/Strings.cs.xlf index bce0cd169f9..6b8e731127d 100644 --- a/src/Build/Resources/xlf/Strings.cs.xlf +++ b/src/Build/Resources/xlf/Strings.cs.xlf @@ -451,6 +451,11 @@ LOCALIZATION: {0} is a file, {1} and {2} are semicolon delimited lists of messages + + SDK "{0}" successfully resolved. + SDK "{0}" successfully resolved. + + Task "{0}" requested {1} cores, acquired {2} cores, and now holds {3} cores total. Úloha {0} požadovala tento počet jader: {1}. Získala tento počet jader: {2}. Teď používá celkem tento počet jader: {3} diff --git a/src/Build/Resources/xlf/Strings.de.xlf b/src/Build/Resources/xlf/Strings.de.xlf index be95e6e8f12..bfc208782d4 100644 --- a/src/Build/Resources/xlf/Strings.de.xlf +++ b/src/Build/Resources/xlf/Strings.de.xlf @@ -451,6 +451,11 @@ LOCALIZATION: {0} is a file, {1} and {2} are semicolon delimited lists of messages + + SDK "{0}" successfully resolved. + SDK "{0}" successfully resolved. + + Task "{0}" requested {1} cores, acquired {2} cores, and now holds {3} cores total. Die Aufgabe "{0}" hat {1} Kerne angefordert und {2} Kerne erhalten und belegt jetzt insgesamt {3} Kerne. diff --git a/src/Build/Resources/xlf/Strings.es.xlf b/src/Build/Resources/xlf/Strings.es.xlf index e3ab82956ad..1e2aa3990f2 100644 --- a/src/Build/Resources/xlf/Strings.es.xlf +++ b/src/Build/Resources/xlf/Strings.es.xlf @@ -451,6 +451,11 @@ LOCALIZATION: {0} is a file, {1} and {2} are semicolon delimited lists of messages + + SDK "{0}" successfully resolved. + SDK "{0}" successfully resolved. + + Task "{0}" requested {1} cores, acquired {2} cores, and now holds {3} cores total. La tarea "{0}" solicitó {1} núcleos, adquirió {2} núcleos y ahora retiene un total de {3} núcleos. diff --git a/src/Build/Resources/xlf/Strings.fr.xlf b/src/Build/Resources/xlf/Strings.fr.xlf index 8fdb220057b..5ad132a95a6 100644 --- a/src/Build/Resources/xlf/Strings.fr.xlf +++ b/src/Build/Resources/xlf/Strings.fr.xlf @@ -451,6 +451,11 @@ LOCALIZATION: {0} is a file, {1} and {2} are semicolon delimited lists of messages + + SDK "{0}" successfully resolved. + SDK "{0}" successfully resolved. + + Task "{0}" requested {1} cores, acquired {2} cores, and now holds {3} cores total. La tâche "{0}" a demandé {1} cœurs et a obtenu {2} cœurs. Elle détient désormais {3} cœurs au total. diff --git a/src/Build/Resources/xlf/Strings.it.xlf b/src/Build/Resources/xlf/Strings.it.xlf index 12f8460c1e0..4034bc8bfe1 100644 --- a/src/Build/Resources/xlf/Strings.it.xlf +++ b/src/Build/Resources/xlf/Strings.it.xlf @@ -451,6 +451,11 @@ LOCALIZATION: {0} is a file, {1} and {2} are semicolon delimited lists of messages + + SDK "{0}" successfully resolved. + SDK "{0}" successfully resolved. + + Task "{0}" requested {1} cores, acquired {2} cores, and now holds {3} cores total. L'attività "{0}" ha richiesto {1} core, ha acquisito {2} core e ora contiene {3} core in totale. diff --git a/src/Build/Resources/xlf/Strings.ja.xlf b/src/Build/Resources/xlf/Strings.ja.xlf index f21702818b4..566f2fda55d 100644 --- a/src/Build/Resources/xlf/Strings.ja.xlf +++ b/src/Build/Resources/xlf/Strings.ja.xlf @@ -451,6 +451,11 @@ LOCALIZATION: {0} is a file, {1} and {2} are semicolon delimited lists of messages + + SDK "{0}" successfully resolved. + SDK "{0}" successfully resolved. + + Task "{0}" requested {1} cores, acquired {2} cores, and now holds {3} cores total. タスク "{0}" では、{1} 個のコアを要求し、{2} 個のコアを取得したため、現在合計 {3} 個のコアを保持しています。 diff --git a/src/Build/Resources/xlf/Strings.ko.xlf b/src/Build/Resources/xlf/Strings.ko.xlf index 432ff34b4eb..63eb232629c 100644 --- a/src/Build/Resources/xlf/Strings.ko.xlf +++ b/src/Build/Resources/xlf/Strings.ko.xlf @@ -451,6 +451,11 @@ LOCALIZATION: {0} is a file, {1} and {2} are semicolon delimited lists of messages + + SDK "{0}" successfully resolved. + SDK "{0}" successfully resolved. + + Task "{0}" requested {1} cores, acquired {2} cores, and now holds {3} cores total. "{0}" 작업에서 코어 {1}개를 요청했고 코어 {2}개를 획득했으며 지금 총 {3}개의 코어를 보유하고 있습니다. diff --git a/src/Build/Resources/xlf/Strings.pl.xlf b/src/Build/Resources/xlf/Strings.pl.xlf index 3842b13b712..a6833fc6176 100644 --- a/src/Build/Resources/xlf/Strings.pl.xlf +++ b/src/Build/Resources/xlf/Strings.pl.xlf @@ -451,6 +451,11 @@ LOCALIZATION: {0} is a file, {1} and {2} are semicolon delimited lists of messages + + SDK "{0}" successfully resolved. + SDK "{0}" successfully resolved. + + Task "{0}" requested {1} cores, acquired {2} cores, and now holds {3} cores total. Zadanie „{0}” żądało {1} rdzeni, uzyskało {2} i teraz jego łączna liczba rdzeni to {3}. diff --git a/src/Build/Resources/xlf/Strings.pt-BR.xlf b/src/Build/Resources/xlf/Strings.pt-BR.xlf index bee8a55e88d..6a488f3f418 100644 --- a/src/Build/Resources/xlf/Strings.pt-BR.xlf +++ b/src/Build/Resources/xlf/Strings.pt-BR.xlf @@ -451,6 +451,11 @@ LOCALIZATION: {0} is a file, {1} and {2} are semicolon delimited lists of messages + + SDK "{0}" successfully resolved. + SDK "{0}" successfully resolved. + + Task "{0}" requested {1} cores, acquired {2} cores, and now holds {3} cores total. A tarefa "{0}" solicitou {1} núcleos, adquiriu {2} núcleos e agora contém {3} núcleos no total. diff --git a/src/Build/Resources/xlf/Strings.ru.xlf b/src/Build/Resources/xlf/Strings.ru.xlf index 40ebdbfe1e6..78114c910b7 100644 --- a/src/Build/Resources/xlf/Strings.ru.xlf +++ b/src/Build/Resources/xlf/Strings.ru.xlf @@ -451,6 +451,11 @@ LOCALIZATION: {0} is a file, {1} and {2} are semicolon delimited lists of messages + + SDK "{0}" successfully resolved. + SDK "{0}" successfully resolved. + + Task "{0}" requested {1} cores, acquired {2} cores, and now holds {3} cores total. Задача "{0}" запросила указанное число ядер ({1}) и получила указанное число ядер ({2}). Теперь общее число ядер, которыми располагает задача, равно {3}. diff --git a/src/Build/Resources/xlf/Strings.tr.xlf b/src/Build/Resources/xlf/Strings.tr.xlf index 8eaeeb2fa66..d22708ed8cb 100644 --- a/src/Build/Resources/xlf/Strings.tr.xlf +++ b/src/Build/Resources/xlf/Strings.tr.xlf @@ -451,6 +451,11 @@ LOCALIZATION: {0} is a file, {1} and {2} are semicolon delimited lists of messages + + SDK "{0}" successfully resolved. + SDK "{0}" successfully resolved. + + Task "{0}" requested {1} cores, acquired {2} cores, and now holds {3} cores total. "{0}" görevi {1} çekirdek istedi, {2} çekirdek aldı ve şu anda toplam {3} çekirdek tutuyor. diff --git a/src/Build/Resources/xlf/Strings.zh-Hans.xlf b/src/Build/Resources/xlf/Strings.zh-Hans.xlf index 29acca521f2..882b685f4d0 100644 --- a/src/Build/Resources/xlf/Strings.zh-Hans.xlf +++ b/src/Build/Resources/xlf/Strings.zh-Hans.xlf @@ -451,6 +451,11 @@ LOCALIZATION: {0} is a file, {1} and {2} are semicolon delimited lists of messages + + SDK "{0}" successfully resolved. + SDK "{0}" successfully resolved. + + Task "{0}" requested {1} cores, acquired {2} cores, and now holds {3} cores total. 任务“{0}”请求了 {1} 个核心，已获取 {2} 个核心，现总共包含 {3} 个核心。 diff --git a/src/Build/Resources/xlf/Strings.zh-Hant.xlf b/src/Build/Resources/xlf/Strings.zh-Hant.xlf index d7e86b932b4..42ff379309b 100644 --- a/src/Build/Resources/xlf/Strings.zh-Hant.xlf +++ b/src/Build/Resources/xlf/Strings.zh-Hant.xlf @@ -451,6 +451,11 @@ LOCALIZATION: {0} is a file, {1} and {2} are semicolon delimited lists of messages + + SDK "{0}" successfully resolved. + SDK "{0}" successfully resolved. + + Task "{0}" requested {1} cores, acquired {2} cores, and now holds {3} cores total. 工作 "{0}" 已要求 {1} 個核心、已取得 {2} 個核心，現在共保留 {3} 個核心。 From b8fab1d9fb94bbf39e87848fa48a86d4cddf38b8 Mon Sep 17 00:00:00 2001 From: Surayya Huseyn Zada Date: Wed, 10 Jan 2024 13:30:11 +0100 Subject: [PATCH 02/10] fix typo --- .../BackEnd/SdkResolverService_Tests.cs | 20 +++++++++---------- .../SdkResolution/SdkResolverService.cs | 2 +- src/Build/Resources/Strings.resx | 2 +- src/Build/Resources/xlf/Strings.cs.xlf | 2 +- src/Build/Resources/xlf/Strings.de.xlf | 2 +- src/Build/Resources/xlf/Strings.es.xlf | 2 +- src/Build/Resources/xlf/Strings.fr.xlf | 2 +- src/Build/Resources/xlf/Strings.it.xlf | 2 +- src/Build/Resources/xlf/Strings.ja.xlf | 2 +- src/Build/Resources/xlf/Strings.ko.xlf | 2 +- src/Build/Resources/xlf/Strings.pl.xlf | 2 +- src/Build/Resources/xlf/Strings.pt-BR.xlf | 2 +- src/Build/Resources/xlf/Strings.ru.xlf | 2 +- src/Build/Resources/xlf/Strings.tr.xlf | 2 +- src/Build/Resources/xlf/Strings.zh-Hans.xlf | 2 +- src/Build/Resources/xlf/Strings.zh-Hant.xlf | 2 +- 16 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs b/src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs index 65b7ddf7db5..65e21871880 100644 --- a/src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs +++ b/src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs @@ -94,7 +94,7 @@ public void AssertResolutionWarnsIfResolvedVersionIsDifferentFromReferencedVersi result.Path.ShouldBe("path"); - _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SuccededToResolveSDK", sdk.ToString())); + _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SucceededToResolveSDK", sdk.ToString())); _logger.WarningCount.ShouldBe(1); _logger.Warnings.First().Code.ShouldStartWith("MSB4241"); @@ -125,7 +125,7 @@ public void AssertSecondResolverWithPatternCanResolve() var result = SdkResolverService.Instance.ResolveSdk(BuildEventContext.InvalidSubmissionId, sdk, _loggingContext, new MockElementLocation("file"), "sln", "projectPath", interactive: false, isRunningInVisualStudio: false, failOnUnresolvedSdk: true); result.Path.ShouldBe("resolverpathwithresolvablesdkpattern2"); - _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SuccededToResolveSDK", sdk.ToString())); + _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SucceededToResolveSDK", sdk.ToString())); _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain("MockSdkResolverWithResolvableSdkPattern2 running"); _logger.BuildMessageEvents.Select(i => i.Message).ShouldNotContain("MockSdkResolver1 running"); _logger.BuildMessageEvents.Select(i => i.Message).ShouldNotContain("MockSdkResolver2 running"); @@ -143,7 +143,7 @@ public void AssertFirstResolverCanResolve() var result = SdkResolverService.Instance.ResolveSdk(BuildEventContext.InvalidSubmissionId, sdk, _loggingContext, new MockElementLocation("file"), "sln", "projectPath", interactive: false, isRunningInVisualStudio: false, failOnUnresolvedSdk: true); result.Path.ShouldBe("resolverpath1"); - _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SuccededToResolveSDK", sdk.ToString())); + _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SucceededToResolveSDK", sdk.ToString())); _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain("MockSdkResolver1 running"); _logger.BuildMessageEvents.Select(i => i.Message).ShouldNotContain("MockSdkResolverWithResolvableSdkPattern1 running"); } @@ -165,7 +165,7 @@ public void AssertFirstResolverWithPatternCantResolveChangeWave17_4() var result = SdkResolverService.Instance.ResolveSdk(BuildEventContext.InvalidSubmissionId, sdk, _loggingContext, new MockElementLocation("file"), "sln", "projectPath", interactive: false, isRunningInVisualStudio: false, failOnUnresolvedSdk: true); result.Path.ShouldBe("resolverpath1"); - _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SuccededToResolveSDK", sdk.ToString())); + _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SucceededToResolveSDK", sdk.ToString())); _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain("MockSdkResolver1 running"); _logger.BuildMessageEvents.Select(i => i.Message).ShouldNotContain("MockSdkResolverWithResolvableSdkPattern1 running"); ChangeWaves.ResetStateForTests(); @@ -184,7 +184,7 @@ public void AssertFirstResolverWithPatternCanResolve() var result = SdkResolverService.Instance.ResolveSdk(BuildEventContext.InvalidSubmissionId, sdk, _loggingContext, new MockElementLocation("file"), "sln", "projectPath", interactive: false, isRunningInVisualStudio: false, failOnUnresolvedSdk: true); result.Path.ShouldBe("resolverpathwithresolvablesdkpattern1"); - _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SuccededToResolveSDK", sdk.ToString())); + _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SucceededToResolveSDK", sdk.ToString())); _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain("MockSdkResolverWithResolvableSdkPattern1 running"); _logger.BuildMessageEvents.Select(i => i.Message).ShouldNotContain("MockSdkResolver1 running"); } @@ -201,7 +201,7 @@ public void AssertFirstResolverErrorsSupressedWhenResolved() var result = SdkResolverService.Instance.ResolveSdk(BuildEventContext.InvalidSubmissionId, sdk, _loggingContext, new MockElementLocation("file"), "sln", "projectPath", interactive: false, isRunningInVisualStudio: false, failOnUnresolvedSdk: true); result.Path.ShouldBe("resolverpath2"); - _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SuccededToResolveSDK", sdk.ToString())); + _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SucceededToResolveSDK", sdk.ToString())); // Both resolvers should run, and no ERROR string. _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain("MockSdkResolver1 running"); @@ -372,7 +372,7 @@ public void SdkResolverCanReturnNoPaths(bool includePropertiesAndItems) ValidateExpectedPropertiesAndItems(includePropertiesAndItems, result); - _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SuccededToResolveSDK", sdk.ToString())); + _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SucceededToResolveSDK", sdk.ToString())); _logger.WarningCount.ShouldBe(0); } @@ -409,7 +409,7 @@ public void SdkResultCanReturnPropertiesAndItems() ValidateExpectedPropertiesAndItems(true, result); - _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SuccededToResolveSDK", sdk.ToString())); + _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SucceededToResolveSDK", sdk.ToString())); _logger.WarningCount.ShouldBe(0); } @@ -462,7 +462,7 @@ public void SdkResultCanReturnMultiplePaths(bool includePropertiesAndItems) ValidateExpectedPropertiesAndItems(includePropertiesAndItems, result); - _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SuccededToResolveSDK", sdk.ToString())); + _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SucceededToResolveSDK", sdk.ToString())); _logger.WarningCount.ShouldBe(0); } @@ -508,7 +508,7 @@ public void AssertResolutionWarnsIfResolvedVersionIsDifferentFromReferencedVersi ValidateExpectedPropertiesAndItems(true, result); - _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SuccededToResolveSDK", sdk.ToString())); + _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SucceededToResolveSDK", sdk.ToString())); _logger.WarningCount.ShouldBe(1); _logger.Warnings.First().Code.ShouldStartWith("MSB4241"); } diff --git a/src/Build/BackEnd/Components/SdkResolution/SdkResolverService.cs b/src/Build/BackEnd/Components/SdkResolution/SdkResolverService.cs index 0b61eff04f4..9d847022d74 100644 --- a/src/Build/BackEnd/Components/SdkResolution/SdkResolverService.cs +++ b/src/Build/BackEnd/Components/SdkResolution/SdkResolverService.cs @@ -355,7 +355,7 @@ private bool TryResolveSdkUsingSpecifiedResolvers( if (result.Success) { - loggingContext.LogComment(MessageImportance.Low, "SuccededToResolveSDK", sdk.ToString()); + loggingContext.LogComment(MessageImportance.Low, "SucceededToResolveSDK", sdk.ToString()); LogWarnings(loggingContext, sdkReferenceLocation, result.Warnings); diff --git a/src/Build/Resources/Strings.resx b/src/Build/Resources/Strings.resx index cea0f831182..fe1bdce18e3 100644 --- a/src/Build/Resources/Strings.resx +++ b/src/Build/Resources/Strings.resx @@ -1324,7 +1324,7 @@ Could not resolve SDK "{0}". Exactly one of the probing messages below indicates why we could not resolve the SDK. Investigate and resolve that message to correctly specify the SDK. {1} - + SDK "{0}" successfully resolved. diff --git a/src/Build/Resources/xlf/Strings.cs.xlf b/src/Build/Resources/xlf/Strings.cs.xlf index 6b8e731127d..b565268b2f6 100644 --- a/src/Build/Resources/xlf/Strings.cs.xlf +++ b/src/Build/Resources/xlf/Strings.cs.xlf @@ -451,7 +451,7 @@ LOCALIZATION: {0} is a file, {1} and {2} are semicolon delimited lists of messages - + SDK "{0}" successfully resolved. SDK "{0}" successfully resolved. diff --git a/src/Build/Resources/xlf/Strings.de.xlf b/src/Build/Resources/xlf/Strings.de.xlf index bfc208782d4..ef3da8e53fe 100644 --- a/src/Build/Resources/xlf/Strings.de.xlf +++ b/src/Build/Resources/xlf/Strings.de.xlf @@ -451,7 +451,7 @@ LOCALIZATION: {0} is a file, {1} and {2} are semicolon delimited lists of messages - + SDK "{0}" successfully resolved. SDK "{0}" successfully resolved. diff --git a/src/Build/Resources/xlf/Strings.es.xlf b/src/Build/Resources/xlf/Strings.es.xlf index 1e2aa3990f2..73cf5de3092 100644 --- a/src/Build/Resources/xlf/Strings.es.xlf +++ b/src/Build/Resources/xlf/Strings.es.xlf @@ -451,7 +451,7 @@ LOCALIZATION: {0} is a file, {1} and {2} are semicolon delimited lists of messages - + SDK "{0}" successfully resolved. SDK "{0}" successfully resolved. diff --git a/src/Build/Resources/xlf/Strings.fr.xlf b/src/Build/Resources/xlf/Strings.fr.xlf index 5ad132a95a6..e7eb053a796 100644 --- a/src/Build/Resources/xlf/Strings.fr.xlf +++ b/src/Build/Resources/xlf/Strings.fr.xlf @@ -451,7 +451,7 @@ LOCALIZATION: {0} is a file, {1} and {2} are semicolon delimited lists of messages - + SDK "{0}" successfully resolved. SDK "{0}" successfully resolved. diff --git a/src/Build/Resources/xlf/Strings.it.xlf b/src/Build/Resources/xlf/Strings.it.xlf index 4034bc8bfe1..83f1d4dab5d 100644 --- a/src/Build/Resources/xlf/Strings.it.xlf +++ b/src/Build/Resources/xlf/Strings.it.xlf @@ -451,7 +451,7 @@ LOCALIZATION: {0} is a file, {1} and {2} are semicolon delimited lists of messages - + SDK "{0}" successfully resolved. SDK "{0}" successfully resolved. diff --git a/src/Build/Resources/xlf/Strings.ja.xlf b/src/Build/Resources/xlf/Strings.ja.xlf index 566f2fda55d..8ead006fd8f 100644 --- a/src/Build/Resources/xlf/Strings.ja.xlf +++ b/src/Build/Resources/xlf/Strings.ja.xlf @@ -451,7 +451,7 @@ LOCALIZATION: {0} is a file, {1} and {2} are semicolon delimited lists of messages - + SDK "{0}" successfully resolved. SDK "{0}" successfully resolved. diff --git a/src/Build/Resources/xlf/Strings.ko.xlf b/src/Build/Resources/xlf/Strings.ko.xlf index 63eb232629c..e02f39b5c48 100644 --- a/src/Build/Resources/xlf/Strings.ko.xlf +++ b/src/Build/Resources/xlf/Strings.ko.xlf @@ -451,7 +451,7 @@ LOCALIZATION: {0} is a file, {1} and {2} are semicolon delimited lists of messages - + SDK "{0}" successfully resolved. SDK "{0}" successfully resolved. diff --git a/src/Build/Resources/xlf/Strings.pl.xlf b/src/Build/Resources/xlf/Strings.pl.xlf index a6833fc6176..dd1b162b97b 100644 --- a/src/Build/Resources/xlf/Strings.pl.xlf +++ b/src/Build/Resources/xlf/Strings.pl.xlf @@ -451,7 +451,7 @@ LOCALIZATION: {0} is a file, {1} and {2} are semicolon delimited lists of messages - + SDK "{0}" successfully resolved. SDK "{0}" successfully resolved. diff --git a/src/Build/Resources/xlf/Strings.pt-BR.xlf b/src/Build/Resources/xlf/Strings.pt-BR.xlf index 6a488f3f418..e87e2f2185a 100644 --- a/src/Build/Resources/xlf/Strings.pt-BR.xlf +++ b/src/Build/Resources/xlf/Strings.pt-BR.xlf @@ -451,7 +451,7 @@ LOCALIZATION: {0} is a file, {1} and {2} are semicolon delimited lists of messages - + SDK "{0}" successfully resolved. SDK "{0}" successfully resolved. diff --git a/src/Build/Resources/xlf/Strings.ru.xlf b/src/Build/Resources/xlf/Strings.ru.xlf index 78114c910b7..9af788bc454 100644 --- a/src/Build/Resources/xlf/Strings.ru.xlf +++ b/src/Build/Resources/xlf/Strings.ru.xlf @@ -451,7 +451,7 @@ LOCALIZATION: {0} is a file, {1} and {2} are semicolon delimited lists of messages - + SDK "{0}" successfully resolved. SDK "{0}" successfully resolved. diff --git a/src/Build/Resources/xlf/Strings.tr.xlf b/src/Build/Resources/xlf/Strings.tr.xlf index d22708ed8cb..fc27ddc2af5 100644 --- a/src/Build/Resources/xlf/Strings.tr.xlf +++ b/src/Build/Resources/xlf/Strings.tr.xlf @@ -451,7 +451,7 @@ LOCALIZATION: {0} is a file, {1} and {2} are semicolon delimited lists of messages - + SDK "{0}" successfully resolved. SDK "{0}" successfully resolved. diff --git a/src/Build/Resources/xlf/Strings.zh-Hans.xlf b/src/Build/Resources/xlf/Strings.zh-Hans.xlf index 882b685f4d0..9e086bd1aa8 100644 --- a/src/Build/Resources/xlf/Strings.zh-Hans.xlf +++ b/src/Build/Resources/xlf/Strings.zh-Hans.xlf @@ -451,7 +451,7 @@ LOCALIZATION: {0} is a file, {1} and {2} are semicolon delimited lists of messages - + SDK "{0}" successfully resolved. SDK "{0}" successfully resolved. diff --git a/src/Build/Resources/xlf/Strings.zh-Hant.xlf b/src/Build/Resources/xlf/Strings.zh-Hant.xlf index 42ff379309b..a74c5134842 100644 --- a/src/Build/Resources/xlf/Strings.zh-Hant.xlf +++ b/src/Build/Resources/xlf/Strings.zh-Hant.xlf @@ -451,7 +451,7 @@ LOCALIZATION: {0} is a file, {1} and {2} are semicolon delimited lists of messages - + SDK "{0}" successfully resolved. SDK "{0}" successfully resolved. From efbec2a32b64020fc71e41eded6f170488ec7449 Mon Sep 17 00:00:00 2001 From: Surayya Huseyn Zada Date: Wed, 10 Jan 2024 13:33:31 +0100 Subject: [PATCH 03/10] change message text --- 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.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 ++-- 14 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/Build/Resources/Strings.resx b/src/Build/Resources/Strings.resx index fe1bdce18e3..7d22d822031 100644 --- a/src/Build/Resources/Strings.resx +++ b/src/Build/Resources/Strings.resx @@ -1325,7 +1325,7 @@ {1} - SDK "{0}" successfully resolved. + SDK "{0}" was successfully resolved. The NuGet-based SDK resolver failed to run because NuGet assemblies could not be located. Check your installation of MSBuild or set the environment variable "{0}" to the folder that contains the required NuGet assemblies. {1} diff --git a/src/Build/Resources/xlf/Strings.cs.xlf b/src/Build/Resources/xlf/Strings.cs.xlf index b565268b2f6..ea073c23257 100644 --- a/src/Build/Resources/xlf/Strings.cs.xlf +++ b/src/Build/Resources/xlf/Strings.cs.xlf @@ -452,8 +452,8 @@ - SDK "{0}" successfully resolved. - SDK "{0}" successfully resolved. + SDK "{0}" was successfully resolved. + SDK "{0}" was successfully resolved. diff --git a/src/Build/Resources/xlf/Strings.de.xlf b/src/Build/Resources/xlf/Strings.de.xlf index ef3da8e53fe..8a7bb88da55 100644 --- a/src/Build/Resources/xlf/Strings.de.xlf +++ b/src/Build/Resources/xlf/Strings.de.xlf @@ -452,8 +452,8 @@ - SDK "{0}" successfully resolved. - SDK "{0}" successfully resolved. + SDK "{0}" was successfully resolved. + SDK "{0}" was successfully resolved. diff --git a/src/Build/Resources/xlf/Strings.es.xlf b/src/Build/Resources/xlf/Strings.es.xlf index 73cf5de3092..879129b3b25 100644 --- a/src/Build/Resources/xlf/Strings.es.xlf +++ b/src/Build/Resources/xlf/Strings.es.xlf @@ -452,8 +452,8 @@ - SDK "{0}" successfully resolved. - SDK "{0}" successfully resolved. + SDK "{0}" was successfully resolved. + SDK "{0}" was successfully resolved. diff --git a/src/Build/Resources/xlf/Strings.fr.xlf b/src/Build/Resources/xlf/Strings.fr.xlf index e7eb053a796..329b69bd259 100644 --- a/src/Build/Resources/xlf/Strings.fr.xlf +++ b/src/Build/Resources/xlf/Strings.fr.xlf @@ -452,8 +452,8 @@ - SDK "{0}" successfully resolved. - SDK "{0}" successfully resolved. + SDK "{0}" was successfully resolved. + SDK "{0}" was successfully resolved. diff --git a/src/Build/Resources/xlf/Strings.it.xlf b/src/Build/Resources/xlf/Strings.it.xlf index 83f1d4dab5d..cbb9c3c7b99 100644 --- a/src/Build/Resources/xlf/Strings.it.xlf +++ b/src/Build/Resources/xlf/Strings.it.xlf @@ -452,8 +452,8 @@ - SDK "{0}" successfully resolved. - SDK "{0}" successfully resolved. + SDK "{0}" was successfully resolved. + SDK "{0}" was successfully resolved. diff --git a/src/Build/Resources/xlf/Strings.ja.xlf b/src/Build/Resources/xlf/Strings.ja.xlf index 8ead006fd8f..66d3c26bd75 100644 --- a/src/Build/Resources/xlf/Strings.ja.xlf +++ b/src/Build/Resources/xlf/Strings.ja.xlf @@ -452,8 +452,8 @@ - SDK "{0}" successfully resolved. - SDK "{0}" successfully resolved. + SDK "{0}" was successfully resolved. + SDK "{0}" was successfully resolved. diff --git a/src/Build/Resources/xlf/Strings.ko.xlf b/src/Build/Resources/xlf/Strings.ko.xlf index e02f39b5c48..645c89f2a53 100644 --- a/src/Build/Resources/xlf/Strings.ko.xlf +++ b/src/Build/Resources/xlf/Strings.ko.xlf @@ -452,8 +452,8 @@ - SDK "{0}" successfully resolved. - SDK "{0}" successfully resolved. + SDK "{0}" was successfully resolved. + SDK "{0}" was successfully resolved. diff --git a/src/Build/Resources/xlf/Strings.pl.xlf b/src/Build/Resources/xlf/Strings.pl.xlf index dd1b162b97b..7feeb078466 100644 --- a/src/Build/Resources/xlf/Strings.pl.xlf +++ b/src/Build/Resources/xlf/Strings.pl.xlf @@ -452,8 +452,8 @@ - SDK "{0}" successfully resolved. - SDK "{0}" successfully resolved. + SDK "{0}" was successfully resolved. + SDK "{0}" was successfully resolved. diff --git a/src/Build/Resources/xlf/Strings.pt-BR.xlf b/src/Build/Resources/xlf/Strings.pt-BR.xlf index e87e2f2185a..ab1d914623c 100644 --- a/src/Build/Resources/xlf/Strings.pt-BR.xlf +++ b/src/Build/Resources/xlf/Strings.pt-BR.xlf @@ -452,8 +452,8 @@ - SDK "{0}" successfully resolved. - SDK "{0}" successfully resolved. + SDK "{0}" was successfully resolved. + SDK "{0}" was successfully resolved. diff --git a/src/Build/Resources/xlf/Strings.ru.xlf b/src/Build/Resources/xlf/Strings.ru.xlf index 9af788bc454..47a94889c24 100644 --- a/src/Build/Resources/xlf/Strings.ru.xlf +++ b/src/Build/Resources/xlf/Strings.ru.xlf @@ -452,8 +452,8 @@ - SDK "{0}" successfully resolved. - SDK "{0}" successfully resolved. + SDK "{0}" was successfully resolved. + SDK "{0}" was successfully resolved. diff --git a/src/Build/Resources/xlf/Strings.tr.xlf b/src/Build/Resources/xlf/Strings.tr.xlf index fc27ddc2af5..8dd29909d10 100644 --- a/src/Build/Resources/xlf/Strings.tr.xlf +++ b/src/Build/Resources/xlf/Strings.tr.xlf @@ -452,8 +452,8 @@ - SDK "{0}" successfully resolved. - SDK "{0}" successfully resolved. + SDK "{0}" was successfully resolved. + SDK "{0}" was successfully resolved. diff --git a/src/Build/Resources/xlf/Strings.zh-Hans.xlf b/src/Build/Resources/xlf/Strings.zh-Hans.xlf index 9e086bd1aa8..ba79af4b84e 100644 --- a/src/Build/Resources/xlf/Strings.zh-Hans.xlf +++ b/src/Build/Resources/xlf/Strings.zh-Hans.xlf @@ -452,8 +452,8 @@ - SDK "{0}" successfully resolved. - SDK "{0}" successfully resolved. + SDK "{0}" was successfully resolved. + SDK "{0}" was successfully resolved. diff --git a/src/Build/Resources/xlf/Strings.zh-Hant.xlf b/src/Build/Resources/xlf/Strings.zh-Hant.xlf index a74c5134842..71a1e1fdaf6 100644 --- a/src/Build/Resources/xlf/Strings.zh-Hant.xlf +++ b/src/Build/Resources/xlf/Strings.zh-Hant.xlf @@ -452,8 +452,8 @@ - SDK "{0}" successfully resolved. - SDK "{0}" successfully resolved. + SDK "{0}" was successfully resolved. + SDK "{0}" was successfully resolved. From 7dd051143f92d0a1ac9c8837bdc9fa3f96ec2c3d Mon Sep 17 00:00:00 2001 From: Surayya Huseyn Zada Date: Wed, 10 Jan 2024 15:28:12 +0100 Subject: [PATCH 04/10] include sdk result and sdk resolver info in the message --- .../BackEnd/SdkResolverService_Tests.cs | 20 +++++++++---------- .../SdkResolution/SdkResolverService.cs | 2 +- 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.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, 38 insertions(+), 38 deletions(-) diff --git a/src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs b/src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs index 65e21871880..82ecac0f8cb 100644 --- a/src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs +++ b/src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs @@ -94,7 +94,7 @@ public void AssertResolutionWarnsIfResolvedVersionIsDifferentFromReferencedVersi result.Path.ShouldBe("path"); - _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SucceededToResolveSDK", sdk.ToString())); + _logger.BuildMessageEvents.Any(i => i.Message.StartsWith($"The SDK \"{sdk}\" was successfully resolved")).ShouldBeTrue(); _logger.WarningCount.ShouldBe(1); _logger.Warnings.First().Code.ShouldStartWith("MSB4241"); @@ -125,7 +125,7 @@ public void AssertSecondResolverWithPatternCanResolve() var result = SdkResolverService.Instance.ResolveSdk(BuildEventContext.InvalidSubmissionId, sdk, _loggingContext, new MockElementLocation("file"), "sln", "projectPath", interactive: false, isRunningInVisualStudio: false, failOnUnresolvedSdk: true); result.Path.ShouldBe("resolverpathwithresolvablesdkpattern2"); - _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SucceededToResolveSDK", sdk.ToString())); + _logger.BuildMessageEvents.Any(i => i.Message.StartsWith($"The SDK \"{sdk}\" was successfully resolved")).ShouldBeTrue(); _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain("MockSdkResolverWithResolvableSdkPattern2 running"); _logger.BuildMessageEvents.Select(i => i.Message).ShouldNotContain("MockSdkResolver1 running"); _logger.BuildMessageEvents.Select(i => i.Message).ShouldNotContain("MockSdkResolver2 running"); @@ -143,7 +143,7 @@ public void AssertFirstResolverCanResolve() var result = SdkResolverService.Instance.ResolveSdk(BuildEventContext.InvalidSubmissionId, sdk, _loggingContext, new MockElementLocation("file"), "sln", "projectPath", interactive: false, isRunningInVisualStudio: false, failOnUnresolvedSdk: true); result.Path.ShouldBe("resolverpath1"); - _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SucceededToResolveSDK", sdk.ToString())); + _logger.BuildMessageEvents.Any(i => i.Message.StartsWith($"The SDK \"{sdk}\" was successfully resolved")).ShouldBeTrue(); _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain("MockSdkResolver1 running"); _logger.BuildMessageEvents.Select(i => i.Message).ShouldNotContain("MockSdkResolverWithResolvableSdkPattern1 running"); } @@ -165,7 +165,7 @@ public void AssertFirstResolverWithPatternCantResolveChangeWave17_4() var result = SdkResolverService.Instance.ResolveSdk(BuildEventContext.InvalidSubmissionId, sdk, _loggingContext, new MockElementLocation("file"), "sln", "projectPath", interactive: false, isRunningInVisualStudio: false, failOnUnresolvedSdk: true); result.Path.ShouldBe("resolverpath1"); - _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SucceededToResolveSDK", sdk.ToString())); + _logger.BuildMessageEvents.Any(i => i.Message.StartsWith($"The SDK \"{sdk}\" was successfully resolved")).ShouldBeTrue(); _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain("MockSdkResolver1 running"); _logger.BuildMessageEvents.Select(i => i.Message).ShouldNotContain("MockSdkResolverWithResolvableSdkPattern1 running"); ChangeWaves.ResetStateForTests(); @@ -184,7 +184,7 @@ public void AssertFirstResolverWithPatternCanResolve() var result = SdkResolverService.Instance.ResolveSdk(BuildEventContext.InvalidSubmissionId, sdk, _loggingContext, new MockElementLocation("file"), "sln", "projectPath", interactive: false, isRunningInVisualStudio: false, failOnUnresolvedSdk: true); result.Path.ShouldBe("resolverpathwithresolvablesdkpattern1"); - _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SucceededToResolveSDK", sdk.ToString())); + _logger.BuildMessageEvents.Any(i => i.Message.StartsWith($"The SDK \"{sdk}\" was successfully resolved")).ShouldBeTrue(); _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain("MockSdkResolverWithResolvableSdkPattern1 running"); _logger.BuildMessageEvents.Select(i => i.Message).ShouldNotContain("MockSdkResolver1 running"); } @@ -201,7 +201,7 @@ public void AssertFirstResolverErrorsSupressedWhenResolved() var result = SdkResolverService.Instance.ResolveSdk(BuildEventContext.InvalidSubmissionId, sdk, _loggingContext, new MockElementLocation("file"), "sln", "projectPath", interactive: false, isRunningInVisualStudio: false, failOnUnresolvedSdk: true); result.Path.ShouldBe("resolverpath2"); - _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SucceededToResolveSDK", sdk.ToString())); + _logger.BuildMessageEvents.Any(i => i.Message.StartsWith($"The SDK \"{sdk}\" was successfully resolved")).ShouldBeTrue(); // Both resolvers should run, and no ERROR string. _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain("MockSdkResolver1 running"); @@ -372,7 +372,7 @@ public void SdkResolverCanReturnNoPaths(bool includePropertiesAndItems) ValidateExpectedPropertiesAndItems(includePropertiesAndItems, result); - _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SucceededToResolveSDK", sdk.ToString())); + _logger.BuildMessageEvents.Any(i => i.Message.StartsWith($"The SDK \"{sdk}\" was successfully resolved")).ShouldBeTrue(); _logger.WarningCount.ShouldBe(0); } @@ -409,7 +409,7 @@ public void SdkResultCanReturnPropertiesAndItems() ValidateExpectedPropertiesAndItems(true, result); - _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SucceededToResolveSDK", sdk.ToString())); + _logger.BuildMessageEvents.Any(i => i.Message.StartsWith($"The SDK \"{sdk}\" was successfully resolved")).ShouldBeTrue(); _logger.WarningCount.ShouldBe(0); } @@ -462,7 +462,7 @@ public void SdkResultCanReturnMultiplePaths(bool includePropertiesAndItems) ValidateExpectedPropertiesAndItems(includePropertiesAndItems, result); - _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SucceededToResolveSDK", sdk.ToString())); + _logger.BuildMessageEvents.Any(i => i.Message.StartsWith($"The SDK \"{sdk}\" was successfully resolved")).ShouldBeTrue(); _logger.WarningCount.ShouldBe(0); } @@ -508,7 +508,7 @@ public void AssertResolutionWarnsIfResolvedVersionIsDifferentFromReferencedVersi ValidateExpectedPropertiesAndItems(true, result); - _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SucceededToResolveSDK", sdk.ToString())); + _logger.BuildMessageEvents.Any(i => i.Message.StartsWith($"The SDK \"{sdk}\" was successfully resolved")).ShouldBeTrue(); _logger.WarningCount.ShouldBe(1); _logger.Warnings.First().Code.ShouldStartWith("MSB4241"); } diff --git a/src/Build/BackEnd/Components/SdkResolution/SdkResolverService.cs b/src/Build/BackEnd/Components/SdkResolution/SdkResolverService.cs index 9d847022d74..b36af03f027 100644 --- a/src/Build/BackEnd/Components/SdkResolution/SdkResolverService.cs +++ b/src/Build/BackEnd/Components/SdkResolution/SdkResolverService.cs @@ -355,7 +355,7 @@ private bool TryResolveSdkUsingSpecifiedResolvers( if (result.Success) { - loggingContext.LogComment(MessageImportance.Low, "SucceededToResolveSDK", sdk.ToString()); + loggingContext.LogComment(MessageImportance.Low, "SucceededToResolveSDK", sdk.ToString(), sdkResolver.Name, result.Path ?? "null", result.Version ?? "null"); LogWarnings(loggingContext, sdkReferenceLocation, result.Warnings); diff --git a/src/Build/Resources/Strings.resx b/src/Build/Resources/Strings.resx index 7d22d822031..c9729e0de72 100644 --- a/src/Build/Resources/Strings.resx +++ b/src/Build/Resources/Strings.resx @@ -1325,7 +1325,7 @@ {1} - SDK "{0}" was successfully resolved. + The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" The NuGet-based SDK resolver failed to run because NuGet assemblies could not be located. Check your installation of MSBuild or set the environment variable "{0}" to the folder that contains the required NuGet assemblies. {1} diff --git a/src/Build/Resources/xlf/Strings.cs.xlf b/src/Build/Resources/xlf/Strings.cs.xlf index ea073c23257..8c69daaf137 100644 --- a/src/Build/Resources/xlf/Strings.cs.xlf +++ b/src/Build/Resources/xlf/Strings.cs.xlf @@ -452,8 +452,8 @@ - SDK "{0}" was successfully resolved. - SDK "{0}" was successfully resolved. + The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" + The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" diff --git a/src/Build/Resources/xlf/Strings.de.xlf b/src/Build/Resources/xlf/Strings.de.xlf index 8a7bb88da55..4dbc558eee5 100644 --- a/src/Build/Resources/xlf/Strings.de.xlf +++ b/src/Build/Resources/xlf/Strings.de.xlf @@ -452,8 +452,8 @@ - SDK "{0}" was successfully resolved. - SDK "{0}" was successfully resolved. + The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" + The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" diff --git a/src/Build/Resources/xlf/Strings.es.xlf b/src/Build/Resources/xlf/Strings.es.xlf index 879129b3b25..27492bd248f 100644 --- a/src/Build/Resources/xlf/Strings.es.xlf +++ b/src/Build/Resources/xlf/Strings.es.xlf @@ -452,8 +452,8 @@ - SDK "{0}" was successfully resolved. - SDK "{0}" was successfully resolved. + The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" + The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" diff --git a/src/Build/Resources/xlf/Strings.fr.xlf b/src/Build/Resources/xlf/Strings.fr.xlf index 329b69bd259..6431851fbaf 100644 --- a/src/Build/Resources/xlf/Strings.fr.xlf +++ b/src/Build/Resources/xlf/Strings.fr.xlf @@ -452,8 +452,8 @@ - SDK "{0}" was successfully resolved. - SDK "{0}" was successfully resolved. + The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" + The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" diff --git a/src/Build/Resources/xlf/Strings.it.xlf b/src/Build/Resources/xlf/Strings.it.xlf index cbb9c3c7b99..f263329b9cf 100644 --- a/src/Build/Resources/xlf/Strings.it.xlf +++ b/src/Build/Resources/xlf/Strings.it.xlf @@ -452,8 +452,8 @@ - SDK "{0}" was successfully resolved. - SDK "{0}" was successfully resolved. + The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" + The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" diff --git a/src/Build/Resources/xlf/Strings.ja.xlf b/src/Build/Resources/xlf/Strings.ja.xlf index 66d3c26bd75..12b3a2208cf 100644 --- a/src/Build/Resources/xlf/Strings.ja.xlf +++ b/src/Build/Resources/xlf/Strings.ja.xlf @@ -452,8 +452,8 @@ - SDK "{0}" was successfully resolved. - SDK "{0}" was successfully resolved. + The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" + The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" diff --git a/src/Build/Resources/xlf/Strings.ko.xlf b/src/Build/Resources/xlf/Strings.ko.xlf index 645c89f2a53..699a6727401 100644 --- a/src/Build/Resources/xlf/Strings.ko.xlf +++ b/src/Build/Resources/xlf/Strings.ko.xlf @@ -452,8 +452,8 @@ - SDK "{0}" was successfully resolved. - SDK "{0}" was successfully resolved. + The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" + The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" diff --git a/src/Build/Resources/xlf/Strings.pl.xlf b/src/Build/Resources/xlf/Strings.pl.xlf index 7feeb078466..f8521208986 100644 --- a/src/Build/Resources/xlf/Strings.pl.xlf +++ b/src/Build/Resources/xlf/Strings.pl.xlf @@ -452,8 +452,8 @@ - SDK "{0}" was successfully resolved. - SDK "{0}" was successfully resolved. + The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" + The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" diff --git a/src/Build/Resources/xlf/Strings.pt-BR.xlf b/src/Build/Resources/xlf/Strings.pt-BR.xlf index ab1d914623c..ef62ddb0ff7 100644 --- a/src/Build/Resources/xlf/Strings.pt-BR.xlf +++ b/src/Build/Resources/xlf/Strings.pt-BR.xlf @@ -452,8 +452,8 @@ - SDK "{0}" was successfully resolved. - SDK "{0}" was successfully resolved. + The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" + The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" diff --git a/src/Build/Resources/xlf/Strings.ru.xlf b/src/Build/Resources/xlf/Strings.ru.xlf index 47a94889c24..76e24434620 100644 --- a/src/Build/Resources/xlf/Strings.ru.xlf +++ b/src/Build/Resources/xlf/Strings.ru.xlf @@ -452,8 +452,8 @@ - SDK "{0}" was successfully resolved. - SDK "{0}" was successfully resolved. + The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" + The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" diff --git a/src/Build/Resources/xlf/Strings.tr.xlf b/src/Build/Resources/xlf/Strings.tr.xlf index 8dd29909d10..e74ae727475 100644 --- a/src/Build/Resources/xlf/Strings.tr.xlf +++ b/src/Build/Resources/xlf/Strings.tr.xlf @@ -452,8 +452,8 @@ - SDK "{0}" was successfully resolved. - SDK "{0}" was successfully resolved. + The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" + The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" diff --git a/src/Build/Resources/xlf/Strings.zh-Hans.xlf b/src/Build/Resources/xlf/Strings.zh-Hans.xlf index ba79af4b84e..4bcead9c994 100644 --- a/src/Build/Resources/xlf/Strings.zh-Hans.xlf +++ b/src/Build/Resources/xlf/Strings.zh-Hans.xlf @@ -452,8 +452,8 @@ - SDK "{0}" was successfully resolved. - SDK "{0}" was successfully resolved. + The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" + The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" diff --git a/src/Build/Resources/xlf/Strings.zh-Hant.xlf b/src/Build/Resources/xlf/Strings.zh-Hant.xlf index 71a1e1fdaf6..894fade6964 100644 --- a/src/Build/Resources/xlf/Strings.zh-Hant.xlf +++ b/src/Build/Resources/xlf/Strings.zh-Hant.xlf @@ -452,8 +452,8 @@ - SDK "{0}" was successfully resolved. - SDK "{0}" was successfully resolved. + The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" + The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" From 04da0af19fe146465eac8152bb890256d3722e9d Mon Sep 17 00:00:00 2001 From: Surayya Huseyn Zada Date: Thu, 11 Jan 2024 16:54:27 +0100 Subject: [PATCH 05/10] 1. remove SdkResolving log 2. log each SDK resolver attempt + errors and warnings as message 3. rephrese the success message --- .../BackEnd/SdkResolverService_Tests.cs | 28 +++++++++++-------- .../SdkResolution/SdkResolverService.cs | 9 ++++-- src/Build/Resources/Strings.resx | 11 +++----- src/Build/Resources/xlf/Strings.cs.xlf | 16 +++++------ src/Build/Resources/xlf/Strings.de.xlf | 16 +++++------ src/Build/Resources/xlf/Strings.es.xlf | 16 +++++------ src/Build/Resources/xlf/Strings.fr.xlf | 16 +++++------ src/Build/Resources/xlf/Strings.it.xlf | 16 +++++------ src/Build/Resources/xlf/Strings.ja.xlf | 16 +++++------ src/Build/Resources/xlf/Strings.ko.xlf | 16 +++++------ src/Build/Resources/xlf/Strings.pl.xlf | 16 +++++------ src/Build/Resources/xlf/Strings.pt-BR.xlf | 16 +++++------ src/Build/Resources/xlf/Strings.ru.xlf | 16 +++++------ src/Build/Resources/xlf/Strings.tr.xlf | 16 +++++------ src/Build/Resources/xlf/Strings.zh-Hans.xlf | 16 +++++------ src/Build/Resources/xlf/Strings.zh-Hant.xlf | 16 +++++------ 16 files changed, 118 insertions(+), 138 deletions(-) diff --git a/src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs b/src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs index 82ecac0f8cb..3c33ef28840 100644 --- a/src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs +++ b/src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs @@ -94,8 +94,6 @@ public void AssertResolutionWarnsIfResolvedVersionIsDifferentFromReferencedVersi result.Path.ShouldBe("path"); - _logger.BuildMessageEvents.Any(i => i.Message.StartsWith($"The SDK \"{sdk}\" was successfully resolved")).ShouldBeTrue(); - _logger.WarningCount.ShouldBe(1); _logger.Warnings.First().Code.ShouldStartWith("MSB4241"); } @@ -125,7 +123,6 @@ public void AssertSecondResolverWithPatternCanResolve() var result = SdkResolverService.Instance.ResolveSdk(BuildEventContext.InvalidSubmissionId, sdk, _loggingContext, new MockElementLocation("file"), "sln", "projectPath", interactive: false, isRunningInVisualStudio: false, failOnUnresolvedSdk: true); result.Path.ShouldBe("resolverpathwithresolvablesdkpattern2"); - _logger.BuildMessageEvents.Any(i => i.Message.StartsWith($"The SDK \"{sdk}\" was successfully resolved")).ShouldBeTrue(); _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain("MockSdkResolverWithResolvableSdkPattern2 running"); _logger.BuildMessageEvents.Select(i => i.Message).ShouldNotContain("MockSdkResolver1 running"); _logger.BuildMessageEvents.Select(i => i.Message).ShouldNotContain("MockSdkResolver2 running"); @@ -143,7 +140,6 @@ public void AssertFirstResolverCanResolve() var result = SdkResolverService.Instance.ResolveSdk(BuildEventContext.InvalidSubmissionId, sdk, _loggingContext, new MockElementLocation("file"), "sln", "projectPath", interactive: false, isRunningInVisualStudio: false, failOnUnresolvedSdk: true); result.Path.ShouldBe("resolverpath1"); - _logger.BuildMessageEvents.Any(i => i.Message.StartsWith($"The SDK \"{sdk}\" was successfully resolved")).ShouldBeTrue(); _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain("MockSdkResolver1 running"); _logger.BuildMessageEvents.Select(i => i.Message).ShouldNotContain("MockSdkResolverWithResolvableSdkPattern1 running"); } @@ -165,7 +161,6 @@ public void AssertFirstResolverWithPatternCantResolveChangeWave17_4() var result = SdkResolverService.Instance.ResolveSdk(BuildEventContext.InvalidSubmissionId, sdk, _loggingContext, new MockElementLocation("file"), "sln", "projectPath", interactive: false, isRunningInVisualStudio: false, failOnUnresolvedSdk: true); result.Path.ShouldBe("resolverpath1"); - _logger.BuildMessageEvents.Any(i => i.Message.StartsWith($"The SDK \"{sdk}\" was successfully resolved")).ShouldBeTrue(); _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain("MockSdkResolver1 running"); _logger.BuildMessageEvents.Select(i => i.Message).ShouldNotContain("MockSdkResolverWithResolvableSdkPattern1 running"); ChangeWaves.ResetStateForTests(); @@ -184,11 +179,26 @@ public void AssertFirstResolverWithPatternCanResolve() var result = SdkResolverService.Instance.ResolveSdk(BuildEventContext.InvalidSubmissionId, sdk, _loggingContext, new MockElementLocation("file"), "sln", "projectPath", interactive: false, isRunningInVisualStudio: false, failOnUnresolvedSdk: true); result.Path.ShouldBe("resolverpathwithresolvablesdkpattern1"); - _logger.BuildMessageEvents.Any(i => i.Message.StartsWith($"The SDK \"{sdk}\" was successfully resolved")).ShouldBeTrue(); _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain("MockSdkResolverWithResolvableSdkPattern1 running"); _logger.BuildMessageEvents.Select(i => i.Message).ShouldNotContain("MockSdkResolver1 running"); } + [Fact] + public void AssertSdkResolutionMessagesAreLogged() + { + SdkResolverService.Instance.InitializeForTests(new MockLoaderStrategy()); + SdkReference sdk = new SdkReference("1sdkName", "referencedVersion", "minimumVersion"); + + var result = SdkResolverService.Instance.ResolveSdk(BuildEventContext.InvalidSubmissionId, sdk, _loggingContext, new MockElementLocation("file"), "sln", "projectPath", interactive: false, isRunningInVisualStudio: false, failOnUnresolvedSdk: true); + + // First resolver attemopted to resolve, but failed. + var errorMessage = "\nErrors:\n" + ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SDKResolverReturnedNull", nameof(MockResolverReturnsNull)); + _logger.BuildMessageEvents.Select(i => i.Message) + .ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SDKResolverAttempt", nameof(MockResolverReturnsNull), sdk.ToString(), errorMessage)); + // Second resolver succeeded. + _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SucceededToResolveSDK", sdk.ToString(), nameof(MockSdkResolver1), result.Path, result.Version)); + } + [Fact] public void AssertFirstResolverErrorsSupressedWhenResolved() { @@ -201,8 +211,6 @@ public void AssertFirstResolverErrorsSupressedWhenResolved() var result = SdkResolverService.Instance.ResolveSdk(BuildEventContext.InvalidSubmissionId, sdk, _loggingContext, new MockElementLocation("file"), "sln", "projectPath", interactive: false, isRunningInVisualStudio: false, failOnUnresolvedSdk: true); result.Path.ShouldBe("resolverpath2"); - _logger.BuildMessageEvents.Any(i => i.Message.StartsWith($"The SDK \"{sdk}\" was successfully resolved")).ShouldBeTrue(); - // Both resolvers should run, and no ERROR string. _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain("MockSdkResolver1 running"); _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain("MockSdkResolver2 running"); @@ -372,7 +380,6 @@ public void SdkResolverCanReturnNoPaths(bool includePropertiesAndItems) ValidateExpectedPropertiesAndItems(includePropertiesAndItems, result); - _logger.BuildMessageEvents.Any(i => i.Message.StartsWith($"The SDK \"{sdk}\" was successfully resolved")).ShouldBeTrue(); _logger.WarningCount.ShouldBe(0); } @@ -409,7 +416,6 @@ public void SdkResultCanReturnPropertiesAndItems() ValidateExpectedPropertiesAndItems(true, result); - _logger.BuildMessageEvents.Any(i => i.Message.StartsWith($"The SDK \"{sdk}\" was successfully resolved")).ShouldBeTrue(); _logger.WarningCount.ShouldBe(0); } @@ -462,7 +468,6 @@ public void SdkResultCanReturnMultiplePaths(bool includePropertiesAndItems) ValidateExpectedPropertiesAndItems(includePropertiesAndItems, result); - _logger.BuildMessageEvents.Any(i => i.Message.StartsWith($"The SDK \"{sdk}\" was successfully resolved")).ShouldBeTrue(); _logger.WarningCount.ShouldBe(0); } @@ -508,7 +513,6 @@ public void AssertResolutionWarnsIfResolvedVersionIsDifferentFromReferencedVersi ValidateExpectedPropertiesAndItems(true, result); - _logger.BuildMessageEvents.Any(i => i.Message.StartsWith($"The SDK \"{sdk}\" was successfully resolved")).ShouldBeTrue(); _logger.WarningCount.ShouldBe(1); _logger.Warnings.First().Code.ShouldStartWith("MSB4241"); } diff --git a/src/Build/BackEnd/Components/SdkResolution/SdkResolverService.cs b/src/Build/BackEnd/Components/SdkResolution/SdkResolverService.cs index b36af03f027..e972600f8c7 100644 --- a/src/Build/BackEnd/Components/SdkResolution/SdkResolverService.cs +++ b/src/Build/BackEnd/Components/SdkResolution/SdkResolverService.cs @@ -312,8 +312,6 @@ private bool TryResolveSdkUsingSpecifiedResolvers( // Loop through resolvers which have already been sorted by priority, returning the first result that was successful SdkLogger buildEngineLogger = new SdkLogger(loggingContext); - loggingContext.LogComment(MessageImportance.Low, "SdkResolving", sdk.ToString()); - foreach (SdkResolver sdkResolver in resolvers) { SdkResolverContext context = new SdkResolverContext(buildEngineLogger, projectPath, solutionPath, ProjectCollection.Version, interactive, isRunningInVisualStudio) @@ -371,6 +369,13 @@ private bool TryResolveSdkUsingSpecifiedResolvers( sdkResult = result; return true; } + else + { + string resultWarningsAndErrors = (result.Warnings?.Any() == true ? "\nWarnings:\n" + string.Join("\n", result.Warnings) : string.Empty) + + (result.Errors?.Any() == true ? "\nErrors:\n" + string.Join("\n", result.Errors) : string.Empty); + + loggingContext.LogComment(MessageImportance.Low, "SDKResolverAttempt", sdkResolver.Name, sdk.ToString(), resultWarningsAndErrors); + } results.Add(result); } diff --git a/src/Build/Resources/Strings.resx b/src/Build/Resources/Strings.resx index c9729e0de72..0cac48be6bb 100644 --- a/src/Build/Resources/Strings.resx +++ b/src/Build/Resources/Strings.resx @@ -1325,7 +1325,10 @@ {1} - The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" + The SDK "{0}" was successfully resolved by the "{1}" resolver to location "{2}" and version "{3}". + + + The "{0}" resolver attempted to resolve the SDK "{1}". {2} The NuGet-based SDK resolver failed to run because NuGet assemblies could not be located. Check your installation of MSBuild or set the environment variable "{0}" to the folder that contains the required NuGet assemblies. {1} @@ -1772,12 +1775,6 @@ Utilization: {0} Average Utilization: {1:###.0} LOCALIZATION: Do not localize the word SDK. - - Resolving SDK '{0}'... - - LOCALIZATION: Do not localize the word SDK. - - MSB4250: ProjectGraph does not support ProjectReference items with the ToolsVersion metadata set. Found ProjectReference "{0}" with ToolsVersion in file "{1}" diff --git a/src/Build/Resources/xlf/Strings.cs.xlf b/src/Build/Resources/xlf/Strings.cs.xlf index 8c69daaf137..c00a460ba64 100644 --- a/src/Build/Resources/xlf/Strings.cs.xlf +++ b/src/Build/Resources/xlf/Strings.cs.xlf @@ -390,6 +390,11 @@ Přístupy k souborům sestav se v současné době podporují jenom pomocí varianty x64 nástroje MSBuild. + + The "{0}" resolver attempted to resolve the SDK "{1}". {2} + The "{0}" resolver attempted to resolve the SDK "{1}". {2} + + MSB4242: SDK Resolver Failure: "{0}" MSB4242: Selhání překladače sady SDK: {0} @@ -452,8 +457,8 @@ - The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" - The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" + The SDK "{0}" was successfully resolved by the "{1}" resolver to location "{2}" and version "{3}". + The SDK "{0}" was successfully resolved by the "{1}" resolver to location "{2}" and version "{3}". @@ -2586,13 +2591,6 @@ Využití: Průměrné využití {0}: {1:###.0} MSB4241: Odkaz na sadu SDK {0} verze {1} byl místo toho přeložen na verzi {2}. Pokud neaktualizujete odkazovanou verzi tak, aby se shodovala, může se používat jiná verze, než kterou očekáváte. {StrBegin="MSB4241: "} LOCALIZATION: Do not localize the word SDK. - - - - Resolving SDK '{0}'... - Překládá se sada SDK {0}... - - LOCALIZATION: Do not localize the word SDK. diff --git a/src/Build/Resources/xlf/Strings.de.xlf b/src/Build/Resources/xlf/Strings.de.xlf index 4dbc558eee5..73b13669383 100644 --- a/src/Build/Resources/xlf/Strings.de.xlf +++ b/src/Build/Resources/xlf/Strings.de.xlf @@ -390,6 +390,11 @@ Das Melden von Dateizugriffen wird derzeit nur mit der x64-Variante von MSBuild unterstützt. + + The "{0}" resolver attempted to resolve the SDK "{1}". {2} + The "{0}" resolver attempted to resolve the SDK "{1}". {2} + + MSB4242: SDK Resolver Failure: "{0}" MSB4242: Fehler bei SDK-Resolver: "{0}" @@ -452,8 +457,8 @@ - The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" - The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" + The SDK "{0}" was successfully resolved by the "{1}" resolver to location "{2}" and version "{3}". + The SDK "{0}" was successfully resolved by the "{1}" resolver to location "{2}" and version "{3}". @@ -2586,13 +2591,6 @@ Auslastung: {0} Durchschnittliche Auslastung: {1:###.0} MSB4241: Der SDK-Verweis "{0}" auf Version "{1}" wurde stattdessen in Version "{2}" aufgelöst. Sie könnten eine andere Version als die erwartete verwenden, wenn Sie die referenzierte Version nicht entsprechend aktualisieren. {StrBegin="MSB4241: "} LOCALIZATION: Do not localize the word SDK. - - - - Resolving SDK '{0}'... - SDK "{0}" wird aufgelöst... - - LOCALIZATION: Do not localize the word SDK. diff --git a/src/Build/Resources/xlf/Strings.es.xlf b/src/Build/Resources/xlf/Strings.es.xlf index 27492bd248f..98c471daa16 100644 --- a/src/Build/Resources/xlf/Strings.es.xlf +++ b/src/Build/Resources/xlf/Strings.es.xlf @@ -390,6 +390,11 @@ Los accesos a archivos de informes solo se admiten actualmente con el tipo x64 de MSBuild. + + The "{0}" resolver attempted to resolve the SDK "{1}". {2} + The "{0}" resolver attempted to resolve the SDK "{1}". {2} + + MSB4242: SDK Resolver Failure: "{0}" MSB4242: Error del solucionador del SDK: "{0}" @@ -452,8 +457,8 @@ - The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" - The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" + The SDK "{0}" was successfully resolved by the "{1}" resolver to location "{2}" and version "{3}". + The SDK "{0}" was successfully resolved by the "{1}" resolver to location "{2}" and version "{3}". @@ -2586,13 +2591,6 @@ Utilización: Utilización media de {0}: {1:###.0} MSB4241: La referencia del SKD "{0}", versión "{1}", se resolvió en la versión "{2}". Podría estar utilizando una versión diferente de la esperada si no actualiza la versión de referencia para que coincida. {StrBegin="MSB4241: "} LOCALIZATION: Do not localize the word SDK. - - - - Resolving SDK '{0}'... - Resolviendo SDK "{0}"... - - LOCALIZATION: Do not localize the word SDK. diff --git a/src/Build/Resources/xlf/Strings.fr.xlf b/src/Build/Resources/xlf/Strings.fr.xlf index 6431851fbaf..6ca1de0c223 100644 --- a/src/Build/Resources/xlf/Strings.fr.xlf +++ b/src/Build/Resources/xlf/Strings.fr.xlf @@ -390,6 +390,11 @@ Les accès aux fichiers de création de rapports sont uniquement pris en charge à l’aide de la saveur x64 de MSBuild. + + The "{0}" resolver attempted to resolve the SDK "{1}". {2} + The "{0}" resolver attempted to resolve the SDK "{1}". {2} + + MSB4242: SDK Resolver Failure: "{0}" MSB4242: Échec du Programme de Résolution SDK : «{0}» @@ -452,8 +457,8 @@ - The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" - The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" + The SDK "{0}" was successfully resolved by the "{1}" resolver to location "{2}" and version "{3}". + The SDK "{0}" was successfully resolved by the "{1}" resolver to location "{2}" and version "{3}". @@ -2586,13 +2591,6 @@ Utilisation : {0} Utilisation moyenne : {1:###.0} MSB4241: La référence du SDK "{0}" version "{1}" a été résolue avec la version "{2}" à la place. Vous risquez d'utiliser une version différente de celle attendue si vous ne mettez pas à jour la version référencée correspondante. {StrBegin="MSB4241: "} LOCALIZATION: Do not localize the word SDK. - - - - Resolving SDK '{0}'... - Résolution du SDK '{0}'... - - LOCALIZATION: Do not localize the word SDK. diff --git a/src/Build/Resources/xlf/Strings.it.xlf b/src/Build/Resources/xlf/Strings.it.xlf index f263329b9cf..fc90b55d36c 100644 --- a/src/Build/Resources/xlf/Strings.it.xlf +++ b/src/Build/Resources/xlf/Strings.it.xlf @@ -390,6 +390,11 @@ Gli accessi ai file di report sono attualmente supportati solo con la versione x64 di MSBuild. + + The "{0}" resolver attempted to resolve the SDK "{1}". {2} + The "{0}" resolver attempted to resolve the SDK "{1}". {2} + + MSB4242: SDK Resolver Failure: "{0}" MSB4242: errore sistema di risoluzione SDK: "{0}" @@ -452,8 +457,8 @@ - The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" - The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" + The SDK "{0}" was successfully resolved by the "{1}" resolver to location "{2}" and version "{3}". + The SDK "{0}" was successfully resolved by the "{1}" resolver to location "{2}" and version "{3}". @@ -2586,13 +2591,6 @@ Utilizzo: {0} Utilizzo medio: {1:###.0} MSB4241: la versione "{1}" del riferimento "{0}" all'SDK è stata risolta nella versione "{2}". Se non si aggiorna la versione di riferimento in modo che corrisponda, è possibile che la versione in uso sia diversa da quella prevista. {StrBegin="MSB4241: "} LOCALIZATION: Do not localize the word SDK. - - - - Resolving SDK '{0}'... - Risoluzione dell'SDK '{0}'... - - LOCALIZATION: Do not localize the word SDK. diff --git a/src/Build/Resources/xlf/Strings.ja.xlf b/src/Build/Resources/xlf/Strings.ja.xlf index 12b3a2208cf..cffed967370 100644 --- a/src/Build/Resources/xlf/Strings.ja.xlf +++ b/src/Build/Resources/xlf/Strings.ja.xlf @@ -390,6 +390,11 @@ ファイル アクセスのレポートは、現在、MSBuild の x64 フレーバーを使用してのみサポートされています。 + + The "{0}" resolver attempted to resolve the SDK "{1}". {2} + The "{0}" resolver attempted to resolve the SDK "{1}". {2} + + MSB4242: SDK Resolver Failure: "{0}" MSB4242: SDK リゾルバー エラー: "{0}" @@ -452,8 +457,8 @@ - The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" - The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" + The SDK "{0}" was successfully resolved by the "{1}" resolver to location "{2}" and version "{3}". + The SDK "{0}" was successfully resolved by the "{1}" resolver to location "{2}" and version "{3}". @@ -2586,13 +2591,6 @@ Utilization: {0} Average Utilization: {1:###.0} MSB4241: SDK 参照 "{0}" のバージョン "{1}" は、代わりにバージョン "{2}" に解決されました。 参照されたバージョンを一致するように更新しない場合、必要なバージョンとは別のバージョンを使用する可能性があります。 {StrBegin="MSB4241: "} LOCALIZATION: Do not localize the word SDK. - - - - Resolving SDK '{0}'... - SDK '{0}' を解決しています... - - LOCALIZATION: Do not localize the word SDK. diff --git a/src/Build/Resources/xlf/Strings.ko.xlf b/src/Build/Resources/xlf/Strings.ko.xlf index 699a6727401..a7687b44399 100644 --- a/src/Build/Resources/xlf/Strings.ko.xlf +++ b/src/Build/Resources/xlf/Strings.ko.xlf @@ -390,6 +390,11 @@ 파일 액세스 보고는 현재 x64 버전의 MSBuild를 사용하는 경우에만 지원됩니다. + + The "{0}" resolver attempted to resolve the SDK "{1}". {2} + The "{0}" resolver attempted to resolve the SDK "{1}". {2} + + MSB4242: SDK Resolver Failure: "{0}" MSB4242: SDK 해결 프로그램 오류: "{0}" @@ -452,8 +457,8 @@ - The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" - The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" + The SDK "{0}" was successfully resolved by the "{1}" resolver to location "{2}" and version "{3}". + The SDK "{0}" was successfully resolved by the "{1}" resolver to location "{2}" and version "{3}". @@ -2586,13 +2591,6 @@ Utilization: {0} Average Utilization: {1:###.0} MSB4241: SDK 참조 "{0}" 버전 "{1}"이(가) 대신 "{2}" 버전으로 확인되었습니다. 참조된 버전을 일치하도록 업데이트하지 않는 경우 예상과 다른 버전을 사용할 수 있습니다. {StrBegin="MSB4241: "} LOCALIZATION: Do not localize the word SDK. - - - - Resolving SDK '{0}'... - SDK '{0}'을(를) 확인하는 중... - - LOCALIZATION: Do not localize the word SDK. diff --git a/src/Build/Resources/xlf/Strings.pl.xlf b/src/Build/Resources/xlf/Strings.pl.xlf index f8521208986..009ec1d4e23 100644 --- a/src/Build/Resources/xlf/Strings.pl.xlf +++ b/src/Build/Resources/xlf/Strings.pl.xlf @@ -390,6 +390,11 @@ Raportowanie dostępu do plików jest obecnie obsługiwane tylko przy użyciu wersji x64 programu MSBuild. + + The "{0}" resolver attempted to resolve the SDK "{1}". {2} + The "{0}" resolver attempted to resolve the SDK "{1}". {2} + + MSB4242: SDK Resolver Failure: "{0}" MSB4242: niepowodzenia programu do rozpoznawania zestawu SDK: „{0}” @@ -452,8 +457,8 @@ - The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" - The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" + The SDK "{0}" was successfully resolved by the "{1}" resolver to location "{2}" and version "{3}". + The SDK "{0}" was successfully resolved by the "{1}" resolver to location "{2}" and version "{3}". @@ -2586,13 +2591,6 @@ Wykorzystanie: Średnie wykorzystanie {0}: {1:###.0} MSB4241: Odwołanie do zestawu SDK „{0}” w wersji „{1}” zostało rozpoznane jako wersja „{2}”. Może zostać użyta inna wersja niż oczekiwana, jeśli nie zaktualizujesz wersji określonej w odwołaniu, tak aby była zgodna. {StrBegin="MSB4241: "} LOCALIZATION: Do not localize the word SDK. - - - - Resolving SDK '{0}'... - Trwa rozpoznawanie zestawu SDK „{0}”... - - LOCALIZATION: Do not localize the word SDK. diff --git a/src/Build/Resources/xlf/Strings.pt-BR.xlf b/src/Build/Resources/xlf/Strings.pt-BR.xlf index ef62ddb0ff7..988bda257de 100644 --- a/src/Build/Resources/xlf/Strings.pt-BR.xlf +++ b/src/Build/Resources/xlf/Strings.pt-BR.xlf @@ -390,6 +390,11 @@ Atualmente, o relatório de acessos a arquivos só tem suporte usando o tipo x64 do MSBuild. + + The "{0}" resolver attempted to resolve the SDK "{1}". {2} + The "{0}" resolver attempted to resolve the SDK "{1}". {2} + + MSB4242: SDK Resolver Failure: "{0}" MSB4242: Falha no Resolvedor do SDK: "{0}" @@ -452,8 +457,8 @@ - The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" - The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" + The SDK "{0}" was successfully resolved by the "{1}" resolver to location "{2}" and version "{3}". + The SDK "{0}" was successfully resolved by the "{1}" resolver to location "{2}" and version "{3}". @@ -2586,13 +2591,6 @@ Utilização: {0} Utilização Média: {1:###.0} MSB4241: a referência do SDK "{0}" versão "{1}" foi resolvida para a versão "{2}". Talvez você estava usando um versão diferente que a esperada caso não tenha atualizado a versão referenciada de maneira correspondente. {StrBegin="MSB4241: "} LOCALIZATION: Do not localize the word SDK. - - - - Resolving SDK '{0}'... - Resolvendo o SDK '{0}'... - - LOCALIZATION: Do not localize the word SDK. diff --git a/src/Build/Resources/xlf/Strings.ru.xlf b/src/Build/Resources/xlf/Strings.ru.xlf index 76e24434620..08bc455f497 100644 --- a/src/Build/Resources/xlf/Strings.ru.xlf +++ b/src/Build/Resources/xlf/Strings.ru.xlf @@ -390,6 +390,11 @@ Доступ к файлам отчетов сейчас поддерживается только при использовании 64-разрядного варианта приложения MSBuild. + + The "{0}" resolver attempted to resolve the SDK "{1}". {2} + The "{0}" resolver attempted to resolve the SDK "{1}". {2} + + MSB4242: SDK Resolver Failure: "{0}" MSB4242: сбой сопоставителя SDK: "{0}" @@ -452,8 +457,8 @@ - The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" - The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" + The SDK "{0}" was successfully resolved by the "{1}" resolver to location "{2}" and version "{3}". + The SDK "{0}" was successfully resolved by the "{1}" resolver to location "{2}" and version "{3}". @@ -2586,13 +2591,6 @@ Utilization: {0} Average Utilization: {1:###.0} MSB4241: ссылка на пакет SDK "{0}" версии "{1}" была сопоставлена версии "{2}". Возможно, вы используете версию, отличную от ожидаемой, если вы не обновили версию по ссылке. {StrBegin="MSB4241: "} LOCALIZATION: Do not localize the word SDK. - - - - Resolving SDK '{0}'... - Сопоставление SDK "{0}"… - - LOCALIZATION: Do not localize the word SDK. diff --git a/src/Build/Resources/xlf/Strings.tr.xlf b/src/Build/Resources/xlf/Strings.tr.xlf index e74ae727475..7b93bf0b1e2 100644 --- a/src/Build/Resources/xlf/Strings.tr.xlf +++ b/src/Build/Resources/xlf/Strings.tr.xlf @@ -390,6 +390,11 @@ Raporlama dosyası erişimleri şu anda yalnızca MSBuild x64 varyantı kullanıldığında destekleniyor. + + The "{0}" resolver attempted to resolve the SDK "{1}". {2} + The "{0}" resolver attempted to resolve the SDK "{1}". {2} + + MSB4242: SDK Resolver Failure: "{0}" MSB4242: SDK Çözümleyici Hatası: "{0}" @@ -452,8 +457,8 @@ - The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" - The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" + The SDK "{0}" was successfully resolved by the "{1}" resolver to location "{2}" and version "{3}". + The SDK "{0}" was successfully resolved by the "{1}" resolver to location "{2}" and version "{3}". @@ -2586,13 +2591,6 @@ Kullanım: {0} Ortalama Kullanım: {1:###.0} MSB4241: "{0}" SDK başvurusunun "{1}" sürümü, bunun yerine sürüm "{2}" olarak çözümlendi. Başvurulan sürümü eşleşecek şekilde güncelleştirmezseniz beklenen sürümden farklı bir sürüm kullanıyor olabilirsiniz. {StrBegin="MSB4241: "} LOCALIZATION: Do not localize the word SDK. - - - - Resolving SDK '{0}'... - '{0}' SDK’sı çözümleniyor... - - LOCALIZATION: Do not localize the word SDK. diff --git a/src/Build/Resources/xlf/Strings.zh-Hans.xlf b/src/Build/Resources/xlf/Strings.zh-Hans.xlf index 4bcead9c994..0855cec7218 100644 --- a/src/Build/Resources/xlf/Strings.zh-Hans.xlf +++ b/src/Build/Resources/xlf/Strings.zh-Hans.xlf @@ -390,6 +390,11 @@ 当前仅支持使用 x64 风格的 MSBuild 来报告文件访问情况。 + + The "{0}" resolver attempted to resolve the SDK "{1}". {2} + The "{0}" resolver attempted to resolve the SDK "{1}". {2} + + MSB4242: SDK Resolver Failure: "{0}" MSB4242: SDK 解析程序失败: "{0}" @@ -452,8 +457,8 @@ - The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" - The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" + The SDK "{0}" was successfully resolved by the "{1}" resolver to location "{2}" and version "{3}". + The SDK "{0}" was successfully resolved by the "{1}" resolver to location "{2}" and version "{3}". @@ -2586,13 +2591,6 @@ Utilization: {0} Average Utilization: {1:###.0} MSB4241: SDK 引用“{0}”版本“{1}”已改为解析到版本“{2}”。如果不更新要匹配的已引用版本，你可能会使用与预期不同的版本。 {StrBegin="MSB4241: "} LOCALIZATION: Do not localize the word SDK. - - - - Resolving SDK '{0}'... - 正在解析 SDK“{0}”... - - LOCALIZATION: Do not localize the word SDK. diff --git a/src/Build/Resources/xlf/Strings.zh-Hant.xlf b/src/Build/Resources/xlf/Strings.zh-Hant.xlf index 894fade6964..ae8b8426917 100644 --- a/src/Build/Resources/xlf/Strings.zh-Hant.xlf +++ b/src/Build/Resources/xlf/Strings.zh-Hant.xlf @@ -390,6 +390,11 @@ 目前只支援使用 MSBuild 的 x64 變體來報告檔案存取。 + + The "{0}" resolver attempted to resolve the SDK "{1}". {2} + The "{0}" resolver attempted to resolve the SDK "{1}". {2} + + MSB4242: SDK Resolver Failure: "{0}" MSB4242: SDK 解析程式失敗: "{0}" @@ -452,8 +457,8 @@ - The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" - The SDK "{0}" was successfully resolved by the SDK resolver "{1}". SDK Result: "Path : {2}, Version : {3}" + The SDK "{0}" was successfully resolved by the "{1}" resolver to location "{2}" and version "{3}". + The SDK "{0}" was successfully resolved by the "{1}" resolver to location "{2}" and version "{3}". @@ -2586,13 +2591,6 @@ Utilization: {0} Average Utilization: {1:###.0} MSB4241: SDK 參考 "{0}" 版本 "{1}" 已改為解析成版本 "{2}"。若您未將參考的版本更新為符合的版本，您可能使用了與預期不同的版本。 {StrBegin="MSB4241: "} LOCALIZATION: Do not localize the word SDK. - - - - Resolving SDK '{0}'... - 正在解析 SDK '{0}'... - - LOCALIZATION: Do not localize the word SDK. From c938d3ce37ad87ac6cb13b5a7d451e2bc22a28b0 Mon Sep 17 00:00:00 2001 From: Surayya Huseyn Zada Date: Fri, 12 Jan 2024 11:01:02 +0100 Subject: [PATCH 06/10] include "Warnings" and "Errors" in the message so they could be translated --- .../BackEnd/SdkResolverService_Tests.cs | 5 ++--- .../Components/SdkResolution/SdkResolverService.cs | 6 +++--- src/Build/Resources/Strings.resx | 7 ++++++- src/Build/Resources/xlf/Strings.cs.xlf | 12 +++++++++--- src/Build/Resources/xlf/Strings.de.xlf | 12 +++++++++--- src/Build/Resources/xlf/Strings.es.xlf | 12 +++++++++--- src/Build/Resources/xlf/Strings.fr.xlf | 12 +++++++++--- src/Build/Resources/xlf/Strings.it.xlf | 12 +++++++++--- src/Build/Resources/xlf/Strings.ja.xlf | 12 +++++++++--- src/Build/Resources/xlf/Strings.ko.xlf | 12 +++++++++--- src/Build/Resources/xlf/Strings.pl.xlf | 12 +++++++++--- src/Build/Resources/xlf/Strings.pt-BR.xlf | 12 +++++++++--- src/Build/Resources/xlf/Strings.ru.xlf | 12 +++++++++--- src/Build/Resources/xlf/Strings.tr.xlf | 12 +++++++++--- src/Build/Resources/xlf/Strings.zh-Hans.xlf | 12 +++++++++--- src/Build/Resources/xlf/Strings.zh-Hant.xlf | 12 +++++++++--- 16 files changed, 128 insertions(+), 46 deletions(-) diff --git a/src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs b/src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs index 3c33ef28840..e8e6ae13c30 100644 --- a/src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs +++ b/src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs @@ -192,9 +192,8 @@ public void AssertSdkResolutionMessagesAreLogged() var result = SdkResolverService.Instance.ResolveSdk(BuildEventContext.InvalidSubmissionId, sdk, _loggingContext, new MockElementLocation("file"), "sln", "projectPath", interactive: false, isRunningInVisualStudio: false, failOnUnresolvedSdk: true); // First resolver attemopted to resolve, but failed. - var errorMessage = "\nErrors:\n" + ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SDKResolverReturnedNull", nameof(MockResolverReturnsNull)); - _logger.BuildMessageEvents.Select(i => i.Message) - .ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SDKResolverAttempt", nameof(MockResolverReturnsNull), sdk.ToString(), errorMessage)); + _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SDKResolverAttempt", nameof(MockResolverReturnsNull), sdk.ToString(), "null", + ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SDKResolverReturnedNull", nameof(MockResolverReturnsNull)))); // Second resolver succeeded. _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SucceededToResolveSDK", sdk.ToString(), nameof(MockSdkResolver1), result.Path, result.Version)); } diff --git a/src/Build/BackEnd/Components/SdkResolution/SdkResolverService.cs b/src/Build/BackEnd/Components/SdkResolution/SdkResolverService.cs index e972600f8c7..9181b84f74f 100644 --- a/src/Build/BackEnd/Components/SdkResolution/SdkResolverService.cs +++ b/src/Build/BackEnd/Components/SdkResolution/SdkResolverService.cs @@ -371,10 +371,10 @@ private bool TryResolveSdkUsingSpecifiedResolvers( } else { - string resultWarningsAndErrors = (result.Warnings?.Any() == true ? "\nWarnings:\n" + string.Join("\n", result.Warnings) : string.Empty) - + (result.Errors?.Any() == true ? "\nErrors:\n" + string.Join("\n", result.Errors) : string.Empty); + string resultWarnings = result.Warnings?.Any() == true ? string.Join(Environment.NewLine, result.Warnings) : "null"; + string resultErrors = result.Errors?.Any() == true ? string.Join(Environment.NewLine, result.Errors) : "null"; - loggingContext.LogComment(MessageImportance.Low, "SDKResolverAttempt", sdkResolver.Name, sdk.ToString(), resultWarningsAndErrors); + loggingContext.LogComment(MessageImportance.Low, "SDKResolverAttempt", sdkResolver.Name, sdk.ToString(), resultWarnings, resultErrors); } results.Add(result); diff --git a/src/Build/Resources/Strings.resx b/src/Build/Resources/Strings.resx index 0cac48be6bb..74446a978ac 100644 --- a/src/Build/Resources/Strings.resx +++ b/src/Build/Resources/Strings.resx @@ -1328,7 +1328,12 @@ The SDK "{0}" was successfully resolved by the "{1}" resolver to location "{2}" and version "{3}". - The "{0}" resolver attempted to resolve the SDK "{1}". {2} + The "{0}" resolver attempted to resolve the SDK "{1}". +Warnings: {2} +Errors: {3} + + LOCALIZATION: "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". + The NuGet-based SDK resolver failed to run because NuGet assemblies could not be located. Check your installation of MSBuild or set the environment variable "{0}" to the folder that contains the required NuGet assemblies. {1} diff --git a/src/Build/Resources/xlf/Strings.cs.xlf b/src/Build/Resources/xlf/Strings.cs.xlf index c00a460ba64..d513fcf26ca 100644 --- a/src/Build/Resources/xlf/Strings.cs.xlf +++ b/src/Build/Resources/xlf/Strings.cs.xlf @@ -391,9 +391,15 @@ - The "{0}" resolver attempted to resolve the SDK "{1}". {2} - The "{0}" resolver attempted to resolve the SDK "{1}". {2} - + The "{0}" resolver attempted to resolve the SDK "{1}". +Warnings: {2} +Errors: {3} + The "{0}" resolver attempted to resolve the SDK "{1}". +Warnings: {2} +Errors: {3} + + LOCALIZATION: "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". + MSB4242: SDK Resolver Failure: "{0}" diff --git a/src/Build/Resources/xlf/Strings.de.xlf b/src/Build/Resources/xlf/Strings.de.xlf index 73b13669383..04b780035a1 100644 --- a/src/Build/Resources/xlf/Strings.de.xlf +++ b/src/Build/Resources/xlf/Strings.de.xlf @@ -391,9 +391,15 @@ - The "{0}" resolver attempted to resolve the SDK "{1}". {2} - The "{0}" resolver attempted to resolve the SDK "{1}". {2} - + The "{0}" resolver attempted to resolve the SDK "{1}". +Warnings: {2} +Errors: {3} + The "{0}" resolver attempted to resolve the SDK "{1}". +Warnings: {2} +Errors: {3} + + LOCALIZATION: "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". + MSB4242: SDK Resolver Failure: "{0}" diff --git a/src/Build/Resources/xlf/Strings.es.xlf b/src/Build/Resources/xlf/Strings.es.xlf index 98c471daa16..c6cf1e26d8d 100644 --- a/src/Build/Resources/xlf/Strings.es.xlf +++ b/src/Build/Resources/xlf/Strings.es.xlf @@ -391,9 +391,15 @@ - The "{0}" resolver attempted to resolve the SDK "{1}". {2} - The "{0}" resolver attempted to resolve the SDK "{1}". {2} - + The "{0}" resolver attempted to resolve the SDK "{1}". +Warnings: {2} +Errors: {3} + The "{0}" resolver attempted to resolve the SDK "{1}". +Warnings: {2} +Errors: {3} + + LOCALIZATION: "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". + MSB4242: SDK Resolver Failure: "{0}" diff --git a/src/Build/Resources/xlf/Strings.fr.xlf b/src/Build/Resources/xlf/Strings.fr.xlf index 6ca1de0c223..af0667303a5 100644 --- a/src/Build/Resources/xlf/Strings.fr.xlf +++ b/src/Build/Resources/xlf/Strings.fr.xlf @@ -391,9 +391,15 @@ - The "{0}" resolver attempted to resolve the SDK "{1}". {2} - The "{0}" resolver attempted to resolve the SDK "{1}". {2} - + The "{0}" resolver attempted to resolve the SDK "{1}". +Warnings: {2} +Errors: {3} + The "{0}" resolver attempted to resolve the SDK "{1}". +Warnings: {2} +Errors: {3} + + LOCALIZATION: "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". + MSB4242: SDK Resolver Failure: "{0}" diff --git a/src/Build/Resources/xlf/Strings.it.xlf b/src/Build/Resources/xlf/Strings.it.xlf index fc90b55d36c..4061e12daff 100644 --- a/src/Build/Resources/xlf/Strings.it.xlf +++ b/src/Build/Resources/xlf/Strings.it.xlf @@ -391,9 +391,15 @@ - The "{0}" resolver attempted to resolve the SDK "{1}". {2} - The "{0}" resolver attempted to resolve the SDK "{1}". {2} - + The "{0}" resolver attempted to resolve the SDK "{1}". +Warnings: {2} +Errors: {3} + The "{0}" resolver attempted to resolve the SDK "{1}". +Warnings: {2} +Errors: {3} + + LOCALIZATION: "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". + MSB4242: SDK Resolver Failure: "{0}" diff --git a/src/Build/Resources/xlf/Strings.ja.xlf b/src/Build/Resources/xlf/Strings.ja.xlf index cffed967370..32ea1effdb1 100644 --- a/src/Build/Resources/xlf/Strings.ja.xlf +++ b/src/Build/Resources/xlf/Strings.ja.xlf @@ -391,9 +391,15 @@ - The "{0}" resolver attempted to resolve the SDK "{1}". {2} - The "{0}" resolver attempted to resolve the SDK "{1}". {2} - + The "{0}" resolver attempted to resolve the SDK "{1}". +Warnings: {2} +Errors: {3} + The "{0}" resolver attempted to resolve the SDK "{1}". +Warnings: {2} +Errors: {3} + + LOCALIZATION: "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". + MSB4242: SDK Resolver Failure: "{0}" diff --git a/src/Build/Resources/xlf/Strings.ko.xlf b/src/Build/Resources/xlf/Strings.ko.xlf index a7687b44399..500b5fc5186 100644 --- a/src/Build/Resources/xlf/Strings.ko.xlf +++ b/src/Build/Resources/xlf/Strings.ko.xlf @@ -391,9 +391,15 @@ - The "{0}" resolver attempted to resolve the SDK "{1}". {2} - The "{0}" resolver attempted to resolve the SDK "{1}". {2} - + The "{0}" resolver attempted to resolve the SDK "{1}". +Warnings: {2} +Errors: {3} + The "{0}" resolver attempted to resolve the SDK "{1}". +Warnings: {2} +Errors: {3} + + LOCALIZATION: "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". + MSB4242: SDK Resolver Failure: "{0}" diff --git a/src/Build/Resources/xlf/Strings.pl.xlf b/src/Build/Resources/xlf/Strings.pl.xlf index 009ec1d4e23..7ae7313210b 100644 --- a/src/Build/Resources/xlf/Strings.pl.xlf +++ b/src/Build/Resources/xlf/Strings.pl.xlf @@ -391,9 +391,15 @@ - The "{0}" resolver attempted to resolve the SDK "{1}". {2} - The "{0}" resolver attempted to resolve the SDK "{1}". {2} - + The "{0}" resolver attempted to resolve the SDK "{1}". +Warnings: {2} +Errors: {3} + The "{0}" resolver attempted to resolve the SDK "{1}". +Warnings: {2} +Errors: {3} + + LOCALIZATION: "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". + MSB4242: SDK Resolver Failure: "{0}" diff --git a/src/Build/Resources/xlf/Strings.pt-BR.xlf b/src/Build/Resources/xlf/Strings.pt-BR.xlf index 988bda257de..54c35ee11de 100644 --- a/src/Build/Resources/xlf/Strings.pt-BR.xlf +++ b/src/Build/Resources/xlf/Strings.pt-BR.xlf @@ -391,9 +391,15 @@ - The "{0}" resolver attempted to resolve the SDK "{1}". {2} - The "{0}" resolver attempted to resolve the SDK "{1}". {2} - + The "{0}" resolver attempted to resolve the SDK "{1}". +Warnings: {2} +Errors: {3} + The "{0}" resolver attempted to resolve the SDK "{1}". +Warnings: {2} +Errors: {3} + + LOCALIZATION: "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". + MSB4242: SDK Resolver Failure: "{0}" diff --git a/src/Build/Resources/xlf/Strings.ru.xlf b/src/Build/Resources/xlf/Strings.ru.xlf index 08bc455f497..003d44ffb95 100644 --- a/src/Build/Resources/xlf/Strings.ru.xlf +++ b/src/Build/Resources/xlf/Strings.ru.xlf @@ -391,9 +391,15 @@ - The "{0}" resolver attempted to resolve the SDK "{1}". {2} - The "{0}" resolver attempted to resolve the SDK "{1}". {2} - + The "{0}" resolver attempted to resolve the SDK "{1}". +Warnings: {2} +Errors: {3} + The "{0}" resolver attempted to resolve the SDK "{1}". +Warnings: {2} +Errors: {3} + + LOCALIZATION: "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". + MSB4242: SDK Resolver Failure: "{0}" diff --git a/src/Build/Resources/xlf/Strings.tr.xlf b/src/Build/Resources/xlf/Strings.tr.xlf index 7b93bf0b1e2..2a13d632520 100644 --- a/src/Build/Resources/xlf/Strings.tr.xlf +++ b/src/Build/Resources/xlf/Strings.tr.xlf @@ -391,9 +391,15 @@ - The "{0}" resolver attempted to resolve the SDK "{1}". {2} - The "{0}" resolver attempted to resolve the SDK "{1}". {2} - + The "{0}" resolver attempted to resolve the SDK "{1}". +Warnings: {2} +Errors: {3} + The "{0}" resolver attempted to resolve the SDK "{1}". +Warnings: {2} +Errors: {3} + + LOCALIZATION: "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". + MSB4242: SDK Resolver Failure: "{0}" diff --git a/src/Build/Resources/xlf/Strings.zh-Hans.xlf b/src/Build/Resources/xlf/Strings.zh-Hans.xlf index 0855cec7218..8a2783bbe81 100644 --- a/src/Build/Resources/xlf/Strings.zh-Hans.xlf +++ b/src/Build/Resources/xlf/Strings.zh-Hans.xlf @@ -391,9 +391,15 @@ - The "{0}" resolver attempted to resolve the SDK "{1}". {2} - The "{0}" resolver attempted to resolve the SDK "{1}". {2} - + The "{0}" resolver attempted to resolve the SDK "{1}". +Warnings: {2} +Errors: {3} + The "{0}" resolver attempted to resolve the SDK "{1}". +Warnings: {2} +Errors: {3} + + LOCALIZATION: "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". + MSB4242: SDK Resolver Failure: "{0}" diff --git a/src/Build/Resources/xlf/Strings.zh-Hant.xlf b/src/Build/Resources/xlf/Strings.zh-Hant.xlf index ae8b8426917..ba104d2c09a 100644 --- a/src/Build/Resources/xlf/Strings.zh-Hant.xlf +++ b/src/Build/Resources/xlf/Strings.zh-Hant.xlf @@ -391,9 +391,15 @@ - The "{0}" resolver attempted to resolve the SDK "{1}". {2} - The "{0}" resolver attempted to resolve the SDK "{1}". {2} - + The "{0}" resolver attempted to resolve the SDK "{1}". +Warnings: {2} +Errors: {3} + The "{0}" resolver attempted to resolve the SDK "{1}". +Warnings: {2} +Errors: {3} + + LOCALIZATION: "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". + MSB4242: SDK Resolver Failure: "{0}" From e152a54e4b552c5b0ad2d3752b2276e91a9a5a43 Mon Sep 17 00:00:00 2001 From: Surayya Huseyn Zada Date: Fri, 12 Jan 2024 11:10:00 +0100 Subject: [PATCH 07/10] add back the line --- src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs b/src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs index e8e6ae13c30..593cb00d1bc 100644 --- a/src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs +++ b/src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs @@ -210,6 +210,7 @@ public void AssertFirstResolverErrorsSupressedWhenResolved() var result = SdkResolverService.Instance.ResolveSdk(BuildEventContext.InvalidSubmissionId, sdk, _loggingContext, new MockElementLocation("file"), "sln", "projectPath", interactive: false, isRunningInVisualStudio: false, failOnUnresolvedSdk: true); result.Path.ShouldBe("resolverpath2"); + // Both resolvers should run, and no ERROR string. _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain("MockSdkResolver1 running"); _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain("MockSdkResolver2 running"); From 9597569ca394cee2ae85f37d5829ddc574e94221 Mon Sep 17 00:00:00 2001 From: Surayya Huseyn Zada Date: Fri, 12 Jan 2024 12:36:49 +0100 Subject: [PATCH 08/10] add localization comment and fix typo --- src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs | 2 +- src/Build/Resources/Strings.resx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs b/src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs index 593cb00d1bc..831ec4a4091 100644 --- a/src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs +++ b/src/Build.UnitTests/BackEnd/SdkResolverService_Tests.cs @@ -191,7 +191,7 @@ public void AssertSdkResolutionMessagesAreLogged() var result = SdkResolverService.Instance.ResolveSdk(BuildEventContext.InvalidSubmissionId, sdk, _loggingContext, new MockElementLocation("file"), "sln", "projectPath", interactive: false, isRunningInVisualStudio: false, failOnUnresolvedSdk: true); - // First resolver attemopted to resolve, but failed. + // First resolver attempted to resolve, but failed. _logger.BuildMessageEvents.Select(i => i.Message).ShouldContain(ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SDKResolverAttempt", nameof(MockResolverReturnsNull), sdk.ToString(), "null", ResourceUtilities.FormatResourceStringStripCodeAndKeyword("SDKResolverReturnedNull", nameof(MockResolverReturnsNull)))); // Second resolver succeeded. diff --git a/src/Build/Resources/Strings.resx b/src/Build/Resources/Strings.resx index 74446a978ac..17663002579 100644 --- a/src/Build/Resources/Strings.resx +++ b/src/Build/Resources/Strings.resx @@ -1332,7 +1332,7 @@ Warnings: {2} Errors: {3} - LOCALIZATION: "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". + LOCALIZATION: Do not localize the word SDK. "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". From 3c42fa93fac32bc42dc9d631d840696e8b476f97 Mon Sep 17 00:00:00 2001 From: Surayya Huseyn Zada Date: Fri, 12 Jan 2024 12:53:39 +0100 Subject: [PATCH 09/10] update localization strings --- src/Build/Resources/xlf/Strings.cs.xlf | 2 +- src/Build/Resources/xlf/Strings.de.xlf | 2 +- src/Build/Resources/xlf/Strings.es.xlf | 2 +- src/Build/Resources/xlf/Strings.fr.xlf | 2 +- src/Build/Resources/xlf/Strings.it.xlf | 2 +- src/Build/Resources/xlf/Strings.ja.xlf | 2 +- src/Build/Resources/xlf/Strings.ko.xlf | 2 +- src/Build/Resources/xlf/Strings.pl.xlf | 2 +- src/Build/Resources/xlf/Strings.pt-BR.xlf | 2 +- src/Build/Resources/xlf/Strings.ru.xlf | 2 +- src/Build/Resources/xlf/Strings.tr.xlf | 2 +- src/Build/Resources/xlf/Strings.zh-Hans.xlf | 2 +- src/Build/Resources/xlf/Strings.zh-Hant.xlf | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Build/Resources/xlf/Strings.cs.xlf b/src/Build/Resources/xlf/Strings.cs.xlf index d513fcf26ca..98f1e842d9e 100644 --- a/src/Build/Resources/xlf/Strings.cs.xlf +++ b/src/Build/Resources/xlf/Strings.cs.xlf @@ -398,7 +398,7 @@ Errors: {3} Warnings: {2} Errors: {3} - LOCALIZATION: "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". + LOCALIZATION: Do not localize the word SDK. "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". diff --git a/src/Build/Resources/xlf/Strings.de.xlf b/src/Build/Resources/xlf/Strings.de.xlf index 04b780035a1..06cd91d4856 100644 --- a/src/Build/Resources/xlf/Strings.de.xlf +++ b/src/Build/Resources/xlf/Strings.de.xlf @@ -398,7 +398,7 @@ Errors: {3} Warnings: {2} Errors: {3} - LOCALIZATION: "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". + LOCALIZATION: Do not localize the word SDK. "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". diff --git a/src/Build/Resources/xlf/Strings.es.xlf b/src/Build/Resources/xlf/Strings.es.xlf index c6cf1e26d8d..b81addddc61 100644 --- a/src/Build/Resources/xlf/Strings.es.xlf +++ b/src/Build/Resources/xlf/Strings.es.xlf @@ -398,7 +398,7 @@ Errors: {3} Warnings: {2} Errors: {3} - LOCALIZATION: "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". + LOCALIZATION: Do not localize the word SDK. "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". diff --git a/src/Build/Resources/xlf/Strings.fr.xlf b/src/Build/Resources/xlf/Strings.fr.xlf index af0667303a5..c605c002b8b 100644 --- a/src/Build/Resources/xlf/Strings.fr.xlf +++ b/src/Build/Resources/xlf/Strings.fr.xlf @@ -398,7 +398,7 @@ Errors: {3} Warnings: {2} Errors: {3} - LOCALIZATION: "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". + LOCALIZATION: Do not localize the word SDK. "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". diff --git a/src/Build/Resources/xlf/Strings.it.xlf b/src/Build/Resources/xlf/Strings.it.xlf index 4061e12daff..bf6f1947910 100644 --- a/src/Build/Resources/xlf/Strings.it.xlf +++ b/src/Build/Resources/xlf/Strings.it.xlf @@ -398,7 +398,7 @@ Errors: {3} Warnings: {2} Errors: {3} - LOCALIZATION: "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". + LOCALIZATION: Do not localize the word SDK. "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". diff --git a/src/Build/Resources/xlf/Strings.ja.xlf b/src/Build/Resources/xlf/Strings.ja.xlf index 32ea1effdb1..ec466b248e1 100644 --- a/src/Build/Resources/xlf/Strings.ja.xlf +++ b/src/Build/Resources/xlf/Strings.ja.xlf @@ -398,7 +398,7 @@ Errors: {3} Warnings: {2} Errors: {3} - LOCALIZATION: "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". + LOCALIZATION: Do not localize the word SDK. "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". diff --git a/src/Build/Resources/xlf/Strings.ko.xlf b/src/Build/Resources/xlf/Strings.ko.xlf index 500b5fc5186..5777254f213 100644 --- a/src/Build/Resources/xlf/Strings.ko.xlf +++ b/src/Build/Resources/xlf/Strings.ko.xlf @@ -398,7 +398,7 @@ Errors: {3} Warnings: {2} Errors: {3} - LOCALIZATION: "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". + LOCALIZATION: Do not localize the word SDK. "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". diff --git a/src/Build/Resources/xlf/Strings.pl.xlf b/src/Build/Resources/xlf/Strings.pl.xlf index 7ae7313210b..54916942030 100644 --- a/src/Build/Resources/xlf/Strings.pl.xlf +++ b/src/Build/Resources/xlf/Strings.pl.xlf @@ -398,7 +398,7 @@ Errors: {3} Warnings: {2} Errors: {3} - LOCALIZATION: "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". + LOCALIZATION: Do not localize the word SDK. "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". diff --git a/src/Build/Resources/xlf/Strings.pt-BR.xlf b/src/Build/Resources/xlf/Strings.pt-BR.xlf index 54c35ee11de..acc1c342208 100644 --- a/src/Build/Resources/xlf/Strings.pt-BR.xlf +++ b/src/Build/Resources/xlf/Strings.pt-BR.xlf @@ -398,7 +398,7 @@ Errors: {3} Warnings: {2} Errors: {3} - LOCALIZATION: "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". + LOCALIZATION: Do not localize the word SDK. "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". diff --git a/src/Build/Resources/xlf/Strings.ru.xlf b/src/Build/Resources/xlf/Strings.ru.xlf index 003d44ffb95..9d66b016fcd 100644 --- a/src/Build/Resources/xlf/Strings.ru.xlf +++ b/src/Build/Resources/xlf/Strings.ru.xlf @@ -398,7 +398,7 @@ Errors: {3} Warnings: {2} Errors: {3} - LOCALIZATION: "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". + LOCALIZATION: Do not localize the word SDK. "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". diff --git a/src/Build/Resources/xlf/Strings.tr.xlf b/src/Build/Resources/xlf/Strings.tr.xlf index 2a13d632520..5d9b88e244b 100644 --- a/src/Build/Resources/xlf/Strings.tr.xlf +++ b/src/Build/Resources/xlf/Strings.tr.xlf @@ -398,7 +398,7 @@ Errors: {3} Warnings: {2} Errors: {3} - LOCALIZATION: "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". + LOCALIZATION: Do not localize the word SDK. "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". diff --git a/src/Build/Resources/xlf/Strings.zh-Hans.xlf b/src/Build/Resources/xlf/Strings.zh-Hans.xlf index 8a2783bbe81..3705917e138 100644 --- a/src/Build/Resources/xlf/Strings.zh-Hans.xlf +++ b/src/Build/Resources/xlf/Strings.zh-Hans.xlf @@ -398,7 +398,7 @@ Errors: {3} Warnings: {2} Errors: {3} - LOCALIZATION: "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". + LOCALIZATION: Do not localize the word SDK. "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". diff --git a/src/Build/Resources/xlf/Strings.zh-Hant.xlf b/src/Build/Resources/xlf/Strings.zh-Hant.xlf index ba104d2c09a..0dad1aee9b1 100644 --- a/src/Build/Resources/xlf/Strings.zh-Hant.xlf +++ b/src/Build/Resources/xlf/Strings.zh-Hant.xlf @@ -398,7 +398,7 @@ Errors: {3} Warnings: {2} Errors: {3} - LOCALIZATION: "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". + LOCALIZATION: Do not localize the word SDK. "{2}" is new line separated warnings or "null". "{3}" is new line separated errors or "null". From 370c663d8f57ea0348988d6f79f0d53be0821e7a Mon Sep 17 00:00:00 2001 From: Surayya Huseyn Zada <114938397+surayya-MS@users.noreply.github.com> Date: Fri, 12 Jan 2024 14:29:02 +0100 Subject: [PATCH 10/10] Update src/Build/BackEnd/Components/SdkResolution/SdkResolverService.cs Co-authored-by: Ladi Prosek --- .../BackEnd/Components/SdkResolution/SdkResolverService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Build/BackEnd/Components/SdkResolution/SdkResolverService.cs b/src/Build/BackEnd/Components/SdkResolution/SdkResolverService.cs index 9181b84f74f..79c899b4dc2 100644 --- a/src/Build/BackEnd/Components/SdkResolution/SdkResolverService.cs +++ b/src/Build/BackEnd/Components/SdkResolution/SdkResolverService.cs @@ -369,7 +369,7 @@ private bool TryResolveSdkUsingSpecifiedResolvers( sdkResult = result; return true; } - else + else if (loggingContext.LoggingService.MinimumRequiredMessageImportance >= MessageImportance.Low) { string resultWarnings = result.Warnings?.Any() == true ? string.Join(Environment.NewLine, result.Warnings) : "null"; string resultErrors = result.Errors?.Any() == true ? string.Join(Environment.NewLine, result.Errors) : "null";