diff --git a/Directory.Build.props b/Directory.Build.props index 30abe2d4acc..6ae1c0f822f 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -99,7 +99,22 @@ - + + + + false + + + $([MSBuild]::NormalizeDirectory('$(ArtifactsLogDir)', 'TestLogs')) + + + true + + + diff --git a/eng/Packages/TestOnly.props b/eng/Packages/TestOnly.props index f297b3ad325..518cfd8ab9a 100644 --- a/eng/Packages/TestOnly.props +++ b/eng/Packages/TestOnly.props @@ -1,19 +1,5 @@ - - - false - - - $([MSBuild]::NormalizeDirectory('$(ArtifactsLogDir)', 'TestLogs')) - - - true - - @@ -35,13 +21,13 @@ - - + + - - + + diff --git a/src/Libraries/Microsoft.Extensions.Http.Resilience/Hedging/StandardHedgingHandlerBuilderExtensions.cs b/src/Libraries/Microsoft.Extensions.Http.Resilience/Hedging/StandardHedgingHandlerBuilderExtensions.cs index a51f69f3a82..5630e7420ea 100644 --- a/src/Libraries/Microsoft.Extensions.Http.Resilience/Hedging/StandardHedgingHandlerBuilderExtensions.cs +++ b/src/Libraries/Microsoft.Extensions.Http.Resilience/Hedging/StandardHedgingHandlerBuilderExtensions.cs @@ -36,11 +36,7 @@ public static IStandardHedgingHandlerBuilder Configure(this IStandardHedgingHand _ = builder.Services.Configure( builder.Name, section, -#if NET6_0_OR_GREATER o => o.ErrorOnUnknownConfiguration = true); -#else - _ => { }); -#endif return builder; } diff --git a/src/Libraries/Microsoft.Extensions.Http.Resilience/Resilience/HttpStandardResilienceBuilderBuilderExtensions.cs b/src/Libraries/Microsoft.Extensions.Http.Resilience/Resilience/HttpStandardResilienceBuilderBuilderExtensions.cs index b3cee1fc974..0b0fef0d0cc 100644 --- a/src/Libraries/Microsoft.Extensions.Http.Resilience/Resilience/HttpStandardResilienceBuilderBuilderExtensions.cs +++ b/src/Libraries/Microsoft.Extensions.Http.Resilience/Resilience/HttpStandardResilienceBuilderBuilderExtensions.cs @@ -34,11 +34,8 @@ public static IHttpStandardResilienceStrategyBuilder Configure(this IHttpStandar _ = builder.Services.Configure( builder.StrategyName, section, -#if NET6_0_OR_GREATER o => o.ErrorOnUnknownConfiguration = true); -#else - _ => { }); -#endif + return builder; } diff --git a/src/Libraries/Microsoft.Extensions.Options.Contextual/ContextualOptionsFactory.cs b/src/Libraries/Microsoft.Extensions.Options.Contextual/ContextualOptionsFactory.cs index 88cc5ebf8bb..344beba1c09 100644 --- a/src/Libraries/Microsoft.Extensions.Options.Contextual/ContextualOptionsFactory.cs +++ b/src/Libraries/Microsoft.Extensions.Options.Contextual/ContextualOptionsFactory.cs @@ -18,11 +18,7 @@ namespace Microsoft.Extensions.Options.Contextual; /// /// The type of options being requested. internal sealed class ContextualOptionsFactory : IContextualOptionsFactory -#if NET5_0_OR_GREATER where TOptions : class -#else - where TOptions : class, new() -#endif { private readonly IOptionsFactory _baseFactory; private readonly ILoadContextualOptions[] _loaders; @@ -124,11 +120,7 @@ async ValueTask ConfigureOptions(TContext context) if (result.Failed) { failures ??= new(); -#if NETFRAMEWORK || NETSTANDARD2_0 - failures.Add(result.FailureMessage); -#else failures.AddRange(result.Failures); -#endif } } diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LogMethodHelper.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LogMethodHelper.cs index bfa1c1ce49d..ebbe1542074 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LogMethodHelper.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LogMethodHelper.cs @@ -6,9 +6,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Diagnostics.CodeAnalysis; -#if NET6_0_OR_GREATER using Microsoft.Extensions.Logging; -#endif using Microsoft.Extensions.ObjectPool; using Microsoft.Extensions.Telemetry.Enrichment; using Microsoft.Shared.Diagnostics; @@ -202,10 +200,8 @@ void IEnrichmentPropertyBag.Add(ReadOnlySpan> prope } } -#if NET6_0_OR_GREATER /// /// Gets log define options configured to skip the log level enablement check. /// public static LogDefineOptions SkipEnabledCheckOptions { get; } = new() { SkipEnabledCheck = true }; -#endif } diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Metering/MetricCollector.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Metering/MetricCollector.cs index cdf8405b73f..d234babe126 100644 --- a/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Metering/MetricCollector.cs +++ b/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Metering/MetricCollector.cs @@ -231,15 +231,11 @@ public Task WaitForMeasurementsAsync(int minCount, CancellationToken cancellatio { lock (_measurements) { - _waiters.Remove(w); + _ = _waiters.Remove(w); } // trigger the task from outside the lock -#if NET6_0_OR_GREATER - w.TaskSource.TrySetCanceled(cancellationToken); -#else - w.TaskSource.TrySetCanceled(); -#endif + _ = w.TaskSource.TrySetCanceled(cancellationToken); }); } diff --git a/test/Generators/Microsoft.Gen.EnumStrings/Unit/Common/EmitterTests.cs b/test/Generators/Microsoft.Gen.EnumStrings/Unit/Common/EmitterTests.cs index fae0d775986..eed6b2ee609 100644 --- a/test/Generators/Microsoft.Gen.EnumStrings/Unit/Common/EmitterTests.cs +++ b/test/Generators/Microsoft.Gen.EnumStrings/Unit/Common/EmitterTests.cs @@ -20,11 +20,7 @@ public async Task TestEmitter() var sources = new List(); foreach (var file in Directory.GetFiles("TestClasses")) { -#if NETCOREAPP3_1_OR_GREATER sources.Add("#define NETCOREAPP3_1_OR_GREATER\n" + File.ReadAllText(file)); -#else - sources.Add(File.ReadAllText(file)); -#endif } // try it without the frozen collections diff --git a/test/Generators/Microsoft.Gen.Logging/Generated/Common/LogMethodTests.cs b/test/Generators/Microsoft.Gen.Logging/Generated/Common/LogMethodTests.cs index 61d272345c3..6196c8039d1 100644 --- a/test/Generators/Microsoft.Gen.Logging/Generated/Common/LogMethodTests.cs +++ b/test/Generators/Microsoft.Gen.Logging/Generated/Common/LogMethodTests.cs @@ -694,9 +694,7 @@ public void SkipEnabledCheckTests() SkipEnabledCheckTestExtensions.LoggerMethodWithFalseSkipEnabledCheck(logger, LogLevel.Information, "p1"); Assert.Equal(0, logger.Collector.Count); -#if NET8_0_OR_GREATER - // Whilst these API are marked as NET6_0_OR_GREATER we don't build .NET 6.0, - // and as such the API is available in .NET 8 onwards. +#if NET6_0_OR_GREATER SkipEnabledCheckTestExtensions.LoggerMethodWithTrueSkipEnabledCheck(logger); Assert.Equal(1, logger.Collector.Count); #endif diff --git a/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Resilience/HttpClientBuilderExtensionsTests.Standard.cs b/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Resilience/HttpClientBuilderExtensionsTests.Standard.cs index 19f6e088ecc..865146df7ba 100644 --- a/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Resilience/HttpClientBuilderExtensionsTests.Standard.cs +++ b/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Resilience/HttpClientBuilderExtensionsTests.Standard.cs @@ -122,13 +122,7 @@ public void AddStandardResilienceHandler_ConfigurationPropertyWithTypo_Throws(Me AddStandardResilienceHandler(mode, builder, _invalidConfigurationSection, options => { }); -#if NET8_0_OR_GREATER - // Whilst these API are marked as NET6_0_OR_GREATER we don't build .NET 6.0, - // and as such the API is available in .NET 8 onwards. Assert.Throws(() => HttpClientBuilderExtensionsTests.GetStrategy(builder.Services, $"test-standard")); -#else - GetStrategy(builder.Services, $"test-standard").Should().NotBeNull(); -#endif } [Fact]