iyzico · erdemdmr · Dec 8, 2022 · Dec 8, 2022
diff --git a/.github/workflows/dotnet_pull_request.yml b/.github/workflows/dotnet_pull_request.yml
@@ -19,7 +19,3 @@ jobs:
       run: dotnet build -c Release Iyzipay
     - name: NET45 Tests
       run: dotnet test -c Release Iyzipay.Tests -f net45
-    - name: NETCORE2 Tests
-      run: dotnet test -c Release Iyzipay.Tests -f netcoreapp2.0
-    #- name: NETCORE1 Tests
-      #run: dotnet test -c Release Iyzipay.Tests -f netcoreapp1.1
diff --git a/Iyzipay.Samples/Iyzipay.Samples.csproj b/Iyzipay.Samples/Iyzipay.Samples.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netcoreapp2.0;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net45</TargetFrameworks>
     <Authors />
     <Company />
   </PropertyGroup>
@@ -28,25 +28,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp1.1'">
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
-    <PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />
-    <PackageReference Include="System.Diagnostics.TextWriterTraceListener" Version="4.3.0" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Iyzipay\Iyzipay.csproj" />
   </ItemGroup>
-
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
-    <DefineConstants>$(DefineConstants);NETCORE2</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
-    <DefineConstants>$(DefineConstants);NETCORE1</DefineConstants>
-  </PropertyGroup>
 </Project>
diff --git a/Iyzipay.Samples/Sample.cs b/Iyzipay.Samples/Sample.cs
@@ -22,12 +22,7 @@ public void Initialize()
 
         protected void PrintResponse<T>(T resource)
         {
-#if NETCORE1 || NETCORE2
-            TraceListener consoleListener = new TextWriterTraceListener(System.Console.Out);
-#else
             TraceListener consoleListener = new ConsoleTraceListener();
-#endif
-
             Trace.Listeners.Add(consoleListener);
             Trace.WriteLine(JsonConvert.SerializeObject(resource, new JsonSerializerSettings()
             {

diff --git a/Iyzipay.Tests/Functional/BaseTest.cs b/Iyzipay.Tests/Functional/BaseTest.cs
@@ -20,16 +20,7 @@ public void Initialize()
 
         protected void PrintResponse<T>(T resource)
         {
-#if RELEASE
-            return;
-#endif
-
-#if NETCORE1 || NETCORE2
-            TraceListener consoleListener = new TextWriterTraceListener(System.Console.Out);
-#else
             TraceListener consoleListener = new ConsoleTraceListener();
-#endif
-
             Trace.Listeners.Add(consoleListener);
             Trace.WriteLine(JsonConvert.SerializeObject(resource, new JsonSerializerSettings()
             {

diff --git a/Iyzipay.Tests/Functional/Builder/Request/CreatePaymentRequestBuilder.cs b/Iyzipay.Tests/Functional/Builder/Request/CreatePaymentRequestBuilder.cs
@@ -32,13 +32,13 @@ public static CreatePaymentRequestBuilder Create()
             return new CreatePaymentRequestBuilder();
         }
 
-        public new CreatePaymentRequestBuilder Locale(string locale)
+        public CreatePaymentRequestBuilder Locale(string locale)
         {
             base._locale = locale;
             return this;
         }
 
-        public new CreatePaymentRequestBuilder ConversationId(string conversationId)
+        public CreatePaymentRequestBuilder ConversationId(string conversationId)
         {
             base._conversationId = conversationId;
             return this;

diff --git a/Iyzipay.Tests/Iyzipay.Tests.csproj b/Iyzipay.Tests/Iyzipay.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netcoreapp2.0;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net45</TargetFrameworks>
     <!-- When compiling .NET SDK 2.0 projects targeting .NET 4.x on Mono using 'dotnet build' you -->
     <!-- have to teach MSBuild where the Mono copy of the reference asssemblies is -->
     <TargetIsMono Condition="$(TargetFramework.StartsWith('net4')) and '$(OS)' == 'Unix'">true</TargetIsMono>
@@ -37,25 +37,8 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp1.1'">
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
-    <PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />
-    <PackageReference Include="System.Diagnostics.TextWriterTraceListener" Version="4.3.0" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Iyzipay\Iyzipay.csproj" />
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
-    <DefineConstants>$(DefineConstants);NETCORE2</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
-    <DefineConstants>$(DefineConstants);NETCORE1</DefineConstants>
-  </PropertyGroup>
 </Project>
diff --git a/Iyzipay/HashGenerator.cs b/Iyzipay/HashGenerator.cs
@@ -12,11 +12,7 @@ private HashGenerator()
 
         public static String GenerateHash(String apiKey, String secretKey, String randomString, BaseRequest request)
         {
-#if NETSTANDARD
-            SHA1 algorithm = SHA1.Create();
-#else
             HashAlgorithm algorithm = new SHA1Managed();
-#endif
             string hashStr = apiKey + randomString + secretKey + request.ToPKIRequestString();
             byte[] computeHash = algorithm.ComputeHash(Encoding.UTF8.GetBytes(hashStr));
             return Convert.ToBase64String(computeHash);

diff --git a/Iyzipay/HttpClient.cs b/Iyzipay/HttpClient.cs
@@ -12,9 +12,6 @@ public class HttpClient : System.Net.Http.HttpClient
     {
 
         public HttpClient()
-#if NETSTANDARD
-            : base(new HttpClientHandler(){ SslProtocols = SslProtocols.Tls12 } )
-#endif
         {
         }
     }

diff --git a/Iyzipay/Iyzipay.csproj b/Iyzipay/Iyzipay.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard2.0;netstandard1.3</TargetFrameworks>
+    <TargetFrameworks>net45;netstandard2.1</TargetFrameworks>
     <AssemblyName>Iyzipay</AssemblyName>
     <RootNamespace>Iyzipay</RootNamespace>
     <Version>2.1.49</Version>
@@ -29,20 +29,8 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
-    <PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.0" />
-  </ItemGroup>
-
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <DefineConstants>$(DefineConstants);NETSTANDARD2</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
-  </PropertyGroup>
 </Project>
diff --git a/Iyzipay/RestHttpClient.cs b/Iyzipay/RestHttpClient.cs
@@ -12,10 +12,7 @@ public class RestHttpClient
         private static readonly HttpClient HttpClient;
         static RestHttpClient()
         {
-#if !NETSTANDARD
             ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
-#endif
-
             HttpClient = new HttpClient();
         }
 

diff --git a/Iyzipay/RestHttpClientV2.cs b/Iyzipay/RestHttpClientV2.cs
@@ -13,10 +13,7 @@ class RestHttpClientV2
         private static readonly HttpClient HttpClient;
         static RestHttpClientV2()
         {
-#if !NETSTANDARD
             ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
-#endif
-
             HttpClient = new HttpClient();
         }
 

diff --git a/README.md b/README.md
@@ -8,8 +8,6 @@ You can sign up for an iyzico account at https://iyzico.com
 # Requirements
 One of the runtime environment is required from below
 * .NET Framework 4.5
-* .NET Core 1.1
-* .NET Core 2.0
 
 # Installation
 
@@ -22,13 +20,9 @@ Install-Package Iyzipay
  Or you can download the latest .dll from:  https://github.com/iyzico/iyzipay-dotnet/releases/latest
 
 For .NET Framework:
-* Newtonsoft.Json 8.0.2 from http://www.newtonsoft.com/json#
+* Newtonsoft.Json 13.0.2 from http://www.newtonsoft.com/json#
 
-For .NET Standard 1.3:
-* Newtonsoft.Json 11.0.2 from http://www.newtonsoft.com/json#
-* System.Security.Cryptography.Algorithms 4.3.0
-
-For .NET Standard 2.0:
+For .NET Standard 2.1:
 * Newtonsoft.Json 11.0.2 from http://www.newtonsoft.com/json#
 
 

diff --git a/build.cmd b/build.cmd
@@ -6,16 +6,4 @@ echo --------------------
 
 dotnet test -c Release ./Iyzipay.Tests -f net45
 
-echo --------------------
-echo Running NETCORE2 Tests
-echo --------------------
-
-dotnet test -c Release ./Iyzipay.Tests -f netcoreapp2.0
-
-echo --------------------
-echo Running NETCORE1 Tests
-echo --------------------
-
-dotnet test -c Release ./Iyzipay.Tests -f netcoreapp1.1
-
 dotnet pack -c Release ./Iyzipay
diff --git a/build.sh b/build.sh
@@ -19,16 +19,4 @@ echo --------------------
 echo Running NET45 Tests
 echo --------------------
 
-mono ./testrunner/NUnit.ConsoleRunner.*/tools/nunit3-console.exe ./Iyzipay.Tests/bin/Release/net45/Iyzipay.Tests.dll
-
-echo --------------------
-echo Running NETCORE2 Tests
-echo --------------------
-
-dotnet test ./Iyzipay.Tests -c Release -f netcoreapp2.0
-
-echo --------------------
-echo Running NETCORE1 Tests
-echo --------------------
-
-dotnet test ./Iyzipay.Tests -c Release -f netcoreapp1.1
+mono ./testrunner/NUnit.ConsoleRunner.*/tools/nunit3-console.exe ./Iyzipay.Tests/bin/Release/net45/Iyzipay.Tests.dll
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,9 +12,6 @@ public class HttpClient : System.Net.Http.HttpClient @@
         {
             public HttpClient()
-    #if NETSTANDARD
-                : base(new HttpClientHandler(){ SslProtocols = SslProtocols.Tls12 } )
-    #endif
             {
             }
         }
@@ Expand Down @@