diff --git a/WireMock.Net Solution.sln b/WireMock.Net Solution.sln index 3c05bd3e..1c3c8853 100644 --- a/WireMock.Net Solution.sln +++ b/WireMock.Net Solution.sln @@ -14,6 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution GitReleaseNotes.txt = GitReleaseNotes.txt README.md = README.md ReSharper_WireMock.DotSettings = ReSharper_WireMock.DotSettings + WireMock.Net Solution.sln.DotSettings = WireMock.Net Solution.sln.DotSettings EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{F0C22C47-DF71-463C-9B04-B4E0F3B8708A}" diff --git a/WireMock.Net Solution.sln.DotSettings b/WireMock.Net Solution.sln.DotSettings index 3fb89f9a..10779af8 100644 --- a/WireMock.Net Solution.sln.DotSettings +++ b/WireMock.Net Solution.sln.DotSettings @@ -1,3 +1,11 @@  + ID IP - SSL \ No newline at end of file + MD5 + SSL + TE + TSV + WWW + XMS + XUA + \ No newline at end of file diff --git a/src/WireMock.Net.StandAlone/WireMock.Net.StandAlone.csproj b/src/WireMock.Net.StandAlone/WireMock.Net.StandAlone.csproj index f8067ca6..e8d40dde 100644 --- a/src/WireMock.Net.StandAlone/WireMock.Net.StandAlone.csproj +++ b/src/WireMock.Net.StandAlone/WireMock.Net.StandAlone.csproj @@ -3,7 +3,7 @@ Lightweight StandAlone Http Mocking Server for .Net. WireMock.Net.StandAlone - 1.0.3.15 + 1.0.3.16 Stef Heyenrath net452;net46;netstandard1.3;netstandard2.0 true diff --git a/src/WireMock.Net/ResponseBuilders/Response.cs b/src/WireMock.Net/ResponseBuilders/Response.cs index 508894b8..dc21d718 100644 --- a/src/WireMock.Net/ResponseBuilders/Response.cs +++ b/src/WireMock.Net/ResponseBuilders/Response.cs @@ -31,9 +31,6 @@ namespace WireMock.ResponseBuilders /// /// Gets a value indicating whether [use transformer]. /// - /// - /// true if [use transformer]; otherwise, false. - /// public bool UseTransformer { get; private set; } /// @@ -258,7 +255,7 @@ namespace WireMock.ResponseBuilders return this; } - /// + /// public IResponseBuilder WithBodyAsJson(object body, Encoding encoding = null, bool? indented = null) { Check.NotNull(body, nameof(body)); diff --git a/src/WireMock.Net/Util/JsonUtils.cs b/src/WireMock.Net/Util/JsonUtils.cs index 9554a5e6..36178f62 100644 --- a/src/WireMock.Net/Util/JsonUtils.cs +++ b/src/WireMock.Net/Util/JsonUtils.cs @@ -11,8 +11,7 @@ namespace WireMock.Util return default(T); } - var token = value as JToken; - return token == null ? default(T) : token.ToObject(); + return !(value is JToken token) ? default(T) : token.ToObject(); } } } \ No newline at end of file diff --git a/src/WireMock.Net/WireMock.Net.csproj b/src/WireMock.Net/WireMock.Net.csproj index 2886becd..28618f8c 100644 --- a/src/WireMock.Net/WireMock.Net.csproj +++ b/src/WireMock.Net/WireMock.Net.csproj @@ -3,7 +3,7 @@ Lightweight Http Mocking Server for .Net, inspired by WireMock from the Java landscape. WireMock.Net - 1.0.3.15 + 1.0.3.16 Stef Heyenrath net452;net46;netstandard1.3;netstandard2.0 true