Merge branch 'v12/dev' into v13/dev
# Conflicts: # build/azure-pipelines.yml # src/Umbraco.Core/Configuration/Models/SecuritySettings.cs # version.json
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
|
||||
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
|
||||
"version": "13.0.0-rc",
|
||||
"assemblyVersion": {
|
||||
"precision": "build"
|
||||
@@ -12,7 +12,12 @@
|
||||
"^refs/heads/main$",
|
||||
"^refs/heads/release/"
|
||||
],
|
||||
"release": {
|
||||
"branchName": "release/{version}",
|
||||
"tagName": "release-{version}"
|
||||
},
|
||||
"cloudBuild": {
|
||||
"setAllVariables": true,
|
||||
"buildNumber": {
|
||||
"enabled": true
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user