From f388933ebb61941568e63203de430c5c54c9be62 Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 30 May 2018 17:45:17 -0700 Subject: [PATCH 01/17] 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/17] 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/17] 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/17] 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/17] 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/17] 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/17] 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/17] 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/17] 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/17] 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/17] 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/17] 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/17] 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 7a0d2c8f0c827b59b84857eb79f18f2c7b4f64c6 Mon Sep 17 00:00:00 2001 From: jbeisner Date: Wed, 6 Jun 2018 23:08:38 +0000 Subject: [PATCH 14/17] 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 15/17] 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 6e550e5c254174de975bf3eb5a5fe6677647e50a Mon Sep 17 00:00:00 2001 From: jbeisner Date: Fri, 8 Jun 2018 19:12:51 +0000 Subject: [PATCH 16/17] 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 17/17] 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)