From 3fbf38b1b4f324f4201807f6e84bf18483641f75 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Thu, 27 Oct 2022 17:01:30 -0700 Subject: [PATCH 1/3] Detect corrupt sln file --- .../LocalizableStrings.resx | 2 +- src/Cli/dotnet/CommonLocalizableStrings.resx | 3 +++ src/Cli/dotnet/SlnFileExtensions.cs | 11 +++++++++-- src/Cli/dotnet/xlf/CommonLocalizableStrings.cs.xlf | 5 +++++ src/Cli/dotnet/xlf/CommonLocalizableStrings.de.xlf | 5 +++++ src/Cli/dotnet/xlf/CommonLocalizableStrings.es.xlf | 5 +++++ src/Cli/dotnet/xlf/CommonLocalizableStrings.fr.xlf | 5 +++++ src/Cli/dotnet/xlf/CommonLocalizableStrings.it.xlf | 5 +++++ src/Cli/dotnet/xlf/CommonLocalizableStrings.ja.xlf | 5 +++++ src/Cli/dotnet/xlf/CommonLocalizableStrings.ko.xlf | 5 +++++ src/Cli/dotnet/xlf/CommonLocalizableStrings.pl.xlf | 5 +++++ src/Cli/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf | 5 +++++ src/Cli/dotnet/xlf/CommonLocalizableStrings.ru.xlf | 5 +++++ src/Cli/dotnet/xlf/CommonLocalizableStrings.tr.xlf | 5 +++++ .../dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf | 5 +++++ .../dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf | 5 +++++ 16 files changed, 78 insertions(+), 3 deletions(-) diff --git a/src/Cli/Microsoft.DotNet.Cli.Sln.Internal/LocalizableStrings.resx b/src/Cli/Microsoft.DotNet.Cli.Sln.Internal/LocalizableStrings.resx index 20503793171b..524b72423138 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Sln.Internal/LocalizableStrings.resx +++ b/src/Cli/Microsoft.DotNet.Cli.Sln.Internal/LocalizableStrings.resx @@ -150,4 +150,4 @@ Closing section tag not found - \ No newline at end of file + diff --git a/src/Cli/dotnet/CommonLocalizableStrings.resx b/src/Cli/dotnet/CommonLocalizableStrings.resx index f99dc04589eb..8e1ef429f043 100644 --- a/src/Cli/dotnet/CommonLocalizableStrings.resx +++ b/src/Cli/dotnet/CommonLocalizableStrings.resx @@ -712,4 +712,7 @@ The default is 'true' if a runtime identifier is specified. A custom configuration was detected in the project '{0}', so the property '{1}' will not take effect. + + The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + diff --git a/src/Cli/dotnet/SlnFileExtensions.cs b/src/Cli/dotnet/SlnFileExtensions.cs index e8ab7b14a295..d11d75ced1d9 100644 --- a/src/Cli/dotnet/SlnFileExtensions.cs +++ b/src/Cli/dotnet/SlnFileExtensions.cs @@ -269,8 +269,15 @@ private static IDictionary GetSolutionFolderPaths( while (nestedProjects.ContainsKey(id)) { id = nestedProjects[id]; - var parentSlnProject = solutionFolderProjects.Where(p => p.Id == id).Single(); - path = Path.Combine(parentSlnProject.FilePath, path); + try + { + var parentSlnProject = solutionFolderProjects.Where(p => p.Id == id).Single(); + path = Path.Combine(parentSlnProject.FilePath, path); + } + catch (System.InvalidOperationException) + { + throw new Exception(String.Format(CommonLocalizableStrings.CorruptSolutionProjectFolderStructure, slnFile.FullPath, id)); + } } solutionFolderPaths[path] = slnProject.Id; diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.cs.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.cs.xlf index ec73ad5d9d63..8d55d7d55fa4 100644 --- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.cs.xlf +++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.cs.xlf @@ -32,6 +32,11 @@ Umožňuje instalaci předběžných verzí balíčků. + + The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + + Could not find any project in `{0}`. V {0} se nenašel žádný projekt. diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.de.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.de.xlf index ff28004f23ae..9832f38f93e7 100644 --- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.de.xlf +++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.de.xlf @@ -32,6 +32,11 @@ Ermöglicht die Installation von Paketen mit Vorabversionen. + + The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + + Could not find any project in `{0}`. In "{0}" wurde kein Projekt gefunden. diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.es.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.es.xlf index 0e364606b380..5a38240f8a4b 100644 --- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.es.xlf +++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.es.xlf @@ -32,6 +32,11 @@ Permite que se instalen paquetes de versión preliminar. + + The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + + Could not find any project in `{0}`. No se encuentra ningún proyecto en "{0}". diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.fr.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.fr.xlf index 12512d162bbb..955788e4fded 100644 --- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.fr.xlf +++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.fr.xlf @@ -32,6 +32,11 @@ Permet d'installer les packages de préversion. + + The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + + Could not find any project in `{0}`. Projet introuvable dans '{0}'. diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.it.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.it.xlf index 6de2e025e3a0..bcdd49576e47 100644 --- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.it.xlf +++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.it.xlf @@ -32,6 +32,11 @@ Consente l'installazione di pacchetti non definitivi. + + The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + + Could not find any project in `{0}`. Non è stato trovato alcun progetto in `{0}`. diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.ja.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.ja.xlf index 188add3bdb3a..5008e2c69b7f 100644 --- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.ja.xlf +++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.ja.xlf @@ -32,6 +32,11 @@ プレリリース パッケージのインストールを許可します。 + + The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + + Could not find any project in `{0}`. `{0}` にプロジェクトが見つかりませんでした。 diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.ko.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.ko.xlf index 25ceb045d347..c76d8d667641 100644 --- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.ko.xlf +++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.ko.xlf @@ -32,6 +32,11 @@ 시험판 패키지를 설치할 수 있습니다. + + The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + + Could not find any project in `{0}`. '{0}'에서 프로젝트를 찾을 수 없습니다. diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.pl.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.pl.xlf index 76ac44802f60..934bbab3c035 100644 --- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.pl.xlf +++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.pl.xlf @@ -32,6 +32,11 @@ Zezwala na instalowanie pakietów wersji wstępnych. + + The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + + Could not find any project in `{0}`. Nie można odnaleźć żadnego projektu w lokalizacji „{0}”. diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf index 0825aa6790c7..ae28a1095ed6 100644 --- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf +++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf @@ -32,6 +32,11 @@ Permite a instalação de pacotes de pré-lançamento. + + The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + + Could not find any project in `{0}`. Não foi possível encontrar nenhum projeto em ‘{0}’. diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.ru.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.ru.xlf index 1c135adfd965..c10b9559381e 100644 --- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.ru.xlf +++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.ru.xlf @@ -32,6 +32,11 @@ Разрешает установку пакетов предварительного выпуска. + + The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + + Could not find any project in `{0}`. Не удалось найти проекты в "{0}". diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.tr.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.tr.xlf index 2a8796ff7820..266c2f9cd356 100644 --- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.tr.xlf +++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.tr.xlf @@ -32,6 +32,11 @@ Ön sürüm paketlerinin yüklenmesini sağlar. + + The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + + Could not find any project in `{0}`. `{0}` içinde proje bulunamadı. diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf index 04292ed151ce..000688212936 100644 --- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf +++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf @@ -32,6 +32,11 @@ 允许安装预发行包。 + + The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + + Could not find any project in `{0}`. “{0}”中找不到任何项目。 diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf index 518db1927b54..87964359c84a 100644 --- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf +++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf @@ -32,6 +32,11 @@ 允許安裝發行前版本套件。 + + The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + + Could not find any project in `{0}`. 在 `{0}` 中找不到任何專案。 From 3cde2681639c8a24e56ecbfdc6c85492e45bcc6e Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Fri, 28 Oct 2022 09:50:57 -0700 Subject: [PATCH 2/3] Improve error quality --- src/Cli/dotnet/SlnFileExtensions.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Cli/dotnet/SlnFileExtensions.cs b/src/Cli/dotnet/SlnFileExtensions.cs index d11d75ced1d9..e7b1e223cead 100644 --- a/src/Cli/dotnet/SlnFileExtensions.cs +++ b/src/Cli/dotnet/SlnFileExtensions.cs @@ -190,7 +190,7 @@ private static string MapSolutionConfigKeyToProjectConfigKey( Dictionary projectPlatforms, string defaultProjectPlatform) { - var pair = solutionConfigKey.Split(new char[] {'|'}, 2); + var pair = solutionConfigKey.Split(new char[] { '|' }, 2); if (pair.Length != 2) { return null; @@ -276,7 +276,8 @@ private static IDictionary GetSolutionFolderPaths( } catch (System.InvalidOperationException) { - throw new Exception(String.Format(CommonLocalizableStrings.CorruptSolutionProjectFolderStructure, slnFile.FullPath, id)); + Reporter.Error.WriteLine(String.Format(CommonLocalizableStrings.CorruptSolutionProjectFolderStructure, slnFile.FullPath, id).Red()); + Environment.Exit(1); } } From e08720844d45505bc64a76f9d2a00ebc7b086c4c Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Thu, 3 Nov 2022 15:23:01 -0700 Subject: [PATCH 3/3] Update error message and respond to feedback --- src/Cli/dotnet/CommonLocalizableStrings.resx | 2 +- src/Cli/dotnet/SlnFileExtensions.cs | 14 ++++---------- src/Cli/dotnet/xlf/CommonLocalizableStrings.cs.xlf | 4 ++-- src/Cli/dotnet/xlf/CommonLocalizableStrings.de.xlf | 4 ++-- src/Cli/dotnet/xlf/CommonLocalizableStrings.es.xlf | 4 ++-- src/Cli/dotnet/xlf/CommonLocalizableStrings.fr.xlf | 4 ++-- src/Cli/dotnet/xlf/CommonLocalizableStrings.it.xlf | 4 ++-- src/Cli/dotnet/xlf/CommonLocalizableStrings.ja.xlf | 4 ++-- src/Cli/dotnet/xlf/CommonLocalizableStrings.ko.xlf | 4 ++-- src/Cli/dotnet/xlf/CommonLocalizableStrings.pl.xlf | 4 ++-- .../dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf | 4 ++-- src/Cli/dotnet/xlf/CommonLocalizableStrings.ru.xlf | 4 ++-- src/Cli/dotnet/xlf/CommonLocalizableStrings.tr.xlf | 4 ++-- .../xlf/CommonLocalizableStrings.zh-Hans.xlf | 4 ++-- .../xlf/CommonLocalizableStrings.zh-Hant.xlf | 4 ++-- 15 files changed, 31 insertions(+), 37 deletions(-) diff --git a/src/Cli/dotnet/CommonLocalizableStrings.resx b/src/Cli/dotnet/CommonLocalizableStrings.resx index 8e1ef429f043..02eafb9f1c1a 100644 --- a/src/Cli/dotnet/CommonLocalizableStrings.resx +++ b/src/Cli/dotnet/CommonLocalizableStrings.resx @@ -713,6 +713,6 @@ The default is 'true' if a runtime identifier is specified. A custom configuration was detected in the project '{0}', so the property '{1}' will not take effect. - The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project folder mappings around project GUID: '{1}'. Manually repair the solution or try to open and save it in Visual Studio." diff --git a/src/Cli/dotnet/SlnFileExtensions.cs b/src/Cli/dotnet/SlnFileExtensions.cs index e7b1e223cead..445a37fec664 100644 --- a/src/Cli/dotnet/SlnFileExtensions.cs +++ b/src/Cli/dotnet/SlnFileExtensions.cs @@ -269,16 +269,10 @@ private static IDictionary GetSolutionFolderPaths( while (nestedProjects.ContainsKey(id)) { id = nestedProjects[id]; - try - { - var parentSlnProject = solutionFolderProjects.Where(p => p.Id == id).Single(); - path = Path.Combine(parentSlnProject.FilePath, path); - } - catch (System.InvalidOperationException) - { - Reporter.Error.WriteLine(String.Format(CommonLocalizableStrings.CorruptSolutionProjectFolderStructure, slnFile.FullPath, id).Red()); - Environment.Exit(1); - } + var parentSlnProject = solutionFolderProjects.Where(p => p.Id == id).SingleOrDefault(); + if(parentSlnProject == null) // see: https://github.com/dotnet/sdk/pull/28811 + throw new GracefulException(CommonLocalizableStrings.CorruptSolutionProjectFolderStructure, slnFile.FullPath, id); + path = Path.Combine(parentSlnProject.FilePath, path); } solutionFolderPaths[path] = slnProject.Id; diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.cs.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.cs.xlf index 8d55d7d55fa4..1b5b430edf10 100644 --- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.cs.xlf +++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.cs.xlf @@ -33,8 +33,8 @@ - The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." - The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project folder mappings around project GUID: '{1}'. Manually repair the solution or try to open and save it in Visual Studio." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project folder mappings around project GUID: '{1}'. Manually repair the solution or try to open and save it in Visual Studio." diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.de.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.de.xlf index 9832f38f93e7..133355f23bbc 100644 --- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.de.xlf +++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.de.xlf @@ -33,8 +33,8 @@ - The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." - The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project folder mappings around project GUID: '{1}'. Manually repair the solution or try to open and save it in Visual Studio." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project folder mappings around project GUID: '{1}'. Manually repair the solution or try to open and save it in Visual Studio." diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.es.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.es.xlf index 5a38240f8a4b..94376169b0ab 100644 --- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.es.xlf +++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.es.xlf @@ -33,8 +33,8 @@ - The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." - The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project folder mappings around project GUID: '{1}'. Manually repair the solution or try to open and save it in Visual Studio." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project folder mappings around project GUID: '{1}'. Manually repair the solution or try to open and save it in Visual Studio." diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.fr.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.fr.xlf index 955788e4fded..1a7078e0a639 100644 --- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.fr.xlf +++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.fr.xlf @@ -33,8 +33,8 @@ - The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." - The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project folder mappings around project GUID: '{1}'. Manually repair the solution or try to open and save it in Visual Studio." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project folder mappings around project GUID: '{1}'. Manually repair the solution or try to open and save it in Visual Studio." diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.it.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.it.xlf index bcdd49576e47..bbd8c8e2794e 100644 --- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.it.xlf +++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.it.xlf @@ -33,8 +33,8 @@ - The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." - The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project folder mappings around project GUID: '{1}'. Manually repair the solution or try to open and save it in Visual Studio." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project folder mappings around project GUID: '{1}'. Manually repair the solution or try to open and save it in Visual Studio." diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.ja.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.ja.xlf index 5008e2c69b7f..6f755a5a7a17 100644 --- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.ja.xlf +++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.ja.xlf @@ -33,8 +33,8 @@ - The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." - The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project folder mappings around project GUID: '{1}'. Manually repair the solution or try to open and save it in Visual Studio." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project folder mappings around project GUID: '{1}'. Manually repair the solution or try to open and save it in Visual Studio." diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.ko.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.ko.xlf index c76d8d667641..a8f06856d009 100644 --- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.ko.xlf +++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.ko.xlf @@ -33,8 +33,8 @@ - The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." - The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project folder mappings around project GUID: '{1}'. Manually repair the solution or try to open and save it in Visual Studio." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project folder mappings around project GUID: '{1}'. Manually repair the solution or try to open and save it in Visual Studio." diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.pl.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.pl.xlf index 934bbab3c035..d6786d00213b 100644 --- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.pl.xlf +++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.pl.xlf @@ -33,8 +33,8 @@ - The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." - The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project folder mappings around project GUID: '{1}'. Manually repair the solution or try to open and save it in Visual Studio." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project folder mappings around project GUID: '{1}'. Manually repair the solution or try to open and save it in Visual Studio." diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf index ae28a1095ed6..d74794bfe5dc 100644 --- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf +++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf @@ -33,8 +33,8 @@ - The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." - The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project folder mappings around project GUID: '{1}'. Manually repair the solution or try to open and save it in Visual Studio." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project folder mappings around project GUID: '{1}'. Manually repair the solution or try to open and save it in Visual Studio." diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.ru.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.ru.xlf index c10b9559381e..5b64f66d9f80 100644 --- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.ru.xlf +++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.ru.xlf @@ -33,8 +33,8 @@ - The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." - The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project folder mappings around project GUID: '{1}'. Manually repair the solution or try to open and save it in Visual Studio." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project folder mappings around project GUID: '{1}'. Manually repair the solution or try to open and save it in Visual Studio." diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.tr.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.tr.xlf index 266c2f9cd356..29aff2576a53 100644 --- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.tr.xlf +++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.tr.xlf @@ -33,8 +33,8 @@ - The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." - The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project folder mappings around project GUID: '{1}'. Manually repair the solution or try to open and save it in Visual Studio." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project folder mappings around project GUID: '{1}'. Manually repair the solution or try to open and save it in Visual Studio." diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf index 000688212936..2047e165e8b5 100644 --- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf +++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf @@ -33,8 +33,8 @@ - The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." - The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project folder mappings around project GUID: '{1}'. Manually repair the solution or try to open and save it in Visual Studio." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project folder mappings around project GUID: '{1}'. Manually repair the solution or try to open and save it in Visual Studio." diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf index 87964359c84a..5dd189e90973 100644 --- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf +++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf @@ -33,8 +33,8 @@ - The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." - The solution file '{0}' is missing EndProject tags or has invalid child-parent project mappings. Thus, the project with GUID '{1}' failed to load. Try saving your sln in VS to repair it." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project folder mappings around project GUID: '{1}'. Manually repair the solution or try to open and save it in Visual Studio." + The solution file '{0}' is missing EndProject tags or has invalid child-parent project folder mappings around project GUID: '{1}'. Manually repair the solution or try to open and save it in Visual Studio."