Merge branch 'main' into csproj-formatting

Author: belav

.github/workflows/deploy_website.yml

@@ -1,7 +1,7 @@
 name: Deploy Website
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
     paths:
       - 'Src/Website/**'
 

.github/workflows/format_repositories.yml

@@ -1,7 +1,7 @@
 name: Format Repositories
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
     paths:
       - "Src/CSharpier/**/*"
 

.github/workflows/publish_nuget.yml

@@ -1,7 +1,7 @@
 name: Publish Nuget
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
 jobs:
   test:
     runs-on: ubuntu-latest

.github/workflows/validate_pull_request.yml

@@ -1,7 +1,7 @@
 name: Validate Pull Request
 on:
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 jobs:
   run_tests:
     runs-on: ubuntu-latest

CSharpier.VisualStudio/.idea/.idea.CSharpier.VisualStudio/.idea/indexLayout.xml

@@ -112,7 +112,7 @@ This option keeps csharpier running so that multiple files can be formatted. Thi
 to drastically improve formatting time.  
 The input is a '\u0003' delimited list of file names followed by file contents.  
 The results are written to stdout delimited by \u0003.  
-For an example of implementing this in code see [this example](https://github.com/belav/csharpier/blob/master/Src/CSharpier.VSCode/src/CSharpierProcessPipeMultipleFiles.ts)
+For an example of implementing this in code see [this example](https://github.com/belav/csharpier/blob/main/Src/CSharpier.VSCode/src/CSharpierProcessPipeMultipleFiles.ts)
 ```bash
 $ [FullPathToFile]\u0003[FileContents]\u0003[FullPathToFile]\u0003[FileContents]\u0003 | dotnet csharpier --pipe-multiple-files
 public class ClassName

CSharpier.VisualStudio/.idea/.idea.CSharpier.VisualStudio/.idea/projectSettingsUpdater.xml

@@ -29,7 +29,7 @@ Normally when using a code formatter like CSharpier, you'll want to ensure that
    name: Validate PR
    on:
      pull_request:
-       branches: [ master ]
+       branches: [ main ]
    jobs:
      check_formatting:
        runs-on: ubuntu-latest

Docs/CLI.md

@@ -18,8 +18,8 @@ $ErrorActionPreference = "Stop"
 
 $branch = & git branch --show-current
 
-if ($branch -eq "master") {
-    Write-Output "You must be on the branch you want to test. You are currently on master"
+if ($branch -eq "main") {
+    Write-Output "You must be on the branch you want to test. You are currently on main"
     exit 1
 }
 
@@ -42,7 +42,7 @@ if ($firstRun)
 {
     Set-Location $repositoryRoot
     # TODO this should make sure the working tree is clean
-    & git checkout master
+    & git checkout main
     Build-CSharpier
 
     Set-Location $pathToTestingRepo
@@ -52,6 +52,10 @@ if ($firstRun)
     & git checkout -b $preBranch
 
     dotnet $csharpierDllPath . $fastParam --no-cache
+    # there is some weirdness with a couple files with #if where
+    # they need to be formatted twice to get them stable
+    # it isn't worth fixing in csharpier, because it only really affects this
+    dotnet $csharpierDllPath . $fastParam
 
     & git add -A
     & git commit -m "Before $branch"

Docs/ContinuousIntegration.md

@@ -355,7 +355,8 @@ CancellationToken cancellationToken
 
         try
         {
-            codeFormattingResult = await CodeFormatter.FormatAsync(
+            // TODO xml find correct formatter
+            codeFormattingResult = await CSharpFormatter.FormatAsync(
                 fileToFormatInfo.FileContents,
                 Path.GetExtension(fileToFormatInfo.Path),
                 printerOptions,