Merge branch 'main' into sw/image-brush-offsets

Author: JimBobSquarePants

.github/workflows/build-and-test.yml

@@ -107,14 +107,14 @@ jobs:
 
       - name: DotNet Setup
         if: ${{ matrix.options.sdk-preview != true }}
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
             6.0.x
 
       - name: DotNet Setup Preview
         if: ${{ matrix.options.sdk-preview == true }}
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
             7.0.x