From f388933ebb61941568e63203de430c5c54c9be62 Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 30 May 2018 17:45:17 -0700 Subject: [PATCH 01/73] Set Default aspnetcore metapackage versions --- build/MSBuildExtensions.targets | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets index 1ada841ca..ef6729dce 100644 --- a/build/MSBuildExtensions.targets +++ b/build/MSBuildExtensions.targets @@ -116,6 +116,13 @@ <_AspNetCoreAllPackageVersion>$(MicrosoftAspNetCoreAllPackageVersion) <_AspNetCoreAppPackageVersion>$(MicrosoftAspNetCoreAppPackageVersion) + + <_DefaultPatchVersionForAspNetCoreAll2_1>2.1.1 + <_DefaultPatchVersionForAspNetCoreApp2_1>$(_DefaultPatchVersionForAspNetCoreAll2_1) + + <_DefaultPatchVersionForAspNetCoreAll2_1 Condition="$(_AspNetCoreAllPackageVersion.StartsWith('$(_DefaultPatchVersionForAspNetCoreAll2_1)'))">$(_AspNetCoreAllPackageVersion) + <_DefaultPatchVersionForAspNetCoreApp2_1 Condition="$(_AspNetCoreAppPackageVersion.StartsWith('$(_DefaultPatchVersionForAspNetCoreApp2_1)'))">$(_AspNetCoreAppPackageVersion) + <_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1]) <_NETStandardTargetFrameworkVersion>$(_NETStandardLibraryPackageVersion.Split('.')[0]).$(_NETStandardLibraryPackageVersion.Split('.')[1]) @@ -170,6 +177,10 @@ Copyright (c) .NET Foundation. All rights reserved. $(SdkVersion) <_NETCoreSdkIsPreview>$(_NETCoreSdkIsPreview) + + $(_DefaultPatchVersionForAspNetCoreAll2_1) + $(_DefaultPatchVersionForAspNetCoreApp2_1) + 1.0.11 1.1.8 From 538aa557b09a35aa8c32f63a5ac6c0830138bbc9 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 31 May 2018 10:34:02 -0700 Subject: [PATCH 02/73] Upgrade to aspnetcore 2.1.1-rtm-30818 and react to file name change --- build/BundledRuntimes.props | 2 +- build/DependencyVersions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index 40003b788..e290e4daf 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -37,7 +37,7 @@ $(AspNetCoreSharedFxInstallerRid) x64 - aspnetcore-runtime-$(AspNetCoreVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerEndSuffix)$(InstallerExtension) + aspnetcore-runtime-$(AspNetCoreVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) aspnetcore-runtime-internal-$(AspNetCoreVersion)-$(AspNetCoreSharedFxInstallerRid).wixlib $(PackagesDirectory)/$(DownloadedAspNetCoreSharedFxInstallerFileName) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index d79ed2c5e..f9ea37abf 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.1.0 + 2.1.1-rtm-30818 $(MicrosoftAspNetCoreAllPackageVersion) 2.1.0 $(MicrosoftNETCoreAppPackageVersion) From 0fa8657fb1a15881699c4b967b2fa705daea9d1d Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 31 May 2018 11:07:55 -0700 Subject: [PATCH 03/73] Fixup myget feed for aspnetcore --- build/NugetConfigFile.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets index 5e72d79b7..266a9cf81 100644 --- a/build/NugetConfigFile.targets +++ b/build/NugetConfigFile.targets @@ -19,7 +19,7 @@ - + From a997650cb47f09f8a385450914112f90a5587846 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 31 May 2018 11:54:12 -0700 Subject: [PATCH 04/73] Split the version of Microsoft.AspNetCore.DeveloperCertificates.XPlat into a separate variable --- build/DependencyVersions.props | 1 + src/dotnet/dotnet.csproj | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index f9ea37abf..f23e59336 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -3,6 +3,7 @@ 2.1.1-rtm-30818 $(MicrosoftAspNetCoreAllPackageVersion) + 2.1.0 2.1.0 $(MicrosoftNETCoreAppPackageVersion) 15.7.179 diff --git a/src/dotnet/dotnet.csproj b/src/dotnet/dotnet.csproj index b739ba700..3b6a976f2 100644 --- a/src/dotnet/dotnet.csproj +++ b/src/dotnet/dotnet.csproj @@ -77,7 +77,7 @@ - + From 276045d95789e07dd33acef943ca5292f4982b31 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 31 May 2018 12:39:56 -0700 Subject: [PATCH 05/73] Set package versions for bundled aspnet tools separately from the metapackage version --- build/BundledDotnetTools.props | 10 +++++----- build/DependencyVersions.props | 5 +++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/build/BundledDotnetTools.props b/build/BundledDotnetTools.props index 1df3521de..bd3259451 100644 --- a/build/BundledDotnetTools.props +++ b/build/BundledDotnetTools.props @@ -1,9 +1,9 @@ - - - - - + + + + + diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index f23e59336..b1f97ce19 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -4,6 +4,11 @@ 2.1.1-rtm-30818 $(MicrosoftAspNetCoreAllPackageVersion) 2.1.0 + 2.1.1-rtm-30818 + 2.1.0 + 2.1.0 + 2.1.0 + 2.1.0 2.1.0 $(MicrosoftNETCoreAppPackageVersion) 15.7.179 From 1386aa28e114e9bacbd2d63935121446c80aea66 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 31 May 2018 14:44:21 -0700 Subject: [PATCH 06/73] Fix mismatch of dotnet-watch with package variable name --- .../Microsoft.DotNet.Cli.Utils.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj b/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj index 222c14025..51f9ce940 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj @@ -52,7 +52,7 @@ DotnetToolsLayoutDirectory=$(SdkOutputDirectory)/DotnetTools; TemplateFillInPackageName=dotnet-watch; - TemplateFillInPackageVersion=$(AspNetCoreVersion); + TemplateFillInPackageVersion=$(DotnetWatchPackageVersion); PreviousStageDirectory=$(PreviousStageDirectory); DotnetToolsLayoutDirectory=$(testAssetSourceRoot); DotnetToolsRestoreProjectStyle=DotnetToolReference From ea539c7f6345303f4309c3f6aa0c5a3012839cad Mon Sep 17 00:00:00 2001 From: William Li Date: Tue, 22 May 2018 09:55:10 -0700 Subject: [PATCH 07/73] Add retry when Directory.Move (#9313) --- .../FileAccessRetryer.cs | 31 +++++++++++++++++++ src/dotnet/ShellShim/ShellShimRepository.cs | 4 +-- .../ToolPackage/ToolPackageInstaller.cs | 3 +- src/dotnet/ToolPackage/ToolPackageInstance.cs | 5 +-- 4 files changed, 38 insertions(+), 5 deletions(-) diff --git a/src/Microsoft.DotNet.Cli.Utils/FileAccessRetryer.cs b/src/Microsoft.DotNet.Cli.Utils/FileAccessRetryer.cs index f73d5d4d1..80201ecac 100644 --- a/src/Microsoft.DotNet.Cli.Utils/FileAccessRetryer.cs +++ b/src/Microsoft.DotNet.Cli.Utils/FileAccessRetryer.cs @@ -3,6 +3,7 @@ using System; using System.IO; +using System.Threading; using System.Threading.Tasks; namespace Microsoft.DotNet.Cli.Utils @@ -47,5 +48,35 @@ namespace Microsoft.DotNet.Cli.Utils } } } + + /// + /// Run Directory.Move and File.Move in Windows has a chance to get IOException with + /// HResult 0x80070005 due to Indexer. But this error is transient. + /// + internal static void RetryOnMoveAccessFailure(Action action) + { + const int ERROR_HRESULT_ACCESS_DENIED = unchecked((int)0x80070005); + int nextWaitTime = 10; + int remainRetry = 10; + + while (true) + { + try + { + action(); + break; + } + catch (IOException e) when (e.HResult == ERROR_HRESULT_ACCESS_DENIED) + { + Thread.Sleep(nextWaitTime); + nextWaitTime *= 2; + remainRetry--; + if (remainRetry == 0) + { + throw; + } + } + } + } } } diff --git a/src/dotnet/ShellShim/ShellShimRepository.cs b/src/dotnet/ShellShim/ShellShimRepository.cs index 121582cf6..a2ebd78a4 100644 --- a/src/dotnet/ShellShim/ShellShimRepository.cs +++ b/src/dotnet/ShellShim/ShellShimRepository.cs @@ -113,7 +113,7 @@ namespace Microsoft.DotNet.ShellShim foreach (var file in GetShimFiles(commandName).Where(f => _fileSystem.File.Exists(f.Value))) { var tempPath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName()); - _fileSystem.File.Move(file.Value, tempPath); + FileAccessRetrier.RetryOnMoveAccessFailure(() => _fileSystem.File.Move(file.Value, tempPath)); files[file.Value] = tempPath; } } @@ -137,7 +137,7 @@ namespace Microsoft.DotNet.ShellShim rollback: () => { foreach (var kvp in files) { - _fileSystem.File.Move(kvp.Value, kvp.Key); + FileAccessRetrier.RetryOnMoveAccessFailure(() => _fileSystem.File.Move(kvp.Value, kvp.Key)); } }); } diff --git a/src/dotnet/ToolPackage/ToolPackageInstaller.cs b/src/dotnet/ToolPackage/ToolPackageInstaller.cs index 0fce39a61..14ea51d25 100644 --- a/src/dotnet/ToolPackage/ToolPackageInstaller.cs +++ b/src/dotnet/ToolPackage/ToolPackageInstaller.cs @@ -4,6 +4,7 @@ using System.IO; using System.Linq; using System.Xml.Linq; using Microsoft.DotNet.Cli; +using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.Configurer; using Microsoft.DotNet.Tools; using Microsoft.Extensions.EnvironmentAbstractions; @@ -82,7 +83,7 @@ namespace Microsoft.DotNet.ToolPackage } Directory.CreateDirectory(packageRootDirectory.Value); - Directory.Move(stageDirectory.Value, packageDirectory.Value); + FileAccessRetrier.RetryOnMoveAccessFailure(() => Directory.Move(stageDirectory.Value, packageDirectory.Value)); rollbackDirectory = packageDirectory.Value; return new ToolPackageInstance(_store, packageId, version, packageDirectory); diff --git a/src/dotnet/ToolPackage/ToolPackageInstance.cs b/src/dotnet/ToolPackage/ToolPackageInstance.cs index c8be8d5ca..9a8041582 100644 --- a/src/dotnet/ToolPackage/ToolPackageInstance.cs +++ b/src/dotnet/ToolPackage/ToolPackageInstance.cs @@ -8,6 +8,7 @@ using Microsoft.Extensions.EnvironmentAbstractions; using NuGet.ProjectModel; using NuGet.Versioning; using Microsoft.DotNet.Cli.Utils; +using System.Threading; namespace Microsoft.DotNet.ToolPackage { @@ -79,7 +80,7 @@ namespace Microsoft.DotNet.ToolPackage // Use the staging directory for uninstall // This prevents cross-device moves when temp is mounted to a different device var tempPath = _store.GetRandomStagingDirectory().Value; - Directory.Move(PackageDirectory.Value, tempPath); + FileAccessRetrier.RetryOnMoveAccessFailure(() => Directory.Move(PackageDirectory.Value, tempPath)); tempPackageDirectory = tempPath; } @@ -111,7 +112,7 @@ namespace Microsoft.DotNet.ToolPackage if (tempPackageDirectory != null) { Directory.CreateDirectory(rootDirectory.Value); - Directory.Move(tempPackageDirectory, PackageDirectory.Value); + FileAccessRetrier.RetryOnMoveAccessFailure(() => Directory.Move(tempPackageDirectory, PackageDirectory.Value)); } }); } From e9a1bd434a45ec617f41fcc7bbc5b6c879f7a351 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 1 Jun 2018 12:01:42 -0700 Subject: [PATCH 08/73] Ensure default aspnetcore metapackage versions doesn't jump when/if we ever get to version `2.1.10` --- build/MSBuildExtensions.targets | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets index ef6729dce..042cd2e93 100644 --- a/build/MSBuildExtensions.targets +++ b/build/MSBuildExtensions.targets @@ -119,9 +119,9 @@ <_DefaultPatchVersionForAspNetCoreAll2_1>2.1.1 <_DefaultPatchVersionForAspNetCoreApp2_1>$(_DefaultPatchVersionForAspNetCoreAll2_1) - - <_DefaultPatchVersionForAspNetCoreAll2_1 Condition="$(_AspNetCoreAllPackageVersion.StartsWith('$(_DefaultPatchVersionForAspNetCoreAll2_1)'))">$(_AspNetCoreAllPackageVersion) - <_DefaultPatchVersionForAspNetCoreApp2_1 Condition="$(_AspNetCoreAppPackageVersion.StartsWith('$(_DefaultPatchVersionForAspNetCoreApp2_1)'))">$(_AspNetCoreAppPackageVersion) + + <_DefaultPatchVersionForAspNetCoreAll2_1 Condition="$(_AspNetCoreAllPackageVersion.StartsWith('$(_DefaultPatchVersionForAspNetCoreAll2_1)-'))">$(_AspNetCoreAllPackageVersion) + <_DefaultPatchVersionForAspNetCoreApp2_1 Condition="$(_AspNetCoreAppPackageVersion.StartsWith('$(_DefaultPatchVersionForAspNetCoreApp2_1)-'))">$(_AspNetCoreAppPackageVersion) <_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1]) From c078dda8c723d15162e0c20439dccefbc5563f6b Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Sun, 3 Jun 2018 08:45:34 -0700 Subject: [PATCH 09/73] Remove -upgrade suffix from installer inputs --- build/BundledRuntimes.props | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index e290e4daf..45234b98b 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -6,24 +6,21 @@ -internal - - -upgrade - - dotnet-runtime-deps-$(SharedHostVersion)-$(CoreSetupRid)$(InstallerEndSuffix)$(InstallerExtension) + dotnet-runtime-deps-$(SharedHostVersion)-$(CoreSetupRid)$(InstallerExtension) $(PackagesDirectory)/$(DownloadedRuntimeDepsInstallerFileName) $(CoreSetupRid) x64 - dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerEndSuffix)$(InstallerExtension) + dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) $(PackagesDirectory)/$(DownloadedSharedHostInstallerFileName) - dotnet-hostfxr$(InstallerStartSuffix)-$(HostFxrVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerEndSuffix)$(InstallerExtension) + dotnet-hostfxr$(InstallerStartSuffix)-$(HostFxrVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) $(PackagesDirectory)/$(DownloadedHostFxrInstallerFileName) - dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerEndSuffix)$(InstallerExtension) + dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) $(PackagesDirectory)/$(DownloadedSharedFrameworkInstallerFileName) From 9ff4188d483586ef562711ff9e6718ab28111a1e Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 4 Jun 2018 10:36:54 -0700 Subject: [PATCH 10/73] Fix alpine file ownership issues with newer docker Upgrades to a newer docker version (18.03.1-ce) caused files created inside to be owned by root on alpine. It appears that the logic to set up the user in the container so that this doesn't happen was missing from alpine. While it's not clear why it worked before at all, the logic has been duplicated (tweaked for the alpine base image). --- scripts/docker/alpine.3.6/Dockerfile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/docker/alpine.3.6/Dockerfile b/scripts/docker/alpine.3.6/Dockerfile index 746f1bd4b..2dc797963 100644 --- a/scripts/docker/alpine.3.6/Dockerfile +++ b/scripts/docker/alpine.3.6/Dockerfile @@ -9,6 +9,15 @@ FROM microsoft/dotnet-buildtools-prereqs:alpine-3.6-3148f11-20171119021156 # This Dockerfile doesn't use the USER_ID, but the parameter needs to be declared to prevent docker # from issuing a warning ARG USER_ID=0 +RUN adduser code_executor -u ${USER_ID} -G root -D +RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers + +# With the User Change, we need to change permssions 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 From 0015821db64340362177aa2202b8a0e3ae94ed5d Mon Sep 17 00:00:00 2001 From: jbeisner Date: Tue, 5 Jun 2018 16:51:32 +0000 Subject: [PATCH 11/73] Pass "PB_AssetRootUrl" explictly on the MSBuild call; we are looking for Microsoft.NETCore.App "2.1.0" or "2.1.1*" --- build/Test.targets | 2 +- .../GivenAProjectToolsCommandResolver.cs | 2 +- test/dotnet-new.Tests/GivenThatIWantANewApp.cs | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build/Test.targets b/build/Test.targets index 39cc79f83..9f4ce8778 100644 --- a/build/Test.targets +++ b/build/Test.targets @@ -89,7 +89,7 @@ - diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs index 89d74d82f..6fbf38387 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs @@ -304,7 +304,7 @@ namespace Microsoft.DotNet.Tests result.Should().NotBeNull(); - result.Args.Should().Contain("--fx-version 2.1.0"); + result.Args.Should().Contain("--fx-version 2.1."); } [Fact] diff --git a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs index bb2c148f5..98e17ce06 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs @@ -75,8 +75,7 @@ namespace Microsoft.DotNet.New.Tests } [Theory] - [InlineData("console", "microsoft.netcore.app")] - // re-enable when this bug is resolved: https://github.com/dotnet/cli/issues/7574 + // [InlineData("console", "microsoft.netcore.app")] re-enable when this issue is resolved: "https://github.com/dotnet/cli/issues/9420" [InlineData("classlib", "netstandard.library")] public void NewProjectRestoresCorrectPackageVersion(string type, string packageName) { @@ -107,7 +106,7 @@ namespace Microsoft.DotNet.New.Tests var sharedFxDir = dotnetDir .GetDirectory("shared", "Microsoft.NETCore.App") .EnumerateDirectories() - .Single(d => d.Name.StartsWith("2.1.0")); + .Single(d => d.Name.StartsWith("2.1.")); if (packageName == "microsoft.netcore.app") { From 74a7d63e43b43b78d5800cd22ea3aba221c1df86 Mon Sep 17 00:00:00 2001 From: jbeisner Date: Tue, 5 Jun 2018 17:51:19 +0000 Subject: [PATCH 12/73] Update the version for 'microsoft.netcore.app' to "2.1.1*" --- build/DependencyVersions.props | 2 +- .../GivenAProjectToolsCommandResolver.cs | 2 +- test/dotnet-new.Tests/GivenThatIWantANewApp.cs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index b1f97ce19..fd00a864f 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -9,7 +9,7 @@ 2.1.0 2.1.0 2.1.0 - 2.1.0 + 2.1.1-rtm-26531-02 $(MicrosoftNETCoreAppPackageVersion) 15.7.179 $(MicrosoftBuildPackageVersion) diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs index 6fbf38387..632a1cc36 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs @@ -304,7 +304,7 @@ namespace Microsoft.DotNet.Tests result.Should().NotBeNull(); - result.Args.Should().Contain("--fx-version 2.1."); + result.Args.Should().Contain("--fx-version 2.1.1"); } [Fact] diff --git a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs index 98e17ce06..84c0011e5 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs @@ -75,7 +75,7 @@ namespace Microsoft.DotNet.New.Tests } [Theory] - // [InlineData("console", "microsoft.netcore.app")] re-enable when this issue is resolved: "https://github.com/dotnet/cli/issues/9420" + [InlineData("console", "microsoft.netcore.app")] [InlineData("classlib", "netstandard.library")] public void NewProjectRestoresCorrectPackageVersion(string type, string packageName) { @@ -106,7 +106,7 @@ namespace Microsoft.DotNet.New.Tests var sharedFxDir = dotnetDir .GetDirectory("shared", "Microsoft.NETCore.App") .EnumerateDirectories() - .Single(d => d.Name.StartsWith("2.1.")); + .Single(d => d.Name.StartsWith("2.1.1")); if (packageName == "microsoft.netcore.app") { From 79b4809559ea63105f39a19cf16b70f38d81711a Mon Sep 17 00:00:00 2001 From: jbeisner Date: Tue, 5 Jun 2018 18:25:07 +0000 Subject: [PATCH 13/73] Disable NewProjectRestoresCorrectPackageVersion "console" test for now. --- test/dotnet-new.Tests/GivenThatIWantANewApp.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs index 84c0011e5..cb9d8135e 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs @@ -75,7 +75,7 @@ namespace Microsoft.DotNet.New.Tests } [Theory] - [InlineData("console", "microsoft.netcore.app")] + // [InlineData("console", "microsoft.netcore.app")] re-enable when this issue is resolved: "https://github.com/dotnet/cli/issues/9420" [InlineData("classlib", "netstandard.library")] public void NewProjectRestoresCorrectPackageVersion(string type, string packageName) { From d99a367db0aec129440b566188064dd66434820d Mon Sep 17 00:00:00 2001 From: Sarabjot Singh Date: Wed, 6 Jun 2018 15:56:55 +0530 Subject: [PATCH 14/73] Inserting Testplatform 15.8.0-preview-20180605-02 package in dotnet cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 31c330ab5..44bd6fdbd 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -46,7 +46,7 @@ $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) - 15.8.0-preview-20180510-03 + 15.8.0-preview-20180605-02 $(MicrosoftNETTestSdkPackageVersion) $(MicrosoftNETTestSdkPackageVersion) 0.2.0-beta-000042 From 2594a6d7ec19059638028ecf22436d4e3e677c5b Mon Sep 17 00:00:00 2001 From: William Li Date: Wed, 6 Jun 2018 11:22:19 -0700 Subject: [PATCH 15/73] Always store absolute full path in directory and file path (#9363) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There is no need to store relative path today. But some part of the system does not accept relative path and there is no indication if it is storing full path or not. This is the root cause of https://github.com/dotnet/cli/issues/9319 “someplace” means different full path for Path class on unix and Windows. And the mock file system uses real Path class. Change tests' setup to use essentially “TEMPATH/someplace” instead of “someplace” --- .../DirectoryPath.cs | 11 ++++- .../FilePath.cs | 9 ++++ .../Mock/FileSystemMockBuilder.cs | 11 +++++ .../BuildServerProviderTests.cs | 24 +++++----- .../BuildServerTests/RazorServerTests.cs | 16 ++++--- .../CommandTests/ToolInstallCommandTests.cs | 48 ++++++++++--------- .../CommandTests/ToolUninstallCommandTests.cs | 27 ++++++----- .../CommandTests/ToolUpdateCommandTests.cs | 16 ++++--- 8 files changed, 104 insertions(+), 58 deletions(-) diff --git a/src/Microsoft.DotNet.InternalAbstractions/DirectoryPath.cs b/src/Microsoft.DotNet.InternalAbstractions/DirectoryPath.cs index 3d578432e..c05177f61 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/DirectoryPath.cs +++ b/src/Microsoft.DotNet.InternalAbstractions/DirectoryPath.cs @@ -10,8 +10,17 @@ namespace Microsoft.Extensions.EnvironmentAbstractions { public string Value { get; } + /// + /// Create DirectoryPath to repesent a absolute directory path. Note it may not exist. + /// + /// If the value is not rooted. Path.GetFullPath will be called during the consturctor. public DirectoryPath(string value) { + if (!Path.IsPathRooted(value)) + { + value = Path.GetFullPath(value); + } + Value = value; } @@ -46,7 +55,7 @@ namespace Microsoft.Extensions.EnvironmentAbstractions public DirectoryPath GetParentPath() { - return new DirectoryPath(Directory.GetParent(Path.GetFullPath(Value)).FullName); + return new DirectoryPath(Path.GetDirectoryName(Value)); } } } diff --git a/src/Microsoft.DotNet.InternalAbstractions/FilePath.cs b/src/Microsoft.DotNet.InternalAbstractions/FilePath.cs index 9dbbf8c83..7b7caee28 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/FilePath.cs +++ b/src/Microsoft.DotNet.InternalAbstractions/FilePath.cs @@ -9,8 +9,17 @@ namespace Microsoft.Extensions.EnvironmentAbstractions { public string Value { get; } + /// + /// Create FilePath to repesent a absolute file path. Note it may not exist. + /// + /// If the value is not rooted. Path.GetFullPath will be called during the consturctor. public FilePath(string value) { + if (!Path.IsPathRooted(value)) + { + value = Path.GetFullPath(value); + } + Value = value; } diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/FileSystemMockBuilder.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/FileSystemMockBuilder.cs index 4320d0da6..7f3166bf2 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/FileSystemMockBuilder.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/FileSystemMockBuilder.cs @@ -39,6 +39,17 @@ namespace Microsoft.Extensions.DependencyModel.Tests return this; } + /// + /// Just a "home" means different path on Windows and Unix. + /// Create a platform dependent Temporary directory path and use it to avoid further mis interpretation in + /// later tests. Like "c:/home vs /home". Instead always use Path.Combine(TempraryDirectory, "home") + /// + internal FileSystemMockBuilder UseCurrentSystemTemporaryDirectory() + { + TemporaryFolder = Path.GetTempPath(); + return this; + } + internal IFileSystem Build() { return new FileSystemMock(_files, TemporaryFolder); diff --git a/test/dotnet.Tests/BuildServerTests/BuildServerProviderTests.cs b/test/dotnet.Tests/BuildServerTests/BuildServerProviderTests.cs index 15f9a94ea..0c93cd041 100644 --- a/test/dotnet.Tests/BuildServerTests/BuildServerProviderTests.cs +++ b/test/dotnet.Tests/BuildServerTests/BuildServerProviderTests.cs @@ -81,37 +81,39 @@ namespace Microsoft.DotNet.Tests.BuildServerTests [Fact] public void GivenEnvironmentVariableItUsesItForThePidDirectory() { - const string PidDirectory = "path/to/some/directory"; - + IFileSystem fileSystem = new FileSystemMockBuilder().UseCurrentSystemTemporaryDirectory().Build(); + var pidDirectory = Path.Combine(fileSystem.Directory.CreateTemporaryDirectory().DirectoryPath, "path/to/some/directory"); var provider = new BuildServerProvider( - new FileSystemMockBuilder().Build(), - CreateEnvironmentProviderMock(PidDirectory).Object); + fileSystem, + CreateEnvironmentProviderMock(pidDirectory).Object); provider .GetPidFileDirectory() .Value .Should() - .Be(PidDirectory); + .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( + var fileSystemMockBuilder = new FileSystemMockBuilder(); + fileSystemMockBuilder.UseCurrentSystemTemporaryDirectory(); + var serverPath = Path.Combine(fileSystemMockBuilder.TemporaryFolder, "path/to/rzc.dll"); + + IFileSystem fileSystemMock = fileSystemMockBuilder.AddFile( pidFilePath, - $"{ProcessId}{Environment.NewLine}{RazorPidFile.RazorServerType}{Environment.NewLine}{ServerPath}{Environment.NewLine}{PipeName}") + $"{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(); + .Build(); var provider = new BuildServerProvider( fileSystemMock, @@ -127,7 +129,7 @@ namespace Microsoft.DotNet.Tests.BuildServerTests 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.ServerPath.Value.Should().Be(serverPath); razorServer.PidFile.PipeName.Should().Be(PipeName); } diff --git a/test/dotnet.Tests/BuildServerTests/RazorServerTests.cs b/test/dotnet.Tests/BuildServerTests/RazorServerTests.cs index f9b1ea52f..3161c89c0 100644 --- a/test/dotnet.Tests/BuildServerTests/RazorServerTests.cs +++ b/test/dotnet.Tests/BuildServerTests/RazorServerTests.cs @@ -24,7 +24,6 @@ namespace Microsoft.DotNet.Tests.BuildServerTests public void GivenAFailedShutdownCommandItThrows() { const int ProcessId = 1234; - const string ServerPath = "path/to/rzc.dll"; const string PipeName = "some-pipe-name"; const string ErrorMessage = "error!"; @@ -33,17 +32,20 @@ namespace Microsoft.DotNet.Tests.BuildServerTests var fileSystemMock = new FileSystemMockBuilder() .AddFile(pidFilePath, "") + .UseCurrentSystemTemporaryDirectory() .Build(); fileSystemMock.File.Exists(pidFilePath).Should().BeTrue(); + var serverPath = Path.Combine(fileSystemMock.Directory.CreateTemporaryDirectory().DirectoryPath, "path/to/rzc.dll"); + var server = new RazorServer( pidFile: new RazorPidFile( path: new FilePath(pidFilePath), processId: ProcessId, - serverPath: new FilePath(ServerPath), + serverPath: new FilePath(serverPath), pipeName: PipeName), - commandFactory: CreateCommandFactoryMock(ServerPath, PipeName, exitCode: 1, stdErr: ErrorMessage).Object, + commandFactory: CreateCommandFactoryMock(serverPath, PipeName, exitCode: 1, stdErr: ErrorMessage).Object, fileSystem: fileSystemMock); Action a = () => server.Shutdown(); @@ -60,7 +62,6 @@ namespace Microsoft.DotNet.Tests.BuildServerTests 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"); @@ -68,17 +69,20 @@ namespace Microsoft.DotNet.Tests.BuildServerTests var fileSystemMock = new FileSystemMockBuilder() .AddFile(pidFilePath, "") + .UseCurrentSystemTemporaryDirectory() .Build(); fileSystemMock.File.Exists(pidFilePath).Should().BeTrue(); + var serverPath = Path.Combine(fileSystemMock.Directory.CreateTemporaryDirectory().DirectoryPath, "path/to/rzc.dll"); + var server = new RazorServer( pidFile: new RazorPidFile( path: new FilePath(pidFilePath), processId: ProcessId, - serverPath: new FilePath(ServerPath), + serverPath: new FilePath(serverPath), pipeName: PipeName), - commandFactory: CreateCommandFactoryMock(ServerPath, PipeName).Object, + commandFactory: CreateCommandFactoryMock(serverPath, PipeName).Object, fileSystem: fileSystemMock); server.Shutdown(); diff --git a/test/dotnet.Tests/CommandTests/ToolInstallCommandTests.cs b/test/dotnet.Tests/CommandTests/ToolInstallCommandTests.cs index eb9914064..c111e6104 100644 --- a/test/dotnet.Tests/CommandTests/ToolInstallCommandTests.cs +++ b/test/dotnet.Tests/CommandTests/ToolInstallCommandTests.cs @@ -35,24 +35,28 @@ namespace Microsoft.DotNet.Tests.Commands private readonly AppliedOption _appliedCommand; private readonly ParseResult _parseResult; private readonly BufferedReporter _reporter; - private const string PathToPlaceShim = "pathToPlace"; - private const string PathToPlacePackages = PathToPlaceShim + "pkg"; + private readonly string _temporaryDirectory; + private readonly string _pathToPlaceShim; + private readonly string _pathToPlacePackages; private const string PackageId = "global.tool.console.demo"; private const string PackageVersion = "1.0.4"; public ToolInstallCommandTests() { _reporter = new BufferedReporter(); - _fileSystem = new FileSystemMockBuilder().Build(); - _toolPackageStore = new ToolPackageStoreMock(new DirectoryPath(PathToPlacePackages), _fileSystem); + _fileSystem = new FileSystemMockBuilder().UseCurrentSystemTemporaryDirectory().Build(); + _temporaryDirectory = _fileSystem.Directory.CreateTemporaryDirectory().DirectoryPath; + _pathToPlaceShim = Path.Combine(_temporaryDirectory, "pathToPlace"); + _pathToPlacePackages = _pathToPlaceShim + "Packages"; + _toolPackageStore = new ToolPackageStoreMock(new DirectoryPath(_pathToPlacePackages), _fileSystem); _createShellShimRepository = (nonGlobalLocation) => new ShellShimRepository( - new DirectoryPath(PathToPlaceShim), + new DirectoryPath(_pathToPlaceShim), fileSystem: _fileSystem, appHostShellShimMaker: new AppHostShellShimMakerMock(_fileSystem), filePermissionSetter: new NoOpFilePermissionSetter()); _environmentPathInstructionMock = - new EnvironmentPathInstructionMock(_reporter, PathToPlaceShim); + new EnvironmentPathInstructionMock(_reporter, _pathToPlaceShim); _createToolPackageStoreAndInstaller = (_) => (_toolPackageStore, CreateToolPackageInstaller()); ParseResult result = Parser.Instance.Parse($"dotnet tool install -g {PackageId}"); @@ -197,7 +201,7 @@ namespace Microsoft.DotNet.Tests.Commands Environment.NewLine + string.Format(LocalizableStrings.ToolInstallationFailedWithRestoreGuidance, PackageId)); - _fileSystem.Directory.Exists(Path.Combine(PathToPlacePackages, PackageId)).Should().BeFalse(); + _fileSystem.Directory.Exists(Path.Combine(_pathToPlacePackages, PackageId)).Should().BeFalse(); } [Fact] @@ -220,7 +224,7 @@ namespace Microsoft.DotNet.Tests.Commands CommonLocalizableStrings.ShellShimConflict, ProjectRestorerMock.FakeCommandName)); - _fileSystem.Directory.Exists(Path.Combine(PathToPlacePackages, PackageId)).Should().BeFalse(); + _fileSystem.Directory.Exists(Path.Combine(_pathToPlacePackages, PackageId)).Should().BeFalse(); } [Fact] @@ -257,7 +261,7 @@ namespace Microsoft.DotNet.Tests.Commands _parseResult, _createToolPackageStoreAndInstaller, _createShellShimRepository, - new EnvironmentPathInstructionMock(_reporter, PathToPlaceShim, true), + new EnvironmentPathInstructionMock(_reporter, _pathToPlaceShim, true), _reporter); installCommand.Execute().Should().Be(0); @@ -284,7 +288,7 @@ namespace Microsoft.DotNet.Tests.Commands result, _createToolPackageStoreAndInstaller, _createShellShimRepository, - new EnvironmentPathInstructionMock(_reporter, PathToPlaceShim, true), + new EnvironmentPathInstructionMock(_reporter, _pathToPlaceShim, true), _reporter); Action action = () => installCommand.Execute(); @@ -307,7 +311,7 @@ namespace Microsoft.DotNet.Tests.Commands result, _createToolPackageStoreAndInstaller, _createShellShimRepository, - new EnvironmentPathInstructionMock(_reporter, PathToPlaceShim, true), + new EnvironmentPathInstructionMock(_reporter, _pathToPlaceShim, true), _reporter); installCommand.Execute().Should().Be(0); @@ -333,7 +337,7 @@ namespace Microsoft.DotNet.Tests.Commands result, _createToolPackageStoreAndInstaller, _createShellShimRepository, - new EnvironmentPathInstructionMock(_reporter, PathToPlaceShim, true), + new EnvironmentPathInstructionMock(_reporter, _pathToPlaceShim, true), _reporter); installCommand.Execute().Should().Be(0); @@ -359,7 +363,7 @@ namespace Microsoft.DotNet.Tests.Commands result, _createToolPackageStoreAndInstaller, _createShellShimRepository, - new EnvironmentPathInstructionMock(_reporter, PathToPlaceShim, true), + new EnvironmentPathInstructionMock(_reporter, _pathToPlaceShim, true), _reporter); Action a = () => installCommand.Execute(); @@ -369,7 +373,7 @@ namespace Microsoft.DotNet.Tests.Commands LocalizableStrings.ToolInstallationRestoreFailed + Environment.NewLine + string.Format(LocalizableStrings.ToolInstallationFailedWithRestoreGuidance, PackageId)); - _fileSystem.Directory.Exists(Path.Combine(PathToPlacePackages, PackageId)).Should().BeFalse(); + _fileSystem.Directory.Exists(Path.Combine(_pathToPlacePackages, PackageId)).Should().BeFalse(); } [Fact] @@ -383,7 +387,7 @@ namespace Microsoft.DotNet.Tests.Commands result, _createToolPackageStoreAndInstaller, _createShellShimRepository, - new EnvironmentPathInstructionMock(_reporter, PathToPlaceShim, true), + new EnvironmentPathInstructionMock(_reporter, _pathToPlaceShim, true), _reporter); installCommand.Execute().Should().Be(0); @@ -411,7 +415,7 @@ namespace Microsoft.DotNet.Tests.Commands parseResult, _createToolPackageStoreAndInstaller, _createShellShimRepository, - new EnvironmentPathInstructionMock(_reporter, PathToPlaceShim, true), + new EnvironmentPathInstructionMock(_reporter, _pathToPlaceShim, true), _reporter); Action a = () => installCommand.Execute(); @@ -433,7 +437,7 @@ namespace Microsoft.DotNet.Tests.Commands parseResult, _createToolPackageStoreAndInstaller, _createShellShimRepository, - new EnvironmentPathInstructionMock(_reporter, PathToPlaceShim, true), + new EnvironmentPathInstructionMock(_reporter, _pathToPlaceShim, true), _reporter); Action a = () => installCommand.Execute(); @@ -454,7 +458,7 @@ namespace Microsoft.DotNet.Tests.Commands parseResult, _createToolPackageStoreAndInstaller, _createShellShimRepository, - new EnvironmentPathInstructionMock(_reporter, PathToPlaceShim), + new EnvironmentPathInstructionMock(_reporter, _pathToPlaceShim), _reporter); installCommand.Execute().Should().Be(0); @@ -466,7 +470,7 @@ namespace Microsoft.DotNet.Tests.Commands public void AndPackagedShimIsProvidedWhenRunWithPackageIdItCreateShimUsingPackagedShim() { var extension = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".exe" : string.Empty; - var prepackagedShimPath = "packagedShimDirectory/" + ProjectRestorerMock.FakeCommandName + extension; + var prepackagedShimPath = Path.Combine (_temporaryDirectory, ProjectRestorerMock.FakeCommandName + extension); var tokenToIdentifyPackagedShim = "packagedShim"; _fileSystem.File.WriteAllText(prepackagedShimPath, tokenToIdentifyPackagedShim); @@ -490,7 +494,7 @@ namespace Microsoft.DotNet.Tests.Commands fileSystem: _fileSystem, reporter: _reporter))), _createShellShimRepository, - new EnvironmentPathInstructionMock(_reporter, PathToPlaceShim), + new EnvironmentPathInstructionMock(_reporter, _pathToPlaceShim), _reporter); installCommand.Execute().Should().Be(0); @@ -512,11 +516,11 @@ namespace Microsoft.DotNet.Tests.Commands installCallback: installCallback); } - private static string ExpectedCommandPath() + private string ExpectedCommandPath() { var extension = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".exe" : string.Empty; return Path.Combine( - "pathToPlace", + _pathToPlaceShim, ProjectRestorerMock.FakeCommandName + extension); } diff --git a/test/dotnet.Tests/CommandTests/ToolUninstallCommandTests.cs b/test/dotnet.Tests/CommandTests/ToolUninstallCommandTests.cs index 902d4eb1d..516c2e26a 100644 --- a/test/dotnet.Tests/CommandTests/ToolUninstallCommandTests.cs +++ b/test/dotnet.Tests/CommandTests/ToolUninstallCommandTests.cs @@ -34,14 +34,17 @@ namespace Microsoft.DotNet.Tests.Commands private const string PackageId = "global.tool.console.demo"; private const string PackageVersion = "1.0.4"; - private const string ShimsDirectory = "shims"; - private const string ToolsDirectory = "tools"; + private readonly string _shimsDirectory; + private readonly string _toolsDirectory; public ToolUninstallCommandTests() { _reporter = new BufferedReporter(); - _fileSystem = new FileSystemMockBuilder().Build(); - _environmentPathInstructionMock = new EnvironmentPathInstructionMock(_reporter, ShimsDirectory); + _fileSystem = new FileSystemMockBuilder().UseCurrentSystemTemporaryDirectory().Build(); + var tempDirectory = _fileSystem.Directory.CreateTemporaryDirectory().DirectoryPath; + _shimsDirectory = Path.Combine(tempDirectory, "shims"); + _toolsDirectory = Path.Combine(tempDirectory, "tools"); + _environmentPathInstructionMock = new EnvironmentPathInstructionMock(_reporter, _shimsDirectory); } [Fact] @@ -74,10 +77,10 @@ namespace Microsoft.DotNet.Tests.Commands PackageId, PackageVersion)); - var packageDirectory = new DirectoryPath(Path.GetFullPath(ToolsDirectory)) + var packageDirectory = new DirectoryPath(Path.GetFullPath(_toolsDirectory)) .WithSubDirectories(PackageId, PackageVersion); var shimPath = Path.Combine( - ShimsDirectory, + _shimsDirectory, ProjectRestorerMock.FakeCommandName + (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".exe" : "")); @@ -116,10 +119,10 @@ namespace Microsoft.DotNet.Tests.Commands PackageId, PackageVersion)); - var packageDirectory = new DirectoryPath(Path.GetFullPath(ToolsDirectory)) + var packageDirectory = new DirectoryPath(Path.GetFullPath(_toolsDirectory)) .WithSubDirectories(PackageId, PackageVersion); var shimPath = Path.Combine( - ShimsDirectory, + _shimsDirectory, ProjectRestorerMock.FakeCommandName + (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".exe" : "")); @@ -192,7 +195,7 @@ namespace Microsoft.DotNet.Tests.Commands { ParseResult result = Parser.Instance.Parse("dotnet tool install " + options); - var store = new ToolPackageStoreMock(new DirectoryPath(ToolsDirectory), _fileSystem); + var store = new ToolPackageStoreMock(new DirectoryPath(_toolsDirectory), _fileSystem); var packageInstallerMock = new ToolPackageInstallerMock( _fileSystem, store, @@ -205,7 +208,7 @@ namespace Microsoft.DotNet.Tests.Commands result, (_) => (store, packageInstallerMock), (_) => new ShellShimRepository( - new DirectoryPath(ShimsDirectory), + new DirectoryPath(_shimsDirectory), fileSystem: _fileSystem, appHostShellShimMaker: new AppHostShellShimMakerMock(_fileSystem)), _environmentPathInstructionMock, @@ -220,11 +223,11 @@ namespace Microsoft.DotNet.Tests.Commands result["dotnet"]["tool"]["uninstall"], result, (_) => new ToolPackageStoreMock( - new DirectoryPath(ToolsDirectory), + new DirectoryPath(_toolsDirectory), _fileSystem, uninstallCallback), (_) => new ShellShimRepository( - new DirectoryPath(ShimsDirectory), + new DirectoryPath(_shimsDirectory), fileSystem: _fileSystem, appHostShellShimMaker: new AppHostShellShimMakerMock(_fileSystem)), _reporter); diff --git a/test/dotnet.Tests/CommandTests/ToolUpdateCommandTests.cs b/test/dotnet.Tests/CommandTests/ToolUpdateCommandTests.cs index 32a64274f..17b969f8c 100644 --- a/test/dotnet.Tests/CommandTests/ToolUpdateCommandTests.cs +++ b/test/dotnet.Tests/CommandTests/ToolUpdateCommandTests.cs @@ -18,6 +18,7 @@ using Xunit; using Parser = Microsoft.DotNet.Cli.Parser; using LocalizableStrings = Microsoft.DotNet.Tools.Tool.Update.LocalizableStrings; using Microsoft.DotNet.ShellShim; +using System.IO; namespace Microsoft.DotNet.Tests.Commands { @@ -31,15 +32,18 @@ namespace Microsoft.DotNet.Tests.Commands private readonly List _mockFeeds; private const string LowerPackageVersion = "1.0.4"; private const string HigherPackageVersion = "1.0.5"; - private const string ShimsDirectory = "shims"; - private const string ToolsDirectory = "tools"; + private readonly string _shimsDirectory; + private readonly string _toolsDirectory; public ToolUpdateCommandTests() { _reporter = new BufferedReporter(); - _fileSystem = new FileSystemMockBuilder().Build(); - _environmentPathInstructionMock = new EnvironmentPathInstructionMock(_reporter, ShimsDirectory); - _store = new ToolPackageStoreMock(new DirectoryPath(ToolsDirectory), _fileSystem); + _fileSystem = new FileSystemMockBuilder().UseCurrentSystemTemporaryDirectory().Build(); + var tempDirectory = _fileSystem.Directory.CreateTemporaryDirectory().DirectoryPath; + _shimsDirectory = Path.Combine(tempDirectory, "shims"); + _toolsDirectory = Path.Combine(tempDirectory, "tools"); + _environmentPathInstructionMock = new EnvironmentPathInstructionMock(_reporter, _shimsDirectory); + _store = new ToolPackageStoreMock(new DirectoryPath(_toolsDirectory), _fileSystem); _mockFeeds = new List { new MockFeed @@ -244,7 +248,7 @@ namespace Microsoft.DotNet.Tests.Commands private ShellShimRepository GetMockedShellShimRepository() { return new ShellShimRepository( - new DirectoryPath(ShimsDirectory), + new DirectoryPath(_shimsDirectory), fileSystem: _fileSystem, appHostShellShimMaker: new AppHostShellShimMakerMock(_fileSystem)); } From 7a0d2c8f0c827b59b84857eb79f18f2c7b4f64c6 Mon Sep 17 00:00:00 2001 From: jbeisner Date: Wed, 6 Jun 2018 23:08:38 +0000 Subject: [PATCH 16/73] Drop the LZMA archive for every build. --- build/Publish.targets | 2 ++ build/compile/LzmaArchive.targets | 32 ++++++++++++++++--------------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/build/Publish.targets b/build/Publish.targets index 70819a6b1..58d6057c1 100644 --- a/build/Publish.targets +++ b/build/Publish.targets @@ -54,6 +54,8 @@ Condition=" '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' "/> + diff --git a/build/compile/LzmaArchive.targets b/build/compile/LzmaArchive.targets index a1fa07e91..7fbcd309f 100644 --- a/build/compile/LzmaArchive.targets +++ b/build/compile/LzmaArchive.targets @@ -1,21 +1,23 @@ - - $(SdkOutputDirectory)/nuGetPackagesArchive.lzma - nuGetPackagesArchive-$(AspNetCoreVersion).lzma - $(IntermediateDirectory)/$(NugetPackagesArchiveName) - $(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion)/$(NugetPackagesArchiveName) - + + $(SdkOutputDirectory)/nuGetPackagesArchive.lzma + $(PackagesDirectory)/nuGetPackagesArchive.lzma + nuGetPackagesArchive-$(AspNetCoreVersion).lzma + $(IntermediateDirectory)/$(NugetPackagesArchiveName) + $(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion)/$(NugetPackagesArchiveName) + - - + + - - + + + From 7f5ab825beac77cc95f4c9fb4da2f72ee06f25a7 Mon Sep 17 00:00:00 2001 From: jbeisner Date: Wed, 6 Jun 2018 23:15:52 +0000 Subject: [PATCH 17/73] Formatting... --- build/compile/LzmaArchive.targets | 34 +++++++++++++++---------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/build/compile/LzmaArchive.targets b/build/compile/LzmaArchive.targets index 7fbcd309f..2d55fd502 100644 --- a/build/compile/LzmaArchive.targets +++ b/build/compile/LzmaArchive.targets @@ -1,23 +1,23 @@ - - $(SdkOutputDirectory)/nuGetPackagesArchive.lzma - $(PackagesDirectory)/nuGetPackagesArchive.lzma - nuGetPackagesArchive-$(AspNetCoreVersion).lzma - $(IntermediateDirectory)/$(NugetPackagesArchiveName) - $(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion)/$(NugetPackagesArchiveName) - + + $(SdkOutputDirectory)/nuGetPackagesArchive.lzma + $(PackagesDirectory)/nuGetPackagesArchive.lzma + nuGetPackagesArchive-$(AspNetCoreVersion).lzma + $(IntermediateDirectory)/$(NugetPackagesArchiveName) + $(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion)/$(NugetPackagesArchiveName) + - - + + - - - + + + From 767f569ac31b057b8927eb47d3961805e8de70ba Mon Sep 17 00:00:00 2001 From: Andy Gerlicher Date: Thu, 7 Jun 2018 10:22:03 -0700 Subject: [PATCH 18/73] MSBuild 15.8.86 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 44f9904c6..7587a5865 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -11,7 +11,7 @@ 2.1.0 2.1.0 $(MicrosoftNETCoreAppPackageVersion) - 15.8.0-preview-000078 + 15.8.0-preview-000086 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From 6e550e5c254174de975bf3eb5a5fe6677647e50a Mon Sep 17 00:00:00 2001 From: jbeisner Date: Fri, 8 Jun 2018 19:12:51 +0000 Subject: [PATCH 19/73] Update Microsoft.NETCore.App Package Version --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index fd00a864f..e45de7425 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -9,7 +9,7 @@ 2.1.0 2.1.0 2.1.0 - 2.1.1-rtm-26531-02 + 2.1.1-servicing-26605-02 $(MicrosoftNETCoreAppPackageVersion) 15.7.179 $(MicrosoftBuildPackageVersion) From 15e6928b025abbbe4a8a9e047746892a8bdabd00 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Fri, 8 Jun 2018 16:03:24 -0700 Subject: [PATCH 20/73] Updating the CLI stage0 to 2.1.300 and fixing some build failures. --- build/BundledDotnetTools.proj | 3 +-- run-build.ps1 | 4 ++-- run-build.sh | 2 +- test/InsertionTests/InsertionTests.csproj | 3 +-- .../Microsoft.DotNet.Cli.Utils.Tests.csproj | 3 +-- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/build/BundledDotnetTools.proj b/build/BundledDotnetTools.proj index 3c07a51f0..57837ea01 100644 --- a/build/BundledDotnetTools.proj +++ b/build/BundledDotnetTools.proj @@ -13,12 +13,11 @@ Condition="!Exists('$(DotnetToolsNuPkgPath)/$(TemplateFillInPackageName.ToLower())')"> - --runtime any + --runtime any /p:RestoreProjectStyle=DotnetToolReference $(DotnetToolsRestoreAdditionalParameters) /p:TargetFramework=$(CliTargetFramework) $(DotnetToolsRestoreAdditionalParameters) /p:TemplateFillInPackageName=$(TemplateFillInPackageName) $(DotnetToolsRestoreAdditionalParameters) /p:TemplateFillInPackageVersion=$(TemplateFillInPackageVersion) $(DotnetToolsRestoreAdditionalParameters) /p:RestorePackagesPath=$(DotnetToolsLayoutDirectory) - $(DotnetToolsRestoreAdditionalParameters) /p:RestoreProjectStyle=$(DotnetToolsRestoreProjectStyle) diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj b/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj index 51f9ce940..4d006484a 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj @@ -54,8 +54,7 @@ TemplateFillInPackageName=dotnet-watch; TemplateFillInPackageVersion=$(DotnetWatchPackageVersion); PreviousStageDirectory=$(PreviousStageDirectory); - DotnetToolsLayoutDirectory=$(testAssetSourceRoot); - DotnetToolsRestoreProjectStyle=DotnetToolReference + DotnetToolsLayoutDirectory=$(testAssetSourceRoot) From bc96902c6131ad179d2b928bd9278109a7ee271b Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Thu, 31 May 2018 21:19:21 -0700 Subject: [PATCH 21/73] Implement `mode` option for `dotnet publish`. This commit implements a `mode` option that can control how an application is published with the `dotnet publish` command. There are three supported modes: * self-contained: publishes a self-contained application (same as --self-contained). * fx-dependent: publishes a framework-dependent application (with an application host when a runtime is specified). * fx-dependent-no-exe: publishes a framework-dependent application without an application host. The default when publishing without a runtime specified is `fx-dependent-no-exe`. The default when publishing with a runtime specified is `self-contained`. `fx-dependent` requires netcoreapp2.1 or later when a runtime is specified. The `--self-contained` option is still supported, but is now hidden so that users will be encouraged to move to the `--mode` option. Fixes #6237. --- build/DependencyVersions.props | 2 +- src/dotnet/Properties/AssemblyInfo.cs | 1 + .../dotnet-publish/LocalizableStrings.resx | 23 ++- src/dotnet/commands/dotnet-publish/Program.cs | 31 ++++ .../dotnet-publish/PublishCommandParser.cs | 14 +- .../xlf/LocalizableStrings.cs.xlf | 44 ++++-- .../xlf/LocalizableStrings.de.xlf | 44 ++++-- .../xlf/LocalizableStrings.es.xlf | 44 ++++-- .../xlf/LocalizableStrings.fr.xlf | 44 ++++-- .../xlf/LocalizableStrings.it.xlf | 44 ++++-- .../xlf/LocalizableStrings.ja.xlf | 44 ++++-- .../xlf/LocalizableStrings.ko.xlf | 44 ++++-- .../xlf/LocalizableStrings.pl.xlf | 44 ++++-- .../xlf/LocalizableStrings.pt-BR.xlf | 44 ++++-- .../xlf/LocalizableStrings.ru.xlf | 44 ++++-- .../xlf/LocalizableStrings.tr.xlf | 44 ++++-- .../xlf/LocalizableStrings.zh-Hans.xlf | 44 ++++-- .../xlf/LocalizableStrings.zh-Hant.xlf | 44 ++++-- .../Commands/PublishCommand.cs | 10 +- .../GivenDotnetPublishPublishesProjects.cs | 138 +++++++++++------- .../dotnet-publish.Tests.csproj | 4 + 21 files changed, 597 insertions(+), 198 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 7587a5865..a2b8bb466 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -22,7 +22,7 @@ $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 1.0.0-preview-62924-09 + 2.1.400-preview-63010-01 $(MicrosoftNETSdkPackageVersion) $(MicrosoftAspNetCoreAppPackageVersion) 2.1.300 diff --git a/src/dotnet/Properties/AssemblyInfo.cs b/src/dotnet/Properties/AssemblyInfo.cs index b5f0b8fe0..8b1c62cd5 100644 --- a/src/dotnet/Properties/AssemblyInfo.cs +++ b/src/dotnet/Properties/AssemblyInfo.cs @@ -9,6 +9,7 @@ using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("dotnet-add-package.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("dotnet-add-reference.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("dotnet-help.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("dotnet-publish.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("dotnet-list-reference.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("dotnet-remove-reference.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("dotnet-remove-package.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/src/dotnet/commands/dotnet-publish/LocalizableStrings.resx b/src/dotnet/commands/dotnet-publish/LocalizableStrings.resx index ebdf1fe0a..6a11341d8 100644 --- a/src/dotnet/commands/dotnet-publish/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-publish/LocalizableStrings.resx @@ -135,9 +135,16 @@ The path to a target manifest file that contains the list of packages to be excluded from the publish step. - - Publish the .NET Core runtime with your application so the runtime doesn't need to be installed on the target machine. -The default is 'true' if a runtime identifier is specified. + + The mode to use when publishing the application. +The 'self-contained' mode publishes the application with the .NET Core runtime. +The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. +The default is 'fx-dependent-no-exe' when a target runtime is not specified. +The default is 'self-contained' when a target runtime is specified. + + + MODE Do not build the project before publishing. Implies --no-restore. @@ -146,10 +153,16 @@ The default is 'true' if a runtime identifier is specified. The target framework to publish for. The target framework has to be specified in the project file. - The target runtime to publish for. This is used when creating self-contained deployment. -The default is to publish a framework-dependent application. + The target runtime to publish the application for. +The default is to publish a framework-dependent application without an executable. The configuration to publish for. The default for most projects is 'Debug'. + + The '--mode' and '--self-contained' options conflict. Specify only one of the options. + + + The specified publish mode '{0}' is not supported. + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-publish/Program.cs b/src/dotnet/commands/dotnet-publish/Program.cs index ed8f3260c..631416b82 100644 --- a/src/dotnet/commands/dotnet-publish/Program.cs +++ b/src/dotnet/commands/dotnet-publish/Program.cs @@ -39,6 +39,37 @@ namespace Microsoft.DotNet.Tools.Publish var appliedPublishOption = result["dotnet"]["publish"]; + if (appliedPublishOption.HasOption("mode") && appliedPublishOption.HasOption("self-contained")) + { + throw new GracefulException(LocalizableStrings.PublishModeAndSelfContainedOptionsConflict); + } + + var mode = appliedPublishOption.ValueOrDefault("mode"); + switch (mode) + { + case null: + break; + + case PublishCommandParser.SelfContainedMode: + msbuildArgs.Add("-p:SelfContained=true"); + break; + + case PublishCommandParser.FxDependentMode: + msbuildArgs.Add("-p:SelfContained=false"); + break; + + case PublishCommandParser.FxDependentNoExeMode: + msbuildArgs.Add("-p:SelfContained=false"); + msbuildArgs.Add("-p:UseAppHost=false"); + break; + + default: + throw new GracefulException( + string.Format( + LocalizableStrings.UnsupportedPublishMode, + mode)); + } + msbuildArgs.AddRange(appliedPublishOption.OptionValuesToBeForwarded()); msbuildArgs.AddRange(appliedPublishOption.Arguments); diff --git a/src/dotnet/commands/dotnet-publish/PublishCommandParser.cs b/src/dotnet/commands/dotnet-publish/PublishCommandParser.cs index 19ee3ec12..96519680f 100644 --- a/src/dotnet/commands/dotnet-publish/PublishCommandParser.cs +++ b/src/dotnet/commands/dotnet-publish/PublishCommandParser.cs @@ -10,6 +10,10 @@ namespace Microsoft.DotNet.Cli { internal static class PublishCommandParser { + public const string SelfContainedMode = "self-contained"; + public const string FxDependentMode = "fx-dependent"; + public const string FxDependentNoExeMode = "fx-dependent-no-exe"; + public static Command Publish() => CreateWithRestoreOptions.Command( "publish", @@ -40,7 +44,7 @@ namespace Microsoft.DotNet.Cli Accept.NoArguments().ForwardAs("-property:NoBuild=true")), Create.Option( "--self-contained", - LocalizableStrings.SelfContainedOptionDescription, + "", // Hidden option for backwards-compatibility (now '--mode self-contained'). Accept.ZeroOrOneArgument() .WithSuggestionsFrom("true", "false") .ForwardAsSingle(o => @@ -48,6 +52,14 @@ namespace Microsoft.DotNet.Cli string value = o.Arguments.Any() ? o.Arguments.Single() : "true"; return $"-property:SelfContained={value}"; })), + Create.Option( + "--mode", + LocalizableStrings.ModeOptionDescription, + Accept.AnyOneOf( + SelfContainedMode, + FxDependentMode, + FxDependentNoExeMode) + .With(name: LocalizableStrings.ModeOptionName)), CommonOptions.NoRestoreOption(), CommonOptions.VerbosityOption()); } diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.cs.xlf index fb4bc6d55..d8802bc57 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.cs.xlf @@ -37,22 +37,16 @@ Cesta k cílovému souboru manifestu obsahujícímu seznam balíčků, které se mají vyloučit z kroku publikování - - Publish the .NET Core runtime with your application so the runtime doesn't need to be installed on the target machine. -The default is 'true' if a runtime identifier is specified. - Publikuje spolu s aplikací modul runtime .NET Core, aby se tento modul nemusel instalovat na cílový počítač. Standardně se nastaví na True, pokud je zadaný identifikátor modulu runtime. - - Do not build the project before publishing. Implies --no-restore. Nesestavujte projekt, dokud ho nepublikujete. Implikuje možnost --no-restore. - The target runtime to publish for. This is used when creating self-contained deployment. -The default is to publish a framework-dependent application. - The target runtime to publish for. This is used when creating self-contained deployment. -The default is to publish a framework-dependent application. + The target runtime to publish the application for. +The default is to publish a framework-dependent application without an executable. + The target runtime to publish the application for. +The default is to publish a framework-dependent application without an executable. @@ -60,6 +54,36 @@ The default is to publish a framework-dependent application. The configuration to publish for. The default for most projects is 'Debug'. + + The mode to use when publishing the application. +The 'self-contained' mode publishes the application with the .NET Core runtime. +The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. +The default is 'fx-dependent-no-exe' when a target runtime is not specified. +The default is 'self-contained' when a target runtime is specified. + The mode to use when publishing the application. +The 'self-contained' mode publishes the application with the .NET Core runtime. +The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. +The default is 'fx-dependent-no-exe' when a target runtime is not specified. +The default is 'self-contained' when a target runtime is specified. + + + + MODE + MODE + + + + The '--mode' and '--self-contained' options conflict. Specify only one of the options. + The '--mode' and '--self-contained' options conflict. Specify only one of the options. + + + + The specified publish mode '{0}' is not supported. + The specified publish mode '{0}' is not supported. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.de.xlf index 60b8b2a50..e26d57f71 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.de.xlf @@ -37,22 +37,16 @@ Der Pfad zu einer Zielmanifestdatei, die die Liste der von der Veröffentlichung auszuschließenden Pakete enthält. - - Publish the .NET Core runtime with your application so the runtime doesn't need to be installed on the target machine. -The default is 'true' if a runtime identifier is specified. - Veröffentlichen Sie die .NET Core-Runtime mit Ihrer Anwendung, damit die Runtime auf dem Zielcomputer nicht installiert werden muss. Der Standardwert ist "true", wenn ein Runtimebezeichner angegeben ist. - - Do not build the project before publishing. Implies --no-restore. Erstellt das Projekt nicht vor dem Veröffentlichen. Impliziert "--no-restore". - The target runtime to publish for. This is used when creating self-contained deployment. -The default is to publish a framework-dependent application. - The target runtime to publish for. This is used when creating self-contained deployment. -The default is to publish a framework-dependent application. + The target runtime to publish the application for. +The default is to publish a framework-dependent application without an executable. + The target runtime to publish the application for. +The default is to publish a framework-dependent application without an executable. @@ -60,6 +54,36 @@ The default is to publish a framework-dependent application. The configuration to publish for. The default for most projects is 'Debug'. + + The mode to use when publishing the application. +The 'self-contained' mode publishes the application with the .NET Core runtime. +The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. +The default is 'fx-dependent-no-exe' when a target runtime is not specified. +The default is 'self-contained' when a target runtime is specified. + The mode to use when publishing the application. +The 'self-contained' mode publishes the application with the .NET Core runtime. +The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. +The default is 'fx-dependent-no-exe' when a target runtime is not specified. +The default is 'self-contained' when a target runtime is specified. + + + + MODE + MODE + + + + The '--mode' and '--self-contained' options conflict. Specify only one of the options. + The '--mode' and '--self-contained' options conflict. Specify only one of the options. + + + + The specified publish mode '{0}' is not supported. + The specified publish mode '{0}' is not supported. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.es.xlf index 3e18e4ab9..baa3744c3 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.es.xlf @@ -37,22 +37,16 @@ La ruta de acceso a un archivo de manifiesto de destino que contiene la lista de paquetes que se excluirán del paso de publicación. - - Publish the .NET Core runtime with your application so the runtime doesn't need to be installed on the target machine. -The default is 'true' if a runtime identifier is specified. - Publica el tiempo de ejecución de .NET Core con su aplicación para que no sea necesario instalarlo en la máquina de destino. Si se especifica un identificador de tiempo de ejecución, se toma como predeterminado el valor "true". - - Do not build the project before publishing. Implies --no-restore. No compile el proyecto antes de publicarlo. Implica --no-restore. - The target runtime to publish for. This is used when creating self-contained deployment. -The default is to publish a framework-dependent application. - The target runtime to publish for. This is used when creating self-contained deployment. -The default is to publish a framework-dependent application. + The target runtime to publish the application for. +The default is to publish a framework-dependent application without an executable. + The target runtime to publish the application for. +The default is to publish a framework-dependent application without an executable. @@ -60,6 +54,36 @@ The default is to publish a framework-dependent application. The configuration to publish for. The default for most projects is 'Debug'. + + The mode to use when publishing the application. +The 'self-contained' mode publishes the application with the .NET Core runtime. +The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. +The default is 'fx-dependent-no-exe' when a target runtime is not specified. +The default is 'self-contained' when a target runtime is specified. + The mode to use when publishing the application. +The 'self-contained' mode publishes the application with the .NET Core runtime. +The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. +The default is 'fx-dependent-no-exe' when a target runtime is not specified. +The default is 'self-contained' when a target runtime is specified. + + + + MODE + MODE + + + + The '--mode' and '--self-contained' options conflict. Specify only one of the options. + The '--mode' and '--self-contained' options conflict. Specify only one of the options. + + + + The specified publish mode '{0}' is not supported. + The specified publish mode '{0}' is not supported. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.fr.xlf index b80796a49..73ab78be8 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.fr.xlf @@ -37,22 +37,16 @@ Chemin d'un fichier manifeste cible contenant la liste des packages à exclure de l'étape de publication. - - Publish the .NET Core runtime with your application so the runtime doesn't need to be installed on the target machine. -The default is 'true' if a runtime identifier is specified. - Publiez le runtime .NET Core avec votre application pour éviter à l'utilisateur de l'installer sur la machine cible. La valeur par défaut est 'true' si un identificateur de runtime est spécifié. - - Do not build the project before publishing. Implies --no-restore. Ne pas générer le projet avant la publication. Implique --no-restore. - The target runtime to publish for. This is used when creating self-contained deployment. -The default is to publish a framework-dependent application. - The target runtime to publish for. This is used when creating self-contained deployment. -The default is to publish a framework-dependent application. + The target runtime to publish the application for. +The default is to publish a framework-dependent application without an executable. + The target runtime to publish the application for. +The default is to publish a framework-dependent application without an executable. @@ -60,6 +54,36 @@ The default is to publish a framework-dependent application. The configuration to publish for. The default for most projects is 'Debug'. + + The mode to use when publishing the application. +The 'self-contained' mode publishes the application with the .NET Core runtime. +The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. +The default is 'fx-dependent-no-exe' when a target runtime is not specified. +The default is 'self-contained' when a target runtime is specified. + The mode to use when publishing the application. +The 'self-contained' mode publishes the application with the .NET Core runtime. +The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. +The default is 'fx-dependent-no-exe' when a target runtime is not specified. +The default is 'self-contained' when a target runtime is specified. + + + + MODE + MODE + + + + The '--mode' and '--self-contained' options conflict. Specify only one of the options. + The '--mode' and '--self-contained' options conflict. Specify only one of the options. + + + + The specified publish mode '{0}' is not supported. + The specified publish mode '{0}' is not supported. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.it.xlf index 70e1cde81..fd9e38f7a 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.it.xlf @@ -37,22 +37,16 @@ Percorso di un file manifesto di destinazione che contiene l'elenco di pacchetti da escludere dal passaggio di pubblicazione. - - Publish the .NET Core runtime with your application so the runtime doesn't need to be installed on the target machine. -The default is 'true' if a runtime identifier is specified. - Pubblica il runtime di .NET Core con l'applicazione in modo che non sia necessario installarlo nel computer di destinazione. Se si specifica un identificatore di runtime, l'impostazione predefinita è 'true'. - - Do not build the project before publishing. Implies --no-restore. Non compila il progetto prima della pubblicazione. Implica --no-restore. - The target runtime to publish for. This is used when creating self-contained deployment. -The default is to publish a framework-dependent application. - The target runtime to publish for. This is used when creating self-contained deployment. -The default is to publish a framework-dependent application. + The target runtime to publish the application for. +The default is to publish a framework-dependent application without an executable. + The target runtime to publish the application for. +The default is to publish a framework-dependent application without an executable. @@ -60,6 +54,36 @@ The default is to publish a framework-dependent application. The configuration to publish for. The default for most projects is 'Debug'. + + The mode to use when publishing the application. +The 'self-contained' mode publishes the application with the .NET Core runtime. +The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. +The default is 'fx-dependent-no-exe' when a target runtime is not specified. +The default is 'self-contained' when a target runtime is specified. + The mode to use when publishing the application. +The 'self-contained' mode publishes the application with the .NET Core runtime. +The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. +The default is 'fx-dependent-no-exe' when a target runtime is not specified. +The default is 'self-contained' when a target runtime is specified. + + + + MODE + MODE + + + + The '--mode' and '--self-contained' options conflict. Specify only one of the options. + The '--mode' and '--self-contained' options conflict. Specify only one of the options. + + + + The specified publish mode '{0}' is not supported. + The specified publish mode '{0}' is not supported. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ja.xlf index 66e3fb513..89904c476 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ja.xlf @@ -37,22 +37,16 @@ 発行ステップから除外されるパッケージのリストを含むターゲット マニフェスト ファイルへのパス。 - - Publish the .NET Core runtime with your application so the runtime doesn't need to be installed on the target machine. -The default is 'true' if a runtime identifier is specified. - ランタイムをターゲット マシンにインストールしなくてもよいよう、.NET Core ランタイムをアプリケーションと一緒に発行します。ランタイム ID が指定される場合、既定の 'true' になります。 - - Do not build the project before publishing. Implies --no-restore. 発行する前にプロジェクトをビルドしないでください。--no-restore を意味します。 - The target runtime to publish for. This is used when creating self-contained deployment. -The default is to publish a framework-dependent application. - The target runtime to publish for. This is used when creating self-contained deployment. -The default is to publish a framework-dependent application. + The target runtime to publish the application for. +The default is to publish a framework-dependent application without an executable. + The target runtime to publish the application for. +The default is to publish a framework-dependent application without an executable. @@ -60,6 +54,36 @@ The default is to publish a framework-dependent application. The configuration to publish for. The default for most projects is 'Debug'. + + The mode to use when publishing the application. +The 'self-contained' mode publishes the application with the .NET Core runtime. +The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. +The default is 'fx-dependent-no-exe' when a target runtime is not specified. +The default is 'self-contained' when a target runtime is specified. + The mode to use when publishing the application. +The 'self-contained' mode publishes the application with the .NET Core runtime. +The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. +The default is 'fx-dependent-no-exe' when a target runtime is not specified. +The default is 'self-contained' when a target runtime is specified. + + + + MODE + MODE + + + + The '--mode' and '--self-contained' options conflict. Specify only one of the options. + The '--mode' and '--self-contained' options conflict. Specify only one of the options. + + + + The specified publish mode '{0}' is not supported. + The specified publish mode '{0}' is not supported. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ko.xlf index f861e1c24..1e879682f 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ko.xlf @@ -37,22 +37,16 @@ 게시 단계에서 제외할 패키지 목록이 들어 있는 대상 매니페스트 파일의 경로입니다. - - Publish the .NET Core runtime with your application so the runtime doesn't need to be installed on the target machine. -The default is 'true' if a runtime identifier is specified. - 런타임은 대상 컴퓨터에 설치할 필요가 없으므로 응용 프로그램과 함께 .NET Core 런타임을 게시합니다. 런타임 식별자가 지정된 경우 기본값은 'true'입니다. - - Do not build the project before publishing. Implies --no-restore. 게시하기 전에 프로젝트를 빌드하지 않습니다. 복원 없음을 의미합니다. - The target runtime to publish for. This is used when creating self-contained deployment. -The default is to publish a framework-dependent application. - The target runtime to publish for. This is used when creating self-contained deployment. -The default is to publish a framework-dependent application. + The target runtime to publish the application for. +The default is to publish a framework-dependent application without an executable. + The target runtime to publish the application for. +The default is to publish a framework-dependent application without an executable. @@ -60,6 +54,36 @@ The default is to publish a framework-dependent application. The configuration to publish for. The default for most projects is 'Debug'. + + The mode to use when publishing the application. +The 'self-contained' mode publishes the application with the .NET Core runtime. +The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. +The default is 'fx-dependent-no-exe' when a target runtime is not specified. +The default is 'self-contained' when a target runtime is specified. + The mode to use when publishing the application. +The 'self-contained' mode publishes the application with the .NET Core runtime. +The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. +The default is 'fx-dependent-no-exe' when a target runtime is not specified. +The default is 'self-contained' when a target runtime is specified. + + + + MODE + MODE + + + + The '--mode' and '--self-contained' options conflict. Specify only one of the options. + The '--mode' and '--self-contained' options conflict. Specify only one of the options. + + + + The specified publish mode '{0}' is not supported. + The specified publish mode '{0}' is not supported. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pl.xlf index a44c78445..24d8a39b8 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pl.xlf @@ -37,22 +37,16 @@ Ścieżka do docelowego pliku manifestu zawierającego listę pakietów, które mają zostać wykluczone z kroku publikowania. - - Publish the .NET Core runtime with your application so the runtime doesn't need to be installed on the target machine. -The default is 'true' if a runtime identifier is specified. - Opublikuj środowisko uruchomieniowe programu .NET Core z aplikacją, aby nie trzeba było go instalować na maszynie docelowej. Domyślnie jest ustawiona wartość „true” w przypadku określenia identyfikatora środowiska uruchomieniowego. - - Do not build the project before publishing. Implies --no-restore. Nie kompiluj tego projektu przed opublikowaniem. Powoduje przyjęcie, że podano parametr --no-restore. - The target runtime to publish for. This is used when creating self-contained deployment. -The default is to publish a framework-dependent application. - The target runtime to publish for. This is used when creating self-contained deployment. -The default is to publish a framework-dependent application. + The target runtime to publish the application for. +The default is to publish a framework-dependent application without an executable. + The target runtime to publish the application for. +The default is to publish a framework-dependent application without an executable. @@ -60,6 +54,36 @@ The default is to publish a framework-dependent application. The configuration to publish for. The default for most projects is 'Debug'. + + The mode to use when publishing the application. +The 'self-contained' mode publishes the application with the .NET Core runtime. +The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. +The default is 'fx-dependent-no-exe' when a target runtime is not specified. +The default is 'self-contained' when a target runtime is specified. + The mode to use when publishing the application. +The 'self-contained' mode publishes the application with the .NET Core runtime. +The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. +The default is 'fx-dependent-no-exe' when a target runtime is not specified. +The default is 'self-contained' when a target runtime is specified. + + + + MODE + MODE + + + + The '--mode' and '--self-contained' options conflict. Specify only one of the options. + The '--mode' and '--self-contained' options conflict. Specify only one of the options. + + + + The specified publish mode '{0}' is not supported. + The specified publish mode '{0}' is not supported. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pt-BR.xlf index 59445fae7..55df48df7 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pt-BR.xlf @@ -37,22 +37,16 @@ O caminho para um arquivo de manifesto de destino que contém a lista de pacotes a serem excluídos da etapa de publicação. - - Publish the .NET Core runtime with your application so the runtime doesn't need to be installed on the target machine. -The default is 'true' if a runtime identifier is specified. - Publique o tempo de execução .NET Core com seu aplicativo para que o tempo de execução não precise ser instalado no computador de destino. Assumirá 'true' como padrão se um identificador de tempo de execução for especificado. - - Do not build the project before publishing. Implies --no-restore. Não compile o projeto antes de publicar. Implica em --no-restore. - The target runtime to publish for. This is used when creating self-contained deployment. -The default is to publish a framework-dependent application. - The target runtime to publish for. This is used when creating self-contained deployment. -The default is to publish a framework-dependent application. + The target runtime to publish the application for. +The default is to publish a framework-dependent application without an executable. + The target runtime to publish the application for. +The default is to publish a framework-dependent application without an executable. @@ -60,6 +54,36 @@ The default is to publish a framework-dependent application. The configuration to publish for. The default for most projects is 'Debug'. + + The mode to use when publishing the application. +The 'self-contained' mode publishes the application with the .NET Core runtime. +The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. +The default is 'fx-dependent-no-exe' when a target runtime is not specified. +The default is 'self-contained' when a target runtime is specified. + The mode to use when publishing the application. +The 'self-contained' mode publishes the application with the .NET Core runtime. +The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. +The default is 'fx-dependent-no-exe' when a target runtime is not specified. +The default is 'self-contained' when a target runtime is specified. + + + + MODE + MODE + + + + The '--mode' and '--self-contained' options conflict. Specify only one of the options. + The '--mode' and '--self-contained' options conflict. Specify only one of the options. + + + + The specified publish mode '{0}' is not supported. + The specified publish mode '{0}' is not supported. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ru.xlf index a79f188de..084aad81c 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ru.xlf @@ -37,22 +37,16 @@ Путь к целевому файлу манифеста, содержащему список пакетов, исключаемых из публикации. - - Publish the .NET Core runtime with your application so the runtime doesn't need to be installed on the target machine. -The default is 'true' if a runtime identifier is specified. - Опубликуйте среду выполнения .NET Core вместе с приложением, чтобы ее не нужно было устанавливать на целевом компьютере. Если идентификатор среды выполнения указан, значение по умолчанию — true. - - Do not build the project before publishing. Implies --no-restore. Сборка проекта перед публикацией не выполняется. Подразумевает --no-restore. - The target runtime to publish for. This is used when creating self-contained deployment. -The default is to publish a framework-dependent application. - The target runtime to publish for. This is used when creating self-contained deployment. -The default is to publish a framework-dependent application. + The target runtime to publish the application for. +The default is to publish a framework-dependent application without an executable. + The target runtime to publish the application for. +The default is to publish a framework-dependent application without an executable. @@ -60,6 +54,36 @@ The default is to publish a framework-dependent application. The configuration to publish for. The default for most projects is 'Debug'. + + The mode to use when publishing the application. +The 'self-contained' mode publishes the application with the .NET Core runtime. +The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. +The default is 'fx-dependent-no-exe' when a target runtime is not specified. +The default is 'self-contained' when a target runtime is specified. + The mode to use when publishing the application. +The 'self-contained' mode publishes the application with the .NET Core runtime. +The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. +The default is 'fx-dependent-no-exe' when a target runtime is not specified. +The default is 'self-contained' when a target runtime is specified. + + + + MODE + MODE + + + + The '--mode' and '--self-contained' options conflict. Specify only one of the options. + The '--mode' and '--self-contained' options conflict. Specify only one of the options. + + + + The specified publish mode '{0}' is not supported. + The specified publish mode '{0}' is not supported. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.tr.xlf index 3e2339ef7..daa82317b 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.tr.xlf @@ -37,22 +37,16 @@ Yayımlama adımının dışında tutulacak paketlerin listesini içeren bir hedef bildirim dosyasının yolu. - - Publish the .NET Core runtime with your application so the runtime doesn't need to be installed on the target machine. -The default is 'true' if a runtime identifier is specified. - Çalışma zamanının hedef makineye yüklenmesine gerek kalmaması için, .NET Core çalışma zamanını uygulamanızla birlikte yayımlayın. Bir çalışma zamanı tanımlayıcısı belirtilmişse, varsayılan olarak 'true' değerine ayarlanır. - - Do not build the project before publishing. Implies --no-restore. Yayımlamadan önce projeyi derlemeyin. --no-restore anlamına gelir. - The target runtime to publish for. This is used when creating self-contained deployment. -The default is to publish a framework-dependent application. - The target runtime to publish for. This is used when creating self-contained deployment. -The default is to publish a framework-dependent application. + The target runtime to publish the application for. +The default is to publish a framework-dependent application without an executable. + The target runtime to publish the application for. +The default is to publish a framework-dependent application without an executable. @@ -60,6 +54,36 @@ The default is to publish a framework-dependent application. The configuration to publish for. The default for most projects is 'Debug'. + + The mode to use when publishing the application. +The 'self-contained' mode publishes the application with the .NET Core runtime. +The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. +The default is 'fx-dependent-no-exe' when a target runtime is not specified. +The default is 'self-contained' when a target runtime is specified. + The mode to use when publishing the application. +The 'self-contained' mode publishes the application with the .NET Core runtime. +The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. +The default is 'fx-dependent-no-exe' when a target runtime is not specified. +The default is 'self-contained' when a target runtime is specified. + + + + MODE + MODE + + + + The '--mode' and '--self-contained' options conflict. Specify only one of the options. + The '--mode' and '--self-contained' options conflict. Specify only one of the options. + + + + The specified publish mode '{0}' is not supported. + The specified publish mode '{0}' is not supported. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hans.xlf index 1926cf1dd..0a3631a91 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hans.xlf @@ -37,22 +37,16 @@ 指向目标清单文件的路径，该文件包含要通过发布步骤执行的包的列表。 - - Publish the .NET Core runtime with your application so the runtime doesn't need to be installed on the target machine. -The default is 'true' if a runtime identifier is specified. - 随附应用程序发布 .NET Core 运行时，免除在目标计算机上安装运行时的需求。如果指定了运行时标识符，则默认为 “true”。 - - Do not build the project before publishing. Implies --no-restore. 发布之前不要生成项目。Implies --no-restore. - The target runtime to publish for. This is used when creating self-contained deployment. -The default is to publish a framework-dependent application. - The target runtime to publish for. This is used when creating self-contained deployment. -The default is to publish a framework-dependent application. + The target runtime to publish the application for. +The default is to publish a framework-dependent application without an executable. + The target runtime to publish the application for. +The default is to publish a framework-dependent application without an executable. @@ -60,6 +54,36 @@ The default is to publish a framework-dependent application. The configuration to publish for. The default for most projects is 'Debug'. + + The mode to use when publishing the application. +The 'self-contained' mode publishes the application with the .NET Core runtime. +The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. +The default is 'fx-dependent-no-exe' when a target runtime is not specified. +The default is 'self-contained' when a target runtime is specified. + The mode to use when publishing the application. +The 'self-contained' mode publishes the application with the .NET Core runtime. +The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. +The default is 'fx-dependent-no-exe' when a target runtime is not specified. +The default is 'self-contained' when a target runtime is specified. + + + + MODE + MODE + + + + The '--mode' and '--self-contained' options conflict. Specify only one of the options. + The '--mode' and '--self-contained' options conflict. Specify only one of the options. + + + + The specified publish mode '{0}' is not supported. + The specified publish mode '{0}' is not supported. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hant.xlf index b4379233d..f0e5d9bcb 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hant.xlf @@ -37,22 +37,16 @@ 目標資訊清單檔案的路徑，其包含要從發行步驟中排除的套件清單。 - - Publish the .NET Core runtime with your application so the runtime doesn't need to be installed on the target machine. -The default is 'true' if a runtime identifier is specified. - 隨著應用程式一併發行 .NET Core 執行階段，因此不需要在目標電腦上安裝此執行階段。若指定了執行階段識別碼，則預設為 'true'。 - - Do not build the project before publishing. Implies --no-restore. 請勿在執行之前建置專案。提示：-no-restore。 - The target runtime to publish for. This is used when creating self-contained deployment. -The default is to publish a framework-dependent application. - The target runtime to publish for. This is used when creating self-contained deployment. -The default is to publish a framework-dependent application. + The target runtime to publish the application for. +The default is to publish a framework-dependent application without an executable. + The target runtime to publish the application for. +The default is to publish a framework-dependent application without an executable. @@ -60,6 +54,36 @@ The default is to publish a framework-dependent application. The configuration to publish for. The default for most projects is 'Debug'. + + The mode to use when publishing the application. +The 'self-contained' mode publishes the application with the .NET Core runtime. +The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. +The default is 'fx-dependent-no-exe' when a target runtime is not specified. +The default is 'self-contained' when a target runtime is specified. + The mode to use when publishing the application. +The 'self-contained' mode publishes the application with the .NET Core runtime. +The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. +The default is 'fx-dependent-no-exe' when a target runtime is not specified. +The default is 'self-contained' when a target runtime is specified. + + + + MODE + MODE + + + + The '--mode' and '--self-contained' options conflict. Specify only one of the options. + The '--mode' and '--self-contained' options conflict. Specify only one of the options. + + + + The specified publish mode '{0}' is not supported. + The specified publish mode '{0}' is not supported. + + \ No newline at end of file diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/PublishCommand.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/PublishCommand.cs index ada6a80be..a22b5acf7 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/PublishCommand.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/PublishCommand.cs @@ -13,7 +13,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities private string _output; private string _runtime; private List _targetManifests = new List(); - private bool? _selfContained; + private string _mode; public PublishCommand WithFramework(string framework) { @@ -44,9 +44,9 @@ namespace Microsoft.DotNet.Tools.Test.Utilities return this; } - public PublishCommand WithSelfContained(bool value) + public PublishCommand WithMode(string value) { - _selfContained = value; + _mode = value; return this; } @@ -69,7 +69,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities OutputOption, TargetOption, RuntimeOption, - SelfContainedOption); + ModeOption); } private string FrameworkOption => string.IsNullOrEmpty(_framework) ? "" : $"-f {_framework}"; @@ -80,6 +80,6 @@ namespace Microsoft.DotNet.Tools.Test.Utilities private string TargetOption => string.Join(" ", _targetManifests); - private string SelfContainedOption => _selfContained.HasValue ? $"--self-contained:{_selfContained.Value}" : ""; + private string ModeOption => string.IsNullOrEmpty(_mode) ? "" : $"--mode {_mode}"; } } diff --git a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs index 9b325256f..9aa9ad4dc 100644 --- a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs +++ b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs @@ -11,6 +11,7 @@ using Microsoft.DotNet.PlatformAbstractions; using Microsoft.DotNet.TestFramework; using Microsoft.DotNet.Tools.Test.Utilities; using Xunit; +using LocalizableStrings = Microsoft.DotNet.Tools.Publish.LocalizableStrings; namespace Microsoft.DotNet.Cli.Publish.Tests { @@ -95,50 +96,43 @@ namespace Microsoft.DotNet.Cli.Publish.Tests .And.HaveStdOutContaining("project.assets.json"); } - [Fact] - public void ItPublishesARunnableSelfContainedApp() + [Theory] + [InlineData("self-contained", null)] + [InlineData(null, null)] + [InlineData(null, "--self-contained")] + [InlineData(null, "--self-contained=true")] + public void ItPublishesSelfContainedWithRid(string mode, string args) { var testAppName = "MSBuildTestApp"; - - var testInstance = TestAssets.Get(testAppName) - .CreateInstance() - .WithSourceFiles() - .WithRestoreFiles(); - - var testProjectDirectory = testInstance.Root; - var rid = DotnetLegacyRuntimeIdentifiers.InferLegacyRestoreRuntimeIdentifier(); - - new PublishCommand() - .WithFramework("netcoreapp2.1") - .WithRuntime(rid) - .WithWorkingDirectory(testProjectDirectory) - .Execute() - .Should().Pass(); - - var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug"; - - var outputProgram = testProjectDirectory - .GetDirectory("bin", configuration, "netcoreapp2.1", rid, "publish", $"{testAppName}{Constants.ExeSuffix}") - .FullName; - - EnsureProgramIsRunnable(outputProgram); - - new TestCommand(outputProgram) - .ExecuteWithCapturedOutput() - .Should().Pass() - .And.HaveStdOutContaining("Hello World"); - } - - [Fact] - public void ItPublishesARidSpecificAppSettingSelfContainedToTrue() - { - var testAppName = "MSBuildTestApp"; - var outputDirectory = PublishAppWithSelfContained(testAppName, true); + var outputDirectory = PublishApp(testAppName, rid, mode, args); var outputProgram = Path.Combine(outputDirectory.FullName, $"{testAppName}{Constants.ExeSuffix}"); - EnsureProgramIsRunnable(outputProgram); + new TestCommand(outputProgram) + .ExecuteWithCapturedOutput() + .Should().Pass() + .And.HaveStdOutContaining("Hello World"); + } + + [Theory] + [InlineData("fx-dependent", null)] + [InlineData(null, "--self-contained=false")] + public void ItPublishesFrameworkDependentWithRid(string mode, string args) + { + var testAppName = "MSBuildTestApp"; + var rid = DotnetLegacyRuntimeIdentifiers.InferLegacyRestoreRuntimeIdentifier(); + var outputDirectory = PublishApp(testAppName, rid, mode, args); + + outputDirectory.Should().OnlyHaveFiles(new[] { + $"{testAppName}{Constants.ExeSuffix}", + $"{testAppName}.dll", + $"{testAppName}.pdb", + $"{testAppName}.deps.json", + $"{testAppName}.runtimeconfig.json", + }); + + var outputProgram = Path.Combine(outputDirectory.FullName, $"{testAppName}{Constants.ExeSuffix}"); new TestCommand(outputProgram) .ExecuteWithCapturedOutput() @@ -147,10 +141,11 @@ namespace Microsoft.DotNet.Cli.Publish.Tests } [Fact] - public void ItPublishesARidSpecificAppSettingSelfContainedToFalse() + public void ItPublishesFrameworkDependentNoExeWithRid() { var testAppName = "MSBuildTestApp"; - var outputDirectory = PublishAppWithSelfContained(testAppName, false); + var rid = DotnetLegacyRuntimeIdentifiers.InferLegacyRestoreRuntimeIdentifier(); + var outputDirectory = PublishApp(testAppName, rid, mode: "fx-dependent-no-exe"); outputDirectory.Should().OnlyHaveFiles(new[] { $"{testAppName}.dll", @@ -165,36 +160,48 @@ namespace Microsoft.DotNet.Cli.Publish.Tests .And.HaveStdOutContaining("Hello World"); } - private DirectoryInfo PublishAppWithSelfContained(string testAppName, bool selfContained) + [Theory] + [InlineData("fx-dependent-no-exe", null)] + [InlineData("fx-dependent", null)] + [InlineData(null, "--self-contained=false")] + [InlineData(null, null)] + public void ItPublishesFrameworkDependentWithoutRid(string mode, string args) + { + var testAppName = "MSBuildTestApp"; + var outputDirectory = PublishApp(testAppName, rid: null, mode: mode, args: args); + + outputDirectory.Should().OnlyHaveFiles(new[] { + $"{testAppName}.dll", + $"{testAppName}.pdb", + $"{testAppName}.deps.json", + $"{testAppName}.runtimeconfig.json", + }); + + new DotnetCommand() + .ExecuteWithCapturedOutput(Path.Combine(outputDirectory.FullName, $"{testAppName}.dll")) + .Should().Pass() + .And.HaveStdOutContaining("Hello World"); + } + + private DirectoryInfo PublishApp(string testAppName, string rid, string mode, string args = null) { var testInstance = TestAssets.Get(testAppName) - .CreateInstance($"PublishesSelfContained{selfContained}") + .CreateInstance($"PublishApp_{rid ?? "none"}_{mode ?? "none"}") .WithSourceFiles() .WithRestoreFiles(); var testProjectDirectory = testInstance.Root; - var rid = DotnetLegacyRuntimeIdentifiers.InferLegacyRestoreRuntimeIdentifier(); - new PublishCommand() .WithRuntime(rid) - .WithSelfContained(selfContained) + .WithMode(mode) .WithWorkingDirectory(testProjectDirectory) - .Execute() + .Execute(args ?? "") .Should().Pass(); var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug"; return testProjectDirectory - .GetDirectory("bin", configuration, "netcoreapp2.1", rid, "publish"); - } - - private static void EnsureProgramIsRunnable(string path) - { - if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) - { - //Workaround for https://github.com/dotnet/corefx/issues/15516 - Process.Start("chmod", $"u+x {path}").WaitForExit(); - } + .GetDirectory("bin", configuration, "netcoreapp2.1", rid ?? "", "publish"); } [Fact] @@ -324,5 +331,24 @@ namespace Microsoft.DotNet.Cli.Publish.Tests .Should() .Fail(); } + + [Fact] + public void ItFailsToPublishIfBothModeAndSelfContainedAreSpecified() + { + var testInstance = TestAssets.Get("MSBuildTestApp") + .CreateInstance() + .WithSourceFiles() + .WithRestoreFiles(); + + var testProjectDirectory = testInstance.Root; + + new PublishCommand() + .WithWorkingDirectory(testProjectDirectory) + .Execute("--self-contained --mode fx-dependent") + .Should() + .Fail() + .And + .HaveStdErrContaining(LocalizableStrings.PublishModeAndSelfContainedOptionsConflict); + } } } diff --git a/test/dotnet-publish.Tests/dotnet-publish.Tests.csproj b/test/dotnet-publish.Tests/dotnet-publish.Tests.csproj index 77012ff8d..51c2ff924 100644 --- a/test/dotnet-publish.Tests/dotnet-publish.Tests.csproj +++ b/test/dotnet-publish.Tests/dotnet-publish.Tests.csproj @@ -4,6 +4,9 @@ $(MicrosoftNETCoreAppPackageVersion) true dotnet-publish.Tests + ../../tools/Key.snk + true + true $(AssetTargetFallback);dotnet5.4;portable-net451+win8 @@ -16,6 +19,7 @@ + From da2b1b90ec2d449dca552640f149f4e0b9e099ba Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Mon, 11 Jun 2018 21:31:48 -0700 Subject: [PATCH 22/73] Fix PR review feedback. Amending string resources based on suggestions. Fixing tests that need DOTNET_ROOT set. Adding args to the asset instance name for `PublishApp`. --- .../dotnet-publish/LocalizableStrings.resx | 4 ++-- .../dotnet-publish/xlf/LocalizableStrings.cs.xlf | 8 ++++---- .../dotnet-publish/xlf/LocalizableStrings.de.xlf | 8 ++++---- .../dotnet-publish/xlf/LocalizableStrings.es.xlf | 8 ++++---- .../dotnet-publish/xlf/LocalizableStrings.fr.xlf | 8 ++++---- .../dotnet-publish/xlf/LocalizableStrings.it.xlf | 8 ++++---- .../dotnet-publish/xlf/LocalizableStrings.ja.xlf | 8 ++++---- .../dotnet-publish/xlf/LocalizableStrings.ko.xlf | 8 ++++---- .../dotnet-publish/xlf/LocalizableStrings.pl.xlf | 8 ++++---- .../xlf/LocalizableStrings.pt-BR.xlf | 8 ++++---- .../dotnet-publish/xlf/LocalizableStrings.ru.xlf | 8 ++++---- .../dotnet-publish/xlf/LocalizableStrings.tr.xlf | 8 ++++---- .../xlf/LocalizableStrings.zh-Hans.xlf | 8 ++++---- .../xlf/LocalizableStrings.zh-Hant.xlf | 8 ++++---- .../GivenDotnetPublishPublishesProjects.cs | 14 +++++++++----- 15 files changed, 63 insertions(+), 59 deletions(-) diff --git a/src/dotnet/commands/dotnet-publish/LocalizableStrings.resx b/src/dotnet/commands/dotnet-publish/LocalizableStrings.resx index 6a11341d8..59c01c3af 100644 --- a/src/dotnet/commands/dotnet-publish/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-publish/LocalizableStrings.resx @@ -138,7 +138,7 @@ The mode to use when publishing the application. The 'self-contained' mode publishes the application with the .NET Core runtime. -The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable. The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. The default is 'fx-dependent-no-exe' when a target runtime is not specified. The default is 'self-contained' when a target runtime is specified. @@ -160,7 +160,7 @@ The default is to publish a framework-dependent application without an executabl The configuration to publish for. The default for most projects is 'Debug'. - The '--mode' and '--self-contained' options conflict. Specify only one of the options. + The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options. The specified publish mode '{0}' is not supported. diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.cs.xlf index d8802bc57..65cdf77c0 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.cs.xlf @@ -57,13 +57,13 @@ The default is to publish a framework-dependent application without an executabl The mode to use when publishing the application. The 'self-contained' mode publishes the application with the .NET Core runtime. -The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable. The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. The default is 'fx-dependent-no-exe' when a target runtime is not specified. The default is 'self-contained' when a target runtime is specified. The mode to use when publishing the application. The 'self-contained' mode publishes the application with the .NET Core runtime. -The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable. The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. The default is 'fx-dependent-no-exe' when a target runtime is not specified. The default is 'self-contained' when a target runtime is specified. @@ -75,8 +75,8 @@ The default is 'self-contained' when a target runtime is specified. - The '--mode' and '--self-contained' options conflict. Specify only one of the options. - The '--mode' and '--self-contained' options conflict. Specify only one of the options. + The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options. + The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options. diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.de.xlf index e26d57f71..54fe79e46 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.de.xlf @@ -57,13 +57,13 @@ The default is to publish a framework-dependent application without an executabl The mode to use when publishing the application. The 'self-contained' mode publishes the application with the .NET Core runtime. -The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable. The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. The default is 'fx-dependent-no-exe' when a target runtime is not specified. The default is 'self-contained' when a target runtime is specified. The mode to use when publishing the application. The 'self-contained' mode publishes the application with the .NET Core runtime. -The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable. The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. The default is 'fx-dependent-no-exe' when a target runtime is not specified. The default is 'self-contained' when a target runtime is specified. @@ -75,8 +75,8 @@ The default is 'self-contained' when a target runtime is specified. - The '--mode' and '--self-contained' options conflict. Specify only one of the options. - The '--mode' and '--self-contained' options conflict. Specify only one of the options. + The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options. + The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options. diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.es.xlf index baa3744c3..d71ab145b 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.es.xlf @@ -57,13 +57,13 @@ The default is to publish a framework-dependent application without an executabl The mode to use when publishing the application. The 'self-contained' mode publishes the application with the .NET Core runtime. -The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable. The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. The default is 'fx-dependent-no-exe' when a target runtime is not specified. The default is 'self-contained' when a target runtime is specified. The mode to use when publishing the application. The 'self-contained' mode publishes the application with the .NET Core runtime. -The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable. The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. The default is 'fx-dependent-no-exe' when a target runtime is not specified. The default is 'self-contained' when a target runtime is specified. @@ -75,8 +75,8 @@ The default is 'self-contained' when a target runtime is specified. - The '--mode' and '--self-contained' options conflict. Specify only one of the options. - The '--mode' and '--self-contained' options conflict. Specify only one of the options. + The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options. + The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options. diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.fr.xlf index 73ab78be8..dbc2c0835 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.fr.xlf @@ -57,13 +57,13 @@ The default is to publish a framework-dependent application without an executabl The mode to use when publishing the application. The 'self-contained' mode publishes the application with the .NET Core runtime. -The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable. The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. The default is 'fx-dependent-no-exe' when a target runtime is not specified. The default is 'self-contained' when a target runtime is specified. The mode to use when publishing the application. The 'self-contained' mode publishes the application with the .NET Core runtime. -The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable. The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. The default is 'fx-dependent-no-exe' when a target runtime is not specified. The default is 'self-contained' when a target runtime is specified. @@ -75,8 +75,8 @@ The default is 'self-contained' when a target runtime is specified. - The '--mode' and '--self-contained' options conflict. Specify only one of the options. - The '--mode' and '--self-contained' options conflict. Specify only one of the options. + The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options. + The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options. diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.it.xlf index fd9e38f7a..d6b3ca3ca 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.it.xlf @@ -57,13 +57,13 @@ The default is to publish a framework-dependent application without an executabl The mode to use when publishing the application. The 'self-contained' mode publishes the application with the .NET Core runtime. -The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable. The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. The default is 'fx-dependent-no-exe' when a target runtime is not specified. The default is 'self-contained' when a target runtime is specified. The mode to use when publishing the application. The 'self-contained' mode publishes the application with the .NET Core runtime. -The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable. The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. The default is 'fx-dependent-no-exe' when a target runtime is not specified. The default is 'self-contained' when a target runtime is specified. @@ -75,8 +75,8 @@ The default is 'self-contained' when a target runtime is specified. - The '--mode' and '--self-contained' options conflict. Specify only one of the options. - The '--mode' and '--self-contained' options conflict. Specify only one of the options. + The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options. + The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options. diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ja.xlf index 89904c476..36949f48d 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ja.xlf @@ -57,13 +57,13 @@ The default is to publish a framework-dependent application without an executabl The mode to use when publishing the application. The 'self-contained' mode publishes the application with the .NET Core runtime. -The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable. The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. The default is 'fx-dependent-no-exe' when a target runtime is not specified. The default is 'self-contained' when a target runtime is specified. The mode to use when publishing the application. The 'self-contained' mode publishes the application with the .NET Core runtime. -The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable. The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. The default is 'fx-dependent-no-exe' when a target runtime is not specified. The default is 'self-contained' when a target runtime is specified. @@ -75,8 +75,8 @@ The default is 'self-contained' when a target runtime is specified. - The '--mode' and '--self-contained' options conflict. Specify only one of the options. - The '--mode' and '--self-contained' options conflict. Specify only one of the options. + The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options. + The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options. diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ko.xlf index 1e879682f..b5781e2e6 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ko.xlf @@ -57,13 +57,13 @@ The default is to publish a framework-dependent application without an executabl The mode to use when publishing the application. The 'self-contained' mode publishes the application with the .NET Core runtime. -The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable. The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. The default is 'fx-dependent-no-exe' when a target runtime is not specified. The default is 'self-contained' when a target runtime is specified. The mode to use when publishing the application. The 'self-contained' mode publishes the application with the .NET Core runtime. -The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable. The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. The default is 'fx-dependent-no-exe' when a target runtime is not specified. The default is 'self-contained' when a target runtime is specified. @@ -75,8 +75,8 @@ The default is 'self-contained' when a target runtime is specified. - The '--mode' and '--self-contained' options conflict. Specify only one of the options. - The '--mode' and '--self-contained' options conflict. Specify only one of the options. + The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options. + The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options. diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pl.xlf index 24d8a39b8..cb4c0c981 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pl.xlf @@ -57,13 +57,13 @@ The default is to publish a framework-dependent application without an executabl The mode to use when publishing the application. The 'self-contained' mode publishes the application with the .NET Core runtime. -The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable. The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. The default is 'fx-dependent-no-exe' when a target runtime is not specified. The default is 'self-contained' when a target runtime is specified. The mode to use when publishing the application. The 'self-contained' mode publishes the application with the .NET Core runtime. -The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable. The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. The default is 'fx-dependent-no-exe' when a target runtime is not specified. The default is 'self-contained' when a target runtime is specified. @@ -75,8 +75,8 @@ The default is 'self-contained' when a target runtime is specified. - The '--mode' and '--self-contained' options conflict. Specify only one of the options. - The '--mode' and '--self-contained' options conflict. Specify only one of the options. + The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options. + The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options. 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 55df48df7..f7c91c76c 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pt-BR.xlf @@ -57,13 +57,13 @@ The default is to publish a framework-dependent application without an executabl The mode to use when publishing the application. The 'self-contained' mode publishes the application with the .NET Core runtime. -The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable. The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. The default is 'fx-dependent-no-exe' when a target runtime is not specified. The default is 'self-contained' when a target runtime is specified. The mode to use when publishing the application. The 'self-contained' mode publishes the application with the .NET Core runtime. -The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable. The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. The default is 'fx-dependent-no-exe' when a target runtime is not specified. The default is 'self-contained' when a target runtime is specified. @@ -75,8 +75,8 @@ The default is 'self-contained' when a target runtime is specified. - The '--mode' and '--self-contained' options conflict. Specify only one of the options. - The '--mode' and '--self-contained' options conflict. Specify only one of the options. + The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options. + The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options. diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ru.xlf index 084aad81c..2b269e4ec 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ru.xlf @@ -57,13 +57,13 @@ The default is to publish a framework-dependent application without an executabl The mode to use when publishing the application. The 'self-contained' mode publishes the application with the .NET Core runtime. -The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable. The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. The default is 'fx-dependent-no-exe' when a target runtime is not specified. The default is 'self-contained' when a target runtime is specified. The mode to use when publishing the application. The 'self-contained' mode publishes the application with the .NET Core runtime. -The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable. The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. The default is 'fx-dependent-no-exe' when a target runtime is not specified. The default is 'self-contained' when a target runtime is specified. @@ -75,8 +75,8 @@ The default is 'self-contained' when a target runtime is specified. - The '--mode' and '--self-contained' options conflict. Specify only one of the options. - The '--mode' and '--self-contained' options conflict. Specify only one of the options. + The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options. + The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options. diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.tr.xlf index daa82317b..d39339db9 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.tr.xlf @@ -57,13 +57,13 @@ The default is to publish a framework-dependent application without an executabl The mode to use when publishing the application. The 'self-contained' mode publishes the application with the .NET Core runtime. -The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable. The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. The default is 'fx-dependent-no-exe' when a target runtime is not specified. The default is 'self-contained' when a target runtime is specified. The mode to use when publishing the application. The 'self-contained' mode publishes the application with the .NET Core runtime. -The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable. The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. The default is 'fx-dependent-no-exe' when a target runtime is not specified. The default is 'self-contained' when a target runtime is specified. @@ -75,8 +75,8 @@ The default is 'self-contained' when a target runtime is specified. - The '--mode' and '--self-contained' options conflict. Specify only one of the options. - The '--mode' and '--self-contained' options conflict. Specify only one of the options. + The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options. + The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options. 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 0a3631a91..277fcd58e 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hans.xlf @@ -57,13 +57,13 @@ The default is to publish a framework-dependent application without an executabl The mode to use when publishing the application. The 'self-contained' mode publishes the application with the .NET Core runtime. -The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable. The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. The default is 'fx-dependent-no-exe' when a target runtime is not specified. The default is 'self-contained' when a target runtime is specified. The mode to use when publishing the application. The 'self-contained' mode publishes the application with the .NET Core runtime. -The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable. The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. The default is 'fx-dependent-no-exe' when a target runtime is not specified. The default is 'self-contained' when a target runtime is specified. @@ -75,8 +75,8 @@ The default is 'self-contained' when a target runtime is specified. - The '--mode' and '--self-contained' options conflict. Specify only one of the options. - The '--mode' and '--self-contained' options conflict. Specify only one of the options. + The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options. + The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options. 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 f0e5d9bcb..a23a56120 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hant.xlf @@ -57,13 +57,13 @@ The default is to publish a framework-dependent application without an executabl The mode to use when publishing the application. The 'self-contained' mode publishes the application with the .NET Core runtime. -The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable. The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. The default is 'fx-dependent-no-exe' when a target runtime is not specified. The default is 'self-contained' when a target runtime is specified. The mode to use when publishing the application. The 'self-contained' mode publishes the application with the .NET Core runtime. -The 'fx-dependent' mode publishes the application as framework-dependent with an executable if a target runtime is specified. +The 'fx-dependent' mode publishes the application as framework-dependent. If a target runtime is specified, it is published with an executable. The 'fx-dependent-no-exe' mode publishes the application as framework-dependent without an executable. The default is 'fx-dependent-no-exe' when a target runtime is not specified. The default is 'self-contained' when a target runtime is specified. @@ -75,8 +75,8 @@ The default is 'self-contained' when a target runtime is specified. - The '--mode' and '--self-contained' options conflict. Specify only one of the options. - The '--mode' and '--self-contained' options conflict. Specify only one of the options. + The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options. + The '--mode' and '--self-contained' options cannot be used together. Specify only one of the options. diff --git a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs index 9aa9ad4dc..b9da56f11 100644 --- a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs +++ b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs @@ -134,10 +134,14 @@ namespace Microsoft.DotNet.Cli.Publish.Tests var outputProgram = Path.Combine(outputDirectory.FullName, $"{testAppName}{Constants.ExeSuffix}"); - new TestCommand(outputProgram) - .ExecuteWithCapturedOutput() - .Should().Pass() - .And.HaveStdOutContaining("Hello World"); + var command = new TestCommand(outputProgram); + command.Environment["DOTNET_ROOT"]= new RepoDirectoriesProvider().DotnetRoot; + + command.ExecuteWithCapturedOutput() + .Should() + .Pass() + .And + .HaveStdOutContaining("Hello World"); } [Fact] @@ -186,7 +190,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests private DirectoryInfo PublishApp(string testAppName, string rid, string mode, string args = null) { var testInstance = TestAssets.Get(testAppName) - .CreateInstance($"PublishApp_{rid ?? "none"}_{mode ?? "none"}") + .CreateInstance($"PublishApp_{rid ?? "none"}_{mode ?? "none"}_{args ?? "none"}") .WithSourceFiles() .WithRestoreFiles(); From 8205dd4a150e5f714f45b92dc18f7510185751af Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Mon, 11 Jun 2018 21:55:47 -0700 Subject: [PATCH 23/73] Fix publish test for 32-bit environments. Ensure the correct DOTNET_ROOT variable is set for the apphost being run. --- .../GivenDotnetPublishPublishesProjects.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs index b9da56f11..01e4b5922 100644 --- a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs +++ b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs @@ -135,7 +135,8 @@ namespace Microsoft.DotNet.Cli.Publish.Tests var outputProgram = Path.Combine(outputDirectory.FullName, $"{testAppName}{Constants.ExeSuffix}"); var command = new TestCommand(outputProgram); - command.Environment["DOTNET_ROOT"]= new RepoDirectoriesProvider().DotnetRoot; + command.Environment[Environment.Is64BitProcess ? "DOTNET_ROOT" : "DOTNET_ROOT(x86)"] = + new RepoDirectoriesProvider().DotnetRoot; command.ExecuteWithCapturedOutput() .Should() From c834c8cd0b147e5232460174a1d6e89310b7a9e1 Mon Sep 17 00:00:00 2001 From: Nikolche Kolev Date: Tue, 12 Jun 2018 11:52:50 -0700 Subject: [PATCH 24/73] add interactive flag for the add package and restore commands --- .../dotnet-add/dotnet-add-package/AddPackageParser.cs | 4 +++- .../dotnet-add-package/LocalizableStrings.resx | 3 +++ .../commands/dotnet-restore/LocalizableStrings.resx | 3 +++ .../commands/dotnet-restore/RestoreCommandParser.cs | 9 +++++++-- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/AddPackageParser.cs b/src/dotnet/commands/dotnet-add/dotnet-add-package/AddPackageParser.cs index 8724683cd..750efa51e 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/AddPackageParser.cs +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/AddPackageParser.cs @@ -47,7 +47,9 @@ namespace Microsoft.DotNet.Cli LocalizableStrings.CmdPackageDirectoryDescription, Accept.ExactlyOneArgument() .With(name: LocalizableStrings.CmdPackageDirectory) - .ForwardAsSingle(o => $"--package-directory {o.Arguments.Single()}"))); + .ForwardAsSingle(o => $"--package-directory {o.Arguments.Single()}")), + Create.Option("--interactive", + LocalizableStrings.CmdInteractiveRestoreDescription)); } public static IEnumerable QueryNuGet(string match) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.resx b/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.resx index 36320b010..38e62efed 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.resx @@ -165,4 +165,7 @@ Unable to generate a temporary file for project '{0}'. Cannot add package reference. Please clear the temp directory and try again. + + Allow the command to block and require manual action to proceed. + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-restore/LocalizableStrings.resx b/src/dotnet/commands/dotnet-restore/LocalizableStrings.resx index 155845dc7..da0f30c11 100644 --- a/src/dotnet/commands/dotnet-restore/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-restore/LocalizableStrings.resx @@ -169,4 +169,7 @@ Force all dependencies to be resolved even if the last restore was successful. This is equivalent to deleting project.assets.json. + + Allow restore to block and require manual action to proceed. + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-restore/RestoreCommandParser.cs b/src/dotnet/commands/dotnet-restore/RestoreCommandParser.cs index f6c566af3..11cbc6d56 100644 --- a/src/dotnet/commands/dotnet-restore/RestoreCommandParser.cs +++ b/src/dotnet/commands/dotnet-restore/RestoreCommandParser.cs @@ -94,8 +94,13 @@ namespace Microsoft.DotNet.Cli useShortOptions ? "-f|--force" : "--force", LocalizableStrings.CmdForceRestoreOptionDescription, Accept.NoArguments() - .ForwardAs("-property:RestoreForce=true")) + .ForwardAs("-property:RestoreForce=true")), + Create.Option( + "--interactive", + showHelp ? LocalizableStrings.CmdInteractiveRestoreOptionDescription : string.Empty, + Accept.NoArguments() + .ForwardAs("-property:NuGetInteractive=true")) }; } } -} \ No newline at end of file +} From c7cde12e2def4f962db8d72ee6a25e29b424f49f Mon Sep 17 00:00:00 2001 From: Nikolche Kolev Date: Tue, 12 Jun 2018 12:08:18 -0700 Subject: [PATCH 25/73] update xlf files --- .../dotnet-add-package/xlf/LocalizableStrings.cs.xlf | 5 +++++ .../dotnet-add-package/xlf/LocalizableStrings.de.xlf | 5 +++++ .../dotnet-add-package/xlf/LocalizableStrings.es.xlf | 5 +++++ .../dotnet-add-package/xlf/LocalizableStrings.fr.xlf | 5 +++++ .../dotnet-add-package/xlf/LocalizableStrings.it.xlf | 5 +++++ .../dotnet-add-package/xlf/LocalizableStrings.ja.xlf | 5 +++++ .../dotnet-add-package/xlf/LocalizableStrings.ko.xlf | 5 +++++ .../dotnet-add-package/xlf/LocalizableStrings.pl.xlf | 5 +++++ .../dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf | 5 +++++ .../dotnet-add-package/xlf/LocalizableStrings.ru.xlf | 5 +++++ .../dotnet-add-package/xlf/LocalizableStrings.tr.xlf | 5 +++++ .../dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf | 5 +++++ .../dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf | 5 +++++ .../commands/dotnet-restore/xlf/LocalizableStrings.cs.xlf | 5 +++++ .../commands/dotnet-restore/xlf/LocalizableStrings.de.xlf | 5 +++++ .../commands/dotnet-restore/xlf/LocalizableStrings.es.xlf | 5 +++++ .../commands/dotnet-restore/xlf/LocalizableStrings.fr.xlf | 5 +++++ .../commands/dotnet-restore/xlf/LocalizableStrings.it.xlf | 5 +++++ .../commands/dotnet-restore/xlf/LocalizableStrings.ja.xlf | 5 +++++ .../commands/dotnet-restore/xlf/LocalizableStrings.ko.xlf | 5 +++++ .../commands/dotnet-restore/xlf/LocalizableStrings.pl.xlf | 5 +++++ .../commands/dotnet-restore/xlf/LocalizableStrings.pt-BR.xlf | 5 +++++ .../commands/dotnet-restore/xlf/LocalizableStrings.ru.xlf | 5 +++++ .../commands/dotnet-restore/xlf/LocalizableStrings.tr.xlf | 5 +++++ .../dotnet-restore/xlf/LocalizableStrings.zh-Hans.xlf | 5 +++++ .../dotnet-restore/xlf/LocalizableStrings.zh-Hant.xlf | 5 +++++ 26 files changed, 130 insertions(+) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf index dfe3f4ed9..ff155542f 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf @@ -82,6 +82,11 @@ Nejde generovat dočasný soubor pro projekt {0}. Není možné přidat odkaz na balíček. Vyprázdněte prosím dočasný adresář a zkuste to znovu. + + Allow the command to block and require manual action to proceed. + Allow the command to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf index a3016887c..8af9b379d 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf @@ -82,6 +82,11 @@ Für das Projekt "{0}" kann keine temporäre Datei generiert werden. Ein Paketverweis kann nicht hinzugefügt werden. Löschen Sie das temporäre Verzeichnis, und versuchen Sie es noch mal. + + Allow the command to block and require manual action to proceed. + Allow the command to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf index 0dd40da84..8deb95299 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf @@ -82,6 +82,11 @@ No se puede generar un archivo temporal para el proyecto "{0}". No se puede agregar la referencia del paquete. Borre el directorio temporal e inténtelo de nuevo. + + Allow the command to block and require manual action to proceed. + Allow the command to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf index fa4124efb..d80770eed 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf @@ -82,6 +82,11 @@ Impossible de générer un fichier temporaire pour le projet '{0}'. Impossible d'ajouter une référence de package. Effacez le répertoire temporaire et réessayez. + + Allow the command to block and require manual action to proceed. + Allow the command to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf index 97b0db78d..bebe45ec2 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf @@ -82,6 +82,11 @@ Non è possibile generare un file temporaneo per il progetto '{0}'. Non è possibile aggiungere il riferimento al pacchetto. Cancellare la directory temp e riprovare. + + Allow the command to block and require manual action to proceed. + Allow the command to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf index 694661e14..49d4b1a24 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf @@ -82,6 +82,11 @@ プロジェクト '{0}' の一時ファイルを生成できません。パッケージ参照を追加できません。一時ディレクトリをクリアして、もう一度お試しください。 + + Allow the command to block and require manual action to proceed. + Allow the command to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf index 6f5e5962b..a85d2d632 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf @@ -82,6 +82,11 @@ '{0}' 프로젝트에 대한 임시 파일을 생성할 수 없습니다. 패키지 참조를 추가할 수 없습니다. 임시 디렉터리를 지우고 다시 시도하세요. + + Allow the command to block and require manual action to proceed. + Allow the command to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf index 45e41afee..7487aed91 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf @@ -82,6 +82,11 @@ Nie można wygenerować pliku tymczasowego dla projektu „{0}”. Nie można dodać odwołania do pakietu. Wyczyść katalog tymczasowy i spróbuj ponownie. + + Allow the command to block and require manual action to proceed. + Allow the command to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf index 05dc7dca2..b5b59df92 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf @@ -82,6 +82,11 @@ Não é possível gerar um arquivo temporário para o projeto '{0}'. Não é possível adicionar a referência do pacote. Limpe i diretório temporário e tente novamente. + + Allow the command to block and require manual action to proceed. + Allow the command to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf index e57fae4e9..bf507e9d2 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf @@ -82,6 +82,11 @@ Не удалось создать временный файл для проекта "{0}". Невозможно добавить ссылку на пакет. Очистите временный каталог и повторите попытку. + + Allow the command to block and require manual action to proceed. + Allow the command to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf index edbca50eb..e2ab823e3 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf @@ -82,6 +82,11 @@ '{0}' projesi için bir geçici dosya oluşturulamıyor. Paket başvurusu eklenemiyor. Lütfen geçici dizini temizleyin ve yeniden deneyin. + + Allow the command to block and require manual action to proceed. + Allow the command to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf index 9d4f9ebe7..741381fce 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf @@ -82,6 +82,11 @@ 未能为项目“{0}”生成临时文件。无法添加包引用。请清除临时目录，再重试。 + + Allow the command to block and require manual action to proceed. + Allow the command to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf index 9f8584c45..fe7b898ee 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf @@ -82,6 +82,11 @@ 無法產生專案 '{0}' 的暫存檔案。無法新增套件參考。請清除暫存目錄並再試一次。 + + Allow the command to block and require manual action to proceed. + Allow the command to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.cs.xlf index 334b4c013..83123ef77 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.cs.xlf @@ -88,6 +88,11 @@ This is equivalent to deleting project.assets.json. Tento příznak nastavte, pokud chcete vynutit vyřešení všech závislostí, i když poslední obnovení proběhlo úspěšně. Jedná se o ekvivalent odstranění project.assets.json. + + Allow restore to block and require manual action to proceed. + Allow restore to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.de.xlf index 6f995fd04..1f497a696 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.de.xlf @@ -88,6 +88,11 @@ This is equivalent to deleting project.assets.json. Legen Sie dieses Flag fest, damit alle Abhängigkeiten aufgelöst werden, auch wenn die letzte Wiederherstellung erfolgreich war. Dies entspricht dem Löschen von "project.assets.json". + + Allow restore to block and require manual action to proceed. + Allow restore to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.es.xlf index 21e4c7f6d..8a212cc48 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.es.xlf @@ -88,6 +88,11 @@ This is equivalent to deleting project.assets.json. Establezca este indicador para forzar la resolución de todas las dependencias aunque la última restauración se haya realizado correctamente. Esta acción es equivalente a eliminar project.assets.json. + + Allow restore to block and require manual action to proceed. + Allow restore to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.fr.xlf index 84858d4f1..fd6fd82fe 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.fr.xlf @@ -88,6 +88,11 @@ This is equivalent to deleting project.assets.json. Définissez cet indicateur pour forcer la résolution de toutes les dépendances même si la dernière restauration a réussi. Cela équivaut à supprimer project.assets.json. + + Allow restore to block and require manual action to proceed. + Allow restore to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.it.xlf index 9066cc895..abb659781 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.it.xlf @@ -88,6 +88,11 @@ This is equivalent to deleting project.assets.json. Impostare questo flag per forzare la risoluzione di tutte le dipendenze anche se l'ultimo ripristino è riuscito. Equivale a eliminare project.assets.json. + + Allow restore to block and require manual action to proceed. + Allow restore to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ja.xlf index 835dc0c69..b23e93f2c 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ja.xlf @@ -88,6 +88,11 @@ This is equivalent to deleting project.assets.json. このフラグを設定すると、最後に行われた復元が成功した場合でも強制的にすべての依存関係を解決します。これは、project.assets.json を削除することと同じです。 + + Allow restore to block and require manual action to proceed. + Allow restore to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ko.xlf index 78d22847a..f26e0a6de 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ko.xlf @@ -88,6 +88,11 @@ This is equivalent to deleting project.assets.json. 마지막 복원이 성공적인 경우에도 이 플래그를 설정하여 모든 종속성을 확인합니다. project.assets.json을 삭제하는 것과 동일합니다. + + Allow restore to block and require manual action to proceed. + Allow restore to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pl.xlf index 7ecff7887..352b72654 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pl.xlf @@ -88,6 +88,11 @@ This is equivalent to deleting project.assets.json. Ustaw tę flagę, aby wymusić rozstrzygnięcie wszystkich zależności nawet w przypadku, gdy ostatnie przywracanie się powiodło. Jest to równoważne usunięciu pliku project.assets.json. + + Allow restore to block and require manual action to proceed. + Allow restore to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pt-BR.xlf index 69099d848..66c269966 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pt-BR.xlf @@ -88,6 +88,11 @@ This is equivalent to deleting project.assets.json. Defina este sinalizador para forçar todas as dependências a serem resolvidas, mesmo que a última restauração tenha tido êxito. Isso equivale a excluir o project.assets.json. + + Allow restore to block and require manual action to proceed. + Allow restore to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ru.xlf index 7a5345c37..b4e464a24 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ru.xlf @@ -88,6 +88,11 @@ This is equivalent to deleting project.assets.json. Задайте этот флаг, чтобы принудительно разрешать все зависимости даже в случае успеха последнего восстановления. Это эквивалентно удалению project.assets.json. + + Allow restore to block and require manual action to proceed. + Allow restore to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.tr.xlf index 3bac27e0e..4bfc9ff76 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.tr.xlf @@ -88,6 +88,11 @@ This is equivalent to deleting project.assets.json. Son geri yükleme başarılı olsa bile tüm bağımlılıkların çözümlenmesini zorlamak için bu bayrağı ayarlayın. Bu, project.assets.json öğesini silmeyle eşdeğerdir. + + Allow restore to block and require manual action to proceed. + Allow restore to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hans.xlf index e6bbe76ae..1be87cbe4 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hans.xlf @@ -88,6 +88,11 @@ This is equivalent to deleting project.assets.json. 设置此标志以强制解析所有依赖项，即使最后一次还原已经成功。这等效于删除 project.assets.json。 + + Allow restore to block and require manual action to proceed. + Allow restore to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hant.xlf index a0cec1f4d..c78e76935 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hant.xlf @@ -88,6 +88,11 @@ This is equivalent to deleting project.assets.json. 設定此旗標可在即使上次還原已成功的情況下，仍然強制解決所有相依性。如此等同於刪除 project.assets.json。 + + Allow restore to block and require manual action to proceed. + Allow restore to block and require manual action to proceed. + + \ No newline at end of file From af6b9ab12e75855a7ab24e13893c4ed29bf56d39 Mon Sep 17 00:00:00 2001 From: jbeisner Date: Tue, 12 Jun 2018 22:15:53 +0000 Subject: [PATCH 26/73] Correct the 'Channel' and 'BranchName' to "release/2.1.3xx" --- build/BranchInfo.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/BranchInfo.props b/build/BranchInfo.props index f62c8fd00..961d6d290 100644 --- a/build/BranchInfo.props +++ b/build/BranchInfo.props @@ -1,6 +1,6 @@ - master - master + release/2.1.3xx + release/2.1.3xx From 1d12ea7f1edfada566e2bc67a7d9f4660bc13467 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 12 Jun 2018 15:55:16 -0700 Subject: [PATCH 27/73] Update VS insertion package name for x64 package --- ...pec => VS.Redist.Common.Net.Core.SDK.x64.2.1.2xx.nuspec} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename packaging/windows/clisdk/{VS.Redist.Common.Net.Core.SDK.x64.nuspec => VS.Redist.Common.Net.Core.SDK.x64.2.1.2xx.nuspec} (74%) diff --git a/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x64.nuspec b/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x64.2.1.2xx.nuspec similarity index 74% rename from packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x64.nuspec rename to packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x64.2.1.2xx.nuspec index 1e5f870e8..785a650a2 100644 --- a/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x64.nuspec +++ b/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x64.2.1.2xx.nuspec @@ -1,15 +1,15 @@  - VS.Redist.Common.Net.Core.SDK.x64 + VS.Redist.Common.Net.Core.SDK.x64.2.1.2xx 1.0.0 - VS.Redist.Common.Net.Core.SDK.x64 + VS.Redist.Common.Net.Core.SDK.x64.2.1.2xx Microsoft Microsoft https://www.microsoft.com/net/dotnet_library_license.htm https://github.com/dotnet/cli true - Windows Installers (x64) for .Net Core SDK + Windows Installers (x64) for .Net Core SDK 2.1.2xx © Microsoft Corporation. All rights reserved. From 4ef09279d223d0b7c4bb034b41c7b768ddfb88c1 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 12 Jun 2018 15:55:49 -0700 Subject: [PATCH 28/73] Update VS insertion package name for x86 package --- ...pec => VS.Redist.Common.Net.Core.SDK.x86.2.1.2xx.nuspec} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename packaging/windows/clisdk/{VS.Redist.Common.Net.Core.SDK.x86.nuspec => VS.Redist.Common.Net.Core.SDK.x86.2.1.2xx.nuspec} (74%) diff --git a/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x86.nuspec b/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x86.2.1.2xx.nuspec similarity index 74% rename from packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x86.nuspec rename to packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x86.2.1.2xx.nuspec index c9b9f73cd..e8bd5cd0f 100644 --- a/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x86.nuspec +++ b/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x86.2.1.2xx.nuspec @@ -1,15 +1,15 @@  - VS.Redist.Common.Net.Core.SDK.x86 + VS.Redist.Common.Net.Core.SDK.x86.2.1.2xx 1.0.0 - VS.Redist.Common.Net.Core.SDK.x86 + VS.Redist.Common.Net.Core.SDK.x86.2.1.2xx Microsoft Microsoft https://www.microsoft.com/net/dotnet_library_license.htm https://github.com/dotnet/cli true - Windows Installer (x86) for .Net Core SDK + Windows Installer (x86) for .Net Core SDK 2.1.2xx © Microsoft Corporation. All rights reserved. From ac9b4579ce4d21faa3830e0b0fed6f3b5e61849d Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 12 Jun 2018 16:05:04 -0700 Subject: [PATCH 29/73] Update VS Insertion NuGet package IDs in Installer.MSI.targets --- build/package/Installer.MSI.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/package/Installer.MSI.targets b/build/package/Installer.MSI.targets index e1baf462d..68fc9c15a 100644 --- a/build/package/Installer.MSI.targets +++ b/build/package/Installer.MSI.targets @@ -19,8 +19,8 @@ $(RepoRoot)/packaging/windows/msbuildextensions/generatemsi.ps1 - $(RepoRoot)/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.$(Architecture).nuspec - $(InstallerOutputDirectory)/VS.Redist.Common.Net.Core.SDK.$(Architecture).$(FullNugetVersion).nupkg + $(RepoRoot)/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.$(Architecture).2.1.2xx.nuspec + $(InstallerOutputDirectory)/VS.Redist.Common.Net.Core.SDK.$(Architecture).2.1.2xx.$(FullNugetVersion).nupkg $(RepoRoot)/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec $(InstallerOutputDirectory)/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.$(FullNugetVersion).nupkg From e45766ca1e5641ee819be31e21477c12ea46540c Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Wed, 13 Jun 2018 02:47:33 +0000 Subject: [PATCH 30/73] Update coresetup, msbuild, nugetclient, roslyn to preview1-26216-03, 15.7.177, preview1.5116, beta6-62923-07, respectively --- build/DependencyVersions.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index e45de7425..54f139040 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -9,15 +9,15 @@ 2.1.0 2.1.0 2.1.0 - 2.1.1-servicing-26605-02 + 2.1.1 $(MicrosoftNETCoreAppPackageVersion) - 15.7.179 + 15.7.177 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) 10.1.4-rtm-180515-0 - 2.8.1-beta6-62915-07 + 2.8.3-beta6-62923-07 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) @@ -42,7 +42,7 @@ 1.3.1 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 0.2.0-beta-62628-01 - 4.7.0-rtm.5148 + 4.8.0-preview1.5116 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 0a5861d8b25905d49b31ff85a37bf3d96678bce5 Mon Sep 17 00:00:00 2001 From: Andy Gerlicher Date: Tue, 12 Jun 2018 19:52:57 -0700 Subject: [PATCH 31/73] MSBuild 15.8.101-preview --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 7587a5865..691aa8fb0 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -11,7 +11,7 @@ 2.1.0 2.1.0 $(MicrosoftNETCoreAppPackageVersion) - 15.8.0-preview-000086 + 15.8.0-preview-000101 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From 7f0765eb33819d25a4504599493c04806c86f721 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 12 Jun 2018 20:34:32 -0700 Subject: [PATCH 32/73] Revert undesired changes --- build/DependencyVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 54f139040..3be1d13b8 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -11,13 +11,13 @@ 2.1.0 2.1.1 $(MicrosoftNETCoreAppPackageVersion) - 15.7.177 + 15.7.179 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) 10.1.4-rtm-180515-0 - 2.8.3-beta6-62923-07 + 2.8.1-beta6-62915-07 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) @@ -42,7 +42,7 @@ 1.3.1 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 0.2.0-beta-62628-01 - 4.8.0-preview1.5116 + 4.7.0-rtm.5148 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 7f29a9063518eafc128473c0b57e648d867e19c7 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 13 Jun 2018 13:24:47 -0700 Subject: [PATCH 33/73] Update SDK/WebSDK dependencies to 2.1.1 --- build/DependencyVersions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 3be1d13b8..e5d4f098f 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -22,10 +22,10 @@ $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.300 + 2.1.301 $(MicrosoftNETSdkPackageVersion) $(MicrosoftAspNetCoreAppPackageVersion) - 2.1.300 + 2.1.301 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) 1.0.2-beta3 From 80f143dd0834978de16b3772bc935ff3dc5b660f Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 13 Jun 2018 17:59:54 -0700 Subject: [PATCH 34/73] Bring back old package IDs --- .../VS.Redist.Common.Net.Core.SDK.x64.nuspec | 18 ++++++++++++++++++ .../VS.Redist.Common.Net.Core.SDK.x86.nuspec | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x64.nuspec create mode 100644 packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x86.nuspec diff --git a/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x64.nuspec b/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x64.nuspec new file mode 100644 index 000000000..1e5f870e8 --- /dev/null +++ b/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x64.nuspec @@ -0,0 +1,18 @@ + + + + VS.Redist.Common.Net.Core.SDK.x64 + 1.0.0 + VS.Redist.Common.Net.Core.SDK.x64 + Microsoft + Microsoft + https://www.microsoft.com/net/dotnet_library_license.htm + https://github.com/dotnet/cli + true + Windows Installers (x64) for .Net Core SDK + © Microsoft Corporation. All rights reserved. + + + + + \ No newline at end of file diff --git a/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x86.nuspec b/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x86.nuspec new file mode 100644 index 000000000..c9b9f73cd --- /dev/null +++ b/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x86.nuspec @@ -0,0 +1,18 @@ + + + + VS.Redist.Common.Net.Core.SDK.x86 + 1.0.0 + VS.Redist.Common.Net.Core.SDK.x86 + Microsoft + Microsoft + https://www.microsoft.com/net/dotnet_library_license.htm + https://github.com/dotnet/cli + true + Windows Installer (x86) for .Net Core SDK + © Microsoft Corporation. All rights reserved. + + + + + \ No newline at end of file From bcbfbffced9b30f0d2d659179c87f3663650883c Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 13 Jun 2018 18:25:59 -0700 Subject: [PATCH 35/73] Update Installer build to create both old and new package identities --- build/package/Installer.MSI.targets | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/build/package/Installer.MSI.targets b/build/package/Installer.MSI.targets index 68fc9c15a..2b1b5285d 100644 --- a/build/package/Installer.MSI.targets +++ b/build/package/Installer.MSI.targets @@ -19,8 +19,10 @@ $(RepoRoot)/packaging/windows/msbuildextensions/generatemsi.ps1 - $(RepoRoot)/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.$(Architecture).2.1.2xx.nuspec - $(InstallerOutputDirectory)/VS.Redist.Common.Net.Core.SDK.$(Architecture).2.1.2xx.$(FullNugetVersion).nupkg + $(RepoRoot)/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.$(Architecture).nuspec + $(InstallerOutputDirectory)/VS.Redist.Common.Net.Core.SDK.$(Architecture).$(FullNugetVersion).nupkg + $(RepoRoot)/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.$(Architecture).2.1.2xx.nuspec + $(InstallerOutputDirectory)/VS.Redist.Common.Net.Core.SDK.$(Architecture).2.1.2xx.$(FullNugetVersion).nupkg $(RepoRoot)/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec $(InstallerOutputDirectory)/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.$(FullNugetVersion).nupkg @@ -162,14 +164,21 @@ Condition=" '$(OS)' == 'Windows_NT'" Inputs="$(CombinedFrameworkSdkHostInstallerFile); $(SdkInstallerNuspecFile); + $(SdkInstallerNuspecFile2xx); $(SdkGenerateNupkgPowershellScript)" - Outputs="$(SdkInstallerNupkgFile)"> + Outputs="$(SdkInstallerNupkgFile);$(SdkInstallerNupkgFile2xx)"> + + Date: Thu, 14 Jun 2018 10:43:41 -0700 Subject: [PATCH 36/73] Updating the WebSdk version for release/2.1.4xx --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 190b836fe..294404430 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -25,7 +25,7 @@ 1.0.0-preview-62924-09 $(MicrosoftNETSdkPackageVersion) $(MicrosoftAspNetCoreAppPackageVersion) - 2.1.300 + 2.1.400-preview1-20180614-1774926 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) 1.0.2-beta3 From bf473ad46c8e48a522b7109e2534d3557794cbff Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Thu, 14 Jun 2018 12:57:21 -0700 Subject: [PATCH 37/73] Insert NuGet Build 4.8.0-preview3.5278 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 190b836fe..d2c04ab80 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -42,7 +42,7 @@ 1.3.1 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 0.2.0-beta-62628-01 - 4.8.0-preview3.5244 + 4.8.0-preview3.5278 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 4050c6374f51e17cd585750f08f571ccd4686ecb Mon Sep 17 00:00:00 2001 From: jbeisner Date: Thu, 14 Jun 2018 20:31:09 +0000 Subject: [PATCH 38/73] The "pack" command under 'buildCrossTargeting' for 'Microsoft.DotNet.MSBuildSdkResolver' now throws a "NU5104" warning/error because the SDK stage0 was changed to "2.1.300" [change was intended]. --- build/BuildDefaults.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/BuildDefaults.props b/build/BuildDefaults.props index 757d6ec36..acf196ff3 100644 --- a/build/BuildDefaults.props +++ b/build/BuildDefaults.props @@ -28,7 +28,7 @@ - NU1701 + NU1701;NU5104 true From d396c8bf4e3253008b963bae860a609694e810cf Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Thu, 14 Jun 2018 13:41:15 -0700 Subject: [PATCH 39/73] Update templates to carry test SDK 15.8.0-preview-20180610-02 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 190b836fe..4734d360a 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -30,7 +30,7 @@ $(MicrosoftNETSdkWebPackageVersion) 1.0.2-beta3 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 1.0.2-beta3 + 1.0.2-beta3-20180614-1775839 1.0.2-beta3 $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) From c0c445be04052584fbc61d863f215f4a0bd55f9c Mon Sep 17 00:00:00 2001 From: jbeisner Date: Thu, 14 Jun 2018 21:12:46 +0000 Subject: [PATCH 40/73] Updating the 'NoWarn' comments. --- build/BuildDefaults.props | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build/BuildDefaults.props b/build/BuildDefaults.props index acf196ff3..eb114a390 100644 --- a/build/BuildDefaults.props +++ b/build/BuildDefaults.props @@ -26,8 +26,10 @@ true - + + + NU1701;NU5104 true From 734a41730a2a66f6c5afcbe4a82ee39224331d21 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Thu, 14 Jun 2018 17:32:24 -0700 Subject: [PATCH 41/73] Fix the 'Microsoft.AspNet.Core.Mvc' versioning (#9491) * The version of 'Microsoft.AspNetCore.Mvc' should be independent of 'Microsoft.AspNetCore.All' * Changing "MicrosoftAspNetCoreMvcVersion" to "MicrosoftAspNetCoreMvcPackageVersion" in order to be compatable with ProdCon. --- TestAssets/TestProjects/TestRazorApp/TestRazorApp.csproj | 2 +- build/DependencyVersions.props | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/TestAssets/TestProjects/TestRazorApp/TestRazorApp.csproj b/TestAssets/TestProjects/TestRazorApp/TestRazorApp.csproj index 59cfc871f..611bb08eb 100644 --- a/TestAssets/TestProjects/TestRazorApp/TestRazorApp.csproj +++ b/TestAssets/TestProjects/TestRazorApp/TestRazorApp.csproj @@ -6,6 +6,6 @@ - + diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index e5d4f098f..a141031dd 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -4,6 +4,7 @@ 2.1.1-rtm-30818 $(MicrosoftAspNetCoreAllPackageVersion) 2.1.0 + 2.1.1 2.1.1-rtm-30818 2.1.0 2.1.0 From f3f43a7db4b5b866672b6fa5bb7063cb37b1ba33 Mon Sep 17 00:00:00 2001 From: William Li Date: Fri, 15 Jun 2018 10:36:47 -0700 Subject: [PATCH 42/73] Update SDK to 2.1.400-preview-63014-01 (#9498) --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 4a38e9c97..98e98283a 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -22,7 +22,7 @@ $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.400-preview-63010-01 + 2.1.400-preview-63014-01 $(MicrosoftNETSdkPackageVersion) $(MicrosoftAspNetCoreAppPackageVersion) 2.1.300 From 470370ab7668d35f547b21f0d0a362c1a01207fe Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Fri, 15 Jun 2018 14:44:22 -0700 Subject: [PATCH 43/73] Bump to a newer package version built by prodcon --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 4734d360a..0c02175e2 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -30,7 +30,7 @@ $(MicrosoftNETSdkWebPackageVersion) 1.0.2-beta3 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 1.0.2-beta3-20180614-1775839 + 1.0.2-beta3-20180615-1778025 1.0.2-beta3 $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) From cec0b5998e0270b3f3b0c2e5f80c5216bdcad42b Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Fri, 15 Jun 2018 15:18:30 -0700 Subject: [PATCH 44/73] Switch back to the older version of the template package and add the templating MyGet feed --- 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 0c02175e2..4734d360a 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -30,7 +30,7 @@ $(MicrosoftNETSdkWebPackageVersion) 1.0.2-beta3 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 1.0.2-beta3-20180615-1778025 + 1.0.2-beta3-20180614-1775839 1.0.2-beta3 $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets index 097849290..2505ed6c6 100644 --- a/build/NugetConfigFile.targets +++ b/build/NugetConfigFile.targets @@ -20,6 +20,7 @@ + From 81996f47e87f08035bdb79199ce3975bef8b68f6 Mon Sep 17 00:00:00 2001 From: vramak Date: Fri, 15 Jun 2018 15:21:11 -0700 Subject: [PATCH 45/73] Updating the websdk feed --- build/NugetConfigFile.targets | 1 + 1 file changed, 1 insertion(+) diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets index 097849290..604d26b00 100644 --- a/build/NugetConfigFile.targets +++ b/build/NugetConfigFile.targets @@ -20,6 +20,7 @@ + From dba0aa33da7bc858f95d6c0c1f09a1bd0a3e8ad7 Mon Sep 17 00:00:00 2001 From: Nikolche Kolev Date: Tue, 19 Jun 2018 16:33:59 -0700 Subject: [PATCH 46/73] Update the messages per the recommendation --- .../dotnet-add/dotnet-add-package/LocalizableStrings.resx | 2 +- .../dotnet-add-package/xlf/LocalizableStrings.cs.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.de.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.es.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.fr.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.it.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.ja.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.ko.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.pl.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.ru.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.tr.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf | 4 ++-- src/dotnet/commands/dotnet-restore/LocalizableStrings.resx | 2 +- .../commands/dotnet-restore/xlf/LocalizableStrings.cs.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.de.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.es.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.fr.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.it.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.ja.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.ko.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.pl.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.pt-BR.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.ru.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.tr.xlf | 4 ++-- .../dotnet-restore/xlf/LocalizableStrings.zh-Hans.xlf | 4 ++-- .../dotnet-restore/xlf/LocalizableStrings.zh-Hant.xlf | 4 ++-- 28 files changed, 54 insertions(+), 54 deletions(-) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.resx b/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.resx index 38e62efed..564a2fcdb 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.resx @@ -166,6 +166,6 @@ Unable to generate a temporary file for project '{0}'. Cannot add package reference. Please clear the temp directory and try again. - Allow the command to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf index ff155542f..449b261dd 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf @@ -83,8 +83,8 @@ - Allow the command to block and require manual action to proceed. - Allow the command to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf index 8af9b379d..ac4f6b94f 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf @@ -83,8 +83,8 @@ - Allow the command to block and require manual action to proceed. - Allow the command to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf index 8deb95299..d32981896 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf @@ -83,8 +83,8 @@ - Allow the command to block and require manual action to proceed. - Allow the command to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf index d80770eed..ce45e848e 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf @@ -83,8 +83,8 @@ - Allow the command to block and require manual action to proceed. - Allow the command to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf index bebe45ec2..e7e122963 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf @@ -83,8 +83,8 @@ - Allow the command to block and require manual action to proceed. - Allow the command to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf index 49d4b1a24..25d7475dc 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf @@ -83,8 +83,8 @@ - Allow the command to block and require manual action to proceed. - Allow the command to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf index a85d2d632..ab76e50ea 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf @@ -83,8 +83,8 @@ - Allow the command to block and require manual action to proceed. - Allow the command to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf index 7487aed91..ff0b4eec7 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf @@ -83,8 +83,8 @@ - Allow the command to block and require manual action to proceed. - Allow the command to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf index b5b59df92..08ccc2d5a 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf @@ -83,8 +83,8 @@ - Allow the command to block and require manual action to proceed. - Allow the command to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf index bf507e9d2..811d11db6 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf @@ -83,8 +83,8 @@ - Allow the command to block and require manual action to proceed. - Allow the command to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf index e2ab823e3..761e6e345 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf @@ -83,8 +83,8 @@ - Allow the command to block and require manual action to proceed. - Allow the command to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf index 741381fce..ebfd3ec4e 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf @@ -83,8 +83,8 @@ - Allow the command to block and require manual action to proceed. - Allow the command to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf index fe7b898ee..25bd15a5a 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf @@ -83,8 +83,8 @@ - Allow the command to block and require manual action to proceed. - Allow the command to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-restore/LocalizableStrings.resx b/src/dotnet/commands/dotnet-restore/LocalizableStrings.resx index da0f30c11..63bc3cb98 100644 --- a/src/dotnet/commands/dotnet-restore/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-restore/LocalizableStrings.resx @@ -170,6 +170,6 @@ This is equivalent to deleting project.assets.json. - Allow restore to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.cs.xlf index 83123ef77..fc8c864cc 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.cs.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allow restore to block and require manual action to proceed. - Allow restore to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.de.xlf index 1f497a696..33432091d 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.de.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allow restore to block and require manual action to proceed. - Allow restore to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.es.xlf index 8a212cc48..66a74d4db 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.es.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allow restore to block and require manual action to proceed. - Allow restore to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.fr.xlf index fd6fd82fe..063ba5b8a 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.fr.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allow restore to block and require manual action to proceed. - Allow restore to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.it.xlf index abb659781..99cae559e 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.it.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allow restore to block and require manual action to proceed. - Allow restore to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ja.xlf index b23e93f2c..55ab86705 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ja.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allow restore to block and require manual action to proceed. - Allow restore to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ko.xlf index f26e0a6de..a1973ddb0 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ko.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allow restore to block and require manual action to proceed. - Allow restore to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pl.xlf index 352b72654..be4c39e2d 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pl.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allow restore to block and require manual action to proceed. - Allow restore to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pt-BR.xlf index 66c269966..981657cfa 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pt-BR.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allow restore to block and require manual action to proceed. - Allow restore to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ru.xlf index b4e464a24..6689efadb 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ru.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allow restore to block and require manual action to proceed. - Allow restore to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.tr.xlf index 4bfc9ff76..50e20535f 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.tr.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allow restore to block and require manual action to proceed. - Allow restore to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hans.xlf index 1be87cbe4..519cdd150 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hans.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allow restore to block and require manual action to proceed. - Allow restore to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hant.xlf index c78e76935..853137b9c 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hant.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allow restore to block and require manual action to proceed. - Allow restore to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) From d6fb69a4be003e5584736175b9a9da8374ad6162 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 20 Jun 2018 10:26:43 -0700 Subject: [PATCH 47/73] Fix remove sln description. --- src/dotnet/commands/dotnet-sln/LocalizableStrings.resx | 2 +- src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.cs.xlf | 4 ++-- src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.de.xlf | 4 ++-- src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.es.xlf | 4 ++-- src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.fr.xlf | 4 ++-- src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.it.xlf | 4 ++-- src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.ja.xlf | 4 ++-- src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.ko.xlf | 4 ++-- src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.pl.xlf | 4 ++-- .../commands/dotnet-sln/xlf/LocalizableStrings.pt-BR.xlf | 4 ++-- src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.ru.xlf | 4 ++-- src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.tr.xlf | 4 ++-- .../commands/dotnet-sln/xlf/LocalizableStrings.zh-Hans.xlf | 4 ++-- .../commands/dotnet-sln/xlf/LocalizableStrings.zh-Hant.xlf | 4 ++-- test/dotnet-sln-remove.Tests/GivenDotnetSlnRemove.cs | 2 +- 15 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/dotnet/commands/dotnet-sln/LocalizableStrings.resx b/src/dotnet/commands/dotnet-sln/LocalizableStrings.resx index 8bb6a42f7..33334746d 100644 --- a/src/dotnet/commands/dotnet-sln/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-sln/LocalizableStrings.resx @@ -145,7 +145,7 @@ PROJECT_PATH - The paths to the projects to from from the solution. + The paths to the projects to remove from the solution. Remove one or more projects from a solution file. diff --git a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.cs.xlf index 04ea26957..9ef2e269f 100644 --- a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.cs.xlf @@ -68,8 +68,8 @@ - The paths to the projects to from from the solution. - The paths to the projects to from from the solution. + The paths to the projects to remove from the solution. + The paths to the projects to remove from the solution. diff --git a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.de.xlf index bfd65fa0c..17c13ea5a 100644 --- a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.de.xlf @@ -68,8 +68,8 @@ - The paths to the projects to from from the solution. - The paths to the projects to from from the solution. + The paths to the projects to remove from the solution. + The paths to the projects to remove from the solution. diff --git a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.es.xlf index 695f2ddf0..d7a1dcd8f 100644 --- a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.es.xlf @@ -68,8 +68,8 @@ - The paths to the projects to from from the solution. - The paths to the projects to from from the solution. + The paths to the projects to remove from the solution. + The paths to the projects to remove from the solution. diff --git a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.fr.xlf index b227be359..985fa5ce9 100644 --- a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.fr.xlf @@ -68,8 +68,8 @@ - The paths to the projects to from from the solution. - The paths to the projects to from from the solution. + The paths to the projects to remove from the solution. + The paths to the projects to remove from the solution. diff --git a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.it.xlf index dce77ca36..3b62e07c6 100644 --- a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.it.xlf @@ -68,8 +68,8 @@ - The paths to the projects to from from the solution. - The paths to the projects to from from the solution. + The paths to the projects to remove from the solution. + The paths to the projects to remove from the solution. diff --git a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.ja.xlf index f84735e78..40e92f1eb 100644 --- a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.ja.xlf @@ -68,8 +68,8 @@ - The paths to the projects to from from the solution. - The paths to the projects to from from the solution. + The paths to the projects to remove from the solution. + The paths to the projects to remove from the solution. diff --git a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.ko.xlf index a4e19ccdc..8699ccff9 100644 --- a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.ko.xlf @@ -68,8 +68,8 @@ - The paths to the projects to from from the solution. - The paths to the projects to from from the solution. + The paths to the projects to remove from the solution. + The paths to the projects to remove from the solution. diff --git a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.pl.xlf index faac28dbe..779da30cd 100644 --- a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.pl.xlf @@ -68,8 +68,8 @@ - The paths to the projects to from from the solution. - The paths to the projects to from from the solution. + The paths to the projects to remove from the solution. + The paths to the projects to remove from the solution. diff --git a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.pt-BR.xlf index ec3d79ae1..11af2e0cf 100644 --- a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.pt-BR.xlf @@ -68,8 +68,8 @@ - The paths to the projects to from from the solution. - The paths to the projects to from from the solution. + The paths to the projects to remove from the solution. + The paths to the projects to remove from the solution. diff --git a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.ru.xlf index 0cd4225da..d94ab6677 100644 --- a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.ru.xlf @@ -68,8 +68,8 @@ - The paths to the projects to from from the solution. - The paths to the projects to from from the solution. + The paths to the projects to remove from the solution. + The paths to the projects to remove from the solution. diff --git a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.tr.xlf index e303d7a8c..555d80781 100644 --- a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.tr.xlf @@ -68,8 +68,8 @@ - The paths to the projects to from from the solution. - The paths to the projects to from from the solution. + The paths to the projects to remove from the solution. + The paths to the projects to remove from the solution. diff --git a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.zh-Hans.xlf index 9ff940fff..e3358413c 100644 --- a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.zh-Hans.xlf @@ -68,8 +68,8 @@ - The paths to the projects to from from the solution. - The paths to the projects to from from the solution. + The paths to the projects to remove from the solution. + The paths to the projects to remove from the solution. diff --git a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.zh-Hant.xlf index a19bb69cc..c23bcd86c 100644 --- a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.zh-Hant.xlf @@ -68,8 +68,8 @@ - The paths to the projects to from from the solution. - The paths to the projects to from from the solution. + The paths to the projects to remove from the solution. + The paths to the projects to remove from the solution. diff --git a/test/dotnet-sln-remove.Tests/GivenDotnetSlnRemove.cs b/test/dotnet-sln-remove.Tests/GivenDotnetSlnRemove.cs index 29ddd549b..0f25c6fd5 100644 --- a/test/dotnet-sln-remove.Tests/GivenDotnetSlnRemove.cs +++ b/test/dotnet-sln-remove.Tests/GivenDotnetSlnRemove.cs @@ -19,7 +19,7 @@ namespace Microsoft.DotNet.Cli.Sln.Remove.Tests Arguments: The solution file to operate on. If not specified, the command will search the current directory for one. - The paths to the projects to from from the solution. + The paths to the projects to remove from the solution. Options: -h, --help Show command line help."; From 4402dfb6845dca803ddfe2e713572549ce1ee683 Mon Sep 17 00:00:00 2001 From: jbeisner Date: Wed, 20 Jun 2018 22:11:00 +0000 Subject: [PATCH 48/73] Revert "Merge remote-tracking branch 'origin/release/2.1.2xx' into merges/release/2.1.2xx-to-release/2.1.3xx" This reverts commit 40be59f753e6397541a279e2b68248c031bd794a, reversing changes made to 734a41730a2a66f6c5afcbe4a82ee39224331d21. --- build/package/Installer.MSI.targets | 11 +---------- ...dist.Common.Net.Core.SDK.x64.2.1.2xx.nuspec | 18 ------------------ ...dist.Common.Net.Core.SDK.x86.2.1.2xx.nuspec | 18 ------------------ 3 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x64.2.1.2xx.nuspec delete mode 100644 packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x86.2.1.2xx.nuspec diff --git a/build/package/Installer.MSI.targets b/build/package/Installer.MSI.targets index 12793b2dd..649947574 100644 --- a/build/package/Installer.MSI.targets +++ b/build/package/Installer.MSI.targets @@ -21,8 +21,6 @@ $(RepoRoot)/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.$(Architecture).nuspec $(InstallerOutputDirectory)/VS.Redist.Common.Net.Core.SDK.$(Architecture).$(FullNugetVersion).nupkg - $(RepoRoot)/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.$(Architecture).2.1.2xx.nuspec - $(InstallerOutputDirectory)/VS.Redist.Common.Net.Core.SDK.$(Architecture).2.1.2xx.$(FullNugetVersion).nupkg $(RepoRoot)/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec $(InstallerOutputDirectory)/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.$(FullNugetVersion).nupkg @@ -166,21 +164,14 @@ Condition=" '$(OS)' == 'Windows_NT'" Inputs="$(CombinedFrameworkSdkHostInstallerFile); $(SdkInstallerNuspecFile); - $(SdkInstallerNuspecFile2xx); $(SdkGenerateNupkgPowershellScript)" - Outputs="$(SdkInstallerNupkgFile);$(SdkInstallerNupkgFile2xx)"> + Outputs="$(SdkInstallerNupkgFile)"> - - - - - VS.Redist.Common.Net.Core.SDK.x64.2.1.2xx - 1.0.0 - VS.Redist.Common.Net.Core.SDK.x64.2.1.2xx - Microsoft - Microsoft - https://www.microsoft.com/net/dotnet_library_license.htm - https://github.com/dotnet/cli - true - Windows Installers (x64) for .Net Core SDK 2.1.2xx - © Microsoft Corporation. All rights reserved. - - - - - \ No newline at end of file diff --git a/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x86.2.1.2xx.nuspec b/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x86.2.1.2xx.nuspec deleted file mode 100644 index e8bd5cd0f..000000000 --- a/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.x86.2.1.2xx.nuspec +++ /dev/null @@ -1,18 +0,0 @@ - - - - VS.Redist.Common.Net.Core.SDK.x86.2.1.2xx - 1.0.0 - VS.Redist.Common.Net.Core.SDK.x86.2.1.2xx - Microsoft - Microsoft - https://www.microsoft.com/net/dotnet_library_license.htm - https://github.com/dotnet/cli - true - Windows Installer (x86) for .Net Core SDK 2.1.2xx - © Microsoft Corporation. All rights reserved. - - - - - \ No newline at end of file From b23c3720773d7027d293dbe165508e15b32ee4ff Mon Sep 17 00:00:00 2001 From: Nikolche Kolev Date: Wed, 20 Jun 2018 15:17:19 -0700 Subject: [PATCH 49/73] fix add package parsing --- .../dotnet-add/dotnet-add-package/AddPackageParser.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/AddPackageParser.cs b/src/dotnet/commands/dotnet-add/dotnet-add-package/AddPackageParser.cs index 750efa51e..c141be03b 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/AddPackageParser.cs +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/AddPackageParser.cs @@ -49,7 +49,9 @@ namespace Microsoft.DotNet.Cli .With(name: LocalizableStrings.CmdPackageDirectory) .ForwardAsSingle(o => $"--package-directory {o.Arguments.Single()}")), Create.Option("--interactive", - LocalizableStrings.CmdInteractiveRestoreDescription)); + LocalizableStrings.CmdInteractiveRestoreDescription, + Accept.NoArguments() + .ForwardAs("--interactive"))); } public static IEnumerable QueryNuGet(string match) From 9cd006f591be8c9043ac7dd777b180b7c0679dc6 Mon Sep 17 00:00:00 2001 From: Nikolche Kolev Date: Wed, 20 Jun 2018 15:53:33 -0700 Subject: [PATCH 50/73] make the interactive switch not implicit --- .../dotnet-restore/RestoreCommandParser.cs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/dotnet/commands/dotnet-restore/RestoreCommandParser.cs b/src/dotnet/commands/dotnet-restore/RestoreCommandParser.cs index 11cbc6d56..71afaabb4 100644 --- a/src/dotnet/commands/dotnet-restore/RestoreCommandParser.cs +++ b/src/dotnet/commands/dotnet-restore/RestoreCommandParser.cs @@ -24,7 +24,14 @@ namespace Microsoft.DotNet.Cli { var fullRestoreOptions = AddImplicitRestoreOptions(new Option[] { CommonOptions.HelpOption() }, true, true); - return fullRestoreOptions.Concat(new Option[] { CommonOptions.VerbosityOption() }).ToArray(); + return fullRestoreOptions.Concat( + new Option[] { + CommonOptions.VerbosityOption(), + Create.Option( + "--interactive", + LocalizableStrings.CmdInteractiveRestoreOptionDescription, + Accept.NoArguments() + .ForwardAs("-property:NuGetInteractive=true")) }).ToArray(); } public static Option[] AddImplicitRestoreOptions( @@ -94,12 +101,7 @@ namespace Microsoft.DotNet.Cli useShortOptions ? "-f|--force" : "--force", LocalizableStrings.CmdForceRestoreOptionDescription, Accept.NoArguments() - .ForwardAs("-property:RestoreForce=true")), - Create.Option( - "--interactive", - showHelp ? LocalizableStrings.CmdInteractiveRestoreOptionDescription : string.Empty, - Accept.NoArguments() - .ForwardAs("-property:NuGetInteractive=true")) + .ForwardAs("-property:RestoreForce=true")) }; } } From c172433ce7f73465e4641ef2f4180388fa081762 Mon Sep 17 00:00:00 2001 From: Nikolche Kolev Date: Wed, 20 Jun 2018 16:40:27 -0700 Subject: [PATCH 51/73] add '.' period to the command description --- .../dotnet-add/dotnet-add-package/LocalizableStrings.resx | 2 +- .../dotnet-add-package/xlf/LocalizableStrings.cs.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.de.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.es.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.fr.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.it.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.ja.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.ko.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.pl.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.ru.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.tr.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf | 4 ++-- src/dotnet/commands/dotnet-restore/LocalizableStrings.resx | 2 +- .../commands/dotnet-restore/xlf/LocalizableStrings.cs.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.de.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.es.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.fr.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.it.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.ja.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.ko.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.pl.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.pt-BR.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.ru.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.tr.xlf | 4 ++-- .../dotnet-restore/xlf/LocalizableStrings.zh-Hans.xlf | 4 ++-- .../dotnet-restore/xlf/LocalizableStrings.zh-Hant.xlf | 4 ++-- 28 files changed, 54 insertions(+), 54 deletions(-) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.resx b/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.resx index 564a2fcdb..ec8af6d18 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.resx @@ -166,6 +166,6 @@ Unable to generate a temporary file for project '{0}'. Cannot add package reference. Please clear the temp directory and try again. - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf index 449b261dd..ed3a68382 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf @@ -83,8 +83,8 @@ - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf index ac4f6b94f..cc06b3996 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf @@ -83,8 +83,8 @@ - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf index d32981896..64def58f0 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf @@ -83,8 +83,8 @@ - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf index ce45e848e..1903857f2 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf @@ -83,8 +83,8 @@ - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf index e7e122963..fe8e318c7 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf @@ -83,8 +83,8 @@ - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf index 25d7475dc..3a90c9dc1 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf @@ -83,8 +83,8 @@ - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf index ab76e50ea..f982cf749 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf @@ -83,8 +83,8 @@ - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf index ff0b4eec7..d7f759822 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf @@ -83,8 +83,8 @@ - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf index 08ccc2d5a..728c4482e 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf @@ -83,8 +83,8 @@ - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf index 811d11db6..0ca1e3de0 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf @@ -83,8 +83,8 @@ - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf index 761e6e345..c6c66a725 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf @@ -83,8 +83,8 @@ - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf index ebfd3ec4e..55e7419f0 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf @@ -83,8 +83,8 @@ - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf index 25bd15a5a..b2096d6a8 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf @@ -83,8 +83,8 @@ - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-restore/LocalizableStrings.resx b/src/dotnet/commands/dotnet-restore/LocalizableStrings.resx index 63bc3cb98..155b7b7d5 100644 --- a/src/dotnet/commands/dotnet-restore/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-restore/LocalizableStrings.resx @@ -170,6 +170,6 @@ This is equivalent to deleting project.assets.json. - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.cs.xlf index fc8c864cc..3dfcec338 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.cs.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.de.xlf index 33432091d..00d8248a2 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.de.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.es.xlf index 66a74d4db..c1dde2c11 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.es.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.fr.xlf index 063ba5b8a..165614404 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.fr.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.it.xlf index 99cae559e..485298ee0 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.it.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ja.xlf index 55ab86705..c76cb47cf 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ja.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ko.xlf index a1973ddb0..4c7717f81 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ko.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pl.xlf index be4c39e2d..0f8d97ed8 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pl.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pt-BR.xlf index 981657cfa..318c35b4e 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pt-BR.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ru.xlf index 6689efadb..c931b8b09 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ru.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.tr.xlf index 50e20535f..fdd3f8e42 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.tr.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hans.xlf index 519cdd150..47c81f1cf 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hans.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hant.xlf index 853137b9c..564a5bb17 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hant.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). From f0e0e9d51e3e06cd40069f445b9f5a4914625772 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Thu, 21 Jun 2018 00:10:41 -0700 Subject: [PATCH 52/73] Align F# with VS2017.8 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 0357c60f0..669067723 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -16,7 +16,7 @@ $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 10.1.4-rtm-180515-0 + 10.2.0-rtm-180620-0 2.8.1-beta6-62915-07 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) From 7d94dbbd9922fc0174f6123af197d27a8c4c1fc6 Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 21 Jun 2018 10:40:44 -0700 Subject: [PATCH 53/73] Test and automatic Update default package version and re-enable Latest package version test (#9507) * Add Compute UseBundledNETCoreAppPackageVersionAsDefaultNetCorePatchVersion * Add tests to catch DefaultNetCorePatchVersion moving * Update LatestPatchVersionForNetCore2_0 to 2.0.9, it is in the process of shipping * Update LatestPatchVersionForNetCore1_0 and LatestPatchVersionForNetCore1_1 --- build/MSBuildExtensions.targets | 17 +++- build/Microsoft.DotNet.Cli.tasks | 1 + build/NugetConfigFile.targets | 2 + .../GetUseBundledVersionAsDefaultVersion.cs | 30 +++++++ test/EndToEnd/GivenFrameworkDependentApps.cs | 90 +++++++++++++++++++ .../GivenSelfContainedAppsRollForward.cs | 25 ++---- test/EndToEnd/SupportedNetCoreAppVersions.cs | 26 ++++++ 7 files changed, 168 insertions(+), 23 deletions(-) create mode 100644 build_projects/dotnet-cli-build/GetUseBundledVersionAsDefaultVersion.cs create mode 100644 test/EndToEnd/GivenFrameworkDependentApps.cs create mode 100644 test/EndToEnd/SupportedNetCoreAppVersions.cs diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets index 042cd2e93..f5365724a 100644 --- a/build/MSBuildExtensions.targets +++ b/build/MSBuildExtensions.targets @@ -132,6 +132,16 @@ <_NETCoreSdkIsPreview Condition=" '$(DropSuffix)' != 'true' ">true + + + + + @@ -170,6 +180,7 @@ Copyright (c) .NET Foundation. All rights reserved. $(_NETCoreAppTargetFrameworkVersion) $(_NETCoreAppPackageVersion) + $(_UseBundledNETCoreAppPackageVersionAsDefaultNetCorePatchVersion) $(_NETStandardTargetFrameworkVersion) $(_NETStandardLibraryPackageVersion) $(_NETCorePlatformsPackageVersion) @@ -182,9 +193,9 @@ Copyright (c) .NET Foundation. All rights reserved. $(_DefaultPatchVersionForAspNetCoreApp2_1) - 1.0.11 - 1.1.8 - 2.0.7 + 1.0.12 + 1.1.9 + 2.0.9 ]]> diff --git a/build/Microsoft.DotNet.Cli.tasks b/build/Microsoft.DotNet.Cli.tasks index 901a48f84..812c04925 100644 --- a/build/Microsoft.DotNet.Cli.tasks +++ b/build/Microsoft.DotNet.Cli.tasks @@ -23,6 +23,7 @@ + diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets index 604d26b00..37d2ddb7c 100644 --- a/build/NugetConfigFile.targets +++ b/build/NugetConfigFile.targets @@ -5,6 +5,7 @@ + + ]]> diff --git a/build_projects/dotnet-cli-build/GetUseBundledVersionAsDefaultVersion.cs b/build_projects/dotnet-cli-build/GetUseBundledVersionAsDefaultVersion.cs new file mode 100644 index 000000000..91d10694a --- /dev/null +++ b/build_projects/dotnet-cli-build/GetUseBundledVersionAsDefaultVersion.cs @@ -0,0 +1,30 @@ +// 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.Build.Utilities; +using Microsoft.Build.Framework; +using Microsoft.DotNet.Cli.Build.Framework; +using NuGet.Versioning; + +namespace Microsoft.DotNet.Cli.Build +{ + public class GetUseBundledNETCoreAppPackageVersionAsDefaultNetCorePatchVersion : Task + { + [Required] + public string BundledNETCoreAppPackageVersion { get; set; } + + [Output] + public string UseBundledNETCoreAppPackageVersionAsDefaultNetCorePatchVersion { get; set; } + + public override bool Execute() + { + var parsedVersion = NuGetVersion.Parse(BundledNETCoreAppPackageVersion); + UseBundledNETCoreAppPackageVersionAsDefaultNetCorePatchVersion = + (parsedVersion.Patch == 0) && parsedVersion.IsPrerelease ? "true" : "false"; + + return true; + } + } +} diff --git a/test/EndToEnd/GivenFrameworkDependentApps.cs b/test/EndToEnd/GivenFrameworkDependentApps.cs new file mode 100644 index 000000000..605e22bd2 --- /dev/null +++ b/test/EndToEnd/GivenFrameworkDependentApps.cs @@ -0,0 +1,90 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Xml.Linq; +using FluentAssertions; +using Microsoft.DotNet.PlatformAbstractions; +using Microsoft.DotNet.TestFramework; +using Microsoft.DotNet.Tools.Test.Utilities; +using NuGet.ProjectModel; +using NuGet.Versioning; +using Xunit; + +namespace EndToEnd +{ + public class GivenFrameworkDependentApps : TestBase + { + [Theory] + [ClassData(typeof(SupportedNetCoreAppVersions))] + public void ItDoesNotRollForwardToTheLatestVersion(string minorVersion) + { + var _testInstance = TestAssets.Get("TestAppSimple") + .CreateInstance(identifier: minorVersion) + // scope the feed to only dotnet-core feed to avoid flaky when different feed has a newer / lower version + .WithNuGetConfig(new RepoDirectoriesProvider().TestPackages) + .WithSourceFiles(); + + string projectDirectory = _testInstance.Root.FullName; + + string projectPath = Path.Combine(projectDirectory, "TestAppSimple.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; + + project.Save(projectPath); + + // Get the resolved version of .NET Core + new RestoreCommand() + .WithWorkingDirectory(projectDirectory) + .Execute() + .Should().Pass(); + + string assetsFilePath = Path.Combine(projectDirectory, "obj", "project.assets.json"); + var assetsFile = new LockFileFormat().Read(assetsFilePath); + + var versionInAssertsJson = GetNetCoreAppVersion(assetsFile); + versionInAssertsJson.Should().NotBeNull(); + + if (versionInAssertsJson.IsPrerelease && versionInAssertsJson.Patch == 0) + { + // if the bundled version is, for example, a prerelease of + // .NET Core 2.1.1, that we don't roll forward to that prerelease + // version for framework-dependent deployments. + return; + } + + versionInAssertsJson.ToNormalizedString().Should().BeEquivalentTo(GetExpectedVersion(minorVersion)); + } + + private NuGetVersion GetNetCoreAppVersion(LockFile lockFile) + { + return lockFile?.Targets?.SingleOrDefault(t => t.RuntimeIdentifier == null) + ?.Libraries?.SingleOrDefault(l => + string.Compare(l.Name, "Microsoft.NETCore.App", StringComparison.CurrentCultureIgnoreCase) == 0) + ?.Version; + } + + public string GetExpectedVersion(string minorVersion) + { + if (minorVersion.StartsWith("1.0")) + { + return "1.0.5"; // special case for 1.0 + } + else if (minorVersion.StartsWith("1.1")) + { + return "1.1.2"; // special case for 1.1 + } + else + { + var parsed = NuGetVersion.Parse(minorVersion); + return new NuGetVersion(parsed.Major, parsed.Minor, 0).ToNormalizedString(); + } + } + } +} diff --git a/test/EndToEnd/GivenSelfContainedAppsRollForward.cs b/test/EndToEnd/GivenSelfContainedAppsRollForward.cs index 080197472..b624cd14f 100644 --- a/test/EndToEnd/GivenSelfContainedAppsRollForward.cs +++ b/test/EndToEnd/GivenSelfContainedAppsRollForward.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; @@ -13,13 +12,13 @@ using Xunit; namespace EndToEnd { - public class GivenSelfContainedAppsRollForward : TestBase + public partial class GivenSelfContainedAppsRollForward : TestBase { - [Theory(Skip = "Runtime 1.1 support for openSUSE and Fedora 27 needed")] + [Theory] // MemberData is used instead of InlineData here so we can access it in another test to // verify that we are covering the latest release of .NET Core - [MemberData(nameof(SupportedNetCoreAppVersions))] + [ClassData(typeof(SupportedNetCoreAppVersions))] public void ItRollsForwardToTheLatestVersion(string minorVersion) { var _testInstance = TestAssets.Get("TestAppSimple") @@ -118,25 +117,11 @@ namespace EndToEnd .Element(ns + "TargetFramework") .Value; - SupportedNetCoreAppVersions.Select(v => $"netcoreapp{v[0]}") - .Should().Contain(targetFramework, $"the {nameof(SupportedNetCoreAppVersions)} property should include the default version " + + SupportedNetCoreAppVersions.Versions.Select(v => $"netcoreapp{v[0]}") + .Should().Contain(targetFramework, $"the {nameof(SupportedNetCoreAppVersions)}.{nameof(SupportedNetCoreAppVersions.Versions)} property should include the default version " + "of .NET Core created by \"dotnet new\""); } } - - public static IEnumerable SupportedNetCoreAppVersions - { - get - { - return new[] - { - "1.0", - "1.1", - "2.0", - "2.1" - }.Select(version => new object[] { version }); - } - } } } diff --git a/test/EndToEnd/SupportedNetCoreAppVersions.cs b/test/EndToEnd/SupportedNetCoreAppVersions.cs new file mode 100644 index 000000000..fe1eb44e2 --- /dev/null +++ b/test/EndToEnd/SupportedNetCoreAppVersions.cs @@ -0,0 +1,26 @@ +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using Xunit; + +namespace EndToEnd +{ + public class SupportedNetCoreAppVersions : IEnumerable + { + public IEnumerator GetEnumerator() => Versions.GetEnumerator(); + IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); + public static IEnumerable Versions + { + get + { + return new[] + { + "1.0", + "1.1", + "2.0", + "2.1" + }.Select(version => new object[] { version }); + } + } + } +} From f8823769337d862437b56c52fb25584e2985fe95 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Thu, 21 Jun 2018 12:00:28 -0700 Subject: [PATCH 54/73] Adding 'NoSuffix' legs to the CI (#9502) * Adding 'NoSuffix' legs to the CI * Fixing typo... * Updates per code review... * "openSUSE 43.2" should be "openSUSE 42.3"; fixing 'netci.groovy' command formation logic. --- build/BuildDefaults.props | 4 +- netci.groovy | 79 +++++++++++-------- .../Dockerfile | 0 3 files changed, 46 insertions(+), 37 deletions(-) rename scripts/docker/{opensuse.43.2 => opensuse.42.3}/Dockerfile (100%) diff --git a/build/BuildDefaults.props b/build/BuildDefaults.props index eb114a390..d574b1789 100644 --- a/build/BuildDefaults.props +++ b/build/BuildDefaults.props @@ -10,7 +10,7 @@ ($(Rid.StartsWith('rhel.6')) OR $(Rid.StartsWith('linux-musl')) OR $(Rid.StartsWith('fedora.27')) - OR $(Rid.StartsWith('opensuse.43.2')) + OR $(Rid.StartsWith('opensuse.42.3')) OR $(Rid.StartsWith('ubuntu.18.04')))">true false true @@ -19,7 +19,7 @@ AND '$(Rid)' != 'rhel.6-x64' AND '$(Rid)' != 'linux-musl-x64' AND '$(Rid)' != 'fedora.27-x64' - AND '$(Rid)' != 'opensuse.43.2-x64' + AND '$(Rid)' != 'opensuse.42.3-x64' AND '$(Rid)' != 'ubuntu.18.04-x64'">true true diff --git a/netci.groovy b/netci.groovy index c2283cd23..9b9ce5d4f 100644 --- a/netci.groovy +++ b/netci.groovy @@ -18,7 +18,9 @@ def platformList = [ 'Linux:arm64:Debug', 'Linux-musl:x64:Debug', 'Linux:x64:Release', - 'opensuse.43.2:x64:Debug', + 'Linux_NoSuffix:arm:Release', + 'Linux_NoSuffix:x64:Release', + 'opensuse.42.3:x64:Debug', 'OSX10.12:x64:Release', 'RHEL6:x64:Debug', 'RHEL7.2:x64:Release', @@ -27,7 +29,8 @@ def platformList = [ 'ubuntu.18.04:x64:Debug', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', - 'Windows_NT_ES:x64:Debug' + 'Windows_NT_ES:x64:Debug', + 'Windows_NT_NoSuffix:x64:Release' ] def static getBuildJobName(def configuration, def os, def architecture) { @@ -42,50 +45,56 @@ platformList.each { platform -> // Calculate job name def jobName = getBuildJobName(configuration, os, architecture) - def buildCommand = ''; + def baseBatchBuildCommand = ".\\build.cmd -Configuration ${configuration} -Architecture ${architecture} -Targets Default"; + def baseShellBuildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --targets Default"; // Calculate the build command - if (os == 'Windows_NT') { - buildCommand = ".\\build.cmd -Configuration ${configuration} -Architecture ${architecture} -Targets Default" + if (os.startsWith("Windows_NT")) { + osUsedForMachineAffinity = 'Windows_NT' + buildCommand = "${baseBatchBuildCommand}" + if (os == 'Windows_NT_ES') { + buildCommand = """ +set DOTNET_CLI_UI_LANGUAGE=es +${buildCommand} +""" + } + else if (os == 'Windows_NT_NoSuffix') { + buildCommand = "${buildCommand} /p:DropSuffix=true" + } } else if (os == 'Windows_2016') { - buildCommand = ".\\build.cmd -Configuration ${configuration} -Architecture ${architecture} -RunInstallerTestsInDocker -Targets Default" + buildCommand = "${baseBatchBuildCommand} -RunInstallerTestsInDocker" } - else if (os == 'Windows_NT_ES') { - osUsedForMachineAffinity = 'Windows_NT' - buildCommand = """ -set DOTNET_CLI_UI_LANGUAGE=es -.\\build.cmd -Configuration ${configuration} -Architecture ${architecture} -Targets Default -""" + else if (os.startsWith("Linux")) { + osUsedForMachineAffinity = 'Ubuntu16.04'; + if (os == 'Linux-musl') { + buildCommand = "${buildCommand} --runtime-id linux-musl-x64 --docker alpine.3.6" + } + else + { + buildCommand = "${baseShellBuildCommand} --linux-portable" + if ((architecture == 'arm') || (architecture == 'arm64')) { + buildCommand = "${buildCommand} --architecture ${architecture} /p:CLIBUILD_SKIP_TESTS=true" + } + if (os == 'Linux_NoSuffix') { + buildCommand = "${buildCommand} /p:DropSuffix=true" + } + } } else if (os == 'Ubuntu') { - buildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --docker ubuntu.14.04 --targets Default" - } - else if (os == 'Linux') { - osUsedForMachineAffinity = 'Ubuntu16.04'; - if ((architecture == 'arm') || (architecture == 'arm64')) { - buildCommand = "./build.sh --linux-portable --skip-prereqs --architecture ${architecture} --configuration ${configuration} --targets Default /p:CLIBUILD_SKIP_TESTS=true" - } - else { - buildCommand = "./build.sh --linux-portable --skip-prereqs --configuration ${configuration} --targets Default" - } + buildCommand = "${baseShellBuildCommand} --docker ubuntu.14.04" } else if (os == 'RHEL6') { osUsedForMachineAffinity = 'Ubuntu16.04'; - buildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --runtime-id rhel.6-x64 --docker rhel.6 --targets Default" + buildCommand = "${baseShellBuildCommand} --runtime-id rhel.6-x64 --docker rhel.6" } - else if (os == 'Linux-musl') { - osUsedForMachineAffinity = 'Ubuntu16.04'; - buildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --runtime-id linux-musl-x64 --docker alpine.3.6 --targets Default" - } - else if (os == 'ubuntu.18.04' || os == 'fedora.27' || os == 'opensuse.43.2') { + else if (os == 'ubuntu.18.04' || os == 'fedora.27' || os == 'opensuse.42.3') { osUsedForMachineAffinity = 'Ubuntu16.04' osVersionUsedForMachineAffinity = 'latest-docker' - buildCommand = "./build.sh --linux-portable --skip-prereqs --configuration ${configuration} --docker ${os} --targets Default" + buildCommand = "${baseShellBuildCommand} --docker ${os} --linux-portable" } else { - // Jenkins non-Ubuntu CI machines don't have docker - buildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --targets Default" + buildCommand = "${baseShellBuildCommand}" } def newJob = job(Utilities.getFullJobName(project, jobName, isPR)) { @@ -110,10 +119,10 @@ set DOTNET_CLI_UI_LANGUAGE=es } Utilities.addGithubPRTriggerForBranch(newJob, branch, "${os} ${architecture} ${configuration} Build") - def archiveSettings = new ArchivalSettings() - archiveSettings.addFiles("test/**/*.trx") - archiveSettings.setFailIfNothingArchived() - archiveSettings.setArchiveOnFailure() + def archiveSettings = new ArchivalSettings() + archiveSettings.addFiles("test/**/*.trx") + archiveSettings.setFailIfNothingArchived() + archiveSettings.setArchiveOnFailure() Utilities.addArchival(newJob, archiveSettings) } diff --git a/scripts/docker/opensuse.43.2/Dockerfile b/scripts/docker/opensuse.42.3/Dockerfile similarity index 100% rename from scripts/docker/opensuse.43.2/Dockerfile rename to scripts/docker/opensuse.42.3/Dockerfile From 488edfad3f4b23ae4b2800332059097fff8d0444 Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 21 Jun 2018 13:00:49 -0700 Subject: [PATCH 55/73] Use correct nuget version normalized format (#9525) * Use correct nuget version normalized format * Change test accordingly This matches nuget behavior if restore with `` there is no warning and if restore with `` there is warning due to no exact 1.0.0 find --- .../ToolPackage/ToolPackageInstaller.cs | 2 +- .../ToolPackageInstallerTests.cs | 27 ++++++++++++++++++- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/dotnet/ToolPackage/ToolPackageInstaller.cs b/src/dotnet/ToolPackage/ToolPackageInstaller.cs index aa63ae8c7..17d5ad80b 100644 --- a/src/dotnet/ToolPackage/ToolPackageInstaller.cs +++ b/src/dotnet/ToolPackage/ToolPackageInstaller.cs @@ -154,7 +154,7 @@ 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("N", new VersionRangeFormatter()) ?? "*"))), // nuget will restore latest stable for * and format N is the normalization format new XElement(("Import"), new XAttribute("Project", "Sdk.targets"), new XAttribute("Sdk", "Microsoft.NET.Sdk")))); diff --git a/test/Microsoft.DotNet.ToolPackage.Tests/ToolPackageInstallerTests.cs b/test/Microsoft.DotNet.ToolPackage.Tests/ToolPackageInstallerTests.cs index 1b4dcadbd..6b90ff3fb 100644 --- a/test/Microsoft.DotNet.ToolPackage.Tests/ToolPackageInstallerTests.cs +++ b/test/Microsoft.DotNet.ToolPackage.Tests/ToolPackageInstallerTests.cs @@ -598,7 +598,7 @@ namespace Microsoft.DotNet.ToolPackage.Tests var package = installer.InstallPackage( packageId: TestPackageId, - versionRange: VersionRange.Parse("1.0.*"), + versionRange: VersionRange.Parse("1.0.0"), targetFramework: _testTargetframework, nugetConfig: nugetConfigPath); @@ -612,6 +612,31 @@ namespace Microsoft.DotNet.ToolPackage.Tests package.Uninstall(); } + [Theory] + [InlineData(false)] + [InlineData(true)] + // repro https://github.com/dotnet/cli/issues/9409 + public void GivenAComplexVersionRangeInstallSucceeds(bool testMockBehaviorIsInSync) + { + var nugetConfigPath = WriteNugetConfigFileToPointToTheFeed(); + var emptySource = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName()); + Directory.CreateDirectory(emptySource); + + var (store, installer, reporter, fileSystem) = Setup( + useMock: testMockBehaviorIsInSync, + feeds: GetMockFeedsForSource(emptySource)); + + var package = installer.InstallPackage( + packageId: TestPackageId, + versionRange: VersionRange.Parse("1.0.0-rc*"), + targetFramework: _testTargetframework, + nugetConfig: nugetConfigPath, additionalFeeds: new[] { emptySource }); + + AssertPackageInstall(reporter, fileSystem, package, store); + + package.Uninstall(); + } + private static void AssertPackageInstall( BufferedReporter reporter, IFileSystem fileSystem, From 50c5a5e1101a659b9b55ffe53eb3d40c36681447 Mon Sep 17 00:00:00 2001 From: Andy Gerlicher Date: Fri, 22 Jun 2018 10:45:22 -0700 Subject: [PATCH 56/73] MSBuild 15.8.125-preview --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index f36e9b97d..f0c0f7c97 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ 2.1.0 2.1.1 $(MicrosoftNETCoreAppPackageVersion) - 15.8.0-preview-000101 + 15.8.0-preview-000125 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From dc2443ca74e30c5cf255e20d3382447c31879bf9 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Fri, 22 Jun 2018 13:45:53 -0700 Subject: [PATCH 57/73] Fix the CI legs; CLI:release/2.1.3xx (#9535) * Linux-musl command should be derived from "baseShellBuildCommand" not "buildCommand"; setting 'DropSuffix' in the environment. --- netci.groovy | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/netci.groovy b/netci.groovy index 9b9ce5d4f..3d49daada 100644 --- a/netci.groovy +++ b/netci.groovy @@ -59,7 +59,10 @@ ${buildCommand} """ } else if (os == 'Windows_NT_NoSuffix') { - buildCommand = "${buildCommand} /p:DropSuffix=true" + buildCommand = """ +set DropSuffix=true +${buildCommand} +""" } } else if (os == 'Windows_2016') { @@ -68,7 +71,7 @@ ${buildCommand} else if (os.startsWith("Linux")) { osUsedForMachineAffinity = 'Ubuntu16.04'; if (os == 'Linux-musl') { - buildCommand = "${buildCommand} --runtime-id linux-musl-x64 --docker alpine.3.6" + buildCommand = "${baseShellBuildCommand} --runtime-id linux-musl-x64 --docker alpine.3.6" } else { @@ -77,7 +80,10 @@ ${buildCommand} buildCommand = "${buildCommand} --architecture ${architecture} /p:CLIBUILD_SKIP_TESTS=true" } if (os == 'Linux_NoSuffix') { - buildCommand = "${buildCommand} /p:DropSuffix=true" + buildCommand = """ +export DropSuffix=true +${buildCommand} +""" } } } From 5218c4bcf52441075ca4d5b8fa7ed860c99ea454 Mon Sep 17 00:00:00 2001 From: William Li Date: Sun, 24 Jun 2018 11:32:44 -0700 Subject: [PATCH 58/73] Pass BaseIntermediateOutputPath via xml (#9509) Instead of command line to avoid escaping problem. It can support most of the character including surrogate char. It cannot support semicolon. However, semicolon is not allow to be part of the user name. Port 2.1.4xx fix 0251f677ede571b61a47ca24f38df8e09038277d while keep BaseIntermediateOutputPath instead of MsBuildProjectExtensionsPath to minimize the change. --- src/dotnet/ToolPackage/IProjectRestorer.cs | 1 - .../ToolPackage/ToolPackageInstaller.cs | 17 +++++++--- .../dotnet-tool/install/ProjectRestorer.cs | 4 +-- .../ToolPackageInstallerTests.cs | 34 ++++++++++++++++++- .../ProjectRestorerMock.cs | 9 ++--- .../ToolPackageInstallerMock.cs | 3 +- 6 files changed, 52 insertions(+), 16 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 14ea51d25..0814bc601 100644 --- a/src/dotnet/ToolPackage/ToolPackageInstaller.cs +++ b/src/dotnet/ToolPackage/ToolPackageInstaller.cs @@ -55,6 +55,7 @@ namespace Microsoft.DotNet.ToolPackage versionRange: versionRange, targetFramework: targetFramework ?? BundledTargetFramework.GetTargetFrameworkMoniker(), restoreDirectory: stageDirectory, + assetJsonOutputDirectory: stageDirectory, rootConfigDirectory: rootConfigDirectory, additionalFeeds: additionalFeeds); @@ -62,7 +63,6 @@ namespace Microsoft.DotNet.ToolPackage { _projectRestorer.Restore( tempProject, - stageDirectory, nugetConfig, verbosity: verbosity); } @@ -117,6 +117,7 @@ namespace Microsoft.DotNet.ToolPackage VersionRange versionRange, string targetFramework, DirectoryPath restoreDirectory, + DirectoryPath assetJsonOutputDirectory, DirectoryPath? rootConfigDirectory, string[] additionalFeeds) { @@ -133,7 +134,12 @@ namespace Microsoft.DotNet.ToolPackage var tempProjectContent = new XDocument( new XElement("Project", - new XAttribute("Sdk", "Microsoft.NET.Sdk"), + new XElement("PropertyGroup", + new XElement("BaseIntermediateOutputPath", assetJsonOutputDirectory.Value)), // change the output directory of asset.json + // due to https://github.com/Microsoft/msbuild/issues/1603 -- import SDK after setting BaseIntermediateOutputPath + 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), @@ -149,9 +155,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.ToolPackage.Tests/ToolPackageInstallerTests.cs b/test/Microsoft.DotNet.ToolPackage.Tests/ToolPackageInstallerTests.cs index 1b4dcadbd..e40c98c68 100644 --- a/test/Microsoft.DotNet.ToolPackage.Tests/ToolPackageInstallerTests.cs +++ b/test/Microsoft.DotNet.ToolPackage.Tests/ToolPackageInstallerTests.cs @@ -1,8 +1,9 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. +// 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.Globalization; using System.IO; using System.Linq; using System.Reflection; @@ -16,8 +17,10 @@ using Microsoft.DotNet.Tools.Tool.Install; using Microsoft.DotNet.Tools.Tests.ComponentMocks; using Microsoft.Extensions.DependencyModel.Tests; using Microsoft.Extensions.EnvironmentAbstractions; +using Microsoft.TemplateEngine.Cli; using NuGet.Versioning; using Xunit; +using LocalizableStrings = Microsoft.DotNet.Tools.Tool.Install.LocalizableStrings; namespace Microsoft.DotNet.ToolPackage.Tests { @@ -612,6 +615,35 @@ namespace Microsoft.DotNet.ToolPackage.Tests package.Uninstall(); } + [Fact] + public void GivenARootWithNonAsciiCharactorInstallSucceeds() + { + var nugetConfigPath = WriteNugetConfigFileToPointToTheFeed(); + + var surrogate = char.ConvertFromUtf32(int.Parse("2A601", NumberStyles.HexNumber)); + string nonAscii = "ab Ṱ̺̺̕o 田中さん åä," + surrogate; + + var root = new DirectoryPath(Path.Combine(TempRoot.Root, nonAscii, Path.GetRandomFileName())); + var reporter = new BufferedReporter(); + var fileSystem = new FileSystemWrapper(); + var store = new ToolPackageStore(root); + var installer = new ToolPackageInstaller( + store: store, + projectRestorer: new ProjectRestorer(reporter), + tempProject: GetUniqueTempProjectPathEachTest(), + offlineFeed: new DirectoryPath("does not exist")); + + var package = installer.InstallPackage( + packageId: TestPackageId, + versionRange: VersionRange.Parse(TestPackageVersion), + targetFramework: _testTargetframework, + nugetConfig: nugetConfigPath); + + AssertPackageInstall(reporter, fileSystem, package, store); + + package.Uninstall(); + } + private static void AssertPackageInstall( BufferedReporter reporter, IFileSystem fileSystem, 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 34fd28a3ba6629f2ac76abd4e2ccc23311d349e0 Mon Sep 17 00:00:00 2001 From: William Li Date: Mon, 25 Jun 2018 10:37:19 -0700 Subject: [PATCH 59/73] Use blob feed instead of myget (#9546) --- build/NugetConfigFile.targets | 2 -- test/Microsoft.DotNet.TestFramework/TestAssetInstance.cs | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets index 2a4436977..d7dffd6b0 100644 --- a/build/NugetConfigFile.targets +++ b/build/NugetConfigFile.targets @@ -5,7 +5,6 @@ - - ]]> diff --git a/test/Microsoft.DotNet.TestFramework/TestAssetInstance.cs b/test/Microsoft.DotNet.TestFramework/TestAssetInstance.cs index 4d27d0fe7..fca0c33c2 100644 --- a/test/Microsoft.DotNet.TestFramework/TestAssetInstance.cs +++ b/test/Microsoft.DotNet.TestFramework/TestAssetInstance.cs @@ -117,7 +117,7 @@ namespace Microsoft.DotNet.TestFramework var content = @" - + "; From 2fed1c07ba8669c87da60be5fd77f380d4b3fc95 Mon Sep 17 00:00:00 2001 From: Livar Date: Mon, 25 Jun 2018 13:04:14 -0700 Subject: [PATCH 60/73] Updates asp.net versions to match prodcon Fixes https://github.com/dotnet/cli/issues/9550 --- build/DependencyVersions.props | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index a141031dd..691f47d54 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,15 +1,15 @@ - 2.1.1-rtm-30818 + 2.1.1 $(MicrosoftAspNetCoreAllPackageVersion) - 2.1.0 + 2.1.1 2.1.1 - 2.1.1-rtm-30818 - 2.1.0 - 2.1.0 - 2.1.0 - 2.1.0 + 2.1.1 + 2.1.1 + 2.1.1 + 2.1.1 + 2.1.1 2.1.1 $(MicrosoftNETCoreAppPackageVersion) 15.7.179 From c7cf8a55b8964d2671d8e84a9474142bd247625f Mon Sep 17 00:00:00 2001 From: Nikolche Kolev Date: Mon, 25 Jun 2018 14:15:24 -0700 Subject: [PATCH 61/73] Add DOTNET_HOST_PATH for dotnet nuget commands --- src/dotnet/commands/dotnet-nuget/Program.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/dotnet/commands/dotnet-nuget/Program.cs b/src/dotnet/commands/dotnet-nuget/Program.cs index 8e6378b41..1871da2cb 100644 --- a/src/dotnet/commands/dotnet-nuget/Program.cs +++ b/src/dotnet/commands/dotnet-nuget/Program.cs @@ -35,9 +35,14 @@ namespace Microsoft.DotNet.Tools.NuGet public int Run(string[] args) { var nugetApp = new NuGetForwardingApp(args); - + nugetApp.WithEnvironmentVariable("DOTNET_HOST_PATH", GetDotnetPath()); return nugetApp.Execute(); } } + + private static string GetDotnetPath() + { + return new Muxer().MuxerPath; + } } } From dc3835df84b09a4bf7a63d65327b0a56993be0ba Mon Sep 17 00:00:00 2001 From: akharlov Date: Tue, 26 Jun 2018 10:01:10 +0500 Subject: [PATCH 62/73] add nunit project and item templates to bundle --- build/BundledTemplates.props | 2 ++ build/DependencyVersions.props | 1 + 2 files changed, 3 insertions(+) diff --git a/build/BundledTemplates.props b/build/BundledTemplates.props index 1a77f6043..c38a969a4 100644 --- a/build/BundledTemplates.props +++ b/build/BundledTemplates.props @@ -7,5 +7,7 @@ + + diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index a56cbb027..e0ce5a31e 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -58,6 +58,7 @@ $(MicrosoftNETTestSdkPackageVersion) 0.2.0-beta-000042 0.2.0 + 1.5.1 From a5abacf15542fe1a3c164d935336dddbde25ec13 Mon Sep 17 00:00:00 2001 From: akharlov Date: Tue, 26 Jun 2018 12:33:34 +0500 Subject: [PATCH 63/73] add tests for `dotnet new nunit` --- .../dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs index 5a080e772..ca71bcabc 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs @@ -19,6 +19,7 @@ namespace Microsoft.DotNet.New.Tests [InlineData("C#", "console", false)] [InlineData("C#", "classlib", false)] [InlineData("C#", "mstest", false)] + [InlineData("C#", "nunit", false)] [InlineData("C#", "xunit", false)] [InlineData("C#", "web", false)] [InlineData("C#", "mvc", false)] @@ -30,11 +31,13 @@ namespace Microsoft.DotNet.New.Tests // re-enable when this bug is resolved: https://github.com/dotnet/cli/issues/7574 //[InlineData("F#", "classlib", false)] [InlineData("F#", "mstest", false)] + [InlineData("F#", "nunit", false)] [InlineData("F#", "xunit", false)] [InlineData("F#", "mvc", false)] [InlineData("VB", "console", false)] [InlineData("VB", "classlib", false)] [InlineData("VB", "mstest", false)] + [InlineData("VB", "nunit", false)] [InlineData("VB", "xunit", false)] public void TemplateRestoresAndBuildsWithoutWarnings( string language, From 58a4fd0285bee620c30fb4bbe210613b5b431cba Mon Sep 17 00:00:00 2001 From: Andy Gerlicher Date: Mon, 25 Jun 2018 15:40:50 -0700 Subject: [PATCH 64/73] MSBuild 15.8.138-preview --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index f0c0f7c97..4b1bc0f68 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ 2.1.0 2.1.1 $(MicrosoftNETCoreAppPackageVersion) - 15.8.0-preview-000125 + 15.8.0-preview-000138 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From 57597e8511464a4d22699c0bb043e1310f9cc57b Mon Sep 17 00:00:00 2001 From: Livar Date: Tue, 26 Jun 2018 17:50:41 -0700 Subject: [PATCH 65/73] Update SDK to 2.1.400-preview-63027-01 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 6a4aaa023..6f54fa099 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -23,7 +23,7 @@ $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.400-preview-63014-01 + 2.1.400-preview-63027-01 $(MicrosoftNETSdkPackageVersion) $(MicrosoftAspNetCoreAppPackageVersion) 2.1.400-preview1-20180614-1774926 From 5fdaa4f92d0c9419e7ce12752ceebc239598cb69 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Fri, 29 Jun 2018 15:53:35 -0700 Subject: [PATCH 66/73] Fix xlf merge --- .../xlf/LocalizableStrings.cs.xlf | 12 ++++----- .../xlf/LocalizableStrings.de.xlf | 12 ++++----- .../xlf/LocalizableStrings.es.xlf | 12 ++++----- .../xlf/LocalizableStrings.fr.xlf | 12 ++++----- .../xlf/LocalizableStrings.it.xlf | 12 ++++----- .../xlf/LocalizableStrings.ja.xlf | 12 ++++----- .../xlf/LocalizableStrings.ko.xlf | 12 ++++----- .../xlf/LocalizableStrings.pl.xlf | 12 ++++----- .../xlf/LocalizableStrings.pt-BR.xlf | 12 ++++----- .../xlf/LocalizableStrings.ru.xlf | 12 ++++----- .../xlf/LocalizableStrings.tr.xlf | 12 ++++----- .../xlf/LocalizableStrings.zh-Hans.xlf | 12 ++++----- .../xlf/LocalizableStrings.zh-Hant.xlf | 14 +++++----- .../dotnet-sln/xlf/LocalizableStrings.cs.xlf | 20 +++++++------- .../dotnet-sln/xlf/LocalizableStrings.de.xlf | 20 +++++++------- .../dotnet-sln/xlf/LocalizableStrings.es.xlf | 24 ++++++++--------- .../dotnet-sln/xlf/LocalizableStrings.fr.xlf | 26 +++++++++---------- .../dotnet-sln/xlf/LocalizableStrings.it.xlf | 20 +++++++------- .../dotnet-sln/xlf/LocalizableStrings.ja.xlf | 20 +++++++------- .../dotnet-sln/xlf/LocalizableStrings.ko.xlf | 20 +++++++------- .../dotnet-sln/xlf/LocalizableStrings.pl.xlf | 20 +++++++------- .../xlf/LocalizableStrings.pt-BR.xlf | 20 +++++++------- .../dotnet-sln/xlf/LocalizableStrings.ru.xlf | 20 +++++++------- .../dotnet-sln/xlf/LocalizableStrings.tr.xlf | 20 +++++++------- .../xlf/LocalizableStrings.zh-Hans.xlf | 20 +++++++------- .../xlf/LocalizableStrings.zh-Hant.xlf | 20 +++++++------- 26 files changed, 214 insertions(+), 214 deletions(-) diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.cs.xlf index 65cdf77c0..33ddc6820 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.cs.xlf @@ -14,7 +14,7 @@ The target framework to publish for. The target framework has to be specified in the project file. - Cílová platforma pro publikování. Cílová platforma musí být v souboru projektu zadaná. + Cílová architektura pro publikování. Cílová architektura musí být zadaná v souboru projektu. @@ -24,12 +24,12 @@ The output directory to place the published artifacts in. - Výstupní adresář do kterého se umisťují publikované artefakty. + Výstupní adresář do kterého se mají umístit publikované artefakty MANIFEST - manifest.xml + MANIFEST @@ -45,13 +45,13 @@ The target runtime to publish the application for. The default is to publish a framework-dependent application without an executable. - The target runtime to publish the application for. -The default is to publish a framework-dependent application without an executable. + Cílový modul runtime pro publikování. Používá se při vytváření nezávislého nasazení. +Ve výchozím nastavení se publikuje aplikace závislá na architektuře. The configuration to publish for. The default for most projects is 'Debug'. - The configuration to publish for. The default for most projects is 'Debug'. + Konfigurace pro publikování. Výchozí možností pro většinu projektů je Debug. diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.de.xlf index 54fe79e46..7f2b370ec 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.de.xlf @@ -14,7 +14,7 @@ The target framework to publish for. The target framework has to be specified in the project file. - Zielframework für die Veröffentlichung. Das Zielframework muss in der Projektdatei angegeben werden. + Das Zielframework für die Veröffentlichung. Das Zielframework muss in der Projektdatei angegeben werden. @@ -24,12 +24,12 @@ The output directory to place the published artifacts in. - Ausgabeverzeichnis, in dem veröffentlichte Artefakte abgelegt werden. + Das Ausgabeverzeichnis, in dem veröffentlichte Artefakte abgelegt werden. MANIFEST - manifest.xml + MANIFEST @@ -45,13 +45,13 @@ The target runtime to publish the application for. The default is to publish a framework-dependent application without an executable. - The target runtime to publish the application for. -The default is to publish a framework-dependent application without an executable. + Die Zielruntime für die Veröffentlichung. Diese wird zum Erstellen einer eigenständigen Bereitstellung verwendet. +Standardmäßig wird eine frameworkabhängige Anwendung veröffentlicht. The configuration to publish for. The default for most projects is 'Debug'. - The configuration to publish for. The default for most projects is 'Debug'. + Die Konfiguration für die Veröffentlichung. Der Standardwert für die meisten Projekte ist "Debug". diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.es.xlf index d71ab145b..ed152e303 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.es.xlf @@ -14,7 +14,7 @@ The target framework to publish for. The target framework has to be specified in the project file. - Plataforma de destino para la que se publica. La plataforma de destino se debe especificar en el archivo de proyecto. + La plataforma de destino para la que se publica. La plataforma de destino se debe especificar en el archivo de proyecto. @@ -24,12 +24,12 @@ The output directory to place the published artifacts in. - Directorio de salida en el que se ubicarán los artefactos publicados. + El directorio de salida en el que se ubicarán los artefactos publicados. MANIFEST - manifest.xml + MANIFEST @@ -45,13 +45,13 @@ The target runtime to publish the application for. The default is to publish a framework-dependent application without an executable. - The target runtime to publish the application for. -The default is to publish a framework-dependent application without an executable. + El tiempo de ejecución de destino para el que se publica. Se usa cuando se crea una implementación autocontenida. +El valor predeterminado es publicar una aplicación dependiente de la plataforma. The configuration to publish for. The default for most projects is 'Debug'. - The configuration to publish for. The default for most projects is 'Debug'. + La configuración para la que se publica. El valor predeterminado para la mayoría de los proyectos es "Debug". diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.fr.xlf index dbc2c0835..1f5cb582f 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.fr.xlf @@ -14,7 +14,7 @@ The target framework to publish for. The target framework has to be specified in the project file. - Framework cible de la publication. Le framework cible doit être spécifié dans le fichier projet. + Framework cible pour lequel la publication est effectuée. Le framework cible doit être spécifié dans le fichier projet. @@ -24,12 +24,12 @@ The output directory to place the published artifacts in. - Répertoire de sortie dans lequel placer les artefacts publiés. + Répertoire de sortie dans lequel placer les artefacts publiés. MANIFEST - manifest.xml + MANIFEST @@ -45,13 +45,13 @@ The target runtime to publish the application for. The default is to publish a framework-dependent application without an executable. - The target runtime to publish the application for. -The default is to publish a framework-dependent application without an executable. + Runtime cible pour lequel la publication est effectuée. S'utilise pour la création d'un déploiement autonome. +L'action par défaut consiste à publier une application qui dépend d'un framework. The configuration to publish for. The default for most projects is 'Debug'. - The configuration to publish for. The default for most projects is 'Debug'. + Configuration pour laquelle la publication est effectuée. La valeur par défaut pour la plupart des projets est 'Debug'. diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.it.xlf index d6b3ca3ca..cf87a03ae 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.it.xlf @@ -14,7 +14,7 @@ The target framework to publish for. The target framework has to be specified in the project file. - Framework di destinazione per cui eseguire la pubblicazione. Il framework di destinazione deve essere specificato nel file di progetto. + Framework di destinazione per cui eseguire la pubblicazione. Il framework di destinazione deve essere specificato nel file di progetto. @@ -24,12 +24,12 @@ The output directory to place the published artifacts in. - Directory di output in cui inserire gli artefatti pubblicati. + Directory di output in cui inserire gli artefatti pubblicati. MANIFEST - manifest.xml + MANIFESTO @@ -45,13 +45,13 @@ The target runtime to publish the application for. The default is to publish a framework-dependent application without an executable. - The target runtime to publish the application for. -The default is to publish a framework-dependent application without an executable. + Runtime di destinazione per cui eseguire la pubblicazione. Viene usata durante la creazione della distribuzione indipendente. +Per impostazione predefinita, viene pubblicata un'applicazione dipendente dal framework. The configuration to publish for. The default for most projects is 'Debug'. - The configuration to publish for. The default for most projects is 'Debug'. + Configurazione per cui eseguire la pubblicazione. L'impostazione predefinita per la maggior parte dei progetti è 'Debug'. diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ja.xlf index 36949f48d..c3ddfd748 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ja.xlf @@ -14,7 +14,7 @@ The target framework to publish for. The target framework has to be specified in the project file. - 発行用のターゲット フレームワーク。ターゲット フレームワークはプロジェクト ファイルで指定する必要があります。 + 発行する対象のターゲット フレームワーク。ターゲット フレームワークはプロジェクト ファイルで指定する必要があります。 @@ -24,12 +24,12 @@ The output directory to place the published artifacts in. - 発行された成果物を配置する出力ディレクトリ。 + 発行された成果物を配置する出力ディレクトリ。 MANIFEST - manifest.xml + MANIFEST @@ -45,13 +45,13 @@ The target runtime to publish the application for. The default is to publish a framework-dependent application without an executable. - The target runtime to publish the application for. -The default is to publish a framework-dependent application without an executable. + 発行する対象のターゲット ランタイム。これは、自己完結型の配置を作成する際に使用します。 +既定では、フレームワーク依存アプリケーションを発行します。 The configuration to publish for. The default for most projects is 'Debug'. - The configuration to publish for. The default for most projects is 'Debug'. + 発行する対象の構成。大部分のプロジェクトで、既定値は 'Debug' です。 diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ko.xlf index b5781e2e6..03b88afc2 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ko.xlf @@ -14,7 +14,7 @@ The target framework to publish for. The target framework has to be specified in the project file. - 게시할 대상 프레임워크입니다. 대상 프레임워크는 프로젝트 파일에서 지정해야 합니다. + 게시할 대상 프레임워크입니다. 대상 프레임워크는 프로젝트 파일에서 지정해야 합니다. @@ -24,12 +24,12 @@ The output directory to place the published artifacts in. - 게시할 아티팩트를 배치할 출력 디렉터리입니다. + 게시된 아티팩트를 배치할 출력 디렉터리입니다. MANIFEST - manifest.xml + MANIFEST @@ -45,13 +45,13 @@ The target runtime to publish the application for. The default is to publish a framework-dependent application without an executable. - The target runtime to publish the application for. -The default is to publish a framework-dependent application without an executable. + 게시할 대상 런타임입니다. 자체 포함 배포를 만들 때 사용됩니다. +기본값은 프레임워크 종속 응용 프로그램을 게시하는 것입니다. The configuration to publish for. The default for most projects is 'Debug'. - The configuration to publish for. The default for most projects is 'Debug'. + 게시할 구성입니다. 대부분의 프로젝트에서 기본값은 'Debug'입니다. diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pl.xlf index cb4c0c981..caacebc07 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pl.xlf @@ -14,7 +14,7 @@ The target framework to publish for. The target framework has to be specified in the project file. - Docelowa platforma publikacji. Platforma docelowa musi być określona w pliku projektu. + Platforma docelowa publikacji. Platforma docelowa musi być określona w pliku projektu. @@ -24,12 +24,12 @@ The output directory to place the published artifacts in. - Katalog wyjściowy, w którym mają zostać umieszczone opublikowane artefakty. + Katalog wyjściowy, w którym mają zostać umieszczone opublikowane artefakty. MANIFEST - manifest.xml + MANIFEST @@ -45,13 +45,13 @@ The target runtime to publish the application for. The default is to publish a framework-dependent application without an executable. - The target runtime to publish the application for. -The default is to publish a framework-dependent application without an executable. + Docelowe środowisko uruchomieniowe na potrzeby publikacji. Ustawienie stosowane w przypadku tworzenia wdrożenia autonomicznego. +Ustawieniem domyślnym jest opublikowanie aplikacji zależnej od platformy. The configuration to publish for. The default for most projects is 'Debug'. - The configuration to publish for. The default for most projects is 'Debug'. + Konfiguracja, dla której ma być wykonane publikowanie. W przypadku większości projektów ustawienie domyślne to „Debugowanie”. 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 f7c91c76c..a332416cf 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pt-BR.xlf @@ -14,7 +14,7 @@ The target framework to publish for. The target framework has to be specified in the project file. - Estrutura de destino na qual publicar. A estrutura de destino deve ser especificada no arquivo de projeto. + A estrutura de destino da publicação. A estrutura de destino precisa ser especificada no arquivo de projeto. @@ -24,12 +24,12 @@ The output directory to place the published artifacts in. - Diretório de saída no qual os artefatos publicados serão colocados. + O diretório de saída no qual os artefatos publicados serão colocados. MANIFEST - manifest.xml + MANIFEST @@ -45,13 +45,13 @@ The target runtime to publish the application for. The default is to publish a framework-dependent application without an executable. - The target runtime to publish the application for. -The default is to publish a framework-dependent application without an executable. + O tempo de execução de destino da publicação. Ele é usado ao criar uma implantação autossuficiente. +O padrão é publicar um aplicativo dependente da estrutura. The configuration to publish for. The default for most projects is 'Debug'. - The configuration to publish for. The default for most projects is 'Debug'. + A configuração para a qual a publicação ocorrerá. O padrão para a maioria dos projetos é 'Debug'. diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ru.xlf index 2b269e4ec..34d488ed8 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.ru.xlf @@ -14,7 +14,7 @@ The target framework to publish for. The target framework has to be specified in the project file. - Целевая платформа публикации. Целевая платформа должна быть указана в файле проекта. + Целевая платформа публикации. Целевая платформа должна быть указана в файле проекта. @@ -24,12 +24,12 @@ The output directory to place the published artifacts in. - Выходной каталог для размещения опубликованных артефактов. + Выходной каталог для размещения опубликованных артефактов. MANIFEST - manifest.xml + MANIFEST @@ -45,13 +45,13 @@ The target runtime to publish the application for. The default is to publish a framework-dependent application without an executable. - The target runtime to publish the application for. -The default is to publish a framework-dependent application without an executable. + Целевая среда выполнения публикации. Используется при создании автономного развертывания. +По умолчанию публикуется платформозависимое приложение. The configuration to publish for. The default for most projects is 'Debug'. - The configuration to publish for. The default for most projects is 'Debug'. + Конфигурация для публикации. По умолчанию для большинства проектов используется "Debug". diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.tr.xlf index d39339db9..6aed67f27 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.tr.xlf @@ -14,7 +14,7 @@ The target framework to publish for. The target framework has to be specified in the project file. - Yayımlamanın yapılacağı hedef çerçeve. Hedef çerçevenin proje dosyasında belirtilmesi gerekir. + Yayımlamanın yapılacağı hedef çerçeve. Hedef çerçevenin proje dosyasında belirtilmesi gerekir. @@ -24,12 +24,12 @@ The output directory to place the published artifacts in. - Yayımlanan yapıtların yerleştirileceği çıkış dizini. + Yayımlanan yapıtların yerleştirileceği çıkış dizini. MANIFEST - manifest.xml + MANIFEST @@ -45,13 +45,13 @@ The target runtime to publish the application for. The default is to publish a framework-dependent application without an executable. - The target runtime to publish the application for. -The default is to publish a framework-dependent application without an executable. + Yayımlamanın yapılacağı hedef çalışma zamanı. Kendi içinde dağıtımlar oluşturulurken kullanılır. +Varsayılan seçenek, çerçeveye bağımlı bir proje yayımlamaktır. The configuration to publish for. The default for most projects is 'Debug'. - The configuration to publish for. The default for most projects is 'Debug'. + Yayımlanacak yapılandırma. Çoğu proje için varsayılan, ‘Hata Ayıklama’ seçeneğidir. 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 277fcd58e..95ca67dce 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hans.xlf @@ -14,7 +14,7 @@ The target framework to publish for. The target framework has to be specified in the project file. - 要发布的目标框架。目标框架必须在项目文件中指定。 + 要发布的目标框架。必须在项目文件中指定目标框架。 @@ -24,12 +24,12 @@ The output directory to place the published artifacts in. - 用于放置已发布项的输出目录。 + 要放置已发布项目的输出目录。 MANIFEST - manifest.xml + MANIFEST @@ -45,13 +45,13 @@ The target runtime to publish the application for. The default is to publish a framework-dependent application without an executable. - The target runtime to publish the application for. -The default is to publish a framework-dependent application without an executable. + 要发布的目标运行时。创建自包含部署时使用此项。 +默认操作为发布依赖框架的应用程序。 The configuration to publish for. The default for most projects is 'Debug'. - The configuration to publish for. The default for most projects is 'Debug'. + 要发布的配置。大多数项目的默认值是 "Debug"。 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 a23a56120..7339114f2 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.zh-Hant.xlf @@ -9,12 +9,12 @@ FRAMEWORK - FRAMEWORK + 架構 The target framework to publish for. The target framework has to be specified in the project file. - 要為其發行的目標 Framework。其必須在專案檔中指定。 + 要為其進行發行的目標架構。該架構必須在專案檔中指定。 @@ -24,12 +24,12 @@ The output directory to place the published artifacts in. - 要放置發行之成品的輸出目錄。 + 放置發行之成品的輸出目錄。 MANIFEST - manifest.xml + 資訊清單 @@ -45,13 +45,13 @@ The target runtime to publish the application for. The default is to publish a framework-dependent application without an executable. - The target runtime to publish the application for. -The default is to publish a framework-dependent application without an executable. + 對其進行發行的目標執行階段。建立獨立的部署時，將會使用。 +預設會發行與架構相依的應用程式。 The configuration to publish for. The default for most projects is 'Debug'. - The configuration to publish for. The default for most projects is 'Debug'. + 要為其進行發行的組態。大部分的專案預設為「偵錯」。 diff --git a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.cs.xlf index 9ef2e269f..d48783d50 100644 --- a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.cs.xlf @@ -19,12 +19,12 @@ Add one or more projects to a solution file. - Příkaz rozhraní .NET pro přidání projektů do souboru řešení + Přidá do souboru řešení jeden nebo více projektů. Remove one or more projects from a solution file. - Příkaz rozhraní .NET pro odebrání projektů ze souboru řešení + Odebere ze souboru řešení jeden nebo více projektů. @@ -34,7 +34,7 @@ List all projects in a solution file. - Příkaz rozhraní .NET pro vypsání seznamu projektů v souboru řešení + Vypíše seznam všech projektů v souboru řešení. @@ -44,37 +44,37 @@ SLN_FILE - SLN_FILE + SLN_FILE The solution file to operate on. If not specified, the command will search the current directory for one. - The solution file to operate on. If not specified, the command will search the current directory for one. + Soubor řešení, s kterým se má pracovat. Pokud není zadaný, příkaz ho bude hledat v aktuálním adresáři. PROJECT_PATH - PROJECT_PATH + PROJECT_PATH The paths to the projects to add to the solution. - The paths to the projects to add to the solution. + Cesty k projektům, které se mají přidat do řešení PROJECT_PATH - PROJECT_PATH + PROJECT_PATH The paths to the projects to remove from the solution. - The paths to the projects to remove from the solution. + Cesty k projektům, které se mají odebrat z řešení Project(s) - Project(s) + Projekty diff --git a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.de.xlf index 17c13ea5a..b51848a9e 100644 --- a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.de.xlf @@ -19,12 +19,12 @@ Add one or more projects to a solution file. - .NET-Befehl zum Hinzufügen von Projekten zu einer Projektmappendatei + Fügt einer Projektmappendatei ein oder mehrere Projekte hinzu. Remove one or more projects from a solution file. - .NET-Befehl zum Entfernen von Projekten aus einer Projektmappendatei + Entfernt ein oder mehrere Projekte von einer Projektmappendatei. @@ -34,7 +34,7 @@ List all projects in a solution file. - .NET-Befehl zum Auflisten von Projekten in einer Projektmappendatei + Listet alle Projekte in einer Projektmappendatei auf. @@ -44,37 +44,37 @@ SLN_FILE - SLN_FILE + <SLN_FILE> The solution file to operate on. If not specified, the command will search the current directory for one. - The solution file to operate on. If not specified, the command will search the current directory for one. + Die zu verwendende Projektmappendatei. Wenn keine Projektmappendatei angegeben ist, sucht der Befehl im aktuellen Verzeichnis nach einer Datei. PROJECT_PATH - PROJECT_PATH + PROJECT_PATH The paths to the projects to add to the solution. - The paths to the projects to add to the solution. + Die Pfade zu den Projekten, die zur Projektmappe hinzugefügt werden sollen. PROJECT_PATH - PROJECT_PATH + PROJECT_PATH The paths to the projects to remove from the solution. - The paths to the projects to remove from the solution. + Die Pfade zu den Projekten, die von der Projektmappe entfernt werden sollen. Project(s) - Project(s) + Projekt(e) diff --git a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.es.xlf index d7a1dcd8f..e408effa1 100644 --- a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.es.xlf @@ -4,12 +4,12 @@ .NET modify solution file command - Comando de .NET para modificar el archivo de la solución + Comando de .NET para modificar el archivo de solución Command to add, remove, and list projects from the solution (SLN) file. - Comando para agregar, quitar y enumerar proyectos desde el archivo de la solución (SLN). + Comando para agregar, quitar y enumerar proyectos desde el archivo de solución (SLN). @@ -19,12 +19,12 @@ Add one or more projects to a solution file. - Comando de .NET para agregar proyectos a un archivo de la solución + Agrega uno o varios proyectos a un archivo de solución. Remove one or more projects from a solution file. - Comando de .NET para quitar proyectos de un archivo de la solución + Quita uno o varios proyectos de un archivo de solución. @@ -34,7 +34,7 @@ List all projects in a solution file. - Comando de .NET para enumerar proyectos en un archivo de la solución + Enumera todos los proyectos de la solución. @@ -44,37 +44,37 @@ SLN_FILE - SLN_FILE + SLN_FILE The solution file to operate on. If not specified, the command will search the current directory for one. - The solution file to operate on. If not specified, the command will search the current directory for one. + El archivo de solución sobre el que se va a operar. Si no se especifica, el comando buscará uno en el directorio actual. PROJECT_PATH - PROJECT_PATH + PROJECT_PATH The paths to the projects to add to the solution. - The paths to the projects to add to the solution. + Las rutas a los proyectos para agregar la solución. PROJECT_PATH - PROJECT_PATH + PROJECT_PATH The paths to the projects to remove from the solution. - The paths to the projects to remove from the solution. + Las rutas a los proyectos desde la solución. Project(s) - Project(s) + Proyectos diff --git a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.fr.xlf index 985fa5ce9..51f990d60 100644 --- a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.fr.xlf @@ -9,32 +9,32 @@ Command to add, remove, and list projects from the solution (SLN) file. - Commande permettant d'ajouter, de supprimer et de répertorier des projets à partir du fichier solution (SLN). + Commande permettant d'ajouter, de retirer et de répertorier des projets à partir du fichier solution (SLN). Projects to add or to remove from the solution. - Projets à ajouter ou supprimer dans la solution. + Projets à ajouter ou retirer dans la solution. Add one or more projects to a solution file. - Commande .NET Ajouter un ou des projets à un fichier solution + Ajoutez un ou plusieurs projets à un fichier solution. Remove one or more projects from a solution file. - Commande .NET Supprimer un ou des projets dans un fichier solution + Supprimez un ou plusieurs projets d'un fichier solution. Remove the specified project(s) from the solution. The project is not impacted. - Supprimez le ou les projets spécifiés dans la solution. Le projet n'est pas affecté. + Retirez le ou les projets spécifiés dans la solution. Le projet n'est pas affecté. List all projects in a solution file. - Commande .NET Répertorier un ou des projets dans un fichier solution + Listez tous les projets d'un fichier solution. @@ -44,37 +44,37 @@ SLN_FILE - SLN_FILE + SLN_FILE The solution file to operate on. If not specified, the command will search the current directory for one. - The solution file to operate on. If not specified, the command will search the current directory for one. + Fichier solution à utiliser. Si aucun fichier n'est spécifié, la commande en recherche un dans le répertoire actif. PROJECT_PATH - PROJECT_PATH + PROJECT_PATH The paths to the projects to add to the solution. - The paths to the projects to add to the solution. + Chemins des projets à ajouter à la solution. PROJECT_PATH - PROJECT_PATH + PROJECT_PATH The paths to the projects to remove from the solution. - The paths to the projects to remove from the solution. + Chemins des projets à supprimer de la solution. Project(s) - Project(s) + Projet(s) diff --git a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.it.xlf index 3b62e07c6..617a4311b 100644 --- a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.it.xlf @@ -19,12 +19,12 @@ Add one or more projects to a solution file. - Comando Aggiungi progetto/i a un file di soluzione .NET + Consente di aggiungere uno o più progetti a un file di soluzione. Remove one or more projects from a solution file. - Comando Rimuovi progetto/i da un file di soluzione .NET + Consente di rimuovere uno o più progetti da un file di soluzione. @@ -34,7 +34,7 @@ List all projects in a solution file. - Comando Elenca progetto/i in un file di soluzione .NET + Elenca tutti i progetti presenti in un file di soluzione. @@ -44,37 +44,37 @@ SLN_FILE - SLN_FILE + FILE_SOLUZIONE The solution file to operate on. If not specified, the command will search the current directory for one. - The solution file to operate on. If not specified, the command will search the current directory for one. + File di soluzione su cui intervenire. Se non si specifica un file, il comando ne cercherà uno nella directory corrente. PROJECT_PATH - PROJECT_PATH + PERCORSO_PROGETTO The paths to the projects to add to the solution. - The paths to the projects to add to the solution. + Percorsi dei progetti da aggiungere alla soluzione. PROJECT_PATH - PROJECT_PATH + PERCORSO_PROGETTO The paths to the projects to remove from the solution. - The paths to the projects to remove from the solution. + Percorsi dei progetti da rimuovere dalla soluzione. Project(s) - Project(s) + Progetto/i diff --git a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.ja.xlf index 40e92f1eb..b276b5b96 100644 --- a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.ja.xlf @@ -19,12 +19,12 @@ Add one or more projects to a solution file. - .NET プロジェクトをソリューション ファイルに追加するコマンド + 1 つ以上のプロジェクトをソリューション ファイルに追加します。 Remove one or more projects from a solution file. - .NET プロジェクトをソリューション ファイルから削除するコマンド + 1 つ以上のプロジェクトをソリューション ファイルから削除します。 @@ -34,7 +34,7 @@ List all projects in a solution file. - .NET ソリューション ファイルのプロジェクトを一覧表示するコマンド + ソリューション ファイル内のすべてのプロジェクトを一覧表示します。 @@ -44,37 +44,37 @@ SLN_FILE - SLN_FILE + <SLN_FILE> The solution file to operate on. If not specified, the command will search the current directory for one. - The solution file to operate on. If not specified, the command will search the current directory for one. + 操作するソリューション ファイル。指定しない場合、コマンドによって現在のディレクトリから検索されます。 PROJECT_PATH - PROJECT_PATH + PROJECT_PATH The paths to the projects to add to the solution. - The paths to the projects to add to the solution. + ソリューションに追加するプロジェクトへのパス。 PROJECT_PATH - PROJECT_PATH + PROJECT_PATH The paths to the projects to remove from the solution. - The paths to the projects to remove from the solution. + ソリューションから削除するプロジェクトへのパス。 Project(s) - Project(s) + プロジェクト diff --git a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.ko.xlf index 8699ccff9..03cfb0ad3 100644 --- a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.ko.xlf @@ -19,12 +19,12 @@ Add one or more projects to a solution file. - .NET 솔루션 파일에 프로젝트 추가 명령 + 솔루션 파일에 하나 이상의 프로젝트를 추가합니다. Remove one or more projects from a solution file. - .NET 솔루션에서 프로젝트 제거 명령 + 솔루션 파일에서 하나 이상의 프로젝트를 제거합니다. @@ -34,7 +34,7 @@ List all projects in a solution file. - .NET 솔루션 파일의 프로젝트 나열 명령 + 솔루션 파일의 프로젝트를 모두 나열합니다. @@ -44,37 +44,37 @@ SLN_FILE - SLN_FILE + SLN_FILE The solution file to operate on. If not specified, the command will search the current directory for one. - The solution file to operate on. If not specified, the command will search the current directory for one. + 수행할 솔루션 파일입니다. 파일을 지정하지 않으면 명령이 현재 디렉터리에서 파일을 검색합니다. PROJECT_PATH - PROJECT_PATH + PROJECT_PATH The paths to the projects to add to the solution. - The paths to the projects to add to the solution. + 솔루션에 추가할 프로젝트의 경로입니다. PROJECT_PATH - PROJECT_PATH + PROJECT_PATH The paths to the projects to remove from the solution. - The paths to the projects to remove from the solution. + 솔루션에서 제거할 프로젝트의 경로입니다. Project(s) - Project(s) + 프로젝트 diff --git a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.pl.xlf index 779da30cd..83af390ce 100644 --- a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.pl.xlf @@ -19,12 +19,12 @@ Add one or more projects to a solution file. - Polecenie dodawania projektów do pliku rozwiązania dla platformy .NET + Dodaj co najmniej jeden projekt do pliku rozwiązania. Remove one or more projects from a solution file. - Polecenie usuwania projektów z pliku rozwiązania dla platformy .NET + Usuń co najmniej jeden projekt z pliku rozwiązania. @@ -34,7 +34,7 @@ List all projects in a solution file. - Polecenie wyświetlania listy projektów w pliku rozwiązania dla platformy .NET + Wyświetl listę wszystkich projektów w pliku rozwiązania. @@ -44,37 +44,37 @@ SLN_FILE - SLN_FILE + PLIK_SLN The solution file to operate on. If not specified, the command will search the current directory for one. - The solution file to operate on. If not specified, the command will search the current directory for one. + Plik rozwiązania, na którym ma zostać wykonana operacja. Jeśli nie określono pliku, polecenie przeszuka bieżący katalog pod jego kątem. PROJECT_PATH - PROJECT_PATH + ŚCIEŻKA_PROJEKTU The paths to the projects to add to the solution. - The paths to the projects to add to the solution. + Ścieżki do projektów, które mają zostać dodane do rozwiązania. PROJECT_PATH - PROJECT_PATH + ŚCIEŻKA_PROJEKTU The paths to the projects to remove from the solution. - The paths to the projects to remove from the solution. + Ścieżki do projektów, które mają zostać usunięte z rozwiązania. Project(s) - Project(s) + Projekty diff --git a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.pt-BR.xlf index 11af2e0cf..408c168ea 100644 --- a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.pt-BR.xlf @@ -19,12 +19,12 @@ Add one or more projects to a solution file. - Comando para adicionar projetos a um arquivo de solução do .NET + Adicionar um ou mais projetos em um arquivo de solução. Remove one or more projects from a solution file. - Comando para remover projetos de um arquivo de solução do .NET + Remover um ou mais projetos de um arquivo de solução. @@ -34,7 +34,7 @@ List all projects in a solution file. - Comando para listar projetos em um arquivo de solução do .NET + Listar todos os projetos em um arquivo de solução. @@ -44,37 +44,37 @@ SLN_FILE - SLN_FILE + SLN_FILE The solution file to operate on. If not specified, the command will search the current directory for one. - The solution file to operate on. If not specified, the command will search the current directory for one. + O arquivo de solução no qual a operação ocorrerá. Se não for especificado, o comando pesquisará um arquivo de solução no diretório atual. PROJECT_PATH - PROJECT_PATH + PROJECT_PATH The paths to the projects to add to the solution. - The paths to the projects to add to the solution. + Os caminhos para os projetos a serem adicionados na solução. PROJECT_PATH - PROJECT_PATH + PROJECT_PATH The paths to the projects to remove from the solution. - The paths to the projects to remove from the solution. + Os caminhos para os projetos da solução. Project(s) - Project(s) + Projetos diff --git a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.ru.xlf index d94ab6677..665deb701 100644 --- a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.ru.xlf @@ -19,12 +19,12 @@ Add one or more projects to a solution file. - Команда .NET "Добавить проекты в файл решения" + Добавление проектов в файл решения. Remove one or more projects from a solution file. - Команда .NET "Удалить проекты из файла решения" + Удаление проектов из файла решения. @@ -34,7 +34,7 @@ List all projects in a solution file. - Команда .NET "Перечислить проекты в файле решения" + Вывод списка всех проектов в файле решения. @@ -44,37 +44,37 @@ SLN_FILE - SLN_FILE + SLN_FILE The solution file to operate on. If not specified, the command will search the current directory for one. - The solution file to operate on. If not specified, the command will search the current directory for one. + Обрабатываемый файл решения. Если не указать его, команда будет искать его в текущем каталоге. PROJECT_PATH - PROJECT_PATH + PROJECT_PATH The paths to the projects to add to the solution. - The paths to the projects to add to the solution. + Пути к проектам, которые необходимо добавить в решение. PROJECT_PATH - PROJECT_PATH + PROJECT_PATH The paths to the projects to remove from the solution. - The paths to the projects to remove from the solution. + Пути к проектам, которые необходимо удалить из решения. Project(s) - Project(s) + Проекты diff --git a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.tr.xlf index 555d80781..ede6ff040 100644 --- a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.tr.xlf @@ -19,12 +19,12 @@ Add one or more projects to a solution file. - .NET Çözüm dosyasına proje ekle Komutu + Bir çözüm dosyasına bir veya daha fazla proje ekler. Remove one or more projects from a solution file. - .NET Çözüm dosyasından projeleri kaldır Komutu + Bir çözüm dosyasından bir veya daha fazla projeyi kaldırır. @@ -34,7 +34,7 @@ List all projects in a solution file. - .NET Çözüm dosyasındaki projeleri listele Komutu + Bir çözüm dosyasındaki tüm projeleri listeler. @@ -44,37 +44,37 @@ SLN_FILE - SLN_FILE + <SLN_FILE> The solution file to operate on. If not specified, the command will search the current directory for one. - The solution file to operate on. If not specified, the command will search the current directory for one. + Üzerinde işlem yapılacak çözüm dosyası. Belirtilmezse, komut geçerli dizinde böyle bir dosya arar. PROJECT_PATH - PROJECT_PATH + PROJECT_PATH The paths to the projects to add to the solution. - The paths to the projects to add to the solution. + Çözüme eklenecek projelerin yolları. PROJECT_PATH - PROJECT_PATH + PROJECT_PATH The paths to the projects to remove from the solution. - The paths to the projects to remove from the solution. + Çözümden kaldırılacak projelerin yolları. Project(s) - Project(s) + Projeler diff --git a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.zh-Hans.xlf index e3358413c..8c1e4766f 100644 --- a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.zh-Hans.xlf @@ -19,12 +19,12 @@ Add one or more projects to a solution file. - .NET“将项目添加到解决方案文件”命令 + 将一个或多个项目添加到解决方案文件。 Remove one or more projects from a solution file. - .NET“从解决方案文件删除项目”命令 + 从解决方案文件中删除一个或多个项目。 @@ -34,7 +34,7 @@ List all projects in a solution file. - .NET“列出解决方案文件中项目”命令 + 列出解决方案文件中的所有项目。 @@ -44,37 +44,37 @@ SLN_FILE - SLN_FILE + SLN_FILE The solution file to operate on. If not specified, the command will search the current directory for one. - The solution file to operate on. If not specified, the command will search the current directory for one. + 要操作的解决方案文件。如未指定，则命令会在当前目录下搜索一个文件。 PROJECT_PATH - PROJECT_PATH + PROJECT_PATH The paths to the projects to add to the solution. - The paths to the projects to add to the solution. + 要添加到解决方案的项目路径。 PROJECT_PATH - PROJECT_PATH + PROJECT_PATH The paths to the projects to remove from the solution. - The paths to the projects to remove from the solution. + 从解决方案到项目的路径。 Project(s) - Project(s) + 项目 diff --git a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.zh-Hant.xlf index c23bcd86c..1e314c136 100644 --- a/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-sln/xlf/LocalizableStrings.zh-Hant.xlf @@ -19,12 +19,12 @@ Add one or more projects to a solution file. - .NET 將專案新增到方案檔的命令 + 為解決方案檔新增一或多個專案。 Remove one or more projects from a solution file. - .NET 將專案從方案檔移除的命令 + 從解決方案檔移除一或多個專案。 @@ -34,7 +34,7 @@ List all projects in a solution file. - .NET 列出方案中專案的命令 + 列出解決方案檔中的所有專案。 @@ -44,37 +44,37 @@ SLN_FILE - SLN_FILE + SLN_FILE The solution file to operate on. If not specified, the command will search the current directory for one. - The solution file to operate on. If not specified, the command will search the current directory for one. + 要進行作業的解決方案檔。若未指定檔案，此命令將會搜尋目前的目錄以取得一個檔案。 PROJECT_PATH - PROJECT_PATH + PROJECT_PATH The paths to the projects to add to the solution. - The paths to the projects to add to the solution. + 到達要新增至解決方案之專案的路徑。 PROJECT_PATH - PROJECT_PATH + PROJECT_PATH The paths to the projects to remove from the solution. - The paths to the projects to remove from the solution. + 從解決方案到達要專案的路徑。 Project(s) - Project(s) + 專案 From 35496cfe418268565d61dd7fcc711e05247610b2 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Fri, 13 Jul 2018 16:52:54 -0700 Subject: [PATCH 67/73] Fix incorrect merge --- test/dotnet-new.Tests/GivenThatIWantANewApp.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs index 56c338c1f..d63d844b3 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs @@ -76,8 +76,7 @@ namespace Microsoft.DotNet.New.Tests // Remove the expectedVersion parameter once we have templates targetting netcoreapp2.2. [Theory] - [InlineData("console", "microsoft.netcore.app")] - // re-enable when this bug is resolved: https://github.com/dotnet/cli/issues/7574 + [InlineData("console", "microsoft.netcore.app", "2.1.0")] [InlineData("classlib", "netstandard.library", null)] public void NewProjectRestoresCorrectPackageVersion(string type, string packageName, string expectedVersion) { @@ -108,7 +107,7 @@ namespace Microsoft.DotNet.New.Tests var sharedFxDir = dotnetDir .GetDirectory("shared", "Microsoft.NETCore.App") .EnumerateDirectories() - .Single(d => d.Name.StartsWith("2.1.0")); + .Single(d => d.Name.StartsWith("2.2.0")); if (packageName == "microsoft.netcore.app") { From 423b718beaec67dc1d04dee861d5b4aa08fc56e5 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Fri, 13 Jul 2018 16:55:23 -0700 Subject: [PATCH 68/73] Temporarily disable part of self-contained roll-forward test --- test/EndToEnd/GivenSelfContainedAppsRollForward.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/EndToEnd/GivenSelfContainedAppsRollForward.cs b/test/EndToEnd/GivenSelfContainedAppsRollForward.cs index b624cd14f..8061e98d0 100644 --- a/test/EndToEnd/GivenSelfContainedAppsRollForward.cs +++ b/test/EndToEnd/GivenSelfContainedAppsRollForward.cs @@ -21,6 +21,13 @@ namespace EndToEnd [ClassData(typeof(SupportedNetCoreAppVersions))] public void ItRollsForwardToTheLatestVersion(string minorVersion) { + // https://github.com/dotnet/cli/issues/9661: remove this once the ASP.NET version bump + // merges from 2.1.3xx -> 2.1.4xx -> 2.2.1xx + if (minorVersion == "2.1") + { + return; + } + var _testInstance = TestAssets.Get("TestAppSimple") .CreateInstance(identifier: minorVersion) .WithSourceFiles(); From 02c19ad94538af6f985322883e8f059df6df5c2c Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Fri, 13 Jul 2018 19:19:37 -0700 Subject: [PATCH 69/73] Revert tests for feature that is about to be reverted by merge The mode switch tests are failing as they hit the 2.2.1xx branch because we don't have a dotnet/sdk with the needed support for it. Since the feature is reverted in release/2.1.4xx anyway, revert the tests ahead of time to match release/2.1.4xx (modulo s/2.1/2.2/) --- .../GivenDotnetPublishPublishesProjects.cs | 78 ++++--------------- 1 file changed, 14 insertions(+), 64 deletions(-) diff --git a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs index 51d164b04..ba51449fe 100644 --- a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs +++ b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs @@ -97,15 +97,14 @@ namespace Microsoft.DotNet.Cli.Publish.Tests } [Theory] - [InlineData("self-contained", null)] - [InlineData(null, null)] - [InlineData(null, "--self-contained")] - [InlineData(null, "--self-contained=true")] - public void ItPublishesSelfContainedWithRid(string mode, string args) + [InlineData(null)] + [InlineData("--self-contained")] + [InlineData("--self-contained=true")] + public void ItPublishesSelfContainedWithRid(string args) { var testAppName = "MSBuildTestApp"; var rid = DotnetLegacyRuntimeIdentifiers.InferLegacyRestoreRuntimeIdentifier(); - var outputDirectory = PublishApp(testAppName, rid, mode, args); + var outputDirectory = PublishApp(testAppName, rid, args); var outputProgram = Path.Combine(outputDirectory.FullName, $"{testAppName}{Constants.ExeSuffix}"); @@ -116,16 +115,14 @@ namespace Microsoft.DotNet.Cli.Publish.Tests } [Theory] - [InlineData("fx-dependent", null)] - [InlineData(null, "--self-contained=false")] - public void ItPublishesFrameworkDependentWithRid(string mode, string args) + [InlineData("--self-contained=false")] + public void ItPublishesFrameworkDependentWithRid(string args) { var testAppName = "MSBuildTestApp"; var rid = DotnetLegacyRuntimeIdentifiers.InferLegacyRestoreRuntimeIdentifier(); - var outputDirectory = PublishApp(testAppName, rid, mode, args); + var outputDirectory = PublishApp(testAppName, rid, args); outputDirectory.Should().OnlyHaveFiles(new[] { - $"{testAppName}{Constants.ExeSuffix}", $"{testAppName}.dll", $"{testAppName}.pdb", $"{testAppName}.deps.json", @@ -134,31 +131,6 @@ namespace Microsoft.DotNet.Cli.Publish.Tests var outputProgram = Path.Combine(outputDirectory.FullName, $"{testAppName}{Constants.ExeSuffix}"); - var command = new TestCommand(outputProgram); - command.Environment[Environment.Is64BitProcess ? "DOTNET_ROOT" : "DOTNET_ROOT(x86)"] = - new RepoDirectoriesProvider().DotnetRoot; - - command.ExecuteWithCapturedOutput() - .Should() - .Pass() - .And - .HaveStdOutContaining("Hello World"); - } - - [Fact] - public void ItPublishesFrameworkDependentNoExeWithRid() - { - var testAppName = "MSBuildTestApp"; - var rid = DotnetLegacyRuntimeIdentifiers.InferLegacyRestoreRuntimeIdentifier(); - var outputDirectory = PublishApp(testAppName, rid, mode: "fx-dependent-no-exe"); - - outputDirectory.Should().OnlyHaveFiles(new[] { - $"{testAppName}.dll", - $"{testAppName}.pdb", - $"{testAppName}.deps.json", - $"{testAppName}.runtimeconfig.json", - }); - new DotnetCommand() .ExecuteWithCapturedOutput(Path.Combine(outputDirectory.FullName, $"{testAppName}.dll")) .Should().Pass() @@ -166,14 +138,12 @@ namespace Microsoft.DotNet.Cli.Publish.Tests } [Theory] - [InlineData("fx-dependent-no-exe", null)] - [InlineData("fx-dependent", null)] - [InlineData(null, "--self-contained=false")] - [InlineData(null, null)] - public void ItPublishesFrameworkDependentWithoutRid(string mode, string args) + [InlineData("--self-contained=false")] + [InlineData(null)] + public void ItPublishesFrameworkDependentWithoutRid(string args) { var testAppName = "MSBuildTestApp"; - var outputDirectory = PublishApp(testAppName, rid: null, mode: mode, args: args); + var outputDirectory = PublishApp(testAppName, rid: null, args: args); outputDirectory.Should().OnlyHaveFiles(new[] { $"{testAppName}.dll", @@ -188,10 +158,10 @@ namespace Microsoft.DotNet.Cli.Publish.Tests .And.HaveStdOutContaining("Hello World"); } - private DirectoryInfo PublishApp(string testAppName, string rid, string mode, string args = null) + private DirectoryInfo PublishApp(string testAppName, string rid, string args = null) { var testInstance = TestAssets.Get(testAppName) - .CreateInstance($"PublishApp_{rid ?? "none"}_{mode ?? "none"}_{args ?? "none"}") + .CreateInstance($"PublishApp_{rid ?? "none"}_{args ?? "none"}") .WithSourceFiles() .WithRestoreFiles(); @@ -199,7 +169,6 @@ namespace Microsoft.DotNet.Cli.Publish.Tests new PublishCommand() .WithRuntime(rid) - .WithMode(mode) .WithWorkingDirectory(testProjectDirectory) .Execute(args ?? "") .Should().Pass(); @@ -336,24 +305,5 @@ namespace Microsoft.DotNet.Cli.Publish.Tests .Should() .Fail(); } - - [Fact] - public void ItFailsToPublishIfBothModeAndSelfContainedAreSpecified() - { - var testInstance = TestAssets.Get("MSBuildTestApp") - .CreateInstance() - .WithSourceFiles() - .WithRestoreFiles(); - - var testProjectDirectory = testInstance.Root; - - new PublishCommand() - .WithWorkingDirectory(testProjectDirectory) - .Execute("--self-contained --mode fx-dependent") - .Should() - .Fail() - .And - .HaveStdErrContaining(LocalizableStrings.PublishModeAndSelfContainedOptionsConflict); - } } } From f378070c25c616ec17adcfed406db626483b0878 Mon Sep 17 00:00:00 2001 From: jbeisner Date: Mon, 16 Jul 2018 19:52:12 +0000 Subject: [PATCH 70/73] =?UTF-8?q?Replace=20the=20"sudo=20dpkg=20-r?= =?UTF-8?q?=E2=80=9D=20command=20with=20a=20more=20encompassing:=20?= =?UTF-8?q?=E2=80=9Csudo=20apt-get=20purge=20-y=E2=80=9D.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/package/Installer.DEB.proj | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/build/package/Installer.DEB.proj b/build/package/Installer.DEB.proj index 0e516f440..abbf45e59 100644 --- a/build/package/Installer.DEB.proj +++ b/build/package/Installer.DEB.proj @@ -94,12 +94,12 @@ UseHardlinksIfPossible="False" /> - - - - - - + + + + + + - - - - - - + + + + + + From 782c4401d4c2c5d8919a2a751ae553cf818e0a7e Mon Sep 17 00:00:00 2001 From: jbeisner Date: Mon, 16 Jul 2018 20:51:02 +0000 Subject: [PATCH 71/73] Back to "sudo dpkg -r" with ContinueOnError="WarnAndContinue" --- build/package/Installer.DEB.proj | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/build/package/Installer.DEB.proj b/build/package/Installer.DEB.proj index abbf45e59..68390e2d7 100644 --- a/build/package/Installer.DEB.proj +++ b/build/package/Installer.DEB.proj @@ -94,12 +94,12 @@ UseHardlinksIfPossible="False" /> - - - - - - + + + + + + - - - - - - + + + + + + From d8735024f99e67721146715cbda107b607a1d74c Mon Sep 17 00:00:00 2001 From: jbeisner Date: Mon, 16 Jul 2018 22:52:41 +0000 Subject: [PATCH 72/73] Use the full version as the DEB package names for the runtime and ASP.NET runtime. --- build/package/Installer.DEB.proj | 24 ++++++++++++------------ build/package/Installer.DEB.targets | 12 ++++++++++-- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/build/package/Installer.DEB.proj b/build/package/Installer.DEB.proj index 68390e2d7..0e516f440 100644 --- a/build/package/Installer.DEB.proj +++ b/build/package/Installer.DEB.proj @@ -94,12 +94,12 @@ UseHardlinksIfPossible="False" /> - - - - - - + + + + + + - - - - - - + + + + + + diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets index 349089d86..f6f9abfa9 100644 --- a/build/package/Installer.DEB.targets +++ b/build/package/Installer.DEB.targets @@ -30,7 +30,11 @@ $(MicrosoftNETCoreAppMajorMinorVersion) dotnet-runtime-$(SharedFxDebianPackageFileVersion) $(SharedFxDebianPackageFileName.ToLower()) - dotnet-runtime-$(SharedFxDebianPackageVersion) + + + dotnet-runtime-$(SharedFxDebianPackageFileVersion) + $(SharedFxDebianPackageName.ToLower()) $(HostFxrMajorMinorVersion) dotnet-hostfxr-$(HostFxrDebianPackageVersion) @@ -38,7 +42,11 @@ dotnet-host aspnetcore-runtime-$(AspNetCoreVersion) $(AspNetCoreSharedFxDebianPackageFileName.ToLower()) - aspnetcore-runtime-$(AspNetCoreMajorMinorVersion) + + + aspnetcore-runtime-$(AspNetCoreVersion) + $(AspNetCoreSharedFxDebianPackageName.ToLower()) From 67abf5c634c102ca7e662d8f07f6833b795354e4 Mon Sep 17 00:00:00 2001 From: jbeisner Date: Mon, 16 Jul 2018 23:35:41 +0000 Subject: [PATCH 73/73] 'Warn and Continue' on the DEB removal errors. --- build/package/Installer.DEB.proj | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/build/package/Installer.DEB.proj b/build/package/Installer.DEB.proj index 0e516f440..68390e2d7 100644 --- a/build/package/Installer.DEB.proj +++ b/build/package/Installer.DEB.proj @@ -94,12 +94,12 @@ UseHardlinksIfPossible="False" /> - - - - - - + + + + + + - - - - - - + + + + + +