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

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

Browse Source 
# Conflicts:
#	src/Directory.Build.props
#	templates/UmbracoPackage/.template.config/template.json
#	templates/UmbracoProject/.template.config/template.json
This commit is contained in:
Bjarke Berg
2022-05-02 11:42:00 +02:00
parent 2c3953ae19 bb9fc9b4d8
commit 58cbeac39d
9 changed files with 102 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,7 +41,7 @@
"description": "The version of Umbraco.Cms to add as PackageReference.",
"type": "parameter",
"datatype": "string",
"defaultValue": "10.0.0-rc",
"defaultValue": "10.0.0-rc1",
"replaces": "UMBRACO_VERSION_FROM_TEMPLATE"
},
"namespaceReplacer": {

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

@@ -39,7 +39,7 @@
"description": "The version of Umbraco.Cms to add as PackageReference.",
"type": "parameter",
"datatype": "string",
"defaultValue": "10.0.0-rc",
"defaultValue": "10.0.0-rc1",
"replaces": "UMBRACO_VERSION_FROM_TEMPLATE"
},
"UseHttpsRedirect": {