From aaa9fe2c1dcc226170037b31ffeaa21778dd1fd9 Mon Sep 17 00:00:00 2001 From: Justin Goshi Date: Fri, 17 Feb 2017 11:13:33 -0800 Subject: [PATCH 01/20] Re-enable solution building tests --- .../GivenThatIWantToMigrateSolutions.cs | 18 ++++++++---------- test/dotnet-sln-add.Tests/GivenDotnetSlnAdd.cs | 9 ++++----- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs index 330baa6e0..622f0b27f 100644 --- a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs +++ b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs @@ -229,11 +229,10 @@ namespace Microsoft.DotNet.Migration.Tests .Execute($"restore \"{solutionRelPath}\"") .Should().Pass(); - //ISSUE: https://github.com/dotnet/cli/issues/5205 - //new DotnetCommand() - // .WithWorkingDirectory(projectDirectory) - // .Execute($"build \"{solutionRelPath}\"") - // .Should().Pass(); + new DotnetCommand() + .WithWorkingDirectory(projectDirectory) + .Execute($"build \"{solutionRelPath}\"") + .Should().Pass(); } private void MigrateAndBuild(string groupName, string projectName, [CallerMemberName] string callingMethod = "", string identifier = "") @@ -257,11 +256,10 @@ namespace Microsoft.DotNet.Migration.Tests .Execute($"restore \"{solutionRelPath}\"") .Should().Pass(); - //ISSUE: https://github.com/dotnet/cli/issues/5205 - //new DotnetCommand() - // .WithWorkingDirectory(projectDirectory) - // .Execute($"build \"{solutionRelPath}\"") - // .Should().Pass(); + new DotnetCommand() + .WithWorkingDirectory(projectDirectory) + .Execute($"build \"{solutionRelPath}\"") + .Should().Pass(); SlnFile slnFile = SlnFile.Read(Path.Combine(projectDirectory.FullName, solutionRelPath)); diff --git a/test/dotnet-sln-add.Tests/GivenDotnetSlnAdd.cs b/test/dotnet-sln-add.Tests/GivenDotnetSlnAdd.cs index 740fd6d76..ecf64be5b 100644 --- a/test/dotnet-sln-add.Tests/GivenDotnetSlnAdd.cs +++ b/test/dotnet-sln-add.Tests/GivenDotnetSlnAdd.cs @@ -452,11 +452,10 @@ EndGlobal cmd.StdErr.Should().BeEmpty(); } - //ISSUE: https://github.com/dotnet/cli/issues/5205 - //[Theory] - //[InlineData("TestAppWithSlnAndCsprojFiles")] - //[InlineData("TestAppWithSlnAndCsprojProjectGuidFiles")] - //[InlineData("TestAppWithEmptySln")] + [Theory] + [InlineData("TestAppWithSlnAndCsprojFiles")] + [InlineData("TestAppWithSlnAndCsprojProjectGuidFiles")] + [InlineData("TestAppWithEmptySln")] public void WhenValidProjectIsPassedTheSlnBuilds(string testAsset) { var projectDirectory = TestAssets From aefdb22ae4cb60c41b9ca967ed42375954411e6e Mon Sep 17 00:00:00 2001 From: Justin Goshi Date: Fri, 17 Feb 2017 17:02:15 -0800 Subject: [PATCH 02/20] Shorten test folder name --- .../TestApp/Program.cs | 0 .../TestApp/TestApp.sln | 0 .../TestApp/TestApp.xproj | 0 .../TestApp/project.json | 0 .../TestApp/src/subdir/Helper.cs | 0 .../TestApp/src/subdir/subdir.csproj | 0 .../TestLibrary/Helper.cs | 0 .../TestLibrary/TestLibrary.xproj | 0 .../TestLibrary/project.json | 0 test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs | 2 +- 10 files changed, 1 insertion(+), 1 deletion(-) rename TestAssets/NonRestoredTestProjects/{PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj => PJAppWithSlnThatDoesNotRefCsproj}/TestApp/Program.cs (100%) rename TestAssets/NonRestoredTestProjects/{PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj => PJAppWithSlnThatDoesNotRefCsproj}/TestApp/TestApp.sln (100%) rename TestAssets/NonRestoredTestProjects/{PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj => PJAppWithSlnThatDoesNotRefCsproj}/TestApp/TestApp.xproj (100%) rename TestAssets/NonRestoredTestProjects/{PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj => PJAppWithSlnThatDoesNotRefCsproj}/TestApp/project.json (100%) rename TestAssets/NonRestoredTestProjects/{PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj => PJAppWithSlnThatDoesNotRefCsproj}/TestApp/src/subdir/Helper.cs (100%) rename TestAssets/NonRestoredTestProjects/{PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj => PJAppWithSlnThatDoesNotRefCsproj}/TestApp/src/subdir/subdir.csproj (100%) rename TestAssets/NonRestoredTestProjects/{PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj => PJAppWithSlnThatDoesNotRefCsproj}/TestLibrary/Helper.cs (100%) rename TestAssets/NonRestoredTestProjects/{PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj => PJAppWithSlnThatDoesNotRefCsproj}/TestLibrary/TestLibrary.xproj (100%) rename TestAssets/NonRestoredTestProjects/{PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj => PJAppWithSlnThatDoesNotRefCsproj}/TestLibrary/project.json (100%) diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/Program.cs b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/Program.cs similarity index 100% rename from TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/Program.cs rename to TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/Program.cs diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/TestApp.sln b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/TestApp.sln similarity index 100% rename from TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/TestApp.sln rename to TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/TestApp.sln diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/TestApp.xproj b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/TestApp.xproj similarity index 100% rename from TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/TestApp.xproj rename to TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/TestApp.xproj diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/project.json similarity index 100% rename from TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/project.json rename to TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/project.json diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/src/subdir/Helper.cs b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/src/subdir/Helper.cs similarity index 100% rename from TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/src/subdir/Helper.cs rename to TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/src/subdir/Helper.cs diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/src/subdir/subdir.csproj b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/src/subdir/subdir.csproj similarity index 100% rename from TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/src/subdir/subdir.csproj rename to TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/src/subdir/subdir.csproj diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestLibrary/Helper.cs b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestLibrary/Helper.cs similarity index 100% rename from TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestLibrary/Helper.cs rename to TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestLibrary/Helper.cs diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestLibrary/TestLibrary.xproj b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestLibrary/TestLibrary.xproj similarity index 100% rename from TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestLibrary/TestLibrary.xproj rename to TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestLibrary/TestLibrary.xproj diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestLibrary/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestLibrary/project.json similarity index 100% rename from TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestLibrary/project.json rename to TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestLibrary/project.json diff --git a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs index 622f0b27f..30387fecc 100644 --- a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs +++ b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs @@ -95,7 +95,7 @@ namespace Microsoft.DotNet.Migration.Tests { MigrateAndBuild( "NonRestoredTestProjects", - "PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj"); + "PJAppWithSlnThatDoesNotRefCsproj"); } [Fact] From e145ca88e4e02f8da1e400825caa8a4c1d90cfd8 Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Wed, 15 Feb 2017 20:38:25 -0800 Subject: [PATCH 03/20] 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 ccf46468cffeb0efaff57de62ad08c2f7453cc5f Mon Sep 17 00:00:00 2001 From: Nate Amundson Date: Tue, 21 Feb 2017 18:35:56 -0600 Subject: [PATCH 04/20] Update badges for build status --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e825c7b35..bde9f52a7 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ Build Status |Ubuntu 14.04 / Linux Mint 17 |Ubuntu 16.04 |Debian 8.2 |Windows x64 |Windows x86 |Mac OS X |CentOS 7.1 / Oracle Linux 7.1 |RHEL 7.2 |OpenSUSE 13.2 |Fedora 23| |:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:| -|[![](https://mseng.visualstudio.com/_apis/public/build/definitions/d09b7a4d-0a51-4c0e-a15a-07921d5b558f/3132/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3132)|[![](https://mseng.visualstudio.com/_apis/public/build/definitions/d09b7a4d-0a51-4c0e-a15a-07921d5b558f/3618/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3618)|[![](https://mseng.visualstudio.com/_apis/public/build/definitions/d09b7a4d-0a51-4c0e-a15a-07921d5b558f/3271/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3271)|[![](https://mseng.visualstudio.com/_apis/public/build/definitions/d09b7a4d-0a51-4c0e-a15a-07921d5b558f/3022/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3022)|[![](https://mseng.visualstudio.com/_apis/public/build/definitions/d09b7a4d-0a51-4c0e-a15a-07921d5b558f/3071/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3071)|[![](https://mseng.visualstudio.com/_apis/public/build/definitions/d09b7a4d-0a51-4c0e-a15a-07921d5b558f/3397/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3397)|[![](https://mseng.visualstudio.com/_apis/public/build/definitions/d09b7a4d-0a51-4c0e-a15a-07921d5b558f/3257/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3257)|[![](https://mseng.visualstudio.com/_apis/public/build/definitions/d09b7a4d-0a51-4c0e-a15a-07921d5b558f/3256/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3256)|[![](https://mseng.visualstudio.com/_apis/public/build/definitions/d09b7a4d-0a51-4c0e-a15a-07921d5b558f/3626/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3626)|[![](https://mseng.visualstudio.com/_apis/public/build/definitions/d09b7a4d-0a51-4c0e-a15a-07921d5b558f/3623/badge)](https://mseng.visualstudio.com/dotnetcore/_build?_a=completed&definitionId=3623)| +|[![](https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5467/badge)](https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5467)|[![](https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5468/badge)](https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5468)|[![](https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5462/badge)](https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5462)|[![](https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5469/badge)](https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5469)|[![](https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5470/badge)](https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5470)|[![](https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5465/badge)](https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5465)|[![](https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5461/badge)](https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5461)|[![](https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5466/badge)](https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5466)|[![](https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5464/badge)](https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5464)|[![](https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5463/badge)](https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5463)| Installers and Binaries ----------------------- From 7a84c47d97f59a8b7361f0c643feb2fed2cb7de6 Mon Sep 17 00:00:00 2001 From: Piotr Puszkiewicz Date: Tue, 21 Feb 2017 16:40:12 -0800 Subject: [PATCH 05/20] Update CLI branding --- build/Microsoft.DotNet.Cli.Monikers.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/Microsoft.DotNet.Cli.Monikers.props b/build/Microsoft.DotNet.Cli.Monikers.props index 615cbc0c7..ad22a6d72 100644 --- a/build/Microsoft.DotNet.Cli.Monikers.props +++ b/build/Microsoft.DotNet.Cli.Monikers.props @@ -1,12 +1,12 @@ - Microsoft .NET Core 1.0.3 - SDK - Microsoft .NET Core 1.0.3 - Runtime + .NET Core SDK 1.0.0 ($(Architecture)) Installer + Microsoft .NET Core 1.0.4 - Runtime Microsoft .NET Core 1.1.0 - Host Microsoft .NET Core 1.1.0 - Host FX Resolver - Microsoft .NET Core 1.1.0 - Runtime + Microsoft .NET Core 1.1.1 - Runtime Microsoft .NET Core 1.1.0 - Host Microsoft .NET Core 1.1.0 - Host FX Resolver From 0aa4e83cb8bcc7811aaed04eb1cf61533fb46d02 Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Tue, 21 Feb 2017 17:10:53 -0800 Subject: [PATCH 06/20] 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 07/20] 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 08/20] 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 09/20] 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 10/20] 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 11/20] 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 19:56:57 +0530 Subject: [PATCH 12/20] Update TestPlatform to v15.0.0-preview-20170222-09. --- 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 df8667514..a10406482 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -7,7 +7,7 @@ 1.0.0-alpha-20170217-2 4.0.0-rtm-2283 1.0.0-alpha-20170130-3-281 - 15.0.0-preview-20170217-05 + 15.0.0-preview-20170222-09 1.0.0-beta1-20170202-111 1.0.0-beta1-20170206-112 1.1.1 From 0a242633ca77021b99d3a90d8dffc9f427467fba Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Wed, 22 Feb 2017 11:15:43 -0800 Subject: [PATCH 13/20] 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 14/20] 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 From 523935f3fe2a723c1ea0fdfa8f732f532fd343d4 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 22 Feb 2017 10:49:15 -0800 Subject: [PATCH 15/20] Updating packages for migration to new LTS versions. --- .../dotnet-supported-package-versions.csv | 219 +++++++++--------- 1 file changed, 114 insertions(+), 105 deletions(-) diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/dotnet-supported-package-versions.csv b/src/Microsoft.DotNet.ProjectJsonMigration/dotnet-supported-package-versions.csv index 6cd457775..7896b482d 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/dotnet-supported-package-versions.csv +++ b/src/Microsoft.DotNet.ProjectJsonMigration/dotnet-supported-package-versions.csv @@ -1,80 +1,88 @@ Id,LtsVersion,CurrentVersion -Microsoft.NETCore.App,1.0.3,1.1.0 -Microsoft.AspNetCore,1.0.3,1.1.0 -Microsoft.AspNetCore.Authentication,1.0.1,1.1.0 -Microsoft.AspNetCore.Authentication.Cookies,1.0.1,1.1.0 -Microsoft.AspNetCore.Authentication.Facebook,1.0.1,1.1.0 -Microsoft.AspNetCore.Authentication.Google,1.0.1,1.1.0 -Microsoft.AspNetCore.Authentication.JwtBearer,1.0.1,1.1.0 -Microsoft.AspNetCore.Authentication.MicrosoftAccount,1.0.1,1.1.0 -Microsoft.AspNetCore.Authentication.OAuth,1.0.1,1.1.0 -Microsoft.AspNetCore.Authentication.OpenIdConnect,1.0.1,1.1.0 -Microsoft.AspNetCore.Authentication.Twitter,1.0.1,1.1.0 -Microsoft.AspNetCore.CookiePolicy,1.0.1,1.1.0 -Microsoft.AspNetCore.Cors,1.0.1,1.1.0 -Microsoft.AspNetCore.DataProtection,1.0.1,1.1.0 -Microsoft.AspNetCore.DataProtection.Extensions,1.0.1,1.1.0 -Microsoft.AspNetCore.DataProtection.SystemWeb,1.0.1,1.1.0 -Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore,1.0.1,1.1.0 -Microsoft.AspNetCore.Hosting.WindowsServices,1.0.1,1.1.0 -Microsoft.AspNetCore.Html.Abstractions,1.0.1,1.1.0 -Microsoft.AspNetCore.Identity.EntityFrameworkCore,1.0.1,1.1.0 -Microsoft.AspNetCore.MiddlewareAnalysis,1.0.1,1.1.0 -Microsoft.AspNetCore.Mvc,1.0.2,1.1.0 -Microsoft.AspNetCore.Mvc.Abstractions,1.0.2,1.1.0 -Microsoft.AspNetCore.Mvc.ApiExplorer,1.0.2,1.1.0 -Microsoft.AspNetCore.Mvc.Formatters.Xml,1.0.2,1.1.0 -Microsoft.AspNetCore.Mvc.WebApiCompatShim,1.0.2,1.1.0 -Microsoft.AspNetCore.Owin,1.0.1,1.1.0 -Microsoft.AspNetCore.Routing,1.0.2,1.1.0 -Microsoft.AspNetCore.Routing.Abstractions,1.0.2,1.1.0 -Microsoft.AspNetCore.Server.Kestrel.Https,1.0.2,1.1.0 -Microsoft.AspNetCore.Session,1.0.1,1.1.0 -Microsoft.AspNetCore.StaticFiles,1.0.1,1.1.0 -Microsoft.AspNetCore.TestHost,1.0.1,1.1.0 +Microsoft.NETCore.App,1.0.4,1.1.0 +Microsoft.AspNetCore,1.0.4,1.1.0 +Microsoft.AspNetCore.Authentication,1.0.2,1.1.0 +Microsoft.AspNetCore.Authentication.Cookies,1.0.2,1.1.0 +Microsoft.AspNetCore.Authentication.Facebook,1.0.2,1.1.0 +Microsoft.AspNetCore.Authentication.Google,1.0.1,2.1.0 +Microsoft.AspNetCore.Authentication.JwtBearer,1.0.2,1.1.0 +Microsoft.AspNetCore.Authentication.MicrosoftAccount,1.0.2,1.1.0 +Microsoft.AspNetCore.Authentication.OAuth,1.0.2,1.1.0 +Microsoft.AspNetCore.Authentication.OpenIdConnect,1.0.2,1.1.0 +Microsoft.AspNetCore.Authentication.Twitter,1.0.2,1.1.0 +Microsoft.AspNetCore.Buffering,0.1.2,0.1.2 +Microsoft.AspNetCore.CookiePolicy,1.0.2,1.1.0 +Microsoft.AspNetCore.Cors,1.0.2,1.1.0 +Microsoft.AspNetCore.DataProtection,1.0.2,1.1.0 +Microsoft.AspNetCore.DataProtection.Extensions,1.0.2,1.1.0 +Microsoft.AspNetCore.DataProtection.SystemWeb,1.0.2,1.1.0 +Microsoft.AspNetCore.DataProtection.Sources,1.0.2,1.1.0 +Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore,1.0.2,1.1.0 +Microsoft.AspNetCore.Diagnostics.Elm,0.1.2,0.1.2 +Microsoft.AspNetCore.Hosting.WindowsServices,1.0.2,1.1.0 +Microsoft.AspNetCore.Html.Abstractions,1.0.2,1.1.0 +Microsoft.AspNetCore.Identity.EntityFrameworkCore,1.0.2,1.1.0 +Microsoft.AspNetCore.MiddlewareAnalysis,1.0.2,1.1.0 +Microsoft.AspNetCore.Mvc,1.0.3,1.1.0 +Microsoft.AspNetCore.Mvc.Abstractions,1.0.3,1.1.0 +Microsoft.AspNetCore.Mvc.ApiExplorer,1.0.3,1.1.0 +Microsoft.AspNetCore.Mvc.Formatters.Xml,1.0.3,1.1.0 +Microsoft.AspNetCore.Mvc.WebApiCompatShim,1.0.3,1.1.0 +Microsoft.AspNetCore.Owin,1.0.2,1.1.0 +Microsoft.AspNetCore.Routing,1.0.3,1.1.0 +Microsoft.AspNetCore.Routing.Abstractions,1.0.3,1.1.0 +Microsoft.AspNetCore.Routing.DecisionTree.Sources,1.0.3,1.1.0 +Microsoft.AspNetCore.Server.Kestrel.Https,1.0.3,1.1.0 +Microsoft.AspNetCore.Server.WebListener,1.0.2,1.1.0 +Microsoft.AspNetCore.Session,1.0.2,1.1.0 +Microsoft.AspNetCore.StaticFiles,1.0.2,1.1.0 +Microsoft.AspNetCore.TestHost,1.0.2,1.1.0 +Microsoft.AspNetCore.Testing,1.0.1,1.1.0 +Microsoft.AspNetCore.DiagnosticsViewPage.Sources,1.0.2,1.1.0 Microsoft.Data.Sqlite,1.0.1,1.1.0 -Microsoft.EntityFrameworkCore,1.0.2,1.1.0 -Microsoft.EntityFrameworkCore.Design,1.0.2,1.1.0 -Microsoft.EntityFrameworkCore.InMemory,1.0.2,1.1.0 -Microsoft.EntityFrameworkCore.Relational,1.0.2,1.1.0 -Microsoft.EntityFrameworkCore.Relational.Design,1.0.2,1.1.0 -Microsoft.EntityFrameworkCore.Sqlite,1.0.2,1.1.0 -Microsoft.EntityFrameworkCore.Sqlite.Design,1.0.2,1.1.0 -Microsoft.EntityFrameworkCore.SqlServer,1.0.2,1.1.0 -Microsoft.EntityFrameworkCore.SqlServer.Design,1.0.2,1.1.0 -Microsoft.Extensions.Caching.Memory,1.0.1,1.1.0 -Microsoft.Extensions.Caching.Redis,1.0.1,1.1.0 -Microsoft.Extensions.Caching.SqlServer,1.0.1,1.1.0 +Microsoft.EntityFrameworkCore,1.0.3,1.1.0 +Microsoft.EntityFrameworkCore.Design,1.0.3,1.1.0 +Microsoft.EntityFrameworkCore.InMemory,1.0.3,1.1.0 +Microsoft.EntityFrameworkCore.Relational,1.0.3,1.1.0 +Microsoft.EntityFrameworkCore.Relational.Design,1.0.3,1.1.0 +Microsoft.EntityFrameworkCore.Sqlite,1.0.3,1.1.0 +Microsoft.EntityFrameworkCore.Sqlite.Design,1.0.3,1.1.0 +Microsoft.EntityFrameworkCore.SqlServer,1.0.3,1.1.0 +Microsoft.EntityFrameworkCore.SqlServer.Design,1.0.3,1.1.0 +Microsoft.Extensions.Caching.Memory,1.0.2,1.1.0 +Microsoft.Extensions.Caching.Redis,1.0.2,1.1.0 +Microsoft.Extensions.Caching.SqlServer,1.0.2,1.1.0 Microsoft.Extensions.CommandLineUtils,1.0.1,1.1.0 -Microsoft.Extensions.Configuration,1.0.1,1.1.0 -Microsoft.Extensions.Configuration.Binder,1.0.1,1.1.0 -Microsoft.Extensions.Configuration.CommandLine,1.0.1,1.1.0 -Microsoft.Extensions.Configuration.EnvironmentVariables,1.0.1,1.1.0 -Microsoft.Extensions.Configuration.FileExtensions,1.0.1,1.1.0 -Microsoft.Extensions.Configuration.Ini,1.0.1,1.1.0 -Microsoft.Extensions.Configuration.Json,1.0.1,1.1.0 -Microsoft.Extensions.Configuration.UserSecrets,1.0.1,1.1.0 -Microsoft.Extensions.Configuration.Xml,1.0.1,1.1.0 -Microsoft.Extensions.DependencyInjection,1.0.1,1.1.0 -Microsoft.Extensions.DiagnosticAdapter,1.0.1,1.1.0 +Microsoft.Extensions.Configuration,1.0.2,1.1.0 +Microsoft.Extensions.Configuration.Binder,1.0.2,1.1.0 +Microsoft.Extensions.Configuration.CommandLine,1.0.2,1.1.0 +Microsoft.Extensions.Configuration.EnvironmentVariables,1.0.2,1.1.0 +Microsoft.Extensions.Configuration.FileExtensions,1.0.2,1.1.0 +Microsoft.Extensions.Configuration.Ini,1.0.2,1.1.0 +Microsoft.Extensions.Configuration.Json,1.0.2,1.1.0 +Microsoft.Extensions.Configuration.UserSecrets,1.0.2,1.1.0 +Microsoft.Extensions.Configuration.Xml,1.0.2,1.1.0 +Microsoft.Extensions.DependencyInjection,1.0.2,1.1.0 +Microsoft.Extensions.DiagnosticAdapter,1.0.2,1.1.0 Microsoft.Extensions.FileProviders.Composite,1.0.1,1.1.0 Microsoft.Extensions.FileProviders.Embedded,1.0.1,1.1.0 Microsoft.Extensions.FileProviders.Physical,1.0.1,1.1.0 Microsoft.Extensions.FileSystemGlobbing,1.0.1,1.1.0 -Microsoft.Extensions.Globalization.CultureInfoCache,1.0.1,1.1.0 -Microsoft.Extensions.Localization,1.0.1,1.1.0 -Microsoft.Extensions.Logging,1.0.1,1.1.0 -Microsoft.Extensions.Logging.Console,1.0.1,1.1.0 -Microsoft.Extensions.Logging.Debug,1.0.1,1.1.0 -Microsoft.Extensions.Logging.Filter,1.0.1,1.1.0 -Microsoft.Extensions.Logging.TraceSource,1.0.1,1.1.0 +Microsoft.Extensions.Globalization.CultureInfoCache,1.0.2,1.1.0 +Microsoft.Extensions.Localization,1.0.2,1.1.0 +Microsoft.Extensions.Logging,1.0.2,1.1.0 +Microsoft.Extensions.Logging.Console,1.0.2,1.1.0 +Microsoft.Extensions.Logging.Debug,1.0.2,1.1.0 +Microsoft.Extensions.Logging.Filter,1.0.2,1.1.0 +Microsoft.Extensions.Logging.TraceSource,1.0.2,1.1.0 +Microsoft.Extensions.Logging.EventLog,1.0.2,1.1.0 Microsoft.VisualStudio.Web.BrowserLink,1.0.0,1.0.0 -Microsoft.VisualStudio.Web.BrowserLink.Loader,14.0.1,14.1.0 +Microsoft.VisualStudio.Web.BrowserLink.Loader,14.0.2,14.1.0 Microsoft.AspNetCore.AzureAppServicesIntegration,,1.0.0 Microsoft.AspNetCore.DataProtection.AzureStorage,,1.0.0 Microsoft.AspNetCore.Localization.Routing,,1.1.0 Microsoft.AspNetCore.Rewrite,,1.0.0 -Microsoft.AspNetCore.ResponseCaching,,1.1.0 +Microsoft.AspNetCore.ResponseCaching,1.0.1,1.1.0 Microsoft.AspNetCore.ResponseCompression,,1.0.0 Microsoft.AspNetCore.WebSockets,,1.0.0 Microsoft.Extensions.Logging.AzureAppServices,,1.0.0 @@ -87,37 +95,37 @@ System.ServiceModel.Security,4.0.1,4.3.0 Libuv,1.9.1,1.9.1 Microsoft.AspNet.WebApi.Client,5.2.2,5.2.2 Microsoft.AspNetCore.Antiforgery,1.0.2,1.1.0 -Microsoft.AspNetCore.Authorization,1.0.1,1.1.0 -Microsoft.AspNetCore.Cryptography.Internal,1.0.1,1.1.0 -Microsoft.AspNetCore.Cryptography.KeyDerivation,1.0.1,1.1.0 -Microsoft.AspNetCore.DataProtection.Abstractions,1.0.1,1.1.0 -Microsoft.AspNetCore.Diagnostics,1.0.1,1.1.0 -Microsoft.AspNetCore.Diagnostics.Abstractions,1.0.1,1.1.0 -Microsoft.AspNetCore.Hosting,1.0.1,1.1.0 -Microsoft.AspNetCore.Hosting.Abstractions,1.0.1,1.1.0 -Microsoft.AspNetCore.Hosting.Server.Abstractions,1.0.1,1.1.0 -Microsoft.AspNetCore.Http,1.0.1,1.1.0 -Microsoft.AspNetCore.Http.Abstractions,1.0.1,1.1.0 -Microsoft.AspNetCore.Http.Extensions,1.0.1,1.1.0 -Microsoft.AspNetCore.Http.Features,1.0.1,1.1.0 -Microsoft.AspNetCore.HttpOverrides,1.0.1,1.1.0 -Microsoft.AspNetCore.Identity,1.0.1,1.1.0 +Microsoft.AspNetCore.Authorization,1.0.2,1.1.0 +Microsoft.AspNetCore.Cryptography.Internal,1.0.2,1.1.0 +Microsoft.AspNetCore.Cryptography.KeyDerivation,1.0.2,1.1.0 +Microsoft.AspNetCore.DataProtection.Abstractions,1.0.2,1.1.0 +Microsoft.AspNetCore.Diagnostics,1.0.2,1.1.0 +Microsoft.AspNetCore.Diagnostics.Abstractions,1.0.2,1.1.0 +Microsoft.AspNetCore.Hosting,1.0.2,1.1.0 +Microsoft.AspNetCore.Hosting.Abstractions,1.0.2,1.1.0 +Microsoft.AspNetCore.Hosting.Server.Abstractions,1.0.2,1.1.0 +Microsoft.AspNetCore.Http,1.0.2,1.1.0 +Microsoft.AspNetCore.Http.Abstractions,1.0.2,1.1.0 +Microsoft.AspNetCore.Http.Extensions,1.0.2,1.1.0 +Microsoft.AspNetCore.Http.Features,1.0.2,1.1.0 +Microsoft.AspNetCore.HttpOverrides,1.0.2,1.1.0 +Microsoft.AspNetCore.Identity,1.0.2,1.1.0 Microsoft.AspNetCore.JsonPatch,1.0.0,1.1.0 -Microsoft.AspNetCore.Localization,1.0.1,1.1.0 -Microsoft.AspNetCore.Mvc.Core,1.0.2,1.1.0 -Microsoft.AspNetCore.Mvc.Cors,1.0.2,1.1.0 -Microsoft.AspNetCore.Mvc.DataAnnotations,1.0.2,1.1.0 -Microsoft.AspNetCore.Mvc.Formatters.Json,1.0.2,1.1.0 -Microsoft.AspNetCore.Mvc.Localization,1.0.2,1.1.0 -Microsoft.AspNetCore.Mvc.Razor,1.0.2,1.1.0 -Microsoft.AspNetCore.Mvc.Razor.Host,1.0.2,1.1.0 -Microsoft.AspNetCore.Mvc.TagHelpers,1.0.2,1.1.0 -Microsoft.AspNetCore.Mvc.ViewFeatures,1.0.2,1.1.0 -Microsoft.AspNetCore.Razor,1.0.1,1.1.0 -Microsoft.AspNetCore.Razor.Runtime,1.0.1,1.1.0 -Microsoft.AspNetCore.Server.IISIntegration,1.0.1,1.1.0 -Microsoft.AspNetCore.Server.Kestrel,1.0.2,1.1.0 -Microsoft.AspNetCore.WebUtilities,1.0.1,1.1.0 +Microsoft.AspNetCore.Localization,1.0.2,1.1.0 +Microsoft.AspNetCore.Mvc.Core,1.0.3,1.1.0 +Microsoft.AspNetCore.Mvc.Cors,1.0.3,1.1.0 +Microsoft.AspNetCore.Mvc.DataAnnotations,1.0.3,1.1.0 +Microsoft.AspNetCore.Mvc.Formatters.Json,1.0.3,1.1.0 +Microsoft.AspNetCore.Mvc.Localization,1.0.3,1.1.0 +Microsoft.AspNetCore.Mvc.Razor,1.0.3,1.1.0 +Microsoft.AspNetCore.Mvc.Razor.Host,1.0.3,1.1.0 +Microsoft.AspNetCore.Mvc.TagHelpers,1.0.3,1.1.0 +Microsoft.AspNetCore.Mvc.ViewFeatures,1.0.3,1.1.0 +Microsoft.AspNetCore.Razor,1.0.2,1.1.0 +Microsoft.AspNetCore.Razor.Runtime,1.0.2,1.1.0 +Microsoft.AspNetCore.Server.IISIntegration,1.0.2,1.1.0 +Microsoft.AspNetCore.Server.Kestrel,1.0.3,1.1.0 +Microsoft.AspNetCore.WebUtilities,1.0.2,1.1.0 Microsoft.Bcl,1.1.9,1.1.9 Microsoft.Bcl.Build,1.0.14,1.0.14 Microsoft.CodeAnalysis.Analyzers,1.1.0,1.1.0 @@ -126,25 +134,26 @@ Microsoft.CodeAnalysis.CSharp,1.3.0,1.3.0 Microsoft.CodeAnalysis.VisualBasic,1.3.0,1.3.0 Microsoft.CSharp,4.0.1,4.3.0 Microsoft.DotNet.InternalAbstractions,1.0.0, -Microsoft.Extensions.Caching.Abstractions,1.0.1,1.1.0 -Microsoft.Extensions.Configuration.Abstractions,1.0.1,1.1.0 -Microsoft.Extensions.DependencyInjection.Abstractions,1.0.1,1.1.0 +Microsoft.Extensions.Caching.Abstractions,1.0.2,1.1.0 +Microsoft.Extensions.Configuration.Abstractions,1.0.2,1.1.0 +Microsoft.Extensions.DependencyInjection.Abstractions,1.0.2,1.1.0 Microsoft.Extensions.DependencyModel,1.0.0,1.1.0 Microsoft.Extensions.FileProviders.Abstractions,1.0.1,1.1.0 -Microsoft.Extensions.Localization.Abstractions,1.0.1,1.1.0 -Microsoft.Extensions.Logging.Abstractions,1.0.1,1.1.0 +Microsoft.Extensions.Localization.Abstractions,1.0.2,1.1.0 +Microsoft.Extensions.Logging.Abstractions,1.0.2,1.1.0 Microsoft.Extensions.ObjectPool,1.0.1,1.1.0 -Microsoft.Extensions.Options,1.0.1,1.1.0 -Microsoft.Extensions.Options.ConfigurationExtensions,1.0.1,1.1.0 +Microsoft.Extensions.Options,1.0.2,1.1.0 +Microsoft.Extensions.Options.ConfigurationExtensions,1.0.2,1.1.0 Microsoft.Extensions.PlatformAbstractions,1.0.0,1.1.0 Microsoft.Extensions.Primitives,1.0.1,1.1.0 -Microsoft.Extensions.WebEncoders,1.0.1,1.1.0 +Microsoft.Extensions.WebEncoders,1.0.2,1.1.0 Microsoft.IdentityModel.Logging,1.0.0,1.1.0 Microsoft.IdentityModel.Protocols,2.0.0,2.1.0 Microsoft.IdentityModel.Protocols.OpenIdConnect,2.0.0,2.1.0 Microsoft.IdentityModel.Tokens,5.0.0,5.1.0 Microsoft.Net.Http,2.2.22,2.2.22 -Microsoft.Net.Http.Headers,1.0.1,1.1.0 +Microsoft.Net.Http.Headers,1.0.2,1.1.0 +Microsoft.Net.Http.Server,1.0.2,1.1.0 Microsoft.NETCore.DotNetHost,1.0.1,1.1.0 Microsoft.NETCore.DotNetHostPolicy,1.0.3,1.1.0 Microsoft.NETCore.DotNetHostResolver,1.0.1,1.1.0 @@ -275,7 +284,7 @@ System.Xml.XmlDocument,4.0.1,4.3.0 System.Xml.XmlSerializer,4.0.11,4.3.0 System.Xml.XPath,4.0.1,4.0.1 System.Xml.XPath.XDocument,4.0.1,4.0.1 -Microsoft.AspNetCore.ResponseCaching.Abstractions,,1.1.0 +Microsoft.AspNetCore.ResponseCaching.Abstractions,1.0.1,1.1.0 Microsoft.Azure.KeyVault,,2.0.2-preview Microsoft.Azure.KeyVault.WebKey,,2.0.0-preview Microsoft.Data.Edm,,5.6.4 From 3701b94c321a5a6ba190b6c6900ca4157762d5cd Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 22 Feb 2017 14:49:49 -0800 Subject: [PATCH 16/20] Updating the FTS versions of packages. Started uplifting FTS packages. And migration BrowserLink.Loader to BrowserLink. --- .../ConstantPackageVersions.cs | 4 +- ...tnetSupportedPackageVersionsCsvProvider.cs | 17 ++ .../MigratePackageDependenciesAndToolsRule.cs | 2 + .../SupportedPackageVersions.cs | 24 ++ .../dotnet-supported-package-versions.csv | 244 +++++++++--------- ...enThatIWantToMigratePackageDependencies.cs | 6 +- ...igratePackagesToTheirLTSAndFTSVersions.cs} | 51 +++- .../Rules/GivenThatIWantToMigrateTools.cs | 5 + 8 files changed, 218 insertions(+), 135 deletions(-) rename test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/{GivenThatIWantToMigratePackagesToTheirLTSVersions.cs => GivenThatIWantToMigratePackagesToTheirLTSAndFTSVersions.cs} (82%) diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/ConstantPackageVersions.cs b/src/Microsoft.DotNet.ProjectJsonMigration/ConstantPackageVersions.cs index bb86cd1c3..973b3008a 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/ConstantPackageVersions.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/ConstantPackageVersions.cs @@ -7,8 +7,8 @@ namespace Microsoft.DotNet.ProjectJsonMigration { public const string AspNetToolsVersion = "1.0.0"; public const string AspNet110ToolsVersion = "1.1.0"; - public const string AspNetLTSPackagesVersion = "1.0.2"; - public const string EntityFrameworkLTSPackagesVersion = "1.0.2"; + public const string AspNetLTSPackagesVersion = "1.0.3"; + public const string EntityFrameworkLTSPackagesVersion = "1.0.3"; public const string TestSdkPackageVersion = "15.0.0-preview-20170106-08"; public const string XUnitPackageVersion = "2.2.0-beta5-build3474"; public const string XUnitRunnerPackageVersion = "2.2.0-beta5-build1225"; diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/DotnetSupportedPackageVersionsCsvProvider.cs b/src/Microsoft.DotNet.ProjectJsonMigration/DotnetSupportedPackageVersionsCsvProvider.cs index 8f2fe2bc7..53937454b 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/DotnetSupportedPackageVersionsCsvProvider.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/DotnetSupportedPackageVersionsCsvProvider.cs @@ -23,6 +23,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration var values = line.Split(','); var packageName = values[0]; var ltsVersion = values[1]; + var ftsVersion = values[2]; if (HasVersion(ltsVersion)) { @@ -38,6 +39,22 @@ namespace Microsoft.DotNet.ProjectJsonMigration Version = ltsVersion }); } + + if(HasVersion(ftsVersion)) + { + var version = HasVersion(ltsVersion) ? $"({ltsVersion},{ftsVersion})" : $"[,{ftsVersion})"; + projectDependenciesPackages.Add( + new PackageDependencyInfo + { + Name = packageName, + Version = version + }, + new PackageDependencyInfo + { + Name = packageName, + Version = ftsVersion + }); + } } } } diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigratePackageDependenciesAndToolsRule.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigratePackageDependenciesAndToolsRule.cs index f95260149..6c0a8edc7 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigratePackageDependenciesAndToolsRule.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigratePackageDependenciesAndToolsRule.cs @@ -297,6 +297,8 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Rules var possibleMappings = dependencyToVersionMap.Where(c => c.Key.Name.Equals(name, StringComparison.OrdinalIgnoreCase)); + var a = string.Join(",", possibleMappings.Select(c => $"{c.Key.Name},{c.Key.Version}")); + Console.WriteLine($"POSSIBLE MAPPINGS = {a}"); if (possibleMappings.Any() && !string.IsNullOrEmpty(version)) { var possibleVersions = possibleMappings.Select(p => VersionRange.Parse(p.Key.Version)); diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/SupportedPackageVersions.cs b/src/Microsoft.DotNet.ProjectJsonMigration/SupportedPackageVersions.cs index 511763603..6b3f5f6ff 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/SupportedPackageVersions.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/SupportedPackageVersions.cs @@ -188,6 +188,30 @@ namespace Microsoft.DotNet.ProjectJsonMigration Version = ConstantPackageVersions.AspNetToolsVersion } }, + { + new PackageDependencyInfo + { + Name = "Microsoft.VisualStudio.Web.BrowserLink.Loader", + Version = "[1.1.0-*,)" + }, + new PackageDependencyInfo + { + Name = "Microsoft.VisualStudio.Web.BrowserLink", + Version = "1.1.0" + } + }, + { + new PackageDependencyInfo + { + Name = "Microsoft.VisualStudio.Web.BrowserLink.Loader", + Version = "[1.0.0-*,1.1.0)" + }, + new PackageDependencyInfo + { + Name = "Microsoft.VisualStudio.Web.BrowserLink", + Version = "1.0.1" + } + }, { new PackageDependencyInfo { diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/dotnet-supported-package-versions.csv b/src/Microsoft.DotNet.ProjectJsonMigration/dotnet-supported-package-versions.csv index 7896b482d..bf27080ed 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/dotnet-supported-package-versions.csv +++ b/src/Microsoft.DotNet.ProjectJsonMigration/dotnet-supported-package-versions.csv @@ -1,131 +1,131 @@ Id,LtsVersion,CurrentVersion -Microsoft.NETCore.App,1.0.4,1.1.0 -Microsoft.AspNetCore,1.0.4,1.1.0 -Microsoft.AspNetCore.Authentication,1.0.2,1.1.0 -Microsoft.AspNetCore.Authentication.Cookies,1.0.2,1.1.0 -Microsoft.AspNetCore.Authentication.Facebook,1.0.2,1.1.0 -Microsoft.AspNetCore.Authentication.Google,1.0.1,2.1.0 -Microsoft.AspNetCore.Authentication.JwtBearer,1.0.2,1.1.0 -Microsoft.AspNetCore.Authentication.MicrosoftAccount,1.0.2,1.1.0 -Microsoft.AspNetCore.Authentication.OAuth,1.0.2,1.1.0 -Microsoft.AspNetCore.Authentication.OpenIdConnect,1.0.2,1.1.0 -Microsoft.AspNetCore.Authentication.Twitter,1.0.2,1.1.0 -Microsoft.AspNetCore.Buffering,0.1.2,0.1.2 -Microsoft.AspNetCore.CookiePolicy,1.0.2,1.1.0 -Microsoft.AspNetCore.Cors,1.0.2,1.1.0 -Microsoft.AspNetCore.DataProtection,1.0.2,1.1.0 -Microsoft.AspNetCore.DataProtection.Extensions,1.0.2,1.1.0 -Microsoft.AspNetCore.DataProtection.SystemWeb,1.0.2,1.1.0 -Microsoft.AspNetCore.DataProtection.Sources,1.0.2,1.1.0 -Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore,1.0.2,1.1.0 -Microsoft.AspNetCore.Diagnostics.Elm,0.1.2,0.1.2 -Microsoft.AspNetCore.Hosting.WindowsServices,1.0.2,1.1.0 -Microsoft.AspNetCore.Html.Abstractions,1.0.2,1.1.0 -Microsoft.AspNetCore.Identity.EntityFrameworkCore,1.0.2,1.1.0 -Microsoft.AspNetCore.MiddlewareAnalysis,1.0.2,1.1.0 -Microsoft.AspNetCore.Mvc,1.0.3,1.1.0 -Microsoft.AspNetCore.Mvc.Abstractions,1.0.3,1.1.0 -Microsoft.AspNetCore.Mvc.ApiExplorer,1.0.3,1.1.0 -Microsoft.AspNetCore.Mvc.Formatters.Xml,1.0.3,1.1.0 -Microsoft.AspNetCore.Mvc.WebApiCompatShim,1.0.3,1.1.0 -Microsoft.AspNetCore.Owin,1.0.2,1.1.0 -Microsoft.AspNetCore.Routing,1.0.3,1.1.0 -Microsoft.AspNetCore.Routing.Abstractions,1.0.3,1.1.0 -Microsoft.AspNetCore.Routing.DecisionTree.Sources,1.0.3,1.1.0 -Microsoft.AspNetCore.Server.Kestrel.Https,1.0.3,1.1.0 -Microsoft.AspNetCore.Server.WebListener,1.0.2,1.1.0 -Microsoft.AspNetCore.Session,1.0.2,1.1.0 -Microsoft.AspNetCore.StaticFiles,1.0.2,1.1.0 -Microsoft.AspNetCore.TestHost,1.0.2,1.1.0 -Microsoft.AspNetCore.Testing,1.0.1,1.1.0 -Microsoft.AspNetCore.DiagnosticsViewPage.Sources,1.0.2,1.1.0 +Microsoft.NETCore.App,1.0.4,1.1.1 +Microsoft.AspNetCore,1.0.4,1.1.1 +Microsoft.AspNetCore.Authentication,1.0.2,1.1.1 +Microsoft.AspNetCore.Authentication.Cookies,1.0.2,1.1.1 +Microsoft.AspNetCore.Authentication.Facebook,1.0.2,1.1.1 +Microsoft.AspNetCore.Authentication.Google,1.0.1,2.1.1 +Microsoft.AspNetCore.Authentication.JwtBearer,1.0.2,1.1.1 +Microsoft.AspNetCore.Authentication.MicrosoftAccount,1.0.2,1.1.1 +Microsoft.AspNetCore.Authentication.OAuth,1.0.2,1.1.1 +Microsoft.AspNetCore.Authentication.OpenIdConnect,1.0.2,1.1.1 +Microsoft.AspNetCore.Authentication.Twitter,1.0.2,1.1.1 +Microsoft.AspNetCore.Buffering,0.1.2,0.2.1 +Microsoft.AspNetCore.CookiePolicy,1.0.2,1.1.1 +Microsoft.AspNetCore.Cors,1.0.2,1.1.1 +Microsoft.AspNetCore.DataProtection,1.0.2,1.1.1 +Microsoft.AspNetCore.DataProtection.Extensions,1.0.2,1.1.1 +Microsoft.AspNetCore.DataProtection.Redis,,0.1.1 +Microsoft.AspNetCore.DataProtection.SystemWeb,1.0.2,1.1.1 +Microsoft.AspNetCore.DataProtection.Sources,1.0.2,1.1.1 +Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore,1.0.2,1.1.1 +Microsoft.AspNetCore.Diagnostics.Elm,0.1.2,0.2.1 +Microsoft.AspNetCore.Hosting.WindowsServices,1.0.2,1.1.1 +Microsoft.AspNetCore.Html.Abstractions,1.0.2,1.1.1 +Microsoft.AspNetCore.Identity.EntityFrameworkCore,1.0.2,1.1.1 +Microsoft.AspNetCore.MiddlewareAnalysis,1.0.2,1.1.1 +Microsoft.AspNetCore.Mvc,1.0.3,1.1.2 +Microsoft.AspNetCore.Mvc.Abstractions,1.0.3,1.1.2 +Microsoft.AspNetCore.Mvc.ApiExplorer,1.0.3,1.1.2 +Microsoft.AspNetCore.Mvc.Formatters.Xml,1.0.3,1.1.2 +Microsoft.AspNetCore.Mvc.WebApiCompatShim,1.0.3,1.1.2 +Microsoft.AspNetCore.Owin,1.0.2,1.1.1 +Microsoft.AspNetCore.Routing,1.0.3,1.1.1 +Microsoft.AspNetCore.Routing.Abstractions,1.0.3,1.1.1 +Microsoft.AspNetCore.Routing.DecisionTree.Sources,1.0.3,1.1.1 +Microsoft.AspNetCore.Server.Kestrel.Https,1.0.3,1.1.1 +Microsoft.AspNetCore.Server.WebListener,1.0.2,1.1.1 +Microsoft.AspNetCore.Session,1.0.2,1.1.1 +Microsoft.AspNetCore.StaticFiles,1.0.2,1.1.1 +Microsoft.AspNetCore.TestHost,1.0.2,1.1.1 +Microsoft.AspNetCore.Testing,1.0.1,1.1.0-rtm-22752 +Microsoft.AspNetCore.DiagnosticsViewPage.Sources,1.0.2,1.1.1 Microsoft.Data.Sqlite,1.0.1,1.1.0 -Microsoft.EntityFrameworkCore,1.0.3,1.1.0 -Microsoft.EntityFrameworkCore.Design,1.0.3,1.1.0 -Microsoft.EntityFrameworkCore.InMemory,1.0.3,1.1.0 -Microsoft.EntityFrameworkCore.Relational,1.0.3,1.1.0 -Microsoft.EntityFrameworkCore.Relational.Design,1.0.3,1.1.0 -Microsoft.EntityFrameworkCore.Sqlite,1.0.3,1.1.0 -Microsoft.EntityFrameworkCore.Sqlite.Design,1.0.3,1.1.0 -Microsoft.EntityFrameworkCore.SqlServer,1.0.3,1.1.0 -Microsoft.EntityFrameworkCore.SqlServer.Design,1.0.3,1.1.0 -Microsoft.Extensions.Caching.Memory,1.0.2,1.1.0 -Microsoft.Extensions.Caching.Redis,1.0.2,1.1.0 -Microsoft.Extensions.Caching.SqlServer,1.0.2,1.1.0 +Microsoft.EntityFrameworkCore,1.0.3,1.1.1 +Microsoft.EntityFrameworkCore.Design,1.0.3,1.1.1 +Microsoft.EntityFrameworkCore.InMemory,1.0.3,1.1.1 +Microsoft.EntityFrameworkCore.Relational,1.0.3,1.1.1 +Microsoft.EntityFrameworkCore.Relational.Design,1.0.3,1.1.1 +Microsoft.EntityFrameworkCore.Sqlite,1.0.3,1.1.1 +Microsoft.EntityFrameworkCore.Sqlite.Design,1.0.3,1.1.1 +Microsoft.EntityFrameworkCore.SqlServer,1.0.3,1.1.1 +Microsoft.EntityFrameworkCore.SqlServer.Design,1.0.3,1.1.1 +Microsoft.Extensions.Caching.Memory,1.0.2,1.1.1 +Microsoft.Extensions.Caching.Redis,1.0.2,1.1.1 +Microsoft.Extensions.Caching.SqlServer,1.0.2,1.1.1 Microsoft.Extensions.CommandLineUtils,1.0.1,1.1.0 -Microsoft.Extensions.Configuration,1.0.2,1.1.0 -Microsoft.Extensions.Configuration.Binder,1.0.2,1.1.0 -Microsoft.Extensions.Configuration.CommandLine,1.0.2,1.1.0 -Microsoft.Extensions.Configuration.EnvironmentVariables,1.0.2,1.1.0 -Microsoft.Extensions.Configuration.FileExtensions,1.0.2,1.1.0 -Microsoft.Extensions.Configuration.Ini,1.0.2,1.1.0 -Microsoft.Extensions.Configuration.Json,1.0.2,1.1.0 -Microsoft.Extensions.Configuration.UserSecrets,1.0.2,1.1.0 -Microsoft.Extensions.Configuration.Xml,1.0.2,1.1.0 +Microsoft.Extensions.Configuration,1.0.2,1.1.1 +Microsoft.Extensions.Configuration.Binder,1.0.2,1.1.1 +Microsoft.Extensions.Configuration.CommandLine,1.0.2,1.1.1 +Microsoft.Extensions.Configuration.EnvironmentVariables,1.0.2,1.1.1 +Microsoft.Extensions.Configuration.FileExtensions,1.0.2,1.1.1 +Microsoft.Extensions.Configuration.Ini,1.0.2,1.1.1 +Microsoft.Extensions.Configuration.Json,1.0.2,1.1.1 +Microsoft.Extensions.Configuration.UserSecrets,1.0.2,1.1.1 +Microsoft.Extensions.Configuration.Xml,1.0.2,1.1.1 Microsoft.Extensions.DependencyInjection,1.0.2,1.1.0 Microsoft.Extensions.DiagnosticAdapter,1.0.2,1.1.0 Microsoft.Extensions.FileProviders.Composite,1.0.1,1.1.0 Microsoft.Extensions.FileProviders.Embedded,1.0.1,1.1.0 Microsoft.Extensions.FileProviders.Physical,1.0.1,1.1.0 Microsoft.Extensions.FileSystemGlobbing,1.0.1,1.1.0 -Microsoft.Extensions.Globalization.CultureInfoCache,1.0.2,1.1.0 -Microsoft.Extensions.Localization,1.0.2,1.1.0 -Microsoft.Extensions.Logging,1.0.2,1.1.0 -Microsoft.Extensions.Logging.Console,1.0.2,1.1.0 -Microsoft.Extensions.Logging.Debug,1.0.2,1.1.0 -Microsoft.Extensions.Logging.Filter,1.0.2,1.1.0 -Microsoft.Extensions.Logging.TraceSource,1.0.2,1.1.0 -Microsoft.Extensions.Logging.EventLog,1.0.2,1.1.0 -Microsoft.VisualStudio.Web.BrowserLink,1.0.0,1.0.0 -Microsoft.VisualStudio.Web.BrowserLink.Loader,14.0.2,14.1.0 -Microsoft.AspNetCore.AzureAppServicesIntegration,,1.0.0 -Microsoft.AspNetCore.DataProtection.AzureStorage,,1.0.0 -Microsoft.AspNetCore.Localization.Routing,,1.1.0 -Microsoft.AspNetCore.Rewrite,,1.0.0 -Microsoft.AspNetCore.ResponseCaching,1.0.1,1.1.0 -Microsoft.AspNetCore.ResponseCompression,,1.0.0 -Microsoft.AspNetCore.WebSockets,,1.0.0 +Microsoft.Extensions.Globalization.CultureInfoCache,1.0.2,1.1.1 +Microsoft.Extensions.Localization,1.0.2,1.1.1 +Microsoft.Extensions.Logging,1.0.2,1.1.1 +Microsoft.Extensions.Logging.Console,1.0.2,1.1.1 +Microsoft.Extensions.Logging.Debug,1.0.2,1.1.1 +Microsoft.Extensions.Logging.Filter,1.0.2,1.1.1 +Microsoft.Extensions.Logging.TraceSource,1.0.2,1.1.1 +Microsoft.Extensions.Logging.EventLog,1.0.2,1.1.1 +Microsoft.VisualStudio.Web.BrowserLink,1.0.1,1.1.0 +Microsoft.AspNetCore.AzureAppServicesIntegration,,1.0.1 +Microsoft.AspNetCore.DataProtection.AzureStorage,,1.0.1 +Microsoft.AspNetCore.Localization.Routing,,1.1.1 +Microsoft.AspNetCore.Rewrite,,1.0.1 +Microsoft.AspNetCore.ResponseCaching,1.0.1,1.1.1 +Microsoft.AspNetCore.ResponseCompression,,1.0.1 +Microsoft.AspNetCore.WebSockets,,1.0.1 Microsoft.Extensions.Logging.AzureAppServices,,1.0.0 -Microsoft.Extensions.Configuration.AzureKeyVault,,1.0.0 -Microsoft.Extensions.Logging.EventSource,,1.1.0 +Microsoft.Extensions.Configuration.AzureKeyVault,,1.0.1 +Microsoft.Extensions.Logging.EventSource,,1.1.1 System.ServiceModel.Duplex,4.0.1,4.3.0 System.ServiceModel.Http,4.1.0,4.3.0 System.ServiceModel.NetTcp,4.1.0,4.3.0 System.ServiceModel.Security,4.0.1,4.3.0 Libuv,1.9.1,1.9.1 Microsoft.AspNet.WebApi.Client,5.2.2,5.2.2 -Microsoft.AspNetCore.Antiforgery,1.0.2,1.1.0 -Microsoft.AspNetCore.Authorization,1.0.2,1.1.0 -Microsoft.AspNetCore.Cryptography.Internal,1.0.2,1.1.0 -Microsoft.AspNetCore.Cryptography.KeyDerivation,1.0.2,1.1.0 -Microsoft.AspNetCore.DataProtection.Abstractions,1.0.2,1.1.0 +Microsoft.AspNetCore.Antiforgery,1.0.3,1.1.1 +Microsoft.AspNetCore.Authorization,1.0.2,1.1.1 +Microsoft.AspNetCore.Cryptography.Internal,1.0.2,1.1.1 +Microsoft.AspNetCore.Cryptography.KeyDerivation,1.0.2,1.1.1 +Microsoft.AspNetCore.DataProtection.Abstractions,1.0.2,1.1.1 Microsoft.AspNetCore.Diagnostics,1.0.2,1.1.0 -Microsoft.AspNetCore.Diagnostics.Abstractions,1.0.2,1.1.0 -Microsoft.AspNetCore.Hosting,1.0.2,1.1.0 -Microsoft.AspNetCore.Hosting.Abstractions,1.0.2,1.1.0 -Microsoft.AspNetCore.Hosting.Server.Abstractions,1.0.2,1.1.0 -Microsoft.AspNetCore.Http,1.0.2,1.1.0 -Microsoft.AspNetCore.Http.Abstractions,1.0.2,1.1.0 -Microsoft.AspNetCore.Http.Extensions,1.0.2,1.1.0 -Microsoft.AspNetCore.Http.Features,1.0.2,1.1.0 -Microsoft.AspNetCore.HttpOverrides,1.0.2,1.1.0 -Microsoft.AspNetCore.Identity,1.0.2,1.1.0 -Microsoft.AspNetCore.JsonPatch,1.0.0,1.1.0 -Microsoft.AspNetCore.Localization,1.0.2,1.1.0 -Microsoft.AspNetCore.Mvc.Core,1.0.3,1.1.0 -Microsoft.AspNetCore.Mvc.Cors,1.0.3,1.1.0 -Microsoft.AspNetCore.Mvc.DataAnnotations,1.0.3,1.1.0 -Microsoft.AspNetCore.Mvc.Formatters.Json,1.0.3,1.1.0 -Microsoft.AspNetCore.Mvc.Localization,1.0.3,1.1.0 -Microsoft.AspNetCore.Mvc.Razor,1.0.3,1.1.0 -Microsoft.AspNetCore.Mvc.Razor.Host,1.0.3,1.1.0 -Microsoft.AspNetCore.Mvc.TagHelpers,1.0.3,1.1.0 -Microsoft.AspNetCore.Mvc.ViewFeatures,1.0.3,1.1.0 -Microsoft.AspNetCore.Razor,1.0.2,1.1.0 -Microsoft.AspNetCore.Razor.Runtime,1.0.2,1.1.0 -Microsoft.AspNetCore.Server.IISIntegration,1.0.2,1.1.0 -Microsoft.AspNetCore.Server.Kestrel,1.0.3,1.1.0 -Microsoft.AspNetCore.WebUtilities,1.0.2,1.1.0 +Microsoft.AspNetCore.Diagnostics.Abstractions,1.0.2,1.1.1 +Microsoft.AspNetCore.Hosting,1.0.2,1.1.1 +Microsoft.AspNetCore.Hosting.Abstractions,1.0.2,1.1.1 +Microsoft.AspNetCore.Hosting.Server.Abstractions,1.0.2,1.1.1 +Microsoft.AspNetCore.Http,1.0.2,1.1.1 +Microsoft.AspNetCore.Http.Abstractions,1.0.2,1.1.1 +Microsoft.AspNetCore.Http.Extensions,1.0.2,1.1.1 +Microsoft.AspNetCore.Http.Features,1.0.2,1.1.1 +Microsoft.AspNetCore.HttpOverrides,1.0.2,1.1.1 +Microsoft.AspNetCore.Identity,1.0.2,1.1.1 +Microsoft.AspNetCore.JsonPatch,1.0.0,1.1.1 +Microsoft.AspNetCore.Localization,1.0.2,1.1.1 +Microsoft.AspNetCore.Mvc.Core,1.0.3,1.1.2 +Microsoft.AspNetCore.Mvc.Cors,1.0.3,1.1.2 +Microsoft.AspNetCore.Mvc.DataAnnotations,1.0.3,1.1.2 +Microsoft.AspNetCore.Mvc.Formatters.Json,1.0.3,1.1.2 +Microsoft.AspNetCore.Mvc.Localization,1.0.3,1.1.2 +Microsoft.AspNetCore.Mvc.Razor,1.0.3,1.1.2 +Microsoft.AspNetCore.Mvc.Razor.Host,1.0.3,1.1.2 +Microsoft.AspNetCore.Mvc.TagHelpers,1.0.3,1.1.2 +Microsoft.AspNetCore.Mvc.ViewFeatures,1.0.3,1.1.2 +Microsoft.AspNetCore.Razor,1.0.2,1.1.1 +Microsoft.AspNetCore.Razor.Runtime,1.0.2,1.1.1 +Microsoft.AspNetCore.Server.IISIntegration,1.0.2,1.1.1 +Microsoft.AspNetCore.Server.Kestrel,1.0.3,1.1.1 +Microsoft.AspNetCore.WebUtilities,1.0.2,1.1.1 Microsoft.Bcl,1.1.9,1.1.9 Microsoft.Bcl.Build,1.0.14,1.0.14 Microsoft.CodeAnalysis.Analyzers,1.1.0,1.1.0 @@ -134,26 +134,26 @@ Microsoft.CodeAnalysis.CSharp,1.3.0,1.3.0 Microsoft.CodeAnalysis.VisualBasic,1.3.0,1.3.0 Microsoft.CSharp,4.0.1,4.3.0 Microsoft.DotNet.InternalAbstractions,1.0.0, -Microsoft.Extensions.Caching.Abstractions,1.0.2,1.1.0 -Microsoft.Extensions.Configuration.Abstractions,1.0.2,1.1.0 +Microsoft.Extensions.Caching.Abstractions,1.0.2,1.1.1 +Microsoft.Extensions.Configuration.Abstractions,1.0.2,1.1.1 Microsoft.Extensions.DependencyInjection.Abstractions,1.0.2,1.1.0 Microsoft.Extensions.DependencyModel,1.0.0,1.1.0 Microsoft.Extensions.FileProviders.Abstractions,1.0.1,1.1.0 -Microsoft.Extensions.Localization.Abstractions,1.0.2,1.1.0 -Microsoft.Extensions.Logging.Abstractions,1.0.2,1.1.0 -Microsoft.Extensions.ObjectPool,1.0.1,1.1.0 -Microsoft.Extensions.Options,1.0.2,1.1.0 -Microsoft.Extensions.Options.ConfigurationExtensions,1.0.2,1.1.0 +Microsoft.Extensions.Localization.Abstractions,1.0.2,1.1.1 +Microsoft.Extensions.Logging.Abstractions,1.0.2,1.1.1 +Microsoft.Extensions.ObjectPool,1.0.1,1.1.1 +Microsoft.Extensions.Options,1.0.2,1.1.1 +Microsoft.Extensions.Options.ConfigurationExtensions,1.0.2,1.1.1 Microsoft.Extensions.PlatformAbstractions,1.0.0,1.1.0 Microsoft.Extensions.Primitives,1.0.1,1.1.0 -Microsoft.Extensions.WebEncoders,1.0.2,1.1.0 +Microsoft.Extensions.WebEncoders,1.0.2,1.1.1 Microsoft.IdentityModel.Logging,1.0.0,1.1.0 Microsoft.IdentityModel.Protocols,2.0.0,2.1.0 Microsoft.IdentityModel.Protocols.OpenIdConnect,2.0.0,2.1.0 Microsoft.IdentityModel.Tokens,5.0.0,5.1.0 Microsoft.Net.Http,2.2.22,2.2.22 -Microsoft.Net.Http.Headers,1.0.2,1.1.0 -Microsoft.Net.Http.Server,1.0.2,1.1.0 +Microsoft.Net.Http.Headers,1.0.2,1.1.1 +Microsoft.Net.Http.Server,1.0.2,1.1.1 Microsoft.NETCore.DotNetHost,1.0.1,1.1.0 Microsoft.NETCore.DotNetHostPolicy,1.0.3,1.1.0 Microsoft.NETCore.DotNetHostResolver,1.0.1,1.1.0 @@ -284,7 +284,7 @@ System.Xml.XmlDocument,4.0.1,4.3.0 System.Xml.XmlSerializer,4.0.11,4.3.0 System.Xml.XPath,4.0.1,4.0.1 System.Xml.XPath.XDocument,4.0.1,4.0.1 -Microsoft.AspNetCore.ResponseCaching.Abstractions,1.0.1,1.1.0 +Microsoft.AspNetCore.ResponseCaching.Abstractions,1.0.1,1.1.1 Microsoft.Azure.KeyVault,,2.0.2-preview Microsoft.Azure.KeyVault.WebKey,,2.0.0-preview Microsoft.Data.Edm,,5.6.4 diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackageDependencies.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackageDependencies.cs index 1bc10c03a..76056e9b4 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackageDependencies.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackageDependencies.cs @@ -414,7 +414,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests mockProj.Items.Should().NotContain( i => i.Include == "Microsoft.NETCore.App" && i.ItemType == "PackageReference"); - mockProj.Properties.Should().ContainSingle(p => p.Name == "RuntimeFrameworkVersion").Which.Value.Should().Be("1.1.0"); + mockProj.Properties.Should().ContainSingle(p => p.Name == "RuntimeFrameworkVersion").Which.Value.Should().Be("1.1.1"); } [Fact] @@ -436,7 +436,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests mockProj.Items.Should().NotContain( i => i.Include == "Microsoft.NETCore.App" && i.ItemType == "PackageReference"); var runtimeFrameworkVersion = mockProj.Properties.Should().ContainSingle(p => p.Name == "RuntimeFrameworkVersion").Which; - runtimeFrameworkVersion.Value.Should().Be("1.1.0"); + runtimeFrameworkVersion.Value.Should().Be("1.1.1"); runtimeFrameworkVersion.Condition.Should().Contain("netcoreapp1.0"); } @@ -457,7 +457,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests mockProj.Items.Should().NotContain( i => i.Include == "Microsoft.NETCore.App" && i.ItemType == "PackageReference"); var runtimeFrameworkVersion = mockProj.Properties.Should().ContainSingle(p => p.Name == "RuntimeFrameworkVersion").Which; - runtimeFrameworkVersion.Value.Should().Be("1.1.0"); + runtimeFrameworkVersion.Value.Should().Be("1.1.1"); runtimeFrameworkVersion.Condition.Should().BeEmpty(); } diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackagesToTheirLTSVersions.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackagesToTheirLTSAndFTSVersions.cs similarity index 82% rename from test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackagesToTheirLTSVersions.cs rename to test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackagesToTheirLTSAndFTSVersions.cs index d2e17fe0b..9e74aff2d 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackagesToTheirLTSVersions.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackagesToTheirLTSAndFTSVersions.cs @@ -9,11 +9,13 @@ using System; namespace Microsoft.DotNet.ProjectJsonMigration.Tests { - public class GivenThatIWantToMigratePackagesToTheirLTSVersions : PackageDependenciesTestBase + public class GivenThatIWantToMigratePackagesToTheirLTSAndFTSVersions : PackageDependenciesTestBase { [Theory] - [InlineData("1.0.0", "1.0.3")] - [InlineData("1.0.3-preview2", "1.0.3")] + [InlineData("1.0.0", "1.0.4")] + [InlineData("1.0.3-preview2", "1.0.4")] + [InlineData("1.1.0", "1.1.1")] + [InlineData("1.1.1-preview2", "1.1.1")] public void ItUpliftsMicrosoftNETCoreAppMetaPackages( string sourceVersion, string targetVersion) @@ -74,6 +76,25 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests [InlineData("Microsoft.AspNetCore.Routing.Abstractions", "1.0.0", "Microsoft.AspNetCore.Routing.Abstractions", ConstantPackageVersions.AspNetLTSPackagesVersion)] [InlineData("Microsoft.AspNetCore.Server.Kestrel", "1.0.0", "Microsoft.AspNetCore.Server.Kestrel", ConstantPackageVersions.AspNetLTSPackagesVersion)] [InlineData("Microsoft.AspNetCore.Server.Kestrel.Https", "1.0.0", "Microsoft.AspNetCore.Server.Kestrel.Https", ConstantPackageVersions.AspNetLTSPackagesVersion)] + [InlineData("Microsoft.AspNetCore.Antiforgery", "1.1.0", "Microsoft.AspNetCore.Antiforgery", "1.1.1")] + [InlineData("Microsoft.AspNetCore.Mvc", "1.1.0", "Microsoft.AspNetCore.Mvc", "1.1.2")] + [InlineData("Microsoft.AspNetCore.Mvc.Abstractions", "1.1.0", "Microsoft.AspNetCore.Mvc.Abstractions", "1.1.2")] + [InlineData("Microsoft.AspNetCore.Mvc.ApiExplorer", "1.1.0", "Microsoft.AspNetCore.Mvc.ApiExplorer", "1.1.2")] + [InlineData("Microsoft.AspNetCore.Mvc.Core", "1.1.0", "Microsoft.AspNetCore.Mvc.Core", "1.1.2")] + [InlineData("Microsoft.AspNetCore.Mvc.Cors", "1.1.0", "Microsoft.AspNetCore.Mvc.Cors", "1.1.2")] + [InlineData("Microsoft.AspNetCore.Mvc.DataAnnotations", "1.1.0", "Microsoft.AspNetCore.Mvc.DataAnnotations", "1.1.2")] + [InlineData("Microsoft.AspNetCore.Mvc.Formatters.Json", "1.1.0", "Microsoft.AspNetCore.Mvc.Formatters.Json", "1.1.2")] + [InlineData("Microsoft.AspNetCore.Mvc.Formatters.Xml", "1.1.0", "Microsoft.AspNetCore.Mvc.Formatters.Xml", "1.1.2")] + [InlineData("Microsoft.AspNetCore.Mvc.Localization", "1.1.0", "Microsoft.AspNetCore.Mvc.Localization", "1.1.2")] + [InlineData("Microsoft.AspNetCore.Mvc.Razor", "1.1.0", "Microsoft.AspNetCore.Mvc.Razor", "1.1.2")] + [InlineData("Microsoft.AspNetCore.Mvc.Razor.Host", "1.1.0", "Microsoft.AspNetCore.Mvc.Razor.Host", "1.1.2")] + [InlineData("Microsoft.AspNetCore.Mvc.TagHelpers", "1.1.0", "Microsoft.AspNetCore.Mvc.TagHelpers", "1.1.2")] + [InlineData("Microsoft.AspNetCore.Mvc.ViewFeatures", "1.1.0", "Microsoft.AspNetCore.Mvc.ViewFeatures", "1.1.2")] + [InlineData("Microsoft.AspNetCore.Mvc.WebApiCompatShim", "1.1.0", "Microsoft.AspNetCore.Mvc.WebApiCompatShim", "1.1.2")] + [InlineData("Microsoft.AspNetCore.Routing", "1.1.0", "Microsoft.AspNetCore.Routing", "1.1.1")] + [InlineData("Microsoft.AspNetCore.Routing.Abstractions", "1.1.0", "Microsoft.AspNetCore.Routing.Abstractions", "1.1.1")] + [InlineData("Microsoft.AspNetCore.Server.Kestrel", "1.1.0", "Microsoft.AspNetCore.Server.Kestrel", "1.1.1")] + [InlineData("Microsoft.AspNetCore.Server.Kestrel.Https", "1.1.0", "Microsoft.AspNetCore.Server.Kestrel.Https", "1.1.1")] public void ItUpliftsAspNetCorePackages( string sourcePackageName, string sourceVersion, @@ -92,6 +113,14 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests [InlineData("Microsoft.EntityFrameworkCore.Sqlite.Design", "1.0.0", "Microsoft.EntityFrameworkCore.Sqlite.Design", ConstantPackageVersions.EntityFrameworkLTSPackagesVersion)] [InlineData("Microsoft.EntityFrameworkCore.SqlServer", "1.0.0", "Microsoft.EntityFrameworkCore.SqlServer", ConstantPackageVersions.EntityFrameworkLTSPackagesVersion)] [InlineData("Microsoft.EntityFrameworkCore.SqlServer.Design", "1.0.0", "Microsoft.EntityFrameworkCore.SqlServer.Design", ConstantPackageVersions.EntityFrameworkLTSPackagesVersion)] + [InlineData("Microsoft.EntityFrameworkCore", "1.1.0", "Microsoft.EntityFrameworkCore", "1.1.1")] + [InlineData("Microsoft.EntityFrameworkCore.InMemory", "1.1.0", "Microsoft.EntityFrameworkCore.InMemory", "1.1.1")] + [InlineData("Microsoft.EntityFrameworkCore.Relational", "1.1.0", "Microsoft.EntityFrameworkCore.Relational", "1.1.1")] + [InlineData("Microsoft.EntityFrameworkCore.Relational.Design", "1.1.0", "Microsoft.EntityFrameworkCore.Relational.Design", "1.1.1")] + [InlineData("Microsoft.EntityFrameworkCore.Sqlite", "1.1.0", "Microsoft.EntityFrameworkCore.Sqlite", "1.1.1")] + [InlineData("Microsoft.EntityFrameworkCore.Sqlite.Design", "1.1.0", "Microsoft.EntityFrameworkCore.Sqlite.Design", "1.1.1")] + [InlineData("Microsoft.EntityFrameworkCore.SqlServer", "1.1.0", "Microsoft.EntityFrameworkCore.SqlServer", "1.1.1")] + [InlineData("Microsoft.EntityFrameworkCore.SqlServer.Design", "1.1.0", "Microsoft.EntityFrameworkCore.SqlServer.Design", "1.1.1")] public void ItUpliftsEntityFrameworkCorePackages( string sourcePackageName, string sourceVersion, @@ -228,11 +257,17 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests } [Theory] - [InlineData("Microsoft.Extensions.Logging", "1.0.0", "Microsoft.Extensions.Logging", "1.0.1")] - [InlineData("Microsoft.Extensions.Logging.Console", "1.0.0", "Microsoft.Extensions.Logging.Console", "1.0.1")] - [InlineData("Microsoft.Extensions.Logging.Debug", "1.0.0", "Microsoft.Extensions.Logging.Debug", "1.0.1")] - [InlineData("Microsoft.Extensions.Configuration.Json", "1.0.0", "Microsoft.Extensions.Configuration.Json", "1.0.1")] - [InlineData("Microsoft.Extensions.Configuration.UserSecrets", "1.0.0", "Microsoft.Extensions.Configuration.UserSecrets", "1.0.1")] + [InlineData("Microsoft.Extensions.Logging", "1.0.0", "Microsoft.Extensions.Logging", "1.0.2")] + [InlineData("Microsoft.Extensions.Logging.Console", "1.0.0", "Microsoft.Extensions.Logging.Console", "1.0.2")] + [InlineData("Microsoft.Extensions.Logging.Debug", "1.0.0", "Microsoft.Extensions.Logging.Debug", "1.0.2")] + [InlineData("Microsoft.Extensions.Configuration.Json", "1.0.0", "Microsoft.Extensions.Configuration.Json", "1.0.2")] + [InlineData("Microsoft.Extensions.Configuration.UserSecrets", "1.0.0", "Microsoft.Extensions.Configuration.UserSecrets", "1.0.2")] + [InlineData("Microsoft.Extensions.Logging", "1.1.0", "Microsoft.Extensions.Logging", "1.1.1")] + [InlineData("Microsoft.Extensions.Logging.Console", "1.1.0", "Microsoft.Extensions.Logging.Console", "1.1.1")] + [InlineData("Microsoft.Extensions.Logging.Debug", "1.1.0", "Microsoft.Extensions.Logging.Debug", "1.1.1")] + [InlineData("Microsoft.Extensions.Configuration.Json", "1.1.0", "Microsoft.Extensions.Configuration.Json", "1.1.1")] + [InlineData("Microsoft.Extensions.Configuration.UserSecrets", "1.1.0", "Microsoft.Extensions.Configuration.UserSecrets", "1.1.1")] + [InlineData("Microsoft.Extensions.Logging.AzureAppServices", "1.0.0-preview2", "Microsoft.Extensions.Logging.AzureAppServices", "1.0.0")] public void ItUpliftsMicrosoftExtensionsPackages( string sourcePackageName, string sourceVersion, diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTools.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTools.cs index afcede957..7a3d1d41b 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTools.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTools.cs @@ -19,6 +19,11 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests [InlineData("Microsoft.VisualStudio.Web.CodeGenerators.Mvc", "1.0.0-preview3-final", "Microsoft.VisualStudio.Web.CodeGeneration.Design", ConstantPackageVersions.AspNetToolsVersion)] [InlineData("Microsoft.VisualStudio.Web.CodeGenerators.Mvc", "1.1.0-preview4-final", "Microsoft.VisualStudio.Web.CodeGeneration.Design", ConstantPackageVersions.AspNet110ToolsVersion)] [InlineData("Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design", "1.1.0-preview4-final", "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation", ConstantPackageVersions.AspNet110ToolsVersion)] + [InlineData("Microsoft.VisualStudio.Web.BrowserLink.Loader", "1.0.0-preview2-final", "Microsoft.VisualStudio.Web.BrowserLink", "1.0.1")] + [InlineData("Microsoft.VisualStudio.Web.BrowserLink.Loader", "1.0.0-*", "Microsoft.VisualStudio.Web.BrowserLink", "1.0.1")] + [InlineData("Microsoft.VisualStudio.Web.BrowserLink.Loader", "1.0.1", "Microsoft.VisualStudio.Web.BrowserLink", "1.0.1")] + [InlineData("Microsoft.VisualStudio.Web.BrowserLink.Loader", "1.0.0-preview3-final", "Microsoft.VisualStudio.Web.BrowserLink", "1.0.1")] + [InlineData("Microsoft.VisualStudio.Web.BrowserLink.Loader", "1.1.0-preview4-final", "Microsoft.VisualStudio.Web.BrowserLink", "1.1.0")] public void ItMigratesProjectDependenciesToANewNameAndVersion( string sourceToolName, string sourceVersion, From 281bd15a190a69a363c93f58f33597233ad0b957 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 22 Feb 2017 15:23:48 -0800 Subject: [PATCH 17/20] Fixing a couple of stray package versions. --- .../Rules/MigratePackageDependenciesAndToolsRule.cs | 2 -- .../dotnet-supported-package-versions.csv | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigratePackageDependenciesAndToolsRule.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigratePackageDependenciesAndToolsRule.cs index 6c0a8edc7..f95260149 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigratePackageDependenciesAndToolsRule.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigratePackageDependenciesAndToolsRule.cs @@ -297,8 +297,6 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Rules var possibleMappings = dependencyToVersionMap.Where(c => c.Key.Name.Equals(name, StringComparison.OrdinalIgnoreCase)); - var a = string.Join(",", possibleMappings.Select(c => $"{c.Key.Name},{c.Key.Version}")); - Console.WriteLine($"POSSIBLE MAPPINGS = {a}"); if (possibleMappings.Any() && !string.IsNullOrEmpty(version)) { var possibleVersions = possibleMappings.Select(p => VersionRange.Parse(p.Key.Version)); diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/dotnet-supported-package-versions.csv b/src/Microsoft.DotNet.ProjectJsonMigration/dotnet-supported-package-versions.csv index bf27080ed..c3abe102d 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/dotnet-supported-package-versions.csv +++ b/src/Microsoft.DotNet.ProjectJsonMigration/dotnet-supported-package-versions.csv @@ -4,7 +4,7 @@ Microsoft.AspNetCore,1.0.4,1.1.1 Microsoft.AspNetCore.Authentication,1.0.2,1.1.1 Microsoft.AspNetCore.Authentication.Cookies,1.0.2,1.1.1 Microsoft.AspNetCore.Authentication.Facebook,1.0.2,1.1.1 -Microsoft.AspNetCore.Authentication.Google,1.0.1,2.1.1 +Microsoft.AspNetCore.Authentication.Google,1.0.2,1.1.1 Microsoft.AspNetCore.Authentication.JwtBearer,1.0.2,1.1.1 Microsoft.AspNetCore.Authentication.MicrosoftAccount,1.0.2,1.1.1 Microsoft.AspNetCore.Authentication.OAuth,1.0.2,1.1.1 @@ -85,7 +85,7 @@ Microsoft.AspNetCore.Rewrite,,1.0.1 Microsoft.AspNetCore.ResponseCaching,1.0.1,1.1.1 Microsoft.AspNetCore.ResponseCompression,,1.0.1 Microsoft.AspNetCore.WebSockets,,1.0.1 -Microsoft.Extensions.Logging.AzureAppServices,,1.0.0 +Microsoft.Extensions.Logging.AzureAppServices,,1.0.1 Microsoft.Extensions.Configuration.AzureKeyVault,,1.0.1 Microsoft.Extensions.Logging.EventSource,,1.1.1 System.ServiceModel.Duplex,4.0.1,4.3.0 @@ -99,7 +99,7 @@ Microsoft.AspNetCore.Authorization,1.0.2,1.1.1 Microsoft.AspNetCore.Cryptography.Internal,1.0.2,1.1.1 Microsoft.AspNetCore.Cryptography.KeyDerivation,1.0.2,1.1.1 Microsoft.AspNetCore.DataProtection.Abstractions,1.0.2,1.1.1 -Microsoft.AspNetCore.Diagnostics,1.0.2,1.1.0 +Microsoft.AspNetCore.Diagnostics,1.0.2,1.1.1 Microsoft.AspNetCore.Diagnostics.Abstractions,1.0.2,1.1.1 Microsoft.AspNetCore.Hosting,1.0.2,1.1.1 Microsoft.AspNetCore.Hosting.Abstractions,1.0.2,1.1.1 @@ -141,7 +141,7 @@ Microsoft.Extensions.DependencyModel,1.0.0,1.1.0 Microsoft.Extensions.FileProviders.Abstractions,1.0.1,1.1.0 Microsoft.Extensions.Localization.Abstractions,1.0.2,1.1.1 Microsoft.Extensions.Logging.Abstractions,1.0.2,1.1.1 -Microsoft.Extensions.ObjectPool,1.0.1,1.1.1 +Microsoft.Extensions.ObjectPool,1.0.1,1.1.0 Microsoft.Extensions.Options,1.0.2,1.1.1 Microsoft.Extensions.Options.ConfigurationExtensions,1.0.2,1.1.1 Microsoft.Extensions.PlatformAbstractions,1.0.0,1.1.0 From ef49240f78a14534437e5a24c5c15519a6928f0f Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 22 Feb 2017 16:34:08 -0800 Subject: [PATCH 18/20] Fixing failing test. I changed the version but forgot to update the test. Should have fixed the test first. --- .../GivenThatIWantToMigratePackagesToTheirLTSAndFTSVersions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackagesToTheirLTSAndFTSVersions.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackagesToTheirLTSAndFTSVersions.cs index 9e74aff2d..e699cad61 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackagesToTheirLTSAndFTSVersions.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackagesToTheirLTSAndFTSVersions.cs @@ -267,7 +267,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests [InlineData("Microsoft.Extensions.Logging.Debug", "1.1.0", "Microsoft.Extensions.Logging.Debug", "1.1.1")] [InlineData("Microsoft.Extensions.Configuration.Json", "1.1.0", "Microsoft.Extensions.Configuration.Json", "1.1.1")] [InlineData("Microsoft.Extensions.Configuration.UserSecrets", "1.1.0", "Microsoft.Extensions.Configuration.UserSecrets", "1.1.1")] - [InlineData("Microsoft.Extensions.Logging.AzureAppServices", "1.0.0-preview2", "Microsoft.Extensions.Logging.AzureAppServices", "1.0.0")] + [InlineData("Microsoft.Extensions.Logging.AzureAppServices", "1.0.0-preview2", "Microsoft.Extensions.Logging.AzureAppServices", "1.0.1")] public void ItUpliftsMicrosoftExtensionsPackages( string sourcePackageName, string sourceVersion, From 24431edfa3cc0231dbed3c4fa0a0848a3a05594c Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 22 Feb 2017 20:07:47 -0800 Subject: [PATCH 19/20] Fixing the origin versions of BrowserLink to migrate. --- .../SupportedPackageVersions.cs | 4 ++-- .../Rules/GivenThatIWantToMigrateTools.cs | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/SupportedPackageVersions.cs b/src/Microsoft.DotNet.ProjectJsonMigration/SupportedPackageVersions.cs index 6b3f5f6ff..196e51366 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/SupportedPackageVersions.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/SupportedPackageVersions.cs @@ -192,7 +192,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration new PackageDependencyInfo { Name = "Microsoft.VisualStudio.Web.BrowserLink.Loader", - Version = "[1.1.0-*,)" + Version = "[14.1.0-*,)" }, new PackageDependencyInfo { @@ -204,7 +204,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration new PackageDependencyInfo { Name = "Microsoft.VisualStudio.Web.BrowserLink.Loader", - Version = "[1.0.0-*,1.1.0)" + Version = "[14.0.0-*,14.1.0)" }, new PackageDependencyInfo { diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTools.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTools.cs index 7a3d1d41b..9e19f351e 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTools.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTools.cs @@ -19,11 +19,10 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests [InlineData("Microsoft.VisualStudio.Web.CodeGenerators.Mvc", "1.0.0-preview3-final", "Microsoft.VisualStudio.Web.CodeGeneration.Design", ConstantPackageVersions.AspNetToolsVersion)] [InlineData("Microsoft.VisualStudio.Web.CodeGenerators.Mvc", "1.1.0-preview4-final", "Microsoft.VisualStudio.Web.CodeGeneration.Design", ConstantPackageVersions.AspNet110ToolsVersion)] [InlineData("Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Design", "1.1.0-preview4-final", "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation", ConstantPackageVersions.AspNet110ToolsVersion)] - [InlineData("Microsoft.VisualStudio.Web.BrowserLink.Loader", "1.0.0-preview2-final", "Microsoft.VisualStudio.Web.BrowserLink", "1.0.1")] - [InlineData("Microsoft.VisualStudio.Web.BrowserLink.Loader", "1.0.0-*", "Microsoft.VisualStudio.Web.BrowserLink", "1.0.1")] - [InlineData("Microsoft.VisualStudio.Web.BrowserLink.Loader", "1.0.1", "Microsoft.VisualStudio.Web.BrowserLink", "1.0.1")] - [InlineData("Microsoft.VisualStudio.Web.BrowserLink.Loader", "1.0.0-preview3-final", "Microsoft.VisualStudio.Web.BrowserLink", "1.0.1")] - [InlineData("Microsoft.VisualStudio.Web.BrowserLink.Loader", "1.1.0-preview4-final", "Microsoft.VisualStudio.Web.BrowserLink", "1.1.0")] + [InlineData("Microsoft.VisualStudio.Web.BrowserLink.Loader", "14.0.0-preview2-final", "Microsoft.VisualStudio.Web.BrowserLink", "1.0.1")] + [InlineData("Microsoft.VisualStudio.Web.BrowserLink.Loader", "14.0.0-*", "Microsoft.VisualStudio.Web.BrowserLink", "1.0.1")] + [InlineData("Microsoft.VisualStudio.Web.BrowserLink.Loader", "14.0.1", "Microsoft.VisualStudio.Web.BrowserLink", "1.0.1")] + [InlineData("Microsoft.VisualStudio.Web.BrowserLink.Loader", "14.1.0-preview4-final", "Microsoft.VisualStudio.Web.BrowserLink", "1.1.0")] public void ItMigratesProjectDependenciesToANewNameAndVersion( string sourceToolName, string sourceVersion, From fb82fb6a8edb9e8db6908f72e39c2ed1508dc3a7 Mon Sep 17 00:00:00 2001 From: Piotr Puszkiewicz Date: Thu, 23 Feb 2017 00:02:33 -0800 Subject: [PATCH 20/20] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index bde9f52a7..28dfc20b5 100644 --- a/README.md +++ b/README.md @@ -23,8 +23,7 @@ There are a couple of things to keep in mind: Found an issue? --------------- -You can consult the [known issues page](https://github.com/dotnet/core/blob/master/cli/known-issues.md) to find out the current issues and -to see the workarounds. +You can consult the [known issues page](https://github.com/dotnet/core/blob/master/cli/known-issues.md) to find out the current issues and to see the workarounds. If you don't find your issue, please file one! However, given that this is a very high-frequency repo, we've setup some [basic guidelines](Documentation/issue-filing-guide.md) to help you. Please consult those first.