diff --git a/NuGet.Config b/NuGet.Config index 559db7b79..556ee5919 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -9,5 +9,6 @@ + diff --git a/README.md b/README.md index a630081c5..a3ab2b48f 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. 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/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..b0fb69426 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -7,9 +7,9 @@ 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.0.0-beta1-20170222-125 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..7dc602f21 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/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/SupportedPackageVersions.cs b/src/Microsoft.DotNet.ProjectJsonMigration/SupportedPackageVersions.cs index 511763603..196e51366 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 = "[14.1.0-*,)" + }, + new PackageDependencyInfo + { + Name = "Microsoft.VisualStudio.Web.BrowserLink", + Version = "1.1.0" + } + }, + { + new PackageDependencyInfo + { + Name = "Microsoft.VisualStudio.Web.BrowserLink.Loader", + Version = "[14.0.0-*,14.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 6cd457775..c3abe102d 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/dotnet-supported-package-versions.csv +++ b/src/Microsoft.DotNet.ProjectJsonMigration/dotnet-supported-package-versions.csv @@ -1,123 +1,131 @@ 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.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.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 +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.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.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.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.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.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.VisualStudio.Web.BrowserLink,1.0.0,1.0.0 -Microsoft.VisualStudio.Web.BrowserLink.Loader,14.0.1,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.ResponseCompression,,1.0.0 -Microsoft.AspNetCore.WebSockets,,1.0.0 -Microsoft.Extensions.Logging.AzureAppServices,,1.0.0 -Microsoft.Extensions.Configuration.AzureKeyVault,,1.0.0 -Microsoft.Extensions.Logging.EventSource,,1.1.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.1 +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.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.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.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.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 +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 @@ -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.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.1,1.1.0 -Microsoft.Extensions.Logging.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.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.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.1,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.1,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 @@ -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.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.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(); 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..e699cad61 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.1")] 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..9e19f351e 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTools.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTools.cs @@ -19,6 +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", "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, diff --git a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs index 330baa6e0..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] @@ -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-migrate.Tests/NuGet.tempaspnetpatch.config b/test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config index 8bfa9c1ed..eaf5b585e 100644 --- a/test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config +++ b/test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config @@ -8,5 +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 41ba66505..80a6898ca 100644 --- a/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config +++ b/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config @@ -7,5 +7,6 @@ + \ No newline at end of file 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 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()