Skip to content

Commit 0e18334

Browse files
keyur9keyur9
authored
Merge pull request #31 from Moesif/refactor-target-framework
#CS-2 Refactor: Ensure target framework is not strictly tied
2 parents c445517 + 66813f2 commit 0e18334

File tree

4 files changed

+8
-147
lines changed

4 files changed

+8
-147
lines changed

‎Moesif.Api/Http/Client/UnirestClient.cs‎

Lines changed: 0 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,14 @@
1313

1414
#if NET6_0_OR_GREATER
1515

16-
// using unirest_net.http;
17-
// using UniHttpRequest = unirest_net.request.HttpRequest;
1816
using UniHttp = System.Net.Http;
1917
using HttpRequestMessage = System.Net.Http.HttpRequestMessage;
2018
using HttpResponseMessage = System.Net.Http.HttpResponseMessage;
21-
// using System.Net.Http;
22-
23-
// dotnet add package Microsoft.Extensions.Http
24-
// using Microsoft.Extensions.Http;
2519

2620
namespace Moesif.Api.Http.Client
2721
{
2822
public class UnirestClient: IHttpClient
2923
{
30-
// private readonly IHttpClientFactory _httpClientFactory;
31-
//
32-
// public UnirestClient(IHttpClientFactory httpClientFactory)
33-
// {
34-
// _httpClientFactory = httpClientFactory;
35-
// }
36-
3724
public static IHttpClient SharedClient { get; set; }
3825

3926
private static string Version;
@@ -88,11 +75,6 @@ public HttpResponse ExecuteAsString(HttpRequest request)
8875
}
8976
}
9077

91-
// public Task<HttpResponse> ExecuteAsStringAsync(HttpRequest request)
92-
// {
93-
// return Task.Factory.StartNew(() => ExecuteAsString(request));
94-
// }
95-
//
9678
public async Task<HttpResponse> ExecuteAsStringAsync(HttpRequest request, bool waitForResponse = true)
9779
{
9880
HttpStringResponse httpResponse;
@@ -144,18 +126,6 @@ public async Task<HttpResponse> ExecuteAsStringAsync(HttpRequest request, bool w
144126
return httpResponse;
145127
}
146128

147-
// public HttpResponse ExecuteAsBinary(HttpRequest request)
148-
// {
149-
// //raise the on before request event
150-
// raiseOnBeforeHttpRequestEvent(request);
151-
//
152-
// UniHttpRequest uniRequest = ConvertRequest(request);
153-
// HttpResponse response = ConvertResponse(uniRequest.asBinary());
154-
//
155-
// //raise the on after response event
156-
// raiseOnAfterHttpResponseEvent(response);
157-
// return response;
158-
// }
159129
public HttpResponse ExecuteAsBinary(HttpRequest request)
160130
{
161131
try
@@ -169,11 +139,6 @@ public HttpResponse ExecuteAsBinary(HttpRequest request)
169139
throw ae.InnerException;
170140
}
171141
}
172-
//
173-
// public Task<HttpResponse> ExecuteAsBinaryAsync(HttpRequest request)
174-
// {
175-
// return Task.Factory.StartNew(() => ExecuteAsString(request));
176-
// }
177142
public async Task<HttpResponse> ExecuteAsBinaryAsync(HttpRequest request)
178143
{
179144
raiseOnBeforeHttpRequestEvent(request);
@@ -250,21 +215,11 @@ private async Task<HttpResponseMessage> ExecuteRequestAsync(HttpRequest request)
250215
public event OnBeforeHttpRequestEventHandler OnBeforeHttpRequestEvent;
251216
public event OnAfterHttpResponseEventHandler OnAfterHttpResponseEvent;
252217

253-
// private void raiseOnBeforeHttpRequestEvent(HttpRequest request)
254-
// {
255-
// if ((null != OnBeforeHttpRequestEvent) && (null != request))
256-
// OnBeforeHttpRequestEvent(this, request);
257-
// }
258218
private void raiseOnBeforeHttpRequestEvent(HttpRequest request)
259219
{
260220
OnBeforeHttpRequestEvent?.Invoke(this, request);
261221
}
262222

263-
// private void raiseOnAfterHttpResponseEvent(HttpResponse response)
264-
// {
265-
// if ((null != OnAfterHttpResponseEvent) && (null != response))
266-
// OnAfterHttpResponseEvent(this, response);
267-
// }
268223
private void raiseOnAfterHttpResponseEvent(HttpResponse response)
269224
{
270225
OnAfterHttpResponseEvent?.Invoke(this, response);
@@ -366,88 +321,6 @@ private static UniHttp.HttpMethod ConvertHttpMethod(HttpMethod method)
366321
};
367322
}
368323

369-
// private static UniHttpRequest ConvertRequest(HttpRequest request)
370-
// {
371-
// var uniMethod = ConvertHttpMethod(request.HttpMethod);
372-
// var queryUrl = request.QueryUrl;
373-
//
374-
// //instantiate unirest request object
375-
// HttpRequest uniRequest = new HttpRequest(uniMethod,queryUrl);
376-
// uniRequest.TimeOut = TimeSpan.FromSeconds(10);
377-
//
378-
// //set request payload
379-
// if (request.Body != null)
380-
// {
381-
// uniRequest.body(request.Body);
382-
// }
383-
// else if (request.FormParameters != null)
384-
// {
385-
// if (request.FormParameters.Any(p => p.Value is Stream || p.Value is FileStreamInfo))
386-
// {
387-
// //multipart
388-
// foreach (var kvp in request.FormParameters)
389-
// {
390-
// if (kvp.Value is FileStreamInfo){
391-
// var fileInfo = (FileStreamInfo) kvp.Value;
392-
// uniRequest.field(kvp.Key, fileInfo.FileStream, fileInfo.FileName, fileInfo.ContentType);
393-
// continue;
394-
// }
395-
// uniRequest.field(kvp.Key,kvp.Value);
396-
// }
397-
// }
398-
// else
399-
// {
400-
// //URL Encode params
401-
// var paramsString = string.Join("&",
402-
// request.FormParameters.Select(kvp =>
403-
// string.Format("{0}={1}", Uri.EscapeDataString(kvp.Key), Uri.EscapeDataString(kvp.Value.ToString()))));
404-
// uniRequest.body(paramsString);
405-
// uniRequest.header("Content-Type", "application/x-www-form-urlencoded");
406-
// }
407-
// }
408-
//
409-
// //set request headers
410-
// Dictionary<string, Object> headers = request.Headers.ToDictionary(item=> item.Key,item=> (Object) item.Value);
411-
// uniRequest.headers(headers);
412-
// if (Configuration.UserAgentString != null)
413-
// {
414-
// uniRequest.header("user-agent", Configuration.UserAgentString);
415-
// }
416-
// else
417-
// {
418-
// uniRequest.header("user-agent", "moesifapi-csharp/" + Version);
419-
// }
420-
//
421-
// //Set basic auth credentials if any
422-
// if (!string.IsNullOrWhiteSpace(request.Username))
423-
// {
424-
// uniRequest.basicAuth(request.Username, request.Password);
425-
// }
426-
//
427-
// return uniRequest;
428-
// }
429-
//
430-
// private static HttpResponse ConvertResponse(HttpResponse<Stream> binaryResponse)
431-
// {
432-
// return new HttpResponse
433-
// {
434-
// Headers = binaryResponse.Headers,
435-
// RawBody = binaryResponse.Body,
436-
// StatusCode = binaryResponse.Code
437-
// };
438-
// }
439-
//
440-
// private static HttpResponse ConvertResponse(HttpResponse<string> stringResponse)
441-
// {
442-
// return new HttpStringResponse
443-
// {
444-
// Headers = stringResponse.Headers,
445-
// RawBody = stringResponse.Raw,
446-
// Body = stringResponse.Body,
447-
// StatusCode = stringResponse.Code
448-
// };
449-
// }
450-
451324
#endregion
452325
}
453326
}

‎Moesif.Api/Moesif.Api.csproj‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,18 @@
1111
<AssemblyOriginatorKeyFile>Moesif.Api.snk</AssemblyOriginatorKeyFile>
1212
</PropertyGroup>
1313

14-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0'">
14+
<PropertyGroup Condition=" !('$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net47' Or '$(TargetFramework)' == 'net471' Or '$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'net48' Or '$(TargetFramework)' == 'net481' Or '$(TargetFramework)' == 'net5.0')">
1515
<DefineConstants>NET6_0_OR_GREATER</DefineConstants>
1616
<DefineConstants>NETCORE</DefineConstants>
1717
<!-- IMPORTANT please comment following lines before release build/publish -->
1818
<!-- <DefineConstants>MOESIF_INSTRUMENT</DefineConstants>-->
1919
</PropertyGroup>
2020

21-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net45'">
21+
<PropertyGroup Condition=" ('$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net47' Or '$(TargetFramework)' == 'net471' Or '$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'net48' Or '$(TargetFramework)' == 'net481' Or '$(TargetFramework)' == 'net5.0')">
2222
<DefineConstants>NET451</DefineConstants>
2323
</PropertyGroup>
2424

25-
<!-- <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">-->
26-
<!-- <Reference Include="System" />-->
27-
<!-- <Reference Include="System.Net.Http" />-->
28-
<!-- </ItemGroup>-->
29-
<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
25+
<ItemGroup Condition=" ('$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net47' Or '$(TargetFramework)' == 'net471' Or '$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'net48' Or '$(TargetFramework)' == 'net481' Or '$(TargetFramework)' == 'net5.0')">
3026
<Reference Include="System" />
3127
<Reference Include="System.Net.Http" />
3228
<Reference Include="Newtonsoft.Json" Version="13.0.1" />
@@ -44,14 +40,6 @@
4440
<None Include="Moesif.Api.nuspec" />
4541
<None Include="Moesif.Api.snk" />
4642
</ItemGroup>
47-
<ItemGroup>
48-
<!-- <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />-->
49-
</ItemGroup>
50-
<!-- <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">-->
51-
<!-- <PackageReference Include="System.Text.Json" Version="8.0.5" />-->
52-
<!-- <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />-->
53-
<!-- <PackageReference Include="Unirest-APIMATIC" Version="1.0.1.26" />-->
54-
<!-- </ItemGroup>-->
5543
<PropertyGroup>
5644
<NuspecFile>Moesif.Api.nuspec</NuspecFile>
5745
<NuspecProperties>$(NuspecProperties);configuration=$(Configuration)</NuspecProperties>

‎Moesif.Api/Moesif.Api.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<package >
33
<metadata>
44
<id>Moesif.Api</id>
5-
<version>3.1.2</version>
5+
<version>3.1.3</version>
66
<title>MoesifApi</title>
77
<authors>Moesif</authors>
88
<owners>Moesif</owners>
9-
<copyright>Copyright 2024</copyright>
9+
<copyright>Copyright 2025</copyright>
1010
<license type="expression">Apache-2.0</license>
1111
<projectUrl>https://www.moesif.com</projectUrl>
1212
<iconUrl>https://cdn.moesif.com/images/icon.png</iconUrl>

‎Moesif.Api/Properties/AssemblyInfo.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("Moesif, Inc")]
1212
[assembly: AssemblyProduct("Moesif.Api")]
13-
[assembly: AssemblyCopyright("Copyright © 2024")]
13+
[assembly: AssemblyCopyright("Copyright © 2025")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616
// Version information for an assembly consists of the following four values:
@@ -23,5 +23,5 @@
2323
// You can specify all the values or you can default the Build and Revision Numbers
2424
// by using the '*' as shown below:
2525
// [assembly: AssemblyVersion("1.0.*")]
26-
[assembly: AssemblyVersion("3.1.2")]
27-
[assembly: AssemblyFileVersion("3.1.2")]
26+
[assembly: AssemblyVersion("3.1.3")]
27+
[assembly: AssemblyFileVersion("3.1.3")]

0 commit comments

Comments
 (0)