From de292fd9b917d36db57632fdfeb4c00996f36a7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Linda=20Prytz=20S=C3=B8rlie?= <linda.sorlie@bekk.no>
Date: Thu, 25 Nov 2021 14:09:45 +0100
Subject: [PATCH 1/2] Upgrade from .NET Target Framework 4.5 to 4.6.1

This must be done in order to be able to upgrade the RestSharp package.
---
 TextmagicRest.Examples/App.config                    | 6 +++---
 TextmagicRest.Examples/TextmagicRest.Examples.csproj | 3 ++-
 TextmagicRest.Tests/TextmagicRest.Tests.csproj       | 3 ++-
 TextmagicRest.Tests/packages.config                  | 2 +-
 TextmagicRest/TextmagicRest.csproj                   | 3 ++-
 TextmagicRest/packages.config                        | 2 +-
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/TextmagicRest.Examples/App.config b/TextmagicRest.Examples/App.config
index 9c05822..bae5d6d 100644
--- a/TextmagicRest.Examples/App.config
+++ b/TextmagicRest.Examples/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
     </startup>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/TextmagicRest.Examples/TextmagicRest.Examples.csproj b/TextmagicRest.Examples/TextmagicRest.Examples.csproj
index ab961bf..eed2efc 100644
--- a/TextmagicRest.Examples/TextmagicRest.Examples.csproj
+++ b/TextmagicRest.Examples/TextmagicRest.Examples.csproj
@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TextmagicRest.Examples</RootNamespace>
     <AssemblyName>TextmagicRest.Examples</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
diff --git a/TextmagicRest.Tests/TextmagicRest.Tests.csproj b/TextmagicRest.Tests/TextmagicRest.Tests.csproj
index 0af90c9..38ca884 100644
--- a/TextmagicRest.Tests/TextmagicRest.Tests.csproj
+++ b/TextmagicRest.Tests/TextmagicRest.Tests.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TextmagicRest.Tests</RootNamespace>
     <AssemblyName>TextmagicRest.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/TextmagicRest.Tests/packages.config b/TextmagicRest.Tests/packages.config
index 8a91701..31d829d 100644
--- a/TextmagicRest.Tests/packages.config
+++ b/TextmagicRest.Tests/packages.config
@@ -3,5 +3,5 @@
   <package id="Moq" version="4.2.1502.0911" targetFramework="net45" />
   <package id="NUnit" version="2.6.4" targetFramework="net45" />
   <package id="NUnitTestAdapter" version="2.0.0" targetFramework="net45" />
-  <package id="RestSharp" version="105.1.0" targetFramework="net45" />
+  <package id="RestSharp" version="105.1.0" targetFramework="net45" requireReinstallation="true" />
 </packages>
\ No newline at end of file
diff --git a/TextmagicRest/TextmagicRest.csproj b/TextmagicRest/TextmagicRest.csproj
index bae8486..601f9ea 100644
--- a/TextmagicRest/TextmagicRest.csproj
+++ b/TextmagicRest/TextmagicRest.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TextmagicRest</RootNamespace>
     <AssemblyName>TextmagicRest</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/TextmagicRest/packages.config b/TextmagicRest/packages.config
index 9396df9..8f9116b 100644
--- a/TextmagicRest/packages.config
+++ b/TextmagicRest/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="RestSharp" version="105.1.0" targetFramework="net45" />
+  <package id="RestSharp" version="105.1.0" targetFramework="net45" requireReinstallation="true" />
 </packages>
\ No newline at end of file

From 3c069d4a6f076b455bbd17f164adaf5276e0dd68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Linda=20Prytz=20S=C3=B8rlie?= <linda.sorlie@bekk.no>
Date: Thu, 25 Nov 2021 14:14:14 +0100
Subject: [PATCH 2/2] Upgrade package RestSharp from 105.1.0 to 106.13.0

- Also fixed broken imports after package upgrade
---
 TextmagicRest.Tests/Common.cs                  | 9 ++-------
 TextmagicRest.Tests/TextmagicRest.Tests.csproj | 6 +++---
 TextmagicRest.Tests/packages.config            | 2 +-
 TextmagicRest/TextmagicAuthenticator.cs        | 8 ++------
 TextmagicRest/TextmagicRest.csproj             | 6 +++---
 TextmagicRest/packages.config                  | 2 +-
 6 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/TextmagicRest.Tests/Common.cs b/TextmagicRest.Tests/Common.cs
index d1a8720..bbc9805 100644
--- a/TextmagicRest.Tests/Common.cs
+++ b/TextmagicRest.Tests/Common.cs
@@ -1,12 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using RestSharp;
+using RestSharp;
 using System.Net;
 using Moq;
-using RestSharp.Deserializers;
+using RestSharp.Serialization.Json;
 
 namespace TextmagicRest.Tests
 {
diff --git a/TextmagicRest.Tests/TextmagicRest.Tests.csproj b/TextmagicRest.Tests/TextmagicRest.Tests.csproj
index 38ca884..4e58e99 100644
--- a/TextmagicRest.Tests/TextmagicRest.Tests.csproj
+++ b/TextmagicRest.Tests/TextmagicRest.Tests.csproj
@@ -55,12 +55,12 @@
       <HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\NUnit.VisualStudio.TestAdapter.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="RestSharp, Version=105.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="RestSharp, Version=106.13.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
+      <HintPath>..\packages\RestSharp.106.13.0\lib\net452\RestSharp.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
diff --git a/TextmagicRest.Tests/packages.config b/TextmagicRest.Tests/packages.config
index 31d829d..f3f529a 100644
--- a/TextmagicRest.Tests/packages.config
+++ b/TextmagicRest.Tests/packages.config
@@ -3,5 +3,5 @@
   <package id="Moq" version="4.2.1502.0911" targetFramework="net45" />
   <package id="NUnit" version="2.6.4" targetFramework="net45" />
   <package id="NUnitTestAdapter" version="2.0.0" targetFramework="net45" />
-  <package id="RestSharp" version="105.1.0" targetFramework="net45" requireReinstallation="true" />
+  <package id="RestSharp" version="106.13.0" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/TextmagicRest/TextmagicAuthenticator.cs b/TextmagicRest/TextmagicAuthenticator.cs
index ab780d3..9202515 100644
--- a/TextmagicRest/TextmagicAuthenticator.cs
+++ b/TextmagicRest/TextmagicAuthenticator.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using RestSharp;
+using RestSharp;
+using RestSharp.Authenticators;
 
 namespace TextmagicRest
 {
diff --git a/TextmagicRest/TextmagicRest.csproj b/TextmagicRest/TextmagicRest.csproj
index 601f9ea..b890ab3 100644
--- a/TextmagicRest/TextmagicRest.csproj
+++ b/TextmagicRest/TextmagicRest.csproj
@@ -31,12 +31,12 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="RestSharp, Version=105.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="RestSharp, Version=106.13.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
+      <HintPath>..\packages\RestSharp.106.13.0\lib\net452\RestSharp.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
diff --git a/TextmagicRest/packages.config b/TextmagicRest/packages.config
index 8f9116b..7302f46 100644
--- a/TextmagicRest/packages.config
+++ b/TextmagicRest/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="RestSharp" version="105.1.0" targetFramework="net45" requireReinstallation="true" />
+  <package id="RestSharp" version="106.13.0" targetFramework="net461" />
 </packages>
\ No newline at end of file