Bring updates from pnp feature branch to preview

.github/CODEOWNERS

@@ -1,3 +1,3 @@
 # Track1 .NET Azure IoT Hub and DPS SDKs
 
-*	@drwill-ms @timtay-microsoft @abhipsaMisra @vinagesh @azabbasi @bikamani @barustum @jamdavi
+*	@drwill-ms @timtay-microsoft @abhipsaMisra @azabbasi @jamdavi @andykwong-ms

.github/CONTRIBUTING.md

@@ -27,13 +27,13 @@ That is definitely something we want to hear about. Please open an issue on gith
 
 ## Contribute documentation
 
-For simple markdown files, we accept documentation pull requests submitted against the `master` branch, if it's about existing SDK features.
+For simple markdown files, we accept documentation pull requests submitted against the `main` branch, if it's about existing SDK features.
 If your PR is about future changes or has changes to the comments in the code itself, we'll treat is as a code change (see the next section).
 
 ## Contribute code
 Our SDKs are open-source and we do accept pull-requests if you feel like taking a stab at fixing the bug and maybe adding your name to our commit history :) Please mention any relevant issue number in the pull request description, and follow the contributing guidelines [below](#contributing-guidelines).
 
-Pull-requests for code are to be submitted against the `master` branch. We will review the request and once approved we will be running it in our gated build system. We try to maintain a high bar for code quality and maintainability, we insist on having tests associated with the code, and if necessary, additions/modifications to the requirement documents.
+Pull-requests for code are to be submitted against the `main` branch. We will review the request and once approved we will be running it in our gated build system. We try to maintain a high bar for code quality and maintainability, we insist on having tests associated with the code, and if necessary, additions/modifications to the requirement documents.
 
 Also, have you signed the [Contribution License Agreement](https://cla.microsoft.com/) ([CLA](https://cla.microsoft.com/))? A friendly bot will remind you about it when you submit your pull-request.
 
@@ -44,9 +44,9 @@ sure your plans and ours are in sync :) Just open an issue on github and tag it
 1. If the change affects the public API, extract the updated public API surface and submit a PR for review. Make sure you get a signoff before you move to Step 2.
 2. Post API surface approval, follow the below guidelines for contributing code:
 
-    a) Follow the steps [here](https://github.com/Azure/azure-iot-sdk-csharp/blob/master/doc/devbox_setup.md) for setting up your development environment.
+    a) Follow the steps [here](https://github.com/Azure/azure-iot-sdk-csharp/blob/main/doc/devbox_setup.md) for setting up your development environment.
 
-    b) Follow the [C# Coding Style](https://github.com/Azure/azure-iot-sdk-csharp/blob/master/doc/coding-style.md).
+    b) Follow the [C# Coding Style](https://github.com/Azure/azure-iot-sdk-csharp/blob/main/doc/coding-style.md).
 
     c) Unit Tests:
     We write unit tests for any new function or block of application code that impacts the existing behavior of the code.
@@ -73,9 +73,9 @@ sure your plans and ours are in sync :) Just open an issue on github and tag it
     ```
     d) E2E Tests:
     Any new feature or functionality added must have associated end-to-end tests.
-        1. Update/ Add the E2E tests [here](https://github.com/Azure/azure-iot-sdk-csharp/tree/master/e2e/test).
-        2. In case environmental setup required for the application is changed, update the pre-requisites [here](https://github.com/Azure/azure-iot-sdk-csharp/tree/master/e2e/test/prerequisites).
-        3. Run the E2E test suite and ensure that all the tests pass successfully. You can also test against the [CI script](https://github.com/Azure/azure-iot-sdk-csharp/blob/master/jenkins/windows_csharp.cmd) that is used in our gated build system.
+        1. Update/ Add the E2E tests [here](https://github.com/Azure/azure-iot-sdk-csharp/tree/main/e2e/test).
+        2. In case environmental setup required for the application is changed, update the pre-requisites [here](https://github.com/Azure/azure-iot-sdk-csharp/tree/main/e2e/test/prerequisites).
+        3. Run the E2E test suite and ensure that all the tests pass successfully. You can also test against the [CI script](https://github.com/Azure/azure-iot-sdk-csharp/blob/main/jenkins/windows_csharp.cmd) that is used in our gated build system.
 
     e) Samples:
     Add relevant samples to the [Azure IoT Samples for C# Repo](https://github.com/Azure-Samples/azure-iot-samples-csharp). Make sure to add a supporting readme file demonstrating the steps to run the sample.
@@ -100,7 +100,7 @@ sure your plans and ours are in sync :) Just open an issue on github and tag it
         }
     }
     ```
-3. Post completion of all of the above steps, create a PR against `master`.
+3. Post completion of all of the above steps, create a PR against `main`.
 
 #### Commit Guidelines
 We have very precise rules over how our git commit messages can be formatted. This leads to more readable messages that are easy to follow when looking through the project history.
@@ -130,7 +130,7 @@ If the commit reverts a previous commit, it should begin with `revert:`, followe
 
 **Rebase and Squash**
 
-* Its manadatory to squash all your commits per scope (i.e package). It is also important to rebase your commits on master.
+* Its manadatory to squash all your commits per scope (i.e package). It is also important to rebase your commits on `main`.
 * Optionally you can split your commits on the basis of the package you are providing code to.
 
 **Type**

.github/ISSUE_TEMPLATE.md

@@ -24,5 +24,5 @@ Please use your Azure subscription if you need to share any information from you
 
 ## Console log of the issue:
 <!-- Please share logs as possible, that will help debugging. -->
-<!-- See https://github.com/Azure/azure-iot-sdk-csharp/tree/master/tools/CaptureLogs and
+<!-- See https://github.com/Azure/azure-iot-sdk-csharp/tree/main/tools/CaptureLogs and
          https://github.com/dotnet/corefx/blob/master/Documentation/debugging/windows-instructions.md#traces -->

.github/ISSUE_TEMPLATE/bug_report.md

@@ -25,7 +25,7 @@ Please follow the instructions and template below to save us time requesting add
 4. Include enough information for us to address the bug:
    -  A detailed description.
    -  A [Minimal Complete Reproducible Example](https://stackoverflow.com/help/mcve). This is code we can cut and paste into a readily available sample and run, or a link to a project you've written that we can compile to reproduce the bug. 
-   -  Console logs (https://github.com/Azure/azure-iot-sdk-csharp/tree/master/tools/CaptureLogs).
+   -  Console logs (https://github.com/Azure/azure-iot-sdk-csharp/tree/main/tools/CaptureLogs).
 
 5. Delete these instructions before submitting the bug.
 
@@ -51,5 +51,5 @@ Please be as detailed as possible: which feature has a problem, how often does i
 Please remove any connection string information!
 
 ## Console log of the issue
-Consider setting the DEBUG environment variable to '*'. This will produce a much more verbose output that will help debugging
+Follow the instructions [here](https://github.com/Azure/azure-iot-sdk-csharp/tree/main/tools/CaptureLogs) to capture SDK logs.
 Don't forget to remove any connection string information!

.github/PULL_REQUEST_TEMPLATE.md

@@ -9,10 +9,10 @@ Need support?
 -->
 
 ## Checklist
-- [ ] I have read the [contribution guidelines](https://github.com/Azure/azure-iot-sdk-csharp/blob/master/.github/CONTRIBUTING.md).
+- [ ] I have read the [contribution guidelines](https://github.com/Azure/azure-iot-sdk-csharp/blob/main/.github/CONTRIBUTING.md).
 - [ ] I added or modified the existing tests to cover the change (we do not allow our test coverage to go down).
-- [ ] This pull-request is submitted against the `master` branch.
-<!-- If not against master, please add the reason. -->
+- [ ] This pull-request is submitted against the `main` branch.
+<!-- If not against main, please add the reason. -->
 
 ## Description of the changes
 <!-- Itemized list of changes. -->

azureiot.sln

@@ -72,11 +72,17 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{719D18A7-E943-461B-B777-0AAEC43916F5}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
+		configure_tls_protocol_version_and_ciphers.md = configure_tls_protocol_version_and_ciphers.md
+		device_connection_and_reliability_readme.md = device_connection_and_reliability_readme.md
+		readme.md = readme.md
+		supported_platforms.md = supported_platforms.md
 		test.runsettings = test.runsettings
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.Devices.Shared.Tests", "shared\tests\Microsoft.Azure.Devices.Shared.Tests.csproj", "{CEEE435F-32FC-4DE5-8735-90F6AC950A01}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{2368415A-9C09-4F47-9636-FDCA4B85C88C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -184,6 +190,7 @@ Global
 		{275DEE86-1EEA-47C4-A9C5-797DF20EC8A7} = {3AA089A9-A035-439E-BAF6-C3975A334379}
 		{8E25CDE3-992D-4942-8C38-51A0D8E8EB70} = {9C260BF0-1CCA-45A2-AAB8-6419291B8B88}
 		{CEEE435F-32FC-4DE5-8735-90F6AC950A01} = {3AA089A9-A035-439E-BAF6-C3975A334379}
+		{2368415A-9C09-4F47-9636-FDCA4B85C88C} = {A48437BA-3C5B-431E-9B2F-96C850E9E1A5}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {AF61665D-340A-494B-9705-571456BDC752}