Upgrade RestSharp fork from .NET 2.0/3.5 to .NET Framework 4.8

README.markdown

@@ -1,17 +1,18 @@
-# RestSharp .NET 2.0 Fork - Simple .NET REST Client
+# RestSharp - Simple .NET REST Client
 
-This is a fork of RestSharp for ,NET 2.0.
+This fork of RestSharp targets .NET Framework 4.8.
 
-To get it to work correctly we have included System.Xml.Linq from Mono project, and LinqBridge.cs, 
-so you may run into conflicts should you have other .NET2 projects that have done the same
+It was originally a .NET 2.0 fork that bundled `System.Xml.Linq` from the Mono
+project and `LinqBridge` to backport LINQ. Those shims are no longer needed on
+.NET Framework 4.8 (LINQ and `System.Xml.Linq` are built in) and have been removed.
 
 ### [Official Site/Blog][1] - [@RestSharp][2]  
 ### Please use the [Google Group][3] for feature requests and troubleshooting usage.
 ### License: Apache License 2.0  
 
 ### Features
 
-* Supports .NET 3.5+, Silverlight 4, Windows Phone 7, Mono, MonoTouch
+* Targets .NET Framework 4.8
 * Automatic XML and JSON deserialization
 * Supports custom serialization and deserialization via ISerializer and IDeserializer
 * Fuzzy element name matching ('product_id' in XML/JSON will match C# property named 'ProductId')

RestSharp.IntegrationTests/Properties/AssemblyInfo.cs

@@ -1,6 +1,11 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using Xunit;
+
+// Integration tests share a fixed local HTTP listener port, so they must run
+// serially. xunit 2.x parallelizes test collections by default; disable it.
+[assembly: CollectionBehavior(DisableTestParallelization = true)]
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information

RestSharp.IntegrationTests/RestSharp.IntegrationTests.csproj

@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>RestSharp.IntegrationTests</RootNamespace>
     <AssemblyName>RestSharp.IntegrationTests</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
@@ -40,21 +40,25 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="xunit, Version=1.9.0.1566, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+    <Reference Include="xunit.abstractions, Version=2.0.3.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="xunit.assert, Version=2.4.2.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\xunit.assert.2.4.2\lib\netstandard1.1\xunit.assert.dll</HintPath>
+    </Reference>
+    <Reference Include="xunit.core, Version=2.4.2.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\xunit.1.9.0.1566\lib\xunit.dll</HintPath>
+      <HintPath>..\packages\xunit.extensibility.core.2.4.2\lib\net452\xunit.core.dll</HintPath>
     </Reference>
-    <Reference Include="xunit.extensions, Version=1.9.0.1566, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+    <Reference Include="xunit.execution.desktop, Version=2.4.2.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\xunit.extensions.1.9.0.1566\lib\xunit.extensions.dll</HintPath>
+      <HintPath>..\packages\xunit.extensibility.execution.2.4.2\lib\net452\xunit.execution.desktop.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

RestSharp.IntegrationTests/packages.config

@@ -1,5 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="xunit" version="1.9.0.1566" />
-  <package id="xunit.extensions" version="1.9.0.1566" />
-</packages>
+  <package id="xunit" version="2.4.2" targetFramework="net48" />
+  <package id="xunit.abstractions" version="2.0.3" targetFramework="net48" />
+  <package id="xunit.assert" version="2.4.2" targetFramework="net48" />
+  <package id="xunit.core" version="2.4.2" targetFramework="net48" />
+  <package id="xunit.extensibility.core" version="2.4.2" targetFramework="net48" />
+  <package id="xunit.extensibility.execution" version="2.4.2" targetFramework="net48" />
+  <package id="xunit.runner.console" version="2.4.2" targetFramework="net48" developmentDependency="true" />
+</packages>