From 654cf06615981b190737101d3a1df39e57e20341 Mon Sep 17 00:00:00 2001 From: Brennan Date: Fri, 27 Mar 2020 10:56:49 -0700 Subject: [PATCH 1/5] Backport ANCM environment variable additions (#20006) --- .../AspNetCore/ShimOptions.cpp | 5 ++ .../CommonLib/ConfigurationSection.h | 2 + .../InProcessOptions.cpp | 6 ++ .../environmentvariablehash.h | 1 + .../environmentvariablehelpers.h | 20 ++++++- .../requesthandler_config.cpp | 56 ++++++++++++++----- .../Inprocess/EnvironmentVariableTests.cs | 17 ++++++ .../Inprocess/StartupTests.cs | 33 +++++++++++ .../RequiresIISAttribute.cs | 5 ++ 9 files changed, 131 insertions(+), 14 deletions(-) diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp index 208d4a1eaa..353b0be788 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp @@ -54,6 +54,11 @@ ShimOptions::ShimOptions(const ConfigurationSource &configurationSource) : .value_or(environmentVariables[CS_ASPNETCORE_ENVIRONMENT]); const auto dotnetEnvironment = Environment::GetEnvironmentVariableValue(CS_DOTNET_ENVIRONMENT) .value_or(environmentVariables[CS_DOTNET_ENVIRONMENT]); + // We prefer the environment variables for LAUNCHER_PATH and LAUNCHER_ARGS + m_strProcessPath = Environment::GetEnvironmentVariableValue(CS_ANCM_LAUNCHER_PATH) + .value_or(m_strProcessPath); + m_strArguments = Environment::GetEnvironmentVariableValue(CS_ANCM_LAUNCHER_ARGS) + .value_or(m_strArguments); auto detailedErrorsEnabled = equals_ignore_case(L"1", detailedErrors) || equals_ignore_case(L"true", detailedErrors); auto aspnetCoreEnvironmentEnabled = equals_ignore_case(L"Development", aspnetCoreEnvironment); diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h index ae02dd3faa..8c9cece3e3 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ConfigurationSection.h @@ -33,6 +33,8 @@ #define CS_ASPNETCORE_DETAILEDERRORS L"ASPNETCORE_DETAILEDERRORS" #define CS_ASPNETCORE_ENVIRONMENT L"ASPNETCORE_ENVIRONMENT" #define CS_DOTNET_ENVIRONMENT L"DOTNET_ENVIRONMENT" +#define CS_ANCM_LAUNCHER_PATH L"ANCM_LAUNCHER_PATH" +#define CS_ANCM_LAUNCHER_ARGS L"ANCM_LAUNCHER_ARGS" class ConfigurationSection: NonCopyable { diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp index 01ec10f6f6..c2ff5e0a7d 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessOptions.cpp @@ -4,6 +4,7 @@ #include "InProcessOptions.h" #include "InvalidOperationException.h" #include "EventLog.h" +#include "Environment.h" HRESULT InProcessOptions::Create( IHttpServer& pServer, @@ -51,6 +52,11 @@ InProcessOptions::InProcessOptions(const ConfigurationSource &configurationSourc auto const aspNetCoreSection = configurationSource.GetRequiredSection(CS_ASPNETCORE_SECTION); m_strArguments = aspNetCoreSection->GetString(CS_ASPNETCORE_PROCESS_ARGUMENTS).value_or(CS_ASPNETCORE_PROCESS_ARGUMENTS_DEFAULT); m_strProcessPath = aspNetCoreSection->GetRequiredString(CS_ASPNETCORE_PROCESS_EXE_PATH); + // We prefer the environment variables for LAUNCHER_PATH and LAUNCHER_ARGS + m_strProcessPath = Environment::GetEnvironmentVariableValue(CS_ANCM_LAUNCHER_PATH) + .value_or(m_strProcessPath); + m_strArguments = Environment::GetEnvironmentVariableValue(CS_ANCM_LAUNCHER_ARGS) + .value_or(m_strArguments); m_fStdoutLogEnabled = aspNetCoreSection->GetRequiredBool(CS_ASPNETCORE_STDOUT_LOG_ENABLED); m_struStdoutLogFile = aspNetCoreSection->GetRequiredString(CS_ASPNETCORE_STDOUT_LOG_FILE); m_fDisableStartUpErrorPage = aspNetCoreSection->GetRequiredBool(CS_ASPNETCORE_DISABLE_START_UP_ERROR_PAGE); diff --git a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h index 82541f1bdf..248ca1aa93 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h @@ -13,6 +13,7 @@ #define ASPNETCORE_IIS_AUTH_BASIC L"basic;" #define ASPNETCORE_IIS_AUTH_ANONYMOUS L"anonymous;" #define ASPNETCORE_IIS_AUTH_NONE L"none" +#define ANCM_PREFER_ENVIRONMENT_VARIABLES_ENV_STR L"ANCM_PREFER_ENVIRONMENT_VARIABLES" // // The key used for hash-table lookups, consists of the port on which the http process is created. diff --git a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h index 2842dc0245..3a6fef9335 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h @@ -78,9 +78,27 @@ public: environmentVariables.insert_or_assign(HOSTING_STARTUP_ASSEMBLIES_ENV_STR, hostingStartupValues); } + auto preferEnvironmentVariablesSetting = Environment::GetEnvironmentVariableValue(ANCM_PREFER_ENVIRONMENT_VARIABLES_ENV_STR).value_or(L"false"); + auto preferEnvironmentVariables = equals_ignore_case(L"1", preferEnvironmentVariablesSetting) || equals_ignore_case(L"true", preferEnvironmentVariablesSetting); + for (auto& environmentVariable : environmentVariables) { - environmentVariable.second = Environment::ExpandEnvironmentVariables(environmentVariable.second); + if (preferEnvironmentVariables) + { + auto env = Environment::GetEnvironmentVariableValue(environmentVariable.first); + if (env.has_value()) + { + environmentVariable.second = env.value(); + } + else + { + environmentVariable.second = Environment::ExpandEnvironmentVariables(environmentVariable.second); + } + } + else + { + environmentVariable.second = Environment::ExpandEnvironmentVariables(environmentVariable.second); + } } return environmentVariables; diff --git a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp index d3a705e9a2..2b68345623 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp @@ -7,6 +7,7 @@ #include "environmentvariablehash.h" #include "exceptions.h" #include "config_utility.h" +#include "Environment.h" REQUESTHANDLER_CONFIG::~REQUESTHANDLER_CONFIG() { @@ -101,6 +102,8 @@ REQUESTHANDLER_CONFIG::Populate( BSTR bstrBasicAuthSection = NULL; BSTR bstrAnonymousAuthSection = NULL; BSTR bstrAspNetCoreSection = NULL; + std::optional launcherPathEnv; + std::optional launcherArgsEnv; pAdminManager = pHttpServer->GetAdminManager(); try @@ -248,12 +251,47 @@ REQUESTHANDLER_CONFIG::Populate( goto Finished; } - hr = GetElementStringProperty(pAspNetCoreElement, - CS_ASPNETCORE_PROCESS_EXE_PATH, - &m_struProcessPath); - if (FAILED(hr)) + // We prefer the environment variables for LAUNCHER_PATH and LAUNCHER_ARGS + try { - goto Finished; + launcherPathEnv = Environment::GetEnvironmentVariableValue(CS_ANCM_LAUNCHER_PATH); + launcherArgsEnv = Environment::GetEnvironmentVariableValue(CS_ANCM_LAUNCHER_ARGS); + } + catch(...) + { + FINISHED_IF_FAILED(E_FAIL); + } + + if (launcherPathEnv.has_value()) + { + hr = m_struProcessPath.Copy(launcherPathEnv.value().c_str()); + FINISHED_IF_FAILED(hr); + } + else + { + hr = GetElementStringProperty(pAspNetCoreElement, + CS_ASPNETCORE_PROCESS_EXE_PATH, + &m_struProcessPath); + if (FAILED(hr)) + { + goto Finished; + } + } + + if (launcherArgsEnv.has_value()) + { + hr = m_struArguments.Copy(launcherArgsEnv.value().c_str()); + FINISHED_IF_FAILED(hr); + } + else + { + hr = GetElementStringProperty(pAspNetCoreElement, + CS_ASPNETCORE_PROCESS_ARGUMENTS, + &m_struArguments); + if (FAILED(hr)) + { + goto Finished; + } } hr = GetElementStringProperty(pAspNetCoreElement, @@ -281,14 +319,6 @@ REQUESTHANDLER_CONFIG::Populate( goto Finished; } - hr = GetElementStringProperty(pAspNetCoreElement, - CS_ASPNETCORE_PROCESS_ARGUMENTS, - &m_struArguments); - if (FAILED(hr)) - { - goto Finished; - } - hr = GetElementDWORDProperty(pAspNetCoreElement, CS_ASPNETCORE_RAPID_FAILS_PER_MINUTE, &m_dwRapidFailsPerMinute); diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs index 7f8d003eb7..2a8140aec5 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs @@ -126,5 +126,22 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess deploymentParameters.WebConfigBasedEnvironmentVariables["OtherVariable"] = "%TestVariable%;Hello"; Assert.Equal("World;Hello", await GetStringAsync(deploymentParameters, "/GetEnvironmentVariable?name=OtherVariable")); } + + [ConditionalTheory] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] + [RequiresNewHandler] + [RequiresNewShim] + [InlineData(HostingModel.InProcess)] + [InlineData(HostingModel.OutOfProcess)] + public async Task PreferEnvironmentVariablesOverWebConfigWhenConfigured(HostingModel hostingModel) + { + var deploymentParameters = Fixture.GetBaseDeploymentParameters(hostingModel); + + var environment = "Development"; + deploymentParameters.EnvironmentVariables["ANCM_PREFER_ENVIRONMENT_VARIABLES"] = "true"; + deploymentParameters.EnvironmentVariables["ASPNETCORE_ENVIRONMENT"] = environment; + deploymentParameters.WebConfigBasedEnvironmentVariables.Add("ASPNETCORE_ENVIRONMENT", "Debug"); + Assert.Equal(environment, await GetStringAsync(deploymentParameters, "/GetEnvironmentVariable?name=ASPNETCORE_ENVIRONMENT")); + } } } diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs index 1c070242e0..2d152fccca 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs @@ -875,6 +875,39 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess Assert.True(result.IsSuccessStatusCode); } + [ConditionalTheory] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] + [RequiresNewShim] + [RequiresNewHandler] + [InlineData(HostingModel.InProcess)] + [InlineData(HostingModel.OutOfProcess)] + public async Task EnvironmentVariableForLauncherPathIsPreferred(HostingModel hostingModel) + { + var deploymentParameters = Fixture.GetBaseDeploymentParameters(hostingModel); + + deploymentParameters.EnvironmentVariables["ANCM_LAUNCHER_PATH"] = _dotnetLocation; + deploymentParameters.WebConfigActionList.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection("processPath", "nope")); + + await StartAsync(deploymentParameters); + } + + [ConditionalTheory] + [RequiresIIS(IISCapability.PoolEnvironmentVariables)] + [RequiresNewShim] + [RequiresNewHandler] + [InlineData(HostingModel.InProcess)] + [InlineData(HostingModel.OutOfProcess)] + public async Task EnvironmentVariableForLauncherArgsIsPreferred(HostingModel hostingModel) + { + var deploymentParameters = Fixture.GetBaseDeploymentParameters(hostingModel); + using var publishedApp = await deploymentParameters.ApplicationPublisher.Publish(deploymentParameters, LoggerFactory.CreateLogger("test")); + + deploymentParameters.EnvironmentVariables["ANCM_LAUNCHER_ARGS"] = Path.ChangeExtension(Path.Combine(publishedApp.Path, deploymentParameters.ApplicationPublisher.ApplicationPath), ".dll"); + deploymentParameters.WebConfigActionList.Add(WebConfigHelpers.AddOrModifyAspNetCoreSection("arguments", "nope")); + + await StartAsync(deploymentParameters); + } + private static void VerifyDotnetRuntimeEventLog(IISDeploymentResult deploymentResult) { var entries = GetEventLogsFromDotnetRuntime(deploymentResult); diff --git a/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs b/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs index fad488d484..d6fc23a803 100644 --- a/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs +++ b/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs @@ -61,6 +61,11 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests var ancmConfigPath = Path.Combine(Environment.SystemDirectory, "inetsrv", "config", "schema", "aspnetcore_schema.xml"); + if (!File.Exists(ancmConfigPath)) + { + ancmConfigPath = Path.Combine(Environment.SystemDirectory, "inetsrv", "config", "schema", "aspnetcore_schema_v2.xml"); + } + if (!File.Exists(ancmConfigPath) && !SkipInVSTSAttribute.RunningInVSTS) { _skipReasonStatic = "IIS Schema is not installed."; From 23493a99627bcf0b6e9b35dcfe6f92d25b857086 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Sat, 28 Mar 2020 11:36:25 -0700 Subject: [PATCH 2/5] Bump .NET Core SDK to the latest (2.1.512) (#19257) * Bump .NET Core SDK to the latest (2.1.512) - use just-built aspnet/BuildTools * Clean up build of templating submodule - response file otherwise contains invalid `/p:RepositoryRoot="...\Templating\\\"` --- build/RepositoryBuild.targets | 6 ++++-- korebuild-lock.txt | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build/RepositoryBuild.targets b/build/RepositoryBuild.targets index 6457bbf13b..be439fc010 100644 --- a/build/RepositoryBuild.targets +++ b/build/RepositoryBuild.targets @@ -119,8 +119,9 @@ + + diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 4b446c4553..f879f18f8b 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.7-build-20190110.2 -commithash:00aefcfd284db33352f35bfa2c74c65f8580e372 +version:2.1.7-build-20200221.1 +commithash:96fb43f7c4a724d7af26b053240182760ac80a9b From 306ef044cf9c8500d4d37f930f2b3f64380b2622 Mon Sep 17 00:00:00 2001 From: John Luo Date: Sat, 28 Mar 2020 18:04:20 -0700 Subject: [PATCH 3/5] Conditionally enable/disable targeting pack tests (#20255) --- .../Microsoft.AspNetCore.App.UnitTests.csproj | 4 ++++ src/Framework/test/TargetingPackTests.cs | 16 ++++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj b/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj index 58eefd0a28..e79fd0ca25 100644 --- a/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj +++ b/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj @@ -36,6 +36,10 @@ <_Parameter1>TargetingPackLayoutRoot <_Parameter2>$(TargetingPackLayoutRoot) + + <_Parameter1>IsTargetingPackBuilding + <_Parameter2>$(IsTargetingPackBuilding) + <_Parameter1>VerifyAncmBinary <_Parameter2>$(VerifyAncmBinary) diff --git a/src/Framework/test/TargetingPackTests.cs b/src/Framework/test/TargetingPackTests.cs index 8e830707a3..54da276513 100644 --- a/src/Framework/test/TargetingPackTests.cs +++ b/src/Framework/test/TargetingPackTests.cs @@ -20,17 +20,24 @@ namespace Microsoft.AspNetCore private readonly string _expectedRid; private readonly string _targetingPackRoot; private readonly ITestOutputHelper _output; + private readonly bool _isTargetingPackBuilding; public TargetingPackTests(ITestOutputHelper output) { _output = output; _expectedRid = TestData.GetSharedFxRuntimeIdentifier(); _targetingPackRoot = Path.Combine(TestData.GetTestDataValue("TargetingPackLayoutRoot"), "packs", "Microsoft.AspNetCore.App.Ref", TestData.GetTestDataValue("TargetingPackVersion")); + _isTargetingPackBuilding = bool.Parse(TestData.GetTestDataValue("IsTargetingPackBuilding")); } - [Fact(Skip="https://github.com/aspnet/AspNetCore/issues/14832")] + [Fact] public void AssembliesAreReferenceAssemblies() { + if (!_isTargetingPackBuilding) + { + return; + } + IEnumerable dlls = Directory.GetFiles(_targetingPackRoot, "*.dll", SearchOption.AllDirectories); Assert.NotEmpty(dlls); @@ -55,9 +62,14 @@ namespace Microsoft.AspNetCore }); } - [Fact(Skip="https://github.com/aspnet/AspNetCore/issues/14832")] + [Fact] public void PlatformManifestListsAllFiles() { + if (!_isTargetingPackBuilding) + { + return; + } + var platformManifestPath = Path.Combine(_targetingPackRoot, "data", "PlatformManifest.txt"); var expectedAssemblies = TestData.GetSharedFxDependencies() .Split(';', StringSplitOptions.RemoveEmptyEntries) From ffab087b73506f6622eff69e087efcb557efeef4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Apr 2020 03:45:29 +0000 Subject: [PATCH 4/5] Update dependencies from https://github.com/dotnet/efcore build 20200331.4 (#20392) - Microsoft.EntityFrameworkCore.Tools - 3.1.4 - Microsoft.EntityFrameworkCore.InMemory - 3.1.4 - Microsoft.EntityFrameworkCore - 3.1.4 - Microsoft.EntityFrameworkCore.Relational - 3.1.4 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.4 - dotnet-ef - 3.1.4 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.4 Dependency coherency updates - Microsoft.AspNetCore.Analyzer.Testing - 3.1.4-servicing.20181.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.1.4-servicing.20181.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ActivatorUtilities.Sources - 3.1.4-servicing.20181.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Abstractions - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Memory - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.SqlServer - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.StackExchangeRedis - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.CommandLineUtils.Sources - 3.1.4-servicing.20181.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Abstractions - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.AzureKeyVault - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Binder - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.CommandLine - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.EnvironmentVariables - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.FileExtensions - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Ini - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Json - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.KeyPerFile - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.UserSecrets - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Xml - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection.Abstractions - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DiagnosticAdapter - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Abstractions - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Composite - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Embedded - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Physical - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileSystemGlobbing - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HashCodeCombiner.Sources - 3.1.4-servicing.20181.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting.Abstractions - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HostFactoryResolver.Sources - 3.1.4-servicing.20181.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Http - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization.Abstractions - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Abstractions - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.AzureAppServices - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Configuration - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Console - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Debug - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventSource - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventLog - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.TraceSource - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Testing - 3.1.4-servicing.20181.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ObjectPool - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.ConfigurationExtensions - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.DataAnnotations - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ParameterDefaultValue.Sources - 3.1.4-servicing.20181.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Primitives - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.TypeNameHelper.Sources - 3.1.4-servicing.20181.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ValueStopwatch.Sources - 3.1.4-servicing.20181.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.WebEncoders - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.JSInterop - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.4 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyModel - 3.1.4 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.App.Internal - 3.1.4-servicing.20181.1 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.Platforms - 3.1.1-servicing.20176.6 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Internal.AspNetCore.Analyzers - 3.1.4-servicing.20181.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.Testing - 3.1.4-servicing.20181.3 (parent: Microsoft.EntityFrameworkCore) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 5 +- eng/Version.Details.xml | 172 ++++++++++++++++++++-------------------- eng/Versions.props | 32 ++++---- 3 files changed, 105 insertions(+), 104 deletions(-) diff --git a/NuGet.config b/NuGet.config index 18e9d0cf68..2a891f55d5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,8 +3,9 @@ - - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff722eff07..394569febf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -31,259 +31,259 @@ https://github.com/dotnet/efcore - 00f57950901b46a4ee065edd6fe8594f1caa7b1f + a9649445567338214dd1e6c944b71a23480b5b9a https://github.com/dotnet/efcore - 00f57950901b46a4ee065edd6fe8594f1caa7b1f + a9649445567338214dd1e6c944b71a23480b5b9a https://github.com/dotnet/efcore - 00f57950901b46a4ee065edd6fe8594f1caa7b1f + a9649445567338214dd1e6c944b71a23480b5b9a https://github.com/dotnet/efcore - 00f57950901b46a4ee065edd6fe8594f1caa7b1f + a9649445567338214dd1e6c944b71a23480b5b9a https://github.com/dotnet/efcore - 00f57950901b46a4ee065edd6fe8594f1caa7b1f + a9649445567338214dd1e6c944b71a23480b5b9a https://github.com/dotnet/efcore - 00f57950901b46a4ee065edd6fe8594f1caa7b1f + a9649445567338214dd1e6c944b71a23480b5b9a https://github.com/dotnet/efcore - 00f57950901b46a4ee065edd6fe8594f1caa7b1f + a9649445567338214dd1e6c944b71a23480b5b9a - + https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 - + https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 - + https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 - + https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 - + https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 - + https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 - + https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 - + https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 - + https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 - + https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/corefx @@ -373,25 +373,25 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - + https://github.com/dotnet/core-setup - 866f89c19bfb6bcb3d861cc424643765a441d396 + 87da73b3299b0dd151585d3811bd9b5dec30318b - + https://github.com/dotnet/core-setup - 866f89c19bfb6bcb3d861cc424643765a441d396 + 87da73b3299b0dd151585d3811bd9b5dec30318b https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - 866f89c19bfb6bcb3d861cc424643765a441d396 + 87da73b3299b0dd151585d3811bd9b5dec30318b @@ -405,13 +405,13 @@ - + https://github.com/dotnet/corefx - c5f41f1b6bec47ee8c1a4daba911b65723540da5 + 78ef3883a0a2ca585ebf9392c2ee6897d611cfe7 - + https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/arcade @@ -425,9 +425,9 @@ https://github.com/dotnet/arcade 15f00efd583eab4372b2e9ca25bd80ace5b119ad - + https://github.com/dotnet/extensions - 6ea53eeff45bed83b1df5a19433b20e4177fbb8c + 4622c9253dbbe02fee450da6c1d71095ad4f6493 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 4cbf2c2548..75158ed6ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,10 +66,10 @@ 3.4.1-beta4-20127-10 - 3.1.4-servicing.20176.1 - 3.1.4-servicing.20176.1 + 3.1.4 + 3.1.4-servicing.20181.1 3.1.0 - 3.1.4-servicing.20176.1 + 3.1.4 2.1.0 1.1.0 @@ -95,20 +95,20 @@ 4.7.0 4.7.0 - 3.1.1-servicing.20176.2 + 3.1.1-servicing.20176.6 3.1.0-preview4.19605.1 - 3.1.4-servicing.20176.6 - 3.1.4-servicing.20176.6 - 3.1.4-servicing.20176.6 - 3.1.4-servicing.20176.6 - 3.1.4-servicing.20176.6 + 3.1.4-servicing.20181.3 + 3.1.4-servicing.20181.3 + 3.1.4-servicing.20181.3 + 3.1.4-servicing.20181.3 + 3.1.4-servicing.20181.3 3.1.4 3.1.4 3.1.4 3.1.4 - 3.1.4-servicing.20176.6 + 3.1.4-servicing.20181.3 3.1.4 3.1.4 3.1.4 @@ -131,10 +131,10 @@ 3.1.4 3.1.4 3.1.4 - 3.1.4-servicing.20176.6 + 3.1.4-servicing.20181.3 3.1.4 3.1.4 - 3.1.4-servicing.20176.6 + 3.1.4-servicing.20181.3 3.1.4 3.1.4 3.1.4 @@ -146,16 +146,16 @@ 3.1.4 3.1.4 3.1.4 - 3.1.4-servicing.20176.6 + 3.1.4-servicing.20181.3 3.1.4 3.1.4 3.1.4 3.1.4 3.1.4 - 3.1.4-servicing.20176.6 + 3.1.4-servicing.20181.3 3.1.4 - 3.1.4-servicing.20176.6 - 3.1.4-servicing.20176.6 + 3.1.4-servicing.20181.3 + 3.1.4-servicing.20181.3 3.1.4 3.1.0-rtm.19565.4 3.1.4 From d2fa99aa85c7ee4fa95d0b729d57fcf69e15f802 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Apr 2020 07:16:57 +0000 Subject: [PATCH 5/5] Update dependencies from https://github.com/dotnet/efcore build 20200331.5 (#20399) - Microsoft.EntityFrameworkCore.Tools - 3.1.4 - Microsoft.EntityFrameworkCore.InMemory - 3.1.4 - Microsoft.EntityFrameworkCore - 3.1.4 - Microsoft.EntityFrameworkCore.Relational - 3.1.4 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.4 - dotnet-ef - 3.1.4 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.4 Dependency coherency updates - Microsoft.AspNetCore.Analyzer.Testing - 3.1.4-servicing.20181.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.1.4-servicing.20181.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ActivatorUtilities.Sources - 3.1.4-servicing.20181.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Abstractions - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Memory - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.SqlServer - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.StackExchangeRedis - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.CommandLineUtils.Sources - 3.1.4-servicing.20181.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Abstractions - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.AzureKeyVault - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Binder - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.CommandLine - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.EnvironmentVariables - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.FileExtensions - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Ini - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Json - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.KeyPerFile - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.UserSecrets - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Xml - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection.Abstractions - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DiagnosticAdapter - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Abstractions - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Composite - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Embedded - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Physical - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileSystemGlobbing - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HashCodeCombiner.Sources - 3.1.4-servicing.20181.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting.Abstractions - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HostFactoryResolver.Sources - 3.1.4-servicing.20181.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Http - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization.Abstractions - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Abstractions - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.AzureAppServices - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Configuration - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Console - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Debug - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventSource - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventLog - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.TraceSource - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Testing - 3.1.4-servicing.20181.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ObjectPool - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.ConfigurationExtensions - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.DataAnnotations - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ParameterDefaultValue.Sources - 3.1.4-servicing.20181.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Primitives - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.TypeNameHelper.Sources - 3.1.4-servicing.20181.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ValueStopwatch.Sources - 3.1.4-servicing.20181.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.WebEncoders - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.JSInterop - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.4 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - System.Text.Json - 4.7.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.Extensions.DependencyModel - 3.1.4 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.App.Internal - 3.1.4-servicing.20181.2 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.Platforms - 3.1.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Internal.AspNetCore.Analyzers - 3.1.4-servicing.20181.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.Testing - 3.1.4-servicing.20181.5 (parent: Microsoft.EntityFrameworkCore) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 8 +- eng/Version.Details.xml | 172 ++++++++++++++++++++-------------------- eng/Versions.props | 30 +++---- 3 files changed, 105 insertions(+), 105 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2a891f55d5..d3a2804e2a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,10 +3,10 @@ - - - - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 394569febf..4528f749eb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -31,259 +31,259 @@ https://github.com/dotnet/efcore - a9649445567338214dd1e6c944b71a23480b5b9a + 7c74e87eccf3a1785ff73d77b769226e6b2ab458 https://github.com/dotnet/efcore - a9649445567338214dd1e6c944b71a23480b5b9a + 7c74e87eccf3a1785ff73d77b769226e6b2ab458 https://github.com/dotnet/efcore - a9649445567338214dd1e6c944b71a23480b5b9a + 7c74e87eccf3a1785ff73d77b769226e6b2ab458 https://github.com/dotnet/efcore - a9649445567338214dd1e6c944b71a23480b5b9a + 7c74e87eccf3a1785ff73d77b769226e6b2ab458 https://github.com/dotnet/efcore - a9649445567338214dd1e6c944b71a23480b5b9a + 7c74e87eccf3a1785ff73d77b769226e6b2ab458 https://github.com/dotnet/efcore - a9649445567338214dd1e6c944b71a23480b5b9a + 7c74e87eccf3a1785ff73d77b769226e6b2ab458 https://github.com/dotnet/efcore - a9649445567338214dd1e6c944b71a23480b5b9a + 7c74e87eccf3a1785ff73d77b769226e6b2ab458 - + https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d - + https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d - + https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d - + https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d - + https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d - + https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d - + https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d - + https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d - + https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d - + https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/corefx @@ -361,9 +361,9 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - + https://github.com/dotnet/corefx - e946cebe43a510e8c6476bbc8185d1445df33a1a + 282d5b9f83e7a4e7fe0cef268f4f8f85e6162510 https://github.com/dotnet/corefx @@ -375,7 +375,7 @@ https://github.com/dotnet/core-setup - 87da73b3299b0dd151585d3811bd9b5dec30318b + 57d5bbb58f17a8cb3a82c81839c9379b4fcfe0d8 https://github.com/dotnet/core-setup - 87da73b3299b0dd151585d3811bd9b5dec30318b + 57d5bbb58f17a8cb3a82c81839c9379b4fcfe0d8 https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - 87da73b3299b0dd151585d3811bd9b5dec30318b + 57d5bbb58f17a8cb3a82c81839c9379b4fcfe0d8 @@ -405,13 +405,13 @@ - + https://github.com/dotnet/corefx - 78ef3883a0a2ca585ebf9392c2ee6897d611cfe7 + 282d5b9f83e7a4e7fe0cef268f4f8f85e6162510 - + https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/arcade @@ -425,9 +425,9 @@ https://github.com/dotnet/arcade 15f00efd583eab4372b2e9ca25bd80ace5b119ad - + https://github.com/dotnet/extensions - 4622c9253dbbe02fee450da6c1d71095ad4f6493 + cf044102f01a3402a680fa58cabea8a9ca53aa3d https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 75158ed6ac..d9fb46f2d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,7 +67,7 @@ 3.4.1-beta4-20127-10 3.1.4 - 3.1.4-servicing.20181.1 + 3.1.4-servicing.20181.2 3.1.0 3.1.4 2.1.0 @@ -91,24 +91,24 @@ 4.7.0 4.7.0 4.7.0 - 4.7.1 + 4.7.2 4.7.0 4.7.0 - 3.1.1-servicing.20176.6 + 3.1.1 3.1.0-preview4.19605.1 - 3.1.4-servicing.20181.3 - 3.1.4-servicing.20181.3 - 3.1.4-servicing.20181.3 - 3.1.4-servicing.20181.3 - 3.1.4-servicing.20181.3 + 3.1.4-servicing.20181.5 + 3.1.4-servicing.20181.5 + 3.1.4-servicing.20181.5 + 3.1.4-servicing.20181.5 + 3.1.4-servicing.20181.5 3.1.4 3.1.4 3.1.4 3.1.4 - 3.1.4-servicing.20181.3 + 3.1.4-servicing.20181.5 3.1.4 3.1.4 3.1.4 @@ -131,10 +131,10 @@ 3.1.4 3.1.4 3.1.4 - 3.1.4-servicing.20181.3 + 3.1.4-servicing.20181.5 3.1.4 3.1.4 - 3.1.4-servicing.20181.3 + 3.1.4-servicing.20181.5 3.1.4 3.1.4 3.1.4 @@ -146,16 +146,16 @@ 3.1.4 3.1.4 3.1.4 - 3.1.4-servicing.20181.3 + 3.1.4-servicing.20181.5 3.1.4 3.1.4 3.1.4 3.1.4 3.1.4 - 3.1.4-servicing.20181.3 + 3.1.4-servicing.20181.5 3.1.4 - 3.1.4-servicing.20181.3 - 3.1.4-servicing.20181.3 + 3.1.4-servicing.20181.5 + 3.1.4-servicing.20181.5 3.1.4 3.1.0-rtm.19565.4 3.1.4