From e145ca88e4e02f8da1e400825caa8a4c1d90cfd8 Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Wed, 15 Feb 2017 20:38:25 -0800 Subject: [PATCH 1/9] Placeholder for template update --- NuGet.Config | 2 ++ build/Microsoft.DotNet.Cli.BundledTemplates.props | 6 +++--- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets | 4 ++-- .../dotnet-cli-build/GenerateNuGetPackagesArchiveVersion.cs | 4 ++-- src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs | 4 ++-- .../GivenANuGetCachePrimer.cs | 4 ++-- 7 files changed, 14 insertions(+), 12 deletions(-) diff --git a/NuGet.Config b/NuGet.Config index 559db7b79..df7c3dd7e 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -3,6 +3,8 @@ + + diff --git a/build/Microsoft.DotNet.Cli.BundledTemplates.props b/build/Microsoft.DotNet.Cli.BundledTemplates.props index 6f9987424..ba625fc9d 100644 --- a/build/Microsoft.DotNet.Cli.BundledTemplates.props +++ b/build/Microsoft.DotNet.Cli.BundledTemplates.props @@ -3,8 +3,8 @@ - - - + + + diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index df8667514..426efb7ce 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -9,7 +9,7 @@ 1.0.0-alpha-20170130-3-281 15.0.0-preview-20170217-05 1.0.0-beta1-20170202-111 - 1.0.0-beta1-20170206-112 + 1.0.0-beta1-20170221-124 1.1.1 1.0.2 diff --git a/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets b/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets index f27fa510d..023e4d172 100644 --- a/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets +++ b/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets @@ -88,7 +88,7 @@ > _templatesUsedToPrimeCache = new List>() { - new List() { "mvc", "-f", "netcoreapp1.0", "-au", "Individual", "--debug:ephemeral-hive" }, - new List() { "mvc", "-f", "netcoreapp1.1", "-au", "Individual", "--debug:ephemeral-hive" } + new List() { "mvc", "-f", "netcoreapp1.0", "-au", "Individual", "--debug:ephemeral-hive", "--no-tools" }, + new List() { "mvc", "-f", "netcoreapp1.1", "-au", "Individual", "--debug:ephemeral-hive", "--no-tools" } }; private readonly ICommandFactory _commandFactory; diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs b/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs index 0defc02ba..3268bfed2 100644 --- a/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs +++ b/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs @@ -63,10 +63,10 @@ namespace Microsoft.DotNet.Configurer.UnitTests SetupCommandMock(_dotnetNewCommandMock); commandFactoryMock - .Setup(c => c.Create("new", new[] { "mvc", "-f", "netcoreapp1.0", "-au", "Individual", "--debug:ephemeral-hive" }, null, Constants.DefaultConfiguration)) + .Setup(c => c.Create("new", new[] { "mvc", "-f", "netcoreapp1.0", "-au", "Individual", "--debug:ephemeral-hive", "--no-tools" }, null, Constants.DefaultConfiguration)) .Returns(_dotnetNewCommandMock.Object); commandFactoryMock - .Setup(c => c.Create("new", new[] { "mvc", "-f", "netcoreapp1.1", "-au", "Individual", "--debug:ephemeral-hive" }, null, Constants.DefaultConfiguration)) + .Setup(c => c.Create("new", new[] { "mvc", "-f", "netcoreapp1.1", "-au", "Individual", "--debug:ephemeral-hive", "--no-tools" }, null, Constants.DefaultConfiguration)) .Returns(_dotnetNewCommandMock.Object); _dotnetRestoreCommandMock = new Mock(); From 0aa4e83cb8bcc7811aaed04eb1cf61533fb46d02 Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Tue, 21 Feb 2017 17:10:53 -0800 Subject: [PATCH 2/9] Reorder feeds to prevent issue where a package with the same name and version has been rebuilt Update package versions in tests --- NuGet.Config | 4 ++-- .../GivenThatTheUserIsRunningDotNetForTheFirstTime.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NuGet.Config b/NuGet.Config index df7c3dd7e..16edc909c 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -3,13 +3,13 @@ - - + + diff --git a/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs b/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs index 6cdad4b02..b6981d924 100644 --- a/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs +++ b/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs @@ -118,7 +118,7 @@ A command is running to initially populate your local package cache, to improve _nugetCacheFolder .GetDirectory("microsoft.aspnetcore.mvc") - .Should().HaveDirectories(new string[] { "1.0.2", "1.1.1" }); + .Should().HaveDirectories(new string[] { "1.0.3", "1.1.2" }); } private string GetDotnetVersion() From 3e91be94e16f12b2a0054f10d6bce5254fd694bc Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Tue, 21 Feb 2017 18:01:36 -0800 Subject: [PATCH 3/9] Flip feed order back to try to fix build --- NuGet.Config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NuGet.Config b/NuGet.Config index 16edc909c..df7c3dd7e 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -3,13 +3,13 @@ + + - - From 2659a777b525974b5dd1f9153fbafd4a15d85228 Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Tue, 21 Feb 2017 18:40:11 -0800 Subject: [PATCH 4/9] Fix tests by updating the temporary asp.net feeds Revert change to feed ordering for normal nuget.config --- NuGet.Config | 4 ++-- test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config | 2 ++ test/dotnet-new.Tests/NuGet.tempaspnetpatch.config | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/NuGet.Config b/NuGet.Config index df7c3dd7e..16edc909c 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -3,13 +3,13 @@ - - + + diff --git a/test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config b/test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config index 8bfa9c1ed..a76c3ab27 100644 --- a/test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config +++ b/test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config @@ -8,5 +8,7 @@ + + \ No newline at end of file diff --git a/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config b/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config index 41ba66505..5a8658385 100644 --- a/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config +++ b/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config @@ -7,5 +7,7 @@ + + \ No newline at end of file From 04f714c01f980cf5e203ba3a8768d246520a4636 Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Tue, 21 Feb 2017 19:48:24 -0800 Subject: [PATCH 5/9] Test fixes - update AspNetCore version being looked for, account for diasymreadernative showing up in output, account for new default of netcoreapp1.1 for console apps --- test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs | 2 +- .../dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs | 2 +- .../GivenThatTheUserIsRunningDotNetForTheFirstTime.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs b/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs index 781f7c985..f6ae3c052 100644 --- a/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs +++ b/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs @@ -65,7 +65,7 @@ namespace Microsoft.DotNet.Cli.Build.Tests .Execute() .Should().Pass(); - var outputDll = Directory.EnumerateFiles(Path.Combine(rootPath, "bin"), "*.dll", SearchOption.AllDirectories).Single(); + var outputDll = Directory.EnumerateFiles(Path.Combine(rootPath, "bin"), "*.dll", SearchOption.AllDirectories).Single(x => !x.Contains("DiaSymReader")); var outputRunCommand = new TestCommand("dotnet"); diff --git a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs index 13d5374d2..65ede2408 100644 --- a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs +++ b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs @@ -107,7 +107,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug"; var outputProgram = rootDir - .GetDirectory("bin", configuration, "netcoreapp1.0", "publish", $"{rootDir.Name}.dll") + .GetDirectory("bin", configuration, "netcoreapp1.1", "publish", $"{rootDir.Name}.dll") .FullName; new TestCommand(outputProgram) diff --git a/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs b/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs index b6981d924..1ba57d86a 100644 --- a/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs +++ b/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs @@ -118,7 +118,7 @@ A command is running to initially populate your local package cache, to improve _nugetCacheFolder .GetDirectory("microsoft.aspnetcore.mvc") - .Should().HaveDirectories(new string[] { "1.0.3", "1.1.2" }); + .Should().HaveDirectories(new string[] { "1.0.4", "1.1.2" }); } private string GetDotnetVersion() From 7b4c0647566d931bf1938c556fb87252674a17c8 Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Tue, 21 Feb 2017 20:16:34 -0800 Subject: [PATCH 6/9] Correct version of the MVC package being looked for in tests --- .../GivenThatTheUserIsRunningDotNetForTheFirstTime.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs b/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs index 1ba57d86a..b6981d924 100644 --- a/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs +++ b/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs @@ -118,7 +118,7 @@ A command is running to initially populate your local package cache, to improve _nugetCacheFolder .GetDirectory("microsoft.aspnetcore.mvc") - .Should().HaveDirectories(new string[] { "1.0.4", "1.1.2" }); + .Should().HaveDirectories(new string[] { "1.0.3", "1.1.2" }); } private string GetDotnetVersion() From 36717ef3fccb77f9d5c10b3cb357e186b85650fe Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Tue, 21 Feb 2017 21:04:50 -0800 Subject: [PATCH 7/9] Fix lzma archive creation to include 1.0.x packages --- build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets b/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets index 023e4d172..7dc602f21 100644 --- a/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets +++ b/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets @@ -88,7 +88,7 @@ Date: Wed, 22 Feb 2017 11:15:43 -0800 Subject: [PATCH 8/9] Use the curated feed with all the relevant ASP.NET packages --- NuGet.Config | 3 +-- test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config | 3 +-- test/dotnet-new.Tests/NuGet.tempaspnetpatch.config | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/NuGet.Config b/NuGet.Config index 16edc909c..556ee5919 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -9,7 +9,6 @@ - - + diff --git a/test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config b/test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config index a76c3ab27..eaf5b585e 100644 --- a/test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config +++ b/test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config @@ -8,7 +8,6 @@ - - + \ No newline at end of file diff --git a/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config b/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config index 5a8658385..80a6898ca 100644 --- a/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config +++ b/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config @@ -7,7 +7,6 @@ - - + \ No newline at end of file From 6a26c5584a996ff95f5e7294dbd30eb4ca013428 Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Wed, 22 Feb 2017 13:47:28 -0800 Subject: [PATCH 9/9] Pick up a newer version of templates carrying the latest test SDK changes --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index 426efb7ce..0b295ce4e 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -9,7 +9,7 @@ 1.0.0-alpha-20170130-3-281 15.0.0-preview-20170217-05 1.0.0-beta1-20170202-111 - 1.0.0-beta1-20170221-124 + 1.0.0-beta1-20170222-125 1.1.1 1.0.2