Merge branch 'main' into arm64-fix-csproj

Author: Beyley

.github/workflows/bindings-regeneration.yml

@@ -23,6 +23,10 @@ jobs:
       with:
         java-version: 11
         distribution: "temurin"
+    - name: Setup .NET 7.0
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 7.0.102
     - name: Setup .NET 6.0
       uses: actions/setup-dotnet@v1
       with:
@@ -45,12 +49,12 @@ jobs:
       with:
         sdk-version: 22621
     - name: Run a full run of BuildTools
-      run: dotnet run -c Release --project src/Core/Silk.NET.BuildTools/Silk.NET.BuildTools.csproj -- --no-parallel
+      run: dotnet run -c Release --project src/Core/Silk.NET.BuildTools/Silk.NET.BuildTools.csproj -- generator.json --no-parallel
     - name: Get current date
       id: date
       run: echo "::set-output name=date::$(date +'%d-%m-%Y')"
     - name: Create or Update Pull Request
-      uses: gr2m/create-or-update-pull-request-action@master
+      uses: gr2m/create-or-update-pull-request-action@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:

.github/workflows/build.yml

@@ -12,6 +12,9 @@ on:
     # all branches
     paths-ignore:
       - 'documentation/**'
+  merge_group:
+      types: [checks_requested]
+      
 jobs:
   Build:
     # This will:

.github/workflows/public-api.yml

@@ -38,10 +38,12 @@ jobs:
                       .tmp
                       ~/.nuget/packages
                   key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
-            - name: Setup .NET 6.0
-              uses: actions/setup-dotnet@v1
+            - name: Setup .NET 6.0 and .NET 7.0
+              uses: actions/setup-dotnet@v3.0.3
               with:
-                  dotnet-version: 6.0.201
+                  dotnet-version: |
+                    6.0.201
+                    7.0.*
             - name: Install Workloads for Restore
               # TODO: This is slow. Maybe we can make a docker container with this already done?
               run: dotnet workload install android ios maccatalyst maui
@@ -68,10 +70,12 @@ jobs:
                       .tmp
                       ~/.nuget/packages
                   key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
-            - name: Setup .NET 6.0
-              uses: actions/setup-dotnet@v1
+            - name: Setup .NET 6.0 and .NET 7.0
+              uses: actions/setup-dotnet@v3.0.3
               with:
-                  dotnet-version: 6.0.201
+                  dotnet-version: |
+                    6.0.201
+                    7.0.* 
             - name: Ship Public API
               run: ./build.sh ShipApi
               env: