diff --git a/src/libraries/Common/src/Extensions/ActivatorUtilities/Microsoft.Extensions.ActivatorUtilities.Sources.csproj b/src/libraries/Common/src/Extensions/ActivatorUtilities/Microsoft.Extensions.ActivatorUtilities.Sources.csproj deleted file mode 100644 index 85545d30c81002..00000000000000 --- a/src/libraries/Common/src/Extensions/ActivatorUtilities/Microsoft.Extensions.ActivatorUtilities.Sources.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - true - $(ContentTargetFolders)\cs\netstandard1.0\ - - - - - - diff --git a/src/libraries/Common/src/Extensions/BenchmarkRunner/Microsoft.AspNetCore.BenchmarkRunner.Sources.csproj b/src/libraries/Common/src/Extensions/BenchmarkRunner/Microsoft.AspNetCore.BenchmarkRunner.Sources.csproj deleted file mode 100644 index dec7fff6e5fd14..00000000000000 --- a/src/libraries/Common/src/Extensions/BenchmarkRunner/Microsoft.AspNetCore.BenchmarkRunner.Sources.csproj +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/libraries/Common/src/Extensions/CommandLineUtils/Microsoft.Extensions.CommandLineUtils.Sources.csproj b/src/libraries/Common/src/Extensions/CommandLineUtils/Microsoft.Extensions.CommandLineUtils.Sources.csproj deleted file mode 100644 index dec7fff6e5fd14..00000000000000 --- a/src/libraries/Common/src/Extensions/CommandLineUtils/Microsoft.Extensions.CommandLineUtils.Sources.csproj +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/libraries/Common/src/Extensions/HashCodeCombiner/Microsoft.Extensions.HashCodeCombiner.Sources.csproj b/src/libraries/Common/src/Extensions/HashCodeCombiner/Microsoft.Extensions.HashCodeCombiner.Sources.csproj deleted file mode 100644 index dec7fff6e5fd14..00000000000000 --- a/src/libraries/Common/src/Extensions/HashCodeCombiner/Microsoft.Extensions.HashCodeCombiner.Sources.csproj +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/libraries/Common/src/Extensions/HostFactoryResolver/Microsoft.Extensions.HostFactoryResolver.Sources.csproj b/src/libraries/Common/src/Extensions/HostFactoryResolver/Microsoft.Extensions.HostFactoryResolver.Sources.csproj deleted file mode 100644 index dec7fff6e5fd14..00000000000000 --- a/src/libraries/Common/src/Extensions/HostFactoryResolver/Microsoft.Extensions.HostFactoryResolver.Sources.csproj +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/libraries/Common/src/Extensions/NonCapturingTimer/Microsoft.Extensions.NonCapturingTimer.Sources.csproj b/src/libraries/Common/src/Extensions/NonCapturingTimer/Microsoft.Extensions.NonCapturingTimer.Sources.csproj deleted file mode 100644 index dec7fff6e5fd14..00000000000000 --- a/src/libraries/Common/src/Extensions/NonCapturingTimer/Microsoft.Extensions.NonCapturingTimer.Sources.csproj +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/libraries/Common/src/Extensions/ParameterDefaultValue/Microsoft.Extensions.ParameterDefaultValue.Sources.csproj b/src/libraries/Common/src/Extensions/ParameterDefaultValue/Microsoft.Extensions.ParameterDefaultValue.Sources.csproj deleted file mode 100644 index dec7fff6e5fd14..00000000000000 --- a/src/libraries/Common/src/Extensions/ParameterDefaultValue/Microsoft.Extensions.ParameterDefaultValue.Sources.csproj +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/libraries/Common/src/Extensions/TypeNameHelper/Microsoft.Extensions.TypeNameHelper.Sources.csproj b/src/libraries/Common/src/Extensions/TypeNameHelper/Microsoft.Extensions.TypeNameHelper.Sources.csproj deleted file mode 100644 index dec7fff6e5fd14..00000000000000 --- a/src/libraries/Common/src/Extensions/TypeNameHelper/Microsoft.Extensions.TypeNameHelper.Sources.csproj +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/libraries/Common/src/Extensions/ValueStopwatch/Microsoft.Extensions.ValueStopwatch.Sources.csproj b/src/libraries/Common/src/Extensions/ValueStopwatch/Microsoft.Extensions.ValueStopwatch.Sources.csproj deleted file mode 100644 index dec7fff6e5fd14..00000000000000 --- a/src/libraries/Common/src/Extensions/ValueStopwatch/Microsoft.Extensions.ValueStopwatch.Sources.csproj +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/libraries/Common/tests/Extensions/Microsoft.Extensions.Sources.Tests.csproj b/src/libraries/Common/tests/Extensions/Microsoft.Extensions.Sources.Tests.csproj deleted file mode 100644 index 5d7cd465c1cb92..00000000000000 --- a/src/libraries/Common/tests/Extensions/Microsoft.Extensions.Sources.Tests.csproj +++ /dev/null @@ -1,34 +0,0 @@ - - - - $(DefaultNetCoreTargetFramework);net472 - true - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/src/Microsoft.AspNetCore.Testing.csproj b/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/src/Microsoft.AspNetCore.Testing.csproj deleted file mode 100644 index a27f74f21a1535..00000000000000 --- a/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/src/Microsoft.AspNetCore.Testing.csproj +++ /dev/null @@ -1,50 +0,0 @@ - - - - Various helpers for writing tests that use ASP.NET Core. - netstandard2.0;net46 - $(NoWarn);CS1591 - true - aspnetcore - - false - true - - true - false - - - - - - - - - - - - - - - - - - - - - - - - True - contentFiles\cs\netstandard2.0\ - - - - diff --git a/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/src/xunit/FrameworkSkipConditionAttribute.cs b/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/src/xunit/FrameworkSkipConditionAttribute.cs index e41715a2ec06e9..029ffaa1d5f760 100644 --- a/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/src/xunit/FrameworkSkipConditionAttribute.cs +++ b/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/src/xunit/FrameworkSkipConditionAttribute.cs @@ -44,7 +44,7 @@ private static bool CanRunOnThisFramework(RuntimeFrameworks excludedFrameworks) { return false; } -#elif NETSTANDARD2_0 +#elif NETSTANDARD2_0 || NETCOREAPP if (excludedFrameworks.HasFlag(RuntimeFrameworks.CoreCLR)) { return false; diff --git a/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/test/Microsoft.AspNetCore.Testing.Tests.csproj b/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/test/Microsoft.AspNetCore.Testing.Tests.csproj deleted file mode 100644 index 654d48dcb1d490..00000000000000 --- a/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/test/Microsoft.AspNetCore.Testing.Tests.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - $(DefaultNetCoreTargetFramework);net472 - - - $(NoWarn);xUnit1004 - - $(NoWarn);xUnit1026 - - - - - - - - - - - - - - diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props index 0d1f1d6f9497be..71632768d2d3bc 100644 --- a/src/libraries/Directory.Build.props +++ b/src/libraries/Directory.Build.props @@ -4,36 +4,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - MicrosoftAspNetCore true - $(NoWarn);SA1129;SA1028;SA1027;SA1121;CA1200;SA1000;CA1507;CA1802;CA1825;CA1018;SA1648;CA2007;SA1001;SA1026 + $(NoWarn);SA1129;SA1028;SA1027;SA1121;CA1200;SA1000;CA1507;CA1802;CA1825;CA1018;SA1648;CA2007;SA1001;SA1026;CA1810;SA1206 $(NoWarn);CS0618 diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/pkg/Microsoft.Extensions.Caching.Memory.pkgproj b/src/libraries/Microsoft.Extensions.Caching.Memory/pkg/Microsoft.Extensions.Caching.Memory.pkgproj new file mode 100644 index 00000000000000..126073754466e1 --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Caching.Memory/pkg/Microsoft.Extensions.Caching.Memory.pkgproj @@ -0,0 +1,9 @@ + + + + + net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) + + + + \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.cs b/src/libraries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.cs index a1d47175fb2943..231e0ece267066 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.cs +++ b/src/libraries/Microsoft.Extensions.Caching.Memory/ref/Microsoft.Extensions.Caching.Memory.cs @@ -1,6 +1,9 @@ // 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. +// ------------------------------------------------------------------------------ +// Changes to this file must follow the https://aka.ms/api-review process. +// ------------------------------------------------------------------------------ namespace Microsoft.Extensions.Caching.Distributed { @@ -36,9 +39,9 @@ public void Remove(object key) { } public partial class MemoryCacheOptions : Microsoft.Extensions.Options.IOptions { public MemoryCacheOptions() { } - public Microsoft.Extensions.Internal.ISystemClock Clock { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } + public Microsoft.Extensions.Internal.ISystemClock Clock { get { throw null; } set { } } public double CompactionPercentage { get { throw null; } set { } } - public System.TimeSpan ExpirationScanFrequency { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } + public System.TimeSpan ExpirationScanFrequency { get { throw null; } set { } } Microsoft.Extensions.Caching.Memory.MemoryCacheOptions Microsoft.Extensions.Options.IOptions.Value { get { throw null; } } public long? SizeLimit { get { throw null; } set { } } } diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/src/CacheEntryHelper.cs b/src/libraries/Microsoft.Extensions.Caching.Memory/src/CacheEntryHelper.cs index a88b674e8fbb03..f79341984008b7 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Memory/src/CacheEntryHelper.cs +++ b/src/libraries/Microsoft.Extensions.Caching.Memory/src/CacheEntryHelper.cs @@ -50,7 +50,7 @@ private static CacheEntryStack GetOrCreateScopes() private sealed class ScopeLease : IDisposable { - readonly CacheEntryStack _cacheEntryStack; + private readonly CacheEntryStack _cacheEntryStack; public ScopeLease(CacheEntryStack cacheEntryStack) { diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj b/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj index d3a007618f5695..adb6a59860baa2 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj +++ b/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/tests/CapacityTests.cs b/src/libraries/Microsoft.Extensions.Caching.Memory/tests/CapacityTests.cs index 875bd861928d7a..276ff07ad5a1d9 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Memory/tests/CapacityTests.cs +++ b/src/libraries/Microsoft.Extensions.Caching.Memory/tests/CapacityTests.cs @@ -7,12 +7,11 @@ using System.Threading.Tasks; using Microsoft.Extensions.Caching.Memory.Infrastructure; using Microsoft.Extensions.Internal; -using Microsoft.Extensions.Logging.Testing; using Xunit; namespace Microsoft.Extensions.Caching.Memory { - public class CapacityTests : LoggedTestBase + public class CapacityTests { [Fact] public void MemoryDistributedCacheOptionsDefaultsTo200MBSizeLimit() @@ -112,13 +111,9 @@ public void DoNotAddEntryIfItExceedsCapacity() } [Fact] - [CollectDump] public async Task DoNotAddIfSizeOverflows() { - var cache = new MemoryCache(new MemoryCacheOptions - { - SizeLimit = long.MaxValue - }, LoggerFactory); + var cache = new MemoryCache(new MemoryCacheOptions { SizeLimit = long.MaxValue }); var entryOptions = new MemoryCacheEntryOptions { Size = long.MaxValue }; var sem = new SemaphoreSlim(0, 1); @@ -148,7 +143,6 @@ public async Task DoNotAddIfSizeOverflows() } [Fact] - [CollectDump] public async Task ExceedsCapacityCompacts() { var cache = new MemoryCache(new MemoryCacheOptions @@ -242,7 +236,7 @@ public void AddingReplacementWhenTotalSizeExceedsCapacityDoesNotUpdateAndRemoves } [Fact] - [CollectDump] + [ActiveIssue("https://github.com/dotnet/runtime/issues/34102")] public async Task AddingReplacementWhenTotalSizeExceedsCapacityDoesNotUpdateRemovesOldEntryAndTriggersCompaction() { var cache = new MemoryCache(new MemoryCacheOptions @@ -312,7 +306,6 @@ public void RemovingEntryDecreasesCacheSize() } [Fact] - [CollectDump] public async Task ExpiringEntryDecreasesCacheSize() { var cache = new MemoryCache(new MemoryCacheOptions @@ -348,7 +341,6 @@ public async Task ExpiringEntryDecreasesCacheSize() } [Fact] - [CollectDump] public async Task CompactsToLessThanLowWatermarkUsingLRUWhenHighWatermarkExceeded() { var testClock = new TestClock(); diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/tests/MemoryCacheSetAndRemoveTests.cs b/src/libraries/Microsoft.Extensions.Caching.Memory/tests/MemoryCacheSetAndRemoveTests.cs index 6fe4ee60ab94e5..4872e524dcd258 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Memory/tests/MemoryCacheSetAndRemoveTests.cs +++ b/src/libraries/Microsoft.Extensions.Caching.Memory/tests/MemoryCacheSetAndRemoveTests.cs @@ -443,6 +443,7 @@ public void SetGetAndRemoveWorksWithObjectKeysWhenDifferentReferences() } [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/33993", TestRuntimes.Mono)] public void GetAndSet_AreThreadSafe_AndUpdatesNeverLeavesNullValues() { var cache = CreateCache(); diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/tests/Microsoft.Extensions.Caching.Memory.Tests.csproj b/src/libraries/Microsoft.Extensions.Caching.Memory/tests/Microsoft.Extensions.Caching.Memory.Tests.csproj index a0fee41c97d354..723c7244522e13 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Memory/tests/Microsoft.Extensions.Caching.Memory.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Caching.Memory/tests/Microsoft.Extensions.Caching.Memory.Tests.csproj @@ -1,21 +1,18 @@ - - - $(DefaultNetCoreTargetFramework);net472 + $(NetCoreAppCurrent);$(NetFrameworkCurrent) + true - - - - - - - - - + + Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\ExceptionAssertions.cs + + + Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\CultureReplacer.cs + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Json/pkg/Microsoft.Extensions.Configuration.Json.pkgproj b/src/libraries/Microsoft.Extensions.Configuration.Json/pkg/Microsoft.Extensions.Configuration.Json.pkgproj new file mode 100644 index 00000000000000..b3f239fc3fd033 --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Configuration.Json/pkg/Microsoft.Extensions.Configuration.Json.pkgproj @@ -0,0 +1,9 @@ + + + + + net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) + + + + \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.cs b/src/libraries/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.cs index 886de43e81ae0e..1ddda5486f3da4 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.cs +++ b/src/libraries/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.cs @@ -1,6 +1,9 @@ // 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. +// ------------------------------------------------------------------------------ +// Changes to this file must follow the https://aka.ms/api-review process. +// ------------------------------------------------------------------------------ namespace Microsoft.Extensions.Configuration { diff --git a/src/libraries/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.csproj b/src/libraries/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.csproj index cc1299a16f6c39..ee7309646a160c 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Json/ref/Microsoft.Extensions.Configuration.Json.csproj @@ -4,9 +4,11 @@ - - - - + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationExtensions.cs b/src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationExtensions.cs index 173cf5d2788b34..a71e48ba7f1415 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationExtensions.cs +++ b/src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationExtensions.cs @@ -71,7 +71,7 @@ public static IConfigurationBuilder AddJsonFile(this IConfigurationBuilder build } if (string.IsNullOrEmpty(path)) { - throw new ArgumentException(Resources.Error_InvalidFilePath, nameof(path)); + throw new ArgumentException(SR.Error_InvalidFilePath, nameof(path)); } return builder.AddJsonFile(s => diff --git a/src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationFileParser.cs b/src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationFileParser.cs index 79a37d73ff8e65..18736057edfe54 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationFileParser.cs +++ b/src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationFileParser.cs @@ -36,7 +36,7 @@ private IDictionary ParseStream(Stream input) { if (doc.RootElement.ValueKind != JsonValueKind.Object) { - throw new FormatException(Resources.FormatError_UnsupportedJSONToken(doc.RootElement.ValueKind)); + throw new FormatException(SR.Format(SR.Error_UnsupportedJSONToken, doc.RootElement.ValueKind)); } VisitElement(doc.RootElement); } @@ -78,13 +78,13 @@ private void VisitValue(JsonElement value) var key = _currentPath; if (_data.ContainsKey(key)) { - throw new FormatException(Resources.FormatError_KeyIsDuplicated(key)); + throw new FormatException(SR.Format(SR.Error_KeyIsDuplicated, key)); } _data[key] = value.ToString(); break; default: - throw new FormatException(Resources.FormatError_UnsupportedJSONToken(value.ValueKind)); + throw new FormatException(SR.Format(SR.Error_UnsupportedJSONToken, value.ValueKind)); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationProvider.cs b/src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationProvider.cs index e629a64250a005..f179001f10329f 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationProvider.cs +++ b/src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationProvider.cs @@ -32,7 +32,7 @@ public override void Load(Stream stream) } catch (JsonException e) { - throw new FormatException(Resources.Error_JSONParseError, e); + throw new FormatException(SR.Error_JSONParseError, e); } } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj b/src/libraries/Microsoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj index 61d76b7820c27d..3639c5abf063a3 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj @@ -1,24 +1,25 @@  - netstandard2.0;$(DefaultNetCoreTargetFramework) - $(DefaultNetCoreTargetFramework) + $(NetCoreAppCurrent);netstandard2.0 true $(NoWarn);3021 + true - - - - + + + + - - - + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Json/src/Properties/InternalsVisibleTo.cs b/src/libraries/Microsoft.Extensions.Configuration.Json/src/Properties/InternalsVisibleTo.cs new file mode 100644 index 00000000000000..0970d98a83e920 --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Configuration.Json/src/Properties/InternalsVisibleTo.cs @@ -0,0 +1,7 @@ +// 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. + +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("Microsoft.Extensions.Configuration.Json.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")] diff --git a/src/libraries/Microsoft.Extensions.Configuration.Json/tests/JsonConfigurationTest.cs b/src/libraries/Microsoft.Extensions.Configuration.Json/tests/JsonConfigurationTest.cs index 0539ed16c70743..c45f0ade6f0e78 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Json/tests/JsonConfigurationTest.cs +++ b/src/libraries/Microsoft.Extensions.Configuration.Json/tests/JsonConfigurationTest.cs @@ -181,7 +181,7 @@ public void ThrowExceptionWhenMissingCurlyBeforeFinishParsing() [Fact] public void ThrowExceptionWhenPassingNullAsFilePath() { - var expectedMsg = new ArgumentException(Resources.Error_InvalidFilePath, "path").Message; + var expectedMsg = new ArgumentException(SR.Error_InvalidFilePath, "path").Message; var exception = Assert.Throws(() => new ConfigurationBuilder().AddJsonFile(path: null)); @@ -191,7 +191,7 @@ public void ThrowExceptionWhenPassingNullAsFilePath() [Fact] public void ThrowExceptionWhenPassingEmptyStringAsFilePath() { - var expectedMsg = new ArgumentException(Resources.Error_InvalidFilePath, "path").Message; + var expectedMsg = new ArgumentException(SR.Error_InvalidFilePath, "path").Message; var exception = Assert.Throws(() => new ConfigurationBuilder().AddJsonFile(string.Empty)); diff --git a/src/libraries/Microsoft.Extensions.Configuration.Json/tests/Microsoft.Extensions.Configuration.Json.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration.Json/tests/Microsoft.Extensions.Configuration.Json.Tests.csproj index 94bd9498e551d2..fa4a9e15cc7a4a 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Json/tests/Microsoft.Extensions.Configuration.Json.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Json/tests/Microsoft.Extensions.Configuration.Json.Tests.csproj @@ -2,21 +2,23 @@ $(NetCoreAppCurrent);$(NetFrameworkCurrent) + true - - + + Microsoft.Extensions.Configuration\tests\ConfigurationProviderTestBase.cs + + + Microsoft.Extensions.Configuration\tests\Common\ConfigurationProviderExtensions.cs + + + Microsoft.Extensions.Configuration\tests\Common\TestStreamHelpers.cs + - - - - - - - + diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/pkg/Microsoft.Extensions.Configuration.UserSecrets.pkgproj b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/pkg/Microsoft.Extensions.Configuration.UserSecrets.pkgproj new file mode 100644 index 00000000000000..24fd2cb8cefcfb --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/pkg/Microsoft.Extensions.Configuration.UserSecrets.pkgproj @@ -0,0 +1,10 @@ + + + + + net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) + + + + + \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.cs b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.cs index f2335c384b84be..f2ac335f3d8fce 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.cs +++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.cs @@ -1,6 +1,9 @@ // 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. +// ------------------------------------------------------------------------------ +// Changes to this file must follow the https://aka.ms/api-review process. +// ------------------------------------------------------------------------------ namespace Microsoft.Extensions.Configuration { @@ -27,6 +30,6 @@ public PathHelper() { } public partial class UserSecretsIdAttribute : System.Attribute { public UserSecretsIdAttribute(string userSecretId) { } - public string UserSecretsId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } + public string UserSecretsId { get { throw null; } } } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.csproj b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.csproj index 3aede7fb4c146e..97089510aa49ac 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.csproj @@ -4,6 +4,7 @@ - + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj index c87f73ebd36941..30f8b84c2aeef1 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj @@ -1,12 +1,20 @@  - netstandard2.0;$(DefaultNetCoreTargetFramework) - $(DefaultNetCoreTargetFramework) + $(NetCoreAppCurrent);netstandard2.0 + true - + + + + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/PathHelper.cs b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/PathHelper.cs index 4c0a927c1dd467..03ea1ffd75e267 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/PathHelper.cs +++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/PathHelper.cs @@ -28,7 +28,7 @@ public static string GetSecretsPathFromSecretsId(string userSecretsId) { if (string.IsNullOrEmpty(userSecretsId)) { - throw new ArgumentException(Resources.Common_StringNullOrEmpty, nameof(userSecretsId)); + throw new ArgumentException(SR.Common_StringNullOrEmpty, nameof(userSecretsId)); } var badCharIndex = userSecretsId.IndexOfAny(Path.GetInvalidFileNameChars()); @@ -36,7 +36,7 @@ public static string GetSecretsPathFromSecretsId(string userSecretsId) { throw new InvalidOperationException( string.Format( - Resources.Error_Invalid_Character_In_UserSecrets_Id, + SR.Error_Invalid_Character_In_UserSecrets_Id, userSecretsId[badCharIndex], badCharIndex)); } diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Properties/InternalsVisibleTo.cs b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Properties/InternalsVisibleTo.cs new file mode 100644 index 00000000000000..990604ae190831 --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Properties/InternalsVisibleTo.cs @@ -0,0 +1,7 @@ +// 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. + +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("Microsoft.Extensions.Configuration.UserSecrets.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")] diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/UserSecretsConfigurationExtensions.cs b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/UserSecretsConfigurationExtensions.cs index 5371ace15116b6..9e6833a0a3d5e9 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/UserSecretsConfigurationExtensions.cs +++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/UserSecretsConfigurationExtensions.cs @@ -137,7 +137,7 @@ public static IConfigurationBuilder AddUserSecrets(this IConfigurationBuilder co if (!optional) { - throw new InvalidOperationException(Resources.FormatError_Missing_UserSecretsIdAttribute(assembly.GetName().Name)); + throw new InvalidOperationException(SR.Format(SR.Error_Missing_UserSecretsIdAttribute, assembly.GetName().Name)); } return configuration; diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/UserSecretsIdAttribute.cs b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/UserSecretsIdAttribute.cs index e23296ba669277..b24c82a1047755 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/UserSecretsIdAttribute.cs +++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/UserSecretsIdAttribute.cs @@ -27,7 +27,7 @@ public UserSecretsIdAttribute(string userSecretId) { if (string.IsNullOrEmpty(userSecretId)) { - throw new ArgumentException(Resources.Common_StringNullOrEmpty, nameof(userSecretId)); + throw new ArgumentException(SR.Common_StringNullOrEmpty, nameof(userSecretId)); } UserSecretsId = userSecretId; diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/ConfigurationExtensionTest.cs b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/ConfigurationExtensionTest.cs index 1e2d6f8ccdf5c9..43b5366ae8ffef 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/ConfigurationExtensionTest.cs +++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/ConfigurationExtensionTest.cs @@ -85,12 +85,12 @@ public void AddUserSecrets_ThrowsIfAssemblyAttributeFromType() { var ex = Assert.Throws(() => new ConfigurationBuilder().AddUserSecrets()); - Assert.Equal(Resources.FormatError_Missing_UserSecretsIdAttribute(typeof(string).GetTypeInfo().Assembly.GetName().Name), + Assert.Equal(SR.Format(SR.Error_Missing_UserSecretsIdAttribute, typeof(string).GetTypeInfo().Assembly.GetName().Name), ex.Message); ex = Assert.Throws(() => new ConfigurationBuilder().AddUserSecrets(typeof(JObject).Assembly)); - Assert.Equal(Resources.FormatError_Missing_UserSecretsIdAttribute(typeof(JObject).GetTypeInfo().Assembly.GetName().Name), + Assert.Equal(SR.Format(SR.Error_Missing_UserSecretsIdAttribute, typeof(JObject).GetTypeInfo().Assembly.GetName().Name), ex.Message); } diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/Microsoft.Extensions.Configuration.UserSecrets.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/Microsoft.Extensions.Configuration.UserSecrets.Tests.csproj index 2847e6d3e448ea..b5c7dd08cc2bb2 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/Microsoft.Extensions.Configuration.UserSecrets.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/Microsoft.Extensions.Configuration.UserSecrets.Tests.csproj @@ -2,18 +2,11 @@ $(NetCoreAppCurrent);$(NetFrameworkCurrent) + true - - - - - - - - - + diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/MsBuildTargetTest.cs b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/MsBuildTargetTest.cs index 106f500ad1188c..ee5aa2ca350235 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/MsBuildTargetTest.cs +++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/MsBuildTargetTest.cs @@ -42,7 +42,7 @@ public MsBuildTargetTest(ITestOutputHelper output) } [Theory] - [InlineData(".csproj", ".cs")] + [InlineData(".csproj", ".cs", Skip = "https://github.com/dotnet/runtime/issues/33989")] [InlineData(".fsproj", ".fs", Skip = "https://github.com/dotnet/aspnetcore/issues/13303")] public void GeneratesAssemblyAttributeFile(string projectExt, string sourceExt) { @@ -58,7 +58,7 @@ public void GeneratesAssemblyAttributeFile(string projectExt, string sourceExt) .GetCustomAttributes() .First(f => f.Key == "MicrosoftNETCoreAppRefPackageVersion") .Value; - var target = Path.Combine(_solutionRoot.FullName, "src", "Configuration", "Config.UserSecrets", "src", "build", "netstandard2.0", "Microsoft.Extensions.Configuration.UserSecrets.targets"); + var target = Path.Combine(_solutionRoot.FullName, "src", "libraries", "Microsoft.Extensions.Configuration.UserSecrets", "src", "build", "netstandard2.0", "Microsoft.Extensions.Configuration.UserSecrets.targets"); Directory.CreateDirectory(Path.Combine(_tempDir, "obj")); var libName = "Microsoft.Extensions.Configuration.UserSecrets.dll"; File.Copy(Path.Combine(AppContext.BaseDirectory, libName), Path.Combine(_tempDir, libName)); diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/pkg/Microsoft.Extensions.Configuration.Xml.pkgproj b/src/libraries/Microsoft.Extensions.Configuration.Xml/pkg/Microsoft.Extensions.Configuration.Xml.pkgproj new file mode 100644 index 00000000000000..f1b66ef8c5a88d --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Configuration.Xml/pkg/Microsoft.Extensions.Configuration.Xml.pkgproj @@ -0,0 +1,9 @@ + + + + + net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) + + + + \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/ref/Microsoft.Extensions.Configuration.Xml.cs b/src/libraries/Microsoft.Extensions.Configuration.Xml/ref/Microsoft.Extensions.Configuration.Xml.cs index c2e37f3c5ab593..1eb156048a3921 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Xml/ref/Microsoft.Extensions.Configuration.Xml.cs +++ b/src/libraries/Microsoft.Extensions.Configuration.Xml/ref/Microsoft.Extensions.Configuration.Xml.cs @@ -1,6 +1,9 @@ // 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. +// ------------------------------------------------------------------------------ +// Changes to this file must follow the https://aka.ms/api-review process. +// ------------------------------------------------------------------------------ namespace Microsoft.Extensions.Configuration { diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/ref/Microsoft.Extensions.Configuration.Xml.csproj b/src/libraries/Microsoft.Extensions.Configuration.Xml/ref/Microsoft.Extensions.Configuration.Xml.csproj index 2a442d90a18d35..68a8306997a1c6 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Xml/ref/Microsoft.Extensions.Configuration.Xml.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Xml/ref/Microsoft.Extensions.Configuration.Xml.csproj @@ -4,8 +4,9 @@ - - - + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj b/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj index c97b9136938f2d..f41429e7e7883a 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj @@ -1,17 +1,22 @@  - netstandard2.0;$(DefaultNetCoreTargetFramework) - $(DefaultNetCoreTargetFramework) + $(NetCoreAppCurrent);netstandard2.0 + true - - + + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Properties/InternalsVisibleTo.cs b/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Properties/InternalsVisibleTo.cs new file mode 100644 index 00000000000000..25c05c63f7dd79 --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Properties/InternalsVisibleTo.cs @@ -0,0 +1,7 @@ +// 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. + +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("Microsoft.Extensions.Configuration.Xml.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")] diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/src/XmlConfigurationExtensions.cs b/src/libraries/Microsoft.Extensions.Configuration.Xml/src/XmlConfigurationExtensions.cs index 037842a1b555d7..15f2afa8cee2c2 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Xml/src/XmlConfigurationExtensions.cs +++ b/src/libraries/Microsoft.Extensions.Configuration.Xml/src/XmlConfigurationExtensions.cs @@ -71,7 +71,7 @@ public static IConfigurationBuilder AddXmlFile(this IConfigurationBuilder builde } if (string.IsNullOrEmpty(path)) { - throw new ArgumentException(Resources.Error_InvalidFilePath, nameof(path)); + throw new ArgumentException(SR.Error_InvalidFilePath, nameof(path)); } return builder.AddXmlFile(s => diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/src/XmlStreamConfigurationProvider.cs b/src/libraries/Microsoft.Extensions.Configuration.Xml/src/XmlStreamConfigurationProvider.cs index 10fd8a81248e46..3d718e87768bf4 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Xml/src/XmlStreamConfigurationProvider.cs +++ b/src/libraries/Microsoft.Extensions.Configuration.Xml/src/XmlStreamConfigurationProvider.cs @@ -89,7 +89,7 @@ public static IDictionary Read(Stream stream, XmlDocumentDecrypt var key = ConfigurationPath.Combine(prefixStack.Reverse()); if (data.ContainsKey(key)) { - throw new FormatException(Resources.FormatError_KeyIsDuplicated(key, + throw new FormatException(SR.Format(SR.Error_KeyIsDuplicated, key, GetLineInfo(reader))); } @@ -104,7 +104,7 @@ public static IDictionary Read(Stream stream, XmlDocumentDecrypt break; default: - throw new FormatException(Resources.FormatError_UnsupportedNodeType(reader.NodeType, + throw new FormatException(SR.Format(SR.Error_UnsupportedNodeType, reader.NodeType, GetLineInfo(reader))); } preNodeType = reader.NodeType; @@ -146,7 +146,7 @@ private static string GetLineInfo(XmlReader reader) { var lineInfo = reader as IXmlLineInfo; return lineInfo == null ? string.Empty : - Resources.FormatMsg_LineInfo(lineInfo.LineNumber, lineInfo.LinePosition); + SR.Format(SR.Msg_LineInfo, lineInfo.LineNumber, lineInfo.LinePosition); } private static void ProcessAttributes(XmlReader reader, Stack prefixStack, IDictionary data, @@ -159,7 +159,7 @@ private static void ProcessAttributes(XmlReader reader, Stack prefixStac // If there is a namespace attached to current attribute if (!string.IsNullOrEmpty(reader.NamespaceURI)) { - throw new FormatException(Resources.FormatError_NamespaceIsNotSupported(GetLineInfo(reader))); + throw new FormatException(SR.Format(SR.Error_NamespaceIsNotSupported, GetLineInfo(reader))); } act(reader, prefixStack, data, writer); @@ -200,7 +200,7 @@ private static void AddAttributePair(XmlReader reader, Stack prefixStack var key = ConfigurationPath.Combine(prefixStack.Reverse()); if (data.ContainsKey(key)) { - throw new FormatException(Resources.FormatError_KeyIsDuplicated(key, GetLineInfo(reader))); + throw new FormatException(SR.Format(SR.Error_KeyIsDuplicated, key, GetLineInfo(reader))); } data[key] = reader.Value; diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/test/Microsoft.Extensions.Configuration.Xml.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration.Xml/test/Microsoft.Extensions.Configuration.Xml.Tests.csproj index c1be2c4e604e7e..206ff09a1a29c9 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Xml/test/Microsoft.Extensions.Configuration.Xml.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Xml/test/Microsoft.Extensions.Configuration.Xml.Tests.csproj @@ -2,24 +2,35 @@ $(NetCoreAppCurrent);$(NetFrameworkCurrent) + true - - + + Microsoft.Extensions.Configuration\tests\ConfigurationProviderTestBase.cs + + + Microsoft.Extensions.Configuration\tests\Common\ConfigurationProviderExtensions.cs + + + Microsoft.Extensions.Configuration\tests\Common\TestStreamHelpers.cs + + + Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\ReplaceCulture.cs + + + Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\xunit\FrameworkSkipConditionAttribute.cs + + + Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\xunit\ITestCondition.cs + + + Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\xunit\RuntimeFrameworks.cs + - - - - - - - - - - + diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/test/XmlConfigurationTest.cs b/src/libraries/Microsoft.Extensions.Configuration.Xml/test/XmlConfigurationTest.cs index 54d752872f3a79..5e34cdc0ad4dab 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Xml/test/XmlConfigurationTest.cs +++ b/src/libraries/Microsoft.Extensions.Configuration.Xml/test/XmlConfigurationTest.cs @@ -368,7 +368,7 @@ public void ThrowExceptionWhenFindNamespace() "; var xmlConfigSrc = new XmlConfigurationProvider(new XmlConfigurationSource()); - var expectedMsg = Resources.FormatError_NamespaceIsNotSupported(Resources.FormatMsg_LineInfo(1, 11)); + var expectedMsg = SR.Format(SR.Error_NamespaceIsNotSupported, SR.Format(SR.Msg_LineInfo, 1, 11)); var exception = Assert.Throws(() => xmlConfigSrc.Load(TestStreamHelpers.StringToStream(xml))); @@ -378,7 +378,7 @@ public void ThrowExceptionWhenFindNamespace() [Fact] public void ThrowExceptionWhenPassingNullAsFilePath() { - var expectedMsg = new ArgumentException(Resources.Error_InvalidFilePath, "path").Message; + var expectedMsg = new ArgumentException(SR.Error_InvalidFilePath, "path").Message; var exception = Assert.Throws(() => new ConfigurationBuilder().AddXmlFile(path: null)); @@ -388,7 +388,7 @@ public void ThrowExceptionWhenPassingNullAsFilePath() [Fact] public void ThrowExceptionWhenPassingEmptyStringAsFilePath() { - var expectedMsg = new ArgumentException(Resources.Error_InvalidFilePath, "path").Message; + var expectedMsg = new ArgumentException(SR.Error_InvalidFilePath, "path").Message; var exception = Assert.Throws(() => new ConfigurationBuilder().AddXmlFile(string.Empty)); @@ -411,8 +411,8 @@ public void ThrowExceptionWhenKeyIsDuplicated() "; var xmlConfigSrc = new XmlConfigurationProvider(new XmlConfigurationSource()); - var expectedMsg = Resources.FormatError_KeyIsDuplicated("Data:DefaultConnection:ConnectionString", - Resources.FormatMsg_LineInfo(8, 52)); + var expectedMsg = SR.Format(SR.Error_KeyIsDuplicated, "Data:DefaultConnection:ConnectionString", + SR.Format(SR.Msg_LineInfo, 8, 52)); var exception = Assert.Throws(() => xmlConfigSrc.Load(TestStreamHelpers.StringToStream(xml))); diff --git a/src/libraries/Microsoft.Extensions.Configuration/tests/FunctionalTests/ConfigurationTests.cs b/src/libraries/Microsoft.Extensions.Configuration/tests/FunctionalTests/ConfigurationTests.cs index ba842f27748287..2ea4297042e8b4 100644 --- a/src/libraries/Microsoft.Extensions.Configuration/tests/FunctionalTests/ConfigurationTests.cs +++ b/src/libraries/Microsoft.Extensions.Configuration/tests/FunctionalTests/ConfigurationTests.cs @@ -8,7 +8,6 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.Configuration.Ini; using Microsoft.Extensions.Configuration.Json; using Microsoft.Extensions.Configuration.UserSecrets; @@ -465,7 +464,7 @@ public void OnLoadErrorCanIgnoreErrors() } [Fact] - [Flaky("File watching is flaky (particularly on non windows.", FlakyOn.All)] + [ActiveIssue("File watching is flaky (particularly on non windows. https://github.com/dotnet/runtime/issues/33992")] public void CanSetValuesAndReloadValues() { WriteTestFiles(); @@ -508,7 +507,7 @@ public void CanSetValuesAndReloadValues() } [Fact] - [Flaky("File watching is flaky (particularly on non windows.", FlakyOn.All)] + [ActiveIssue("File watching is flaky (particularly on non windows. https://github.com/dotnet/runtime/issues/33992")] public async Task ReloadOnChangeWorksAfterError() { _fileSystem.WriteFile("reload.json", @"{""JsonKey1"": ""JsonValue1""}"); @@ -539,7 +538,7 @@ await WaitForChange( } [Fact] - [Flaky("File watching is flaky (particularly on non windows.", FlakyOn.All)] + [ActiveIssue("File watching is flaky (particularly on non windows. https://github.com/dotnet/runtime/issues/33992")] public async Task TouchingFileWillReload() { _fileSystem.WriteFile("reload.json", @"{""JsonKey1"": ""JsonValue1""}"); @@ -576,7 +575,7 @@ await WaitForChange( } [Fact] - [Flaky("File watching is flaky (particularly on non windows.", FlakyOn.All)] + [ActiveIssue("File watching is flaky (particularly on non windows. https://github.com/dotnet/runtime/issues/33992")] public async Task CreatingOptionalFileInNonExistentDirectoryWillReload() { var directory = Path.GetRandomFileName(); @@ -610,7 +609,7 @@ await WaitForChange( } [Theory] - [Flaky("File watching is flaky (particularly on non windows.", FlakyOn.All)] + [ActiveIssue("File watching is flaky (particularly on non windows. https://github.com/dotnet/runtime/issues/33992")] [InlineData(false)] [InlineData(true)] public async Task DeletingFilesThatRedefineKeysWithReload(bool optional) @@ -691,7 +690,7 @@ await WaitForChange( } [Theory] - [Flaky("File watching is flaky (particularly on non windows.", FlakyOn.All)] + [ActiveIssue("File watching is flaky (particularly on non windows. https://github.com/dotnet/runtime/issues/33992")] [InlineData(false)] [InlineData(true)] public async Task DeletingFileWillReload(bool optional) @@ -730,7 +729,7 @@ await WaitForChange( } [Fact] - [Flaky("File watching is flaky (particularly on non windows.", FlakyOn.All)] + [ActiveIssue("File watching is flaky (particularly on non windows. https://github.com/dotnet/runtime/issues/33992")] public async Task CreatingWritingDeletingCreatingFileWillReload() { var config = CreateBuilder() @@ -908,7 +907,7 @@ public void CanEnumerateProviders() } [Fact] - [Flaky("File watching is flaky (particularly on non windows.", FlakyOn.All)] + [ActiveIssue("File watching is flaky (particularly on non windows. https://github.com/dotnet/runtime/issues/33992")] public async Task TouchingFileWillReloadForUserSecrets() { string userSecretsId = "Test"; diff --git a/src/libraries/Microsoft.Extensions.Configuration/tests/FunctionalTests/Microsoft.Extensions.Configuration.Functional.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration/tests/FunctionalTests/Microsoft.Extensions.Configuration.Functional.Tests.csproj index 1135395e4120d9..38c800ff807a5d 100644 --- a/src/libraries/Microsoft.Extensions.Configuration/tests/FunctionalTests/Microsoft.Extensions.Configuration.Functional.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration/tests/FunctionalTests/Microsoft.Extensions.Configuration.Functional.Tests.csproj @@ -2,27 +2,16 @@ $(NetCoreAppCurrent);$(NetFrameworkCurrent) + true - + + Common\ConfigurationProviderExtensions.cs + - - - - - - - - - - - - - - diff --git a/src/libraries/Microsoft.Extensions.Hosting/pkg/Microsoft.Extensions.Hosting.pkgproj b/src/libraries/Microsoft.Extensions.Hosting/pkg/Microsoft.Extensions.Hosting.pkgproj new file mode 100644 index 00000000000000..622f44a3ac04c3 --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Hosting/pkg/Microsoft.Extensions.Hosting.pkgproj @@ -0,0 +1,9 @@ + + + + + net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) + + + + \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.cs b/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.cs index 6e77a2d68d0cac..b91b323fd3ac16 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.cs +++ b/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.cs @@ -1,13 +1,16 @@ // 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. +// ------------------------------------------------------------------------------ +// Changes to this file must follow the https://aka.ms/api-review process. +// ------------------------------------------------------------------------------ namespace Microsoft.Extensions.Hosting { public partial class ConsoleLifetimeOptions { public ConsoleLifetimeOptions() { } - public bool SuppressStatusMessages { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } + public bool SuppressStatusMessages { get { throw null; } set { } } } public static partial class Host { @@ -17,7 +20,7 @@ public static partial class Host public partial class HostBuilder : Microsoft.Extensions.Hosting.IHostBuilder { public HostBuilder() { } - public System.Collections.Generic.IDictionary Properties { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } + public System.Collections.Generic.IDictionary Properties { get { throw null; } } public Microsoft.Extensions.Hosting.IHost Build() { throw null; } public Microsoft.Extensions.Hosting.IHostBuilder ConfigureAppConfiguration(System.Action configureDelegate) { throw null; } public Microsoft.Extensions.Hosting.IHostBuilder ConfigureContainer(System.Action configureDelegate) { throw null; } @@ -45,7 +48,7 @@ public static partial class HostingHostBuilderExtensions public partial class HostOptions { public HostOptions() { } - public System.TimeSpan ShutdownTimeout { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } + public System.TimeSpan ShutdownTimeout { get { throw null; } set { } } } } namespace Microsoft.Extensions.Hosting.Internal @@ -71,9 +74,9 @@ public void Dispose() { } public partial class HostingEnvironment : Microsoft.Extensions.Hosting.IHostEnvironment, Microsoft.Extensions.Hosting.IHostingEnvironment { public HostingEnvironment() { } - public string ApplicationName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - public Microsoft.Extensions.FileProviders.IFileProvider ContentRootFileProvider { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - public string ContentRootPath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - public string EnvironmentName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } + public string ApplicationName { get { throw null; } set { } } + public Microsoft.Extensions.FileProviders.IFileProvider ContentRootFileProvider { get { throw null; } set { } } + public string ContentRootPath { get { throw null; } set { } } + public string EnvironmentName { get { throw null; } set { } } } } diff --git a/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.csproj b/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.csproj index 459f91e1a48be1..b6d0d8eeabe2fa 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting/ref/Microsoft.Extensions.Hosting.csproj @@ -4,18 +4,14 @@ - - - - - - - - - - - - - + + + + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Hosting/src/Internal/Host.cs b/src/libraries/Microsoft.Extensions.Hosting/src/Internal/Host.cs index 49f2babc307202..fe50833d4d93f4 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/src/Internal/Host.cs +++ b/src/libraries/Microsoft.Extensions.Hosting/src/Internal/Host.cs @@ -106,7 +106,7 @@ public async Task StopAsync(CancellationToken cancellationToken = default) _logger.Stopped(); } - public void Dispose() => DisposeAsync().GetAwaiter().GetResult(); + public void Dispose() => DisposeAsync().AsTask().GetAwaiter().GetResult(); public async ValueTask DisposeAsync() { diff --git a/src/libraries/Microsoft.Extensions.Hosting/src/Internal/HostingLoggerExtensions.cs b/src/libraries/Microsoft.Extensions.Hosting/src/Internal/HostingLoggerExtensions.cs index 46092e6b1658a8..17fec42e266fe7 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/src/Internal/HostingLoggerExtensions.cs +++ b/src/libraries/Microsoft.Extensions.Hosting/src/Internal/HostingLoggerExtensions.cs @@ -82,4 +82,3 @@ public static void StoppedWithException(this ILogger logger, Exception ex) } } } - diff --git a/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj b/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj index b0092a632bc88c..52434638ac92cc 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj @@ -1,28 +1,48 @@ - netstandard2.0;netstandard2.1;$(DefaultNetCoreTargetFramework) - $(DefaultNetCoreTargetFramework) + netstandard2.0;netstandard2.1;$(NetCoreAppCurrent) $(NoWarn);CS1591 + true + + + + + + + + + + + + + + + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/IntegrationTesting/src/Common/LoggingHandler.cs b/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/IntegrationTesting/src/Common/LoggingHandler.cs deleted file mode 100644 index b587b6b8d85046..00000000000000 --- a/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/IntegrationTesting/src/Common/LoggingHandler.cs +++ /dev/null @@ -1,38 +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. - -using System; -using System.Net.Http; -using System.Threading; -using System.Threading.Tasks; -using Microsoft.Extensions.Logging; - -namespace Microsoft.Extensions.Hosting.IntegrationTesting -{ - internal class LoggingHandler : DelegatingHandler - { - private ILogger _logger; - - public LoggingHandler(ILoggerFactory loggerFactory, HttpMessageHandler innerHandler) : base(innerHandler) - { - _logger = loggerFactory.CreateLogger(); - } - - protected override async Task SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) - { - _logger.LogDebug("Sending {method} {url}", request.Method, request.RequestUri); - try - { - var response = await base.SendAsync(request, cancellationToken); - _logger.LogDebug("Received {statusCode} {reasonPhrase} {url}", response.StatusCode, response.ReasonPhrase, request.RequestUri); - return response; - } - catch (Exception ex) - { - _logger.LogError(0, ex, "Exception while sending '{method} {url}' : {exception}", request.Method, request.RequestUri, ex); - throw; - } - } - } -} diff --git a/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/IntegrationTesting/src/Deployers/ApplicationDeployerFactory.cs b/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/IntegrationTesting/src/Deployers/ApplicationDeployerFactory.cs deleted file mode 100644 index 563c8d0be366ff..00000000000000 --- a/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/IntegrationTesting/src/Deployers/ApplicationDeployerFactory.cs +++ /dev/null @@ -1,36 +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. - -using System; -using Microsoft.Extensions.Logging; - -namespace Microsoft.Extensions.Hosting.IntegrationTesting -{ - /// - /// Factory to create an appropriate deployer based on . - /// - public class ApplicationDeployerFactory - { - /// - /// Creates a deployer instance based on settings in . - /// - /// The parameters to set on the deployer. - /// The factory used to create loggers. - /// The that was created. - public static ApplicationDeployer Create(DeploymentParameters deploymentParameters, ILoggerFactory loggerFactory) - { - if (deploymentParameters == null) - { - throw new ArgumentNullException(nameof(deploymentParameters)); - } - - if (loggerFactory == null) - { - throw new ArgumentNullException(nameof(loggerFactory)); - } - - return new SelfHostDeployer(deploymentParameters, loggerFactory); - } - } -} diff --git a/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/IntegrationTesting/src/TestMatrix.cs b/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/IntegrationTesting/src/TestMatrix.cs deleted file mode 100644 index c5833e615c699a..00000000000000 --- a/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/IntegrationTesting/src/TestMatrix.cs +++ /dev/null @@ -1,203 +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. - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using System.Runtime.InteropServices; - -namespace Microsoft.Extensions.Hosting.IntegrationTesting -{ - public class TestMatrix : IEnumerable - { - public IList Tfms { get; set; } = new List(); - public IList ApplicationTypes { get; set; } = new List(); - public IList Architectures { get; set; } = new List(); - private IList, string>> Skips { get; } = new List, string>>(); - - public static TestMatrix Create() - { - return new TestMatrix(); - } - - public TestMatrix WithTfms(params string[] tfms) - { - Tfms = tfms; - return this; - } - - public TestMatrix WithApplicationTypes(params ApplicationType[] types) - { - ApplicationTypes = types; - return this; - } - - public TestMatrix WithAllApplicationTypes() - { - ApplicationTypes.Add(ApplicationType.Portable); - ApplicationTypes.Add(ApplicationType.Standalone); - return this; - } - public TestMatrix WithArchitectures(params RuntimeArchitecture[] archs) - { - Architectures = archs; - return this; - } - - public TestMatrix WithAllArchitectures() - { - Architectures.Add(RuntimeArchitecture.x64); - Architectures.Add(RuntimeArchitecture.x86); - return this; - } - - public TestMatrix Skip(string message, Func check) - { - Skips.Add(new Tuple, string>(check, message)); - return this; - } - - private IEnumerable Build() - { - // TFMs. - if (!Tfms.Any()) - { - throw new ArgumentException("No TFMs were specified."); - } - - ResolveDefaultArchitecture(); - - if (!ApplicationTypes.Any()) - { - ApplicationTypes.Add(ApplicationType.Portable); - } - - var variants = new List(); - VaryByTfm(variants); - - CheckForSkips(variants); - - return variants; - } - - private void ResolveDefaultArchitecture() - { - if (!Architectures.Any()) - { - switch (RuntimeInformation.OSArchitecture) - { - case Architecture.X86: - Architectures.Add(RuntimeArchitecture.x86); - break; - case Architecture.X64: - Architectures.Add(RuntimeArchitecture.x64); - break; - default: - throw new ArgumentException(RuntimeInformation.OSArchitecture.ToString()); - } - } - } - - private void VaryByTfm(List variants) - { - foreach (var tfm in Tfms) - { - var skipTfm = SkipIfTfmIsNotSupportedOnThisOS(tfm); - - VaryByApplicationType(variants, tfm, skipTfm); - } - } - - private static string SkipIfTfmIsNotSupportedOnThisOS(string tfm) - { - if (Tfm.Matches(Tfm.Net461, tfm) && !RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) - { - return "This TFM is not supported on this operating system."; - } - - return null; - } - - private void VaryByApplicationType(List variants, string tfm, string skip) - { - foreach (var t in ApplicationTypes) - { - var type = t; - if (Tfm.Matches(Tfm.Net461, tfm) && type == ApplicationType.Portable) - { - if (ApplicationTypes.Count == 1) - { - // Override the default - type = ApplicationType.Standalone; - } - else - { - continue; - } - } - - VaryByArchitecture(variants, tfm, skip, type); - } - } - - private void VaryByArchitecture(List variants, string tfm, string skip, ApplicationType type) - { - foreach (var arch in Architectures) - { - var archSkip = skip ?? SkipIfArchitectureNotSupportedOnCurrentSystem(arch); - - variants.Add(new TestVariant() - { - Tfm = tfm, - ApplicationType = type, - Architecture = arch, - Skip = archSkip, - }); - } - } - - private string SkipIfArchitectureNotSupportedOnCurrentSystem(RuntimeArchitecture arch) - { - if (arch == RuntimeArchitecture.x64) - { - // Can't run x64 on a x86 OS. - return (RuntimeInformation.OSArchitecture == Architecture.Arm || RuntimeInformation.OSArchitecture == Architecture.X86) - ? $"Cannot run {arch} on your current system." : null; - } - - // No x86 runtimes available on MacOS or Linux. - return RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? null : $"No {arch} available for non-Windows systems."; - } - - private void CheckForSkips(List variants) - { - foreach (var variant in variants) - { - foreach (var skipPair in Skips) - { - if (skipPair.Item1(variant)) - { - variant.Skip = skipPair.Item2; - break; - } - } - } - } - - IEnumerator IEnumerable.GetEnumerator() - { - return ((IEnumerable)this).GetEnumerator(); - } - - // This is what Xunit MemberData expects - public IEnumerator GetEnumerator() - { - foreach (var v in Build()) - { - yield return new[] { v }; - } - } - } -} diff --git a/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/IntegrationTesting/src/xunit/SkipIfEnvironmentVariableNotEnabled.cs b/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/IntegrationTesting/src/xunit/SkipIfEnvironmentVariableNotEnabled.cs deleted file mode 100644 index 60d832ca3a9939..00000000000000 --- a/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/IntegrationTesting/src/xunit/SkipIfEnvironmentVariableNotEnabled.cs +++ /dev/null @@ -1,42 +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. - -using System; -using Microsoft.AspNetCore.Testing; - -namespace Microsoft.Extensions.Hosting.IntegrationTesting -{ - /// - /// Skip test if a given environment variable is not enabled. To enable the test, set environment variable - /// to "true" for the test process. - /// - [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] - public class SkipIfEnvironmentVariableNotEnabledAttribute : Attribute, ITestCondition - { - private readonly string _environmentVariableName; - - public SkipIfEnvironmentVariableNotEnabledAttribute(string environmentVariableName) - { - _environmentVariableName = environmentVariableName; - } - - public bool IsMet - { - get - { - return string.Compare(Environment.GetEnvironmentVariable(_environmentVariableName), "true", ignoreCase: true) == 0; - } - } - - public string SkipReason - { - get - { - return $"To run this test, set the environment variable {_environmentVariableName}=\"true\". {AdditionalInfo}"; - } - } - - public string AdditionalInfo { get; set; } - } -} \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/IntegrationTesting/src/xunit/SkipOn32BitOSAttribute.cs b/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/IntegrationTesting/src/xunit/SkipOn32BitOSAttribute.cs deleted file mode 100644 index 999012d7f591ca..00000000000000 --- a/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/IntegrationTesting/src/xunit/SkipOn32BitOSAttribute.cs +++ /dev/null @@ -1,23 +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. - -using System; -using System.Runtime.InteropServices; -using Microsoft.AspNetCore.Testing; - -namespace Microsoft.Extensions.Hosting.IntegrationTesting -{ - /// - /// Skips a 64 bit test if the current OS is 32-bit. - /// - [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)] - public class SkipOn32BitOSAttribute : Attribute, ITestCondition - { - public bool IsMet => - RuntimeInformation.OSArchitecture == Architecture.Arm64 - || RuntimeInformation.OSArchitecture == Architecture.X64; - - public string SkipReason => "Skipping the x64 test since Windows is 32-bit"; - } -} \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/Microsoft.Extensions.Hosting.Functional.Tests.csproj b/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/Microsoft.Extensions.Hosting.Functional.Tests.csproj index 42abf801fe10dd..d4203ae1141c94 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/Microsoft.Extensions.Hosting.Functional.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/Microsoft.Extensions.Hosting.Functional.Tests.csproj @@ -1,26 +1,32 @@  - - $(NetCoreAppCurrent);$(NetFrameworkCurrent) + true + + + TestingUtils\Microsoft.AspNetCore.Testing\src\TaskExtensions.cs + + + tests\DI.Common\Common\src\LogLevelAttribute.cs + + + tests\DI.Common\Common\src\LogValuesAssert.cs + + + tests\DI.Common\Common\src\XunitLoggerFactoryExtensions.cs + + + tests\DI.Common\Common\src\XunitLoggerProvider.cs + - - - - - - - - - - + diff --git a/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/ShutdownTests.cs b/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/ShutdownTests.cs index e6268cd664456a..64cca40c09899e 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/ShutdownTests.cs +++ b/src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/ShutdownTests.cs @@ -6,33 +6,41 @@ using System.Diagnostics; using System.IO; using System.Runtime.InteropServices; -using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.Hosting.IntegrationTesting; -using Microsoft.Extensions.Logging.Testing; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging.Test; using Xunit; using Xunit.Abstractions; namespace Microsoft.AspNetCore.Hosting.FunctionalTests { - public class ShutdownTests : LoggedTest + public class ShutdownTests { private static readonly string StartedMessage = "Started"; private static readonly string CompletionMessage = "Stopping firing\n" + "Stopping end\n" + "Stopped firing\n" + "Stopped end"; + private readonly ITestOutputHelper _output; - [ConditionalFact] - [OSSkipCondition(OperatingSystems.Windows | OperatingSystems.MacOSX)] + public ShutdownTests(ITestOutputHelper output) + { + _output = output; + } + + [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/34090")] + [PlatformSpecific(TestPlatforms.Linux)] public async Task ShutdownTestRun() { await ExecuteShutdownTest(nameof(ShutdownTestRun), "Run"); } - [ConditionalFact] - [OSSkipCondition(OperatingSystems.Windows | OperatingSystems.MacOSX)] + [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/34090")] + [PlatformSpecific(TestPlatforms.Linux)] public async Task ShutdownTestWaitForShutdown() { await ExecuteShutdownTest(nameof(ShutdownTestWaitForShutdown), "WaitForShutdown"); @@ -40,67 +48,67 @@ public async Task ShutdownTestWaitForShutdown() private async Task ExecuteShutdownTest(string testName, string shutdownMechanic) { - using (StartLog(out var loggerFactory)) + var xunitTestLoggerFactory = TestLoggerBuilder.Create(builder => { - var logger = loggerFactory.CreateLogger(testName); + builder.SetMinimumLevel(LogLevel.Trace); + builder.AddXunit(_output); + }); - // TODO refactor deployers to not depend on source code - // see https://github.com/dotnet/extensions/issues/1697 and https://github.com/dotnet/aspnetcore/issues/10268 + // TODO refactor deployers to not depend on source code + // see https://github.com/dotnet/extensions/issues/1697 and https://github.com/dotnet/aspnetcore/issues/10268 #pragma warning disable 0618 - var applicationPath = Path.Combine(TestPathUtilities.GetSolutionRootDirectory("Extensions"), - "src", "Hosting", "test", "testassets", "Microsoft.Extensions.Hosting.TestApp"); + var applicationPath = string.Empty; // disabled for now #pragma warning restore 0618 - var deploymentParameters = new DeploymentParameters( - applicationPath, - RuntimeFlavor.CoreClr, - RuntimeArchitecture.x64) - { - TargetFramework = Tfm.NetCoreApp50, - ApplicationType = ApplicationType.Portable, - PublishApplicationBeforeDeployment = true, - StatusMessagesEnabled = false - }; + var deploymentParameters = new DeploymentParameters( + applicationPath, + RuntimeFlavor.CoreClr, + RuntimeArchitecture.x64) + { + TargetFramework = Tfm.NetCoreApp50, + ApplicationType = ApplicationType.Portable, + PublishApplicationBeforeDeployment = true, + StatusMessagesEnabled = false + }; - deploymentParameters.EnvironmentVariables["DOTNET_STARTMECHANIC"] = shutdownMechanic; + deploymentParameters.EnvironmentVariables["DOTNET_STARTMECHANIC"] = shutdownMechanic; - using (var deployer = new SelfHostDeployer(deploymentParameters, loggerFactory)) - { - var result = await deployer.DeployAsync(); + using (var deployer = new SelfHostDeployer(deploymentParameters, xunitTestLoggerFactory)) + { + var result = await deployer.DeployAsync(); - var started = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var completed = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var output = string.Empty; - deployer.HostProcess.OutputDataReceived += (sender, args) => + var started = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var completed = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var output = string.Empty; + deployer.HostProcess.OutputDataReceived += (sender, args) => + { + if (!string.IsNullOrEmpty(args.Data) && args.Data.StartsWith(StartedMessage)) { - if (!string.IsNullOrEmpty(args.Data) && args.Data.StartsWith(StartedMessage)) - { - output += args.Data.Substring(StartedMessage.Length) + '\n'; - started.TrySetResult(0); - } - else - { - output += args.Data + '\n'; - } + output += args.Data.Substring(StartedMessage.Length) + '\n'; + started.TrySetResult(0); + } + else + { + output += args.Data + '\n'; + } - if (output.Contains(CompletionMessage)) - { - completed.TrySetResult(0); - } - }; + if (output.Contains(CompletionMessage)) + { + completed.TrySetResult(0); + } + }; - await started.Task.TimeoutAfter(TimeSpan.FromSeconds(60)); + await started.Task.TimeoutAfter(TimeSpan.FromSeconds(60)); - SendShutdownSignal(deployer.HostProcess); + SendShutdownSignal(deployer.HostProcess); - await completed.Task.TimeoutAfter(TimeSpan.FromSeconds(60)); + await completed.Task.TimeoutAfter(TimeSpan.FromSeconds(60)); - WaitForExitOrKill(deployer.HostProcess); + WaitForExitOrKill(deployer.HostProcess); - output = output.Trim('\n'); + output = output.Trim('\n'); - Assert.Equal(CompletionMessage, output); - } + Assert.Equal(CompletionMessage, output); } } @@ -150,4 +158,4 @@ private static void WaitForExitOrKill(Process process) Assert.Equal(0, process.ExitCode); } } -} +} \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.Hosting/tests/TestApp/Microsoft.Extensions.Hosting.TestApp.csproj b/src/libraries/Microsoft.Extensions.Hosting/tests/TestApp/Microsoft.Extensions.Hosting.TestApp.csproj index 95839ccbb045b3..f774716ddfe7a8 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/tests/TestApp/Microsoft.Extensions.Hosting.TestApp.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting/tests/TestApp/Microsoft.Extensions.Hosting.TestApp.csproj @@ -1,35 +1,7 @@  - - $(DefaultNetCoreTargetFramework) + $(NetCoreAppCurrent);$(NetFrameworkCurrent) + true Exe - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/HostBuilderTests.cs b/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/HostBuilderTests.cs index 13acfeb47ff8a1..53c38ea7069e83 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/HostBuilderTests.cs +++ b/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/HostBuilderTests.cs @@ -6,7 +6,6 @@ using System.Collections.Generic; using System.IO; using System.Reflection; -using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.FileProviders; diff --git a/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/Microsoft.Extensions.Hosting.Unit.Tests.csproj b/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/Microsoft.Extensions.Hosting.Unit.Tests.csproj index b935250f09bc3f..287af4c213f48e 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/Microsoft.Extensions.Hosting.Unit.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/Microsoft.Extensions.Hosting.Unit.Tests.csproj @@ -2,40 +2,16 @@ $(NetCoreAppCurrent);$(NetFrameworkCurrent) + true - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/libraries/Microsoft.Extensions.Http/pkg/Microsoft.Extensions.Http.pkgproj b/src/libraries/Microsoft.Extensions.Http/pkg/Microsoft.Extensions.Http.pkgproj new file mode 100644 index 00000000000000..f476c3e9c4164e --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Http/pkg/Microsoft.Extensions.Http.pkgproj @@ -0,0 +1,9 @@ + + + + + net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) + + + + \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.Http/ref/Microsoft.Extensions.Http.csproj b/src/libraries/Microsoft.Extensions.Http/ref/Microsoft.Extensions.Http.csproj index 46164f9d0127a4..c798ddd1c3094f 100644 --- a/src/libraries/Microsoft.Extensions.Http/ref/Microsoft.Extensions.Http.csproj +++ b/src/libraries/Microsoft.Extensions.Http/ref/Microsoft.Extensions.Http.csproj @@ -6,6 +6,7 @@ + diff --git a/src/libraries/Microsoft.Extensions.Http/src/DefaultHttpMessageHandlerBuilder.cs b/src/libraries/Microsoft.Extensions.Http/src/DefaultHttpMessageHandlerBuilder.cs index c601ccc7ba747b..fbe1a133ba5703 100644 --- a/src/libraries/Microsoft.Extensions.Http/src/DefaultHttpMessageHandlerBuilder.cs +++ b/src/libraries/Microsoft.Extensions.Http/src/DefaultHttpMessageHandlerBuilder.cs @@ -41,7 +41,7 @@ public override HttpMessageHandler Build() { if (PrimaryHandler == null) { - var message = Resources.FormatHttpMessageHandlerBuilder_PrimaryHandlerIsNull(nameof(PrimaryHandler)); + var message = SR.Format(SR.HttpMessageHandlerBuilder_PrimaryHandlerIsNull, nameof(PrimaryHandler)); throw new InvalidOperationException(message); } diff --git a/src/libraries/Microsoft.Extensions.Http/src/DependencyInjection/HttpClientBuilderExtensions.cs b/src/libraries/Microsoft.Extensions.Http/src/DependencyInjection/HttpClientBuilderExtensions.cs index efcb5062274da4..67973c50408f7a 100644 --- a/src/libraries/Microsoft.Extensions.Http/src/DependencyInjection/HttpClientBuilderExtensions.cs +++ b/src/libraries/Microsoft.Extensions.Http/src/DependencyInjection/HttpClientBuilderExtensions.cs @@ -611,7 +611,7 @@ public static IHttpClientBuilder SetHandlerLifetime(this IHttpClientBuilder buil if (handlerLifetime != Timeout.InfiniteTimeSpan && handlerLifetime < HttpClientFactoryOptions.MinimumHandlerLifetime) { - throw new ArgumentException(Resources.HandlerLifetime_InvalidValue, nameof(handlerLifetime)); + throw new ArgumentException(SR.HandlerLifetime_InvalidValue, nameof(handlerLifetime)); } builder.Services.Configure(builder.Name, options => options.HandlerLifetime = handlerLifetime); diff --git a/src/libraries/Microsoft.Extensions.Http/src/HttpClientFactoryOptions.cs b/src/libraries/Microsoft.Extensions.Http/src/HttpClientFactoryOptions.cs index 417b353efcd51f..93f43f41272390 100644 --- a/src/libraries/Microsoft.Extensions.Http/src/HttpClientFactoryOptions.cs +++ b/src/libraries/Microsoft.Extensions.Http/src/HttpClientFactoryOptions.cs @@ -63,7 +63,7 @@ public TimeSpan HandlerLifetime { if (value != Timeout.InfiniteTimeSpan && value < MinimumHandlerLifetime) { - throw new ArgumentException(Resources.HandlerLifetime_InvalidValue, nameof(value)); + throw new ArgumentException(SR.HandlerLifetime_InvalidValue, nameof(value)); } _handlerLifetime = value; diff --git a/src/libraries/Microsoft.Extensions.Http/src/HttpMessageHandlerBuilder.cs b/src/libraries/Microsoft.Extensions.Http/src/HttpMessageHandlerBuilder.cs index ea1025a57e0f85..07a6d5c7773916 100644 --- a/src/libraries/Microsoft.Extensions.Http/src/HttpMessageHandlerBuilder.cs +++ b/src/libraries/Microsoft.Extensions.Http/src/HttpMessageHandlerBuilder.cs @@ -85,7 +85,7 @@ protected internal static HttpMessageHandler CreateHandlerPipeline(HttpMessageHa var handler = additionalHandlersList[i]; if (handler == null) { - var message = Resources.FormatHttpMessageHandlerBuilder_AdditionalHandlerIsNull(nameof(additionalHandlers)); + var message = SR.Format(SR.HttpMessageHandlerBuilder_AdditionalHandlerIsNull, nameof(additionalHandlers)); throw new InvalidOperationException(message); } @@ -93,7 +93,7 @@ protected internal static HttpMessageHandler CreateHandlerPipeline(HttpMessageHa // work the way you want and it can be tricky for callers to figure out. if (handler.InnerHandler != null) { - var message = Resources.FormatHttpMessageHandlerBuilder_AdditionHandlerIsInvalid( + var message = SR.Format(SR.HttpMessageHandlerBuilder_AdditionHandlerIsInvalid, nameof(DelegatingHandler.InnerHandler), nameof(DelegatingHandler), nameof(HttpMessageHandlerBuilder), diff --git a/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj b/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj index 208cae23f9c305..c8a0848f510662 100644 --- a/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj +++ b/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj @@ -10,8 +10,8 @@ Common\src\Extensions\NonCapturingTimer\NonCapturingTimer.cs - - Common\src\Extensions\TypeNameHelper.cs + + Common\src\Extensions\TypeNameHelper\TypeNameHelper.cs Common\src\Extensions\ValueStopwatch\ValueStopwatch.cs @@ -21,6 +21,7 @@ + diff --git a/src/libraries/Microsoft.Extensions.Http/src/Resources.resx b/src/libraries/Microsoft.Extensions.Http/src/Resources/Strings.resx similarity index 100% rename from src/libraries/Microsoft.Extensions.Http/src/Resources.resx rename to src/libraries/Microsoft.Extensions.Http/src/Resources/Strings.resx diff --git a/src/libraries/Microsoft.Extensions.Http/tests/DefaultHttpClientFactoryTest.cs b/src/libraries/Microsoft.Extensions.Http/tests/DefaultHttpClientFactoryTest.cs index fdbb2ec4c30be3..f49a1fb9f07558 100644 --- a/src/libraries/Microsoft.Extensions.Http/tests/DefaultHttpClientFactoryTest.cs +++ b/src/libraries/Microsoft.Extensions.Http/tests/DefaultHttpClientFactoryTest.cs @@ -92,7 +92,7 @@ public void Factory_DisposeClient_DoesNotDisposeHandler() var mockHandler = new Mock(); mockHandler .Protected() - .Setup("Dispose", true) + .Setup("Dispose", ItExpr.IsAny()) .Throws(new Exception("Dispose should not be called")); b.PrimaryHandler = mockHandler.Object; @@ -117,7 +117,7 @@ public void Factory_DisposeHandler_DoesNotDisposeInnerHandler() var mockHandler = new Mock(); mockHandler .Protected() - .Setup("Dispose", true) + .Setup("Dispose", ItExpr.IsAny()) .Throws(new Exception("Dispose should not be called")); b.PrimaryHandler = mockHandler.Object; @@ -413,6 +413,7 @@ private async Task SimulateClientUse_Factory_Cleanu } [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/34023", TestRuntimes.Mono)] public async Task Factory_CleanupCycle_DisposesLiveHandler() { // Arrange diff --git a/src/libraries/Microsoft.Extensions.Http/tests/Microsoft.Extensions.Http.Tests.csproj b/src/libraries/Microsoft.Extensions.Http/tests/Microsoft.Extensions.Http.Tests.csproj index 7ac2eb532ad511..345634c008664a 100644 --- a/src/libraries/Microsoft.Extensions.Http/tests/Microsoft.Extensions.Http.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Http/tests/Microsoft.Extensions.Http.Tests.csproj @@ -1,22 +1,35 @@ - $(DefaultNetCoreTargetFramework);net472 + $(NetCoreAppCurrent);$(NetFrameworkCurrent) + true - - - - - - - - + + tests\DI.Common\Common\src\TestSink.cs + + + tests\DI.Common\Common\src\WriteContext.cs + + + tests\DI.Common\Common\src\BeginScopeContext.cs + + + tests\DI.Common\Common\src\ITestSink.cs + + + tests\DI.Common\Common\src\TestLogger.cs + + + tests\DI.Common\Common\src\TestLoggerFactory.cs + + - + + diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/LoggerMessage.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/LoggerMessage.cs index 7101c09d986f58..05caaa4ad698f9 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/LoggerMessage.cs +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/LoggerMessage.cs @@ -259,7 +259,7 @@ private static LogValuesFormatter CreateLogValuesFormatter(string formatString, if (actualCount != expectedNamedParameterCount) { throw new ArgumentException( - SR.Format(SR.UnexpectedNumberOfNamedParameters, expectedNamedParameterCount, actualCount)); + SR.Format(SR.UnexpectedNumberOfNamedParameters, formatString, expectedNamedParameterCount, actualCount)); } return logValuesFormatter; diff --git a/src/libraries/Microsoft.Extensions.Logging.Configuration/pkg/Microsoft.Extensions.Logging.Configuration.pkgproj b/src/libraries/Microsoft.Extensions.Logging.Configuration/pkg/Microsoft.Extensions.Logging.Configuration.pkgproj new file mode 100644 index 00000000000000..5bd1b2513fc661 --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Logging.Configuration/pkg/Microsoft.Extensions.Logging.Configuration.pkgproj @@ -0,0 +1,9 @@ + + + + + net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) + + + + \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.cs b/src/libraries/Microsoft.Extensions.Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.cs index e91e792916278f..1cd6c905b25b1d 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.cs +++ b/src/libraries/Microsoft.Extensions.Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.cs @@ -1,6 +1,9 @@ // 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. +// ------------------------------------------------------------------------------ +// Changes to this file must follow the https://aka.ms/api-review process. +// ------------------------------------------------------------------------------ namespace Microsoft.Extensions.Logging { diff --git a/src/libraries/Microsoft.Extensions.Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.csproj b/src/libraries/Microsoft.Extensions.Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.csproj index 36116be0c2f7fc..d5e676b199f9c4 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.csproj @@ -4,7 +4,9 @@ - - + + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj b/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj index 234ea3fbcad9bf..a3bb2b570f8ae7 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj @@ -1,14 +1,29 @@  - netstandard2.0;$(DefaultNetCoreTargetFramework) - $(DefaultNetCoreTargetFramework) + $(NetCoreAppCurrent);netstandard2.0 + true - + + Common\Extensions\ProviderAliasUtilities\ProviderAliasUtilities.cs + + + + + + + + + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/pkg/Microsoft.Extensions.Logging.Console.pkgproj b/src/libraries/Microsoft.Extensions.Logging.Console/pkg/Microsoft.Extensions.Logging.Console.pkgproj new file mode 100644 index 00000000000000..4c3cdc6eb9b0ab --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Logging.Console/pkg/Microsoft.Extensions.Logging.Console.pkgproj @@ -0,0 +1,9 @@ + + + + + net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) + + + + \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.cs b/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.cs index ddb8a8779179ec..3012421b0901b5 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.cs +++ b/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.cs @@ -1,6 +1,9 @@ // 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. +// ------------------------------------------------------------------------------ +// Changes to this file must follow the https://aka.ms/api-review process. +// ------------------------------------------------------------------------------ namespace Microsoft.Extensions.Logging { @@ -20,12 +23,12 @@ public enum ConsoleLoggerFormat public partial class ConsoleLoggerOptions { public ConsoleLoggerOptions() { } - public bool DisableColors { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } + public bool DisableColors { get { throw null; } set { } } public Microsoft.Extensions.Logging.Console.ConsoleLoggerFormat Format { get { throw null; } set { } } - public bool IncludeScopes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - public Microsoft.Extensions.Logging.LogLevel LogToStandardErrorThreshold { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - public string TimestampFormat { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - public bool UseUtcTimestamp { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } + public bool IncludeScopes { get { throw null; } set { } } + public Microsoft.Extensions.Logging.LogLevel LogToStandardErrorThreshold { get { throw null; } set { } } + public string TimestampFormat { get { throw null; } set { } } + public bool UseUtcTimestamp { get { throw null; } set { } } } [Microsoft.Extensions.Logging.ProviderAliasAttribute("Console")] public partial class ConsoleLoggerProvider : Microsoft.Extensions.Logging.ILoggerProvider, Microsoft.Extensions.Logging.ISupportExternalScope, System.IDisposable diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj b/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj index 137a1dd28296a5..17f4ef6d337e9a 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj @@ -2,10 +2,11 @@ netstandard2.0 + - - - + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj b/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj index c2f0ce66369e56..9bf8ca6491ae0a 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj @@ -1,21 +1,34 @@  - netstandard2.0;$(DefaultNetCoreTargetFramework) - $(DefaultNetCoreTargetFramework) + $(NetCoreAppCurrent);netstandard2.0 + true $(NoWarn);CS1591 - - + + + + + + - + + Common\src\Extensions\Logging\NullExternalScopeProvider.cs + + + Common\src\Extensions\Logging\NullScope.cs + + - - + + + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/src/Properties/InternalsVisibleTo.cs b/src/libraries/Microsoft.Extensions.Logging.Console/src/Properties/InternalsVisibleTo.cs new file mode 100644 index 00000000000000..a3841254b41bb5 --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Logging.Console/src/Properties/InternalsVisibleTo.cs @@ -0,0 +1,7 @@ +// 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. + +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("Microsoft.Extensions.Logging.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")] diff --git a/src/libraries/Microsoft.Extensions.Logging.Debug/pkg/Microsoft.Extensions.Logging.Debug.pkgproj b/src/libraries/Microsoft.Extensions.Logging.Debug/pkg/Microsoft.Extensions.Logging.Debug.pkgproj new file mode 100644 index 00000000000000..d89a7e97d34346 --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Logging.Debug/pkg/Microsoft.Extensions.Logging.Debug.pkgproj @@ -0,0 +1,9 @@ + + + + + net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) + + + + \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.cs b/src/libraries/Microsoft.Extensions.Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.cs index 8583f37e586cc1..c7efbf1328ef8d 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.cs +++ b/src/libraries/Microsoft.Extensions.Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.cs @@ -1,6 +1,9 @@ // 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. +// ------------------------------------------------------------------------------ +// Changes to this file must follow the https://aka.ms/api-review process. +// ------------------------------------------------------------------------------ namespace Microsoft.Extensions.Logging { diff --git a/src/libraries/Microsoft.Extensions.Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.csproj b/src/libraries/Microsoft.Extensions.Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.csproj index 5c3cbd1a780660..3857ebe8a7bff4 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.csproj @@ -4,6 +4,7 @@ - + + diff --git a/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj b/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj index a405d88709cde9..936305667687c2 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj @@ -1,19 +1,28 @@  - netstandard2.0;$(DefaultNetCoreTargetFramework) - $(DefaultNetCoreTargetFramework) + $(NetCoreAppCurrent);netstandard2.0 + true $(NoWarn);CS1591 - - + + - + + Common\src\Extensions\Logging\NullExternalScopeProvider.cs + + + Common\src\Extensions\Logging\NullScope.cs + + + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.EventLog/pkg/Microsoft.Extensions.Logging.EventLog.pkgproj b/src/libraries/Microsoft.Extensions.Logging.EventLog/pkg/Microsoft.Extensions.Logging.EventLog.pkgproj new file mode 100644 index 00000000000000..b6dff5a43e4317 --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Logging.EventLog/pkg/Microsoft.Extensions.Logging.EventLog.pkgproj @@ -0,0 +1,9 @@ + + + + + net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) + + + + \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.cs b/src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.cs index ce5db7be8c0a8b..27b2bab9938d50 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.cs +++ b/src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.cs @@ -1,6 +1,9 @@ // 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. +// ------------------------------------------------------------------------------ +// Changes to this file must follow the https://aka.ms/api-review process. +// ------------------------------------------------------------------------------ namespace Microsoft.Extensions.Logging { @@ -26,9 +29,9 @@ public void SetScopeProvider(Microsoft.Extensions.Logging.IExternalScopeProvider public partial class EventLogSettings { public EventLogSettings() { } - public System.Func Filter { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - public string LogName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - public string MachineName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - public string SourceName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } + public System.Func Filter { get { throw null; } set { } } + public string LogName { get { throw null; } set { } } + public string MachineName { get { throw null; } set { } } + public string SourceName { get { throw null; } set { } } } } diff --git a/src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.csproj b/src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.csproj index b7dc400067cd28..21d4d4cb730983 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.csproj @@ -4,7 +4,8 @@ - - + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj b/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj index adb5a465f07afc..930e42aeef4520 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj @@ -1,18 +1,40 @@  - netstandard2.0;net461;$(DefaultNetCoreTargetFramework) - $(DefaultNetCoreTargetFramework) + $(NetCoreAppCurrent);$(NetFrameworkCurrent);net461;netstandard2.0;netstandard2.1 + true $(NoWarn);CS1591 + + + + + + + + + + + + + + + - + + Common\src\Extensions\Logging\NullExternalScopeProvider.cs + + + Common\src\Extensions\Logging\NullScope.cs + + - + + diff --git a/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Properties/InternalsVisibleTo.cs b/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Properties/InternalsVisibleTo.cs new file mode 100644 index 00000000000000..a3841254b41bb5 --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Properties/InternalsVisibleTo.cs @@ -0,0 +1,7 @@ +// 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. + +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("Microsoft.Extensions.Logging.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")] diff --git a/src/libraries/Microsoft.Extensions.Logging.EventSource/pkg/Microsoft.Extensions.Logging.EventSource.pkgproj b/src/libraries/Microsoft.Extensions.Logging.EventSource/pkg/Microsoft.Extensions.Logging.EventSource.pkgproj new file mode 100644 index 00000000000000..0360fe39d24aca --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Logging.EventSource/pkg/Microsoft.Extensions.Logging.EventSource.pkgproj @@ -0,0 +1,9 @@ + + + + + net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) + + + + \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.cs b/src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.cs index c123c1a5183198..d70d8593902148 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.cs +++ b/src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.cs @@ -1,6 +1,9 @@ // 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. +// ------------------------------------------------------------------------------ +// Changes to this file must follow the https://aka.ms/api-review process. +// ------------------------------------------------------------------------------ namespace Microsoft.Extensions.Logging { diff --git a/src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.csproj b/src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.csproj index 00e88870dc3445..ecf0ef7df93a7d 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.csproj @@ -1,13 +1,10 @@ - netstandard2.0;netstandard2.1 + netstandard2.0 - - - - - + + diff --git a/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj b/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj index 0eeaff784cb200..9458321aabdfb4 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj @@ -1,21 +1,40 @@  - netstandard2.0;$(DefaultNetCoreTargetFramework) - $(DefaultNetCoreTargetFramework) + $(NetCoreAppCurrent);netstandard2.0 + true true $(NoWarn);CS3021 - + + Common\src\Extensions\Logging\NullExternalScopeProvider.cs + + + Common\src\Extensions\Logging\NullScope.cs + + + + + + + + + + + + + + + + - - + diff --git a/src/libraries/Microsoft.Extensions.Logging.TraceSource/pkg/Microsoft.Extensions.Logging.TraceSource.pkgproj b/src/libraries/Microsoft.Extensions.Logging.TraceSource/pkg/Microsoft.Extensions.Logging.TraceSource.pkgproj new file mode 100644 index 00000000000000..88eeed2fdb0a52 --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Logging.TraceSource/pkg/Microsoft.Extensions.Logging.TraceSource.pkgproj @@ -0,0 +1,9 @@ + + + + + net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) + + + + \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.cs b/src/libraries/Microsoft.Extensions.Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.cs index 5a7ea4245edf85..f1578698e8bca1 100644 --- a/src/libraries/Microsoft.Extensions.Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.cs +++ b/src/libraries/Microsoft.Extensions.Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.cs @@ -1,6 +1,9 @@ // 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. +// ------------------------------------------------------------------------------ +// Changes to this file must follow the https://aka.ms/api-review process. +// ------------------------------------------------------------------------------ namespace Microsoft.Extensions.Logging { diff --git a/src/libraries/Microsoft.Extensions.Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.csproj b/src/libraries/Microsoft.Extensions.Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.csproj index 44ccfa061c23f0..eaa0a981e27ee7 100644 --- a/src/libraries/Microsoft.Extensions.Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.csproj @@ -4,6 +4,7 @@ - + + diff --git a/src/libraries/Microsoft.Extensions.Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj b/src/libraries/Microsoft.Extensions.Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj index c4ad607e269385..5fee45899f0ff7 100644 --- a/src/libraries/Microsoft.Extensions.Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj @@ -1,13 +1,22 @@  - netstandard2.0;$(DefaultNetCoreTargetFramework) - $(DefaultNetCoreTargetFramework) + $(NetCoreAppCurrent);netstandard2.0 + true $(NoWarn);CS1591 + + + + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Logging/Directory.Build.props b/src/libraries/Microsoft.Extensions.Logging/Directory.Build.props deleted file mode 100644 index 660f2d2abb3b4a..00000000000000 --- a/src/libraries/Microsoft.Extensions.Logging/Directory.Build.props +++ /dev/null @@ -1,8 +0,0 @@ - - - - - $(NoWarn);PKG0001 - - - diff --git a/src/libraries/Microsoft.Extensions.Logging/pkg/Microsoft.Extensions.Logging.pkgproj b/src/libraries/Microsoft.Extensions.Logging/pkg/Microsoft.Extensions.Logging.pkgproj new file mode 100644 index 00000000000000..b1aeb27796364a --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Logging/pkg/Microsoft.Extensions.Logging.pkgproj @@ -0,0 +1,9 @@ + + + + + net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) + + + + \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.cs b/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.cs index a7233571ac4270..a3302a6411a1dd 100644 --- a/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.cs +++ b/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.cs @@ -1,6 +1,9 @@ // 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. +// ------------------------------------------------------------------------------ +// Changes to this file must follow the https://aka.ms/api-review process. +// ------------------------------------------------------------------------------ namespace Microsoft.Extensions.DependencyInjection { @@ -52,17 +55,17 @@ public void Dispose() { } public partial class LoggerFilterOptions { public LoggerFilterOptions() { } - public bool CaptureScopes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - public Microsoft.Extensions.Logging.LogLevel MinLevel { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - public System.Collections.Generic.IList Rules { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } + public bool CaptureScopes { get { throw null; } set { } } + public Microsoft.Extensions.Logging.LogLevel MinLevel { get { throw null; } set { } } + public System.Collections.Generic.IList Rules { get { throw null; } } } public partial class LoggerFilterRule { public LoggerFilterRule(string providerName, string categoryName, Microsoft.Extensions.Logging.LogLevel? logLevel, System.Func filter) { } - public string CategoryName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } - public System.Func Filter { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } - public Microsoft.Extensions.Logging.LogLevel? LogLevel { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } - public string ProviderName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } + public string CategoryName { get { throw null; } } + public System.Func Filter { get { throw null; } } + public Microsoft.Extensions.Logging.LogLevel? LogLevel { get { throw null; } } + public string ProviderName { get { throw null; } } public override string ToString() { throw null; } } public static partial class LoggingBuilderExtensions @@ -75,6 +78,6 @@ public static partial class LoggingBuilderExtensions public partial class ProviderAliasAttribute : System.Attribute { public ProviderAliasAttribute(string alias) { } - public string Alias { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } + public string Alias { get { throw null; } } } } diff --git a/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.csproj b/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.csproj index 4886274d162832..c79d0fdc6128e4 100644 --- a/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.csproj +++ b/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.csproj @@ -4,9 +4,8 @@ - - - - + + + diff --git a/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj b/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj index 404661273b35be..b97b83142698c2 100644 --- a/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj +++ b/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj @@ -1,19 +1,40 @@  - netstandard2.0;$(DefaultNetCoreTargetFramework) - $(DefaultNetCoreTargetFramework) + $(NetCoreAppCurrent);netstandard2.0 + true $(NoWarn);CS1591 - - + + Common\Extensions\ProviderAliasUtilities\ProviderAliasUtilities.cs + + + Common\src\Extensions\Logging\NullExternalScopeProvider.cs + + + Common\src\Extensions\Logging\NullScope.cs + + + + + + + + + + - + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/Common/EventLogLoggerTest.cs b/src/libraries/Microsoft.Extensions.Logging/tests/Common/EventLogLoggerTest.cs index 502327187398b3..8eb185566f5e2e 100644 --- a/src/libraries/Microsoft.Extensions.Logging/tests/Common/EventLogLoggerTest.cs +++ b/src/libraries/Microsoft.Extensions.Logging/tests/Common/EventLogLoggerTest.cs @@ -6,18 +6,16 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; -using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging.EventLog; using Xunit; namespace Microsoft.Extensions.Logging { - [OSSkipCondition(OperatingSystems.Linux)] - [OSSkipCondition(OperatingSystems.MacOSX)] public class EventLogLoggerTest { - [ConditionalFact] + [Fact] + [PlatformSpecific(TestPlatforms.Windows)] public static void IsEnabledReturnsCorrectValue() { // Arrange @@ -37,7 +35,8 @@ public static void IsEnabledReturnsCorrectValue() Assert.False(logger.IsEnabled(LogLevel.Trace)); } - [ConditionalFact] + [Fact] + [PlatformSpecific(TestPlatforms.Windows)] public void CallingBeginScopeOnLogger_ReturnsNonNullableInstance() { // Arrange @@ -50,7 +49,8 @@ public void CallingBeginScopeOnLogger_ReturnsNonNullableInstance() Assert.NotNull(disposable); } - [ConditionalFact] + [Fact] + [PlatformSpecific(TestPlatforms.Windows)] public void WindowsEventLog_Constructor_CreatesWithExpectedInformation() { // Arrange @@ -68,7 +68,8 @@ public void WindowsEventLog_Constructor_CreatesWithExpectedInformation() Assert.Equal(sourceName, windowsEventLog.DiagnosticsEventLog.Source); } - [ConditionalFact] + [Fact] + [PlatformSpecific(TestPlatforms.Windows)] public void Constructor_CreatesWindowsEventLog_WithExpectedInformation() { // Arrange & Act @@ -81,7 +82,8 @@ public void Constructor_CreatesWindowsEventLog_WithExpectedInformation() Assert.Equal(".", windowsEventLog.DiagnosticsEventLog.MachineName); } - [ConditionalFact] + [Fact] + [PlatformSpecific(TestPlatforms.Windows)] public void Constructor_CreatesWindowsEventLog_WithSuppliedEventLogSettings() { // Arrange @@ -104,6 +106,7 @@ public void Constructor_CreatesWindowsEventLog_WithSuppliedEventLogSettings() } [Fact] + [PlatformSpecific(TestPlatforms.Windows)] public void IOptions_CreatesWindowsEventLog_WithSuppliedEventLogSettings() { var serviceCollection = new ServiceCollection(); @@ -124,7 +127,8 @@ public void IOptions_CreatesWindowsEventLog_WithSuppliedEventLogSettings() Assert.Equal("blah", settings.MachineName); } - [ConditionalTheory] + [Theory] + [PlatformSpecific(TestPlatforms.Windows)] [InlineData(50)] [InlineData(49)] [InlineData(36)] @@ -149,8 +153,8 @@ public void MessageWithinMaxSize_WritesFullMessage(int messageSize) Assert.Equal(expectedMessage, testEventLog.Messages[0]); } - - [ConditionalFact] + [Fact] + [PlatformSpecific(TestPlatforms.Windows)] public void Message_WritesFullMessageWithScopes() { // Arrange @@ -187,7 +191,8 @@ public void Message_WritesFullMessageWithScopes() Assert.Equal(expectedMessage, testEventLog.Messages[0]); } - [ConditionalFact] + [Fact] + [PlatformSpecific(TestPlatforms.Windows)] public void MessageWrittenToEventLogContainsEventId() { // Arrange @@ -208,7 +213,8 @@ public void MessageWrittenToEventLogContainsEventId() Assert.Equal(1, testEventLog.Entries[0].EventId); } - [ConditionalFact] + [Fact] + [PlatformSpecific(TestPlatforms.Windows)] public void EventIdWrittenToEventLogUsesDefaultIfSpecified() { // Arrange @@ -232,13 +238,15 @@ public void EventIdWrittenToEventLogUsesDefaultIfSpecified() Assert.Equal(1034, testEventLog.Entries[0].EventId); } - [ConditionalFact] + [Fact] + [PlatformSpecific(TestPlatforms.Windows)] public void NullCategoryNameThrows() { Assert.Throws(() => new EventLogLogger(null, new EventLogSettings() { }, new LoggerExternalScopeProvider())); } - [ConditionalFact] + [Fact] + [PlatformSpecific(TestPlatforms.Windows)] public void NullEventSettingsThrows() { Assert.Throws(() => new EventLogLogger("Something", settings: null, new LoggerExternalScopeProvider())); @@ -289,7 +297,8 @@ public static TheoryData WritesSplitMessagesData } } - [ConditionalTheory] + [Theory] + [PlatformSpecific(TestPlatforms.Windows)] [MemberData(nameof(WritesSplitMessagesData))] public void MessageExceedingMaxSize_WritesSplitMessages(int messageSize, string[] expectedMessages) { diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/Common/LoggerFactoryExtensionsTest.cs b/src/libraries/Microsoft.Extensions.Logging/tests/Common/LoggerFactoryExtensionsTest.cs index 49bba86bfa3d52..d0308254f0b179 100644 --- a/src/libraries/Microsoft.Extensions.Logging/tests/Common/LoggerFactoryExtensionsTest.cs +++ b/src/libraries/Microsoft.Extensions.Logging/tests/Common/LoggerFactoryExtensionsTest.cs @@ -11,6 +11,7 @@ namespace Microsoft.Extensions.Logging.Test public class LoggerFactoryExtensionsTest { [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/34091", TestRuntimes.Mono)] public void LoggerFactoryCreateOfT_CallsCreateWithCorrectName() { // Arrange @@ -29,6 +30,7 @@ public void LoggerFactoryCreateOfT_CallsCreateWithCorrectName() } [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/34091", TestRuntimes.Mono)] public void LoggerFactoryCreateOfT_SingleGeneric_CallsCreateWithCorrectName() { // Arrange @@ -44,6 +46,7 @@ public void LoggerFactoryCreateOfT_SingleGeneric_CallsCreateWithCorrectName() } [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/34091", TestRuntimes.Mono)] public void LoggerFactoryCreateOfT_TwoGenerics_CallsCreateWithCorrectName() { // Arrange @@ -114,6 +117,7 @@ public void CreatesLoggerName_OnMultipleTypeArgumentGenericType_CreatesWithoutGe [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/34091", TestRuntimes.Mono)] public void LoggerFactoryCreate_CallsCreateWithCorrectName() { // Arrange @@ -132,6 +136,7 @@ public void LoggerFactoryCreate_CallsCreateWithCorrectName() } [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/34091", TestRuntimes.Mono)] public void LoggerFactoryCreate_SingleGeneric_CallsCreateWithCorrectName() { // Arrange @@ -147,6 +152,7 @@ public void LoggerFactoryCreate_SingleGeneric_CallsCreateWithCorrectName() } [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/34091", TestRuntimes.Mono)] public void LoggerFactoryCreate_TwoGenerics_CallsCreateWithCorrectName() { // Arrange diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/Common/LoggerTest.cs b/src/libraries/Microsoft.Extensions.Logging/tests/Common/LoggerTest.cs index 768bd3828195e3..d55342ed6c606c 100644 --- a/src/libraries/Microsoft.Extensions.Logging/tests/Common/LoggerTest.cs +++ b/src/libraries/Microsoft.Extensions.Logging/tests/Common/LoggerTest.cs @@ -126,6 +126,7 @@ public void LoggerCanGetProviderAfterItIsCreated() } [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/34091", TestRuntimes.Mono)] public void ScopesAreNotCreatedForDisabledLoggers() { var provider = new Mock(); @@ -151,6 +152,7 @@ public void ScopesAreNotCreatedForDisabledLoggers() } [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/34091", TestRuntimes.Mono)] public void ScopesAreNotCreatedWhenScopesAreDisabled() { var provider = new Mock(); @@ -175,6 +177,7 @@ public void ScopesAreNotCreatedWhenScopesAreDisabled() } [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/34091", TestRuntimes.Mono)] public void ScopesAreNotCreatedInIScopeProviderWhenScopesAreDisabled() { var provider = new Mock(); @@ -207,6 +210,7 @@ public void ScopesAreNotCreatedInIScopeProviderWhenScopesAreDisabled() } [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/34091", TestRuntimes.Mono)] public void CaptureScopesIsReadFromConfiguration() { var provider = new Mock(); diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/Common/Microsoft.Extensions.Logging.Tests.csproj b/src/libraries/Microsoft.Extensions.Logging/tests/Common/Microsoft.Extensions.Logging.Tests.csproj index 7acbd9fd1ce1e3..0e7e9d287a1201 100644 --- a/src/libraries/Microsoft.Extensions.Logging/tests/Common/Microsoft.Extensions.Logging.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Logging/tests/Common/Microsoft.Extensions.Logging.Tests.csproj @@ -2,28 +2,32 @@ $(NetCoreAppCurrent);$(NetFrameworkCurrent) + true - - - - - - - - - - - - - - - - - - - + + tests\DI.Common\Common\src\TestSink.cs + + + tests\DI.Common\Common\src\WriteContext.cs + + + tests\DI.Common\Common\src\BeginScopeContext.cs + + + tests\DI.Common\Common\src\ITestSink.cs + + + tests\DI.Common\Common\src\TestLogger.cs + + + tests\DI.Common\Common\src\TestLoggerFactory.cs + + + + + diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/AssemblyTestLog.cs b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/AssemblyTestLog.cs deleted file mode 100644 index bd69cd20a3ed88..00000000000000 --- a/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/AssemblyTestLog.cs +++ /dev/null @@ -1,306 +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. - -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Linq; -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Text; -using Microsoft.AspNetCore.Testing; -using Microsoft.Extensions.DependencyInjection; -using Serilog; -using Serilog.Core; -using Serilog.Events; -using Serilog.Extensions.Logging; -using Xunit.Abstractions; - -namespace Microsoft.Extensions.Logging.Testing -{ - public class AssemblyTestLog : IDisposable - { - private static readonly string MaxPathLengthEnvironmentVariableName = "ASPNETCORE_TEST_LOG_MAXPATH"; - private static readonly string LogFileExtension = ".log"; - private static readonly int MaxPathLength = GetMaxPathLength(); - - private static readonly object _lock = new object(); - private static readonly Dictionary _logs = new Dictionary(); - - private readonly ILoggerFactory _globalLoggerFactory; - private readonly ILogger _globalLogger; - private readonly string _baseDirectory; - private readonly Assembly _assembly; - private readonly IServiceProvider _serviceProvider; - - private static int GetMaxPathLength() - { - var maxPathString = Environment.GetEnvironmentVariable(MaxPathLengthEnvironmentVariableName); - var defaultMaxPath = 245; - return string.IsNullOrEmpty(maxPathString) ? defaultMaxPath : int.Parse(maxPathString); - } - - private AssemblyTestLog(ILoggerFactory globalLoggerFactory, ILogger globalLogger, string baseDirectory, Assembly assembly, IServiceProvider serviceProvider) - { - _globalLoggerFactory = globalLoggerFactory; - _globalLogger = globalLogger; - _baseDirectory = baseDirectory; - _assembly = assembly; - _serviceProvider = serviceProvider; - } - - public IDisposable StartTestLog(ITestOutputHelper output, string className, out ILoggerFactory loggerFactory, [CallerMemberName] string testName = null) => - StartTestLog(output, className, out loggerFactory, LogLevel.Debug, testName); - - public IDisposable StartTestLog(ITestOutputHelper output, string className, out ILoggerFactory loggerFactory, LogLevel minLogLevel, [CallerMemberName] string testName = null) => - StartTestLog(output, className, out loggerFactory, minLogLevel, out var _, out var _, testName); - - internal IDisposable StartTestLog(ITestOutputHelper output, string className, out ILoggerFactory loggerFactory, LogLevel minLogLevel, out string resolvedTestName, out string logOutputDirectory, [CallerMemberName] string testName = null) - { - var logStart = DateTimeOffset.UtcNow; - var serviceProvider = CreateLoggerServices(output, className, minLogLevel, out resolvedTestName, out logOutputDirectory, testName, logStart); - var factory = serviceProvider.GetRequiredService(); - loggerFactory = factory; - var logger = loggerFactory.CreateLogger("TestLifetime"); - - var stopwatch = Stopwatch.StartNew(); - - var scope = logger.BeginScope("Test: {testName}", testName); - - _globalLogger.LogInformation("Starting test {testName}", testName); - logger.LogInformation("Starting test {testName} at {logStart}", testName, logStart.ToString("s")); - - return new Disposable(() => - { - stopwatch.Stop(); - _globalLogger.LogInformation("Finished test {testName} in {duration}s", testName, stopwatch.Elapsed.TotalSeconds); - logger.LogInformation("Finished test {testName} in {duration}s", testName, stopwatch.Elapsed.TotalSeconds); - scope.Dispose(); - factory.Dispose(); - (serviceProvider as IDisposable)?.Dispose(); - }); - } - - public ILoggerFactory CreateLoggerFactory(ITestOutputHelper output, string className, [CallerMemberName] string testName = null, DateTimeOffset? logStart = null) - => CreateLoggerFactory(output, className, LogLevel.Trace, testName, logStart); - - public ILoggerFactory CreateLoggerFactory(ITestOutputHelper output, string className, LogLevel minLogLevel, [CallerMemberName] string testName = null, DateTimeOffset? logStart = null) - => CreateLoggerServices(output, className, minLogLevel, out var _, out var _, testName, logStart).GetRequiredService(); - - public IServiceProvider CreateLoggerServices(ITestOutputHelper output, string className, LogLevel minLogLevel, out string normalizedTestName, [CallerMemberName] string testName = null, DateTimeOffset? logStart = null) - => CreateLoggerServices(output, className, minLogLevel, out normalizedTestName, out var _, testName, logStart); - - public IServiceProvider CreateLoggerServices(ITestOutputHelper output, string className, LogLevel minLogLevel, out string normalizedTestName, out string logOutputDirectory, [CallerMemberName] string testName = null, DateTimeOffset? logStart = null) - { - normalizedTestName = string.Empty; - logOutputDirectory = string.Empty; - var assemblyName = _assembly.GetName().Name; - - // Try to shorten the class name using the assembly name - if (className.StartsWith(assemblyName + ".")) - { - className = className.Substring(assemblyName.Length + 1); - } - - SerilogLoggerProvider serilogLoggerProvider = null; - if (!string.IsNullOrEmpty(_baseDirectory)) - { - logOutputDirectory = Path.Combine(_baseDirectory, className); - testName = TestFileOutputContext.RemoveIllegalFileChars(testName); - - if (logOutputDirectory.Length + testName.Length + LogFileExtension.Length >= MaxPathLength) - { - _globalLogger.LogWarning($"Test name {testName} is too long. Please shorten test name."); - - // Shorten the test name by removing the middle portion of the testname - var testNameLength = MaxPathLength - logOutputDirectory.Length - LogFileExtension.Length; - - if (testNameLength <= 0) - { - throw new InvalidOperationException("Output file path could not be constructed due to max path length restrictions. Please shorten test assembly, class or method names."); - } - - testName = testName.Substring(0, testNameLength / 2) + testName.Substring(testName.Length - testNameLength / 2, testNameLength / 2); - - _globalLogger.LogWarning($"To prevent long paths test name was shortened to {testName}."); - } - - var testOutputFile = Path.Combine(logOutputDirectory, $"{testName}{LogFileExtension}"); - - if (File.Exists(testOutputFile)) - { - _globalLogger.LogWarning($"Output log file {testOutputFile} already exists. Please try to keep log file names unique."); - - for (var i = 0; i < 1000; i++) - { - testOutputFile = Path.Combine(logOutputDirectory, $"{testName}.{i}{LogFileExtension}"); - - if (!File.Exists(testOutputFile)) - { - _globalLogger.LogWarning($"To resolve log file collision, the enumerated file {testOutputFile} will be used."); - testName = $"{testName}.{i}"; - break; - } - } - } - - normalizedTestName = testName; - serilogLoggerProvider = ConfigureFileLogging(testOutputFile, logStart); - } - - var serviceCollection = new ServiceCollection(); - serviceCollection.AddLogging(builder => - { - builder.SetMinimumLevel(minLogLevel); - - if (output != null) - { - builder.AddXunit(output, minLogLevel, logStart); - } - - if (serilogLoggerProvider != null) - { - // Use a factory so that the container will dispose it - builder.Services.AddSingleton(_ => serilogLoggerProvider); - } - }); - - return serviceCollection.BuildServiceProvider(); - } - - // For back compat - public static AssemblyTestLog Create(string assemblyName, string baseDirectory) - => Create(Assembly.Load(new AssemblyName(assemblyName)), baseDirectory); - - public static AssemblyTestLog Create(Assembly assembly, string baseDirectory) - { - var logStart = DateTimeOffset.UtcNow; - SerilogLoggerProvider serilogLoggerProvider = null; - if (!string.IsNullOrEmpty(baseDirectory)) - { - baseDirectory = TestFileOutputContext.GetAssemblyBaseDirectory(assembly, baseDirectory); - var globalLogFileName = Path.Combine(baseDirectory, "global.log"); - serilogLoggerProvider = ConfigureFileLogging(globalLogFileName, logStart); - } - - var serviceCollection = new ServiceCollection(); - - serviceCollection.AddLogging(builder => - { - // Global logging, when it's written, is expected to be outputted. So set the log level to minimum. - builder.SetMinimumLevel(LogLevel.Trace); - - if (serilogLoggerProvider != null) - { - // Use a factory so that the container will dispose it - builder.Services.AddSingleton(_ => serilogLoggerProvider); - } - }); - - var serviceProvider = serviceCollection.BuildServiceProvider(); - var loggerFactory = serviceProvider.GetRequiredService(); - - var logger = loggerFactory.CreateLogger("GlobalTestLog"); - logger.LogInformation("Global Test Logging initialized at {logStart}. " - + "Configure the output directory via 'LoggingTestingFileLoggingDirectory' MSBuild property " - + "or set 'LoggingTestingDisableFileLogging' to 'true' to disable file logging.", - logStart.ToString("s")); - return new AssemblyTestLog(loggerFactory, logger, baseDirectory, assembly, serviceProvider); - } - - public static AssemblyTestLog ForAssembly(Assembly assembly) - { - lock (_lock) - { - if (!_logs.TryGetValue(assembly, out var log)) - { - var baseDirectory = TestFileOutputContext.GetOutputDirectory(assembly); - - log = Create(assembly, baseDirectory); - _logs[assembly] = log; - - // Try to clear previous logs, continue if it fails. - var assemblyBaseDirectory = TestFileOutputContext.GetAssemblyBaseDirectory(assembly); - if (!string.IsNullOrEmpty(assemblyBaseDirectory) && !TestFileOutputContext.GetPreserveExistingLogsInOutput(assembly)) - { - try - { - Directory.Delete(assemblyBaseDirectory, recursive: true); - } - catch { } - } - } - return log; - } - } - - private static TestFrameworkFileLoggerAttribute GetFileLoggerAttribute(Assembly assembly) - => assembly.GetCustomAttribute() - ?? throw new InvalidOperationException($"No {nameof(TestFrameworkFileLoggerAttribute)} found on the assembly {assembly.GetName().Name}. " - + "The attribute is added via msbuild properties of the Microsoft.Extensions.Logging.Testing. " - + "Please ensure the msbuild property is imported or a direct reference to Microsoft.Extensions.Logging.Testing is added."); - - private static SerilogLoggerProvider ConfigureFileLogging(string fileName, DateTimeOffset? logStart) - { - var dir = Path.GetDirectoryName(fileName); - if (!Directory.Exists(dir)) - { - Directory.CreateDirectory(dir); - } - - if (File.Exists(fileName)) - { - File.Delete(fileName); - } - - var serilogger = new LoggerConfiguration() - .Enrich.FromLogContext() - .Enrich.With(new AssemblyLogTimestampOffsetEnricher(logStart)) - .MinimumLevel.Verbose() - .WriteTo.File(fileName, outputTemplate: "[{TimestampOffset}] [{SourceContext}] [{Level}] {Message:l}{NewLine}{Exception}", flushToDiskInterval: TimeSpan.FromSeconds(1), shared: true) - .CreateLogger(); - return new SerilogLoggerProvider(serilogger, dispose: true); - } - - public void Dispose() - { - (_serviceProvider as IDisposable)?.Dispose(); - _globalLoggerFactory.Dispose(); - } - - private class AssemblyLogTimestampOffsetEnricher : ILogEventEnricher - { - private DateTimeOffset? _logStart; - - public AssemblyLogTimestampOffsetEnricher(DateTimeOffset? logStart) - { - _logStart = logStart; - } - - public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory) - => logEvent.AddPropertyIfAbsent( - propertyFactory.CreateProperty( - "TimestampOffset", - _logStart.HasValue - ? $"{(DateTimeOffset.UtcNow - _logStart.Value).TotalSeconds.ToString("N3")}s" - : DateTimeOffset.UtcNow.ToString("s"))); - } - - private class Disposable : IDisposable - { - private Action _action; - - public Disposable(Action action) - { - _action = action; - } - - public void Dispose() - { - _action(); - } - } - } -} diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/CollectDumpAttribute.cs b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/CollectDumpAttribute.cs deleted file mode 100644 index 5f4a1eee590ab6..00000000000000 --- a/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/CollectDumpAttribute.cs +++ /dev/null @@ -1,40 +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. - -using System; -using System.Diagnostics; -using System.IO; -using System.Threading; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Testing; - -namespace Microsoft.Extensions.Logging.Testing -{ - /// - /// Capture the memory dump upon test failure. - /// - /// - /// This currently only works in Windows environments - /// - [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)] - public class CollectDumpAttribute : Attribute, ITestMethodLifecycle - { - public Task OnTestStartAsync(TestContext context, CancellationToken cancellationToken) - { - return Task.CompletedTask; - } - - public Task OnTestEndAsync(TestContext context, Exception exception, CancellationToken cancellationToken) - { - if (exception != null) - { - var path = Path.Combine(context.FileOutput.TestClassOutputDirectory, context.FileOutput.GetUniqueFileName(context.FileOutput.TestName, ".dmp")); - var process = Process.GetCurrentProcess(); - DumpCollector.Collect(process, path); - } - - return Task.CompletedTask; - } - } -} diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/DumpCollector/DumpCollector.Windows.cs b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/DumpCollector/DumpCollector.Windows.cs deleted file mode 100644 index 20395208d7c033..00000000000000 --- a/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/DumpCollector/DumpCollector.Windows.cs +++ /dev/null @@ -1,77 +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. - -using System; -using System.Diagnostics; -using System.IO; -using System.Runtime.InteropServices; -using Microsoft.Win32.SafeHandles; - -namespace Microsoft.Extensions.Logging.Testing -{ - public static partial class DumpCollector - { - private static class Windows - { - internal static void Collect(Process process, string outputFile) - { - // Open the file for writing - using (var stream = new FileStream(outputFile, FileMode.Create, FileAccess.ReadWrite, FileShare.None)) - { - // Dump the process! - var exceptionInfo = new NativeMethods.MINIDUMP_EXCEPTION_INFORMATION(); - if (!NativeMethods.MiniDumpWriteDump(process.Handle, (uint)process.Id, stream.SafeFileHandle, NativeMethods.MINIDUMP_TYPE.MiniDumpWithFullMemory, ref exceptionInfo, IntPtr.Zero, IntPtr.Zero)) - { - var err = Marshal.GetHRForLastWin32Error(); - Marshal.ThrowExceptionForHR(err); - } - } - } - - private static class NativeMethods - { - [DllImport("Dbghelp.dll")] - public static extern bool MiniDumpWriteDump(IntPtr hProcess, uint ProcessId, SafeFileHandle hFile, MINIDUMP_TYPE DumpType, ref MINIDUMP_EXCEPTION_INFORMATION ExceptionParam, IntPtr UserStreamParam, IntPtr CallbackParam); - - [StructLayout(LayoutKind.Sequential, Pack = 4)] - public struct MINIDUMP_EXCEPTION_INFORMATION - { - public uint ThreadId; - public IntPtr ExceptionPointers; - public int ClientPointers; - } - - [Flags] - public enum MINIDUMP_TYPE : uint - { - MiniDumpNormal = 0, - MiniDumpWithDataSegs = 1 << 0, - MiniDumpWithFullMemory = 1 << 1, - MiniDumpWithHandleData = 1 << 2, - MiniDumpFilterMemory = 1 << 3, - MiniDumpScanMemory = 1 << 4, - MiniDumpWithUnloadedModules = 1 << 5, - MiniDumpWithIndirectlyReferencedMemory = 1 << 6, - MiniDumpFilterModulePaths = 1 << 7, - MiniDumpWithProcessThreadData = 1 << 8, - MiniDumpWithPrivateReadWriteMemory = 1 << 9, - MiniDumpWithoutOptionalData = 1 << 10, - MiniDumpWithFullMemoryInfo = 1 << 11, - MiniDumpWithThreadInfo = 1 << 12, - MiniDumpWithCodeSegs = 1 << 13, - MiniDumpWithoutAuxiliaryState = 1 << 14, - MiniDumpWithFullAuxiliaryState = 1 << 15, - MiniDumpWithPrivateWriteCopyMemory = 1 << 16, - MiniDumpIgnoreInaccessibleMemory = 1 << 17, - MiniDumpWithTokenInformation = 1 << 18, - MiniDumpWithModuleHeaders = 1 << 19, - MiniDumpFilterTriage = 1 << 20, - MiniDumpWithAvxXStateContext = 1 << 21, - MiniDumpWithIptTrace = 1 << 22, - MiniDumpValidTypeFlags = (-1) ^ ((~1) << 22) - } - } - } - } -} diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/DumpCollector/DumpCollector.cs b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/DumpCollector/DumpCollector.cs deleted file mode 100644 index d67e109b38367b..00000000000000 --- a/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/DumpCollector/DumpCollector.cs +++ /dev/null @@ -1,21 +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. - -using System.Diagnostics; -using System.Runtime.InteropServices; - -namespace Microsoft.Extensions.Logging.Testing -{ - public static partial class DumpCollector - { - public static void Collect(Process process, string fileName) - { - if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) - { - Windows.Collect(process, fileName); - } - // No implementations yet for macOS and Linux - } - } -} diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/LoggedTest/ILoggedTest.cs b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/LoggedTest/ILoggedTest.cs deleted file mode 100644 index 750f45cd912a29..00000000000000 --- a/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/LoggedTest/ILoggedTest.cs +++ /dev/null @@ -1,25 +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. - -using System; -using System.Reflection; -using Microsoft.AspNetCore.Testing; -using Xunit.Abstractions; - -namespace Microsoft.Extensions.Logging.Testing -{ - public interface ILoggedTest : IDisposable - { - ILogger Logger { get; } - - ILoggerFactory LoggerFactory { get; } - - ITestOutputHelper TestOutputHelper { get; } - - // For back compat - IDisposable StartLog(out ILoggerFactory loggerFactory, LogLevel minLogLevel, string testName); - - void Initialize(TestContext context, MethodInfo methodInfo, object[] testMethodArguments, ITestOutputHelper testOutputHelper); - } -} diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/LoggedTest/LoggedTest.cs b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/LoggedTest/LoggedTest.cs deleted file mode 100644 index 169a94f59d6a12..00000000000000 --- a/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/LoggedTest/LoggedTest.cs +++ /dev/null @@ -1,26 +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. - -using System.Reflection; -using Microsoft.AspNetCore.Testing; -using Xunit.Abstractions; - -namespace Microsoft.Extensions.Logging.Testing -{ - public class LoggedTest : LoggedTestBase - { - // Obsolete but keeping for back compat - public LoggedTest(ITestOutputHelper output = null) : base (output) { } - - public ITestSink TestSink { get; set; } - - public override void Initialize(TestContext context, MethodInfo methodInfo, object[] testMethodArguments, ITestOutputHelper testOutputHelper) - { - base.Initialize(context, methodInfo, testMethodArguments, testOutputHelper); - - TestSink = new TestSink(); - LoggerFactory.AddProvider(new TestLoggerProvider(TestSink)); - } - } -} diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/LoggedTest/LoggedTestBase.cs b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/LoggedTest/LoggedTestBase.cs deleted file mode 100644 index 16dde9676c59a2..00000000000000 --- a/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/LoggedTest/LoggedTestBase.cs +++ /dev/null @@ -1,122 +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. - -using System; -using System.Linq; -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.ExceptionServices; -using System.Threading; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Testing; -using Microsoft.Extensions.DependencyInjection; -using Serilog; -using Xunit.Abstractions; - -namespace Microsoft.Extensions.Logging.Testing -{ - public class LoggedTestBase : ILoggedTest, ITestMethodLifecycle - { - private ExceptionDispatchInfo _initializationException; - - private IDisposable _testLog; - - // Obsolete but keeping for back compat - public LoggedTestBase(ITestOutputHelper output = null) - { - TestOutputHelper = output; - } - - protected TestContext Context { get; private set; } - - // Internal for testing - internal string ResolvedTestClassName { get; set; } - - public string ResolvedLogOutputDirectory { get; set; } - - public string ResolvedTestMethodName { get; set; } - - public ILogger Logger { get; set; } - - public ILoggerFactory LoggerFactory { get; set; } - - public ITestOutputHelper TestOutputHelper { get; set; } - - public void AddTestLogging(IServiceCollection services) => services.AddSingleton(LoggerFactory); - - // For back compat - public IDisposable StartLog(out ILoggerFactory loggerFactory, [CallerMemberName] string testName = null) => StartLog(out loggerFactory, LogLevel.Debug, testName); - - // For back compat - public IDisposable StartLog(out ILoggerFactory loggerFactory, LogLevel minLogLevel, [CallerMemberName] string testName = null) - { - return AssemblyTestLog.ForAssembly(GetType().GetTypeInfo().Assembly).StartTestLog(TestOutputHelper, GetType().FullName, out loggerFactory, minLogLevel, testName); - } - - public virtual void Initialize(TestContext context, MethodInfo methodInfo, object[] testMethodArguments, ITestOutputHelper testOutputHelper) - { - try - { - TestOutputHelper = testOutputHelper; - - var classType = GetType(); - var logLevelAttribute = methodInfo.GetCustomAttribute() - ?? methodInfo.DeclaringType.GetCustomAttribute() - ?? methodInfo.DeclaringType.Assembly.GetCustomAttribute(); - - // internal for testing - ResolvedTestClassName = context.FileOutput.TestClassName; - - _testLog = AssemblyTestLog - .ForAssembly(classType.GetTypeInfo().Assembly) - .StartTestLog( - TestOutputHelper, - context.FileOutput.TestClassName, - out var loggerFactory, - logLevelAttribute?.LogLevel ?? LogLevel.Debug, - out var resolvedTestName, - out var logDirectory, - context.FileOutput.TestName); - - ResolvedLogOutputDirectory = logDirectory; - ResolvedTestMethodName = resolvedTestName; - - LoggerFactory = loggerFactory; - Logger = loggerFactory.CreateLogger(classType); - } - catch (Exception e) - { - _initializationException = ExceptionDispatchInfo.Capture(e); - } - } - - public virtual void Dispose() - { - if (_testLog == null) - { - // It seems like sometimes the MSBuild goop that adds the test framework can end up in a bad state and not actually add it - // Not sure yet why that happens but the exception isn't clear so I'm adding this error so we can detect it better. - // -anurse - throw new InvalidOperationException("LoggedTest base class was used but nothing initialized it! The test framework may not be enabled. Try cleaning your 'obj' directory."); - } - - _initializationException?.Throw(); - _testLog.Dispose(); - } - - Task ITestMethodLifecycle.OnTestStartAsync(TestContext context, CancellationToken cancellationToken) - { - - Context = context; - - Initialize(context, context.TestMethod, context.MethodArguments, context.Output); - return Task.CompletedTask; - } - - Task ITestMethodLifecycle.OnTestEndAsync(TestContext context, Exception exception, CancellationToken cancellationToken) - { - return Task.CompletedTask; - } - } -} diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/Microsoft.Extensions.Logging.Testing.csproj b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/Microsoft.Extensions.Logging.Testing.csproj deleted file mode 100644 index 0c07c01c1037b0..00000000000000 --- a/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/Microsoft.Extensions.Logging.Testing.csproj +++ /dev/null @@ -1,44 +0,0 @@ - - - - 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 - $(NoWarn);CS1591 - $(PackageTags);testing - - false - - true - false - true - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/TestFrameworkFileLoggerAttribute.cs b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/TestFrameworkFileLoggerAttribute.cs deleted file mode 100644 index 61fa9993e85558..00000000000000 --- a/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/TestFrameworkFileLoggerAttribute.cs +++ /dev/null @@ -1,18 +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. - -using System; -using Microsoft.AspNetCore.Testing; - -namespace Microsoft.Extensions.Logging.Testing -{ - [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = false)] - public class TestFrameworkFileLoggerAttribute : TestOutputDirectoryAttribute - { - public TestFrameworkFileLoggerAttribute(string preserveExistingLogsInOutput, string tfm, string baseDirectory = null) - : base(preserveExistingLogsInOutput, tfm, baseDirectory) - { - } - } -} diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/build/Microsoft.Extensions.Logging.Testing.props b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/build/Microsoft.Extensions.Logging.Testing.props deleted file mode 100644 index 167efb3f8260ab..00000000000000 --- a/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/build/Microsoft.Extensions.Logging.Testing.props +++ /dev/null @@ -1,30 +0,0 @@ - - - - $(RepositoryRoot) - $(ASPNETCORE_TEST_LOG_DIR) - $(RepoRoot)artifacts\log\ - - - - - true - false - - - - - <_Parameter1>Microsoft.AspNetCore.Testing.AspNetTestFramework - <_Parameter2>Microsoft.AspNetCore.Testing - - - - <_Parameter1>$(PreserveExistingLogsInOutput) - <_Parameter2>$(TargetFramework) - <_Parameter3 Condition="'$(LoggingTestingDisableFileLogging)' != 'true'">$(LoggingTestingFileLoggingDirectory) - - - - diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/test/AssemblyTestLogTests.cs b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/test/AssemblyTestLogTests.cs deleted file mode 100644 index 27a7cf83cf6286..00000000000000 --- a/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/test/AssemblyTestLogTests.cs +++ /dev/null @@ -1,221 +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. - -using System; -using System.IO; -using System.Linq; -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Text.RegularExpressions; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Testing; -using Xunit; - -namespace Microsoft.Extensions.Logging.Testing.Tests -{ - public class AssemblyTestLogTests : LoggedTest - { - private static readonly Assembly ThisAssembly = typeof(AssemblyTestLogTests).GetTypeInfo().Assembly; - private static readonly string ThisAssemblyName = ThisAssembly.GetName().Name; - private static readonly string TFM = new DirectoryInfo(AppContext.BaseDirectory).Name; - - [Fact] - public void FunctionalLogs_LogsPreservedFromNonFlakyRun() - { - } - - [Fact] - [Flaky("http://example.com", FlakyOn.All)] - public void FunctionalLogs_LogsPreservedFromFlakyRun() - { - } - - [Fact] - public void ForAssembly_ReturnsSameInstanceForSameAssembly() - { - Assert.Same( - AssemblyTestLog.ForAssembly(ThisAssembly), - AssemblyTestLog.ForAssembly(ThisAssembly)); - } - - [Fact] - public void TestLogWritesToITestOutputHelper() - { - var output = new TestTestOutputHelper(); - var assemblyLog = AssemblyTestLog.Create(ThisAssemblyName, baseDirectory: null); - - using (assemblyLog.StartTestLog(output, "NonExistant.Test.Class", out var loggerFactory)) - { - var logger = loggerFactory.CreateLogger("TestLogger"); - logger.LogInformation("Information!"); - - // Trace is disabled by default - logger.LogTrace("Trace!"); - } - - var testLogContent = MakeConsistent(output.Output); - - Assert.Equal( -@"[OFFSET] TestLifetime Information: Starting test TestLogWritesToITestOutputHelper at TIMESTAMP -[OFFSET] TestLogger Information: Information! -[OFFSET] TestLifetime Information: Finished test TestLogWritesToITestOutputHelper in DURATION -", testLogContent, ignoreLineEndingDifferences: true); - } - - [Fact] - public Task TestLogEscapesIllegalFileNames() => - RunTestLogFunctionalTest((tempDir) => - { - var illegalTestName = "T:e/s//t"; - var escapedTestName = "T_e_s_t"; - using (var testAssemblyLog = AssemblyTestLog.Create(ThisAssemblyName, baseDirectory: tempDir)) - using (testAssemblyLog.StartTestLog(output: null, className: "FakeTestAssembly.FakeTestClass", loggerFactory: out var testLoggerFactory, minLogLevel: LogLevel.Trace, resolvedTestName: out var resolvedTestname, out var _, testName: illegalTestName)) - { - Assert.Equal(escapedTestName, resolvedTestname); - } - }); - - [Fact] - public Task TestLogWritesToGlobalLogFile() => - RunTestLogFunctionalTest((tempDir) => - { - // Because this test writes to a file, it is a functional test and should be logged - // but it's also testing the test logging facility. So this is pretty meta ;) - var logger = LoggerFactory.CreateLogger("Test"); - - using (var testAssemblyLog = AssemblyTestLog.Create(ThisAssemblyName, tempDir)) - { - logger.LogInformation("Created test log in {baseDirectory}", tempDir); - - using (testAssemblyLog.StartTestLog(output: null, className: $"{ThisAssemblyName}.FakeTestClass", loggerFactory: out var testLoggerFactory, minLogLevel: LogLevel.Trace, testName: "FakeTestName")) - { - var testLogger = testLoggerFactory.CreateLogger("TestLogger"); - testLogger.LogInformation("Information!"); - testLogger.LogTrace("Trace!"); - } - } - - logger.LogInformation("Finished test log in {baseDirectory}", tempDir); - - var globalLogPath = Path.Combine(tempDir, ThisAssemblyName, TFM, "global.log"); - var testLog = Path.Combine(tempDir, ThisAssemblyName, TFM, "FakeTestClass", "FakeTestName.log"); - - Assert.True(File.Exists(globalLogPath), $"Expected global log file {globalLogPath} to exist"); - Assert.True(File.Exists(testLog), $"Expected test log file {testLog} to exist"); - - var globalLogContent = MakeConsistent(File.ReadAllText(globalLogPath)); - var testLogContent = MakeConsistent(File.ReadAllText(testLog)); - - Assert.Equal( -@"[OFFSET] [GlobalTestLog] [Information] Global Test Logging initialized at TIMESTAMP. Configure the output directory via 'LoggingTestingFileLoggingDirectory' MSBuild property or set 'LoggingTestingDisableFileLogging' to 'true' to disable file logging. -[OFFSET] [GlobalTestLog] [Information] Starting test FakeTestName -[OFFSET] [GlobalTestLog] [Information] Finished test FakeTestName in DURATION -", globalLogContent, ignoreLineEndingDifferences: true); - Assert.Equal( -@"[OFFSET] [TestLifetime] [Information] Starting test FakeTestName at TIMESTAMP -[OFFSET] [TestLogger] [Information] Information! -[OFFSET] [TestLogger] [Verbose] Trace! -[OFFSET] [TestLifetime] [Information] Finished test FakeTestName in DURATION -", testLogContent, ignoreLineEndingDifferences: true); - }); - - [Fact] - public Task TestLogTruncatesTestNameToAvoidLongPaths() => - RunTestLogFunctionalTest((tempDir) => - { - var longTestName = new string('0', 50) + new string('1', 50) + new string('2', 50) + new string('3', 50) + new string('4', 50); - var logger = LoggerFactory.CreateLogger("Test"); - using (var testAssemblyLog = AssemblyTestLog.Create(ThisAssemblyName, tempDir)) - { - logger.LogInformation("Created test log in {baseDirectory}", tempDir); - - using (testAssemblyLog.StartTestLog(output: null, className: $"{ThisAssemblyName}.FakeTestClass", loggerFactory: out var testLoggerFactory, minLogLevel: LogLevel.Trace, testName: longTestName)) - { - testLoggerFactory.CreateLogger("TestLogger").LogInformation("Information!"); - } - } - logger.LogInformation("Finished test log in {baseDirectory}", tempDir); - - var testLogFiles = new DirectoryInfo(Path.Combine(tempDir, ThisAssemblyName, TFM, "FakeTestClass")).EnumerateFiles(); - var testLog = Assert.Single(testLogFiles); - var testFileName = Path.GetFileNameWithoutExtension(testLog.Name); - - // The first half of the file comes from the beginning of the test name passed to the logger - Assert.Equal(longTestName.Substring(0, testFileName.Length / 2), testFileName.Substring(0, testFileName.Length / 2)); - // The last half of the file comes from the ending of the test name passed to the logger - Assert.Equal(longTestName.Substring(longTestName.Length - testFileName.Length / 2, testFileName.Length / 2), testFileName.Substring(testFileName.Length - testFileName.Length / 2, testFileName.Length / 2)); - }); - - [Fact] - public Task TestLogEnumerateFilenamesToAvoidCollisions() => - RunTestLogFunctionalTest((tempDir) => - { - var logger = LoggerFactory.CreateLogger("Test"); - using (var testAssemblyLog = AssemblyTestLog.Create(ThisAssemblyName, tempDir)) - { - logger.LogInformation("Created test log in {baseDirectory}", tempDir); - - for (var i = 0; i < 10; i++) - { - using (testAssemblyLog.StartTestLog(output: null, className: $"{ThisAssemblyName}.FakeTestClass", loggerFactory: out var testLoggerFactory, minLogLevel: LogLevel.Trace, testName: "FakeTestName")) - { - testLoggerFactory.CreateLogger("TestLogger").LogInformation("Information!"); - } - } - } - logger.LogInformation("Finished test log in {baseDirectory}", tempDir); - - // The first log file exists - Assert.True(File.Exists(Path.Combine(tempDir, ThisAssemblyName, TFM, "FakeTestClass", "FakeTestName.log"))); - - // Subsequent files exist - for (var i = 0; i < 9; i++) - { - Assert.True(File.Exists(Path.Combine(tempDir, ThisAssemblyName, TFM, "FakeTestClass", $"FakeTestName.{i}.log"))); - } - }); - - private static readonly Regex TimestampRegex = new Regex(@"\d+-\d+-\d+T\d+:\d+:\d+"); - private static readonly Regex TimestampOffsetRegex = new Regex(@"\d+\.\d+s"); - private static readonly Regex DurationRegex = new Regex(@"[^ ]+s$"); - - private async Task RunTestLogFunctionalTest(Action action, [CallerMemberName] string testName = null) - { - var tempDir = Path.Combine(Path.GetTempPath(), $"TestLogging_{Guid.NewGuid().ToString("N")}"); - try - { - action(tempDir); - } - finally - { - if (Directory.Exists(tempDir)) - { - try - { - Directory.Delete(tempDir, recursive: true); - } - catch - { - await Task.Delay(100); - Directory.Delete(tempDir, recursive: true); - } - } - } - } - - private static string MakeConsistent(string input) - { - return string.Join(Environment.NewLine, input.Split(new[] { Environment.NewLine }, StringSplitOptions.None) - .Select(line => - { - var strippedPrefix = line.IndexOf("[") >= 0 ? line.Substring(line.IndexOf("[")) : line; - - var strippedDuration = DurationRegex.Replace(strippedPrefix, "DURATION"); - var strippedTimestamp = TimestampRegex.Replace(strippedDuration, "TIMESTAMP"); - var strippedTimestampOffset = TimestampOffsetRegex.Replace(strippedTimestamp, "OFFSET"); - return strippedTimestampOffset; - })); - } - } -} diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/test/LoggedTestXunitTests.cs b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/test/LoggedTestXunitTests.cs deleted file mode 100644 index 61d7802508a30b..00000000000000 --- a/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/test/LoggedTestXunitTests.cs +++ /dev/null @@ -1,193 +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. - -using System.Linq; -using System.Reflection; -using Microsoft.AspNetCore.Testing; -using Microsoft.Extensions.DependencyInjection; -using Xunit; -using Xunit.Abstractions; - -namespace Microsoft.Extensions.Logging.Testing.Tests -{ - [LogLevel(LogLevel.Debug)] - [ShortClassName] - public class LoggedTestXunitTests : TestLoggedTest - { - private readonly ITestOutputHelper _output; - - public LoggedTestXunitTests(ITestOutputHelper output) - { - _output = output; - } - - [Fact] - public void LoggedFactInitializesLoggedTestProperties() - { - Assert.NotNull(Logger); - Assert.NotNull(LoggerFactory); - Assert.NotNull(TestSink); - Assert.NotNull(TestOutputHelper); - } - - [Theory] - [InlineData("Hello world")] - public void LoggedTheoryInitializesLoggedTestProperties(string argument) - { - Assert.NotNull(Logger); - Assert.NotNull(LoggerFactory); - Assert.NotNull(TestSink); - Assert.NotNull(TestOutputHelper); - // Use the test argument - Assert.NotNull(argument); - } - - [ConditionalFact] - public void ConditionalLoggedFactGetsInitializedLoggerFactory() - { - Assert.NotNull(Logger); - Assert.NotNull(LoggerFactory); - Assert.NotNull(TestSink); - Assert.NotNull(TestOutputHelper); - } - - [ConditionalTheory] - [InlineData("Hello world")] - public void LoggedConditionalTheoryInitializesLoggedTestProperties(string argument) - { - Assert.NotNull(Logger); - Assert.NotNull(LoggerFactory); - Assert.NotNull(TestSink); - Assert.NotNull(TestOutputHelper); - // Use the test argument - Assert.NotNull(argument); - } - - [Fact] - [LogLevel(LogLevel.Information)] - public void LoggedFactFilteredByMethodLogLevel() - { - Logger.LogInformation("Information"); - Logger.LogDebug("Debug"); - - var message = Assert.Single(TestSink.Writes); - Assert.Equal(LogLevel.Information, message.LogLevel); - Assert.Equal("Information", message.Formatter(message.State, null)); - } - - [Fact] - public void LoggedFactFilteredByClassLogLevel() - { - Logger.LogDebug("Debug"); - Logger.LogTrace("Trace"); - - var message = Assert.Single(TestSink.Writes); - Assert.Equal(LogLevel.Debug, message.LogLevel); - Assert.Equal("Debug", message.Formatter(message.State, null)); - } - - [Theory] - [InlineData("Hello world")] - [LogLevel(LogLevel.Information)] - public void LoggedTheoryFilteredByLogLevel(string argument) - { - Logger.LogInformation("Information"); - Logger.LogDebug("Debug"); - - var message = Assert.Single(TestSink.Writes); - Assert.Equal(LogLevel.Information, message.LogLevel); - Assert.Equal("Information", message.Formatter(message.State, null)); - - // Use the test argument - Assert.NotNull(argument); - } - - [Fact] - public void AddTestLoggingUpdatedWhenLoggerFactoryIsSet() - { - var loggerFactory = new LoggerFactory(); - var serviceCollection = new ServiceCollection(); - - LoggerFactory = loggerFactory; - AddTestLogging(serviceCollection); - - Assert.Same(loggerFactory, serviceCollection.BuildServiceProvider().GetRequiredService()); - } - - [ConditionalTheory] - [EnvironmentVariableSkipCondition("ASPNETCORE_TEST_LOG_DIR", "")] // The test name is only generated when logging is enabled via the environment variable - [InlineData(null)] - public void LoggedTheoryNullArgumentsAreEscaped(string argument) - { - Assert.NotNull(LoggerFactory); - Assert.Equal($"{nameof(LoggedTheoryNullArgumentsAreEscaped)}_null", ResolvedTestMethodName); - // Use the test argument - Assert.Null(argument); - } - - [Fact] - public void AdditionalSetupInvoked() - { - Assert.True(SetupInvoked); - } - - [Fact] - public void MessageWrittenEventInvoked() - { - WriteContext context = null; - TestSink.MessageLogged += ctx => context = ctx; - Logger.LogInformation("Information"); - Assert.Equal(TestSink.Writes.Single(), context); - } - - [Fact] - public void ScopeStartedEventInvoked() - { - BeginScopeContext context = null; - TestSink.ScopeStarted += ctx => context = ctx; - using (Logger.BeginScope("Scope")) {} - Assert.Equal(TestSink.Scopes.Single(), context); - } - } - - public class LoggedTestXunitLogLevelTests : LoggedTest - { - [Fact] - public void LoggedFactFilteredByAssemblyLogLevel() - { - Logger.LogTrace("Trace"); - - var message = Assert.Single(TestSink.Writes); - Assert.Equal(LogLevel.Trace, message.LogLevel); - Assert.Equal("Trace", message.Formatter(message.State, null)); - } - } - - public class LoggedTestXunitInitializationTests : TestLoggedTest - { - [Fact] - public void ITestOutputHelperInitializedByDefault() - { - Assert.True(ITestOutputHelperIsInitialized); - } - } - - public class TestLoggedTest : LoggedTest - { - public bool SetupInvoked { get; private set; } = false; - public bool ITestOutputHelperIsInitialized { get; private set; } = false; - - public override void Initialize(TestContext context, MethodInfo methodInfo, object[] testMethodArguments, ITestOutputHelper testOutputHelper) - { - base.Initialize(context, methodInfo, testMethodArguments, testOutputHelper); - - try - { - TestOutputHelper.WriteLine("Test"); - ITestOutputHelperIsInitialized = true; - } catch { } - SetupInvoked = true; - } - } -} diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/test/Microsoft.Extensions.Logging.Testing.Tests.csproj b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/test/Microsoft.Extensions.Logging.Testing.Tests.csproj index 27555b4f14411c..905b9a874c12d7 100644 --- a/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/test/Microsoft.Extensions.Logging.Testing.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/test/Microsoft.Extensions.Logging.Testing.Tests.csproj @@ -1,17 +1,27 @@  - - $(NetCoreAppCurrent);$(NetFrameworkCurrent) + true - - - - - - - + + Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\ShortClassNameAttribute.cs + + + tests\DI.Common\Common\src\LogLevelAttribute.cs + + + tests\DI.Common\Common\src\LogValuesAssert.cs + + + tests\Common\TestLoggerBuilder.cs + + + tests\DI.Common\Common\src\XunitLoggerFactoryExtensions.cs + + + tests\DI.Common\Common\src\XunitLoggerProvider.cs + diff --git a/src/libraries/pkg/baseline/packageIndex.json b/src/libraries/pkg/baseline/packageIndex.json index 8ea122447fc6d3..355b04d5ba0e43 100644 --- a/src/libraries/pkg/baseline/packageIndex.json +++ b/src/libraries/pkg/baseline/packageIndex.json @@ -173,6 +173,34 @@ "5.0.0.0": "5.0.0" } }, + "Microsoft.Extensions.Caching.Memory": { + "StableVersions": [ + "1.0.0", + "1.0.1", + "1.0.2", + "1.1.0", + "1.1.1", + "1.1.2", + "2.0.0", + "2.0.1", + "2.0.2", + "2.1.0", + "2.1.1", + "2.1.2", + "2.2.0", + "3.0.0", + "3.0.1", + "3.0.2", + "3.0.3", + "3.1.0", + "3.1.1", + "3.1.2" + ], + "InboxOn": {}, + "AssemblyVersionInPackageVersion": { + "5.0.0.0": "5.0.0" + } + }, "Microsoft.Extensions.Configuration": { "StableVersions": [ "1.0.0", @@ -365,6 +393,87 @@ "5.0.0.0": "5.0.0" } }, + "Microsoft.Extensions.Configuration.Json": { + "StableVersions": [ + "1.0.0", + "1.0.1", + "1.0.2", + "1.1.0", + "1.1.1", + "1.1.2", + "2.0.0", + "2.0.1", + "2.0.2", + "2.1.0", + "2.1.1", + "2.2.0", + "3.0.0", + "3.0.1", + "3.0.2", + "3.0.3", + "3.1.0", + "3.1.1", + "3.1.2" + ], + "InboxOn": {}, + "AssemblyVersionInPackageVersion": { + "5.0.0.0": "5.0.0" + } + }, + "Microsoft.Extensions.Configuration.UserSecrets": { + "StableVersions": [ + "1.0.0", + "1.0.1", + "1.0.2", + "1.1.0", + "1.1.1", + "1.1.2", + "2.0.0", + "2.0.1", + "2.0.2", + "2.1.0", + "2.1.1", + "2.2.0", + "3.0.0", + "3.0.1", + "3.0.2", + "3.0.3", + "3.1.0", + "3.1.1", + "3.1.2" + ], + "InboxOn": {}, + "AssemblyVersionInPackageVersion": { + "5.0.0.0": "5.0.0" + } + }, + "Microsoft.Extensions.Configuration.Xml": { + "StableVersions": [ + "1.0.0", + "1.0.1", + "1.0.2", + "1.1.0", + "1.1.1", + "1.1.2", + "2.0.0", + "2.0.1", + "2.0.2", + "2.1.0", + "2.1.1", + "2.2.0", + "3.0.0", + "3.0.1", + "3.0.2", + "3.0.3", + "3.1.0", + "3.1.1", + "3.1.2" + ], + "InboxOn": {}, + "AssemblyVersionInPackageVersion": { + "5.0.0.0": "5.0.0" + } + }, "Microsoft.Extensions.DependencyInjection": { "StableVersions": [ "1.0.0", @@ -507,6 +616,24 @@ "5.0.0.0": "5.0.0" } }, + "Microsoft.Extensions.Hosting": { + "StableVersions": [ + "2.1.0", + "2.1.1", + "2.2.0", + "3.0.0", + "3.0.1", + "3.0.2", + "3.0.3", + "3.1.0", + "3.1.1", + "3.1.2" + ], + "InboxOn": {}, + "AssemblyVersionInPackageVersion": { + "5.0.0.0": "5.0.0" + } + }, "Microsoft.Extensions.Hosting.Abstractions": { "StableVersions": [ "2.0.0", @@ -529,6 +656,51 @@ "5.0.0.0": "5.0.0" } }, + "Microsoft.Extensions.Http": { + "StableVersions": [ + "2.1.0", + "2.1.1", + "2.2.0", + "3.0.0", + "3.0.1", + "3.0.2", + "3.0.3", + "3.1.0", + "3.1.1", + "3.1.2" + ], + "InboxOn": {}, + "AssemblyVersionInPackageVersion": { + "5.0.0.0": "5.0.0" + } + }, + "Microsoft.Extensions.Logging": { + "StableVersions": [ + "1.0.0", + "1.0.1", + "1.0.2", + "1.1.0", + "1.1.1", + "1.1.2", + "2.0.0", + "2.0.1", + "2.0.2", + "2.1.0", + "2.1.1", + "2.2.0", + "3.0.0", + "3.0.1", + "3.0.2", + "3.0.3", + "3.1.0", + "3.1.1", + "3.1.2" + ], + "InboxOn": {}, + "AssemblyVersionInPackageVersion": { + "5.0.0.0": "5.0.0" + } + }, "Microsoft.Extensions.Logging.Abstractions": { "StableVersions": [ "1.0.0", @@ -556,6 +728,159 @@ "5.0.0.0": "5.0.0" } }, + "Microsoft.Extensions.Logging.Configuration": { + "StableVersions": [ + "2.0.0", + "2.0.1", + "2.0.2", + "2.1.0", + "2.1.1", + "2.2.0", + "3.0.0", + "3.0.1", + "3.0.2", + "3.0.3", + "3.1.0", + "3.1.1", + "3.1.2" + ], + "InboxOn": {}, + "AssemblyVersionInPackageVersion": { + "5.0.0.0": "5.0.0" + } + }, + "Microsoft.Extensions.Logging.Console": { + "StableVersions": [ + "1.0.0", + "1.0.1", + "1.0.2", + "1.1.0", + "1.1.1", + "1.1.2", + "2.0.0", + "2.0.1", + "2.0.2", + "2.1.0", + "2.1.1", + "2.2.0", + "3.0.0", + "3.0.1", + "3.0.2", + "3.0.3", + "3.1.0", + "3.1.1", + "3.1.2" + ], + "InboxOn": {}, + "AssemblyVersionInPackageVersion": { + "5.0.0.0": "5.0.0" + } + }, + "Microsoft.Extensions.Logging.Debug": { + "StableVersions": [ + "1.0.0", + "1.0.1", + "1.0.2", + "1.1.0", + "1.1.1", + "1.1.2", + "2.0.0", + "2.0.1", + "2.0.2", + "2.1.0", + "2.1.1", + "2.2.0", + "3.0.0", + "3.0.1", + "3.0.2", + "3.0.3", + "3.1.0", + "3.1.1", + "3.1.2" + ], + "InboxOn": {}, + "AssemblyVersionInPackageVersion": { + "5.0.0.0": "5.0.0" + } + }, + "Microsoft.Extensions.Logging.EventLog": { + "StableVersions": [ + "1.0.0", + "1.0.1", + "1.0.2", + "1.1.0", + "1.1.1", + "1.1.2", + "2.0.0", + "2.0.1", + "2.0.2", + "2.1.0", + "2.1.1", + "2.2.0", + "3.0.0", + "3.0.1", + "3.0.2", + "3.0.3", + "3.1.0", + "3.1.1", + "3.1.2" + ], + "InboxOn": {}, + "AssemblyVersionInPackageVersion": { + "5.0.0.0": "5.0.0" + } + }, + "Microsoft.Extensions.Logging.EventSource": { + "StableVersions": [ + "1.1.0", + "1.1.1", + "1.1.2", + "2.0.0", + "2.0.1", + "2.0.2", + "2.1.0", + "2.1.1", + "2.2.0", + "3.0.0", + "3.0.1", + "3.0.2", + "3.0.3", + "3.1.0", + "3.1.1", + "3.1.2" + ], + "InboxOn": {}, + "AssemblyVersionInPackageVersion": { + "5.0.0.0": "5.0.0" + } + }, + "Microsoft.Extensions.Logging.TraceSource": { + "StableVersions": [ + "1.0.0", + "1.0.1", + "1.0.2", + "1.1.0", + "1.1.1", + "1.1.2", + "2.0.0", + "2.0.1", + "2.0.2", + "2.1.0", + "2.1.1", + "2.2.0", + "3.0.0", + "3.0.1", + "3.0.2", + "3.0.3", + "3.1.0", + "3.1.1", + "3.1.2" + ], + "InboxOn": {}, + "AssemblyVersionInPackageVersion": { + "5.0.0.0": "5.0.0" + } + }, "Microsoft.Extensions.Options": { "StableVersions": [ "1.0.0", diff --git a/src/libraries/pkg/test/packageTest.targets b/src/libraries/pkg/test/packageTest.targets index 13b4288879fe58..2d1c98b2ca5bb6 100644 --- a/src/libraries/pkg/test/packageTest.targets +++ b/src/libraries/pkg/test/packageTest.targets @@ -19,6 +19,11 @@ + + + + + diff --git a/src/libraries/pkg/test/testPackages.proj b/src/libraries/pkg/test/testPackages.proj index dba24ae606f48e..556872dc0b6f71 100644 --- a/src/libraries/pkg/test/testPackages.proj +++ b/src/libraries/pkg/test/testPackages.proj @@ -3,6 +3,8 @@ + +