From 9ea9cbc8a6608df2f154e1f0f97b972b5e5d2b1b Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Wed, 19 Apr 2017 20:07:10 -0700 Subject: [PATCH 1/7] Update templates and engine, pin ASP.NET package versions, add web item templates --- build/BundledTemplates.props | 1 + build/DependencyVersions.props | 6 +++--- build/compile/LzmaArchive.targets | 13 +++++++++++++ .../GenerateNuGetPackagesArchiveVersion.cs | 1 + ...ivenThatTheUserIsRunningDotNetForTheFirstTime.cs | 9 ++++----- 5 files changed, 22 insertions(+), 8 deletions(-) diff --git a/build/BundledTemplates.props b/build/BundledTemplates.props index 1d7ef3d55..59606c8b5 100644 --- a/build/BundledTemplates.props +++ b/build/BundledTemplates.props @@ -1,6 +1,7 @@ + diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 30ac513f1..82e644357 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -11,9 +11,9 @@ $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) - 1.0.0-beta2-20170410-189 - 1.0.0-beta2-20170410-189 - 1.0.0-beta2-20170410-189 + 1.0.0-beta2-20170419-195 + 1.0.0-beta2-20170419-195 + 1.0.0-beta2-20170419-195 2.0.0-preview1-001960 2.0.0-preview1-002022 0.1.0-alpha-142 diff --git a/build/compile/LzmaArchive.targets b/build/compile/LzmaArchive.targets index df6e34f30..4f36f536f 100644 --- a/build/compile/LzmaArchive.targets +++ b/build/compile/LzmaArchive.targets @@ -79,6 +79,7 @@ + @@ -101,6 +102,18 @@ SkipInvalidConfigurations="True" WorkingDirectory="$(NuGetPackagesArchiveProject)/Console" /> + + + + + diff --git a/build_projects/dotnet-cli-build/GenerateNuGetPackagesArchiveVersion.cs b/build_projects/dotnet-cli-build/GenerateNuGetPackagesArchiveVersion.cs index 316f813de..8dbe4d129 100644 --- a/build_projects/dotnet-cli-build/GenerateNuGetPackagesArchiveVersion.cs +++ b/build_projects/dotnet-cli-build/GenerateNuGetPackagesArchiveVersion.cs @@ -30,6 +30,7 @@ namespace Microsoft.DotNet.Cli.Build private static string[][] _templatesAndArgs = new string[][] { new string[] { "console", "" }, + new string[] { "mvc", "-au individual" }, }; public override bool Execute() diff --git a/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs b/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs index d3ff7008c..2c6800dcd 100644 --- a/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs +++ b/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs @@ -97,11 +97,6 @@ A command is running to initially populate your local package cache, to improve "microsoft.netcore.app", "microsoft.netcore.platforms", "netstandard.library", - }; - - // https://github.com/dotnet/cli/issues/5505 - add the "2.0" asp.net packages into the offline cache - List unexpectedDirectories = new List() - { "microsoft.aspnetcore.diagnostics", "microsoft.aspnetcore.mvc", "microsoft.aspnetcore.routing", @@ -117,6 +112,10 @@ A command is running to initially populate your local package cache, to improve "microsoft.visualstudio.web.browserlink", }; + List unexpectedDirectories = new List() + { + }; + _nugetFallbackFolder .Should() .HaveDirectories(expectedDirectories); From 4dd1be1978886a7522a604af77932bdca70651a1 Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Wed, 19 Apr 2017 20:48:25 -0700 Subject: [PATCH 2/7] Respond to review feedback --- build/compile/LzmaArchive.targets | 12 ------------ .../GenerateNuGetPackagesArchiveVersion.cs | 1 - ...GivenThatTheUserIsRunningDotNetForTheFirstTime.cs | 8 -------- 3 files changed, 21 deletions(-) diff --git a/build/compile/LzmaArchive.targets b/build/compile/LzmaArchive.targets index 4f36f536f..ae7bf4646 100644 --- a/build/compile/LzmaArchive.targets +++ b/build/compile/LzmaArchive.targets @@ -78,7 +78,6 @@ - @@ -91,17 +90,6 @@ File="$(LZMANuGetConfigFilePath)" Lines="$(NuGetConfigContent)" /> - - - - unexpectedDirectories = new List() - { - }; - _nugetFallbackFolder .Should() .HaveDirectories(expectedDirectories); - - _nugetFallbackFolder - .Should() - .NotHaveDirectories(unexpectedDirectories); } private string GetDotnetVersion() From 90cdb07cbc58c3841a3dd7b327c51d8e41f38473 Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Thu, 20 Apr 2017 13:49:03 -0700 Subject: [PATCH 3/7] Try slightly earlier engine version --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 82e644357..cea2ac7dc 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -11,7 +11,7 @@ $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) - 1.0.0-beta2-20170419-195 + 1.0.0-beta2-20170418-194 1.0.0-beta2-20170419-195 1.0.0-beta2-20170419-195 2.0.0-preview1-001960 From 2cbbea5b48aa7aa74d896ec5c1bce4dcad9f85e4 Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Thu, 20 Apr 2017 14:38:06 -0700 Subject: [PATCH 4/7] Put 195 engine version back --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index cea2ac7dc..01acddc93 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -11,7 +11,7 @@ $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) - 1.0.0-beta2-20170418-194 + 1.0.0-beta2-20170418-195 1.0.0-beta2-20170419-195 1.0.0-beta2-20170419-195 2.0.0-preview1-001960 From cc64d6cd6d0a9bbdb9c0248e58d2f50517ee49b0 Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Thu, 20 Apr 2017 17:25:24 -0700 Subject: [PATCH 5/7] Re-enable tests as promised --- .../GivenThatIWantANewAppWithSpecifiedType.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs index e6f540c70..ce6d8aff0 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs @@ -21,9 +21,8 @@ namespace Microsoft.DotNet.New.Tests [InlineData("C#", "mstest", false)] [InlineData("C#", "xunit", false)] [InlineData("C#", "web", false)] - // Uncomment the tests below in PR#6362 - //[InlineData("C#", "mvc", false)] - //[InlineData("C#", "webapi", false)] + [InlineData("C#", "mvc", false)] + [InlineData("C#", "webapi", false)] // Uncomment the test below once https://github.com/dotnet/netcorecli-fsc/issues/92 is fixed. //[InlineData("F#", "console", false)] //[InlineData("F#", "classlib", false)] From 38e467e9902224692a1dc82a5106c7f2a259b62f Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Fri, 21 Apr 2017 20:46:27 -0700 Subject: [PATCH 6/7] Fix build warning for web projects, add gracefull fallback for framework reference add attempts --- build/DependencyVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 01acddc93..0e0940f66 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -11,9 +11,9 @@ $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) - 1.0.0-beta2-20170418-195 - 1.0.0-beta2-20170419-195 - 1.0.0-beta2-20170419-195 + 1.0.0-beta2-20170421-197 + 1.0.0-beta2-20170421-197 + 1.0.0-beta2-20170421-197 2.0.0-preview1-001960 2.0.0-preview1-002022 0.1.0-alpha-142 From 8227a6edace6dca9dcb86946557c759fd83144c9 Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Fri, 21 Apr 2017 22:10:57 -0700 Subject: [PATCH 7/7] Update templates, remove browserlink from checked packages --- build/DependencyVersions.props | 6 +++--- .../GivenThatTheUserIsRunningDotNetForTheFirstTime.cs | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 0e0940f66..b2a603cdc 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -11,9 +11,9 @@ $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) - 1.0.0-beta2-20170421-197 - 1.0.0-beta2-20170421-197 - 1.0.0-beta2-20170421-197 + 1.0.0-beta2-20170421-198 + 1.0.0-beta2-20170421-198 + 1.0.0-beta2-20170421-198 2.0.0-preview1-001960 2.0.0-preview1-002022 0.1.0-alpha-142 diff --git a/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs b/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs index 0b4203431..fa6e693e2 100644 --- a/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs +++ b/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs @@ -109,7 +109,8 @@ A command is running to initially populate your local package cache, to improve "microsoft.extensions.logging.console", "microsoft.extensions.logging.debug", "microsoft.extensions.options.configurationextensions", - "microsoft.visualstudio.web.browserlink", + //BrowserLink has been temporarily disabled until https://github.com/dotnet/templating/issues/644 is resolved + //"microsoft.visualstudio.web.browserlink", }; _nugetFallbackFolder