Merge branch 'develop' into v1_border-borderBrush-background-fix_2834

.github/workflows/dotnet-core.yml

@@ -16,20 +16,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-      with:
-        fetch-depth: 0 #fetch-depth is needed for GitVersion
-        
-    # - name: Install and calculate the new version with GitVersion 
-    #   uses: gittools/actions/gitversion/setup@v0
-    #   with:
-    #       versionSpec: '6.x'
-    #       includePrerelease: true
-
-    # - name: Determine Version
-    #   uses: gittools/actions/gitversion/execute@v0
-    #   with:
-    #       useConfigFile: true
-    #   id: gitversion # step id used as reference for output values
 
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v3
@@ -43,7 +29,6 @@ jobs:
 
     - name: Build Debug
       run: |
-        #dotnet-gitversion /updateprojectfiles
         dotnet build --configuration Debug --no-restore
         
     - name: Test

.github/workflows/publish.yml

@@ -28,7 +28,7 @@ jobs:
       uses: gittools/actions/gitversion/execute@v0
       with:
         useConfigFile: true
-        additionalArguments: /verbosity Diagnostic
+        #additionalArguments: /verbosity Diagnostic
       id: gitversion # step id used as reference for output values
 
     - name: Setup dotnet

GitVersion.yml

@@ -1,4 +1,3 @@
-#next-version: 1.14
 mode: ContinuousDeployment
 tag-prefix: '[vV]'
 continuous-delivery-fallback-tag: 'pre'
@@ -6,7 +5,7 @@ branches:
   develop:
     mode: ContinuousDeployment
     tag: pre
-    regex: ^develop?[/-]
+    regex: ^develop
   main:
     tag: rc
     increment: Patch