feat!: Merging RC branch to main (#645)

* fix: correct the Oauth/UserInfo naming

* docs: Update README.md for 6.x release (#643)

Co-authored-by: Jennifer Mah <[email protected]>

Author: sbansla

.github/workflows/test-and-deploy.yml

@@ -34,6 +34,11 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          TWILIO_ACCOUNT_SID: ${{ secrets.TWILIO_ACCOUNT_SID }}
+          TWILIO_API_KEY: ${{ secrets.TWILIO_CLUSTER_TEST_API_KEY }}
+          TWILIO_API_SECRET: ${{ secrets.TWILIO_CLUSTER_TEST_API_KEY_SECRET }}
+          TWILIO_FROM_NUMBER: ${{ secrets.TWILIO_FROM_NUMBER }}
+          TWILIO_TO_NUMBER: ${{ secrets.TWILIO_TO_NUMBER }}
         run: |
           dotnet tool install --global dotnet-sonarscanner
           make cover

.gitignore

@@ -15,6 +15,7 @@ local.properties
 .classpath
 .settings/
 .loadpath
+**/.openapi-generator*
 
 # External tool builders
 .externalToolBuilders/

CONTRIBUTING.md

@@ -37,6 +37,22 @@ This code was generated by
       /       /
 """
 ```
+or 
+```
+/*
+ * This code was generated by
+ * ___ _ _ _ _ _    _ ____    ____ ____ _    ____ ____ _  _ ____ ____ ____ ___ __   __
+ *  |  | | | | |    | |  | __ |  | |__| | __ | __ |___ |\ | |___ |__/ |__|  | |  | |__/
+ *  |  |_|_| | |___ | |__|    |__| |  | |    |__] |___ | \| |___ |  \ |  |  | |__| |  \
+ *
+ * Twilio - XXXX
+ * This is the public Twilio REST API.
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator.
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+```
 then it is a generated file and the change will need to be made by us, but
 submitting an issue will help us track it and keep you up-to-date. If the file
 isn't generated, you can help us out even more by submitting a Pull Request with

Makefile

@@ -11,11 +11,11 @@ install:
 
 test:
 	dotnet build -c Release
-	dotnet test -c Release
+	dotnet test -c Release --filter TestCategory!="ClusterTest"
 
 test-docker:
 	docker build -t twilio/twilio-csharp .
-	docker run twilio/twilio-csharp /bin/bash -c "dotnet build -c Release; dotnet test -c Release"
+	docker run twilio/twilio-csharp /bin/bash -c "dotnet build -c Release; dotnet test -c Release --filter TestCategory!=\"ClusterTest\""
 
 release:
 	dotnet pack -c Release

README.md

@@ -7,15 +7,15 @@
 
 ## Twilio REST API and TwiML Libraries for .NET
 
-Twilio provides a simple HTTP-based API for sending and receiving phone calls and text messages. Learn more on [twilio.com][apidocs].
+Twilio provides a HTTP-based API for sending and receiving phone calls and text messages. Learn more on [twilio.com][apidocs].
 
 More documentation for this library can be found [here][libdocs].
 
 ## Versions
 
 `twilio-csharp` uses a modified version of [Semantic Versioning](https://semver.org) for all changes. [See this document](VERSIONS.md) for details.
 
-### Migrating from earlier versions
+### Migrate from earlier versions
 
 See the migration guide [here][migrating]. Also, if you were using the `Twilio.Mvc` package, that has been replaced by the [Twilio.AspNet.Mvc][aspnet] package which is compatible with this version of the library.
 
@@ -46,7 +46,7 @@ If you are building with the .NET Core command line tools, then you can run the
 
     dotnet add package Twilio
 
-## Sample Usage
+## Sample usage
 
 The examples below show how to have your application initiate and outbound phone call and send an SMS message using the Twilio .NET helper library:
 ```csharp
@@ -78,18 +78,18 @@ TwilioClient.SetEdge("sydney");
 
 This will result in the `hostname` transforming from `api.twilio.com` to `api.sydney.au1.twilio.com`.
 
-## Enable Debug Logging
+## Enable debug logging
 There are two ways to enable debug logging in the default HTTP client. You can create an environment variable called `TWILIO_LOG_LEVEL` and set it to `debug` or you can set the LogLevel variable on the client as debug:
 
 ```csharp
 TwilioClient.SetLogLevel("debug");
 ```
 
-## Handling Exceptions
+## Handle exceptions
 
-For an example on how to handle exceptions in this helper library, please see the [Twilio documentation](https://www.twilio.com/docs/libraries/csharp-dotnet/usage-guide#handling-errors).
+For an example on how to handle exceptions in this helper library, please see the [Twilio documentation](https://www.twilio.com/docs/libraries/csharp-dotnet/usage-guide#handle-errors).
 
-## Generating TwiML
+## Generate TwiML
 
 To control phone calls, your application needs to output [TwiML][twiml].
 
@@ -129,7 +129,7 @@ Console.WriteLine(response);
 */
 ```
 
-## Using a Custom HTTP Client
+## Use a custom HTTP Client
 
 To use a custom HTTP client with this helper library, please see the [Twilio documentation](https://www.twilio.com/docs/libraries/csharp-dotnet/custom-http-clients-dot-net-framework).
 
@@ -155,7 +155,7 @@ make test
 ```
 
 
-## Getting help
+## Get support
 
 If you need help installing or using the library, please check the [Twilio Support Help Center](https://support.twilio.com) first, and [file a support ticket](https://twilio.com/help/contact) if you don't find an answer to your question.
 
@@ -164,6 +164,6 @@ If you've instead found a bug in the library or would like new features added, g
 [twilio]: https://www.twilio.com
 [apidocs]: https://www.twilio.com/docs/api
 [twiml]: https://www.twilio.com/docs/api/twiml
-[libdocs]: https://twilio.github.io/twilio-csharp
-[migrating]: https://www.twilio.com/docs/libraries/csharp/migrating-your-csharp-dot-net-application-twilio-sdk-4x-5x
+[libdocs]: https://www.twilio.com/docs/libraries/reference/twilio-csharp/
+[migrating]: https://www.twilio.com/docs/libraries/csharp-dotnet/usage-guide
 [aspnet]: https://github.com/twilio/twilio-aspnet

UPGRADE.md

@@ -2,6 +2,16 @@
 
 _`MAJOR` version bumps will have upgrade notes posted here._
 
+[2022-11-XX] 5.x.x to 6.x.x
+---------------------------
+### Overview
+
+#### Twilio Csharp Helper Library’s major version 6.0.1 is now available. We ensured that you can upgrade to Csharp helper Library 6.0.1 version without any breaking changes
+
+Behind the scenes Csharp Helper is now auto-generated via OpenAPI with this release. This enables us to rapidly add new features and enhance consistency across versions and languages.
+
+To learn more about the Csharp Helper Library, check out [our docs](https://www.twilio.com/docs/libraries/csharp-dotnet).
+
 [2017-11-XX] 5.8.x to 5.9.x
 ---------------------------
 

src/Twilio/Rest/Accounts/V1/AuthTokenPromotionOptions.cs

@@ -1,30 +1,47 @@
-/// This code was generated by
-/// \ / _    _  _|   _  _
-///  | (_)\/(_)(_|\/| |(/_  v1.0.0
-///       /       /
+/*
+ * This code was generated by
+ * ___ _ _ _ _ _    _ ____    ____ ____ _    ____ ____ _  _ ____ ____ ____ ___ __   __
+ *  |  | | | | |    | |  | __ |  | |__| | __ | __ |___ |\ | |___ |__/ |__|  | |  | |__/
+ *  |  |_|_| | |___ | |__|    |__| |  | |    |__] |___ | \| |___ |  \ |  |  | |__| |  \
+ *
+ * Twilio - Accounts
+ * This is the public Twilio REST API.
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator.
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
 
 using System;
 using System.Collections.Generic;
 using Twilio.Base;
 using Twilio.Converters;
 
+
+
+
 namespace Twilio.Rest.Accounts.V1
 {
-
-    /// <summary>
-    /// Promote the secondary Auth Token to primary. After promoting the new token, all requests to Twilio using your old
-    /// primary Auth Token will result in an error.
-    /// </summary>
+    /// <summary> Promote the secondary Auth Token to primary. After promoting the new token, all requests to Twilio using your old primary Auth Token will result in an error. </summary>
     public class UpdateAuthTokenPromotionOptions : IOptions<AuthTokenPromotionResource>
     {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
+    
+
+
+
+        
+        /// <summary> Generate the necessary parameters </summary>
+        public  List<KeyValuePair<string, string>> GetParams()
         {
             var p = new List<KeyValuePair<string, string>>();
+
             return p;
         }
+        
+
     }
 
-}
+
+}
+