netstandard as target framework (#845)

appium · Oct 18, 2024 · 4330885 · 4330885
1 parent 2cb047b
commit 4330885
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 73 deletions.
diff --git a/src/Appium.Net/Appium.Net.csproj b/src/Appium.Net/Appium.Net.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net48;net6.0</TargetFrameworks>
-    <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <RootNamespace>OpenQA.Selenium</RootNamespace>
+    <LangVersion>latest</LangVersion>
     <Company>Appium Commiters</Company>
     <Product>Dotnet-Client</Product>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Copyright>Copyright © 2023</Copyright>
-    <PackageProjectUrl>https://github.com/appium/dotnet-client</PackageProjectUrl>
+    <PackageProjectUrl>https://appium.io</PackageProjectUrl>
     <RepositoryUrl>https://github.com/appium/dotnet-client</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <IncludeSymbols>true</IncludeSymbols>
@@ -19,40 +19,25 @@
     <PackageIcon>appium-icon.png</PackageIcon>
     <Description>Selenium Webdriver extension for Appium.</Description>
     <PackageTags>Appium Webdriver device automation</PackageTags>
-  </PropertyGroup>
-  <PropertyGroup>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
-  </PropertyGroup>
-  <PropertyGroup>
     <PackageReadmeFile>README.md</PackageReadmeFile>
-  </PropertyGroup>
-  <PropertyGroup>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
-  <PropertyGroup>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
+
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
     <NoWarn>1701;1702;1591</NoWarn>
   </PropertyGroup>
+
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
     <NoWarn>1701;1702;1591</NoWarn>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net48|AnyCPU'">
-    <NoWarn>1701;1702;1591</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net48|AnyCPU'">
-    <NoWarn>1701;1702;1591</NoWarn>
-  </PropertyGroup>
+
   <ItemGroup>
     <None Include="LICENSE.txt" Pack="true" PackagePath="" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="appium-icon.png" Pack="true" PackagePath="" />
+    <None Include="..\..\README.md" Pack="true" PackagePath="" />
   </ItemGroup>
-  <ItemGroup>
-	<None Include="..\..\README.md" Pack="true" PackagePath="" />
-  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
@@ -61,8 +46,4 @@
     <PackageReference Include="Selenium.WebDriver" Version="4.24.0" />
     <PackageReference Include="System.Drawing.Common" Version="8.0.8" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-    <Folder Include="Appium\Mac\" />
-  </ItemGroup>
-</Project>
+</Project>
diff --git a/src/Appium.Net/Appium/Service/AppiumLocalService.cs b/src/Appium.Net/Appium/Service/AppiumLocalService.cs
@@ -20,9 +20,7 @@
 using System.IO;
 using System.Linq;
 using System.Net;
-#if NET
 using System.Net.Http;
-#endif
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 
@@ -39,9 +37,7 @@ public class AppiumLocalService : ICommandServer
         private readonly int Port;
         private readonly TimeSpan InitializationTimeout;
         private readonly IDictionary<string, string> EnvironmentForProcess;
-#if !NET48
         private readonly HttpClient SharedHttpClient;
-#endif
         private Process Service;
         private List<string> ArgsList;
 
@@ -65,24 +61,14 @@ internal AppiumLocalService(
             Port = port;
             InitializationTimeout = initializationTimeout;
             EnvironmentForProcess = environmentForProcess;
-#if !NET48
-            SharedHttpClient = CreateHttpClientInstance;
-#endif
+            SharedHttpClient = CreateHttpClientInstance();
         }
 
-#if !NET48
-        private HttpClient CreateHttpClientInstance
+        private static HttpClient CreateHttpClientInstance()
         {
-            get
-            {
-                SocketsHttpHandler handler = new SocketsHttpHandler
-                {
-                    PooledConnectionLifetime = TimeSpan.FromMinutes(2)
-                };
-                return new HttpClient(handler);
-            }
+            return new HttpClient() { Timeout = TimeSpan.FromMinutes(2) };
         }
-#endif
+
         /// <summary>
         /// The base URL for the managed appium server.
         /// </summary>
@@ -175,9 +161,7 @@ private void DestroyProcess()
             finally
             {
                 Service?.Close();
-#if !NET48
                 SharedHttpClient.Dispose();
-#endif
             }
         }
 
@@ -296,20 +280,12 @@ private async Task<bool> PingAsync(TimeSpan span)
             {
                 try
                 {
-#if NET48
-                    HttpWebResponse response = await GetHttpResponseAsync(status).ConfigureAwait(false);
-                    if (response.StatusCode == HttpStatusCode.OK)
-                    {
-                        return true;
-                    }
-#elif NET
-                    HttpResponseMessage response = await GetHttpResponseAsync(status).ConfigureAwait(false);
+                    using HttpResponseMessage response = await SharedHttpClient.GetAsync(status).ConfigureAwait(false);
 
                     if (response.IsSuccessStatusCode)
                     {
                         return true;
                     }
-#endif
                 }
                 catch
                 {
@@ -318,21 +294,5 @@ private async Task<bool> PingAsync(TimeSpan span)
             }
             return pinged;
         }
-#if NET48
-        private async Task<HttpWebResponse> GetHttpResponseAsync(Uri status)
-        {
-            return await Task.Run(() =>
-            {
-                HttpWebRequest request = (HttpWebRequest)WebRequest.Create(status);
-                return (HttpWebResponse)request.GetResponse();
-            }).ConfigureAwait(false);
-        }
-#else
-        private async Task<HttpResponseMessage> GetHttpResponseAsync(Uri status)
-            {
-                HttpResponseMessage response = await SharedHttpClient.GetAsync(status).ConfigureAwait(false);
-                return response;
-            }
-#endif
     }
 }