Merge remote-tracking branch 'origin/dev' into dev

Author: alexeyzimarev

RestSharp.sln.DotSettings

@@ -98,4 +98,5 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. 
 	</s:String>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Zimarev/@EntryIndexedValue">True</s:Boolean>
 </wpf:ResourceDictionary>

src/Directory.Build.props

@@ -31,7 +31,7 @@
         <Using Include="JetBrains.Annotations"/>
     </ItemGroup>
     <ItemGroup Condition="$(TargetFramework) == 'netstandard2.0'">
-        <PackageReference Include="IsExternalInit" Version="1.0.1" PrivateAssets="All"/>
+        <PackageReference Include="IsExternalInit" Version="1.0.2" PrivateAssets="All"/>
     </ItemGroup>
     <Target Name="CustomVersion" AfterTargets="MinVer">
         <PropertyGroup>

src/RestSharp.Serializers.NewtonsoftJson/JsonNetSerializer.cs

@@ -1,8 +1,22 @@
+//   Copyright © 2009-2021 John Sheehan, Andrew Young, Alexey Zimarev and RestSharp community
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License. 
+
 using Newtonsoft.Json.Serialization;
 
-namespace RestSharp.Serializers.NewtonsoftJson; 
+namespace RestSharp.Serializers.NewtonsoftJson;
 
-public class JsonNetSerializer : IRestSerializer {
+public class JsonNetSerializer : IRestSerializer, ISerializer, IDeserializer {
     /// <summary>
     /// Default serialization settings:
     /// - Camel-case contract resolver
@@ -37,7 +51,7 @@ public class JsonNetSerializer : IRestSerializer {
 
     public string? Serialize(object? obj) {
         if (obj == null) return null;
-            
+
         using var writerBuffer = _writerBuffer ??= new WriterBuffer(_serializer);
 
         _serializer.Serialize(writerBuffer.GetJsonTextWriter(), obj, obj.GetType());
@@ -50,11 +64,15 @@ public class JsonNetSerializer : IRestSerializer {
     public T? Deserialize<T>(RestResponse response) {
         if (response.Content == null)
             throw new DeserializationException(response, new InvalidOperationException("Response content is null"));
+
         using var reader = new JsonTextReader(new StringReader(response.Content)) { CloseInput = true };
 
         return _serializer.Deserialize<T>(reader);
     }
 
+    public ISerializer   Serializer   => this;
+    public IDeserializer Deserializer => this;
+
     public string[] SupportedContentTypes { get; } = {
         "application/json", "text/json", "text/x-json", "text/javascript", "*+json"
     };

src/RestSharp.Serializers.NewtonsoftJson/RestClientExtensions.cs

@@ -1,3 +1,17 @@
+//   Copyright © 2009-2021 John Sheehan, Andrew Young, Alexey Zimarev and RestSharp community
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License. 
+
 namespace RestSharp.Serializers.NewtonsoftJson;
 
 [PublicAPI]

src/RestSharp.Serializers.NewtonsoftJson/WriterBuffer.cs

@@ -1,3 +1,17 @@
+//   Copyright © 2009-2021 John Sheehan, Andrew Young, Alexey Zimarev and RestSharp community
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License. 
+
 using System.Globalization;
 using System.Text;
 

src/RestSharp.Serializers.Xml/DeserializeAsAttribute.cs

@@ -1,4 +1,18 @@
-// ReSharper disable once CheckNamespace
+//   Copyright © 2009-2021 John Sheehan, Andrew Young, Alexey Zimarev and RestSharp community
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License. 
+
+// ReSharper disable once CheckNamespace
 namespace RestSharp.Serializers;
 
 /// <summary>

src/RestSharp.Serializers.Xml/SerializeAsAttribute.cs

@@ -1,4 +1,18 @@
-using System.Globalization;
+//   Copyright © 2009-2021 John Sheehan, Andrew Young, Alexey Zimarev and RestSharp community
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License. 
+
+using System.Globalization;
 using RestSharp.Extensions;
 
 // ReSharper disable once CheckNamespace

src/RestSharp.Serializers.Xml/XmlAttributeDeserializer.cs

@@ -1,4 +1,18 @@
-using System.Reflection;
+//   Copyright © 2009-2021 John Sheehan, Andrew Young, Alexey Zimarev and RestSharp community
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License. 
+
+using System.Reflection;
 using System.Xml.Linq;
 using RestSharp.Extensions;
 

src/RestSharp.Serializers.Xml/XmlDeserializer.cs

@@ -1,3 +1,17 @@
+//   Copyright © 2009-2021 John Sheehan, Andrew Young, Alexey Zimarev and RestSharp community
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License. 
+
 using System.Collections;
 using System.ComponentModel;
 using System.Globalization;
@@ -8,7 +22,7 @@
 
 namespace RestSharp.Serializers.Xml;
 
-public class XmlDeserializer : IXmlDeserializer {
+public class XmlDeserializer : IXmlDeserializer, IWithRootElement, IWithDateFormat {
     public XmlDeserializer() => Culture = CultureInfo.InvariantCulture;
 
     public CultureInfo Culture { get; set; }

src/RestSharp.Serializers.Xml/XmlExtensions.cs

@@ -1,4 +1,18 @@
-using System.Xml.Linq;
+//   Copyright © 2009-2021 John Sheehan, Andrew Young, Alexey Zimarev and RestSharp community
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License. 
+
+using System.Xml.Linq;
 using RestSharp.Extensions;
 
 namespace RestSharp.Serializers.Xml;