From 63313301c901b03035f6191d1a76c3cebfa450b7 Mon Sep 17 00:00:00 2001
From: Lajos Marton <lajosmarton@hotmail.col>
Date: Mon, 27 Jun 2022 23:03:56 +0200
Subject: [PATCH 1/2] Update .Net Framework and Nuget packages

---
 ...arionClientLibrary.IntegrationTests.csproj | 36 ++++++++++---------
 .../packages.config                           | 19 +++++-----
 .../BarionClientLibrary.Tests.csproj          | 13 ++++---
 BarionClientLibrary/BarionClient.cs           |  2 +-
 .../BarionClientLibrary.csproj                |  8 ++---
 BarionClientTester/App.config                 |  2 +-
 BarionClientTester/BarionClientTester.csproj  |  2 +-
 7 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/BarionClientLibrary.IntegrationTests/BarionClientLibrary.IntegrationTests.csproj b/BarionClientLibrary.IntegrationTests/BarionClientLibrary.IntegrationTests.csproj
index 07ecdfd..86dbbe8 100644
--- a/BarionClientLibrary.IntegrationTests/BarionClientLibrary.IntegrationTests.csproj
+++ b/BarionClientLibrary.IntegrationTests/BarionClientLibrary.IntegrationTests.csproj
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
+  <Import Project="..\packages\xunit.runner.visualstudio.2.4.5\build\net462\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.4.5\build\net462\xunit.runner.visualstudio.props')" />
+  <Import Project="..\packages\xunit.core.2.4.1\build\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.4.1\build\xunit.core.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -9,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BarionClientLibrary.IntegrationTests</RootNamespace>
     <AssemblyName>BarionClientLibrary.IntegrationTests</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
@@ -38,28 +39,23 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="NReco.PhantomJS, Version=1.0.3.0, Culture=neutral, PublicKeyToken=f160d8c5e2ae66b6, processorArchitecture=MSIL">
-      <HintPath>..\packages\NReco.PhantomJS.1.0.3.0\lib\net40-Client\NReco.PhantomJS.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="NReco.PhantomJS, Version=1.0.4.0, Culture=neutral, PublicKeyToken=f160d8c5e2ae66b6, processorArchitecture=MSIL">
+      <HintPath>..\packages\NReco.PhantomJS.1.0.4\lib\net40\NReco.PhantomJS.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Net.Http" />
     <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="xunit.assert, Version=2.4.1.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.assert.2.4.1\lib\netstandard1.1\xunit.assert.dll</HintPath>
     </Reference>
-    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="xunit.core, Version=2.4.1.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.extensibility.core.2.4.1\lib\net452\xunit.core.dll</HintPath>
     </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="xunit.execution.desktop, Version=2.4.1.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.extensibility.execution.2.4.1\lib\net452\xunit.execution.desktop.dll</HintPath>
     </Reference>
   </ItemGroup>
   <Choose>
@@ -101,6 +97,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\packages\xunit.analyzers.0.10.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
+  </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
       <ItemGroup>
@@ -125,8 +124,11 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
+    <Error Condition="!Exists('..\packages\xunit.core.2.4.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.4.1\build\xunit.core.props'))" />
+    <Error Condition="!Exists('..\packages\xunit.core.2.4.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.4.1\build\xunit.core.targets'))" />
+    <Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.4.5\build\net462\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.4.5\build\net462\xunit.runner.visualstudio.props'))" />
   </Target>
+  <Import Project="..\packages\xunit.core.2.4.1\build\xunit.core.targets" Condition="Exists('..\packages\xunit.core.2.4.1\build\xunit.core.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/BarionClientLibrary.IntegrationTests/packages.config b/BarionClientLibrary.IntegrationTests/packages.config
index 7c8a6b3..b31d488 100644
--- a/BarionClientLibrary.IntegrationTests/packages.config
+++ b/BarionClientLibrary.IntegrationTests/packages.config
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NReco.PhantomJS" version="1.0.3.0" targetFramework="net452" />
-  <package id="PhantomJS" version="2.1.1" targetFramework="net452" />
-  <package id="xunit" version="2.1.0" targetFramework="net452" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net452" />
-  <package id="xunit.assert" version="2.1.0" targetFramework="net452" />
-  <package id="xunit.core" version="2.1.0" targetFramework="net452" />
-  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net452" />
-  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net452" />
-  <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net452" />
+  <package id="NReco.PhantomJS" version="1.0.4" targetFramework="net462" />
+  <package id="PhantomJS" version="2.1.1" targetFramework="net462" />
+  <package id="xunit" version="2.4.1" targetFramework="net462" />
+  <package id="xunit.abstractions" version="2.0.3" targetFramework="net462" />
+  <package id="xunit.analyzers" version="0.10.0" targetFramework="net462" />
+  <package id="xunit.assert" version="2.4.1" targetFramework="net462" />
+  <package id="xunit.core" version="2.4.1" targetFramework="net462" />
+  <package id="xunit.extensibility.core" version="2.4.1" targetFramework="net462" />
+  <package id="xunit.extensibility.execution" version="2.4.1" targetFramework="net462" />
+  <package id="xunit.runner.visualstudio" version="2.4.5" targetFramework="net462" developmentDependency="true" />
 </packages>
\ No newline at end of file
diff --git a/BarionClientLibrary.Tests/BarionClientLibrary.Tests.csproj b/BarionClientLibrary.Tests/BarionClientLibrary.Tests.csproj
index c6f4858..a9e9068 100644
--- a/BarionClientLibrary.Tests/BarionClientLibrary.Tests.csproj
+++ b/BarionClientLibrary.Tests/BarionClientLibrary.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net45</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;net462</TargetFrameworks>
     <AssemblyName>BarionClientLibrary.Tests</AssemblyName>
     <PackageId>BarionClientLibrary.Tests</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@@ -30,12 +30,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
     <Reference Include="System.Runtime" />
     <Reference Include="System.Threading.Tasks" />
     <Reference Include="System" />
diff --git a/BarionClientLibrary/BarionClient.cs b/BarionClientLibrary/BarionClient.cs
index da22228..0f19929 100644
--- a/BarionClientLibrary/BarionClient.cs
+++ b/BarionClientLibrary/BarionClient.cs
@@ -45,7 +45,7 @@ public BarionClient(BarionSettings settings, HttpClient httpClient)
             if (httpClient == null)
                 throw new ArgumentNullException(nameof(httpClient));
 
-#if NET45
+#if NET462_OR_GREATER
             ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
 #endif
 
diff --git a/BarionClientLibrary/BarionClientLibrary.csproj b/BarionClientLibrary/BarionClientLibrary.csproj
index c132092..6f96a48 100644
--- a/BarionClientLibrary/BarionClientLibrary.csproj
+++ b/BarionClientLibrary/BarionClientLibrary.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <AssemblyTitle>BarionClient</AssemblyTitle>
-    <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>BarionClient</AssemblyName>
     <AssemblyOriginatorKeyFile>BarionClientSignKey.snk</AssemblyOriginatorKeyFile>
@@ -18,7 +18,7 @@
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <DefineConstants Condition=" '$(TargetFramework)' == 'net45' ">$(DefineConstants);NET45</DefineConstants>
+    <DefineConstants Condition=" '$(TargetFramework)' == 'net462' ">$(DefineConstants);NET462</DefineConstants>
     <Authors>Peter Szel</Authors>
     <PackageLicenseUrl>https://github.com/szelpe/barion-dotnet/blob/master/LICENSE</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/szelpe/barion-dotnet</PackageProjectUrl>
@@ -38,13 +38,13 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="System.Net.Requests" Version="4.3.0" />
     <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System" />
diff --git a/BarionClientTester/App.config b/BarionClientTester/App.config
index f3e2f88..842a1cd 100644
--- a/BarionClientTester/App.config
+++ b/BarionClientTester/App.config
@@ -1,7 +1,7 @@
 <?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.2"/>
     </startup>
     <appSettings>
         <add key="BarionBaseAddress" value="https://api.test.barion.com/"/>
diff --git a/BarionClientTester/BarionClientTester.csproj b/BarionClientTester/BarionClientTester.csproj
index 95b0c12..1f1135f 100644
--- a/BarionClientTester/BarionClientTester.csproj
+++ b/BarionClientTester/BarionClientTester.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BarionClientTester</RootNamespace>
     <AssemblyName>BarionClientTester</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />

From 602ba8eaa21b38c3fe55607abe28687625ea6627 Mon Sep 17 00:00:00 2001
From: Lajos Marton <lajosmarton@hotmail.col>
Date: Tue, 28 Jun 2022 22:58:09 +0200
Subject: [PATCH 2/2] PaymentScript used without jquery

---
 BarionClientLibrary.IntegrationTests/PaymentScript.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/BarionClientLibrary.IntegrationTests/PaymentScript.js b/BarionClientLibrary.IntegrationTests/PaymentScript.js
index 50200c8..bb9393b 100644
--- a/BarionClientLibrary.IntegrationTests/PaymentScript.js
+++ b/BarionClientLibrary.IntegrationTests/PaymentScript.js
@@ -3,15 +3,15 @@ var page = require('webpage').create();
 
 page.open(system.args[1], function (status) {
     page.evaluate(function (loginName, password) {
-        $('[data-target="#PaymentMethodBarion"]').click();
-        $('#LoginName').val(loginName);
-        $('#Password').val(password);
-        $('button[type="submit"]').click();
+        document.querySelector('[data-target="#PaymentMethodBarion"]').click();
+        document.getElementById('LoginName').value = loginName;
+        document.getElementById('Password').value = password;
+        document.querySelector('button[type="submit"]').click();
     }, system.args[2], system.args[3]);
 
     setTimeout(function () {
         page.evaluate(function () {
-            $('button[type="submit"]').click();
+            document.getElementById('StartPayment').click();
         });
 
         setTimeout(function () {