From b6174af5119daf3dcdcc747469fc7ff22c1b5f59 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Wed, 4 Apr 2018 15:02:36 -0700 Subject: [PATCH 1/3] Implement `dotnet publish --no-build` --- build/DependencyVersions.props | 2 +- .../dotnet-publish/LocalizableStrings.resx | 3 + src/dotnet/commands/dotnet-publish/Program.cs | 5 +- .../dotnet-publish/PublishCommandParser.cs | 7 ++- .../xlf/LocalizableStrings.cs.xlf | 5 ++ .../xlf/LocalizableStrings.de.xlf | 5 ++ .../xlf/LocalizableStrings.es.xlf | 5 ++ .../xlf/LocalizableStrings.fr.xlf | 5 ++ .../xlf/LocalizableStrings.it.xlf | 5 ++ .../xlf/LocalizableStrings.ja.xlf | 5 ++ .../xlf/LocalizableStrings.ko.xlf | 5 ++ .../xlf/LocalizableStrings.pl.xlf | 5 ++ .../xlf/LocalizableStrings.pt-BR.xlf | 5 ++ .../xlf/LocalizableStrings.ru.xlf | 5 ++ .../xlf/LocalizableStrings.tr.xlf | 5 ++ .../xlf/LocalizableStrings.zh-Hans.xlf | 5 ++ .../xlf/LocalizableStrings.zh-Hant.xlf | 5 ++ .../GivenDotnetPublishInvocation.cs | 20 ++++++- .../GivenDotnetPublishPublishesProjects.cs | 56 +++++++++++++++++++ 19 files changed, 152 insertions(+), 6 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index efbd36959..77f17de57 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -14,7 +14,7 @@ $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.300-preview2-62716-01 + 2.1.300-preview3-62804-06 $(MicrosoftNETSdkPackageVersion) $(MicrosoftAspNetCoreAppPackageVersion) 2.1.300-preview2-20180306-1448279 diff --git a/src/dotnet/commands/dotnet-publish/LocalizableStrings.resx b/src/dotnet/commands/dotnet-publish/LocalizableStrings.resx index e11675be8..93acbf870 100644 --- a/src/dotnet/commands/dotnet-publish/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-publish/LocalizableStrings.resx @@ -141,4 +141,7 @@ Publish the .NET Core runtime with your application so the runtime doesn't need to be installed on the target machine. Defaults to 'true' if a runtime identifier is specified. + + Do not build project before publishing. Implies --no-restore. + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-publish/Program.cs b/src/dotnet/commands/dotnet-publish/Program.cs index 223e786e7..ed8f3260c 100644 --- a/src/dotnet/commands/dotnet-publish/Program.cs +++ b/src/dotnet/commands/dotnet-publish/Program.cs @@ -43,7 +43,8 @@ namespace Microsoft.DotNet.Tools.Publish msbuildArgs.AddRange(appliedPublishOption.Arguments); - bool noRestore = appliedPublishOption.HasOption("--no-restore"); + bool noRestore = appliedPublishOption.HasOption("--no-restore") + || appliedPublishOption.HasOption("--no-build"); return new PublishCommand( msbuildArgs, @@ -70,4 +71,4 @@ namespace Microsoft.DotNet.Tools.Publish return cmd.Execute(); } } -} \ No newline at end of file +} diff --git a/src/dotnet/commands/dotnet-publish/PublishCommandParser.cs b/src/dotnet/commands/dotnet-publish/PublishCommandParser.cs index 91d0e0659..56e55e539 100644 --- a/src/dotnet/commands/dotnet-publish/PublishCommandParser.cs +++ b/src/dotnet/commands/dotnet-publish/PublishCommandParser.cs @@ -1,7 +1,6 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System.Collections.Generic; using System.Linq; using Microsoft.DotNet.Cli.CommandLine; using Microsoft.DotNet.Tools; @@ -33,6 +32,10 @@ namespace Microsoft.DotNet.Cli Accept.OneOrMoreArguments() .With(name: LocalizableStrings.ManifestOption) .ForwardAsSingle(o => $"-property:TargetManifestFiles={string.Join("%3B", o.Arguments)}")), + Create.Option( + "--no-build", + LocalizableStrings.NoBuildOptionDescription, + Accept.NoArguments().ForwardAs("-property:NoBuild=true")), Create.Option( "--self-contained", LocalizableStrings.SelfContainedOptionDescription, @@ -46,4 +49,4 @@ namespace Microsoft.DotNet.Cli CommonOptions.NoRestoreOption(), CommonOptions.VerbosityOption()); } -} \ No newline at end of file +} diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.cs.xlf index 37b71db9d..f3711ca7d 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.cs.xlf @@ -42,6 +42,11 @@ Publikuje spolu s aplikací modul runtime .NET Core, aby se tento modul nemusel instalovat na cílový počítač. Standardně se nastaví na True, pokud je zadaný identifikátor modulu runtime. + + Do not build project before publishing. Implies --no-restore. + Do not build project before publishing. Implies --no-restore. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.de.xlf index 832d56a35..d92f9061d 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.de.xlf @@ -42,6 +42,11 @@ Veröffentlichen Sie die .NET Core-Runtime mit Ihrer Anwendung, damit die Runtime auf dem Zielcomputer nicht installiert werden muss. Der Standardwert ist "true", wenn ein Runtimebezeichner angegeben ist. + + Do not build project before publishing. Implies --no-restore. + Do not build project before publishing. Implies --no-restore. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.es.xlf index 779367c21..489c71ca5 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.es.xlf @@ -42,6 +42,11 @@ Publica el tiempo de ejecución de .NET Core con su aplicación para que no sea necesario instalarlo en la máquina de destino. Si se especifica un identificador de tiempo de ejecución, se toma como predeterminado el valor "true". + + Do not build project before publishing. Implies --no-restore. + Do not build project before publishing. Implies --no-restore. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.fr.xlf index 44a8f8c73..e7f4eb781 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.fr.xlf @@ -42,6 +42,11 @@ Publiez le runtime .NET Core avec votre application pour éviter à l'utilisateur de l'installer sur la machine cible. La valeur par défaut est 'true' si un identificateur de runtime est spécifié. + + Do not build project before publishing. Implies --no-restore. + Do not build project before publishing. Implies --no-restore. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.it.xlf index 3e15ff10b..d23757a14 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.it.xlf @@ -42,6 +42,11 @@ Pubblica il runtime di .NET Core con l'applicazione in modo che non sia necessario installarlo nel computer di destinazione. Se si specifica un identificatore di runtime, l'impostazione predefinita è 'true'. + + Do not build project before publishing. Implies --no-restore. + Do not build project before publishing. Implies --no-restore. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ja.xlf index 4337b4f66..de8970210 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ja.xlf @@ -42,6 +42,11 @@ ランタイムをターゲット マシンにインストールしなくてもよいよう、.NET Core ランタイムをアプリケーションと一緒に発行します。ランタイム ID が指定される場合、既定の 'true' になります。 + + Do not build project before publishing. Implies --no-restore. + Do not build project before publishing. Implies --no-restore. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ko.xlf index e5f42bc3a..ec06ee9df 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ko.xlf @@ -42,6 +42,11 @@ 런타임은 대상 컴퓨터에 설치할 필요가 없으므로 응용 프로그램과 함께 .NET Core 런타임을 게시합니다. 런타임 식별자가 지정된 경우 기본값은 'true'입니다. + + Do not build project before publishing. Implies --no-restore. + Do not build project before publishing. Implies --no-restore. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pl.xlf index 4a51e1e39..98762f398 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pl.xlf @@ -42,6 +42,11 @@ Opublikuj środowisko uruchomieniowe programu .NET Core z aplikacją, aby nie trzeba było go instalować na maszynie docelowej. Domyślnie jest ustawiona wartość „true” w przypadku określenia identyfikatora środowiska uruchomieniowego. + + Do not build project before publishing. Implies --no-restore. + Do not build project before publishing. Implies --no-restore. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pt-BR.xlf index 81a53b9d7..2bddbbcd2 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pt-BR.xlf @@ -42,6 +42,11 @@ Publique o tempo de execução .NET Core com seu aplicativo para que o tempo de execução não precise ser instalado no computador de destino. Assumirá 'true' como padrão se um identificador de tempo de execução for especificado. + + Do not build project before publishing. Implies --no-restore. + Do not build project before publishing. Implies --no-restore. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ru.xlf index c4ce49b81..4cc8643f4 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ru.xlf @@ -42,6 +42,11 @@ Опубликуйте среду выполнения .NET Core вместе с приложением, чтобы ее не нужно было устанавливать на целевом компьютере. Если идентификатор среды выполнения указан, значение по умолчанию — true. + + Do not build project before publishing. Implies --no-restore. + Do not build project before publishing. Implies --no-restore. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.tr.xlf index cc3c5ae9d..1acb2c224 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.tr.xlf @@ -42,6 +42,11 @@ Çalışma zamanının hedef makineye yüklenmesine gerek kalmaması için, .NET Core çalışma zamanını uygulamanızla birlikte yayımlayın. Bir çalışma zamanı tanımlayıcısı belirtilmişse, varsayılan olarak 'true' değerine ayarlanır. + + Do not build project before publishing. Implies --no-restore. + Do not build project before publishing. Implies --no-restore. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hans.xlf index 64d86e8bb..b19817aa7 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hans.xlf @@ -42,6 +42,11 @@ 随附应用程序发布 .NET Core 运行时，免除在目标计算机上安装运行时的需求。如果指定了运行时标识符，则默认为 “true”。 + + Do not build project before publishing. Implies --no-restore. + Do not build project before publishing. Implies --no-restore. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hant.xlf index ad6e74bf6..db7c8c18b 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hant.xlf @@ -42,6 +42,11 @@ 隨著應用程式一併發行 .NET Core 執行階段，因此不需要在目標電腦上安裝此執行階段。若指定了執行階段識別碼，則預設為 'true'。 + + Do not build project before publishing. Implies --no-restore. + Do not build project before publishing. Implies --no-restore. + + \ No newline at end of file diff --git a/test/dotnet-msbuild.Tests/GivenDotnetPublishInvocation.cs b/test/dotnet-msbuild.Tests/GivenDotnetPublishInvocation.cs index 2eb45a33a..b66155261 100644 --- a/test/dotnet-msbuild.Tests/GivenDotnetPublishInvocation.cs +++ b/test/dotnet-msbuild.Tests/GivenDotnetPublishInvocation.cs @@ -72,6 +72,23 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests .Be($"{ExpectedPrefix} -nologo -target:Publish{expectedAdditionalArgs}"); } + [Fact] + public void MsbuildInvocationIsCorrectForNoBuild() + { + var msbuildPath = ""; + var command = PublishCommand.FromArgs(new[] { "--no-build" }, msbuildPath); + + command.SeparateRestoreCommand + .Should() + .BeNull(); + + // NOTE --no-build implies no-restore hence no -restore argument to msbuild below. + command.GetProcessStartInfo() + .Arguments + .Should() + .Be($"{ExpectedPrefix} -target:Publish -property:NoBuild=true"); + } + [Theory] [InlineData(new string[] { }, "")] [InlineData(new string[] { "-f", "" }, "-property:TargetFramework=")] @@ -86,6 +103,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests [InlineData(new string[] { "--manifest", "" }, "-property:TargetManifestFiles=")] [InlineData(new string[] { "-v", "minimal" }, "-verbosity:minimal")] [InlineData(new string[] { "--verbosity", "minimal" }, "-verbosity:minimal")] + [InlineData(new string[] { "--no-build" }, "-property:NoBuild=true")] public void OptionForwardingIsCorrect(string[] args, string expectedAdditionalArgs) { var expectedArgs = expectedAdditionalArgs.Split(' ', StringSplitOptions.RemoveEmptyEntries); @@ -100,4 +118,4 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests .BeEquivalentTo(expectedArgs); } } -} \ No newline at end of file +} diff --git a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs index aa705a0c2..3152e0a2c 100644 --- a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs +++ b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs @@ -235,5 +235,61 @@ namespace Microsoft.DotNet.Cli.Publish.Tests .Should().Pass() .And.HaveStdOutContaining("Hello World"); } + + [Fact] + public void ItFailsToPublishWithNoBuildIfNotPreviouslyBuilt() + { + var rootPath = TestAssets.CreateTestDirectory().FullName; + + string newArgs = $"console -o \"{rootPath}\""; + new NewCommandShim() + .WithWorkingDirectory(rootPath) + .Execute(newArgs) + .Should().Pass(); + + new PublishCommand() + .WithWorkingDirectory(rootPath) + .ExecuteWithCapturedOutput("--no-build") + .Should().Fail() + .And.HaveStdOutContaining("MSB3030"); // "Could not copy ___ because it was not found. + } + + [Fact] + public void ItPublishesSuccessfullyWithNoBuildIfPreviouslyBuilt() + { + var rootPath = TestAssets.CreateTestDirectory().FullName; + var rootDir = new DirectoryInfo(rootPath); + + string newArgs = $"console -o \"{rootPath}\" --no-restore"; + new NewCommandShim() + .WithWorkingDirectory(rootPath) + .Execute(newArgs) + .Should() + .Pass(); + + new BuildCommand() + .WithWorkingDirectory(rootPath) + .ExecuteWithCapturedOutput() + .Should() + .Pass(); + + new PublishCommand() + .WithWorkingDirectory(rootPath) + .ExecuteWithCapturedOutput("--no-build") + .Should() + .Pass(); + + var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug"; + + var outputProgram = rootDir + .GetDirectory("bin", configuration, "netcoreapp2.1", "publish", $"{rootDir.Name}.dll") + .FullName; + + new TestCommand(outputProgram) + .ExecuteWithCapturedOutput() + .Should() + .Pass() + .And.HaveStdOutContaining("Hello World"); + } } } From 42e0afff1dcbc89ebddd91829228b92aff53427d Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Thu, 5 Apr 2018 16:07:52 -0700 Subject: [PATCH 2/3] Tweak --no-build messages based on PR feedback --- src/dotnet/commands/dotnet-pack/LocalizableStrings.resx | 2 +- src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.cs.xlf | 4 ++-- src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.de.xlf | 4 ++-- src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.es.xlf | 4 ++-- src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.fr.xlf | 4 ++-- src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.it.xlf | 4 ++-- src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.ja.xlf | 4 ++-- src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.ko.xlf | 4 ++-- src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.pl.xlf | 4 ++-- .../commands/dotnet-pack/xlf/LocalizableStrings.pt-BR.xlf | 4 ++-- src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.ru.xlf | 4 ++-- src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.tr.xlf | 4 ++-- .../commands/dotnet-pack/xlf/LocalizableStrings.zh-Hans.xlf | 4 ++-- .../commands/dotnet-pack/xlf/LocalizableStrings.zh-Hant.xlf | 4 ++-- src/dotnet/commands/dotnet-publish/LocalizableStrings.resx | 2 +- .../commands/dotnet-publish/xlf/LocalizableStrings.cs.xlf | 4 ++-- .../commands/dotnet-publish/xlf/LocalizableStrings.de.xlf | 4 ++-- .../commands/dotnet-publish/xlf/LocalizableStrings.es.xlf | 4 ++-- .../commands/dotnet-publish/xlf/LocalizableStrings.fr.xlf | 4 ++-- .../commands/dotnet-publish/xlf/LocalizableStrings.it.xlf | 4 ++-- .../commands/dotnet-publish/xlf/LocalizableStrings.ja.xlf | 4 ++-- .../commands/dotnet-publish/xlf/LocalizableStrings.ko.xlf | 4 ++-- .../commands/dotnet-publish/xlf/LocalizableStrings.pl.xlf | 4 ++-- .../commands/dotnet-publish/xlf/LocalizableStrings.pt-BR.xlf | 4 ++-- .../commands/dotnet-publish/xlf/LocalizableStrings.ru.xlf | 4 ++-- .../commands/dotnet-publish/xlf/LocalizableStrings.tr.xlf | 4 ++-- .../dotnet-publish/xlf/LocalizableStrings.zh-Hans.xlf | 4 ++-- .../dotnet-publish/xlf/LocalizableStrings.zh-Hant.xlf | 4 ++-- src/dotnet/commands/dotnet-run/LocalizableStrings.resx | 2 +- src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.cs.xlf | 4 ++-- src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.de.xlf | 4 ++-- src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.es.xlf | 4 ++-- src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.fr.xlf | 4 ++-- src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.it.xlf | 4 ++-- src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ja.xlf | 4 ++-- src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ko.xlf | 4 ++-- src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.pl.xlf | 4 ++-- .../commands/dotnet-run/xlf/LocalizableStrings.pt-BR.xlf | 4 ++-- src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ru.xlf | 4 ++-- src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.tr.xlf | 4 ++-- .../commands/dotnet-run/xlf/LocalizableStrings.zh-Hans.xlf | 4 ++-- .../commands/dotnet-run/xlf/LocalizableStrings.zh-Hant.xlf | 4 ++-- src/dotnet/commands/dotnet-test/LocalizableStrings.resx | 2 +- src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.cs.xlf | 4 ++-- src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.de.xlf | 4 ++-- src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.es.xlf | 4 ++-- src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.fr.xlf | 4 ++-- src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.it.xlf | 4 ++-- src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ja.xlf | 4 ++-- src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ko.xlf | 4 ++-- src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pl.xlf | 4 ++-- .../commands/dotnet-test/xlf/LocalizableStrings.pt-BR.xlf | 4 ++-- src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ru.xlf | 4 ++-- src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.tr.xlf | 4 ++-- .../commands/dotnet-test/xlf/LocalizableStrings.zh-Hans.xlf | 4 ++-- .../commands/dotnet-test/xlf/LocalizableStrings.zh-Hant.xlf | 4 ++-- 56 files changed, 108 insertions(+), 108 deletions(-) diff --git a/src/dotnet/commands/dotnet-pack/LocalizableStrings.resx b/src/dotnet/commands/dotnet-pack/LocalizableStrings.resx index 58ac50f04..755fbba14 100644 --- a/src/dotnet/commands/dotnet-pack/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-pack/LocalizableStrings.resx @@ -130,7 +130,7 @@ Directory in which to place built packages. - Do not build project before packing. Implies --no-restore. + Do not build the project before packing. Implies --no-restore. Include packages with symbols in addition to regular packages in output directory. diff --git a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.cs.xlf index 8a2eda177..132384329 100644 --- a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.cs.xlf @@ -23,8 +23,8 @@ - Do not build project before packing. Implies --no-restore. - Nesestavujte projekt, dokud ho nezabalíte. Implikuje možnost --no-restore. + Do not build the project before packing. Implies --no-restore. + Nesestavujte projekt, dokud ho nezabalíte. Implikuje možnost --no-restore. diff --git a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.de.xlf index ce9f591a6..294f6f531 100644 --- a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.de.xlf @@ -23,8 +23,8 @@ - Do not build project before packing. Implies --no-restore. - Erstellt das Projekt nicht vor dem Packen. Impliziert "--no-restore". + Do not build the project before packing. Implies --no-restore. + Erstellt das Projekt nicht vor dem Packen. Impliziert "--no-restore". diff --git a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.es.xlf index 2764082d2..f0a671a65 100644 --- a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.es.xlf @@ -23,8 +23,8 @@ - Do not build project before packing. Implies --no-restore. - No compile el proyecto antes de empaquetarlo. Implica la no restauración. + Do not build the project before packing. Implies --no-restore. + No compile el proyecto antes de empaquetarlo. Implica la no restauración. diff --git a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.fr.xlf index 4da09abb1..200ea5fc4 100644 --- a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.fr.xlf @@ -23,8 +23,8 @@ - Do not build project before packing. Implies --no-restore. - Ne pas générer le projet avant la compression. Implique --no-restore. + Do not build the project before packing. Implies --no-restore. + Ne pas générer le projet avant la compression. Implique --no-restore. diff --git a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.it.xlf index 6d20f4d2b..11d60afa9 100644 --- a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.it.xlf @@ -23,8 +23,8 @@ - Do not build project before packing. Implies --no-restore. - Non compila il progetto prima della creazione del pacchetto. Implica --no-restore. + Do not build the project before packing. Implies --no-restore. + Non compila il progetto prima della creazione del pacchetto. Implica --no-restore. diff --git a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.ja.xlf index d3846e90f..146421b26 100644 --- a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.ja.xlf @@ -23,8 +23,8 @@ - Do not build project before packing. Implies --no-restore. - パックする前にプロジェクトをビルドしないでください。 暗示 --復元なし。 + Do not build the project before packing. Implies --no-restore. + パックする前にプロジェクトをビルドしないでください。 暗示 --復元なし。 diff --git a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.ko.xlf index c2f20394c..3cbc41b27 100644 --- a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.ko.xlf @@ -23,8 +23,8 @@ - Do not build project before packing. Implies --no-restore. - 압축하기 전에 프로젝트를 빌드하지 않습니다. 복원 없음을 의미합니다. + Do not build the project before packing. Implies --no-restore. + 압축하기 전에 프로젝트를 빌드하지 않습니다. 복원 없음을 의미합니다. diff --git a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.pl.xlf index d566ce9c9..74df2c640 100644 --- a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.pl.xlf @@ -23,8 +23,8 @@ - Do not build project before packing. Implies --no-restore. - Nie kompiluj projektu przed pakowaniem. Powoduje przyjęcie, że podano parametr --no-restore. + Do not build the project before packing. Implies --no-restore. + Nie kompiluj projektu przed pakowaniem. Powoduje przyjęcie, że podano parametr --no-restore. diff --git a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.pt-BR.xlf index 5450f87e7..46b75eef4 100644 --- a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.pt-BR.xlf @@ -23,8 +23,8 @@ - Do not build project before packing. Implies --no-restore. - Não compile o projeto antes de empacotar. Implica em --no-restore. + Do not build the project before packing. Implies --no-restore. + Não compile o projeto antes de empacotar. Implica em --no-restore. diff --git a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.ru.xlf index caaa7f7e2..aacddbc93 100644 --- a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.ru.xlf @@ -23,8 +23,8 @@ - Do not build project before packing. Implies --no-restore. - Не собирать проекты перед упаковкой. Подразумевает --no-restore. + Do not build the project before packing. Implies --no-restore. + Не собирать проекты перед упаковкой. Подразумевает --no-restore. diff --git a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.tr.xlf index f44aa5037..dbf1d3e43 100644 --- a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.tr.xlf @@ -23,8 +23,8 @@ - Do not build project before packing. Implies --no-restore. - Paketlemeden önce projeyi derlemeyin. --no-restore anlamına gelir. + Do not build the project before packing. Implies --no-restore. + Paketlemeden önce projeyi derlemeyin. --no-restore anlamına gelir. diff --git a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.zh-Hans.xlf index 00852ea3a..c599593b4 100644 --- a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.zh-Hans.xlf @@ -23,8 +23,8 @@ - Do not build project before packing. Implies --no-restore. - 打包之前不要生成项目。Implies --no-restore. + Do not build the project before packing. Implies --no-restore. + 打包之前不要生成项目。Implies --no-restore. diff --git a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.zh-Hant.xlf index 96d6ab934..129152bbe 100644 --- a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.zh-Hant.xlf @@ -23,8 +23,8 @@ - Do not build project before packing. Implies --no-restore. - 請勿在封裝前建置專案。 這意味著 --沒有還原。 + Do not build the project before packing. Implies --no-restore. + 請勿在封裝前建置專案。 這意味著 --沒有還原。 diff --git a/src/dotnet/commands/dotnet-publish/LocalizableStrings.resx b/src/dotnet/commands/dotnet-publish/LocalizableStrings.resx index 93acbf870..f7c03e9a7 100644 --- a/src/dotnet/commands/dotnet-publish/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-publish/LocalizableStrings.resx @@ -142,6 +142,6 @@ Publish the .NET Core runtime with your application so the runtime doesn't need to be installed on the target machine. Defaults to 'true' if a runtime identifier is specified. - Do not build project before publishing. Implies --no-restore. + Do not build the project before publishing. Implies --no-restore. \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.cs.xlf index f3711ca7d..f4fb78fb1 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.cs.xlf @@ -43,8 +43,8 @@ - Do not build project before publishing. Implies --no-restore. - Do not build project before publishing. Implies --no-restore. + Do not build the project before publishing. Implies --no-restore. + Do not build the project before publishing. Implies --no-restore. diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.de.xlf index d92f9061d..48b7e70ca 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.de.xlf @@ -43,8 +43,8 @@ - Do not build project before publishing. Implies --no-restore. - Do not build project before publishing. Implies --no-restore. + Do not build the project before publishing. Implies --no-restore. + Do not build the project before publishing. Implies --no-restore. diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.es.xlf index 489c71ca5..e0bbd7767 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.es.xlf @@ -43,8 +43,8 @@ - Do not build project before publishing. Implies --no-restore. - Do not build project before publishing. Implies --no-restore. + Do not build the project before publishing. Implies --no-restore. + Do not build the project before publishing. Implies --no-restore. diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.fr.xlf index e7f4eb781..1276f9f72 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.fr.xlf @@ -43,8 +43,8 @@ - Do not build project before publishing. Implies --no-restore. - Do not build project before publishing. Implies --no-restore. + Do not build the project before publishing. Implies --no-restore. + Do not build the project before publishing. Implies --no-restore. diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.it.xlf index d23757a14..fb910869d 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.it.xlf @@ -43,8 +43,8 @@ - Do not build project before publishing. Implies --no-restore. - Do not build project before publishing. Implies --no-restore. + Do not build the project before publishing. Implies --no-restore. + Do not build the project before publishing. Implies --no-restore. diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ja.xlf index de8970210..49c52b0b7 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ja.xlf @@ -43,8 +43,8 @@ - Do not build project before publishing. Implies --no-restore. - Do not build project before publishing. Implies --no-restore. + Do not build the project before publishing. Implies --no-restore. + Do not build the project before publishing. Implies --no-restore. diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ko.xlf index ec06ee9df..258b44d77 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ko.xlf @@ -43,8 +43,8 @@ - Do not build project before publishing. Implies --no-restore. - Do not build project before publishing. Implies --no-restore. + Do not build the project before publishing. Implies --no-restore. + Do not build the project before publishing. Implies --no-restore. diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pl.xlf index 98762f398..4faa98d60 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pl.xlf @@ -43,8 +43,8 @@ - Do not build project before publishing. Implies --no-restore. - Do not build project before publishing. Implies --no-restore. + Do not build the project before publishing. Implies --no-restore. + Do not build the project before publishing. Implies --no-restore. diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pt-BR.xlf index 2bddbbcd2..3dc61ce04 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pt-BR.xlf @@ -43,8 +43,8 @@ - Do not build project before publishing. Implies --no-restore. - Do not build project before publishing. Implies --no-restore. + Do not build the project before publishing. Implies --no-restore. + Do not build the project before publishing. Implies --no-restore. diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ru.xlf index 4cc8643f4..3019f07cb 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ru.xlf @@ -43,8 +43,8 @@ - Do not build project before publishing. Implies --no-restore. - Do not build project before publishing. Implies --no-restore. + Do not build the project before publishing. Implies --no-restore. + Do not build the project before publishing. Implies --no-restore. diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.tr.xlf index 1acb2c224..aa58c8144 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.tr.xlf @@ -43,8 +43,8 @@ - Do not build project before publishing. Implies --no-restore. - Do not build project before publishing. Implies --no-restore. + Do not build the project before publishing. Implies --no-restore. + Do not build the project before publishing. Implies --no-restore. diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hans.xlf index b19817aa7..cc1feec66 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hans.xlf @@ -43,8 +43,8 @@ - Do not build project before publishing. Implies --no-restore. - Do not build project before publishing. Implies --no-restore. + Do not build the project before publishing. Implies --no-restore. + Do not build the project before publishing. Implies --no-restore. diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hant.xlf index db7c8c18b..89c72c534 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hant.xlf @@ -43,8 +43,8 @@ - Do not build project before publishing. Implies --no-restore. - Do not build project before publishing. Implies --no-restore. + Do not build the project before publishing. Implies --no-restore. + Do not build the project before publishing. Implies --no-restore. diff --git a/src/dotnet/commands/dotnet-run/LocalizableStrings.resx b/src/dotnet/commands/dotnet-run/LocalizableStrings.resx index c9676caa0..5e0066b94 100644 --- a/src/dotnet/commands/dotnet-run/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-run/LocalizableStrings.resx @@ -124,7 +124,7 @@ Command used to run .NET apps - Do not build project before running. Implies --no-restore. + Do not build the project before running. Implies --no-restore. Build and run the app using the specified framework. The framework has to be specified in the project file. diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.cs.xlf index 7921611af..d26356a55 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.cs.xlf @@ -33,8 +33,8 @@ - Do not build project before running. Implies --no-restore. - Nesestavujte projekt, dokud ho nespustíte. Implikuje možnost --no-restore. + Do not build the project before running. Implies --no-restore. + Nesestavujte projekt, dokud ho nespustíte. Implikuje možnost --no-restore. diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.de.xlf index 918f86aba..7170829ae 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.de.xlf @@ -33,8 +33,8 @@ - Do not build project before running. Implies --no-restore. - Erstellt das Projekt nicht vor der Ausführung. Impliziert "--no-restore". + Do not build the project before running. Implies --no-restore. + Erstellt das Projekt nicht vor der Ausführung. Impliziert "--no-restore". diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.es.xlf index 06be95c0f..204762c45 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.es.xlf @@ -33,8 +33,8 @@ - Do not build project before running. Implies --no-restore. - No compile el proyecto antes de ejecutarlo. Implica la no restauración. + Do not build the project before running. Implies --no-restore. + No compile el proyecto antes de ejecutarlo. Implica la no restauración. diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.fr.xlf index e5028e467..06699eccc 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.fr.xlf @@ -33,8 +33,8 @@ - Do not build project before running. Implies --no-restore. - Ne pas générer le projet avant l’exécution. Implique --no-restore. + Do not build the project before running. Implies --no-restore. + Ne pas générer le projet avant l’exécution. Implique --no-restore. diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.it.xlf index 27460ddb1..1083013db 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.it.xlf @@ -33,8 +33,8 @@ - Do not build project before running. Implies --no-restore. - Non compila il progetto prima dell'esecuzione. Implica --no-restore. + Do not build the project before running. Implies --no-restore. + Non compila il progetto prima dell'esecuzione. Implica --no-restore. diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ja.xlf index d5e10fb6b..b27a529ca 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ja.xlf @@ -33,8 +33,8 @@ - Do not build project before running. Implies --no-restore. - 実行する前にプロジェクトをビルドしないでください。 暗示 --復元なし。 + Do not build the project before running. Implies --no-restore. + 実行する前にプロジェクトをビルドしないでください。 暗示 --復元なし。 diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ko.xlf index 78399d299..b65a6cd09 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ko.xlf @@ -33,8 +33,8 @@ - Do not build project before running. Implies --no-restore. - 실행하기 전에 프로젝트를 빌드하지 않습니다. 복원 없음을 의미합니다. + Do not build the project before running. Implies --no-restore. + 실행하기 전에 프로젝트를 빌드하지 않습니다. 복원 없음을 의미합니다. diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.pl.xlf index 1fcd0af95..219fdf99e 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.pl.xlf @@ -33,8 +33,8 @@ - Do not build project before running. Implies --no-restore. - Nie kompiluj projektu przed uruchomieniem. Powoduje przyjęcie, że podano parametr --no-restore. + Do not build the project before running. Implies --no-restore. + Nie kompiluj projektu przed uruchomieniem. Powoduje przyjęcie, że podano parametr --no-restore. diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.pt-BR.xlf index f0d20689f..6f13e81c1 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.pt-BR.xlf @@ -33,8 +33,8 @@ - Do not build project before running. Implies --no-restore. - Não compile o projeto antes de executar. Implica em --no-restore. + Do not build the project before running. Implies --no-restore. + Não compile o projeto antes de executar. Implica em --no-restore. diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ru.xlf index 695981188..101711b78 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ru.xlf @@ -33,8 +33,8 @@ - Do not build project before running. Implies --no-restore. - Не собирать проекты перед запуском. Подразумевает --no-restore. + Do not build the project before running. Implies --no-restore. + Не собирать проекты перед запуском. Подразумевает --no-restore. diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.tr.xlf index 13ec9a55a..3ea4dbf33 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.tr.xlf @@ -33,8 +33,8 @@ - Do not build project before running. Implies --no-restore. - Çalıştırmadan önce projeyi derlemeyin. --no-restore anlamına gelir. + Do not build the project before running. Implies --no-restore. + Çalıştırmadan önce projeyi derlemeyin. --no-restore anlamına gelir. diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.zh-Hans.xlf index b7708e348..6ef9e7b53 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.zh-Hans.xlf @@ -33,8 +33,8 @@ - Do not build project before running. Implies --no-restore. - 运行之前不要生成项目。Implies --no-restore. + Do not build the project before running. Implies --no-restore. + 运行之前不要生成项目。Implies --no-restore. diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.zh-Hant.xlf index 2eb38479c..d9c430440 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.zh-Hant.xlf @@ -33,8 +33,8 @@ - Do not build project before running. Implies --no-restore. - 請勿在執行前建置專案。 這意味著 --沒有還原。 + Do not build the project before running. Implies --no-restore. + 請勿在執行前建置專案。 這意味著 --沒有還原。 diff --git a/src/dotnet/commands/dotnet-test/LocalizableStrings.resx b/src/dotnet/commands/dotnet-test/LocalizableStrings.resx index 8d336388a..b2bdfc160 100644 --- a/src/dotnet/commands/dotnet-test/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-test/LocalizableStrings.resx @@ -193,7 +193,7 @@ Logs are written to the provided file. - Do not build project before testing. Implies --no-restore. + Do not build the project before testing. Implies --no-restore. The directory where the test results are going to be placed. The specified directory will be created if it does not exist. diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.cs.xlf index 28ebec810..72686f890 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.cs.xlf @@ -127,8 +127,8 @@ - Do not build project before testing. Implies --no-restore. - Nesestavujte projekt, dokud ho neotestujete. Implikuje možnost --no-restore. + Do not build the project before testing. Implies --no-restore. + Nesestavujte projekt, dokud ho neotestujete. Implikuje možnost --no-restore. diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.de.xlf index 4c5780e86..479c9d7f0 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.de.xlf @@ -127,8 +127,8 @@ - Do not build project before testing. Implies --no-restore. - Erstellt das Projekt nicht vor dem Testen. Impliziert "--no-restore". + Do not build the project before testing. Implies --no-restore. + Erstellt das Projekt nicht vor dem Testen. Impliziert "--no-restore". diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.es.xlf index 0b5356630..e5b18ba75 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.es.xlf @@ -127,8 +127,8 @@ - Do not build project before testing. Implies --no-restore. - No compile el proyecto antes de probarlo. Implica la no restauración. + Do not build the project before testing. Implies --no-restore. + No compile el proyecto antes de probarlo. Implica la no restauración. diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.fr.xlf index 52a8bd6ea..aa2b70adb 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.fr.xlf @@ -127,8 +127,8 @@ - Do not build project before testing. Implies --no-restore. - Ne pas générer le projet avant le test. Implique --no-restore. + Do not build the project before testing. Implies --no-restore. + Ne pas générer le projet avant le test. Implique --no-restore. diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.it.xlf index 9c6459245..58f47377c 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.it.xlf @@ -127,8 +127,8 @@ - Do not build project before testing. Implies --no-restore. - Non compila il progetto prima del test. Implica --no-restore. + Do not build the project before testing. Implies --no-restore. + Non compila il progetto prima del test. Implica --no-restore. diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ja.xlf index c5f65dcd6..64f74ad01 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ja.xlf @@ -127,8 +127,8 @@ - Do not build project before testing. Implies --no-restore. - テストする前にプロジェクトをビルドしないでください。 暗示 --復元なし。 + Do not build the project before testing. Implies --no-restore. + テストする前にプロジェクトをビルドしないでください。 暗示 --復元なし。 diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ko.xlf index a44de0285..f91849b77 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ko.xlf @@ -127,8 +127,8 @@ - Do not build project before testing. Implies --no-restore. - 테스트하기 전에 프로젝트를 빌드하지 않습니다. 복원 없음을 의미합니다. + Do not build the project before testing. Implies --no-restore. + 테스트하기 전에 프로젝트를 빌드하지 않습니다. 복원 없음을 의미합니다. diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pl.xlf index 67654d0c8..d794d6cb7 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pl.xlf @@ -127,8 +127,8 @@ - Do not build project before testing. Implies --no-restore. - Nie kompiluj projektu przed testowaniem. Powoduje przyjęcie, że podano parametr --no-restore. + Do not build the project before testing. Implies --no-restore. + Nie kompiluj projektu przed testowaniem. Powoduje przyjęcie, że podano parametr --no-restore. diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pt-BR.xlf index a233ca607..9b6ef5155 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pt-BR.xlf @@ -127,8 +127,8 @@ - Do not build project before testing. Implies --no-restore. - Não compile o projeto antes de testar. Implica em --no-restore. + Do not build the project before testing. Implies --no-restore. + Não compile o projeto antes de testar. Implica em --no-restore. diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ru.xlf index 374524a7e..2201c0370 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ru.xlf @@ -127,8 +127,8 @@ - Do not build project before testing. Implies --no-restore. - Не собирать проекты перед тестированием. Подразумевает --no-restore. + Do not build the project before testing. Implies --no-restore. + Не собирать проекты перед тестированием. Подразумевает --no-restore. diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.tr.xlf index 5c96ff885..d834291ca 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.tr.xlf @@ -127,8 +127,8 @@ - Do not build project before testing. Implies --no-restore. - Test etmeden önce projeyi derlemeyin. --no-restore anlamına gelir. + Do not build the project before testing. Implies --no-restore. + Test etmeden önce projeyi derlemeyin. --no-restore anlamına gelir. diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hans.xlf index 0e5969c11..72820a496 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hans.xlf @@ -127,8 +127,8 @@ - Do not build project before testing. Implies --no-restore. - 测试之前不要生成项目。Implies --no-restore. + Do not build the project before testing. Implies --no-restore. + 测试之前不要生成项目。Implies --no-restore. diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hant.xlf index 718d08ca1..221f1ac23 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hant.xlf @@ -127,8 +127,8 @@ - Do not build project before testing. Implies --no-restore. - 請勿在測試前建置專案。 這意味著 --沒有還原。 + Do not build the project before testing. Implies --no-restore. + 請勿在測試前建置專案。 這意味著 --沒有還原。 From 60e798598d7ec6ac3c370c1ace14c04a1cde3992 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Thu, 5 Apr 2018 17:58:38 -0700 Subject: [PATCH 3/3] Add test cases per PR feedback --- .../GivenDotnetPublishPublishesProjects.cs | 71 ++++++++++++++----- 1 file changed, 52 insertions(+), 19 deletions(-) diff --git a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs index 3152e0a2c..9b325256f 100644 --- a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs +++ b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs @@ -242,20 +242,65 @@ namespace Microsoft.DotNet.Cli.Publish.Tests var rootPath = TestAssets.CreateTestDirectory().FullName; string newArgs = $"console -o \"{rootPath}\""; - new NewCommandShim() + new NewCommandShim() // note implicit restore here .WithWorkingDirectory(rootPath) .Execute(newArgs) - .Should().Pass(); + .Should() + .Pass(); new PublishCommand() .WithWorkingDirectory(rootPath) .ExecuteWithCapturedOutput("--no-build") - .Should().Fail() - .And.HaveStdOutContaining("MSB3030"); // "Could not copy ___ because it was not found. + .Should() + .Fail() + .And.HaveStdOutContaining("MSB3030"); // "Could not copy ___ because it was not found." + } + + [Theory] + [InlineData(false)] + [InlineData(true)] + public void ItPublishesSuccessfullyWithNoBuildIfPreviouslyBuilt(bool selfContained) + { + var rootPath = TestAssets.CreateTestDirectory(identifier: selfContained ? "_sc" : "").FullName; + var rootDir = new DirectoryInfo(rootPath); + + string newArgs = $"console -o \"{rootPath}\" --no-restore"; + new NewCommandShim() + .WithWorkingDirectory(rootPath) + .Execute(newArgs) + .Should() + .Pass(); + + var rid = selfContained ? DotnetLegacyRuntimeIdentifiers.InferLegacyRestoreRuntimeIdentifier() : ""; + var ridArg = selfContained ? $"-r {rid}" : ""; + + new BuildCommand() + .WithWorkingDirectory(rootPath) + .ExecuteWithCapturedOutput(ridArg) + .Should() + .Pass(); + + new PublishCommand() + .WithWorkingDirectory(rootPath) + .ExecuteWithCapturedOutput($"{ridArg} --no-build") + .Should() + .Pass(); + + var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug"; + + var outputProgram = rootDir + .GetDirectory("bin", configuration, "netcoreapp2.1", rid, "publish", $"{rootDir.Name}.dll") + .FullName; + + new TestCommand(outputProgram) + .ExecuteWithCapturedOutput() + .Should() + .Pass() + .And.HaveStdOutContaining("Hello World"); } [Fact] - public void ItPublishesSuccessfullyWithNoBuildIfPreviouslyBuilt() + public void ItFailsToPublishWithNoBuildIfPreviouslyBuiltWithoutRid() { var rootPath = TestAssets.CreateTestDirectory().FullName; var rootDir = new DirectoryInfo(rootPath); @@ -275,21 +320,9 @@ namespace Microsoft.DotNet.Cli.Publish.Tests new PublishCommand() .WithWorkingDirectory(rootPath) - .ExecuteWithCapturedOutput("--no-build") + .ExecuteWithCapturedOutput("-r win-x64 --no-build") .Should() - .Pass(); - - var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug"; - - var outputProgram = rootDir - .GetDirectory("bin", configuration, "netcoreapp2.1", "publish", $"{rootDir.Name}.dll") - .FullName; - - new TestCommand(outputProgram) - .ExecuteWithCapturedOutput() - .Should() - .Pass() - .And.HaveStdOutContaining("Hello World"); + .Fail(); } } }