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

Merge remote-tracking branch 'origin/v13/dev' into v14/dev

Browse Source 
# Conflicts:
#	Directory.Build.props
#	src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
This commit is contained in:
Bjarke Berg
2023-07-07 08:56:17 +02:00
parent c7a38cdac4 fe6cdb0f17
commit d991285466
38 changed files with 1252 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,13 +38,13 @@
"datatype": "choice",
"choices": [
{
"displayName": ".NET 7.0",
"description": "Target net7.0",
"choice": "net7.0"
"displayName": ".NET 8.0",
"description": "Target net8.0",
"choice": "net8.0"
}
],
"defaultValue": "net7.0",
"replaces": "net7.0"
"defaultValue": "net8.0",
"replaces": "net8.0"
},
"UmbracoVersion": {
"displayName": "Umbraco version",

2
templates/UmbracoProject/UmbracoProject.csproj
View File

@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Umbraco.Cms.Web.UI</RootNamespace>