Skip to content

Commit 5f84c1d

Browse files
author
Andy Clarke
committed
Update README.md and version number
1 parent 3fb387d commit 5f84c1d

File tree

9 files changed

+44
-41
lines changed

9 files changed

+44
-41
lines changed

‎.vs/TwilioWithThinQLCR/v15/.suo‎

-13 KB
Binary file not shown.

‎Demo/App.config‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
44

5-
<supportedRuntime version="v2.0.50727"/></startup>
5+
<supportedRuntime version="v2.0.50727" /></startup>
6+
<runtime>
7+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8+
<dependentAssembly>
9+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
10+
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
11+
</dependentAssembly>
12+
</assemblyBinding>
13+
</runtime>
614
</configuration>

‎Demo/Demo.csproj‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@
3333
<WarningLevel>4</WarningLevel>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<Reference Include="JWT, Version=1.3.3.0, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\packages\JWT.1.3.4\lib\3.5\JWT.dll</HintPath>
38-
</Reference>
3936
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
4037
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net35\Newtonsoft.Json.dll</HintPath>
4138
</Reference>
@@ -45,8 +42,8 @@
4542
<Reference Include="System.Data.DataSetExtensions" />
4643
<Reference Include="System.Data" />
4744
<Reference Include="System.Xml" />
48-
<Reference Include="Twilio, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
49-
<HintPath>..\packages\Twilio.5.0.2\lib\net35\Twilio.dll</HintPath>
45+
<Reference Include="Twilio, Version=5.6.0.0, Culture=neutral, processorArchitecture=MSIL">
46+
<HintPath>..\packages\Twilio.5.6.0\lib\net35\Twilio.dll</HintPath>
5047
</Reference>
5148
</ItemGroup>
5249
<ItemGroup>

‎Demo/Properties/AssemblyInfo.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22
using System.Runtime.CompilerServices;
33
using System.Runtime.InteropServices;
44

5-
// General Information about an assembly is controlled through the following
5+
// General Information about an assembly is controlled through the following
66
// set of attributes. Change these attribute values to modify the information
77
// associated with an assembly.
88
[assembly: AssemblyTitle("Demo")]
99
[assembly: AssemblyDescription("")]
1010
[assembly: AssemblyConfiguration("")]
11-
[assembly: AssemblyCompany("")]
11+
[assembly: AssemblyCompany("thinQ")]
1212
[assembly: AssemblyProduct("Demo")]
13-
[assembly: AssemblyCopyright("Copyright © 2015")]
13+
[assembly: AssemblyCopyright("Copyright © 2017")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

17-
// Setting ComVisible to false makes the types in this assembly not visible
18-
// to COM components. If you need to access a type in this assembly from
17+
// Setting ComVisible to false makes the types in this assembly not visible
18+
// to COM components. If you need to access a type in this assembly from
1919
// COM, set the ComVisible attribute to true on that type.
2020
[assembly: ComVisible(false)]
2121

@@ -25,11 +25,11 @@
2525
// Version information for an assembly consists of the following four values:
2626
//
2727
// Major Version
28-
// Minor Version
28+
// Minor Version
2929
// Build Number
3030
// Revision
3131
//
32-
// You can specify all the values or you can default the Build and Revision Numbers
32+
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
3535
[assembly: AssemblyVersion("1.0.0.0")]

‎Demo/packages.config‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="JWT" version="1.3.4" targetFramework="net35" />
43
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net35" />
54
<package id="Twilio" version="5.6.0" targetFramework="net35" />
65
</packages>

‎README.md‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,34 +17,38 @@ namespace Demo
1717
{
1818
static void Main(string[] args)
1919
{
20+
string thinqAccountId = "thinqAccountId";
21+
string thinqToken = "thinqToken";
22+
string twilioSid = "twilioSid";
23+
string twilioToken = "twilioToken";
24+
2025
//
2126
// Example using a callOptions object
2227
//
2328
2429
// Initialize the Twilio rest client using your Twilio SID and Token.
25-
TwilioClient.Init("twilioSid", "twilioToken");
30+
TwilioClient.Init(twilioSid, twilioToken);
2631

2732
// Create a thinQ callOptions object, passing in your thinQ ID and ThinQ Token.
28-
CreateCallOptionsWithThinQLCR callOptions = new CreateCallOptionsWithThinQLCR("thinqAccountId", "thinqToken", new PhoneNumber("19195551234"), new PhoneNumber("19198900000"));
33+
CreateCallOptionsWithThinQLCR callOptions = new CreateCallOptionsWithThinQLCR(thinqAccountId, thinqToken, new PhoneNumber("19195551234"), new PhoneNumber("19198900000"));
2934
// Populate your callOptions object with any additional parameters like normal.
30-
callOptions.Url = new Uri("http://twilio.example.com/xml/twilio-custom.xml");
35+
callOptions.Url = new Uri("https://demo.twilio.com/docs/voice.xml");
3136

3237
// Create your call as you normally would.
3338
var call = CallResource.Create(callOptions);
3439
Console.WriteLine("Call sid: " + call.Sid);
3540
Console.ReadLine();
3641

3742

38-
3943
//
4044
// Example using the thinQ wrapper
4145
//
4246
4347
// Create a wrapper object, psasing in your Twilio SID, Twilio Token, thinQ ID and thinQ Token.
44-
TwilioWrapper wrapper = new TwilioWrapper("twilioSid", "twilioToken", "thinqAccountId", "thinqToken");
48+
TwilioWrapper wrapper = new TwilioWrapper(twilioSid, twilioToken, thinqAccountId, thinqToken);
4549

4650
// Call the createCall method on the wrapper as normal.
47-
var call2 = wrapper.createCall(new PhoneNumber("19195551234"), new PhoneNumber("19198900000"), url: new Uri("http://twilio.example.com/xml/twilio-custom.xml"));
51+
var call2 = wrapper.createCall(new PhoneNumber("19195551234"), new PhoneNumber("19198900000"), url: new Uri("https://demo.twilio.com/docs/voice.xml"));
4852
Console.WriteLine("Call2 sid: " + call2.Sid);
4953
Console.ReadLine();
5054

@@ -54,12 +58,12 @@ namespace Demo
5458
//
5559
5660
// Create a wrapper object, psasing in your Twilio SID, Twilio Token, thinQ ID and thinQ Token.
57-
TwilioWrapper wrapper2 = new TwilioWrapper("twilioSid", "twilioToken", "thinqAccountId", "thinqToken");
61+
TwilioWrapper wrapper2 = new TwilioWrapper(twilioSid, twilioToken, thinqAccountId, thinqToken);
5862

5963
// Create a callOptions object, passing in your to and from numbers.
6064
CreateCallOptions callOptions2 = new CreateCallOptions(new PhoneNumber("19195551234"), new PhoneNumber("19198900000"));
6165
// Populate your callOptions object with any additional parameters like normal.
62-
callOptions2.Url = new Uri("http://twilio.example.com/twilio.xml");
66+
callOptions2.Url = new Uri("https://demo.twilio.com/docs/voice.xml");
6367

6468
// Call the createCall method on the wrapper as normal.
6569
CallResource call3 = wrapper2.createCall(callOptions);
@@ -68,6 +72,7 @@ namespace Demo
6872
}
6973
}
7074
}
75+
7176
```
7277
---
7378

‎TwilioWithThinq/Properties/AssemblyInfo.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Runtime.CompilerServices;
33
using System.Runtime.InteropServices;
44

5-
// General Information about an assembly is controlled through the following
5+
// General Information about an assembly is controlled through the following
66
// set of attributes. Change these attribute values to modify the information
77
// associated with an assembly.
88
[assembly: AssemblyTitle("TwilioWithThinQLCR")]
@@ -14,8 +14,8 @@
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

17-
// Setting ComVisible to false makes the types in this assembly not visible
18-
// to COM components. If you need to access a type in this assembly from
17+
// Setting ComVisible to false makes the types in this assembly not visible
18+
// to COM components. If you need to access a type in this assembly from
1919
// COM, set the ComVisible attribute to true on that type.
2020
[assembly: ComVisible(false)]
2121

@@ -25,12 +25,12 @@
2525
// Version information for an assembly consists of the following four values:
2626
//
2727
// Major Version
28-
// Minor Version
28+
// Minor Version
2929
// Build Number
3030
// Revision
3131
//
32-
// You can specify all the values or you can default the Build and Revision Numbers
32+
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("2.0.0.0")]
36-
[assembly: AssemblyFileVersion("2.0.0.0")]
35+
[assembly: AssemblyVersion("2.1.0.0")]
36+
[assembly: AssemblyFileVersion("2.1.0.0")]

‎TwilioWithThinq/TwilioWithThinQLCR.csproj‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<Copyright>Copyright © thinQ</Copyright>
88
<AssemblyTitle>Twilio</AssemblyTitle>
99
<NeutralLanguage>en-US</NeutralLanguage>
10-
<Version>2.0.0</Version>
10+
<Version>2.1.0</Version>
1111
<Authors>AndyClarke</Authors>
1212
<NoWarn>$(NoWarn);CS1591</NoWarn>
1313
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -21,20 +21,14 @@
2121
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.4' ">1.6.1</NetStandardImplicitPackageVersion>
2222
</PropertyGroup>
2323
<ItemGroup>
24-
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
25-
</ItemGroup>
26-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.4' ">
27-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.1.2" />
28-
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="5.1.2" />
29-
<PackageReference Include="Microsoft.IdentityModel.Logging" Version="1.1.2" />
30-
<PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
24+
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
3125
<PackageReference Include="Twilio" Version="5.6.0" />
3226
</ItemGroup>
3327
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
3428
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.1.2" />
3529
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="5.1.2" />
3630
<PackageReference Include="Microsoft.IdentityModel.Logging" Version="1.1.2" />
37-
<PackageReference Include="Twilio" Version="5.0.2" />
31+
<PackageReference Include="Twilio" Version="5.6.0" />
3832
</ItemGroup>
3933
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
4034
<Reference Include="System.Net.Http" />
@@ -45,6 +39,6 @@
4539
</ItemGroup>
4640
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
4741
<PackageReference Include="JWT" Version="1.3.4" />
48-
<PackageReference Include="Twilio" Version="5.0.2" />
42+
<PackageReference Include="Twilio" Version="5.6.0" />
4943
</ItemGroup>
5044
</Project>

‎TwilioWithThinq/TwilioWithThinQLCR.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<projectUrl>http://thinq.com</projectUrl>
1010
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1111
<description>$description$</description>
12-
<releaseNotes>Fixes for Twilio SDK 4.X.</releaseNotes>
12+
<releaseNotes>Fixes for Twilio SDK 5.X.</releaseNotes>
1313
<copyright>Copyright 2017</copyright>
1414
<tags>twilio thinq lcr</tags>
1515
</metadata>

0 commit comments

Comments
 (0)