From bb561c94d072ea9f0b24499057f7ff3e85681c77 Mon Sep 17 00:00:00 2001 From: Stef Heyenrath Date: Sun, 31 Aug 2025 11:07:25 +0200 Subject: [PATCH] cleanup some #if for NETSTANDARD1_3 --- .../WireMock.Net.Abstractions.csproj | 10 ++++------ .../AzureADAuthenticationMatcher.cs | 4 ++-- .../Compatibility/StringExtensions.cs | 2 +- .../Http/HttpClientBuilder.cs | 4 ++-- .../Matchers/XPathMatcher.cs | 20 +++++++++---------- .../Owin/AspNetCoreSelfHost.cs | 16 +++++++-------- .../Server/WireMockServer.cs | 8 ++++---- .../Handlebars/WireMockHandlebarsHelpers.cs | 6 +++--- .../Util/CultureInfoExtensions.cs | 4 ++-- src/WireMock.Net.Minimal/Util/PortUtils.cs | 8 ++++---- .../WireMock.Net.OpenApiParser.csproj | 5 ++++- .../RegularExpressions/RegexExtended.cs | 6 +++--- .../Util/CompressionUtils.cs | 4 ++-- src/WireMock.Net.Shared/Util/TypeLoader.cs | 8 ++++---- .../WireMock.Net.Shared.csproj | 3 ++- .../ResponseWithHandlebarsXPathTests.cs | 20 +++++++++---------- .../Util/CultureInfoUtilsTests.cs | 4 ++-- 17 files changed, 67 insertions(+), 65 deletions(-) diff --git a/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj b/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj index 862dc113..08142ea8 100644 --- a/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj +++ b/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj @@ -44,18 +44,16 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/src/WireMock.Net.Shared/RegularExpressions/RegexExtended.cs b/src/WireMock.Net.Shared/RegularExpressions/RegexExtended.cs index 529e39e8..04569e5c 100644 --- a/src/WireMock.Net.Shared/RegularExpressions/RegexExtended.cs +++ b/src/WireMock.Net.Shared/RegularExpressions/RegexExtended.cs @@ -10,9 +10,9 @@ namespace WireMock.RegularExpressions; /// /// Extension to the object, adding support for GUID tokens for matching on. /// -#if !NETSTANDARD1_3 +//#if !NETSTANDARD1_3 [Serializable] -#endif +//#endif internal class RegexExtended : Regex { /// @@ -32,7 +32,7 @@ internal class RegexExtended : Regex { } -#if !NETSTANDARD1_3 && !NET8_0_OR_GREATER +#if !NET8_0_OR_GREATER /// protected RegexExtended(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) : base(info, context) diff --git a/src/WireMock.Net.Shared/Util/CompressionUtils.cs b/src/WireMock.Net.Shared/Util/CompressionUtils.cs index 290ff9c8..3388617f 100644 --- a/src/WireMock.Net.Shared/Util/CompressionUtils.cs +++ b/src/WireMock.Net.Shared/Util/CompressionUtils.cs @@ -23,9 +23,9 @@ internal static class CompressionUtils using var zipStream = Create(contentEncoding, compressedStream, CompressionMode.Compress); zipStream.Write(data, 0, data.Length); -#if !NETSTANDARD1_3 +//#if !NETSTANDARD1_3 zipStream.Close(); -#endif +//#endif return compressedStream.ToArray(); } diff --git a/src/WireMock.Net.Shared/Util/TypeLoader.cs b/src/WireMock.Net.Shared/Util/TypeLoader.cs index dabd8e9b..c2dda6ff 100644 --- a/src/WireMock.Net.Shared/Util/TypeLoader.cs +++ b/src/WireMock.Net.Shared/Util/TypeLoader.cs @@ -142,16 +142,16 @@ internal static class TypeLoader private static bool TryFindTypeInDlls(string? implementationTypeFullName, [NotNullWhen(true)] out Type? pluginType) where TInterface : class { -#if NETSTANDARD1_3 - var directoriesToSearch = new[] { AppContext.BaseDirectory }; -#else +//#if NETSTANDARD1_3 +// var directoriesToSearch = new[] { AppContext.BaseDirectory }; +//#else var processDirectory = Path.GetDirectoryName(System.Diagnostics.Process.GetCurrentProcess().MainModule?.FileName); var assemblyDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); var directoriesToSearch = new[] { processDirectory, assemblyDirectory } .Where(d => !string.IsNullOrEmpty(d)) .Distinct() .ToArray(); -#endif +//#endif foreach (var directory in directoriesToSearch) { foreach (var file in Directory.GetFiles(directory!, "*.dll")) diff --git a/src/WireMock.Net.Shared/WireMock.Net.Shared.csproj b/src/WireMock.Net.Shared/WireMock.Net.Shared.csproj index 7bec17d2..35bc4531 100644 --- a/src/WireMock.Net.Shared/WireMock.Net.Shared.csproj +++ b/src/WireMock.Net.Shared/WireMock.Net.Shared.csproj @@ -43,7 +43,8 @@ --> - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXPathTests.cs b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXPathTests.cs index 0a29a387..0dba8525 100644 --- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXPathTests.cs +++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXPathTests.cs @@ -1,7 +1,7 @@ // Copyright © WireMock.Net using System.Threading.Tasks; -using System.Xml; +//using System.Xml; using NFluent; using WireMock.Models; using WireMock.ResponseBuilders; @@ -12,9 +12,9 @@ using Xunit; using Moq; using WireMock.Handlers; using FluentAssertions; -#if !NETSTANDARD1_3 -using Wmhelp.XPath2; -#endif +//#if !NETSTANDARD1_3 +//using Wmhelp.XPath2; +//#endif namespace WireMock.Net.Tests.ResponseBuilders; @@ -57,7 +57,7 @@ public class ResponseWithHandlebarsXPathTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert response.Message.BodyData!.BodyAsString.Should().Be("abc"); @@ -85,7 +85,7 @@ public class ResponseWithHandlebarsXPathTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(response.Message.BodyData.BodyAsString).IsEqualTo("abc"); @@ -113,7 +113,7 @@ public class ResponseWithHandlebarsXPathTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert response.Message.BodyData!.BodyAsString.Should().Be("abc,def,xyz"); @@ -169,7 +169,7 @@ public class ResponseWithHandlebarsXPathTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert response.Message.BodyData!.BodyAsString.Should().Be("0000083256"); @@ -197,7 +197,7 @@ public class ResponseWithHandlebarsXPathTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(response.Message.BodyData.BodyAsString).IsEqualIgnoringCase("True"); @@ -225,7 +225,7 @@ public class ResponseWithHandlebarsXPathTests .WithTransformer(); // Act - var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false); + var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings); // Assert Check.That(response.Message.BodyData.BodyAsString).IsEqualTo("a1"); diff --git a/test/WireMock.Net.Tests/Util/CultureInfoUtilsTests.cs b/test/WireMock.Net.Tests/Util/CultureInfoUtilsTests.cs index 08102d66..28f7aca3 100644 --- a/test/WireMock.Net.Tests/Util/CultureInfoUtilsTests.cs +++ b/test/WireMock.Net.Tests/Util/CultureInfoUtilsTests.cs @@ -39,7 +39,7 @@ public class CultureInfoUtilsTests result.Should().Be(expectedCulture); } -#if !NETSTANDARD1_3 +//#if !NETSTANDARD1_3 [Fact] public void Parse_IntegerInput_ReturnsExpectedCultureInfo() { @@ -53,7 +53,7 @@ public class CultureInfoUtilsTests // Assert result.Should().Be(expectedCulture); } -#endif +//#endif [Fact] public void Parse_CurrentCultureInput_ReturnsCurrentCulture()