Merge branch 'master' into feature/decouple-xaml-code-add-net6_0

Author: codebude

.github/workflows/wf-build-release.yml

@@ -6,7 +6,7 @@ on:
           description: 'Release Notes (use `n for new line)'     
           required: true     
 jobs:  
-  build: 
+  build:
     runs-on: windows-2019 
     env:
         ACTIONS_ALLOW_UNSECURE_COMMANDS: true

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

@@ -16,7 +16,7 @@ jobs:
     - name: Install .NET 6
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '3.1.x'
+        dotnet-version: '6.0.1'
 
     - name: Setup MSBuild Path
       uses: microsoft/setup-msbuild@v1      
@@ -49,7 +49,7 @@ jobs:
     - name: Install .NET 6
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '3.1.x' 
+        dotnet-version: '6.0.1' 
 
     - name: Run test .NET 3.5
       run: dotnet test -c Release -f net35 --nologo --no-build # No coverage for NET3.5 because of bug in combination with Coverlet+Stron naming