Merge branch 'main' into collection-expressions

.build/Build.Environment.cs

@@ -22,8 +22,6 @@ partial class Build
     AbsolutePath StarWarsTemplateNuSpec => RootDirectory / "templates" / "StarWars" / "HotChocolate.Templates.StarWars.nuspec";
     AbsolutePath HotChocolateDirectoryBuildProps => SourceDirectory / "HotChocolate" / "Directory.Build.Props";
     AbsolutePath StarWarsProj => RootDirectory / "templates" / "StarWars" / "content" / "StarWars.csproj";
-    AbsolutePath EmptyServerTemplateNuSpec => RootDirectory / "templates" / "Server" / "HotChocolate.Templates.Server.nuspec";
-    AbsolutePath EmptyServerProj => RootDirectory / "templates" / "Server" / "content" / "HotChocolate.Server.Template.csproj";
     AbsolutePath TemplatesNuSpec => RootDirectory / "templates" / "v12" / "HotChocolate.Templates.nuspec";
     AbsolutePath EmptyServer12Proj => RootDirectory / "templates" / "v12" / "server" / "HotChocolate.Template.Server.csproj";
     AbsolutePath EmptyAzf12Proj => RootDirectory / "templates" / "v12" / "function" / "HotChocolate.Template.AzureFunctions.csproj";

.build/Build.Publish.cs

@@ -50,9 +50,6 @@ partial class Build
             var projFile = File.ReadAllText(StarWarsProj);
             File.WriteAllText(StarWarsProj, projFile.Replace("11.1.0", SemVersion));
 
-            projFile = File.ReadAllText(EmptyServerProj);
-            File.WriteAllText(EmptyServerProj, projFile.Replace("11.1.0", SemVersion));
-
             projFile = File.ReadAllText(EmptyServer12Proj);
             File.WriteAllText(EmptyServer12Proj, projFile.Replace("11.1.0", SemVersion));
 
@@ -111,7 +108,6 @@ partial class Build
                 .SetConfiguration(Configuration)
                 .CombineWith(
                     t => t.SetTargetPath(StarWarsTemplateNuSpec),
-                    t => t.SetTargetPath(EmptyServerTemplateNuSpec),
                     t => t.SetTargetPath(TemplatesNuSpec)));
         });
 

.editorconfig

@@ -121,3 +121,12 @@ resharper_trailing_comma_in_multiline_lists = true
 resharper_wrap_before_binary_pattern_op = false
 resharper_wrap_chained_binary_expressions = chop_if_long
 resharper_wrap_chained_binary_patterns = chop_if_long
+
+# Require braces on all control statements
+resharper_csharp_braces_for_ifelse = required
+resharper_csharp_braces_for_for = required
+resharper_csharp_braces_for_foreach = required
+resharper_csharp_braces_for_while = required
+resharper_csharp_braces_for_using = required
+resharper_csharp_braces_for_lock = required
+resharper_csharp_braces_for_fixed = required

.github/linters/.markdownlint.yml

@@ -0,0 +1,41 @@
+---
+###########################
+###########################
+## Markdown Linter rules ##
+###########################
+###########################
+
+# Linter rules doc:
+# - https://github.com/DavidAnson/markdownlint
+#
+# Note:
+# To comment out a single error:
+#   <!-- markdownlint-disable -->
+#   any violations you want
+#   <!-- markdownlint-restore -->
+#
+
+###############
+# Rules by id #
+###############
+MD001: false
+MD009: false
+MD012: false
+MD013: false
+MD018: false
+MD022: false
+MD024: false
+MD025: false
+MD026: false
+MD028: false
+MD029: false
+MD031: false
+MD032: false
+MD033: false
+MD034: false
+MD036: false
+MD037: false
+MD040: false
+MD041: false
+MD045: false
+MD053: false

.github/workflows/ci.yml

@@ -77,7 +77,7 @@ jobs:
     - name: Install Node.js
       uses: actions/setup-node@v2
       with:
-        node-version: '16.x'
+        node-version: '20'
         cache: 'yarn'
         cache-dependency-path: 'website/yarn.lock'
 
@@ -86,7 +86,20 @@ jobs:
 
     - name: run cspell
       run: cspell --config ./cSpell.json "website/src/**/*.md" --no-progress --no-cache
-
+  linting:
+    name: "Markdown linting"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        name: Check out the code
+      - uses: actions/setup-node@v4
+        name: Setup node
+        with:
+          node-version: '20'
+      - run: npm install -g markdownlint-cli2
+        name: Install markdownlint-cli2
+      - run: markdownlint-cli2 --config ".github/linters/.markdownlint.yml" "website/src/**/*.md"
+        name: run Markdownlint
   website-tests:
     name: "Website Tests"
     needs: check-changes
@@ -275,48 +288,6 @@ jobs:
           steps.run-tests.outcome == 'failure' ||
           steps.run-tests.outcome == 'cancelled'
 
-  sonar:
-    runs-on: ubuntu-latest
-    name: Sonar Pull-Request
-    needs: check-changes
-    if: needs.check-changes.outputs.library_changes == 'true'
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-
-    - name: Set up Java
-      uses: actions/setup-java@v2
-      with:
-        java-version: '17'
-        distribution: 'adopt'
-        architecture: x64
-
-    - name: Install .NET
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: |
-          6.x
-          7.x
-          8.x
-
-    - uses: actions/cache@v3
-      with:
-        path: ~/.nuget/packages
-        key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-nuget-
-
-    - name: Run Sonar Analysis
-      run: ./build.cmd SonarPr --SonarToken $SONARTOKEN
-      env:
-        HC_GITHUB_PR_NR: ${{ github.event.pull_request.number }}
-        HC_GITHUB_HEAD_REF: ${{ github.event.pull_request.head.ref }}
-        HC_GITHUB_BASE_REF: ${{ github.event.pull_request.base.ref }}
-        GITHUB_REPOSITORY: ${{ github.repository }}
-        SONARTOKEN: ${{ secrets.SONARTOKEN }}
-
   codeql:
     name: CodeQL
     runs-on: ubuntu-latest

.github/workflows/release.yml

@@ -59,26 +59,3 @@ jobs:
         done
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  sonar_analysis:
-    name: Sonar
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-
-    - name: Set up Java
-      uses: actions/setup-java@v2
-      with:
-        java-version: '17'
-        distribution: 'adopt'
-        architecture: x64
-
-    - name: Run Sonar Analysis
-      run: ./build.cmd Sonar --SonarToken $SONARTOKEN --SemVersion ${{ env.GIT_TAG }}
-      env:
-        GITHUB_REPOSITORY: ${{ github.repository }}
-        SONARTOKEN: ${{ secrets.SONARTOKEN }}

.markdownlintrc

@@ -0,0 +1,23 @@
+{
+  "MD001": false,
+  "MD009": false,
+  "MD012": false,
+  "MD013": false,
+  "MD018": false,
+  "MD022": false,
+  "MD024": false,
+  "MD025": false,
+  "MD026": false,
+  "MD028": false,
+  "MD029": false,
+  "MD031": false,
+  "MD032": false,
+  "MD033": false,
+  "MD034": false,
+  "MD036": false,
+  "MD037": false,
+  "MD040": false,
+  "MD041": false,
+  "MD045": false,
+  "MD053": false
+}