diff --git a/eng/Build.props b/eng/Build.props index 6f1b3f1908..8eb31fb823 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -191,6 +191,7 @@ $(RepoRoot)src\Security\**\src\*.csproj; $(RepoRoot)src\SiteExtensions\**\src\*.csproj; $(RepoRoot)src\Tools\**\src\*.csproj; + $(RepoRoot)src\Logging\**\src\*.csproj; $(RepoRoot)src\Middleware\**\src\*.csproj; $(RepoRoot)src\Razor\**\src\*.csproj; $(RepoRoot)src\Mvc\**\src\*.csproj; diff --git a/eng/Dependencies.props b/eng/Dependencies.props index d02e5158ae..6635f7f4e7 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -120,8 +120,6 @@ and are generated based on the last package release. - - diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props index dda9b06ce8..3f63f1a68a 100644 --- a/eng/ProjectReferences.props +++ b/eng/ProjectReferences.props @@ -32,6 +32,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 54c6b6f9fb..85f8f0dab9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -161,10 +161,6 @@ https://github.com/dotnet/extensions 050d3aea0c8b18579c426d7ff2cb196953540327 - - https://github.com/dotnet/extensions - 050d3aea0c8b18579c426d7ff2cb196953540327 - https://github.com/dotnet/extensions 050d3aea0c8b18579c426d7ff2cb196953540327 @@ -189,10 +185,6 @@ https://github.com/dotnet/extensions 050d3aea0c8b18579c426d7ff2cb196953540327 - - https://github.com/dotnet/extensions - 050d3aea0c8b18579c426d7ff2cb196953540327 - https://github.com/dotnet/extensions 050d3aea0c8b18579c426d7ff2cb196953540327 diff --git a/eng/Versions.props b/eng/Versions.props index cb0ea3d54a..8236a7f114 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -123,14 +123,12 @@ 5.0.0-preview.4.20201.1 5.0.0-preview.4.20201.1 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 5.0.0-preview.4.20201.1 5.0.0-preview.4.20201.1 5.0.0-preview.4.20201.1 5.0.0-preview.4.20201.1 5.0.0-preview.4.20201.1 5.0.0-preview.4.20201.1 - 5.0.0-preview.4.20201.1 5.0.0-preview.4.20201.1 5.0.0-preview.4.20201.1 5.0.0-preview.4.20201.1 diff --git a/src/Logging/Logging.AzureAppServices/ref/Microsoft.Extensions.Logging.AzureAppServices.csproj b/src/Logging/Logging.AzureAppServices/ref/Microsoft.Extensions.Logging.AzureAppServices.csproj deleted file mode 100644 index 0132b21870..0000000000 --- a/src/Logging/Logging.AzureAppServices/ref/Microsoft.Extensions.Logging.AzureAppServices.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - netstandard2.0 - - - - - - - - - - - diff --git a/src/Logging/Logging.AzureAppServices/ref/Microsoft.Extensions.Logging.AzureAppServices.netstandard2.0.cs b/src/Logging/Logging.AzureAppServices/ref/Microsoft.Extensions.Logging.AzureAppServices.netstandard2.0.cs deleted file mode 100644 index 9b8f637cff..0000000000 --- a/src/Logging/Logging.AzureAppServices/ref/Microsoft.Extensions.Logging.AzureAppServices.netstandard2.0.cs +++ /dev/null @@ -1,54 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -namespace Microsoft.Extensions.Logging -{ - public static partial class AzureAppServicesLoggerFactoryExtensions - { - public static Microsoft.Extensions.Logging.ILoggingBuilder AddAzureWebAppDiagnostics(this Microsoft.Extensions.Logging.ILoggingBuilder builder) { throw null; } - } -} -namespace Microsoft.Extensions.Logging.AzureAppServices -{ - public partial class AzureBlobLoggerOptions : Microsoft.Extensions.Logging.AzureAppServices.BatchingLoggerOptions - { - public AzureBlobLoggerOptions() { } - public string BlobName { get { throw null; } set { } } - } - public partial class AzureFileLoggerOptions : Microsoft.Extensions.Logging.AzureAppServices.BatchingLoggerOptions - { - public AzureFileLoggerOptions() { } - public string FileName { get { throw null; } set { } } - public int? FileSizeLimit { get { throw null; } set { } } - public int? RetainedFileCountLimit { get { throw null; } set { } } - } - public partial class BatchingLoggerOptions - { - public BatchingLoggerOptions() { } - public int? BackgroundQueueSize { get { throw null; } set { } } - public int? BatchSize { get { throw null; } set { } } - public System.TimeSpan FlushPeriod { get { throw null; } set { } } - public bool IncludeScopes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - public bool IsEnabled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - } - public abstract partial class BatchingLoggerProvider : Microsoft.Extensions.Logging.ILoggerProvider, Microsoft.Extensions.Logging.ISupportExternalScope, System.IDisposable - { - internal BatchingLoggerProvider() { } - public bool IsEnabled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } - public Microsoft.Extensions.Logging.ILogger CreateLogger(string categoryName) { throw null; } - public void Dispose() { } - protected virtual System.Threading.Tasks.Task IntervalAsync(System.TimeSpan interval, System.Threading.CancellationToken cancellationToken) { throw null; } - void Microsoft.Extensions.Logging.ISupportExternalScope.SetScopeProvider(Microsoft.Extensions.Logging.IExternalScopeProvider scopeProvider) { } - } - [Microsoft.Extensions.Logging.ProviderAliasAttribute("AzureAppServicesBlob")] - public partial class BlobLoggerProvider : Microsoft.Extensions.Logging.AzureAppServices.BatchingLoggerProvider - { - public BlobLoggerProvider(Microsoft.Extensions.Options.IOptionsMonitor options) { } - } - [Microsoft.Extensions.Logging.ProviderAliasAttribute("AzureAppServicesFile")] - public partial class FileLoggerProvider : Microsoft.Extensions.Logging.AzureAppServices.BatchingLoggerProvider - { - public FileLoggerProvider(Microsoft.Extensions.Options.IOptionsMonitor options) { } - } -} diff --git a/src/Logging/Logging.Testing/src/Microsoft.Extensions.Logging.Testing.csproj b/src/Logging/Logging.Testing/src/Microsoft.Extensions.Logging.Testing.csproj index 457843ba64..eabb677844 100644 --- a/src/Logging/Logging.Testing/src/Microsoft.Extensions.Logging.Testing.csproj +++ b/src/Logging/Logging.Testing/src/Microsoft.Extensions.Logging.Testing.csproj @@ -2,13 +2,11 @@ Helpers for writing tests that use Microsoft.Extensions.Logging. Contains null implementations of the abstractions that do nothing, as well as test implementations that are observable. - netstandard2.0;net461 + netstandard2.0;net472 $(NoWarn);CS1591 $(PackageTags);testing false - - true false true