From f0091d8946012dcdeaf7162a9b6236a8e9433574 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 3 Oct 2019 16:25:17 +0000 Subject: [PATCH 1/4] Update dependencies from https://github.com/aspnet/Extensions build 20191003.1 - Microsoft.Extensions.DependencyInjection - 3.0.1-servicing.19503.1 - Microsoft.Extensions.Configuration.Json - 3.0.1-servicing.19503.1 - Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.1-servicing.19503.1 - Microsoft.Extensions.Configuration - 3.0.1-servicing.19503.1 - Microsoft.Extensions.Caching.Memory - 3.0.1-servicing.19503.1 - Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.1-servicing.19503.1 - Microsoft.Extensions.Logging - 3.0.1-servicing.19503.1 Dependency coherency updates - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.1 (parent: Microsoft.Extensions.Logging) - Microsoft.DotNet.PlatformAbstractions - 3.0.1 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.DependencyModel - 3.0.1 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.App.Ref - 3.0.1 (parent: Microsoft.Extensions.Logging) - NETStandard.Library.Ref - 2.1.0 (parent: Microsoft.Extensions.Logging) --- NuGet.config | 1 + eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++++----------- 3 files changed, 37 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index 322aec3be4b..1067c236656 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,6 +3,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92e62e11ceb..10cc9745ae6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,53 +5,53 @@ https://github.com/dotnet/corefx bedb348c4d93b6172967df6cdeea0272c81eb752 - + https://github.com/dotnet/core-setup - 93abb6b3a675b44ee35698d9640a42779b18e004 + d34d1570bfdf669ed94b4c939b2f39a1650e2320 - + https://github.com/aspnet/Extensions - d92e5d70fb47137438f4c614ea9fe6ebddb55407 + 1544a6c0f628df50caf8f8bb6d22b176a1d1b9b6 - + https://github.com/aspnet/Extensions - d92e5d70fb47137438f4c614ea9fe6ebddb55407 + 1544a6c0f628df50caf8f8bb6d22b176a1d1b9b6 - + https://github.com/aspnet/Extensions - d92e5d70fb47137438f4c614ea9fe6ebddb55407 + 1544a6c0f628df50caf8f8bb6d22b176a1d1b9b6 - + https://github.com/aspnet/Extensions - d92e5d70fb47137438f4c614ea9fe6ebddb55407 + 1544a6c0f628df50caf8f8bb6d22b176a1d1b9b6 - + https://github.com/aspnet/Extensions - d92e5d70fb47137438f4c614ea9fe6ebddb55407 + 1544a6c0f628df50caf8f8bb6d22b176a1d1b9b6 - + https://github.com/dotnet/core-setup - 93abb6b3a675b44ee35698d9640a42779b18e004 + d34d1570bfdf669ed94b4c939b2f39a1650e2320 - + https://github.com/aspnet/Extensions - d92e5d70fb47137438f4c614ea9fe6ebddb55407 + 1544a6c0f628df50caf8f8bb6d22b176a1d1b9b6 - + https://github.com/aspnet/Extensions - d92e5d70fb47137438f4c614ea9fe6ebddb55407 + 1544a6c0f628df50caf8f8bb6d22b176a1d1b9b6 - + https://github.com/dotnet/core-setup - 93abb6b3a675b44ee35698d9640a42779b18e004 + d34d1570bfdf669ed94b4c939b2f39a1650e2320 - + https://github.com/dotnet/core-setup - 93abb6b3a675b44ee35698d9640a42779b18e004 + d34d1570bfdf669ed94b4c939b2f39a1650e2320 - + https://github.com/dotnet/core-setup - 93abb6b3a675b44ee35698d9640a42779b18e004 + d34d1570bfdf669ed94b4c939b2f39a1650e2320 https://github.com/dotnet/corefx diff --git a/eng/Versions.props b/eng/Versions.props index 05913d9bea0..caa94b25af4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,13 +32,13 @@ 1.0.19249.1 - 3.0.1-servicing.19502.3 - 3.0.1-servicing.19502.3 - 3.0.1-servicing.19502.3 - 3.0.1-servicing.19502.3 - 3.0.1-servicing.19502.3 - 3.0.1-servicing.19502.3 - 3.0.1-servicing.19502.3 + 3.0.1-servicing.19503.1 + 3.0.1-servicing.19503.1 + 3.0.1-servicing.19503.1 + 3.0.1-servicing.19503.1 + 3.0.1-servicing.19503.1 + 3.0.1-servicing.19503.1 + 3.0.1-servicing.19503.1 4.6.0 @@ -47,11 +47,11 @@ 4.6.0 - 3.0.1-servicing-19502-01 - 3.0.1-servicing-19502-01 - 3.0.1-servicing-19502-01 - 3.0.1-servicing-19502-01 - 2.1.0-servicing-19502-01 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 2.1.0 3.3.1-beta4-19462-11 From 72298a2c7bf7b570ebc309c962e99338d994bbed Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 4 Oct 2019 15:40:44 +0000 Subject: [PATCH 2/4] Update dependencies from https://github.com/aspnet/Extensions build 20191004.1 - Microsoft.Extensions.DependencyInjection - 3.0.1-servicing.19504.1 - Microsoft.Extensions.Configuration.Json - 3.0.1-servicing.19504.1 - Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.1-servicing.19504.1 - Microsoft.Extensions.Configuration - 3.0.1-servicing.19504.1 - Microsoft.Extensions.Caching.Memory - 3.0.1-servicing.19504.1 - Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.1-servicing.19504.1 - Microsoft.Extensions.Logging - 3.0.1-servicing.19504.1 Dependency coherency updates - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0 (parent: Microsoft.Extensions.Logging) - Microsoft.DotNet.PlatformAbstractions - 3.0.0 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.DependencyModel - 3.0.0 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.App.Ref - 3.0.0 (parent: Microsoft.Extensions.Logging) - NETStandard.Library.Ref - 2.1.0 (parent: Microsoft.Extensions.Logging) - System.Collections.Immutable - 1.6.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.ComponentModel.Annotations - 4.6.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Diagnostics.DiagnosticSource - 4.6.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- NuGet.config | 3 ++- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++--------- 3 files changed, 39 insertions(+), 38 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1067c236656..cd459588a1f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,8 +3,9 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 10cc9745ae6..0eabad7241b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,65 +5,65 @@ https://github.com/dotnet/corefx bedb348c4d93b6172967df6cdeea0272c81eb752 - + https://github.com/dotnet/core-setup - d34d1570bfdf669ed94b4c939b2f39a1650e2320 + 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/aspnet/Extensions - 1544a6c0f628df50caf8f8bb6d22b176a1d1b9b6 + 40cae905d5617de159c9d19b1f4f33da9d879f10 - + https://github.com/aspnet/Extensions - 1544a6c0f628df50caf8f8bb6d22b176a1d1b9b6 + 40cae905d5617de159c9d19b1f4f33da9d879f10 - + https://github.com/aspnet/Extensions - 1544a6c0f628df50caf8f8bb6d22b176a1d1b9b6 + 40cae905d5617de159c9d19b1f4f33da9d879f10 - + https://github.com/aspnet/Extensions - 1544a6c0f628df50caf8f8bb6d22b176a1d1b9b6 + 40cae905d5617de159c9d19b1f4f33da9d879f10 - + https://github.com/aspnet/Extensions - 1544a6c0f628df50caf8f8bb6d22b176a1d1b9b6 + 40cae905d5617de159c9d19b1f4f33da9d879f10 - + https://github.com/dotnet/core-setup - d34d1570bfdf669ed94b4c939b2f39a1650e2320 + 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/aspnet/Extensions - 1544a6c0f628df50caf8f8bb6d22b176a1d1b9b6 + 40cae905d5617de159c9d19b1f4f33da9d879f10 - + https://github.com/aspnet/Extensions - 1544a6c0f628df50caf8f8bb6d22b176a1d1b9b6 + 40cae905d5617de159c9d19b1f4f33da9d879f10 - + https://github.com/dotnet/core-setup - d34d1570bfdf669ed94b4c939b2f39a1650e2320 + 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - d34d1570bfdf669ed94b4c939b2f39a1650e2320 + 7d57652f33493fa022125b7f63aad0d70c52d810 https://github.com/dotnet/core-setup - d34d1570bfdf669ed94b4c939b2f39a1650e2320 + 7d57652f33493fa022125b7f63aad0d70c52d810 https://github.com/dotnet/corefx - bedb348c4d93b6172967df6cdeea0272c81eb752 + 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea https://github.com/dotnet/corefx - bedb348c4d93b6172967df6cdeea0272c81eb752 + 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea https://github.com/dotnet/corefx - bedb348c4d93b6172967df6cdeea0272c81eb752 + 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea diff --git a/eng/Versions.props b/eng/Versions.props index caa94b25af4..70a8813cf74 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,13 +32,13 @@ 1.0.19249.1 - 3.0.1-servicing.19503.1 - 3.0.1-servicing.19503.1 - 3.0.1-servicing.19503.1 - 3.0.1-servicing.19503.1 - 3.0.1-servicing.19503.1 - 3.0.1-servicing.19503.1 - 3.0.1-servicing.19503.1 + 3.0.1-servicing.19504.1 + 3.0.1-servicing.19504.1 + 3.0.1-servicing.19504.1 + 3.0.1-servicing.19504.1 + 3.0.1-servicing.19504.1 + 3.0.1-servicing.19504.1 + 3.0.1-servicing.19504.1 4.6.0 @@ -47,10 +47,10 @@ 4.6.0 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 + 3.0.0 + 3.0.0 + 3.0.0 + 3.0.0 2.1.0 From 2e5b95a4470731599323fc039a9e0cecb45ec06a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 4 Oct 2019 23:25:18 +0000 Subject: [PATCH 3/4] Update dependencies from https://github.com/aspnet/Extensions build 20191004.7 - Microsoft.Extensions.DependencyInjection - 3.0.1 - Microsoft.Extensions.Configuration.Json - 3.0.1 - Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.1 - Microsoft.Extensions.Configuration - 3.0.1 - Microsoft.Extensions.Caching.Memory - 3.0.1 - Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.1-servicing.19504.7 - Microsoft.Extensions.Logging - 3.0.1 Dependency coherency updates - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.1 (parent: Microsoft.Extensions.Logging) - Microsoft.DotNet.PlatformAbstractions - 3.0.1 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.DependencyModel - 3.0.1 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.App.Ref - 3.0.1 (parent: Microsoft.Extensions.Logging) - NETStandard.Library.Ref - 2.1.0 (parent: Microsoft.Extensions.Logging) --- NuGet.config | 3 ++- eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++++---------- 3 files changed, 36 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index cd459588a1f..481af2595e9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,9 +3,10 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0eabad7241b..8a140ac0ab1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,53 +5,53 @@ https://github.com/dotnet/corefx bedb348c4d93b6172967df6cdeea0272c81eb752 - + https://github.com/dotnet/core-setup - 7d57652f33493fa022125b7f63aad0d70c52d810 + d34d1570bfdf669ed94b4c939b2f39a1650e2320 - + https://github.com/aspnet/Extensions - 40cae905d5617de159c9d19b1f4f33da9d879f10 + 1a34885e2800a7b387e006a12d72a5a19febf922 - + https://github.com/aspnet/Extensions - 40cae905d5617de159c9d19b1f4f33da9d879f10 + 1a34885e2800a7b387e006a12d72a5a19febf922 - + https://github.com/aspnet/Extensions - 40cae905d5617de159c9d19b1f4f33da9d879f10 + 1a34885e2800a7b387e006a12d72a5a19febf922 - + https://github.com/aspnet/Extensions - 40cae905d5617de159c9d19b1f4f33da9d879f10 + 1a34885e2800a7b387e006a12d72a5a19febf922 - + https://github.com/aspnet/Extensions - 40cae905d5617de159c9d19b1f4f33da9d879f10 + 1a34885e2800a7b387e006a12d72a5a19febf922 - + https://github.com/dotnet/core-setup - 7d57652f33493fa022125b7f63aad0d70c52d810 + d34d1570bfdf669ed94b4c939b2f39a1650e2320 - + https://github.com/aspnet/Extensions - 40cae905d5617de159c9d19b1f4f33da9d879f10 + 1a34885e2800a7b387e006a12d72a5a19febf922 - + https://github.com/aspnet/Extensions - 40cae905d5617de159c9d19b1f4f33da9d879f10 + 1a34885e2800a7b387e006a12d72a5a19febf922 - + https://github.com/dotnet/core-setup - 7d57652f33493fa022125b7f63aad0d70c52d810 + d34d1570bfdf669ed94b4c939b2f39a1650e2320 - + https://github.com/dotnet/core-setup - 7d57652f33493fa022125b7f63aad0d70c52d810 + d34d1570bfdf669ed94b4c939b2f39a1650e2320 https://github.com/dotnet/core-setup - 7d57652f33493fa022125b7f63aad0d70c52d810 + d34d1570bfdf669ed94b4c939b2f39a1650e2320 https://github.com/dotnet/corefx diff --git a/eng/Versions.props b/eng/Versions.props index 70a8813cf74..8b490679135 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,13 +32,13 @@ 1.0.19249.1 - 3.0.1-servicing.19504.1 - 3.0.1-servicing.19504.1 - 3.0.1-servicing.19504.1 - 3.0.1-servicing.19504.1 - 3.0.1-servicing.19504.1 - 3.0.1-servicing.19504.1 - 3.0.1-servicing.19504.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1-servicing.19504.7 + 3.0.1 4.6.0 @@ -47,10 +47,10 @@ 4.6.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 2.1.0 From 0f4612cfc0270776c9c184d47537a3d5bc425d21 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 4 Oct 2019 16:35:32 -0700 Subject: [PATCH 4/4] Pin microsoft.netcore.app.ref to 3.0.0 --- eng/Version.Details.xml | 9 +++++---- eng/Versions.props | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8a140ac0ab1..1b234d81c17 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,10 +41,6 @@ https://github.com/aspnet/Extensions 1a34885e2800a7b387e006a12d72a5a19febf922 - - https://github.com/dotnet/core-setup - d34d1570bfdf669ed94b4c939b2f39a1650e2320 - https://github.com/dotnet/core-setup d34d1570bfdf669ed94b4c939b2f39a1650e2320 @@ -65,6 +61,11 @@ https://github.com/dotnet/corefx 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea + + + https://github.com/dotnet/core-setup + 7d57652f33493fa022125b7f63aad0d70c52d810 + diff --git a/eng/Versions.props b/eng/Versions.props index 8b490679135..bd68250b1a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,7 +49,7 @@ 3.0.1 3.0.1 - 3.0.1 + 3.0.0 3.0.1 2.1.0