diff --git a/.gitattributes b/.gitattributes index 2dbab83b..269bc192 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,7 +2,7 @@ * text=auto # Text files that should be normalized to LF in odb. -*.cs text diff=csharp +*.cs text eol=lf diff=csharp *.xaml text *.config text *.c text @@ -40,3 +40,6 @@ *.pdb binary *.sdf binary *.7z binary + +# Generated file should just use CRLF, it's fiiine +SolutionInfo.cs text eol=crlf diff=csharp diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 45beba7a..a14a8f59 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -96,15 +96,16 @@ Run this command to confirm all the tests pass: `.\build` ### Running integration tests Octokit has integration tests that access the GitHub API, but they must be -configured before they will be executed. To configure the tests, create a -test GitHub account (i.e., don't use your real GitHub account) and a test -organization owned by that account. Then set the following environment variables: +configured before they will be executed. + +**Note:** To run the tests, we highly recommend you create a test GitHub +account (i.e., don't use your real GitHub account) and a test organization +owned by that account. Then set the following environment variables: `OCTOKIT_GITHUBUSERNAME` (set this to the test account's username) `OCTOKIT_GITHUBPASSWORD` (set this to the test account's password) `OCTOKIT_GITHUBORGANIZATION` (set this to the test account's organization) - Once these are set, the integration tests will be executed both when running the FullBuild MSBuild target, and when running the Octokit.Tests.Integration assembly through an xUnit.net-friendly test runner. diff --git a/Octokit.Tests.Integration/Clients/MiscellaneousClientTests.cs b/Octokit.Tests.Integration/Clients/MiscellaneousClientTests.cs index cc05e038..24ca412a 100644 --- a/Octokit.Tests.Integration/Clients/MiscellaneousClientTests.cs +++ b/Octokit.Tests.Integration/Clients/MiscellaneousClientTests.cs @@ -33,8 +33,7 @@ public class MiscellaneousClientTests var result = await github.Miscellaneous.RenderRawMarkdown("This is\r\n a **test**"); - Assert.Equal("

This is a test

\n", result); - //Assert.Equal("

This is\n a test

\n", result); + Assert.Equal("

This is\n a test

\n", result); } } } diff --git a/Octokit/Octokit-netcore45.csproj b/Octokit/Octokit-netcore45.csproj index 5fc8d06c..eece5f70 100644 --- a/Octokit/Octokit-netcore45.csproj +++ b/Octokit/Octokit-netcore45.csproj @@ -355,10 +355,7 @@ - - 11.0 - - +