diff --git a/.vsts-ci.yml b/.vsts-ci.yml index f552a15920e3..e28a658a8d28 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -5,7 +5,7 @@ trigger: branches: include: - main - - release/10.0.3* + - release/10.0.4* - internal/release/* - exp/* @@ -104,7 +104,7 @@ extends: publishTaskPrefix: 1ES. populateInternalRuntimeVariables: true runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) - locBranch: release/10.0.3xx + locBranch: release/10.0.4xx # WORKAROUND: BinSkim requires the folder exist prior to scanning. preSteps: - powershell: New-Item -ItemType Directory -Path $(Build.SourcesDirectory)/artifacts/bin -Force diff --git a/src/Cli/Microsoft.DotNet.FileBasedPrograms/xlf/FileBasedProgramsResources.zh-Hant.xlf b/src/Cli/Microsoft.DotNet.FileBasedPrograms/xlf/FileBasedProgramsResources.zh-Hant.xlf index 7d2c81a0428d..a6aa49ad64fd 100644 --- a/src/Cli/Microsoft.DotNet.FileBasedPrograms/xlf/FileBasedProgramsResources.zh-Hant.xlf +++ b/src/Cli/Microsoft.DotNet.FileBasedPrograms/xlf/FileBasedProgramsResources.zh-Hant.xlf @@ -64,7 +64,7 @@ The '#:ref' directive is invalid: {0} - The '#:ref' directive is invalid: {0} + '#:ref' 指示詞無效: {0} {Locked="#:ref"}{0} is the inner error message. diff --git a/src/Cli/dotnet/CommandFactory/CommandResolution/MuxerCommandSpecMaker.cs b/src/Cli/dotnet/CommandFactory/CommandResolution/MuxerCommandSpecMaker.cs index 63a3ecae1d5b..57b2db2ba6e0 100644 --- a/src/Cli/dotnet/CommandFactory/CommandResolution/MuxerCommandSpecMaker.cs +++ b/src/Cli/dotnet/CommandFactory/CommandResolution/MuxerCommandSpecMaker.cs @@ -38,7 +38,7 @@ internal static CommandSpec CreatePackageCommandSpecUsingMuxer( { if (rollForwardArgument.Any()) { - arguments.AddRange(commandArguments.Except(rollForwardArgument)); + arguments.AddRange(commandArguments.Where(arg => !arg.Equals("--allow-roll-forward", StringComparison.OrdinalIgnoreCase))); } else { diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf index e07f0214c790..58fe26ffcca6 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf @@ -1500,12 +1500,12 @@ Cílem projektu je více architektur. Pomocí parametru {0} určete, která arch Warning: '{0}' looks like a file-based app but the file was not found, and it was passed as an argument to the project '{1}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. - Warning: '{0}' looks like a file-based app but the file was not found, and it was passed as an argument to the project '{1}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. + Upozornění: {0} vypadá jako souborová aplikace, ale soubor nebyl nalezen a byl předán jako argument projektu {1}. Pokud ho chcete předat jako argument aplikace, použijte dotnet run -- {0}, čímž toto upozornění potlačíte. {0} is the .cs file path argument. {1} is the project file path.{Locked="dotnet run --"} Warning: '{0}' appears to be a file-based app but was passed as an argument to the project '{1}'. To run it as a file-based app, use 'dotnet run --file {0}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. - Warning: '{0}' appears to be a file-based app but was passed as an argument to the project '{1}'. To run it as a file-based app, use 'dotnet run --file {0}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. + Upozornění: {0} vypadá jako souborová aplikace, ale byl předán jako argument projektu {1}. Pokud ho chcete spustit jako souborovou aplikaci, použijte příkaz dotnet run --file {0}. Pokud ho chcete předat jako argument aplikace, použijte dotnet run -- {0}, čímž toto upozornění potlačíte. {0} is the file path argument. {1} is the project file path.{Locked="dotnet run --file"}{Locked="dotnet run --"} @@ -2081,12 +2081,12 @@ příkazu „dotnet tool list“. Warning: '{0}' looks like a file-based app but the file was not found, and it was treated as an MSBuild argument. - Warning: '{0}' looks like a file-based app but the file was not found, and it was treated as an MSBuild argument. + Upozornění: {0} vypadá jako souborová aplikace, ale soubor nebyl nalezen a byl považován za argument MSBuild. {0} is the .cs file path argument. Warning: '{0}' appears to be a file-based app but was treated as an MSBuild argument. To treat it as a file-based app, use 'dotnet {1} {0}'. - Warning: '{0}' appears to be a file-based app but was treated as an MSBuild argument. To treat it as a file-based app, use 'dotnet {1} {0}'. + Upozornění: {0} vypadá jako souborová aplikace, ale bylo s ní zacházeno jako s argumentem MSBuild. Pokud ji chcete považovat za souborovou aplikaci, použijte dotnet {1} {0}. {0} is the file path argument. {1} is the command name (e.g. build, clean, publish).{Locked="dotnet"} diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf index 18a5eeff1d7d..9900e1504395 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf @@ -1500,12 +1500,12 @@ Ihr Projekt verwendet mehrere Zielframeworks. Geben Sie über "{0}" an, welches Warning: '{0}' looks like a file-based app but the file was not found, and it was passed as an argument to the project '{1}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. - Warning: '{0}' looks like a file-based app but the file was not found, and it was passed as an argument to the project '{1}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. + Warnung: „{0}“ sieht wie eine dateibasierte App aus, aber die Datei wurde nicht gefunden und als Argument an das Projekt „{1}“ übergeben. Um es als Anwendungsargument zu übergeben, verwenden Sie „dotnet run -- {0}“, um diese Warnung zu unterdrücken. {0} is the .cs file path argument. {1} is the project file path.{Locked="dotnet run --"} Warning: '{0}' appears to be a file-based app but was passed as an argument to the project '{1}'. To run it as a file-based app, use 'dotnet run --file {0}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. - Warning: '{0}' appears to be a file-based app but was passed as an argument to the project '{1}'. To run it as a file-based app, use 'dotnet run --file {0}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. + Warnung: „{0}“ scheint eine dateibasierte App zu sein, wurde aber als Argument an das Projekt „{1}“ übergeben. Um sie als dateibasierte App auszuführen, verwenden Sie „dotnet run --file {0}“. Um es als Anwendungsargument zu übergeben, verwenden Sie „dotnet run -- {0}“, um diese Warnung zu unterdrücken. {0} is the file path argument. {1} is the project file path.{Locked="dotnet run --file"}{Locked="dotnet run --"} @@ -2081,12 +2081,12 @@ und die zugehörigen Paket-IDs für installierte Tools über den Befehl Warning: '{0}' looks like a file-based app but the file was not found, and it was treated as an MSBuild argument. - Warning: '{0}' looks like a file-based app but the file was not found, and it was treated as an MSBuild argument. + Warnung: „{0}“ sieht wie eine dateibasierte App aus, aber die Datei wurde nicht gefunden und als MSBuild-Argument behandelt. {0} is the .cs file path argument. Warning: '{0}' appears to be a file-based app but was treated as an MSBuild argument. To treat it as a file-based app, use 'dotnet {1} {0}'. - Warning: '{0}' appears to be a file-based app but was treated as an MSBuild argument. To treat it as a file-based app, use 'dotnet {1} {0}'. + Warnung: „{0}“ scheint eine dateibasierte App zu sein, wurde aber als MSBuild-Argument behandelt. Verwenden Sie „dotnet {1} {0}“, um sie als dateibasierte App zu behandeln. {0} is the file path argument. {1} is the command name (e.g. build, clean, publish).{Locked="dotnet"} diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf index 61cf2fafbf85..b174c111c0ae 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf @@ -1500,12 +1500,12 @@ Su proyecto tiene como destino varias plataformas. Especifique la que quiere usa Warning: '{0}' looks like a file-based app but the file was not found, and it was passed as an argument to the project '{1}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. - Warning: '{0}' looks like a file-based app but the file was not found, and it was passed as an argument to the project '{1}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. + Advertencia: "{0}" parece una aplicación basada en archivos, pero no se encontró el archivo y se pasó como argumento al proyecto "{1}". Para pasarlo como argumento de aplicación, use "dotnet run -- {0}" para suprimir esta advertencia. {0} is the .cs file path argument. {1} is the project file path.{Locked="dotnet run --"} Warning: '{0}' appears to be a file-based app but was passed as an argument to the project '{1}'. To run it as a file-based app, use 'dotnet run --file {0}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. - Warning: '{0}' appears to be a file-based app but was passed as an argument to the project '{1}'. To run it as a file-based app, use 'dotnet run --file {0}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. + Advertencia: "{0}" parece ser una aplicación basada en archivos, pero se pasó como argumento al proyecto "{1}". Para ejecutarla como una aplicación basada en archivos, use "dotnet run --file {0}". Para pasarlo como argumento de aplicación, use "dotnet run -- {0}" para suprimir esta advertencia. {0} is the file path argument. {1} is the project file path.{Locked="dotnet run --file"}{Locked="dotnet run --"} @@ -2081,12 +2081,12 @@ y los identificadores de los paquetes correspondientes a las herramientas instal Warning: '{0}' looks like a file-based app but the file was not found, and it was treated as an MSBuild argument. - Warning: '{0}' looks like a file-based app but the file was not found, and it was treated as an MSBuild argument. + Advertencia: "{0}" parece una aplicación basada en archivos, pero no se encontró el archivo y se trató como un argumento de MSBuild. {0} is the .cs file path argument. Warning: '{0}' appears to be a file-based app but was treated as an MSBuild argument. To treat it as a file-based app, use 'dotnet {1} {0}'. - Warning: '{0}' appears to be a file-based app but was treated as an MSBuild argument. To treat it as a file-based app, use 'dotnet {1} {0}'. + Advertencia: "{0}" parece ser una aplicación basada en archivos, pero se trató como un argumento de MSBuild. Para tratarla como una aplicación basada en archivos, use "dotnet {1}{0}". {0} is the file path argument. {1} is the command name (e.g. build, clean, publish).{Locked="dotnet"} diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf index d59257a44347..f71d532d903e 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf @@ -1500,12 +1500,12 @@ Votre projet cible plusieurs frameworks. Spécifiez le framework à exécuter à Warning: '{0}' looks like a file-based app but the file was not found, and it was passed as an argument to the project '{1}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. - Warning: '{0}' looks like a file-based app but the file was not found, and it was passed as an argument to the project '{1}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. + Avertissement : « {0} » ressemble à une application basée sur un fichier, mais le fichier est introuvable et il a été passé en tant qu’argument au projet « {1} ». Pour le passer en tant qu’argument d’application, utilisez « dotnet run -- {0} » afin de supprimer cet avertissement. {0} is the .cs file path argument. {1} is the project file path.{Locked="dotnet run --"} Warning: '{0}' appears to be a file-based app but was passed as an argument to the project '{1}'. To run it as a file-based app, use 'dotnet run --file {0}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. - Warning: '{0}' appears to be a file-based app but was passed as an argument to the project '{1}'. To run it as a file-based app, use 'dotnet run --file {0}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. + Avertissement : « {0} » semble être une application basée sur un fichier, mais elle a été transmise en tant qu’argument au projet « {1} ». Pour l’exécuter en tant qu’application basée sur un fichier, utilisez « dotnet run --file {0} ». Pour le passer en tant qu’argument d’application, utilisez « dotnet run -- {0} » afin de supprimer cet avertissement. {0} is the file path argument. {1} is the project file path.{Locked="dotnet run --file"}{Locked="dotnet run --"} @@ -2081,12 +2081,12 @@ et les ID de package correspondants aux outils installés, utilisez la commande Warning: '{0}' looks like a file-based app but the file was not found, and it was treated as an MSBuild argument. - Warning: '{0}' looks like a file-based app but the file was not found, and it was treated as an MSBuild argument. + Avertissement : « {0} » ressemble à une application basée sur un fichier, mais le fichier est introuvable et il a été traité en tant qu’argument MSBuild. {0} is the .cs file path argument. Warning: '{0}' appears to be a file-based app but was treated as an MSBuild argument. To treat it as a file-based app, use 'dotnet {1} {0}'. - Warning: '{0}' appears to be a file-based app but was treated as an MSBuild argument. To treat it as a file-based app, use 'dotnet {1} {0}'. + Avertissement : « {0} » semble être une application basée sur un fichier, mais a été traitée comme un argument MSBuild. Pour la traiter comme une application basée sur un fichier, utilisez « dotnet {1} {0} ». {0} is the file path argument. {1} is the command name (e.g. build, clean, publish).{Locked="dotnet"} diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf index 4ffd173f2e8b..23fc7c610107 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf @@ -1500,12 +1500,12 @@ Il progetto è destinato a più framework. Specificare il framework da eseguire Warning: '{0}' looks like a file-based app but the file was not found, and it was passed as an argument to the project '{1}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. - Warning: '{0}' looks like a file-based app but the file was not found, and it was passed as an argument to the project '{1}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. + Avviso: '{0}' sembra un'app basata su file, ma il file non è stato trovato ed è stato passato come argomento al progetto '{1}'. Per passarla come argomento dell'app, usare 'dotnet run -- {0}' per eliminare l'avviso. {0} is the .cs file path argument. {1} is the project file path.{Locked="dotnet run --"} Warning: '{0}' appears to be a file-based app but was passed as an argument to the project '{1}'. To run it as a file-based app, use 'dotnet run --file {0}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. - Warning: '{0}' appears to be a file-based app but was passed as an argument to the project '{1}'. To run it as a file-based app, use 'dotnet run --file {0}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. + Avviso: '{0}' sembra un'app basata su file, ma è stata passata come argomento al progetto '{1}'. Per eseguirla come app basata su file, usare 'dotnet run --file {0}'. Per passarla come argomento dell'app, usare 'dotnet run -- {0}' per eliminare l'avviso. {0} is the file path argument. {1} is the project file path.{Locked="dotnet run --file"}{Locked="dotnet run --"} @@ -2081,12 +2081,12 @@ e gli ID pacchetto corrispondenti per gli strumenti installati usando il comando Warning: '{0}' looks like a file-based app but the file was not found, and it was treated as an MSBuild argument. - Warning: '{0}' looks like a file-based app but the file was not found, and it was treated as an MSBuild argument. + Avviso: '{0}' sembra un'app basata su file, ma il file non è stato trovato ed è stata considerata come argomento di MSBuild. {0} is the .cs file path argument. Warning: '{0}' appears to be a file-based app but was treated as an MSBuild argument. To treat it as a file-based app, use 'dotnet {1} {0}'. - Warning: '{0}' appears to be a file-based app but was treated as an MSBuild argument. To treat it as a file-based app, use 'dotnet {1} {0}'. + Avviso: '{0}' sembra un'app basata su file, ma è stata considerata come argomento di MSBuild. Per considerarla come app basata su file, usare 'dotnet {1} {0}'. {0} is the file path argument. {1} is the command name (e.g. build, clean, publish).{Locked="dotnet"} diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf index e1255a3658c2..ac112d3422b3 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf @@ -1500,12 +1500,12 @@ Your project targets multiple frameworks. Specify which framework to run using ' Warning: '{0}' looks like a file-based app but the file was not found, and it was passed as an argument to the project '{1}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. - Warning: '{0}' looks like a file-based app but the file was not found, and it was passed as an argument to the project '{1}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. + 警告: '{0}' はファイルベースのアプリのように見えますが、ファイルが見つからず、プロジェクト '{1}' の引数として渡されました。アプリケーション引数として渡すには、'dotnet run -- {0}' を使用してこの警告を抑制してください。 {0} is the .cs file path argument. {1} is the project file path.{Locked="dotnet run --"} Warning: '{0}' appears to be a file-based app but was passed as an argument to the project '{1}'. To run it as a file-based app, use 'dotnet run --file {0}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. - Warning: '{0}' appears to be a file-based app but was passed as an argument to the project '{1}'. To run it as a file-based app, use 'dotnet run --file {0}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. + 警告: '{0}' はファイルベースのアプリのように見えますが、プロジェクト '{1}' への引数として渡されました。ファイルベースのアプリとして実行するには、'dotnet run --file {0}' を使用してください。アプリケーション引数として渡すには、'dotnet run -- {0}' を使用してこの警告を抑制してください。 {0} is the file path argument. {1} is the project file path.{Locked="dotnet run --file"}{Locked="dotnet run --"} @@ -2081,12 +2081,12 @@ and the corresponding package Ids for installed tools using the command Warning: '{0}' looks like a file-based app but the file was not found, and it was treated as an MSBuild argument. - Warning: '{0}' looks like a file-based app but the file was not found, and it was treated as an MSBuild argument. + 警告: '{0}' はファイルベースのアプリのように見えますが、ファイルが見つからず、MSBuild 引数として扱われました。 {0} is the .cs file path argument. Warning: '{0}' appears to be a file-based app but was treated as an MSBuild argument. To treat it as a file-based app, use 'dotnet {1} {0}'. - Warning: '{0}' appears to be a file-based app but was treated as an MSBuild argument. To treat it as a file-based app, use 'dotnet {1} {0}'. + 警告: '{0}' はファイルベースのアプリのように見えますが、MSBuild 引数として扱われました。ファイルベースのアプリとして扱うには、'dotnet {1} {0}' を使用してください。 {0} is the file path argument. {1} is the command name (e.g. build, clean, publish).{Locked="dotnet"} diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf index 6ae7735085da..481689db5794 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf @@ -1500,12 +1500,12 @@ Your project targets multiple frameworks. Specify which framework to run using ' Warning: '{0}' looks like a file-based app but the file was not found, and it was passed as an argument to the project '{1}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. - Warning: '{0}' looks like a file-based app but the file was not found, and it was passed as an argument to the project '{1}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. + 경고: '{0}'은(는) 파일 기반 앱처럼 보이지만 파일을 찾을 수 없으며 프로젝트 '{1}'에 인수로 전달되었습니다. 응용 프로그램 인수로 전달하려면 'dotnet run -- {0}'을(를) 사용해 이 경고를 표시하지 않도록 설정하세요. {0} is the .cs file path argument. {1} is the project file path.{Locked="dotnet run --"} Warning: '{0}' appears to be a file-based app but was passed as an argument to the project '{1}'. To run it as a file-based app, use 'dotnet run --file {0}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. - Warning: '{0}' appears to be a file-based app but was passed as an argument to the project '{1}'. To run it as a file-based app, use 'dotnet run --file {0}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. + 경고: '{0}'은(는) 파일 기반 앱으로 보이지만 프로젝트 '{1}'에 인수로 전달되었습니다. 파일 기반 앱으로 실행하려면 'dotnet run --file {0}'을(를) 사용하세요. 응용 프로그램 인수로 전달하려면 'dotnet run -- {0}'을(를) 사용해 이 경고를 표시하지 않도록 설정하세요. {0} is the file path argument. {1} is the project file path.{Locked="dotnet run --file"}{Locked="dotnet run --"} @@ -2081,12 +2081,12 @@ and the corresponding package Ids for installed tools using the command Warning: '{0}' looks like a file-based app but the file was not found, and it was treated as an MSBuild argument. - Warning: '{0}' looks like a file-based app but the file was not found, and it was treated as an MSBuild argument. + 경고: '{0}'은(는) 파일 기반 앱으로 보이지만 파일을 찾을 수 없으며 MSBuild 인수로 처리되었습니다. {0} is the .cs file path argument. Warning: '{0}' appears to be a file-based app but was treated as an MSBuild argument. To treat it as a file-based app, use 'dotnet {1} {0}'. - Warning: '{0}' appears to be a file-based app but was treated as an MSBuild argument. To treat it as a file-based app, use 'dotnet {1} {0}'. + 경고: '{0}'은(는) 파일 기반 앱으로 보이지만 MSBuild 인수로 처리되었습니다. 파일 기반 앱으로 실행하려면 'dotnet {1} {0}'을 사용하세요. {0} is the file path argument. {1} is the command name (e.g. build, clean, publish).{Locked="dotnet"} diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf index 75795f96f4bf..a9ae42d9cd7b 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf @@ -1500,12 +1500,12 @@ Projekt ma wiele platform docelowych. Określ platformę do uruchomienia przy u Warning: '{0}' looks like a file-based app but the file was not found, and it was passed as an argument to the project '{1}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. - Warning: '{0}' looks like a file-based app but the file was not found, and it was passed as an argument to the project '{1}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. + Ostrzeżenie: „{0}” wygląda jak aplikacja oparta na plikach, ale plik nie został znaleziony, i został przekazana jako argument do projektu „{1}”. Aby przekazać go jako argument aplikacji, użyj polecenia „dotnet run -- {0}”, aby pominąć to ostrzeżenie. {0} is the .cs file path argument. {1} is the project file path.{Locked="dotnet run --"} Warning: '{0}' appears to be a file-based app but was passed as an argument to the project '{1}'. To run it as a file-based app, use 'dotnet run --file {0}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. - Warning: '{0}' appears to be a file-based app but was passed as an argument to the project '{1}'. To run it as a file-based app, use 'dotnet run --file {0}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. + Ostrzeżenie: „{0}” wydaje się być aplikacją opartą na plikach, ale została przekazana jako argument do projektu „{1}”. Aby uruchomić ją jako aplikację opartą na plikach, użyj polecenia „dotnet run --file {0}”. Aby przekazać go jako argument aplikacji, użyj polecenia „dotnet run -- {0}”, aby pominąć to ostrzeżenie. {0} is the file path argument. {1} is the project file path.{Locked="dotnet run --file"}{Locked="dotnet run --"} @@ -2081,12 +2081,12 @@ i odpowiednie identyfikatory pakietów zainstalowanych narzędzi można znaleź Warning: '{0}' looks like a file-based app but the file was not found, and it was treated as an MSBuild argument. - Warning: '{0}' looks like a file-based app but the file was not found, and it was treated as an MSBuild argument. + Ostrzeżenie: „{0}” wygląda jak aplikacja oparta na plikach, ale plik nie został znaleziony, i była traktowana jako argument MSBuild. {0} is the .cs file path argument. Warning: '{0}' appears to be a file-based app but was treated as an MSBuild argument. To treat it as a file-based app, use 'dotnet {1} {0}'. - Warning: '{0}' appears to be a file-based app but was treated as an MSBuild argument. To treat it as a file-based app, use 'dotnet {1} {0}'. + Ostrzeżenie: „{0}” wydaje się być aplikacją opartą na plikach, ale była traktowana jako argument MSBuild. Aby traktować ją jako aplikację opartą na plikach, użyj polecenia „dotnet {1}{0}”. {0} is the file path argument. {1} is the command name (e.g. build, clean, publish).{Locked="dotnet"} diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf index 6c0de7f3dfea..59bb956ae6a9 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf @@ -1500,12 +1500,12 @@ Ele tem diversas estruturas como destino. Especifique que estrutura executar usa Warning: '{0}' looks like a file-based app but the file was not found, and it was passed as an argument to the project '{1}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. - Warning: '{0}' looks like a file-based app but the file was not found, and it was passed as an argument to the project '{1}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. + Aviso: '{0}' parece um aplicativo baseado em arquivo, mas o arquivo não foi encontrado e foi passado como um argumento para o projeto '{1}'. Para passá-lo como um argumento de aplicativo, use 'dotnet run -- {0}' para suprimir esse aviso. {0} is the .cs file path argument. {1} is the project file path.{Locked="dotnet run --"} Warning: '{0}' appears to be a file-based app but was passed as an argument to the project '{1}'. To run it as a file-based app, use 'dotnet run --file {0}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. - Warning: '{0}' appears to be a file-based app but was passed as an argument to the project '{1}'. To run it as a file-based app, use 'dotnet run --file {0}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. + Aviso: '{0}' parece ser um aplicativo baseado em arquivo, mas foi passado como um argumento para o projeto '{1}'. Para executar como um aplicativo baseado em arquivo, use 'dotnet run --file {0}'. Para passá-lo como um argumento de aplicativo, use 'dotnet run -- {0}' para suprimir esse aviso. {0} is the file path argument. {1} is the project file path.{Locked="dotnet run --file"}{Locked="dotnet run --"} @@ -2081,12 +2081,12 @@ e as Ids de pacote correspondentes para as ferramentas instaladas usando o coman Warning: '{0}' looks like a file-based app but the file was not found, and it was treated as an MSBuild argument. - Warning: '{0}' looks like a file-based app but the file was not found, and it was treated as an MSBuild argument. + Aviso: '{0}' parece um aplicativo baseado em arquivo, mas o arquivo não foi encontrado e foi tratado como um argumento do MSBuild. {0} is the .cs file path argument. Warning: '{0}' appears to be a file-based app but was treated as an MSBuild argument. To treat it as a file-based app, use 'dotnet {1} {0}'. - Warning: '{0}' appears to be a file-based app but was treated as an MSBuild argument. To treat it as a file-based app, use 'dotnet {1} {0}'. + Aviso: '{0}' parece ser um aplicativo baseado em arquivo, mas foi tratado como um argumento do MSBuild. Para tratá-lo como um aplicativo baseado em arquivo, use 'dotnet {1}{0}'. {0} is the file path argument. {1} is the command name (e.g. build, clean, publish).{Locked="dotnet"} diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf index af8d83fda6fa..d05d064409cb 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf @@ -1500,12 +1500,12 @@ Your project targets multiple frameworks. Specify which framework to run using ' Warning: '{0}' looks like a file-based app but the file was not found, and it was passed as an argument to the project '{1}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. - Warning: '{0}' looks like a file-based app but the file was not found, and it was passed as an argument to the project '{1}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. + Предупреждение: "{0}" выглядит как файловое приложение, но файл не найден. Оно было передано в качестве аргумента проекту "{1}". Чтобы передать его как аргумент приложения, используйте "dotnet run -- {0}" для подавления этого предупреждения. {0} is the .cs file path argument. {1} is the project file path.{Locked="dotnet run --"} Warning: '{0}' appears to be a file-based app but was passed as an argument to the project '{1}'. To run it as a file-based app, use 'dotnet run --file {0}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. - Warning: '{0}' appears to be a file-based app but was passed as an argument to the project '{1}'. To run it as a file-based app, use 'dotnet run --file {0}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. + Предупреждение: "{0}" выглядит как файловое приложение, но было передано в качестве аргумента проекту "{1}". Чтобы запустить его как файловое приложение, используйте "dotnet run --file {0}". Чтобы передать его как аргумент приложения, используйте "dotnet run -- {0}" для подавления этого предупреждения. {0} is the file path argument. {1} is the project file path.{Locked="dotnet run --file"}{Locked="dotnet run --"} @@ -2082,12 +2082,12 @@ and the corresponding package Ids for installed tools using the command Warning: '{0}' looks like a file-based app but the file was not found, and it was treated as an MSBuild argument. - Warning: '{0}' looks like a file-based app but the file was not found, and it was treated as an MSBuild argument. + Предупреждение: "{0}" выглядит как файловое приложение, но файл не найден. Оно было обработано как аргумент MSBuild. {0} is the .cs file path argument. Warning: '{0}' appears to be a file-based app but was treated as an MSBuild argument. To treat it as a file-based app, use 'dotnet {1} {0}'. - Warning: '{0}' appears to be a file-based app but was treated as an MSBuild argument. To treat it as a file-based app, use 'dotnet {1} {0}'. + Предупреждение: "{0}" выглядит как файловое приложение, но было обработано как аргумент MSBuild. Чтобы обработать его как файловое приложение, используйте "dotnet {1} {0}". {0} is the file path argument. {1} is the command name (e.g. build, clean, publish).{Locked="dotnet"} diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf index 443e3fb2b543..afedbb8b8a4d 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf @@ -1500,12 +1500,12 @@ Your project targets multiple frameworks. Specify which framework to run using ' Warning: '{0}' looks like a file-based app but the file was not found, and it was passed as an argument to the project '{1}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. - Warning: '{0}' looks like a file-based app but the file was not found, and it was passed as an argument to the project '{1}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. + 警告:“{0}”似乎是一个基于文件的应用,但找不到该文件,并且它已作为参数传递给项目“{1}”。要将其作为应用程序参数传递,请使用“dotnet run -- {0}”来抑制此警告。 {0} is the .cs file path argument. {1} is the project file path.{Locked="dotnet run --"} Warning: '{0}' appears to be a file-based app but was passed as an argument to the project '{1}'. To run it as a file-based app, use 'dotnet run --file {0}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. - Warning: '{0}' appears to be a file-based app but was passed as an argument to the project '{1}'. To run it as a file-based app, use 'dotnet run --file {0}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. + 警告:“{0}”似乎是一个基于文件的应用,但已作为参数传递给项目“{1}”。要将其作为基于文件的应用运行,请使用“dotnet run --file {0}”。要将其作为应用程序参数传递,请使用“dotnet run -- {0}”来抑制此警告。 {0} is the file path argument. {1} is the project file path.{Locked="dotnet run --file"}{Locked="dotnet run --"} @@ -2081,12 +2081,12 @@ and the corresponding package Ids for installed tools using the command Warning: '{0}' looks like a file-based app but the file was not found, and it was treated as an MSBuild argument. - Warning: '{0}' looks like a file-based app but the file was not found, and it was treated as an MSBuild argument. + 警告:“{0}”似乎是基于文件的应用,但找不到该文件,并且它被视为 MSBuild 参数。 {0} is the .cs file path argument. Warning: '{0}' appears to be a file-based app but was treated as an MSBuild argument. To treat it as a file-based app, use 'dotnet {1} {0}'. - Warning: '{0}' appears to be a file-based app but was treated as an MSBuild argument. To treat it as a file-based app, use 'dotnet {1} {0}'. + 警告:“{0}”似乎是一个基于文件的应用,但被视为 MSBuild 参数。要将其视为基于文件的应用,请使用“dotnet {1} {0}”。 {0} is the file path argument. {1} is the command name (e.g. build, clean, publish).{Locked="dotnet"} diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf index 76e4c11c4e0f..45d626f1c015 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf @@ -1258,7 +1258,7 @@ Tool '{1}' (version '{2}') was successfully installed. Entry is added to the man Multiple referenced files would be converted into the same directory: '{0}' - Multiple referenced files would be converted into the same directory: '{0}' + 多個參照的檔案將會轉換到相同的目錄: '{0}' {0} is the target directory path. @@ -1500,12 +1500,12 @@ Your project targets multiple frameworks. Specify which framework to run using ' Warning: '{0}' looks like a file-based app but the file was not found, and it was passed as an argument to the project '{1}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. - Warning: '{0}' looks like a file-based app but the file was not found, and it was passed as an argument to the project '{1}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. + 警告: '{0}' 看起來像檔案型應用程式,但找不到檔案,且是以引數形式傳遞至專案 '{1}'。若要以應用程式引數形式傳遞它,請使用 'dotnet run -- {0}' 來抑制此警告。 {0} is the .cs file path argument. {1} is the project file path.{Locked="dotnet run --"} Warning: '{0}' appears to be a file-based app but was passed as an argument to the project '{1}'. To run it as a file-based app, use 'dotnet run --file {0}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. - Warning: '{0}' appears to be a file-based app but was passed as an argument to the project '{1}'. To run it as a file-based app, use 'dotnet run --file {0}'. To pass it as an application argument, use 'dotnet run -- {0}' to suppress this warning. + 警告: '{0}' 似乎是檔案型應用程式,但它是以引數形式傳遞至專案 '{1}'。若要以檔案型應用程式執行它,請使用 'dotnet run --file {0}'。若要以應用程式引數形式傳遞它,請使用 'dotnet run -- {0}' 來抑制此警告。 {0} is the file path argument. {1} is the project file path.{Locked="dotnet run --file"}{Locked="dotnet run --"} @@ -2081,12 +2081,12 @@ and the corresponding package Ids for installed tools using the command Warning: '{0}' looks like a file-based app but the file was not found, and it was treated as an MSBuild argument. - Warning: '{0}' looks like a file-based app but the file was not found, and it was treated as an MSBuild argument. + 警告: '{0}' 看起來像檔案型應用程式,但找不到檔案,且將其視為 MSBuild 引數。 {0} is the .cs file path argument. Warning: '{0}' appears to be a file-based app but was treated as an MSBuild argument. To treat it as a file-based app, use 'dotnet {1} {0}'. - Warning: '{0}' appears to be a file-based app but was treated as an MSBuild argument. To treat it as a file-based app, use 'dotnet {1} {0}'. + 警告: '{0}' 似乎是檔案型應用程式,但被視為 MSBuild 引數。若要將它視為檔案型應用程式,請使用 'dotnet {1} {0}'。 {0} is the file path argument. {1} is the command name (e.g. build, clean, publish).{Locked="dotnet"} diff --git a/src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.NetAnalyzers.Package.csproj b/src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.NetAnalyzers.Package.csproj index 80f55420cfcb..a403fe040d62 100644 --- a/src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.NetAnalyzers.Package.csproj +++ b/src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.NetAnalyzers.Package.csproj @@ -17,9 +17,15 @@ $(BaseOutputPath)Rulesets $(BaseOutputPath)Editorconfig $(BaseOutputPath)GlobalAnalyzerConfigs + $(BaseOutputPath)Documentation + $(GeneratedDocumentationDir)\$(PackageId).sarif $(BaseOutputPath)Build + + + + @@ -32,7 +38,7 @@ - + @@ -74,6 +80,7 @@ DisableNETAnalyzersForNuGetPackage.props $(PackageId).md $(PackageId).sarif + AnalyzerVersion=$(VersionPrefix) Analyzer Configuration.md @@ -89,7 +96,13 @@ <_GenerateDocumentationAndConfigFilesPath>%(_GenerateDocumentationAndConfigFilesPath.Identity) + + + - \ No newline at end of file + diff --git a/src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.NetAnalyzers.sarif b/src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.NetAnalyzers.sarif index 3896133aaa7b..ebd5d4d08854 100644 --- a/src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.NetAnalyzers.sarif +++ b/src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.NetAnalyzers.sarif @@ -5,7 +5,7 @@ { "tool": { "name": "Microsoft.CodeAnalysis.CSharp.NetAnalyzers", - "version": "10.0.400", + "version": "${AnalyzerVersion}", "language": "en-US" }, "rules": { @@ -727,7 +727,7 @@ { "tool": { "name": "Microsoft.CodeAnalysis.NetAnalyzers", - "version": "10.0.400", + "version": "${AnalyzerVersion}", "language": "en-US" }, "rules": { @@ -6522,7 +6522,7 @@ { "tool": { "name": "Microsoft.CodeAnalysis.VisualBasic.NetAnalyzers", - "version": "10.0.400", + "version": "${AnalyzerVersion}", "language": "en-US" }, "rules": { diff --git a/src/Microsoft.CodeAnalysis.NetAnalyzers/tools/GenerateDocumentationAndConfigFiles/Program.cs b/src/Microsoft.CodeAnalysis.NetAnalyzers/tools/GenerateDocumentationAndConfigFiles/Program.cs index ff7104f3fd0a..e631e83ae5b9 100644 --- a/src/Microsoft.CodeAnalysis.NetAnalyzers/tools/GenerateDocumentationAndConfigFiles/Program.cs +++ b/src/Microsoft.CodeAnalysis.NetAnalyzers/tools/GenerateDocumentationAndConfigFiles/Program.cs @@ -32,6 +32,7 @@ public static async Task Main(string[] args) { const int expectedArguments = 23; const string validateOnlyPrefix = "-validateOnly:"; + const string analyzerVersionTemplate = "${AnalyzerVersion}"; if (args.Length != expectedArguments) { @@ -450,7 +451,9 @@ void createAnalyzerSarifFile() if (!string.IsNullOrWhiteSpace(analyzerVersion)) { - writer.Write("version", analyzerVersion); + // Keep the checked-in SARIF stable across SDK version updates. + // The build resolves this placeholder into the intermediate output that gets packed. + writer.Write("version", analyzerVersionTemplate); } writer.Write("language", culture.Name); diff --git a/test/dotnet.Tests/CommandTests/Tool/Run/ToolRunCommandTests.cs b/test/dotnet.Tests/CommandTests/Tool/Run/ToolRunCommandTests.cs index f122a680dc71..1616c16f9aae 100644 --- a/test/dotnet.Tests/CommandTests/Tool/Run/ToolRunCommandTests.cs +++ b/test/dotnet.Tests/CommandTests/Tool/Run/ToolRunCommandTests.cs @@ -43,6 +43,24 @@ public void WhenRunWithRollForwardOptionItShouldIncludeRollForwardInNativeHost() result.Args.Should().ContainAll("--roll-forward", "Major", fakeExecutable.Value); } + [Fact] + public void WhenRunWithRollForwardOptionItShouldPreserveDuplicateArgumentsForwardedToTool() + { + (FilePath fakeExecutable, LocalToolsCommandResolver localToolsCommandResolver) = DefaultSetup("a"); + IEnumerable testForwardArgument = ["--var", "a", "--var", "b"]; + + var result = localToolsCommandResolver.ResolveStrict(new CommandResolverArguments() + { + CommandName = "dotnet-a", + CommandArguments = testForwardArgument + }, allowRollForward: true); + + result.Should().NotBeNull(); + result.Args.Should().ContainAll("--roll-forward", "Major", fakeExecutable.Value); + // Verify duplicate forwarded arguments are preserved in order. + result.Args.Should().Contain("--var a --var b"); + } + [Fact] public void WhenRunWithoutRollForwardOptionItShouldNotIncludeRollForwardInNativeHost() {