From 68908b5b26a7fb97441a1c4cc0c3f8db70191066 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 27 Mar 2020 04:26:26 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/efcore build 20200326.8 (#20222) - 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.20176.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.1.4-servicing.20176.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ActivatorUtilities.Sources - 3.1.4-servicing.20176.6 (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.20176.6 (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.20176.6 (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.20176.6 (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.20176.6 (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.20176.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Primitives - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.TypeNameHelper.Sources - 3.1.4-servicing.20176.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ValueStopwatch.Sources - 3.1.4-servicing.20176.6 (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-servicing.20176.1 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.1.4 (parent: Microsoft.EntityFrameworkCore) - System.IO.Pipelines - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - System.Runtime.CompilerServices.Unsafe - 4.7.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.Extensions.DependencyModel - 3.1.4-servicing.20176.1 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.App.Internal - 3.1.4-servicing.20176.1 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.Platforms - 3.1.1-servicing.20176.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Internal.AspNetCore.Analyzers - 3.1.4-servicing.20176.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.Testing - 3.1.4-servicing.20176.6 (parent: Microsoft.EntityFrameworkCore) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 6 +- eng/Version.Details.xml | 180 ++++++++++++++++++++-------------------- eng/Versions.props | 36 ++++---- 3 files changed, 110 insertions(+), 112 deletions(-) diff --git a/NuGet.config b/NuGet.config index a02474daeb..18e9d0cf68 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,11 +3,9 @@ - - - + + - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 73499d865c..ff722eff07 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -31,259 +31,259 @@ https://github.com/dotnet/efcore - 8ccce2b5c7ea02ee517e8ac1ecf6333141d79d98 + 00f57950901b46a4ee065edd6fe8594f1caa7b1f https://github.com/dotnet/efcore - 8ccce2b5c7ea02ee517e8ac1ecf6333141d79d98 + 00f57950901b46a4ee065edd6fe8594f1caa7b1f https://github.com/dotnet/efcore - 8ccce2b5c7ea02ee517e8ac1ecf6333141d79d98 + 00f57950901b46a4ee065edd6fe8594f1caa7b1f https://github.com/dotnet/efcore - 8ccce2b5c7ea02ee517e8ac1ecf6333141d79d98 + 00f57950901b46a4ee065edd6fe8594f1caa7b1f https://github.com/dotnet/efcore - 8ccce2b5c7ea02ee517e8ac1ecf6333141d79d98 + 00f57950901b46a4ee065edd6fe8594f1caa7b1f https://github.com/dotnet/efcore - 8ccce2b5c7ea02ee517e8ac1ecf6333141d79d98 + 00f57950901b46a4ee065edd6fe8594f1caa7b1f https://github.com/dotnet/efcore - 8ccce2b5c7ea02ee517e8ac1ecf6333141d79d98 + 00f57950901b46a4ee065edd6fe8594f1caa7b1f - + https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c - + https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c - + https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c - + https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c - + https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c - + https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c - + https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c - + https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c - + https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c - + https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/corefx @@ -313,9 +313,9 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - + https://github.com/dotnet/corefx - 8a3ffed558ddf943c1efa87d693227722d6af094 + 0f7f38c4fd323b26da10cce95f857f77f0f09b48 https://github.com/dotnet/corefx @@ -329,9 +329,9 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - + https://github.com/dotnet/corefx - 8a3ffed558ddf943c1efa87d693227722d6af094 + 0f7f38c4fd323b26da10cce95f857f77f0f09b48 https://github.com/dotnet/corefx @@ -373,25 +373,25 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - + https://github.com/dotnet/core-setup - 4a9f85e9f89d7f686fef2ae2109d876b1e2eed2a + 866f89c19bfb6bcb3d861cc424643765a441d396 - + https://github.com/dotnet/core-setup - 4a9f85e9f89d7f686fef2ae2109d876b1e2eed2a + 866f89c19bfb6bcb3d861cc424643765a441d396 https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - 4a9f85e9f89d7f686fef2ae2109d876b1e2eed2a + 866f89c19bfb6bcb3d861cc424643765a441d396 @@ -405,13 +405,13 @@ - + https://github.com/dotnet/corefx - 0f7f38c4fd323b26da10cce95f857f77f0f09b48 + c5f41f1b6bec47ee8c1a4daba911b65723540da5 - + https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/arcade @@ -425,9 +425,9 @@ https://github.com/dotnet/arcade 15f00efd583eab4372b2e9ca25bd80ace5b119ad - + https://github.com/dotnet/extensions - ff61512b5aed3c8e651820b9ccc66b2e6ec94389 + 6ea53eeff45bed83b1df5a19433b20e4177fbb8c https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index ce8a610949..4cbf2c2548 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,10 +66,10 @@ 3.4.1-beta4-20127-10 - 3.1.3 - 3.1.3-servicing.20128.1 + 3.1.4-servicing.20176.1 + 3.1.4-servicing.20176.1 3.1.0 - 3.1.3 + 3.1.4-servicing.20176.1 2.1.0 1.1.0 @@ -79,11 +79,11 @@ 4.7.0 4.7.0 4.7.0 - 4.7.1 + 4.7.0 4.7.0 4.7.0 1.8.0 - 4.7.1 + 4.7.0 4.7.0 4.7.0 4.7.0 @@ -95,20 +95,20 @@ 4.7.0 4.7.0 - 3.1.0 + 3.1.1-servicing.20176.2 3.1.0-preview4.19605.1 - 3.1.4-servicing.20176.4 - 3.1.4-servicing.20176.4 - 3.1.4-servicing.20176.4 - 3.1.4-servicing.20176.4 - 3.1.4-servicing.20176.4 + 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 3.1.4 3.1.4 3.1.4 - 3.1.4-servicing.20176.4 + 3.1.4-servicing.20176.6 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.4 + 3.1.4-servicing.20176.6 3.1.4 3.1.4 - 3.1.4-servicing.20176.4 + 3.1.4-servicing.20176.6 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.4 + 3.1.4-servicing.20176.6 3.1.4 3.1.4 3.1.4 3.1.4 3.1.4 - 3.1.4-servicing.20176.4 + 3.1.4-servicing.20176.6 3.1.4 - 3.1.4-servicing.20176.4 - 3.1.4-servicing.20176.4 + 3.1.4-servicing.20176.6 + 3.1.4-servicing.20176.6 3.1.4 3.1.0-rtm.19565.4 3.1.4 From 1040be35882ea9af85c026b6e998911b5d799926 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Fri, 27 Mar 2020 10:15:32 -0700 Subject: [PATCH 2/2] Include third-party-notices.txt in all packages (#20166) * Include third-party-notices.txt in all packages * Fix version test filename --- Directory.Build.targets | 8 ++++++++ .../src/Microsoft.AspNetCore.Blazor.Build.csproj | 1 + .../src/Microsoft.AspNetCore.Blazor.Build.nuspec | 2 +- .../src/Microsoft.AspNetCore.Blazor.DevServer.csproj | 1 + .../src/Microsoft.AspNetCore.Blazor.DevServer.nuspec | 2 +- .../src/Microsoft.AspNetCore.Components.csproj | 1 + ...Microsoft.AspNetCore.Components.multitarget.nuspec | 2 +- .../Microsoft.AspNetCore.Components.netcoreapp.nuspec | 2 +- src/Components/Directory.Build.props | 2 ++ src/Components/Directory.Build.targets | 2 -- .../src/Microsoft.AspNetCore.App.Runtime.csproj | 11 ++++++++++- src/Framework/test/SharedFxTests.cs | 2 +- .../UI/src/Microsoft.AspNetCore.Identity.UI.csproj | 2 +- 13 files changed, 29 insertions(+), 9 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index bc8bb5dfc8..94595c4b88 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -104,6 +104,14 @@ true + + $(RepoRoot)THIRD-PARTY-NOTICES.TXT + + + + + + diff --git a/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj b/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj index 2f5b3297f5..93fa3fa9d6 100644 --- a/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj +++ b/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj @@ -23,6 +23,7 @@ + diff --git a/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.nuspec b/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.nuspec index 26ca818d7f..2094d3fc5f 100644 --- a/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.nuspec +++ b/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.nuspec @@ -8,7 +8,7 @@ $CommonFileElements$ - + diff --git a/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj b/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj index 4749a781ca..53514cf36c 100644 --- a/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj +++ b/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj @@ -33,6 +33,7 @@ + diff --git a/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.nuspec b/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.nuspec index 2f0f6b8479..77df4b791b 100644 --- a/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.nuspec +++ b/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.nuspec @@ -7,6 +7,6 @@ $CommonFileElements$ - + diff --git a/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj b/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj index 6bc25e8d43..87960ab55f 100644 --- a/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj +++ b/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj @@ -54,6 +54,7 @@ + diff --git a/src/Components/Components/src/Microsoft.AspNetCore.Components.multitarget.nuspec b/src/Components/Components/src/Microsoft.AspNetCore.Components.multitarget.nuspec index 700ea95fa9..4bd2ba3b7c 100644 --- a/src/Components/Components/src/Microsoft.AspNetCore.Components.multitarget.nuspec +++ b/src/Components/Components/src/Microsoft.AspNetCore.Components.multitarget.nuspec @@ -21,6 +21,6 @@ - + diff --git a/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp.nuspec b/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp.nuspec index 8561bc2f2f..87fb784083 100644 --- a/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp.nuspec +++ b/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp.nuspec @@ -15,6 +15,6 @@ - + diff --git a/src/Components/Directory.Build.props b/src/Components/Directory.Build.props index 02d423b43e..b017bb81ea 100644 --- a/src/Components/Directory.Build.props +++ b/src/Components/Directory.Build.props @@ -16,6 +16,8 @@ $(MSBuildThisFileDirectory)Blazor\Build\src\bin\$(Configuration)\$(DefaultNetCoreTargetFramework)\ + + $(MSBuildThisFileDirectory)THIRD-PARTY-NOTICES.txt diff --git a/src/Components/Directory.Build.targets b/src/Components/Directory.Build.targets index b992960cc3..a3eb973629 100644 --- a/src/Components/Directory.Build.targets +++ b/src/Components/Directory.Build.targets @@ -4,8 +4,6 @@ - - $(IntermediateOutputPath)ignoreme.dev.runtimeconfig.json - $(IntermediateOutputPath).version + $(IntermediateOutputPath)$(SharedFxName).versions.txt none @@ -497,4 +497,13 @@ This package is an internal implementation of the .NET Core SDK and is not meant + + + + + + + diff --git a/src/Framework/test/SharedFxTests.cs b/src/Framework/test/SharedFxTests.cs index 2fc09b96b0..558fc34439 100644 --- a/src/Framework/test/SharedFxTests.cs +++ b/src/Framework/test/SharedFxTests.cs @@ -131,7 +131,7 @@ namespace Microsoft.AspNetCore [Fact] public void ItContainsVersionFile() { - var versionFile = Path.Combine(_sharedFxRoot, ".version"); + var versionFile = Path.Combine(_sharedFxRoot, "Microsoft.AspNetCore.App.versions.txt"); AssertEx.FileExists(versionFile); var lines = File.ReadAllLines(versionFile); Assert.Equal(2, lines.Length); diff --git a/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj b/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj index d803f42f5a..0f37a23a40 100644 --- a/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj +++ b/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj @@ -23,6 +23,7 @@ Bootstrap4 + $(MSBuildThisFileDirectory)THIRD-PARTY-NOTICES.TXT @@ -32,7 +33,6 @@ -