yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v9/9.2' into v9/dev

Browse Source 
# Conflicts:
#	build/templates/UmbracoPackage/.template.config/template.json
#	build/templates/UmbracoProject/.template.config/template.json
#	src/Directory.Build.props
#	src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
This commit is contained in:
Bjarke Berg
2022-01-23 13:34:39 +01:00
parent eb126a77b6 763cb70e67
commit b7d8b7923d
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/templates/UmbracoPackage/.template.config/template.json
View File

@@ -24,7 +24,7 @@
"version": {
"type": "parameter",
"datatype": "string",
"defaultValue": "9.3.0-rc",
"defaultValue": "9.3.0",
"description": "The version of Umbraco to load using NuGet",
"replaces": "UMBRACO_VERSION_FROM_TEMPLATE"
},

2
build/templates/UmbracoProject/.template.config/template.json
View File

@@ -57,7 +57,7 @@
"version": {
"type": "parameter",
"datatype": "string",
"defaultValue": "9.3.0-rc",
"defaultValue": "9.3.0",
"description": "The version of Umbraco to load using NuGet",
"replaces": "UMBRACO_VERSION_FROM_TEMPLATE"
},

2
src/Directory.Build.props
View File

@@ -5,7 +5,7 @@
<PropertyGroup>
<Version>9.3.0</Version>
<AssemblyVersion>9.3.0</AssemblyVersion>
<InformationalVersion>9.3.0-rc</InformationalVersion>
<InformationalVersion>9.3.0</InformationalVersion>
<FileVersion>9.3.0</FileVersion>
<LangVersion Condition="'$(LangVersion)' == ''">9.0</LangVersion>
<NeutralLanguage>en-US</NeutralLanguage>