Skip to content

Commit 31dc0e3

Browse files
authored
fix: adding support for net35 net462 and netstandard2.1 (#738)
* fix: adding support for net35 net462 and netstandard2.1
1 parent 66d46bd commit 31dc0e3

File tree

2 files changed

+35
-24
lines changed

2 files changed

+35
-24
lines changed

src/Twilio/Http/SystemNetHttpClient.cs

+3-18
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ namespace Twilio.Http
1515
/// </summary>
1616
public class SystemNetHttpClient : HttpClient
1717
{
18-
#if NET451
19-
private string PlatVersion = ".NET Framework 4.5.1+";
18+
#if NET462
19+
private string PlatVersion = ".NET Framework 4.6.2+";
2020
#else
2121
private string PlatVersion = RuntimeInformation.FrameworkDescription;
2222
#endif
@@ -107,25 +107,10 @@ private HttpRequestMessage BuildHttpRequest(Request request)
107107
string helperLibVersion = AssemblyInfomation.AssemblyInformationalVersion;
108108

109109
string osName = "Unknown";
110-
#if !NETSTANDARD1_4
111110
osName = Environment.OSVersion.Platform.ToString();
112-
#else
113-
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
114-
{
115-
osName = "Windows";
116-
}
117-
else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
118-
{
119-
osName = "MacOS";
120-
}
121-
else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
122-
{
123-
osName = "Linux";
124-
}
125-
#endif
126111

127112
string osArch;
128-
#if !NET451
113+
#if !NET462
129114
osArch = RuntimeInformation.OSArchitecture.ToString();
130115
#else
131116
osArch = Environment.GetEnvironmentVariable("PROCESSOR_ARCHITECTURE") ?? "Unknown";

src/Twilio/Twilio.csproj

+32-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup Label="NuGet">
3-
<TargetFramework>net6.0</TargetFramework>
4-
<OutputPath>bin/Release</OutputPath>
5-
<Nullable>enable</Nullable>
3+
<TargetFrameworks>net6.0;netstandard2.1;net462;net35</TargetFrameworks>
64
<IsPackable>true</IsPackable>
75
<PackageId>Twilio</PackageId>
86
<Description>Twilio REST API helper library</Description>
@@ -24,12 +22,40 @@
2422
<RepositoryUrl>https://github.com/twilio/twilio-csharp</RepositoryUrl>
2523
<RepositoryType>git</RepositoryType>
2624
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
25+
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.1' ">2.1.0</NetStandardImplicitPackageVersion>
2726
</PropertyGroup>
2827
<ItemGroup>
29-
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.15.0" />
28+
<Reference Include="System.Xml.Linq" />
29+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
30+
</ItemGroup>
31+
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
32+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
33+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.15.0" />
34+
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.19.0" />
35+
<PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
36+
</ItemGroup>
37+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
3038
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
31-
<PackageReference Include="NUnit" Version="3.13.2" />
32-
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
3339
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.15.0" />
40+
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.19.0" />
41+
<PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
42+
</ItemGroup>
43+
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
44+
<Reference Include="System" />
45+
<Reference Include="System.Web" />
46+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
47+
<PackageReference Include="JWT" Version="1.3.4" />
48+
</ItemGroup>
49+
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
50+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
51+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.15.0" />
52+
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.19.0" />
53+
<PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
54+
<Reference Include="System.Net" />
55+
<Reference Include="System.Net.Http" />
56+
</ItemGroup>
57+
<ItemGroup Condition="($(TargetFramework.StartsWith('net3')) OR $(TargetFramework.StartsWith('net4'))) AND '$(MSBuildRuntimeType)' == 'Core' AND '$(OS)' != 'Windows_NT'">
58+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
59+
<PackageReference Include="jnm2.ReferenceAssemblies.net35" Version="1.0.1" PrivateAssets="All" />
3460
</ItemGroup>
3561
</Project>

0 commit comments

Comments
 (0)