diff --git a/src/Cli/dotnet/CommonOptions.cs b/src/Cli/dotnet/CommonOptions.cs index aa1730a23525..13663b3cc5c2 100644 --- a/src/Cli/dotnet/CommonOptions.cs +++ b/src/Cli/dotnet/CommonOptions.cs @@ -175,7 +175,7 @@ public static Option FrameworkOption(string description) => HelpName = CliStrings.FrameworkArgumentName } .AddCompletions(CliCompletion.TargetFrameworksFromProjectFile) - .ForwardAsSingle(o => $"--property:TargetFramework={o}"); + .ForwardAsMany(o => [$"--property:TargetFramework={o}", "--property:_CommandLineDefinedTargetFramework=true"]); public static Option ArtifactsPathOption = new ForwardedOption( diff --git a/src/Tasks/Common/Resources/Strings.resx b/src/Tasks/Common/Resources/Strings.resx index 518abb95d3de..442919e9692c 100644 --- a/src/Tasks/Common/Resources/Strings.resx +++ b/src/Tasks/Common/Resources/Strings.resx @@ -1010,5 +1010,9 @@ You may need to build the project on another operating system or architecture, o NETSDK1233: Targeting .NET 10.0 or higher in Visual Studio 2022 17.14 is not supported. {StrBegins="NETSDK1233: "} - + + NETSDK1234: The "--framework" option isn't supported when building a solution. Specifying a solution-level framework results in all projects building for that framework, which can cause referenced projects to build multiple times and can lead to inconsistent builds. + {StrBegins="NETSDK1234: "}{Locked="--framework"} + + diff --git a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf index b3150ec53b65..e889a168aaa5 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf @@ -182,6 +182,11 @@ NETSDK1134: Vytváření řešení s konkrétním identifikátorem RuntimeIdentifier se nepodporuje. Pokud chcete publikovat pro jedno RID, zadejte místo toho RID na úrovni jednotlivých projektů. {StrBegins="NETSDK1134: "} + + NETSDK1234: The "--framework" option isn't supported when building a solution. Specifying a solution-level framework results in all projects building for that framework, which can cause referenced projects to build multiple times and can lead to inconsistent builds. + NETSDK1234: The "--framework" option isn't supported when building a solution. Specifying a solution-level framework results in all projects building for that framework, which can cause referenced projects to build multiple times and can lead to inconsistent builds. + {StrBegins="NETSDK1234: "}{Locked="--framework"} + NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}. NETSDK1135: SupportedOSPlatformVersion {0} nemůže být větší než TargetPlatformVersion {1}. diff --git a/src/Tasks/Common/Resources/xlf/Strings.de.xlf b/src/Tasks/Common/Resources/xlf/Strings.de.xlf index 2d96be400f70..754ff56aaa32 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.de.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.de.xlf @@ -182,6 +182,11 @@ NETSDK1134: Das Erstellen einer Lösung mit einem bestimmten RuntimeIdentifier wird nicht unterstützt. Wenn Sie für eine einzelne RID veröffentlichen möchten, geben Sie stattdessen die RID auf der Ebene des einzelnen Projekts an. {StrBegins="NETSDK1134: "} + + NETSDK1234: The "--framework" option isn't supported when building a solution. Specifying a solution-level framework results in all projects building for that framework, which can cause referenced projects to build multiple times and can lead to inconsistent builds. + NETSDK1234: The "--framework" option isn't supported when building a solution. Specifying a solution-level framework results in all projects building for that framework, which can cause referenced projects to build multiple times and can lead to inconsistent builds. + {StrBegins="NETSDK1234: "}{Locked="--framework"} + NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}. NETSDK1135: SupportedOSPlatformVersion {0} darf nicht höher sein als TargetPlatformVersion {1}. diff --git a/src/Tasks/Common/Resources/xlf/Strings.es.xlf b/src/Tasks/Common/Resources/xlf/Strings.es.xlf index c809c4172947..2acfc10c4d3e 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.es.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.es.xlf @@ -182,6 +182,11 @@ NETSDK1134: No se admite la creación de una solución con un runtimeIdentifier específico. Si deseas publicar para un único RID, especifica el RID en el nivel de proyecto individual en su lugar. {StrBegins="NETSDK1134: "} + + NETSDK1234: The "--framework" option isn't supported when building a solution. Specifying a solution-level framework results in all projects building for that framework, which can cause referenced projects to build multiple times and can lead to inconsistent builds. + NETSDK1234: The "--framework" option isn't supported when building a solution. Specifying a solution-level framework results in all projects building for that framework, which can cause referenced projects to build multiple times and can lead to inconsistent builds. + {StrBegins="NETSDK1234: "}{Locked="--framework"} + NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}. NETSDK1135: El valor de SupportedOSPlatformVersion {0} no puede ser mayor que TargetPlatformVersion {1}. diff --git a/src/Tasks/Common/Resources/xlf/Strings.fr.xlf b/src/Tasks/Common/Resources/xlf/Strings.fr.xlf index 4f8f47200d1c..551e6c89ed1c 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.fr.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.fr.xlf @@ -182,6 +182,11 @@ NETSDK1134: la création d'une solution avec un RuntimeIdentifier spécifique n'est pas prise en charge. Si vous souhaitez publier pour un seul RID, spécifiez plutôt le RID au niveau du projet individuel. {StrBegins="NETSDK1134: "} + + NETSDK1234: The "--framework" option isn't supported when building a solution. Specifying a solution-level framework results in all projects building for that framework, which can cause referenced projects to build multiple times and can lead to inconsistent builds. + NETSDK1234: The "--framework" option isn't supported when building a solution. Specifying a solution-level framework results in all projects building for that framework, which can cause referenced projects to build multiple times and can lead to inconsistent builds. + {StrBegins="NETSDK1234: "}{Locked="--framework"} + NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}. NETSDK1135: le SupportedOSPlatformVersion {0} ne doit pas être supérieur au TargetPlatformVersion {1}. diff --git a/src/Tasks/Common/Resources/xlf/Strings.it.xlf b/src/Tasks/Common/Resources/xlf/Strings.it.xlf index 6f47775c6a67..bf1c21644c58 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.it.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.it.xlf @@ -182,6 +182,11 @@ NETSDK1134: non è supportata la compilazione di una soluzione con un parametro RuntimeIdentifier specifico. Se si desidera pubblicare per un singolo RID, specificare il RID a livello di singolo progetto. {StrBegins="NETSDK1134: "} + + NETSDK1234: The "--framework" option isn't supported when building a solution. Specifying a solution-level framework results in all projects building for that framework, which can cause referenced projects to build multiple times and can lead to inconsistent builds. + NETSDK1234: The "--framework" option isn't supported when building a solution. Specifying a solution-level framework results in all projects building for that framework, which can cause referenced projects to build multiple times and can lead to inconsistent builds. + {StrBegins="NETSDK1234: "}{Locked="--framework"} + NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}. NETSDK1135: il valore di SupportedOSPlatformVersion {0} non può essere maggiore di quello di TargetPlatformVersion {1}. diff --git a/src/Tasks/Common/Resources/xlf/Strings.ja.xlf b/src/Tasks/Common/Resources/xlf/Strings.ja.xlf index 03fb4261129c..7427d0e6dab2 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ja.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ja.xlf @@ -182,6 +182,11 @@ NETSDK1134: 特定の RuntimeIdentifier を使用したソリューションのビルドはサポートされていません。単一の RID に対して発行する場合は、個々のプロジェクト レベルで RID を指定してください。 {StrBegins="NETSDK1134: "} + + NETSDK1234: The "--framework" option isn't supported when building a solution. Specifying a solution-level framework results in all projects building for that framework, which can cause referenced projects to build multiple times and can lead to inconsistent builds. + NETSDK1234: The "--framework" option isn't supported when building a solution. Specifying a solution-level framework results in all projects building for that framework, which can cause referenced projects to build multiple times and can lead to inconsistent builds. + {StrBegins="NETSDK1234: "}{Locked="--framework"} + NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}. NETSDK1135: SupportedOSPlatformVersion {0} を TargetPlatformVersion {1} より大きくすることはできません。 diff --git a/src/Tasks/Common/Resources/xlf/Strings.ko.xlf b/src/Tasks/Common/Resources/xlf/Strings.ko.xlf index 367083c96234..072ea65f923e 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ko.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ko.xlf @@ -182,6 +182,11 @@ NETSDK1134: 특정 RuntimeIdentifier를 사용하여 솔루션을 빌드하는 것은 지원되지 않습니다. 단일 RID에 대해 게시하려는 경우 개별 프로젝트 수준에서 RID를 대신 지정합니다. {StrBegins="NETSDK1134: "} + + NETSDK1234: The "--framework" option isn't supported when building a solution. Specifying a solution-level framework results in all projects building for that framework, which can cause referenced projects to build multiple times and can lead to inconsistent builds. + NETSDK1234: The "--framework" option isn't supported when building a solution. Specifying a solution-level framework results in all projects building for that framework, which can cause referenced projects to build multiple times and can lead to inconsistent builds. + {StrBegins="NETSDK1234: "}{Locked="--framework"} + NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}. NETSDK1135: SupportedOSPlatformVersion {0}은(는) TargetPlatformVersion {1}보다 높을 수 없습니다. diff --git a/src/Tasks/Common/Resources/xlf/Strings.pl.xlf b/src/Tasks/Common/Resources/xlf/Strings.pl.xlf index 9ae273652d32..c309a44b9f7e 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.pl.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.pl.xlf @@ -182,6 +182,11 @@ NETSDK1134: tworzenie rozwiązania z określonym identyfikatorem RuntimeIdentifier nie jest obsługiwane. Jeśli chcesz dokonać publikacji tylko dla jednego identyfikatora RID, określ identyfikator RID na poziomie projektu indywidualnego. {StrBegins="NETSDK1134: "} + + NETSDK1234: The "--framework" option isn't supported when building a solution. Specifying a solution-level framework results in all projects building for that framework, which can cause referenced projects to build multiple times and can lead to inconsistent builds. + NETSDK1234: The "--framework" option isn't supported when building a solution. Specifying a solution-level framework results in all projects building for that framework, which can cause referenced projects to build multiple times and can lead to inconsistent builds. + {StrBegins="NETSDK1234: "}{Locked="--framework"} + NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}. NETSDK1135: Element SupportedOSPlatformVersion {0} nie może być większy niż element TargetPlatformVersion {1}. diff --git a/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf b/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf index e5dd12698ed0..4a13c527c07f 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf @@ -182,6 +182,11 @@ NETSDK1134: Não há suporte para a criação de uma solução com um RuntimeIdentifier específico. Se você quiser publicar para um único RID, especifique o RID no nível do projeto individual. {StrBegins="NETSDK1134: "} + + NETSDK1234: The "--framework" option isn't supported when building a solution. Specifying a solution-level framework results in all projects building for that framework, which can cause referenced projects to build multiple times and can lead to inconsistent builds. + NETSDK1234: The "--framework" option isn't supported when building a solution. Specifying a solution-level framework results in all projects building for that framework, which can cause referenced projects to build multiple times and can lead to inconsistent builds. + {StrBegins="NETSDK1234: "}{Locked="--framework"} + NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}. NETSDK1135: SupportedOSPlatformVersion {0} não pode ser superior a TargetPlatformVersion {1}. diff --git a/src/Tasks/Common/Resources/xlf/Strings.ru.xlf b/src/Tasks/Common/Resources/xlf/Strings.ru.xlf index 80990c05eb42..9902580b1cea 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ru.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ru.xlf @@ -182,6 +182,11 @@ NETSDK1134: сборка решения с заданным идентификатором RuntimeIdentifier не поддерживается. Если вы хотите выполнить публикацию для одного RID, укажите RID на уровне отдельного проекта. {StrBegins="NETSDK1134: "} + + NETSDK1234: The "--framework" option isn't supported when building a solution. Specifying a solution-level framework results in all projects building for that framework, which can cause referenced projects to build multiple times and can lead to inconsistent builds. + NETSDK1234: The "--framework" option isn't supported when building a solution. Specifying a solution-level framework results in all projects building for that framework, which can cause referenced projects to build multiple times and can lead to inconsistent builds. + {StrBegins="NETSDK1234: "}{Locked="--framework"} + NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}. NETSDK1135: версия SupportedOSPlatformVersion {0} не может быть выше версии TargetPlatformVersion {1}. diff --git a/src/Tasks/Common/Resources/xlf/Strings.tr.xlf b/src/Tasks/Common/Resources/xlf/Strings.tr.xlf index 3d5a18e84483..11e5529b5b11 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.tr.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.tr.xlf @@ -182,6 +182,11 @@ NETSDK1134: Belirli bir RuntimeIdentifier ile bir çözüm oluşturma desteklenmiyor. Tek bir RID için yayımlamak istiyorsanız, bunun yerine ilgili proje düzeyindeki RID'yi belirtin. {StrBegins="NETSDK1134: "} + + NETSDK1234: The "--framework" option isn't supported when building a solution. Specifying a solution-level framework results in all projects building for that framework, which can cause referenced projects to build multiple times and can lead to inconsistent builds. + NETSDK1234: The "--framework" option isn't supported when building a solution. Specifying a solution-level framework results in all projects building for that framework, which can cause referenced projects to build multiple times and can lead to inconsistent builds. + {StrBegins="NETSDK1234: "}{Locked="--framework"} + NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}. NETSDK1135: {0} SupportedOSPlatformVersion, {1} TargetPlatformVersion değerinden yüksek olamaz. diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf index 4724120c66ed..cb618b8d9651 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf @@ -182,6 +182,11 @@ NETSDK1134: 不支持使用特定 RuntimeIdentifier 生成解决方案。如果要为单个 RID 发布，请改为在单独的项目级别指定 RID。 {StrBegins="NETSDK1134: "} + + NETSDK1234: The "--framework" option isn't supported when building a solution. Specifying a solution-level framework results in all projects building for that framework, which can cause referenced projects to build multiple times and can lead to inconsistent builds. + NETSDK1234: The "--framework" option isn't supported when building a solution. Specifying a solution-level framework results in all projects building for that framework, which can cause referenced projects to build multiple times and can lead to inconsistent builds. + {StrBegins="NETSDK1234: "}{Locked="--framework"} + NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}. NETSDK1135: SupportedOSPlatformVersion {0} 不能高于 TargetPlatformVersion {1}。 diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf index 9d8d0bf09817..c5da2a806ab2 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf @@ -182,6 +182,11 @@ NETSDK1134: 不支援使用特定 RuntimeIdentifier 建置解決方案。若要發佈單一 RID，請改為在個別專案層級指定 RID。 {StrBegins="NETSDK1134: "} + + NETSDK1234: The "--framework" option isn't supported when building a solution. Specifying a solution-level framework results in all projects building for that framework, which can cause referenced projects to build multiple times and can lead to inconsistent builds. + NETSDK1234: The "--framework" option isn't supported when building a solution. Specifying a solution-level framework results in all projects building for that framework, which can cause referenced projects to build multiple times and can lead to inconsistent builds. + {StrBegins="NETSDK1234: "}{Locked="--framework"} + NETSDK1135: SupportedOSPlatformVersion {0} cannot be higher than TargetPlatformVersion {1}. NETSDK1135: SupportedOSPlatformVersion {0} 不得高於 TargetPlatformVersion {1}。 diff --git a/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/msbuildExtensions-ver/SolutionFile/ImportAfter/Microsoft.NET.Sdk.Solution.targets b/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/msbuildExtensions-ver/SolutionFile/ImportAfter/Microsoft.NET.Sdk.Solution.targets index 3cb04c4b9959..4515079d37b4 100644 --- a/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/msbuildExtensions-ver/SolutionFile/ImportAfter/Microsoft.NET.Sdk.Solution.targets +++ b/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/msbuildExtensions-ver/SolutionFile/ImportAfter/Microsoft.NET.Sdk.Solution.targets @@ -37,4 +37,12 @@ Copyright (c) .NET Foundation. All rights reserved. + + + + + +