diff --git a/src/FormatCommand.cs b/src/FormatCommand.cs index 9ba8a9f0cd..16f80888f4 100644 --- a/src/FormatCommand.cs +++ b/src/FormatCommand.cs @@ -9,33 +9,28 @@ namespace Microsoft.CodeAnalysis.Tools { internal static class FormatCommand { + internal static string[] VerbosityLevels => new[] { "q", "quiet", "m", "minimal", "n", "normal", "d", "detailed", "diag", "diagnostic" }; + internal static string[] SeverityLevels => new[] { FixSeverity.Info, FixSeverity.Warn, FixSeverity.Error }; + internal static RootCommand CreateCommandLineOptions() { var rootCommand = new RootCommand { - new Argument("project") + new Argument("workspace") { Arity = ArgumentArity.ZeroOrOne, - Description = Resources.The_solution_or_project_file_to_operate_on_If_a_file_is_not_specified_the_command_will_search_the_current_directory_for_one - }, - new Option(new[] { "--folder", "-f" }, Resources.Whether_to_treat_the_project_path_as_a_folder_of_files) - { - Argument = new Argument(() => null) { Arity = ArgumentArity.ZeroOrOne }, - }, - new Option(new[] { "--workspace", "-w" }, Resources.The_solution_or_project_file_to_operate_on_If_a_file_is_not_specified_the_command_will_search_the_current_directory_for_one) - { - Argument = new Argument(() => null), - IsHidden = true - }, + Description = Resources.A_path_to_a_solution_file_a_project_file_or_a_folder_containing_a_solution_or_project_file_If_a_path_is_not_specified_then_the_current_directory_is_used + }.LegalFilePathsOnly(), + new Option(new[] { "--folder", "-f" }, Resources.Whether_to_treat_the_workspace_argument_as_a_simple_folder_of_files), new Option(new[] { "--fix-style", "-fs" }, Resources.Run_code_style_analyzer_and_apply_fixes) { - Argument = new Argument("severity") { Arity = ArgumentArity.ZeroOrOne } + Argument = new Argument("severity") { Arity = ArgumentArity.ZeroOrOne }.FromAmong(SeverityLevels) }, new Option(new[] { "--fix-analyzers", "-fa" }, Resources.Run_code_style_analyzer_and_apply_fixes) { - Argument = new Argument("severity") { Arity = ArgumentArity.ZeroOrOne } + Argument = new Argument("severity") { Arity = ArgumentArity.ZeroOrOne }.FromAmong(SeverityLevels) }, - new Option(new[] { "--include", "--files" }, Resources.A_list_of_relative_file_or_folder_paths_to_include_in_formatting_All_files_are_formatted_if_empty) + new Option(new[] { "--include" }, Resources.A_list_of_relative_file_or_folder_paths_to_include_in_formatting_All_files_are_formatted_if_empty) { Argument = new Argument(() => Array.Empty()) }, @@ -43,91 +38,26 @@ internal static RootCommand CreateCommandLineOptions() { Argument = new Argument(() => Array.Empty()) }, - new Option(new[] { "--check", "--dry-run" }, Resources.Formats_files_without_saving_changes_to_disk_Terminates_with_a_non_zero_exit_code_if_any_files_were_formatted) - { - Argument = new Argument() - }, + new Option(new[] { "--check" }, Resources.Formats_files_without_saving_changes_to_disk_Terminates_with_a_non_zero_exit_code_if_any_files_were_formatted), new Option(new[] { "--report" }, Resources.Accepts_a_file_path_which_if_provided_will_produce_a_format_report_json_file_in_the_given_directory) { - Argument = new Argument(() => null) + Argument = new Argument(() => null).LegalFilePathsOnly() }, new Option(new[] { "--verbosity", "-v" }, Resources.Set_the_verbosity_level_Allowed_values_are_quiet_minimal_normal_detailed_and_diagnostic) { - Argument = new Argument() { Arity = ArgumentArity.ExactlyOne } + Argument = new Argument() { Arity = ArgumentArity.ExactlyOne }.FromAmong(VerbosityLevels) }, new Option(new[] { "--include-generated" }, Resources.Include_generated_code_files_in_formatting_operations) { - Argument = new Argument(), IsHidden = true }, }; rootCommand.Description = "dotnet-format"; - rootCommand.AddValidator(ValidateProjectArgumentAndWorkspace); - rootCommand.AddValidator(ValidateProjectArgumentAndFolder); - rootCommand.AddValidator(ValidateWorkspaceAndFolder); return rootCommand; } - private static string? ValidateProjectArgumentAndWorkspace(CommandResult symbolResult) - { - try - { - var project = symbolResult.GetArgumentValueOrDefault("project"); - var workspace = symbolResult.ValueForOption("workspace"); - - if (!string.IsNullOrEmpty(project) && !string.IsNullOrEmpty(workspace)) - { - return Resources.Cannot_specify_both_project_argument_and_workspace_option; - } - } - catch (InvalidOperationException) // Parsing of arguments failed. This will be reported later. - { - } - - return null; - } - - private static string? ValidateProjectArgumentAndFolder(CommandResult symbolResult) - { - try - { - var project = symbolResult.GetArgumentValueOrDefault("project"); - var folder = symbolResult.ValueForOption("folder"); - - if (!string.IsNullOrEmpty(project) && !string.IsNullOrEmpty(folder)) - { - return Resources.Cannot_specify_both_project_argument_and_folder_options; - } - } - catch (InvalidOperationException) // Parsing of arguments failed. This will be reported later. - { - } - - return null; - } - - private static string? ValidateWorkspaceAndFolder(CommandResult symbolResult) - { - try - { - var workspace = symbolResult.ValueForOption("workspace"); - var folder = symbolResult.ValueForOption("folder"); - - - if (!string.IsNullOrEmpty(workspace) && !string.IsNullOrEmpty(folder)) - { - return Resources.Cannot_specify_both_folder_and_workspace_options; - } - } - catch (InvalidOperationException) // Parsing of arguments failed. This will be reported later. - { - } - - return null; - } - internal static bool WasOptionUsed(this ParseResult result, params string[] aliases) { return result.Tokens diff --git a/src/MSBuild/LooseVersionAssemblyLoader.cs b/src/MSBuild/LooseVersionAssemblyLoader.cs index 4bf844d8f0..8ec7b2c5e9 100644 --- a/src/MSBuild/LooseVersionAssemblyLoader.cs +++ b/src/MSBuild/LooseVersionAssemblyLoader.cs @@ -63,7 +63,17 @@ public static void Register(string searchPath) continue; } - return LoadAndCache(context, candidatePath); + try + { + return LoadAndCache(context, candidatePath); + } + catch + { + // We were unable to load the assembly from the file path. It is likely that + // a different version of the assembly has already been loaded into the context. + // Be forgiving and attempt to load assembly by name without specifying a version. + return context.LoadFromAssemblyName(new AssemblyName(assemblyName.Name)); + } } } diff --git a/src/MSBuild/MSBuildWorkspaceFinder.cs b/src/MSBuild/MSBuildWorkspaceFinder.cs index b286621d70..b119eae1d4 100644 --- a/src/MSBuild/MSBuildWorkspaceFinder.cs +++ b/src/MSBuild/MSBuildWorkspaceFinder.cs @@ -36,12 +36,12 @@ public static (bool isSolution, string workspacePath) FindWorkspace(string searc : FindFile(workspacePath!); // IsNullOrEmpty is not annotated on .NET Core 2.1 } - var foundSolution = FindMatchingFile(searchDirectory, FindSolutionFiles, Resources.Multiple_MSBuild_solution_files_found_in_0_Specify_which_to_use_with_the_workspace_option); - var foundProject = FindMatchingFile(searchDirectory, FindProjectFiles, Resources.Multiple_MSBuild_project_files_found_in_0_Specify_which_to_use_with_the_workspace_option); + var foundSolution = FindMatchingFile(searchDirectory, FindSolutionFiles, Resources.Multiple_MSBuild_solution_files_found_in_0_Specify_which_to_use_with_the_workspace_argument); + var foundProject = FindMatchingFile(searchDirectory, FindProjectFiles, Resources.Multiple_MSBuild_project_files_found_in_0_Specify_which_to_use_with_the_workspace_argument); if (!string.IsNullOrEmpty(foundSolution) && !string.IsNullOrEmpty(foundProject)) { - throw new FileNotFoundException(string.Format(Resources.Both_a_MSBuild_project_file_and_solution_file_found_in_0_Specify_which_to_use_with_the_workspace_option, searchDirectory)); + throw new FileNotFoundException(string.Format(Resources.Both_a_MSBuild_project_file_and_solution_file_found_in_0_Specify_which_to_use_with_the_workspace_argument, searchDirectory)); } if (!string.IsNullOrEmpty(foundSolution)) @@ -54,7 +54,7 @@ public static (bool isSolution, string workspacePath) FindWorkspace(string searc return (false, foundProject!); // IsNullOrEmpty is not annotated on .NET Core 2.1 } - throw new FileNotFoundException(string.Format(Resources.Could_not_find_a_MSBuild_project_or_solution_file_in_0_Specify_which_to_use_with_the_workspace_option, searchDirectory)); + throw new FileNotFoundException(string.Format(Resources.Could_not_find_a_MSBuild_project_or_solution_file_in_0_Specify_which_to_use_with_the_workspace_argument, searchDirectory)); } private static (bool isSolution, string workspacePath) FindFile(string workspacePath) diff --git a/src/Program.cs b/src/Program.cs index 4c80898b5b..3bdf8d471c 100644 --- a/src/Program.cs +++ b/src/Program.cs @@ -20,7 +20,6 @@ namespace Microsoft.CodeAnalysis.Tools { internal class Program { - private static string[] VerbosityLevels => new[] { "q", "quiet", "m", "minimal", "n", "normal", "d", "detailed", "diag", "diagnostic" }; internal const int UnhandledExceptionExitCode = 1; internal const int CheckFailedExitCode = 2; internal const int UnableToLocateMSBuildExitCode = 3; @@ -40,9 +39,8 @@ private static async Task Main(string[] args) } public static async Task Run( - string? project, - string? folder, string? workspace, + bool folder, string? fixStyle, string? fixAnalyzers, string? verbosity, @@ -76,44 +74,22 @@ private static async Task Main(string[] args) { currentDirectory = Environment.CurrentDirectory; - // Check for deprecated options and assign package if specified via `-w | -f` options. - if (!string.IsNullOrEmpty(workspace) && string.IsNullOrEmpty(project)) - { - logger.LogWarning(Resources.The_workspace_option_is_deprecated_Use_the_project_argument_instead); - project = workspace; - } - else if (!string.IsNullOrEmpty(folder) && string.IsNullOrEmpty(project)) - { - logger.LogWarning(Resources.The_folder_option_is_deprecated_for_specifying_the_path_Pass_the_folder_option_but_specify_the_path_with_the_project_argument_instead); - project = folder; - } - - if (s_parseResult.WasOptionUsed("--files")) - { - logger.LogWarning(Resources.The_files_option_is_deprecated_Use_the_include_option_instead); - } - - if (s_parseResult.WasOptionUsed("--dry-run")) - { - logger.LogWarning(Resources.The_dry_run_option_is_deprecated_Use_the_check_option_instead); - } string workspaceDirectory; string workspacePath; WorkspaceType workspaceType; - // The presence of the folder token means we should treat the project path as a folder path. - // This will change in the following version so that the folder option is a bool flag. - if (s_parseResult.WasOptionUsed("-f", "--folder")) + // The folder option means we should treat the project path as a folder path. + if (folder) { // If folder isn't populated, then use the current directory - workspacePath = Path.GetFullPath(project ?? ".", Environment.CurrentDirectory); + workspacePath = Path.GetFullPath(workspace ?? ".", Environment.CurrentDirectory); workspaceDirectory = workspacePath; workspaceType = WorkspaceType.Folder; } else { - var (isSolution, workspaceFilePath) = MSBuildWorkspaceFinder.FindWorkspace(currentDirectory, project); + var (isSolution, workspaceFilePath) = MSBuildWorkspaceFinder.FindWorkspace(currentDirectory, workspace); workspacePath = workspaceFilePath; workspaceType = isSolution diff --git a/src/Resources.resx b/src/Resources.resx index 18954f9c5a..ac8f7875ad 100644 --- a/src/Resources.resx +++ b/src/Resources.resx @@ -1,17 +1,17 @@  - @@ -123,11 +123,11 @@ The solution file '{0}' does not exist. - - Both a MSBuild project file and solution file found in '{0}'. Specify which to use with the --workspace option. + + Both a MSBuild project file and solution file found in '{0}'. Specify which to use with the <workspace> agrument. - - Could not find a MSBuild project file or solution file in '{0}'. Specify which to use with the --workspace option. + + Could not find a MSBuild project file or solution file in '{0}'. Specify which to use with the <workspace> argument. Failed to save formatting changes. @@ -135,11 +135,11 @@ The file '{0}' does not appear to be a valid project or solution file. - - Multiple MSBuild project files found in '{0}'. Specify which to use with the --workspace option. + + Multiple MSBuild project files found in '{0}'. Specify which to use with the <workspace> argument. - - Multiple MSBuild solution files found in '{0}'. Specify which to use with the --workspace option. + + Multiple MSBuild solution files found in '{0}'. Specify which to use with the <workspace> argument. Format complete in {0}ms. @@ -165,11 +165,8 @@ Set the verbosity level. Allowed values are q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic] - - The solution or project file to operate on. If a file is not specified, the command will search the current directory for one. - - - Format files, but do not save changes to disk. + + A path to a solution file, a project file, or a folder containing a solution or project file. If a path is not specified then the current directory is used. Formats files without saving changes to disk. Terminates with a non-zero exit code if any files were formatted. @@ -204,11 +201,8 @@ Fix file encoding. - - Whether to treat the `<project>` path as a folder of files. - - - Cannot specify both folder and workspace options. + + Whether to treat the `<workspace>` argument as a simple folder of files. Accepts a file path, which if provided, will produce a json report in the given directory. @@ -234,24 +228,6 @@ The dotnet CLI version is '{0}'. - - Cannot specify both project argument and workspace option. - - - Cannot specify both project argument and folder options. - - - The `--workspace` option is deprecated. Use the `<project>` argument instead. - - - The `--folder` option is deprecated for specifying the path. Pass the `--folder` option but specify the path with the project argument instead. - - - The `--files` option is deprecated. Use the `--include` option instead. - - - The `--dry-run` option is deprecated. Use the `--check` option instead. - Fix imports ordering. diff --git a/src/xlf/Resources.cs.xlf b/src/xlf/Resources.cs.xlf index 2051bdab39..6cfe825c18 100644 --- a/src/xlf/Resources.cs.xlf +++ b/src/xlf/Resources.cs.xlf @@ -12,6 +12,11 @@ A list of relative file or folder paths to include in formatting. All files are formatted if empty. + + A path to a solution file, a project file, or a folder containing a solution or project file. If a path is not specified then the current directory is used. + A path to a solution file, a project file, or a folder containing a solution or project file. If a path is not specified then the current directory is used. + + Accepts a file path, which if provided, will produce a json report in the given directory. Accepts a file path, which if provided, will produce a json report in the given directory. @@ -27,24 +32,9 @@ Analyzer Reference - - Both a MSBuild project file and solution file found in '{0}'. Specify which to use with the --workspace option. - {0} obsahuje jak soubor projektu MSBuild, tak soubor řešení. Určete, který soubor chcete použít, pomocí parametru --workspace. - - - - Cannot specify both folder and workspace options. - Cannot specify both folder and workspace options. - - - - Cannot specify both project argument and folder options. - Cannot specify both project argument and folder options. - - - - Cannot specify both project argument and workspace option. - Cannot specify both project argument and workspace option. + + Both a MSBuild project file and solution file found in '{0}'. Specify which to use with the <workspace> agrument. + {0} obsahuje jak soubor projektu MSBuild, tak soubor řešení. Určete, který soubor chcete použít, pomocí parametru --workspace. @@ -57,9 +47,9 @@ Complete in {0}ms. - - Could not find a MSBuild project file or solution file in '{0}'. Specify which to use with the --workspace option. - V adresáři {0} nešlo najít soubor projektu MSBuild nebo soubor řešení. Určete, který soubor chcete použít, pomocí parametru --workspace. + + Could not find a MSBuild project file or solution file in '{0}'. Specify which to use with the <workspace> argument. + V adresáři {0} nešlo najít soubor projektu MSBuild nebo soubor řešení. Určete, který soubor chcete použít, pomocí parametru --workspace. @@ -122,11 +112,6 @@ Format complete in {0}ms. - - Format files, but do not save changes to disk. - Soubory se naformátují, ale změny se neuloží na disk. - - Formats files without saving changes to disk. Terminates with a non-zero exit code if any files were formatted. Formats files without saving changes to disk. Terminates with a non-zero exit code if any files were formatted. @@ -157,14 +142,14 @@ Načítá se pracovní prostor. - - Multiple MSBuild project files found in '{0}'. Specify which to use with the --workspace option. - {0} obsahuje více souborů projektů MSBuild. Určete, který soubor chcete použít, pomocí parametru --workspace. + + Multiple MSBuild project files found in '{0}'. Specify which to use with the <workspace> argument. + Multiple MSBuild project files found in '{0}'. Specify which to use with the <workspace> argument. - - Multiple MSBuild solution files found in '{0}'. Specify which to use with the --workspace option. - {0} obsahuje více souborů řešení MSBuild. Určete, který soubor chcete použít, pomocí parametru --workspace. + + Multiple MSBuild solution files found in '{0}'. Specify which to use with the <workspace> argument. + Multiple MSBuild solution files found in '{0}'. Specify which to use with the <workspace> argument. @@ -202,26 +187,11 @@ The dotnet CLI version is '{0}'. - - The `--dry-run` option is deprecated. Use the `--check` option instead. - The `--dry-run` option is deprecated. Use the `--check` option instead. - - The file '{0}' does not appear to be a valid project or solution file. Soubor {0} zřejmě není platný soubor projektu nebo řešení. - - The `--files` option is deprecated. Use the `--include` option instead. - The `--files` option is deprecated. Use the `--include` option instead. - - - - The `--folder` option is deprecated for specifying the path. Pass the `--folder` option but specify the path with the project argument instead. - The `--folder` option is deprecated for specifying the path. Pass the `--folder` option but specify the path with the project argument instead. - - The project file '{0}' does not exist. Soubor projektu {0} neexistuje. @@ -232,21 +202,11 @@ Soubor řešení {0} neexistuje. - - The solution or project file to operate on. If a file is not specified, the command will search the current directory for one. - Soubor řešení nebo projektu, se kterým se má operace provést. Pokud soubor není zadaný, příkaz ho bude hledat v aktuálním adresáři. - - Formatted code file '{0}'. Formatted code file '{0}'. - - The `--workspace` option is deprecated. Use the `<project>` argument instead. - The `--workspace` option is deprecated. Use the `<project>` argument instead. - - Unable to fix {0}. Code fix {1} doesn't support Fix All in Solution. Unable to fix {0}. Code fix {1} doesn't support Fix All in Solution. @@ -277,9 +237,9 @@ Warnings were encountered while loading the workspace. Set the verbosity option to the 'diagnostic' level to log warnings. - - Whether to treat the `<project>` path as a folder of files. - Whether to treat the `<project>` path as a folder of files. + + Whether to treat the `<workspace>` argument as a simple folder of files. + Whether to treat the `<workspace>` argument as a simple folder of files. diff --git a/src/xlf/Resources.de.xlf b/src/xlf/Resources.de.xlf index b6b2284980..3c858a7bf5 100644 --- a/src/xlf/Resources.de.xlf +++ b/src/xlf/Resources.de.xlf @@ -12,6 +12,11 @@ A list of relative file or folder paths to include in formatting. All files are formatted if empty. + + A path to a solution file, a project file, or a folder containing a solution or project file. If a path is not specified then the current directory is used. + A path to a solution file, a project file, or a folder containing a solution or project file. If a path is not specified then the current directory is used. + + Accepts a file path, which if provided, will produce a json report in the given directory. Accepts a file path, which if provided, will produce a json report in the given directory. @@ -27,24 +32,9 @@ Analyzer Reference - - Both a MSBuild project file and solution file found in '{0}'. Specify which to use with the --workspace option. - In "{0}" wurden eine MSBuild-Projektdatei und eine Projektmappe gefunden. Geben Sie mit der Option "--workspace" an, welche verwendet werden soll. - - - - Cannot specify both folder and workspace options. - Cannot specify both folder and workspace options. - - - - Cannot specify both project argument and folder options. - Cannot specify both project argument and folder options. - - - - Cannot specify both project argument and workspace option. - Cannot specify both project argument and workspace option. + + Both a MSBuild project file and solution file found in '{0}'. Specify which to use with the <workspace> agrument. + In "{0}" wurden eine MSBuild-Projektdatei und eine Projektmappe gefunden. Geben Sie mit der Option "--workspace" an, welche verwendet werden soll. @@ -57,9 +47,9 @@ Complete in {0}ms. - - Could not find a MSBuild project file or solution file in '{0}'. Specify which to use with the --workspace option. - Kein MSBuild-Projektdatei oder Projektmappendatei in "{0}" gefunden. Geben Sie die zu verwendende Datei mit der Option "--workspace" an. + + Could not find a MSBuild project file or solution file in '{0}'. Specify which to use with the <workspace> argument. + Kein MSBuild-Projektdatei oder Projektmappendatei in "{0}" gefunden. Geben Sie die zu verwendende Datei mit der Option "--workspace" an. @@ -122,11 +112,6 @@ Format complete in {0}ms. - - Format files, but do not save changes to disk. - Dateien formatieren, Änderungen aber nicht auf Festplatte speichern. - - Formats files without saving changes to disk. Terminates with a non-zero exit code if any files were formatted. Formats files without saving changes to disk. Terminates with a non-zero exit code if any files were formatted. @@ -157,14 +142,14 @@ Arbeitsbereich wird geladen. - - Multiple MSBuild project files found in '{0}'. Specify which to use with the --workspace option. - Mehrere MSBuild-Projektdateien in "{0}" gefunden. Geben Sie mit der Option "--workspace" an, welche verwendet werden soll. + + Multiple MSBuild project files found in '{0}'. Specify which to use with the <workspace> argument. + Multiple MSBuild project files found in '{0}'. Specify which to use with the <workspace> argument. - - Multiple MSBuild solution files found in '{0}'. Specify which to use with the --workspace option. - Mehrere MSBuild Projektmappendateien in "{0}" gefunden. Geben Sie mit der Option "--workspace" an, welche verwendet werden soll. + + Multiple MSBuild solution files found in '{0}'. Specify which to use with the <workspace> argument. + Multiple MSBuild solution files found in '{0}'. Specify which to use with the <workspace> argument. @@ -202,26 +187,11 @@ The dotnet CLI version is '{0}'. - - The `--dry-run` option is deprecated. Use the `--check` option instead. - The `--dry-run` option is deprecated. Use the `--check` option instead. - - The file '{0}' does not appear to be a valid project or solution file. Die Datei "{0}" ist weder ein gültiges Projekt noch eine Projektmappendatei. - - The `--files` option is deprecated. Use the `--include` option instead. - The `--files` option is deprecated. Use the `--include` option instead. - - - - The `--folder` option is deprecated for specifying the path. Pass the `--folder` option but specify the path with the project argument instead. - The `--folder` option is deprecated for specifying the path. Pass the `--folder` option but specify the path with the project argument instead. - - The project file '{0}' does not exist. Die Projektdatei "{0}" ist nicht vorhanden. @@ -232,21 +202,11 @@ Die Projektmappendatei "{0}" ist nicht vorhanden. - - The solution or project file to operate on. If a file is not specified, the command will search the current directory for one. - Die Projektmappe oder Projektdatei, die verwendet werden soll. Wenn keine Datei angegeben ist, durchsucht der Befehl das aktuelle Verzeichnis nach einer Datei. - - Formatted code file '{0}'. Formatted code file '{0}'. - - The `--workspace` option is deprecated. Use the `<project>` argument instead. - The `--workspace` option is deprecated. Use the `<project>` argument instead. - - Unable to fix {0}. Code fix {1} doesn't support Fix All in Solution. Unable to fix {0}. Code fix {1} doesn't support Fix All in Solution. @@ -277,9 +237,9 @@ Warnings were encountered while loading the workspace. Set the verbosity option to the 'diagnostic' level to log warnings. - - Whether to treat the `<project>` path as a folder of files. - Whether to treat the `<project>` path as a folder of files. + + Whether to treat the `<workspace>` argument as a simple folder of files. + Whether to treat the `<workspace>` argument as a simple folder of files. diff --git a/src/xlf/Resources.es.xlf b/src/xlf/Resources.es.xlf index 87f3c6f4ba..7c9c26f29f 100644 --- a/src/xlf/Resources.es.xlf +++ b/src/xlf/Resources.es.xlf @@ -12,6 +12,11 @@ A list of relative file or folder paths to include in formatting. All files are formatted if empty. + + A path to a solution file, a project file, or a folder containing a solution or project file. If a path is not specified then the current directory is used. + A path to a solution file, a project file, or a folder containing a solution or project file. If a path is not specified then the current directory is used. + + Accepts a file path, which if provided, will produce a json report in the given directory. Accepts a file path, which if provided, will produce a json report in the given directory. @@ -27,24 +32,9 @@ Analyzer Reference - - Both a MSBuild project file and solution file found in '{0}'. Specify which to use with the --workspace option. - Se encontró un archivo de proyecto y un archivo de solución MSBuild en "{0}". Especifique cuál debe usarse con la opción --workspace. - - - - Cannot specify both folder and workspace options. - Cannot specify both folder and workspace options. - - - - Cannot specify both project argument and folder options. - Cannot specify both project argument and folder options. - - - - Cannot specify both project argument and workspace option. - Cannot specify both project argument and workspace option. + + Both a MSBuild project file and solution file found in '{0}'. Specify which to use with the <workspace> agrument. + Se encontró un archivo de proyecto y un archivo de solución MSBuild en "{0}". Especifique cuál debe usarse con la opción --workspace. @@ -57,9 +47,9 @@ Complete in {0}ms. - - Could not find a MSBuild project file or solution file in '{0}'. Specify which to use with the --workspace option. - No se pudo encontrar un archivo de proyecto o archivo de solución MSBuild en "{0}". Especifique cuál debe utilizarse con la opción --workspace. + + Could not find a MSBuild project file or solution file in '{0}'. Specify which to use with the <workspace> argument. + No se pudo encontrar un archivo de proyecto o archivo de solución MSBuild en "{0}". Especifique cuál debe utilizarse con la opción --workspace. @@ -122,11 +112,6 @@ Format complete in {0}ms. - - Format files, but do not save changes to disk. - Formato de archivos, pero no guardar los cambios al disco. - - Formats files without saving changes to disk. Terminates with a non-zero exit code if any files were formatted. Formats files without saving changes to disk. Terminates with a non-zero exit code if any files were formatted. @@ -157,14 +142,14 @@ Cargando área de trabajo. - - Multiple MSBuild project files found in '{0}'. Specify which to use with the --workspace option. - Se encontraron múltiples archivos de proyecto MSBuild en "{0}". Especifique cuál debe usarse con la opción --workspace. + + Multiple MSBuild project files found in '{0}'. Specify which to use with the <workspace> argument. + Multiple MSBuild project files found in '{0}'. Specify which to use with the <workspace> argument. - - Multiple MSBuild solution files found in '{0}'. Specify which to use with the --workspace option. - Se encontraron múltiples archivos de solución MSBuild en "{0}". Especifique cuáles se deben utilizar con la opción --workspace. + + Multiple MSBuild solution files found in '{0}'. Specify which to use with the <workspace> argument. + Multiple MSBuild solution files found in '{0}'. Specify which to use with the <workspace> argument. @@ -202,26 +187,11 @@ The dotnet CLI version is '{0}'. - - The `--dry-run` option is deprecated. Use the `--check` option instead. - The `--dry-run` option is deprecated. Use the `--check` option instead. - - The file '{0}' does not appear to be a valid project or solution file. El archivo "{0}" no parece ser un proyecto o archivo de solución válido. - - The `--files` option is deprecated. Use the `--include` option instead. - The `--files` option is deprecated. Use the `--include` option instead. - - - - The `--folder` option is deprecated for specifying the path. Pass the `--folder` option but specify the path with the project argument instead. - The `--folder` option is deprecated for specifying the path. Pass the `--folder` option but specify the path with the project argument instead. - - The project file '{0}' does not exist. El archivo de proyecto "{0}" no existe. @@ -232,21 +202,11 @@ El archivo de solución "{0}" no existe. - - The solution or project file to operate on. If a file is not specified, the command will search the current directory for one. - El archivo de solución o el proyecto para operar. Si no se especifica un archivo, el comando buscará uno en el directorio actual. - - Formatted code file '{0}'. Formatted code file '{0}'. - - The `--workspace` option is deprecated. Use the `<project>` argument instead. - The `--workspace` option is deprecated. Use the `<project>` argument instead. - - Unable to fix {0}. Code fix {1} doesn't support Fix All in Solution. Unable to fix {0}. Code fix {1} doesn't support Fix All in Solution. @@ -277,9 +237,9 @@ Warnings were encountered while loading the workspace. Set the verbosity option to the 'diagnostic' level to log warnings. - - Whether to treat the `<project>` path as a folder of files. - Whether to treat the `<project>` path as a folder of files. + + Whether to treat the `<workspace>` argument as a simple folder of files. + Whether to treat the `<workspace>` argument as a simple folder of files. diff --git a/src/xlf/Resources.fr.xlf b/src/xlf/Resources.fr.xlf index f92284f72c..96407b9ee9 100644 --- a/src/xlf/Resources.fr.xlf +++ b/src/xlf/Resources.fr.xlf @@ -12,6 +12,11 @@ A list of relative file or folder paths to include in formatting. All files are formatted if empty. + + A path to a solution file, a project file, or a folder containing a solution or project file. If a path is not specified then the current directory is used. + A path to a solution file, a project file, or a folder containing a solution or project file. If a path is not specified then the current directory is used. + + Accepts a file path, which if provided, will produce a json report in the given directory. Accepts a file path, which if provided, will produce a json report in the given directory. @@ -27,24 +32,9 @@ Analyzer Reference - - Both a MSBuild project file and solution file found in '{0}'. Specify which to use with the --workspace option. - Un fichier projet et un fichier solution MSBuild ont été trouvés dans '{0}'. Spécifiez celui à utiliser avec l'option --workspace. - - - - Cannot specify both folder and workspace options. - Cannot specify both folder and workspace options. - - - - Cannot specify both project argument and folder options. - Cannot specify both project argument and folder options. - - - - Cannot specify both project argument and workspace option. - Cannot specify both project argument and workspace option. + + Both a MSBuild project file and solution file found in '{0}'. Specify which to use with the <workspace> agrument. + Un fichier projet et un fichier solution MSBuild ont été trouvés dans '{0}'. Spécifiez celui à utiliser avec l'option --workspace. @@ -57,9 +47,9 @@ Complete in {0}ms. - - Could not find a MSBuild project file or solution file in '{0}'. Specify which to use with the --workspace option. - Fichier projet ou solution MSBuild introuvable dans '{0}'. Spécifiez celui à utiliser avec l'option --workspace. + + Could not find a MSBuild project file or solution file in '{0}'. Specify which to use with the <workspace> argument. + Fichier projet ou solution MSBuild introuvable dans '{0}'. Spécifiez celui à utiliser avec l'option --workspace. @@ -122,11 +112,6 @@ Format complete in {0}ms. - - Format files, but do not save changes to disk. - Mettez en forme les fichiers, mais n'enregistrez pas les changements sur le disque. - - Formats files without saving changes to disk. Terminates with a non-zero exit code if any files were formatted. Formats files without saving changes to disk. Terminates with a non-zero exit code if any files were formatted. @@ -157,14 +142,14 @@ Chargement de l'espace de travail. - - Multiple MSBuild project files found in '{0}'. Specify which to use with the --workspace option. - Plusieurs fichiers projet MSBuild dans '{0}'. Spécifiez celui à utiliser avec l'option --workspace. + + Multiple MSBuild project files found in '{0}'. Specify which to use with the <workspace> argument. + Multiple MSBuild project files found in '{0}'. Specify which to use with the <workspace> argument. - - Multiple MSBuild solution files found in '{0}'. Specify which to use with the --workspace option. - Plusieurs fichiers solution MSBuild dans '{0}'. Spécifiez ceux à utiliser avec l'option --workspace. + + Multiple MSBuild solution files found in '{0}'. Specify which to use with the <workspace> argument. + Multiple MSBuild solution files found in '{0}'. Specify which to use with the <workspace> argument. @@ -202,26 +187,11 @@ The dotnet CLI version is '{0}'. - - The `--dry-run` option is deprecated. Use the `--check` option instead. - The `--dry-run` option is deprecated. Use the `--check` option instead. - - The file '{0}' does not appear to be a valid project or solution file. Le fichier '{0}' ne semble pas être un fichier projet ou solution valide. - - The `--files` option is deprecated. Use the `--include` option instead. - The `--files` option is deprecated. Use the `--include` option instead. - - - - The `--folder` option is deprecated for specifying the path. Pass the `--folder` option but specify the path with the project argument instead. - The `--folder` option is deprecated for specifying the path. Pass the `--folder` option but specify the path with the project argument instead. - - The project file '{0}' does not exist. Le fichier projet '{0}' n'existe pas. @@ -232,21 +202,11 @@ Le fichier solution '{0}' n'existe pas. - - The solution or project file to operate on. If a file is not specified, the command will search the current directory for one. - Fichier solution ou projet à utiliser. Si un fichier n'est pas spécifié, la commande en recherche un dans le répertoire actuel. - - Formatted code file '{0}'. Formatted code file '{0}'. - - The `--workspace` option is deprecated. Use the `<project>` argument instead. - The `--workspace` option is deprecated. Use the `<project>` argument instead. - - Unable to fix {0}. Code fix {1} doesn't support Fix All in Solution. Unable to fix {0}. Code fix {1} doesn't support Fix All in Solution. @@ -277,9 +237,9 @@ Warnings were encountered while loading the workspace. Set the verbosity option to the 'diagnostic' level to log warnings. - - Whether to treat the `<project>` path as a folder of files. - Whether to treat the `<project>` path as a folder of files. + + Whether to treat the `<workspace>` argument as a simple folder of files. + Whether to treat the `<workspace>` argument as a simple folder of files. diff --git a/src/xlf/Resources.it.xlf b/src/xlf/Resources.it.xlf index f0752d5af9..4cea5eaa88 100644 --- a/src/xlf/Resources.it.xlf +++ b/src/xlf/Resources.it.xlf @@ -12,6 +12,11 @@ A list of relative file or folder paths to include in formatting. All files are formatted if empty. + + A path to a solution file, a project file, or a folder containing a solution or project file. If a path is not specified then the current directory is used. + A path to a solution file, a project file, or a folder containing a solution or project file. If a path is not specified then the current directory is used. + + Accepts a file path, which if provided, will produce a json report in the given directory. Accepts a file path, which if provided, will produce a json report in the given directory. @@ -27,24 +32,9 @@ Analyzer Reference - - Both a MSBuild project file and solution file found in '{0}'. Specify which to use with the --workspace option. - In '{0}' sono stati trovati sia un file di progetto che un file di soluzione MSBuild. Per specificare quello desiderato, usare l'opzione --workspace. - - - - Cannot specify both folder and workspace options. - Cannot specify both folder and workspace options. - - - - Cannot specify both project argument and folder options. - Cannot specify both project argument and folder options. - - - - Cannot specify both project argument and workspace option. - Cannot specify both project argument and workspace option. + + Both a MSBuild project file and solution file found in '{0}'. Specify which to use with the <workspace> agrument. + In '{0}' sono stati trovati sia un file di progetto che un file di soluzione MSBuild. Per specificare quello desiderato, usare l'opzione --workspace. @@ -57,9 +47,9 @@ Complete in {0}ms. - - Could not find a MSBuild project file or solution file in '{0}'. Specify which to use with the --workspace option. - In '{0}' non è stato possibile trovare alcun file di progetto o di soluzione MSBuild. Per specificare quello desiderato, usare l'opzione --workspace. + + Could not find a MSBuild project file or solution file in '{0}'. Specify which to use with the <workspace> argument. + In '{0}' non è stato possibile trovare alcun file di progetto o di soluzione MSBuild. Per specificare quello desiderato, usare l'opzione --workspace. @@ -122,11 +112,6 @@ Format complete in {0}ms. - - Format files, but do not save changes to disk. - Formatta i file, ma non salvare le modifiche sul disco. - - Formats files without saving changes to disk. Terminates with a non-zero exit code if any files were formatted. Formats files without saving changes to disk. Terminates with a non-zero exit code if any files were formatted. @@ -157,14 +142,14 @@ Caricamento dell'area di lavoro. - - Multiple MSBuild project files found in '{0}'. Specify which to use with the --workspace option. - In '{0}' sono stati trovati più file di progetto MSBuild. Per specificare quello desiderato, usare l'opzione --workspace. + + Multiple MSBuild project files found in '{0}'. Specify which to use with the <workspace> argument. + Multiple MSBuild project files found in '{0}'. Specify which to use with the <workspace> argument. - - Multiple MSBuild solution files found in '{0}'. Specify which to use with the --workspace option. - In '{0}' sono stati trovati più file di soluzione MSBuild. Per specificare quello desiderato, usare l'opzione --workspace. + + Multiple MSBuild solution files found in '{0}'. Specify which to use with the <workspace> argument. + Multiple MSBuild solution files found in '{0}'. Specify which to use with the <workspace> argument. @@ -202,26 +187,11 @@ The dotnet CLI version is '{0}'. - - The `--dry-run` option is deprecated. Use the `--check` option instead. - The `--dry-run` option is deprecated. Use the `--check` option instead. - - The file '{0}' does not appear to be a valid project or solution file. Il file '{0}' non sembra essere un file di progetto o di soluzione valido. - - The `--files` option is deprecated. Use the `--include` option instead. - The `--files` option is deprecated. Use the `--include` option instead. - - - - The `--folder` option is deprecated for specifying the path. Pass the `--folder` option but specify the path with the project argument instead. - The `--folder` option is deprecated for specifying the path. Pass the `--folder` option but specify the path with the project argument instead. - - The project file '{0}' does not exist. Il file di progetto '{0}' non esiste. @@ -232,21 +202,11 @@ Il file di soluzione '{0}' non esiste. - - The solution or project file to operate on. If a file is not specified, the command will search the current directory for one. - File di progetto o di soluzione su cui intervenire. Se non si specifica un file, il comando ne cercherà uno nella directory corrente. - - Formatted code file '{0}'. Formatted code file '{0}'. - - The `--workspace` option is deprecated. Use the `<project>` argument instead. - The `--workspace` option is deprecated. Use the `<project>` argument instead. - - Unable to fix {0}. Code fix {1} doesn't support Fix All in Solution. Unable to fix {0}. Code fix {1} doesn't support Fix All in Solution. @@ -277,9 +237,9 @@ Warnings were encountered while loading the workspace. Set the verbosity option to the 'diagnostic' level to log warnings. - - Whether to treat the `<project>` path as a folder of files. - Whether to treat the `<project>` path as a folder of files. + + Whether to treat the `<workspace>` argument as a simple folder of files. + Whether to treat the `<workspace>` argument as a simple folder of files. diff --git a/src/xlf/Resources.ja.xlf b/src/xlf/Resources.ja.xlf index 5d7fad18a4..5ee9c30208 100644 --- a/src/xlf/Resources.ja.xlf +++ b/src/xlf/Resources.ja.xlf @@ -12,6 +12,11 @@ A list of relative file or folder paths to include in formatting. All files are formatted if empty. + + A path to a solution file, a project file, or a folder containing a solution or project file. If a path is not specified then the current directory is used. + A path to a solution file, a project file, or a folder containing a solution or project file. If a path is not specified then the current directory is used. + + Accepts a file path, which if provided, will produce a json report in the given directory. Accepts a file path, which if provided, will produce a json report in the given directory. @@ -27,24 +32,9 @@ Analyzer Reference - - Both a MSBuild project file and solution file found in '{0}'. Specify which to use with the --workspace option. - MSBuild プロジェクト ファイルとソリューション ファイルが '{0}' で見つかりました。使用するファイルを --workspace オプションで指定してください。 - - - - Cannot specify both folder and workspace options. - Cannot specify both folder and workspace options. - - - - Cannot specify both project argument and folder options. - Cannot specify both project argument and folder options. - - - - Cannot specify both project argument and workspace option. - Cannot specify both project argument and workspace option. + + Both a MSBuild project file and solution file found in '{0}'. Specify which to use with the <workspace> agrument. + MSBuild プロジェクト ファイルとソリューション ファイルが '{0}' で見つかりました。使用するファイルを --workspace オプションで指定してください。 @@ -57,9 +47,9 @@ Complete in {0}ms. - - Could not find a MSBuild project file or solution file in '{0}'. Specify which to use with the --workspace option. - '{0}' で MSBuild プロジェクト ファイルまたはソリューション ファイルが見つかりませんでした。使用するファイルを --workspace オプションで指定してください。 + + Could not find a MSBuild project file or solution file in '{0}'. Specify which to use with the <workspace> argument. + '{0}' で MSBuild プロジェクト ファイルまたはソリューション ファイルが見つかりませんでした。使用するファイルを --workspace オプションで指定してください。 @@ -122,11 +112,6 @@ Format complete in {0}ms. - - Format files, but do not save changes to disk. - ファイルを書式設定しますが、変更をディスクに保存しません。 - - Formats files without saving changes to disk. Terminates with a non-zero exit code if any files were formatted. Formats files without saving changes to disk. Terminates with a non-zero exit code if any files were formatted. @@ -157,14 +142,14 @@ ワークスペースを読み込んでいます。 - - Multiple MSBuild project files found in '{0}'. Specify which to use with the --workspace option. - 複数の MSBuild プロジェクト ファイルが '{0}' で見つかりました。使用するファイルを --workspace オプションで指定してください。 + + Multiple MSBuild project files found in '{0}'. Specify which to use with the <workspace> argument. + Multiple MSBuild project files found in '{0}'. Specify which to use with the <workspace> argument. - - Multiple MSBuild solution files found in '{0}'. Specify which to use with the --workspace option. - 複数の MSBuild ソリューション ファイルが '{0}' で見つかりました。使用するファイルを --workspace オプションで指定してください。 + + Multiple MSBuild solution files found in '{0}'. Specify which to use with the <workspace> argument. + Multiple MSBuild solution files found in '{0}'. Specify which to use with the <workspace> argument. @@ -202,26 +187,11 @@ The dotnet CLI version is '{0}'. - - The `--dry-run` option is deprecated. Use the `--check` option instead. - The `--dry-run` option is deprecated. Use the `--check` option instead. - - The file '{0}' does not appear to be a valid project or solution file. ファイル '{0}' が、有効なプロジェクト ファイルまたはソリューション ファイルではない可能性があります。 - - The `--files` option is deprecated. Use the `--include` option instead. - The `--files` option is deprecated. Use the `--include` option instead. - - - - The `--folder` option is deprecated for specifying the path. Pass the `--folder` option but specify the path with the project argument instead. - The `--folder` option is deprecated for specifying the path. Pass the `--folder` option but specify the path with the project argument instead. - - The project file '{0}' does not exist. プロジェクト ファイル '{0}' が存在しません。 @@ -232,21 +202,11 @@ ソリューション ファイル '{0}' が存在しません。 - - The solution or project file to operate on. If a file is not specified, the command will search the current directory for one. - 操作対象のソリューション ファイルまたはプロジェクト ファイル。ファイルを指定しない場合、コマンドは現在のディレクトリを検索します。 - - Formatted code file '{0}'. Formatted code file '{0}'. - - The `--workspace` option is deprecated. Use the `<project>` argument instead. - The `--workspace` option is deprecated. Use the `<project>` argument instead. - - Unable to fix {0}. Code fix {1} doesn't support Fix All in Solution. Unable to fix {0}. Code fix {1} doesn't support Fix All in Solution. @@ -277,9 +237,9 @@ Warnings were encountered while loading the workspace. Set the verbosity option to the 'diagnostic' level to log warnings. - - Whether to treat the `<project>` path as a folder of files. - Whether to treat the `<project>` path as a folder of files. + + Whether to treat the `<workspace>` argument as a simple folder of files. + Whether to treat the `<workspace>` argument as a simple folder of files. diff --git a/src/xlf/Resources.ko.xlf b/src/xlf/Resources.ko.xlf index 712ced7a50..af6fa13c8f 100644 --- a/src/xlf/Resources.ko.xlf +++ b/src/xlf/Resources.ko.xlf @@ -12,6 +12,11 @@ A list of relative file or folder paths to include in formatting. All files are formatted if empty. + + A path to a solution file, a project file, or a folder containing a solution or project file. If a path is not specified then the current directory is used. + A path to a solution file, a project file, or a folder containing a solution or project file. If a path is not specified then the current directory is used. + + Accepts a file path, which if provided, will produce a json report in the given directory. Accepts a file path, which if provided, will produce a json report in the given directory. @@ -27,24 +32,9 @@ Analyzer Reference - - Both a MSBuild project file and solution file found in '{0}'. Specify which to use with the --workspace option. - '{0}'에 MSBuild 프로젝트 파일 및 솔루션 파일이 모두 있습니다. --workspace 옵션에 사용할 파일을 지정하세요. - - - - Cannot specify both folder and workspace options. - Cannot specify both folder and workspace options. - - - - Cannot specify both project argument and folder options. - Cannot specify both project argument and folder options. - - - - Cannot specify both project argument and workspace option. - Cannot specify both project argument and workspace option. + + Both a MSBuild project file and solution file found in '{0}'. Specify which to use with the <workspace> agrument. + '{0}'에 MSBuild 프로젝트 파일 및 솔루션 파일이 모두 있습니다. --workspace 옵션에 사용할 파일을 지정하세요. @@ -57,9 +47,9 @@ Complete in {0}ms. - - Could not find a MSBuild project file or solution file in '{0}'. Specify which to use with the --workspace option. - '{0}'에서 MSBuild 프로젝트 파일 또는 솔루션 파일을 찾을 수 없습니다. --workspace 옵션에 사용할 파일을 지정하세요. + + Could not find a MSBuild project file or solution file in '{0}'. Specify which to use with the <workspace> argument. + '{0}'에서 MSBuild 프로젝트 파일 또는 솔루션 파일을 찾을 수 없습니다. --workspace 옵션에 사용할 파일을 지정하세요. @@ -122,11 +112,6 @@ Format complete in {0}ms. - - Format files, but do not save changes to disk. - 파일의 형식을 지정하지만 변경 내용을 디스크에 저장하지 않습니다. - - Formats files without saving changes to disk. Terminates with a non-zero exit code if any files were formatted. Formats files without saving changes to disk. Terminates with a non-zero exit code if any files were formatted. @@ -157,14 +142,14 @@ 작업 영역을 로드하는 중입니다. - - Multiple MSBuild project files found in '{0}'. Specify which to use with the --workspace option. - '{0}'에서 여러 MSBuild 프로젝트 파일을 찾았습니다. --workspace 옵션에 사용할 파일을 지정하세요. + + Multiple MSBuild project files found in '{0}'. Specify which to use with the <workspace> argument. + Multiple MSBuild project files found in '{0}'. Specify which to use with the <workspace> argument. - - Multiple MSBuild solution files found in '{0}'. Specify which to use with the --workspace option. - '{0}'에 여러 MSBuild 솔루션 파일이 있습니다. --workspace 옵션에 사용할 파일을 지정하세요. + + Multiple MSBuild solution files found in '{0}'. Specify which to use with the <workspace> argument. + Multiple MSBuild solution files found in '{0}'. Specify which to use with the <workspace> argument. @@ -202,26 +187,11 @@ The dotnet CLI version is '{0}'. - - The `--dry-run` option is deprecated. Use the `--check` option instead. - The `--dry-run` option is deprecated. Use the `--check` option instead. - - The file '{0}' does not appear to be a valid project or solution file. '{0}' 파일은 유효한 프로젝트 또는 솔루션 파일이 아닌 것 같습니다. - - The `--files` option is deprecated. Use the `--include` option instead. - The `--files` option is deprecated. Use the `--include` option instead. - - - - The `--folder` option is deprecated for specifying the path. Pass the `--folder` option but specify the path with the project argument instead. - The `--folder` option is deprecated for specifying the path. Pass the `--folder` option but specify the path with the project argument instead. - - The project file '{0}' does not exist. 프로젝트 파일 '{0}'이(가) 없습니다. @@ -232,21 +202,11 @@ 솔루션 파일 '{0}'이(가) 없습니다. - - The solution or project file to operate on. If a file is not specified, the command will search the current directory for one. - 수행할 솔루션 또는 프로젝트 파일입니다. 파일을 지정하지 않으면 명령이 현재 디렉터리에서 파일을 검색합니다. - - Formatted code file '{0}'. Formatted code file '{0}'. - - The `--workspace` option is deprecated. Use the `<project>` argument instead. - The `--workspace` option is deprecated. Use the `<project>` argument instead. - - Unable to fix {0}. Code fix {1} doesn't support Fix All in Solution. Unable to fix {0}. Code fix {1} doesn't support Fix All in Solution. @@ -277,9 +237,9 @@ Warnings were encountered while loading the workspace. Set the verbosity option to the 'diagnostic' level to log warnings. - - Whether to treat the `<project>` path as a folder of files. - Whether to treat the `<project>` path as a folder of files. + + Whether to treat the `<workspace>` argument as a simple folder of files. + Whether to treat the `<workspace>` argument as a simple folder of files. diff --git a/src/xlf/Resources.pl.xlf b/src/xlf/Resources.pl.xlf index dfec45a515..72edec1e78 100644 --- a/src/xlf/Resources.pl.xlf +++ b/src/xlf/Resources.pl.xlf @@ -12,6 +12,11 @@ A list of relative file or folder paths to include in formatting. All files are formatted if empty. + + A path to a solution file, a project file, or a folder containing a solution or project file. If a path is not specified then the current directory is used. + A path to a solution file, a project file, or a folder containing a solution or project file. If a path is not specified then the current directory is used. + + Accepts a file path, which if provided, will produce a json report in the given directory. Accepts a file path, which if provided, will produce a json report in the given directory. @@ -27,24 +32,9 @@ Analyzer Reference - - Both a MSBuild project file and solution file found in '{0}'. Specify which to use with the --workspace option. - W elemencie „{0}” znaleziono zarówno plik rozwiązania, jak i plik projektu MSBuild. Określ plik do użycia za pomocą opcji --workspace. - - - - Cannot specify both folder and workspace options. - Cannot specify both folder and workspace options. - - - - Cannot specify both project argument and folder options. - Cannot specify both project argument and folder options. - - - - Cannot specify both project argument and workspace option. - Cannot specify both project argument and workspace option. + + Both a MSBuild project file and solution file found in '{0}'. Specify which to use with the <workspace> agrument. + W elemencie „{0}” znaleziono zarówno plik rozwiązania, jak i plik projektu MSBuild. Określ plik do użycia za pomocą opcji --workspace. @@ -57,9 +47,9 @@ Complete in {0}ms. - - Could not find a MSBuild project file or solution file in '{0}'. Specify which to use with the --workspace option. - Nie można znaleźć pliku rozwiązania lub projektu MSBuild w elemencie „{0}”. Określ plik do użycia za pomocą opcji --workspace. + + Could not find a MSBuild project file or solution file in '{0}'. Specify which to use with the <workspace> argument. + Nie można znaleźć pliku rozwiązania lub projektu MSBuild w elemencie „{0}”. Określ plik do użycia za pomocą opcji --workspace. @@ -122,11 +112,6 @@ Format complete in {0}ms. - - Format files, but do not save changes to disk. - Formatuj pliki, ale nie zapisuj zmian na dysku. - - Formats files without saving changes to disk. Terminates with a non-zero exit code if any files were formatted. Formats files without saving changes to disk. Terminates with a non-zero exit code if any files were formatted. @@ -157,14 +142,14 @@ Ładowanie obszaru roboczego. - - Multiple MSBuild project files found in '{0}'. Specify which to use with the --workspace option. - W elemencie „{0}” znaleziono wiele plików projektów MSBuild. Określ, którego użyć, za pomocą opcji --workspace. + + Multiple MSBuild project files found in '{0}'. Specify which to use with the <workspace> argument. + Multiple MSBuild project files found in '{0}'. Specify which to use with the <workspace> argument. - - Multiple MSBuild solution files found in '{0}'. Specify which to use with the --workspace option. - W elemencie „{0}” znaleziono wiele plików rozwiązań MSBuild. Określ plik do użycia za pomocą opcji --workspace. + + Multiple MSBuild solution files found in '{0}'. Specify which to use with the <workspace> argument. + Multiple MSBuild solution files found in '{0}'. Specify which to use with the <workspace> argument. @@ -202,26 +187,11 @@ The dotnet CLI version is '{0}'. - - The `--dry-run` option is deprecated. Use the `--check` option instead. - The `--dry-run` option is deprecated. Use the `--check` option instead. - - The file '{0}' does not appear to be a valid project or solution file. Plik „{0}” prawdopodobnie nie jest prawidłowym plikiem projektu lub rozwiązania. - - The `--files` option is deprecated. Use the `--include` option instead. - The `--files` option is deprecated. Use the `--include` option instead. - - - - The `--folder` option is deprecated for specifying the path. Pass the `--folder` option but specify the path with the project argument instead. - The `--folder` option is deprecated for specifying the path. Pass the `--folder` option but specify the path with the project argument instead. - - The project file '{0}' does not exist. Plik projektu „{0}” nie istnieje. @@ -232,21 +202,11 @@ Plik rozwiązania „{0}” nie istnieje. - - The solution or project file to operate on. If a file is not specified, the command will search the current directory for one. - Plik rozwiązania lub projektu, względem którego operacja ma być wykonana. Jeśli plik nie zostanie określony, polecenie wyszuka go w bieżącym katalogu. - - Formatted code file '{0}'. Formatted code file '{0}'. - - The `--workspace` option is deprecated. Use the `<project>` argument instead. - The `--workspace` option is deprecated. Use the `<project>` argument instead. - - Unable to fix {0}. Code fix {1} doesn't support Fix All in Solution. Unable to fix {0}. Code fix {1} doesn't support Fix All in Solution. @@ -277,9 +237,9 @@ Warnings were encountered while loading the workspace. Set the verbosity option to the 'diagnostic' level to log warnings. - - Whether to treat the `<project>` path as a folder of files. - Whether to treat the `<project>` path as a folder of files. + + Whether to treat the `<workspace>` argument as a simple folder of files. + Whether to treat the `<workspace>` argument as a simple folder of files. diff --git a/src/xlf/Resources.pt-BR.xlf b/src/xlf/Resources.pt-BR.xlf index d0cf59e42b..36fe15137f 100644 --- a/src/xlf/Resources.pt-BR.xlf +++ b/src/xlf/Resources.pt-BR.xlf @@ -12,6 +12,11 @@ A list of relative file or folder paths to include in formatting. All files are formatted if empty. + + A path to a solution file, a project file, or a folder containing a solution or project file. If a path is not specified then the current directory is used. + A path to a solution file, a project file, or a folder containing a solution or project file. If a path is not specified then the current directory is used. + + Accepts a file path, which if provided, will produce a json report in the given directory. Accepts a file path, which if provided, will produce a json report in the given directory. @@ -27,24 +32,9 @@ Analyzer Reference - - Both a MSBuild project file and solution file found in '{0}'. Specify which to use with the --workspace option. - Foram encontrados um arquivo de solução e um arquivo de projeto MSBuild em '{0}'. Especifique qual usar com a opção --espaço de trabalho. - - - - Cannot specify both folder and workspace options. - Cannot specify both folder and workspace options. - - - - Cannot specify both project argument and folder options. - Cannot specify both project argument and folder options. - - - - Cannot specify both project argument and workspace option. - Cannot specify both project argument and workspace option. + + Both a MSBuild project file and solution file found in '{0}'. Specify which to use with the <workspace> agrument. + Foram encontrados um arquivo de solução e um arquivo de projeto MSBuild em '{0}'. Especifique qual usar com a opção --espaço de trabalho. @@ -57,9 +47,9 @@ Complete in {0}ms. - - Could not find a MSBuild project file or solution file in '{0}'. Specify which to use with the --workspace option. - Não foi possível encontrar um arquivo de solução ou arquivo de projeto MSBuild em '{0}'. Especifique qual usar com a opção --espaço de trabalho. + + Could not find a MSBuild project file or solution file in '{0}'. Specify which to use with the <workspace> argument. + Não foi possível encontrar um arquivo de solução ou arquivo de projeto MSBuild em '{0}'. Especifique qual usar com a opção --espaço de trabalho. @@ -122,11 +112,6 @@ Format complete in {0}ms. - - Format files, but do not save changes to disk. - Arquivos de formato, mas não salva as alterações para o disco. - - Formats files without saving changes to disk. Terminates with a non-zero exit code if any files were formatted. Formats files without saving changes to disk. Terminates with a non-zero exit code if any files were formatted. @@ -157,14 +142,14 @@ Carregando espaço de trabalho. - - Multiple MSBuild project files found in '{0}'. Specify which to use with the --workspace option. - Foram encontrados vários arquivos do projeto MSBuild em '{0}'. Especifique qual usar com a opção --espaço de trabalho. + + Multiple MSBuild project files found in '{0}'. Specify which to use with the <workspace> argument. + Multiple MSBuild project files found in '{0}'. Specify which to use with the <workspace> argument. - - Multiple MSBuild solution files found in '{0}'. Specify which to use with the --workspace option. - Foram encontrados vários arquivos de solução MSBuild em '{0}'. Especifique qual usar com a opção --espaço de trabalho. + + Multiple MSBuild solution files found in '{0}'. Specify which to use with the <workspace> argument. + Multiple MSBuild solution files found in '{0}'. Specify which to use with the <workspace> argument. @@ -202,26 +187,11 @@ The dotnet CLI version is '{0}'. - - The `--dry-run` option is deprecated. Use the `--check` option instead. - The `--dry-run` option is deprecated. Use the `--check` option instead. - - The file '{0}' does not appear to be a valid project or solution file. O arquivo '{0}' parece não ser um projeto válido ou o arquivo de solução. - - The `--files` option is deprecated. Use the `--include` option instead. - The `--files` option is deprecated. Use the `--include` option instead. - - - - The `--folder` option is deprecated for specifying the path. Pass the `--folder` option but specify the path with the project argument instead. - The `--folder` option is deprecated for specifying the path. Pass the `--folder` option but specify the path with the project argument instead. - - The project file '{0}' does not exist. O arquivo de projeto '{0}' não existe. @@ -232,21 +202,11 @@ O arquivo de solução '{0}' não existe. - - The solution or project file to operate on. If a file is not specified, the command will search the current directory for one. - O arquivo de projeto ou solução para operar. Se um arquivo não for especificado, o comando pesquisará o diretório atual para um. - - Formatted code file '{0}'. Formatted code file '{0}'. - - The `--workspace` option is deprecated. Use the `<project>` argument instead. - The `--workspace` option is deprecated. Use the `<project>` argument instead. - - Unable to fix {0}. Code fix {1} doesn't support Fix All in Solution. Unable to fix {0}. Code fix {1} doesn't support Fix All in Solution. @@ -277,9 +237,9 @@ Warnings were encountered while loading the workspace. Set the verbosity option to the 'diagnostic' level to log warnings. - - Whether to treat the `<project>` path as a folder of files. - Whether to treat the `<project>` path as a folder of files. + + Whether to treat the `<workspace>` argument as a simple folder of files. + Whether to treat the `<workspace>` argument as a simple folder of files. diff --git a/src/xlf/Resources.ru.xlf b/src/xlf/Resources.ru.xlf index 3aa559f191..4b50b46f48 100644 --- a/src/xlf/Resources.ru.xlf +++ b/src/xlf/Resources.ru.xlf @@ -12,6 +12,11 @@ A list of relative file or folder paths to include in formatting. All files are formatted if empty. + + A path to a solution file, a project file, or a folder containing a solution or project file. If a path is not specified then the current directory is used. + A path to a solution file, a project file, or a folder containing a solution or project file. If a path is not specified then the current directory is used. + + Accepts a file path, which if provided, will produce a json report in the given directory. Accepts a file path, which if provided, will produce a json report in the given directory. @@ -27,24 +32,9 @@ Analyzer Reference - - Both a MSBuild project file and solution file found in '{0}'. Specify which to use with the --workspace option. - В "{0}" обнаружены как файл проекта, так и файл решения MSBuild. Укажите используемый файл с помощью параметра --workspace. - - - - Cannot specify both folder and workspace options. - Cannot specify both folder and workspace options. - - - - Cannot specify both project argument and folder options. - Cannot specify both project argument and folder options. - - - - Cannot specify both project argument and workspace option. - Cannot specify both project argument and workspace option. + + Both a MSBuild project file and solution file found in '{0}'. Specify which to use with the <workspace> agrument. + В "{0}" обнаружены как файл проекта, так и файл решения MSBuild. Укажите используемый файл с помощью параметра --workspace. @@ -57,9 +47,9 @@ Complete in {0}ms. - - Could not find a MSBuild project file or solution file in '{0}'. Specify which to use with the --workspace option. - Не удалось найти файл проекта или решения MSBuild в "{0}". Укажите используемый файл с параметром --workspace. + + Could not find a MSBuild project file or solution file in '{0}'. Specify which to use with the <workspace> argument. + Не удалось найти файл проекта или решения MSBuild в "{0}". Укажите используемый файл с параметром --workspace. @@ -122,11 +112,6 @@ Format complete in {0}ms. - - Format files, but do not save changes to disk. - Форматировать файлы без сохранения изменений на диск. - - Formats files without saving changes to disk. Terminates with a non-zero exit code if any files were formatted. Formats files without saving changes to disk. Terminates with a non-zero exit code if any files were formatted. @@ -157,14 +142,14 @@ Загрузка рабочей области. - - Multiple MSBuild project files found in '{0}'. Specify which to use with the --workspace option. - В "{0}" обнаружено несколько файлов проектов MSBuild. Укажите используемый файл с помощью параметра --workspace. + + Multiple MSBuild project files found in '{0}'. Specify which to use with the <workspace> argument. + Multiple MSBuild project files found in '{0}'. Specify which to use with the <workspace> argument. - - Multiple MSBuild solution files found in '{0}'. Specify which to use with the --workspace option. - В "{0}" обнаружено несколько файлов решений MSBuild. Укажите используемый файл с параметром --workspace. + + Multiple MSBuild solution files found in '{0}'. Specify which to use with the <workspace> argument. + Multiple MSBuild solution files found in '{0}'. Specify which to use with the <workspace> argument. @@ -202,26 +187,11 @@ The dotnet CLI version is '{0}'. - - The `--dry-run` option is deprecated. Use the `--check` option instead. - The `--dry-run` option is deprecated. Use the `--check` option instead. - - The file '{0}' does not appear to be a valid project or solution file. Файл "{0}" не является допустимым файлом проекта или решения. - - The `--files` option is deprecated. Use the `--include` option instead. - The `--files` option is deprecated. Use the `--include` option instead. - - - - The `--folder` option is deprecated for specifying the path. Pass the `--folder` option but specify the path with the project argument instead. - The `--folder` option is deprecated for specifying the path. Pass the `--folder` option but specify the path with the project argument instead. - - The project file '{0}' does not exist. Файл проекта "{0}" не существует. @@ -232,21 +202,11 @@ Файл решения "{0}" не существует. - - The solution or project file to operate on. If a file is not specified, the command will search the current directory for one. - Файл решения или проекта. Если файл не указан, команда будет искать этот файл в текущем каталоге. - - Formatted code file '{0}'. Formatted code file '{0}'. - - The `--workspace` option is deprecated. Use the `<project>` argument instead. - The `--workspace` option is deprecated. Use the `<project>` argument instead. - - Unable to fix {0}. Code fix {1} doesn't support Fix All in Solution. Unable to fix {0}. Code fix {1} doesn't support Fix All in Solution. @@ -277,9 +237,9 @@ Warnings were encountered while loading the workspace. Set the verbosity option to the 'diagnostic' level to log warnings. - - Whether to treat the `<project>` path as a folder of files. - Whether to treat the `<project>` path as a folder of files. + + Whether to treat the `<workspace>` argument as a simple folder of files. + Whether to treat the `<workspace>` argument as a simple folder of files. diff --git a/src/xlf/Resources.tr.xlf b/src/xlf/Resources.tr.xlf index a3a9b05b50..b736f28bd3 100644 --- a/src/xlf/Resources.tr.xlf +++ b/src/xlf/Resources.tr.xlf @@ -12,6 +12,11 @@ A list of relative file or folder paths to include in formatting. All files are formatted if empty. + + A path to a solution file, a project file, or a folder containing a solution or project file. If a path is not specified then the current directory is used. + A path to a solution file, a project file, or a folder containing a solution or project file. If a path is not specified then the current directory is used. + + Accepts a file path, which if provided, will produce a json report in the given directory. Accepts a file path, which if provided, will produce a json report in the given directory. @@ -27,24 +32,9 @@ Analyzer Reference - - Both a MSBuild project file and solution file found in '{0}'. Specify which to use with the --workspace option. - Hem bir MSBuild proje dosyası ve çözüm dosyası '{0}' içinde bulundu. Hangi--çalışma alanı seçeneği ile kullanmak için belirtin. - - - - Cannot specify both folder and workspace options. - Cannot specify both folder and workspace options. - - - - Cannot specify both project argument and folder options. - Cannot specify both project argument and folder options. - - - - Cannot specify both project argument and workspace option. - Cannot specify both project argument and workspace option. + + Both a MSBuild project file and solution file found in '{0}'. Specify which to use with the <workspace> agrument. + Hem bir MSBuild proje dosyası ve çözüm dosyası '{0}' içinde bulundu. Hangi--çalışma alanı seçeneği ile kullanmak için belirtin. @@ -57,9 +47,9 @@ Complete in {0}ms. - - Could not find a MSBuild project file or solution file in '{0}'. Specify which to use with the --workspace option. - Bir MSBuild proje dosyası veya çözüm dosyası '{0}' içinde bulunamadı. Hangi--çalışma alanı seçeneği ile kullanmak için belirtin. + + Could not find a MSBuild project file or solution file in '{0}'. Specify which to use with the <workspace> argument. + Bir MSBuild proje dosyası veya çözüm dosyası '{0}' içinde bulunamadı. Hangi--çalışma alanı seçeneği ile kullanmak için belirtin. @@ -122,11 +112,6 @@ Format complete in {0}ms. - - Format files, but do not save changes to disk. - Dosyaları biçimlendir, ancak değişiklikleri diske kaydetme. - - Formats files without saving changes to disk. Terminates with a non-zero exit code if any files were formatted. Formats files without saving changes to disk. Terminates with a non-zero exit code if any files were formatted. @@ -157,14 +142,14 @@ Çalışma alanı yükleniyor. - - Multiple MSBuild project files found in '{0}'. Specify which to use with the --workspace option. - Birden fazla MSBuild proje dosyası '{0}' içinde bulundu. Hangi--çalışma alanı seçeneği ile kullanmak için belirtin. + + Multiple MSBuild project files found in '{0}'. Specify which to use with the <workspace> argument. + Multiple MSBuild project files found in '{0}'. Specify which to use with the <workspace> argument. - - Multiple MSBuild solution files found in '{0}'. Specify which to use with the --workspace option. - Birden fazla MSBuild çözüm dosyası '{0}' içinde bulundu. Hangi--çalışma alanı seçeneği ile kullanmak için belirtin. + + Multiple MSBuild solution files found in '{0}'. Specify which to use with the <workspace> argument. + Multiple MSBuild solution files found in '{0}'. Specify which to use with the <workspace> argument. @@ -202,26 +187,11 @@ The dotnet CLI version is '{0}'. - - The `--dry-run` option is deprecated. Use the `--check` option instead. - The `--dry-run` option is deprecated. Use the `--check` option instead. - - The file '{0}' does not appear to be a valid project or solution file. '{0}' dosyası geçerli proje veya çözüm dosyası gibi görünmüyor. - - The `--files` option is deprecated. Use the `--include` option instead. - The `--files` option is deprecated. Use the `--include` option instead. - - - - The `--folder` option is deprecated for specifying the path. Pass the `--folder` option but specify the path with the project argument instead. - The `--folder` option is deprecated for specifying the path. Pass the `--folder` option but specify the path with the project argument instead. - - The project file '{0}' does not exist. Proje dosyası '{0}' yok. @@ -232,21 +202,11 @@ Çözüm dosyası '{0}' yok. - - The solution or project file to operate on. If a file is not specified, the command will search the current directory for one. - Ameliyat için çözüm ya da proje dosyasını. Bir dosya belirtilmezse, komut için bir geçerli dizini arar. - - Formatted code file '{0}'. Formatted code file '{0}'. - - The `--workspace` option is deprecated. Use the `<project>` argument instead. - The `--workspace` option is deprecated. Use the `<project>` argument instead. - - Unable to fix {0}. Code fix {1} doesn't support Fix All in Solution. Unable to fix {0}. Code fix {1} doesn't support Fix All in Solution. @@ -277,9 +237,9 @@ Warnings were encountered while loading the workspace. Set the verbosity option to the 'diagnostic' level to log warnings. - - Whether to treat the `<project>` path as a folder of files. - Whether to treat the `<project>` path as a folder of files. + + Whether to treat the `<workspace>` argument as a simple folder of files. + Whether to treat the `<workspace>` argument as a simple folder of files. diff --git a/src/xlf/Resources.zh-Hans.xlf b/src/xlf/Resources.zh-Hans.xlf index 0fb9804162..9363b6f9fb 100644 --- a/src/xlf/Resources.zh-Hans.xlf +++ b/src/xlf/Resources.zh-Hans.xlf @@ -12,6 +12,11 @@ A list of relative file or folder paths to include in formatting. All files are formatted if empty. + + A path to a solution file, a project file, or a folder containing a solution or project file. If a path is not specified then the current directory is used. + A path to a solution file, a project file, or a folder containing a solution or project file. If a path is not specified then the current directory is used. + + Accepts a file path, which if provided, will produce a json report in the given directory. Accepts a file path, which if provided, will produce a json report in the given directory. @@ -27,24 +32,9 @@ Analyzer Reference - - Both a MSBuild project file and solution file found in '{0}'. Specify which to use with the --workspace option. - 在“{0}”中同时找到 MSBuild 项目文件和解决方案文件。请指定要将哪一个文件用于 --workspace 选项。 - - - - Cannot specify both folder and workspace options. - Cannot specify both folder and workspace options. - - - - Cannot specify both project argument and folder options. - Cannot specify both project argument and folder options. - - - - Cannot specify both project argument and workspace option. - Cannot specify both project argument and workspace option. + + Both a MSBuild project file and solution file found in '{0}'. Specify which to use with the <workspace> agrument. + 在“{0}”中同时找到 MSBuild 项目文件和解决方案文件。请指定要将哪一个文件用于 --workspace 选项。 @@ -57,9 +47,9 @@ Complete in {0}ms. - - Could not find a MSBuild project file or solution file in '{0}'. Specify which to use with the --workspace option. - 无法在“{0}”中找到 MSBuild 项目文件或解决方案文件。请指定要用于 --workspace 选项的文件。 + + Could not find a MSBuild project file or solution file in '{0}'. Specify which to use with the <workspace> argument. + 无法在“{0}”中找到 MSBuild 项目文件或解决方案文件。请指定要用于 --workspace 选项的文件。 @@ -122,11 +112,6 @@ Format complete in {0}ms. - - Format files, but do not save changes to disk. - 格式化文件, 但不将更改保存到磁盘。 - - Formats files without saving changes to disk. Terminates with a non-zero exit code if any files were formatted. Formats files without saving changes to disk. Terminates with a non-zero exit code if any files were formatted. @@ -157,14 +142,14 @@ 正在加载工作区。 - - Multiple MSBuild project files found in '{0}'. Specify which to use with the --workspace option. - 在“{0}”中找到多个 MSBuild 项目文件。请指定要将哪一个文件用于 --workspace 选项。 + + Multiple MSBuild project files found in '{0}'. Specify which to use with the <workspace> argument. + Multiple MSBuild project files found in '{0}'. Specify which to use with the <workspace> argument. - - Multiple MSBuild solution files found in '{0}'. Specify which to use with the --workspace option. - 在“{0}”中找到多个 MSBuild 解决方案文件。请指定要用于 --workspace 选项的文件。 + + Multiple MSBuild solution files found in '{0}'. Specify which to use with the <workspace> argument. + Multiple MSBuild solution files found in '{0}'. Specify which to use with the <workspace> argument. @@ -202,26 +187,11 @@ The dotnet CLI version is '{0}'. - - The `--dry-run` option is deprecated. Use the `--check` option instead. - The `--dry-run` option is deprecated. Use the `--check` option instead. - - The file '{0}' does not appear to be a valid project or solution file. 文件“{0}”似乎不是有效的项目或解决方案文件。 - - The `--files` option is deprecated. Use the `--include` option instead. - The `--files` option is deprecated. Use the `--include` option instead. - - - - The `--folder` option is deprecated for specifying the path. Pass the `--folder` option but specify the path with the project argument instead. - The `--folder` option is deprecated for specifying the path. Pass the `--folder` option but specify the path with the project argument instead. - - The project file '{0}' does not exist. 项目文件“{0}” 不存在。 @@ -232,21 +202,11 @@ 解决方案文件“{0}”不存在。 - - The solution or project file to operate on. If a file is not specified, the command will search the current directory for one. - 要操作的解决方案或项目文件。如果未指定文件，该命令将在当前目录中搜索一个文件。 - - Formatted code file '{0}'. Formatted code file '{0}'. - - The `--workspace` option is deprecated. Use the `<project>` argument instead. - The `--workspace` option is deprecated. Use the `<project>` argument instead. - - Unable to fix {0}. Code fix {1} doesn't support Fix All in Solution. Unable to fix {0}. Code fix {1} doesn't support Fix All in Solution. @@ -277,9 +237,9 @@ Warnings were encountered while loading the workspace. Set the verbosity option to the 'diagnostic' level to log warnings. - - Whether to treat the `<project>` path as a folder of files. - Whether to treat the `<project>` path as a folder of files. + + Whether to treat the `<workspace>` argument as a simple folder of files. + Whether to treat the `<workspace>` argument as a simple folder of files. diff --git a/src/xlf/Resources.zh-Hant.xlf b/src/xlf/Resources.zh-Hant.xlf index 574df84741..becbf45db2 100644 --- a/src/xlf/Resources.zh-Hant.xlf +++ b/src/xlf/Resources.zh-Hant.xlf @@ -12,6 +12,11 @@ A list of relative file or folder paths to include in formatting. All files are formatted if empty. + + A path to a solution file, a project file, or a folder containing a solution or project file. If a path is not specified then the current directory is used. + A path to a solution file, a project file, or a folder containing a solution or project file. If a path is not specified then the current directory is used. + + Accepts a file path, which if provided, will produce a json report in the given directory. Accepts a file path, which if provided, will produce a json report in the given directory. @@ -27,24 +32,9 @@ Analyzer Reference - - Both a MSBuild project file and solution file found in '{0}'. Specify which to use with the --workspace option. - 在 '{0}' 中同時找到 MSBuild 專案檔和解決方案檔。請指定要搭配 --workspace 選項使用的檔案。 - - - - Cannot specify both folder and workspace options. - Cannot specify both folder and workspace options. - - - - Cannot specify both project argument and folder options. - Cannot specify both project argument and folder options. - - - - Cannot specify both project argument and workspace option. - Cannot specify both project argument and workspace option. + + Both a MSBuild project file and solution file found in '{0}'. Specify which to use with the <workspace> agrument. + 在 '{0}' 中同時找到 MSBuild 專案檔和解決方案檔。請指定要搭配 --workspace 選項使用的檔案。 @@ -57,9 +47,9 @@ Complete in {0}ms. - - Could not find a MSBuild project file or solution file in '{0}'. Specify which to use with the --workspace option. - 在 '{0}' 中找不到 MSBuild 專案檔或解決方案檔。請指定要搭配 --workspace 選項使用的檔案。 + + Could not find a MSBuild project file or solution file in '{0}'. Specify which to use with the <workspace> argument. + 在 '{0}' 中找不到 MSBuild 專案檔或解決方案檔。請指定要搭配 --workspace 選項使用的檔案。 @@ -122,11 +112,6 @@ Format complete in {0}ms. - - Format files, but do not save changes to disk. - 將檔案格式化，但不儲存變更到磁碟。 - - Formats files without saving changes to disk. Terminates with a non-zero exit code if any files were formatted. Formats files without saving changes to disk. Terminates with a non-zero exit code if any files were formatted. @@ -157,14 +142,14 @@ 正在載入工作區。 - - Multiple MSBuild project files found in '{0}'. Specify which to use with the --workspace option. - 在 '{0}' 中找到多個 MSBuild 專案檔。請指定要搭配 --workspace 選項使用的檔案。 + + Multiple MSBuild project files found in '{0}'. Specify which to use with the <workspace> argument. + Multiple MSBuild project files found in '{0}'. Specify which to use with the <workspace> argument. - - Multiple MSBuild solution files found in '{0}'. Specify which to use with the --workspace option. - 在 '{0}' 中找到多個 MSBuild 解決方案檔。請指定要搭配 --workspace 選項使用的檔案。 + + Multiple MSBuild solution files found in '{0}'. Specify which to use with the <workspace> argument. + Multiple MSBuild solution files found in '{0}'. Specify which to use with the <workspace> argument. @@ -202,26 +187,11 @@ The dotnet CLI version is '{0}'. - - The `--dry-run` option is deprecated. Use the `--check` option instead. - The `--dry-run` option is deprecated. Use the `--check` option instead. - - The file '{0}' does not appear to be a valid project or solution file. 檔案 '{0}' 似乎不是有效的專案或解決方案檔。 - - The `--files` option is deprecated. Use the `--include` option instead. - The `--files` option is deprecated. Use the `--include` option instead. - - - - The `--folder` option is deprecated for specifying the path. Pass the `--folder` option but specify the path with the project argument instead. - The `--folder` option is deprecated for specifying the path. Pass the `--folder` option but specify the path with the project argument instead. - - The project file '{0}' does not exist. 專案檔 '{0}' 不存在。 @@ -232,21 +202,11 @@ 解決方案檔 '{0}' 不存在。 - - The solution or project file to operate on. If a file is not specified, the command will search the current directory for one. - 要操作的解決方案或專案檔。若未指定檔案，該命令會在目前的目錄中搜尋一個檔案。 - - Formatted code file '{0}'. Formatted code file '{0}'. - - The `--workspace` option is deprecated. Use the `<project>` argument instead. - The `--workspace` option is deprecated. Use the `<project>` argument instead. - - Unable to fix {0}. Code fix {1} doesn't support Fix All in Solution. Unable to fix {0}. Code fix {1} doesn't support Fix All in Solution. @@ -277,9 +237,9 @@ Warnings were encountered while loading the workspace. Set the verbosity option to the 'diagnostic' level to log warnings. - - Whether to treat the `<project>` path as a folder of files. - Whether to treat the `<project>` path as a folder of files. + + Whether to treat the `<workspace>` argument as a simple folder of files. + Whether to treat the `<workspace>` argument as a simple folder of files. diff --git a/tests/CodeFormatterTests.cs b/tests/CodeFormatterTests.cs index 1d7ce5851c..d1aa166734 100644 --- a/tests/CodeFormatterTests.cs +++ b/tests/CodeFormatterTests.cs @@ -11,31 +11,36 @@ using Microsoft.CodeAnalysis.Tools.Utilities; using Microsoft.Extensions.Logging; using Xunit; +using Xunit.Abstractions; namespace Microsoft.CodeAnalysis.Tools.Tests { - public class CodeFormatterTests : IClassFixture, IClassFixture + public class CodeFormatterTests : IClassFixture, IClassFixture { - private const string FormattedProjectPath = "tests/projects/for_code_formatter/formatted_project/"; + private const string FormattedProjectPath = "for_code_formatter/formatted_project/"; private const string FormattedProjectFilePath = FormattedProjectPath + "formatted_project.csproj"; - private const string FormattedSolutionFilePath = "tests/projects/for_code_formatter/formatted_solution/formatted_solution.sln"; + private const string FormattedSolutionFilePath = "for_code_formatter/formatted_solution/formatted_solution.sln"; - private const string UnformattedProjectPath = "tests/projects/for_code_formatter/unformatted_project/"; + private const string UnformattedProjectPath = "for_code_formatter/unformatted_project/"; private const string UnformattedProjectFilePath = UnformattedProjectPath + "unformatted_project.csproj"; private const string UnformattedProgramFilePath = UnformattedProjectPath + "program.cs"; - private const string UnformattedSolutionFilePath = "tests/projects/for_code_formatter/unformatted_solution/unformatted_solution.sln"; + private const string UnformattedSolutionFilePath = "for_code_formatter/unformatted_solution/unformatted_solution.sln"; - private const string FSharpProjectPath = "tests/projects/for_code_formatter/fsharp_project/"; + private const string FSharpProjectPath = "for_code_formatter/fsharp_project/"; private const string FSharpProjectFilePath = FSharpProjectPath + "fsharp_project.fsproj"; private static IEnumerable EmptyFilesList => Array.Empty(); private Regex FindFormattingLogLine => new Regex(@"((.*)\(\d+,\d+\): (.*))\r|((.*)\(\d+,\d+\): (.*))"); - public CodeFormatterTests(MSBuildFixture msBuildFixture, SolutionPathFixture solutionPathFixture) + private readonly ITestOutputHelper _output; + + public CodeFormatterTests(ITestOutputHelper output, MSBuildFixture msBuildFixture, TestProjectsPathFixture testProjectsPathFixture) { - msBuildFixture.RegisterInstance(); - solutionPathFixture.SetCurrentDirectory(); + _output = output; + + testProjectsPathFixture.SetCurrentDirectory(); + msBuildFixture.RegisterInstance(_output); } [Fact] @@ -90,8 +95,8 @@ public async Task GeneratedFilesFormattedInUnformattedProject() expectedFileCount: 5); var logLines = log.Split(Environment.NewLine, StringSplitOptions.RemoveEmptyEntries); - Assert.Contains(logLines, line => line.Contains("unformatted_project.AssemblyInfo.cs(1,1): Fix file encoding.")); - Assert.Contains(logLines, line => line.Contains("NETCoreApp,Version=v3.0.AssemblyAttributes.cs(1,1): Fix file encoding.")); + Assert.Contains(logLines, line => line.Contains("unformatted_project.AssemblyInfo.cs")); + Assert.Contains(logLines, line => line.Contains("NETCoreApp,Version=v3.0.AssemblyAttributes.cs")); } [Fact] @@ -118,7 +123,7 @@ public async Task FilesFormattedInUnformattedProjectFolder() includeGenerated: false, expectedExitCode: 0, expectedFilesFormatted: 2, - expectedFileCount: 3); + expectedFileCount: 5); } [Fact] @@ -407,6 +412,8 @@ public async Task TestFormatWorkspaceAsync(string workspaceFilePath, IEn var log = logger.GetLog(); + _output.WriteLine(log); + Assert.Equal(expectedExitCode, formatResult.ExitCode); Assert.Equal(expectedFilesFormatted, formatResult.FilesFormatted); Assert.Equal(expectedFileCount, formatResult.FileCount); diff --git a/tests/MSBuild/MSBuildWorkspaceFinderTests.cs b/tests/MSBuild/MSBuildWorkspaceFinderTests.cs index 84862589c1..c4ccb2dbe6 100644 --- a/tests/MSBuild/MSBuildWorkspaceFinderTests.cs +++ b/tests/MSBuild/MSBuildWorkspaceFinderTests.cs @@ -8,21 +8,21 @@ namespace Microsoft.CodeAnalysis.Tools.Tests.MSBuild { - public class MSBuildWorkspaceFinderTests : IClassFixture + public class MSBuildWorkspaceFinderTests : IClassFixture { private string SolutionPath => Environment.CurrentDirectory; - public MSBuildWorkspaceFinderTests(SolutionPathFixture solutionPathFixture) + public MSBuildWorkspaceFinderTests(TestProjectsPathFixture testProjectsPathFixture) { - solutionPathFixture.SetCurrentDirectory(); + testProjectsPathFixture.SetCurrentDirectory(); } [Fact] public void ThrowsException_CannotFindMSBuildProjectFile() { - var workspacePath = "tests/projects/for_workspace_finder/no_project_or_solution/"; + var workspacePath = "for_workspace_finder/no_project_or_solution/"; var exceptionMessageStart = string.Format( - Resources.Could_not_find_a_MSBuild_project_or_solution_file_in_0_Specify_which_to_use_with_the_workspace_option, + Resources.Could_not_find_a_MSBuild_project_or_solution_file_in_0_Specify_which_to_use_with_the_workspace_argument, Path.Combine(SolutionPath, workspacePath)).Replace('/', Path.DirectorySeparatorChar); var exception = Assert.Throws(() => MSBuildWorkspaceFinder.FindWorkspace(SolutionPath, workspacePath)); Assert.StartsWith(exceptionMessageStart, exception.Message); @@ -31,9 +31,9 @@ public void ThrowsException_CannotFindMSBuildProjectFile() [Fact] public void ThrowsException_MultipleMSBuildProjectFiles() { - var workspacePath = "tests/projects/for_workspace_finder/multiple_projects/"; + var workspacePath = "for_workspace_finder/multiple_projects/"; var exceptionMessageStart = string.Format( - Resources.Multiple_MSBuild_project_files_found_in_0_Specify_which_to_use_with_the_workspace_option, + Resources.Multiple_MSBuild_project_files_found_in_0_Specify_which_to_use_with_the_workspace_argument, Path.Combine(SolutionPath, workspacePath)).Replace('/', Path.DirectorySeparatorChar); var exception = Assert.Throws(() => MSBuildWorkspaceFinder.FindWorkspace(SolutionPath, workspacePath)); Assert.Equal(exceptionMessageStart, exception.Message); @@ -42,9 +42,9 @@ public void ThrowsException_MultipleMSBuildProjectFiles() [Fact] public void ThrowsException_MultipleMSBuildSolutionFiles() { - var workspacePath = "tests/projects/for_workspace_finder/multiple_solutions/"; + var workspacePath = "for_workspace_finder/multiple_solutions/"; var exceptionMessageStart = string.Format( - Resources.Multiple_MSBuild_solution_files_found_in_0_Specify_which_to_use_with_the_workspace_option, + Resources.Multiple_MSBuild_solution_files_found_in_0_Specify_which_to_use_with_the_workspace_argument, Path.Combine(SolutionPath, workspacePath)).Replace('/', Path.DirectorySeparatorChar); var exception = Assert.Throws(() => MSBuildWorkspaceFinder.FindWorkspace(SolutionPath, workspacePath)); Assert.Equal(exceptionMessageStart, exception.Message); @@ -53,9 +53,9 @@ public void ThrowsException_MultipleMSBuildSolutionFiles() [Fact] public void ThrowsException_SolutionAndProjectAmbiguity() { - var workspacePath = "tests/projects/for_workspace_finder/project_and_solution/"; + var workspacePath = "for_workspace_finder/project_and_solution/"; var exceptionMessageStart = string.Format( - Resources.Both_a_MSBuild_project_file_and_solution_file_found_in_0_Specify_which_to_use_with_the_workspace_option, + Resources.Both_a_MSBuild_project_file_and_solution_file_found_in_0_Specify_which_to_use_with_the_workspace_argument, Path.Combine(SolutionPath, workspacePath)).Replace('/', Path.DirectorySeparatorChar); var exception = Assert.Throws(() => MSBuildWorkspaceFinder.FindWorkspace(SolutionPath, workspacePath)); Assert.Equal(exceptionMessageStart, exception.Message); @@ -64,7 +64,7 @@ public void ThrowsException_SolutionAndProjectAmbiguity() [Fact] public void FindsSolutionByFolder() { - const string Path = "tests/projects/for_workspace_finder/single_solution/"; + const string Path = "for_workspace_finder/single_solution/"; var (isSolution, workspacePath) = MSBuildWorkspaceFinder.FindWorkspace(SolutionPath, Path); @@ -76,7 +76,7 @@ public void FindsSolutionByFolder() [Fact] public void FindsSolutionByFilePath() { - const string Path = "tests/projects/for_workspace_finder/multiple_solutions/solution_b.sln"; + const string Path = "for_workspace_finder/multiple_solutions/solution_b.sln"; var (isSolution, workspacePath) = MSBuildWorkspaceFinder.FindWorkspace(SolutionPath, Path); @@ -88,7 +88,7 @@ public void FindsSolutionByFilePath() [Fact] public void FindsProjectByFolder() { - const string Path = "tests/projects/for_workspace_finder/single_project/"; + const string Path = "for_workspace_finder/single_project/"; var (isSolution, workspacePath) = MSBuildWorkspaceFinder.FindWorkspace(SolutionPath, Path); @@ -100,7 +100,7 @@ public void FindsProjectByFolder() [Fact] public void FindsProjectByFilePath() { - const string Path = "tests/projects/for_workspace_finder/multiple_projects/project_b.csproj"; + const string Path = "for_workspace_finder/multiple_projects/project_b.csproj"; var (isSolution, workspacePath) = MSBuildWorkspaceFinder.FindWorkspace(SolutionPath, Path); diff --git a/tests/ProgramTests.cs b/tests/ProgramTests.cs index 32250b1234..cb26e80ed7 100644 --- a/tests/ProgramTests.cs +++ b/tests/ProgramTests.cs @@ -11,8 +11,15 @@ namespace Microsoft.CodeAnalysis.Tools.Tests public class ProgramTests { // Should be kept in sync with Program.Run - private delegate void TestCommandHandlerDelegate(string project, string folder, string workspace, string verbosity, bool check, - string[] include, string[] exclude, string report, bool includeGenerated); + private delegate void TestCommandHandlerDelegate( + string workspace, + bool folder, + string verbosity, + bool check, + string[] include, + string[] exclude, + string report, + bool includeGenerated); [Fact] public void ExitCodeIsOneWithCheckAndAnyFilesFormatted() @@ -49,21 +56,19 @@ public void CommandLine_OptionsAreParsedCorrectly() // Act var result = sut.Parse(new[] { - "--folder", "folder", - "--workspace", "workspace", + "--folder", "--include", "include1", "include2", "--exclude", "exclude1", "exclude2", "--check", "--report", "report", - "--verbosity", "verbosity", + "--verbosity", "detailed", "--include-generated"}); // Assert - Assert.Equal(1, result.Errors.Count); // folder and workspace can not be combined + Assert.Equal(0, result.Errors.Count); Assert.Equal(0, result.UnmatchedTokens.Count); Assert.Equal(0, result.UnparsedTokens.Count); - Assert.Equal("folder", result.ValueForOption("folder")); - Assert.Equal("workspace", result.ValueForOption("workspace")); + Assert.True(result.ValueForOption("folder")); Assert.Collection(result.ValueForOption>("include"), i0 => Assert.Equal("include1", i0), i1 => Assert.Equal("include2", i1)); @@ -72,7 +77,7 @@ public void CommandLine_OptionsAreParsedCorrectly() i1 => Assert.Equal("exclude2", i1)); Assert.True(result.ValueForOption("check")); Assert.Equal("report", result.ValueForOption("report")); - Assert.Equal("verbosity", result.ValueForOption("verbosity")); + Assert.Equal("detailed", result.ValueForOption("verbosity")); Assert.True(result.ValueForOption("include-generated")); } @@ -83,11 +88,11 @@ public void CommandLine_ProjectArgument_Simple() var sut = FormatCommand.CreateCommandLineOptions(); // Act - var result = sut.Parse(new[] { "projectValue" }); + var result = sut.Parse(new[] { "workspaceValue" }); // Assert Assert.Equal(0, result.Errors.Count); - Assert.Equal("projectValue", result.CommandResult.GetArgumentValueOrDefault("project")); + Assert.Equal("workspaceValue", result.CommandResult.GetArgumentValueOrDefault("workspace")); } [Fact] @@ -97,12 +102,12 @@ public void CommandLine_ProjectArgument_WithOption_AfterArgument() var sut = FormatCommand.CreateCommandLineOptions(); // Act - var result = sut.Parse(new[] { "projectValue", "--verbosity", "verbosity" }); + var result = sut.Parse(new[] { "workspaceValue", "--verbosity", "detailed" }); // Assert Assert.Equal(0, result.Errors.Count); - Assert.Equal("projectValue", result.CommandResult.GetArgumentValueOrDefault("project")); - Assert.Equal("verbosity", result.ValueForOption("verbosity")); + Assert.Equal("workspaceValue", result.CommandResult.GetArgumentValueOrDefault("workspace")); + Assert.Equal("detailed", result.ValueForOption("verbosity")); } [Fact] @@ -112,12 +117,12 @@ public void CommandLine_ProjectArgument_WithOption_BeforeArgument() var sut = FormatCommand.CreateCommandLineOptions(); // Act - var result = sut.Parse(new[] { "--verbosity", "verbosity", "projectValue" }); + var result = sut.Parse(new[] { "--verbosity", "detailed", "workspaceValue" }); // Assert Assert.Equal(0, result.Errors.Count); - Assert.Equal("projectValue", result.CommandResult.GetArgumentValueOrDefault("project")); - Assert.Equal("verbosity", result.ValueForOption("verbosity")); + Assert.Equal("workspaceValue", result.CommandResult.GetArgumentValueOrDefault("workspace")); + Assert.Equal("detailed", result.ValueForOption("verbosity")); } [Fact] @@ -128,16 +133,23 @@ public void CommandLine_ProjectArgument_GetsPassedToHandler() var handlerWasCalled = false; sut.Handler = CommandHandler.Create(new TestCommandHandlerDelegate(TestCommandHandler)); - void TestCommandHandler(string project, string folder, string workspace, string verbosity, bool check, - string[] include, string[] exclude, string report, bool includeGenerated) + void TestCommandHandler( + string workspace, + bool folder, + string verbosity, + bool check, + string[] include, + string[] exclude, + string report, + bool includeGenerated) { handlerWasCalled = true; - Assert.Equal("projectValue", project); - Assert.Equal("verbosity", verbosity); + Assert.Equal("workspaceValue", workspace); + Assert.Equal("detailed", verbosity); }; // Act - var result = sut.Invoke(new[] { "--verbosity", "verbosity", "projectValue" }); + var result = sut.Invoke(new[] { "--verbosity", "detailed", "workspace" }); // Assert Assert.True(handlerWasCalled); @@ -150,59 +162,7 @@ public void CommandLine_ProjectArgument_FailesIfSpecifiedTwice() var sut = FormatCommand.CreateCommandLineOptions(); // Act - var result = sut.Parse(new[] { "projectValue1", "projectValue2" }); - - // Assert - Assert.Equal(1, result.Errors.Count); - } - - [Fact] - public void CommandLine_ProjectArgumentAndWorkspaceCanNotBeCombined() - { - // Arrange - var sut = FormatCommand.CreateCommandLineOptions(); - - // Act - var result = sut.Parse(new[] { "projectValue", "--workspace", "workspace" }); - - // Assert - Assert.Equal(1, result.Errors.Count); - } - - [Fact] - public void CommandLine_ProjectArgumentAndFolderCanNotBeCombined1() - { - // Arrange - var sut = FormatCommand.CreateCommandLineOptions(); - - // Act - var result = sut.Parse(new[] { "projectValue", "--folder", "folder" }); - - // Assert - Assert.Equal(1, result.Errors.Count); - } - - [Fact] - public void CommandLine_ProjectWorkspaceAndFolderCanNotBeCombined2() - { - // Arrange - var sut = FormatCommand.CreateCommandLineOptions(); - - // Act - var result = sut.Parse(new[] { "--workspace", "workspace", "--folder", "folder" }); - - // Assert - Assert.Equal(1, result.Errors.Count); - } - - [Fact] - public void CommandLine_InvalidArgumentsDontCrashTheValidators() - { - // Arrange - var sut = FormatCommand.CreateCommandLineOptions(); - - // Act - var result = sut.Parse(new[] { "--workspace", "workspace1", "--workspace", "workspace2" }); + var result = sut.Parse(new[] { "workspaceValue1", "workspaceValue2" }); // Assert Assert.Equal(1, result.Errors.Count); diff --git a/tests/Utilities/MSBuildFixture.cs b/tests/Utilities/MSBuildFixture.cs index 0c6ce95c58..d0771c952c 100644 --- a/tests/Utilities/MSBuildFixture.cs +++ b/tests/Utilities/MSBuildFixture.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Threading; using Microsoft.CodeAnalysis.Tools.MSBuild; +using Xunit.Abstractions; namespace Microsoft.CodeAnalysis.Tools.Tests.Utilities { @@ -14,11 +15,14 @@ public class MSBuildFixture : IDisposable { private static int s_registered = 0; - public void RegisterInstance() + public void RegisterInstance(ITestOutputHelper output) { if (Interlocked.Exchange(ref s_registered, 1) == 0) { var msBuildInstance = Build.Locator.MSBuildLocator.QueryVisualStudioInstances().First(); + + output.WriteLine(Resources.Using_msbuildexe_located_in_0, msBuildInstance.MSBuildPath); + LooseVersionAssemblyLoader.Register(msBuildInstance.MSBuildPath); Build.Locator.MSBuildLocator.RegisterInstance(msBuildInstance); } diff --git a/tests/Utilities/SolutionPathFixture.cs b/tests/Utilities/TestProjectsPathFixture.cs similarity index 83% rename from tests/Utilities/SolutionPathFixture.cs rename to tests/Utilities/TestProjectsPathFixture.cs index 271159b7d8..567424e2d5 100644 --- a/tests/Utilities/SolutionPathFixture.cs +++ b/tests/Utilities/TestProjectsPathFixture.cs @@ -7,9 +7,9 @@ namespace Microsoft.CodeAnalysis.Tools.Tests.Utilities { /// - /// This test fixture sets the to the dotnet-format solution's path. + /// This test fixture sets the to the dotnet-format test projects folder path. /// - public class SolutionPathFixture : IDisposable + public class TestProjectsPathFixture : IDisposable { private static int s_registered = 0; private static string s_currentDirectory; @@ -20,7 +20,7 @@ public void SetCurrentDirectory() { s_currentDirectory = Environment.CurrentDirectory; var solutionPath = Directory.GetParent(s_currentDirectory).Parent.Parent.Parent.Parent.FullName; - Environment.CurrentDirectory = solutionPath; + Environment.CurrentDirectory = Path.Combine(solutionPath, "tests", "projects"); } } diff --git a/tests/projects/Directory.Build.props b/tests/projects/Directory.Build.props new file mode 100644 index 0000000000..1cd50ce64f --- /dev/null +++ b/tests/projects/Directory.Build.props @@ -0,0 +1,4 @@ + + + + diff --git a/tests/projects/Directory.Build.targets b/tests/projects/Directory.Build.targets new file mode 100644 index 0000000000..8f68664271 --- /dev/null +++ b/tests/projects/Directory.Build.targets @@ -0,0 +1,4 @@ + + + + diff --git a/tests/projects/for_code_formatter/unformatted_project/.editorconfig b/tests/projects/for_code_formatter/unformatted_project/.editorconfig index 8b5bebcf12..68704aa414 100644 --- a/tests/projects/for_code_formatter/unformatted_project/.editorconfig +++ b/tests/projects/for_code_formatter/unformatted_project/.editorconfig @@ -2,7 +2,7 @@ root = true # C# files -[{Program.cs,other_items/*.cs}] +[{Program.cs,other_items/*.cs,obj/**/*.cs}] #### Core EditorConfig Options ####