Updated the package validation baseline version to 12.0.0 (#14389)

* Updated the package validation baseline version to 12 RC1

* Update PackageValidationBaselineVersion to 12.0.0 and remove CompatibilitySuppressions.xml files

* Clean up project files

---------

Co-authored-by: Ronald Barendse <ronald@barend.se>

Directory.Build.props

@@ -31,7 +31,7 @@
   <PropertyGroup>
     <GenerateCompatibilitySuppressionFile>false</GenerateCompatibilitySuppressionFile>
     <EnablePackageValidation>true</EnablePackageValidation>
-    <PackageValidationBaselineVersion>11.0.0</PackageValidationBaselineVersion>
+    <PackageValidationBaselineVersion>12.0.0</PackageValidationBaselineVersion>
     <EnableStrictModeForCompatibleFrameworksInPackage>true</EnableStrictModeForCompatibleFrameworksInPackage>
     <EnableStrictModeForCompatibleTfms>true</EnableStrictModeForCompatibleTfms>
   </PropertyGroup>

src/Umbraco.Cms.Api.Common/Umbraco.Cms.Api.Common.csproj

@@ -2,17 +2,18 @@
   <PropertyGroup>
     <Title>Umbraco CMS - API Common</Title>
     <Description>Contains the bits and pieces that are shared between the Umbraco CMS APIs.</Description>
-    <IsPackable>true</IsPackable>
-    <EnablePackageValidation>false</EnablePackageValidation>
-    <AssemblyName>Umbraco.Cms.Api.Common</AssemblyName>
-    <RootNamespace>Umbraco.Cms.Api.Common</RootNamespace>
   </PropertyGroup>
+
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
+  
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.8" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
     <PackageReference Include="OpenIddict.Abstractions" Version="4.5.0" />
     <PackageReference Include="OpenIddict.AspNetCore" Version="4.5.0" />
   </ItemGroup>
+  
   <ItemGroup>
     <ProjectReference Include="..\Umbraco.Cms.Persistence.EFCore.Sqlite\Umbraco.Cms.Persistence.EFCore.Sqlite.csproj" />
     <ProjectReference Include="..\Umbraco.Cms.Persistence.EFCore.SqlServer\Umbraco.Cms.Persistence.EFCore.SqlServer.csproj" />

src/Umbraco.Cms.Api.Delivery/Umbraco.Cms.Api.Delivery.csproj

@@ -2,14 +2,8 @@
   <PropertyGroup>
     <Title>Umbraco CMS - Delivery API</Title>
     <Description>Contains the presentation layer for the Umbraco CMS Delivery API.</Description>
-    <IsPackable>true</IsPackable>
-    <EnablePackageValidation>false</EnablePackageValidation>
-    <AssemblyName>Umbraco.Cms.Api.Delivery</AssemblyName>
-    <RootNamespace>Umbraco.Cms.Api.Delivery</RootNamespace>
-    <PackageId>Umbraco.Cms.Api.Delivery</PackageId>
   </PropertyGroup>
 
-
   <ItemGroup>
     <ProjectReference Include="..\Umbraco.Cms.Api.Common\Umbraco.Cms.Api.Common.csproj" />
     <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />

src/Umbraco.Cms.Imaging.ImageSharp2/Umbraco.Cms.Imaging.ImageSharp2.csproj

@@ -2,8 +2,6 @@
   <PropertyGroup>
     <Title>Umbraco CMS - Imaging - ImageSharp 2</Title>
     <Description>Adds imaging support using ImageSharp/ImageSharp.Web version 2 to Umbraco CMS.</Description>
-    <!-- TODO: Enable when final version is shipped (because there's currently no previous version) -->
-    <EnablePackageValidation>false</EnablePackageValidation>
   </PropertyGroup>
 
   <ItemGroup>

src/Umbraco.Cms.Persistence.EFCore.SqlServer/Umbraco.Cms.Persistence.EFCore.SqlServer.csproj

@@ -1,6 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Title>Umbraco CMS - EF Core - SqlServer migrations</Title>
+    <Title>Umbraco CMS - Persistence - Entity Framework Core - SQL Server migrations</Title>
+    <Description>Adds support for Entity Framework Core SQL Server migrations to Umbraco CMS.</Description>
     <!-- TODO: Enable when final version is shipped (because there's currently no previous version) -->
     <EnablePackageValidation>false</EnablePackageValidation>
   </PropertyGroup>

src/Umbraco.Cms.Persistence.EFCore.Sqlite/Umbraco.Cms.Persistence.EFCore.Sqlite.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Title>Umbraco CMS - EF Core - Sqlite migrations</Title>
+    <Title>Umbraco CMS - Persistence - Entity Framework Core - SQLite migrations</Title>
+    <Description>Adds support for Entity Framework Core SQLite migrations to Umbraco CMS.</Description>
     <!-- TODO: Enable when final version is shipped (because there's currently no previous version) -->
     <EnablePackageValidation>false</EnablePackageValidation>
   </PropertyGroup>

src/Umbraco.Cms.Persistence.EFCore/Umbraco.Cms.Persistence.EFCore.csproj

@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Title>Umbraco CMS - Persistence - EFCore</Title>
+    <Title>Umbraco CMS - Persistence - Entity Framework Core</Title>
-    <!-- TODO: Enable when final version is shipped (because there's currently no previous version) -->
+    <Description>Adds support for Entity Framework Core to Umbraco CMS.</Description>
-    <EnablePackageValidation>false</EnablePackageValidation>
   </PropertyGroup>
 
   <ItemGroup>
@@ -21,5 +20,4 @@
       <_Parameter1>Umbraco.Tests.Integration</_Parameter1>
     </AssemblyAttribute>
   </ItemGroup>
-
 </Project>

src/Umbraco.Cms.Targets/Umbraco.Cms.Targets.csproj

@@ -4,8 +4,6 @@
     <Description>Installs Umbraco CMS with minimal dependencies in your ASP.NET Core project.</Description>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <IncludeSymbols>false</IncludeSymbols>
-    <!-- TODO: Enable when final version is shipped (because there's currently no previous version) -->
-    <EnablePackageValidation>false</EnablePackageValidation>
   </PropertyGroup>
 
   <ItemGroup>

src/Umbraco.Core/CompatibilitySuppressions.xml

@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Umbraco.New.Cms.Core.Models.PagedModel`1</Target>
-    <Left>lib/net7.0/Umbraco.Core.dll</Left>
-    <Right>lib/net7.0/Umbraco.Core.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0005</DiagnosticId>
-    <Target>M:Umbraco.Cms.Core.Models.PublishedContent.PublishedPropertyBase.GetDeliveryApiValue(System.Boolean,System.String,System.String)</Target>
-    <Left>lib/net7.0/Umbraco.Core.dll</Left>
-    <Right>lib/net7.0/Umbraco.Core.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Umbraco.Cms.Core.Events.IEventAggregator.Publish``2(System.Collections.Generic.IEnumerable{``0})</Target>
-    <Left>lib/net7.0/Umbraco.Core.dll</Left>
-    <Right>lib/net7.0/Umbraco.Core.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Umbraco.Cms.Core.Events.IEventAggregator.PublishAsync``2(System.Collections.Generic.IEnumerable{``0},System.Threading.CancellationToken)</Target>
-    <Left>lib/net7.0/Umbraco.Core.dll</Left>
-    <Right>lib/net7.0/Umbraco.Core.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Umbraco.Cms.Core.Models.PublishedContent.IPublishedProperty.GetDeliveryApiValue(System.Boolean,System.String,System.String)</Target>
-    <Left>lib/net7.0/Umbraco.Core.dll</Left>
-    <Right>lib/net7.0/Umbraco.Core.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Umbraco.Cms.Core.Models.PublishedContent.IPublishedPropertyType.ConvertInterToDeliveryApiObject(Umbraco.Cms.Core.Models.PublishedContent.IPublishedElement,Umbraco.Cms.Core.PropertyEditors.PropertyCacheLevel,System.Object,System.Boolean,System.Boolean)</Target>
-    <Left>lib/net7.0/Umbraco.Core.dll</Left>
-    <Right>lib/net7.0/Umbraco.Core.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Umbraco.Cms.Core.Models.PublishedContent.IPublishedPropertyType.ConvertInterToDeliveryApiObject(Umbraco.Cms.Core.Models.PublishedContent.IPublishedElement,Umbraco.Cms.Core.PropertyEditors.PropertyCacheLevel,System.Object,System.Boolean)</Target>
-    <Left>lib/net7.0/Umbraco.Core.dll</Left>
-    <Right>lib/net7.0/Umbraco.Core.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>P:Umbraco.Cms.Core.Models.PublishedContent.IPublishedPropertyType.DeliveryApiCacheLevel</Target>
-    <Left>lib/net7.0/Umbraco.Core.dll</Left>
-    <Right>lib/net7.0/Umbraco.Core.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>P:Umbraco.Cms.Core.Scoping.ICoreScope.Locks</Target>
-    <Left>lib/net7.0/Umbraco.Core.dll</Left>
-    <Right>lib/net7.0/Umbraco.Core.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-</Suppressions>

src/Umbraco.Infrastructure/CompatibilitySuppressions.xml

@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Umbraco.Cms.Core.Cache.DistributedCacheBinder</Target>
-    <Left>lib/net7.0/Umbraco.Infrastructure.dll</Left>
-    <Right>lib/net7.0/Umbraco.Infrastructure.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Umbraco.Cms.Infrastructure.Migrations.PostMigrations.ClearCsrfCookies</Target>
-    <Left>lib/net7.0/Umbraco.Infrastructure.dll</Left>
-    <Right>lib/net7.0/Umbraco.Infrastructure.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Umbraco.Cms.Infrastructure.Migrations.PostMigrations.DeleteLogViewerQueryFile</Target>
-    <Left>lib/net7.0/Umbraco.Infrastructure.dll</Left>
-    <Right>lib/net7.0/Umbraco.Infrastructure.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Umbraco.Cms.Infrastructure.Migrations.PostMigrations.RebuildPublishedSnapshot</Target>
-    <Left>lib/net7.0/Umbraco.Infrastructure.dll</Left>
-    <Right>lib/net7.0/Umbraco.Infrastructure.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Umbraco.Extensions.DistributedCacheExtensions</Target>
-    <Left>lib/net7.0/Umbraco.Infrastructure.dll</Left>
-    <Right>lib/net7.0/Umbraco.Infrastructure.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Umbraco.Cms.Core.Migrations.IMigrationPlanExecutor.Execute(Umbraco.Cms.Infrastructure.Migrations.MigrationPlan,System.String)</Target>
-    <Left>lib/net7.0/Umbraco.Infrastructure.dll</Left>
-    <Right>lib/net7.0/Umbraco.Infrastructure.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Umbraco.Cms.Infrastructure.Migrations.IMigrationContext.AddPostMigration``1</Target>
-    <Left>lib/net7.0/Umbraco.Infrastructure.dll</Left>
-    <Right>lib/net7.0/Umbraco.Infrastructure.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Umbraco.Cms.Infrastructure.Migrations.MigrationPlan.AddPostMigration``1</Target>
-    <Left>lib/net7.0/Umbraco.Infrastructure.dll</Left>
-    <Right>lib/net7.0/Umbraco.Infrastructure.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Umbraco.Cms.Infrastructure.Migrations.MigrationPlan.get_PostMigrationTypes</Target>
-    <Left>lib/net7.0/Umbraco.Infrastructure.dll</Left>
-    <Right>lib/net7.0/Umbraco.Infrastructure.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Umbraco.Cms.Infrastructure.Migrations.MigrationPlanExecutor.Execute(Umbraco.Cms.Infrastructure.Migrations.MigrationPlan,System.String)</Target>
-    <Left>lib/net7.0/Umbraco.Infrastructure.dll</Left>
-    <Right>lib/net7.0/Umbraco.Infrastructure.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Umbraco.Cms.Infrastructure.Migrations.Upgrade.Upgrader.Execute(Umbraco.Cms.Core.Migrations.IMigrationPlanExecutor,Umbraco.Cms.Core.Scoping.IScopeProvider,Umbraco.Cms.Core.Services.IKeyValueService)</Target>
-    <Left>lib/net7.0/Umbraco.Infrastructure.dll</Left>
-    <Right>lib/net7.0/Umbraco.Infrastructure.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Umbraco.Cms.Core.Migrations.IMigrationPlanExecutor.ExecutePlan(Umbraco.Cms.Infrastructure.Migrations.MigrationPlan,System.String)</Target>
-    <Left>lib/net7.0/Umbraco.Infrastructure.dll</Left>
-    <Right>lib/net7.0/Umbraco.Infrastructure.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Umbraco.Cms.Infrastructure.Search.IUmbracoIndexingHandler.RemoveProtectedContent</Target>
-    <Left>lib/net7.0/Umbraco.Infrastructure.dll</Left>
-    <Right>lib/net7.0/Umbraco.Infrastructure.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0006</DiagnosticId>
-    <Target>P:Umbraco.Cms.Infrastructure.Examine.IUmbracoIndex.SupportProtectedContent</Target>
-    <Left>lib/net7.0/Umbraco.Infrastructure.dll</Left>
-    <Right>lib/net7.0/Umbraco.Infrastructure.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-</Suppressions>

src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj

@@ -3,7 +3,6 @@
     <PackageId>Umbraco.Cms.Web.BackOffice</PackageId>
     <Title>Umbraco CMS - Web - Backoffice</Title>
     <Description>Contains the backoffice assembly needed to run the backend of Umbraco CMS.</Description>
-    <OutputType>Library</OutputType>
     <RootNamespace>Umbraco.Cms.Web.BackOffice</RootNamespace>
   </PropertyGroup>
 

src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <RootNamespace>Umbraco.Cms.Web.UI</RootNamespace>
+    <IsPackable>false</IsPackable>
     <EnablePackageValidation>false</EnablePackageValidation>
   </PropertyGroup>
 

src/Umbraco.Web.Website/Umbraco.Web.Website.csproj

@@ -3,7 +3,6 @@
     <PackageId>Umbraco.Cms.Web.Website</PackageId>
     <Title>Umbraco CMS - Web - Website</Title>
     <Description>Contains the website assembly needed to run the frontend of Umbraco CMS.</Description>
-    <OutputType>Library</OutputType>
     <RootNamespace>Umbraco.Cms.Web.Website</RootNamespace>
   </PropertyGroup>
 

tests/Directory.Build.props

@@ -2,10 +2,15 @@
   <!-- Enable multi-level merging -->
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
 
+  <PropertyGroup>
+    <!-- Disable packaging and validation for test projects to fix benchmarks (that auto-generates boilerplate code) -->
+    <IsPackable>false</IsPackable>
+    <EnablePackageValidation>false</EnablePackageValidation>
+  </PropertyGroup>
+  
   <PropertyGroup>
     <!-- TODO: Update test projects to use nullable reference types and remove this to enable nullable warnings as errors (the solution default) -->
     <Nullable>annotations</Nullable>
-    <EnablePackageValidation>false</EnablePackageValidation>
   </PropertyGroup>
 
   <!-- Specify rule set for all test projects -->

tests/Umbraco.TestData/Umbraco.TestData.csproj

@@ -1,10 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <RootNamespace>Umbraco.TestData</RootNamespace>
-    <IsPackable>false</IsPackable>
-    <EnablePackageValidation>false</EnablePackageValidation>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Bogus" Version="34.0.2" />
   </ItemGroup>

tests/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj

@@ -1,9 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <IsPackable>false</IsPackable>
-    <EnablePackageValidation>false</EnablePackageValidation>
   </PropertyGroup>
 
   <ItemGroup>

tests/Umbraco.Tests.Common/Umbraco.Tests.Common.csproj

@@ -4,6 +4,7 @@
     <Title>Umbraco CMS - Test tools</Title>
     <Description>Contains commonly used tools to write tests for Umbraco CMS, such as various builders for content etc.</Description>
     <RootNamespace>Umbraco.Cms.Tests.Common</RootNamespace>
+    <IsPackable>true</IsPackable>
     <EnablePackageValidation>true</EnablePackageValidation>
   </PropertyGroup>
 

tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj

@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <IsTestProject>true</IsTestProject>
     <PackageId>Umbraco.Cms.Tests.Integration</PackageId>
     <Title>Umbraco CMS - Integration tests</Title>
     <Description>Contains helper classes for integration tests with Umbraco CMS, including all internal integration tests.</Description>
-    <IsPackable>true</IsPackable>
-    <IsTestProject>true</IsTestProject>
     <RootNamespace>Umbraco.Cms.Tests.Integration</RootNamespace>
+    <IsPackable>true</IsPackable>
     <EnablePackageValidation>true</EnablePackageValidation>
   </PropertyGroup>
 

tests/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj

@@ -2,8 +2,6 @@
   <PropertyGroup>
     <IsTestProject>true</IsTestProject>
     <RootNamespace>Umbraco.Cms.Tests.UnitTests</RootNamespace>
-    <IsPackable>false</IsPackable>
-    <EnablePackageValidation>false</EnablePackageValidation>
   </PropertyGroup>
 
   <ItemGroup>