diff --git a/Directory.Build.props b/Directory.Build.props index eb552039..5d5c16f8 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -4,7 +4,7 @@ - 2.0.0-preview-02 + 2.0.0-preview-01 WireMock.Net-Logo.png https://github.com/wiremock/WireMock.Net Apache-2.0 diff --git a/examples/WireMock.Net.ConsoleApp.UsingNuGet/WireMock.Net.ConsoleApp.UsingNuGet.csproj b/examples/WireMock.Net.ConsoleApp.UsingNuGet/WireMock.Net.ConsoleApp.UsingNuGet.csproj index 54836452..4255cee4 100644 --- a/examples/WireMock.Net.ConsoleApp.UsingNuGet/WireMock.Net.ConsoleApp.UsingNuGet.csproj +++ b/examples/WireMock.Net.ConsoleApp.UsingNuGet/WireMock.Net.ConsoleApp.UsingNuGet.csproj @@ -16,7 +16,7 @@ - + \ No newline at end of file diff --git a/examples/WireMock.Net.WebSocketExamples/Program.cs b/examples/WireMock.Net.WebSocketExamples/Program.cs index b89cf943..045fac83 100644 --- a/examples/WireMock.Net.WebSocketExamples/Program.cs +++ b/examples/WireMock.Net.WebSocketExamples/Program.cs @@ -201,7 +201,6 @@ public static class Program .WithGuid(broadcastMappingGuid) .RespondWith(Response.Create() .WithWebSocket(ws => ws - .WithBroadcast() .WithMessageHandler(async (message, context) => { if (message.MessageType == WebSocketMessageType.Text) @@ -423,7 +422,6 @@ public static class Program .WithGuid(broadcastGuid) .RespondWith(Response.Create() .WithWebSocket(ws => ws - .WithBroadcast() .WithMessageHandler(async (message, context) => { if (message.MessageType == WebSocketMessageType.Text) diff --git a/src/WireMock.Net.Abstractions/Admin/Mappings/EncodingModel.cs b/src/WireMock.Net.Abstractions/Admin/Mappings/EncodingModel.cs index 8c698d28..7066c3e2 100644 --- a/src/WireMock.Net.Abstractions/Admin/Mappings/EncodingModel.cs +++ b/src/WireMock.Net.Abstractions/Admin/Mappings/EncodingModel.cs @@ -1,26 +1,25 @@ // Copyright © WireMock.Net -namespace WireMock.Admin.Mappings +namespace WireMock.Admin.Mappings; + +/// +/// EncodingModel +/// +[FluentBuilder.AutoGenerateBuilder] +public class EncodingModel { /// - /// EncodingModel + /// Encoding CodePage /// - [FluentBuilder.AutoGenerateBuilder] - public class EncodingModel - { - /// - /// Encoding CodePage - /// - public int CodePage { get; set; } + public int CodePage { get; set; } - /// - /// Encoding EncodingName - /// - public string EncodingName { get; set; } + /// + /// Encoding EncodingName + /// + public required string EncodingName { get; set; } - /// - /// Encoding WebName - /// - public string WebName { get; set; } - } + /// + /// Encoding WebName + /// + public required string WebName { get; set; } } \ No newline at end of file diff --git a/src/WireMock.Net.Abstractions/Admin/Mappings/MappingModel.cs b/src/WireMock.Net.Abstractions/Admin/Mappings/MappingModel.cs index cb72241c..a6c7ce1c 100644 --- a/src/WireMock.Net.Abstractions/Admin/Mappings/MappingModel.cs +++ b/src/WireMock.Net.Abstractions/Admin/Mappings/MappingModel.cs @@ -1,6 +1,5 @@ // Copyright © WireMock.Net -using System; using WireMock.Models; namespace WireMock.Admin.Mappings; @@ -65,12 +64,12 @@ public class MappingModel /// /// The request model. /// - public RequestModel Request { get; set; } + public required RequestModel Request { get; set; } /// /// The response model. /// - public ResponseModel Response { get; set; } + public required ResponseModel Response { get; set; } /// /// Saves this mapping as a static mapping file. diff --git a/src/WireMock.Net.Abstractions/Admin/Requests/LogRequestModel.cs b/src/WireMock.Net.Abstractions/Admin/Requests/LogRequestModel.cs index 4dd95732..a627b604 100644 --- a/src/WireMock.Net.Abstractions/Admin/Requests/LogRequestModel.cs +++ b/src/WireMock.Net.Abstractions/Admin/Requests/LogRequestModel.cs @@ -13,7 +13,7 @@ public class LogRequestModel /// /// The Client IP Address. /// - public string ClientIP { get; set; } + public required string ClientIP { get; set; } /// /// The DateTime. @@ -23,22 +23,22 @@ public class LogRequestModel /// /// The Path. /// - public string Path { get; set; } + public required string Path { get; set; } /// /// The Absolute Path. /// - public string AbsolutePath { get; set; } + public required string AbsolutePath { get; set; } /// /// Gets the url (relative). /// - public string Url { get; set; } + public required string Url { get; set; } /// /// The absolute URL. /// - public string AbsoluteUrl { get; set; } + public required string AbsoluteUrl { get; set; } /// /// The ProxyUrl (if a proxy is used). @@ -53,7 +53,7 @@ public class LogRequestModel /// /// The method. /// - public string Method { get; set; } + public required string Method { get; set; } /// /// The HTTP Version. diff --git a/src/WireMock.Net.Abstractions/Admin/Scenarios/ScenarioStateModel.cs b/src/WireMock.Net.Abstractions/Admin/Scenarios/ScenarioStateModel.cs index 46851d88..35b7f048 100644 --- a/src/WireMock.Net.Abstractions/Admin/Scenarios/ScenarioStateModel.cs +++ b/src/WireMock.Net.Abstractions/Admin/Scenarios/ScenarioStateModel.cs @@ -1,36 +1,35 @@ // Copyright © WireMock.Net -namespace WireMock.Admin.Scenarios +namespace WireMock.Admin.Scenarios; + +/// +/// ScenarioStateModel +/// +[FluentBuilder.AutoGenerateBuilder] +public class ScenarioStateModel { /// - /// ScenarioStateModel + /// Gets or sets the name. /// - [FluentBuilder.AutoGenerateBuilder] - public class ScenarioStateModel - { - /// - /// Gets or sets the name. - /// - public string Name { get; set; } + public required string Name { get; set; } - /// - /// Gets or sets the NextState. - /// - public string? NextState { get; set; } + /// + /// Gets or sets the NextState. + /// + public string? NextState { get; set; } - /// - /// Gets or sets a value indicating whether this is started. - /// - public bool Started { get; set; } + /// + /// Gets or sets a value indicating whether this is started. + /// + public bool Started { get; set; } - /// - /// Gets or sets a value indicating whether this is finished. - /// - public bool Finished { get; set; } + /// + /// Gets or sets a value indicating whether this is finished. + /// + public bool Finished { get; set; } - /// - /// Gets or sets the state counter. - /// - public int Counter { get; set; } - } + /// + /// Gets or sets the state counter. + /// + public int Counter { get; set; } } \ No newline at end of file diff --git a/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj b/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj index 917c7cf2..4ee831b5 100644 --- a/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj +++ b/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj @@ -39,7 +39,7 @@ --> - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/WireMock.Net.Minimal/Serialization/MappingFileNameSanitizer.cs b/src/WireMock.Net.Minimal/Serialization/MappingFileNameSanitizer.cs index 94cefa2b..bf21cd5e 100644 --- a/src/WireMock.Net.Minimal/Serialization/MappingFileNameSanitizer.cs +++ b/src/WireMock.Net.Minimal/Serialization/MappingFileNameSanitizer.cs @@ -1,7 +1,5 @@ // Copyright © WireMock.Net -using System.IO; -using System.Linq; using Stef.Validation; using WireMock.Settings; @@ -10,7 +8,7 @@ namespace WireMock.Serialization; /// /// Creates sanitized file names for mappings /// -public class MappingFileNameSanitizer +internal class MappingFileNameSanitizer { private const char ReplaceChar = '_'; diff --git a/src/WireMock.Net.Minimal/Server/WireMockServer.Admin.cs b/src/WireMock.Net.Minimal/Server/WireMockServer.Admin.cs index 131bab66..7e1d4d93 100644 --- a/src/WireMock.Net.Minimal/Server/WireMockServer.Admin.cs +++ b/src/WireMock.Net.Minimal/Server/WireMockServer.Admin.cs @@ -870,7 +870,7 @@ public partial class WireMockServer throw new NotSupportedException(); } - private static T DeserializeObject(IRequestMessage requestMessage) where T : new() + private static T DeserializeObject(IRequestMessage requestMessage) { switch (requestMessage.BodyData?.DetectedBodyType) { diff --git a/src/WireMock.Net.Minimal/WireMock.Net.Minimal.csproj b/src/WireMock.Net.Minimal/WireMock.Net.Minimal.csproj index 618ab0c5..6e41ed30 100644 --- a/src/WireMock.Net.Minimal/WireMock.Net.Minimal.csproj +++ b/src/WireMock.Net.Minimal/WireMock.Net.Minimal.csproj @@ -1,4 +1,4 @@ - + Minimal version from the lightweight Http Mocking Server for .NET WireMock.Net.Minimal @@ -37,9 +37,9 @@ - - - + + + @@ -47,6 +47,12 @@ + + + CS1591;CS8618 + + + @@ -56,18 +62,6 @@ - - - - - - - WireMockServer.cs diff --git a/src/WireMock.Net.OpenApiParser/WireMock.Net.OpenApiParser.csproj b/src/WireMock.Net.OpenApiParser/WireMock.Net.OpenApiParser.csproj index 7daf4ed7..86869227 100644 --- a/src/WireMock.Net.OpenApiParser/WireMock.Net.OpenApiParser.csproj +++ b/src/WireMock.Net.OpenApiParser/WireMock.Net.OpenApiParser.csproj @@ -42,7 +42,7 @@ - + diff --git a/src/WireMock.Net.TUnit/WireMock.Net.TUnit.csproj b/src/WireMock.Net.TUnit/WireMock.Net.TUnit.csproj index 73823377..5604d0e2 100644 --- a/src/WireMock.Net.TUnit/WireMock.Net.TUnit.csproj +++ b/src/WireMock.Net.TUnit/WireMock.Net.TUnit.csproj @@ -28,7 +28,7 @@ - + diff --git a/src/WireMock.Net.xUnit.v3/WireMock.Net.xUnit.v3.csproj b/src/WireMock.Net.xUnit.v3/WireMock.Net.xUnit.v3.csproj index dd410373..a016d1d7 100644 --- a/src/WireMock.Net.xUnit.v3/WireMock.Net.xUnit.v3.csproj +++ b/src/WireMock.Net.xUnit.v3/WireMock.Net.xUnit.v3.csproj @@ -24,7 +24,7 @@ - + diff --git a/test/WireMock.Net.Aspire.Tests/WireMock.Net.Aspire.Tests.csproj b/test/WireMock.Net.Aspire.Tests/WireMock.Net.Aspire.Tests.csproj index fc48f611..f048cd86 100644 --- a/test/WireMock.Net.Aspire.Tests/WireMock.Net.Aspire.Tests.csproj +++ b/test/WireMock.Net.Aspire.Tests/WireMock.Net.Aspire.Tests.csproj @@ -25,7 +25,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/test/WireMock.Net.Extensions.Routing.Tests/WireMock.Net.Extensions.Routing.Tests.csproj b/test/WireMock.Net.Extensions.Routing.Tests/WireMock.Net.Extensions.Routing.Tests.csproj index 5e91c503..3924c66b 100644 --- a/test/WireMock.Net.Extensions.Routing.Tests/WireMock.Net.Extensions.Routing.Tests.csproj +++ b/test/WireMock.Net.Extensions.Routing.Tests/WireMock.Net.Extensions.Routing.Tests.csproj @@ -16,7 +16,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/WireMock.Net.Middleware.Tests/WireMock.Net.Middleware.Tests.csproj b/test/WireMock.Net.Middleware.Tests/WireMock.Net.Middleware.Tests.csproj index 6c65c9d8..bbabf516 100644 --- a/test/WireMock.Net.Middleware.Tests/WireMock.Net.Middleware.Tests.csproj +++ b/test/WireMock.Net.Middleware.Tests/WireMock.Net.Middleware.Tests.csproj @@ -24,7 +24,7 @@ - + diff --git a/test/WireMock.Net.TUnitTests/WireMock.Net.TUnitTests.csproj b/test/WireMock.Net.TUnitTests/WireMock.Net.TUnitTests.csproj index 828b1488..f6d6e4e2 100644 --- a/test/WireMock.Net.TUnitTests/WireMock.Net.TUnitTests.csproj +++ b/test/WireMock.Net.TUnitTests/WireMock.Net.TUnitTests.csproj @@ -10,7 +10,7 @@ - + diff --git a/test/WireMock.Net.Tests.UsingNuGet/WireMock.Net.Tests.UsingNuGet.csproj b/test/WireMock.Net.Tests.UsingNuGet/WireMock.Net.Tests.UsingNuGet.csproj index 8d41905f..7800b45d 100644 --- a/test/WireMock.Net.Tests.UsingNuGet/WireMock.Net.Tests.UsingNuGet.csproj +++ b/test/WireMock.Net.Tests.UsingNuGet/WireMock.Net.Tests.UsingNuGet.csproj @@ -2,9 +2,9 @@ net8.0 + Exe enable enable - false true @@ -15,7 +15,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/test/WireMock.Net.Tests.UsingNuGet/WireMockServerTests.WithMultiPart.cs b/test/WireMock.Net.Tests.UsingNuGet/WireMockServerTests.WithMultiPart.cs index 57c9b0f8..878bb212 100644 --- a/test/WireMock.Net.Tests.UsingNuGet/WireMockServerTests.WithMultiPart.cs +++ b/test/WireMock.Net.Tests.UsingNuGet/WireMockServerTests.WithMultiPart.cs @@ -12,8 +12,10 @@ using WireMock.Server; // ReSharper disable once CheckNamespace namespace WireMock.Net.Tests; -public partial class WireMockServerTests +public class WireMockServerTests { + private readonly CancellationToken _ct = TestContext.Current.CancellationToken; + [Fact] public async Task WireMockServer_WithMultiPartBody_Using_MimePartMatchers() { @@ -85,19 +87,19 @@ public partial class WireMockServerTests var client = server.CreateClient(); // Act 1 - var response1 = await client.PostAsync("/multipart", formDataContent); + var response1 = await client.PostAsync("/multipart", formDataContent, _ct); // Assert 1 response1.StatusCode.Should().Be(HttpStatusCode.OK); - var content1 = await response1.Content.ReadAsStringAsync(); + var content1 = await response1.Content.ReadAsStringAsync(_ct); content1.Should().Be("POST;This is some plain text"); // Act 2 - var response2 = await client.PostAsync("/multipart2", formDataContent); + var response2 = await client.PostAsync("/multipart2", formDataContent, _ct); // Assert 1 response2.StatusCode.Should().Be(HttpStatusCode.OK); - var content2 = await response2.Content.ReadAsStringAsync(); + var content2 = await response2.Content.ReadAsStringAsync(_ct); content2.Should().Be("OK"); } } \ No newline at end of file diff --git a/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj b/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj index b83bfefd..4a6b5470 100644 --- a/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj +++ b/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj @@ -62,13 +62,13 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive