mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #8100 from peterhuene/test-no-restore

Browse source 
Make --no-build imply --no-restore for run, pack, and test commands.
This commit is contained in:
Livar 2017-11-29 09:50:11 -08:00 committed by GitHub
commit fe1b4dc6b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
51 changed files with 159 additions and 156 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dotnet/Parser.cs
View file

@ -19,7 +19,7 @@ namespace Microsoft.DotNet.Cli
private static void ConfigureCommandLineLocalizedStrings()
{
DefaultHelpViewText.AdditionalArgumentsSection =
$"{UsageCommandsAdditionalArgsHeader}:{NewLine} {LocalizableStrings.RunCommandAdditionalArgsHelpText}";
$"{UsageCommandsAdditionalArgsHeader}{NewLine} {LocalizableStrings.RunCommandAdditionalArgsHelpText}";
DefaultHelpViewText.ArgumentsSection.Title = UsageArgumentsHeader;
DefaultHelpViewText.CommandsSection.Title = UsageCommandsHeader;
DefaultHelpViewText.OptionsSection.Title = UsageOptionsHeader;

2
src/dotnet/commands/dotnet-pack/LocalizableStrings.resx
View file

@ -130,7 +130,7 @@
<value>Directory in which to place built packages.</value>
</data>
<data name="CmdNoBuildOptionDescription" xml:space="preserve">
<value>Skip building the project prior to packing. By default, the project will be built.</value>
<value>Do not build project before packing. Implies --no-restore.</value>
</data>
<data name="CmdIncludeSymbolsDescription" xml:space="preserve">
<value>Include packages with symbols in addition to regular packages in output directory.</value>

2
src/dotnet/commands/dotnet-pack/PackCommand.cs
View file

@ -43,7 +43,7 @@ namespace Microsoft.DotNet.Tools.Pack
msbuildArgs.AddRange(parsedPack.Arguments);
bool noRestore = parsedPack.HasOption("--no-restore");
bool noRestore = parsedPack.HasOption("--no-restore") || parsedPack.HasOption("--no-build");
return new PackCommand(
msbuildArgs,

4
src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.cs.xlf
View file

@ -23,8 +23,8 @@
<note />
</trans-unit>
<trans-unit id="CmdNoBuildOptionDescription">
<source>Skip building the project prior to packing. By default, the project will be built.</source>
<target state="translated">Přeskočí sestavení projektu, dokud ho nezabalíte. Projekt se sestaví automaticky.</target>
<source>Do not build project before packing. Implies --no-restore.</source>
<target state="needs-review-translation">Přeskočí sestavení projektu, dokud ho nezabalíte. Projekt se sestaví automaticky.</target>
<note />
</trans-unit>
<trans-unit id="CmdIncludeSymbolsDescription">

4
src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.de.xlf
View file

@ -23,8 +23,8 @@
<note />
</trans-unit>
<trans-unit id="CmdNoBuildOptionDescription">
<source>Skip building the project prior to packing. By default, the project will be built.</source>
<target state="translated">Hiermit wird das Projekt nicht vor dem Packen erstellt. Standardmäßig wird das Projekt erstellt.</target>
<source>Do not build project before packing. Implies --no-restore.</source>
<target state="needs-review-translation">Hiermit wird das Projekt nicht vor dem Packen erstellt. Standardmäßig wird das Projekt erstellt.</target>
<note />
</trans-unit>
<trans-unit id="CmdIncludeSymbolsDescription">

4
src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.es.xlf
View file

@ -23,8 +23,8 @@
<note />
</trans-unit>
<trans-unit id="CmdNoBuildOptionDescription">
<source>Skip building the project prior to packing. By default, the project will be built.</source>
<target state="translated">Omita la compilación del proyecto antes de empaquetar. El proyecto se compilará de manera predeterminada.</target>
<source>Do not build project before packing. Implies --no-restore.</source>
<target state="needs-review-translation">Omita la compilación del proyecto antes de empaquetar. El proyecto se compilará de manera predeterminada.</target>
<note />
</trans-unit>
<trans-unit id="CmdIncludeSymbolsDescription">

4
src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.fr.xlf
View file

@ -23,8 +23,8 @@
<note />
</trans-unit>
<trans-unit id="CmdNoBuildOptionDescription">
<source>Skip building the project prior to packing. By default, the project will be built.</source>
<target state="translated">Ignorez la génération du projet avant la compression. Par défaut, le projet est généré.</target>
<source>Do not build project before packing. Implies --no-restore.</source>
<target state="needs-review-translation">Ignorez la génération du projet avant la compression. Par défaut, le projet est généré.</target>
<note />
</trans-unit>
<trans-unit id="CmdIncludeSymbolsDescription">

4
src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.it.xlf
View file

@ -23,8 +23,8 @@
<note />
</trans-unit>
<trans-unit id="CmdNoBuildOptionDescription">
<source>Skip building the project prior to packing. By default, the project will be built.</source>
<target state="translated">Consente di ignorare la compilazione del progetto prima di creare il pacchetto. Per impostazione predefinita, il progetto verrà compilato.</target>
<source>Do not build project before packing. Implies --no-restore.</source>
<target state="needs-review-translation">Consente di ignorare la compilazione del progetto prima di creare il pacchetto. Per impostazione predefinita, il progetto verrà compilato.</target>
<note />
</trans-unit>
<trans-unit id="CmdIncludeSymbolsDescription">

4
src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.ja.xlf
View file

@ -23,8 +23,8 @@
<note />
</trans-unit>
<trans-unit id="CmdNoBuildOptionDescription">
<source>Skip building the project prior to packing. By default, the project will be built.</source>
<target state="translated">パッキングの前に、プロジェクトの構築をスキップします。既定では、プロジェクトは構築されます。</target>
<source>Do not build project before packing. Implies --no-restore.</source>
<target state="needs-review-translation">パッキングの前に、プロジェクトの構築をスキップします。既定では、プロジェクトは構築されます。</target>
<note />
</trans-unit>
<trans-unit id="CmdIncludeSymbolsDescription">

4
src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.ko.xlf
View file

@ -23,8 +23,8 @@
<note />
</trans-unit>
<trans-unit id="CmdNoBuildOptionDescription">
<source>Skip building the project prior to packing. By default, the project will be built.</source>
<target state="translated">압축하기 전에 프로젝트를 빌드하지 않습니다. 기본적으로 프로젝트가 빌드됩니다.</target>
<source>Do not build project before packing. Implies --no-restore.</source>
<target state="needs-review-translation">압축하기 전에 프로젝트를 빌드하지 않습니다. 기본적으로 프로젝트가 빌드됩니다.</target>
<note />
</trans-unit>
<trans-unit id="CmdIncludeSymbolsDescription">

4
src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.pl.xlf
View file

@ -23,8 +23,8 @@
<note />
</trans-unit>
<trans-unit id="CmdNoBuildOptionDescription">
<source>Skip building the project prior to packing. By default, the project will be built.</source>
<target state="translated">Pomiń kompilację projektu przed pakowaniem. Domyślnie projekt zostanie skompilowany.</target>
<source>Do not build project before packing. Implies --no-restore.</source>
<target state="needs-review-translation">Pomiń kompilację projektu przed pakowaniem. Domyślnie projekt zostanie skompilowany.</target>
<note />
</trans-unit>
<trans-unit id="CmdIncludeSymbolsDescription">

4
src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.pt-BR.xlf
View file

@ -23,8 +23,8 @@
<note />
</trans-unit>
<trans-unit id="CmdNoBuildOptionDescription">
<source>Skip building the project prior to packing. By default, the project will be built.</source>
<target state="translated">Ignorar a compilação do projeto antes do empacotamento. Por padrão, o projeto será compilado.</target>
<source>Do not build project before packing. Implies --no-restore.</source>
<target state="needs-review-translation">Ignorar a compilação do projeto antes do empacotamento. Por padrão, o projeto será compilado.</target>
<note />
</trans-unit>
<trans-unit id="CmdIncludeSymbolsDescription">

4
src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.ru.xlf
View file

@ -23,8 +23,8 @@
<note />
</trans-unit>
<trans-unit id="CmdNoBuildOptionDescription">
<source>Skip building the project prior to packing. By default, the project will be built.</source>
<target state="translated">Пропуск сборки проекта перед упаковкой. По умолчанию выполняется сборка проекта.</target>
<source>Do not build project before packing. Implies --no-restore.</source>
<target state="needs-review-translation">Пропуск сборки проекта перед упаковкой. По умолчанию выполняется сборка проекта.</target>
<note />
</trans-unit>
<trans-unit id="CmdIncludeSymbolsDescription">

4
src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.tr.xlf
View file

@ -23,8 +23,8 @@
<note />
</trans-unit>
<trans-unit id="CmdNoBuildOptionDescription">
<source>Skip building the project prior to packing. By default, the project will be built.</source>
<target state="translated">Projeyi paketlemeden önce derlemeyi atlayın. Varsayılan olarak, proje derlenir.</target>
<source>Do not build project before packing. Implies --no-restore.</source>
<target state="needs-review-translation">Projeyi paketlemeden önce derlemeyi atlayın. Varsayılan olarak, proje derlenir.</target>
<note />
</trans-unit>
<trans-unit id="CmdIncludeSymbolsDescription">

4
src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.zh-Hans.xlf
View file

@ -23,8 +23,8 @@
<note />
</trans-unit>
<trans-unit id="CmdNoBuildOptionDescription">
<source>Skip building the project prior to packing. By default, the project will be built.</source>
<target state="translated">在打包之前跳过生成项目。默认情况下，将生成项目。</target>
<source>Do not build project before packing. Implies --no-restore.</source>
<target state="needs-review-translation">在打包之前跳过生成项目。默认情况下，将生成项目。</target>
<note />
</trans-unit>
<trans-unit id="CmdIncludeSymbolsDescription">

4
src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.zh-Hant.xlf
View file

@ -23,8 +23,8 @@
<note />
</trans-unit>
<trans-unit id="CmdNoBuildOptionDescription">
<source>Skip building the project prior to packing. By default, the project will be built.</source>
<target state="translated">在封裝前跳過建置專案。預設會建置專案。</target>
<source>Do not build project before packing. Implies --no-restore.</source>
<target state="needs-review-translation">在封裝前跳過建置專案。預設會建置專案。</target>
<note />
</trans-unit>
<trans-unit id="CmdIncludeSymbolsDescription">

5
src/dotnet/commands/dotnet-run/LocalizableStrings.resx
View file

@ -124,14 +124,11 @@
<value>Command used to run .NET apps</value>
</data>
<data name="CommandOptionNoBuildDescription" xml:space="preserve">
<value>Skip building the project prior to running. By default, the project will be built.</value>
<value>Do not build project before running. Implies --no-restore.</value>
</data>
<data name="CommandOptionFrameworkDescription" xml:space="preserve">
<value>Build and run the app using the specified framework. The framework has to be specified in the project file. </value>
</data>
<data name="CommandOptionNoBuild" xml:space="preserve">
<value>Do not build the project before running.</value>
</data>
<data name="CommandOptionProjectDescription" xml:space="preserve">
<value>The path to the project file to run (defaults to the current directory if there is only one project).</value>
</data>

5
src/dotnet/commands/dotnet-run/RunCommandParser.cs
View file

@ -26,7 +26,7 @@ namespace Microsoft.DotNet.Cli
project: o.SingleArgumentOrDefault("--project"),
launchProfile: o.SingleArgumentOrDefault("--launch-profile"),
noLaunchProfile: o.HasOption("--no-launch-profile"),
noRestore: o.HasOption("--no-restore"),
noRestore: o.HasOption("--no-restore") || o.HasOption("--no-build"),
restoreArgs: o.OptionValuesToBeForwarded(),
args: o.Arguments
)),
@ -51,7 +51,8 @@ namespace Microsoft.DotNet.Cli
"--no-build",
LocalizableStrings.CommandOptionNoBuildDescription,
Accept.NoArguments()),
CommonOptions.NoRestoreOption()
CommonOptions.NoRestoreOption(),
CommonOptions.VerbosityOption()
});
}
}

9
src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.cs.xlf
View file

@ -33,13 +33,8 @@
<note />
</trans-unit>
<trans-unit id="CommandOptionNoBuildDescription">
<source>Skip building the project prior to running. By default, the project will be built.</source>
<target state="translated">Před spuštěním vynechá sestavení projektu. Standardně se projekt sestaví.</target>
<note />
</trans-unit>
<trans-unit id="CommandOptionNoBuild">
<source>Do not build the project before running.</source>
<target state="translated">Před spuštěním nesestavovat projekt</target>
<source>Do not build project before running. Implies --no-restore.</source>
<target state="needs-review-translation">Před spuštěním vynechá sestavení projektu. Standardně se projekt sestaví.</target>
<note />
</trans-unit>
<trans-unit id="RunCommandExceptionUnableToRunSpecifyFramework">

9
src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.de.xlf
View file

@ -33,13 +33,8 @@
<note />
</trans-unit>
<trans-unit id="CommandOptionNoBuildDescription">
<source>Skip building the project prior to running. By default, the project will be built.</source>
<target state="translated">Überspringen Sie die Erstellung des Projekts vor dem Ausführen. Das Projekt wird standardmäßig erstellt.</target>
<note />
</trans-unit>
<trans-unit id="CommandOptionNoBuild">
<source>Do not build the project before running.</source>
<target state="translated">Erstellen Sie das Projekt nicht vor dem Ausführen.</target>
<source>Do not build project before running. Implies --no-restore.</source>
<target state="needs-review-translation">Überspringen Sie die Erstellung des Projekts vor dem Ausführen. Das Projekt wird standardmäßig erstellt.</target>
<note />
</trans-unit>
<trans-unit id="RunCommandExceptionUnableToRunSpecifyFramework">

9
src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.es.xlf
View file

@ -33,13 +33,8 @@
<note />
</trans-unit>
<trans-unit id="CommandOptionNoBuildDescription">
<source>Skip building the project prior to running. By default, the project will be built.</source>
<target state="translated">Omite la compilación del proyecto antes de ejecutarlo. El proyecto se compilará de manera predeterminada.</target>
<note />
</trans-unit>
<trans-unit id="CommandOptionNoBuild">
<source>Do not build the project before running.</source>
<target state="translated">No se compila el proyecto antes de ejecutarlo.</target>
<source>Do not build project before running. Implies --no-restore.</source>
<target state="needs-review-translation">Omite la compilación del proyecto antes de ejecutarlo. El proyecto se compilará de manera predeterminada.</target>
<note />
</trans-unit>
<trans-unit id="RunCommandExceptionUnableToRunSpecifyFramework">

9
src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.fr.xlf
View file

@ -33,13 +33,8 @@
<note />
</trans-unit>
<trans-unit id="CommandOptionNoBuildDescription">
<source>Skip building the project prior to running. By default, the project will be built.</source>
<target state="translated">Ignorez la génération du projet avant l'exécution. Par défaut, le projet est généré.</target>
<note />
</trans-unit>
<trans-unit id="CommandOptionNoBuild">
<source>Do not build the project before running.</source>
<target state="translated">Ne générez pas le projet avant l'exécution.</target>
<source>Do not build project before running. Implies --no-restore.</source>
<target state="needs-review-translation">Ignorez la génération du projet avant l'exécution. Par défaut, le projet est généré.</target>
<note />
</trans-unit>
<trans-unit id="RunCommandExceptionUnableToRunSpecifyFramework">

9
src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.it.xlf
View file

@ -33,13 +33,8 @@
<note />
</trans-unit>
<trans-unit id="CommandOptionNoBuildDescription">
<source>Skip building the project prior to running. By default, the project will be built.</source>
<target state="translated">Consente di ignorare la compilazione del progetto prima dell'esecuzione. Per impostazione predefinita, il progetto verrà compilato.</target>
<note />
</trans-unit>
<trans-unit id="CommandOptionNoBuild">
<source>Do not build the project before running.</source>
<target state="translated">Non compilare il progetto prima dell'esecuzione.</target>
<source>Do not build project before running. Implies --no-restore.</source>
<target state="needs-review-translation">Consente di ignorare la compilazione del progetto prima dell'esecuzione. Per impostazione predefinita, il progetto verrà compilato.</target>
<note />
</trans-unit>
<trans-unit id="RunCommandExceptionUnableToRunSpecifyFramework">

9
src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ja.xlf
View file

@ -33,13 +33,8 @@
<note />
</trans-unit>
<trans-unit id="CommandOptionNoBuildDescription">
<source>Skip building the project prior to running. By default, the project will be built.</source>
<target state="translated">実行の前に、プロジェクトのビルドをスキップします。既定では、プロジェクトはビルドされます。</target>
<note />
</trans-unit>
<trans-unit id="CommandOptionNoBuild">
<source>Do not build the project before running.</source>
<target state="translated">実行する前にプロジェクトをビルドしません。</target>
<source>Do not build project before running. Implies --no-restore.</source>
<target state="needs-review-translation">実行の前に、プロジェクトのビルドをスキップします。既定では、プロジェクトはビルドされます。</target>
<note />
</trans-unit>
<trans-unit id="RunCommandExceptionUnableToRunSpecifyFramework">

9
src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ko.xlf
View file

@ -33,13 +33,8 @@
<note />
</trans-unit>
<trans-unit id="CommandOptionNoBuildDescription">
<source>Skip building the project prior to running. By default, the project will be built.</source>
<target state="translated">실행하기 전에 프로젝트를 빌드하지 않습니다. 기본적으로 프로젝트가 빌드됩니다.</target>
<note />
</trans-unit>
<trans-unit id="CommandOptionNoBuild">
<source>Do not build the project before running.</source>
<target state="translated">실행하기 전에 프로젝트를 빌드하지 않습니다.</target>
<source>Do not build project before running. Implies --no-restore.</source>
<target state="needs-review-translation">실행하기 전에 프로젝트를 빌드하지 않습니다. 기본적으로 프로젝트가 빌드됩니다.</target>
<note />
</trans-unit>
<trans-unit id="RunCommandExceptionUnableToRunSpecifyFramework">

9
src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.pl.xlf
View file

@ -33,13 +33,8 @@
<note />
</trans-unit>
<trans-unit id="CommandOptionNoBuildDescription">
<source>Skip building the project prior to running. By default, the project will be built.</source>
<target state="translated">Pomiń kompilację projektu przed uruchomieniem. Domyślnie projekt zostanie skompilowany.</target>
<note />
</trans-unit>
<trans-unit id="CommandOptionNoBuild">
<source>Do not build the project before running.</source>
<target state="translated">Nie kompiluj projektu przed uruchomieniem.</target>
<source>Do not build project before running. Implies --no-restore.</source>
<target state="needs-review-translation">Pomiń kompilację projektu przed uruchomieniem. Domyślnie projekt zostanie skompilowany.</target>
<note />
</trans-unit>
<trans-unit id="RunCommandExceptionUnableToRunSpecifyFramework">

9
src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.pt-BR.xlf
View file

@ -33,13 +33,8 @@
<note />
</trans-unit>
<trans-unit id="CommandOptionNoBuildDescription">
<source>Skip building the project prior to running. By default, the project will be built.</source>
<target state="translated">Ignorar a compilação do projeto antes da execução. Por padrão, o projeto será compilado.</target>
<note />
</trans-unit>
<trans-unit id="CommandOptionNoBuild">
<source>Do not build the project before running.</source>
<target state="translated">Não compilar o projeto antes da execução.</target>
<source>Do not build project before running. Implies --no-restore.</source>
<target state="needs-review-translation">Ignorar a compilação do projeto antes da execução. Por padrão, o projeto será compilado.</target>
<note />
</trans-unit>
<trans-unit id="RunCommandExceptionUnableToRunSpecifyFramework">

9
src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ru.xlf
View file

@ -33,13 +33,8 @@
<note />
</trans-unit>
<trans-unit id="CommandOptionNoBuildDescription">
<source>Skip building the project prior to running. By default, the project will be built.</source>
<target state="translated">Пропуск сборки проекта перед запуском. По умолчанию выполняется сборка проекта.</target>
<note />
</trans-unit>
<trans-unit id="CommandOptionNoBuild">
<source>Do not build the project before running.</source>
<target state="translated">Не выполнять сборку проекта перед запуском.</target>
<source>Do not build project before running. Implies --no-restore.</source>
<target state="needs-review-translation">Пропуск сборки проекта перед запуском. По умолчанию выполняется сборка проекта.</target>
<note />
</trans-unit>
<trans-unit id="RunCommandExceptionUnableToRunSpecifyFramework">

9
src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.tr.xlf
View file

@ -33,13 +33,8 @@
<note />
</trans-unit>
<trans-unit id="CommandOptionNoBuildDescription">
<source>Skip building the project prior to running. By default, the project will be built.</source>
<target state="translated">Projeyi çalıştırmadan önce derlemeyi atlayın. Varsayılan olarak, proje derlenir.</target>
<note />
</trans-unit>
<trans-unit id="CommandOptionNoBuild">
<source>Do not build the project before running.</source>
<target state="translated">Projeyi çalıştırmadan önce derleme.</target>
<source>Do not build project before running. Implies --no-restore.</source>
<target state="needs-review-translation">Projeyi çalıştırmadan önce derlemeyi atlayın. Varsayılan olarak, proje derlenir.</target>
<note />
</trans-unit>
<trans-unit id="RunCommandExceptionUnableToRunSpecifyFramework">

9
src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.zh-Hans.xlf
View file

@ -33,13 +33,8 @@
<note />
</trans-unit>
<trans-unit id="CommandOptionNoBuildDescription">
<source>Skip building the project prior to running. By default, the project will be built.</source>
<target state="translated">在运行之前跳过项目生成操作。将默认生成项目。</target>
<note />
</trans-unit>
<trans-unit id="CommandOptionNoBuild">
<source>Do not build the project before running.</source>
<target state="translated">运行之前不要生成项目。</target>
<source>Do not build project before running. Implies --no-restore.</source>
<target state="needs-review-translation">在运行之前跳过项目生成操作。将默认生成项目。</target>
<note />
</trans-unit>
<trans-unit id="RunCommandExceptionUnableToRunSpecifyFramework">

9
src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.zh-Hant.xlf
View file

@ -33,13 +33,8 @@
<note />
</trans-unit>
<trans-unit id="CommandOptionNoBuildDescription">
<source>Skip building the project prior to running. By default, the project will be built.</source>
<target state="translated">在執行之前跳過建置該專案。根據預設，將會建置該專案。</target>
<note />
</trans-unit>
<trans-unit id="CommandOptionNoBuild">
<source>Do not build the project before running.</source>
<target state="translated">請勿在執行之前建置專案。</target>
<source>Do not build project before running. Implies --no-restore.</source>
<target state="needs-review-translation">在執行之前跳過建置該專案。根據預設，將會建置該專案。</target>
<note />
</trans-unit>
<trans-unit id="RunCommandExceptionUnableToRunSpecifyFramework">

2
src/dotnet/commands/dotnet-test/LocalizableStrings.resx
View file

@ -193,7 +193,7 @@
Logs are written to the provided file.</value>
</data>
<data name="CmdNoBuildDescription" xml:space="preserve">
<value>Do not build project before testing.</value>
<value>Do not build project before testing. Implies --no-restore.</value>
</data>
<data name="CmdResultsDirectoryDescription" xml:space="preserve">
<value>The directory where the test results are going to be placed. The specified directory will be created if it does not exist.

2
src/dotnet/commands/dotnet-test/Program.cs
View file

@ -70,7 +70,7 @@ namespace Microsoft.DotNet.Tools.Test
}
}
bool noRestore = parsedTest.HasOption("--no-restore");
bool noRestore = parsedTest.HasOption("--no-restore") || parsedTest.HasOption("--no-build");
return new TestCommand(
msbuildArgs,

4
src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.cs.xlf
View file

@ -125,8 +125,8 @@
<note />
</trans-unit>
<trans-unit id="CmdNoBuildDescription">
<source>Do not build project before testing.</source>
<target state="translated">Nesestavujte projekt dříve, než ho otestujete.</target>
<source>Do not build project before testing. Implies --no-restore.</source>
<target state="needs-review-translation">Nesestavujte projekt dříve, než ho otestujete.</target>
<note />
</trans-unit>
<trans-unit id="CmdTestAdapterPath">

4
src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.de.xlf
View file

@ -125,8 +125,8 @@
<note />
</trans-unit>
<trans-unit id="CmdNoBuildDescription">
<source>Do not build project before testing.</source>
<target state="translated">Erstellen Sie das Projekt nicht vor dem Testen.</target>
<source>Do not build project before testing. Implies --no-restore.</source>
<target state="needs-review-translation">Erstellen Sie das Projekt nicht vor dem Testen.</target>
<note />
</trans-unit>
<trans-unit id="CmdTestAdapterPath">

4
src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.es.xlf
View file

@ -125,8 +125,8 @@
<note />
</trans-unit>
<trans-unit id="CmdNoBuildDescription">
<source>Do not build project before testing.</source>
<target state="translated">El proyecto no se compila antes de probarlo.</target>
<source>Do not build project before testing. Implies --no-restore.</source>
<target state="needs-review-translation">El proyecto no se compila antes de probarlo.</target>
<note />
</trans-unit>
<trans-unit id="CmdTestAdapterPath">

4
src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.fr.xlf
View file

@ -125,8 +125,8 @@
<note />
</trans-unit>
<trans-unit id="CmdNoBuildDescription">
<source>Do not build project before testing.</source>
<target state="translated">Ne générez pas le projet avant les tests.</target>
<source>Do not build project before testing. Implies --no-restore.</source>
<target state="needs-review-translation">Ne générez pas le projet avant les tests.</target>
<note />
</trans-unit>
<trans-unit id="CmdTestAdapterPath">

4
src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.it.xlf
View file

@ -125,8 +125,8 @@
<note />
</trans-unit>
<trans-unit id="CmdNoBuildDescription">
<source>Do not build project before testing.</source>
<target state="translated">Il progetto non viene compilato prima del test.</target>
<source>Do not build project before testing. Implies --no-restore.</source>
<target state="needs-review-translation">Il progetto non viene compilato prima del test.</target>
<note />
</trans-unit>
<trans-unit id="CmdTestAdapterPath">

4
src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ja.xlf
View file

@ -125,8 +125,8 @@
<note />
</trans-unit>
<trans-unit id="CmdNoBuildDescription">
<source>Do not build project before testing.</source>
<target state="translated">テストする前にプロジェクトを構築しないでください。</target>
<source>Do not build project before testing. Implies --no-restore.</source>
<target state="needs-review-translation">テストする前にプロジェクトを構築しないでください。</target>
<note />
</trans-unit>
<trans-unit id="CmdTestAdapterPath">

4
src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ko.xlf
View file

@ -125,8 +125,8 @@
<note />
</trans-unit>
<trans-unit id="CmdNoBuildDescription">
<source>Do not build project before testing.</source>
<target state="translated">테스트하기 전에 프로젝트를 빌드하지 않습니다.</target>
<source>Do not build project before testing. Implies --no-restore.</source>
<target state="needs-review-translation">테스트하기 전에 프로젝트를 빌드하지 않습니다.</target>
<note />
</trans-unit>
<trans-unit id="CmdTestAdapterPath">

4
src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pl.xlf
View file

@ -125,8 +125,8 @@
<note />
</trans-unit>
<trans-unit id="CmdNoBuildDescription">
<source>Do not build project before testing.</source>
<target state="translated">Nie kompiluj projektu przed przeprowadzeniem testów.</target>
<source>Do not build project before testing. Implies --no-restore.</source>
<target state="needs-review-translation">Nie kompiluj projektu przed przeprowadzeniem testów.</target>
<note />
</trans-unit>
<trans-unit id="CmdTestAdapterPath">

4
src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pt-BR.xlf
View file

@ -125,8 +125,8 @@
<note />
</trans-unit>
<trans-unit id="CmdNoBuildDescription">
<source>Do not build project before testing.</source>
<target state="translated">Não compile o projeto antes de testar.</target>
<source>Do not build project before testing. Implies --no-restore.</source>
<target state="needs-review-translation">Não compile o projeto antes de testar.</target>
<note />
</trans-unit>
<trans-unit id="CmdTestAdapterPath">

4
src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ru.xlf
View file

@ -125,8 +125,8 @@
<note />
</trans-unit>
<trans-unit id="CmdNoBuildDescription">
<source>Do not build project before testing.</source>
<target state="translated">Не выполнять сборку проектов перед тестированием.</target>
<source>Do not build project before testing. Implies --no-restore.</source>
<target state="needs-review-translation">Не выполнять сборку проектов перед тестированием.</target>
<note />
</trans-unit>
<trans-unit id="CmdTestAdapterPath">

4
src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.tr.xlf
View file

@ -125,8 +125,8 @@
<note />
</trans-unit>
<trans-unit id="CmdNoBuildDescription">
<source>Do not build project before testing.</source>
<target state="translated">Projeyi derlemeden önce test edin.</target>
<source>Do not build project before testing. Implies --no-restore.</source>
<target state="needs-review-translation">Projeyi derlemeden önce test edin.</target>
<note />
</trans-unit>
<trans-unit id="CmdTestAdapterPath">

4
src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hans.xlf
View file

@ -125,8 +125,8 @@
<note />
</trans-unit>
<trans-unit id="CmdNoBuildDescription">
<source>Do not build project before testing.</source>
<target state="translated">测试之前不要生成项目。</target>
<source>Do not build project before testing. Implies --no-restore.</source>
<target state="needs-review-translation">测试之前不要生成项目。</target>
<note />
</trans-unit>
<trans-unit id="CmdTestAdapterPath">

4
src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hant.xlf
View file

@ -125,8 +125,8 @@
<note />
</trans-unit>
<trans-unit id="CmdNoBuildDescription">
<source>Do not build project before testing.</source>
<target state="translated">請勿在測試前建置專案。</target>
<source>Do not build project before testing. Implies --no-restore.</source>
<target state="needs-review-translation">請勿在測試前建置專案。</target>
<note />
</trans-unit>
<trans-unit id="CmdTestAdapterPath">

7
test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/CommandResultAssertions.cs
View file

@ -69,6 +69,13 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
return new AndConstraint<CommandResultAssertions>(this);
}
public AndConstraint<CommandResultAssertions> NotHaveStdOutContaining(string pattern)
{
Execute.Assertion.ForCondition(!_commandResult.StdOut.Contains(pattern))
.FailWith(AppendDiagnosticsTo($"The command output contained a result it should not have contained: {pattern}{Environment.NewLine}"));
return new AndConstraint<CommandResultAssertions>(this);
}
public AndConstraint<CommandResultAssertions> HaveStdOutMatching(string pattern, RegexOptions options = RegexOptions.None)
{
Execute.Assertion.ForCondition(Regex.Match(_commandResult.StdOut, pattern, options).Success)

4
test/dotnet-msbuild.Tests/GivenDotnetPackInvocation.cs
View file

@ -12,6 +12,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
public class GivenDotnetPackInvocation
{
const string ExpectedPrefix = "exec <msbuildpath> /m /v:m /restore /t:pack";
const string ExpectedNoBuildPrefix = "exec <msbuildpath> /m /v:m /t:pack";
[Theory]
[InlineData(new string[] { }, "")]
@ -34,9 +35,10 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
var msbuildPath = "<msbuildpath>";
var command = PackCommand.FromArgs(args, msbuildPath);
var expectedPrefix = args.FirstOrDefault() == "--no-build" ? ExpectedNoBuildPrefix : ExpectedPrefix;
command.SeparateRestoreCommand.Should().BeNull();
command.GetProcessStartInfo().Arguments.Should().Be($"{ExpectedPrefix}{expectedAdditionalArgs}");
command.GetProcessStartInfo().Arguments.Should().Be($"{expectedPrefix}{expectedAdditionalArgs}");
}
}
}

19
test/dotnet-pack.Tests/PackTests.cs
View file

@ -186,6 +186,25 @@ namespace Microsoft.DotNet.Tools.Pack.Tests
.Should().Pass();
}
[Fact]
public void ItDoesNotImplicitlyBuildAProjectWhenPackagingWithTheNoBuildOption()
{
var testInstance = TestAssets.Get("TestAppSimple")
.CreateInstance()
.WithSourceFiles();
var result = new PackCommand()
.WithWorkingDirectory(testInstance.Root)
.ExecuteWithCapturedOutput("--no-build");
result.Should().Fail();
if (!DotnetUnderTest.IsLocalized())
{
result.Should().NotHaveStdOutContaining("Restore")
.And.HaveStdOutContaining("project.assets.json");
}
}
[Fact]
public void ItDoesNotImplicitlyRestoreAProjectWhenPackagingWithTheNoRestoreOption()
{

41
test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs
View file

@ -75,6 +75,25 @@ namespace Microsoft.DotNet.Cli.Run.Tests
.And.HaveStdOutContaining("This string came from the test library!");
}
[Fact]
public void ItDoesNotImplicitlyBuildAProjectWhenRunningWithTheNoBuildOption()
{
var testAppName = "MSBuildTestApp";
var testInstance = TestAssets.Get(testAppName)
.CreateInstance()
.WithSourceFiles();
var result = new RunCommand()
.WithWorkingDirectory(testInstance.Root.FullName)
.ExecuteWithCapturedOutput("--no-build -v:m");
result.Should().Fail();
if (!DotnetUnderTest.IsLocalized())
{
result.Should().NotHaveStdOutContaining("Restore");
}
}
[Fact]
public void ItDoesNotImplicitlyRestoreAProjectWhenRunningWithTheNoRestoreOption()
{
@ -518,5 +537,27 @@ namespace Microsoft.DotNet.Cli.Run.Tests
.And.HaveStdOutContaining("(NO MESSAGE)")
.And.HaveStdErrContaining(string.Format(LocalizableStrings.RunCommandExceptionCouldNotApplyLaunchSettings, LocalizableStrings.DefaultLaunchProfileDisplayName, "").Trim());
}
[Fact]
public void ItRunsWithTheSpecifiedVerbosity()
{
var testAppName = "MSBuildTestApp";
var testInstance = TestAssets.Get(testAppName)
.CreateInstance()
.WithSourceFiles();
var result = new RunCommand()
.WithWorkingDirectory( testInstance.Root.FullName)
.ExecuteWithCapturedOutput("-v:n");
result.Should().Pass()
.And.HaveStdOutContaining("Hello World!");
if (!DotnetUnderTest.IsLocalized())
{
result.Should().HaveStdOutContaining("Restore")
.And.HaveStdOutContaining("CoreCompile");
}
}
}
}

3
test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs
View file

@ -123,11 +123,12 @@ namespace Microsoft.DotNet.Cli.Test.Tests
// Call test
CommandResult result = new DotnetTestCommand()
.WithWorkingDirectory(testProjectDirectory)
.ExecuteWithCapturedOutput("--no-build");
.ExecuteWithCapturedOutput("--no-build -v:m");
// Verify
if (!DotnetUnderTest.IsLocalized())
{
result.StdOut.Should().NotContain("Restore");
result.StdErr.Should().Contain(expectedError);
}