Merge branch 'main' into tte/export-schema-as-utf8-without-bom

.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/workflows/ci.yml

@@ -275,48 +275,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 }}

src/HotChocolate/ApolloFederation/Directory.Build.props

@@ -3,6 +3,6 @@
 
   <PropertyGroup>
     <Nullable>enable</Nullable>
-    <TargetFrameworks>$(Library2TargetFrameworks)</TargetFrameworks>
+    <TargetFrameworks>$(Library3TargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 </Project>