From 0015821db64340362177aa2202b8a0e3ae94ed5d Mon Sep 17 00:00:00 2001 From: jbeisner Date: Tue, 5 Jun 2018 16:51:32 +0000 Subject: [PATCH 1/3] 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 2/3] 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 3/3] 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) {