From bedf79f444289f3caabb836055e1faa7d28c596b Mon Sep 17 00:00:00 2001 From: Mayank Bansal Date: Thu, 22 Mar 2018 14:25:38 +0530 Subject: [PATCH 001/118] [WIP]TestPlatform 15.7 preview 3 insertion --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 745bdee58..58b55035b 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -40,7 +40,7 @@ $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) - 15.7.0-preview-20180221-13 + 15.7.0-preview-20180320-02 $(MicrosoftNETTestSdkPackageVersion) $(MicrosoftNETTestSdkPackageVersion) 0.2.0-beta-000042 From c4cae059a957b4cfe71b724fa3233f72f7d080e6 Mon Sep 17 00:00:00 2001 From: Andy Gerlicher Date: Tue, 20 Mar 2018 15:17:40 -0700 Subject: [PATCH 002/118] MSBuild 15.7.108 * Add feed to msbuild myget * Update MSBuild to 15.7.108 (contains both netcoreapp2.0 and netcoreapp2.1) --- build/DependencyVersions.props | 2 +- build/NugetConfigFile.targets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 745bdee58..20f0187ca 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -3,7 +3,7 @@ 2.0.6 $(MicrosoftNETCoreAppPackageVersion) - 15.6.82 + 15.7.0-preview-000108 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets index 10d4f8b23..a272ecb86 100644 --- a/build/NugetConfigFile.targets +++ b/build/NugetConfigFile.targets @@ -32,7 +32,7 @@ - + ]]> From 8d7009cb83069fbe0310edcb9aa19440a4934fb8 Mon Sep 17 00:00:00 2001 From: Jeff Kluge Date: Tue, 27 Feb 2018 13:59:59 -0800 Subject: [PATCH 003/118] Move some projects to netstandard2.0 (#8692) * Move some projects to netstandard2.0 * Use version agnostic $(TargetFrameworkIdentifier) property to make changing versions easier since we only care about .NET Framework vs .NET Standard * Add missing project to solution file * Update TestPackageProjects.targets to use netstandard2.0 on non-Windows --- build/test/TestPackageProjects.targets | 2 +- .../Microsoft.DotNet.Cli.Sln.Internal.csproj | 4 ++-- .../Microsoft.DotNet.Cli.Utils.csproj | 9 +++++---- .../Microsoft.DotNet.Configurer.csproj | 2 +- .../Microsoft.DotNet.InternalAbstractions.csproj | 2 +- .../Interop.NETStandard.cs | 6 +++--- .../MSBuildSdkResolver.cs | 2 +- .../Microsoft.DotNet.MSBuildSdkResolver.csproj | 15 ++++++++++----- .../Microsoft.DotNet.TestFramework.csproj | 3 ++- src/dotnet/dotnet.csproj | 2 +- .../Microsoft.DotNet.Cli.Msi.Tests.csproj | 2 +- ...crosoft.DotNet.MSBuildSdkResolver.Tests.csproj | 2 +- .../Microsoft.DotNet.Tools.Tests.Utilities.csproj | 4 ++-- 13 files changed, 31 insertions(+), 24 deletions(-) diff --git a/build/test/TestPackageProjects.targets b/build/test/TestPackageProjects.targets index fea46690c..bb280358a 100644 --- a/build/test/TestPackageProjects.targets +++ b/build/test/TestPackageProjects.targets @@ -39,7 +39,7 @@ $(CliVersionPrefix) $(VersionSuffix) False - /p:TargetFramework=netstandard1.5 + /p:TargetFramework=netstandard2.0 Microsoft.DotNet.InternalAbstractions diff --git a/src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj b/src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj index 518040d30..b75274e65 100644 --- a/src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj +++ b/src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj @@ -4,7 +4,7 @@ SLN file reader/writer $(CliVersionPrefix) - netstandard1.6 + netstandard2.0 portable Microsoft.DotNet.Cli.Sln.Internal ../../tools/Key.snk @@ -23,7 +23,7 @@ - + diff --git a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj index bcf9bd712..a998d6c36 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj +++ b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj @@ -3,8 +3,8 @@ $(SdkVersion) - netstandard1.5;net46 - netstandard1.5 + netstandard2.0;net46 + netstandard2.0 true ../../tools/Key.snk true @@ -28,11 +28,12 @@ - + + - + diff --git a/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj b/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj index 0b4daa29e..3a96ee0b0 100644 --- a/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj +++ b/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj @@ -3,7 +3,7 @@ $(CliVersionPrefix) - netstandard1.5 + netstandard2.0 true ../../tools/Key.snk true diff --git a/src/Microsoft.DotNet.InternalAbstractions/Microsoft.DotNet.InternalAbstractions.csproj b/src/Microsoft.DotNet.InternalAbstractions/Microsoft.DotNet.InternalAbstractions.csproj index a5c6d9d6a..a00fdccf2 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/Microsoft.DotNet.InternalAbstractions.csproj +++ b/src/Microsoft.DotNet.InternalAbstractions/Microsoft.DotNet.InternalAbstractions.csproj @@ -18,7 +18,7 @@ - + diff --git a/src/Microsoft.DotNet.MSBuildSdkResolver/Interop.NETStandard.cs b/src/Microsoft.DotNet.MSBuildSdkResolver/Interop.NETStandard.cs index 74abc2a61..5ea10eaad 100644 --- a/src/Microsoft.DotNet.MSBuildSdkResolver/Interop.NETStandard.cs +++ b/src/Microsoft.DotNet.MSBuildSdkResolver/Interop.NETStandard.cs @@ -4,8 +4,8 @@ // NOTE: Currently, only the NET46 build ships (with Visual Studio/desktop msbuild), // but the netstandard1.5 adaptation here acts a proof-of-concept for cross-platform // portability of the underlying hostfxr API and gives us build and test coverage -// on non-Windows machines. -#if NETSTANDARD1_5 +// on non-Windows machines. It also ships with msbuild on Mono. +#if NETSTANDARD2_0 using System; using System.Runtime.InteropServices; @@ -50,4 +50,4 @@ namespace Microsoft.DotNet.MSBuildSdkResolver } } -#endif // NETSTANDARD1_5 \ No newline at end of file +#endif // NETSTANDARD2_0 diff --git a/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs b/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs index 08a552479..a115a867b 100644 --- a/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs +++ b/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs @@ -176,7 +176,7 @@ namespace Microsoft.DotNet.MSBuildSdkResolver var environmentProvider = new EnvironmentProvider(_getEnvironmentVariable); var dotnetExe = environmentProvider.GetCommandPath("dotnet"); -#if NETSTANDARD1_5 +#if NETSTANDARD2_0 if (dotnetExe != null && !Interop.RunningOnWindows) { // e.g. on Linux the 'dotnet' command from PATH is a symlink so we need to diff --git a/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj b/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj index f804fa356..f7f7ced6b 100644 --- a/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj +++ b/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj @@ -3,8 +3,8 @@ $(SdkVersion) - netstandard1.5;net46 - netstandard1.5 + netstandard2.0;net46 + netstandard2.0 AnyCPU win-x86;win-x64 true @@ -20,11 +20,16 @@ - - + + - + + + + + + x86/hostfxr.dll diff --git a/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj b/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj index 4e9b4a96f..d672d5a52 100644 --- a/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj +++ b/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj @@ -4,10 +4,11 @@ Microsoft.DotNet.TestFramework Class Library $(CliVersionPrefix) - netstandard1.5 + netstandard2.0 ../../tools/Key.snk true true + 2.0.0 diff --git a/src/dotnet/dotnet.csproj b/src/dotnet/dotnet.csproj index 928a17ccb..54d458a52 100644 --- a/src/dotnet/dotnet.csproj +++ b/src/dotnet/dotnet.csproj @@ -50,7 +50,7 @@ - + diff --git a/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/Microsoft.DotNet.Cli.Msi.Tests.csproj b/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/Microsoft.DotNet.Cli.Msi.Tests.csproj index e576ed679..ad3219ebe 100644 --- a/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/Microsoft.DotNet.Cli.Msi.Tests.csproj +++ b/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/Microsoft.DotNet.Cli.Msi.Tests.csproj @@ -22,7 +22,7 @@ - + diff --git a/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj b/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj index b009123c0..f421d831f 100644 --- a/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj +++ b/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj @@ -29,7 +29,7 @@ - + diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj index 2ac3bfe37..b8a0ed9a2 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj @@ -3,13 +3,13 @@ Microsoft.DotNet.Tools.Tests.Utilities Class Library - netstandard1.5 + netstandard2.0 Microsoft.DotNet.Tools.Tests.Utilities ../../tools/Key.snk true true $(AssetTargetFallback);dotnet5.4;portable-net451+win8 - 1.6.0 + 2.0.0 From 39f08229a34835d4fc37683c6976fe198f70170e Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Thu, 22 Mar 2018 19:53:52 -0700 Subject: [PATCH 004/118] Updating InteropServices.Runtime to 4.3.0 in CLI utils and adding an explicit reference to netstandard 2.0 to TestFramework. --- .../Microsoft.DotNet.Cli.Utils.csproj | 4 ++-- .../Microsoft.DotNet.TestFramework.csproj | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj index a998d6c36..68fdb256d 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj +++ b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj @@ -24,9 +24,9 @@ - + - + diff --git a/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj b/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj index d672d5a52..c312f7163 100644 --- a/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj +++ b/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj @@ -8,11 +8,14 @@ ../../tools/Key.snk true true - 2.0.0 + + + + \ No newline at end of file From fdac4bcbb964195f18e29aa3bb3672ac8976214a Mon Sep 17 00:00:00 2001 From: Livar Date: Fri, 23 Mar 2018 12:16:12 -0700 Subject: [PATCH 005/118] Update Roslyn to 2.8.0-beta3-62722-05 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 58b55035b..9219379e0 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -9,7 +9,7 @@ $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) 10.1.4-rtm-180213-0 - 2.8.0-beta2-62713-11 + 2.8.0-beta3-62722-05 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) 2.1.200-preview-62717-01 From 0d22280e0833c0d29452a9512798ed988e2161f0 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Fri, 23 Mar 2018 12:25:16 -0700 Subject: [PATCH 006/118] Update msbuild to 15.7.0-preview-000122 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 20f0187ca..5bc3bbdf3 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -3,7 +3,7 @@ 2.0.6 $(MicrosoftNETCoreAppPackageVersion) - 15.7.0-preview-000108 + 15.7.0-preview-000122 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From e49fab71439b02dc2d937887e37697554558effe Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Fri, 23 Mar 2018 14:17:25 -0700 Subject: [PATCH 007/118] Insert NuGet Build 4.7.0-preview3.5039 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 58b55035b..91a591c15 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -31,7 +31,7 @@ 1.2.1-alpha-002133 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 1.6.0-beta2-25304 - 4.7.0-preview1.4982 + 4.7.0-preview3.5039 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 5e6765093af225294d1ea5a076ee33b2b63aa0ae Mon Sep 17 00:00:00 2001 From: Andy Gerlicher Date: Sat, 24 Mar 2018 21:19:34 -0700 Subject: [PATCH 008/118] MSBuild 15.7.124-preview --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 5bc3bbdf3..f8a0fa728 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -3,7 +3,7 @@ 2.0.6 $(MicrosoftNETCoreAppPackageVersion) - 15.7.0-preview-000122 + 15.7.0-preview-000124 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From 29ac66f7d2647b820dfc36bbbc30b6951220c39e Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Sat, 24 Mar 2018 11:59:36 -0500 Subject: [PATCH 009/118] Keep stdout for test execution Work around https://github.com/Microsoft/vstest/issues/1503 by using the MSBuild escape hatch variable MSBUILDENSURESTDOUTFORTASKPROCESSES and ensuring that tests don't run in a disconnected MSBuild process by passing /nr:false. --- src/dotnet/commands/dotnet-test/Program.cs | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/dotnet/commands/dotnet-test/Program.cs b/src/dotnet/commands/dotnet-test/Program.cs index d714d2f9e..8e837ae4c 100644 --- a/src/dotnet/commands/dotnet-test/Program.cs +++ b/src/dotnet/commands/dotnet-test/Program.cs @@ -32,6 +32,7 @@ namespace Microsoft.DotNet.Tools.Test { "/t:VSTest", "/v:quiet", + "/nodereuse:false", // workaround for https://github.com/Microsoft/vstest/issues/1503 "/nologo" }; @@ -95,7 +96,23 @@ namespace Microsoft.DotNet.Tools.Test return e.ExitCode; } - return cmd.Execute(); + // Workaround for https://github.com/Microsoft/vstest/issues/1503 + const string NodeWindowEnvironmentName = "MSBUILDENSURESTDOUTFORTASKPROCESSES"; + string previousNodeWindowSetting = Environment.GetEnvironmentVariable(NodeWindowEnvironmentName); + + int result = -1; + + try + { + Environment.SetEnvironmentVariable(NodeWindowEnvironmentName, "1"); + result = cmd.Execute(); + } + finally + { + Environment.SetEnvironmentVariable(NodeWindowEnvironmentName, previousNodeWindowSetting); + } + + return result; } private static string GetSemiColonEscapedString(string arg) From 00c7557960afffc3611bd7e81f1e91111ab2c186 Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Fri, 23 Mar 2018 14:17:25 -0700 Subject: [PATCH 010/118] Insert NuGet Build 4.7.0-preview3.5039 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index f8a0fa728..da6b79f28 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -31,7 +31,7 @@ 1.2.1-alpha-002133 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 1.6.0-beta2-25304 - 4.7.0-preview1.4982 + 4.7.0-preview3.5039 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 3e0cee922dd52b1c5c23fe27d2e010e3ebbb719c Mon Sep 17 00:00:00 2001 From: Livar Date: Mon, 26 Mar 2018 09:34:40 -0700 Subject: [PATCH 011/118] Update SDK to 2.1.200-preview-62726-02 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index dd1a7f499..45b3a1142 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ 2.8.0-beta3-62722-05 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.200-preview-62717-01 + 2.1.200-preview-62726-02 $(MicrosoftNETSdkPackageVersion) 2.0.0-rel-20180221-676 $(MicrosoftNETSdkWebPackageVersion) From b783795dc94f4807f21286720dcd589d410fe8d2 Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Mon, 26 Mar 2018 14:37:55 -0700 Subject: [PATCH 012/118] Update test SDK for 2.0 templates in the 15.7 SDK --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 45b3a1142..a56c0da1b 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -19,7 +19,7 @@ $(MicrosoftNETSdkWebPackageVersion) 1.0.0-beta3-20171117-314 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 1.0.1-beta3-20180227-1423805 + 1.0.1-beta3-20180326-1520591 1.0.0-beta3-20171117-314 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) From 6600612b9e3734c0143c8eb05761707728d26d93 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Tue, 27 Mar 2018 10:24:10 -0700 Subject: [PATCH 013/118] Adding new docker files for opensuse.42.3, ubuntu.18.04 and fedora.27 and removing the project.json CLI from the build. It was not being used anymore. --- build/DependencyVersions.props | 2 +- build/NugetConfigFile.targets | 1 + run-build.sh | 8 - scripts/docker/fedora.27/Dockerfile | 32 +++ scripts/docker/opensuse.42.3/Dockerfile | 49 +++++ scripts/docker/ubuntu.18.04/Dockerfile | 29 +++ .../TestAssets.cs | 34 +--- .../GivenAProjectToolsCommandResolver.cs | 2 +- .../Commands/BuildPJCommand.cs | 183 ------------------ .../Commands/RestoreProjectJsonCommand.cs | 28 --- .../ProjectUtils.cs | 27 --- .../RepoDirectoriesProvider.cs | 6 +- .../TestBase.cs | 3 +- 13 files changed, 116 insertions(+), 288 deletions(-) create mode 100644 scripts/docker/fedora.27/Dockerfile create mode 100644 scripts/docker/opensuse.42.3/Dockerfile create mode 100644 scripts/docker/ubuntu.18.04/Dockerfile delete mode 100644 test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/BuildPJCommand.cs delete mode 100644 test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/RestoreProjectJsonCommand.cs delete mode 100644 test/Microsoft.DotNet.Tools.Tests.Utilities/ProjectUtils.cs diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 3c401e883..2217fae22 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.0.6 + 2.0.7-servicing-26322-01 $(MicrosoftNETCoreAppPackageVersion) 15.6.82 $(MicrosoftBuildPackageVersion) diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets index 1155c016a..e0737ca5a 100644 --- a/build/NugetConfigFile.targets +++ b/build/NugetConfigFile.targets @@ -19,6 +19,7 @@ + diff --git a/run-build.sh b/run-build.sh index 597268b25..9d50c827f 100755 --- a/run-build.sh +++ b/run-build.sh @@ -163,14 +163,6 @@ if [ $EXIT_CODE != 0 ]; then exit $EXIT_CODE fi -# Install a project.json based CLI for use by tests -(set -x ; "$REPOROOT/scripts/obtain/dotnet-install.sh" --channel "master" --install-dir "$DOTNET_INSTALL_DIR_PJ" --architecture "$ARCHITECTURE" --version "1.0.0-preview2-1-003177") -EXIT_CODE=$? -if [ $EXIT_CODE != 0 ]; then - echo "run-build: Error: installing project-json based cli failed with exit code $EXIT_CODE." >&2 - exit $EXIT_CODE -fi - # Put stage 0 on the PATH (for this shell only) PATH="$DOTNET_INSTALL_DIR:$PATH" diff --git a/scripts/docker/fedora.27/Dockerfile b/scripts/docker/fedora.27/Dockerfile new file mode 100644 index 000000000..e0f6e851d --- /dev/null +++ b/scripts/docker/fedora.27/Dockerfile @@ -0,0 +1,32 @@ +# +# 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. +# + +# Dockerfile that creates a container suitable to build dotnet-cli +FROM microsoft/dotnet-buildtools-prereqs:fedora-27-82a3800-20180326211504 + +RUN dnf install -y findutils + +RUN dnf upgrade -y nss + +RUN dnf clean all + +# Set a different rid to publish buildtools for, until we update to a version which +# natively supports fedora.24-x64 +ENV __PUBLISH_RID=fedora.23-x64 + +# Setup User to match Host User, and give superuser permissions +ARG USER_ID=0 +RUN useradd -m code_executor -u ${USER_ID} -g wheel +RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers + +# With the User Change, we need to change permissions on these directories +RUN chmod -R a+rwx /usr/local +RUN chmod -R a+rwx /home + +# Set user to the one we just created +USER ${USER_ID} + +# Set working directory +WORKDIR /opt/code \ No newline at end of file diff --git a/scripts/docker/opensuse.42.3/Dockerfile b/scripts/docker/opensuse.42.3/Dockerfile new file mode 100644 index 000000000..b128f8bc9 --- /dev/null +++ b/scripts/docker/opensuse.42.3/Dockerfile @@ -0,0 +1,49 @@ +# +# 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. +# + +FROM microsoft/dotnet-buildtools-prereqs:opensuse-42.3-d46ee12-20180327014902 + +# Install the base toolchain we need to build anything (clang, cmake, make and the like) +# this does not include libraries that we need to compile different projects, we'd like +# them in a different layer. +RUN zypper -n install binutils \ + cmake \ + which \ + gcc \ + llvm-clang \ + tar \ + ncurses-utils \ + curl \ + git \ + sudo && \ + zypper clean -a + +# Dependencies of CoreCLR and CoreFX. + +RUN zypper -n install --force-resolution \ + libunwind \ + libicu \ + lttng-ust \ + libuuid1 \ + libopenssl1_0_0 \ + libcurl4 \ + krb5 && \ + zypper clean -a + +# Setup User to match Host User, and give superuser permissions +ARG USER_ID=0 +RUN useradd -m code_executor -u ${USER_ID} -g wheel +RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers + +# With the User Change, we need to change permissions on these directories +RUN chmod -R a+rwx /usr/local +RUN chmod -R a+rwx /home +RUN chmod -R 755 /usr/lib/sudo + +# Set user to the one we just created +USER ${USER_ID} + +# Set working directory +WORKDIR /opt/code \ No newline at end of file diff --git a/scripts/docker/ubuntu.18.04/Dockerfile b/scripts/docker/ubuntu.18.04/Dockerfile new file mode 100644 index 000000000..97d0578c7 --- /dev/null +++ b/scripts/docker/ubuntu.18.04/Dockerfile @@ -0,0 +1,29 @@ +# +# 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. +# + +# Dockerfile that creates a container suitable to build dotnet-cli +FROM microsoft/dotnet-buildtools-prereqs:ubuntu-18.04-f90bc20-20180320154721 + +RUN apt-get update && \ + apt-get -qqy install \ + sudo && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* + +# Setup User to match Host User, and give superuser permissions +ARG USER_ID=0 +RUN useradd -m code_executor -u ${USER_ID} -g sudo +RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers + +# With the User Change, we need to change permissions on these directories +RUN chmod -R a+rwx /usr/local +RUN chmod -R a+rwx /home +RUN chmod -R 755 /usr/lib/sudo + +# Set user to the one we just created +USER ${USER_ID} + +# Set working directory +WORKDIR /opt/code \ No newline at end of file diff --git a/src/Microsoft.DotNet.TestFramework/TestAssets.cs b/src/Microsoft.DotNet.TestFramework/TestAssets.cs index 0e47e3ba9..ca4162fe0 100644 --- a/src/Microsoft.DotNet.TestFramework/TestAssets.cs +++ b/src/Microsoft.DotNet.TestFramework/TestAssets.cs @@ -17,13 +17,9 @@ namespace Microsoft.DotNet.TestFramework private FileInfo _dotnetCsprojExe; - private FileInfo _dotnetProjectJsonExe; - - private const string ProjectJsonSearchPattern = "project.json"; - private const string CsprojSearchPattern = "*.csproj"; - public TestAssets(DirectoryInfo assetsRoot, FileInfo dotnetCsprojExe, FileInfo dotnetProjectJsonExe) + public TestAssets(DirectoryInfo assetsRoot, FileInfo dotnetCsprojExe) { if (assetsRoot == null) { @@ -35,11 +31,6 @@ namespace Microsoft.DotNet.TestFramework throw new ArgumentNullException(nameof(dotnetCsprojExe)); } - if (dotnetProjectJsonExe == null) - { - throw new ArgumentNullException(nameof(dotnetProjectJsonExe)); - } - if (!assetsRoot.Exists) { throw new DirectoryNotFoundException($"Directory not found at '{assetsRoot}'"); @@ -50,16 +41,9 @@ namespace Microsoft.DotNet.TestFramework throw new FileNotFoundException("Csproj dotnet executable must exist", dotnetCsprojExe.FullName); } - if (!dotnetProjectJsonExe.Exists) - { - throw new FileNotFoundException("project.json dotnet executable must exist", dotnetProjectJsonExe.FullName); - } - _root = assetsRoot; _dotnetCsprojExe = dotnetCsprojExe; - - _dotnetProjectJsonExe = dotnetProjectJsonExe; } public TestAssetInfo Get(string name) @@ -78,22 +62,6 @@ namespace Microsoft.DotNet.TestFramework CsprojSearchPattern); } - public TestAssetInfo GetProjectJson(string name) - { - return GetProjectJson(TestAssetKinds.TestProjects, name); - } - - public TestAssetInfo GetProjectJson(string kind, string name) - { - var assetDirectory = new DirectoryInfo(Path.Combine(_root.FullName, kind, name)); - - return new TestAssetInfo( - assetDirectory, - name, - _dotnetProjectJsonExe, - ProjectJsonSearchPattern); - } - public DirectoryInfo CreateTestDirectory(string testProjectName = "temp", [CallerMemberName] string callingMethod = "", string identifier = "") { var testDestination = GetTestDestinationDirectoryPath(testProjectName, callingMethod, identifier); diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs index 4333b887c..fc38daf17 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs @@ -303,7 +303,7 @@ namespace Microsoft.DotNet.Tests result.Should().NotBeNull(); - result.Args.Should().Contain("--fx-version 2.0.6"); + result.Args.Should().Contain("--fx-version 2.0.7-servicing-26322-01"); } [Fact] diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/BuildPJCommand.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/BuildPJCommand.cs deleted file mode 100644 index 6b05edfe8..000000000 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/BuildPJCommand.cs +++ /dev/null @@ -1,183 +0,0 @@ -// 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.IO; -using Microsoft.DotNet.Cli.Utils; -using NuGet.Frameworks; - -namespace Microsoft.DotNet.Tools.Test.Utilities -{ - public sealed class BuildPJCommand : TestCommand - { - - private bool _captureOutput; - - private string _configuration; - - private NuGetFramework _framework; - - private string _runtime; - - private bool _noDependencies; - - private DirectoryInfo _outputPath; - - private FileInfo _projectFile; - - private DirectoryInfo _workingDirectory; - - public BuildPJCommand() - : base(new RepoDirectoriesProvider().PjDotnet) - { - } - - public override CommandResult Execute(string args = "") - { - args = $"build {GetNoDependencies()} {GetProjectFile()} {GetOutputPath()} {GetConfiguration()} {GetFramework()} {GetRuntime()} {args}"; - - if (_workingDirectory != null) - { - this.WithWorkingDirectory(_workingDirectory.FullName); - } - - if (_captureOutput) - { - return base.ExecuteWithCapturedOutput(args); - } - else - { - return base.Execute(args); - } - } - - public override CommandResult ExecuteWithCapturedOutput(string args = "") - { - WithCapturedOutput(); - - return Execute(args); - } - - public BuildPJCommand WithCapturedOutput() - { - _captureOutput = true; - - return this; - } - - public BuildPJCommand WithConfiguration(string configuration) - { - _configuration = configuration; - - return this; - } - - public BuildPJCommand WithFramework(NuGetFramework framework) - { - _framework = framework; - - return this; - } - - public BuildPJCommand WithRuntime(string runtime) - { - _runtime = runtime; - - return this; - } - - public BuildPJCommand WithNoDependencies() - { - _noDependencies = true; - - return this; - } - - public BuildPJCommand WithOutputPath(DirectoryInfo outputPath) - { - _outputPath = outputPath; - - return this; - } - - public BuildPJCommand WithProjectDirectory(DirectoryInfo projectDirectory) - { - _workingDirectory = projectDirectory; - - return this; - } - - public BuildPJCommand WithProjectFile(FileInfo projectFile) - { - _projectFile = projectFile; - - return this; - } - - public BuildPJCommand WithWorkingDirectory(DirectoryInfo workingDirectory) - { - _workingDirectory = workingDirectory; - - return this; - } - - private string GetConfiguration() - { - if (_configuration == null) - { - return null; - } - - return $"--configuration {_configuration}"; - } - - private string GetFramework() - { - if (_framework == null) - { - return null; - } - - return $"--framework {_framework.GetShortFolderName()}"; - } - - private string GetRuntime() - { - if (_runtime == null) - { - return null; - } - - return $"--runtime {_runtime}"; - } - - private string GetNoDependencies() - { - if (!_noDependencies) - { - return null; - } - - return "--no-dependencies"; - } - - private string GetOutputPath() - { - if (_outputPath == null) - { - return null; - } - - return $"\"{_outputPath.FullName}\""; - } - - private string GetProjectFile() - { - if (_projectFile == null) - { - return null; - } - - return $"\"{_projectFile.FullName}\""; - } - } -} diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/RestoreProjectJsonCommand.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/RestoreProjectJsonCommand.cs deleted file mode 100644 index a54d89605..000000000 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/RestoreProjectJsonCommand.cs +++ /dev/null @@ -1,28 +0,0 @@ -// 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 Microsoft.DotNet.Cli.Utils; - -namespace Microsoft.DotNet.Tools.Test.Utilities -{ - public sealed class RestoreProjectJsonCommand : TestCommand - { - public RestoreProjectJsonCommand() - : base(new RepoDirectoriesProvider().PjDotnet) - { - } - - public override CommandResult Execute(string args="") - { - args = $"restore {args}"; - - return base.Execute(args); - } - - public override CommandResult ExecuteWithCapturedOutput(string args = "") - { - args = $"restore {args}"; - return base.ExecuteWithCapturedOutput(args); - } - } -} diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/ProjectUtils.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/ProjectUtils.cs deleted file mode 100644 index 3b812ed28..000000000 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/ProjectUtils.cs +++ /dev/null @@ -1,27 +0,0 @@ -// 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; -using System.IO; -using System.Linq; - -namespace Microsoft.DotNet.Tools.Test.Utilities -{ - public class ProjectUtils - { - public static string GetProjectJson(string testRoot, string project) - { - // We assume that the project name same as the directory name with contains the project.json - // We can do better here by using ProjectReader to get the correct project name - string projectPath = Directory.GetFiles(testRoot, "project.json", SearchOption.AllDirectories) - .FirstOrDefault(pj => Directory.GetParent(pj).Name.Equals(project)); - - if (string.IsNullOrEmpty(projectPath)) - { - throw new Exception($"Cannot file project '{project}' in '{testRoot}'"); - } - - return projectPath; - } - } -} diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs index 2f5e1e830..e86f76bac 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs @@ -20,7 +20,6 @@ namespace Microsoft.DotNet.Tools.Test.Utilities private string _stage2Sdk; private string _stage2WithBackwardsCompatibleRuntimesDirectory; private string _testPackages; - private string _pjDotnet; public static string RepoRoot { @@ -81,7 +80,6 @@ namespace Microsoft.DotNet.Tools.Test.Utilities public string Artifacts => _artifacts; public string BuiltDotnet => _builtDotnet; public string NugetPackages => _nugetPackages; - public string PjDotnet => _pjDotnet; public string Stage2Sdk => _stage2Sdk; public string Stage2WithBackwardsCompatibleRuntimesDirectory => _stage2WithBackwardsCompatibleRuntimesDirectory; public string TestPackages => _testPackages; @@ -91,13 +89,11 @@ namespace Microsoft.DotNet.Tools.Test.Utilities string builtDotnet = null, string nugetPackages = null, string corehostPackages = null, - string corehostDummyPackages = null, - string pjDotnet = null) + string corehostDummyPackages = null) { _artifacts = artifacts ?? Path.Combine(RepoRoot, "artifacts", BuildRid); _builtDotnet = builtDotnet ?? Path.Combine(_artifacts, "intermediate", "sharedFrameworkPublish"); _nugetPackages = nugetPackages ?? Path.Combine(RepoRoot, ".nuget", "packages"); - _pjDotnet = pjDotnet ?? GetPjDotnetPath(); _stage2Sdk = Directory .EnumerateDirectories(Path.Combine(_artifacts, "stage2", "sdk")) .First(d => !d.Contains("NuGetFallbackFolder")); diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/TestBase.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/TestBase.cs index b377b4331..974686b92 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/TestBase.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/TestBase.cs @@ -52,8 +52,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities s_testAssets = new TestAssets( new DirectoryInfo(assetsRoot), - new FileInfo(new Muxer().MuxerPath), - new FileInfo(new RepoDirectoriesProvider().PjDotnet)); + new FileInfo(new Muxer().MuxerPath)); } return s_testAssets; From 094a7b2375454f70c4f1247d973720ac5c705c16 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Tue, 27 Mar 2018 16:14:03 -0700 Subject: [PATCH 014/118] Adding Fedora 27, OpenSuse 43.2 and Ubuntu 18.04 to the groovy file to enable these legs in CI. --- netci.groovy | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/netci.groovy b/netci.groovy index ca09235d7..f2cf6a834 100644 --- a/netci.groovy +++ b/netci.groovy @@ -9,7 +9,7 @@ def project = GithubProject def branch = GithubBranchName def isPR = true -def platformList = ['Linux:x64:Release', 'Debian8.2:x64:Debug', 'Ubuntu:x64:Release', 'Ubuntu16.04:x64:Debug', 'OSX10.12:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'RHEL7.2:x64:Release', 'CentOS7.1:x64:Debug'] +def platformList = ['Linux:x64:Release', 'Debian8.2:x64:Debug', 'Ubuntu:x64:Release', 'Ubuntu16.04:x64:Debug', 'OSX10.12:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'RHEL7.2:x64:Release', 'CentOS7.1:x64:Debug', 'ubuntu.18.04:x64:Debug', 'fedora.27:x64:Debug', 'opensuse.43.2:x64:Debug'] def static getBuildJobName(def configuration, def os, def architecture) { return configuration.toLowerCase() + '_' + os.toLowerCase() + '_' + architecture.toLowerCase() @@ -20,6 +20,7 @@ platformList.each { platform -> // Calculate names def (os, architecture, configuration) = platform.tokenize(':') def osUsedForMachineAffinity = os; + def osVersionUsedForMachineAffinity = 'latest-or-auto'; // Calculate job name def jobName = getBuildJobName(configuration, os, architecture) @@ -39,6 +40,11 @@ platformList.each { platform -> osUsedForMachineAffinity = 'Ubuntu16.04'; buildCommand = "./build.sh --linux-portable --skip-prereqs --configuration ${configuration} --targets Default" } + else if (os == 'ubuntu.18.04' || os == 'fedora.27' || os == 'opensuse.43.2') { + osUsedForMachineAffinity = 'Ubuntu16.04' + osVersionUsedForMachineAffinity = 'latest-docker' + buildCommand = "./build.sh --linux-portable --skip-prereqs --configuration ${configuration} --docker ${os} --targets Default" + } else { // Jenkins non-Ubuntu CI machines don't have docker buildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --targets Default" @@ -58,7 +64,7 @@ platformList.each { platform -> } } - Utilities.setMachineAffinity(newJob, osUsedForMachineAffinity, 'latest-or-auto') + Utilities.setMachineAffinity(newJob, osUsedForMachineAffinity, osVersionUsedForMachineAffinity) Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}") Utilities.addMSTestResults(newJob, '**/*.trx') Utilities.addGithubPRTriggerForBranch(newJob, branch, "${os} ${architecture} ${configuration} Build") From 56a01638e16d19336068254826057d6d42f85b76 Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Tue, 27 Mar 2018 18:29:31 -0500 Subject: [PATCH 015/118] MSBuild 15.7.127.34537 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index a56c0da1b..a216fe303 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -3,7 +3,7 @@ 2.0.6 $(MicrosoftNETCoreAppPackageVersion) - 15.7.0-preview-000124 + 15.7.0-preview-000127 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From b250271ac18ec265e2d3030ef9bf1d8d0c64b3eb Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Tue, 27 Mar 2018 16:38:29 -0700 Subject: [PATCH 016/118] Removing the dependency on the project.json CLI from the windows build scripts as well. --- run-build.ps1 | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/run-build.ps1 b/run-build.ps1 index 366267f3e..150a6ba72 100644 --- a/run-build.ps1 +++ b/run-build.ps1 @@ -53,20 +53,6 @@ if (!(Test-Path $env:DOTNET_INSTALL_DIR)) mkdir $env:DOTNET_INSTALL_DIR | Out-Null } -# We also need to pull down a project.json based CLI that is used by some tests -# so create another directory for that. -if (!$env:DOTNET_INSTALL_DIR_PJ) -{ - $env:DOTNET_INSTALL_DIR_PJ="$RepoRoot\.dotnet_stage0PJ\$Architecture" -} - -if (!(Test-Path $env:DOTNET_INSTALL_DIR_PJ)) -{ - mkdir $env:DOTNET_INSTALL_DIR_PJ | Out-Null -} - - - # Disable first run since we want to control all package sources $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 @@ -88,14 +74,6 @@ if ($LastExitCode -ne 0) exit $LastExitCode } -Write-Output "$dotnetInstallPath -InstallDir $env:DOTNET_INSTALL_DIR_PJ -Architecture ""$Architecture"" -Version 1.0.0-preview2-1-003177" -Invoke-Expression "$dotnetInstallPath -InstallDir $env:DOTNET_INSTALL_DIR_PJ -Architecture ""$Architecture"" -Version 1.0.0-preview2-1-003177" -if ($LastExitCode -ne 0) -{ - Write-Output "The .NET CLI installation failed with exit code $LastExitCode" - exit $LastExitCode -} - # Put the stage0 on the path $env:PATH = "$env:DOTNET_INSTALL_DIR;$env:PATH" From 32ac8d897b2ce3cc30ebf13d3b96b85a3f9e295f Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Wed, 28 Mar 2018 22:39:07 -0700 Subject: [PATCH 017/118] Insert NuGet Build 4.7.0-preview3.5052 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index a216fe303..5e6ef73a1 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -31,7 +31,7 @@ 1.2.1-alpha-002133 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 1.6.0-beta2-25304 - 4.7.0-preview3.5039 + 4.7.0-preview3.5052 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From c271df6f6a3bd791fd2af17a2c85e2b0a9632148 Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Wed, 28 Mar 2018 22:41:18 -0700 Subject: [PATCH 018/118] Insert NuGet Build 4.6.2-rtm-5055 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 3c401e883..9a093e602 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -31,7 +31,7 @@ 1.2.1-alpha-002133 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 1.6.0-beta2-25304 - 4.6.1-rtm-5019 + 4.6.2-rtm-5055 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From c4f42d3e6cf4060bd64df9258b965bd3c5a1014b Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Thu, 29 Mar 2018 11:52:16 -0700 Subject: [PATCH 019/118] Adding a step to shutdown the vbcscompiler after test execution. --- build/Test.targets | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/Test.targets b/build/Test.targets index 83591e179..36faa3cf2 100644 --- a/build/Test.targets +++ b/build/Test.targets @@ -74,6 +74,8 @@ Projects="@(ProjectsToTest)"> + + From 1e42b63860c6d1580e920581a9688d0e81e170c8 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Thu, 29 Mar 2018 21:33:27 -0700 Subject: [PATCH 020/118] Updating the branding of the CLI to 2.1.104. --- build/Branding.props | 2 +- build/Version.props | 2 +- packaging/osx/clisdk/resources/cs.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/de.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/en.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/es.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/fr.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/it.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/ja.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/ko.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/pl.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/ru.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/tr.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html | 2 +- packaging/windows/clisdk/bundle.wxl | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build/Branding.props b/build/Branding.props index afdf7976b..4b0a55ab0 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -1,6 +1,6 @@ - Microsoft .NET Core SDK - 2.1.103 + Microsoft .NET Core SDK - 2.1.104 .NET Standard Support for Visual Studio 2015 Microsoft .NET Core Runtime - 2.0.6 Microsoft .NET Core Host - 2.0.1 diff --git a/build/Version.props b/build/Version.props index b7a218a68..8753235f1 100644 --- a/build/Version.props +++ b/build/Version.props @@ -2,7 +2,7 @@ 2 1 - 103 + 104 preview $(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix) diff --git a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html index e9933650d..b44b55c70 100644 --- a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.103
    • +
  • .NET Core SDK 2.1.104
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/de.lproj/conclusion.html b/packaging/osx/clisdk/resources/de.lproj/conclusion.html index e9933650d..b44b55c70 100644 --- a/packaging/osx/clisdk/resources/de.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/de.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.103
    • +
  • .NET Core SDK 2.1.104
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/en.lproj/conclusion.html b/packaging/osx/clisdk/resources/en.lproj/conclusion.html index e9933650d..b44b55c70 100644 --- a/packaging/osx/clisdk/resources/en.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/en.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.103
    • +
  • .NET Core SDK 2.1.104
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/es.lproj/conclusion.html b/packaging/osx/clisdk/resources/es.lproj/conclusion.html index e9933650d..b44b55c70 100644 --- a/packaging/osx/clisdk/resources/es.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/es.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.103
    • +
  • .NET Core SDK 2.1.104
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html index e9933650d..b44b55c70 100644 --- a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.103
    • +
  • .NET Core SDK 2.1.104
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/it.lproj/conclusion.html b/packaging/osx/clisdk/resources/it.lproj/conclusion.html index e9933650d..b44b55c70 100644 --- a/packaging/osx/clisdk/resources/it.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/it.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.103
    • +
  • .NET Core SDK 2.1.104
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html index e9933650d..b44b55c70 100644 --- a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.103
    • +
  • .NET Core SDK 2.1.104
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html index e9933650d..b44b55c70 100644 --- a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.103
    • +
  • .NET Core SDK 2.1.104
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html index e9933650d..b44b55c70 100644 --- a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.103
    • +
  • .NET Core SDK 2.1.104
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html index e9933650d..b44b55c70 100644 --- a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.103
    • +
  • .NET Core SDK 2.1.104
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html index e9933650d..b44b55c70 100644 --- a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.103
    • +
  • .NET Core SDK 2.1.104
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html index e9933650d..b44b55c70 100644 --- a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.103
    • +
  • .NET Core SDK 2.1.104
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html index e9933650d..b44b55c70 100644 --- a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.103
    • +
  • .NET Core SDK 2.1.104
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html index e9933650d..b44b55c70 100644 --- a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.103
    • +
  • .NET Core SDK 2.1.104
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/windows/clisdk/bundle.wxl b/packaging/windows/clisdk/bundle.wxl index d21ee9fc4..59d03795e 100644 --- a/packaging/windows/clisdk/bundle.wxl +++ b/packaging/windows/clisdk/bundle.wxl @@ -50,7 +50,7 @@ The installation was successful The following were installed at [DOTNETHOME] - • .NET Core SDK 2.1.103 + • .NET Core SDK 2.1.104 • .NET Core Runtime 2.0.6 • Runtime Package Store From 820ea7c54f311e19c8298e2234cc82a1759a362b Mon Sep 17 00:00:00 2001 From: Livar Date: Thu, 29 Mar 2018 21:59:27 -0700 Subject: [PATCH 021/118] Updating SDK to 2.1.200-preview-62730-02 This brings back an SDK with a matching version of NuGet. --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 5e6ef73a1..cf8c6f7e9 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ 2.8.0-beta3-62722-05 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.200-preview-62726-02 + 2.1.200-preview-62730-02 $(MicrosoftNETSdkPackageVersion) 2.0.0-rel-20180221-676 $(MicrosoftNETSdkWebPackageVersion) From 9ba1de58dee79bfb5620fc6caaa94e0c9680c3e5 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Thu, 29 Mar 2018 22:29:46 -0700 Subject: [PATCH 022/118] Revert the runtime to 2.0.6 because we need to service the SDK with a new NuGet. --- build/DependencyVersions.props | 2 +- .../GivenAProjectToolsCommandResolver.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index be87b86d7..9a093e602 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.0.7-servicing-26322-01 + 2.0.6 $(MicrosoftNETCoreAppPackageVersion) 15.6.82 $(MicrosoftBuildPackageVersion) diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs index fc38daf17..4333b887c 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs @@ -303,7 +303,7 @@ namespace Microsoft.DotNet.Tests result.Should().NotBeNull(); - result.Args.Should().Contain("--fx-version 2.0.7-servicing-26322-01"); + result.Args.Should().Contain("--fx-version 2.0.6"); } [Fact] From b84a0eb8b234619e11b72a3351be1f3fb246c22f Mon Sep 17 00:00:00 2001 From: Andy Gerlicher Date: Thu, 29 Mar 2018 23:11:58 -0700 Subject: [PATCH 023/118] MSBuild 15.6.84 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index be87b86d7..62e529dca 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -3,7 +3,7 @@ 2.0.7-servicing-26322-01 $(MicrosoftNETCoreAppPackageVersion) - 15.6.82 + 15.6.84 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From d3a78f7d3fd9e1b55f17f336bf8668025c65abb7 Mon Sep 17 00:00:00 2001 From: Andy Gerlicher Date: Fri, 30 Mar 2018 09:10:10 -0700 Subject: [PATCH 024/118] Add msbuild myget.org feed --- build/NugetConfigFile.targets | 1 + 1 file changed, 1 insertion(+) diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets index e0737ca5a..55ebdf871 100644 --- a/build/NugetConfigFile.targets +++ b/build/NugetConfigFile.targets @@ -33,6 +33,7 @@ + ]]> From 27435ea589fd6b516400ad41bb4affe508f54c1a Mon Sep 17 00:00:00 2001 From: Livar Date: Fri, 30 Mar 2018 10:21:43 -0700 Subject: [PATCH 025/118] Update SDK to 2.1.100-preview-62730-07 Contains a matching NuGet version to the one in the CLI. --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 9a093e602..5d19eb80f 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ 2.7.0-beta3-62707-11 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.100-preview-62721-01 + 2.1.100-preview-62730-07 $(MicrosoftNETSdkPackageVersion) 2.0.0-rel-20171110-671 $(MicrosoftNETSdkWebPackageVersion) From 5b8949e66b2512412f9dbc7b79fc54fa6409f70a Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Thu, 29 Mar 2018 18:19:24 -0700 Subject: [PATCH 026/118] Updating the runtime to 2.0.7 and the CLI branding to 2.1.104. --- build/Branding.props | 2 +- build/DependencyVersions.props | 3 ++- .../GivenAProjectToolsCommandResolver.cs | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build/Branding.props b/build/Branding.props index 4b0a55ab0..234b69304 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -2,7 +2,7 @@ Microsoft .NET Core SDK - 2.1.104 .NET Standard Support for Visual Studio 2015 - Microsoft .NET Core Runtime - 2.0.6 + Microsoft .NET Core Runtime - 2.0.7 Microsoft .NET Core Host - 2.0.1 Microsoft .NET Core Host FX Resolver - 2.0.0 diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 25a97c5bb..8e732a775 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,8 @@ - 2.0.6 + + 2.0.7 $(MicrosoftNETCoreAppPackageVersion) 15.6.84 $(MicrosoftBuildPackageVersion) diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs index 4333b887c..90f68472c 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs @@ -303,7 +303,7 @@ namespace Microsoft.DotNet.Tests result.Should().NotBeNull(); - result.Args.Should().Contain("--fx-version 2.0.6"); + result.Args.Should().Contain("--fx-version 2.0.7"); } [Fact] From caff97a3ee6e4e4c25ffa282e0a2c4d163876b7b Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Thu, 29 Mar 2018 21:37:27 -0700 Subject: [PATCH 027/118] Updating the CLI branding to 2.1.105, to go over the 104 release we will have to do for NuGet. Also, fixed the branding of the runtime in our installers to 2.0.7. --- build/Branding.props | 2 +- build/Version.props | 2 +- packaging/osx/clisdk/resources/cs.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/de.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/en.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/es.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/fr.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/it.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/ja.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/ko.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/pl.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/ru.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/tr.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html | 4 ++-- packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html | 4 ++-- packaging/windows/clisdk/bundle.wxl | 4 ++-- 17 files changed, 32 insertions(+), 32 deletions(-) diff --git a/build/Branding.props b/build/Branding.props index 234b69304..3a8979d5d 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -1,6 +1,6 @@ - Microsoft .NET Core SDK - 2.1.104 + Microsoft .NET Core SDK - 2.1.105 .NET Standard Support for Visual Studio 2015 Microsoft .NET Core Runtime - 2.0.7 Microsoft .NET Core Host - 2.0.1 diff --git a/build/Version.props b/build/Version.props index 8753235f1..72f42115f 100644 --- a/build/Version.props +++ b/build/Version.props @@ -2,7 +2,7 @@ 2 1 - 104 + 105 preview $(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix) diff --git a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/de.lproj/conclusion.html b/packaging/osx/clisdk/resources/de.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/de.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/de.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/en.lproj/conclusion.html b/packaging/osx/clisdk/resources/en.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/en.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/en.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/es.lproj/conclusion.html b/packaging/osx/clisdk/resources/es.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/es.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/es.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/it.lproj/conclusion.html b/packaging/osx/clisdk/resources/it.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/it.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/it.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html index b44b55c70..909872a92 100644 --- a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html @@ -7,8 +7,8 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.104
    • -
  • .NET Core Runtime 2.0.6
    • +
  • .NET Core SDK 2.1.105
    • +
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/windows/clisdk/bundle.wxl b/packaging/windows/clisdk/bundle.wxl index 59d03795e..53b6fca6e 100644 --- a/packaging/windows/clisdk/bundle.wxl +++ b/packaging/windows/clisdk/bundle.wxl @@ -50,8 +50,8 @@ The installation was successful The following were installed at [DOTNETHOME] - • .NET Core SDK 2.1.104 - • .NET Core Runtime 2.0.6 + • .NET Core SDK 2.1.105 + • .NET Core Runtime 2.0.7 • Runtime Package Store This product collects usage data From 9b68d55059fc043c66496ea5c3405d59d5e94d6c Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Fri, 30 Mar 2018 13:24:07 -0700 Subject: [PATCH 028/118] Moving the opensuse 43.2 docker file to the right folder. --- scripts/docker/{opensuse.42.3 => opensuse.43.2}/Dockerfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename scripts/docker/{opensuse.42.3 => opensuse.43.2}/Dockerfile (100%) diff --git a/scripts/docker/opensuse.42.3/Dockerfile b/scripts/docker/opensuse.43.2/Dockerfile similarity index 100% rename from scripts/docker/opensuse.42.3/Dockerfile rename to scripts/docker/opensuse.43.2/Dockerfile From c5f3e09520f174b90dbe2bc41996abe53854e74c Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 30 Mar 2018 09:09:43 -0700 Subject: [PATCH 029/118] Update to ASP.NET Core 2.0.7 build 228 - Remove unused myget feeds - Refactor how we keep track of all previous versions of the runtime store --- build/BundledRuntimes.props | 5 +-- build/DependencyVersions.props | 18 ++++++++--- build/NugetConfigFile.targets | 10 +++--- build/package/Installer.DEB.proj | 21 +++---------- build/package/Installer.DEB.targets | 39 ++++++----------------- build/package/Installer.RPM.targets | 48 ++++++++--------------------- 6 files changed, 48 insertions(+), 93 deletions(-) diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index 82f47ecca..4d36aadd9 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -5,7 +5,7 @@ -internal - + dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(CoreSetupRid)$(InstallerExtension) $(PackagesDirectory)/$(DownloadedSharedHostInstallerFileName) @@ -34,9 +34,10 @@ $(CoreSetupBlobRootUrl)aspnetcore/store/$(AspNetCoreRuntimeAzureblobStoresSubfolderName) + $(DotnetBlobRootUrl)/aspnetcore/store/$(AspNetCoreRuntimeAzureblobStoresSubfolderName)/packages/index.json runtime.version $(PackagesDirectory)/$(AspNetCoreSharedRuntimeVersionFileName) - + $(HostOSName)$(Architecture) $(HostOSName) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index c210b83f7..b89c4681c 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -58,22 +58,32 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.0.6 + 2.0.7 notimestamp + + 2.0.0;2.0.3;2.0.5;2.0.6 + - 2.0.6 + 2.0.7 rtm - 2.0.6 - 10011 + 2.0.7 + 228 + $(AspNetCoreVerison) + $(AspNetCoreVerison)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp) aspnetcore-store $(AspNetCoreVersion)-$(AspNetCoreRelease) $(AspNetCoreBranchName)-$(AspNetCoreRuntimePackageTimestamp) + + + + + 2.1.0-prerelease-02430-04 diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets index 55ebdf871..38e858fff 100644 --- a/build/NugetConfigFile.targets +++ b/build/NugetConfigFile.targets @@ -4,7 +4,7 @@ - + - + @@ -30,8 +30,6 @@ - - ]]> @@ -43,13 +41,13 @@ ]]> - + - + - - - - + - - - - + @@ -106,6 +100,7 @@ Inputs="$(DownloadedSharedHostInstallerFile); $(DownloadedHostFxrInstallerFile); $(DownloadedSharedFrameworkInstallerFile); + @(AspNetCoreDebInstallerFile); $(SdkInstallerFile);" Outputs="$(DebianTestResultsXmlFile)" > @@ -113,10 +108,7 @@ - - - - + @@ -130,10 +122,7 @@ - - - - + diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets index f4cfc11a2..57b5a603d 100644 --- a/build/package/Installer.DEB.targets +++ b/build/package/Installer.DEB.targets @@ -35,14 +35,6 @@ dotnet-hostfxr-$(HostFxrDebianPackageVersion) $(HostFxrDebianPackageName.ToLower()) dotnet-host - $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp) - $(AspNetCoreRuntimePackageBrandName)-2.0.0 - $(AspNetCoreRuntimePackageBrandName)-2.0.3 - $(AspNetCoreRuntimePackageBrandName)-2.0.5 - $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion) - $(HostRid) - $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb - $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion)-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb @@ -125,26 +117,15 @@ - - $(AspNetCoreRuntimePackageBrandName)-2.0.0-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb - $(AspNetCoreRuntimePackageBrandName)-2.0.3-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb - $(AspNetCoreRuntimePackageBrandName)-2.0.5-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb - $(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName200) - $(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName203) - $(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName205) - $(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName) - - - - - + + + + $(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimePackageBrandName)-%(AspNetCoreRuntimeStoreVersion.Identity)-$(HostRid).deb$(CoreSetupBlobAccessTokenParam) + $(AspNetCoreRuntimePackageBrandName)-%(AspNetCoreRuntimeStoreVersion.Identity) + + + + diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets index 04d79e051..ce69dad4f 100644 --- a/build/package/Installer.RPM.targets +++ b/build/package/Installer.RPM.targets @@ -50,16 +50,10 @@ dotnet-hostfxr-$(HostFxrRpmPackageVersion) $(HostFxrRpmPackageName.ToLower()) dotnet-host - $(HostRid) $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp) $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion) $(AspNetCoreRuntimePackageBrandName)-2.0.0 $(AspNetCoreRuntimePackageBrandName)-2.0.3 - $(AspNetCoreRuntimePackageBrandName)-2.0.5 - $(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp) - $(AspNetCoreVersion) - $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm - $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion)-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm $(ScriptsDir)/$(AfterInstallHostScriptName) $(RpmLayoutScripts)/$(AfterInstallHostScriptName) @@ -187,27 +181,15 @@ - - $(AspNetCoreRuntimePackageBrandName)-2.0.0-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm - $(AspNetCoreRuntimePackageBrandName)-2.0.3-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm - $(AspNetCoreRuntimePackageBrandName)-2.0.5-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm - $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName200) - $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName203) - $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName205) - $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName) - - - - - + + + $(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimePackageBrandName)-%(AspNetCoreRuntimeStoreVersion.Identity)-$(HostRid).rpm$(CoreSetupBlobAccessTokenParam) + $(AspNetCoreRuntimePackageBrandName)-%(AspNetCoreRuntimeStoreVersion.Identity) + + + + @@ -235,7 +217,7 @@ Inputs="$(DownloadedSharedHostInstallerFile); $(DownloadedHostFxrInstallerFile); $(DownloadedSharedFrameworkInstallerFile); - $(DownloadedSharedAspNetCoreRuntime); + @(AspNetCoreRpmInstallerFile); $(RpmTestResultsXmlFile);" Outputs="$(RpmTestResultsXmlFile)" > @@ -243,10 +225,7 @@ - - - - + @@ -261,10 +240,7 @@ - - - - + From c20f79e8e39ebc5c188134e3878eac933f9d04ef Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 30 Mar 2018 16:20:38 -0700 Subject: [PATCH 030/118] Reverse the order in which old runtime stores are listed --- build/DependencyVersions.props | 12 ++++++++---- build/package/Installer.DEB.proj | 12 ++++++++++-- build/package/Installer.RPM.targets | 6 +++++- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index b89c4681c..0b86826ab 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -63,9 +63,6 @@ AspNetCoreRelease is only used if the value of this property is "timestamped" --> notimestamp - - 2.0.0;2.0.3;2.0.5;2.0.6 - 2.0.7 rtm @@ -80,8 +77,15 @@ - + + + + + diff --git a/build/package/Installer.DEB.proj b/build/package/Installer.DEB.proj index 2c0447372..71408e33b 100644 --- a/build/package/Installer.DEB.proj +++ b/build/package/Installer.DEB.proj @@ -21,11 +21,15 @@ Inputs="@(CLISdkFiles)" Outputs="$(SdkInstallerFile)" > + + + + - + + + + + - + diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets index ce69dad4f..2053557fc 100644 --- a/build/package/Installer.RPM.targets +++ b/build/package/Installer.RPM.targets @@ -221,11 +221,15 @@ $(RpmTestResultsXmlFile);" Outputs="$(RpmTestResultsXmlFile)" > + + + + - + From 370243ab81c43fe0e3e2a57c1d101b45724ea75e Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Fri, 30 Mar 2018 17:57:03 -0700 Subject: [PATCH 031/118] Adding a work around for publishing self-contained apps to RIDs that are not available for Microsoft.NETCore.App 2.0.0. --- .../GivenDotnetPublishPublishesProjects.cs | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs index 2db2018fa..ad9991805 100644 --- a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs +++ b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs @@ -4,7 +4,9 @@ using System; using System.IO; using System.Diagnostics; +using System.Linq; using System.Runtime.InteropServices; +using System.Xml.Linq; using FluentAssertions; using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.PlatformAbstractions; @@ -103,7 +105,19 @@ namespace Microsoft.DotNet.Cli.Publish.Tests var testInstance = TestAssets.Get(testAppName) .CreateInstance() .WithSourceFiles() - .WithRestoreFiles(); + .WithProjectChanges(project => + { + var ns = project.Root.Name.Namespace; + + var propertyGroup = project.Root.Elements(ns + "PropertyGroup").First(); + + // This is needed to be able to restore for RIDs that were not available in Microsoft.NetCore.App 2.0.0. + // M.NC.App 2.0.0 depends on a version of Microsoft.NetCore.Platforms that lacks the mapping for the + // latest RIDs. Given that self-contained apps are pinned to 2.0.0 in this version of the SDK, we + // need a manual roll-forward. + propertyGroup.Add( + new XElement(ns + "RuntimeFrameworkVersion", "2.0.*")); + }); var testProjectDirectory = testInstance.Root; @@ -170,7 +184,19 @@ namespace Microsoft.DotNet.Cli.Publish.Tests var testInstance = TestAssets.Get(testAppName) .CreateInstance($"PublishesSelfContained{selfContained}") .WithSourceFiles() - .WithRestoreFiles(); + .WithProjectChanges(project => + { + var ns = project.Root.Name.Namespace; + + var propertyGroup = project.Root.Elements(ns + "PropertyGroup").First(); + + // This is needed to be able to restore for RIDs that were not available in Microsoft.NetCore.App 2.0.0. + // M.NC.App 2.0.0 depends on a version of Microsoft.NetCore.Platforms that lacks the mapping for the + // latest RIDs. Given that self-contained apps are pinned to 2.0.0 in this version of the SDK, we + // need a manual roll-forward. + propertyGroup.Add( + new XElement(ns + "RuntimeFrameworkVersion", "2.0.*")); + }); var testProjectDirectory = testInstance.Root; From 15c631b02201912ca4209339e9762b0ac29e4445 Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Mon, 2 Apr 2018 10:36:26 -0700 Subject: [PATCH 032/118] Insert NuGet Build 4.7.0-preview3.5059 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index cf8c6f7e9..e41fe8d29 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -31,7 +31,7 @@ 1.2.1-alpha-002133 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 1.6.0-beta2-25304 - 4.7.0-preview3.5052 + 4.7.0-preview3.5059 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From beea8c2e9ba81ff3ca1b255be9c54b5e26293581 Mon Sep 17 00:00:00 2001 From: Livar Date: Mon, 2 Apr 2018 10:55:15 -0700 Subject: [PATCH 033/118] Fix AspNetCoreRuntimeBuildDropFeed to use CoreSetupBlobRootUrl CoreSetupBlobRootUrl determines from which blob storage the CLI consumes bits. That's the right URL to use for consuming asp.net bits as well. --- build/BundledRuntimes.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index 4d36aadd9..eb8c4cc57 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -34,7 +34,7 @@ $(CoreSetupBlobRootUrl)aspnetcore/store/$(AspNetCoreRuntimeAzureblobStoresSubfolderName) - $(DotnetBlobRootUrl)/aspnetcore/store/$(AspNetCoreRuntimeAzureblobStoresSubfolderName)/packages/index.json + $(CoreSetupBlobRootUrl)aspnetcore/store/$(AspNetCoreRuntimeAzureblobStoresSubfolderName)/packages/index.json runtime.version $(PackagesDirectory)/$(AspNetCoreSharedRuntimeVersionFileName) From 3f05bb71ab052766132895b58a20fd7b25658bb6 Mon Sep 17 00:00:00 2001 From: Livar Date: Mon, 2 Apr 2018 21:51:23 -0700 Subject: [PATCH 034/118] Updating SDK to 2.1.200-preview-62803-04 This contains a matching NuGet version to the one in the CLI. --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index e41fe8d29..65d41dbe6 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ 2.8.0-beta3-62722-05 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.200-preview-62730-02 + 2.1.200-preview-62803-04 $(MicrosoftNETSdkPackageVersion) 2.0.0-rel-20180221-676 $(MicrosoftNETSdkWebPackageVersion) From de09fb5104bfe5a89b7adbf584184ccaaa05e8cc Mon Sep 17 00:00:00 2001 From: Livar Date: Tue, 3 Apr 2018 16:20:11 -0700 Subject: [PATCH 035/118] Producing an empty commit to trigger a rebuild of the CLI The runtime had to spin in place and as such we need a "fake" commit to trigger a CLI rebuild using the new runtime bits. From 21529f350d520492a1b5a4feaa91fb2e147b585f Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 3 Apr 2018 17:21:31 -0700 Subject: [PATCH 036/118] Update to aspnet 2.0.7 build 230 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 3761882a7..b287f41d5 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -68,7 +68,7 @@ 2.0.7 rtm 2.0.7 - 228 + 230 $(AspNetCoreVerison) $(AspNetCoreVerison)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp) From 674f64c4c7cf66ac72716c230d17d21eb0a46ebf Mon Sep 17 00:00:00 2001 From: Mayank Bansal Date: Wed, 4 Apr 2018 14:08:12 +0530 Subject: [PATCH 037/118] Insert Testplatform 15.7 RTM package in dotnet SDK --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 65d41dbe6..e74411c27 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -40,7 +40,7 @@ $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) - 15.7.0-preview-20180320-02 + 15.7.0 $(MicrosoftNETTestSdkPackageVersion) $(MicrosoftNETTestSdkPackageVersion) 0.2.0-beta-000042 From 9fb0f9a35b476f71d63b594a0b15e110123b41a9 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 4 Apr 2018 13:14:13 -0700 Subject: [PATCH 038/118] Fix a typo in the rpm.targets when testing the rpm generated packages. --- build/package/Installer.RPM.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets index 2053557fc..cb06d9823 100644 --- a/build/package/Installer.RPM.targets +++ b/build/package/Installer.RPM.targets @@ -188,8 +188,8 @@ - + From 364ee996bf3dd6c69f4ac89b3ff504481530e1bf Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 4 Apr 2018 22:43:37 -0700 Subject: [PATCH 039/118] Fixing another typo in that is breaking RHEL. --- build/DependencyVersions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index b287f41d5..cb1243b3a 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -69,8 +69,8 @@ rtm 2.0.7 230 - $(AspNetCoreVerison) - $(AspNetCoreVerison)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp) + $(AspNetCoreVersion) + $(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp) aspnetcore-store $(AspNetCoreVersion)-$(AspNetCoreRelease) From d0aca6fb7b47f1f2ba2b503e5061fcee9424bf23 Mon Sep 17 00:00:00 2001 From: Livar Date: Thu, 5 Apr 2018 09:43:20 -0700 Subject: [PATCH 040/118] Updating SDK to 2.1.200-preview-62805-05 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 65d41dbe6..f1459deab 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ 2.8.0-beta3-62722-05 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.200-preview-62803-04 + 2.1.200-preview-62805-05 $(MicrosoftNETSdkPackageVersion) 2.0.0-rel-20180221-676 $(MicrosoftNETSdkWebPackageVersion) From 8fa1c8230b3f2638d195dc9bcd61bd066dc5eb2d Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Fri, 6 Apr 2018 10:52:34 -0700 Subject: [PATCH 041/118] Align dotnetcli with VS2017.4 compiler --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 36a179113..3e4913f85 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -9,7 +9,7 @@ $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 10.1.4-rtm-180213-0 + 10.1.4-rtm-180403-0 2.8.0-beta3-62722-05 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) From 8370f24850f5ac02305d3b5a712606d751ce984f Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Sun, 8 Apr 2018 11:57:30 -0700 Subject: [PATCH 042/118] Update test templates to use the 15.7.0 test SDK --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 36a179113..3e16b3b4c 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -20,7 +20,7 @@ $(MicrosoftNETSdkWebPackageVersion) 1.0.0-beta3-20171117-314 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 1.0.1-beta3-20180326-1520591 + 1.0.2-beta3-20180408-1569068 1.0.0-beta3-20171117-314 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) From 1860d4332327f13f3222e358b5c9794cae70110c Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 9 Apr 2018 12:14:47 -0700 Subject: [PATCH 043/118] Update to ASP.NET Core 2.0.7 build 231 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index cb1243b3a..f485d871e 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -68,7 +68,7 @@ 2.0.7 rtm 2.0.7 - 230 + 231 $(AspNetCoreVersion) $(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp) From d43718d44433669513566fd3c2c84ea228a9fbc1 Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Tue, 10 Apr 2018 08:49:48 -0700 Subject: [PATCH 044/118] Insert NuGet Build 4.7.0-rtm.5081 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 36a179113..2e7655eab 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -32,7 +32,7 @@ 1.2.1-alpha-002133 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 1.6.0-beta2-25304 - 4.7.0-preview3.5059 + 4.7.0-rtm.5081 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 18dd8107f264632b35752ac0b78f0a9b94520c56 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Tue, 3 Apr 2018 12:58:51 -0700 Subject: [PATCH 045/118] Removing the explicit dependency on System.Diagnostics.Process from Cli.Utils. Use the assembly from netstandard. --- src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj index 68fdb256d..596020031 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj +++ b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj @@ -30,7 +30,6 @@ - From 51214d02b11cabfc01cc0c661867a13096ca34aa Mon Sep 17 00:00:00 2001 From: Andy Gerlicher Date: Tue, 10 Apr 2018 13:40:30 -0700 Subject: [PATCH 046/118] MSBuild 15.7.163 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 2e7655eab..ed82a8801 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -4,7 +4,7 @@ 2.0.7 $(MicrosoftNETCoreAppPackageVersion) - 15.7.0-preview-000127 + 15.7.0-preview-000163 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From 00cbf0cbb5bd70bb990463fc8990ccd32c8c94b6 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Wed, 11 Apr 2018 16:32:04 -0700 Subject: [PATCH 047/118] Update dotnet/sdk to latest from release/2.1.3xx --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index e7f46b4b4..f1868a1cc 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -14,7 +14,7 @@ $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.300-preview2-62806-04 + 2.1.300-preview2-62811-10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftAspNetCoreAppPackageVersion) 2.1.300-preview2-20180406-1563552 From fef4ae58af31bc354fdba5f8def6867765797d4e Mon Sep 17 00:00:00 2001 From: Livar Date: Wed, 11 Apr 2018 22:23:35 -0700 Subject: [PATCH 048/118] Update SDK to 2.1.200-preview-62812-03 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 38359655e..67f3b6922 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -13,7 +13,7 @@ 2.8.0-beta3-62722-05 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.200-preview-62805-05 + 2.1.200-preview-62812-03 $(MicrosoftNETSdkPackageVersion) 2.0.0-rel-20180221-676 $(MicrosoftNETSdkWebPackageVersion) From 0ed1ffb8dd934c9f1b269f09508ddf09a5cd6be4 Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Fri, 13 Apr 2018 10:44:27 -0700 Subject: [PATCH 049/118] Insert NuGet Build 4.7.0-rtm.5096 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 67f3b6922..2f486b835 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -32,7 +32,7 @@ 1.2.1-alpha-002133 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 1.6.0-beta2-25304 - 4.7.0-rtm.5081 + 4.7.0-rtm.5096 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 6a3419cedd4ec1fcd1ba62443830059282232006 Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Fri, 13 Apr 2018 14:03:00 -0700 Subject: [PATCH 050/118] Insert NuGet Build 4.7.0-rtm.5104 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 2f486b835..3c9b87c14 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -32,7 +32,7 @@ 1.2.1-alpha-002133 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 1.6.0-beta2-25304 - 4.7.0-rtm.5096 + 4.7.0-rtm.5104 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From a0aa144d93571fee13d5975d44a020b4e958e9c9 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Fri, 13 Apr 2018 22:16:45 +0000 Subject: [PATCH 051/118] Update roslyn, sdk to beta4-62811-05, preview2-62812-07, respectively --- build/DependencyVersions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index f1868a1cc..723a82572 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -10,11 +10,11 @@ $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) 10.1.4-rtm-180406-0 - 2.8.0-beta4-62806-08 + 2.8.0-beta4-62811-05 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.300-preview2-62811-10 + 2.1.300-preview2-62812-07 $(MicrosoftNETSdkPackageVersion) $(MicrosoftAspNetCoreAppPackageVersion) 2.1.300-preview2-20180406-1563552 From 83d150e87b6d1b85a349b67aa5ecfb71ee0c6235 Mon Sep 17 00:00:00 2001 From: Livar Date: Mon, 16 Apr 2018 10:38:21 -0700 Subject: [PATCH 052/118] Update SDK to 2.1.200-preview-62816-05 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 3c9b87c14..75cab6558 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -13,7 +13,7 @@ 2.8.0-beta3-62722-05 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.200-preview-62812-03 + 2.1.200-preview-62816-05 $(MicrosoftNETSdkPackageVersion) 2.0.0-rel-20180221-676 $(MicrosoftNETSdkWebPackageVersion) From 6851961c1659bc2f05ce5bb32606f38384148f9b Mon Sep 17 00:00:00 2001 From: William Li Date: Mon, 16 Apr 2018 10:51:43 -0700 Subject: [PATCH 053/118] Better help text on `dotnet tool` --- src/dotnet/commands/dotnet-help/LocalizableStrings.resx | 4 ++-- src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.cs.xlf | 4 ++-- src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.de.xlf | 4 ++-- src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.es.xlf | 4 ++-- src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.fr.xlf | 4 ++-- src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.it.xlf | 4 ++-- src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf | 4 ++-- src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ko.xlf | 4 ++-- src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf | 4 ++-- .../commands/dotnet-help/xlf/LocalizableStrings.pt-BR.xlf | 4 ++-- src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ru.xlf | 4 ++-- src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.tr.xlf | 4 ++-- .../commands/dotnet-help/xlf/LocalizableStrings.zh-Hans.xlf | 4 ++-- .../commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf | 4 ++-- src/dotnet/commands/dotnet-tool/LocalizableStrings.resx | 4 ++-- src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.cs.xlf | 4 ++-- src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.de.xlf | 4 ++-- src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.es.xlf | 4 ++-- src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.fr.xlf | 4 ++-- src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.it.xlf | 4 ++-- src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ja.xlf | 4 ++-- src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ko.xlf | 4 ++-- src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.pl.xlf | 4 ++-- .../commands/dotnet-tool/xlf/LocalizableStrings.pt-BR.xlf | 4 ++-- src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ru.xlf | 4 ++-- src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.tr.xlf | 4 ++-- .../commands/dotnet-tool/xlf/LocalizableStrings.zh-Hans.xlf | 4 ++-- .../commands/dotnet-tool/xlf/LocalizableStrings.zh-Hant.xlf | 4 ++-- .../GivenThatIWantToShowHelpForDotnetCommand.cs | 2 +- 29 files changed, 57 insertions(+), 57 deletions(-) diff --git a/src/dotnet/commands/dotnet-help/LocalizableStrings.resx b/src/dotnet/commands/dotnet-help/LocalizableStrings.resx index 87a781848..07118075e 100644 --- a/src/dotnet/commands/dotnet-help/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-help/LocalizableStrings.resx @@ -268,9 +268,9 @@ Path to additional deps.json file. - Modify tools. + Install or work with tools that extend the .NET experience. Interact with servers started by a build. - \ No newline at end of file + diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.cs.xlf index b1e85a286..2c79948b5 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.cs.xlf @@ -253,8 +253,8 @@ - Modify tools. - Upravte nástroje. + Install or work with tools that extend the .NET experience. + Upravte nástroje. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.de.xlf index f0d6c44b0..1aa8c6c90 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.de.xlf @@ -254,8 +254,8 @@ - Modify tools. - Hiermit werden Tools geändert. + Install or work with tools that extend the .NET experience. + Hiermit werden Tools geändert. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.es.xlf index 1366d754c..f77be21f4 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.es.xlf @@ -253,8 +253,8 @@ - Modify tools. - Modifica herramientas. + Install or work with tools that extend the .NET experience. + Modifica herramientas. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.fr.xlf index ad90d32fa..8cf661d80 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.fr.xlf @@ -253,8 +253,8 @@ - Modify tools. - Modifier les outils. + Install or work with tools that extend the .NET experience. + Modifier les outils. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.it.xlf index bab036495..85afcf32e 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.it.xlf @@ -253,8 +253,8 @@ - Modify tools. - Modifica gli strumenti. + Install or work with tools that extend the .NET experience. + Modifica gli strumenti. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf index c796e75eb..8821d75e4 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf @@ -253,8 +253,8 @@ - Modify tools. - ツールを変更します。 + Install or work with tools that extend the .NET experience. + ツールを変更します。 diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ko.xlf index 557594584..aa0fefac0 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ko.xlf @@ -253,8 +253,8 @@ - Modify tools. - 도구를 수정합니다. + Install or work with tools that extend the .NET experience. + 도구를 수정합니다. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf index e186025f6..879a0e96e 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf @@ -253,8 +253,8 @@ - Modify tools. - Zmodyfikuj narzędzia. + Install or work with tools that extend the .NET experience. + Zmodyfikuj narzędzia. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pt-BR.xlf index 6831f4f47..03eaf235e 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pt-BR.xlf @@ -253,8 +253,8 @@ - Modify tools. - Modificar ferramentas. + Install or work with tools that extend the .NET experience. + Modificar ferramentas. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ru.xlf index 0ff8eba10..29891423b 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ru.xlf @@ -253,8 +253,8 @@ - Modify tools. - Средства для изменения. + Install or work with tools that extend the .NET experience. + Средства для изменения. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.tr.xlf index 376a82510..2968a17f9 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.tr.xlf @@ -253,8 +253,8 @@ - Modify tools. - Araçları değiştirir. + Install or work with tools that extend the .NET experience. + Araçları değiştirir. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hans.xlf index 862df02fd..c60a7ee7d 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hans.xlf @@ -253,8 +253,8 @@ - Modify tools. - 修改工具。 + Install or work with tools that extend the .NET experience. + 修改工具。 diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf index 2a2ddad7f..bba3fe694 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf @@ -253,8 +253,8 @@ - Modify tools. - 修改工具。 + Install or work with tools that extend the .NET experience. + 修改工具。 diff --git a/src/dotnet/commands/dotnet-tool/LocalizableStrings.resx b/src/dotnet/commands/dotnet-tool/LocalizableStrings.resx index 13ec6c39b..0a277bcb3 100644 --- a/src/dotnet/commands/dotnet-tool/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-tool/LocalizableStrings.resx @@ -121,6 +121,6 @@ .NET Install Command - Modify tools. + Install or work with tools that extend the .NET experience. - \ No newline at end of file + diff --git a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.cs.xlf index 59ee69c22..396e272aa 100644 --- a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.cs.xlf @@ -8,8 +8,8 @@ - Modify tools. - Upravte nástroje. + Install or work with tools that extend the .NET experience. + Upravte nástroje. diff --git a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.de.xlf index 43e25eae9..e7f8c2616 100644 --- a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.de.xlf @@ -8,8 +8,8 @@ - Modify tools. - Hiermit werden Tools geändert. + Install or work with tools that extend the .NET experience. + Hiermit werden Tools geändert. diff --git a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.es.xlf index 71c2ab90c..a7a068329 100644 --- a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.es.xlf @@ -8,8 +8,8 @@ - Modify tools. - Modifica herramientas. + Install or work with tools that extend the .NET experience. + Modifica herramientas. diff --git a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.fr.xlf index 78f82c8f7..309ab9588 100644 --- a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.fr.xlf @@ -8,8 +8,8 @@ - Modify tools. - Modifier les outils. + Install or work with tools that extend the .NET experience. + Modifier les outils. diff --git a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.it.xlf index 926ab532e..1e2d30ee4 100644 --- a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.it.xlf @@ -8,8 +8,8 @@ - Modify tools. - Modifica gli strumenti. + Install or work with tools that extend the .NET experience. + Modifica gli strumenti. diff --git a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ja.xlf index 85011ab88..0def28031 100644 --- a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ja.xlf @@ -8,8 +8,8 @@ - Modify tools. - ツールを変更します。 + Install or work with tools that extend the .NET experience. + ツールを変更します。 diff --git a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ko.xlf index f2e259e68..bde48abef 100644 --- a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ko.xlf @@ -8,8 +8,8 @@ - Modify tools. - 도구를 수정합니다. + Install or work with tools that extend the .NET experience. + 도구를 수정합니다. diff --git a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.pl.xlf index 449275ecc..a5476ed4c 100644 --- a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.pl.xlf @@ -8,8 +8,8 @@ - Modify tools. - Zmodyfikuj narzędzia. + Install or work with tools that extend the .NET experience. + Zmodyfikuj narzędzia. diff --git a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.pt-BR.xlf index 69d792746..2351d96dc 100644 --- a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.pt-BR.xlf @@ -8,8 +8,8 @@ - Modify tools. - Modificar ferramentas. + Install or work with tools that extend the .NET experience. + Modificar ferramentas. diff --git a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ru.xlf index 6be9c1aad..5553fc8e7 100644 --- a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ru.xlf @@ -8,8 +8,8 @@ - Modify tools. - Средства для изменения. + Install or work with tools that extend the .NET experience. + Средства для изменения. diff --git a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.tr.xlf index 931ec3f17..8e3a47ac9 100644 --- a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.tr.xlf @@ -8,8 +8,8 @@ - Modify tools. - Araçları değiştirir. + Install or work with tools that extend the .NET experience. + Araçları değiştirir. diff --git a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.zh-Hans.xlf index 63ac5528b..a9b15f580 100644 --- a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.zh-Hans.xlf @@ -8,8 +8,8 @@ - Modify tools. - 修改工具。 + Install or work with tools that extend the .NET experience. + 修改工具。 diff --git a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.zh-Hant.xlf index f64bad870..016929c9d 100644 --- a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.zh-Hant.xlf @@ -8,8 +8,8 @@ - Modify tools. - 修改工具。 + Install or work with tools that extend the .NET experience. + 修改工具。 diff --git a/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs b/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs index 36459d50d..38089f254 100644 --- a/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs +++ b/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs @@ -39,7 +39,7 @@ SDK commands: msbuild Runs Microsoft Build Engine (MSBuild). vstest Runs Microsoft Test Execution Command Line Tool. store Stores the specified assemblies in the runtime store. - tool Modify tools. + tool Install or work with tools that extend the .NET experience. buildserver Interact with servers started by a build. help Show help. From aa8776983ad3d95d031bead7d48dd17bf749e540 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Mon, 16 Apr 2018 12:00:09 -0700 Subject: [PATCH 054/118] Reverting the changes to README.md so that it keeps pointing to release/2.1.3xx artifacts. --- README.md | 66 +++++++++++++++++++++++++++---------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index a577fecda..9e7fd399b 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Looking for V1 of the .NET Core tooling? If you are looking for the v2.0 release of the .NET Core tools (CLI, MSBuild and the new csproj), head over to https://dot.net/core and download! -> **Note:** the master branch of the CLI repo is based on an upcoming update of the SDK and is considered pre-release. For production-level usage, please use the +> **Note:** the release/2.1.3xx branch of the CLI repo is based on an upcoming update of the SDK and is considered pre-release. For production-level usage, please use the > released version of the tools available at https://dot.net/core Found an issue? @@ -65,7 +65,7 @@ To download the .NET Core runtime **without** the SDK, visit https://github.com/ > want to install the latest released versions, check out the [preceding section](#looking-for-v1-of-the-net-core-tooling). > In order to be able to restore these pre-release packages, you may need to add a NuGet feed pointing to https://dotnet.myget.org/F/dotnet-core/api/v3/index.json. Other feeds may also be necessary depending on what kind of project you are working with. -| Platform | Latest Daily Build
*master*
[![][version-badge]][version] | +| Platform | Latest Daily Build
*release/2.1.3xx*
[![][version-badge]][version] | | -------- | :-------------------------------------: | | **Windows x64** | [Installer][win-x64-installer] - [Checksum][win-x64-installer-checksum]
[zip][win-x64-zip] - [Checksum][win-x64-zip-checksum] | | **Windows x86** | [Installer][win-x86-installer] - [Checksum][win-x86-installer-checksum]
[zip][win-x86-zip] - [Checksum][win-x86-zip-checksum] | @@ -76,7 +76,7 @@ To download the .NET Core runtime **without** the SDK, visit https://github.com/ | **RHEL 6** | [tar.gz][rhel-6-targz] - [Checksum][rhel-6-targz-checksum] | | **Alpine 3.6** | [tar.gz][alpine-3.6-targz] - [Checksum][alpine-3.6-targz-checksum] | -| Latest Coherent Build2
*master* | +| Latest Coherent Build2
*release/2.1.3xx* | |:------:| | [![][coherent-version-badge]][coherent-version] | @@ -84,47 +84,47 @@ Reference notes: > **1**: *Our Debian packages are put together slightly differently than the other OS specific installers. Instead of combining everything, we have separate component packages that depend on each other. If you're installing these directly from the .deb files (via dpkg or similar), then you'll need to install the [corresponding Host, Host FX Resolver, and Shared Framework packages](https://github.com/dotnet/core-setup#daily-builds) before installing the Sdk package.* >

**2**: *A 'coherent' build is defined as a build where the Runtime version matches between the CLI and Asp.NET.* -[version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/latest.version -[coherent-version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/latest.coherent.version +[version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/latest.version +[coherent-version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/latest.coherent.version [comment]: # (The latest versions are always the same across all platforms. Just need one to show, so picking win-x64's svg.) -[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/win_x64_Release_version_badge.svg -[coherent-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/win_x64_Release_coherent_badge.svg +[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/win_x64_Release_version_badge.svg +[coherent-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/win_x64_Release_coherent_badge.svg -[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x64.exe -[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x64.exe.sha -[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x64.zip -[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x64.zip.sha +[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-win-x64.exe +[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-win-x64.exe.sha +[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-win-x64.zip +[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-win-x64.zip.sha -[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x86.exe -[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x86.exe.sha -[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x86.zip -[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x86.zip.sha +[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-win-x86.exe +[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-win-x86.exe.sha +[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-win-x86.zip +[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-win-x86.zip.sha -[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-osx-x64.pkg -[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-osx-x64.pkg.sha -[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-osx-x64.tar.gz -[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-osx-x64.tar.gz.sha +[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-osx-x64.pkg +[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-osx-x64.pkg.sha +[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-osx-x64.tar.gz +[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-osx-x64.tar.gz.sha -[linux-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-linux-x64.tar.gz -[linux-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-linux-x64.tar.gz.sha +[linux-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-linux-x64.tar.gz +[linux-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-linux-x64.tar.gz.sha -[linux-arm-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-linux-arm.tar.gz -[linux-arm-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-linux-arm.tar.gz.sha +[linux-arm-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-linux-arm.tar.gz +[linux-arm-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-linux-arm.tar.gz.sha -[linux-arm64-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-linux-arm64.tar.gz -[linux-arm64-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-linux-arm64.tar.gz.sha +[linux-arm64-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-linux-arm64.tar.gz +[linux-arm64-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-linux-arm64.tar.gz.sha -[linux-DEB-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-x64.deb -[linux-DEB-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-x64.deb.sha +[linux-DEB-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-x64.deb +[linux-DEB-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-x64.deb.sha -[linux-RPM-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-x64.rpm -[linux-RPM-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-x64.rpm.sha +[linux-RPM-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-x64.rpm +[linux-RPM-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-x64.rpm.sha -[rhel-6-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-rhel.6-x64.tar.gz -[rhel-6-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-rhel.6-x64.tar.gz.sha +[rhel-6-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-rhel.6-x64.tar.gz +[rhel-6-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-rhel.6-x64.tar.gz.sha -[alpine-3.6-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-alpine.3.6-x64.tar.gz -[alpine-3.6-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-alpine.3.6-x64.tar.gz.sha +[alpine-3.6-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-alpine.3.6-x64.tar.gz +[alpine-3.6-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-alpine.3.6-x64.tar.gz.sha # Debian daily feed From b0610b9116d02a8ab486241bb6598626c849cf5c Mon Sep 17 00:00:00 2001 From: William Li Date: Mon, 16 Apr 2018 12:48:44 -0700 Subject: [PATCH 055/118] Add doc link for both dotnet-tool and dotnet-buildserver --- src/dotnet/BuiltInCommandsCatalog.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/dotnet/BuiltInCommandsCatalog.cs b/src/dotnet/BuiltInCommandsCatalog.cs index e649f6cc7..8a6f81824 100644 --- a/src/dotnet/BuiltInCommandsCatalog.cs +++ b/src/dotnet/BuiltInCommandsCatalog.cs @@ -148,11 +148,13 @@ namespace Microsoft.DotNet.Cli }, ["tool"] = new BuiltInCommandMetadata { - Command = ToolCommand.Run + Command = ToolCommand.Run, + DocLink = "https://aka.ms/dotnet-tool" }, ["buildserver"] = new BuiltInCommandMetadata { - Command = BuildServerCommand.Run + Command = BuildServerCommand.Run, + DocLink = "https://aka.ms/dotnet-build-server" }, ["internal-reportinstallsuccess"] = new BuiltInCommandMetadata { From fd66168922da263ae2c417e80c48796c34ab00a0 Mon Sep 17 00:00:00 2001 From: William Li Date: Mon, 16 Apr 2018 14:28:09 -0700 Subject: [PATCH 056/118] Error message has instruction to help investigate from NuGet error message --- .../dotnet-tool/install/LocalizableStrings.resx | 9 ++++++--- .../ToolInstallCommandLowLevelErrorConverter.cs | 2 +- .../install/xlf/LocalizableStrings.cs.xlf | 16 +++++++++++----- .../install/xlf/LocalizableStrings.de.xlf | 16 +++++++++++----- .../install/xlf/LocalizableStrings.es.xlf | 16 +++++++++++----- .../install/xlf/LocalizableStrings.fr.xlf | 16 +++++++++++----- .../install/xlf/LocalizableStrings.it.xlf | 16 +++++++++++----- .../install/xlf/LocalizableStrings.ja.xlf | 16 +++++++++++----- .../install/xlf/LocalizableStrings.ko.xlf | 16 +++++++++++----- .../install/xlf/LocalizableStrings.pl.xlf | 16 +++++++++++----- .../install/xlf/LocalizableStrings.pt-BR.xlf | 16 +++++++++++----- .../install/xlf/LocalizableStrings.ru.xlf | 16 +++++++++++----- .../install/xlf/LocalizableStrings.tr.xlf | 16 +++++++++++----- .../install/xlf/LocalizableStrings.zh-Hans.xlf | 16 +++++++++++----- .../install/xlf/LocalizableStrings.zh-Hant.xlf | 16 +++++++++++----- .../CommandTests/ToolInstallCommandTests.cs | 2 +- 16 files changed, 151 insertions(+), 70 deletions(-) diff --git a/src/dotnet/commands/dotnet-tool/install/LocalizableStrings.resx b/src/dotnet/commands/dotnet-tool/install/LocalizableStrings.resx index 9705509b6..2f818bfe8 100644 --- a/src/dotnet/commands/dotnet-tool/install/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-tool/install/LocalizableStrings.resx @@ -163,10 +163,13 @@ Tool '{1}' (version '{2}') was successfully installed. Tool '{0}' failed to install. - - Tool '{0}' failed to install. You may need to specify the version using + + Tool '{0}' failed to install. This failure may have been caused by: - dotnet tool install -g {0} --version <version> +* You are attempting to install a preview release and did not use the --version option to specify the version. +* A package by this name was found, but it was not a .NET Core tool. +* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. +* You mistyped the name of the tool. Tool '{0}' failed to install. Please contact the tool author for assistance. diff --git a/src/dotnet/commands/dotnet-tool/install/ToolInstallCommandLowLevelErrorConverter.cs b/src/dotnet/commands/dotnet-tool/install/ToolInstallCommandLowLevelErrorConverter.cs index b73409a32..8323696dc 100644 --- a/src/dotnet/commands/dotnet-tool/install/ToolInstallCommandLowLevelErrorConverter.cs +++ b/src/dotnet/commands/dotnet-tool/install/ToolInstallCommandLowLevelErrorConverter.cs @@ -18,7 +18,7 @@ namespace Microsoft.DotNet.Tools.Tool.Install userFacingMessages = new[] { ex.Message, - string.Format(LocalizableStrings.ToolInstallationFailedWithExplicitVersionGuide, packageId), + string.Format(LocalizableStrings.ToolInstallationFailedWithRestoreGuidance, packageId), }; } else if (ex is ToolConfigurationException) diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf index 87ff9977c..e89bdafbd 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf @@ -119,13 +119,19 @@ Nástroj {1} (verze {2}) byl úspěšně nainstalován. Tool '{0}' failed to install. - - Tool '{0}' failed to install. You may need to specify the version using + + Tool '{0}' failed to install. This failure may have been caused by: - dotnet tool install -g {0} --version <version> - Tool '{0}' failed to install. You may need to specify the version using +* You are attempting to install a preview release and did not use the --version option to specify the version. +* A package by this name was found, but it was not a .NET Core tool. +* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. +* You mistyped the name of the tool. + Tool '{0}' failed to install. This failure may have been caused by: - dotnet tool install -g {0} --version <version> +* You are attempting to install a preview release and did not use the --version option to specify the version. +* A package by this name was found, but it was not a .NET Core tool. +* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. +* You mistyped the name of the tool. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.de.xlf index e16e431f9..9e8b1bb93 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.de.xlf @@ -119,13 +119,19 @@ Das Tool "{1}" (Version {2}) wurde erfolgreich installiert. Tool '{0}' failed to install. - - Tool '{0}' failed to install. You may need to specify the version using + + Tool '{0}' failed to install. This failure may have been caused by: - dotnet tool install -g {0} --version <version> - Tool '{0}' failed to install. You may need to specify the version using +* You are attempting to install a preview release and did not use the --version option to specify the version. +* A package by this name was found, but it was not a .NET Core tool. +* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. +* You mistyped the name of the tool. + Tool '{0}' failed to install. This failure may have been caused by: - dotnet tool install -g {0} --version <version> +* You are attempting to install a preview release and did not use the --version option to specify the version. +* A package by this name was found, but it was not a .NET Core tool. +* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. +* You mistyped the name of the tool. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.es.xlf index c6605fe72..537e3e3db 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.es.xlf @@ -119,13 +119,19 @@ La herramienta "{1}" (versión '{2}') se instaló correctamente. Tool '{0}' failed to install. - - Tool '{0}' failed to install. You may need to specify the version using + + Tool '{0}' failed to install. This failure may have been caused by: - dotnet tool install -g {0} --version <version> - Tool '{0}' failed to install. You may need to specify the version using +* You are attempting to install a preview release and did not use the --version option to specify the version. +* A package by this name was found, but it was not a .NET Core tool. +* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. +* You mistyped the name of the tool. + Tool '{0}' failed to install. This failure may have been caused by: - dotnet tool install -g {0} --version <version> +* You are attempting to install a preview release and did not use the --version option to specify the version. +* A package by this name was found, but it was not a .NET Core tool. +* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. +* You mistyped the name of the tool. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.fr.xlf index 9e1e0600e..b6346f71c 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.fr.xlf @@ -119,13 +119,19 @@ L'outil '{1}' (version '{2}') a été installé correctement. Tool '{0}' failed to install. - - Tool '{0}' failed to install. You may need to specify the version using + + Tool '{0}' failed to install. This failure may have been caused by: - dotnet tool install -g {0} --version <version> - Tool '{0}' failed to install. You may need to specify the version using +* You are attempting to install a preview release and did not use the --version option to specify the version. +* A package by this name was found, but it was not a .NET Core tool. +* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. +* You mistyped the name of the tool. + Tool '{0}' failed to install. This failure may have been caused by: - dotnet tool install -g {0} --version <version> +* You are attempting to install a preview release and did not use the --version option to specify the version. +* A package by this name was found, but it was not a .NET Core tool. +* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. +* You mistyped the name of the tool. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf index 534f8121f..138b4116f 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf @@ -119,13 +119,19 @@ Lo strumento '{1}' (versione '{2}') è stato installato. Tool '{0}' failed to install. - - Tool '{0}' failed to install. You may need to specify the version using + + Tool '{0}' failed to install. This failure may have been caused by: - dotnet tool install -g {0} --version <version> - Tool '{0}' failed to install. You may need to specify the version using +* You are attempting to install a preview release and did not use the --version option to specify the version. +* A package by this name was found, but it was not a .NET Core tool. +* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. +* You mistyped the name of the tool. + Tool '{0}' failed to install. This failure may have been caused by: - dotnet tool install -g {0} --version <version> +* You are attempting to install a preview release and did not use the --version option to specify the version. +* A package by this name was found, but it was not a .NET Core tool. +* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. +* You mistyped the name of the tool. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ja.xlf index 762707822..bdfdce7a7 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ja.xlf @@ -119,13 +119,19 @@ Tool '{1}' (version '{2}') was successfully installed. Tool '{0}' failed to install. - - Tool '{0}' failed to install. You may need to specify the version using + + Tool '{0}' failed to install. This failure may have been caused by: - dotnet tool install -g {0} --version <version> - Tool '{0}' failed to install. You may need to specify the version using +* You are attempting to install a preview release and did not use the --version option to specify the version. +* A package by this name was found, but it was not a .NET Core tool. +* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. +* You mistyped the name of the tool. + Tool '{0}' failed to install. This failure may have been caused by: - dotnet tool install -g {0} --version <version> +* You are attempting to install a preview release and did not use the --version option to specify the version. +* A package by this name was found, but it was not a .NET Core tool. +* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. +* You mistyped the name of the tool. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ko.xlf index 0d886b8aa..0a4912feb 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ko.xlf @@ -119,13 +119,19 @@ Tool '{1}' (version '{2}') was successfully installed. Tool '{0}' failed to install. - - Tool '{0}' failed to install. You may need to specify the version using + + Tool '{0}' failed to install. This failure may have been caused by: - dotnet tool install -g {0} --version <version> - Tool '{0}' failed to install. You may need to specify the version using +* You are attempting to install a preview release and did not use the --version option to specify the version. +* A package by this name was found, but it was not a .NET Core tool. +* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. +* You mistyped the name of the tool. + Tool '{0}' failed to install. This failure may have been caused by: - dotnet tool install -g {0} --version <version> +* You are attempting to install a preview release and did not use the --version option to specify the version. +* A package by this name was found, but it was not a .NET Core tool. +* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. +* You mistyped the name of the tool. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pl.xlf index e3f29a81e..2749cc7b6 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pl.xlf @@ -119,13 +119,19 @@ Pomyślnie zainstalowano narzędzie „{1}” (wersja: „{2}”). Tool '{0}' failed to install. - - Tool '{0}' failed to install. You may need to specify the version using + + Tool '{0}' failed to install. This failure may have been caused by: - dotnet tool install -g {0} --version <version> - Tool '{0}' failed to install. You may need to specify the version using +* You are attempting to install a preview release and did not use the --version option to specify the version. +* A package by this name was found, but it was not a .NET Core tool. +* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. +* You mistyped the name of the tool. + Tool '{0}' failed to install. This failure may have been caused by: - dotnet tool install -g {0} --version <version> +* You are attempting to install a preview release and did not use the --version option to specify the version. +* A package by this name was found, but it was not a .NET Core tool. +* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. +* You mistyped the name of the tool. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf index 21da5c644..01b134248 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf @@ -119,13 +119,19 @@ A ferramenta '{1}' (versão '{2}') foi instalada com êxito. Tool '{0}' failed to install. - - Tool '{0}' failed to install. You may need to specify the version using + + Tool '{0}' failed to install. This failure may have been caused by: - dotnet tool install -g {0} --version <version> - Tool '{0}' failed to install. You may need to specify the version using +* You are attempting to install a preview release and did not use the --version option to specify the version. +* A package by this name was found, but it was not a .NET Core tool. +* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. +* You mistyped the name of the tool. + Tool '{0}' failed to install. This failure may have been caused by: - dotnet tool install -g {0} --version <version> +* You are attempting to install a preview release and did not use the --version option to specify the version. +* A package by this name was found, but it was not a .NET Core tool. +* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. +* You mistyped the name of the tool. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf index 147a2264c..8bff7722b 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf @@ -119,13 +119,19 @@ Tool '{1}' (version '{2}') was successfully installed. Tool '{0}' failed to install. - - Tool '{0}' failed to install. You may need to specify the version using + + Tool '{0}' failed to install. This failure may have been caused by: - dotnet tool install -g {0} --version <version> - Tool '{0}' failed to install. You may need to specify the version using +* You are attempting to install a preview release and did not use the --version option to specify the version. +* A package by this name was found, but it was not a .NET Core tool. +* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. +* You mistyped the name of the tool. + Tool '{0}' failed to install. This failure may have been caused by: - dotnet tool install -g {0} --version <version> +* You are attempting to install a preview release and did not use the --version option to specify the version. +* A package by this name was found, but it was not a .NET Core tool. +* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. +* You mistyped the name of the tool. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.tr.xlf index 67e8ec50c..5ca51e1a4 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.tr.xlf @@ -119,13 +119,19 @@ Tool '{1}' (version '{2}') was successfully installed. Tool '{0}' failed to install. - - Tool '{0}' failed to install. You may need to specify the version using + + Tool '{0}' failed to install. This failure may have been caused by: - dotnet tool install -g {0} --version <version> - Tool '{0}' failed to install. You may need to specify the version using +* You are attempting to install a preview release and did not use the --version option to specify the version. +* A package by this name was found, but it was not a .NET Core tool. +* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. +* You mistyped the name of the tool. + Tool '{0}' failed to install. This failure may have been caused by: - dotnet tool install -g {0} --version <version> +* You are attempting to install a preview release and did not use the --version option to specify the version. +* A package by this name was found, but it was not a .NET Core tool. +* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. +* You mistyped the name of the tool. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf index bee401a25..8f097454d 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf @@ -119,13 +119,19 @@ Tool '{1}' (version '{2}') was successfully installed. Tool '{0}' failed to install. - - Tool '{0}' failed to install. You may need to specify the version using + + Tool '{0}' failed to install. This failure may have been caused by: - dotnet tool install -g {0} --version <version> - Tool '{0}' failed to install. You may need to specify the version using +* You are attempting to install a preview release and did not use the --version option to specify the version. +* A package by this name was found, but it was not a .NET Core tool. +* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. +* You mistyped the name of the tool. + Tool '{0}' failed to install. This failure may have been caused by: - dotnet tool install -g {0} --version <version> +* You are attempting to install a preview release and did not use the --version option to specify the version. +* A package by this name was found, but it was not a .NET Core tool. +* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. +* You mistyped the name of the tool. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf index a7873a9fc..65c5b605d 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf @@ -119,13 +119,19 @@ Tool '{1}' (version '{2}') was successfully installed. Tool '{0}' failed to install. - - Tool '{0}' failed to install. You may need to specify the version using + + Tool '{0}' failed to install. This failure may have been caused by: - dotnet tool install -g {0} --version <version> - Tool '{0}' failed to install. You may need to specify the version using +* You are attempting to install a preview release and did not use the --version option to specify the version. +* A package by this name was found, but it was not a .NET Core tool. +* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. +* You mistyped the name of the tool. + Tool '{0}' failed to install. This failure may have been caused by: - dotnet tool install -g {0} --version <version> +* You are attempting to install a preview release and did not use the --version option to specify the version. +* A package by this name was found, but it was not a .NET Core tool. +* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. +* You mistyped the name of the tool. diff --git a/test/dotnet.Tests/CommandTests/ToolInstallCommandTests.cs b/test/dotnet.Tests/CommandTests/ToolInstallCommandTests.cs index 6ba8a385f..9d52af4d8 100644 --- a/test/dotnet.Tests/CommandTests/ToolInstallCommandTests.cs +++ b/test/dotnet.Tests/CommandTests/ToolInstallCommandTests.cs @@ -364,7 +364,7 @@ namespace Microsoft.DotNet.Tests.Commands a.ShouldThrow().And.Message .Should().Contain( LocalizableStrings.ToolInstallationRestoreFailed + - Environment.NewLine + string.Format(LocalizableStrings.ToolInstallationFailedWithExplicitVersionGuide, PackageId)); + Environment.NewLine + string.Format(LocalizableStrings.ToolInstallationFailedWithRestoreGuidance, PackageId)); _fileSystem.Directory.Exists(Path.Combine(PathToPlacePackages, PackageId)).Should().BeFalse(); } From 617551d065a1fcb9e4692265975d68d93794b52a Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 16 Apr 2018 17:07:57 -0700 Subject: [PATCH 057/118] Update latest patch versions of .NET Core runtime --- build/MSBuildExtensions.targets | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets index 74401de5e..a2a27d61a 100644 --- a/build/MSBuildExtensions.targets +++ b/build/MSBuildExtensions.targets @@ -144,9 +144,9 @@ Copyright (c) .NET Foundation. All rights reserved. <_NETCoreSdkIsPreview>$(_NETCoreSdkIsPreview) - 1.0.10 - 1.1.7 - 2.0.6 + 1.0.11 + 1.1.8 + 2.0.7 ]]> From be2e00e7d283bbb56cd255a4168674e81c36b5d3 Mon Sep 17 00:00:00 2001 From: root <33230602+kasper3@users.noreply.github.com> Date: Mon, 16 Apr 2018 22:07:05 +0000 Subject: [PATCH 058/118] Update dotnet manpages for Unix --- Documentation/manpages/sdk/dotnet-new.1 | 16 ++++++++++- Documentation/manpages/tool/README.md | 27 +++++++------------ .../manpages/tool/update-man-pages.sh | 3 +++ 3 files changed, 28 insertions(+), 18 deletions(-) diff --git a/Documentation/manpages/sdk/dotnet-new.1 b/Documentation/manpages/sdk/dotnet-new.1 index 29b8af05f..f1242f3c1 100644 --- a/Documentation/manpages/sdk/dotnet-new.1 +++ b/Documentation/manpages/sdk/dotnet-new.1 @@ -301,6 +301,13 @@ For example if the directory already contains a project, it doesn't list all pro The language of the template to create. The language accepted varies by the template (see defaults in the arguments section). Not valid for some templates. +.IP +.nf +\f[C] +>\ [!NOTE] +>\ Some\ shells\ interpret\ `#`\ as\ a\ special\ character.\ In\ those\ cases,\ you\ need\ to\ enclose\ the\ language\ parameter\ value,\ such\ as\ `dotnet\ new\ console\ \-lang\ "F#"`. +\f[] +.fi .PP \f[C]\-n|\-\-name\ \f[] .PP @@ -350,6 +357,13 @@ For example if the directory already contains a project, it doesn't list all pro The language of the template to create. The language accepted varies by the template (see defaults in the arguments section). Not valid for some templates. +.IP +.nf +\f[C] +>\ [!NOTE] +>\ Some\ shells\ interpret\ `#`\ as\ a\ special\ character.\ In\ those\ cases,\ you\ need\ to\ enclose\ the\ language\ parameter\ value,\ such\ as\ `dotnet\ new\ console\ \-lang\ "F#"`. +\f[] +.fi .PP \f[C]\-n|\-\-name\ \f[] .PP @@ -548,7 +562,7 @@ The default value is \f[C]false\f[]. .PP Create an F# console application project in the current directory: .PP -\f[C]dotnet\ new\ console\ \-lang\ f#\f[] +\f[C]dotnet\ new\ console\ \-lang\ F#\f[] .PP Create a .NET Standard class library project in the specified directory (available only with .NET Core 2.0 SDK or later versions): .PP diff --git a/Documentation/manpages/tool/README.md b/Documentation/manpages/tool/README.md index 8806be693..2ee216742 100644 --- a/Documentation/manpages/tool/README.md +++ b/Documentation/manpages/tool/README.md @@ -20,23 +20,16 @@ Utility to update dotnet-cli documentation from https://github.com/dotnet/docs. ## Ubuntu example (from scratch) ```sh -sudo apt install -y pandoc python python-pip wget unzip < /dev/null -sudo pip install pandocfilters +apt update +apt install -y jq curl python python-pip wget unzip git < /dev/null +pip install pandocfilters + +pandocVersion=$(curl -s https://api.github.com/repos/jgm/pandoc/releases/latest | jq -r ".tag_name") +pandocVersionedName="pandoc-$pandocVersion-1-amd64.deb" +curl -sLO https://github.com/jgm/pandoc/releases/download/$pandocVersion/$pandocVersionedName > /dev/null +dpkg -i $pandocVersionedName +rm $pandocVersionedName* git clone https://github.com/dotnet/cli -./cli/Documentation/manpage/tool/update-man-pages.sh +./cli/Documentation/manpages/tool/update-man-pages.sh ``` - -The version of pandoc is printed in first line as code comment in `.1` (manpage) files. -If your version of pandoc is older than (or even equal to) the last modifed version, -please install the latest stable version of pandoc from https://github.com/jgm/pandoc/releases (deb file for Ubuntu): - -```sh -wget -q https://github.com/jgm/pandoc/releases/download/$pandocVersion/$pandocVersionedName.deb > /dev/null -# or -# curl -sSLO https://github.com/jgm/pandoc/releases/download/$pandocVersion/$pandocVersionedName.deb > /dev/null -sudo dpkg -i $pandocVersionedName.deb -rm $pandocVersionedName.deb* -``` - -after that update manpages by calling `update-man-pages.sh` script. diff --git a/Documentation/manpages/tool/update-man-pages.sh b/Documentation/manpages/tool/update-man-pages.sh index d52051377..9e177de92 100755 --- a/Documentation/manpages/tool/update-man-pages.sh +++ b/Documentation/manpages/tool/update-man-pages.sh @@ -19,7 +19,10 @@ else exit 1 fi +echo "Extracting master.zip" unzip -o master.zip > /dev/null + +echo "Removing master.zip" rm master.zip* ls docs-master/docs/core/tools/dotnet*.md | while read -r line; From 854feefe6f7ed2c35e2dd061abe3862befc4464e Mon Sep 17 00:00:00 2001 From: William Li Date: Tue, 17 Apr 2018 12:21:20 -0700 Subject: [PATCH 059/118] Give a different error to guide use to install via global tools (#9070) Give a different error to guide use to install via global tools so, if several bundled DotnetTools cannot finish source build on time. The user can use global tools to get it. The original plan that adding a different resolver is hard due to resolver can only find dll that will be used to spawn a process. However, the command constructor will give an error message when resolver find null. By adding a different error when the command name is part of the list, it can achieve the same goal. --- src/Microsoft.DotNet.Cli.Utils/Command.cs | 11 ++- .../CommandAvailableAsDotNetToolException.cs | 29 +++++++ .../LocalizableStrings.resx | 5 ++ .../xlf/LocalizableStrings.cs.xlf | 9 +++ .../xlf/LocalizableStrings.de.xlf | 9 +++ .../xlf/LocalizableStrings.es.xlf | 9 +++ .../xlf/LocalizableStrings.fr.xlf | 9 +++ .../xlf/LocalizableStrings.it.xlf | 9 +++ .../xlf/LocalizableStrings.ja.xlf | 9 +++ .../xlf/LocalizableStrings.ko.xlf | 9 +++ .../xlf/LocalizableStrings.pl.xlf | 9 +++ .../xlf/LocalizableStrings.pt-BR.xlf | 9 +++ .../xlf/LocalizableStrings.ru.xlf | 9 +++ .../xlf/LocalizableStrings.tr.xlf | 9 +++ .../xlf/LocalizableStrings.zh-Hans.xlf | 9 +++ .../xlf/LocalizableStrings.zh-Hant.xlf | 9 +++ test/dotnet.Tests/CommandObjectTests.cs | 77 +++++++++++++++++++ 17 files changed, 238 insertions(+), 1 deletion(-) create mode 100644 src/Microsoft.DotNet.Cli.Utils/CommandAvailableAsDotNetToolException.cs create mode 100644 test/dotnet.Tests/CommandObjectTests.cs diff --git a/src/Microsoft.DotNet.Cli.Utils/Command.cs b/src/Microsoft.DotNet.Cli.Utils/Command.cs index 3413c1350..0165f9dfc 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Command.cs +++ b/src/Microsoft.DotNet.Cli.Utils/Command.cs @@ -21,6 +21,8 @@ namespace Microsoft.DotNet.Cli.Utils private bool _running = false; + private static string[] _knownCommandsAvailableAsDotNetTool = new[] { "dotnet-dev-certs", "dotnet-ef", "dotnet-sql-cache", "dotnet-user-secrets", "dotnet-watch" }; + private Command(CommandSpec commandSpec) { var psi = new ProcessStartInfo @@ -102,7 +104,14 @@ namespace Microsoft.DotNet.Cli.Utils if (commandSpec == null) { - throw new CommandUnknownException(commandName); + if (_knownCommandsAvailableAsDotNetTool.Contains(commandName, StringComparer.OrdinalIgnoreCase)) + { + throw new CommandAvailableAsDotNetToolException(commandName); + } + else + { + throw new CommandUnknownException(commandName); + } } var command = new Command(commandSpec); diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandAvailableAsDotNetToolException.cs b/src/Microsoft.DotNet.Cli.Utils/CommandAvailableAsDotNetToolException.cs new file mode 100644 index 000000000..185e12dcc --- /dev/null +++ b/src/Microsoft.DotNet.Cli.Utils/CommandAvailableAsDotNetToolException.cs @@ -0,0 +1,29 @@ +// 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; + +namespace Microsoft.DotNet.Cli.Utils +{ + public class CommandAvailableAsDotNetToolException : GracefulException + { + public CommandAvailableAsDotNetToolException(string commandName) : base(GetMessage(commandName)) + { + } + + public CommandAvailableAsDotNetToolException(string commandName, Exception innerException) : base( + GetMessage(commandName), innerException) + { + } + + private static string GetMessage(string commandName) + { + var commandRemoveLeadningDotnet = commandName.Replace("dotnet-", string.Empty); + var packageName = "dotnet-" + commandRemoveLeadningDotnet.ToLower(); + + return string.Format(LocalizableStrings.CannotFindCommandAvailableAsTool, + commandRemoveLeadningDotnet, + packageName); + } + } +} diff --git a/src/Microsoft.DotNet.Cli.Utils/LocalizableStrings.resx b/src/Microsoft.DotNet.Cli.Utils/LocalizableStrings.resx index 435a26de9..0052c7542 100644 --- a/src/Microsoft.DotNet.Cli.Utils/LocalizableStrings.resx +++ b/src/Microsoft.DotNet.Cli.Utils/LocalizableStrings.resx @@ -271,4 +271,9 @@ Given file name '{0}' is longer than 1024 bytes + + Cannot find command 'dotnet {0}', please run the following command to install + +dotnet tool install --global {1} + diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf index e344ea524..a5d6c360f 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf @@ -259,6 +259,15 @@ Given file name '{0}' is longer than 1024 bytes + + Cannot find command 'dotnet {0}', please run the following command to install + +dotnet tool install --global {1} + Cannot find command 'dotnet {0}', please run the following command to install + +dotnet tool install --global {1} + + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.de.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.de.xlf index 61e4513d5..06d23632e 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.de.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.de.xlf @@ -259,6 +259,15 @@ Given file name '{0}' is longer than 1024 bytes + + Cannot find command 'dotnet {0}', please run the following command to install + +dotnet tool install --global {1} + Cannot find command 'dotnet {0}', please run the following command to install + +dotnet tool install --global {1} + + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.es.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.es.xlf index 6c204f324..632faa0ef 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.es.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.es.xlf @@ -259,6 +259,15 @@ Given file name '{0}' is longer than 1024 bytes + + Cannot find command 'dotnet {0}', please run the following command to install + +dotnet tool install --global {1} + Cannot find command 'dotnet {0}', please run the following command to install + +dotnet tool install --global {1} + + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.fr.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.fr.xlf index 88aad3035..fc3f12a30 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.fr.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.fr.xlf @@ -259,6 +259,15 @@ Given file name '{0}' is longer than 1024 bytes + + Cannot find command 'dotnet {0}', please run the following command to install + +dotnet tool install --global {1} + Cannot find command 'dotnet {0}', please run the following command to install + +dotnet tool install --global {1} + + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.it.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.it.xlf index ca4052e06..fe089b9e5 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.it.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.it.xlf @@ -259,6 +259,15 @@ Given file name '{0}' is longer than 1024 bytes + + Cannot find command 'dotnet {0}', please run the following command to install + +dotnet tool install --global {1} + Cannot find command 'dotnet {0}', please run the following command to install + +dotnet tool install --global {1} + + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ja.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ja.xlf index b4a5d5c52..b269c1e83 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ja.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ja.xlf @@ -259,6 +259,15 @@ Given file name '{0}' is longer than 1024 bytes + + Cannot find command 'dotnet {0}', please run the following command to install + +dotnet tool install --global {1} + Cannot find command 'dotnet {0}', please run the following command to install + +dotnet tool install --global {1} + + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ko.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ko.xlf index 9dfca8978..bab65aaf3 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ko.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ko.xlf @@ -259,6 +259,15 @@ Given file name '{0}' is longer than 1024 bytes + + Cannot find command 'dotnet {0}', please run the following command to install + +dotnet tool install --global {1} + Cannot find command 'dotnet {0}', please run the following command to install + +dotnet tool install --global {1} + + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pl.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pl.xlf index ef52ffcc3..0fe411a66 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pl.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pl.xlf @@ -259,6 +259,15 @@ Given file name '{0}' is longer than 1024 bytes + + Cannot find command 'dotnet {0}', please run the following command to install + +dotnet tool install --global {1} + Cannot find command 'dotnet {0}', please run the following command to install + +dotnet tool install --global {1} + + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pt-BR.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pt-BR.xlf index fd20f0ffa..1640d7c7b 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pt-BR.xlf @@ -259,6 +259,15 @@ Given file name '{0}' is longer than 1024 bytes + + Cannot find command 'dotnet {0}', please run the following command to install + +dotnet tool install --global {1} + Cannot find command 'dotnet {0}', please run the following command to install + +dotnet tool install --global {1} + + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ru.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ru.xlf index 35d41a676..eb400aebe 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ru.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ru.xlf @@ -259,6 +259,15 @@ Given file name '{0}' is longer than 1024 bytes + + Cannot find command 'dotnet {0}', please run the following command to install + +dotnet tool install --global {1} + Cannot find command 'dotnet {0}', please run the following command to install + +dotnet tool install --global {1} + + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.tr.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.tr.xlf index b1afa5763..d59d59fa8 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.tr.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.tr.xlf @@ -259,6 +259,15 @@ Given file name '{0}' is longer than 1024 bytes + + Cannot find command 'dotnet {0}', please run the following command to install + +dotnet tool install --global {1} + Cannot find command 'dotnet {0}', please run the following command to install + +dotnet tool install --global {1} + + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hans.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hans.xlf index c30d33e41..ddceafc66 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hans.xlf @@ -259,6 +259,15 @@ Given file name '{0}' is longer than 1024 bytes + + Cannot find command 'dotnet {0}', please run the following command to install + +dotnet tool install --global {1} + Cannot find command 'dotnet {0}', please run the following command to install + +dotnet tool install --global {1} + + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hant.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hant.xlf index d56372b1f..19fa42985 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hant.xlf @@ -259,6 +259,15 @@ Given file name '{0}' is longer than 1024 bytes + + Cannot find command 'dotnet {0}', please run the following command to install + +dotnet tool install --global {1} + Cannot find command 'dotnet {0}', please run the following command to install + +dotnet tool install --global {1} + + \ No newline at end of file diff --git a/test/dotnet.Tests/CommandObjectTests.cs b/test/dotnet.Tests/CommandObjectTests.cs new file mode 100644 index 000000000..ce792d181 --- /dev/null +++ b/test/dotnet.Tests/CommandObjectTests.cs @@ -0,0 +1,77 @@ +// 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 Microsoft.DotNet.Cli.Utils; +using Microsoft.DotNet.Tools.Test.Utilities; +using System; +using Xunit; +using Xunit.Abstractions; +using FluentAssertions; + +namespace Microsoft.DotNet.Tests +{ + public class CommandObjectTests : TestBase + { + ITestOutputHelper _output; + + public CommandObjectTests(ITestOutputHelper output) + { + _output = output; + } + + [Fact] + public void WhenItCannotResolveCommandItThrows() + { + Action a = () => { Command.Create(new ResolveNothingCommandResolverPolicy(), "non-exist-command", Array.Empty() ); }; + a.ShouldThrow(); + } + + [Fact] + public void WhenItCannotResolveCommandButCommandIsInListOfKnownToolsItThrows() + { + Action a = () => { Command.Create(new ResolveNothingCommandResolverPolicy(), "non-exist-command", Array.Empty()); }; + a.ShouldThrow(); + } + + [Fact] + public void WhenItCannotResolveCommandButCommandIsInListOfKnownToolsItThrowsWithGuideToUseTool() + { + Action a = () => { Command.Create(new ResolveNothingCommandResolverPolicy(), "dotnet-ef", Array.Empty()); }; + a.ShouldThrow() + .And.Message.Should() + .Contain(string.Format(LocalizableStrings.CannotFindCommandAvailableAsTool, + "ef", + "dotnet-ef")); + } + + [Fact] + public void WhenItCannotResolveCommandButCommandIsInListOfKnownToolsItThrowsWithGuideToUseToolWithNormalizedCasing() + { + Action a = () => { Command.Create(new ResolveNothingCommandResolverPolicy(), "dotnet-EF", Array.Empty()); }; + a.ShouldThrow() + .And.Message.Should() + .Contain(string.Format(LocalizableStrings.CannotFindCommandAvailableAsTool, + "EF", + "dotnet-ef")); + } + + private class ResolveNothingCommandResolverPolicy : ICommandResolverPolicy + { + public CompositeCommandResolver CreateCommandResolver() + { + var compositeCommandResolver = new CompositeCommandResolver(); + compositeCommandResolver.AddCommandResolver(new ResolveNothingCommandResolver()); + + return compositeCommandResolver; + } + } + + private class ResolveNothingCommandResolver : ICommandResolver + { + public CommandSpec Resolve(CommandResolverArguments arguments) + { + return null; + } + } + } +} From 373f189ad2c496a05f009e2434ff520bb956f714 Mon Sep 17 00:00:00 2001 From: Livar Date: Tue, 17 Apr 2018 16:33:40 -0700 Subject: [PATCH 060/118] Updating branding to 2.1.4xx --- build/Version.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/Version.props b/build/Version.props index c8dd4c795..fae0ae5e1 100644 --- a/build/Version.props +++ b/build/Version.props @@ -2,8 +2,8 @@ 2 1 - 300 - preview3 + 400 + preview $(VersionMajor).$(VersionMinor).$(VersionPatch) $(CliVersionNoSuffix)-$(ReleaseSuffix) From 8c3967a36b4fe6ddccb784808a7819df8b18078f Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Tue, 17 Apr 2018 16:49:06 -0700 Subject: [PATCH 061/118] Updating README and branchinfo to 2.1.4xx. --- README.md | 66 +++++++++++++++++++++--------------------- build/BranchInfo.props | 4 +-- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index 9e7fd399b..059836fa7 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Looking for V1 of the .NET Core tooling? If you are looking for the v2.0 release of the .NET Core tools (CLI, MSBuild and the new csproj), head over to https://dot.net/core and download! -> **Note:** the release/2.1.3xx branch of the CLI repo is based on an upcoming update of the SDK and is considered pre-release. For production-level usage, please use the +> **Note:** the release/2.1.4xx branch of the CLI repo is based on an upcoming update of the SDK and is considered pre-release. For production-level usage, please use the > released version of the tools available at https://dot.net/core Found an issue? @@ -65,7 +65,7 @@ To download the .NET Core runtime **without** the SDK, visit https://github.com/ > want to install the latest released versions, check out the [preceding section](#looking-for-v1-of-the-net-core-tooling). > In order to be able to restore these pre-release packages, you may need to add a NuGet feed pointing to https://dotnet.myget.org/F/dotnet-core/api/v3/index.json. Other feeds may also be necessary depending on what kind of project you are working with. -| Platform | Latest Daily Build
*release/2.1.3xx*
[![][version-badge]][version] | +| Platform | Latest Daily Build
*release/2.1.4xx*
[![][version-badge]][version] | | -------- | :-------------------------------------: | | **Windows x64** | [Installer][win-x64-installer] - [Checksum][win-x64-installer-checksum]
[zip][win-x64-zip] - [Checksum][win-x64-zip-checksum] | | **Windows x86** | [Installer][win-x86-installer] - [Checksum][win-x86-installer-checksum]
[zip][win-x86-zip] - [Checksum][win-x86-zip-checksum] | @@ -76,7 +76,7 @@ To download the .NET Core runtime **without** the SDK, visit https://github.com/ | **RHEL 6** | [tar.gz][rhel-6-targz] - [Checksum][rhel-6-targz-checksum] | | **Alpine 3.6** | [tar.gz][alpine-3.6-targz] - [Checksum][alpine-3.6-targz-checksum] | -| Latest Coherent Build2
*release/2.1.3xx* | +| Latest Coherent Build2
*release/2.1.4xx* | |:------:| | [![][coherent-version-badge]][coherent-version] | @@ -84,47 +84,47 @@ Reference notes: > **1**: *Our Debian packages are put together slightly differently than the other OS specific installers. Instead of combining everything, we have separate component packages that depend on each other. If you're installing these directly from the .deb files (via dpkg or similar), then you'll need to install the [corresponding Host, Host FX Resolver, and Shared Framework packages](https://github.com/dotnet/core-setup#daily-builds) before installing the Sdk package.* >

**2**: *A 'coherent' build is defined as a build where the Runtime version matches between the CLI and Asp.NET.* -[version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/latest.version -[coherent-version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/latest.coherent.version +[version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/latest.version +[coherent-version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/latest.coherent.version [comment]: # (The latest versions are always the same across all platforms. Just need one to show, so picking win-x64's svg.) -[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/win_x64_Release_version_badge.svg -[coherent-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/win_x64_Release_coherent_badge.svg +[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/win_x64_Release_version_badge.svg +[coherent-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/win_x64_Release_coherent_badge.svg -[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-win-x64.exe -[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-win-x64.exe.sha -[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-win-x64.zip -[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-win-x64.zip.sha +[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-win-x64.exe +[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-win-x64.exe.sha +[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-win-x64.zip +[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-win-x64.zip.sha -[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-win-x86.exe -[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-win-x86.exe.sha -[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-win-x86.zip -[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-win-x86.zip.sha +[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-win-x86.exe +[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-win-x86.exe.sha +[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-win-x86.zip +[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-win-x86.zip.sha -[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-osx-x64.pkg -[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-osx-x64.pkg.sha -[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-osx-x64.tar.gz -[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-osx-x64.tar.gz.sha +[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-osx-x64.pkg +[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-osx-x64.pkg.sha +[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-osx-x64.tar.gz +[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-osx-x64.tar.gz.sha -[linux-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-linux-x64.tar.gz -[linux-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-linux-x64.tar.gz.sha +[linux-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-linux-x64.tar.gz +[linux-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-linux-x64.tar.gz.sha -[linux-arm-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-linux-arm.tar.gz -[linux-arm-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-linux-arm.tar.gz.sha +[linux-arm-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-linux-arm.tar.gz +[linux-arm-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-linux-arm.tar.gz.sha -[linux-arm64-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-linux-arm64.tar.gz -[linux-arm64-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-linux-arm64.tar.gz.sha +[linux-arm64-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-linux-arm64.tar.gz +[linux-arm64-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-linux-arm64.tar.gz.sha -[linux-DEB-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-x64.deb -[linux-DEB-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-x64.deb.sha +[linux-DEB-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-x64.deb +[linux-DEB-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-x64.deb.sha -[linux-RPM-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-x64.rpm -[linux-RPM-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-x64.rpm.sha +[linux-RPM-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-x64.rpm +[linux-RPM-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-x64.rpm.sha -[rhel-6-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-rhel.6-x64.tar.gz -[rhel-6-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-rhel.6-x64.tar.gz.sha +[rhel-6-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-rhel.6-x64.tar.gz +[rhel-6-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-rhel.6-x64.tar.gz.sha -[alpine-3.6-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-alpine.3.6-x64.tar.gz -[alpine-3.6-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-alpine.3.6-x64.tar.gz.sha +[alpine-3.6-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-alpine.3.6-x64.tar.gz +[alpine-3.6-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.4xx/dotnet-sdk-latest-alpine.3.6-x64.tar.gz.sha # Debian daily feed diff --git a/build/BranchInfo.props b/build/BranchInfo.props index f62c8fd00..c7a84c19d 100644 --- a/build/BranchInfo.props +++ b/build/BranchInfo.props @@ -1,6 +1,6 @@ - master - master + release/2.1.4xx + release/2.1.4xx From 7d375481bc742586bca1cc8d1cf0b658ac97f29f Mon Sep 17 00:00:00 2001 From: John Beisner Date: Tue, 17 Apr 2018 16:53:03 -0700 Subject: [PATCH 062/118] Sign the 'nupkg' files; CLI:release/2.1.3xx (#9086) * Sign the 'nupkg' files. * Sign 'NuPkg' files with the 'NuGet' cert. * Use "Microsoft402" --- build/Signing.proj | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/build/Signing.proj b/build/Signing.proj index cb7b9fe78..4cd7f997a 100644 --- a/build/Signing.proj +++ b/build/Signing.proj @@ -5,6 +5,9 @@ true + 135020001 + Microsoft402 + NuGet @@ -106,6 +109,10 @@ $(InternalCertificateId) + + $(NugetCertificateId) + From 3f1ab372b49731b258a96d81119ada309d7cfa4f Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Tue, 17 Apr 2018 17:04:12 -0700 Subject: [PATCH 063/118] Rename buildserver command. This commit renames the `buildserver` command to `build-server`. Fixes #9075. --- src/dotnet/BuiltInCommandsCatalog.cs | 2 +- .../dotnet-buildserver/BuildServerCommand.cs | 2 +- .../BuildServerCommandParser.cs | 2 +- .../commands/dotnet-help/HelpUsageText.cs | 2 +- ...ivenThatIWantToShowHelpForDotnetCommand.cs | 2 +- .../BuildServerShutdownCommandTests.cs | 4 ++-- .../BuildServerShutdownParserTests.cs | 20 +++++++++---------- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/dotnet/BuiltInCommandsCatalog.cs b/src/dotnet/BuiltInCommandsCatalog.cs index 8a6f81824..e8faed4d9 100644 --- a/src/dotnet/BuiltInCommandsCatalog.cs +++ b/src/dotnet/BuiltInCommandsCatalog.cs @@ -151,7 +151,7 @@ namespace Microsoft.DotNet.Cli Command = ToolCommand.Run, DocLink = "https://aka.ms/dotnet-tool" }, - ["buildserver"] = new BuiltInCommandMetadata + ["build-server"] = new BuiltInCommandMetadata { Command = BuildServerCommand.Run, DocLink = "https://aka.ms/dotnet-build-server" diff --git a/src/dotnet/commands/dotnet-buildserver/BuildServerCommand.cs b/src/dotnet/commands/dotnet-buildserver/BuildServerCommand.cs index e45302274..801a3edff 100644 --- a/src/dotnet/commands/dotnet-buildserver/BuildServerCommand.cs +++ b/src/dotnet/commands/dotnet-buildserver/BuildServerCommand.cs @@ -12,7 +12,7 @@ namespace Microsoft.DotNet.Tools.BuildServer { public class BuildServerCommand : DotNetTopLevelCommandBase { - protected override string CommandName => "buildserver"; + protected override string CommandName => "build-server"; protected override string FullCommandNameLocalized => LocalizableStrings.BuildServerCommandName; protected override string ArgumentName => ""; protected override string ArgumentDescriptionLocalized => ""; diff --git a/src/dotnet/commands/dotnet-buildserver/BuildServerCommandParser.cs b/src/dotnet/commands/dotnet-buildserver/BuildServerCommandParser.cs index a7693c2d7..b298d391d 100644 --- a/src/dotnet/commands/dotnet-buildserver/BuildServerCommandParser.cs +++ b/src/dotnet/commands/dotnet-buildserver/BuildServerCommandParser.cs @@ -11,7 +11,7 @@ namespace Microsoft.DotNet.Cli public static Command CreateCommand() { return Create.Command( - "buildserver", + "build-server", LocalizableStrings.CommandDescription, Accept.NoArguments(), CommonOptions.HelpOption(), diff --git a/src/dotnet/commands/dotnet-help/HelpUsageText.cs b/src/dotnet/commands/dotnet-help/HelpUsageText.cs index afb84106f..0579e9d80 100644 --- a/src/dotnet/commands/dotnet-help/HelpUsageText.cs +++ b/src/dotnet/commands/dotnet-help/HelpUsageText.cs @@ -29,7 +29,7 @@ path-to-application: vstest {LocalizableStrings.VsTestDefinition} store {LocalizableStrings.StoreDefinition} tool {LocalizableStrings.ToolDefinition} - buildserver {LocalizableStrings.BuildServerDefinition} + build-server {LocalizableStrings.BuildServerDefinition} help {LocalizableStrings.HelpDefinition} {LocalizableStrings.CommonOptions}: diff --git a/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs b/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs index 38089f254..09461ed59 100644 --- a/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs +++ b/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs @@ -40,7 +40,7 @@ SDK commands: vstest Runs Microsoft Test Execution Command Line Tool. store Stores the specified assemblies in the runtime store. tool Install or work with tools that extend the .NET experience. - buildserver Interact with servers started by a build. + build-server Interact with servers started by a build. help Show help. Common options: diff --git a/test/dotnet.Tests/CommandTests/BuildServerShutdownCommandTests.cs b/test/dotnet.Tests/CommandTests/BuildServerShutdownCommandTests.cs index 795fe57d9..f41bc9400 100644 --- a/test/dotnet.Tests/CommandTests/BuildServerShutdownCommandTests.cs +++ b/test/dotnet.Tests/CommandTests/BuildServerShutdownCommandTests.cs @@ -172,9 +172,9 @@ namespace Microsoft.DotNet.Tests.Commands private BuildServerShutdownCommand CreateCommand(string options = "", IEnumerable managers = null) { - ParseResult result = Parser.Instance.Parse("dotnet buildserver shutdown " + options); + ParseResult result = Parser.Instance.Parse("dotnet build-server shutdown " + options); return new BuildServerShutdownCommand( - options: result["dotnet"]["buildserver"]["shutdown"], + options: result["dotnet"]["build-server"]["shutdown"], result: result, managers: managers, useOrderedWait: true, diff --git a/test/dotnet.Tests/ParserTests/BuildServerShutdownParserTests.cs b/test/dotnet.Tests/ParserTests/BuildServerShutdownParserTests.cs index fb6e66bc1..d17f6002e 100644 --- a/test/dotnet.Tests/ParserTests/BuildServerShutdownParserTests.cs +++ b/test/dotnet.Tests/ParserTests/BuildServerShutdownParserTests.cs @@ -23,9 +23,9 @@ namespace Microsoft.DotNet.Tests.ParserTests [Fact] public void GivenNoOptionsAllFlagsAreFalse() { - var result = Parser.Instance.Parse("dotnet buildserver shutdown"); + var result = Parser.Instance.Parse("dotnet build-server shutdown"); - var options = result["dotnet"]["buildserver"]["shutdown"]; + var options = result["dotnet"]["build-server"]["shutdown"]; options.ValueOrDefault("msbuild").Should().Be(false); options.ValueOrDefault("vbcscompiler").Should().Be(false); options.ValueOrDefault("razor").Should().Be(false); @@ -34,9 +34,9 @@ namespace Microsoft.DotNet.Tests.ParserTests [Fact] public void GivenMSBuildOptionIsItTrue() { - var result = Parser.Instance.Parse("dotnet buildserver shutdown --msbuild"); + var result = Parser.Instance.Parse("dotnet build-server shutdown --msbuild"); - var options = result["dotnet"]["buildserver"]["shutdown"]; + var options = result["dotnet"]["build-server"]["shutdown"]; options.ValueOrDefault("msbuild").Should().Be(true); options.ValueOrDefault("vbcscompiler").Should().Be(false); options.ValueOrDefault("razor").Should().Be(false); @@ -45,9 +45,9 @@ namespace Microsoft.DotNet.Tests.ParserTests [Fact] public void GivenVBCSCompilerOptionIsItTrue() { - var result = Parser.Instance.Parse("dotnet buildserver shutdown --vbcscompiler"); + var result = Parser.Instance.Parse("dotnet build-server shutdown --vbcscompiler"); - var options = result["dotnet"]["buildserver"]["shutdown"]; + var options = result["dotnet"]["build-server"]["shutdown"]; options.ValueOrDefault("msbuild").Should().Be(false); options.ValueOrDefault("vbcscompiler").Should().Be(true); options.ValueOrDefault("razor").Should().Be(false); @@ -56,9 +56,9 @@ namespace Microsoft.DotNet.Tests.ParserTests [Fact] public void GivenRazorOptionIsItTrue() { - var result = Parser.Instance.Parse("dotnet buildserver shutdown --razor"); + var result = Parser.Instance.Parse("dotnet build-server shutdown --razor"); - var options = result["dotnet"]["buildserver"]["shutdown"]; + var options = result["dotnet"]["build-server"]["shutdown"]; options.ValueOrDefault("msbuild").Should().Be(false); options.ValueOrDefault("vbcscompiler").Should().Be(false); options.ValueOrDefault("razor").Should().Be(true); @@ -67,9 +67,9 @@ namespace Microsoft.DotNet.Tests.ParserTests [Fact] public void GivenMultipleOptionsThoseAreTrue() { - var result = Parser.Instance.Parse("dotnet buildserver shutdown --razor --msbuild"); + var result = Parser.Instance.Parse("dotnet build-server shutdown --razor --msbuild"); - var options = result["dotnet"]["buildserver"]["shutdown"]; + var options = result["dotnet"]["build-server"]["shutdown"]; options.ValueOrDefault("msbuild").Should().Be(true); options.ValueOrDefault("vbcscompiler").Should().Be(false); options.ValueOrDefault("razor").Should().Be(true); From 34060d3a232a93229bcfa91724ea792fe6332d9e Mon Sep 17 00:00:00 2001 From: William Li Date: Wed, 18 Apr 2018 11:18:14 -0700 Subject: [PATCH 064/118] pick up nuget loc (#9090) --- src/redist/redist.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index e3f051a92..da0774145 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -19,6 +19,7 @@ + All From 3c344c2f832f8775fde0510cb90ca4e93d514128 Mon Sep 17 00:00:00 2001 From: Livar Date: Wed, 18 Apr 2018 12:03:42 -0700 Subject: [PATCH 065/118] Update Roslyn to 2.8.0-dev-62817-01 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 75cab6558..32d6a871e 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -10,7 +10,7 @@ $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) 10.1.4-rtm-180403-0 - 2.8.0-beta3-62722-05 + 2.8.0-dev-62817-01 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) 2.1.200-preview-62816-05 From 2d008aa4f74dabb7ab8b9e85aaa17d93dc1fc78f Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 18 Apr 2018 21:35:57 -0700 Subject: [PATCH 066/118] Add tests that assert the dependencies of the dotnet-sdk rpm and deb files --- build/package/Installer.DEB.targets | 1 + build/package/Installer.RPM.targets | 3 +- test/EndToEnd/GivenDotNetLinuxInstallers.cs | 83 +++++++++++++++++++++ 3 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 test/EndToEnd/GivenDotNetLinuxInstallers.cs diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets index 57b5a603d..3724823f6 100644 --- a/build/package/Installer.DEB.targets +++ b/build/package/Installer.DEB.targets @@ -109,6 +109,7 @@ + diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets index cb06d9823..093d820b4 100644 --- a/build/package/Installer.RPM.targets +++ b/build/package/Installer.RPM.targets @@ -137,6 +137,7 @@ + @@ -238,7 +239,7 @@ ToolPath="$(RpmInstalledDirectory)" /> diff --git a/test/EndToEnd/GivenDotNetLinuxInstallers.cs b/test/EndToEnd/GivenDotNetLinuxInstallers.cs new file mode 100644 index 000000000..4968f0221 --- /dev/null +++ b/test/EndToEnd/GivenDotNetLinuxInstallers.cs @@ -0,0 +1,83 @@ +// 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; +using System.IO; +using Microsoft.DotNet.Tools.Test.Utilities; +using Xunit; + +namespace Microsoft.DotNet.Tests.EndToEnd +{ + public class GivenDotNetLinuxInstallers + { + [Fact] + public void ItHasExpectedDependencies() + { + var installerFile = Environment.GetEnvironmentVariable("SDK_INSTALLER_FILE"); + if (string.IsNullOrEmpty(installerFile)) + { + return; + } + + var ext = Path.GetExtension(installerFile); + switch (ext) + { + case ".deb": + DebianPackageHasDependencyOnAspNetCoreStoreAndDotnetRuntime(installerFile); + return; + case ".rpm": + RpmPackageHasDependencyOnAspNetCoreStoreAndDotnetRuntime(installerFile); + return; + } + } + + private void DebianPackageHasDependencyOnAspNetCoreStoreAndDotnetRuntime(string installerFile) + { + // Example output: + + // $ dpkg --info dotnet-sdk-2.1.105-ubuntu-x64.deb + + // new debian package, version 2.0. + // size 75660448 bytes: control archive=29107 bytes. + // 717 bytes, 11 lines control + // 123707 bytes, 1004 lines md5sums + // 1710 bytes, 28 lines * postinst #!/usr/bin/env + // Package: dotnet-sdk-2.1.104 + // Version: 2.1.104-1 + // Architecture: amd64 + // Maintainer: Microsoft + // Installed-Size: 201119 + // Depends: dotnet-runtime-2.0.6, aspnetcore-store-2.0.6 + // Section: devel + // Priority: standard + // Homepage: https://dotnet.github.io/core + // Description: Microsoft .NET Core SDK - 2.1.104 + + new TestCommand("dpkg") + .ExecuteWithCapturedOutput($"--info {installerFile}") + .Should().Pass() + .And.HaveStdOutMatching(@"Depends:.*\s?dotnet-runtime-\d+(\.\d+){2}") + .And.HaveStdOutMatching(@"Depends:.*\s?aspnetcore-store-\d+(\.\d+){2}"); + } + + private void RpmPackageHasDependencyOnAspNetCoreStoreAndDotnetRuntime(string installerFile) + { + // Example output: + + // $ rpm -qpR dotnet-sdk-2.1.105-rhel-x64.rpm + + // dotnet-runtime-2.0.7 >= 2.0.7 + // aspnetcore-store-2.0.7 >= 2.0.7 + // /bin/sh + // /bin/sh + // rpmlib(PayloadFilesHavePrefix) <= 4.0-1 + // rpmlib(CompressedFileNames) <= 3.0.4-1 + + new TestCommand("rpm") + .ExecuteWithCapturedOutput($"-qpR {installerFile}") + .Should().Pass() + .And.HaveStdOutMatching(@"dotnet-runtime-\d+(\.\d+){2} >= \d+(\.\d+){2}") + .And.HaveStdOutMatching(@"aspnetcore-store-\d+(\.\d+){2} >= \d+(\.\d+){2}"); + } + } +} From f729fad2930f988718815c91d6c3bea426091555 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 18 Apr 2018 21:41:06 -0700 Subject: [PATCH 067/118] Fix the aspnetcore dependency on .rpm and .deb installers --- build/DependencyVersions.props | 1 - build/package/Installer.DEB.targets | 3 ++- build/package/Installer.RPM.targets | 10 ++++------ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index f485d871e..2356895c6 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -73,7 +73,6 @@ $(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp) aspnetcore-store - $(AspNetCoreVersion)-$(AspNetCoreRelease) $(AspNetCoreBranchName)-$(AspNetCoreRuntimePackageTimestamp) diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets index 3724823f6..3d3cc7bad 100644 --- a/build/package/Installer.DEB.targets +++ b/build/package/Installer.DEB.targets @@ -35,6 +35,7 @@ dotnet-hostfxr-$(HostFxrDebianPackageVersion) $(HostFxrDebianPackageName.ToLower()) dotnet-host + $(AspNetCoreRuntimePackageBrandName)-$(CurrentAspNetCoreRuntimeVersion) @@ -84,7 +85,7 @@ $(SharedFxDebianPackageName) - $(AspNetCoreRuntimePackageName) + $(AspNetCoreRuntimeDebPackageName) diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets index 093d820b4..fd9d4b117 100644 --- a/build/package/Installer.RPM.targets +++ b/build/package/Installer.RPM.targets @@ -50,10 +50,8 @@ dotnet-hostfxr-$(HostFxrRpmPackageVersion) $(HostFxrRpmPackageName.ToLower()) dotnet-host - $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp) - $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion) - $(AspNetCoreRuntimePackageBrandName)-2.0.0 - $(AspNetCoreRuntimePackageBrandName)-2.0.3 + $(AspNetCoreRuntimePackageBrandName)-$(CurrentAspNetCoreRuntimeVersion) + $(CurrentAspNetCoreRuntimeVersion) $(ScriptsDir)/$(AfterInstallHostScriptName) $(RpmLayoutScripts)/$(AfterInstallHostScriptName) @@ -112,10 +110,10 @@ $(SharedFrameworkVersion) - $(AspNetCoreRuntimePackageName) + $(AspNetCoreRuntimeRpmPackageName) - $(AspNetCoreRuntimePackageVersion) + $(AspNetCoreRuntimeRpmPackageVersion) $(SharedFxRpmPackageName) From 8317c6f0da340a94487b6d284256fea217a86dbf Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Thu, 19 Apr 2018 19:40:52 +0000 Subject: [PATCH 068/118] Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, msbuild, nugetclient, roslyn, sdk, templating, templating, templating, websdk to alpha-62819-01, alpha-62819-01, rc1-26419-02, rc1-26419-02, rc1-26419-02, rtm-180418-0, preview-000169, preview1.5116, dev-62819-05, preview3-62819-01, beta3-20180418-1607235, beta3-20180418-1607235, beta3-20180418-1607235, rc1-20180418-1607241, respectively --- build/DependencyVersions.props | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index ddbd48859..dc4b594eb 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -2,39 +2,39 @@ 2.1.0-preview2-30475 - 2.1.0-preview3-26411-06 + 2.1.0-rc1-26419-02 $(MicrosoftNETCoreAppPackageVersion) - 15.7.0-preview-000145 + 15.7.0-preview-000169 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 10.1.4-rtm-180406-0 - 2.8.0-beta4-62811-05 + 10.1.4-rtm-180418-0 + 2.8.0-dev-62819-05 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.300-preview3-62804-06 + 2.1.300-preview3-62819-01 $(MicrosoftNETSdkPackageVersion) $(MicrosoftAspNetCoreAppPackageVersion) - 2.1.300-preview2-20180406-1563552 + 2.1.300-rc1-20180418-1607241 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) - 1.0.2-beta3-20180406-1563557 + 1.0.2-beta3-20180418-1607235 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 1.0.2-beta3-20180406-1563557 - 1.0.2-beta3-20180406-1563557 + 1.0.2-beta3-20180418-1607235 + 1.0.2-beta3-20180418-1607235 $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) - 2.1.0-preview3-26411-06 - 2.1.0-preview3-26411-06 - 0.2.1-alpha-62806-05 - 1.3.1-alpha-62806-04 + 2.1.0-rc1-26419-02 + 2.1.0-rc1-26419-02 + 0.2.1-alpha-62819-01 + 1.3.1-alpha-62819-01 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 0.2.0-beta-62628-01 - 4.7.0-rtm.5081 + 4.8.0-preview1.5116 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 3070750a5b25bb82470bfe38acf8bd0b5488988c Mon Sep 17 00:00:00 2001 From: Livar Date: Thu, 19 Apr 2018 12:46:56 -0700 Subject: [PATCH 069/118] Updating CLI branding to RC1 --- build/Version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Version.props b/build/Version.props index c8dd4c795..c31b11744 100644 --- a/build/Version.props +++ b/build/Version.props @@ -3,7 +3,7 @@ 2 1 300 - preview3 + rc1 $(VersionMajor).$(VersionMinor).$(VersionPatch) $(CliVersionNoSuffix)-$(ReleaseSuffix) From 1ade191cb62a05f1fb42b58645beda5b70806ba5 Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Sun, 15 Apr 2018 00:50:32 -0700 Subject: [PATCH 070/118] Implement Razor server discovery by pid file. Previously, Razor server discovery for the `build-server shutdown` command was implemented by invoking MSBuild on a project file in the current directory to evaluate the path to the Razor server dll. This was problematic since it would only discover a single running Razor server instance and required that the user run the `build-server shutdown` command from a specific location. Razor's server now writes a "pid file" to a well-known location (`~/.dotnet/pids/build`) which the command can now enumerate to discover, and shutdown, the running Razor servers. This commit changes the Razor server discovery to use the pid files and removes the requirement that users need to run the command in specific directories to work. Fixes #9084. --- .../BuildServer/BuildServerException.cs | 22 ++ src/dotnet/BuildServer/BuildServerProvider.cs | 86 +++++++ ...IBuildServerManager.cs => IBuildServer.cs} | 8 +- .../BuildServer/IBuildServerProvider.cs | 23 ++ .../BuildServer/IRazorAssemblyResolver.cs | 14 -- .../BuildServer/LocalizableStrings.resx | 4 +- src/dotnet/BuildServer/MSBuildServer.cs | 21 ++ .../BuildServer/MSBuildServerManager.cs | 29 --- .../BuildServer/RazorAssemblyResolver.cs | 52 ----- src/dotnet/BuildServer/RazorPidFile.cs | 65 ++++++ src/dotnet/BuildServer/RazorServer.cs | 77 ++++++ src/dotnet/BuildServer/RazorServerManager.cs | 65 ------ src/dotnet/BuildServer/Result.cs | 37 --- ...ServerManager.cs => VBCSCompilerServer.cs} | 35 +-- .../BuildServer/xlf/LocalizableStrings.cs.xlf | 6 +- .../BuildServer/xlf/LocalizableStrings.de.xlf | 6 +- .../BuildServer/xlf/LocalizableStrings.es.xlf | 6 +- .../BuildServer/xlf/LocalizableStrings.fr.xlf | 6 +- .../BuildServer/xlf/LocalizableStrings.it.xlf | 6 +- .../BuildServer/xlf/LocalizableStrings.ja.xlf | 6 +- .../BuildServer/xlf/LocalizableStrings.ko.xlf | 6 +- .../BuildServer/xlf/LocalizableStrings.pl.xlf | 6 +- .../xlf/LocalizableStrings.pt-BR.xlf | 6 +- .../BuildServer/xlf/LocalizableStrings.ru.xlf | 6 +- .../BuildServer/xlf/LocalizableStrings.tr.xlf | 6 +- .../xlf/LocalizableStrings.zh-Hans.xlf | 6 +- .../xlf/LocalizableStrings.zh-Hant.xlf | 6 +- .../shutdown/BuildServerShutdownCommand.cs | 173 ++++++++------ .../shutdown/LocalizableStrings.resx | 14 +- .../shutdown/xlf/LocalizableStrings.cs.xlf | 22 +- .../shutdown/xlf/LocalizableStrings.de.xlf | 22 +- .../shutdown/xlf/LocalizableStrings.es.xlf | 22 +- .../shutdown/xlf/LocalizableStrings.fr.xlf | 22 +- .../shutdown/xlf/LocalizableStrings.it.xlf | 22 +- .../shutdown/xlf/LocalizableStrings.ja.xlf | 22 +- .../shutdown/xlf/LocalizableStrings.ko.xlf | 22 +- .../shutdown/xlf/LocalizableStrings.pl.xlf | 22 +- .../shutdown/xlf/LocalizableStrings.pt-BR.xlf | 22 +- .../shutdown/xlf/LocalizableStrings.ru.xlf | 22 +- .../shutdown/xlf/LocalizableStrings.tr.xlf | 22 +- .../xlf/LocalizableStrings.zh-Hans.xlf | 22 +- .../xlf/LocalizableStrings.zh-Hant.xlf | 22 +- .../Mock/FileSystemMockBuilder.cs | 10 +- .../BuildServerProviderTests.cs | 143 ++++++++++++ .../RazorServerManagerTests.cs | 123 ---------- .../BuildServerTests/RazorServerTests.cs | 109 +++++++++ .../VBCSCompilerServerManagerTests.cs | 75 ------ .../VBCSCompilerServerTests.cs | 63 +++++ .../BuildServerShutdownCommandTests.cs | 219 +++++++++--------- 49 files changed, 1115 insertions(+), 716 deletions(-) create mode 100644 src/dotnet/BuildServer/BuildServerException.cs create mode 100644 src/dotnet/BuildServer/BuildServerProvider.cs rename src/dotnet/BuildServer/{IBuildServerManager.cs => IBuildServer.cs} (69%) create mode 100644 src/dotnet/BuildServer/IBuildServerProvider.cs delete mode 100644 src/dotnet/BuildServer/IRazorAssemblyResolver.cs create mode 100644 src/dotnet/BuildServer/MSBuildServer.cs delete mode 100644 src/dotnet/BuildServer/MSBuildServerManager.cs delete mode 100644 src/dotnet/BuildServer/RazorAssemblyResolver.cs create mode 100644 src/dotnet/BuildServer/RazorPidFile.cs create mode 100644 src/dotnet/BuildServer/RazorServer.cs delete mode 100644 src/dotnet/BuildServer/RazorServerManager.cs delete mode 100644 src/dotnet/BuildServer/Result.cs rename src/dotnet/BuildServer/{VBCSCompilerServerManager.cs => VBCSCompilerServer.cs} (51%) create mode 100644 test/dotnet.Tests/BuildServerTests/BuildServerProviderTests.cs delete mode 100644 test/dotnet.Tests/BuildServerTests/RazorServerManagerTests.cs create mode 100644 test/dotnet.Tests/BuildServerTests/RazorServerTests.cs delete mode 100644 test/dotnet.Tests/BuildServerTests/VBCSCompilerServerManagerTests.cs create mode 100644 test/dotnet.Tests/BuildServerTests/VBCSCompilerServerTests.cs diff --git a/src/dotnet/BuildServer/BuildServerException.cs b/src/dotnet/BuildServer/BuildServerException.cs new file mode 100644 index 000000000..1bbdd9fb4 --- /dev/null +++ b/src/dotnet/BuildServer/BuildServerException.cs @@ -0,0 +1,22 @@ +// 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; + +namespace Microsoft.DotNet.BuildServer +{ + internal class BuildServerException : Exception + { + public BuildServerException() + { + } + + public BuildServerException(string message) : base(message) + { + } + + public BuildServerException(string message, Exception innerException) : base(message, innerException) + { + } + } +} diff --git a/src/dotnet/BuildServer/BuildServerProvider.cs b/src/dotnet/BuildServer/BuildServerProvider.cs new file mode 100644 index 000000000..e292d854a --- /dev/null +++ b/src/dotnet/BuildServer/BuildServerProvider.cs @@ -0,0 +1,86 @@ +// 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; +using System.Collections.Generic; +using System.IO; +using Microsoft.DotNet.Cli.Utils; +using Microsoft.DotNet.Configurer; +using Microsoft.Extensions.EnvironmentAbstractions; + +namespace Microsoft.DotNet.BuildServer +{ + internal class BuildServerProvider : IBuildServerProvider + { + private readonly IFileSystem _fileSystem; + private readonly IEnvironmentProvider _environmentProvider; + + public BuildServerProvider( + IFileSystem fileSystem = null, + IEnvironmentProvider environmentProvider = null) + { + _fileSystem = fileSystem ?? FileSystemWrapper.Default; + _environmentProvider = environmentProvider ?? new EnvironmentProvider(); + } + + public IEnumerable EnumerateBuildServers(ServerEnumerationFlags flags = ServerEnumerationFlags.All) + { + if ((flags & ServerEnumerationFlags.MSBuild) == ServerEnumerationFlags.MSBuild) + { + // Yield a single MSBuild server (handles server discovery itself) + // TODO: use pid file enumeration when supported by the server (https://github.com/dotnet/cli/issues/9113) + yield return new MSBuildServer(); + } + + if ((flags & ServerEnumerationFlags.VBCSCompiler) == ServerEnumerationFlags.VBCSCompiler) + { + // Yield a single VB/C# compiler (handles server discovery itself) + // TODO: use pid file enumeration when supported by the server (https://github.com/dotnet/cli/issues/9112) + yield return new VBCSCompilerServer(); + } + + // TODO: remove or amend this check when the following issues are resolved: + // https://github.com/dotnet/cli/issues/9112 + // https://github.com/dotnet/cli/issues/9113 + if ((flags & ServerEnumerationFlags.Razor) != ServerEnumerationFlags.Razor) + { + yield break; + } + + var directory = GetPidFileDirectory(); + + if (!_fileSystem.Directory.Exists(directory.Value)) + { + yield break; + } + + foreach (var path in _fileSystem.Directory.EnumerateFiles(directory.Value, "*")) + { + if ((flags & ServerEnumerationFlags.Razor) == ServerEnumerationFlags.Razor && + Path.GetFileName(path).StartsWith(RazorPidFile.FilePrefix)) + { + var file = RazorPidFile.Read(new FilePath(path), _fileSystem); + if (file != null) + { + yield return new RazorServer(file); + } + } + } + } + + public DirectoryPath GetPidFileDirectory() + { + var directory = _environmentProvider.GetEnvironmentVariable("DOTNET_BUILD_PIDFILE_DIRECTORY"); + if (!string.IsNullOrEmpty(directory)) + { + return new DirectoryPath(directory); + } + + return new DirectoryPath( + Path.Combine( + CliFolderPathCalculator.DotnetUserProfileFolderPath, + "pids", + "build")); + } + } +} diff --git a/src/dotnet/BuildServer/IBuildServerManager.cs b/src/dotnet/BuildServer/IBuildServer.cs similarity index 69% rename from src/dotnet/BuildServer/IBuildServerManager.cs rename to src/dotnet/BuildServer/IBuildServer.cs index 76d11a4be..4549567a1 100644 --- a/src/dotnet/BuildServer/IBuildServerManager.cs +++ b/src/dotnet/BuildServer/IBuildServer.cs @@ -6,10 +6,12 @@ using System.Threading.Tasks; namespace Microsoft.DotNet.BuildServer { - internal interface IBuildServerManager + internal interface IBuildServer { - string ServerName { get; } + int ProcessId { get; } - Task ShutdownServerAsync(); + string Name { get; } + + void Shutdown(); } } diff --git a/src/dotnet/BuildServer/IBuildServerProvider.cs b/src/dotnet/BuildServer/IBuildServerProvider.cs new file mode 100644 index 000000000..ef4a5b231 --- /dev/null +++ b/src/dotnet/BuildServer/IBuildServerProvider.cs @@ -0,0 +1,23 @@ +// 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; +using System.Collections.Generic; + +namespace Microsoft.DotNet.BuildServer +{ + [Flags] + internal enum ServerEnumerationFlags + { + None = 0, + MSBuild = 1, + VBCSCompiler = 2, + Razor = 4, + All = MSBuild | VBCSCompiler | Razor + } + + internal interface IBuildServerProvider + { + IEnumerable EnumerateBuildServers(ServerEnumerationFlags flags = ServerEnumerationFlags.All); + } +} diff --git a/src/dotnet/BuildServer/IRazorAssemblyResolver.cs b/src/dotnet/BuildServer/IRazorAssemblyResolver.cs deleted file mode 100644 index 31ad1a3e1..000000000 --- a/src/dotnet/BuildServer/IRazorAssemblyResolver.cs +++ /dev/null @@ -1,14 +0,0 @@ -// 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; -using System.Collections.Generic; -using Microsoft.Extensions.EnvironmentAbstractions; - -namespace Microsoft.DotNet.BuildServer -{ - internal interface IRazorAssemblyResolver - { - IEnumerable EnumerateRazorToolAssemblies(); - } -} diff --git a/src/dotnet/BuildServer/LocalizableStrings.resx b/src/dotnet/BuildServer/LocalizableStrings.resx index 198c6ee2e..8534ae97a 100644 --- a/src/dotnet/BuildServer/LocalizableStrings.resx +++ b/src/dotnet/BuildServer/LocalizableStrings.resx @@ -126,7 +126,7 @@ Razor build server - - a Razor project was not found in the current directory. + + The shutdown command failed: {0} diff --git a/src/dotnet/BuildServer/MSBuildServer.cs b/src/dotnet/BuildServer/MSBuildServer.cs new file mode 100644 index 000000000..6d25da9f8 --- /dev/null +++ b/src/dotnet/BuildServer/MSBuildServer.cs @@ -0,0 +1,21 @@ +// 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; +using System.Threading.Tasks; +using Microsoft.Build.Execution; + +namespace Microsoft.DotNet.BuildServer +{ + internal class MSBuildServer : IBuildServer + { + public int ProcessId => 0; // Not yet used + + public string Name => LocalizableStrings.MSBuildServer; + + public void Shutdown() + { + BuildManager.DefaultBuildManager.ShutdownAllNodes(); + } + } +} diff --git a/src/dotnet/BuildServer/MSBuildServerManager.cs b/src/dotnet/BuildServer/MSBuildServerManager.cs deleted file mode 100644 index d0667a600..000000000 --- a/src/dotnet/BuildServer/MSBuildServerManager.cs +++ /dev/null @@ -1,29 +0,0 @@ -// 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; -using System.Threading.Tasks; -using Microsoft.Build.Execution; - -namespace Microsoft.DotNet.BuildServer -{ - internal class MSBuildServerManager : IBuildServerManager - { - public string ServerName => LocalizableStrings.MSBuildServer; - - public Task ShutdownServerAsync() - { - return Task.Run(() => { - try - { - BuildManager.DefaultBuildManager.ShutdownAllNodes(); - return new Result(ResultKind.Success); - } - catch (Exception ex) - { - return new Result(ex); - } - }); - } - } -} diff --git a/src/dotnet/BuildServer/RazorAssemblyResolver.cs b/src/dotnet/BuildServer/RazorAssemblyResolver.cs deleted file mode 100644 index 517fc2830..000000000 --- a/src/dotnet/BuildServer/RazorAssemblyResolver.cs +++ /dev/null @@ -1,52 +0,0 @@ -// 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; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using Microsoft.DotNet.Cli.Utils; -using Microsoft.Build.Execution; -using Microsoft.Extensions.EnvironmentAbstractions; - -namespace Microsoft.DotNet.BuildServer -{ - internal class RazorAssemblyResolver : IRazorAssemblyResolver - { - private readonly IDirectory _directory; - - public RazorAssemblyResolver(IDirectory directory = null) - { - _directory = directory ?? FileSystemWrapper.Default.Directory; - } - - public IEnumerable EnumerateRazorToolAssemblies() - { - HashSet seen = new HashSet(); - - var globalProperties = new Dictionary(StringComparer.OrdinalIgnoreCase) - { - // This property disables default item globbing to improve performance - // This should be safe because we are not evaluating items, only properties - { Constants.EnableDefaultItems, "false" } - }; - - foreach (var projectFile in _directory.EnumerateFiles(Directory.GetCurrentDirectory(), "*.*proj")) - { - var project = new ProjectInstance(projectFile, globalProperties, null); - var path = project.GetPropertyValue("_RazorToolAssembly"); - if (string.IsNullOrEmpty(path)) - { - continue; - } - - if (!seen.Add(path)) - { - continue; - } - - yield return new FilePath(path); - } - } - } -} diff --git a/src/dotnet/BuildServer/RazorPidFile.cs b/src/dotnet/BuildServer/RazorPidFile.cs new file mode 100644 index 000000000..dd8806c9e --- /dev/null +++ b/src/dotnet/BuildServer/RazorPidFile.cs @@ -0,0 +1,65 @@ +// 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; +using System.IO; +using System.Text; +using Microsoft.Extensions.EnvironmentAbstractions; + +namespace Microsoft.DotNet.BuildServer +{ + internal class RazorPidFile + { + public const string RazorServerType = "rzc"; + public const string FilePrefix = "rzc-"; + + public RazorPidFile(FilePath path, int processId, FilePath serverPath, string pipeName) + { + Path = path; + ProcessId = processId; + ServerPath = serverPath; + PipeName = pipeName ?? throw new ArgumentNullException(pipeName); + } + + public FilePath Path { get; } + + public int ProcessId; + + public FilePath ServerPath { get; } + + public string PipeName { get; } + + public static RazorPidFile Read(FilePath path, IFileSystem fileSystem = null) + { + fileSystem = fileSystem ?? FileSystemWrapper.Default; + + using (var stream = fileSystem.File.OpenRead(path.Value)) + using (var reader = new StreamReader(stream, Encoding.UTF8)) + { + if (!int.TryParse(reader.ReadLine(), out var processId)) + { + return null; + } + + if (reader.ReadLine() != RazorServerType) + { + return null; + } + + var serverPath = reader.ReadLine(); + if (string.IsNullOrEmpty(serverPath)) + { + return null; + } + + var pipeName = reader.ReadLine(); + if (string.IsNullOrEmpty(pipeName)) + { + return null; + } + + return new RazorPidFile(path, processId, new FilePath(serverPath), pipeName); + } + } + } +} diff --git a/src/dotnet/BuildServer/RazorServer.cs b/src/dotnet/BuildServer/RazorServer.cs new file mode 100644 index 000000000..95d06c390 --- /dev/null +++ b/src/dotnet/BuildServer/RazorServer.cs @@ -0,0 +1,77 @@ +// 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; +using System.Diagnostics; +using System.IO; +using System.Threading.Tasks; +using Microsoft.DotNet.Cli; +using Microsoft.DotNet.Cli.Utils; +using Microsoft.DotNet.Tools; +using Microsoft.Extensions.EnvironmentAbstractions; + +namespace Microsoft.DotNet.BuildServer +{ + internal class RazorServer : IBuildServer + { + private readonly ICommandFactory _commandFactory; + private readonly IFileSystem _fileSystem; + + public RazorServer( + RazorPidFile pidFile, + ICommandFactory commandFactory = null, + IFileSystem fileSystem = null) + { + PidFile = pidFile ?? throw new ArgumentNullException(nameof(pidFile)); + _commandFactory = commandFactory ?? new DotNetCommandFactory(alwaysRunOutOfProc: true); + _fileSystem = fileSystem ?? FileSystemWrapper.Default; + } + + public int ProcessId => PidFile.ProcessId; + + public string Name => LocalizableStrings.RazorServer; + + public RazorPidFile PidFile { get; } + + public void Shutdown() + { + var command = _commandFactory + .Create( + "exec", + new string[] { + PidFile.ServerPath.Value, + "shutdown", + "-w", // Wait for exit + "-p", // Pipe name + PidFile.PipeName + }) + .CaptureStdOut() + .CaptureStdErr(); + + var result = command.Execute(); + if (result.ExitCode != 0) + { + throw new BuildServerException( + string.Format( + LocalizableStrings.ShutdownCommandFailed, + result.StdErr)); + } + + // After a successful shutdown, ensure the pid file is deleted + // If the pid file was left behind due to a rude exit, this ensures we don't try to shut it down again + try + { + if (_fileSystem.File.Exists(PidFile.Path.Value)) + { + _fileSystem.File.Delete(PidFile.Path.Value); + } + } + catch (UnauthorizedAccessException) + { + } + catch (IOException) + { + } + } + } +} diff --git a/src/dotnet/BuildServer/RazorServerManager.cs b/src/dotnet/BuildServer/RazorServerManager.cs deleted file mode 100644 index 526724d6e..000000000 --- a/src/dotnet/BuildServer/RazorServerManager.cs +++ /dev/null @@ -1,65 +0,0 @@ -// 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; -using System.IO; -using System.Threading.Tasks; -using Microsoft.Build.Exceptions; -using Microsoft.DotNet.Cli; -using Microsoft.DotNet.Cli.Utils; -using Microsoft.DotNet.Tools; -using Microsoft.Extensions.EnvironmentAbstractions; - -namespace Microsoft.DotNet.BuildServer -{ - internal class RazorServerManager : IBuildServerManager - { - private readonly IRazorAssemblyResolver _resolver; - private readonly ICommandFactory _commandFactory; - - public RazorServerManager(IRazorAssemblyResolver resolver = null, ICommandFactory commandFactory = null) - { - _resolver = resolver ?? new RazorAssemblyResolver(); - _commandFactory = commandFactory ?? new DotNetCommandFactory(alwaysRunOutOfProc: true); - } - - public string ServerName => LocalizableStrings.RazorServer; - - public Task ShutdownServerAsync() - { - return Task.Run(() => { - try - { - bool haveRazorAssembly = false; - - foreach (var toolAssembly in _resolver.EnumerateRazorToolAssemblies()) - { - haveRazorAssembly = true; - - var command = _commandFactory - .Create("exec", new string[] { toolAssembly.Value, "shutdown" }) - .CaptureStdOut() - .CaptureStdErr(); - - var result = command.Execute(); - if (result.ExitCode != 0) - { - return new Result(ResultKind.Failure, result.StdErr); - } - } - - if (!haveRazorAssembly) - { - return new Result(ResultKind.Skipped, LocalizableStrings.NoRazorProjectFound); - } - - return new Result(ResultKind.Success); - } - catch (InvalidProjectFileException ex) - { - return new Result(ex); - } - }); - } - } -} diff --git a/src/dotnet/BuildServer/Result.cs b/src/dotnet/BuildServer/Result.cs deleted file mode 100644 index 5962fa145..000000000 --- a/src/dotnet/BuildServer/Result.cs +++ /dev/null @@ -1,37 +0,0 @@ -// 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; - -namespace Microsoft.DotNet.BuildServer -{ - internal enum ResultKind - { - Success, - Failure, - Skipped - } - - internal struct Result - { - public Result(ResultKind kind, string message = null) - { - Kind = kind; - Message = message; - Exception = null; - } - - public Result(Exception exception) - { - Kind = ResultKind.Failure; - Message = exception.Message; - Exception = exception; - } - - public ResultKind Kind { get; private set; } - - public string Message { get; private set; } - - public Exception Exception { get; private set; } - } -} diff --git a/src/dotnet/BuildServer/VBCSCompilerServerManager.cs b/src/dotnet/BuildServer/VBCSCompilerServer.cs similarity index 51% rename from src/dotnet/BuildServer/VBCSCompilerServerManager.cs rename to src/dotnet/BuildServer/VBCSCompilerServer.cs index 12b7bc111..45de2d451 100644 --- a/src/dotnet/BuildServer/VBCSCompilerServerManager.cs +++ b/src/dotnet/BuildServer/VBCSCompilerServer.cs @@ -10,7 +10,7 @@ using Microsoft.DotNet.Cli.Utils; namespace Microsoft.DotNet.BuildServer { - internal class VBCSCompilerServerManager : IBuildServerManager + internal class VBCSCompilerServer : IBuildServer { internal static readonly string VBCSCompilerPath = Path.Combine( Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), @@ -20,29 +20,30 @@ namespace Microsoft.DotNet.BuildServer private readonly ICommandFactory _commandFactory; - public VBCSCompilerServerManager(ICommandFactory commandFactory = null) + public VBCSCompilerServer(ICommandFactory commandFactory = null) { _commandFactory = commandFactory ?? new DotNetCommandFactory(alwaysRunOutOfProc: true); } - public string ServerName => LocalizableStrings.VBCSCompilerServer; + public int ProcessId => 0; // Not yet used - public Task ShutdownServerAsync() + public string Name => LocalizableStrings.VBCSCompilerServer; + + public void Shutdown() { - return Task.Run(() => { - var command = _commandFactory - .Create("exec", new[] { VBCSCompilerPath, "-shutdown" }) - .CaptureStdOut() - .CaptureStdErr(); + var command = _commandFactory + .Create("exec", new[] { VBCSCompilerPath, "-shutdown" }) + .CaptureStdOut() + .CaptureStdErr(); - var result = command.Execute(); - if (result.ExitCode != 0) - { - return new Result(ResultKind.Failure, result.StdErr); - } - - return new Result(ResultKind.Success); - }); + var result = command.Execute(); + if (result.ExitCode != 0) + { + throw new BuildServerException( + string.Format( + LocalizableStrings.ShutdownCommandFailed, + result.StdErr)); + } } } } diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.cs.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.cs.xlf index 3064a54dc..52d049e73 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.cs.xlf @@ -17,9 +17,9 @@ Razor build server - - a Razor project was not found in the current directory. - a Razor project was not found in the current directory. + + The shutdown command failed: {0} + The shutdown command failed: {0} diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.de.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.de.xlf index 162b689a5..01befdbdf 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.de.xlf @@ -17,9 +17,9 @@ Razor build server - - a Razor project was not found in the current directory. - a Razor project was not found in the current directory. + + The shutdown command failed: {0} + The shutdown command failed: {0} diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.es.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.es.xlf index 28ee2c3ce..6e2b1f9d3 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.es.xlf @@ -17,9 +17,9 @@ Razor build server - - a Razor project was not found in the current directory. - a Razor project was not found in the current directory. + + The shutdown command failed: {0} + The shutdown command failed: {0} diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.fr.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.fr.xlf index 64b184f72..d3b8260eb 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.fr.xlf @@ -17,9 +17,9 @@ Razor build server - - a Razor project was not found in the current directory. - a Razor project was not found in the current directory. + + The shutdown command failed: {0} + The shutdown command failed: {0} diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.it.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.it.xlf index 816bdc16b..0ba45554d 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.it.xlf @@ -17,9 +17,9 @@ Razor build server - - a Razor project was not found in the current directory. - a Razor project was not found in the current directory. + + The shutdown command failed: {0} + The shutdown command failed: {0} diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.ja.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.ja.xlf index 1f143937f..b32bc5468 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.ja.xlf @@ -17,9 +17,9 @@ Razor build server - - a Razor project was not found in the current directory. - a Razor project was not found in the current directory. + + The shutdown command failed: {0} + The shutdown command failed: {0} diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.ko.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.ko.xlf index 61d5383c1..2a6174d9d 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.ko.xlf @@ -17,9 +17,9 @@ Razor build server - - a Razor project was not found in the current directory. - a Razor project was not found in the current directory. + + The shutdown command failed: {0} + The shutdown command failed: {0} diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.pl.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.pl.xlf index 93089c95e..18a9f836b 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.pl.xlf @@ -17,9 +17,9 @@ Razor build server - - a Razor project was not found in the current directory. - a Razor project was not found in the current directory. + + The shutdown command failed: {0} + The shutdown command failed: {0} diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.pt-BR.xlf index 6aeb12866..eb5bbde9b 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.pt-BR.xlf @@ -17,9 +17,9 @@ Razor build server - - a Razor project was not found in the current directory. - a Razor project was not found in the current directory. + + The shutdown command failed: {0} + The shutdown command failed: {0} diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.ru.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.ru.xlf index a16008670..3be9872f6 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.ru.xlf @@ -17,9 +17,9 @@ Razor build server - - a Razor project was not found in the current directory. - a Razor project was not found in the current directory. + + The shutdown command failed: {0} + The shutdown command failed: {0} diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.tr.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.tr.xlf index addbfafa2..455687b8b 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.tr.xlf @@ -17,9 +17,9 @@ Razor build server - - a Razor project was not found in the current directory. - a Razor project was not found in the current directory. + + The shutdown command failed: {0} + The shutdown command failed: {0} diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.zh-Hans.xlf index 7f3a039bc..e4534284b 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.zh-Hans.xlf @@ -17,9 +17,9 @@ Razor build server - - a Razor project was not found in the current directory. - a Razor project was not found in the current directory. + + The shutdown command failed: {0} + The shutdown command failed: {0} diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.zh-Hant.xlf index 0f9fdc61b..d6a2505b9 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.zh-Hant.xlf @@ -17,9 +17,9 @@ Razor build server - - a Razor project was not found in the current directory. - a Razor project was not found in the current directory. + + The shutdown command failed: {0} + The shutdown command failed: {0} diff --git a/src/dotnet/commands/dotnet-buildserver/shutdown/BuildServerShutdownCommand.cs b/src/dotnet/commands/dotnet-buildserver/shutdown/BuildServerShutdownCommand.cs index 300223e90..a6659bb49 100644 --- a/src/dotnet/commands/dotnet-buildserver/shutdown/BuildServerShutdownCommand.cs +++ b/src/dotnet/commands/dotnet-buildserver/shutdown/BuildServerShutdownCommand.cs @@ -14,6 +14,8 @@ namespace Microsoft.DotNet.Tools.BuildServer.Shutdown { internal class BuildServerShutdownCommand : CommandBase { + private readonly ServerEnumerationFlags _enumerationFlags; + private readonly IBuildServerProvider _serverProvider; private readonly bool _useOrderedWait; private readonly IReporter _reporter; private readonly IReporter _errorReporter; @@ -21,57 +23,63 @@ namespace Microsoft.DotNet.Tools.BuildServer.Shutdown public BuildServerShutdownCommand( AppliedOption options, ParseResult result, - IEnumerable managers = null, + IBuildServerProvider serverProvider = null, bool useOrderedWait = false, IReporter reporter = null) : base(result) { - if (managers == null) + bool msbuild = options.ValueOrDefault("msbuild"); + bool vbcscompiler = options.ValueOrDefault("vbcscompiler"); + bool razor = options.ValueOrDefault("razor"); + bool all = !msbuild && !vbcscompiler && !razor; + + _enumerationFlags = ServerEnumerationFlags.None; + if (msbuild || all) { - bool msbuild = options.ValueOrDefault("msbuild"); - bool vbcscompiler = options.ValueOrDefault("vbcscompiler"); - bool razor = options.ValueOrDefault("razor"); - bool all = !msbuild && !vbcscompiler && !razor; - - var enabledManagers = new List(); - if (msbuild || all) - { - enabledManagers.Add(new MSBuildServerManager()); - } - - if (vbcscompiler || all) - { - enabledManagers.Add(new VBCSCompilerServerManager()); - } - - if (razor || all) - { - enabledManagers.Add(new RazorServerManager()); - } - - managers = enabledManagers; + _enumerationFlags |= ServerEnumerationFlags.MSBuild; } - Managers = managers; + if (vbcscompiler || all) + { + _enumerationFlags |= ServerEnumerationFlags.VBCSCompiler; + } + + if (razor || all) + { + _enumerationFlags |= ServerEnumerationFlags.Razor; + } + + _serverProvider = serverProvider ?? new BuildServerProvider(); _useOrderedWait = useOrderedWait; _reporter = reporter ?? Reporter.Output; _errorReporter = reporter ?? Reporter.Error; } - public IEnumerable Managers { get; } - public override int Execute() { - bool success = true; - var tasks = StartShutdown(); + if (tasks.Count == 0) + { + _reporter.WriteLine(LocalizableStrings.NoServersToShutdown.Green()); + return 0; + } + + bool success = true; while (tasks.Count > 0) { var index = WaitForResult(tasks.Select(t => t.Item2).ToArray()); - var (manager, task) = tasks[index]; + var (server, task) = tasks[index]; - success &= HandleResult(manager, task.Result); + if (task.IsFaulted) + { + success = false; + WriteFailureMessage(server, task.Exception); + } + else + { + WriteSuccessMessage(server); + } tasks.RemoveAt(index); } @@ -79,14 +87,15 @@ namespace Microsoft.DotNet.Tools.BuildServer.Shutdown return success ? 0 : 1; } - private List<(IBuildServerManager, Task)> StartShutdown() + private List<(IBuildServer, Task)> StartShutdown() { - var tasks = new List<(IBuildServerManager, Task)>(); - foreach (var manager in Managers) + var tasks = new List<(IBuildServer, Task)>(); + foreach (var server in _serverProvider.EnumerateBuildServers(_enumerationFlags)) { - _reporter.WriteLine(string.Format(LocalizableStrings.ShuttingDownServer, manager.ServerName)); - tasks.Add((manager, manager.ShutdownServerAsync())); + WriteShutdownMessage(server); + tasks.Add((server, Task.Run(() => server.Shutdown()))); } + return tasks; } @@ -94,50 +103,72 @@ namespace Microsoft.DotNet.Tools.BuildServer.Shutdown { if (_useOrderedWait) { - tasks[0].Wait(); - return 0; + return Task.WaitAny(tasks.First()); } return Task.WaitAny(tasks); } - private bool HandleResult(IBuildServerManager manager, Result result) + private void WriteShutdownMessage(IBuildServer server) { - switch (result.Kind) + if (server.ProcessId != 0) { - case ResultKind.Success: - _reporter.WriteLine( - string.Format( - LocalizableStrings.ShutDownSucceeded, - manager.ServerName).Green()); - return true; + _reporter.WriteLine( + string.Format( + LocalizableStrings.ShuttingDownServerWithPid, + server.Name, + server.ProcessId)); + } + else + { + _reporter.WriteLine( + string.Format( + LocalizableStrings.ShuttingDownServer, + server.Name)); + } + } - case ResultKind.Skipped: - _reporter.WriteLine( - string.Format( - LocalizableStrings.ShutDownSkipped, - manager.ServerName, - result.Message).Cyan()); - return true; + private void WriteFailureMessage(IBuildServer server, AggregateException exception) + { + if (server.ProcessId != 0) + { + _reporter.WriteLine( + string.Format( + LocalizableStrings.ShutDownFailedWithPid, + server.Name, + server.ProcessId, + exception.InnerException.Message).Red()); + } + else + { + _reporter.WriteLine( + string.Format( + LocalizableStrings.ShutDownFailed, + server.Name, + exception.InnerException.Message).Red()); + } - case ResultKind.Failure: - _errorReporter.WriteLine( - string.Format( - LocalizableStrings.ShutDownFailed, - manager.ServerName, - result.Message).Red()); + if (Reporter.IsVerbose) + { + Reporter.Verbose.WriteLine(exception.ToString().Red()); + } + } - if (Reporter.IsVerbose && result.Exception != null) - { - Reporter.Verbose.WriteLine(result.Exception.ToString().Red()); - } - return false; - - default: - throw new NotSupportedException( - string.Format( - LocalizableStrings.UnsupportedEnumValue, - result.Kind.ToString(), - nameof(ResultKind))); + private void WriteSuccessMessage(IBuildServer server) + { + if (server.ProcessId != 0) + { + _reporter.WriteLine( + string.Format( + LocalizableStrings.ShutDownSucceededWithPid, + server.Name, + server.ProcessId).Green()); + } + else + { + _reporter.WriteLine( + string.Format( + LocalizableStrings.ShutDownSucceeded, + server.Name).Green()); } } } diff --git a/src/dotnet/commands/dotnet-buildserver/shutdown/LocalizableStrings.resx b/src/dotnet/commands/dotnet-buildserver/shutdown/LocalizableStrings.resx index edac1e52c..2d94d92a3 100644 --- a/src/dotnet/commands/dotnet-buildserver/shutdown/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-buildserver/shutdown/LocalizableStrings.resx @@ -132,16 +132,22 @@ Shutting down {0}... + + Shutting down {0} (process {1})... + {0} shut down successfully. + + {0} (process {1}) shut down successfully. + {0} failed to shut down: {1} - - {0} shut down was skipped: {1} + + {0} (process {1}) failed to shut down: {2} - - The value '{0}' for enum type '{1}' is not supported. + + No build servers are running. diff --git a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.cs.xlf index bb9a12c8c..d1c241f1f 100644 --- a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.cs.xlf @@ -37,14 +37,24 @@ {0} failed to shut down: {1} - - {0} shut down was skipped: {1} - {0} shut down was skipped: {1} + + Shutting down {0} (process {1})... + Shutting down {0} (process {1})... - - The value '{0}' for enum type '{1}' is not supported. - The value '{0}' for enum type '{1}' is not supported. + + {0} (process {1}) shut down successfully. + {0} (process {1}) shut down successfully. + + + + {0} (process {1}) failed to shut down: {2} + {0} (process {1}) failed to shut down: {2} + + + + No build servers are running. + No build servers are running. diff --git a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.de.xlf index 4f07f6028..7884b757b 100644 --- a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.de.xlf @@ -37,14 +37,24 @@ {0} failed to shut down: {1} - - {0} shut down was skipped: {1} - {0} shut down was skipped: {1} + + Shutting down {0} (process {1})... + Shutting down {0} (process {1})... - - The value '{0}' for enum type '{1}' is not supported. - The value '{0}' for enum type '{1}' is not supported. + + {0} (process {1}) shut down successfully. + {0} (process {1}) shut down successfully. + + + + {0} (process {1}) failed to shut down: {2} + {0} (process {1}) failed to shut down: {2} + + + + No build servers are running. + No build servers are running. diff --git a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.es.xlf index 47a9ad7c2..25561c2e0 100644 --- a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.es.xlf @@ -37,14 +37,24 @@ {0} failed to shut down: {1} - - {0} shut down was skipped: {1} - {0} shut down was skipped: {1} + + Shutting down {0} (process {1})... + Shutting down {0} (process {1})... - - The value '{0}' for enum type '{1}' is not supported. - The value '{0}' for enum type '{1}' is not supported. + + {0} (process {1}) shut down successfully. + {0} (process {1}) shut down successfully. + + + + {0} (process {1}) failed to shut down: {2} + {0} (process {1}) failed to shut down: {2} + + + + No build servers are running. + No build servers are running. diff --git a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.fr.xlf index e5a20083c..b8d2e3d6c 100644 --- a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.fr.xlf @@ -37,14 +37,24 @@ {0} failed to shut down: {1} - - {0} shut down was skipped: {1} - {0} shut down was skipped: {1} + + Shutting down {0} (process {1})... + Shutting down {0} (process {1})... - - The value '{0}' for enum type '{1}' is not supported. - The value '{0}' for enum type '{1}' is not supported. + + {0} (process {1}) shut down successfully. + {0} (process {1}) shut down successfully. + + + + {0} (process {1}) failed to shut down: {2} + {0} (process {1}) failed to shut down: {2} + + + + No build servers are running. + No build servers are running. diff --git a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.it.xlf index f48e4c3e0..c54c06b59 100644 --- a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.it.xlf @@ -37,14 +37,24 @@ {0} failed to shut down: {1} - - {0} shut down was skipped: {1} - {0} shut down was skipped: {1} + + Shutting down {0} (process {1})... + Shutting down {0} (process {1})... - - The value '{0}' for enum type '{1}' is not supported. - The value '{0}' for enum type '{1}' is not supported. + + {0} (process {1}) shut down successfully. + {0} (process {1}) shut down successfully. + + + + {0} (process {1}) failed to shut down: {2} + {0} (process {1}) failed to shut down: {2} + + + + No build servers are running. + No build servers are running. diff --git a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.ja.xlf index 2b49a95ea..83dc7fa57 100644 --- a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.ja.xlf @@ -37,14 +37,24 @@ {0} failed to shut down: {1} - - {0} shut down was skipped: {1} - {0} shut down was skipped: {1} + + Shutting down {0} (process {1})... + Shutting down {0} (process {1})... - - The value '{0}' for enum type '{1}' is not supported. - The value '{0}' for enum type '{1}' is not supported. + + {0} (process {1}) shut down successfully. + {0} (process {1}) shut down successfully. + + + + {0} (process {1}) failed to shut down: {2} + {0} (process {1}) failed to shut down: {2} + + + + No build servers are running. + No build servers are running. diff --git a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.ko.xlf index 40ca6507c..b67fc7055 100644 --- a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.ko.xlf @@ -37,14 +37,24 @@ {0} failed to shut down: {1} - - {0} shut down was skipped: {1} - {0} shut down was skipped: {1} + + Shutting down {0} (process {1})... + Shutting down {0} (process {1})... - - The value '{0}' for enum type '{1}' is not supported. - The value '{0}' for enum type '{1}' is not supported. + + {0} (process {1}) shut down successfully. + {0} (process {1}) shut down successfully. + + + + {0} (process {1}) failed to shut down: {2} + {0} (process {1}) failed to shut down: {2} + + + + No build servers are running. + No build servers are running. diff --git a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.pl.xlf index 625d93493..0df6609cf 100644 --- a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.pl.xlf @@ -37,14 +37,24 @@ {0} failed to shut down: {1} - - {0} shut down was skipped: {1} - {0} shut down was skipped: {1} + + Shutting down {0} (process {1})... + Shutting down {0} (process {1})... - - The value '{0}' for enum type '{1}' is not supported. - The value '{0}' for enum type '{1}' is not supported. + + {0} (process {1}) shut down successfully. + {0} (process {1}) shut down successfully. + + + + {0} (process {1}) failed to shut down: {2} + {0} (process {1}) failed to shut down: {2} + + + + No build servers are running. + No build servers are running. diff --git a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.pt-BR.xlf index 35cf7d075..af68eba6e 100644 --- a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.pt-BR.xlf @@ -37,14 +37,24 @@ {0} failed to shut down: {1} - - {0} shut down was skipped: {1} - {0} shut down was skipped: {1} + + Shutting down {0} (process {1})... + Shutting down {0} (process {1})... - - The value '{0}' for enum type '{1}' is not supported. - The value '{0}' for enum type '{1}' is not supported. + + {0} (process {1}) shut down successfully. + {0} (process {1}) shut down successfully. + + + + {0} (process {1}) failed to shut down: {2} + {0} (process {1}) failed to shut down: {2} + + + + No build servers are running. + No build servers are running. diff --git a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.ru.xlf index b6fdacbd6..03c7ce71c 100644 --- a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.ru.xlf @@ -37,14 +37,24 @@ {0} failed to shut down: {1} - - {0} shut down was skipped: {1} - {0} shut down was skipped: {1} + + Shutting down {0} (process {1})... + Shutting down {0} (process {1})... - - The value '{0}' for enum type '{1}' is not supported. - The value '{0}' for enum type '{1}' is not supported. + + {0} (process {1}) shut down successfully. + {0} (process {1}) shut down successfully. + + + + {0} (process {1}) failed to shut down: {2} + {0} (process {1}) failed to shut down: {2} + + + + No build servers are running. + No build servers are running. diff --git a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.tr.xlf index acde159fc..2804d42c6 100644 --- a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.tr.xlf @@ -37,14 +37,24 @@ {0} failed to shut down: {1} - - {0} shut down was skipped: {1} - {0} shut down was skipped: {1} + + Shutting down {0} (process {1})... + Shutting down {0} (process {1})... - - The value '{0}' for enum type '{1}' is not supported. - The value '{0}' for enum type '{1}' is not supported. + + {0} (process {1}) shut down successfully. + {0} (process {1}) shut down successfully. + + + + {0} (process {1}) failed to shut down: {2} + {0} (process {1}) failed to shut down: {2} + + + + No build servers are running. + No build servers are running. diff --git a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.zh-Hans.xlf index b9e0a6c1c..fd643550e 100644 --- a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.zh-Hans.xlf @@ -37,14 +37,24 @@ {0} failed to shut down: {1} - - {0} shut down was skipped: {1} - {0} shut down was skipped: {1} + + Shutting down {0} (process {1})... + Shutting down {0} (process {1})... - - The value '{0}' for enum type '{1}' is not supported. - The value '{0}' for enum type '{1}' is not supported. + + {0} (process {1}) shut down successfully. + {0} (process {1}) shut down successfully. + + + + {0} (process {1}) failed to shut down: {2} + {0} (process {1}) failed to shut down: {2} + + + + No build servers are running. + No build servers are running. diff --git a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.zh-Hant.xlf index a5a9c0cfc..5811f0c6e 100644 --- a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.zh-Hant.xlf @@ -37,14 +37,24 @@ {0} failed to shut down: {1} - - {0} shut down was skipped: {1} - {0} shut down was skipped: {1} + + Shutting down {0} (process {1})... + Shutting down {0} (process {1})... - - The value '{0}' for enum type '{1}' is not supported. - The value '{0}' for enum type '{1}' is not supported. + + {0} (process {1}) shut down successfully. + {0} (process {1}) shut down successfully. + + + + {0} (process {1}) failed to shut down: {2} + {0} (process {1}) failed to shut down: {2} + + + + No build servers are running. + No build servers are running. diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/FileSystemMockBuilder.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/FileSystemMockBuilder.cs index f75d3471b..2054d261a 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/FileSystemMockBuilder.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/FileSystemMockBuilder.cs @@ -166,7 +166,15 @@ namespace Microsoft.Extensions.DependencyModel.Tests public IEnumerable EnumerateFiles(string path, string searchPattern) { - throw new NotImplementedException(); + if (searchPattern != "*") + { + throw new NotImplementedException(); + } + + foreach (var kvp in _files.Where(kvp => kvp.Key != kvp.Value && Path.GetDirectoryName(kvp.Key) == path)) + { + yield return kvp.Key; + } } public IEnumerable EnumerateFileSystemEntries(string path) diff --git a/test/dotnet.Tests/BuildServerTests/BuildServerProviderTests.cs b/test/dotnet.Tests/BuildServerTests/BuildServerProviderTests.cs new file mode 100644 index 000000000..4293e49d5 --- /dev/null +++ b/test/dotnet.Tests/BuildServerTests/BuildServerProviderTests.cs @@ -0,0 +1,143 @@ +// 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; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using FluentAssertions; +using Microsoft.DotNet.BuildServer; +using Microsoft.DotNet.Cli.Utils; +using Microsoft.DotNet.Configurer; +using Microsoft.Extensions.DependencyModel.Tests; +using Moq; +using Xunit; +using LocalizableStrings = Microsoft.DotNet.BuildServer.LocalizableStrings; + +namespace Microsoft.DotNet.Tests.BuildServerTests +{ + public class BuildServerProviderTests + { + [Fact] + public void GivenMSBuildFlagItYieldsMSBuild() + { + var provider = new BuildServerProvider( + new FileSystemMockBuilder().Build(), + CreateEnvironmentProviderMock().Object); + + provider + .EnumerateBuildServers(ServerEnumerationFlags.MSBuild) + .Select(s => s.Name) + .Should() + .Equal(LocalizableStrings.MSBuildServer); + } + + [Fact] + public void GivenVBCSCompilerFlagItYieldsVBCSCompiler() + { + var provider = new BuildServerProvider( + new FileSystemMockBuilder().Build(), + CreateEnvironmentProviderMock().Object); + + provider + .EnumerateBuildServers(ServerEnumerationFlags.VBCSCompiler) + .Select(s => s.Name) + .Should() + .Equal(LocalizableStrings.VBCSCompilerServer); + } + + [Fact] + public void GivenRazorFlagAndNoPidDirectoryTheEnumerationIsEmpty() + { + var provider = new BuildServerProvider( + new FileSystemMockBuilder().Build(), + CreateEnvironmentProviderMock().Object); + + provider + .EnumerateBuildServers(ServerEnumerationFlags.Razor) + .Should() + .BeEmpty(); + } + + [Fact] + public void GivenNoEnvironmentVariableItUsesTheDefaultPidDirectory() + { + var provider = new BuildServerProvider( + new FileSystemMockBuilder().Build(), + CreateEnvironmentProviderMock().Object); + + provider + .GetPidFileDirectory() + .Value + .Should() + .Be(Path.Combine( + CliFolderPathCalculator.DotnetUserProfileFolderPath, + "pids", + "build")); + } + + [Fact] + public void GivenEnvironmentVariableItUsesItForThePidDirectory() + { + const string PidDirectory = "path/to/some/directory"; + + var provider = new BuildServerProvider( + new FileSystemMockBuilder().Build(), + CreateEnvironmentProviderMock(PidDirectory).Object); + + provider + .GetPidFileDirectory() + .Value + .Should() + .Be(PidDirectory); + } + + [Fact] + public void GivenARazorPidFileItReturnsARazorBuildServer() + { + const int ProcessId = 1234; + const string ServerPath = "/path/to/rzc.dll"; + const string PipeName = "some-pipe-name"; + + string pidDirectory = Path.GetFullPath("var/pids/build"); + string pidFilePath = Path.Combine(pidDirectory, $"{RazorPidFile.FilePrefix}{ProcessId}"); + + var fileSystemMock = new FileSystemMockBuilder() + .AddFile( + pidFilePath, + $"{ProcessId}{Environment.NewLine}{RazorPidFile.RazorServerType}{Environment.NewLine}{ServerPath}{Environment.NewLine}{PipeName}") + .AddFile( + Path.Combine(pidDirectory, $"{RazorPidFile.FilePrefix}not-a-pid-file"), + "not-a-pid-file") + .Build(); + + var provider = new BuildServerProvider( + fileSystemMock, + CreateEnvironmentProviderMock(pidDirectory).Object); + + var servers = provider.EnumerateBuildServers(ServerEnumerationFlags.Razor).ToArray(); + servers.Length.Should().Be(1); + + var razorServer = servers.First() as RazorServer; + razorServer.Should().NotBeNull(); + razorServer.ProcessId.Should().Be(ProcessId); + razorServer.Name.Should().Be(LocalizableStrings.RazorServer); + razorServer.PidFile.Should().NotBeNull(); + razorServer.PidFile.Path.Value.Should().Be(pidFilePath); + razorServer.PidFile.ProcessId.Should().Be(ProcessId); + razorServer.PidFile.ServerPath.Value.Should().Be(ServerPath); + razorServer.PidFile.PipeName.Should().Be(PipeName); + } + + private Mock CreateEnvironmentProviderMock(string value = null) + { + var provider = new Mock(MockBehavior.Strict); + + provider + .Setup(p => p.GetEnvironmentVariable("DOTNET_BUILD_PIDFILE_DIRECTORY")) + .Returns(value); + + return provider; + } + } +} diff --git a/test/dotnet.Tests/BuildServerTests/RazorServerManagerTests.cs b/test/dotnet.Tests/BuildServerTests/RazorServerManagerTests.cs deleted file mode 100644 index 925f21179..000000000 --- a/test/dotnet.Tests/BuildServerTests/RazorServerManagerTests.cs +++ /dev/null @@ -1,123 +0,0 @@ -// 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; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading.Tasks; -using FluentAssertions; -using Microsoft.Build.Exceptions; -using Microsoft.DotNet.BuildServer; -using Microsoft.DotNet.Cli; -using Microsoft.DotNet.Cli.Utils; -using Microsoft.DotNet.Tools; -using Microsoft.DotNet.Tools.Test.Utilities; -using Microsoft.Extensions.EnvironmentAbstractions; -using Moq; -using NuGet.Frameworks; -using Xunit; -using LocalizableStrings = Microsoft.DotNet.BuildServer.LocalizableStrings; - -namespace Microsoft.DotNet.Tests.BuildServerTests -{ - public class RazorServerManagerTests - { - [Fact] - public async Task GivenNoRazorAssemblyShutdownIsSkipped() - { - var resolverMock = new Mock(MockBehavior.Strict); - resolverMock.Setup(r => r.EnumerateRazorToolAssemblies()).Returns(new FilePath[] {}); - - var commandFactoryMock = new Mock(MockBehavior.Strict); - - var manager = new RazorServerManager(resolverMock.Object, commandFactoryMock.Object); - - var result = await manager.ShutdownServerAsync(); - result.Kind.Should().Be(ResultKind.Skipped); - result.Message.Should().Be(LocalizableStrings.NoRazorProjectFound); - result.Exception.Should().BeNull(); - } - - [Fact] - public async Task GivenARazorAssemblyShutdownSucceeds() - { - const string FakeRazorAssemblyPath = "/path/to/razor.dll"; - - var resolverMock = new Mock(MockBehavior.Strict); - resolverMock.Setup(r => r.EnumerateRazorToolAssemblies()).Returns(new FilePath[] { new FilePath(FakeRazorAssemblyPath) }); - - var commandMock = new Mock(MockBehavior.Strict); - commandMock.Setup(c => c.CaptureStdOut()).Returns(commandMock.Object); - commandMock.Setup(c => c.CaptureStdErr()).Returns(commandMock.Object); - commandMock.Setup(c => c.Execute()).Returns(new CommandResult(null, 0, "", "")); - - var commandFactoryMock = new Mock(MockBehavior.Strict); - commandFactoryMock - .Setup( - f => f.Create( - "exec", - new string[] { FakeRazorAssemblyPath, "shutdown" }, - It.IsAny(), - Constants.DefaultConfiguration)) - .Returns(commandMock.Object); - - var manager = new RazorServerManager(resolverMock.Object, commandFactoryMock.Object); - - var result = await manager.ShutdownServerAsync(); - result.Kind.Should().Be(ResultKind.Success); - result.Message.Should().BeNull(); - result.Exception.Should().BeNull(); - } - - [Fact] - public async Task GivenAnInvalidProjectFileShutdownFails() - { - var exception = new InvalidProjectFileException("invalid project!"); - - var resolverMock = new Mock(MockBehavior.Strict); - resolverMock.Setup(r => r.EnumerateRazorToolAssemblies()).Throws(exception); - - var commandFactoryMock = new Mock(MockBehavior.Strict); - - var manager = new RazorServerManager(resolverMock.Object, commandFactoryMock.Object); - - var result = await manager.ShutdownServerAsync(); - result.Kind.Should().Be(ResultKind.Failure); - result.Message.Should().Be(exception.Message); - result.Exception.Should().Be(exception); - } - - [Fact] - public async Task GivenANonZeroExitCodeShutdownFails() - { - const string FakeRazorAssemblyPath = "/path/to/razor.dll"; - const string ErrorMessage = "failed!"; - - var resolverMock = new Mock(MockBehavior.Strict); - resolverMock.Setup(r => r.EnumerateRazorToolAssemblies()).Returns(new FilePath[] { new FilePath(FakeRazorAssemblyPath) }); - - var commandMock = new Mock(MockBehavior.Strict); - commandMock.Setup(c => c.CaptureStdOut()).Returns(commandMock.Object); - commandMock.Setup(c => c.CaptureStdErr()).Returns(commandMock.Object); - commandMock.Setup(c => c.Execute()).Returns(new CommandResult(null, 1, "", ErrorMessage)); - - var commandFactoryMock = new Mock(MockBehavior.Strict); - commandFactoryMock - .Setup( - f => f.Create( - "exec", - new string[] { FakeRazorAssemblyPath, "shutdown" }, - It.IsAny(), - Constants.DefaultConfiguration)) - .Returns(commandMock.Object); - - var manager = new RazorServerManager(resolverMock.Object, commandFactoryMock.Object); - - var result = await manager.ShutdownServerAsync(); - result.Kind.Should().Be(ResultKind.Failure); - result.Message.Should().Be(ErrorMessage); - result.Exception.Should().BeNull(); - } - } -} diff --git a/test/dotnet.Tests/BuildServerTests/RazorServerTests.cs b/test/dotnet.Tests/BuildServerTests/RazorServerTests.cs new file mode 100644 index 000000000..f9b1ea52f --- /dev/null +++ b/test/dotnet.Tests/BuildServerTests/RazorServerTests.cs @@ -0,0 +1,109 @@ +// 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; +using System.IO; +using System.Linq; +using FluentAssertions; +using Microsoft.DotNet.BuildServer; +using Microsoft.DotNet.Cli; +using Microsoft.DotNet.Cli.Utils; +using Microsoft.DotNet.Tools; +using Microsoft.Extensions.DependencyModel.Tests; +using Microsoft.Extensions.EnvironmentAbstractions; +using Moq; +using NuGet.Frameworks; +using Xunit; +using LocalizableStrings = Microsoft.DotNet.BuildServer.LocalizableStrings; + +namespace Microsoft.DotNet.Tests.BuildServerTests +{ + public class RazorServerTests + { + [Fact] + public void GivenAFailedShutdownCommandItThrows() + { + const int ProcessId = 1234; + const string ServerPath = "path/to/rzc.dll"; + const string PipeName = "some-pipe-name"; + const string ErrorMessage = "error!"; + + string pidDirectory = Path.GetFullPath("var/pids/build"); + string pidFilePath = Path.Combine(pidDirectory, $"{RazorPidFile.FilePrefix}{ProcessId}"); + + var fileSystemMock = new FileSystemMockBuilder() + .AddFile(pidFilePath, "") + .Build(); + + fileSystemMock.File.Exists(pidFilePath).Should().BeTrue(); + + var server = new RazorServer( + pidFile: new RazorPidFile( + path: new FilePath(pidFilePath), + processId: ProcessId, + serverPath: new FilePath(ServerPath), + pipeName: PipeName), + commandFactory: CreateCommandFactoryMock(ServerPath, PipeName, exitCode: 1, stdErr: ErrorMessage).Object, + fileSystem: fileSystemMock); + + Action a = () => server.Shutdown(); + + a.ShouldThrow().WithMessage( + string.Format( + LocalizableStrings.ShutdownCommandFailed, + ErrorMessage)); + + fileSystemMock.File.Exists(pidFilePath).Should().BeTrue(); + } + + [Fact] + public void GivenASuccessfulShutdownItDoesNotThrow() + { + const int ProcessId = 1234; + const string ServerPath = "path/to/rzc.dll"; + const string PipeName = "some-pipe-name"; + + string pidDirectory = Path.GetFullPath("var/pids/build"); + string pidFilePath = Path.Combine(pidDirectory, $"{RazorPidFile.FilePrefix}{ProcessId}"); + + var fileSystemMock = new FileSystemMockBuilder() + .AddFile(pidFilePath, "") + .Build(); + + fileSystemMock.File.Exists(pidFilePath).Should().BeTrue(); + + var server = new RazorServer( + pidFile: new RazorPidFile( + path: new FilePath(pidFilePath), + processId: ProcessId, + serverPath: new FilePath(ServerPath), + pipeName: PipeName), + commandFactory: CreateCommandFactoryMock(ServerPath, PipeName).Object, + fileSystem: fileSystemMock); + + server.Shutdown(); + + fileSystemMock.File.Exists(pidFilePath).Should().BeFalse(); + } + + private Mock CreateCommandFactoryMock(string serverPath, string pipeName, int exitCode = 0, string stdErr = "") + { + var commandMock = new Mock(MockBehavior.Strict); + commandMock.Setup(c => c.CaptureStdOut()).Returns(commandMock.Object); + commandMock.Setup(c => c.CaptureStdErr()).Returns(commandMock.Object); + commandMock.Setup(c => c.Execute()).Returns(new CommandResult(null, exitCode, "", stdErr)); + + var commandFactoryMock = new Mock(MockBehavior.Strict); + commandFactoryMock + .Setup( + f => f.Create( + "exec", + new string[] { serverPath, "shutdown", "-w", "-p", pipeName }, + It.IsAny(), + Constants.DefaultConfiguration)) + .Returns(commandMock.Object); + + return commandFactoryMock; + } + } +} diff --git a/test/dotnet.Tests/BuildServerTests/VBCSCompilerServerManagerTests.cs b/test/dotnet.Tests/BuildServerTests/VBCSCompilerServerManagerTests.cs deleted file mode 100644 index 01e156483..000000000 --- a/test/dotnet.Tests/BuildServerTests/VBCSCompilerServerManagerTests.cs +++ /dev/null @@ -1,75 +0,0 @@ -// 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; -using System.Linq; -using System.Threading.Tasks; -using FluentAssertions; -using Microsoft.DotNet.BuildServer; -using Microsoft.DotNet.Cli; -using Microsoft.DotNet.Cli.Utils; -using Microsoft.DotNet.Tools; -using Microsoft.Extensions.EnvironmentAbstractions; -using Moq; -using NuGet.Frameworks; -using Xunit; - -namespace Microsoft.DotNet.Tests.BuildServerTests -{ - public class VBCSCompilerServerManagerTests - { - [Fact] - public async Task GivenAZeroExit() - { - var commandMock = new Mock(MockBehavior.Strict); - commandMock.Setup(c => c.CaptureStdOut()).Returns(commandMock.Object); - commandMock.Setup(c => c.CaptureStdErr()).Returns(commandMock.Object); - commandMock.Setup(c => c.Execute()).Returns(new CommandResult(null, 0, "", "")); - - var commandFactoryMock = new Mock(MockBehavior.Strict); - commandFactoryMock - .Setup( - f => f.Create( - "exec", - new string[] { VBCSCompilerServerManager.VBCSCompilerPath, "-shutdown" }, - It.IsAny(), - Constants.DefaultConfiguration)) - .Returns(commandMock.Object); - - var manager = new VBCSCompilerServerManager(commandFactoryMock.Object); - - var result = await manager.ShutdownServerAsync(); - result.Kind.Should().Be(ResultKind.Success); - result.Message.Should().BeNull(); - result.Exception.Should().BeNull(); - } - - [Fact] - public async Task GivenANonZeroExitCodeShutdownFails() - { - const string ErrorMessage = "failed!"; - - var commandMock = new Mock(MockBehavior.Strict); - commandMock.Setup(c => c.CaptureStdOut()).Returns(commandMock.Object); - commandMock.Setup(c => c.CaptureStdErr()).Returns(commandMock.Object); - commandMock.Setup(c => c.Execute()).Returns(new CommandResult(null, 1, "", ErrorMessage)); - - var commandFactoryMock = new Mock(MockBehavior.Strict); - commandFactoryMock - .Setup( - f => f.Create( - "exec", - new string[] { VBCSCompilerServerManager.VBCSCompilerPath, "-shutdown" }, - It.IsAny(), - Constants.DefaultConfiguration)) - .Returns(commandMock.Object); - - var manager = new VBCSCompilerServerManager(commandFactoryMock.Object); - - var result = await manager.ShutdownServerAsync(); - result.Kind.Should().Be(ResultKind.Failure); - result.Message.Should().Be(ErrorMessage); - result.Exception.Should().BeNull(); - } - } -} diff --git a/test/dotnet.Tests/BuildServerTests/VBCSCompilerServerTests.cs b/test/dotnet.Tests/BuildServerTests/VBCSCompilerServerTests.cs new file mode 100644 index 000000000..49dd43391 --- /dev/null +++ b/test/dotnet.Tests/BuildServerTests/VBCSCompilerServerTests.cs @@ -0,0 +1,63 @@ +// 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; +using System.Linq; +using FluentAssertions; +using Microsoft.DotNet.BuildServer; +using Microsoft.DotNet.Cli; +using Microsoft.DotNet.Cli.Utils; +using Microsoft.DotNet.Tools; +using Microsoft.Extensions.EnvironmentAbstractions; +using Moq; +using NuGet.Frameworks; +using Xunit; +using LocalizableStrings = Microsoft.DotNet.BuildServer.LocalizableStrings; + +namespace Microsoft.DotNet.Tests.BuildServerTests +{ + public class VBCSCompilerServerTests + { + [Fact] + public void GivenAZeroExitShutdownDoesNotThrow() + { + var server = new VBCSCompilerServer(CreateCommandFactoryMock().Object); + server.Shutdown(); + } + + [Fact] + public void GivenANonZeroExitCodeShutdownThrows() + { + const string ErrorMessage = "failed!"; + + var server = new VBCSCompilerServer(CreateCommandFactoryMock(exitCode: 1, stdErr: ErrorMessage).Object); + + Action a = () => server.Shutdown(); + + a.ShouldThrow().WithMessage( + string.Format( + LocalizableStrings.ShutdownCommandFailed, + ErrorMessage)); + } + + private Mock CreateCommandFactoryMock(int exitCode = 0, string stdErr = "") + { + var commandMock = new Mock(MockBehavior.Strict); + commandMock.Setup(c => c.CaptureStdOut()).Returns(commandMock.Object); + commandMock.Setup(c => c.CaptureStdErr()).Returns(commandMock.Object); + commandMock.Setup(c => c.Execute()).Returns(new CommandResult(null, exitCode, "", stdErr)); + + var commandFactoryMock = new Mock(MockBehavior.Strict); + commandFactoryMock + .Setup( + f => f.Create( + "exec", + new string[] { VBCSCompilerServer.VBCSCompilerPath, "-shutdown" }, + It.IsAny(), + Constants.DefaultConfiguration)) + .Returns(commandMock.Object); + + return commandFactoryMock; + } + } +} diff --git a/test/dotnet.Tests/CommandTests/BuildServerShutdownCommandTests.cs b/test/dotnet.Tests/CommandTests/BuildServerShutdownCommandTests.cs index f41bc9400..78765b812 100644 --- a/test/dotnet.Tests/CommandTests/BuildServerShutdownCommandTests.cs +++ b/test/dotnet.Tests/CommandTests/BuildServerShutdownCommandTests.cs @@ -5,7 +5,6 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using System.Threading.Tasks; using FluentAssertions; using Microsoft.DotNet.BuildServer; using Microsoft.DotNet.Cli; @@ -26,57 +25,92 @@ namespace Microsoft.DotNet.Tests.Commands private readonly BufferedReporter _reporter = new BufferedReporter(); [Fact] - public void GivenNoOptionsAllManagersArePresent() + public void GivenNoOptionsItEnumeratesAllServers() { - var command = CreateCommand(); + var provider = new Mock(MockBehavior.Strict); - command.Managers.Select(m => m.ServerName).Should().Equal( - DotNet.BuildServer.LocalizableStrings.MSBuildServer, - DotNet.BuildServer.LocalizableStrings.VBCSCompilerServer, - DotNet.BuildServer.LocalizableStrings.RazorServer - ); + provider + .Setup(p => p.EnumerateBuildServers(ServerEnumerationFlags.All)) + .Returns(Array.Empty()); + + var command = CreateCommand(serverProvider: provider.Object); + + command.Execute().Should().Be(0); + + _reporter.Lines.Should().Equal(LocalizableStrings.NoServersToShutdown.Green()); + + provider.Verify(p => p.EnumerateBuildServers(ServerEnumerationFlags.All), Times.Once); } [Fact] - public void GivenMSBuildOptionOnlyItIsTheOnlyManager() + public void GivenMSBuildOptionOnlyItEnumeratesOnlyMSBuildServers() { - var command = CreateCommand("--msbuild"); + var provider = new Mock(MockBehavior.Strict); - command.Managers.Select(m => m.ServerName).Should().Equal( - DotNet.BuildServer.LocalizableStrings.MSBuildServer - ); + provider + .Setup(p => p.EnumerateBuildServers(ServerEnumerationFlags.MSBuild)) + .Returns(Array.Empty()); + + var command = CreateCommand(options: "--msbuild", serverProvider: provider.Object); + + command.Execute().Should().Be(0); + + _reporter.Lines.Should().Equal(LocalizableStrings.NoServersToShutdown.Green()); + + provider.Verify(p => p.EnumerateBuildServers(ServerEnumerationFlags.MSBuild), Times.Once); } [Fact] - public void GivenVBCSCompilerOptionOnlyItIsTheOnlyManager() + public void GivenVBCSCompilerOptionOnlyItEnumeratesOnlyVBCSCompilers() { - var command = CreateCommand("--vbcscompiler"); + var provider = new Mock(MockBehavior.Strict); - command.Managers.Select(m => m.ServerName).Should().Equal( - DotNet.BuildServer.LocalizableStrings.VBCSCompilerServer - ); + provider + .Setup(p => p.EnumerateBuildServers(ServerEnumerationFlags.VBCSCompiler)) + .Returns(Array.Empty()); + + var command = CreateCommand(options: "--vbcscompiler", serverProvider: provider.Object); + + command.Execute().Should().Be(0); + + _reporter.Lines.Should().Equal(LocalizableStrings.NoServersToShutdown.Green()); + + provider.Verify(p => p.EnumerateBuildServers(ServerEnumerationFlags.VBCSCompiler), Times.Once); } [Fact] - public void GivenRazorOptionOnlyItIsTheOnlyManager() + public void GivenRazorOptionOnlyItEnumeratesOnlyRazorServers() { - var command = CreateCommand("--razor"); + var provider = new Mock(MockBehavior.Strict); - command.Managers.Select(m => m.ServerName).Should().Equal( - DotNet.BuildServer.LocalizableStrings.RazorServer - ); + provider + .Setup(p => p.EnumerateBuildServers(ServerEnumerationFlags.Razor)) + .Returns(Array.Empty()); + + var command = CreateCommand(options: "--razor", serverProvider: provider.Object); + + command.Execute().Should().Be(0); + + _reporter.Lines.Should().Equal(LocalizableStrings.NoServersToShutdown.Green()); + + provider.Verify(p => p.EnumerateBuildServers(ServerEnumerationFlags.Razor), Times.Once); } [Fact] public void GivenSuccessfulShutdownsItPrintsSuccess() { var mocks = new[] { - CreateManagerMock("first", new Result(ResultKind.Success)), - CreateManagerMock("second", new Result(ResultKind.Success)), - CreateManagerMock("third", new Result(ResultKind.Success)) + CreateServerMock("first"), + CreateServerMock("second"), + CreateServerMock("third") }; - var command = CreateCommand(managers: mocks.Select(m => m.Object)); + var provider = new Mock(MockBehavior.Strict); + provider + .Setup(p => p.EnumerateBuildServers(ServerEnumerationFlags.All)) + .Returns(mocks.Select(m => m.Object)); + + var command = CreateCommand(serverProvider: provider.Object); command.Execute().Should().Be(0); @@ -94,15 +128,21 @@ namespace Microsoft.DotNet.Tests.Commands [Fact] public void GivenAFailingShutdownItPrintsFailureMessage() { - const string FailureMessage = "failed!"; + const string FirstFailureMessage = "first failed!"; + const string ThirdFailureMessage = "third failed!"; var mocks = new[] { - CreateManagerMock("first", new Result(ResultKind.Success)), - CreateManagerMock("second", new Result(ResultKind.Failure, FailureMessage)), - CreateManagerMock("third", new Result(ResultKind.Success)) + CreateServerMock("first", exceptionMessage: FirstFailureMessage), + CreateServerMock("second"), + CreateServerMock("third", exceptionMessage: ThirdFailureMessage) }; - var command = CreateCommand(managers: mocks.Select(m => m.Object)); + var provider = new Mock(MockBehavior.Strict); + provider + .Setup(p => p.EnumerateBuildServers(ServerEnumerationFlags.All)) + .Returns(mocks.Select(m => m.Object)); + + var command = CreateCommand(serverProvider: provider.Object); command.Execute().Should().Be(1); @@ -110,113 +150,80 @@ namespace Microsoft.DotNet.Tests.Commands FormatShuttingDownMessage(mocks[0].Object), FormatShuttingDownMessage(mocks[1].Object), FormatShuttingDownMessage(mocks[2].Object), - FormatSuccessMessage(mocks[0].Object), - FormatFailureMessage(mocks[1].Object, FailureMessage), - FormatSuccessMessage(mocks[2].Object)); - - VerifyShutdownCalls(mocks); - } - - [Fact] - public void GivenASkippedShutdownItPrintsSkipMessage() - { - const string SkipMessage = "skipped!"; - - var mocks = new[] { - CreateManagerMock("first", new Result(ResultKind.Success)), - CreateManagerMock("second", new Result(ResultKind.Success)), - CreateManagerMock("third", new Result(ResultKind.Skipped, SkipMessage)) - }; - - var command = CreateCommand(managers: mocks.Select(m => m.Object)); - - command.Execute().Should().Be(0); - - _reporter.Lines.Should().Equal( - FormatShuttingDownMessage(mocks[0].Object), - FormatShuttingDownMessage(mocks[1].Object), - FormatShuttingDownMessage(mocks[2].Object), - FormatSuccessMessage(mocks[0].Object), + FormatFailureMessage(mocks[0].Object, FirstFailureMessage), FormatSuccessMessage(mocks[1].Object), - FormatSkippedMessage(mocks[2].Object, SkipMessage)); + FormatFailureMessage(mocks[2].Object, ThirdFailureMessage)); VerifyShutdownCalls(mocks); } - [Fact] - public void GivenSuccessFailureAndSkippedItPrintsAllThree() - { - const string FailureMessage = "failed!"; - const string SkipMessage = "skipped!"; - - var mocks = new[] { - CreateManagerMock("first", new Result(ResultKind.Success)), - CreateManagerMock("second", new Result(ResultKind.Failure, FailureMessage)), - CreateManagerMock("third", new Result(ResultKind.Skipped, SkipMessage)) - }; - - var command = CreateCommand(managers: mocks.Select(m => m.Object)); - - command.Execute().Should().Be(1); - - _reporter.Lines.Should().Equal( - FormatShuttingDownMessage(mocks[0].Object), - FormatShuttingDownMessage(mocks[1].Object), - FormatShuttingDownMessage(mocks[2].Object), - FormatSuccessMessage(mocks[0].Object), - FormatFailureMessage(mocks[1].Object, FailureMessage), - FormatSkippedMessage(mocks[2].Object, SkipMessage)); - - VerifyShutdownCalls(mocks); - } - - private BuildServerShutdownCommand CreateCommand(string options = "", IEnumerable managers = null) + private BuildServerShutdownCommand CreateCommand( + string options = "", + IBuildServerProvider serverProvider = null, + IEnumerable buildServers = null, + ServerEnumerationFlags expectedFlags = ServerEnumerationFlags.None) { ParseResult result = Parser.Instance.Parse("dotnet build-server shutdown " + options); return new BuildServerShutdownCommand( options: result["dotnet"]["build-server"]["shutdown"], result: result, - managers: managers, + serverProvider: serverProvider, useOrderedWait: true, reporter: _reporter); } - private Mock CreateManagerMock(string serverName, Result result) + private Mock CreateServerMock(string name, int pid = 0, string exceptionMessage = null) { - var mock = new Mock(MockBehavior.Strict); + var mock = new Mock(MockBehavior.Strict); - mock.SetupGet(m => m.ServerName).Returns(serverName); - mock.Setup(m => m.ShutdownServerAsync()).Returns(Task.FromResult(result)); + mock.SetupGet(s => s.ProcessId).Returns(pid); + mock.SetupGet(s => s.Name).Returns(name); + + if (exceptionMessage == null) + { + mock.Setup(s => s.Shutdown()); + } + else + { + mock.Setup(s => s.Shutdown()).Throws(new Exception(exceptionMessage)); + } return mock; } - private void VerifyShutdownCalls(IEnumerable> mocks) + private void VerifyShutdownCalls(IEnumerable> mocks) { foreach (var mock in mocks) { - mock.Verify(m => m.ShutdownServerAsync(), Times.Once()); + mock.Verify(s => s.Shutdown(), Times.Once); } } - private static string FormatShuttingDownMessage(IBuildServerManager manager) + private static string FormatShuttingDownMessage(IBuildServer server) { - return string.Format(LocalizableStrings.ShuttingDownServer, manager.ServerName); + if (server.ProcessId != 0) + { + return string.Format(LocalizableStrings.ShuttingDownServerWithPid, server.Name, server.ProcessId); + } + return string.Format(LocalizableStrings.ShuttingDownServer, server.Name); } - private static string FormatSuccessMessage(IBuildServerManager manager) + private static string FormatSuccessMessage(IBuildServer server) { - return string.Format(LocalizableStrings.ShutDownSucceeded, manager.ServerName).Green(); + if (server.ProcessId != 0) + { + return string.Format(LocalizableStrings.ShutDownSucceededWithPid, server.Name, server.ProcessId).Green(); + } + return string.Format(LocalizableStrings.ShutDownSucceeded, server.Name).Green(); } - private static string FormatFailureMessage(IBuildServerManager manager, string message) + private static string FormatFailureMessage(IBuildServer server, string message) { - return string.Format(LocalizableStrings.ShutDownFailed, manager.ServerName, message).Red(); - } - - private static string FormatSkippedMessage(IBuildServerManager manager, string message) - { - return string.Format(LocalizableStrings.ShutDownSkipped, manager.ServerName, message).Cyan(); + if (server.ProcessId != 0) + { + return string.Format(LocalizableStrings.ShutDownFailedWithPid, server.Name, server.ProcessId, message).Red(); + } + return string.Format(LocalizableStrings.ShutDownFailed, server.Name, message).Red(); } } } From 205f58496fdbf6b92b3d231514032cfcfd3e44c2 Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Fri, 20 Apr 2018 13:09:19 -0700 Subject: [PATCH 071/118] Insert NuGet Build 4.7.0-rtm.5122 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index b01c20ee2..5164ea400 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -32,7 +32,7 @@ 1.2.1-alpha-002133 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 1.6.0-beta2-25304 - 4.7.0-rtm.5104 + 4.7.0-rtm.5122 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 65d5730631ef3cae8435be66b37b6c03b49d5dbf Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Thu, 19 Apr 2018 16:16:12 -0700 Subject: [PATCH 072/118] Replace alpine with linux-musl builds We still build linux-musl on the alpine OS but we no longer produce a alpine installer/tar file instead we just have the linux-musl version. --- README.md | 12 ++++++------ .../AppWithCorruptedLaunchSettings.csproj | 2 +- .../AppWithLaunchSettings.csproj | 2 +- .../AppWithLaunchSettingsNoDefault.csproj | 2 +- .../MSBuildTestApp/MSBuildTestApp.csproj | 2 +- build/Branding.props | 6 +++--- build/BuildDefaults.props | 6 +++--- build/DerivedHostMachineInfo.props | 2 +- build/publish/Badge.targets | 2 +- .../CheckIfAllBuildsHavePublished.cs | 2 +- netci.groovy | 6 +++--- .../Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj | 2 +- .../EnvironmentInfo.cs | 6 +++--- 13 files changed, 26 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 9e7fd399b..66bc27538 100644 --- a/README.md +++ b/README.md @@ -23,9 +23,9 @@ This project has adopted the code of conduct defined by the [Contributor Covenan Build Status ------------ -|Windows x64|Windows x86|macOS|Linux x64 Archive|Linux arm Archive|Linux arm64 Archive|Linux Native Installers|RHEL 6 Archive|Alpine 3.6 Archive| +|Windows x64|Windows x86|macOS|Linux x64 Archive|Linux arm Archive|Linux arm64 Archive|Linux Native Installers|RHEL 6 Archive|Linux-musl Archive| |:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:| -|[![][win-x64-build-badge]][win-x64-build]|[![][win-x86-build-badge]][win-x86-build]|[![][osx-build-badge]][osx-build]|[![][linux-build-badge]][linux-build]|[![][linux-arm-build-badge]][linux-arm-build]|[![][linux-arm64-build-badge]][linux-arm64-build]|[![][linuxnative-build-badge]][linuxnative-build]|[![][rhel6-build-badge]][rhel6-build]|[![][alpine3.6-build-badge]][alpine3.6-build]| +|[![][win-x64-build-badge]][win-x64-build]|[![][win-x86-build-badge]][win-x86-build]|[![][osx-build-badge]][osx-build]|[![][linux-build-badge]][linux-build]|[![][linux-arm-build-badge]][linux-arm-build]|[![][linux-arm64-build-badge]][linux-arm64-build]|[![][linuxnative-build-badge]][linuxnative-build]|[![][rhel6-build-badge]][rhel6-build]|[![][linux-musl-build-badge]][linux-musl-build]| [win-x64-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6902/badge [win-x64-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6902 @@ -51,8 +51,8 @@ Build Status [rhel6-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/7392/badge [rhel6-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=7392 -[alpine3.6-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/8168/badge -[alpine3.6-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=8168 +[linux-musl-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/8168/badge +[linux-musl-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=8168 Installers and Binaries ----------------------- @@ -74,7 +74,7 @@ To download the .NET Core runtime **without** the SDK, visit https://github.com/ | **Linux arm** | [tar.gz][linux-arm-targz] - [Checksum][linux-arm-targz-checksum] | | **Linux arm64** | [tar.gz][linux-arm64-targz] - [Checksum][linux-arm64-targz-checksum] | | **RHEL 6** | [tar.gz][rhel-6-targz] - [Checksum][rhel-6-targz-checksum] | -| **Alpine 3.6** | [tar.gz][alpine-3.6-targz] - [Checksum][alpine-3.6-targz-checksum] | +| **Linux-musl** | [tar.gz][linux-musl-targz] - [Checksum][linux-musl-targz-checksum] | | Latest Coherent Build2
*release/2.1.3xx* | |:------:| @@ -173,7 +173,7 @@ apt-cache search dotnet-sdk | grep 2.0.0 Docker ------ -You can also use our Docker base images found on https://hub.docker.com/r/microsoft/dotnet to set up your dev or testing environment for usage. +You can also use our Docker base images found on https://hub.docker.com/r/microsoft/dotnet to set up your dev or testing environment for usage. Basic usage ----------- diff --git a/TestAssets/TestProjects/AppWithCorruptedLaunchSettings/AppWithCorruptedLaunchSettings.csproj b/TestAssets/TestProjects/AppWithCorruptedLaunchSettings/AppWithCorruptedLaunchSettings.csproj index 9434c36c9..bde0adabe 100644 --- a/TestAssets/TestProjects/AppWithCorruptedLaunchSettings/AppWithCorruptedLaunchSettings.csproj +++ b/TestAssets/TestProjects/AppWithCorruptedLaunchSettings/AppWithCorruptedLaunchSettings.csproj @@ -4,6 +4,6 @@ Exe netcoreapp2.1 - win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.6-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;alpine.3.6-x64 + win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.6-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64 diff --git a/TestAssets/TestProjects/AppWithLaunchSettings/AppWithLaunchSettings.csproj b/TestAssets/TestProjects/AppWithLaunchSettings/AppWithLaunchSettings.csproj index 9434c36c9..bde0adabe 100644 --- a/TestAssets/TestProjects/AppWithLaunchSettings/AppWithLaunchSettings.csproj +++ b/TestAssets/TestProjects/AppWithLaunchSettings/AppWithLaunchSettings.csproj @@ -4,6 +4,6 @@ Exe netcoreapp2.1 - win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.6-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;alpine.3.6-x64 + win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.6-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64 diff --git a/TestAssets/TestProjects/AppWithLaunchSettingsNoDefault/AppWithLaunchSettingsNoDefault.csproj b/TestAssets/TestProjects/AppWithLaunchSettingsNoDefault/AppWithLaunchSettingsNoDefault.csproj index 9434c36c9..bde0adabe 100644 --- a/TestAssets/TestProjects/AppWithLaunchSettingsNoDefault/AppWithLaunchSettingsNoDefault.csproj +++ b/TestAssets/TestProjects/AppWithLaunchSettingsNoDefault/AppWithLaunchSettingsNoDefault.csproj @@ -4,6 +4,6 @@ Exe netcoreapp2.1 - win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.6-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;alpine.3.6-x64 + win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.6-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64 diff --git a/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj b/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj index 852eafe13..de20e4481 100644 --- a/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj +++ b/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj @@ -4,7 +4,7 @@ Exe netcoreapp2.1 - win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.6-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;alpine.3.6-x64 + win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.6-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64 $(TEST_PACKAGES) diff --git a/build/Branding.props b/build/Branding.props index a13a74294..2db7f6455 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -13,19 +13,19 @@ $(Rid) $(OSName)-$(Architecture) $(HostRid) $(HostOSName)-$(Architecture) $(HostMonikerRid) $(Architecture) - + dotnet-sdk-internal dotnet-sdk $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-langpack diff --git a/build/BuildDefaults.props b/build/BuildDefaults.props index 1c4460790..e1c354c67 100644 --- a/build/BuildDefaults.props +++ b/build/BuildDefaults.props @@ -6,10 +6,10 @@ false true - true + true false - true - true + true + true true diff --git a/build/DerivedHostMachineInfo.props b/build/DerivedHostMachineInfo.props index 3e9712a68..2bb794527 100644 --- a/build/DerivedHostMachineInfo.props +++ b/build/DerivedHostMachineInfo.props @@ -2,7 +2,7 @@ true true - true + true true diff --git a/build/publish/Badge.targets b/build/publish/Badge.targets index 5c8931de0..3493b5880 100644 --- a/build/publish/Badge.targets +++ b/build/publish/Badge.targets @@ -31,7 +31,7 @@ $(OSName)_$(Architecture) rhel.6_x64 - alpine.3.6_x64 + linux_musl_x64 linux_$(Architecture) all_linux_distros_native_installer diff --git a/build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs b/build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs index c2f349624..53e1f7e1a 100644 --- a/build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs +++ b/build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs @@ -54,7 +54,7 @@ namespace Microsoft.DotNet.Cli.Build { "osx_x64", false }, { "linux_x64", false }, { "rhel.6_x64", false }, - { "alpine.3.6_x64", false }, + { "linux_musl_x64", false }, { "all_linux_distros_native_installer", false }, { "linux_arm", false }, { "linux_arm64", false } diff --git a/netci.groovy b/netci.groovy index 75edf396a..6a1cb40a9 100644 --- a/netci.groovy +++ b/netci.groovy @@ -9,7 +9,7 @@ def project = GithubProject def branch = GithubBranchName def isPR = true -def platformList = ['Linux:x64:Release', 'Debian8.2:x64:Debug', 'Ubuntu:x64:Release', 'Ubuntu16.04:x64:Debug', 'OSX10.12:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'Windows_NT_ES:x64:Debug', 'RHEL7.2:x64:Release', 'CentOS7.1:x64:Debug', 'RHEL6:x64:Debug', 'Alpine3.6:x64:Debug', 'Linux:arm:Debug', 'Linux:arm64:Debug'] +def platformList = ['Linux:x64:Release', 'Debian8.2:x64:Debug', 'Ubuntu:x64:Release', 'Ubuntu16.04:x64:Debug', 'OSX10.12:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'Windows_NT_ES:x64:Debug', 'RHEL7.2:x64:Release', 'CentOS7.1:x64:Debug', 'RHEL6:x64:Debug', 'Linux-musl:x64:Debug', 'Linux:arm:Debug', 'Linux:arm64:Debug'] def static getBuildJobName(def configuration, def os, def architecture) { return configuration.toLowerCase() + '_' + os.toLowerCase() + '_' + architecture.toLowerCase() @@ -55,9 +55,9 @@ set DOTNET_CLI_UI_LANGUAGE=es osUsedForMachineAffinity = 'Ubuntu16.04'; buildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --runtime-id rhel.6-x64 --docker rhel.6 --targets Default" } - else if (os == 'Alpine3.6') { + else if (os == 'Linux-musl') { osUsedForMachineAffinity = 'Ubuntu16.04'; - buildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --runtime-id alpine.3.6-x64 --docker alpine.3.6 --targets Default" + buildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --runtime-id linux-musl-x64 --docker alpine.3.6 --targets Default" } else { // Jenkins non-Ubuntu CI machines don't have docker diff --git a/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj b/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj index c4b59fb35..b480a818f 100644 --- a/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj +++ b/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj @@ -21,7 +21,7 @@ - + diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/EnvironmentInfo.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/EnvironmentInfo.cs index 51e2cfd06..1412fad7c 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/EnvironmentInfo.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/EnvironmentInfo.cs @@ -15,7 +15,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities { case "fedora.24-x64": case "rhel.6-x64": - case "alpine.3.6-x64": + case "linux-musl-x64": case "opensuse.42.1-x64": case "ubuntu.16.10-x64": case "linux-x64": @@ -28,7 +28,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities { case "linux-x64": case "rhel.6-x64": - case "alpine.3.6-x64": + case "linux-musl-x64": return false; } } @@ -37,7 +37,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities switch (rid) { case "rhel.6-x64": - case "alpine.3.6-x64": + case "linux-musl-x64": return false; } } From a90f10f629b9a4ae70c197860de94a3c38a88cc5 Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Fri, 20 Apr 2018 12:42:26 -0700 Subject: [PATCH 073/118] Update dotnet-install to select linux-musl on alpine --- scripts/obtain/dotnet-install.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/scripts/obtain/dotnet-install.sh b/scripts/obtain/dotnet-install.sh index 80dde3a56..e19ed452d 100755 --- a/scripts/obtain/dotnet-install.sh +++ b/scripts/obtain/dotnet-install.sh @@ -136,10 +136,6 @@ get_linux_platform_name() { else if [ -e /etc/os-release ]; then . /etc/os-release - if [[ $ID == "alpine" ]]; then - # remove the last version digit - VERSION_ID=${VERSION_ID%.*} - fi echo "$ID.$VERSION_ID" return 0 elif [ -e /etc/redhat-release ]; then @@ -166,9 +162,12 @@ get_current_os_name() { local linux_platform_name linux_platform_name="$(get_linux_platform_name)" || { echo "linux" && return 0 ; } - if [[ $linux_platform_name == "rhel.6" || $linux_platform_name == "alpine.3.6" ]]; then + if [[ $linux_platform_name == "rhel.6" ]]; then echo $linux_platform_name return 0 + elif [[ $linux_platform_name == alpine* ]]; then + echo "linux-musl" + return 0 else echo "linux" return 0 @@ -597,7 +596,7 @@ copy_files_or_dirs_from_list() { local osname="$(get_current_os_name)" local override_switch=$( if [ "$override" = false ]; then - if [[ "$osname" == 'alpine'* ]]; then + if [[ "$osname" == 'alpine'* ]]; then printf -- "-u"; else printf -- "-n"; From 4a59d83b5cb2ad5c7a9331354c5f3b2ac96c7671 Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Fri, 20 Apr 2018 13:16:01 -0700 Subject: [PATCH 074/118] Update the readme to the new build definition --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 66bc27538..cd7ca0be9 100644 --- a/README.md +++ b/README.md @@ -51,8 +51,8 @@ Build Status [rhel6-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/7392/badge [rhel6-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=7392 -[linux-musl-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/8168/badge -[linux-musl-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=8168 +[linux-musl-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/9036/badge +[linux-musl-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=9036 Installers and Binaries ----------------------- From 1e30cf3b5fc8f5cce7b536ddf25729aa9bb2584b Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Fri, 20 Apr 2018 14:11:06 -0700 Subject: [PATCH 075/118] Add temporary feed to boot-strap linux-musl build --- build/DependencyVersions.props | 2 +- build/NugetConfigFile.targets | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index dc4b594eb..789a254bb 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -2,7 +2,7 @@ 2.1.0-preview2-30475 - 2.1.0-rc1-26419-02 + 2.1.0-rc1-26420-08 $(MicrosoftNETCoreAppPackageVersion) 15.7.0-preview-000169 $(MicrosoftBuildPackageVersion) diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets index 4c2bf5346..d2cacaa32 100644 --- a/build/NugetConfigFile.targets +++ b/build/NugetConfigFile.targets @@ -24,6 +24,7 @@ + ]]> From 6d9a4f1c6512839f75e0ad3bd46c89ac418f8ab6 Mon Sep 17 00:00:00 2001 From: Livar Date: Fri, 20 Apr 2018 15:21:46 -0700 Subject: [PATCH 076/118] Update SDK to 2.1.200-preview-62820-08 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 5164ea400..f6afcc36e 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -13,7 +13,7 @@ 2.8.0-dev-62817-01 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.200-preview-62816-05 + 2.1.200-preview-62820-08 $(MicrosoftNETSdkPackageVersion) 2.0.0-rel-20180221-676 $(MicrosoftNETSdkWebPackageVersion) From ea08319a65212ba7fd3830052a8c7f672d1b48e9 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Fri, 20 Apr 2018 16:43:41 -0700 Subject: [PATCH 077/118] Unblock build Test build was causing restore and build in same evaluation, which was always incorrect, but with a recent change to sdk, it will always fail outright instead of sometimes getting lucky enough for it not to matter. This was therefore a breaking change and we will discuss separately how to handle it. This takes the bad pattern out of the test build to unblock the build. --- .../Microsoft.DotNet.ToolPackage.Tests.csproj | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/Microsoft.DotNet.ToolPackage.Tests/Microsoft.DotNet.ToolPackage.Tests.csproj b/test/Microsoft.DotNet.ToolPackage.Tests/Microsoft.DotNet.ToolPackage.Tests.csproj index ad85df299..d60eb79a7 100644 --- a/test/Microsoft.DotNet.ToolPackage.Tests/Microsoft.DotNet.ToolPackage.Tests.csproj +++ b/test/Microsoft.DotNet.ToolPackage.Tests/Microsoft.DotNet.ToolPackage.Tests.csproj @@ -59,7 +59,9 @@ $(BaseOutputPath)/TestAsset/SampleGlobalTool - + + + @@ -72,7 +74,9 @@ - + + + From 441a470f549bd2783216962967d93448cbdbc62a Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 18 Apr 2018 00:31:15 -0700 Subject: [PATCH 078/118] Add bundled aspnetcore runtime framework versions - Add integration test for implicit Microsoft.AspNetCore.App versions --- .../TestProjects/TestWebAppSimple/Program.cs | 24 ++ .../TestProjects/TestWebAppSimple/Startup.cs | 34 +++ .../TestWebAppSimple/TestWebAppSimple.csproj | 23 ++ build/DependencyVersions.props | 5 +- build/MSBuildExtensions.targets | 10 +- .../GivenAspNetAppsResolveImplicitVersions.cs | 222 ++++++++++++++++++ 6 files changed, 315 insertions(+), 3 deletions(-) create mode 100644 TestAssets/TestProjects/TestWebAppSimple/Program.cs create mode 100644 TestAssets/TestProjects/TestWebAppSimple/Startup.cs create mode 100644 TestAssets/TestProjects/TestWebAppSimple/TestWebAppSimple.csproj create mode 100644 test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs diff --git a/TestAssets/TestProjects/TestWebAppSimple/Program.cs b/TestAssets/TestProjects/TestWebAppSimple/Program.cs new file mode 100644 index 000000000..a15982830 --- /dev/null +++ b/TestAssets/TestProjects/TestWebAppSimple/Program.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore; +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Logging; + +namespace TestWebAppSimple +{ + public class Program + { + public static void Main(string[] args) + { + CreateWebHostBuilder(args).Build().Run(); + } + + public static IWebHostBuilder CreateWebHostBuilder(string[] args) => + WebHost.CreateDefaultBuilder(args) + .UseStartup(); + } +} diff --git a/TestAssets/TestProjects/TestWebAppSimple/Startup.cs b/TestAssets/TestProjects/TestWebAppSimple/Startup.cs new file mode 100644 index 000000000..f00c04c75 --- /dev/null +++ b/TestAssets/TestProjects/TestWebAppSimple/Startup.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.DependencyInjection; + +namespace TestWebAppSimple +{ + public class Startup + { + // This method gets called by the runtime. Use this method to add services to the container. + // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940 + public void ConfigureServices(IServiceCollection services) + { + } + + // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. + public void Configure(IApplicationBuilder app, IHostingEnvironment env) + { + if (env.IsDevelopment()) + { + app.UseDeveloperExceptionPage(); + } + + app.Run(async (context) => + { + await context.Response.WriteAsync("Hello World!"); + }); + } + } +} diff --git a/TestAssets/TestProjects/TestWebAppSimple/TestWebAppSimple.csproj b/TestAssets/TestProjects/TestWebAppSimple/TestWebAppSimple.csproj new file mode 100644 index 000000000..f600e9d8e --- /dev/null +++ b/TestAssets/TestProjects/TestWebAppSimple/TestWebAppSimple.csproj @@ -0,0 +1,23 @@ + + + + + netcoreapp2.1 + + + + + + + + + + + + + + + diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 789a254bb..4af3e703c 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,8 @@ - 2.1.0-preview2-30475 + 2.1.0-preview2-30475 + $(MicrosoftAspNetCoreAllPackageVersion) 2.1.0-rc1-26420-08 $(MicrosoftNETCoreAppPackageVersion) 15.7.0-preview-000169 @@ -17,7 +18,7 @@ 2.1.300-preview3-62819-01 $(MicrosoftNETSdkPackageVersion) $(MicrosoftAspNetCoreAppPackageVersion) - 2.1.300-rc1-20180418-1607241 + 2.1.300-rc1-20180420-1612100 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) 1.0.2-beta3-20180418-1607235 diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets index a2a27d61a..67e864f1c 100644 --- a/build/MSBuildExtensions.targets +++ b/build/MSBuildExtensions.targets @@ -113,10 +113,14 @@ <_NETCoreAppPackageVersion>$(MicrosoftNETCoreAppPackageVersion) <_NETStandardLibraryPackageVersion>@(_NETStandardLibraryPackageVersions->Distinct()) <_NETCorePlatformsPackageVersion>@(_NETCorePlatformsPackageVersions->Distinct()) + <_AspNetCoreAllPackageVersion>$(MicrosoftAspNetCoreAllPackageVersion) + <_AspNetCoreAppPackageVersion>$(MicrosoftAspNetCoreAppPackageVersion) <_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1]) <_NETStandardTargetFrameworkVersion>$(_NETStandardLibraryPackageVersion.Split('.')[0]).$(_NETStandardLibraryPackageVersion.Split('.')[1]) + <_AspNetCoreAllTargetFrameworkVersion>$(_NETCoreAppTargetFrameworkVersion) + <_AspNetCoreAppTargetFrameworkVersion>$(_AspNetCoreAllTargetFrameworkVersion) <_NETCoreSdkIsPreview Condition=" '$(DropSuffix)' == '' ">true @@ -140,9 +144,13 @@ Copyright (c) .NET Foundation. All rights reserved. $(_NETStandardTargetFrameworkVersion) $(_NETStandardLibraryPackageVersion) $(_NETCorePlatformsPackageVersion) + $(_AspNetCoreAllTargetFrameworkVersion) + $(_AspNetCoreAllPackageVersion) + $(_AspNetCoreAppTargetFrameworkVersion) + $(_AspNetCoreAppPackageVersion) $(SdkVersion) <_NETCoreSdkIsPreview>$(_NETCoreSdkIsPreview) - + 1.0.11 1.1.8 diff --git a/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs b/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs new file mode 100644 index 000000000..dc780f792 --- /dev/null +++ b/test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs @@ -0,0 +1,222 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Xml.Linq; +using FluentAssertions; +using Microsoft.DotNet.TestFramework; +using Microsoft.DotNet.Tools.Test.Utilities; +using NuGet.ProjectModel; +using NuGet.Versioning; +using Xunit; + +namespace EndToEnd +{ + public class GivenAspNetAppsResolveImplicitVersions : TestBase + { + private const string AspNetTestProject = "TestWebAppSimple"; + + [Fact] + public void PortablePublishWithLatestTFMUsesBundledAspNetCoreAppVersion() + { + var _testInstance = TestAssets.Get(AspNetTestProject) + .CreateInstance(identifier: LatestSupportedAspNetCoreAppVersion) + .WithSourceFiles(); + + string projectDirectory = _testInstance.Root.FullName; + string projectPath = Path.Combine(projectDirectory, $"{AspNetTestProject}.csproj"); + + var project = XDocument.Load(projectPath); + var ns = project.Root.Name.Namespace; + + // Update TargetFramework to the right version of .NET Core + project.Root.Element(ns + "PropertyGroup") + .Element(ns + "TargetFramework") + .Value = "netcoreapp" + LatestSupportedAspNetCoreAppVersion; + + project.Save(projectPath); + + // Get the implicit version + new RestoreCommand() + .WithWorkingDirectory(projectDirectory) + .Execute() + .Should().Pass(); + + var assetsFilePath = Path.Combine(projectDirectory, "obj", "project.assets.json"); + var assetsFile = new LockFileFormat().Read(assetsFilePath); + + var restoredVersion = GetAspNetCoreAppVersion(assetsFile, portable: true); + restoredVersion.Should().NotBeNull(); + + var bundledVersionPath = Path.Combine(projectDirectory, ".BundledAspNetCoreVersion"); + var bundledVersion = File.ReadAllText(bundledVersionPath).Trim(); + + restoredVersion.ToNormalizedString().Should().BeEquivalentTo(bundledVersion, + "The bundled aspnetcore versions set in Microsoft.NETCoreSdk.BundledVersions.props should be idenitical to the versions set in DependencyVersions.props." + + "Please update MSBuildExtensions.targets in this repo so these versions match."); + } + + [Fact] + public void StandalonePublishWithLatestTFMUsesBundledAspNetCoreAppVersion() + { + var _testInstance = TestAssets.Get(AspNetTestProject) + .CreateInstance(identifier: LatestSupportedAspNetCoreAppVersion) + .WithSourceFiles(); + + string projectDirectory = _testInstance.Root.FullName; + string projectPath = Path.Combine(projectDirectory, $"{AspNetTestProject}.csproj"); + + var project = XDocument.Load(projectPath); + var ns = project.Root.Name.Namespace; + + // Update TargetFramework to the right version of .NET Core + project.Root.Element(ns + "PropertyGroup") + .Element(ns + "TargetFramework") + .Value = "netcoreapp" + LatestSupportedAspNetCoreAppVersion; + + var rid = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment.GetRuntimeIdentifier(); + + // Set RuntimeIdentifier to simulate standalone publish + project.Root.Element(ns + "PropertyGroup") + .Add(new XElement(ns + "RuntimeIdentifier", rid)); + + project.Save(projectPath); + + // Get the implicit version + new RestoreCommand() + .WithWorkingDirectory(projectDirectory) + .Execute() + .Should().Pass(); + + var assetsFilePath = Path.Combine(projectDirectory, "obj", "project.assets.json"); + var assetsFile = new LockFileFormat().Read(assetsFilePath); + + var restoredVersion = GetAspNetCoreAppVersion(assetsFile); + restoredVersion.Should().NotBeNull(); + + var bundledVersionPath = Path.Combine(projectDirectory, ".BundledAspNetCoreVersion"); + var bundledVersion = File.ReadAllText(bundledVersionPath).Trim(); + + restoredVersion.ToNormalizedString().Should().BeEquivalentTo(bundledVersion, + "The bundled aspnetcore versions set in Microsoft.NETCoreSdk.BundledVersions.props should be idenitical to the versions set in DependencyVersions.props." + + "Please update MSBuildExtensions.targets in this repo so these versions match."); + } + + [Theory] + [MemberData(nameof(SupportedAspNetCoreAppVersions))] + public void ItRollsForwardToTheLatestVersion(string minorVersion) + { + var _testInstance = TestAssets.Get(AspNetTestProject) + .CreateInstance(identifier: minorVersion) + .WithSourceFiles(); + + string projectDirectory = _testInstance.Root.FullName; + + string projectPath = Path.Combine(projectDirectory, $"{AspNetTestProject}.csproj"); + + var project = XDocument.Load(projectPath); + var ns = project.Root.Name.Namespace; + + // Update TargetFramework to the right version of .NET Core + project.Root.Element(ns + "PropertyGroup") + .Element(ns + "TargetFramework") + .Value = "netcoreapp" + minorVersion; + + var rid = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment.GetRuntimeIdentifier(); + + // Set RuntimeIdentifier to opt in to roll-forward behavior + project.Root.Element(ns + "PropertyGroup") + .Add(new XElement(ns + "RuntimeIdentifier", rid)); + + project.Save(projectPath); + + // Get the version rolled forward to + new RestoreCommand() + .WithWorkingDirectory(projectDirectory) + .Execute() + .Should().Pass(); + + string assetsFilePath = Path.Combine(projectDirectory, "obj", "project.assets.json"); + var assetsFile = new LockFileFormat().Read(assetsFilePath); + + var rolledForwardVersion = GetAspNetCoreAppVersion(assetsFile); + rolledForwardVersion.Should().NotBeNull(); + + if (rolledForwardVersion.IsPrerelease) + { + // If this version of .NET Core is still prerelease, then: + // - Floating the patch by adding ".*" to the major.minor version won't work, but + // - There aren't any patches to roll-forward to, so we skip testing this until the version + // leaves prerelease. + return; + } + + // Float the RuntimeFrameworkVersion to get the latest version of the runtime available from feeds + Directory.Delete(Path.Combine(projectDirectory, "obj"), true); + project.Root.Element(ns + "PropertyGroup") + .Add(new XElement(ns + "RuntimeFrameworkVersion", $"{minorVersion}.*")); + project.Save(projectPath); + + new RestoreCommand() + .WithWorkingDirectory(projectDirectory) + .Execute() + .Should().Pass(); + + var floatedAssetsFile = new LockFileFormat().Read(assetsFilePath); + + var floatedVersion = GetAspNetCoreAppVersion(floatedAssetsFile); + floatedVersion.Should().NotBeNull(); + + rolledForwardVersion.ToNormalizedString().Should().BeEquivalentTo(floatedVersion.ToNormalizedString(), + "the latest patch version properties in Microsoft.NETCoreSdk.BundledVersions.props need to be updated " + + "(see MSBuildExtensions.targets in this repo)"); + } + + [Fact] + public void WeCoverLatestAspNetCoreAppRollForward() + { + // Run "dotnet new web", get TargetFramework property, and make sure it's covered in SupportedAspNetCoreAppVersions + using (DisposableDirectory directory = Temp.CreateDirectory()) + { + string projectDirectory = directory.Path; + + new NewCommandShim() + .WithWorkingDirectory(projectDirectory) + .Execute("web --no-restore") + .Should().Pass(); + + string projectPath = Path.Combine(projectDirectory, Path.GetFileName(projectDirectory) + ".csproj"); + + var project = XDocument.Load(projectPath); + var ns = project.Root.Name.Namespace; + + string targetFramework = project.Root.Element(ns + "PropertyGroup") + .Element(ns + "TargetFramework") + .Value; + + SupportedAspNetCoreAppVersions.Select(v => $"netcoreapp{v[0]}") + .Should().Contain(targetFramework, $"the {nameof(SupportedAspNetCoreAppVersions)} property should include the default version " + + "of Microsoft.AspNetCore.App used by the templates created by \"dotnet new web\""); + + } + } + + private NuGetVersion GetAspNetCoreAppVersion(LockFile lockFile, bool portable = false) + { + return lockFile?.Targets?.SingleOrDefault(t => portable || t.RuntimeIdentifier != null) + ?.Libraries?.SingleOrDefault(l => + string.Compare(l.Name, "Microsoft.AspNetCore.App", StringComparison.CurrentCultureIgnoreCase) == 0) + ?.Version; + } + + public static string LatestSupportedAspNetCoreAppVersion = "2.1"; + + public static IEnumerable SupportedAspNetCoreAppVersions + { + get + { + yield return new object[] { LatestSupportedAspNetCoreAppVersion }; + } + } + } +} From 008e5f3d9702b043b65f0b331a85131c091c43d2 Mon Sep 17 00:00:00 2001 From: William Li Date: Mon, 23 Apr 2018 13:23:35 -0700 Subject: [PATCH 079/118] Remove -f short hand in dotnet tool install (#9102) --- .../commands/dotnet-tool/install/ToolInstallCommandParser.cs | 2 +- .../commands/dotnet-tool/update/ToolUpdateCommandParser.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dotnet/commands/dotnet-tool/install/ToolInstallCommandParser.cs b/src/dotnet/commands/dotnet-tool/install/ToolInstallCommandParser.cs index 55a128724..fbbe789fe 100644 --- a/src/dotnet/commands/dotnet-tool/install/ToolInstallCommandParser.cs +++ b/src/dotnet/commands/dotnet-tool/install/ToolInstallCommandParser.cs @@ -37,7 +37,7 @@ namespace Microsoft.DotNet.Cli Accept.OneOrMoreArguments() .With(name: LocalizableStrings.SourceFeedOptionName)), Create.Option( - "-f|--framework", + "--framework", LocalizableStrings.FrameworkOptionDescription, Accept.ExactlyOneArgument()), CommonOptions.HelpOption(), diff --git a/src/dotnet/commands/dotnet-tool/update/ToolUpdateCommandParser.cs b/src/dotnet/commands/dotnet-tool/update/ToolUpdateCommandParser.cs index 637171188..8e737291f 100644 --- a/src/dotnet/commands/dotnet-tool/update/ToolUpdateCommandParser.cs +++ b/src/dotnet/commands/dotnet-tool/update/ToolUpdateCommandParser.cs @@ -33,7 +33,7 @@ namespace Microsoft.DotNet.Cli Accept.OneOrMoreArguments() .With(name: LocalizableStrings.SourceFeedOptionName)), Create.Option( - "-f|--framework", + "--framework", LocalizableStrings.FrameworkOptionDescription, Accept.ExactlyOneArgument()), CommonOptions.HelpOption(), From 6d353a596388d5a80e4881eefdf99729b9a46b95 Mon Sep 17 00:00:00 2001 From: jbeisner Date: Mon, 23 Apr 2018 21:56:00 +0000 Subject: [PATCH 080/118] Mark both NuPkgs as "NonShipping=true" --- build/publish/PublishNupkgToBlobFeed.targets | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build/publish/PublishNupkgToBlobFeed.targets b/build/publish/PublishNupkgToBlobFeed.targets index 71f3d5371..272e08cc2 100644 --- a/build/publish/PublishNupkgToBlobFeed.targets +++ b/build/publish/PublishNupkgToBlobFeed.targets @@ -5,7 +5,9 @@ + Condition=" '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' " > + NonShipping=true + From 4dc5eb73208dcd85a10c3b298a8221dd736a7def Mon Sep 17 00:00:00 2001 From: jbeisner Date: Mon, 23 Apr 2018 22:03:55 +0000 Subject: [PATCH 081/118] Do not sign the CLI NuPkgs - they do not ship. --- build/Signing.proj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build/Signing.proj b/build/Signing.proj index 4cd7f997a..f77406db0 100644 --- a/build/Signing.proj +++ b/build/Signing.proj @@ -109,10 +109,6 @@ $(InternalCertificateId) - - $(NugetCertificateId) - From 270fc4428ae739bb85c46c71c075f673260acd85 Mon Sep 17 00:00:00 2001 From: William Li Date: Tue, 24 Apr 2018 10:19:27 -0700 Subject: [PATCH 082/118] do not set BaseIntermediateOutputPath in temp project of dotnet install (#9122) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Should use MsBuildProjectExtensionsPath instead. Change the property passin by project file instead of command line. It is more reliable passing path in xml and also the timing of MsBuildProjectExtensionsPath is controlled. (Before loading SDK) Change mock fake project to use “;” instead, since c:\path contains “:”. --- src/dotnet/ToolPackage/IProjectRestorer.cs | 1 - src/dotnet/ToolPackage/ToolPackageInstaller.cs | 16 +++++++++++----- .../dotnet-tool/install/ProjectRestorer.cs | 4 +--- .../ProjectRestorerMock.cs | 9 +++++---- .../ToolPackageInstallerMock.cs | 3 +-- 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/dotnet/ToolPackage/IProjectRestorer.cs b/src/dotnet/ToolPackage/IProjectRestorer.cs index 0546c399a..343681f8d 100644 --- a/src/dotnet/ToolPackage/IProjectRestorer.cs +++ b/src/dotnet/ToolPackage/IProjectRestorer.cs @@ -9,7 +9,6 @@ namespace Microsoft.DotNet.ToolPackage internal interface IProjectRestorer { void Restore(FilePath project, - DirectoryPath assetJsonOutput, FilePath? nugetConfig = null, string verbosity = null); } diff --git a/src/dotnet/ToolPackage/ToolPackageInstaller.cs b/src/dotnet/ToolPackage/ToolPackageInstaller.cs index 9e3fb29dd..b1fdb8d2f 100644 --- a/src/dotnet/ToolPackage/ToolPackageInstaller.cs +++ b/src/dotnet/ToolPackage/ToolPackageInstaller.cs @@ -54,6 +54,7 @@ namespace Microsoft.DotNet.ToolPackage versionRange: versionRange, targetFramework: targetFramework ?? BundledTargetFramework.GetTargetFrameworkMoniker(), restoreDirectory: stageDirectory, + assetJsonOutputDirectory: stageDirectory, rootConfigDirectory: rootConfigDirectory, additionalFeeds: additionalFeeds); @@ -61,7 +62,6 @@ namespace Microsoft.DotNet.ToolPackage { _projectRestorer.Restore( tempProject, - stageDirectory, nugetConfig, verbosity: verbosity); } @@ -116,6 +116,7 @@ namespace Microsoft.DotNet.ToolPackage VersionRange versionRange, string targetFramework, DirectoryPath restoreDirectory, + DirectoryPath assetJsonOutputDirectory, DirectoryPath? rootConfigDirectory, string[] additionalFeeds) { @@ -132,7 +133,11 @@ namespace Microsoft.DotNet.ToolPackage var tempProjectContent = new XDocument( new XElement("Project", - new XAttribute("Sdk", "Microsoft.NET.Sdk"), + new XElement("PropertyGroup", + new XElement("MsBuildProjectExtensionsPath", assetJsonOutputDirectory.Value)), // change the output directory of asset.json + new XElement(("Import"), + new XAttribute("Project", "Sdk.props"), + new XAttribute("Sdk", "Microsoft.NET.Sdk")), new XElement("PropertyGroup", new XElement("TargetFramework", targetFramework), new XElement("RestorePackagesPath", restoreDirectory.Value), @@ -148,9 +153,10 @@ namespace Microsoft.DotNet.ToolPackage new XElement("PackageReference", new XAttribute("Include", packageId.ToString()), new XAttribute("Version", - versionRange?.ToString("S", new VersionRangeFormatter()) ?? "*") // nuget will restore latest stable for * - )) - )); + versionRange?.ToString("S", new VersionRangeFormatter()) ?? "*"))), // nuget will restore latest stable for * + new XElement(("Import"), + new XAttribute("Project", "Sdk.targets"), + new XAttribute("Sdk", "Microsoft.NET.Sdk")))); File.WriteAllText(tempProject.Value, tempProjectContent.ToString()); return tempProject; diff --git a/src/dotnet/commands/dotnet-tool/install/ProjectRestorer.cs b/src/dotnet/commands/dotnet-tool/install/ProjectRestorer.cs index 7d0096b57..83ccd6f34 100644 --- a/src/dotnet/commands/dotnet-tool/install/ProjectRestorer.cs +++ b/src/dotnet/commands/dotnet-tool/install/ProjectRestorer.cs @@ -27,7 +27,6 @@ namespace Microsoft.DotNet.Tools.Tool.Install } public void Restore(FilePath project, - DirectoryPath assetJsonOutput, FilePath? nugetConfig = null, string verbosity = null) { @@ -43,8 +42,7 @@ namespace Microsoft.DotNet.Tools.Tool.Install argsToPassToRestore.AddRange(new List { "--runtime", - AnyRid, - $"-property:BaseIntermediateOutputPath={assetJsonOutput.ToXmlEncodeString()}" + AnyRid }); argsToPassToRestore.Add($"-verbosity:{verbosity ?? "quiet"}"); diff --git a/test/Microsoft.DotNet.Tools.Tests.ComponentMocks/ProjectRestorerMock.cs b/test/Microsoft.DotNet.Tools.Tests.ComponentMocks/ProjectRestorerMock.cs index 7d7f34849..a7548a484 100644 --- a/test/Microsoft.DotNet.Tools.Tests.ComponentMocks/ProjectRestorerMock.cs +++ b/test/Microsoft.DotNet.Tools.Tests.ComponentMocks/ProjectRestorerMock.cs @@ -57,19 +57,19 @@ namespace Microsoft.DotNet.Tools.Tests.ComponentMocks } public void Restore(FilePath project, - DirectoryPath assetJsonOutput, FilePath? nugetConfig = null, string verbosity = null) { string packageId; VersionRange versionRange; string targetFramework; + DirectoryPath assetJsonOutput; try { - // The mock installer wrote a mock project file containing id:version:framework + // The mock installer wrote a mock project file containing id;version;framework;stageDirectory var contents = _fileSystem.File.ReadAllText(project.Value); - var tokens = contents.Split(':'); - if (tokens.Length != 3) + var tokens = contents.Split(';'); + if (tokens.Length != 4) { throw new ToolPackageException(LocalizableStrings.ToolInstallationRestoreFailed); } @@ -77,6 +77,7 @@ namespace Microsoft.DotNet.Tools.Tests.ComponentMocks packageId = tokens[0]; versionRange = VersionRange.Parse(tokens[1]); targetFramework = tokens[2]; + assetJsonOutput = new DirectoryPath(tokens[3]); } catch (IOException) { diff --git a/test/Microsoft.DotNet.Tools.Tests.ComponentMocks/ToolPackageInstallerMock.cs b/test/Microsoft.DotNet.Tools.Tests.ComponentMocks/ToolPackageInstallerMock.cs index 9737ff858..6b28de63b 100644 --- a/test/Microsoft.DotNet.Tools.Tests.ComponentMocks/ToolPackageInstallerMock.cs +++ b/test/Microsoft.DotNet.Tools.Tests.ComponentMocks/ToolPackageInstallerMock.cs @@ -63,12 +63,11 @@ namespace Microsoft.DotNet.Tools.Tests.ComponentMocks // Write a fake project with the requested package id, version, and framework _fileSystem.File.WriteAllText( tempProject.Value, - $"{packageId}:{versionRange?.ToString("S", new VersionRangeFormatter()) ?? "*"}:{targetFramework}"); + $"{packageId};{versionRange?.ToString("S", new VersionRangeFormatter()) ?? "*"};{targetFramework};{stageDirectory.Value}"); // Perform a restore on the fake project _projectRestorer.Restore( tempProject, - stageDirectory, nugetConfig, verbosity); From 74ee6b6070c89061c3a2e74115aee7592d4fd81d Mon Sep 17 00:00:00 2001 From: jbeisner Date: Tue, 24 Apr 2018 18:48:18 +0000 Subject: [PATCH 083/118] Download 'linux-musl-x64' shared framework assets when building 'linux-musl-x64' --- build/BundledRuntimes.props | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index 1bf1db059..6a8a97ff3 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -2,7 +2,7 @@ $(HostRid) $(HostMonikerRid) - + -internal @@ -25,6 +25,7 @@ $(CoreSetupRid) + $(ProductMonikerRid) linux-$(Architecture) dotnet-runtime-$(MicrosoftNETCoreAppPackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) From 96674333e3a2c509b1f8bbb4212d924659998f6d Mon Sep 17 00:00:00 2001 From: jbeisner Date: Tue, 24 Apr 2018 19:07:33 +0000 Subject: [PATCH 084/118] Fixing typo... --- build/BundledRuntimes.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index 6a8a97ff3..60741beb4 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -25,7 +25,7 @@ $(CoreSetupRid) - $(ProductMonikerRid) + $(ProductMonikerRid) linux-$(Architecture) dotnet-runtime-$(MicrosoftNETCoreAppPackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) From 70e3f1d30db8e97a77f76bfe94007c9eec004d4b Mon Sep 17 00:00:00 2001 From: jbeisner Date: Tue, 24 Apr 2018 19:51:04 +0000 Subject: [PATCH 085/118] Updating the AspNetCore version to a drop that has a 'linux-musl' asset --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 789a254bb..54672f06d 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.1.0-preview2-30475 + 2.1.0-rc1-30661 2.1.0-rc1-26420-08 $(MicrosoftNETCoreAppPackageVersion) 15.7.0-preview-000169 From bb15fa8c61d263b328ab5c568554e6fc80b1a36b Mon Sep 17 00:00:00 2001 From: jbeisner Date: Tue, 24 Apr 2018 20:22:35 +0000 Subject: [PATCH 086/118] Formatting... --- build/BundledRuntimes.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index 60741beb4..0031e8dd0 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -2,7 +2,7 @@ $(HostRid) $(HostMonikerRid) - + -internal From 247937665ffa82e9eee3fbbf988bf63c29ac1af8 Mon Sep 17 00:00:00 2001 From: jbeisner Date: Tue, 24 Apr 2018 20:57:42 +0000 Subject: [PATCH 087/118] Fix a release/2.1.3xx baseline error: error NU1605: Detected package downgrade: Microsoft.NETCore.App from 2.1.0-rc1-26423-06 to 2.1.0-rc1-26420-08 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index a1afe9731..169f6163f 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -3,7 +3,7 @@ 2.1.0-rc1-30661 $(MicrosoftAspNetCoreAllPackageVersion) - 2.1.0-rc1-26420-08 + 2.1.0-rc1-26423-06 $(MicrosoftNETCoreAppPackageVersion) 15.7.0-preview-000169 $(MicrosoftBuildPackageVersion) From 458ad92d4963c3450368518cdfc922c3a53bc322 Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Tue, 24 Apr 2018 14:50:13 -0700 Subject: [PATCH 088/118] Insert NuGet Build 4.7.0-rtm.5148 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 416f525a1..f04a3a95f 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -32,7 +32,7 @@ 1.2.1-alpha-002133 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 1.6.0-beta2-25304 - 4.7.0-rtm.5122 + 4.7.0-rtm.5148 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From a711c264f11232703cde1b5cc52161efe0cf82f7 Mon Sep 17 00:00:00 2001 From: Livar Date: Tue, 24 Apr 2018 16:00:33 -0700 Subject: [PATCH 089/118] Update Roslyn to 2.8.0-beta4-62824-10 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 416f525a1..3ead01f96 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -10,7 +10,7 @@ $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) 10.1.4-rtm-180403-0 - 2.8.0-dev-62817-01 + 2.8.0-beta4-62824-10 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) 2.1.200-preview-62820-08 From b9597913dc13fa45bb437c173bbae5569f5aca80 Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Tue, 24 Apr 2018 18:58:37 -0700 Subject: [PATCH 090/118] Fix --source-feed option for tool install and update commands. Commit 9cc2b7cd2f9dc165ee3a04b1de6fa5065b142dd3 regressed the `--source-feed` option so that it no longer accepted relative paths. Because the option is now saved to the temp project file, any relative paths specified by the `--source-feed` option were made relative to the temp project path and not from the current working directory of where dotnet was run. The fix is to use `Path.GetFullPath` of the `--source-feed` option, provided the option specified was not an absolute URI. Fixes #9132. --- .../ToolPackage/ToolPackageInstaller.cs | 12 ++++- .../ToolPackageInstallerTests.cs | 44 +++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) diff --git a/src/dotnet/ToolPackage/ToolPackageInstaller.cs b/src/dotnet/ToolPackage/ToolPackageInstaller.cs index 9e3fb29dd..0fce39a61 100644 --- a/src/dotnet/ToolPackage/ToolPackageInstaller.cs +++ b/src/dotnet/ToolPackage/ToolPackageInstaller.cs @@ -161,7 +161,17 @@ namespace Microsoft.DotNet.ToolPackage var feeds = new List(); if (additionalFeeds != null) { - feeds.AddRange(additionalFeeds); + foreach (var feed in additionalFeeds) + { + if (Uri.IsWellFormedUriString(feed, UriKind.Absolute)) + { + feeds.Add(feed); + } + else + { + feeds.Add(Path.GetFullPath(feed)); + } + } } // use fallbackfolder as feed to enable offline diff --git a/test/Microsoft.DotNet.ToolPackage.Tests/ToolPackageInstallerTests.cs b/test/Microsoft.DotNet.ToolPackage.Tests/ToolPackageInstallerTests.cs index 3f939f1fe..1b4dcadbd 100644 --- a/test/Microsoft.DotNet.ToolPackage.Tests/ToolPackageInstallerTests.cs +++ b/test/Microsoft.DotNet.ToolPackage.Tests/ToolPackageInstallerTests.cs @@ -259,6 +259,50 @@ namespace Microsoft.DotNet.ToolPackage.Tests package.Uninstall(); } + [Theory] + [InlineData(false)] + [InlineData(true)] + public void GivenARelativeSourcePathInstallSucceeds(bool testMockBehaviorIsInSync) + { + var source = GetTestLocalFeedPath(); + + var (store, installer, reporter, fileSystem) = Setup( + useMock: testMockBehaviorIsInSync, + feeds: GetMockFeedsForSource(source)); + + var package = installer.InstallPackage( + packageId: TestPackageId, + versionRange: VersionRange.Parse(TestPackageVersion), + targetFramework: _testTargetframework, + additionalFeeds: new[] { Path.GetRelativePath(Directory.GetCurrentDirectory(), source) }); + + AssertPackageInstall(reporter, fileSystem, package, store); + + package.Uninstall(); + } + + [Theory] + [InlineData(false)] + [InlineData(true)] + public void GivenAUriSourceInstallSucceeds(bool testMockBehaviorIsInSync) + { + var source = GetTestLocalFeedPath(); + + var (store, installer, reporter, fileSystem) = Setup( + useMock: testMockBehaviorIsInSync, + feeds: GetMockFeedsForSource(source)); + + var package = installer.InstallPackage( + packageId: TestPackageId, + versionRange: VersionRange.Parse(TestPackageVersion), + targetFramework: _testTargetframework, + additionalFeeds: new[] { new Uri(source).AbsoluteUri }); + + AssertPackageInstall(reporter, fileSystem, package, store); + + package.Uninstall(); + } + [Theory] [InlineData(false)] [InlineData(true)] From 535cac7f55565805270f6f140d3d340b44b187e8 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 25 Apr 2018 17:11:09 -0700 Subject: [PATCH 091/118] Explicitly note whether the package version props is being overridden It's difficult to tell today whether the package version props is correctly passed and used in some scenarios. Make it more explicit. --- build/DownloadPackageVersions.targets | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/DownloadPackageVersions.targets b/build/DownloadPackageVersions.targets index dc821037b..ff47bd99e 100644 --- a/build/DownloadPackageVersions.targets +++ b/build/DownloadPackageVersions.targets @@ -2,6 +2,8 @@ + From a4cc9fa5e0658fdd97c8f4057d7ba8904d43e295 Mon Sep 17 00:00:00 2001 From: Andy Gerlicher Date: Wed, 25 Apr 2018 20:02:09 -0700 Subject: [PATCH 092/118] MSBuild 15.7.177 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 3ead01f96..d9dd3a07c 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -4,7 +4,7 @@ 2.0.7 $(MicrosoftNETCoreAppPackageVersion) - 15.7.0-preview-000163 + 15.7.177 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From 7b635e76a1163aef662a0d8b582349ed88170237 Mon Sep 17 00:00:00 2001 From: kasper3 <33230602+kasper3@users.noreply.github.com> Date: Thu, 26 Apr 2018 14:26:35 +0300 Subject: [PATCH 093/118] Use cp -u on linux-musl This actually applies to all busybox based OS. --- scripts/obtain/dotnet-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/obtain/dotnet-install.sh b/scripts/obtain/dotnet-install.sh index e19ed452d..27443c397 100755 --- a/scripts/obtain/dotnet-install.sh +++ b/scripts/obtain/dotnet-install.sh @@ -596,7 +596,7 @@ copy_files_or_dirs_from_list() { local osname="$(get_current_os_name)" local override_switch=$( if [ "$override" = false ]; then - if [[ "$osname" == 'alpine'* ]]; then + if [[ "$osname" == "linux-musl" ]]; then printf -- "-u"; else printf -- "-n"; From 7ff4f27df1f92a64d73144bacefa08a4851d9b69 Mon Sep 17 00:00:00 2001 From: kasper3 <33230602+kasper3@users.noreply.github.com> Date: Thu, 26 Apr 2018 14:32:15 +0300 Subject: [PATCH 094/118] Update readme: alpine--targz to musl-targz --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cd7ca0be9..2e45c01fc 100644 --- a/README.md +++ b/README.md @@ -123,8 +123,8 @@ Reference notes: [rhel-6-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-rhel.6-x64.tar.gz [rhel-6-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-rhel.6-x64.tar.gz.sha -[alpine-3.6-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-alpine.3.6-x64.tar.gz -[alpine-3.6-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-alpine.3.6-x64.tar.gz.sha +[linux-musl-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-linux-musl-x64.tar.gz +[linux-musl-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.1.3xx/dotnet-sdk-latest-linux-musl-x64.tar.gz.sha # Debian daily feed From fc577e6b057371cda5bc36068d9022400ac49eea Mon Sep 17 00:00:00 2001 From: Livar Date: Thu, 26 Apr 2018 14:12:42 -0700 Subject: [PATCH 095/118] Update SDK to 2.1.200-preview-62826-08 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index e6efd3f8e..ec7ce53f6 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -13,7 +13,7 @@ 2.8.0-beta4-62824-10 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.200-preview-62820-08 + 2.1.200-preview-62826-08 $(MicrosoftNETSdkPackageVersion) 2.0.0-rel-20180221-676 $(MicrosoftNETSdkWebPackageVersion) From f9b939fe8996210666f4740d16e997081023bb23 Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Thu, 26 Apr 2018 10:53:54 -0700 Subject: [PATCH 096/118] Fix MSBuild invocation to quote property option values. This commit ensures that any `/property` option's value is surrounded by quotes to allow MSBuild to properly interpret special characters like semicolons. Users familiar with MSBuild expect `/property:Name="Value"` to handle semicolons. However, since `dotnet` parses the command line first, the quotes get processed by its command line parser. This results in `/property:Name=Value` being passed to MSBuild, which will not parse a "Value" containing a semicolon correctly. Since it is safe to always quote the property value for this option, this fix simply ensures that the value is surrounded by quotes. This fixes the issue for all commands that forward arguments to MSBuild. Fixes #7791. --- .../ProjectPrintsNoWarn.csproj | 12 +++++ .../ArgumentEscaper.cs | 20 +++------ .../MSBuildForwardingAppWithoutLogging.cs | 44 +++++++++++++------ src/dotnet/commands/dotnet-test/Program.cs | 13 ------ .../GivenDotnetBuildInvocation.cs | 28 ++++++------ .../GivenDotnetCleanInvocation.cs | 12 ++--- .../GivenDotnetMSBuildBuildsProjects.cs | 20 +++++++++ .../GivenDotnetPackInvocation.cs | 20 ++++----- .../GivenDotnetPublishInvocation.cs | 22 +++++----- .../GivenDotnetRestoreInvocation.cs | 24 +++++----- .../GivenDotnetStoreInvocation.cs | 12 ++--- 11 files changed, 128 insertions(+), 99 deletions(-) create mode 100644 TestAssets/TestProjects/ProjectPrintsNoWarn/ProjectPrintsNoWarn.csproj diff --git a/TestAssets/TestProjects/ProjectPrintsNoWarn/ProjectPrintsNoWarn.csproj b/TestAssets/TestProjects/ProjectPrintsNoWarn/ProjectPrintsNoWarn.csproj new file mode 100644 index 000000000..4e83f2fad --- /dev/null +++ b/TestAssets/TestProjects/ProjectPrintsNoWarn/ProjectPrintsNoWarn.csproj @@ -0,0 +1,12 @@ + + + + library + netcoreapp2.0 + + + + + + + diff --git a/src/Microsoft.DotNet.Cli.Utils/ArgumentEscaper.cs b/src/Microsoft.DotNet.Cli.Utils/ArgumentEscaper.cs index afaa58d48..c87268c00 100644 --- a/src/Microsoft.DotNet.Cli.Utils/ArgumentEscaper.cs +++ b/src/Microsoft.DotNet.Cli.Utils/ArgumentEscaper.cs @@ -59,14 +59,10 @@ namespace Microsoft.DotNet.Cli.Utils /// private static IEnumerable EscapeArgArray(IEnumerable args) { - var escapedArgs = new List(); - foreach (var arg in args) { - escapedArgs.Add(EscapeSingleArg(arg)); + yield return EscapeSingleArg(arg); } - - return escapedArgs; } /// @@ -79,23 +75,19 @@ namespace Microsoft.DotNet.Cli.Utils /// /// /// - private static IEnumerable EscapeArgArrayForCmd(IEnumerable arguments) + private static IEnumerable EscapeArgArrayForCmd(IEnumerable args) { - var escapedArgs = new List(); - - foreach (var arg in arguments) + foreach (var arg in args) { - escapedArgs.Add(EscapeArgForCmd(arg)); + yield return EscapeArgForCmd(arg); } - - return escapedArgs; } - public static string EscapeSingleArg(string arg) + public static string EscapeSingleArg(string arg, bool forceQuotes = false) { var sb = new StringBuilder(); - var needsQuotes = ShouldSurroundWithQuotes(arg); + var needsQuotes = forceQuotes || ShouldSurroundWithQuotes(arg); var isQuoted = needsQuotes || IsSurroundedWithQuotes(arg); if (needsQuotes) sb.Append("\""); diff --git a/src/Microsoft.DotNet.Cli.Utils/MSBuildForwardingAppWithoutLogging.cs b/src/Microsoft.DotNet.Cli.Utils/MSBuildForwardingAppWithoutLogging.cs index d46eb52f2..cee835aa0 100644 --- a/src/Microsoft.DotNet.Cli.Utils/MSBuildForwardingAppWithoutLogging.cs +++ b/src/Microsoft.DotNet.Cli.Utils/MSBuildForwardingAppWithoutLogging.cs @@ -34,7 +34,7 @@ namespace Microsoft.DotNet.Cli.Utils { _forwardingApp = new ForwardingAppImplementation( msbuildPath ?? GetMSBuildExePath(), - _msbuildRequiredParameters.Concat(argsToForward.Select(Escape)), + _msbuildRequiredParameters.Concat(argsToForward.Select(QuotePropertyValue)), environmentVariables: _msbuildRequiredEnvironmentVariables); } @@ -49,13 +49,6 @@ namespace Microsoft.DotNet.Cli.Utils return GetProcessStartInfo().Execute(); } - private static string Escape(string arg) => - // this is a workaround for https://github.com/Microsoft/msbuild/issues/1622 - IsRestoreSources(arg) ? - arg.Replace(";", "%3B") - .Replace("://", ":%2F%2F") : - arg; - private static string GetMSBuildExePath() { return Path.Combine( @@ -82,12 +75,37 @@ namespace Microsoft.DotNet.Cli.Utils return new Muxer().MuxerPath; } - private static bool IsRestoreSources(string arg) + private static bool IsPropertyArgument(string arg) { - return arg.StartsWith("/p:RestoreSources=", StringComparison.OrdinalIgnoreCase) || - arg.StartsWith("/property:RestoreSources=", StringComparison.OrdinalIgnoreCase) || - arg.StartsWith("-p:RestoreSources=", StringComparison.OrdinalIgnoreCase) || - arg.StartsWith("-property:RestoreSources=", StringComparison.OrdinalIgnoreCase); + return + arg.StartsWith("/p:", StringComparison.OrdinalIgnoreCase) || + arg.StartsWith("/property:", StringComparison.OrdinalIgnoreCase) || + arg.StartsWith("-p:", StringComparison.OrdinalIgnoreCase) || + arg.StartsWith("-property:", StringComparison.OrdinalIgnoreCase); + } + + private static string QuotePropertyValue(string arg) + { + if (!IsPropertyArgument(arg)) + { + return arg; + } + + var parts = arg.Split(new[] { '=' }, 2); + if (parts.Length != 2) + { + return arg; + } + + // Escaping `://` is a workaround for https://github.com/Microsoft/msbuild/issues/1622 + // The issue is that MSBuild is collapsing multiple slashes to a single slash due to a bad regex. + var value = parts[1].Replace("://", ":%2f%2f"); + if (ArgumentEscaper.IsSurroundedWithQuotes(value)) + { + return $"{parts[0]}={value}"; + } + + return $"{parts[0]}={ArgumentEscaper.EscapeSingleArg(value, forceQuotes: true)}"; } } } diff --git a/src/dotnet/commands/dotnet-test/Program.cs b/src/dotnet/commands/dotnet-test/Program.cs index 95a8f2418..7fd8103b9 100644 --- a/src/dotnet/commands/dotnet-test/Program.cs +++ b/src/dotnet/commands/dotnet-test/Program.cs @@ -125,19 +125,6 @@ namespace Microsoft.DotNet.Tools.Test return arg; } - private static string[] GetSemiColonEscapedArgs(List args) - { - int counter = 0; - string[] array = new string[args.Count]; - - foreach (string arg in args) - { - array[counter++] = GetSemiColonEscapedString(arg); - } - - return array; - } - private static void UpdateRunSettingsArgumentsText() { DefaultHelpViewText.Synopsis.AdditionalArguments = " [[--] ...]]"; diff --git a/test/dotnet-msbuild.Tests/GivenDotnetBuildInvocation.cs b/test/dotnet-msbuild.Tests/GivenDotnetBuildInvocation.cs index 3a4821f5a..022a2b78c 100644 --- a/test/dotnet-msbuild.Tests/GivenDotnetBuildInvocation.cs +++ b/test/dotnet-msbuild.Tests/GivenDotnetBuildInvocation.cs @@ -13,21 +13,21 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests [Theory] [InlineData(new string[] { }, "-target:Build")] - [InlineData(new string[] { "-o", "foo" }, "-target:Build -property:OutputPath=foo")] - [InlineData(new string[] { "-property:Verbosity=diag" }, "-target:Build -property:Verbosity=diag")] - [InlineData(new string[] { "--output", "foo" }, "-target:Build -property:OutputPath=foo")] - [InlineData(new string[] { "-o", "foo1 foo2" }, "-target:Build \"-property:OutputPath=foo1 foo2\"")] + [InlineData(new string[] { "-o", "foo" }, @"-target:Build -property:OutputPath=\""foo\""")] + [InlineData(new string[] { "-property:Verbosity=diag" }, @"-target:Build -property:Verbosity=\""diag\""")] + [InlineData(new string[] { "--output", "foo" }, @"-target:Build -property:OutputPath=\""foo\""")] + [InlineData(new string[] { "-o", "foo1 foo2" }, @"-target:Build ""-property:OutputPath=\""foo1 foo2\""""")] [InlineData(new string[] { "--no-incremental" }, "-target:Rebuild")] - [InlineData(new string[] { "-r", "rid" }, "-target:Build -property:RuntimeIdentifier=rid")] - [InlineData(new string[] { "--runtime", "rid" }, "-target:Build -property:RuntimeIdentifier=rid")] - [InlineData(new string[] { "-c", "config" }, "-target:Build -property:Configuration=config")] - [InlineData(new string[] { "--configuration", "config" }, "-target:Build -property:Configuration=config")] - [InlineData(new string[] { "--version-suffix", "mysuffix" }, "-target:Build -property:VersionSuffix=mysuffix")] - [InlineData(new string[] { "--no-dependencies" }, "-target:Build -property:BuildProjectReferences=false")] + [InlineData(new string[] { "-r", "rid" }, @"-target:Build -property:RuntimeIdentifier=\""rid\""")] + [InlineData(new string[] { "--runtime", "rid" }, @"-target:Build -property:RuntimeIdentifier=\""rid\""")] + [InlineData(new string[] { "-c", "config" }, @"-target:Build -property:Configuration=\""config\""")] + [InlineData(new string[] { "--configuration", "config" }, @"-target:Build -property:Configuration=\""config\""")] + [InlineData(new string[] { "--version-suffix", "mysuffix" }, @"-target:Build -property:VersionSuffix=\""mysuffix\""")] + [InlineData(new string[] { "--no-dependencies" }, @"-target:Build -property:BuildProjectReferences=\""false\""")] [InlineData(new string[] { "-v", "diag" }, "-target:Build -verbosity:diag")] [InlineData(new string[] { "--verbosity", "diag" }, "-target:Build -verbosity:diag")] [InlineData(new string[] { "--no-incremental", "-o", "myoutput", "-r", "myruntime", "-v", "diag", "/ArbitrarySwitchForMSBuild" }, - "-target:Rebuild -property:OutputPath=myoutput -property:RuntimeIdentifier=myruntime -verbosity:diag /ArbitrarySwitchForMSBuild")] + @"-target:Rebuild -property:OutputPath=\""myoutput\"" -property:RuntimeIdentifier=\""myruntime\"" -verbosity:diag /ArbitrarySwitchForMSBuild")] public void MsbuildInvocationIsCorrect(string[] args, string expectedAdditionalArgs) { expectedAdditionalArgs = (string.IsNullOrEmpty(expectedAdditionalArgs) ? "" : $" {expectedAdditionalArgs}"); @@ -43,10 +43,10 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests } [Theory] - [InlineData(new string[] { "-f", "tfm" }, "-target:Restore", "-target:Build -property:TargetFramework=tfm")] + [InlineData(new string[] { "-f", "tfm" }, "-target:Restore", @"-target:Build -property:TargetFramework=\""tfm\""")] [InlineData(new string[] { "-o", "myoutput", "-f", "tfm", "-v", "diag", "/ArbitrarySwitchForMSBuild" }, - "-target:Restore -property:OutputPath=myoutput -verbosity:diag /ArbitrarySwitchForMSBuild", - "-target:Build -property:OutputPath=myoutput -property:TargetFramework=tfm -verbosity:diag /ArbitrarySwitchForMSBuild")] + @"-target:Restore -property:OutputPath=\""myoutput\"" -verbosity:diag /ArbitrarySwitchForMSBuild", + @"-target:Build -property:OutputPath=\""myoutput\"" -property:TargetFramework=\""tfm\"" -verbosity:diag /ArbitrarySwitchForMSBuild")] public void MsbuildInvocationIsCorrectForSeparateRestore( string[] args, string expectedAdditionalArgsForRestore, diff --git a/test/dotnet-msbuild.Tests/GivenDotnetCleanInvocation.cs b/test/dotnet-msbuild.Tests/GivenDotnetCleanInvocation.cs index 4c7d89890..9f9ced642 100644 --- a/test/dotnet-msbuild.Tests/GivenDotnetCleanInvocation.cs +++ b/test/dotnet-msbuild.Tests/GivenDotnetCleanInvocation.cs @@ -22,12 +22,12 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests [Theory] [InlineData(new string[] { }, "")] - [InlineData(new string[] { "-o", "" }, "-property:OutputPath=")] - [InlineData(new string[] { "--output", "" }, "-property:OutputPath=")] - [InlineData(new string[] { "-f", "" }, "-property:TargetFramework=")] - [InlineData(new string[] { "--framework", "" }, "-property:TargetFramework=")] - [InlineData(new string[] { "-c", "" }, "-property:Configuration=")] - [InlineData(new string[] { "--configuration", "" }, "-property:Configuration=")] + [InlineData(new string[] { "-o", "" }, @"-property:OutputPath=\""\""")] + [InlineData(new string[] { "--output", "" }, @"-property:OutputPath=\""\""")] + [InlineData(new string[] { "-f", "" }, @"-property:TargetFramework=\""\""")] + [InlineData(new string[] { "--framework", "" }, @"-property:TargetFramework=\""\""")] + [InlineData(new string[] { "-c", "" }, @"-property:Configuration=\""\""")] + [InlineData(new string[] { "--configuration", "" }, @"-property:Configuration=\""\""")] [InlineData(new string[] { "-v", "diag" }, "-verbosity:diag")] [InlineData(new string[] { "--verbosity", "diag" }, "-verbosity:diag")] public void MsbuildInvocationIsCorrect(string[] args, string expectedAdditionalArgs) diff --git a/test/dotnet-msbuild.Tests/GivenDotnetMSBuildBuildsProjects.cs b/test/dotnet-msbuild.Tests/GivenDotnetMSBuildBuildsProjects.cs index b07fb937c..1c0ea1047 100644 --- a/test/dotnet-msbuild.Tests/GivenDotnetMSBuildBuildsProjects.cs +++ b/test/dotnet-msbuild.Tests/GivenDotnetMSBuildBuildsProjects.cs @@ -159,6 +159,26 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests $"The MSBuild logger argument should not be specified when telemetry is disabled."); } + [Theory] + [InlineData("/p")] + [InlineData("/property")] + [InlineData("-p")] + [InlineData("-property")] + public void GivenAPropertyValueWithASemicolonItIsQuotedToMSBuild(string propertyOption) + { + var testInstance = TestAssets.Get("ProjectPrintsNoWarn") + .CreateInstance() + .WithSourceFiles(); + + new MSBuildCommand() + .WithWorkingDirectory(testInstance.Root) + .ExecuteWithCapturedOutput($@"/restore {propertyOption}:NoWarn=1234;5678;90\") + .Should() + .Pass() + .And + .HaveStdOutContaining(@"NoWarn => 1234;5678;90\"); + } + private string[] GetArgsForMSBuild(Func sentinelExists) { Telemetry.Telemetry telemetry; diff --git a/test/dotnet-msbuild.Tests/GivenDotnetPackInvocation.cs b/test/dotnet-msbuild.Tests/GivenDotnetPackInvocation.cs index e0b766da5..41fe24ee5 100644 --- a/test/dotnet-msbuild.Tests/GivenDotnetPackInvocation.cs +++ b/test/dotnet-msbuild.Tests/GivenDotnetPackInvocation.cs @@ -16,16 +16,16 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests [Theory] [InlineData(new string[] { }, "")] - [InlineData(new string[] { "-o", "" }, "-property:PackageOutputPath=")] - [InlineData(new string[] { "--output", "" }, "-property:PackageOutputPath=")] - [InlineData(new string[] { "--no-build" }, "-property:NoBuild=true")] - [InlineData(new string[] { "--include-symbols" }, "-property:IncludeSymbols=true")] - [InlineData(new string[] { "--include-source" }, "-property:IncludeSource=true")] - [InlineData(new string[] { "-c", "" }, "-property:Configuration=")] - [InlineData(new string[] { "--configuration", "" }, "-property:Configuration=")] - [InlineData(new string[] { "--version-suffix", "" }, "-property:VersionSuffix=")] - [InlineData(new string[] { "-s" }, "-property:Serviceable=true")] - [InlineData(new string[] { "--serviceable" }, "-property:Serviceable=true")] + [InlineData(new string[] { "-o", "" }, @"-property:PackageOutputPath=\""\""")] + [InlineData(new string[] { "--output", "" }, @"-property:PackageOutputPath=\""\""")] + [InlineData(new string[] { "--no-build" }, @"-property:NoBuild=\""true\""")] + [InlineData(new string[] { "--include-symbols" }, @"-property:IncludeSymbols=\""true\""")] + [InlineData(new string[] { "--include-source" }, @"-property:IncludeSource=\""true\""")] + [InlineData(new string[] { "-c", "" }, @"-property:Configuration=\""\""")] + [InlineData(new string[] { "--configuration", "" }, @"-property:Configuration=\""\""")] + [InlineData(new string[] { "--version-suffix", "" }, @"-property:VersionSuffix=\""\""")] + [InlineData(new string[] { "-s" }, @"-property:Serviceable=\""true\""")] + [InlineData(new string[] { "--serviceable" }, @"-property:Serviceable=\""true\""")] [InlineData(new string[] { "-v", "diag" }, "-verbosity:diag")] [InlineData(new string[] { "--verbosity", "diag" }, "-verbosity:diag")] [InlineData(new string[] { "" }, "")] diff --git a/test/dotnet-msbuild.Tests/GivenDotnetPublishInvocation.cs b/test/dotnet-msbuild.Tests/GivenDotnetPublishInvocation.cs index b66155261..9e6e6220a 100644 --- a/test/dotnet-msbuild.Tests/GivenDotnetPublishInvocation.cs +++ b/test/dotnet-msbuild.Tests/GivenDotnetPublishInvocation.cs @@ -24,14 +24,14 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests [Theory] [InlineData(new string[] { }, "")] - [InlineData(new string[] { "-r", "" }, "-property:RuntimeIdentifier=")] - [InlineData(new string[] { "--runtime", "" }, "-property:RuntimeIdentifier=")] - [InlineData(new string[] { "-o", "" }, "-property:PublishDir=")] - [InlineData(new string[] { "--output", "" }, "-property:PublishDir=")] - [InlineData(new string[] { "-c", "" }, "-property:Configuration=")] - [InlineData(new string[] { "--configuration", "" }, "-property:Configuration=")] - [InlineData(new string[] { "--version-suffix", "" }, "-property:VersionSuffix=")] - [InlineData(new string[] { "--manifest", "" }, "-property:TargetManifestFiles=")] + [InlineData(new string[] { "-r", "" }, @"-property:RuntimeIdentifier=\""\""")] + [InlineData(new string[] { "--runtime", "" }, @"-property:RuntimeIdentifier=\""\""")] + [InlineData(new string[] { "-o", "" }, @"-property:PublishDir=\""\""")] + [InlineData(new string[] { "--output", "" }, @"-property:PublishDir=\""\""")] + [InlineData(new string[] { "-c", "" }, @"-property:Configuration=\""\""")] + [InlineData(new string[] { "--configuration", "" }, @"-property:Configuration=\""\""")] + [InlineData(new string[] { "--version-suffix", "" }, @"-property:VersionSuffix=\""\""")] + [InlineData(new string[] { "--manifest", "" }, @"-property:TargetManifestFiles=\""\""")] [InlineData(new string[] { "-v", "minimal" }, "-verbosity:minimal")] [InlineData(new string[] { "--verbosity", "minimal" }, "-verbosity:minimal")] [InlineData(new string[] { "" }, "")] @@ -53,8 +53,8 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests } [Theory] - [InlineData(new string[] { "-f", "" }, "-property:TargetFramework=")] - [InlineData(new string[] { "--framework", "" }, "-property:TargetFramework=")] + [InlineData(new string[] { "-f", "" }, @"-property:TargetFramework=\""\""")] + [InlineData(new string[] { "--framework", "" }, @"-property:TargetFramework=\""\""")] public void MsbuildInvocationIsCorrectForSeparateRestore(string[] args, string expectedAdditionalArgs) { expectedAdditionalArgs = (string.IsNullOrEmpty(expectedAdditionalArgs) ? "" : $" {expectedAdditionalArgs}"); @@ -86,7 +86,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests command.GetProcessStartInfo() .Arguments .Should() - .Be($"{ExpectedPrefix} -target:Publish -property:NoBuild=true"); + .Be($"{ExpectedPrefix} -target:Publish -property:NoBuild=\\\"true\\\""); } [Theory] diff --git a/test/dotnet-msbuild.Tests/GivenDotnetRestoreInvocation.cs b/test/dotnet-msbuild.Tests/GivenDotnetRestoreInvocation.cs index e4ae26741..c1e515234 100644 --- a/test/dotnet-msbuild.Tests/GivenDotnetRestoreInvocation.cs +++ b/test/dotnet-msbuild.Tests/GivenDotnetRestoreInvocation.cs @@ -15,18 +15,18 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests [Theory] [InlineData(new string[] { }, "")] - [InlineData(new string[] { "-s", "" }, "-property:RestoreSources=")] - [InlineData(new string[] { "--source", "" }, "-property:RestoreSources=")] - [InlineData(new string[] { "-s", "", "-s", "" }, "-property:RestoreSources=%3B")] - [InlineData(new string[] { "-r", "" }, "-property:RuntimeIdentifiers=")] - [InlineData(new string[] { "--runtime", "" }, "-property:RuntimeIdentifiers=")] - [InlineData(new string[] { "-r", "", "-r", "" }, "-property:RuntimeIdentifiers=%3B")] - [InlineData(new string[] { "--packages", "" }, "-property:RestorePackagesPath=")] - [InlineData(new string[] { "--disable-parallel" }, "-property:RestoreDisableParallel=true")] - [InlineData(new string[] { "--configfile", "" }, "-property:RestoreConfigFile=")] - [InlineData(new string[] { "--no-cache" }, "-property:RestoreNoCache=true")] - [InlineData(new string[] { "--ignore-failed-sources" }, "-property:RestoreIgnoreFailedSources=true")] - [InlineData(new string[] { "--no-dependencies" }, "-property:RestoreRecursive=false")] + [InlineData(new string[] { "-s", "" }, @"-property:RestoreSources=\""\""")] + [InlineData(new string[] { "--source", "" }, @"-property:RestoreSources=\""\""")] + [InlineData(new string[] { "-s", "", "-s", "" }, @"-property:RestoreSources=\""%3B\""")] + [InlineData(new string[] { "-r", "" }, @"-property:RuntimeIdentifiers=\""\""")] + [InlineData(new string[] { "--runtime", "" }, @"-property:RuntimeIdentifiers=\""\""")] + [InlineData(new string[] { "-r", "", "-r", "" }, @"-property:RuntimeIdentifiers=\""%3B\""")] + [InlineData(new string[] { "--packages", "" }, @"-property:RestorePackagesPath=\""\""")] + [InlineData(new string[] { "--disable-parallel" }, @"-property:RestoreDisableParallel=\""true\""")] + [InlineData(new string[] { "--configfile", "" }, @"-property:RestoreConfigFile=\""\""")] + [InlineData(new string[] { "--no-cache" }, @"-property:RestoreNoCache=\""true\""")] + [InlineData(new string[] { "--ignore-failed-sources" }, @"-property:RestoreIgnoreFailedSources=\""true\""")] + [InlineData(new string[] { "--no-dependencies" }, @"-property:RestoreRecursive=\""false\""")] [InlineData(new string[] { "-v", "minimal" }, @"-verbosity:minimal")] [InlineData(new string[] { "--verbosity", "minimal" }, @"-verbosity:minimal")] public void MsbuildInvocationIsCorrect(string[] args, string expectedAdditionalArgs) diff --git a/test/dotnet-msbuild.Tests/GivenDotnetStoreInvocation.cs b/test/dotnet-msbuild.Tests/GivenDotnetStoreInvocation.cs index 47854f569..a7dd9459e 100644 --- a/test/dotnet-msbuild.Tests/GivenDotnetStoreInvocation.cs +++ b/test/dotnet-msbuild.Tests/GivenDotnetStoreInvocation.cs @@ -26,11 +26,11 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests } [Theory] - [InlineData(new string[] { "-f", "" }, @"-property:TargetFramework=")] - [InlineData(new string[] { "--framework", "" }, @"-property:TargetFramework=")] - [InlineData(new string[] { "-r", "" }, @"-property:RuntimeIdentifier=")] - [InlineData(new string[] { "--runtime", "" }, @"-property:RuntimeIdentifier=")] - [InlineData(new string[] { "--manifest", "one.xml", "--manifest", "two.xml", "--manifest", "three.xml" }, @"-property:AdditionalProjects=one.xml%3Btwo.xml%3Bthree.xml")] + [InlineData(new string[] { "-f", "" }, @"-property:TargetFramework=\""\""")] + [InlineData(new string[] { "--framework", "" }, @"-property:TargetFramework=\""\""")] + [InlineData(new string[] { "-r", "" }, @"-property:RuntimeIdentifier=\""\""")] + [InlineData(new string[] { "--runtime", "" }, @"-property:RuntimeIdentifier=\""\""")] + [InlineData(new string[] { "--manifest", "one.xml", "--manifest", "two.xml", "--manifest", "three.xml" }, @"-property:AdditionalProjects=\""one.xml%3Btwo.xml%3Bthree.xml\""")] public void MsbuildInvocationIsCorrect(string[] args, string expectedAdditionalArgs) { args = ArgsPrefix.Concat(args).ToArray(); @@ -51,7 +51,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests var msbuildPath = ""; StoreCommand.FromArgs(args, msbuildPath) - .GetProcessStartInfo().Arguments.Should().Be($"{ExpectedPrefix} -property:ComposeDir={Path.GetFullPath(path)}"); + .GetProcessStartInfo().Arguments.Should().Be($"{ExpectedPrefix} -property:ComposeDir=\\\"{Path.GetFullPath(path)}\\\""); } } } From 4009912a6e75cb0f3ae0b98a8bedd090643941e7 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Fri, 27 Apr 2018 15:48:19 +0000 Subject: [PATCH 097/118] Update clicommandlineparser, climigrate, coresetup, coresetup, fsharp, roslyn, sdk, templating, templating, templating, websdk to alpha-62823-01, alpha-62823-01, rc1-26423-06, rc1-26423-06, rtm-180422-0, beta4-62827-02, rc1-62823-01, beta3-20180422-1618305, beta3-20180422-1618305, beta3-20180422-1618305, rc1-20180422-1618307, respectively --- build/DependencyVersions.props | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 169f6163f..8c4e47391 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -10,29 +10,29 @@ $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 10.1.4-rtm-180418-0 - 2.8.0-dev-62819-05 + 10.1.4-rtm-180422-0 + 2.8.0-beta4-62827-02 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.300-preview3-62819-01 + 2.1.300-rc1-62823-01 $(MicrosoftNETSdkPackageVersion) $(MicrosoftAspNetCoreAppPackageVersion) - 2.1.300-rc1-20180420-1612100 + 2.1.300-rc1-20180422-1618307 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) - 1.0.2-beta3-20180418-1607235 + 1.0.2-beta3-20180422-1618305 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 1.0.2-beta3-20180418-1607235 - 1.0.2-beta3-20180418-1607235 + 1.0.2-beta3-20180422-1618305 + 1.0.2-beta3-20180422-1618305 $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) - 2.1.0-rc1-26419-02 - 2.1.0-rc1-26419-02 - 0.2.1-alpha-62819-01 - 1.3.1-alpha-62819-01 + 2.1.0-rc1-26423-06 + 2.1.0-rc1-26423-06 + 0.2.1-alpha-62823-01 + 1.3.1-alpha-62823-01 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 0.2.0-beta-62628-01 4.8.0-preview1.5116 From 2b9f00f3610f331fb44c1e09f0883f32b7b26db4 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 27 Apr 2018 10:33:58 -0700 Subject: [PATCH 098/118] Include aspnetcore in the linux-arm build, but not linux-arm64 or windows arm --- build/BundledRuntimes.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index 0031e8dd0..7aa1ddf1d 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -56,7 +56,7 @@ <_DownloadAndExtractItem Include="AspNetCoreSharedFxArchiveFile" - Condition="!Exists('$(AspNetCoreSharedFxArchiveFile)') And !$(Architecture.StartsWith('arm'))"> + Condition="!Exists('$(AspNetCoreSharedFxArchiveFile)') And ( '$(AspNetCoreSharedFxInstallerRid)' == 'linux-arm' OR !$(Architecture.StartsWith('arm')) )"> $(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion)/$(AspNetCoreSharedFxArchiveFileName)$(CoreSetupBlobAccessTokenParam) $(AspNetCoreSharedFxArchiveFile) $(AspNetCoreSharedFxPublishDirectory) From b2b3947c68c3d95a3a273ad1b995b5c551dc1f86 Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Thu, 26 Apr 2018 17:04:37 -0700 Subject: [PATCH 099/118] Fix Razor server shutdown on Windows. On Windows, the Razor server correctly creates the pid file with `FileAccess.Write` and `FileOptions.DeleteOnClose`. This requires a share mode of `FileShare.Write | FileShare.Delete` to open. However, the `dotnet build-server shutdown` command was opening the file with `FileShare.Read`. As a result, an `IOException` was being thrown and was not handled. This change first opens the file with the appropriate share access and also properly handles a failure to access or read the contents of the pid file. Additionally, an integration test was added to test that Razor server shutdown works as expected. Fixes #9158. --- .../Areas/MyFeature/Pages/Page1.cshtml | 16 ++++++ .../Areas/MyFeature/Pages/Page1.cshtml.cs | 17 +++++++ .../TestRazorApp/TestRazorApp.csproj | 11 ++++ src/dotnet/BuildServer/BuildServerProvider.cs | 27 ++++++++-- .../BuildServer/LocalizableStrings.resx | 3 ++ src/dotnet/BuildServer/RazorPidFile.cs | 8 ++- .../BuildServer/xlf/LocalizableStrings.cs.xlf | 5 ++ .../BuildServer/xlf/LocalizableStrings.de.xlf | 5 ++ .../BuildServer/xlf/LocalizableStrings.es.xlf | 5 ++ .../BuildServer/xlf/LocalizableStrings.fr.xlf | 5 ++ .../BuildServer/xlf/LocalizableStrings.it.xlf | 5 ++ .../BuildServer/xlf/LocalizableStrings.ja.xlf | 5 ++ .../BuildServer/xlf/LocalizableStrings.ko.xlf | 5 ++ .../BuildServer/xlf/LocalizableStrings.pl.xlf | 5 ++ .../xlf/LocalizableStrings.pt-BR.xlf | 5 ++ .../BuildServer/xlf/LocalizableStrings.ru.xlf | 5 ++ .../BuildServer/xlf/LocalizableStrings.tr.xlf | 5 ++ .../xlf/LocalizableStrings.zh-Hans.xlf | 5 ++ .../xlf/LocalizableStrings.zh-Hant.xlf | 5 ++ .../Commands/BuildServerCommand.cs | 20 ++++++++ .../Mock/FileSystemMockBuilder.cs | 5 ++ .../BuildServerProviderTests.cs | 51 ++++++++++++++++++- .../BuildServerShutdownCommandTests.cs | 43 +++++++++++++++- 23 files changed, 260 insertions(+), 6 deletions(-) create mode 100644 TestAssets/TestProjects/TestRazorApp/Areas/MyFeature/Pages/Page1.cshtml create mode 100644 TestAssets/TestProjects/TestRazorApp/Areas/MyFeature/Pages/Page1.cshtml.cs create mode 100644 TestAssets/TestProjects/TestRazorApp/TestRazorApp.csproj create mode 100644 test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/BuildServerCommand.cs diff --git a/TestAssets/TestProjects/TestRazorApp/Areas/MyFeature/Pages/Page1.cshtml b/TestAssets/TestProjects/TestRazorApp/Areas/MyFeature/Pages/Page1.cshtml new file mode 100644 index 000000000..79083e425 --- /dev/null +++ b/TestAssets/TestProjects/TestRazorApp/Areas/MyFeature/Pages/Page1.cshtml @@ -0,0 +1,16 @@ +@page +@model TestRazorApp.MyFeature.Pages.Page1Model +@{ + Layout = null; +} + + + + + + + Page1 + + + + diff --git a/TestAssets/TestProjects/TestRazorApp/Areas/MyFeature/Pages/Page1.cshtml.cs b/TestAssets/TestProjects/TestRazorApp/Areas/MyFeature/Pages/Page1.cshtml.cs new file mode 100644 index 000000000..583793ac3 --- /dev/null +++ b/TestAssets/TestProjects/TestRazorApp/Areas/MyFeature/Pages/Page1.cshtml.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; + +namespace TestRazorApp.MyFeature.Pages +{ + public class Page1Model : PageModel + { + public void OnGet() + { + + } + } +} \ No newline at end of file diff --git a/TestAssets/TestProjects/TestRazorApp/TestRazorApp.csproj b/TestAssets/TestProjects/TestRazorApp/TestRazorApp.csproj new file mode 100644 index 000000000..59cfc871f --- /dev/null +++ b/TestAssets/TestProjects/TestRazorApp/TestRazorApp.csproj @@ -0,0 +1,11 @@ + + + + + netstandard2.0 + + + + + + diff --git a/src/dotnet/BuildServer/BuildServerProvider.cs b/src/dotnet/BuildServer/BuildServerProvider.cs index e292d854a..bf26fdfad 100644 --- a/src/dotnet/BuildServer/BuildServerProvider.cs +++ b/src/dotnet/BuildServer/BuildServerProvider.cs @@ -12,15 +12,19 @@ namespace Microsoft.DotNet.BuildServer { internal class BuildServerProvider : IBuildServerProvider { + public const string PidFileDirectoryVariableName = "DOTNET_BUILD_PIDFILE_DIRECTORY"; private readonly IFileSystem _fileSystem; private readonly IEnvironmentProvider _environmentProvider; + private readonly IReporter _reporter; public BuildServerProvider( IFileSystem fileSystem = null, - IEnvironmentProvider environmentProvider = null) + IEnvironmentProvider environmentProvider = null, + IReporter reporter = null) { _fileSystem = fileSystem ?? FileSystemWrapper.Default; _environmentProvider = environmentProvider ?? new EnvironmentProvider(); + _reporter = reporter ?? Reporter.Error; } public IEnumerable EnumerateBuildServers(ServerEnumerationFlags flags = ServerEnumerationFlags.All) @@ -59,7 +63,7 @@ namespace Microsoft.DotNet.BuildServer if ((flags & ServerEnumerationFlags.Razor) == ServerEnumerationFlags.Razor && Path.GetFileName(path).StartsWith(RazorPidFile.FilePrefix)) { - var file = RazorPidFile.Read(new FilePath(path), _fileSystem); + var file = ReadRazorPidFile(new FilePath(path)); if (file != null) { yield return new RazorServer(file); @@ -70,7 +74,7 @@ namespace Microsoft.DotNet.BuildServer public DirectoryPath GetPidFileDirectory() { - var directory = _environmentProvider.GetEnvironmentVariable("DOTNET_BUILD_PIDFILE_DIRECTORY"); + var directory = _environmentProvider.GetEnvironmentVariable(PidFileDirectoryVariableName); if (!string.IsNullOrEmpty(directory)) { return new DirectoryPath(directory); @@ -82,5 +86,22 @@ namespace Microsoft.DotNet.BuildServer "pids", "build")); } + + private RazorPidFile ReadRazorPidFile(FilePath path) + { + try + { + return RazorPidFile.Read(path, _fileSystem); + } + catch (Exception ex) when (ex is IOException || ex is UnauthorizedAccessException) + { + _reporter.WriteLine( + string.Format( + LocalizableStrings.FailedToReadPidFile, + path.Value, + ex.Message).Yellow()); + return null; + } + } } } diff --git a/src/dotnet/BuildServer/LocalizableStrings.resx b/src/dotnet/BuildServer/LocalizableStrings.resx index 8534ae97a..d15e3925a 100644 --- a/src/dotnet/BuildServer/LocalizableStrings.resx +++ b/src/dotnet/BuildServer/LocalizableStrings.resx @@ -129,4 +129,7 @@ The shutdown command failed: {0} + + Failed to read pid file '{0}': {1} + diff --git a/src/dotnet/BuildServer/RazorPidFile.cs b/src/dotnet/BuildServer/RazorPidFile.cs index dd8806c9e..f2baa7115 100644 --- a/src/dotnet/BuildServer/RazorPidFile.cs +++ b/src/dotnet/BuildServer/RazorPidFile.cs @@ -33,7 +33,13 @@ namespace Microsoft.DotNet.BuildServer { fileSystem = fileSystem ?? FileSystemWrapper.Default; - using (var stream = fileSystem.File.OpenRead(path.Value)) + using (var stream = fileSystem.File.OpenFile( + path.Value, + FileMode.Open, + FileAccess.Read, + FileShare.Write | FileShare.Delete, + 4096, + FileOptions.None)) using (var reader = new StreamReader(stream, Encoding.UTF8)) { if (!int.TryParse(reader.ReadLine(), out var processId)) diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.cs.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.cs.xlf index 52d049e73..c2d75710c 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.cs.xlf @@ -22,6 +22,11 @@ The shutdown command failed: {0} + + Failed to read pid file '{0}': {1} + Failed to read pid file '{0}': {1} + + \ No newline at end of file diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.de.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.de.xlf index 01befdbdf..773380657 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.de.xlf @@ -22,6 +22,11 @@ The shutdown command failed: {0} + + Failed to read pid file '{0}': {1} + Failed to read pid file '{0}': {1} + + \ No newline at end of file diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.es.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.es.xlf index 6e2b1f9d3..f10fc5c1a 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.es.xlf @@ -22,6 +22,11 @@ The shutdown command failed: {0} + + Failed to read pid file '{0}': {1} + Failed to read pid file '{0}': {1} + + \ No newline at end of file diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.fr.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.fr.xlf index d3b8260eb..5d8247e06 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.fr.xlf @@ -22,6 +22,11 @@ The shutdown command failed: {0} + + Failed to read pid file '{0}': {1} + Failed to read pid file '{0}': {1} + + \ No newline at end of file diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.it.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.it.xlf index 0ba45554d..964f5b5b1 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.it.xlf @@ -22,6 +22,11 @@ The shutdown command failed: {0} + + Failed to read pid file '{0}': {1} + Failed to read pid file '{0}': {1} + + \ No newline at end of file diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.ja.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.ja.xlf index b32bc5468..7f8488372 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.ja.xlf @@ -22,6 +22,11 @@ The shutdown command failed: {0} + + Failed to read pid file '{0}': {1} + Failed to read pid file '{0}': {1} + + \ No newline at end of file diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.ko.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.ko.xlf index 2a6174d9d..d4021594e 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.ko.xlf @@ -22,6 +22,11 @@ The shutdown command failed: {0} + + Failed to read pid file '{0}': {1} + Failed to read pid file '{0}': {1} + + \ No newline at end of file diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.pl.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.pl.xlf index 18a9f836b..77fbbf49e 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.pl.xlf @@ -22,6 +22,11 @@ The shutdown command failed: {0} + + Failed to read pid file '{0}': {1} + Failed to read pid file '{0}': {1} + + \ No newline at end of file diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.pt-BR.xlf index eb5bbde9b..6dcaccbd0 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.pt-BR.xlf @@ -22,6 +22,11 @@ The shutdown command failed: {0} + + Failed to read pid file '{0}': {1} + Failed to read pid file '{0}': {1} + + \ No newline at end of file diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.ru.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.ru.xlf index 3be9872f6..415392021 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.ru.xlf @@ -22,6 +22,11 @@ The shutdown command failed: {0} + + Failed to read pid file '{0}': {1} + Failed to read pid file '{0}': {1} + + \ No newline at end of file diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.tr.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.tr.xlf index 455687b8b..c04a534c5 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.tr.xlf @@ -22,6 +22,11 @@ The shutdown command failed: {0} + + Failed to read pid file '{0}': {1} + Failed to read pid file '{0}': {1} + + \ No newline at end of file diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.zh-Hans.xlf index e4534284b..a19f1958d 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.zh-Hans.xlf @@ -22,6 +22,11 @@ The shutdown command failed: {0} + + Failed to read pid file '{0}': {1} + Failed to read pid file '{0}': {1} + + \ No newline at end of file diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.zh-Hant.xlf index d6a2505b9..4b7407194 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.zh-Hant.xlf @@ -22,6 +22,11 @@ The shutdown command failed: {0} + + Failed to read pid file '{0}': {1} + Failed to read pid file '{0}': {1} + + \ No newline at end of file diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/BuildServerCommand.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/BuildServerCommand.cs new file mode 100644 index 000000000..986587188 --- /dev/null +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/BuildServerCommand.cs @@ -0,0 +1,20 @@ +// 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 Microsoft.DotNet.Cli.Utils; + +namespace Microsoft.DotNet.Tools.Test.Utilities +{ + public sealed class BuildServerCommand : DotnetCommand + { + public override CommandResult Execute(string args = "") + { + return base.Execute($"build-server {args}"); + } + + public override CommandResult ExecuteWithCapturedOutput(string args = "") + { + return base.ExecuteWithCapturedOutput($"build-server {args}"); + } + } +} diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/FileSystemMockBuilder.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/FileSystemMockBuilder.cs index 2054d261a..4320d0da6 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/FileSystemMockBuilder.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/FileSystemMockBuilder.cs @@ -94,6 +94,11 @@ namespace Microsoft.Extensions.DependencyModel.Tests int bufferSize, FileOptions fileOptions) { + if (fileMode == FileMode.Open && fileAccess == FileAccess.Read) + { + return OpenRead(path); + } + throw new NotImplementedException(); } diff --git a/test/dotnet.Tests/BuildServerTests/BuildServerProviderTests.cs b/test/dotnet.Tests/BuildServerTests/BuildServerProviderTests.cs index 4293e49d5..15f9a94ea 100644 --- a/test/dotnet.Tests/BuildServerTests/BuildServerProviderTests.cs +++ b/test/dotnet.Tests/BuildServerTests/BuildServerProviderTests.cs @@ -9,7 +9,9 @@ using FluentAssertions; using Microsoft.DotNet.BuildServer; using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.Configurer; +using Microsoft.DotNet.Tools.Test.Utilities; using Microsoft.Extensions.DependencyModel.Tests; +using Microsoft.Extensions.EnvironmentAbstractions; using Moq; using Xunit; using LocalizableStrings = Microsoft.DotNet.BuildServer.LocalizableStrings; @@ -129,12 +131,59 @@ namespace Microsoft.DotNet.Tests.BuildServerTests razorServer.PidFile.PipeName.Should().Be(PipeName); } + [Theory] + [InlineData(typeof(UnauthorizedAccessException))] + [InlineData(typeof(IOException))] + public void GivenAnExceptionAccessingTheRazorPidFileItPrintsAWarning(Type exceptionType) + { + const int ProcessId = 1234; + const string ErrorMessage = "failed!"; + + string pidDirectory = Path.GetFullPath("var/pids/build"); + string pidFilePath = Path.Combine(pidDirectory, $"{RazorPidFile.FilePrefix}{ProcessId}"); + + var directoryMock = new Mock(); + directoryMock.Setup(d => d.Exists(pidDirectory)).Returns(true); + directoryMock.Setup(d => d.EnumerateFiles(pidDirectory, "*")).Returns(new [] { pidFilePath }); + + var fileMock = new Mock(); + fileMock + .Setup(f => f.OpenFile( + pidFilePath, + FileMode.Open, + FileAccess.Read, + FileShare.Write | FileShare.Delete, + 4096, + FileOptions.None)) + .Throws((Exception)Activator.CreateInstance(exceptionType, new object[] { ErrorMessage } )); + + var fileSystemMock = new Mock(); + fileSystemMock.SetupGet(fs => fs.Directory).Returns(directoryMock.Object); + fileSystemMock.SetupGet(fs => fs.File).Returns(fileMock.Object); + + var reporter = new BufferedReporter(); + + var provider = new BuildServerProvider( + fileSystemMock.Object, + CreateEnvironmentProviderMock(pidDirectory).Object, + reporter); + + var servers = provider.EnumerateBuildServers(ServerEnumerationFlags.Razor).ToArray(); + servers.Should().BeEmpty(); + + reporter.Lines.Should().Equal( + string.Format( + LocalizableStrings.FailedToReadPidFile, + pidFilePath, + ErrorMessage).Yellow()); + } + private Mock CreateEnvironmentProviderMock(string value = null) { var provider = new Mock(MockBehavior.Strict); provider - .Setup(p => p.GetEnvironmentVariable("DOTNET_BUILD_PIDFILE_DIRECTORY")) + .Setup(p => p.GetEnvironmentVariable(BuildServerProvider.PidFileDirectoryVariableName)) .Returns(value); return provider; diff --git a/test/dotnet.Tests/CommandTests/BuildServerShutdownCommandTests.cs b/test/dotnet.Tests/CommandTests/BuildServerShutdownCommandTests.cs index 78765b812..a699b203f 100644 --- a/test/dotnet.Tests/CommandTests/BuildServerShutdownCommandTests.cs +++ b/test/dotnet.Tests/CommandTests/BuildServerShutdownCommandTests.cs @@ -10,17 +10,21 @@ using Microsoft.DotNet.BuildServer; using Microsoft.DotNet.Cli; using Microsoft.DotNet.Cli.CommandLine; using Microsoft.DotNet.Cli.Utils; +using Microsoft.DotNet.TestFramework; using Microsoft.DotNet.Tools.BuildServer; using Microsoft.DotNet.Tools.BuildServer.Shutdown; using Microsoft.DotNet.Tools.Test.Utilities; +using Microsoft.Extensions.EnvironmentAbstractions; using Moq; using Xunit; using Parser = Microsoft.DotNet.Cli.Parser; +using CommandLocalizableStrings = Microsoft.DotNet.BuildServer.LocalizableStrings; using LocalizableStrings = Microsoft.DotNet.Tools.BuildServer.Shutdown.LocalizableStrings; +using TestBuildServerCommand = Microsoft.DotNet.Tools.Test.Utilities.BuildServerCommand; namespace Microsoft.DotNet.Tests.Commands { - public class BuildServerShutdownCommandTests + public class BuildServerShutdownCommandTests : TestBase { private readonly BufferedReporter _reporter = new BufferedReporter(); @@ -157,6 +161,43 @@ namespace Microsoft.DotNet.Tests.Commands VerifyShutdownCalls(mocks); } + [Fact] + public void GivenARunningRazorServerItShutsDownSuccessfully() + { + var pipeName = Path.GetRandomFileName(); + var pidDirectory = Path.GetFullPath(Path.Combine(TempRoot.Root, Path.GetRandomFileName())); + + var testInstance = TestAssets.Get("TestRazorApp") + .CreateInstance() + .WithSourceFiles(); + + new BuildCommand() + .WithWorkingDirectory(testInstance.Root) + .WithEnvironmentVariable(BuildServerProvider.PidFileDirectoryVariableName, pidDirectory) + .Execute($"/p:_RazorBuildServerPipeName={pipeName}") + .Should() + .Pass(); + + var files = Directory.GetFiles(pidDirectory, RazorPidFile.FilePrefix + "*"); + files.Length.Should().Be(1); + + var pidFile = RazorPidFile.Read(new FilePath(files.First())); + pidFile.PipeName.Should().Be(pipeName); + + new TestBuildServerCommand() + .WithWorkingDirectory(testInstance.Root) + .WithEnvironmentVariable(BuildServerProvider.PidFileDirectoryVariableName, pidDirectory) + .ExecuteWithCapturedOutput("shutdown --razor") + .Should() + .Pass() + .And + .HaveStdOutContaining( + string.Format( + LocalizableStrings.ShutDownSucceededWithPid, + CommandLocalizableStrings.RazorServer, + pidFile.ProcessId)); + } + private BuildServerShutdownCommand CreateCommand( string options = "", IBuildServerProvider serverProvider = null, From 70994ee6dd1373956e797fbbf688c7db6d3b3bdd Mon Sep 17 00:00:00 2001 From: Livar Date: Fri, 27 Apr 2018 14:06:19 -0700 Subject: [PATCH 100/118] Update SDK to 2.1.200-preview-62827-05 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index ec7ce53f6..cc74fb681 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -13,7 +13,7 @@ 2.8.0-beta4-62824-10 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.200-preview-62826-08 + 2.1.200-preview-62827-05 $(MicrosoftNETSdkPackageVersion) 2.0.0-rel-20180221-676 $(MicrosoftNETSdkWebPackageVersion) From 16cc6141d6a84c9ac8c93e782594b6c5ea66d2c8 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 27 Apr 2018 14:14:14 -0700 Subject: [PATCH 101/118] Use AspNetCoreSharedFxArchiveRid instead of AspNetCoreSharedFxInstallerRid --- build/BundledRuntimes.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index 7aa1ddf1d..c2876983b 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -56,7 +56,7 @@ <_DownloadAndExtractItem Include="AspNetCoreSharedFxArchiveFile" - Condition="!Exists('$(AspNetCoreSharedFxArchiveFile)') And ( '$(AspNetCoreSharedFxInstallerRid)' == 'linux-arm' OR !$(Architecture.StartsWith('arm')) )"> + Condition="!Exists('$(AspNetCoreSharedFxArchiveFile)') And ( '$(AspNetCoreSharedFxArchiveRid)' == 'linux-arm' OR !$(Architecture.StartsWith('arm')) )"> $(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion)/$(AspNetCoreSharedFxArchiveFileName)$(CoreSetupBlobAccessTokenParam) $(AspNetCoreSharedFxArchiveFile) $(AspNetCoreSharedFxPublishDirectory) From 4719256c7a4390fa54d81a5a4911bb1e7e98fc23 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Fri, 27 Apr 2018 14:16:11 -0700 Subject: [PATCH 102/118] Empty commit for new build. From b1b35e4226c505cc03bdf67e05ac74fce8dc3039 Mon Sep 17 00:00:00 2001 From: Livar Date: Fri, 27 Apr 2018 16:33:52 -0700 Subject: [PATCH 103/118] Update SDK to latest from 2.1.300 Updating to 1.0.0-rc1-62827-06. There is a bug in the SDK where we are producing packages with the wrong version. --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 8c4e47391..d200751b4 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -15,7 +15,7 @@ $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.300-rc1-62823-01 + 1.0.0-rc1-62827-06 $(MicrosoftNETSdkPackageVersion) $(MicrosoftAspNetCoreAppPackageVersion) 2.1.300-rc1-20180422-1618307 From d65b6b0d06be34ba074d34284afe81c65c38596a Mon Sep 17 00:00:00 2001 From: Livar Date: Mon, 30 Apr 2018 12:00:51 -0700 Subject: [PATCH 104/118] Update version to rtm --- build/Version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Version.props b/build/Version.props index c31b11744..a93a8486c 100644 --- a/build/Version.props +++ b/build/Version.props @@ -3,7 +3,7 @@ 2 1 300 - rc1 + rtm $(VersionMajor).$(VersionMinor).$(VersionPatch) $(CliVersionNoSuffix)-$(ReleaseSuffix) From 47a65f258adf5c5750282a17eb0532fb91e1c877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbyn=C4=9Bk=20Sailer?= Date: Fri, 27 Apr 2018 10:32:24 +0200 Subject: [PATCH 105/118] LOC CHECKIN | dotnet/cli release/2.1.3xx | 20180427 --- .../xlf/LocalizableStrings.cs.xlf | 10 ++++----- .../xlf/LocalizableStrings.de.xlf | 12 +++++----- .../xlf/LocalizableStrings.es.xlf | 10 ++++----- .../xlf/LocalizableStrings.fr.xlf | 10 ++++----- .../xlf/LocalizableStrings.it.xlf | 10 ++++----- .../xlf/LocalizableStrings.ja.xlf | 10 ++++----- .../xlf/LocalizableStrings.ko.xlf | 12 +++++----- .../xlf/LocalizableStrings.pl.xlf | 10 ++++----- .../xlf/LocalizableStrings.pt-BR.xlf | 10 ++++----- .../xlf/LocalizableStrings.ru.xlf | 10 ++++----- .../xlf/LocalizableStrings.tr.xlf | 10 ++++----- .../xlf/LocalizableStrings.zh-Hans.xlf | 12 +++++----- .../xlf/LocalizableStrings.zh-Hant.xlf | 10 ++++----- .../BuildServer/xlf/LocalizableStrings.cs.xlf | 8 +++---- .../BuildServer/xlf/LocalizableStrings.de.xlf | 8 +++---- .../BuildServer/xlf/LocalizableStrings.es.xlf | 8 +++---- .../BuildServer/xlf/LocalizableStrings.fr.xlf | 8 +++---- .../BuildServer/xlf/LocalizableStrings.it.xlf | 8 +++---- .../BuildServer/xlf/LocalizableStrings.ja.xlf | 8 +++---- .../BuildServer/xlf/LocalizableStrings.ko.xlf | 8 +++---- .../BuildServer/xlf/LocalizableStrings.pl.xlf | 8 +++---- .../xlf/LocalizableStrings.pt-BR.xlf | 8 +++---- .../BuildServer/xlf/LocalizableStrings.ru.xlf | 8 +++---- .../BuildServer/xlf/LocalizableStrings.tr.xlf | 8 +++---- .../xlf/LocalizableStrings.zh-Hans.xlf | 8 +++---- .../xlf/LocalizableStrings.zh-Hant.xlf | 8 +++---- .../shutdown/xlf/LocalizableStrings.cs.xlf | 22 +++++++++---------- .../shutdown/xlf/LocalizableStrings.de.xlf | 22 +++++++++---------- .../shutdown/xlf/LocalizableStrings.es.xlf | 22 +++++++++---------- .../shutdown/xlf/LocalizableStrings.fr.xlf | 22 +++++++++---------- .../shutdown/xlf/LocalizableStrings.it.xlf | 22 +++++++++---------- .../shutdown/xlf/LocalizableStrings.ja.xlf | 22 +++++++++---------- .../shutdown/xlf/LocalizableStrings.ko.xlf | 22 +++++++++---------- .../shutdown/xlf/LocalizableStrings.pl.xlf | 22 +++++++++---------- .../shutdown/xlf/LocalizableStrings.pt-BR.xlf | 22 +++++++++---------- .../shutdown/xlf/LocalizableStrings.ru.xlf | 22 +++++++++---------- .../shutdown/xlf/LocalizableStrings.tr.xlf | 22 +++++++++---------- .../xlf/LocalizableStrings.zh-Hans.xlf | 22 +++++++++---------- .../xlf/LocalizableStrings.zh-Hant.xlf | 22 +++++++++---------- .../xlf/LocalizableStrings.cs.xlf | 4 ++-- .../xlf/LocalizableStrings.de.xlf | 4 ++-- .../xlf/LocalizableStrings.es.xlf | 4 ++-- .../xlf/LocalizableStrings.fr.xlf | 4 ++-- .../xlf/LocalizableStrings.it.xlf | 4 ++-- .../xlf/LocalizableStrings.ja.xlf | 4 ++-- .../xlf/LocalizableStrings.ko.xlf | 4 ++-- .../xlf/LocalizableStrings.pl.xlf | 4 ++-- .../xlf/LocalizableStrings.pt-BR.xlf | 4 ++-- .../xlf/LocalizableStrings.ru.xlf | 4 ++-- .../xlf/LocalizableStrings.tr.xlf | 4 ++-- .../xlf/LocalizableStrings.zh-Hans.xlf | 4 ++-- .../xlf/LocalizableStrings.zh-Hant.xlf | 4 ++-- .../dotnet-help/xlf/LocalizableStrings.cs.xlf | 4 ++-- .../dotnet-help/xlf/LocalizableStrings.de.xlf | 4 ++-- .../dotnet-help/xlf/LocalizableStrings.es.xlf | 4 ++-- .../dotnet-help/xlf/LocalizableStrings.fr.xlf | 4 ++-- .../dotnet-help/xlf/LocalizableStrings.it.xlf | 4 ++-- .../dotnet-help/xlf/LocalizableStrings.ja.xlf | 4 ++-- .../dotnet-help/xlf/LocalizableStrings.ko.xlf | 4 ++-- .../dotnet-help/xlf/LocalizableStrings.pl.xlf | 4 ++-- .../xlf/LocalizableStrings.pt-BR.xlf | 4 ++-- .../dotnet-help/xlf/LocalizableStrings.ru.xlf | 4 ++-- .../dotnet-help/xlf/LocalizableStrings.tr.xlf | 4 ++-- .../xlf/LocalizableStrings.zh-Hans.xlf | 4 ++-- .../xlf/LocalizableStrings.zh-Hant.xlf | 4 ++-- .../dotnet-pack/xlf/LocalizableStrings.cs.xlf | 2 +- .../dotnet-pack/xlf/LocalizableStrings.de.xlf | 2 +- .../dotnet-pack/xlf/LocalizableStrings.es.xlf | 2 +- .../dotnet-pack/xlf/LocalizableStrings.fr.xlf | 2 +- .../dotnet-pack/xlf/LocalizableStrings.it.xlf | 2 +- .../dotnet-pack/xlf/LocalizableStrings.ja.xlf | 2 +- .../dotnet-pack/xlf/LocalizableStrings.ko.xlf | 2 +- .../dotnet-pack/xlf/LocalizableStrings.pl.xlf | 2 +- .../xlf/LocalizableStrings.pt-BR.xlf | 2 +- .../dotnet-pack/xlf/LocalizableStrings.ru.xlf | 2 +- .../dotnet-pack/xlf/LocalizableStrings.tr.xlf | 2 +- .../xlf/LocalizableStrings.zh-Hans.xlf | 2 +- .../xlf/LocalizableStrings.zh-Hant.xlf | 2 +- .../xlf/LocalizableStrings.cs.xlf | 2 +- .../xlf/LocalizableStrings.de.xlf | 2 +- .../xlf/LocalizableStrings.es.xlf | 2 +- .../xlf/LocalizableStrings.fr.xlf | 2 +- .../xlf/LocalizableStrings.it.xlf | 2 +- .../xlf/LocalizableStrings.ja.xlf | 2 +- .../xlf/LocalizableStrings.ko.xlf | 2 +- .../xlf/LocalizableStrings.pl.xlf | 2 +- .../xlf/LocalizableStrings.pt-BR.xlf | 2 +- .../xlf/LocalizableStrings.ru.xlf | 2 +- .../xlf/LocalizableStrings.tr.xlf | 2 +- .../xlf/LocalizableStrings.zh-Hans.xlf | 2 +- .../xlf/LocalizableStrings.zh-Hant.xlf | 2 +- .../dotnet-run/xlf/LocalizableStrings.cs.xlf | 2 +- .../dotnet-run/xlf/LocalizableStrings.de.xlf | 2 +- .../dotnet-run/xlf/LocalizableStrings.es.xlf | 2 +- .../dotnet-run/xlf/LocalizableStrings.fr.xlf | 2 +- .../dotnet-run/xlf/LocalizableStrings.it.xlf | 2 +- .../dotnet-run/xlf/LocalizableStrings.ja.xlf | 2 +- .../dotnet-run/xlf/LocalizableStrings.ko.xlf | 2 +- .../dotnet-run/xlf/LocalizableStrings.pl.xlf | 2 +- .../xlf/LocalizableStrings.pt-BR.xlf | 2 +- .../dotnet-run/xlf/LocalizableStrings.ru.xlf | 2 +- .../dotnet-run/xlf/LocalizableStrings.tr.xlf | 2 +- .../xlf/LocalizableStrings.zh-Hans.xlf | 2 +- .../xlf/LocalizableStrings.zh-Hant.xlf | 2 +- .../dotnet-test/xlf/LocalizableStrings.cs.xlf | 2 +- .../dotnet-test/xlf/LocalizableStrings.de.xlf | 2 +- .../dotnet-test/xlf/LocalizableStrings.es.xlf | 2 +- .../dotnet-test/xlf/LocalizableStrings.fr.xlf | 2 +- .../dotnet-test/xlf/LocalizableStrings.it.xlf | 2 +- .../dotnet-test/xlf/LocalizableStrings.ja.xlf | 2 +- .../dotnet-test/xlf/LocalizableStrings.ko.xlf | 2 +- .../dotnet-test/xlf/LocalizableStrings.pl.xlf | 2 +- .../xlf/LocalizableStrings.pt-BR.xlf | 2 +- .../dotnet-test/xlf/LocalizableStrings.ru.xlf | 2 +- .../dotnet-test/xlf/LocalizableStrings.tr.xlf | 2 +- .../xlf/LocalizableStrings.zh-Hans.xlf | 2 +- .../xlf/LocalizableStrings.zh-Hant.xlf | 2 +- .../install/xlf/LocalizableStrings.cs.xlf | 12 +++++----- .../install/xlf/LocalizableStrings.de.xlf | 12 +++++----- .../install/xlf/LocalizableStrings.es.xlf | 12 +++++----- .../install/xlf/LocalizableStrings.fr.xlf | 12 +++++----- .../install/xlf/LocalizableStrings.it.xlf | 12 +++++----- .../install/xlf/LocalizableStrings.ja.xlf | 12 +++++----- .../install/xlf/LocalizableStrings.ko.xlf | 12 +++++----- .../install/xlf/LocalizableStrings.pl.xlf | 12 +++++----- .../install/xlf/LocalizableStrings.pt-BR.xlf | 12 +++++----- .../install/xlf/LocalizableStrings.ru.xlf | 12 +++++----- .../install/xlf/LocalizableStrings.tr.xlf | 12 +++++----- .../xlf/LocalizableStrings.zh-Hans.xlf | 12 +++++----- .../xlf/LocalizableStrings.zh-Hant.xlf | 12 +++++----- .../list/xlf/LocalizableStrings.cs.xlf | 2 +- .../list/xlf/LocalizableStrings.de.xlf | 2 +- .../list/xlf/LocalizableStrings.es.xlf | 2 +- .../list/xlf/LocalizableStrings.fr.xlf | 2 +- .../list/xlf/LocalizableStrings.it.xlf | 2 +- .../list/xlf/LocalizableStrings.ja.xlf | 2 +- .../list/xlf/LocalizableStrings.ko.xlf | 2 +- .../list/xlf/LocalizableStrings.pl.xlf | 2 +- .../list/xlf/LocalizableStrings.pt-BR.xlf | 2 +- .../list/xlf/LocalizableStrings.ru.xlf | 2 +- .../list/xlf/LocalizableStrings.tr.xlf | 2 +- .../list/xlf/LocalizableStrings.zh-Hans.xlf | 2 +- .../list/xlf/LocalizableStrings.zh-Hant.xlf | 2 +- .../uninstall/xlf/LocalizableStrings.cs.xlf | 2 +- .../uninstall/xlf/LocalizableStrings.de.xlf | 2 +- .../uninstall/xlf/LocalizableStrings.es.xlf | 2 +- .../uninstall/xlf/LocalizableStrings.fr.xlf | 2 +- .../uninstall/xlf/LocalizableStrings.it.xlf | 2 +- .../uninstall/xlf/LocalizableStrings.ja.xlf | 2 +- .../uninstall/xlf/LocalizableStrings.ko.xlf | 2 +- .../uninstall/xlf/LocalizableStrings.pl.xlf | 2 +- .../xlf/LocalizableStrings.pt-BR.xlf | 2 +- .../uninstall/xlf/LocalizableStrings.ru.xlf | 2 +- .../uninstall/xlf/LocalizableStrings.tr.xlf | 2 +- .../xlf/LocalizableStrings.zh-Hans.xlf | 2 +- .../xlf/LocalizableStrings.zh-Hant.xlf | 2 +- .../dotnet-tool/xlf/LocalizableStrings.cs.xlf | 2 +- .../dotnet-tool/xlf/LocalizableStrings.de.xlf | 2 +- .../dotnet-tool/xlf/LocalizableStrings.es.xlf | 2 +- .../dotnet-tool/xlf/LocalizableStrings.fr.xlf | 2 +- .../dotnet-tool/xlf/LocalizableStrings.it.xlf | 2 +- .../dotnet-tool/xlf/LocalizableStrings.ja.xlf | 2 +- .../dotnet-tool/xlf/LocalizableStrings.ko.xlf | 2 +- .../dotnet-tool/xlf/LocalizableStrings.pl.xlf | 2 +- .../xlf/LocalizableStrings.pt-BR.xlf | 2 +- .../dotnet-tool/xlf/LocalizableStrings.ru.xlf | 2 +- .../dotnet-tool/xlf/LocalizableStrings.tr.xlf | 2 +- .../xlf/LocalizableStrings.zh-Hans.xlf | 2 +- .../xlf/LocalizableStrings.zh-Hant.xlf | 2 +- .../xlf/CommonLocalizableStrings.cs.xlf | 12 +++++----- .../xlf/CommonLocalizableStrings.de.xlf | 12 +++++----- .../xlf/CommonLocalizableStrings.es.xlf | 12 +++++----- .../xlf/CommonLocalizableStrings.fr.xlf | 12 +++++----- .../xlf/CommonLocalizableStrings.it.xlf | 12 +++++----- .../xlf/CommonLocalizableStrings.ja.xlf | 12 +++++----- .../xlf/CommonLocalizableStrings.ko.xlf | 12 +++++----- .../xlf/CommonLocalizableStrings.pl.xlf | 12 +++++----- .../xlf/CommonLocalizableStrings.pt-BR.xlf | 12 +++++----- .../xlf/CommonLocalizableStrings.ru.xlf | 12 +++++----- .../xlf/CommonLocalizableStrings.tr.xlf | 12 +++++----- .../xlf/CommonLocalizableStrings.zh-Hans.xlf | 12 +++++----- .../xlf/CommonLocalizableStrings.zh-Hant.xlf | 12 +++++----- 182 files changed, 562 insertions(+), 562 deletions(-) diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf index a5d6c360f..bad5c47e0 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf @@ -141,7 +141,7 @@ Unable to generate deps.json, it may have been already generated. You can specify the "-d" option before the tool name for diagnostic output (for example, "dotnet -d <toolname>": {0} - Soubor deps.json se nepodařilo vygenerovat, protože už je pravděpodobně vygenerovaný: {0} + Nelze vygenerovat soubor deps.json, je možné, že už byl vygenerován. Zadáním parametru -d před název nástroje vypíšete diagnostické informace, například dotnet -d <název_nástroje>: {0} @@ -246,24 +246,24 @@ MSBuild arguments: {0} - MSBuild arguments: {0} + Argumenty MSBuild: {0} Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written. - Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written. + {0} nelze použít jako spustitelný soubor hostitele aplikace, protože neobsahuje očekávanou zástupnou bajtovou posloupnost {1}, která by označila, kam se má zapsat název aplikace. Given file name '{0}' is longer than 1024 bytes - Given file name '{0}' is longer than 1024 bytes + Zadaný název souboru {0} je delší než 1024 bajtů. Cannot find command 'dotnet {0}', please run the following command to install dotnet tool install --global {1} - Cannot find command 'dotnet {0}', please run the following command to install + Nelze najít příkaz dotnet {0}. Spusťte prosím instalaci následujícím příkazem: dotnet tool install --global {1} diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.de.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.de.xlf index 06d23632e..bf31a852b 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.de.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.de.xlf @@ -141,7 +141,7 @@ Unable to generate deps.json, it may have been already generated. You can specify the "-d" option before the tool name for diagnostic output (for example, "dotnet -d <toolname>": {0} - "deps.json" kann nicht erzeugt werden; sie wurde vielleicht bereits erzeugt: {0} + Die Datei "deps.json" kann nicht generiert werden, möglicherweise wurde sie bereits generiert. Sie können zur Diagnoseausgabe die Option "-d" vor dem Toolnamen angeben (Beispiel: "dotnet -d <toolname>": {0}). @@ -161,7 +161,7 @@ The project may not have been restored or restore failed - run `dotnet restore` - Das Projekt wurde möglicherweise nicht wiederhergestellt, oder bei der Wiederherstellung ist ein Fehler aufgetreten. führen Sie "dotnet restore" aus. + Das Projekt wurde möglicherweise nicht wiederhergestellt, oder bei der Wiederherstellung ist ein Fehler aufgetreten. Führen Sie "dotnet restore" aus. @@ -246,24 +246,24 @@ MSBuild arguments: {0} - MSBuild arguments: {0} + MSBuild-Argumente: {0} Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written. - Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written. + "{0}" kann nicht als ausführbare Anwendungshostdatei verwendet werden, da die erwartete Platzhalter-Bytesequenz "{1}" nicht vorhanden ist, die markiert, wo der Anwendungsname geschrieben wird. Given file name '{0}' is longer than 1024 bytes - Given file name '{0}' is longer than 1024 bytes + Der angegebene Dateiname "{0}" ist länger als 1024 Byte. Cannot find command 'dotnet {0}', please run the following command to install dotnet tool install --global {1} - Cannot find command 'dotnet {0}', please run the following command to install + Der Befehl "dotnet {0}" wurde nicht gefunden, führen Sie zur Installation den folgenden Befehl aus: dotnet tool install --global {1} diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.es.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.es.xlf index 632faa0ef..9b05c72de 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.es.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.es.xlf @@ -141,7 +141,7 @@ Unable to generate deps.json, it may have been already generated. You can specify the "-d" option before the tool name for diagnostic output (for example, "dotnet -d <toolname>": {0} - no se puede generar deps.json; es posible que ya se haya generado: {0} + No se puede generar deps.json; puede que ya se haya generado. Para obtener una salida de diagnóstico, especifique la opción "-d" delante del nombre de la herramienta (por ejemplo, "dotnet -d <nombreHerramienta>": {0} @@ -246,24 +246,24 @@ MSBuild arguments: {0} - MSBuild arguments: {0} + Argumentos de MSBuild: {0} Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written. - Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written. + No se puede usar "{0}" como ejecutable del host de aplicación ya que no contiene la secuencia de bytes esperada del marcador de posición "{1}" que marcaría dónde escribir el nombre de la aplicación. Given file name '{0}' is longer than 1024 bytes - Given file name '{0}' is longer than 1024 bytes + El nombre de archivo especificado "{0}" tiene más de 1024 bytes Cannot find command 'dotnet {0}', please run the following command to install dotnet tool install --global {1} - Cannot find command 'dotnet {0}', please run the following command to install + No se encuentra el comando "dotnet {0}"; ejecute el comando siguiente para instalar dotnet tool install --global {1} diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.fr.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.fr.xlf index fc3f12a30..413171965 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.fr.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.fr.xlf @@ -141,7 +141,7 @@ Unable to generate deps.json, it may have been already generated. You can specify the "-d" option before the tool name for diagnostic output (for example, "dotnet -d <toolname>": {0} - impossible de générer deps.json, il a peut-être été déjà généré : {0} + Impossible de générer deps.json. Il a peut-être été déjà généré. Vous pouvez spécifier l'option "-d" avant le nom de l'outil pour la sortie de diagnostic (par exemple "dotnet -d <nom_outil>" : {0} @@ -246,24 +246,24 @@ MSBuild arguments: {0} - MSBuild arguments: {0} + Arguments MSBuild : {0} Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written. - Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written. + Impossible d'utiliser '{0}' en tant qu'exécutable d'hôte d'application, car il ne contient pas la séquence d'octets d'espace réservé attendue '{1}' qui marque l'emplacement où est écrit le nom de l'application. Given file name '{0}' is longer than 1024 bytes - Given file name '{0}' is longer than 1024 bytes + Le nom de fichier spécifié '{0}' dépasse 1 024 octets Cannot find command 'dotnet {0}', please run the following command to install dotnet tool install --global {1} - Cannot find command 'dotnet {0}', please run the following command to install + La commande 'dotnet {0}' est introuvable. Exécutez la commande suivante pour effectuer l'installation. dotnet tool install --global {1} diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.it.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.it.xlf index fe089b9e5..89599aa27 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.it.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.it.xlf @@ -141,7 +141,7 @@ Unable to generate deps.json, it may have been already generated. You can specify the "-d" option before the tool name for diagnostic output (for example, "dotnet -d <toolname>": {0} - non è possibile generare deps.json. Potrebbe essere già stato generato: {0} + Non è possibile generare deps.json. Potrebbe essere stato già generato. Per ottenere l'output diagnostico, è possibile specificare l'opzione "-d" prima del nome dello strumento, ad esempio "dotnet -d <nome_strumento>": {0} @@ -246,24 +246,24 @@ MSBuild arguments: {0} - MSBuild arguments: {0} + Argomenti di MSBuild: {0} Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written. - Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written. + Non è possibile usare '{0}' come eseguibile host dell'applicazione perché non contiene la sequenza di byte segnaposto prevista '{1}' che indica dove verrà scritto il nome dell'applicazione. Given file name '{0}' is longer than 1024 bytes - Given file name '{0}' is longer than 1024 bytes + Il nome file specificato '{0}' supera 1024 byte Cannot find command 'dotnet {0}', please run the following command to install dotnet tool install --global {1} - Cannot find command 'dotnet {0}', please run the following command to install + Il comando 'dotnet {0}' non è stato trovato. Per installare, eseguire il comando seguente: dotnet tool install --global {1} diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ja.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ja.xlf index b269c1e83..90a131afc 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ja.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ja.xlf @@ -141,7 +141,7 @@ Unable to generate deps.json, it may have been already generated. You can specify the "-d" option before the tool name for diagnostic output (for example, "dotnet -d <toolname>": {0} - deps.json を生成できません。既に生成されている可能性があります: {0} + deps.json を生成できません。すでに生成されている可能性があります。ツール名の前に "-d" オプションを指定して、診断を出力できます (例: "dotnet -d <toolname>"): {0} @@ -246,24 +246,24 @@ MSBuild arguments: {0} - MSBuild arguments: {0} + MSBuild 引数: {0} Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written. - Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written. + '{0}' は、本来アプリケーション名が書き込まれる場所を示す、必要なプレースホルダー バイト シーケンス '{1}' が含まれていないため、実行可能アプリケーション ホストとして使用できません。 Given file name '{0}' is longer than 1024 bytes - Given file name '{0}' is longer than 1024 bytes + 指定されたファイル名 '{0}' が 1024 バイトを超えています。 Cannot find command 'dotnet {0}', please run the following command to install dotnet tool install --global {1} - Cannot find command 'dotnet {0}', please run the following command to install + コマンド 'dotnet {0}' が見つかりませんでした。次のコマンドを実行してインストールしてください。 dotnet tool install --global {1} diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ko.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ko.xlf index bab65aaf3..49f7b2038 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ko.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ko.xlf @@ -141,7 +141,7 @@ Unable to generate deps.json, it may have been already generated. You can specify the "-d" option before the tool name for diagnostic output (for example, "dotnet -d <toolname>": {0} - deps.json을 생성할 수 없습니다. 이미 생성되었을 수 있습니다. {0} + deps.json을 생성할 수 없습니다. 이미 생성되었을 수 있습니다. 진단 출력의 도구 이름 앞에 "-d" 옵션을 지정할 수 있습니다. 예: "dotnet -d <도구 이름>": {0} @@ -246,26 +246,26 @@ MSBuild arguments: {0} - MSBuild arguments: {0} + MSBuild 인수: {0} Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written. - Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written. + 응용 프로그램 이름이 기록되는 위치를 표시하는 '{1}' 예상 자리 표시자 바이트 시퀀스가 포함되지 않아서 '{0}'을(를) 응용 프로그램 호스트 실행 파일로 사용할 수 없습니다. Given file name '{0}' is longer than 1024 bytes - Given file name '{0}' is longer than 1024 bytes + 제공한 파일 이름 '{0}'이(가) 1024바이트보다 깁니다. Cannot find command 'dotnet {0}', please run the following command to install dotnet tool install --global {1} - Cannot find command 'dotnet {0}', please run the following command to install + 'dotnet {0}' 명령을 찾을 수 없습니다. 다음 명령을 실행하여 -dotnet tool install --global {1} +dotnet 도구를 설치하세요. install --global {1} diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pl.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pl.xlf index 0fe411a66..4f51ed2e5 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pl.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pl.xlf @@ -141,7 +141,7 @@ Unable to generate deps.json, it may have been already generated. You can specify the "-d" option before the tool name for diagnostic output (for example, "dotnet -d <toolname>": {0} - nie można wygenerować pliku deps.json, być może został już wygenerowany: {0} + Nie można wygenerować pliku deps.json. Być może został już wygenerowany. Podaj opcję „-d” przed nazwą narzędzia, aby uzyskać diagnostyczne dane wyjściowe (na przykład „dotnet -d <nazwa_narzędzia>”: {0} @@ -246,24 +246,24 @@ MSBuild arguments: {0} - MSBuild arguments: {0} + Argumenty programu MSBuild: {0} Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written. - Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written. + Nie można użyć elementu „{0}” jako pliku wykonywalnego hosta aplikacji, ponieważ nie zawiera on oczekiwanej sekwencji bajtów symbolu zastępczego „{1}”, która wskazuje lokalizację zapisu nazwy aplikacji. Given file name '{0}' is longer than 1024 bytes - Given file name '{0}' is longer than 1024 bytes + Podana nazwa pliku „{0}” jest dłuższa niż 1024 bajty Cannot find command 'dotnet {0}', please run the following command to install dotnet tool install --global {1} - Cannot find command 'dotnet {0}', please run the following command to install + Nie można znaleźć polecenia „dotnet {0}”; uruchom następujące polecenie, aby zainstalować dotnet tool install --global {1} diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pt-BR.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pt-BR.xlf index 1640d7c7b..d1ecbe2c9 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pt-BR.xlf @@ -141,7 +141,7 @@ Unable to generate deps.json, it may have been already generated. You can specify the "-d" option before the tool name for diagnostic output (for example, "dotnet -d <toolname>": {0} - não é possível gerar deps.json; ele pode já ter sido gerado: {0} + Não é possível gerar o deps.json. Ele já pode ter sido gerado. É possível especificar a opção "-d" antes do nome da ferramenta para a saída de diagnóstico (por exemplo, "dotnet -d <toolname>": {0} @@ -246,24 +246,24 @@ MSBuild arguments: {0} - MSBuild arguments: {0} + Argumentos do MSBuild: {0} Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written. - Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written. + Não é possível usar '{0}' como executável do host de aplicativo, uma vez que ele não contém a sequência de bytes de espaço reservado esperada '{1}' que marcaria o local em que o nome do aplicativo seria gravado. Given file name '{0}' is longer than 1024 bytes - Given file name '{0}' is longer than 1024 bytes + O nome de arquivo '{0}' informado tem mais de 1024 bytes Cannot find command 'dotnet {0}', please run the following command to install dotnet tool install --global {1} - Cannot find command 'dotnet {0}', please run the following command to install + Não é possível encontrar o comando 'dotnet {0}', execute o comando a seguir para instalar dotnet tool install --global {1} diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ru.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ru.xlf index eb400aebe..d744062cb 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ru.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ru.xlf @@ -141,7 +141,7 @@ Unable to generate deps.json, it may have been already generated. You can specify the "-d" option before the tool name for diagnostic output (for example, "dotnet -d <toolname>": {0} - не удается создать deps.json, возможно, он уже создан: {0} + Не удалось создать файл deps.json. Возможно, он уже создан. Вы можете указать параметр "-d" перед именем средства, чтобы получить выходные данные диагностики, например "dotnet -d <имя_средства>": {0} @@ -246,24 +246,24 @@ MSBuild arguments: {0} - MSBuild arguments: {0} + Аргументы MSBuild: {0} Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written. - Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written. + Невозможно использовать файл "{0}" в качестве исполняемого файла узла приложения, так как он не содержит требуемой последовательности байтов "{1}", которая отмечает место, где должно записываться имя приложения. Given file name '{0}' is longer than 1024 bytes - Given file name '{0}' is longer than 1024 bytes + Длина указанного имени файла "{0}" превышает 1024 байта Cannot find command 'dotnet {0}', please run the following command to install dotnet tool install --global {1} - Cannot find command 'dotnet {0}', please run the following command to install + Не удается найти команду "dotnet {0}". Выполните следующую команду для установки: dotnet tool install --global {1} diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.tr.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.tr.xlf index d59d59fa8..edaf50309 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.tr.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.tr.xlf @@ -141,7 +141,7 @@ Unable to generate deps.json, it may have been already generated. You can specify the "-d" option before the tool name for diagnostic output (for example, "dotnet -d <toolname>": {0} - deps.json oluşturulamadı, zaten oluşturulmuş olabilir: {0} + deps.json oluşturulamıyor, daha önce oluşturulmuş olabilir. Tanılama çıktısı için araç adından önce "-d" seçeneğini belirtebilirsiniz (örneğin, "dotnet -d <araçadı>": {0} @@ -246,24 +246,24 @@ MSBuild arguments: {0} - MSBuild arguments: {0} + MSBuild bağımsız değişkenleri: {0} Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written. - Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written. + '{0}', uygulama adının yazılacağı yeri işaretlemesi için beklenen yer tutucu bayt dizisini ('{1}') içermediğinden uygulama konak yürütülebiliri olarak kullanılamıyor. Given file name '{0}' is longer than 1024 bytes - Given file name '{0}' is longer than 1024 bytes + Belirtilen dosya adı ('{0})' 1024 bayttan uzun Cannot find command 'dotnet {0}', please run the following command to install dotnet tool install --global {1} - Cannot find command 'dotnet {0}', please run the following command to install + 'dotnet {0}' komutu bulunamıyor, yüklemek için lütfen aşağıdaki komutu çalıştırın dotnet tool install --global {1} diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hans.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hans.xlf index ddceafc66..e8c13f337 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hans.xlf @@ -141,7 +141,7 @@ Unable to generate deps.json, it may have been already generated. You can specify the "-d" option before the tool name for diagnostic output (for example, "dotnet -d <toolname>": {0} - 无法生成 deps.json，该文件可能已生成: {0} + 无法生成 deps.json，它可能已经生成。可在诊断输出的工具名称之前指定 "-d" 选项（例如，"dotnet -d <toolname>"）: {0} @@ -246,26 +246,26 @@ MSBuild arguments: {0} - MSBuild arguments: {0} + MSBuild 参数: {0} Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written. - Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written. + 未能将“{0}”用作应用程序主机可执行文件，因为它没有必需的占位符字节序列“{1}”，该序列会标记应用程序名称的写入位置。 Given file name '{0}' is longer than 1024 bytes - Given file name '{0}' is longer than 1024 bytes + 给定文件名“{0}”的长度超过 1024 个字节 Cannot find command 'dotnet {0}', please run the following command to install dotnet tool install --global {1} - Cannot find command 'dotnet {0}', please run the following command to install + 没有找到命令 "dotnet {0}"，请运行以下命令安装 -dotnet tool install --global {1} +dotnet 工具安装 -- 全局 {1} diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hant.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hant.xlf index 19fa42985..1330462bd 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hant.xlf @@ -141,7 +141,7 @@ Unable to generate deps.json, it may have been already generated. You can specify the "-d" option before the tool name for diagnostic output (for example, "dotnet -d <toolname>": {0} - 無法產生 deps.json，可能已產生過: {0} + 無法產生 deps.json，但先前可能產生過。您可以在診斷輸出的工具名稱前指定 "-d" 選項 (例如 "dotnet -d <工具名稱>": {0} @@ -246,24 +246,24 @@ MSBuild arguments: {0} - MSBuild arguments: {0} + MSBuild 引數: {0} Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written. - Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written. + 無法使用 '{0}' 作為應用程式主機可執行檔，因為它並未包含應有的預留位置位元組序列 '{1}'，其會標示應用程式名稱的寫入位置。 Given file name '{0}' is longer than 1024 bytes - Given file name '{0}' is longer than 1024 bytes + 指定檔案名稱 '{0}' 的長度超過 1024 個位元組 Cannot find command 'dotnet {0}', please run the following command to install dotnet tool install --global {1} - Cannot find command 'dotnet {0}', please run the following command to install + 找不到命令 'dotnet {0}'，請執行下列命令加以安裝 dotnet tool install --global {1} diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.cs.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.cs.xlf index c2d75710c..3ee07751f 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.cs.xlf @@ -4,22 +4,22 @@ MSBuild server - MSBuild server + Server MSBuild VB/C# compiler server - VB/C# compiler server + Server kompilátoru VB/C# Razor build server - Razor build server + Buildovací server Razor The shutdown command failed: {0} - The shutdown command failed: {0} + Příkaz pro vypnutí selhal: {0} diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.de.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.de.xlf index 773380657..da9249dce 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.de.xlf @@ -4,22 +4,22 @@ MSBuild server - MSBuild server + MSBuild-Server VB/C# compiler server - VB/C# compiler server + VB/C#-Compilerserver Razor build server - Razor build server + Razor-Buildserver The shutdown command failed: {0} - The shutdown command failed: {0} + Fehler beim Befehl zum Herunterfahren: {0} diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.es.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.es.xlf index f10fc5c1a..a5db0a5d8 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.es.xlf @@ -4,22 +4,22 @@ MSBuild server - MSBuild server + Servidor de MSBuild VB/C# compiler server - VB/C# compiler server + Servidor del compilador de VB o C# Razor build server - Razor build server + Servidor de compilación de Razor The shutdown command failed: {0} - The shutdown command failed: {0} + Error del comando de apagado: {0} diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.fr.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.fr.xlf index 5d8247e06..5b1bdef19 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.fr.xlf @@ -4,22 +4,22 @@ MSBuild server - MSBuild server + Serveur MSBuild VB/C# compiler server - VB/C# compiler server + Serveur de compilation VB/C# Razor build server - Razor build server + Serveur de builds Razor The shutdown command failed: {0} - The shutdown command failed: {0} + Échec de la commande d'arrêt : {0} diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.it.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.it.xlf index 964f5b5b1..d3bc10bcf 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.it.xlf @@ -4,22 +4,22 @@ MSBuild server - MSBuild server + Server di MSBuild VB/C# compiler server - VB/C# compiler server + Server del compilatore VB/C# Razor build server - Razor build server + Server di compilazione di Razor The shutdown command failed: {0} - The shutdown command failed: {0} + Il comando di arresto non è riuscito: {0} diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.ja.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.ja.xlf index 7f8488372..373b7eb9c 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.ja.xlf @@ -4,22 +4,22 @@ MSBuild server - MSBuild server + MSBuild サーバー VB/C# compiler server - VB/C# compiler server + VB/C# コンパイラ サーバー Razor build server - Razor build server + Razor ビルド サーバー The shutdown command failed: {0} - The shutdown command failed: {0} + シャットダウン コマンドが失敗しました: {0} diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.ko.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.ko.xlf index d4021594e..6c9405692 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.ko.xlf @@ -4,22 +4,22 @@ MSBuild server - MSBuild server + MSBuild 서버 VB/C# compiler server - VB/C# compiler server + VB/C# 컴파일러 서버 Razor build server - Razor build server + Razor 빌드 서버 The shutdown command failed: {0} - The shutdown command failed: {0} + 종료 명령에 실패했습니다. {0} diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.pl.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.pl.xlf index 77fbbf49e..c11b51fbf 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.pl.xlf @@ -4,22 +4,22 @@ MSBuild server - MSBuild server + Serwer MSBuild VB/C# compiler server - VB/C# compiler server + Serwer kompilatora VB/C# Razor build server - Razor build server + Serwer kompilacji Razor The shutdown command failed: {0} - The shutdown command failed: {0} + Polecenie zamknięcia nie powiodło się: {0} diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.pt-BR.xlf index 6dcaccbd0..2cab2ea6c 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.pt-BR.xlf @@ -4,22 +4,22 @@ MSBuild server - MSBuild server + Servidor MSBuild VB/C# compiler server - VB/C# compiler server + Servidor do compilador VB/C# Razor build server - Razor build server + Servidor de build Razor The shutdown command failed: {0} - The shutdown command failed: {0} + O comando de desligamento falhou: {0} diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.ru.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.ru.xlf index 415392021..3980314c9 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.ru.xlf @@ -4,22 +4,22 @@ MSBuild server - MSBuild server + Сервер MSBuild VB/C# compiler server - VB/C# compiler server + Сервер компилятора VB или C# Razor build server - Razor build server + Сервер сборки Razor The shutdown command failed: {0} - The shutdown command failed: {0} + Команда завершения работы не выполнена: {0} diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.tr.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.tr.xlf index c04a534c5..3f7be7896 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.tr.xlf @@ -4,22 +4,22 @@ MSBuild server - MSBuild server + MSBuild sunucusu VB/C# compiler server - VB/C# compiler server + VB/C# derleyici sunucusu Razor build server - Razor build server + Razor derleme sunucusu The shutdown command failed: {0} - The shutdown command failed: {0} + Kapatma komutu başarısız oldu: {0} diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.zh-Hans.xlf index a19f1958d..dda9562d4 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.zh-Hans.xlf @@ -4,22 +4,22 @@ MSBuild server - MSBuild server + MSBuild 服务器 VB/C# compiler server - VB/C# compiler server + VB/C# 编译器服务器 Razor build server - Razor build server + Razor 生成服务器 The shutdown command failed: {0} - The shutdown command failed: {0} + shutdown 命令失败: {0} diff --git a/src/dotnet/BuildServer/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/BuildServer/xlf/LocalizableStrings.zh-Hant.xlf index 4b7407194..5aeeec06b 100644 --- a/src/dotnet/BuildServer/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/BuildServer/xlf/LocalizableStrings.zh-Hant.xlf @@ -4,22 +4,22 @@ MSBuild server - MSBuild server + MSBuild 伺服器 VB/C# compiler server - VB/C# compiler server + VB/C# 編譯器伺服器 Razor build server - Razor build server + Razor 組建伺服器 The shutdown command failed: {0} - The shutdown command failed: {0} + 關機命令失敗: {0} diff --git a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.cs.xlf index d1c241f1f..f44da55a4 100644 --- a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.cs.xlf @@ -4,57 +4,57 @@ Shuts down build servers that are started from dotnet. By default, all servers are shut down. - Shuts down build servers that are started from dotnet. By default, all servers are shut down. + Vypne buildovací servery spuštěné z dotnetu. Ve výchozím nastavení jsou vypnuté všechny servery. Shuts down the MSBuild build server. - Shuts down the MSBuild build server. + Vypne buildovací server MSBuild. Shuts down the VB/C# compiler build server. - Shuts down the VB/C# compiler build server. + Vypne buildovací server kompilátoru VB/C#. Shuts down the Razor build server. - Shuts down the Razor build server. + Vypne buildovací server Razor. Shutting down {0}... - Shutting down {0}... + Vypíná se {0}... {0} shut down successfully. - {0} shut down successfully. + Vypnutí serveru {0} proběhlo úspěšně. {0} failed to shut down: {1} - {0} failed to shut down: {1} + Nepovedlo se vypnout server {0}: {1} Shutting down {0} (process {1})... - Shutting down {0} (process {1})... + Vypíná se {0} (proces {1})... {0} (process {1}) shut down successfully. - {0} (process {1}) shut down successfully. + {0} (proces {1}) se úspěšně vypnul. {0} (process {1}) failed to shut down: {2} - {0} (process {1}) failed to shut down: {2} + Nepovedlo se vypnout {0} (proces {1}): {2} No build servers are running. - No build servers are running. + Nejsou spuštěné žádné buildovací servery. diff --git a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.de.xlf index 7884b757b..f95ad7e53 100644 --- a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.de.xlf @@ -4,57 +4,57 @@ Shuts down build servers that are started from dotnet. By default, all servers are shut down. - Shuts down build servers that are started from dotnet. By default, all servers are shut down. + Fährt Buildserver herunter, die aus .NET gestartet werden. Standardmäßig werden alle Server heruntergefahren. Shuts down the MSBuild build server. - Shuts down the MSBuild build server. + Fährt den MSBuild-Buildserver herunter. Shuts down the VB/C# compiler build server. - Shuts down the VB/C# compiler build server. + Fährt den VB/C#-Compilerserver herunter. Shuts down the Razor build server. - Shuts down the Razor build server. + Fährt den Razor-Buildserver herunter. Shutting down {0}... - Shutting down {0}... + "{0}" wird heruntergefahren... {0} shut down successfully. - {0} shut down successfully. + "{0}" wurde erfolgreich heruntergefahren. {0} failed to shut down: {1} - {0} failed to shut down: {1} + Fehler beim Herunterfahren von "{0}": {1} Shutting down {0} (process {1})... - Shutting down {0} (process {1})... + "{0}" (Prozess "{1}") wird heruntergefahren... {0} (process {1}) shut down successfully. - {0} (process {1}) shut down successfully. + "{0}" (Prozess "{1}") wurde erfolgreich heruntergefahren. {0} (process {1}) failed to shut down: {2} - {0} (process {1}) failed to shut down: {2} + Fehler beim Herunterfahren von "{0}" (Prozess "{1}"): {2} No build servers are running. - No build servers are running. + Es werden zurzeit keine Buildserver ausgeführt. diff --git a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.es.xlf index 25561c2e0..7d4508002 100644 --- a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.es.xlf @@ -4,57 +4,57 @@ Shuts down build servers that are started from dotnet. By default, all servers are shut down. - Shuts down build servers that are started from dotnet. By default, all servers are shut down. + Apaga los servidores de compilación que se inician desde dotnet. De forma predeterminada, se apagan todos los servidores. Shuts down the MSBuild build server. - Shuts down the MSBuild build server. + Apaga el servidor de compilación de MSBuild. Shuts down the VB/C# compiler build server. - Shuts down the VB/C# compiler build server. + Apaga el servidor de compilación del compilador de VB o C#. Shuts down the Razor build server. - Shuts down the Razor build server. + Apaga el servidor de compilación de Razor. Shutting down {0}... - Shutting down {0}... + Apagando {0}... {0} shut down successfully. - {0} shut down successfully. + {0} se apagó correctamente. {0} failed to shut down: {1} - {0} failed to shut down: {1} + No se pudo apagar {0}: {1} Shutting down {0} (process {1})... - Shutting down {0} (process {1})... + Apagando {0} (proceso {1})... {0} (process {1}) shut down successfully. - {0} (process {1}) shut down successfully. + {0} (proceso {1}) se apagó correctamente. {0} (process {1}) failed to shut down: {2} - {0} (process {1}) failed to shut down: {2} + No se pudo apagar {0} (proceso {1}): {2} No build servers are running. - No build servers are running. + No se está ejecutando ningún servidor de compilación. diff --git a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.fr.xlf index b8d2e3d6c..adddc11af 100644 --- a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.fr.xlf @@ -4,57 +4,57 @@ Shuts down build servers that are started from dotnet. By default, all servers are shut down. - Shuts down build servers that are started from dotnet. By default, all servers are shut down. + Arrête les serveurs de builds démarrés à partir de dotnet. Par défaut, tous les serveurs sont arrêtés. Shuts down the MSBuild build server. - Shuts down the MSBuild build server. + Arrête le serveur de builds MSBuild. Shuts down the VB/C# compiler build server. - Shuts down the VB/C# compiler build server. + Arrête le serveur de builds du compilateur VB/C#. Shuts down the Razor build server. - Shuts down the Razor build server. + Arrête le serveur de builds Razor. Shutting down {0}... - Shutting down {0}... + Arrêt de {0}... {0} shut down successfully. - {0} shut down successfully. + {0} s'est arrêté correctement. {0} failed to shut down: {1} - {0} failed to shut down: {1} + Échec de l'arrêt de {0} : {1} Shutting down {0} (process {1})... - Shutting down {0} (process {1})... + Arrêt de {0} (processus {1})... {0} (process {1}) shut down successfully. - {0} (process {1}) shut down successfully. + {0} (processus {1}) s'est arrêté correctement. {0} (process {1}) failed to shut down: {2} - {0} (process {1}) failed to shut down: {2} + Échec de l'arrêt de {0} (processus {1}) : {2} No build servers are running. - No build servers are running. + Aucun serveur de builds n'est en cours d'exécution. diff --git a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.it.xlf index c54c06b59..7a827bbaa 100644 --- a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.it.xlf @@ -4,57 +4,57 @@ Shuts down build servers that are started from dotnet. By default, all servers are shut down. - Shuts down build servers that are started from dotnet. By default, all servers are shut down. + Arresta i server di compilazione avviati da dotnet. Per impostazione predefinita, vengono arrestati tutti i server. Shuts down the MSBuild build server. - Shuts down the MSBuild build server. + Arresta il server di compilazione di MSBuild. Shuts down the VB/C# compiler build server. - Shuts down the VB/C# compiler build server. + Arresta il server di compilazione del compilatore VB/C#. Shuts down the Razor build server. - Shuts down the Razor build server. + Arresta il server di compilazione di Razor. Shutting down {0}... - Shutting down {0}... + Arresto di {0}... {0} shut down successfully. - {0} shut down successfully. + {0} è stato arrestato. {0} failed to shut down: {1} - {0} failed to shut down: {1} + Non è stato possibile arrestare {0}: {1} Shutting down {0} (process {1})... - Shutting down {0} (process {1})... + Arresto di {0} (processo {1})... {0} (process {1}) shut down successfully. - {0} (process {1}) shut down successfully. + {0} (processo {1}) è stato arrestato. {0} (process {1}) failed to shut down: {2} - {0} (process {1}) failed to shut down: {2} + Non è stato possibile arrestare {0} (processo {1}): {2} No build servers are running. - No build servers are running. + Non ci sono server di compilazione in esecuzione. diff --git a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.ja.xlf index 83dc7fa57..51f72045e 100644 --- a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.ja.xlf @@ -4,57 +4,57 @@ Shuts down build servers that are started from dotnet. By default, all servers are shut down. - Shuts down build servers that are started from dotnet. By default, all servers are shut down. + dotnet から起動されたビルド サーバーをシャットダウンします。既定では、すべてのサーバーがシャットダウンされます。 Shuts down the MSBuild build server. - Shuts down the MSBuild build server. + MSBuild ビルド サーバーをシャットダウンします。 Shuts down the VB/C# compiler build server. - Shuts down the VB/C# compiler build server. + VB/C# コンパイラ ビルド サーバーをシャットダウンします。 Shuts down the Razor build server. - Shuts down the Razor build server. + Razor ビルド サーバーをシャットダウンします。 Shutting down {0}... - Shutting down {0}... + {0} をシャットダウンしています... {0} shut down successfully. - {0} shut down successfully. + {0} は正常にシャットダウンしました。 {0} failed to shut down: {1} - {0} failed to shut down: {1} + {0} のシャットダウンが失敗しました: {1} Shutting down {0} (process {1})... - Shutting down {0} (process {1})... + {0} をシャットダウンしています (プロセス {1})... {0} (process {1}) shut down successfully. - {0} (process {1}) shut down successfully. + {0} (プロセス {1}) は正常にシャットダウンしました。 {0} (process {1}) failed to shut down: {2} - {0} (process {1}) failed to shut down: {2} + {0} (プロセス {1}) のシャットダウンが失敗しました: {2} No build servers are running. - No build servers are running. + 実行中のビルド サーバーはありません。 diff --git a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.ko.xlf index b67fc7055..47a011e53 100644 --- a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.ko.xlf @@ -4,57 +4,57 @@ Shuts down build servers that are started from dotnet. By default, all servers are shut down. - Shuts down build servers that are started from dotnet. By default, all servers are shut down. + dotnet에서 시작한 빌드 서버를 종료합니다. 기본적으로 모든 서버가 종료됩니다. Shuts down the MSBuild build server. - Shuts down the MSBuild build server. + MSBuild 빌드 서버를 종료합니다. Shuts down the VB/C# compiler build server. - Shuts down the VB/C# compiler build server. + VB/C# 컴파일러 빌드 서버를 종료합니다. Shuts down the Razor build server. - Shuts down the Razor build server. + Razor 빌드 서버를 종료합니다. Shutting down {0}... - Shutting down {0}... + {0}을(를) 종료하는 중... {0} shut down successfully. - {0} shut down successfully. + {0}을(를) 종료했습니다. {0} failed to shut down: {1} - {0} failed to shut down: {1} + {0}을(를) 종료하지 못했습니다. {1} Shutting down {0} (process {1})... - Shutting down {0} (process {1})... + {0}(프로세스 {1})을(를) 종료하는 중... {0} (process {1}) shut down successfully. - {0} (process {1}) shut down successfully. + {0}(프로세스 {1})을(를) 종료했습니다. {0} (process {1}) failed to shut down: {2} - {0} (process {1}) failed to shut down: {2} + {0}(프로세스 {1})을(를) 종료하지 못했습니다. {2} No build servers are running. - No build servers are running. + 빌드 서버가 실행되지 않습니다. diff --git a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.pl.xlf index 0df6609cf..cf0ab2a10 100644 --- a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.pl.xlf @@ -4,57 +4,57 @@ Shuts down build servers that are started from dotnet. By default, all servers are shut down. - Shuts down build servers that are started from dotnet. By default, all servers are shut down. + Zamyka serwery kompilacji, które zostały uruchomione z poziomu polecenia dotnet. Domyślnie zamykane są wszystkie serwery. Shuts down the MSBuild build server. - Shuts down the MSBuild build server. + Zamyka serwer kompilacji MSBuild. Shuts down the VB/C# compiler build server. - Shuts down the VB/C# compiler build server. + Zamyka serwer kompilacji kompilatora VB/C#. Shuts down the Razor build server. - Shuts down the Razor build server. + Zamyka serwer kompilacji Razor. Shutting down {0}... - Shutting down {0}... + Trwa zamykanie serwera {0}... {0} shut down successfully. - {0} shut down successfully. + Serwer {0} został zamknięty pomyślnie. {0} failed to shut down: {1} - {0} failed to shut down: {1} + Nie można zamknąć serwera {0}: {1} Shutting down {0} (process {1})... - Shutting down {0} (process {1})... + Trwa zamykanie serwera {0} (proces {1})... {0} (process {1}) shut down successfully. - {0} (process {1}) shut down successfully. + Serwer {0} (proces {1}) został zamknięty pomyślnie. {0} (process {1}) failed to shut down: {2} - {0} (process {1}) failed to shut down: {2} + Nie można zamknąć serwera {0} (proces {1}): {2} No build servers are running. - No build servers are running. + Nie są uruchomione żadne serwery kompilacji. diff --git a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.pt-BR.xlf index af68eba6e..8c00c9a2b 100644 --- a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.pt-BR.xlf @@ -4,57 +4,57 @@ Shuts down build servers that are started from dotnet. By default, all servers are shut down. - Shuts down build servers that are started from dotnet. By default, all servers are shut down. + Desliga os servidores de build que são iniciados do dotnet. Por padrão, todos os servidores são desligados. Shuts down the MSBuild build server. - Shuts down the MSBuild build server. + Desliga o servidor de build MSBuild. Shuts down the VB/C# compiler build server. - Shuts down the VB/C# compiler build server. + Desliga o servidor de build do compilador VB/C#. Shuts down the Razor build server. - Shuts down the Razor build server. + Desliga o servidor de build Razor. Shutting down {0}... - Shutting down {0}... + Desligando {0}... {0} shut down successfully. - {0} shut down successfully. + {0} desligado com sucesso. {0} failed to shut down: {1} - {0} failed to shut down: {1} + Falha ao desligar {0}: {1} Shutting down {0} (process {1})... - Shutting down {0} (process {1})... + Desligando o {0} (processo {1})... {0} (process {1}) shut down successfully. - {0} (process {1}) shut down successfully. + O {0} (processo {1}) foi desligado com êxito. {0} (process {1}) failed to shut down: {2} - {0} (process {1}) failed to shut down: {2} + O desligamento do {0} (processo {1}) falhou: {2} No build servers are running. - No build servers are running. + Não há nenhum servidor de build em execução. diff --git a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.ru.xlf index 03c7ce71c..1338f4115 100644 --- a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.ru.xlf @@ -4,57 +4,57 @@ Shuts down build servers that are started from dotnet. By default, all servers are shut down. - Shuts down build servers that are started from dotnet. By default, all servers are shut down. + Завершает работу серверов сборки, запущенных из среды dotnet. По умолчанию завершается работа всех серверов. Shuts down the MSBuild build server. - Shuts down the MSBuild build server. + Завершает работу сервера сборки MSBuild. Shuts down the VB/C# compiler build server. - Shuts down the VB/C# compiler build server. + Завершает работу сервера сборки компилятора VB или C#. Shuts down the Razor build server. - Shuts down the Razor build server. + Завершает работу сервера сборки Razor. Shutting down {0}... - Shutting down {0}... + Завершается работа {0}... {0} shut down successfully. - {0} shut down successfully. + Работа {0} завершена. {0} failed to shut down: {1} - {0} failed to shut down: {1} + Не удалось завершить работу {0}: {1} Shutting down {0} (process {1})... - Shutting down {0} (process {1})... + Завершается работа {0} (процесс {1})... {0} (process {1}) shut down successfully. - {0} (process {1}) shut down successfully. + Работа {0} (процесс {1}) завершена. {0} (process {1}) failed to shut down: {2} - {0} (process {1}) failed to shut down: {2} + Не удалось завершить работу {0} (процесс {1}): {2} No build servers are running. - No build servers are running. + Нет запущенных серверов сборки. diff --git a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.tr.xlf index 2804d42c6..2e5b42a2d 100644 --- a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.tr.xlf @@ -4,57 +4,57 @@ Shuts down build servers that are started from dotnet. By default, all servers are shut down. - Shuts down build servers that are started from dotnet. By default, all servers are shut down. + Dotnet’ten başlatılan derleme sunucularını kapatır. Varsayılan olarak tüm sunucular kapalıdır. Shuts down the MSBuild build server. - Shuts down the MSBuild build server. + MSBuild derleme sunucusunu kapatır. Shuts down the VB/C# compiler build server. - Shuts down the VB/C# compiler build server. + VB/C# derleyici derleme sunucusunu kapatır. Shuts down the Razor build server. - Shuts down the Razor build server. + Razor derleme sunucusunu kapatır. Shutting down {0}... - Shutting down {0}... + {0} kapatılıyor... {0} shut down successfully. - {0} shut down successfully. + {0} başarıyla kapatıldı. {0} failed to shut down: {1} - {0} failed to shut down: {1} + {0} kapatılamadı: {1} Shutting down {0} (process {1})... - Shutting down {0} (process {1})... + {0} kapatılıyor (işlem {1})... {0} (process {1}) shut down successfully. - {0} (process {1}) shut down successfully. + {0} (işlem {1}) başarıyla kapatıldı. {0} (process {1}) failed to shut down: {2} - {0} (process {1}) failed to shut down: {2} + {0} (işlem {1}) kapatılamadı: {2} No build servers are running. - No build servers are running. + Hiçbir derleme sunucusu çalışmıyor. diff --git a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.zh-Hans.xlf index fd643550e..fff77ab5c 100644 --- a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.zh-Hans.xlf @@ -4,57 +4,57 @@ Shuts down build servers that are started from dotnet. By default, all servers are shut down. - Shuts down build servers that are started from dotnet. By default, all servers are shut down. + 关闭从 dotnet 启动的生成服务器。默认情况下，所有服务器都将关闭。 Shuts down the MSBuild build server. - Shuts down the MSBuild build server. + 关闭 MSBuild 生成服务器。 Shuts down the VB/C# compiler build server. - Shuts down the VB/C# compiler build server. + 关闭 VB/C# 编译器生成服务器。 Shuts down the Razor build server. - Shuts down the Razor build server. + 关闭 Razor 生成服务器。 Shutting down {0}... - Shutting down {0}... + 正在关闭 {0}... {0} shut down successfully. - {0} shut down successfully. + 成功关闭 {0}。 {0} failed to shut down: {1} - {0} failed to shut down: {1} + 未能关闭 {0}: {1} Shutting down {0} (process {1})... - Shutting down {0} (process {1})... + 正在关闭 {0} (进程 {1})... {0} (process {1}) shut down successfully. - {0} (process {1}) shut down successfully. + 成功关闭 {0} (进程 {1})。 {0} (process {1}) failed to shut down: {2} - {0} (process {1}) failed to shut down: {2} + 未能关闭 {0} (进程 {1}): {2} No build servers are running. - No build servers are running. + 未运行生成服务器。 diff --git a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.zh-Hant.xlf index 5811f0c6e..a7669b4f4 100644 --- a/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-buildserver/shutdown/xlf/LocalizableStrings.zh-Hant.xlf @@ -4,57 +4,57 @@ Shuts down build servers that are started from dotnet. By default, all servers are shut down. - Shuts down build servers that are started from dotnet. By default, all servers are shut down. + 關閉 dotnet 啟動的組建伺服器。根據預設會關閉所有伺服器。 Shuts down the MSBuild build server. - Shuts down the MSBuild build server. + 關閉 MSBuild 組建伺服器。 Shuts down the VB/C# compiler build server. - Shuts down the VB/C# compiler build server. + 關閉 VB/C# 編譯器組建伺服器。 Shuts down the Razor build server. - Shuts down the Razor build server. + 關閉 Razor 組建伺服器。 Shutting down {0}... - Shutting down {0}... + 正在關閉 {0}... {0} shut down successfully. - {0} shut down successfully. + {0} 關閉成功。 {0} failed to shut down: {1} - {0} failed to shut down: {1} + {0} 無法關閉: {1} Shutting down {0} (process {1})... - Shutting down {0} (process {1})... + 正在關閉 {0} (處理序 {1})... {0} (process {1}) shut down successfully. - {0} (process {1}) shut down successfully. + {0} (處理序 {1}) 已成功關閉。 {0} (process {1}) failed to shut down: {2} - {0} (process {1}) failed to shut down: {2} + {0} (處理序 {1}) 無法關閉: {2} No build servers are running. - No build servers are running. + 未執行任何組建伺服器。 diff --git a/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.cs.xlf index 5d129801c..aa46a6baf 100644 --- a/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.cs.xlf @@ -4,12 +4,12 @@ Interact with servers started from a build. - Interact with servers started from a build. + Interakce se servery spuštěnými z buildu .NET Build Server Command - .NET Build Server Command + Příkaz buildovacího serveru .NET diff --git a/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.de.xlf index 98138e81b..5e754326c 100644 --- a/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.de.xlf @@ -4,12 +4,12 @@ Interact with servers started from a build. - Interact with servers started from a build. + Interaktion mit Servern, die aus einem Build gestartet werden. .NET Build Server Command - .NET Build Server Command + .NET-Buildserverbefehl diff --git a/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.es.xlf index e81f02741..8eff34033 100644 --- a/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.es.xlf @@ -4,12 +4,12 @@ Interact with servers started from a build. - Interact with servers started from a build. + Interactúe con los servidores que se inician desde una compilación. .NET Build Server Command - .NET Build Server Command + Comando del servidor de compilación de .NET diff --git a/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.fr.xlf index 17adb4387..b4a8cacd6 100644 --- a/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.fr.xlf @@ -4,12 +4,12 @@ Interact with servers started from a build. - Interact with servers started from a build. + Interagissez avec les serveurs démarrés à partir d'une build. .NET Build Server Command - .NET Build Server Command + Commande du serveur de builds .NET diff --git a/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.it.xlf index e18631c38..06eff3bd3 100644 --- a/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.it.xlf @@ -4,12 +4,12 @@ Interact with servers started from a build. - Interact with servers started from a build. + Interagisce con server avviati da una compilazione. .NET Build Server Command - .NET Build Server Command + Comando del server di compilazione di .NET diff --git a/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.ja.xlf index 93021b724..43128814a 100644 --- a/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.ja.xlf @@ -4,12 +4,12 @@ Interact with servers started from a build. - Interact with servers started from a build. + ビルドから開始されたサーバーとやり取りします。 .NET Build Server Command - .NET Build Server Command + .Net ビルド サーバー コマンド diff --git a/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.ko.xlf index dbaea7baa..6639a70d4 100644 --- a/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.ko.xlf @@ -4,12 +4,12 @@ Interact with servers started from a build. - Interact with servers started from a build. + 서버와 상호 작용이 빌드에서 시작되었습니다. .NET Build Server Command - .NET Build Server Command + .NET 빌드 서버 명령 diff --git a/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.pl.xlf index 4eea609ca..a17bdc31a 100644 --- a/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.pl.xlf @@ -4,12 +4,12 @@ Interact with servers started from a build. - Interact with servers started from a build. + Interakcja z serwerami uruchomionymi z poziomu kompilacji. .NET Build Server Command - .NET Build Server Command + Polecenie serwera kompilacji platformy .NET diff --git a/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.pt-BR.xlf index 42d1bd160..f213dba20 100644 --- a/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.pt-BR.xlf @@ -4,12 +4,12 @@ Interact with servers started from a build. - Interact with servers started from a build. + Interagir com servidores iniciados de um build. .NET Build Server Command - .NET Build Server Command + Comando do servidor de build .NET diff --git a/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.ru.xlf index 837af6754..101c0323c 100644 --- a/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.ru.xlf @@ -4,12 +4,12 @@ Interact with servers started from a build. - Interact with servers started from a build. + Взаимодействие с серверами, запущенными в ходе сборки. .NET Build Server Command - .NET Build Server Command + Команда сервера сборки .NET diff --git a/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.tr.xlf index 55dd68623..9c19ca399 100644 --- a/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.tr.xlf @@ -4,12 +4,12 @@ Interact with servers started from a build. - Interact with servers started from a build. + Bir derlemeden başlatılan sunucularla etkileşimde bulunun. .NET Build Server Command - .NET Build Server Command + .NET Derleme Sunucusu Komutu diff --git a/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.zh-Hans.xlf index b9e19d9f2..6a38fcd64 100644 --- a/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.zh-Hans.xlf @@ -4,12 +4,12 @@ Interact with servers started from a build. - Interact with servers started from a build. + 与从生成版本启动的服务器进行交互。 .NET Build Server Command - .NET Build Server Command + .NET 生成服务器命令 diff --git a/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.zh-Hant.xlf index b9bf11b38..638247f30 100644 --- a/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-buildserver/xlf/LocalizableStrings.zh-Hant.xlf @@ -4,12 +4,12 @@ Interact with servers started from a build. - Interact with servers started from a build. + 與組建啟動的伺服器互動。 .NET Build Server Command - .NET Build Server Command + .NET 建置伺服器命令 diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.cs.xlf index 2c79948b5..dafc7ccce 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.cs.xlf @@ -254,12 +254,12 @@ Install or work with tools that extend the .NET experience. - Upravte nástroje. + Instaluje nástroje, které rozšiřují prostředí .NET, nebo s nimi pracuje. Interact with servers started by a build. - Interact with servers started by a build. + Interakce se servery spuštěnými buildem diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.de.xlf index 1aa8c6c90..236103e64 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.de.xlf @@ -255,12 +255,12 @@ Install or work with tools that extend the .NET experience. - Hiermit werden Tools geändert. + Installation oder Arbeit mit Tools zum Erweitern der .NET-Benutzeroberfläche. Interact with servers started by a build. - Interact with servers started by a build. + Interaktion mit Servern, die durch einen Build gestartet werden. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.es.xlf index f77be21f4..6445e9253 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.es.xlf @@ -254,12 +254,12 @@ Install or work with tools that extend the .NET experience. - Modifica herramientas. + Instale o trabaje con herramientas que mejoran la experiencia de uso de .NET. Interact with servers started by a build. - Interact with servers started by a build. + Interactúe con los servidores que inicia una compilación. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.fr.xlf index 8cf661d80..61ea2fdc7 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.fr.xlf @@ -254,12 +254,12 @@ Install or work with tools that extend the .NET experience. - Modifier les outils. + Installez ou utilisez des outils qui étendent l'expérience .NET. Interact with servers started by a build. - Interact with servers started by a build. + Interagissez avec les serveurs démarrés par une build. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.it.xlf index 85afcf32e..1fb95f70b 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.it.xlf @@ -254,12 +254,12 @@ Install or work with tools that extend the .NET experience. - Modifica gli strumenti. + Consente di installare o usare strumenti che estendono l'esperienza .NET. Interact with servers started by a build. - Interact with servers started by a build. + Interagisce con server avviati da una compilazione. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf index 8821d75e4..1157c6ead 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf @@ -254,12 +254,12 @@ Install or work with tools that extend the .NET experience. - ツールを変更します。 + .NET のエクスペリエンスを向上するツールをインストールするか、使用します。 Interact with servers started by a build. - Interact with servers started by a build. + ビルドによって開始されたサーバーとやり取りします。 diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ko.xlf index aa0fefac0..6ea30a852 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ko.xlf @@ -254,12 +254,12 @@ Install or work with tools that extend the .NET experience. - 도구를 수정합니다. + .NET 환경을 확장하는 도구를 설치하거나 도구로 작업합니다. Interact with servers started by a build. - Interact with servers started by a build. + 빌드에 의해 서버와 상호 작용이 시작되었습니다. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf index 879a0e96e..7a6599422 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf @@ -254,12 +254,12 @@ Install or work with tools that extend the .NET experience. - Zmodyfikuj narzędzia. + Zainstaluj lub pracuj z narzędziami, które rozszerzają środowisko .NET. Interact with servers started by a build. - Interact with servers started by a build. + Interakcja z serwerami uruchomionymi przez kompilację. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pt-BR.xlf index 03eaf235e..47d9e9b11 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pt-BR.xlf @@ -254,12 +254,12 @@ Install or work with tools that extend the .NET experience. - Modificar ferramentas. + Instale ou trabalhe com as ferramentas que ampliam a experiência do .NET. Interact with servers started by a build. - Interact with servers started by a build. + Interagir com servidores iniciados por um build. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ru.xlf index 29891423b..e117bd9dd 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ru.xlf @@ -254,12 +254,12 @@ Install or work with tools that extend the .NET experience. - Средства для изменения. + Установка и использование средств, расширяющих возможности .NET. Interact with servers started by a build. - Interact with servers started by a build. + Взаимодействие с серверами, запущенными в ходе сборки. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.tr.xlf index 2968a17f9..357721ae7 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.tr.xlf @@ -254,12 +254,12 @@ Install or work with tools that extend the .NET experience. - Araçları değiştirir. + .NET deneyiminizi genişleten araçları yükleyin veya bu araçlarla çalışın. Interact with servers started by a build. - Interact with servers started by a build. + Bir derleme tarafından başlatılan sunucularla etkileşimde bulunun. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hans.xlf index c60a7ee7d..9e884d0a2 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hans.xlf @@ -254,12 +254,12 @@ Install or work with tools that extend the .NET experience. - 修改工具。 + 安装或使用扩展 .NET 体验的工具。 Interact with servers started by a build. - Interact with servers started by a build. + 与由生成版本启动的服务器进行交互。 diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf index bba3fe694..133ca7e1e 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf @@ -254,12 +254,12 @@ Install or work with tools that extend the .NET experience. - 修改工具。 + 安裝或使用可擴充 .NET 體驗的工具。 Interact with servers started by a build. - Interact with servers started by a build. + 與組建啟動的伺服器互動。 diff --git a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.cs.xlf index 132384329..61ed7f81b 100644 --- a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.cs.xlf @@ -24,7 +24,7 @@ Do not build the project before packing. Implies --no-restore. - Nesestavujte projekt, dokud ho nezabalíte. Implikuje možnost --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 294f6f531..cc6eac1b2 100644 --- a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.de.xlf @@ -24,7 +24,7 @@ Do not build the project before packing. Implies --no-restore. - Erstellt das Projekt nicht vor dem Packen. Impliziert "--no-restore". + Erstellt das Projekt nicht vor dem Paketieren. 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 f0a671a65..f68fc8b03 100644 --- a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.es.xlf @@ -24,7 +24,7 @@ Do not build the project before packing. Implies --no-restore. - No compile el proyecto antes de empaquetarlo. Implica la no restauración. + No compile el proyecto antes de empaquetarlo. Implica --no-restore. diff --git a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.fr.xlf index 200ea5fc4..b895859ff 100644 --- a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.fr.xlf @@ -24,7 +24,7 @@ Do not build the project before packing. Implies --no-restore. - Ne pas générer le projet avant la compression. Implique --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 11d60afa9..f26031f51 100644 --- a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.it.xlf @@ -24,7 +24,7 @@ Do not build the project before packing. Implies --no-restore. - Non compila il progetto prima della creazione del pacchetto. Implica --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 146421b26..5a134aa11 100644 --- a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.ja.xlf @@ -24,7 +24,7 @@ Do not build the project before packing. Implies --no-restore. - パックする前にプロジェクトをビルドしないでください。 暗示 --復元なし。 + パックする前にプロジェクトをビルドしないでください。--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 3cbc41b27..d0392f970 100644 --- a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.ko.xlf @@ -24,7 +24,7 @@ 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 74df2c640..bcb59d575 100644 --- a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.pl.xlf @@ -24,7 +24,7 @@ Do not build the project before packing. Implies --no-restore. - Nie kompiluj projektu przed pakowaniem. Powoduje przyjęcie, że podano parametr --no-restore. + Nie kompiluj tego 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 46b75eef4..24b00da1f 100644 --- a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.pt-BR.xlf @@ -24,7 +24,7 @@ Do not build the project before packing. Implies --no-restore. - Não compile o projeto antes de empacotar. Implica em --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 aacddbc93..8084ddf5f 100644 --- a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.ru.xlf @@ -24,7 +24,7 @@ Do not build the project before packing. Implies --no-restore. - Не собирать проекты перед упаковкой. Подразумевает --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 dbf1d3e43..c6356a393 100644 --- a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.tr.xlf @@ -24,7 +24,7 @@ Do not build the project before packing. Implies --no-restore. - Paketlemeden önce projeyi derlemeyin. --no-restore anlamına gelir. + 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 c599593b4..78dd32bfe 100644 --- a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.zh-Hans.xlf @@ -24,7 +24,7 @@ Do not build the project before packing. Implies --no-restore. - 打包之前不要生成项目。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 129152bbe..721510a5d 100644 --- a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.zh-Hant.xlf @@ -24,7 +24,7 @@ Do not build the project before packing. Implies --no-restore. - 請勿在封裝前建置專案。 這意味著 --沒有還原。 + 請勿在封裝之前建置專案。提示：-no-restore。 diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.cs.xlf index f4fb78fb1..63ee50819 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.cs.xlf @@ -44,7 +44,7 @@ Do not build the project before publishing. Implies --no-restore. - Do not build the project before publishing. Implies --no-restore. + Nesestavujte projekt, dokud ho nepublikujete. Implikuje možnost --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 48b7e70ca..48ed863a3 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.de.xlf @@ -44,7 +44,7 @@ Do not build the project before publishing. Implies --no-restore. - Do not build the project before publishing. Implies --no-restore. + Erstellt das Projekt nicht vor dem Veröffentlichen. Impliziert "--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 e0bbd7767..da3f7ed46 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.es.xlf @@ -44,7 +44,7 @@ Do not build the project before publishing. Implies --no-restore. - Do not build the project before publishing. Implies --no-restore. + No compile el proyecto antes de publicarlo. Implica --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 1276f9f72..dd0313e28 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.fr.xlf @@ -44,7 +44,7 @@ Do not build the project before publishing. Implies --no-restore. - Do not build the project before publishing. Implies --no-restore. + Ne pas générer le projet avant la publication. Implique --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 fb910869d..af43acc33 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.it.xlf @@ -44,7 +44,7 @@ Do not build the project before publishing. Implies --no-restore. - Do not build the project before publishing. Implies --no-restore. + Non compila il progetto prima della pubblicazione. Implica --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 49c52b0b7..e66212555 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ja.xlf @@ -44,7 +44,7 @@ Do not build the project before publishing. Implies --no-restore. - Do not build the project before publishing. Implies --no-restore. + 発行する前にプロジェクトをビルドしないでください。--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 258b44d77..f2d3dcf4a 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ko.xlf @@ -44,7 +44,7 @@ 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 4faa98d60..12fe62cff 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pl.xlf @@ -44,7 +44,7 @@ Do not build the project before publishing. Implies --no-restore. - Do not build the project before publishing. Implies --no-restore. + Nie kompiluj tego projektu przed opublikowaniem. Powoduje przyjęcie, że podano parametr --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 3dc61ce04..56dc77078 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pt-BR.xlf @@ -44,7 +44,7 @@ Do not build the project before publishing. Implies --no-restore. - Do not build the project before publishing. Implies --no-restore. + Não compile o projeto antes de publicar. Implica em --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 3019f07cb..b9d44ef76 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ru.xlf @@ -44,7 +44,7 @@ Do not build the project before publishing. Implies --no-restore. - Do not build the project before publishing. Implies --no-restore. + Сборка проекта перед публикацией не выполняется. Подразумевает --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 aa58c8144..76d508082 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.tr.xlf @@ -44,7 +44,7 @@ Do not build the project before publishing. Implies --no-restore. - Do not build the project before publishing. Implies --no-restore. + Yayımlamadan önce projeyi derlemeyin. --no-restore anlamına gelir. 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 cc1feec66..aebb64b59 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hans.xlf @@ -44,7 +44,7 @@ Do not build the project before publishing. Implies --no-restore. - Do not build the project before publishing. Implies --no-restore. + 发布之前不要生成项目。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 89c72c534..4861b838a 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hant.xlf @@ -44,7 +44,7 @@ Do not build the project before publishing. Implies --no-restore. - Do not build the project before publishing. Implies --no-restore. + 請勿在執行之前建置專案。提示：-no-restore。 diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.cs.xlf index d26356a55..23703c1cd 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.cs.xlf @@ -34,7 +34,7 @@ Do not build the project before running. Implies --no-restore. - Nesestavujte projekt, dokud ho nespustíte. Implikuje možnost --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 7170829ae..30249669f 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.de.xlf @@ -34,7 +34,7 @@ Do not build the project before running. Implies --no-restore. - Erstellt das Projekt nicht vor der Ausführung. Impliziert "--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 204762c45..75a5a6f23 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.es.xlf @@ -34,7 +34,7 @@ Do not build the project before running. Implies --no-restore. - No compile el proyecto antes de ejecutarlo. Implica la no restauración. + No compile el proyecto antes de ejecutarlo. Implica --no-restore. diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.fr.xlf index 06699eccc..b8c125110 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.fr.xlf @@ -34,7 +34,7 @@ Do not build the project before running. Implies --no-restore. - Ne pas générer le projet avant l’exécution. Implique --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 1083013db..20b35ad3e 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.it.xlf @@ -34,7 +34,7 @@ Do not build the project before running. Implies --no-restore. - Non compila il progetto prima dell'esecuzione. Implica --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 b27a529ca..e3b88ac74 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ja.xlf @@ -34,7 +34,7 @@ Do not build the project before running. Implies --no-restore. - 実行する前にプロジェクトをビルドしないでください。 暗示 --復元なし。 + 実行する前にプロジェクトをビルドしないでください。--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 b65a6cd09..3f03b85c2 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ko.xlf @@ -34,7 +34,7 @@ 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 219fdf99e..6fa10eb43 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.pl.xlf @@ -34,7 +34,7 @@ Do not build the project before running. Implies --no-restore. - Nie kompiluj projektu przed uruchomieniem. Powoduje przyjęcie, że podano parametr --no-restore. + Nie kompiluj tego 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 6f13e81c1..bc7045d99 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.pt-BR.xlf @@ -34,7 +34,7 @@ Do not build the project before running. Implies --no-restore. - Não compile o projeto antes de executar. Implica em --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 101711b78..1962123b8 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ru.xlf @@ -34,7 +34,7 @@ Do not build the project before running. Implies --no-restore. - Не собирать проекты перед запуском. Подразумевает --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 3ea4dbf33..b216a0ba5 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.tr.xlf @@ -34,7 +34,7 @@ Do not build the project before running. Implies --no-restore. - Çalıştırmadan önce projeyi derlemeyin. --no-restore anlamına gelir. + Ç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 6ef9e7b53..326ac5f37 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.zh-Hans.xlf @@ -34,7 +34,7 @@ Do not build the project before running. Implies --no-restore. - 运行之前不要生成项目。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 d9c430440..942b1738f 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.zh-Hant.xlf @@ -34,7 +34,7 @@ Do not build the project before running. Implies --no-restore. - 請勿在執行前建置專案。 這意味著 --沒有還原。 + 請勿在執行之前建置專案。提示：-no-restore。 diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.cs.xlf index 72686f890..af05c66f9 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.cs.xlf @@ -128,7 +128,7 @@ Do not build the project before testing. Implies --no-restore. - Nesestavujte projekt, dokud ho neotestujete. Implikuje možnost --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 479c9d7f0..0894b8a96 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.de.xlf @@ -128,7 +128,7 @@ Do not build the project before testing. Implies --no-restore. - Erstellt das Projekt nicht vor dem Testen. Impliziert "--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 e5b18ba75..6b0354fef 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.es.xlf @@ -128,7 +128,7 @@ Do not build the project before testing. Implies --no-restore. - No compile el proyecto antes de probarlo. Implica la no restauración. + No compile el proyecto antes de probarlo. Implica --no-restore. diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.fr.xlf index aa2b70adb..1be1bec08 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.fr.xlf @@ -128,7 +128,7 @@ Do not build the project before testing. Implies --no-restore. - Ne pas générer le projet avant le test. Implique --no-restore. + Ne pas générer le projet avant les tests. 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 58f47377c..625ac8db7 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.it.xlf @@ -128,7 +128,7 @@ Do not build the project before testing. Implies --no-restore. - Non compila il progetto prima del test. Implica --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 64f74ad01..a5f4f4d31 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ja.xlf @@ -128,7 +128,7 @@ Do not build the project before testing. Implies --no-restore. - テストする前にプロジェクトをビルドしないでください。 暗示 --復元なし。 + テストする前にプロジェクトをビルドしないでください。--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 f91849b77..0074d627d 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ko.xlf @@ -128,7 +128,7 @@ 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 d794d6cb7..2a86b9ee7 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pl.xlf @@ -128,7 +128,7 @@ Do not build the project before testing. Implies --no-restore. - Nie kompiluj projektu przed testowaniem. Powoduje przyjęcie, że podano parametr --no-restore. + Nie kompiluj tego 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 9b6ef5155..808612595 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pt-BR.xlf @@ -128,7 +128,7 @@ Do not build the project before testing. Implies --no-restore. - Não compile o projeto antes de testar. Implica em --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 2201c0370..d5981ad1f 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ru.xlf @@ -128,7 +128,7 @@ Do not build the project before testing. Implies --no-restore. - Не собирать проекты перед тестированием. Подразумевает --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 d834291ca..dbf0d2c4e 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.tr.xlf @@ -128,7 +128,7 @@ Do not build the project before testing. Implies --no-restore. - Test etmeden önce projeyi derlemeyin. --no-restore anlamına gelir. + 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 72820a496..a283a064f 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hans.xlf @@ -128,7 +128,7 @@ Do not build the project before testing. Implies --no-restore. - 测试之前不要生成项目。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 221f1ac23..4f3a3225b 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.zh-Hant.xlf @@ -128,7 +128,7 @@ Do not build the project before testing. Implies --no-restore. - 請勿在測試前建置專案。 這意味著 --沒有還原。 + 請勿在測試之前建置專案。提示：-no-restore。 diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf index e89bdafbd..45d57f8d0 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf @@ -116,7 +116,7 @@ Nástroj {1} (verze {2}) byl úspěšně nainstalován. Tool '{0}' failed to install. - Tool '{0}' failed to install. + Nástroj {0} se nepodařilo nainstalovat. @@ -126,12 +126,12 @@ Nástroj {1} (verze {2}) byl úspěšně nainstalován. * A package by this name was found, but it was not a .NET Core tool. * The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. * You mistyped the name of the tool. - Tool '{0}' failed to install. This failure may have been caused by: + Nástroj {0} se nepodařilo nainstalovat. Možné příčiny: -* You are attempting to install a preview release and did not use the --version option to specify the version. -* A package by this name was found, but it was not a .NET Core tool. -* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. -* You mistyped the name of the tool. +* Pokoušíte se nainstalovat verzi Preview, ale nespecifikovali jste ji pomocí možnosti --version. +* Byl nalezen balíček s tímto názvem, ale není to nástroj .NET Core. +* Požadovaný informační kanál NuGet je nedostupný, pravděpodobně z důvodu potíží s připojením k internetu. +* Zadali jste chybně název nástroje. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.de.xlf index 9e8b1bb93..b5b6c49eb 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.de.xlf @@ -116,7 +116,7 @@ Das Tool "{1}" (Version {2}) wurde erfolgreich installiert. Tool '{0}' failed to install. - Tool '{0}' failed to install. + Fehler bei der Installation des Tools "{0}". @@ -126,12 +126,12 @@ Das Tool "{1}" (Version {2}) wurde erfolgreich installiert. * A package by this name was found, but it was not a .NET Core tool. * The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. * You mistyped the name of the tool. - Tool '{0}' failed to install. This failure may have been caused by: + Fehler bei der Installation des Tools "{0}". Dieser Fehler kann folgende Ursachen haben: -* You are attempting to install a preview release and did not use the --version option to specify the version. -* A package by this name was found, but it was not a .NET Core tool. -* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. -* You mistyped the name of the tool. +* Sie versuchen, eine Vorschauversion zu installieren und haben nicht die Option "--version" verwendet, um die Version anzugeben. +* Ein Paket mit diesem Namen wurde gefunden, aber es handelt sich nicht um ein .NET Core-Tool. +* Auf den erforderlichen NuGet-Feed kann nicht zugegriffen werden, möglicherweise aufgrund eines Problems mit der Internetverbindung. +* Sie haben den Namen des Tools falsch eingegeben. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.es.xlf index 537e3e3db..3dda5148d 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.es.xlf @@ -116,7 +116,7 @@ La herramienta "{1}" (versión '{2}') se instaló correctamente. Tool '{0}' failed to install. - Tool '{0}' failed to install. + No se pudo instalar la herramienta “{0}”. @@ -126,12 +126,12 @@ La herramienta "{1}" (versión '{2}') se instaló correctamente. * A package by this name was found, but it was not a .NET Core tool. * The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. * You mistyped the name of the tool. - Tool '{0}' failed to install. This failure may have been caused by: + Error al instalar la herramienta "{0}". El error puede deberse a lo siguiente: -* You are attempting to install a preview release and did not use the --version option to specify the version. -* A package by this name was found, but it was not a .NET Core tool. -* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. -* You mistyped the name of the tool. +* Está intentando instalar una versión preliminar y no usó la opción --version para especificar la versión. +* Se encontró un paquete con este nombre, pero no era una herramienta de .NET Core. +* No se puede acceder a la fuente NuGet requerida, quizá debido a un problema de conexión a Internet. +* El nombre de la herramienta no se escribió correctamente. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.fr.xlf index b6346f71c..8ed5d82dd 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.fr.xlf @@ -116,7 +116,7 @@ L'outil '{1}' (version '{2}') a été installé correctement. Tool '{0}' failed to install. - Tool '{0}' failed to install. + Impossible d'installer l'outil '{0}'. @@ -126,12 +126,12 @@ L'outil '{1}' (version '{2}') a été installé correctement. * A package by this name was found, but it was not a .NET Core tool. * The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. * You mistyped the name of the tool. - Tool '{0}' failed to install. This failure may have been caused by: + Échec d'installation de l'outil '{0}'. Causes possibles de cet échec : -* You are attempting to install a preview release and did not use the --version option to specify the version. -* A package by this name was found, but it was not a .NET Core tool. -* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. -* You mistyped the name of the tool. +* Vous essayez d'installer une préversion, mais vous n'avez pas utilisé l'option --version pour spécifier la version. +* Un package portant ce nom a été trouvé, mais il ne s'agit pas d'un outil .NET Core. +* Le flux NuGet exigé n'est pas accessible, peut-être en raison d'un problème de connexion Internet. +* Vous avez mal tapé le nom de l'outil. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf index 138b4116f..07aa83f09 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf @@ -116,7 +116,7 @@ Lo strumento '{1}' (versione '{2}') è stato installato. Tool '{0}' failed to install. - Tool '{0}' failed to install. + Non è stato possibile installare lo strumento '{0}'. @@ -126,12 +126,12 @@ Lo strumento '{1}' (versione '{2}') è stato installato. * A package by this name was found, but it was not a .NET Core tool. * The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. * You mistyped the name of the tool. - Tool '{0}' failed to install. This failure may have been caused by: + Non è stato possibile installare lo strumento '{0}'. Le cause di questo errore sono le seguenti: -* You are attempting to install a preview release and did not use the --version option to specify the version. -* A package by this name was found, but it was not a .NET Core tool. -* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. -* You mistyped the name of the tool. +* Si sta provando a installare una versione precedente e non è stata usata l'opzione --version per specificare la versione. +* È stato trovato un pacchetto con questo nome, ma non corrisponde a uno strumento .NET Core. +* Non è possibile accedere al feed NuGet richiesto, probabilmente a causa di un problema di connessione Internet. +* Il nome dello strumento non è stato digitato correttamente. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ja.xlf index bdfdce7a7..159e18282 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ja.xlf @@ -116,7 +116,7 @@ Tool '{1}' (version '{2}') was successfully installed. Tool '{0}' failed to install. - Tool '{0}' failed to install. + ツール '{0}' をインストールできませんでした。 @@ -126,12 +126,12 @@ Tool '{1}' (version '{2}') was successfully installed. * A package by this name was found, but it was not a .NET Core tool. * The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. * You mistyped the name of the tool. - Tool '{0}' failed to install. This failure may have been caused by: + ツール '{0}' のインストールに失敗しました。この失敗は次の原因で生じた可能性があります。 -* You are attempting to install a preview release and did not use the --version option to specify the version. -* A package by this name was found, but it was not a .NET Core tool. -* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. -* You mistyped the name of the tool. +* プレビュー リリースをインストールしようとしており、--version オプションを使用してバージョンを指定しなかった。 +* この名前のパッケージが見つかったが、.NET Core ツールではなかった。 +* 恐らくインターネットの接続の問題で、必須の NuGet フィードにアクセスできない。 +* ツールの名前のタイプミス。 diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ko.xlf index 0a4912feb..7c9360df3 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ko.xlf @@ -116,7 +116,7 @@ Tool '{1}' (version '{2}') was successfully installed. Tool '{0}' failed to install. - Tool '{0}' failed to install. + '{0}' 도구를 설치하지 못했습니다. @@ -126,12 +126,12 @@ Tool '{1}' (version '{2}') was successfully installed. * A package by this name was found, but it was not a .NET Core tool. * The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. * You mistyped the name of the tool. - Tool '{0}' failed to install. This failure may have been caused by: + '{0}' 도구를 설치하지 못했습니다. 다음과 같은 이유 때문일 수 있습니다. -* You are attempting to install a preview release and did not use the --version option to specify the version. -* A package by this name was found, but it was not a .NET Core tool. -* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. -* You mistyped the name of the tool. +* 미리 보기 릴리스를 설치하려고 하는데 --version 옵션을 사용하여 버전을 지정하지 않았습니다. +* 이 이름으로 패키지가 검색되었지만 .NET Core 도구가 아니었습니다. +* 아마도 인터넷 연결 문제 때문에 필요한 NuGet 피드에 액세스할 수 없습니다. +* 도구 이름을 잘못 입력했습니다. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pl.xlf index 2749cc7b6..5bfb36173 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pl.xlf @@ -116,7 +116,7 @@ Pomyślnie zainstalowano narzędzie „{1}” (wersja: „{2}”). Tool '{0}' failed to install. - Tool '{0}' failed to install. + Zainstalowanie narzędzia „{0}” nie powiodło się. @@ -126,12 +126,12 @@ Pomyślnie zainstalowano narzędzie „{1}” (wersja: „{2}”). * A package by this name was found, but it was not a .NET Core tool. * The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. * You mistyped the name of the tool. - Tool '{0}' failed to install. This failure may have been caused by: + Zainstalowanie narzędzia „{0}” nie powiodło się. To niepowodzenie może wynikać z następujących powodów: -* You are attempting to install a preview release and did not use the --version option to specify the version. -* A package by this name was found, but it was not a .NET Core tool. -* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. -* You mistyped the name of the tool. +* Próbujesz zainstalować wersję zapoznawczą bez użycia opcji --version do określenia wersji. +* Znaleziono pakiet o tej nazwie, ale nie było to narzędzie .NET Core. +* Nie można uzyskać dostępu do wymaganego kanału informacyjnego NuGet, być może ze względu na problemy z połączeniem z Internetem. +* Błędnie wpisano nazwę narzędzia. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf index 01b134248..e223a798d 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf @@ -116,7 +116,7 @@ A ferramenta '{1}' (versão '{2}') foi instalada com êxito. Tool '{0}' failed to install. - Tool '{0}' failed to install. + Não foi possível instalar a ferramenta '{0}'. @@ -126,12 +126,12 @@ A ferramenta '{1}' (versão '{2}') foi instalada com êxito. * A package by this name was found, but it was not a .NET Core tool. * The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. * You mistyped the name of the tool. - Tool '{0}' failed to install. This failure may have been caused by: + A ferramenta '{0}' falhou ao ser instalada. Essa falha pode ter sido causada pelos seguintes motivos: -* You are attempting to install a preview release and did not use the --version option to specify the version. -* A package by this name was found, but it was not a .NET Core tool. -* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. -* You mistyped the name of the tool. +* Você está tentando instalar uma versão prévia e não usou a opção --version para especificar a versão. +* Um pacote com esse nome foi encontrado, mas ele não era uma ferramenta do .NET Core. +* O feed do NuGet necessário não pode ser acessado, talvez devido a um problema de conexão com a Internet. +* Você digitou errado o nome da ferramenta. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf index 8bff7722b..74949b98d 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf @@ -116,7 +116,7 @@ Tool '{1}' (version '{2}') was successfully installed. Tool '{0}' failed to install. - Tool '{0}' failed to install. + Не удалось установить инструмент "{0}". @@ -126,12 +126,12 @@ Tool '{1}' (version '{2}') was successfully installed. * A package by this name was found, but it was not a .NET Core tool. * The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. * You mistyped the name of the tool. - Tool '{0}' failed to install. This failure may have been caused by: + Не удалось установить средство "{0}". Возможные причины сбоя: -* You are attempting to install a preview release and did not use the --version option to specify the version. -* A package by this name was found, but it was not a .NET Core tool. -* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. -* You mistyped the name of the tool. +* Вы пытаетесь установить предварительный выпуск и не указали версию с помощью параметра --version. +* Пакет с таким именем найден, но он не является средством .NET Core. +* Недоступен требуемый веб-канал NuGet, возможно, из-за проблемы с подключением к Интернету. +* Неправильно введено имя средства. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.tr.xlf index 5ca51e1a4..3c9071c1b 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.tr.xlf @@ -116,7 +116,7 @@ Tool '{1}' (version '{2}') was successfully installed. Tool '{0}' failed to install. - Tool '{0}' failed to install. + '{0}' aracı yüklenemedi. @@ -126,12 +126,12 @@ Tool '{1}' (version '{2}') was successfully installed. * A package by this name was found, but it was not a .NET Core tool. * The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. * You mistyped the name of the tool. - Tool '{0}' failed to install. This failure may have been caused by: + '{0}' aracı yüklenemedi. Bu sorun şunlardan kaynaklanıyor olabilir: -* You are attempting to install a preview release and did not use the --version option to specify the version. -* A package by this name was found, but it was not a .NET Core tool. -* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. -* You mistyped the name of the tool. +* Bir önizleme sürümünü yüklemeye çalışmış ancak sürümü belirtmek için --version seçeneğini kullanmamış olabilirsiniz. +* Bu ada sahip bir paket bulunmuş olabilir, ancak bu paket bir .NET Core aracı olmayabilir. +* Olası bir İnternet bağlantısı sorunundan dolayı gerekli NuGet akışına erişilemiyor olabilir. +* Aracın adını yanlış yazmış olabilirsiniz. diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf index 8f097454d..9f922989a 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf @@ -116,7 +116,7 @@ Tool '{1}' (version '{2}') was successfully installed. Tool '{0}' failed to install. - Tool '{0}' failed to install. + 工具“{0}”安装失败。 @@ -126,12 +126,12 @@ Tool '{1}' (version '{2}') was successfully installed. * A package by this name was found, but it was not a .NET Core tool. * The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. * You mistyped the name of the tool. - Tool '{0}' failed to install. This failure may have been caused by: + 工具 "{0}" 安装失败。此故障可能由于: -* You are attempting to install a preview release and did not use the --version option to specify the version. -* A package by this name was found, but it was not a .NET Core tool. -* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. -* You mistyped the name of the tool. +* 你尝试安装预览版，但没有使用 --version 选项来指定该版本。 +* 已按此名称找到包，但是没有 .NET Core 工具。 +* 无法访问所需 NuGet 源，可能是由于 Internet 连接问题。 +* 工具名称输入错误。 diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf index 65c5b605d..27bbea0bf 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf @@ -116,7 +116,7 @@ Tool '{1}' (version '{2}') was successfully installed. Tool '{0}' failed to install. - Tool '{0}' failed to install. + 工具 '{0}' 無法安裝。 @@ -126,12 +126,12 @@ Tool '{1}' (version '{2}') was successfully installed. * A package by this name was found, but it was not a .NET Core tool. * The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. * You mistyped the name of the tool. - Tool '{0}' failed to install. This failure may have been caused by: + 工具 '{0}' 無法安裝。此失敗原因可能是因為: -* You are attempting to install a preview release and did not use the --version option to specify the version. -* A package by this name was found, but it was not a .NET Core tool. -* The required NuGet feed cannot be accessed, perhaps because of an Internet connection problem. -* You mistyped the name of the tool. +* 您嘗試要安裝預覽版，但並未使用 --version 選項來指定版本。 +* 找到此名稱的套件，但其並非為 .NET Core 工具。 +* 無法存取必要的 NuGet 摘要，可能是因為網際網路連線發生問題。 +* 您打錯了工具的名稱。 diff --git a/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.cs.xlf index 0f2e8a2dd..3af41888b 100644 --- a/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.cs.xlf @@ -49,7 +49,7 @@ Tool path '{0}' does not exist. - Tool path '{0}' does not exist. + Cesta k nástroji {0} neexistuje. diff --git a/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.de.xlf index 05655ea5b..bbbedcf81 100644 --- a/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.de.xlf @@ -49,7 +49,7 @@ Tool path '{0}' does not exist. - Tool path '{0}' does not exist. + Der Toolpfad "{0}" ist nicht vorhanden. diff --git a/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.es.xlf index 1b7aa7428..32fc1407b 100644 --- a/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.es.xlf @@ -49,7 +49,7 @@ Tool path '{0}' does not exist. - Tool path '{0}' does not exist. + La ruta de acceso de la herramienta "{0}" no existe. diff --git a/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.fr.xlf index c535c27fe..dc4abdd6d 100644 --- a/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.fr.xlf @@ -49,7 +49,7 @@ Tool path '{0}' does not exist. - Tool path '{0}' does not exist. + Le chemin d'outil '{0}' n'existe pas. diff --git a/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.it.xlf index 18a85501d..1ccddbb30 100644 --- a/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.it.xlf @@ -49,7 +49,7 @@ Tool path '{0}' does not exist. - Tool path '{0}' does not exist. + Il percorso '{0}' dello strumento non esiste. diff --git a/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.ja.xlf index c08b5cd76..4e477d301 100644 --- a/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.ja.xlf @@ -49,7 +49,7 @@ Tool path '{0}' does not exist. - Tool path '{0}' does not exist. + ツール パス '{0}' は存在しません。 diff --git a/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.ko.xlf index 6ded96f2d..021a479be 100644 --- a/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.ko.xlf @@ -49,7 +49,7 @@ Tool path '{0}' does not exist. - Tool path '{0}' does not exist. + '{0}' 도구 경로가 없습니다. diff --git a/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.pl.xlf index 18ea77f3a..4ac4a3430 100644 --- a/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.pl.xlf @@ -49,7 +49,7 @@ Tool path '{0}' does not exist. - Tool path '{0}' does not exist. + Ścieżka narzędzia „{0}” nie istnieje. diff --git a/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.pt-BR.xlf index a8eb0e97b..b8cccb5b4 100644 --- a/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.pt-BR.xlf @@ -49,7 +49,7 @@ Tool path '{0}' does not exist. - Tool path '{0}' does not exist. + O caminho da ferramenta '{0}' não existe. diff --git a/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.ru.xlf index d0f72ee12..36d630a1f 100644 --- a/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.ru.xlf @@ -49,7 +49,7 @@ Tool path '{0}' does not exist. - Tool path '{0}' does not exist. + Путь к средству "{0}" не существует. diff --git a/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.tr.xlf index c59f88b3d..2fc430b4a 100644 --- a/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.tr.xlf @@ -49,7 +49,7 @@ Tool path '{0}' does not exist. - Tool path '{0}' does not exist. + '{0}' araç yolu yok. diff --git a/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.zh-Hans.xlf index 872d288bd..4134f1625 100644 --- a/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.zh-Hans.xlf @@ -49,7 +49,7 @@ Tool path '{0}' does not exist. - Tool path '{0}' does not exist. + 工具路径“{0}”不存在。 diff --git a/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.zh-Hant.xlf index fc05c1a44..6a35a44bf 100644 --- a/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-tool/list/xlf/LocalizableStrings.zh-Hant.xlf @@ -49,7 +49,7 @@ Tool path '{0}' does not exist. - Tool path '{0}' does not exist. + 工具路徑 {0} 不存在。 diff --git a/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.cs.xlf index 254299704..a15ef16c7 100644 --- a/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.cs.xlf @@ -64,7 +64,7 @@ Tool path '{0}' does not exist. - Tool path '{0}' does not exist. + Cesta k nástroji {0} neexistuje. diff --git a/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.de.xlf index 9780248b3..eb9aa4a23 100644 --- a/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.de.xlf @@ -64,7 +64,7 @@ Tool path '{0}' does not exist. - Tool path '{0}' does not exist. + Der Toolpfad "{0}" ist nicht vorhanden. diff --git a/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.es.xlf index 7bde007ee..74fa8d32c 100644 --- a/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.es.xlf @@ -64,7 +64,7 @@ Tool path '{0}' does not exist. - Tool path '{0}' does not exist. + La ruta de acceso de la herramienta "{0}" no existe. diff --git a/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.fr.xlf index 36b2c4c49..09a31745d 100644 --- a/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.fr.xlf @@ -64,7 +64,7 @@ Tool path '{0}' does not exist. - Tool path '{0}' does not exist. + Le chemin d'outil '{0}' n'existe pas. diff --git a/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.it.xlf index d1121f0e8..8c6d839ed 100644 --- a/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.it.xlf @@ -64,7 +64,7 @@ Tool path '{0}' does not exist. - Tool path '{0}' does not exist. + Il percorso '{0}' dello strumento non esiste. diff --git a/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.ja.xlf index b3941451b..7254a3776 100644 --- a/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.ja.xlf @@ -64,7 +64,7 @@ Tool path '{0}' does not exist. - Tool path '{0}' does not exist. + ツール パス '{0}' は存在しません。 diff --git a/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.ko.xlf index 1062d6dd6..0a70afe86 100644 --- a/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.ko.xlf @@ -64,7 +64,7 @@ Tool path '{0}' does not exist. - Tool path '{0}' does not exist. + '{0}' 도구 경로가 없습니다. diff --git a/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.pl.xlf index 45f1ce54c..bc8c3985b 100644 --- a/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.pl.xlf @@ -64,7 +64,7 @@ Tool path '{0}' does not exist. - Tool path '{0}' does not exist. + Ścieżka narzędzia „{0}” nie istnieje. diff --git a/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.pt-BR.xlf index 1b1812b6e..836dc4373 100644 --- a/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.pt-BR.xlf @@ -64,7 +64,7 @@ Tool path '{0}' does not exist. - Tool path '{0}' does not exist. + O caminho da ferramenta '{0}' não existe. diff --git a/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.ru.xlf index 22d3f2f78..d6d3644db 100644 --- a/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.ru.xlf @@ -64,7 +64,7 @@ Tool path '{0}' does not exist. - Tool path '{0}' does not exist. + Путь к средству "{0}" не существует. diff --git a/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.tr.xlf index 1ec1ca504..60f4c22fe 100644 --- a/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.tr.xlf @@ -64,7 +64,7 @@ Tool path '{0}' does not exist. - Tool path '{0}' does not exist. + '{0}' araç yolu yok. diff --git a/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.zh-Hans.xlf index c6cc3cca5..fe4e6fc59 100644 --- a/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.zh-Hans.xlf @@ -64,7 +64,7 @@ Tool path '{0}' does not exist. - Tool path '{0}' does not exist. + 工具路径“{0}”不存在。 diff --git a/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.zh-Hant.xlf index 5547a3c7c..4753af513 100644 --- a/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-tool/uninstall/xlf/LocalizableStrings.zh-Hant.xlf @@ -64,7 +64,7 @@ Tool path '{0}' does not exist. - Tool path '{0}' does not exist. + 工具路徑 {0} 不存在。 diff --git a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.cs.xlf index 396e272aa..796a721fd 100644 --- a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.cs.xlf @@ -9,7 +9,7 @@ Install or work with tools that extend the .NET experience. - Upravte nástroje. + Instaluje nástroje, které rozšiřují prostředí .NET, nebo s nimi pracuje. diff --git a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.de.xlf index e7f8c2616..752b52549 100644 --- a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.de.xlf @@ -9,7 +9,7 @@ Install or work with tools that extend the .NET experience. - Hiermit werden Tools geändert. + Installation oder Arbeit mit Tools zum Erweitern der .NET-Benutzeroberfläche. diff --git a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.es.xlf index a7a068329..0d1b592f7 100644 --- a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.es.xlf @@ -9,7 +9,7 @@ Install or work with tools that extend the .NET experience. - Modifica herramientas. + Instale o trabaje con herramientas que mejoran la experiencia de uso de .NET. diff --git a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.fr.xlf index 309ab9588..e6cbd1b3d 100644 --- a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.fr.xlf @@ -9,7 +9,7 @@ Install or work with tools that extend the .NET experience. - Modifier les outils. + Installez ou utilisez des outils qui étendent l'expérience .NET. diff --git a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.it.xlf index 1e2d30ee4..08f3917f9 100644 --- a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.it.xlf @@ -9,7 +9,7 @@ Install or work with tools that extend the .NET experience. - Modifica gli strumenti. + Consente di installare o usare strumenti che estendono l'esperienza .NET. diff --git a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ja.xlf index 0def28031..0b8099132 100644 --- a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ja.xlf @@ -9,7 +9,7 @@ Install or work with tools that extend the .NET experience. - ツールを変更します。 + .NET のエクスペリエンスを向上するツールをインストールするか、使用します。 diff --git a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ko.xlf index bde48abef..17163584b 100644 --- a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ko.xlf @@ -9,7 +9,7 @@ Install or work with tools that extend the .NET experience. - 도구를 수정합니다. + .NET 환경을 확장하는 도구를 설치하거나 도구로 작업합니다. diff --git a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.pl.xlf index a5476ed4c..87770d2c9 100644 --- a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.pl.xlf @@ -9,7 +9,7 @@ Install or work with tools that extend the .NET experience. - Zmodyfikuj narzędzia. + Zainstaluj lub pracuj z narzędziami, które rozszerzają środowisko .NET. diff --git a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.pt-BR.xlf index 2351d96dc..6bc92a318 100644 --- a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.pt-BR.xlf @@ -9,7 +9,7 @@ Install or work with tools that extend the .NET experience. - Modificar ferramentas. + Instale ou trabalhe com as ferramentas que ampliam a experiência do .NET. diff --git a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ru.xlf index 5553fc8e7..7b3910ed2 100644 --- a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.ru.xlf @@ -9,7 +9,7 @@ Install or work with tools that extend the .NET experience. - Средства для изменения. + Установка и использование средств, расширяющих возможности .NET. diff --git a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.tr.xlf index 8e3a47ac9..7be496437 100644 --- a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.tr.xlf @@ -9,7 +9,7 @@ Install or work with tools that extend the .NET experience. - Araçları değiştirir. + .NET deneyiminizi genişleten araçları yükleyin veya bu araçlarla çalışın. diff --git a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.zh-Hans.xlf index a9b15f580..89e9c9911 100644 --- a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.zh-Hans.xlf @@ -9,7 +9,7 @@ Install or work with tools that extend the .NET experience. - 修改工具。 + 安装或使用扩展 .NET 体验的工具。 diff --git a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.zh-Hant.xlf index 016929c9d..06c369939 100644 --- a/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-tool/xlf/LocalizableStrings.zh-Hant.xlf @@ -9,7 +9,7 @@ Install or work with tools that extend the .NET experience. - 修改工具。 + 安裝或使用可擴充 .NET 體驗的工具。 diff --git a/src/dotnet/xlf/CommonLocalizableStrings.cs.xlf b/src/dotnet/xlf/CommonLocalizableStrings.cs.xlf index 9473052f4..021f1734e 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.cs.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.cs.xlf @@ -865,32 +865,32 @@ setx PATH "%PATH%;{0}" Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. - Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + Verze formátu je vyšší, než se podporuje. Tento nástroj možná není v této verzi SDK podporovaný. Aktualizujte sadu SDK. Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. - Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + Verze formátu je chybně vytvořená. Tento nástroj možná není v této verzi SDK podporovaný. Kontaktujte prosím autora nástroje. Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. - Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + Verze formátu chybí. Tento nástroj možná není v této verzi SDK podporovaný. Kontaktujte prosím autora nástroje. Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'. - Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'. + Nepovedlo se přidat adresář {0} do proměnné prostředí PATH. Přidejte prosím tento adresář do proměnné PATH, abyste mohli používat nástroje nainstalované pomocí dotnet tool install. More than one packaged shim is available: {0}. - More than one packaged shim is available: {0}. + Je k dispozici více než jedno zabalené překrytí: {0}. Failed to read NuGet LockFile for tool package '{0}': {1} - Failed to read NuGet LockFile for tool package '{0}': {1} + Nepovedlo se přečíst soubor LockFile NuGet pro balíček nástroje {0}: {1} diff --git a/src/dotnet/xlf/CommonLocalizableStrings.de.xlf b/src/dotnet/xlf/CommonLocalizableStrings.de.xlf index 03b47041d..303309eca 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.de.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.de.xlf @@ -865,32 +865,32 @@ setx PATH "%PATH%;{0}" Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. - Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + Die Formatversion ist höher als unterstützt. Dieses Tool wird in dieser SDK-Version möglicherweise nicht unterstützt. Aktualisieren Sie Ihr SDK. Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. - Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + Die Formatversion ist fehlerhaft. Dieses Tool wird in dieser SDK-Version möglicherweise nicht unterstützt. Wenden Sie sich an den Autor des Tools. Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. - Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + Die Formatversion fehlt. Dieses Tool wird in dieser SDK-Version möglicherweise nicht unterstützt. Wenden Sie sich an den Autor des Tools. Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'. - Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'. + Fehler beim Hinzufügen von "{0}" zur PATH-Umgebungsvariable. Fügen Sie dieses Verzeichnis Ihrem PATH hinzu, um mit "dotnet tool install" installierte Tools zu verwenden. More than one packaged shim is available: {0}. - More than one packaged shim is available: {0}. + Mehr als ein paketierter Shim verfügbar: {0}. Failed to read NuGet LockFile for tool package '{0}': {1} - Failed to read NuGet LockFile for tool package '{0}': {1} + Fehler beim Lesen von NuGet-LockFile für Toolpaket "{0}": {1} diff --git a/src/dotnet/xlf/CommonLocalizableStrings.es.xlf b/src/dotnet/xlf/CommonLocalizableStrings.es.xlf index c8c0911e8..7ee34a8d7 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.es.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.es.xlf @@ -865,32 +865,32 @@ setx PATH "%PATH%;{0}" Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. - Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + La versión de formato es superior a la admitida. Puede que la herramienta no sea compatible con esta versión del SDK. Actualice el SDK. Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. - Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + La versión de formato es incorrecta. Puede que la herramienta no sea compatible con esta versión del SDK. Póngase en contacto con el autor de la herramienta. Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. - Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + Falta la versión de formato. Puede que la herramienta no sea compatible con esta versión del SDK. Póngase en contacto con el autor de la herramienta. Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'. - Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'. + No se pudo agregar "{0}" a la variable de entorno PATH. Agregue este directorio a PATH para usar las herramientas instaladas con "dotnet tool install". More than one packaged shim is available: {0}. - More than one packaged shim is available: {0}. + Hay más de una opción de correcciones de compatibilidad (shim) empaquetadas: {0}. Failed to read NuGet LockFile for tool package '{0}': {1} - Failed to read NuGet LockFile for tool package '{0}': {1} + No se pudo leer LockFile de NuGet para el paquete de herramientas "{0}": {1} diff --git a/src/dotnet/xlf/CommonLocalizableStrings.fr.xlf b/src/dotnet/xlf/CommonLocalizableStrings.fr.xlf index 43e95fb8a..cb792b78f 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.fr.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.fr.xlf @@ -865,32 +865,32 @@ setx PATH "%PATH%;{0}" Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. - Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + Version de format supérieure à la version prise en charge. Cet outil risque de ne pas être pris en charge dans cette version du kit SDK. Mettez à jour votre kit SDK. Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. - Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + Version de format incorrecte. Cet outil risque de ne pas être pris en charge dans cette version du kit SDK. Contactez l'auteur de l'outil. Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. - Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + Version de format manquante. Cet outil risque de ne pas être pris en charge dans cette version du kit SDK. Contactez l'auteur de l'outil. Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'. - Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'. + Échec de l'ajout de '{0}' à la variable d'environnement PATH. Ajoutez ce répertoire à votre variable PATH pour pouvoir utiliser les outils installés avec 'dotnet tool install'. More than one packaged shim is available: {0}. - More than one packaged shim is available: {0}. + Plusieurs shims empaquetés sont disponibles : {0}. Failed to read NuGet LockFile for tool package '{0}': {1} - Failed to read NuGet LockFile for tool package '{0}': {1} + Échec de la lecture du LockFile NuGet pour le package d'outils '{0}' : {1} diff --git a/src/dotnet/xlf/CommonLocalizableStrings.it.xlf b/src/dotnet/xlf/CommonLocalizableStrings.it.xlf index b43b0b1d5..33f7d916e 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.it.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.it.xlf @@ -865,32 +865,32 @@ setx PATH "%PATH%;{0}" Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. - Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + La versione di Format è successiva a quella supportata. È possibile che questo strumento non sia supportato in questa versione dell'SDK. Aggiornare l'SDK. Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. - Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + La versione di Format non è corretta. È possibile che questo strumento non sia supportata in questa versione dell'SDK. Contattare l'autore dello strumento. Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. - Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + La versione di Format non è presente. È possibile che questo strumento non sia supportata in questa versione dell'SDK. Contattare l'autore dello strumento. Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'. - Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'. + Non è stato possibile aggiungere '{0}' alla variabile di ambiente PATH. Aggiungere questa directory a PATH per usare gli strumenti installati con 'dotnet tool install'. More than one packaged shim is available: {0}. - More than one packaged shim is available: {0}. + Sono disponibili più shim inclusi nel pacchetto: {0}. Failed to read NuGet LockFile for tool package '{0}': {1} - Failed to read NuGet LockFile for tool package '{0}': {1} + Non è stato possibile leggere il file di blocco NuGet per il pacchetto di strumenti '{0}': {1} diff --git a/src/dotnet/xlf/CommonLocalizableStrings.ja.xlf b/src/dotnet/xlf/CommonLocalizableStrings.ja.xlf index e3d32cdc9..cf6e73b93 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.ja.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.ja.xlf @@ -865,32 +865,32 @@ setx PATH "%PATH%;{0}" Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. - Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + 形式のバージョンがサポートされているものを超えています。このツールはこのバージョンの SDK ではサポートされていない可能性があります。SDK を更新してください。 Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. - Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + 形式のバージョンが無効です。このツールはこのバージョンの SDK ではサポートされていない可能性があります。ツールの作成者にお問い合わせください。 Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. - Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + 形式のバージョンが見つかりません。このツールはこのバージョンの SDK ではサポートされていない可能性があります。ツールの作成者にお問い合わせください。 Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'. - Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'. + '{0}' を PATH 環境変数に追加できませんでした。'dotnet tool install' でインストールしたツールを使用するには、このディレクトリを PATH に追加してください。 More than one packaged shim is available: {0}. - More than one packaged shim is available: {0}. + 複数のパッケージ化された shim が利用可能です: {0}。 Failed to read NuGet LockFile for tool package '{0}': {1} - Failed to read NuGet LockFile for tool package '{0}': {1} + ツール パッケージ '{0}' の NuGet LockFile の読み取りに失敗しました: {1} diff --git a/src/dotnet/xlf/CommonLocalizableStrings.ko.xlf b/src/dotnet/xlf/CommonLocalizableStrings.ko.xlf index 8c4afc359..dc21b37d0 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.ko.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.ko.xlf @@ -865,32 +865,32 @@ setx PATH "%PATH%;{0}" Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. - Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + 형식 버전이 지원되는 버전보다 높습니다. 이 도구는 이 SDK 버전을 지원하지 않을 수 있습니다. SDK를 업데이트하세요. Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. - Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + 형식 버전의 형식이 잘못되었습니다. 이 도구는 이 SDK 버전을 지원하지 않을 수 있습니다. 도구 작성자에게 문의하세요. Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. - Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + 형식 버전이 누락되었습니다. 이 도구는 이 SDK 버전을 지원하지 않을 수 있습니다. 도구 작성자에게 문의하세요. Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'. - Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'. + PATH 환경 변수에 '{0}'을(를) 추가하지 못했습니다. 'dotnet tool install'로 설치한 도구를 사용하려면 이 디렉터리를 PATH에 추가하세요. More than one packaged shim is available: {0}. - More than one packaged shim is available: {0}. + 패키지된 shim을 하나 이상 사용할 수 있습니다. {0} Failed to read NuGet LockFile for tool package '{0}': {1} - Failed to read NuGet LockFile for tool package '{0}': {1} + '{0}' 도구 패키지의 NuGet LockFile을 읽지 못했습니다. {1} diff --git a/src/dotnet/xlf/CommonLocalizableStrings.pl.xlf b/src/dotnet/xlf/CommonLocalizableStrings.pl.xlf index 0639e425c..12abceba6 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.pl.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.pl.xlf @@ -865,32 +865,32 @@ setx PATH "%PATH%;{0}" Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. - Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + Wersja formatu jest nowsza niż obsługiwana. To narzędzie może nie być obsługiwane w tej wersji zestawu SDK. Zaktualizuj zestaw SDK. Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. - Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + Wersja formatu jest nieprawidłowo sformułowana. To narzędzie może nie być obsługiwane w tej wersji zestawu SDK. Skontaktuj się z autorem narzędzia. Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. - Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + Brak wersji formatu. To narzędzie może nie być obsługiwane w tej wersji zestawu SDK. Skontaktuj się z autorem narzędzia. Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'. - Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'. + Nie można dodać katalogu „{0}” do zmiennej środowiskowej PATH. Dodaj ten katalog do zmiennej PATH, aby używać narzędzi zainstalowanych za pomocą polecenia „dotnet tool install”. More than one packaged shim is available: {0}. - More than one packaged shim is available: {0}. + Dostępna jest więcej niż jedna spakowana podkładka: {0}. Failed to read NuGet LockFile for tool package '{0}': {1} - Failed to read NuGet LockFile for tool package '{0}': {1} + Nie można odczytać pliku blokady NuGet dla pakietu narzędzia „{0}”: {1} diff --git a/src/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf b/src/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf index 224b88af3..3e0130f23 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf @@ -865,32 +865,32 @@ setx PATH "%PATH%;{0}" Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. - Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + A versão do formato é superior à versão compatível. Esta ferramenta pode não ser compatível com esta versão do SDK. Atualize o SDK. Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. - Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + A versão do formato está malformada. Esta ferramenta pode não ser compatível com esta versão do SDK. Contate o autor da ferramenta. Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. - Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + A versão do formato está ausente. Esta ferramenta pode não ser compatível com esta versão do SDK. Contate o autor da ferramenta. Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'. - Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'. + Falha ao adicionar '{0}' à variável de ambiente PATH. Adicione este diretório em PATH para usar as ferramentas instaladas com 'dotnet tool install'. More than one packaged shim is available: {0}. - More than one packaged shim is available: {0}. + Há mais de um shim empacotado disponível: {0}. Failed to read NuGet LockFile for tool package '{0}': {1} - Failed to read NuGet LockFile for tool package '{0}': {1} + Falha ao ler o LockFile do NuGet para o pacote da ferramenta '{0}': {1} diff --git a/src/dotnet/xlf/CommonLocalizableStrings.ru.xlf b/src/dotnet/xlf/CommonLocalizableStrings.ru.xlf index e0ad9f276..2a6abaf63 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.ru.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.ru.xlf @@ -865,32 +865,32 @@ setx PATH "%PATH%;{0}" Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. - Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + Версия формата выше поддерживаемой. Средство не поддерживается в этой версии пакета SDK. Обновите пакет SDK. Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. - Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + Версия формата имеет неправильный формат. Средство не поддерживается в этой версии пакета SDK. Обратитесь к автору средства. Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. - Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + Версия формата отсутствует. Средство не поддерживается в этой версии пакета SDK. Обратитесь к автору средства. Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'. - Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'. + Не удалось добавить "{0}" в переменную среды PATH. Добавьте этот каталог в PATH, чтобы использовать средства, установленные с помощью команды dotnet tool install. More than one packaged shim is available: {0}. - More than one packaged shim is available: {0}. + Доступно несколько упакованных оболочек совместимости: {0}. Failed to read NuGet LockFile for tool package '{0}': {1} - Failed to read NuGet LockFile for tool package '{0}': {1} + Не удалось прочитать файл блокировки NuGet для пакета средства "{0}": {1} diff --git a/src/dotnet/xlf/CommonLocalizableStrings.tr.xlf b/src/dotnet/xlf/CommonLocalizableStrings.tr.xlf index df3d20357..c6ff623dc 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.tr.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.tr.xlf @@ -865,32 +865,32 @@ setx PATH "%PATH%;{0}" Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. - Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + Biçim sürümü desteklenenden daha yüksek. Bu araç bu SDK sürümünde desteklenmeyebilir. Lütfen SDK’nızı güncelleştirin. Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. - Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + Biçim sürümü hatalı biçimlendirilmiş. Bu araç bu SDK sürümünde desteklenmeyebilir. Lütfen aracın yazarı ile iletişim kurun. Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. - Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + Biçim sürümü eksik. Bu araç bu SDK sürümünde desteklenmeyebilir. Lütfen aracın yazarı ile iletişim kurun. Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'. - Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'. + PATH ortam tablosuna '{0}' eklenemedi. 'dotnet tool install' ile yüklenen araçları kullanmak için lütfen bu dizini PATH ortamınıza ekleyin. More than one packaged shim is available: {0}. - More than one packaged shim is available: {0}. + Birden fazla paketlenmiş dolgu var: {0}. Failed to read NuGet LockFile for tool package '{0}': {1} - Failed to read NuGet LockFile for tool package '{0}': {1} + '{0}' araç paketi için NuGet LockFile okunamadı: {1} diff --git a/src/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf b/src/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf index 90edcbf9a..63c1fd6f8 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf @@ -865,32 +865,32 @@ setx PATH "%PATH%;{0}" Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. - Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + 格式版本高于受支持的版本。该 SDK 版本可能不支持此工具。请更新 SDK。 Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. - Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + 格式版本格式不正确。该 SDK 版本可能不支持此工具。请联系工具作者。 Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. - Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + 格式版本缺失。该 SDK 版本可能不支持此工具。请联系工具作者。 Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'. - Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'. + 未能将“{0}”添加到 PATH 环境变量。请将此目录添加到 PATH，以使用通过“dotnet tool install”安装的工具。 More than one packaged shim is available: {0}. - More than one packaged shim is available: {0}. + 多个包装填充码可用: {0}。 Failed to read NuGet LockFile for tool package '{0}': {1} - Failed to read NuGet LockFile for tool package '{0}': {1} + 未能读取工具包“{0}”的 NuGet LockFile: {1} diff --git a/src/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf b/src/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf index d4ee5114f..147030433 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf @@ -865,32 +865,32 @@ setx PATH "%PATH%;{0}" Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. - Format version is higher than supported. This tool may not be supported in this SDK version. Please update your SDK. + 格式版本高於支援的版本。此 SDK 版本可能不支援這項工具。請更新您的 SDK。 Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. - Format version is malformed. This tool may not be supported in this SDK version. Please contact the author of the tool. + 格式版本的格式不正確。此 SDK 可能不支援這項工具。請連絡工作的作者。 Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. - Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool. + 缺少格式版本。此 SDK 可能不支援這項工具。請連絡工作的作者。 Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'. - Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'. + 無法將 '{0}' 新增到 PATH 環境變數。請將此目錄新增到您的 PATH，以使用 'dotnet tool install' 所安裝的工具。 More than one packaged shim is available: {0}. - More than one packaged shim is available: {0}. + 有多個經過封裝的填充碼可用: {0}。 Failed to read NuGet LockFile for tool package '{0}': {1} - Failed to read NuGet LockFile for tool package '{0}': {1} + 無法讀取工具套件 '{0}' 的 NuGet LockFile: {1} From b0c5fddc04c8a2b5803718d7906eae41923d8304 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 30 Apr 2018 17:49:09 -0700 Subject: [PATCH 106/118] Add a property to disable bundling ASP.NET Core tools, templates, and runtimes --- build/BundledDotnetTools.props | 2 +- build/BundledRuntimes.props | 16 ++++++----- build/BundledTemplates.props | 2 ++ build/MSBuildExtensions.targets | 27 ++++++++++++++++--- .../DotnetFirstTimeUseConfigurer.cs | 6 ++++- src/dotnet/AspNetCoreCertificateGenerator.cs | 5 ++-- src/dotnet/dotnet.csproj | 7 ++++- 7 files changed, 49 insertions(+), 16 deletions(-) diff --git a/build/BundledDotnetTools.props b/build/BundledDotnetTools.props index ceb89cfd2..1df3521de 100644 --- a/build/BundledDotnetTools.props +++ b/build/BundledDotnetTools.props @@ -1,5 +1,5 @@ - + diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index c2876983b..45234b98b 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -55,13 +55,6 @@ - <_DownloadAndExtractItem Include="AspNetCoreSharedFxArchiveFile" - Condition="!Exists('$(AspNetCoreSharedFxArchiveFile)') And ( '$(AspNetCoreSharedFxArchiveRid)' == 'linux-arm' OR !$(Architecture.StartsWith('arm')) )"> - $(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion)/$(AspNetCoreSharedFxArchiveFileName)$(CoreSetupBlobAccessTokenParam) - $(AspNetCoreSharedFxArchiveFile) - $(AspNetCoreSharedFxPublishDirectory) - - <_DownloadAndExtractItem Include="CombinedSharedHostAndFrameworkArchive" Condition="!Exists('$(CombinedSharedHostAndFrameworkArchive)')"> $(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion)/$(CombinedFrameworkHostCompressedFileName)$(CoreSetupBlobAccessTokenParam) @@ -96,6 +89,15 @@ $(DownloadedHostFxrInstallerFile) + + + + <_DownloadAndExtractItem Include="AspNetCoreSharedFxArchiveFile" + Condition="!Exists('$(AspNetCoreSharedFxArchiveFile)') And ( '$(AspNetCoreSharedFxArchiveRid)' == 'linux-arm' OR !$(Architecture.StartsWith('arm')) )"> + $(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion)/$(AspNetCoreSharedFxArchiveFileName)$(CoreSetupBlobAccessTokenParam) + $(AspNetCoreSharedFxArchiveFile) + $(AspNetCoreSharedFxPublishDirectory) + <_DownloadAndExtractItem Include="DownloadedAspNetCoreSharedFxInstallerFile" Condition="'$(SkipBuildingInstallers)' != 'true' AND '$(DownloadedAspNetCoreSharedFxInstallerFile)' != '' AND !Exists($(DownloadedAspNetCoreSharedFxInstallerFile)) And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))"> diff --git a/build/BundledTemplates.props b/build/BundledTemplates.props index 1a77f6043..5334a2f5b 100644 --- a/build/BundledTemplates.props +++ b/build/BundledTemplates.props @@ -3,7 +3,9 @@ + + diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets index 67e864f1c..567c31fe4 100644 --- a/build/MSBuildExtensions.targets +++ b/build/MSBuildExtensions.targets @@ -123,7 +123,29 @@ <_AspNetCoreAppTargetFrameworkVersion>$(_AspNetCoreAllTargetFrameworkVersion) <_NETCoreSdkIsPreview Condition=" '$(DropSuffix)' == '' ">true + + + + + + + + + + + + + + + $(_NETStandardTargetFrameworkVersion) $(_NETStandardLibraryPackageVersion) $(_NETCorePlatformsPackageVersion) - $(_AspNetCoreAllTargetFrameworkVersion) - $(_AspNetCoreAllPackageVersion) - $(_AspNetCoreAppTargetFrameworkVersion) - $(_AspNetCoreAppPackageVersion) + @(BundledVersionsVariable->'<%(Identity)>%(Value)', '%0A ') $(SdkVersion) <_NETCoreSdkIsPreview>$(_NETCoreSdkIsPreview) diff --git a/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs b/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs index 966bd0d80..2cb502256 100644 --- a/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs +++ b/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs @@ -90,12 +90,16 @@ namespace Microsoft.DotNet.Configurer private bool ShouldGenerateAspNetCertificate() { +#if EXCLUDE_ASPNETCORE + return false; +#else var generateAspNetCertificate = _environmentProvider.GetEnvironmentVariableAsBool("DOTNET_GENERATE_ASPNET_CERTIFICATE", true); return ShouldRunFirstRunExperience() && generateAspNetCertificate && !_aspNetCertificateSentinel.Exists(); +#endif } private bool ShouldAddPackageExecutablePath() @@ -153,7 +157,7 @@ namespace Microsoft.DotNet.Configurer private bool ShouldRunFirstRunExperience() { - var skipFirstTimeExperience = + var skipFirstTimeExperience = _environmentProvider.GetEnvironmentVariableAsBool("DOTNET_SKIP_FIRST_TIME_EXPERIENCE", false); return !skipFirstTimeExperience; diff --git a/src/dotnet/AspNetCoreCertificateGenerator.cs b/src/dotnet/AspNetCoreCertificateGenerator.cs index d0fcf0a9a..c43a8f3ff 100644 --- a/src/dotnet/AspNetCoreCertificateGenerator.cs +++ b/src/dotnet/AspNetCoreCertificateGenerator.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 Microsoft.AspNetCore.DeveloperCertificates.XPlat; using Microsoft.DotNet.Configurer; namespace Microsoft.DotNet.Cli @@ -10,7 +9,9 @@ namespace Microsoft.DotNet.Cli { public void GenerateAspNetCoreDevelopmentCertificate() { - CertificateGenerator.GenerateAspNetHttpsCertificate(); +#if !EXCLUDE_ASPNET + Microsoft.AspNetCore.DeveloperCertificates.XPlat.CertificateGenerator.GenerateAspNetHttpsCertificate(); +#endif } } } diff --git a/src/dotnet/dotnet.csproj b/src/dotnet/dotnet.csproj index b7d26a073..b739ba700 100644 --- a/src/dotnet/dotnet.csproj +++ b/src/dotnet/dotnet.csproj @@ -9,6 +9,7 @@ true dotnet5.4 Microsoft.DotNet.Cli + $(DefineConstants);EXCLUDE_ASPNETCORE @@ -60,7 +61,6 @@ - @@ -75,6 +75,11 @@ + + + + + From faa7a7e47c5601808769ffe67f79f97cd01dcadc Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Mon, 30 Apr 2018 21:49:02 -0700 Subject: [PATCH 107/118] Fix tool package unit test to use the correct resource string. The `GivenFailedPackageInstallWhenRunWithPackageIdItShouldFail` test should match against `ToolInstallationFailedWithRestoreGuidance` and not `ToolInstallationFailed`. This passed prior to the LOC update because the former started with the latter and a "contains" match was being performed. --- .../dotnet.Tests/CommandTests/ToolInstallCommandTests.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/test/dotnet.Tests/CommandTests/ToolInstallCommandTests.cs b/test/dotnet.Tests/CommandTests/ToolInstallCommandTests.cs index 9d52af4d8..6a72ee47a 100644 --- a/test/dotnet.Tests/CommandTests/ToolInstallCommandTests.cs +++ b/test/dotnet.Tests/CommandTests/ToolInstallCommandTests.cs @@ -175,9 +175,11 @@ namespace Microsoft.DotNet.Tests.Commands [Fact] public void GivenFailedPackageInstallWhenRunWithPackageIdItShouldFail() { + const string ErrorMessage = "Simulated error"; + var toolPackageInstaller = CreateToolPackageInstaller( - installCallback: () => throw new ToolPackageException("Simulated error")); + installCallback: () => throw new ToolPackageException(ErrorMessage)); var installCommand = new ToolInstallCommand( _appliedCommand, @@ -191,8 +193,9 @@ namespace Microsoft.DotNet.Tests.Commands a.ShouldThrow().And.Message .Should().Contain( - "Simulated error" + Environment.NewLine - + string.Format(LocalizableStrings.ToolInstallationFailed, PackageId)); + ErrorMessage + + Environment.NewLine + + string.Format(LocalizableStrings.ToolInstallationFailedWithRestoreGuidance, PackageId)); _fileSystem.Directory.Exists(Path.Combine(PathToPlacePackages, PackageId)).Should().BeFalse(); } From ba68037ee6e47163c281c18b28d0afc6f409bdaf Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 1 May 2018 08:49:54 -0700 Subject: [PATCH 108/118] Do not disable bundled aspnet templates See https://github.com/dotnet/source-build/issues/456#issuecomment-385677818 --- build/BundledTemplates.props | 2 -- 1 file changed, 2 deletions(-) diff --git a/build/BundledTemplates.props b/build/BundledTemplates.props index 5334a2f5b..1a77f6043 100644 --- a/build/BundledTemplates.props +++ b/build/BundledTemplates.props @@ -3,9 +3,7 @@ - - From d681933b87835e17bee3a4cfde6f1c3746a3fe0c Mon Sep 17 00:00:00 2001 From: William Li Date: Tue, 1 May 2018 10:21:00 -0700 Subject: [PATCH 109/118] Rename --source-feed to --add-source (#9164) * Rename to add-source --- .../install/LocalizableStrings.resx | 8 ++++---- .../dotnet-tool/install/ToolInstallCommand.cs | 2 +- .../install/ToolInstallCommandParser.cs | 6 +++--- .../install/xlf/LocalizableStrings.cs.xlf | 20 +++++++++---------- .../install/xlf/LocalizableStrings.de.xlf | 20 +++++++++---------- .../install/xlf/LocalizableStrings.es.xlf | 20 +++++++++---------- .../install/xlf/LocalizableStrings.fr.xlf | 20 +++++++++---------- .../install/xlf/LocalizableStrings.it.xlf | 20 +++++++++---------- .../install/xlf/LocalizableStrings.ja.xlf | 20 +++++++++---------- .../install/xlf/LocalizableStrings.ko.xlf | 20 +++++++++---------- .../install/xlf/LocalizableStrings.pl.xlf | 20 +++++++++---------- .../install/xlf/LocalizableStrings.pt-BR.xlf | 20 +++++++++---------- .../install/xlf/LocalizableStrings.ru.xlf | 20 +++++++++---------- .../install/xlf/LocalizableStrings.tr.xlf | 20 +++++++++---------- .../xlf/LocalizableStrings.zh-Hans.xlf | 20 +++++++++---------- .../xlf/LocalizableStrings.zh-Hant.xlf | 20 +++++++++---------- .../update/LocalizableStrings.resx | 6 +++--- .../dotnet-tool/update/ToolUpdateCommand.cs | 2 +- .../update/ToolUpdateCommandParser.cs | 6 +++--- .../update/xlf/LocalizableStrings.cs.xlf | 10 +++++----- .../update/xlf/LocalizableStrings.de.xlf | 10 +++++----- .../update/xlf/LocalizableStrings.es.xlf | 10 +++++----- .../update/xlf/LocalizableStrings.fr.xlf | 10 +++++----- .../update/xlf/LocalizableStrings.it.xlf | 10 +++++----- .../update/xlf/LocalizableStrings.ja.xlf | 10 +++++----- .../update/xlf/LocalizableStrings.ko.xlf | 10 +++++----- .../update/xlf/LocalizableStrings.pl.xlf | 10 +++++----- .../update/xlf/LocalizableStrings.pt-BR.xlf | 10 +++++----- .../update/xlf/LocalizableStrings.ru.xlf | 10 +++++----- .../update/xlf/LocalizableStrings.tr.xlf | 10 +++++----- .../update/xlf/LocalizableStrings.zh-Hans.xlf | 10 +++++----- .../update/xlf/LocalizableStrings.zh-Hant.xlf | 10 +++++----- .../CommandTests/ToolInstallCommandTests.cs | 4 ++-- .../ParserTests/InstallToolParserTests.cs | 12 +++++------ .../ParserTests/UpdateToolParserTests.cs | 12 +++++------ 35 files changed, 224 insertions(+), 224 deletions(-) diff --git a/src/dotnet/commands/dotnet-tool/install/LocalizableStrings.resx b/src/dotnet/commands/dotnet-tool/install/LocalizableStrings.resx index 2f818bfe8..a0c74f9fd 100644 --- a/src/dotnet/commands/dotnet-tool/install/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-tool/install/LocalizableStrings.resx @@ -129,11 +129,11 @@ Version of the tool package in NuGet. - + Adds an additional NuGet package source to use during installation. - - SOURCE_FEED + + SOURCE Installs a tool for use on the command line. @@ -195,4 +195,4 @@ Tool '{1}' (version '{2}') was successfully installed. Location where the tool will be installed. - + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-tool/install/ToolInstallCommand.cs b/src/dotnet/commands/dotnet-tool/install/ToolInstallCommand.cs index 845644239..5dc206445 100644 --- a/src/dotnet/commands/dotnet-tool/install/ToolInstallCommand.cs +++ b/src/dotnet/commands/dotnet-tool/install/ToolInstallCommand.cs @@ -55,7 +55,7 @@ namespace Microsoft.DotNet.Tools.Tool.Install _packageVersion = appliedCommand.ValueOrDefault("version"); _configFilePath = appliedCommand.ValueOrDefault("configfile"); _framework = appliedCommand.ValueOrDefault("framework"); - _source = appliedCommand.ValueOrDefault("source-feed"); + _source = appliedCommand.ValueOrDefault("add-source"); _global = appliedCommand.ValueOrDefault("global"); _verbosity = appliedCommand.SingleArgumentOrDefault("verbosity"); _toolPath = appliedCommand.SingleArgumentOrDefault("tool-path"); diff --git a/src/dotnet/commands/dotnet-tool/install/ToolInstallCommandParser.cs b/src/dotnet/commands/dotnet-tool/install/ToolInstallCommandParser.cs index fbbe789fe..38a57d9f0 100644 --- a/src/dotnet/commands/dotnet-tool/install/ToolInstallCommandParser.cs +++ b/src/dotnet/commands/dotnet-tool/install/ToolInstallCommandParser.cs @@ -32,10 +32,10 @@ namespace Microsoft.DotNet.Cli LocalizableStrings.ConfigFileOptionDescription, Accept.ExactlyOneArgument()), Create.Option( - "--source-feed", - LocalizableStrings.SourceFeedOptionDescription, + "--add-source", + LocalizableStrings.AddSourceOptionDescription, Accept.OneOrMoreArguments() - .With(name: LocalizableStrings.SourceFeedOptionName)), + .With(name: LocalizableStrings.AddSourceOptionName)), Create.Option( "--framework", LocalizableStrings.FrameworkOptionDescription, diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf index e89bdafbd..532032ac6 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf @@ -104,16 +104,6 @@ Nástroj {1} (verze {2}) byl úspěšně nainstalován. Umístění, do kterého se nástroj nainstaluje - - Adds an additional NuGet package source to use during installation. - Přidá další zdroj balíčku NuGet, který se použije při instalaci. - - - - SOURCE_FEED - SOURCE_FEED - - Tool '{0}' failed to install. Tool '{0}' failed to install. @@ -134,6 +124,16 @@ Nástroj {1} (verze {2}) byl úspěšně nainstalován. * You mistyped the name of the tool. + + Adds an additional NuGet package source to use during installation. + Adds an additional NuGet package source to use during installation. + + + + SOURCE + SOURCE + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.de.xlf index 9e8b1bb93..a7087cc36 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.de.xlf @@ -104,16 +104,6 @@ Das Tool "{1}" (Version {2}) wurde erfolgreich installiert. Speicherort für die Installation des Tools. - - Adds an additional NuGet package source to use during installation. - Fügt eine weitere NuGet-Paketquelle zur Verwendung während der Installation hinzu. - - - - SOURCE_FEED - SOURCE_FEED - - Tool '{0}' failed to install. Tool '{0}' failed to install. @@ -134,6 +124,16 @@ Das Tool "{1}" (Version {2}) wurde erfolgreich installiert. * You mistyped the name of the tool. + + Adds an additional NuGet package source to use during installation. + Adds an additional NuGet package source to use during installation. + + + + SOURCE + SOURCE + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.es.xlf index 537e3e3db..a900646c7 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.es.xlf @@ -104,16 +104,6 @@ La herramienta "{1}" (versión '{2}') se instaló correctamente. La ubicación en la que se instalará la herramienta. - - Adds an additional NuGet package source to use during installation. - Agrega un origen de paquetes de NuGet para utilizar durante la instalación. - - - - SOURCE_FEED - SOURCE_FEED - - Tool '{0}' failed to install. Tool '{0}' failed to install. @@ -134,6 +124,16 @@ La herramienta "{1}" (versión '{2}') se instaló correctamente. * You mistyped the name of the tool. + + Adds an additional NuGet package source to use during installation. + Adds an additional NuGet package source to use during installation. + + + + SOURCE + SOURCE + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.fr.xlf index b6346f71c..b3bfe9376 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.fr.xlf @@ -104,16 +104,6 @@ L'outil '{1}' (version '{2}') a été installé correctement. Emplacement où l'outil va être installé. - - Adds an additional NuGet package source to use during installation. - Ajoute un package NuGet source supplémentaire à utiliser durant l'installation. - - - - SOURCE_FEED - SOURCE_FEED - - Tool '{0}' failed to install. Tool '{0}' failed to install. @@ -134,6 +124,16 @@ L'outil '{1}' (version '{2}') a été installé correctement. * You mistyped the name of the tool. + + Adds an additional NuGet package source to use during installation. + Adds an additional NuGet package source to use during installation. + + + + SOURCE + SOURCE + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf index 138b4116f..f0c6222b3 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf @@ -104,16 +104,6 @@ Lo strumento '{1}' (versione '{2}') è stato installato. Percorso in cui verrà installato lo strumento. - - Adds an additional NuGet package source to use during installation. - Aggiunge un'altra origine pacchetto NuGet da usare durante l'installazione. - - - - SOURCE_FEED - SOURCE_FEED - - Tool '{0}' failed to install. Tool '{0}' failed to install. @@ -134,6 +124,16 @@ Lo strumento '{1}' (versione '{2}') è stato installato. * You mistyped the name of the tool. + + Adds an additional NuGet package source to use during installation. + Adds an additional NuGet package source to use during installation. + + + + SOURCE + SOURCE + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ja.xlf index bdfdce7a7..b97610ee6 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ja.xlf @@ -104,16 +104,6 @@ Tool '{1}' (version '{2}') was successfully installed. ツールがインストールされる場所。 - - Adds an additional NuGet package source to use during installation. - インストール中に使用する他の NuGet パッケージ ソースを追加します。 - - - - SOURCE_FEED - SOURCE_FEED - - Tool '{0}' failed to install. Tool '{0}' failed to install. @@ -134,6 +124,16 @@ Tool '{1}' (version '{2}') was successfully installed. * You mistyped the name of the tool. + + Adds an additional NuGet package source to use during installation. + Adds an additional NuGet package source to use during installation. + + + + SOURCE + SOURCE + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ko.xlf index 0a4912feb..37579459d 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ko.xlf @@ -104,16 +104,6 @@ Tool '{1}' (version '{2}') was successfully installed. 도구가 설치될 위치입니다. - - Adds an additional NuGet package source to use during installation. - 설치 중 사용할 추가 NuGet 패키지 소스를 추가합니다. - - - - SOURCE_FEED - SOURCE_FEED - - Tool '{0}' failed to install. Tool '{0}' failed to install. @@ -134,6 +124,16 @@ Tool '{1}' (version '{2}') was successfully installed. * You mistyped the name of the tool. + + Adds an additional NuGet package source to use during installation. + Adds an additional NuGet package source to use during installation. + + + + SOURCE + SOURCE + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pl.xlf index 2749cc7b6..b46ea55fd 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pl.xlf @@ -104,16 +104,6 @@ Pomyślnie zainstalowano narzędzie „{1}” (wersja: „{2}”). Lokalizacja, w której narzędzie zostanie zainstalowane. - - Adds an additional NuGet package source to use during installation. - Dodaje dodatkowe źródło pakietu NuGet do użycia podczas instalacji. - - - - SOURCE_FEED - SOURCE_FEED - - Tool '{0}' failed to install. Tool '{0}' failed to install. @@ -134,6 +124,16 @@ Pomyślnie zainstalowano narzędzie „{1}” (wersja: „{2}”). * You mistyped the name of the tool. + + Adds an additional NuGet package source to use during installation. + Adds an additional NuGet package source to use during installation. + + + + SOURCE + SOURCE + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf index 01b134248..191b29287 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf @@ -104,16 +104,6 @@ A ferramenta '{1}' (versão '{2}') foi instalada com êxito. Localização em que a ferramenta será instalada. - - Adds an additional NuGet package source to use during installation. - Adiciona uma origem adicional do pacote NuGet a ser usada durante a instalação. - - - - SOURCE_FEED - SOURCE_FEED - - Tool '{0}' failed to install. Tool '{0}' failed to install. @@ -134,6 +124,16 @@ A ferramenta '{1}' (versão '{2}') foi instalada com êxito. * You mistyped the name of the tool. + + Adds an additional NuGet package source to use during installation. + Adds an additional NuGet package source to use during installation. + + + + SOURCE + SOURCE + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf index 8bff7722b..7b04d74db 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf @@ -104,16 +104,6 @@ Tool '{1}' (version '{2}') was successfully installed. Расположение для установки средства. - - Adds an additional NuGet package source to use during installation. - Добавляет дополнительный источник пакета NuGet, используемый во время установки. - - - - SOURCE_FEED - SOURCE_FEED - - Tool '{0}' failed to install. Tool '{0}' failed to install. @@ -134,6 +124,16 @@ Tool '{1}' (version '{2}') was successfully installed. * You mistyped the name of the tool. + + Adds an additional NuGet package source to use during installation. + Adds an additional NuGet package source to use during installation. + + + + SOURCE + SOURCE + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.tr.xlf index 5ca51e1a4..a6dd2363d 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.tr.xlf @@ -104,16 +104,6 @@ Tool '{1}' (version '{2}') was successfully installed. Aracın yükleneceği konum. - - Adds an additional NuGet package source to use during installation. - Yükleme sırasında kullanılacak ek bir NuGet paket kaynağı ekler. - - - - SOURCE_FEED - SOURCE_FEED - - Tool '{0}' failed to install. Tool '{0}' failed to install. @@ -134,6 +124,16 @@ Tool '{1}' (version '{2}') was successfully installed. * You mistyped the name of the tool. + + Adds an additional NuGet package source to use during installation. + Adds an additional NuGet package source to use during installation. + + + + SOURCE + SOURCE + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf index 8f097454d..a4c7cd459 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf @@ -104,16 +104,6 @@ Tool '{1}' (version '{2}') was successfully installed. 将安装工具的位置。 - - Adds an additional NuGet package source to use during installation. - 添加其他要在安装期间使用的 NuGet 包。 - - - - SOURCE_FEED - SOURCE_FEED - - Tool '{0}' failed to install. Tool '{0}' failed to install. @@ -134,6 +124,16 @@ Tool '{1}' (version '{2}') was successfully installed. * You mistyped the name of the tool. + + Adds an additional NuGet package source to use during installation. + Adds an additional NuGet package source to use during installation. + + + + SOURCE + SOURCE + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf index 65c5b605d..5a45c4762 100644 --- a/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf @@ -104,16 +104,6 @@ Tool '{1}' (version '{2}') was successfully installed. 安裝工具所在的位置。 - - Adds an additional NuGet package source to use during installation. - 新增於安裝期間要使用的額外 NuGet 套件來源。 - - - - SOURCE_FEED - SOURCE_FEED - - Tool '{0}' failed to install. Tool '{0}' failed to install. @@ -134,6 +124,16 @@ Tool '{1}' (version '{2}') was successfully installed. * You mistyped the name of the tool. + + Adds an additional NuGet package source to use during installation. + Adds an additional NuGet package source to use during installation. + + + + SOURCE + SOURCE + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-tool/update/LocalizableStrings.resx b/src/dotnet/commands/dotnet-tool/update/LocalizableStrings.resx index c6505018e..8968dcc94 100644 --- a/src/dotnet/commands/dotnet-tool/update/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-tool/update/LocalizableStrings.resx @@ -129,11 +129,11 @@ Version of the tool package in NuGet. - + Adds an additional NuGet package source to use during update. - - SOURCE_FEED + + ADD_SOURCE Updates a tool to the latest stable version for use. diff --git a/src/dotnet/commands/dotnet-tool/update/ToolUpdateCommand.cs b/src/dotnet/commands/dotnet-tool/update/ToolUpdateCommand.cs index 62034e3ba..c2ab38826 100644 --- a/src/dotnet/commands/dotnet-tool/update/ToolUpdateCommand.cs +++ b/src/dotnet/commands/dotnet-tool/update/ToolUpdateCommand.cs @@ -52,7 +52,7 @@ namespace Microsoft.DotNet.Tools.Tool.Update _packageId = new PackageId(appliedCommand.Arguments.Single()); _configFilePath = appliedCommand.ValueOrDefault("configfile"); _framework = appliedCommand.ValueOrDefault("framework"); - _additionalFeeds = appliedCommand.ValueOrDefault("source-feed"); + _additionalFeeds = appliedCommand.ValueOrDefault("add-source"); _global = appliedCommand.ValueOrDefault("global"); _verbosity = appliedCommand.SingleArgumentOrDefault("verbosity"); _toolPath = appliedCommand.SingleArgumentOrDefault("tool-path"); diff --git a/src/dotnet/commands/dotnet-tool/update/ToolUpdateCommandParser.cs b/src/dotnet/commands/dotnet-tool/update/ToolUpdateCommandParser.cs index 8e737291f..69717bd82 100644 --- a/src/dotnet/commands/dotnet-tool/update/ToolUpdateCommandParser.cs +++ b/src/dotnet/commands/dotnet-tool/update/ToolUpdateCommandParser.cs @@ -28,10 +28,10 @@ namespace Microsoft.DotNet.Cli LocalizableStrings.ConfigFileOptionDescription, Accept.ExactlyOneArgument()), Create.Option( - "--source-feed", - LocalizableStrings.SourceFeedOptionDescription, + "--add-source", + LocalizableStrings.AddSourceOptionDescription, Accept.OneOrMoreArguments() - .With(name: LocalizableStrings.SourceFeedOptionName)), + .With(name: LocalizableStrings.AddSourceOptionName)), Create.Option( "--framework", LocalizableStrings.FrameworkOptionDescription, diff --git a/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.cs.xlf index b4269baf2..3c3dd65e0 100644 --- a/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.cs.xlf @@ -92,14 +92,14 @@ Aktualizace nástroje {0} se nezdařila z následujícího důvodu: - + Adds an additional NuGet package source to use during update. - Přidá další zdroj balíčku NuGet, který se použije při aktualizaci. + Adds an additional NuGet package source to use during update. - - SOURCE_FEED - SOURCE_FEED + + ADD_SOURCE + ADD_SOURCE diff --git a/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.de.xlf index 8369ee7fc..9a3f4f75a 100644 --- a/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.de.xlf @@ -92,14 +92,14 @@ Fehler beim Update des Tools "{0}". Ursache: - + Adds an additional NuGet package source to use during update. - Fügt eine weitere NuGet-Paketquelle zur Verwendung während des Updates hinzu. + Adds an additional NuGet package source to use during update. - - SOURCE_FEED - SOURCE_FEED + + ADD_SOURCE + ADD_SOURCE diff --git a/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.es.xlf index 3e1d69b56..9026f746c 100644 --- a/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.es.xlf @@ -92,14 +92,14 @@ La herramienta "{0}" no se pudo actualizar debido a lo siguiente: - + Adds an additional NuGet package source to use during update. - Agrega un origen de paquetes de NuGet para utilizar durante la actualización. + Adds an additional NuGet package source to use during update. - - SOURCE_FEED - SOURCE_FEED + + ADD_SOURCE + ADD_SOURCE diff --git a/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.fr.xlf index 575de9f0e..c0a851fcd 100644 --- a/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.fr.xlf @@ -92,14 +92,14 @@ Échec de la mise à jour de l'outil '{0}' pour la ou les raisons suivantes : - + Adds an additional NuGet package source to use during update. - Ajoute un package NuGet source supplémentaire à utiliser durant la mise à jour. + Adds an additional NuGet package source to use during update. - - SOURCE_FEED - SOURCE_FEED + + ADD_SOURCE + ADD_SOURCE diff --git a/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.it.xlf index a614a4c1e..2d043adc9 100644 --- a/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.it.xlf @@ -92,14 +92,14 @@ L'aggiornamento dello strumento '{0}' non è riuscito. Motivi: - + Adds an additional NuGet package source to use during update. - Aggiunge un'altra origine pacchetto NuGet da usare durante l'aggiornamento. + Adds an additional NuGet package source to use during update. - - SOURCE_FEED - SOURCE_FEED + + ADD_SOURCE + ADD_SOURCE diff --git a/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ja.xlf index 6bf44f42c..2112d403f 100644 --- a/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ja.xlf @@ -92,14 +92,14 @@ ツール '{0}' を更新できませんでした。原因: - + Adds an additional NuGet package source to use during update. - 更新中に使用する他の NuGet パッケージ ソースを追加します。 + Adds an additional NuGet package source to use during update. - - SOURCE_FEED - SOURCE_FEED + + ADD_SOURCE + ADD_SOURCE diff --git a/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ko.xlf index a73db03b5..165e94deb 100644 --- a/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ko.xlf @@ -92,14 +92,14 @@ 다음으로 인해 '{0}' 도구를 업데이트하지 못했습니다. - + Adds an additional NuGet package source to use during update. - 업데이트 중 사용할 추가 NuGet 패키지 소스를 추가합니다. + Adds an additional NuGet package source to use during update. - - SOURCE_FEED - SOURCE_FEED + + ADD_SOURCE + ADD_SOURCE diff --git a/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pl.xlf index 826b5fe7f..a18e6b639 100644 --- a/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pl.xlf @@ -92,14 +92,14 @@ Aktualizacja narzędzia „{0}” nie powiodła się z następującego powodu: - + Adds an additional NuGet package source to use during update. - Dodaje dodatkowe źródło pakietu NuGet do użycia podczas aktualizacji. + Adds an additional NuGet package source to use during update. - - SOURCE_FEED - SOURCE_FEED + + ADD_SOURCE + ADD_SOURCE diff --git a/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pt-BR.xlf index 38d724185..ef32d48ca 100644 --- a/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pt-BR.xlf @@ -92,14 +92,14 @@ Falha ao atualizar a ferramenta '{0}' devido ao seguinte motivo: - + Adds an additional NuGet package source to use during update. - Adiciona uma origem adicional do pacote NuGet para ser usada durante a atualização. + Adds an additional NuGet package source to use during update. - - SOURCE_FEED - SOURCE_FEED + + ADD_SOURCE + ADD_SOURCE diff --git a/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ru.xlf index afc272fc1..a69d628d2 100644 --- a/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ru.xlf @@ -92,14 +92,14 @@ Не удалось обновить инструмент "{0}" по следующей причине: - + Adds an additional NuGet package source to use during update. - Добавляет дополнительный источник пакета NuGet, используемый во время обновления. + Adds an additional NuGet package source to use during update. - - SOURCE_FEED - SOURCE_FEED + + ADD_SOURCE + ADD_SOURCE diff --git a/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.tr.xlf index e152ac275..9fe9dd416 100644 --- a/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.tr.xlf @@ -92,14 +92,14 @@ Aşağıdaki nedenlerle '{0}' aracı güncelleştirilemedi: - + Adds an additional NuGet package source to use during update. - Güncelleştirme sırasında kullanılacak ek bir NuGet paket kaynağı ekler. + Adds an additional NuGet package source to use during update. - - SOURCE_FEED - SOURCE_FEED + + ADD_SOURCE + ADD_SOURCE diff --git a/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hans.xlf index d133fe906..90b9e196e 100644 --- a/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hans.xlf @@ -92,14 +92,14 @@ 工具“{0}”因以下原因而未能更新: - + Adds an additional NuGet package source to use during update. - 添加其他要在更新期间使用的 NuGet 包。 + Adds an additional NuGet package source to use during update. - - SOURCE_FEED - SOURCE_FEED + + ADD_SOURCE + ADD_SOURCE diff --git a/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hant.xlf index a28b59344..74d9ec672 100644 --- a/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hant.xlf @@ -92,14 +92,14 @@ 由於下列原因，因此工具 '{0}' 無法更新： - + Adds an additional NuGet package source to use during update. - 新增於更新期間要使用的額外 NuGet 套件來源。 + Adds an additional NuGet package source to use during update. - - SOURCE_FEED - SOURCE_FEED + + ADD_SOURCE + ADD_SOURCE diff --git a/test/dotnet.Tests/CommandTests/ToolInstallCommandTests.cs b/test/dotnet.Tests/CommandTests/ToolInstallCommandTests.cs index 9d52af4d8..3ce010aa8 100644 --- a/test/dotnet.Tests/CommandTests/ToolInstallCommandTests.cs +++ b/test/dotnet.Tests/CommandTests/ToolInstallCommandTests.cs @@ -85,10 +85,10 @@ namespace Microsoft.DotNet.Tests.Commands public void WhenRunWithPackageIdWithSourceItShouldCreateValidShim() { const string sourcePath = "http://mysouce.com"; - ParseResult result = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --source-feed {sourcePath}"); + ParseResult result = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --add-source {sourcePath}"); AppliedOption appliedCommand = result["dotnet"]["tool"]["install"]; ParseResult parseResult = - Parser.Instance.ParseFrom("dotnet tool", new[] { "install", "-g", PackageId, "--source-feed", sourcePath }); + Parser.Instance.ParseFrom("dotnet tool", new[] { "install", "-g", PackageId, "--add-source", sourcePath }); var toolToolPackageInstaller = CreateToolPackageInstaller( diff --git a/test/dotnet.Tests/ParserTests/InstallToolParserTests.cs b/test/dotnet.Tests/ParserTests/InstallToolParserTests.cs index 61134ae03..b8042025a 100644 --- a/test/dotnet.Tests/ParserTests/InstallToolParserTests.cs +++ b/test/dotnet.Tests/ParserTests/InstallToolParserTests.cs @@ -55,10 +55,10 @@ namespace Microsoft.DotNet.Tests.ParserTests const string expectedSourceValue = "TestSourceValue"; var result = - Parser.Instance.Parse($"dotnet tool install -g --source-feed {expectedSourceValue} console.test.app"); + Parser.Instance.Parse($"dotnet tool install -g --add-source {expectedSourceValue} console.test.app"); var appliedOptions = result["dotnet"]["tool"]["install"]; - appliedOptions.ValueOrDefault("source-feed").First().Should().Be(expectedSourceValue); + appliedOptions.ValueOrDefault("add-source").First().Should().Be(expectedSourceValue); } [Fact] @@ -70,13 +70,13 @@ namespace Microsoft.DotNet.Tests.ParserTests var result = Parser.Instance.Parse( $"dotnet tool install -g " + - $"--source-feed {expectedSourceValue1} " + - $"--source-feed {expectedSourceValue2} console.test.app"); + $"--add-source {expectedSourceValue1} " + + $"--add-source {expectedSourceValue2} console.test.app"); var appliedOptions = result["dotnet"]["tool"]["install"]; - appliedOptions.ValueOrDefault("source-feed")[0].Should().Be(expectedSourceValue1); - appliedOptions.ValueOrDefault("source-feed")[1].Should().Be(expectedSourceValue2); + appliedOptions.ValueOrDefault("add-source")[0].Should().Be(expectedSourceValue1); + appliedOptions.ValueOrDefault("add-source")[1].Should().Be(expectedSourceValue2); } [Fact] diff --git a/test/dotnet.Tests/ParserTests/UpdateToolParserTests.cs b/test/dotnet.Tests/ParserTests/UpdateToolParserTests.cs index 4f94dc86e..48284ee41 100644 --- a/test/dotnet.Tests/ParserTests/UpdateToolParserTests.cs +++ b/test/dotnet.Tests/ParserTests/UpdateToolParserTests.cs @@ -62,10 +62,10 @@ namespace Microsoft.DotNet.Tests.ParserTests const string expectedSourceValue = "TestSourceValue"; var result = - Parser.Instance.Parse($"dotnet tool update -g --source-feed {expectedSourceValue} console.test.app"); + Parser.Instance.Parse($"dotnet tool update -g --add-source {expectedSourceValue} console.test.app"); var appliedOptions = result["dotnet"]["tool"]["update"]; - appliedOptions.ValueOrDefault("source-feed").First().Should().Be(expectedSourceValue); + appliedOptions.ValueOrDefault("add-source").First().Should().Be(expectedSourceValue); } [Fact] @@ -77,13 +77,13 @@ namespace Microsoft.DotNet.Tests.ParserTests var result = Parser.Instance.Parse( $"dotnet tool update -g " + - $"--source-feed {expectedSourceValue1} " + - $"--source-feed {expectedSourceValue2} console.test.app"); + $"--add-source {expectedSourceValue1} " + + $"--add-source {expectedSourceValue2} console.test.app"); var appliedOptions = result["dotnet"]["tool"]["update"]; - appliedOptions.ValueOrDefault("source-feed")[0].Should().Be(expectedSourceValue1); - appliedOptions.ValueOrDefault("source-feed")[1].Should().Be(expectedSourceValue2); + appliedOptions.ValueOrDefault("add-source")[0].Should().Be(expectedSourceValue1); + appliedOptions.ValueOrDefault("add-source")[1].Should().Be(expectedSourceValue2); } [Fact] From 57d065e43d0d378e549c8fad92c99ea03ae34067 Mon Sep 17 00:00:00 2001 From: William Li Date: Tue, 1 May 2018 10:24:40 -0700 Subject: [PATCH 110/118] Correct dotnet list description (#9174) After dotnet tool list moved out of dotnet list, the description has not been updated. --- src/dotnet/commands/dotnet-help/LocalizableStrings.resx | 2 +- src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.cs.xlf | 4 ++-- src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.de.xlf | 4 ++-- src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.es.xlf | 4 ++-- src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.fr.xlf | 4 ++-- src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.it.xlf | 4 ++-- src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf | 4 ++-- src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ko.xlf | 4 ++-- src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf | 4 ++-- .../commands/dotnet-help/xlf/LocalizableStrings.pt-BR.xlf | 4 ++-- src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ru.xlf | 4 ++-- src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.tr.xlf | 4 ++-- .../commands/dotnet-help/xlf/LocalizableStrings.zh-Hans.xlf | 4 ++-- .../commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf | 4 ++-- src/dotnet/commands/dotnet-list/LocalizableStrings.resx | 2 +- src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.cs.xlf | 4 ++-- src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.de.xlf | 4 ++-- src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.es.xlf | 4 ++-- src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.fr.xlf | 4 ++-- src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.it.xlf | 4 ++-- src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.ja.xlf | 4 ++-- src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.ko.xlf | 4 ++-- src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.pl.xlf | 4 ++-- .../commands/dotnet-list/xlf/LocalizableStrings.pt-BR.xlf | 4 ++-- src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.ru.xlf | 4 ++-- src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.tr.xlf | 4 ++-- .../commands/dotnet-list/xlf/LocalizableStrings.zh-Hans.xlf | 4 ++-- .../commands/dotnet-list/xlf/LocalizableStrings.zh-Hant.xlf | 4 ++-- .../GivenThatIWantToShowHelpForDotnetCommand.cs | 2 +- 29 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/dotnet/commands/dotnet-help/LocalizableStrings.resx b/src/dotnet/commands/dotnet-help/LocalizableStrings.resx index 07118075e..d527afa27 100644 --- a/src/dotnet/commands/dotnet-help/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-help/LocalizableStrings.resx @@ -193,7 +193,7 @@ Remove reference from the project. - List project references or installed tools. + List references of a .NET project. Advanced Commands diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.cs.xlf index 2c79948b5..cd25bfa25 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.cs.xlf @@ -153,8 +153,8 @@ - List project references or installed tools. - Zobrazí seznam odkazů projektu nebo nainstalovaných nástrojů. + List references of a .NET project. + Zobrazí seznam odkazů projektu nebo nainstalovaných nástrojů. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.de.xlf index 1aa8c6c90..ca71594eb 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.de.xlf @@ -154,8 +154,8 @@ - List project references or installed tools. - Hiermit werden Projektverweise oder installierte Tools aufgelistet. + List references of a .NET project. + Hiermit werden Projektverweise oder installierte Tools aufgelistet. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.es.xlf index f77be21f4..cbab09f20 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.es.xlf @@ -153,8 +153,8 @@ - List project references or installed tools. - Enumere las referencias de proyecto o las herramientas instaladas. + List references of a .NET project. + Enumere las referencias de proyecto o las herramientas instaladas. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.fr.xlf index 8cf661d80..aaf4c1b5b 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.fr.xlf @@ -153,8 +153,8 @@ - List project references or installed tools. - Répertoriez des références de projet ou des outils installés. + List references of a .NET project. + Répertoriez des références de projet ou des outils installés. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.it.xlf index 85afcf32e..3a5dd13f5 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.it.xlf @@ -153,8 +153,8 @@ - List project references or installed tools. - Elenca i riferimenti al progetto o gli strumenti installati. + List references of a .NET project. + Elenca i riferimenti al progetto o gli strumenti installati. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf index 8821d75e4..dec1ff61f 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf @@ -153,8 +153,8 @@ - List project references or installed tools. - プロジェクトの参照またはインストール済みツールを一覧表示します。 + List references of a .NET project. + プロジェクトの参照またはインストール済みツールを一覧表示します。 diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ko.xlf index aa0fefac0..e6c0ba5c9 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ko.xlf @@ -153,8 +153,8 @@ - List project references or installed tools. - 프로젝트 참조 또는 설치된 도구를 나열합니다. + List references of a .NET project. + 프로젝트 참조 또는 설치된 도구를 나열합니다. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf index 879a0e96e..18ce9b893 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf @@ -153,8 +153,8 @@ - List project references or installed tools. - Wyświetl listę odwołań projektu lub zainstalowanych narzędzi. + List references of a .NET project. + Wyświetl listę odwołań projektu lub zainstalowanych narzędzi. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pt-BR.xlf index 03eaf235e..0da686918 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pt-BR.xlf @@ -153,8 +153,8 @@ - List project references or installed tools. - Listar referências de projeto ou ferramentas instaladas. + List references of a .NET project. + Listar referências de projeto ou ferramentas instaladas. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ru.xlf index 29891423b..afaf53eeb 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ru.xlf @@ -153,8 +153,8 @@ - List project references or installed tools. - Перечисление ссылок на проекты или установленных инструментов. + List references of a .NET project. + Перечисление ссылок на проекты или установленных инструментов. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.tr.xlf index 2968a17f9..81d8b8cfa 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.tr.xlf @@ -153,8 +153,8 @@ - List project references or installed tools. - Proje başvurularını veya yüklü araçları listeleyin. + List references of a .NET project. + Proje başvurularını veya yüklü araçları listeleyin. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hans.xlf index c60a7ee7d..e79143be9 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hans.xlf @@ -153,8 +153,8 @@ - List project references or installed tools. - 列出项目参考或安装的工具。 + List references of a .NET project. + 列出项目参考或安装的工具。 diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf index bba3fe694..7a5c96020 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf @@ -153,8 +153,8 @@ - List project references or installed tools. - 列出專案參考或安裝的工具。 + List references of a .NET project. + 列出專案參考或安裝的工具。 diff --git a/src/dotnet/commands/dotnet-list/LocalizableStrings.resx b/src/dotnet/commands/dotnet-list/LocalizableStrings.resx index 41c12481c..054105893 100644 --- a/src/dotnet/commands/dotnet-list/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-list/LocalizableStrings.resx @@ -118,6 +118,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - .NET List Command + List references of a .NET project. \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.cs.xlf index ce6aea3e6..4b17c3ff0 100644 --- a/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.cs.xlf @@ -3,8 +3,8 @@ - .NET List Command - Příkaz .NET pro zobrazení seznamu + List references of a .NET project. + Příkaz .NET pro zobrazení seznamu diff --git a/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.de.xlf index 41e001be7..527b03907 100644 --- a/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.de.xlf @@ -3,8 +3,8 @@ - .NET List Command - .NET-Auflistbefehl + List references of a .NET project. + .NET-Auflistbefehl diff --git a/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.es.xlf index 36f5191ce..2433b8b81 100644 --- a/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.es.xlf @@ -3,8 +3,8 @@ - .NET List Command - Comando de lista de .NET + List references of a .NET project. + Comando de lista de .NET diff --git a/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.fr.xlf index df29efbd4..7b0852711 100644 --- a/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.fr.xlf @@ -3,8 +3,8 @@ - .NET List Command - Commande de liste .NET + List references of a .NET project. + Commande de liste .NET diff --git a/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.it.xlf index a8e413514..cad0bd9d7 100644 --- a/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.it.xlf @@ -3,8 +3,8 @@ - .NET List Command - Comando Elenca .NET + List references of a .NET project. + Comando Elenca .NET diff --git a/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.ja.xlf index b718b4da6..ef3f34b9d 100644 --- a/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.ja.xlf @@ -3,8 +3,8 @@ - .NET List Command - .NET List コマンド + List references of a .NET project. + .NET List コマンド diff --git a/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.ko.xlf index 280ffedfb..412876daf 100644 --- a/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.ko.xlf @@ -3,8 +3,8 @@ - .NET List Command - .NET 명령 나열 + List references of a .NET project. + .NET 명령 나열 diff --git a/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.pl.xlf index 76642c8e3..c27718ed6 100644 --- a/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.pl.xlf @@ -3,8 +3,8 @@ - .NET List Command - Polecenie list platformy .NET + List references of a .NET project. + Polecenie list platformy .NET diff --git a/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.pt-BR.xlf index e264253f3..6de78d997 100644 --- a/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.pt-BR.xlf @@ -3,8 +3,8 @@ - .NET List Command - Comando List do .NET + List references of a .NET project. + Comando List do .NET diff --git a/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.ru.xlf index d01c0c362..292136310 100644 --- a/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.ru.xlf @@ -3,8 +3,8 @@ - .NET List Command - Команда .NET "Список" + List references of a .NET project. + Команда .NET "Список" diff --git a/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.tr.xlf index 08752788f..5fee7b6d3 100644 --- a/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.tr.xlf @@ -3,8 +3,8 @@ - .NET List Command - .NET Listeleme Komutu + List references of a .NET project. + .NET Listeleme Komutu diff --git a/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.zh-Hans.xlf index aed256398..a77780586 100644 --- a/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.zh-Hans.xlf @@ -3,8 +3,8 @@ - .NET List Command - .NET 列表命令 + List references of a .NET project. + .NET 列表命令 diff --git a/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.zh-Hant.xlf index c45809b10..b37654de5 100644 --- a/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.zh-Hant.xlf @@ -3,8 +3,8 @@ - .NET List Command - .NET 清單命令 + List references of a .NET project. + .NET 清單命令 diff --git a/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs b/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs index 09461ed59..194333671 100644 --- a/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs +++ b/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs @@ -34,7 +34,7 @@ SDK commands: sln Modify solution (SLN) files. add Add reference to the project. remove Remove reference from the project. - list List project references or installed tools. + list List references of a .NET project. nuget Provides additional NuGet commands. msbuild Runs Microsoft Build Engine (MSBuild). vstest Runs Microsoft Test Execution Command Line Tool. From 8189d72e062b138eeae25050735c892613b39b81 Mon Sep 17 00:00:00 2001 From: William Li Date: Tue, 1 May 2018 12:33:13 -0700 Subject: [PATCH 111/118] Remove mac mark all 755 (#9177) --- packaging/osx/clisdk/scripts/postinstall | 3 --- 1 file changed, 3 deletions(-) diff --git a/packaging/osx/clisdk/scripts/postinstall b/packaging/osx/clisdk/scripts/postinstall index 8211444d2..28339be99 100755 --- a/packaging/osx/clisdk/scripts/postinstall +++ b/packaging/osx/clisdk/scripts/postinstall @@ -8,9 +8,6 @@ PACKAGE=$1 INSTALL_DESTINATION=$2 INSTALL_TEMP_HOME=/tmp/dotnet-installer -# A temporary fix for the permissions issue(s) -chmod -R 755 $INSTALL_DESTINATION - first_run() { $INSTALL_DESTINATION/dotnet exec $INSTALL_DESTINATION/sdk/%SDK_VERSION%/dotnet.dll internal-reportinstallsuccess "$1" > /dev/null 2>&1 || true } From c382932ec44c38093d8ce1bf5dfd1f21e14e1f59 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 1 May 2018 12:41:38 -0700 Subject: [PATCH 112/118] Fix #if to match .csproj constant --- .../Microsoft.DotNet.Configurer.csproj | 3 ++- src/dotnet/AspNetCoreCertificateGenerator.cs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj b/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj index a393f7926..dbc6f7e6f 100644 --- a/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj +++ b/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj @@ -9,6 +9,7 @@ true git git://github.com/dotnet/cli + $(DefineConstants);EXCLUDE_ASPNETCORE @@ -26,4 +27,4 @@ - \ No newline at end of file + diff --git a/src/dotnet/AspNetCoreCertificateGenerator.cs b/src/dotnet/AspNetCoreCertificateGenerator.cs index c43a8f3ff..17de9ebce 100644 --- a/src/dotnet/AspNetCoreCertificateGenerator.cs +++ b/src/dotnet/AspNetCoreCertificateGenerator.cs @@ -9,7 +9,7 @@ namespace Microsoft.DotNet.Cli { public void GenerateAspNetCoreDevelopmentCertificate() { -#if !EXCLUDE_ASPNET +#if !EXCLUDE_ASPNETCORE Microsoft.AspNetCore.DeveloperCertificates.XPlat.CertificateGenerator.GenerateAspNetHttpsCertificate(); #endif } From 46d4b718143866ff93ca04d393c87e671c888a27 Mon Sep 17 00:00:00 2001 From: William Li Date: Tue, 1 May 2018 13:20:06 -0700 Subject: [PATCH 113/118] Add additional tools to help text --- .../commands/dotnet-help/HelpUsageText.cs | 7 +++++ .../dotnet-help/LocalizableStrings.resx | 18 +++++++++++ .../dotnet-help/xlf/LocalizableStrings.cs.xlf | 30 +++++++++++++++++++ .../dotnet-help/xlf/LocalizableStrings.de.xlf | 30 +++++++++++++++++++ .../dotnet-help/xlf/LocalizableStrings.es.xlf | 30 +++++++++++++++++++ .../dotnet-help/xlf/LocalizableStrings.fr.xlf | 30 +++++++++++++++++++ .../dotnet-help/xlf/LocalizableStrings.it.xlf | 30 +++++++++++++++++++ .../dotnet-help/xlf/LocalizableStrings.ja.xlf | 30 +++++++++++++++++++ .../dotnet-help/xlf/LocalizableStrings.ko.xlf | 30 +++++++++++++++++++ .../dotnet-help/xlf/LocalizableStrings.pl.xlf | 30 +++++++++++++++++++ .../xlf/LocalizableStrings.pt-BR.xlf | 30 +++++++++++++++++++ .../dotnet-help/xlf/LocalizableStrings.ru.xlf | 30 +++++++++++++++++++ .../dotnet-help/xlf/LocalizableStrings.tr.xlf | 30 +++++++++++++++++++ .../xlf/LocalizableStrings.zh-Hans.xlf | 30 +++++++++++++++++++ .../xlf/LocalizableStrings.zh-Hant.xlf | 30 +++++++++++++++++++ ...ivenThatIWantToShowHelpForDotnetCommand.cs | 10 ++++++- 16 files changed, 424 insertions(+), 1 deletion(-) diff --git a/src/dotnet/commands/dotnet-help/HelpUsageText.cs b/src/dotnet/commands/dotnet-help/HelpUsageText.cs index 0579e9d80..8fb937b43 100644 --- a/src/dotnet/commands/dotnet-help/HelpUsageText.cs +++ b/src/dotnet/commands/dotnet-help/HelpUsageText.cs @@ -50,5 +50,12 @@ runtime-options: --fx-version {LocalizableStrings.FxVersionDefinition} --roll-forward-on-no-candidate-fx {LocalizableStrings.RollForwardOnNoCandidateFxDefinition} --additional-deps {LocalizableStrings.AdditionalDeps} + +{LocalizableStrings.AdditionalTools} + dev-certs {LocalizableStrings.DevCertsDefinition} + ef {LocalizableStrings.EfDefinition} + sql-cache {LocalizableStrings.SqlCacheDefinition} + user-secrets {LocalizableStrings.UserSecretsDefinition} + watch {LocalizableStrings.WatchDefinition} "; } diff --git a/src/dotnet/commands/dotnet-help/LocalizableStrings.resx b/src/dotnet/commands/dotnet-help/LocalizableStrings.resx index d527afa27..8e4e4da64 100644 --- a/src/dotnet/commands/dotnet-help/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-help/LocalizableStrings.resx @@ -273,4 +273,22 @@ Interact with servers started by a build. + + Create and manage development certificates. + + + Entity Framework Core command-line tools. + + + SQL Server cache command-line tools. + + + Manage development user secrets. + + + Start a file watcher that runs a command when files change. + + + Additional tools ('dotnet [tool-name] --help' for more information): + diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.cs.xlf index a84f22472..d32499e6d 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.cs.xlf @@ -262,6 +262,36 @@ Interakce se servery spuštěnými buildem + + Create and manage development certificates. + Create and manage development certificates. + + + + Entity Framework Core command-line tools. + Entity Framework Core command-line tools. + + + + SQL Server cache command-line tools. + SQL Server cache command-line tools. + + + + Manage development user secrets. + Manage development user secrets. + + + + Start a file watcher that runs a command when files change. + Start a file watcher that runs a command when files change. + + + + Additional tools ('dotnet [tool-name] --help' for more information): + Additional tools ('dotnet [tool-name] --help' for more information): + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.de.xlf index 3f8bd9256..07f75ad8e 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.de.xlf @@ -263,6 +263,36 @@ Interaktion mit Servern, die durch einen Build gestartet werden. + + Create and manage development certificates. + Create and manage development certificates. + + + + Entity Framework Core command-line tools. + Entity Framework Core command-line tools. + + + + SQL Server cache command-line tools. + SQL Server cache command-line tools. + + + + Manage development user secrets. + Manage development user secrets. + + + + Start a file watcher that runs a command when files change. + Start a file watcher that runs a command when files change. + + + + Additional tools ('dotnet [tool-name] --help' for more information): + Additional tools ('dotnet [tool-name] --help' for more information): + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.es.xlf index ed772fb90..96dd7ea6c 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.es.xlf @@ -262,6 +262,36 @@ Interactúe con los servidores que inicia una compilación. + + Create and manage development certificates. + Create and manage development certificates. + + + + Entity Framework Core command-line tools. + Entity Framework Core command-line tools. + + + + SQL Server cache command-line tools. + SQL Server cache command-line tools. + + + + Manage development user secrets. + Manage development user secrets. + + + + Start a file watcher that runs a command when files change. + Start a file watcher that runs a command when files change. + + + + Additional tools ('dotnet [tool-name] --help' for more information): + Additional tools ('dotnet [tool-name] --help' for more information): + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.fr.xlf index bc0fd565f..4ab388052 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.fr.xlf @@ -262,6 +262,36 @@ Interagissez avec les serveurs démarrés par une build. + + Create and manage development certificates. + Create and manage development certificates. + + + + Entity Framework Core command-line tools. + Entity Framework Core command-line tools. + + + + SQL Server cache command-line tools. + SQL Server cache command-line tools. + + + + Manage development user secrets. + Manage development user secrets. + + + + Start a file watcher that runs a command when files change. + Start a file watcher that runs a command when files change. + + + + Additional tools ('dotnet [tool-name] --help' for more information): + Additional tools ('dotnet [tool-name] --help' for more information): + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.it.xlf index 18c9d3ebc..b76a835d2 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.it.xlf @@ -262,6 +262,36 @@ Interagisce con server avviati da una compilazione. + + Create and manage development certificates. + Create and manage development certificates. + + + + Entity Framework Core command-line tools. + Entity Framework Core command-line tools. + + + + SQL Server cache command-line tools. + SQL Server cache command-line tools. + + + + Manage development user secrets. + Manage development user secrets. + + + + Start a file watcher that runs a command when files change. + Start a file watcher that runs a command when files change. + + + + Additional tools ('dotnet [tool-name] --help' for more information): + Additional tools ('dotnet [tool-name] --help' for more information): + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf index 2f748e1db..10f0b3493 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf @@ -262,6 +262,36 @@ ビルドによって開始されたサーバーとやり取りします。 + + Create and manage development certificates. + Create and manage development certificates. + + + + Entity Framework Core command-line tools. + Entity Framework Core command-line tools. + + + + SQL Server cache command-line tools. + SQL Server cache command-line tools. + + + + Manage development user secrets. + Manage development user secrets. + + + + Start a file watcher that runs a command when files change. + Start a file watcher that runs a command when files change. + + + + Additional tools ('dotnet [tool-name] --help' for more information): + Additional tools ('dotnet [tool-name] --help' for more information): + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ko.xlf index 62f5d1108..1c1a5f1f7 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ko.xlf @@ -262,6 +262,36 @@ 빌드에 의해 서버와 상호 작용이 시작되었습니다. + + Create and manage development certificates. + Create and manage development certificates. + + + + Entity Framework Core command-line tools. + Entity Framework Core command-line tools. + + + + SQL Server cache command-line tools. + SQL Server cache command-line tools. + + + + Manage development user secrets. + Manage development user secrets. + + + + Start a file watcher that runs a command when files change. + Start a file watcher that runs a command when files change. + + + + Additional tools ('dotnet [tool-name] --help' for more information): + Additional tools ('dotnet [tool-name] --help' for more information): + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf index bc0512174..b9da86c36 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf @@ -262,6 +262,36 @@ Interakcja z serwerami uruchomionymi przez kompilację. + + Create and manage development certificates. + Create and manage development certificates. + + + + Entity Framework Core command-line tools. + Entity Framework Core command-line tools. + + + + SQL Server cache command-line tools. + SQL Server cache command-line tools. + + + + Manage development user secrets. + Manage development user secrets. + + + + Start a file watcher that runs a command when files change. + Start a file watcher that runs a command when files change. + + + + Additional tools ('dotnet [tool-name] --help' for more information): + Additional tools ('dotnet [tool-name] --help' for more information): + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pt-BR.xlf index 3a0755c9a..54099921b 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pt-BR.xlf @@ -262,6 +262,36 @@ Interagir com servidores iniciados por um build. + + Create and manage development certificates. + Create and manage development certificates. + + + + Entity Framework Core command-line tools. + Entity Framework Core command-line tools. + + + + SQL Server cache command-line tools. + SQL Server cache command-line tools. + + + + Manage development user secrets. + Manage development user secrets. + + + + Start a file watcher that runs a command when files change. + Start a file watcher that runs a command when files change. + + + + Additional tools ('dotnet [tool-name] --help' for more information): + Additional tools ('dotnet [tool-name] --help' for more information): + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ru.xlf index c73032d52..16a9a8878 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ru.xlf @@ -262,6 +262,36 @@ Взаимодействие с серверами, запущенными в ходе сборки. + + Create and manage development certificates. + Create and manage development certificates. + + + + Entity Framework Core command-line tools. + Entity Framework Core command-line tools. + + + + SQL Server cache command-line tools. + SQL Server cache command-line tools. + + + + Manage development user secrets. + Manage development user secrets. + + + + Start a file watcher that runs a command when files change. + Start a file watcher that runs a command when files change. + + + + Additional tools ('dotnet [tool-name] --help' for more information): + Additional tools ('dotnet [tool-name] --help' for more information): + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.tr.xlf index 93e89c9ad..f1469178e 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.tr.xlf @@ -262,6 +262,36 @@ Bir derleme tarafından başlatılan sunucularla etkileşimde bulunun. + + Create and manage development certificates. + Create and manage development certificates. + + + + Entity Framework Core command-line tools. + Entity Framework Core command-line tools. + + + + SQL Server cache command-line tools. + SQL Server cache command-line tools. + + + + Manage development user secrets. + Manage development user secrets. + + + + Start a file watcher that runs a command when files change. + Start a file watcher that runs a command when files change. + + + + Additional tools ('dotnet [tool-name] --help' for more information): + Additional tools ('dotnet [tool-name] --help' for more information): + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hans.xlf index 9cc25505b..e8f174a7a 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hans.xlf @@ -262,6 +262,36 @@ 与由生成版本启动的服务器进行交互。 + + Create and manage development certificates. + Create and manage development certificates. + + + + Entity Framework Core command-line tools. + Entity Framework Core command-line tools. + + + + SQL Server cache command-line tools. + SQL Server cache command-line tools. + + + + Manage development user secrets. + Manage development user secrets. + + + + Start a file watcher that runs a command when files change. + Start a file watcher that runs a command when files change. + + + + Additional tools ('dotnet [tool-name] --help' for more information): + Additional tools ('dotnet [tool-name] --help' for more information): + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf index 474da8007..72606ffa7 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf @@ -262,6 +262,36 @@ 與組建啟動的伺服器互動。 + + Create and manage development certificates. + Create and manage development certificates. + + + + Entity Framework Core command-line tools. + Entity Framework Core command-line tools. + + + + SQL Server cache command-line tools. + SQL Server cache command-line tools. + + + + Manage development user secrets. + Manage development user secrets. + + + + Start a file watcher that runs a command when files change. + Start a file watcher that runs a command when files change. + + + + Additional tools ('dotnet [tool-name] --help' for more information): + Additional tools ('dotnet [tool-name] --help' for more information): + + \ No newline at end of file diff --git a/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs b/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs index 194333671..ad77d91fb 100644 --- a/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs +++ b/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs @@ -60,7 +60,15 @@ runtime-options: --additionalprobingpath Path containing probing policy and assemblies to probe for. --fx-version Version of the installed Shared Framework to use to run the application. --roll-forward-on-no-candidate-fx Roll forward on no candidate shared framework is enabled. - --additional-deps Path to additional deps.json file."; + --additional-deps Path to additional deps.json file. + +Additional tools ('dotnet [tool-name] --help' for more information): + dev-certs Create and manage development certificates. + ef Entity Framework Core command-line tools. + sql-cache SQL Server cache command-line tools. + user-secrets Manage development user secrets. + watch Start a file watcher that runs a command when files change. +"; [Theory] [InlineData("--help")] From 0f4405974012c1a2bef5d2c5b2b2c112f938f0ae Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Wed, 2 May 2018 11:48:52 -0500 Subject: [PATCH 114/118] Allow ExternalRestoreSources in offline build Allow the caller to provide ExternalRestoreSources while DotnetBuildOffline = true. Any logic to block passing ExternalRestoreSources belongs in the caller. Fixes source-build offline build: it passes in filesystem NuGet sources for prebuilt and source-built packages. --- build/NugetConfigFile.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets index d2cacaa32..b0502bdc6 100644 --- a/build/NugetConfigFile.targets +++ b/build/NugetConfigFile.targets @@ -41,7 +41,7 @@ Lines="$(NugetConfigHeader)" Overwrite="true" /> - From 8c2160b6a07c5019388b68d09b7801b62b5a3948 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 2 May 2018 11:59:01 -0700 Subject: [PATCH 115/118] Removing some patches for source build. --- build/GitCommitInfo.targets | 6 ++++-- build/NugetConfigFile.targets | 2 +- run-build.sh | 2 +- .../Microsoft.DotNet.MSBuildSdkResolver.csproj | 2 +- src/redist/redist.csproj | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/build/GitCommitInfo.targets b/build/GitCommitInfo.targets index 6ac729e50..baf01a253 100644 --- a/build/GitCommitInfo.targets +++ b/build/GitCommitInfo.targets @@ -1,12 +1,14 @@ + ConsoleToMSBuild="true" + Condition=" '$(GitInfoCommitCount)' == '' "> + ConsoleToMSBuild="true" + Condition=" '$(GitInfoCommitHash)' == '' "> diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets index d2cacaa32..733ca6706 100644 --- a/build/NugetConfigFile.targets +++ b/build/NugetConfigFile.targets @@ -43,7 +43,7 @@ netstandard2.0;net46 netstandard2.0 AnyCPU - win-x86;win-x64 + win-x86;win-x64 true ../../tools/Key.snk true diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index da0774145..c2b2a87d8 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -19,7 +19,7 @@ - + All From 4c7d1df5b34ac09566d96862bc2c8be829a4f5db Mon Sep 17 00:00:00 2001 From: Tanner Gooding Date: Thu, 3 May 2018 15:50:19 -0700 Subject: [PATCH 116/118] Revert "Adding a work around for publishing self-contained apps to RIDs that are not available for Microsoft.NETCore.App 2.0.0." This reverts commit 370243ab81c43fe0e3e2a57c1d101b45724ea75e. --- .../GivenDotnetPublishPublishesProjects.cs | 30 ++----------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs index 2cc11eb51..9b325256f 100644 --- a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs +++ b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs @@ -4,9 +4,7 @@ using System; using System.IO; using System.Diagnostics; -using System.Linq; using System.Runtime.InteropServices; -using System.Xml.Linq; using FluentAssertions; using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.PlatformAbstractions; @@ -105,19 +103,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests var testInstance = TestAssets.Get(testAppName) .CreateInstance() .WithSourceFiles() - .WithProjectChanges(project => - { - var ns = project.Root.Name.Namespace; - - var propertyGroup = project.Root.Elements(ns + "PropertyGroup").First(); - - // This is needed to be able to restore for RIDs that were not available in Microsoft.NetCore.App 2.0.0. - // M.NC.App 2.0.0 depends on a version of Microsoft.NetCore.Platforms that lacks the mapping for the - // latest RIDs. Given that self-contained apps are pinned to 2.0.0 in this version of the SDK, we - // need a manual roll-forward. - propertyGroup.Add( - new XElement(ns + "RuntimeFrameworkVersion", "2.0.*")); - }); + .WithRestoreFiles(); var testProjectDirectory = testInstance.Root; @@ -184,19 +170,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests var testInstance = TestAssets.Get(testAppName) .CreateInstance($"PublishesSelfContained{selfContained}") .WithSourceFiles() - .WithProjectChanges(project => - { - var ns = project.Root.Name.Namespace; - - var propertyGroup = project.Root.Elements(ns + "PropertyGroup").First(); - - // This is needed to be able to restore for RIDs that were not available in Microsoft.NetCore.App 2.0.0. - // M.NC.App 2.0.0 depends on a version of Microsoft.NetCore.Platforms that lacks the mapping for the - // latest RIDs. Given that self-contained apps are pinned to 2.0.0 in this version of the SDK, we - // need a manual roll-forward. - propertyGroup.Add( - new XElement(ns + "RuntimeFrameworkVersion", "2.0.*")); - }); + .WithRestoreFiles(); var testProjectDirectory = testInstance.Root; From 488711b4ff3b06600d710a8aec359de434c4e4de Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Fri, 4 May 2018 10:12:00 -0700 Subject: [PATCH 117/118] Removing the word please from the ASP.NET first run message. We are not supposed to use it. --- src/Microsoft.DotNet.Configurer/LocalizableStrings.resx | 2 +- src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf | 4 ++-- src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.de.xlf | 4 ++-- src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf | 4 ++-- src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf | 4 ++-- src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf | 4 ++-- src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf | 4 ++-- src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf | 4 ++-- src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf | 4 ++-- .../xlf/LocalizableStrings.pt-BR.xlf | 4 ++-- src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ru.xlf | 4 ++-- src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.tr.xlf | 4 ++-- .../xlf/LocalizableStrings.zh-Hans.xlf | 4 ++-- .../xlf/LocalizableStrings.zh-Hant.xlf | 4 ++-- 14 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/Microsoft.DotNet.Configurer/LocalizableStrings.resx b/src/Microsoft.DotNet.Configurer/LocalizableStrings.resx index 42b6bc8a6..b40513e00 100644 --- a/src/Microsoft.DotNet.Configurer/LocalizableStrings.resx +++ b/src/Microsoft.DotNet.Configurer/LocalizableStrings.resx @@ -151,7 +151,7 @@ Here are some options to fix this error: ASP.NET Core ------------ Successfully installed the ASP.NET Core HTTPS Development Certificate. -To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only). For establishing trust on other platforms please refer to the platform specific documentation. +To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only). For establishing trust on other platforms refer to the platform specific documentation. For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054. diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf index a504090c5..fef05f8fa 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf @@ -62,9 +62,9 @@ Tuto chybu můžete opravit pomocí některé z těchto možností: ASP.NET Core ------------ Successfully installed the ASP.NET Core HTTPS Development Certificate. -To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only). For establishing trust on other platforms please refer to the platform specific documentation. +To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only). For establishing trust on other platforms refer to the platform specific documentation. For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054. - ASP.NET Core + ASP.NET Core ------------ Úspěšně se podařilo nainstalovat certifikát pro vývoj ASP.NET Core HTTPS Development Certificate. Pokud chcete certifikátu důvěřovat (platí jenom pro Windows a macOS), nainstalujte nejprve nástroj dev-certs. To uděláte tak, že spustíte dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final a potom dotnet-dev-certs https --trust. diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.de.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.de.xlf index f2b67098c..66f168ce1 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.de.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.de.xlf @@ -62,9 +62,9 @@ Im Folgenden finden Sie einige Optionen, um diesen Fehler zu beheben: ASP.NET Core ------------ Successfully installed the ASP.NET Core HTTPS Development Certificate. -To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only). For establishing trust on other platforms please refer to the platform specific documentation. +To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only). For establishing trust on other platforms refer to the platform specific documentation. For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054. - ASP.NET Core + ASP.NET Core ------------ Das ASP.NET Core-HTTPS-Entwicklungszertifikat wurde erfolgreich installiert. Um dem Zertifikat zu vertrauen (nur Windows und macOS), installieren Sie zuerst das Tool "dev-certs", indem Sie "dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final" und anschließend "dotnet-dev-certs https --trust" ausführen. diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf index 253e9ec87..92ba74e98 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf @@ -61,9 +61,9 @@ Estas son algunas opciones para corregir este error: ASP.NET Core ------------ Successfully installed the ASP.NET Core HTTPS Development Certificate. -To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only). For establishing trust on other platforms please refer to the platform specific documentation. +To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only). For establishing trust on other platforms refer to the platform specific documentation. For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054. - ASP.NET Core + ASP.NET Core ------------ El certificado de desarrollo HTTPS de ASP.NET Core se ha instalado correctamente. Para confiar en el certificado (solo Windows y macOS), instale primero la herramienta dev-certs ejecutando "dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final" y, después, ejecute "dotnet-dev-certs https --trust". diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf index f79dc8753..87b7b520b 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf @@ -62,9 +62,9 @@ Voici quelques options pour corriger cette erreur : ASP.NET Core ------------ Successfully installed the ASP.NET Core HTTPS Development Certificate. -To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only). For establishing trust on other platforms please refer to the platform specific documentation. +To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only). For establishing trust on other platforms refer to the platform specific documentation. For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054. - ASP.NET Core + ASP.NET Core ------------ Installation réussie du certificat de développement HTTPS ASP.NET Core. Pour approuver le certificat (Windows et macOS uniquement), installez d'abord l'outil dev-certs en exécutant 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final', puis exécutez 'dotnet-dev-certs https --trust'. diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf index 59c09be7d..4c7b616b3 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf @@ -62,9 +62,9 @@ Ecco alcune opzioni per correggere questo errore: ASP.NET Core ------------ Successfully installed the ASP.NET Core HTTPS Development Certificate. -To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only). For establishing trust on other platforms please refer to the platform specific documentation. +To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only). For establishing trust on other platforms refer to the platform specific documentation. For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054. - ASP.NET Core + ASP.NET Core ------------ Il certificato di sviluppo HTTPS di ASP.NET Core è stato installato. Per considerare attendibile il certificato (solo Windows e macOS), installare prima lo strumento dev-certs eseguendo 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' e quindi eseguire 'dotnet-dev-certs https --trust'. diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf index 7c9fe999b..6db3102f3 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf @@ -62,9 +62,9 @@ Here are some options to fix this error: ASP.NET Core ------------ Successfully installed the ASP.NET Core HTTPS Development Certificate. -To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only). For establishing trust on other platforms please refer to the platform specific documentation. +To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only). For establishing trust on other platforms refer to the platform specific documentation. For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054. - ASP.NET Core + ASP.NET Core ------------ ASP.NET Core HTTPS 開発証明書が正常にインストールされました。 証明書を信頼する (Windows および macOS のみ) には、まず 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' を実行して dev-certs ツールをインストールし、次に 'dotnet-dev-certs https --trust' を実行します。 diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf index 46bfb003c..437834ee8 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf @@ -62,9 +62,9 @@ Here are some options to fix this error: ASP.NET Core ------------ Successfully installed the ASP.NET Core HTTPS Development Certificate. -To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only). For establishing trust on other platforms please refer to the platform specific documentation. +To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only). For establishing trust on other platforms refer to the platform specific documentation. For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054. - ASP.NET Core + ASP.NET Core ------------ ASP.NET Core HTTPS 개발 인증서를 설치했습니다. 인증서를 신뢰하려면(Windows 및 macOS만 해당) 먼저 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final'을 실행하여 dev-certs 도구를 설치한 다음, 'dotnet-dev-certs https --trust'를 실행하세요. diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf index 64a0a11fb..1a36eef5f 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf @@ -62,9 +62,9 @@ Oto kilka opcji naprawiania tego błędu: ASP.NET Core ------------ Successfully installed the ASP.NET Core HTTPS Development Certificate. -To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only). For establishing trust on other platforms please refer to the platform specific documentation. +To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only). For establishing trust on other platforms refer to the platform specific documentation. For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054. - ASP.NET Core + ASP.NET Core ------------ Pomyślnie zainstalowano certyfikat deweloperski protokołu HTTPS programu ASP.NET Core. Aby ufać temu certyfikatowi (dotyczy tylko systemów Windows i macOS), najpierw zainstaluj narzędzie dev-certs, uruchamiając polecenie „dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final”, a następnie uruchom polecenie „dotnet-dev-certs https --trust”. diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pt-BR.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pt-BR.xlf index aaf73e0a5..562bf81f8 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pt-BR.xlf @@ -62,9 +62,9 @@ Aqui estão algumas opções para corrigir este erro: ASP.NET Core ------------ Successfully installed the ASP.NET Core HTTPS Development Certificate. -To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only). For establishing trust on other platforms please refer to the platform specific documentation. +To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only). For establishing trust on other platforms refer to the platform specific documentation. For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054. - ASP.NET Core + ASP.NET Core ------------ Certificado de Desenvolvimento HTTPS ASP.NET Core instalado com êxito. Para confiar no certificado (apenas Windows e macOS), primeiramente instale a ferramenta dev-certs executando 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' e, em seguida, execute 'dotnet-dev-certs https --trust'. diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ru.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ru.xlf index cc4f9d3d4..fc822407e 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ru.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ru.xlf @@ -62,9 +62,9 @@ Here are some options to fix this error: ASP.NET Core ------------ Successfully installed the ASP.NET Core HTTPS Development Certificate. -To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only). For establishing trust on other platforms please refer to the platform specific documentation. +To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only). For establishing trust on other platforms refer to the platform specific documentation. For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054. - ASP.NET Core + ASP.NET Core ------------ Сертификат разработки HTTPS для ASP.NET Core установлен. Чтобы сделать сертификат доверенным (только Windows и macOS), сначала установите инструмент dev-certs, выполнив команду "dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final", а затем выполните "dotnet-dev-certs https --trust". diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.tr.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.tr.xlf index d992f3a49..3017aadab 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.tr.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.tr.xlf @@ -62,9 +62,9 @@ Bu hatayı düzeltmek için bazı seçenekler: ASP.NET Core ------------ Successfully installed the ASP.NET Core HTTPS Development Certificate. -To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only). For establishing trust on other platforms please refer to the platform specific documentation. +To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only). For establishing trust on other platforms refer to the platform specific documentation. For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054. - ASP.NET Core + ASP.NET Core ------------ ASP.NET Core HTTPS Geliştirme Sertifikası başarıyla yüklendi. Sertifikaya güvenmek için (yalnızca Windows ve macOS) önce 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final', sonra 'dotnet-dev-certs https --trust' komutlarını çalıştırarak dev-certs aracını yükleyin. diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hans.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hans.xlf index 7b81395c4..86a94827f 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hans.xlf @@ -62,9 +62,9 @@ Here are some options to fix this error: ASP.NET Core ------------ Successfully installed the ASP.NET Core HTTPS Development Certificate. -To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only). For establishing trust on other platforms please refer to the platform specific documentation. +To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only). For establishing trust on other platforms refer to the platform specific documentation. For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054. - ASP.NET Core + ASP.NET Core ------------ 已成功安装 ASP.NET Core HTTPS 开发证书。 要信任证书(仅限 Windows 和 macOS)，请首先通过运行 "dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final" 安装 dev-certs 工具，然后运行 "dotnet-dev-certs https --trust"。 diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hant.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hant.xlf index 47f2b66cb..a6370e727 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hant.xlf @@ -62,9 +62,9 @@ Here are some options to fix this error: ASP.NET Core ------------ Successfully installed the ASP.NET Core HTTPS Development Certificate. -To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only). For establishing trust on other platforms please refer to the platform specific documentation. +To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only). For establishing trust on other platforms refer to the platform specific documentation. For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054. - ASP.NET Core + ASP.NET Core ------------ 已成功安裝 ASP.NET Core HTTPS 開發憑證。 若要信任此憑證 (僅限 Windows 與 macOS)，請先執行 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' 來安裝 dev-certs 工具，然後再執行 'dotnet-dev-certs https --trust'。 From 817870e97773b6c00b4d4d667d0646c9220c1683 Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Fri, 4 May 2018 10:58:07 -0700 Subject: [PATCH 118/118] Insert NuGet Build 4.8.0-preview1.5158 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index ddbd48859..d43a82a95 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -34,7 +34,7 @@ 1.3.1-alpha-62806-04 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 0.2.0-beta-62628-01 - 4.7.0-rtm.5081 + 4.8.0-preview1.5158 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion)