ci: fix some build warnings (#525)

Vonage · Sep 20, 2023 · ab9e28d · ab9e28d
1 parent 2fb7db6
commit ab9e28d
Show file tree

Hide file tree

Showing 15 changed files with 678 additions and 514 deletions.
diff --git a/Vonage.Common/Vonage.Common.csproj b/Vonage.Common/Vonage.Common.csproj
@@ -30,6 +30,11 @@
         <PackageReference Update="NETStandard.Library" Version="2.0.3"/>
     </ItemGroup>
 
+
+    <ItemGroup>
+      <Folder Include="Http\" />
+    </ItemGroup>
+
     <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
         <Exec Command="node ../.scripts/init.js"/>
     </Target>

diff --git a/Vonage.Server/Video/Sessions/CreateSession/CreateSessionRequest.cs b/Vonage.Server/Video/Sessions/CreateSession/CreateSessionRequest.cs
@@ -1,6 +1,6 @@
-using System.Net.Http;
+using System.Net;
+using System.Net.Http;
 using System.Text;
-using System.Web;
 using Vonage.Common.Client;
 
 namespace Vonage.Server.Video.Sessions.CreateSession;
@@ -65,11 +65,11 @@ public string GetUrlEncoded()
     {
         var builder = new StringBuilder();
         builder.Append("location=");
-        builder.Append(HttpUtility.UrlEncode(this.Location.Address));
+        builder.Append(WebUtility.UrlEncode(this.Location.Address));
         builder.Append("&archiveMode=");
-        builder.Append(HttpUtility.UrlEncode(this.ArchiveMode.ToString().ToLowerInvariant()));
+        builder.Append(WebUtility.UrlEncode(this.ArchiveMode.ToString().ToLowerInvariant()));
         builder.Append("&p2p.preference=");
-        builder.Append(HttpUtility.UrlEncode(GetMediaPreference(this.MediaMode)));
+        builder.Append(WebUtility.UrlEncode(GetMediaPreference(this.MediaMode)));
         return builder.ToString();
     }
 

diff --git a/Vonage.Test.Unit/AccountTest.cs b/Vonage.Test.Unit/AccountTest.cs
@@ -1,5 +1,4 @@
-using System.Linq;
-using System.Web;
+using System.Net;
 using Vonage.Request;
 using Xunit;
 
@@ -381,7 +380,7 @@ public void SetSettings(bool passCreds)
             //ARRANGE
             var expectedUri = $"{this.RestUrl}/account/settings";
             var expectedRequestContents =
-                $"moCallBackUrl={HttpUtility.UrlEncode("https://example.com/webhooks/inbound-sms")}&drCallBackUrl={HttpUtility.UrlEncode("https://example.com/webhooks/delivery-receipt")}&api_key={this.ApiKey}&api_secret={this.ApiSecret}&";
+                $"moCallBackUrl={WebUtility.UrlEncode("https://example.com/webhooks/inbound-sms")}&drCallBackUrl={WebUtility.UrlEncode("https://example.com/webhooks/delivery-receipt")}&api_key={this.ApiKey}&api_secret={this.ApiSecret}&";
             var expectedResponseContent =
                 @"{""mo-callback-url"": ""https://example.com/webhooks/inbound-sms"",""dr-callback-url"": ""https://example.com/webhooks/delivery-receipt"",""max-outbound-request"": 15,""max-inbound-request"": 30,""max-calls-per-second"": 4}";
             this.Setup(uri: expectedUri, responseContent: expectedResponseContent,
@@ -425,7 +424,7 @@ public async void SetSettingsAsync(bool passCreds)
             //ARRANGE
             var expectedUri = $"{this.RestUrl}/account/settings";
             var expectedRequestContents =
-                $"moCallBackUrl={HttpUtility.UrlEncode("https://example.com/webhooks/inbound-sms")}&drCallBackUrl={HttpUtility.UrlEncode("https://example.com/webhooks/delivery-receipt")}&api_key={this.ApiKey}&api_secret={this.ApiSecret}&";
+                $"moCallBackUrl={WebUtility.UrlEncode("https://example.com/webhooks/inbound-sms")}&drCallBackUrl={WebUtility.UrlEncode("https://example.com/webhooks/delivery-receipt")}&api_key={this.ApiKey}&api_secret={this.ApiSecret}&";
             var expectedResponseContent =
                 @"{""mo-callback-url"": ""https://example.com/webhooks/inbound-sms"",""dr-callback-url"": ""https://example.com/webhooks/delivery-receipt"",""max-outbound-request"": 15,""max-inbound-request"": 30,""max-calls-per-second"": 4}";
             this.Setup(uri: expectedUri, responseContent: expectedResponseContent,

diff --git a/Vonage.Test.Unit/MessagingTests.cs b/Vonage.Test.Unit/MessagingTests.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
+using System.Net;
 using System.Threading.Tasks;
-using System.Web;
-using FluentAssertions.Types;
 using Newtonsoft.Json;
 using Vonage.Cryptography;
 using Vonage.Messaging;
@@ -19,14 +18,14 @@ public void NullMessagesResponse()
             var expectedResponse = @"";
             var expectedUri = $"{this.RestUrl}/sms/json";
             var expectedRequestContent =
-                $"from=AcmeInc&to=447700900000&text={HttpUtility.UrlEncode("Hello World!")}&api_key={this.ApiKey}&api_secret={this.ApiSecret}&";
+                $"from=AcmeInc&to=447700900000&text={WebUtility.UrlEncode("Hello World!")}&api_key={this.ApiKey}&api_secret={this.ApiSecret}&";
             this.Setup(expectedUri, expectedResponse, expectedRequestContent);
             var client = this.BuildVonageClient(Credentials.FromApiKeyAndSecret(this.ApiKey, this.ApiSecret));
             var exception = Assert.Throws<VonageSmsResponseException>(() =>
                 client.SmsClient.SendAnSms(new SendSmsRequest
                     {From = "AcmeInc", To = "447700900000", Text = "Hello World!"}));
             Assert.NotNull(exception);
-            Assert.Equal($"Encountered an Empty SMS response", exception.Message);
+            Assert.Equal("Encountered an Empty SMS response", exception.Message);
         }
 
         [Fact]
@@ -35,7 +34,7 @@ public async Task SendSmsAsyncBadResponse()
             var expectedResponse = this.GetResponseJson();
             var expectedUri = $"{this.RestUrl}/sms/json";
             var expectedRequestContent =
-                $"from=AcmeInc&to=447700900000&text={HttpUtility.UrlEncode("Hello World!")}&api_key={this.ApiKey}&api_secret={this.ApiSecret}&";
+                $"from=AcmeInc&to=447700900000&text={WebUtility.UrlEncode("Hello World!")}&api_key={this.ApiKey}&api_secret={this.ApiSecret}&";
             this.Setup(expectedUri, expectedResponse, expectedRequestContent);
             var client = this.BuildVonageClient(Credentials.FromApiKeyAndSecret(this.ApiKey, this.ApiSecret));
             var exception = await Assert.ThrowsAsync<VonageSmsResponseException>(async () =>
@@ -55,8 +54,8 @@ public async Task SendSmsAsyncWithAllPropertiesSet(bool passCreds)
         {
             var expectedResponse = this.GetResponseJson();
             var expectedUri = $"{this.RestUrl}/sms/json";
-            var expectedRequestContent = $"from=AcmeInc&to=447700900000&text={HttpUtility.UrlEncode("Hello World!")}" +
-                                         $"&ttl=900000&status-report-req=true&callback={HttpUtility.UrlEncode("https://example.com/sms-dlr")}&message-class=0" +
+            var expectedRequestContent = $"from=AcmeInc&to=447700900000&text={WebUtility.UrlEncode("Hello World!")}" +
+                                         $"&ttl=900000&status-report-req=true&callback={WebUtility.UrlEncode("https://example.com/sms-dlr")}&message-class=0" +
                                          "&type=text&body=638265253311&udh=06050415811581&protocol-id=127" +
                                          $"&client-ref=my-personal-reference&account-ref=customer1234&entity-id=testEntity&content-id=testcontent&api_key={this.ApiKey}&api_secret={this.ApiSecret}&";
             var request = new SendSmsRequest
@@ -98,7 +97,7 @@ public void SendSmsBadResponse()
             var expectedResponse = this.GetResponseJson();
             var expectedUri = $"{this.RestUrl}/sms/json";
             var expectedRequestContent =
-                $"from=AcmeInc&to=447700900000&text={HttpUtility.UrlEncode("Hello World!")}&api_key={this.ApiKey}&api_secret={this.ApiSecret}&";
+                $"from=AcmeInc&to=447700900000&text={WebUtility.UrlEncode("Hello World!")}&api_key={this.ApiKey}&api_secret={this.ApiSecret}&";
             this.Setup(expectedUri, expectedResponse, expectedRequestContent);
             var client = this.BuildVonageClient(Credentials.FromApiKeyAndSecret(this.ApiKey, this.ApiSecret));
             var exception = Assert.Throws<VonageSmsResponseException>(() =>
@@ -130,7 +129,7 @@ public void SendSmsTypicalUsage()
                 }";
             var expectedUri = $"{this.RestUrl}/sms/json";
             var expectedRequestContent =
-                $"from=AcmeInc&to=447700900000&text={HttpUtility.UrlEncode("Hello World!")}&api_key={this.ApiKey}&api_secret={this.ApiSecret}&";
+                $"from=AcmeInc&to=447700900000&text={WebUtility.UrlEncode("Hello World!")}&api_key={this.ApiKey}&api_secret={this.ApiSecret}&";
             this.Setup(expectedUri, expectedResponse, expectedRequestContent);
             var client = this.BuildVonageClient(Credentials.FromApiKeyAndSecret(this.ApiKey, this.ApiSecret));
             var response = client.SmsClient.SendAnSms(new SendSmsRequest
@@ -164,7 +163,7 @@ public void SendSmsTypicalUsageSimplified()
                 }";
             var expectedUri = $"{this.RestUrl}/sms/json";
             var expectedRequestContent =
-                $"from=AcmeInc&to=447700900000&text={HttpUtility.UrlEncode("Hello World!")}&type=text&api_key={this.ApiKey}&api_secret={this.ApiSecret}&";
+                $"from=AcmeInc&to=447700900000&text={WebUtility.UrlEncode("Hello World!")}&type=text&api_key={this.ApiKey}&api_secret={this.ApiSecret}&";
             this.Setup(expectedUri, expectedResponse, expectedRequestContent);
             var client = this.BuildVonageClient(Credentials.FromApiKeyAndSecret(this.ApiKey, this.ApiSecret));
             var response = client.SmsClient.SendAnSms("AcmeInc", "447700900000", "Hello World!");
@@ -184,7 +183,7 @@ public async Task SendSmsTypicalUsageSimplifiedAsync()
             var expectedResponse = this.GetResponseJson();
             var expectedUri = $"{this.RestUrl}/sms/json";
             var expectedRequestContent =
-                $"from=AcmeInc&to=447700900000&text={HttpUtility.UrlEncode("Hello World!")}&type=text&api_key={this.ApiKey}&api_secret={this.ApiSecret}&";
+                $"from=AcmeInc&to=447700900000&text={WebUtility.UrlEncode("Hello World!")}&type=text&api_key={this.ApiKey}&api_secret={this.ApiSecret}&";
             this.Setup(expectedUri, expectedResponse, expectedRequestContent);
             var client = this.BuildVonageClient(Credentials.FromApiKeyAndSecret(this.ApiKey, this.ApiSecret));
             var response = await client.SmsClient.SendAnSmsAsync("AcmeInc", "447700900000", "Hello World!");
@@ -217,7 +216,7 @@ public void SendSmsUnicode()
                 }";
             var expectedUri = $"{this.RestUrl}/sms/json";
             var expectedRequestContent =
-                $"from=AcmeInc&to=447700900000&text={HttpUtility.UrlEncode("こんにちは世界")}&api_key={this.ApiKey}&api_secret={this.ApiSecret}&";
+                $"from=AcmeInc&to=447700900000&text={WebUtility.UrlEncode("こんにちは世界")}&api_key={this.ApiKey}&api_secret={this.ApiSecret}&";
             this.Setup(expectedUri, expectedResponse, expectedRequestContent);
             var client = this.BuildVonageClient(Credentials.FromApiKeyAndSecret(this.ApiKey, this.ApiSecret));
             var response = client.SmsClient.SendAnSms(new SendSmsRequest
@@ -239,8 +238,8 @@ public void SendSmsWithAllPropertiesSet(bool passCreds)
         {
             var expectedResponse = this.GetResponseJson();
             var expectedUri = $"{this.RestUrl}/sms/json";
-            var expectedRequestContent = $"from=AcmeInc&to=447700900000&text={HttpUtility.UrlEncode("Hello World!")}" +
-                                         $"&ttl=900000&status-report-req=true&callback={HttpUtility.UrlEncode("https://example.com/sms-dlr")}&message-class=0" +
+            var expectedRequestContent = $"from=AcmeInc&to=447700900000&text={WebUtility.UrlEncode("Hello World!")}" +
+                                         $"&ttl=900000&status-report-req=true&callback={WebUtility.UrlEncode("https://example.com/sms-dlr")}&message-class=0" +
                                          "&type=text&body=638265253311&udh=06050415811581&protocol-id=127" +
                                          $"&client-ref=my-personal-reference&account-ref=customer1234&entity-id=testEntity&content-id=testcontent&api_key={this.ApiKey}&api_secret={this.ApiSecret}&";
             var request = new SendSmsRequest