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

Merge branch 'v10/dev' into v11/merge/merge-v10-to-v11

Browse Source 
# Conflicts:
#	.github/workflows/codeql-analysis.yml
#	.gitignore
#	Directory.Build.props
#	build/azure-pipelines.yml
#	src/JsonSchema/Options.cs
#	src/JsonSchema/UmbracoJsonSchemaGenerator.cs
#	src/Umbraco.Cms.ManagementApi/DependencyInjection/FactoryBuilderExtensions.cs
#	src/Umbraco.Cms.ManagementApi/ManagementApiComposer.cs
#	src/Umbraco.Cms.ManagementApi/OpenApi.json
#	src/Umbraco.Core/Models/Mapping/DictionaryMapDefinition.cs
#	src/Umbraco.Infrastructure/Security/UmbracoUserManager.cs
#	tests/Directory.Build.props
#	tests/Umbraco.Tests.AcceptanceTest/package-lock.json
#	tests/Umbraco.Tests.AcceptanceTest/package.json
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Packages/packages.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Tabs/tabs.spec.ts
#	tests/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs
This commit is contained in:
Zeegaan
2022-10-05 14:29:41 +02:00
parent 46da0b07a8 367a4b9727
commit 9243c59ce9
178 changed files with 11773 additions and 1141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Umbraco.Tests.AcceptanceTest/misc/umbraco-linux.docker
View File

@@ -6,6 +6,8 @@ FROM mcr.microsoft.com/dotnet/nightly/sdk:7.0 AS build
COPY nuget.config .
COPY nuget.config .
WORKDIR /nupkg
COPY nupkg .