automated: merge branch release/2.2

Author: Nate McMaster

Directory.Build.props

@@ -14,9 +14,6 @@
  <RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
  <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\Key.snk</AssemblyOriginatorKeyFile>
  <SignAssembly>true</SignAssembly>
- <AssemblySigningCertName>Microsoft</AssemblySigningCertName>
- <PackageSigningCertName>MicrosoftNuGet</PackageSigningCertName>
- <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
  <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
  <!-- https://github.com/aspnet/BuildTools/issues/592 -->
  <EnableApiCheck>false</EnableApiCheck>

run.sh

@@ -220,27 +220,27 @@ if [ -f "$config_file" ]; then
  config_channel="$(jq -r 'select(.channel!=null) | .channel' "$config_file")"
  config_tools_source="$(jq -r 'select(.toolsSource!=null) | .toolsSource' "$config_file")"
  else
- _error "$config_file contains invalid JSON."
+ __error "$config_file contains invalid JSON."
  exit 1
  fi
  elif __machine_has python ; then
  if python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'))" >/dev/null ; then
  config_channel="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")"
  config_tools_source="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")"
  else
- _error "$config_file contains invalid JSON."
+ __error "$config_file contains invalid JSON."
  exit 1
  fi
  elif __machine_has python3 ; then
  if python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'))" >/dev/null ; then
  config_channel="$(python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")"
  config_tools_source="$(python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")"
  else
- _error "$config_file contains invalid JSON."
+ __error "$config_file contains invalid JSON."
  exit 1
  fi
  else
- _error 'Missing required command: jq or python. Could not parse the JSON file.'
+ __error 'Missing required command: jq or python. Could not parse the JSON file.'
  exit 1
  fi
 

src/Microsoft.AspNetCore.Hosting/WebHostBuilder.cs

@@ -162,13 +162,6 @@ public IWebHost Build()
  }
  }
 
- var logger = hostingServiceProvider.GetRequiredService<ILogger<WebHost>>();
- // Warn about duplicate HostingStartupAssemblies
- foreach (var assemblyName in _options.GetFinalHostingStartupAssemblies().GroupBy(a => a, StringComparer.OrdinalIgnoreCase).Where(g => g.Count() > 1))
- {
- logger.LogWarning($"The assembly {assemblyName} was specified multiple times. Hosting startup assemblies should only be specified once.");
- }
-
  AddApplicationServices(applicationServices, hostingServiceProvider);
 
  var host = new WebHost(
@@ -181,6 +174,14 @@ public IWebHost Build()
  {
  host.Initialize();
 
+ var logger = host.Services.GetRequiredService<ILogger<WebHost>>();
+
+ // Warn about duplicate HostingStartupAssemblies
+ foreach (var assemblyName in _options.GetFinalHostingStartupAssemblies().GroupBy(a => a, StringComparer.OrdinalIgnoreCase).Where(g => g.Count() > 1))
+ {
+ logger.LogWarning($"The assembly {assemblyName} was specified multiple times. Hosting startup assemblies should only be specified once.");
+ }
+
  return host;
  }
  catch
@@ -196,7 +197,7 @@ IServiceProvider GetProviderFromFactory(IServiceCollection collection)
  var provider = collection.BuildServiceProvider();
  var factory = provider.GetService<IServiceProviderFactory<IServiceCollection>>();
 
- if (factory != null)
+ if (factory != null && !(factory is DefaultServiceProviderFactory))
  {
  using (provider)
  {