Fix merge issues
This commit is contained in:
@@ -25,26 +25,21 @@
|
||||
"type": "parameter",
|
||||
"datatype": "choice",
|
||||
"choices": [
|
||||
{
|
||||
"displayName": ".NET 5.0",
|
||||
"description": "Target net5.0",
|
||||
"choice": "net5.0"
|
||||
},
|
||||
{
|
||||
"displayName": ".NET 6.0",
|
||||
"description": "Target net6.0",
|
||||
"choice": "net6.0"
|
||||
}
|
||||
],
|
||||
"defaultValue": "net5.0",
|
||||
"replaces": "net5.0"
|
||||
"defaultValue": "net6.0",
|
||||
"replaces": "net6.0"
|
||||
},
|
||||
"UmbracoVersion": {
|
||||
"displayName": "Umbraco version",
|
||||
"description": "The version of Umbraco.Cms to add as PackageReference.",
|
||||
"type": "parameter",
|
||||
"datatype": "string",
|
||||
"defaultValue": "9.5.0-rc",
|
||||
"defaultValue": "10.0.0-rc",
|
||||
"replaces": "UMBRACO_VERSION_FROM_TEMPLATE"
|
||||
},
|
||||
"UseHttpsRedirect": {
|
||||
|
||||
Reference in New Issue
Block a user