diff --git a/src/Directory.Build.props b/src/Directory.Build.props index ce54e08edd..57fa53002f 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -22,6 +22,7 @@ enable Nullable enable + true diff --git a/src/Umbraco.Cms/Umbraco.Cms.csproj b/src/Umbraco.Cms/Umbraco.Cms.csproj index c6c63108ff..6d7fcb195f 100644 --- a/src/Umbraco.Cms/Umbraco.Cms.csproj +++ b/src/Umbraco.Cms/Umbraco.Cms.csproj @@ -16,16 +16,11 @@ - - - - $(ProjectDir)appsettings-schema.json $(ProjectDir)../JsonSchema/ - @@ -33,7 +28,6 @@ - @@ -42,9 +36,4 @@ - - - - - diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 01183739d5..feb2f37fde 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -1,5 +1,4 @@ - - + net6.0 Umbraco.Cms.Core @@ -7,11 +6,6 @@ Umbraco.Cms.Core Umbraco CMS Core Contains the core assembly needed to run Umbraco Cms. This package only contains the assembly, and can be used for package development. Use the template in the Umbraco.Templates package to setup Umbraco - Umbraco CMS - - - - bin\Release\Umbraco.Core.xml @@ -60,8 +54,4 @@ - - - - diff --git a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj index afcb0f1fdd..7bdef8928d 100644 --- a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj +++ b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj @@ -7,19 +7,7 @@ Umbraco.Cms.Examine.Lucene - - true - bin\Release\Umbraco.Examine.Lucene.xml - - - - - - - - - - + @@ -30,6 +18,7 @@ all + diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj index 7903f14f96..dda2e536e4 100644 --- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj +++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj @@ -1,125 +1,109 @@ + + net6.0 + Umbraco.Cms.Infrastructure + Umbraco.Cms.Infrastructure + Umbraco CMS Infrastructure + Contains the infrastructure assembly needed to run Umbraco Cms. This package only contains the assembly, and can be used for package development. Use the template in the Umbraco.Templates package to setup Umbraco + - - net6.0 - Umbraco.Cms.Infrastructure - Umbraco.Cms.Infrastructure - Umbraco CMS Infrastructure - Contains the infrastructure assembly needed to run Umbraco Cms. This package only contains the assembly, and can be used for package development. Use the template in the Umbraco.Templates package to setup Umbraco - + + TRACE_SCOPES; + - - bin\Release\Umbraco.Infrastructure.xml - + + + + + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + + + + + + + + + + + + + + + all + + + 3.5.107 + + - - TRACE_SCOPES; - + + <_UnmanagedRegistrationCache Remove="obj\Umbraco.Infrastructure.csproj.UnmanagedRegistration.cache" /> + - - - - - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - - - - - - - - - - - - - - - all - - - 3.5.107 - - + + + True + True + Resources.resx + + - - <_UnmanagedRegistrationCache Remove="obj\Umbraco.Infrastructure.csproj.UnmanagedRegistration.cache" /> - + + + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + + <_Parameter1>Umbraco.Tests + + + <_Parameter1>Umbraco.Tests.Benchmarks + + + <_Parameter1>Umbraco.Tests.Integration + + + <_Parameter1>Umbraco.Tests.Common + + + <_Parameter1>Umbraco.Tests.UnitTests + + + <_Parameter1>DynamicProxyGenAssembly2 + + + <_Parameter1>Umbraco.New.Cms.Infrastructure + + - - - - True - True - Resources.resx - - - - - - - - - - - ResXFileCodeGenerator - Resources.Designer.cs - - - - - - - - - - <_Parameter1>Umbraco.Tests - - - <_Parameter1>Umbraco.Tests.Benchmarks - - - <_Parameter1>Umbraco.Tests.Integration - - - <_Parameter1>Umbraco.Tests.Common - - - <_Parameter1>Umbraco.Tests.UnitTests - - - <_Parameter1>DynamicProxyGenAssembly2 - - - <_Parameter1>Umbraco.New.Cms.Infrastructure - - - - - - - - - - + + + diff --git a/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj b/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj index 0eb68b99fe..12c091099e 100644 --- a/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj +++ b/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj @@ -1,5 +1,4 @@ - net6.0 Umbraco.Cms.Infrastructure.PublishedCache @@ -8,10 +7,6 @@ Contains the Published Cache assembly needed to run Umbraco Cms. This package only contains the assembly, and can be used for package development. Use the template in the Umbraco.Templates package to setup Umbraco - - bin\Release\Umbraco.PublishedCache.NuCache.xml - - @@ -48,5 +43,4 @@ <_Parameter1>DynamicProxyGenAssembly2 - diff --git a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj index eb3a5c5f01..2f6cfe562b 100644 --- a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj +++ b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj @@ -1,59 +1,49 @@ + + net6.0 + Library + Umbraco.Cms.Web.BackOffice + Umbraco.Cms.Web.BackOffice + Umbraco CMS Back Office + Contains the Back Office assembly needed to run the back office of Umbraco Cms. This package only contains the assembly, and can be used for package development. Use the template in the Umbraco.Templates package to setup Umbraco + - - net6.0 - Library - Umbraco.Cms.Web.BackOffice - Umbraco.Cms.Web.BackOffice - Umbraco CMS Back Office - Contains the Back Office assembly needed to run the back office of Umbraco Cms. This package only contains the assembly, and can be used for package development. Use the template in the Umbraco.Templates package to setup Umbraco - - - - bin\Release\Umbraco.Web.BackOffice.xml - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - all - - - 3.5.107 - - - - - - <_Parameter1>Umbraco.Tests.UnitTests - - - <_Parameter1>Umbraco.Tests.Integration - - - - - - - - - - - - + + - - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + all + + + 3.5.107 + + + + + + <_Parameter1>Umbraco.Tests.UnitTests + + + <_Parameter1>Umbraco.Tests.Integration + + + + + + + + + + + + + diff --git a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj index c75ddfe98f..f428db9797 100644 --- a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj +++ b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj @@ -1,13 +1,4 @@ - - - net6.0 - Library - Umbraco.Cms.Web.Common - Umbraco.Cms.Web.Common - Umbraco CMS Web - Contains the Web assembly needed to run Umbraco Cms. This package only contains the assembly, and can be used for package development. Use the template in the Umbraco.Templates package to setup Umbraco - net6.0 Library @@ -15,11 +6,6 @@ Umbraco.Cms.Web.Common Umbraco CMS Web Contains the Web assembly needed to run Umbraco Cms. This package only contains the assembly, and can be used for package development. Use the template in the Umbraco.Templates package to setup Umbraco - enable - - - - bin\Release\Umbraco.Web.Common.xml diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 2ec54bc2d8..c16d1debfc 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -8,6 +8,7 @@ + diff --git a/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj b/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj index 176564eaf8..be4bc570d8 100644 --- a/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj +++ b/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj @@ -1,50 +1,42 @@ + + net6.0 + Library + Umbraco.Cms.Web.Website + Umbraco.Cms.Web.Website + Umbraco CMS Website + Contains the Website assembly needed to run Umbraco Cms (Front office). This package only contains the assembly, and can be used for package development. Use the template in the Umbraco.Templates package to setup Umbraco + - - net6.0 - Library - Umbraco.Cms.Web.Website - Umbraco.Cms.Web.Website - Umbraco CMS Website - Contains the Website assembly needed to run Umbraco Cms (Front office). This package only contains the assembly, and can be used for package development. Use the template in the Umbraco.Templates package to setup Umbraco - + + + - - bin\Release\Umbraco.Web.Website.xml - + + + + + - - bin\Release\Umbraco.Web.Website.xml - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + + + 3.5.107 + + - - - - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - - - 3.5.107 - - - - - <_Parameter1>Umbraco.Tests.UnitTests - - - <_Parameter1>Umbraco.Tests.Integration - - + + + <_Parameter1>Umbraco.Tests.UnitTests + + + <_Parameter1>Umbraco.Tests.Integration + + diff --git a/tests/Umbraco.Tests.Integration/NewBackoffice/OpenAPIContractTest.cs b/tests/Umbraco.Tests.Integration/NewBackoffice/OpenAPIContractTest.cs index 7b7f20944b..a937ee905d 100644 --- a/tests/Umbraco.Tests.Integration/NewBackoffice/OpenAPIContractTest.cs +++ b/tests/Umbraco.Tests.Integration/NewBackoffice/OpenAPIContractTest.cs @@ -1,5 +1,6 @@ using System; using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Newtonsoft.Json; using Newtonsoft.Json.Linq; @@ -12,19 +13,24 @@ using Umbraco.Extensions; namespace Umbraco.Cms.Tests.Integration.NewBackoffice; -// We only run this test in release because the schema looks different depending if it's built against release or debug. -// XML summaries is included in the description of a response model in release, but not debug mode. -#if DEBUG -[Ignore("This test runs only in release")] -#endif [TestFixture] -public class OpenAPIContractTest : UmbracoTestServerTestBase +internal sealed class OpenAPIContractTest : UmbracoTestServerTestBase { - private GlobalSettings GlobalSettings => GetRequiredService>().Value; private IHostingEnvironment HostingEnvironment => GetRequiredService(); + protected override void CustomTestSetup(IUmbracoBuilder builder) + { + builder.AddMvcAndRazor(mvcBuilder => + { + // Adds Umbraco.Cms.ManagementApi + mvcBuilder.AddApplicationPart(typeof(ManagementApi.Controllers.Install.InstallControllerBase).Assembly); + }); + + new ManagementApi.ManagementApiComposer().Compose(builder); + } + [Test] public async Task Validate_OpenApi_Contract_is_implemented() { @@ -40,7 +46,6 @@ public class OpenAPIContractTest : UmbracoTestServerTestBase var mergedContract = JObject.Parse(generatedJsonString); var originalGeneratedContract = JObject.Parse(generatedJsonString); - mergedContract.Merge(apiContract, new JsonMergeSettings { MergeArrayHandling = MergeArrayHandling.Merge diff --git a/tests/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs b/tests/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs index 92909149d1..7488214611 100644 --- a/tests/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs +++ b/tests/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs @@ -19,9 +19,6 @@ using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; -using Umbraco.Cms.ManagementApi; -using Umbraco.Cms.ManagementApi.Configuration; -using Umbraco.Cms.ManagementApi.Controllers.Install; using Umbraco.Cms.Persistence.Sqlite; using Umbraco.Cms.Persistence.SqlServer; using Umbraco.Cms.Tests.Common.Testing; @@ -240,9 +237,6 @@ namespace Umbraco.Cms.Tests.Integration.TestServerTest // Adds Umbraco.Tests.Integration mvcBuilder.AddApplicationPart(typeof(UmbracoTestServerTestBase).Assembly); - - // Adds Umbraco.Tests.Integration - mvcBuilder.AddApplicationPart(typeof(InstallControllerBase).Assembly); }) .AddWebServer() .AddWebsite() @@ -250,8 +244,6 @@ namespace Umbraco.Cms.Tests.Integration.TestServerTest .AddUmbracoSqliteSupport() .AddTestServices(TestHelper); // This is the important one! - new ManagementApiComposer().Compose(builder); - CustomTestSetup(builder); builder.Build(); } diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj b/tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj index ae197047fe..d83e957ecf 100644 --- a/tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj +++ b/tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj @@ -1,5 +1,4 @@ - net6.0 Umbraco.Cms.Tests.Integration @@ -105,7 +104,7 @@ - + @@ -117,5 +116,4 @@ Designer -