From d8087d35d4ac195e788fbe54624a14d91a8baa11 Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Thu, 29 Jun 2017 10:16:02 -0700 Subject: [PATCH] Update engine and templates, update to SetupCrossgen 224 - Coherence 25975 --- NuGet.Config | 5 +---- build/DependencyVersions.props | 14 +++++++------- .../GenerateNuGetPackagesArchiveVersion.cs | 2 +- .../commands/dotnet-migrate/DotnetNewRedirector.cs | 2 +- test/EndToEnd/GivenDotNetUsesMSBuild.cs | 2 +- .../GivenDotnetAddReference.cs | 2 +- .../GivenDotnetBuildBuildsCsproj.cs | 2 +- .../GivenDotnetListReference.cs | 2 +- test/dotnet-new.Tests/GivenThatIWantANewApp.cs | 8 ++++---- .../GivenThatIWantANewAppWithSpecifiedType.cs | 2 +- test/dotnet-pack.Tests/PackTests.cs | 2 +- .../GivenDotnetPublishPublishesProjects.cs | 2 +- .../GivenDotnetRemoveP2P.cs | 2 +- .../GivenThatIWantToRestoreApp.cs | 6 +++--- test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs | 2 +- 15 files changed, 26 insertions(+), 29 deletions(-) diff --git a/NuGet.Config b/NuGet.Config index 329dde57d..3fb7835ee 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -4,10 +4,8 @@ - - - + @@ -16,7 +14,6 @@ - diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index a3a15fb3b..74f3dc1af 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -22,9 +22,9 @@ $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) - 1.0.0-beta2-20170614-260 - 1.0.0-beta2-20170620-266 - 1.0.0-beta2-20170620-266 + 1.0.0-beta2-20170629-268 + 1.0.0-beta2-20170629-268 + 1.0.0-beta2-20170629-268 2.0.0-preview3-25426-01 2.0.0-preview3-25426-01 0.1.1-alpha-167 @@ -34,10 +34,10 @@ 0.2.0-beta-000042 - notimestamp - 2.0.0-preview2-215 - preview2 - 25794 + timestamped + dev-224 + preview3 + 25975 diff --git a/build_projects/dotnet-cli-build/GenerateNuGetPackagesArchiveVersion.cs b/build_projects/dotnet-cli-build/GenerateNuGetPackagesArchiveVersion.cs index 4ba8fb393..75bcf0232 100644 --- a/build_projects/dotnet-cli-build/GenerateNuGetPackagesArchiveVersion.cs +++ b/build_projects/dotnet-cli-build/GenerateNuGetPackagesArchiveVersion.cs @@ -47,7 +47,7 @@ namespace Microsoft.DotNet.Cli.Build { ToolPath = ToolPath, TemplateType = newArgs[0], - TemplateArgs = newArgs[1] + $" --debug:ephemeral-hive -n TempProject -o \"{outputDir}\" --no-restore", + TemplateArgs = newArgs[1] + $" --debug:ephemeral-hive -n TempProject -o \"{outputDir}\"", HostObject = HostObject, BuildEngine = BuildEngine }; diff --git a/src/dotnet/commands/dotnet-migrate/DotnetNewRedirector.cs b/src/dotnet/commands/dotnet-migrate/DotnetNewRedirector.cs index bc997da4c..0657f4abe 100644 --- a/src/dotnet/commands/dotnet-migrate/DotnetNewRedirector.cs +++ b/src/dotnet/commands/dotnet-migrate/DotnetNewRedirector.cs @@ -15,7 +15,7 @@ namespace Microsoft.DotNet.Tools.Migrate string outputDirectory, string workingDirectory) { - RunCommand("new", new string[] { "console", "-o", workingDirectory, "--debug:ephemeral-hive", "--no-restore" }, workingDirectory); + RunCommand("new", new string[] { "console", "-o", workingDirectory, "--debug:ephemeral-hive" }, workingDirectory); } private void RunCommand(string commandToExecute, IEnumerable args, string workingDirectory) { diff --git a/test/EndToEnd/GivenDotNetUsesMSBuild.cs b/test/EndToEnd/GivenDotNetUsesMSBuild.cs index f714ee38c..fa7e2cb75 100644 --- a/test/EndToEnd/GivenDotNetUsesMSBuild.cs +++ b/test/EndToEnd/GivenDotNetUsesMSBuild.cs @@ -19,7 +19,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd { string projectDirectory = directory.Path; - string newArgs = "console -f netcoreapp2.0 --debug:ephemeral-hive --no-restore"; + string newArgs = "console -f netcoreapp2.0 --debug:ephemeral-hive"; new NewCommandShim() .WithWorkingDirectory(projectDirectory) .Execute(newArgs) diff --git a/test/dotnet-add-reference.Tests/GivenDotnetAddReference.cs b/test/dotnet-add-reference.Tests/GivenDotnetAddReference.cs index bbe339071..0210cda52 100644 --- a/test/dotnet-add-reference.Tests/GivenDotnetAddReference.cs +++ b/test/dotnet-add-reference.Tests/GivenDotnetAddReference.cs @@ -68,7 +68,7 @@ Commands: try { - string args = $"classlib -o \"{projDir.Path}\" --debug:ephemeral-hive --no-restore"; + string args = $"classlib -o \"{projDir.Path}\" --debug:ephemeral-hive"; new NewCommandShim() .WithWorkingDirectory(projDir.Path) .ExecuteWithCapturedOutput(args) diff --git a/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs b/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs index febd7a9b3..a95130cd2 100644 --- a/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs +++ b/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs @@ -93,7 +93,7 @@ namespace Microsoft.DotNet.Cli.Build.Tests string dir = "pkgs"; string args = $"--packages {dir}"; - string newArgs = $"console -f netcoreapp2.0 -o \"{rootPath}\" --debug:ephemeral-hive --no-restore"; + string newArgs = $"console -f netcoreapp2.0 -o \"{rootPath}\" --debug:ephemeral-hive"; new NewCommandShim() .WithWorkingDirectory(rootPath) .Execute(newArgs) diff --git a/test/dotnet-list-reference.Tests/GivenDotnetListReference.cs b/test/dotnet-list-reference.Tests/GivenDotnetListReference.cs index 12766e983..92332290d 100644 --- a/test/dotnet-list-reference.Tests/GivenDotnetListReference.cs +++ b/test/dotnet-list-reference.Tests/GivenDotnetListReference.cs @@ -209,7 +209,7 @@ Commands: try { - string newArgs = $"classlib -o \"{dir.Path}\" --debug:ephemeral-hive --no-restore"; + string newArgs = $"classlib -o \"{dir.Path}\" --debug:ephemeral-hive"; new NewCommandShim() .WithWorkingDirectory(dir.Path) .ExecuteWithCapturedOutput(newArgs) diff --git a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs index a468bd7b8..ec8d96195 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs @@ -21,13 +21,13 @@ namespace Microsoft.DotNet.New.Tests new NewCommand() .WithWorkingDirectory(rootPath) - .Execute($"console --debug:ephemeral-hive --no-restore"); + .Execute($"console --debug:ephemeral-hive"); DateTime expectedState = Directory.GetLastWriteTime(rootPath); var result = new NewCommand() .WithWorkingDirectory(rootPath) - .ExecuteWithCapturedOutput($"console --debug:ephemeral-hive --no-restore"); + .ExecuteWithCapturedOutput($"console --debug:ephemeral-hive"); DateTime actualState = Directory.GetLastWriteTime(rootPath); @@ -64,7 +64,7 @@ namespace Microsoft.DotNet.New.Tests new NewCommand() .WithWorkingDirectory(projectFolder) - .Execute($"{projectType} --debug:ephemeral-hive --no-restore") + .Execute($"{projectType} --debug:ephemeral-hive") .Should().Pass(); // https://github.com/dotnet/templating/issues/946 - remove DisableImplicitAssetTargetFallback once this is fixed. @@ -87,7 +87,7 @@ namespace Microsoft.DotNet.New.Tests new NewCommand() .WithWorkingDirectory(rootPath) - .Execute($"{type} --name {projectName} -o . --debug:ephemeral-hive --no-restore") + .Execute($"{type} --name {projectName} -o . --debug:ephemeral-hive") .Should().Pass(); new RestoreCommand() diff --git a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs index 34d706979..9121df32e 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs @@ -40,7 +40,7 @@ namespace Microsoft.DotNet.New.Tests string rootPath = TestAssets.CreateTestDirectory(identifier: $"{language}_{projectType}").FullName; new TestCommand("dotnet") { WorkingDirectory = rootPath } - .Execute($"new {projectType} -lang {language} -o {rootPath} --debug:ephemeral-hive --no-restore") + .Execute($"new {projectType} -lang {language} -o {rootPath} --debug:ephemeral-hive") .Should().Pass(); if (useNuGetConfigForAspNet) diff --git a/test/dotnet-pack.Tests/PackTests.cs b/test/dotnet-pack.Tests/PackTests.cs index 32b940a45..23d7ecbde 100644 --- a/test/dotnet-pack.Tests/PackTests.cs +++ b/test/dotnet-pack.Tests/PackTests.cs @@ -245,7 +245,7 @@ namespace Microsoft.DotNet.Tools.Pack.Tests string dir = "pkgs"; string args = $"--packages {dir}"; - string newArgs = $"console -o \"{rootPath}\" --no-restore"; + string newArgs = $"console -o \"{rootPath}\""; new NewCommandShim() .WithWorkingDirectory(rootPath) .Execute(newArgs) diff --git a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs index 2db2018fa..8b5e09ca9 100644 --- a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs +++ b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs @@ -206,7 +206,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests string dir = "pkgs"; string args = $"--packages {dir}"; - string newArgs = $"console -o \"{rootPath}\" --no-restore"; + string newArgs = $"console -o \"{rootPath}\""; new NewCommandShim() .WithWorkingDirectory(rootPath) .Execute(newArgs) diff --git a/test/dotnet-remove-reference.Tests/GivenDotnetRemoveP2P.cs b/test/dotnet-remove-reference.Tests/GivenDotnetRemoveP2P.cs index 65da417b2..77407296f 100644 --- a/test/dotnet-remove-reference.Tests/GivenDotnetRemoveP2P.cs +++ b/test/dotnet-remove-reference.Tests/GivenDotnetRemoveP2P.cs @@ -65,7 +65,7 @@ Commands: try { - string newArgs = $"classlib -o \"{projDir.Path}\" --no-restore"; + string newArgs = $"classlib -o \"{projDir.Path}\""; new NewCommandShim() .WithWorkingDirectory(projDir.Path) .ExecuteWithCapturedOutput(newArgs) diff --git a/test/dotnet-restore.Tests/GivenThatIWantToRestoreApp.cs b/test/dotnet-restore.Tests/GivenThatIWantToRestoreApp.cs index 40afaea2e..1022596a3 100644 --- a/test/dotnet-restore.Tests/GivenThatIWantToRestoreApp.cs +++ b/test/dotnet-restore.Tests/GivenThatIWantToRestoreApp.cs @@ -24,7 +24,7 @@ namespace Microsoft.DotNet.Restore.Tests string dir = "pkgs"; string fullPath = Path.GetFullPath(Path.Combine(rootPath, dir)); - string newArgs = $"console -o \"{rootPath}\" --no-restore"; + string newArgs = $"console -o \"{rootPath}\""; new NewCommandShim() .WithWorkingDirectory(rootPath) .Execute(newArgs) @@ -51,7 +51,7 @@ namespace Microsoft.DotNet.Restore.Tests string dir = "pkgs"; string fullPath = Path.GetFullPath(Path.Combine(rootPath, dir)); - string newArgs = $"classlib -o \"{rootPath}\" --no-restore"; + string newArgs = $"classlib -o \"{rootPath}\""; new NewCommandShim() .WithWorkingDirectory(rootPath) .Execute(newArgs) @@ -98,7 +98,7 @@ namespace Microsoft.DotNet.Restore.Tests string dir = "pkgs"; string fullPath = Path.GetFullPath(Path.Combine(rootPath, dir)); - string newArgs = $"console -o \"{rootPath}\" --no-restore"; + string newArgs = $"console -o \"{rootPath}\""; new NewCommandShim() .WithWorkingDirectory(rootPath) .Execute(newArgs) diff --git a/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs b/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs index 36a0d3fde..69ec51360 100644 --- a/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs +++ b/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs @@ -198,7 +198,7 @@ namespace Microsoft.DotNet.Cli.Run.Tests string dir = "pkgs"; string args = $"--packages {dir}"; - string newArgs = $"console -o \"{rootPath}\" --no-restore"; + string newArgs = $"console -o \"{rootPath}\""; new NewCommandShim() .WithWorkingDirectory(rootPath) .Execute(newArgs)