Merge branch 'master' into patch-1

Author: drazisil

jekyll/_cci2/collect-test-data.md

@@ -74,6 +74,7 @@ This section provides the following test runner examples:
 * [pytest]( {{ site.baseurl }}/2.0/collect-test-data/#pytest)
 * [RSpec]( {{ site.baseurl }}/2.0/collect-test-data/#rspec)
 * [test2junit]( {{ site.baseurl }}/2.0/collect-test-data/#test2junit-for-clojure-tests)
+* [trx2junit]( {{ site.baseurl }}/2.0/collect-test-data/#trx2junit-for-visual-studio--net-core-tests)
 * [Karma]( {{ site.baseurl }}/2.0/collect-test-data/#karma)
 * [Jest]( {{ site.baseurl }}/2.0/collect-test-data/#jest)
 
@@ -414,6 +415,30 @@ See the [minitest-ci README](https://github.com/circleci/minitest-ci#readme) for
 {:.no_toc}
 Use [test2junit](https://github.com/ruedigergad/test2junit) to convert Clojure test output to XML format. For more details, refer to the [sample project](https://github.com/kimh/circleci-build-recipies/tree/clojure-test-metadata-with-test2junit).
 
+#### trx2junit for Visual Studio / .NET Core Tests
+{:.no_toc}
+Use [trx2junit](https://github.com/gfoidl/trx2junit) to convert Visual Studio / .NET Core trx output to XML format. 
+
+A working `.circleci/config.yml` section might look like this:
+
+```yaml
+    steps:
+      - checkout
+      - run: dotnet build
+      - run: dotnet test --no-build --logger "trx"
+      - run:
+          name: test results
+          command: |
+              dotnet tool install -g trx2junit
+              export PATH="$PATH:/root/.dotnet/tools"
+              trx2junit tests/**/TestResults/*.trx
+      - store_test_results:
+          path: tests/TestResults
+      - store_artifacts:
+          path: tests/TestResults
+          destination: TestResults
+```
+
 #### Karma
 {:.no_toc}
 

jekyll/_cci2/contexts.md

@@ -30,7 +30,7 @@ For any GitHub Enterprise (GHE) installation that includes multiple organization
 
 ## Creating and Using a Context
 
-1. As an organization member, Navigate to the Settings > Contexts page in the CircleCI application. **Note:** Any organization memeber can create a context only organization administrators can restrict it with a security group.
+1. As an organization member, Navigate to the Settings > Contexts page in the CircleCI application. **Note:** Any organization member can create a context only organization administrators can restrict it with a security group.
 
 2. Click the Create Contexts button to add a unique name for your Context. After you click the Create button on the dialog box, the Context appears in a list with Security set to `All members` to indicate that anyone in your organization can access this context at runtime.