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

Merge remote-tracking branch 'refs/remotes/origin/contrib' into v14/dev

Browse Source 
# Conflicts:
#	tests/Umbraco.Tests.AcceptanceTest/package-lock.json
This commit is contained in:
Bjarke Berg
2024-09-18 11:05:15 +02:00
parent 939b2aaa3d c8899afed6
commit 47d843f424
88 changed files with 503 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Cms.StaticAssets/Umbraco.Cms.StaticAssets.csproj
View File

@@ -6,6 +6,11 @@
<StaticWebAssetBasePath>/</StaticWebAssetBasePath>
</PropertyGroup>
<PropertyGroup>
<!-- TODO: [NU5123] Rename files so path is shorter -->
<WarningsNotAsErrors>NU5123</WarningsNotAsErrors>
</PropertyGroup>
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<ProjectReference Include="..\Umbraco.Cms.Api.Management\Umbraco.Cms.Api.Management.csproj" />
@@ -71,4 +76,4 @@
</ItemGroup>
<RemoveDir Directories="@(LoginDirectories)" />
</Target>
</Project>
</Project>