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:
kjac
2023-10-22 11:23:04 +02:00
236 changed files with 4701 additions and 2603 deletions

View File

@@ -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
}