Merge branch 'main' into release

GitVersion.yml

@@ -1,12 +1,18 @@
 next-version: 3.0
-mode: ContinuousDelivery
+mode: Mainline
 assembly-file-versioning-format: '{Major}.{Minor}.{Patch}.{WeightedPreReleaseNumber}'
+
 branches:
   main:
-    regex: ^master$|^main$
     tag: beta
-  release:
-    regex: ^release$
+    regex: ^master$|^main$
+    increment: Patch
     is-release-branch: true
   pull-request:
     tag: pr
+    increment: Patch
+  release:
+    tag: ''
+    regex: release
+    increment: Patch
+    is-release-branch: true

azure-pipelines.yml

@@ -1,5 +1,9 @@
 trigger:
 - main
+- release
+
+pr:
+- main
 
 stages:
 

scripts/pack.yml

@@ -11,7 +11,7 @@ jobs:
     assemblyVersion: $[ stageDependencies.ver.ver.outputs['version.GitVersion.AssemblySemVer'] ]
     fileVersion: $[ stageDependencies.ver.ver.outputs['version.GitVersion.AssemblySemFileVer'] ]
     informationalVersion: $[ stageDependencies.ver.ver.outputs['version.GitVersion.InformationalVersion'] ]
-    packageVersion: $[ stageDependencies.ver.ver.outputs['version.GitVersion.NuGetVersion'] ]
+    packageVersion: $[ stageDependencies.ver.ver.outputs['version.GitVersion.NuGetVersionV2'] ]
   pool:
     vmImage: 'windows-latest'