diff --git a/src/MetaPackages/Directory.Build.targets b/src/MetaPackages/Directory.Build.targets index 78626b773e..7e3f8df92e 100644 --- a/src/MetaPackages/Directory.Build.targets +++ b/src/MetaPackages/Directory.Build.targets @@ -1,10 +1,6 @@ - $(MicrosoftNETCoreApp20PackageVersion) - $(MicrosoftNETCoreApp21PackageVersion) - $(MicrosoftNETCoreApp22PackageVersion) + $(MicrosoftNETCoreAppPackageVersion) $(NETStandardLibrary20PackageVersion) - - 99.9 diff --git a/src/MetaPackages/README.md b/src/MetaPackages/README.md index d35e5f0866..71a55178ee 100644 --- a/src/MetaPackages/README.md +++ b/src/MetaPackages/README.md @@ -1,7 +1,9 @@ -Meta packages -======== +Meta Packages [Archived] +======================== + +**This GitHub project has been archived.** Ongoing development on this project can be found in https://github.com/aspnet/AspNetCore. This repo contains NuGet meta packages that help quickly reference sets of common packages. -This project is part of ASP.NET Core. You can find samples, documentation and getting started instructions for ASP.NET Core at the [Home](https://github.com/aspnet/home) repo. +This project is part of ASP.NET Core. You can find samples, documentation and getting started instructions for ASP.NET Core at the [AspNetCore](https://github.com/aspnet/AspNetCore) repo. diff --git a/src/MetaPackages/build/dependencies.props b/src/MetaPackages/build/dependencies.props index 8d12964ca3..ee4e17013b 100644 --- a/src/MetaPackages/build/dependencies.props +++ b/src/MetaPackages/build/dependencies.props @@ -3,39 +3,40 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview2-20181004.6 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 0.6.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 - 2.2.0-preview3-35425 + 3.0.0-alpha1-20181004.7 + 3.0.0-alpha1-10733 + 3.0.0-alpha1-10733 + 3.0.0-alpha1-10733 + 3.0.0-alpha1-10733 + 3.0.0-alpha1-10733 + 3.0.0-alpha1-10733 + 3.0.0-alpha1-10733 + 3.0.0-alpha1-10733 + 3.0.0-alpha1-10733 + 0.7.0-alpha1-10733 + 3.0.0-alpha1-10733 + 3.0.0-alpha1-10733 + 3.0.0-alpha1-10733 + 3.0.0-preview-181108-06 + 3.0.0-preview-181108-06 + 3.0.0-preview-181108-06 + 3.0.0-preview-181108-06 + 3.0.0-preview-181108-06 + 3.0.0-preview-181108-06 + 3.0.0-preview-181108-06 + 3.0.0-preview-181108-06 + 3.0.0-preview-181108-06 + 3.0.0-preview-181108-06 + 3.0.0-alpha1-10733 2.0.9 2.1.3 - 2.2.0-preview3-27001-02 + 2.2.0-rtm-27105-02 15.6.1 - 4.7.49 + 4.10.0 2.0.3 2.3.1 2.4.0 - + diff --git a/src/MetaPackages/build/repo.props b/src/MetaPackages/build/repo.props index f1fe24dd27..4402da1d0d 100644 --- a/src/MetaPackages/build/repo.props +++ b/src/MetaPackages/build/repo.props @@ -4,13 +4,10 @@ Internal.AspNetCore.Universe.Lineup - 2.2.0-* https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json - - - + diff --git a/src/MetaPackages/samples/SampleApp/Program.cs b/src/MetaPackages/samples/SampleApp/Program.cs index b5eb900273..1d95226e6c 100644 --- a/src/MetaPackages/samples/SampleApp/Program.cs +++ b/src/MetaPackages/samples/SampleApp/Program.cs @@ -7,6 +7,8 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Routing; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Hosting; namespace SampleApp { @@ -23,6 +25,8 @@ namespace SampleApp CustomApplicationBuilder(); StartupClass(args); + + HostBuilderWithWebHost(args); } private static void HelloWorld() @@ -90,5 +94,21 @@ namespace SampleApp host.Run(); } } + + private static void HostBuilderWithWebHost(string[] args) + { + var host = new HostBuilder() + .ConfigureAppConfiguration(config => + { + config.AddCommandLine(args); + }) + .ConfigureWebHostDefaults(builder => + { + builder.UseStartup(); + }) + .Build(); + + host.Run(); + } } } diff --git a/src/MetaPackages/samples/SampleApp/SampleApp.csproj b/src/MetaPackages/samples/SampleApp/SampleApp.csproj index 64ab5e297e..64625f5583 100644 --- a/src/MetaPackages/samples/SampleApp/SampleApp.csproj +++ b/src/MetaPackages/samples/SampleApp/SampleApp.csproj @@ -1,7 +1,7 @@ - + - netcoreapp2.2;net461 + netcoreapp3.0 aspnetcore-MetaPackagesSampleApp-20170406180413 @@ -11,6 +11,7 @@ + diff --git a/src/MetaPackages/src/Microsoft.AspNetCore/GenericHostBuilderExtensions.cs b/src/MetaPackages/src/Microsoft.AspNetCore/GenericHostBuilderExtensions.cs new file mode 100644 index 0000000000..80d0074e40 --- /dev/null +++ b/src/MetaPackages/src/Microsoft.AspNetCore/GenericHostBuilderExtensions.cs @@ -0,0 +1,33 @@ +using System; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore; + +namespace Microsoft.Extensions.Hosting +{ + /// + /// Extension methods for configuring the IWebHostBuilder. + /// + public static class GenericHostBuilderExtensions + { + /// + /// Initializes a new instance of the class with pre-configured defaults. + /// + /// + /// The following defaults are applied to the : + /// use Kestrel as the web server and configure it using the application's configuration providers, + /// and enable IIS integration. + /// + /// The instance to configure + /// The configure callback + /// + public static IHostBuilder ConfigureWebHostDefaults(this IHostBuilder builder, Action configure) + { + return builder.ConfigureWebHost(webHostBuilder => + { + WebHost.ConfigureWebDefaults(webHostBuilder); + + configure(webHostBuilder); + }); + } + } +} diff --git a/src/MetaPackages/src/Microsoft.AspNetCore/Microsoft.AspNetCore.csproj b/src/MetaPackages/src/Microsoft.AspNetCore/Microsoft.AspNetCore.csproj index ea9a676d87..634d092c36 100644 --- a/src/MetaPackages/src/Microsoft.AspNetCore/Microsoft.AspNetCore.csproj +++ b/src/MetaPackages/src/Microsoft.AspNetCore/Microsoft.AspNetCore.csproj @@ -1,7 +1,7 @@  - netstandard2.0 + netcoreapp3.0 aspnetcore Microsoft.AspNetCore true diff --git a/src/MetaPackages/src/Microsoft.AspNetCore/WebHost.cs b/src/MetaPackages/src/Microsoft.AspNetCore/WebHost.cs index 10726c8356..fd9cadfcb8 100644 --- a/src/MetaPackages/src/Microsoft.AspNetCore/WebHost.cs +++ b/src/MetaPackages/src/Microsoft.AspNetCore/WebHost.cs @@ -158,69 +158,75 @@ namespace Microsoft.AspNetCore builder.UseConfiguration(new ConfigurationBuilder().AddCommandLine(args).Build()); } - builder.UseKestrel((builderContext, options) => - { - options.Configure(builderContext.Configuration.GetSection("Kestrel")); - }) - .ConfigureAppConfiguration((hostingContext, config) => - { - var env = hostingContext.HostingEnvironment; + builder.ConfigureAppConfiguration((hostingContext, config) => + { + var env = hostingContext.HostingEnvironment; - config.AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) - .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true, reloadOnChange: true); + config.AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) + .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true, reloadOnChange: true); - if (env.IsDevelopment()) + if (env.IsDevelopment()) + { + var appAssembly = Assembly.Load(new AssemblyName(env.ApplicationName)); + if (appAssembly != null) { - var appAssembly = Assembly.Load(new AssemblyName(env.ApplicationName)); - if (appAssembly != null) - { - config.AddUserSecrets(appAssembly, optional: true); - } + config.AddUserSecrets(appAssembly, optional: true); } + } - config.AddEnvironmentVariables(); + config.AddEnvironmentVariables(); - if (args != null) - { - config.AddCommandLine(args); - } - }) - .ConfigureLogging((hostingContext, logging) => + if (args != null) { - logging.AddConfiguration(hostingContext.Configuration.GetSection("Logging")); - logging.AddConsole(); - logging.AddDebug(); - logging.AddEventSourceLogger(); - }) - .ConfigureServices((hostingContext, services) => - { - // Fallback - services.PostConfigure(options => - { - if (options.AllowedHosts == null || options.AllowedHosts.Count == 0) - { - // "AllowedHosts": "localhost;127.0.0.1;[::1]" - var hosts = hostingContext.Configuration["AllowedHosts"]?.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries); - // Fall back to "*" to disable. - options.AllowedHosts = (hosts?.Length > 0 ? hosts : new[] { "*" }); - } - }); - // Change notification - services.AddSingleton>( - new ConfigurationChangeTokenSource(hostingContext.Configuration)); + config.AddCommandLine(args); + } + }) + .ConfigureLogging((hostingContext, logging) => + { + logging.AddConfiguration(hostingContext.Configuration.GetSection("Logging")); + logging.AddConsole(); + logging.AddDebug(); + logging.AddEventSourceLogger(); + }). + UseDefaultServiceProvider((context, options) => + { + options.ValidateScopes = context.HostingEnvironment.IsDevelopment(); + }); - services.AddTransient(); - }) - .UseIIS() - .UseIISIntegration() - .UseDefaultServiceProvider((context, options) => - { - options.ValidateScopes = context.HostingEnvironment.IsDevelopment(); - }); + ConfigureWebDefaults(builder); return builder; } + internal static void ConfigureWebDefaults(IWebHostBuilder builder) + { + builder.UseKestrel((builderContext, options) => + { + options.Configure(builderContext.Configuration.GetSection("Kestrel")); + }) + .ConfigureServices((hostingContext, services) => + { + // Fallback + services.PostConfigure(options => + { + if (options.AllowedHosts == null || options.AllowedHosts.Count == 0) + { + // "AllowedHosts": "localhost;127.0.0.1;[::1]" + var hosts = hostingContext.Configuration["AllowedHosts"]?.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries); + // Fall back to "*" to disable. + options.AllowedHosts = (hosts?.Length > 0 ? hosts : new[] { "*" }); + } + }); + // Change notification + services.AddSingleton>( + new ConfigurationChangeTokenSource(hostingContext.Configuration)); + + services.AddTransient(); + }) + .UseIIS() + .UseIISIntegration(); + } + /// /// Initializes a new instance of the class with pre-configured defaults using typed Startup. /// diff --git a/src/MetaPackages/test/Directory.Build.props b/src/MetaPackages/test/Directory.Build.props index b8557e9f98..34fdc31455 100644 --- a/src/MetaPackages/test/Directory.Build.props +++ b/src/MetaPackages/test/Directory.Build.props @@ -1,13 +1,6 @@ - - netcoreapp2.2 - $(DeveloperBuildTestTfms) - - $(StandardTestTfms);net461 - - diff --git a/src/MetaPackages/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj b/src/MetaPackages/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj index 67422e13d6..8503374106 100644 --- a/src/MetaPackages/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj +++ b/src/MetaPackages/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj @@ -1,13 +1,7 @@ - $(StandardTestTfms) - - - true + netcoreapp3.0 diff --git a/src/MetaPackages/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs b/src/MetaPackages/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs index d2e71f5778..0e41734ea0 100644 --- a/src/MetaPackages/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs +++ b/src/MetaPackages/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs @@ -158,7 +158,7 @@ namespace Microsoft.AspNetCore.Tests var applicationName = "CreateDefaultBuilderApp"; var deploymentParameters = new DeploymentParameters(Path.Combine(GetTestSitesPath(), applicationName), ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) { - TargetFramework = "netcoreapp2.2", + TargetFramework = "netcoreapp3.0", HostingModel = HostingModel.InProcess, AncmVersion = AncmVersion.AspNetCoreModuleV2 }; @@ -212,7 +212,10 @@ namespace Microsoft.AspNetCore.Tests bool setTestEnvVars = false, string environment = "Development") { - var deploymentParameters = new DeploymentParameters(Path.Combine(GetTestSitesPath(), applicationName), ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64); + var deploymentParameters = new DeploymentParameters(Path.Combine(GetTestSitesPath(), applicationName), ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) + { + TargetFramework = "netcoreapp3.0", + }; if (setTestEnvVars) { diff --git a/src/MetaPackages/test/Microsoft.AspNetCore.Tests/Microsoft.AspNetCore.Tests.csproj b/src/MetaPackages/test/Microsoft.AspNetCore.Tests/Microsoft.AspNetCore.Tests.csproj index 1b8156a1ca..5df7ab6977 100644 --- a/src/MetaPackages/test/Microsoft.AspNetCore.Tests/Microsoft.AspNetCore.Tests.csproj +++ b/src/MetaPackages/test/Microsoft.AspNetCore.Tests/Microsoft.AspNetCore.Tests.csproj @@ -1,7 +1,7 @@ - $(StandardTestTfms) + netcoreapp3.0 diff --git a/src/MetaPackages/test/TestSites/CreateDefaultBuilderApp/CreateDefaultBuilderApp.csproj b/src/MetaPackages/test/TestSites/CreateDefaultBuilderApp/CreateDefaultBuilderApp.csproj index 9fc88e0995..3927bc6537 100644 --- a/src/MetaPackages/test/TestSites/CreateDefaultBuilderApp/CreateDefaultBuilderApp.csproj +++ b/src/MetaPackages/test/TestSites/CreateDefaultBuilderApp/CreateDefaultBuilderApp.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.2 + netcoreapp3.0 aspnetcore-CreateDefaultBuilder-20170424224131 diff --git a/src/MetaPackages/test/TestSites/CreateDefaultBuilderOfTApp/CreateDefaultBuilderOfTApp.csproj b/src/MetaPackages/test/TestSites/CreateDefaultBuilderOfTApp/CreateDefaultBuilderOfTApp.csproj index beca85599c..ee45c5f744 100644 --- a/src/MetaPackages/test/TestSites/CreateDefaultBuilderOfTApp/CreateDefaultBuilderOfTApp.csproj +++ b/src/MetaPackages/test/TestSites/CreateDefaultBuilderOfTApp/CreateDefaultBuilderOfTApp.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.2 + netcoreapp3.0 aspnetcore-CreateDefaultBuilderOfT-20170424224131 diff --git a/src/MetaPackages/test/TestSites/DependencyInjectionApp/DependencyInjectionApp.csproj b/src/MetaPackages/test/TestSites/DependencyInjectionApp/DependencyInjectionApp.csproj index f52140e4d0..464ba5ae55 100644 --- a/src/MetaPackages/test/TestSites/DependencyInjectionApp/DependencyInjectionApp.csproj +++ b/src/MetaPackages/test/TestSites/DependencyInjectionApp/DependencyInjectionApp.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.2 + netcoreapp3.0 diff --git a/src/MetaPackages/test/TestSites/StartRequestDelegateUrlApp/StartRequestDelegateUrlApp.csproj b/src/MetaPackages/test/TestSites/StartRequestDelegateUrlApp/StartRequestDelegateUrlApp.csproj index f52140e4d0..464ba5ae55 100644 --- a/src/MetaPackages/test/TestSites/StartRequestDelegateUrlApp/StartRequestDelegateUrlApp.csproj +++ b/src/MetaPackages/test/TestSites/StartRequestDelegateUrlApp/StartRequestDelegateUrlApp.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.2 + netcoreapp3.0 diff --git a/src/MetaPackages/test/TestSites/StartRouteBuilderUrlApp/StartRouteBuilderUrlApp.csproj b/src/MetaPackages/test/TestSites/StartRouteBuilderUrlApp/StartRouteBuilderUrlApp.csproj index f52140e4d0..464ba5ae55 100644 --- a/src/MetaPackages/test/TestSites/StartRouteBuilderUrlApp/StartRouteBuilderUrlApp.csproj +++ b/src/MetaPackages/test/TestSites/StartRouteBuilderUrlApp/StartRouteBuilderUrlApp.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.2 + netcoreapp3.0 diff --git a/src/MetaPackages/test/TestSites/StartWithIApplicationBuilderUrlApp/StartWithIApplicationBuilderUrlApp.csproj b/src/MetaPackages/test/TestSites/StartWithIApplicationBuilderUrlApp/StartWithIApplicationBuilderUrlApp.csproj index f52140e4d0..464ba5ae55 100644 --- a/src/MetaPackages/test/TestSites/StartWithIApplicationBuilderUrlApp/StartWithIApplicationBuilderUrlApp.csproj +++ b/src/MetaPackages/test/TestSites/StartWithIApplicationBuilderUrlApp/StartWithIApplicationBuilderUrlApp.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.2 + netcoreapp3.0 diff --git a/src/MetaPackages/version.props b/src/MetaPackages/version.props index 9b41b556d7..2aae215c04 100644 --- a/src/MetaPackages/version.props +++ b/src/MetaPackages/version.props @@ -1,7 +1,7 @@ - + - 2.2.0 - rtm + 3.0.0 + alpha1 $(VersionPrefix) $(VersionPrefix)-$(VersionSuffix)-final t000