Skip to content

Commit 9c038bc

Browse files
authored
Re-enable package validation (#20964)
* Re-enable package validation. * Remove unnecessary supressions file. * Removed unnecessary suppressions. * Restored and obsoleted all overload.
1 parent f44e932 commit 9c038bc

File tree

5 files changed

+44
-14
lines changed

5 files changed

+44
-14
lines changed

Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
<!-- Package Validation -->
4141
<PropertyGroup>
4242
<GenerateCompatibilitySuppressionFile>false</GenerateCompatibilitySuppressionFile>
43-
<EnablePackageValidation>false</EnablePackageValidation> <!-- TODO (V17): Set to true with version 17.0.0 once this version is released. -->
44-
<PackageValidationBaselineVersion>16.0.0</PackageValidationBaselineVersion>
43+
<EnablePackageValidation>true</EnablePackageValidation>
44+
<PackageValidationBaselineVersion>17.0.0</PackageValidationBaselineVersion>
4545
<EnableStrictModeForCompatibleFrameworksInPackage>true</EnableStrictModeForCompatibleFrameworksInPackage>
4646
<EnableStrictModeForCompatibleTfms>true</EnableStrictModeForCompatibleTfms>
4747
</PropertyGroup>

src/Umbraco.Cms.Api.Management/Controllers/MemberType/CopyMemberTypeController.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@ public class CopyMemberTypeController : MemberTypeControllerBase
2020
public CopyMemberTypeController(IMemberTypeService memberTypeService)
2121
=> _memberTypeService = memberTypeService;
2222

23+
[Obsolete("Please use the overload that includes all parameters. Scheduled for removal in Umbraco 19.")]
24+
[NonAction]
25+
public async Task<IActionResult> Copy(
26+
CancellationToken cancellationToken,
27+
Guid id) => await Copy(cancellationToken, id, null);
28+
2329
[HttpPost("{id:guid}/copy")]
2430
[MapToApiVersion("1.0")]
2531
[ProducesResponseType(StatusCodes.Status201Created)]
Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
3-
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
4-
<Suppression>
5-
<DiagnosticId>CP0002</DiagnosticId>
6-
<Target>M:Umbraco.Cms.Core.Configuration.Models.ContentSettings.get_Error404Collection</Target>
7-
<Left>lib/net9.0/Umbraco.Core.dll</Left>
8-
<Right>lib/net9.0/Umbraco.Core.dll</Right>
9-
<IsBaselineSuppression>true</IsBaselineSuppression>
10-
</Suppression>
11-
</Suppressions>
3+
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" />
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
3+
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
4+
<Suppression>
5+
<DiagnosticId>CP0002</DiagnosticId>
6+
<Target>M:Umbraco.Cms.Tests.Common.Builders.TemplateBuilder.CreateTextPageTemplate(System.String)</Target>
7+
<Left>lib/net10.0/Umbraco.Tests.Common.dll</Left>
8+
<Right>lib/net10.0/Umbraco.Tests.Common.dll</Right>
9+
<IsBaselineSuppression>true</IsBaselineSuppression>
10+
</Suppression>
11+
</Suppressions>
Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,32 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
33
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
4+
<Suppression>
5+
<DiagnosticId>CP0001</DiagnosticId>
6+
<Target>T:Umbraco.Cms.Tests.Integration.ManagementApi.DocumentType.Root.ChildrenDocumentTypeTreeControllerTests</Target>
7+
<Left>lib/net10.0/Umbraco.Tests.Integration.dll</Left>
8+
<Right>lib/net10.0/Umbraco.Tests.Integration.dll</Right>
9+
<IsBaselineSuppression>true</IsBaselineSuppression>
10+
</Suppression>
11+
<Suppression>
12+
<DiagnosticId>CP0001</DiagnosticId>
13+
<Target>T:Umbraco.Cms.Tests.Integration.ManagementApi.DocumentType.Root.RootDocumentTypeTreeControllerTests</Target>
14+
<Left>lib/net10.0/Umbraco.Tests.Integration.dll</Left>
15+
<Right>lib/net10.0/Umbraco.Tests.Integration.dll</Right>
16+
<IsBaselineSuppression>true</IsBaselineSuppression>
17+
</Suppression>
18+
<Suppression>
19+
<DiagnosticId>CP0002</DiagnosticId>
20+
<Target>M:Umbraco.Cms.Tests.Integration.Umbraco.Examine.Lucene.UmbracoExamine.IndexInitializer.#ctor(Umbraco.Cms.Core.Strings.IShortStringHelper,Umbraco.Cms.Core.PropertyEditors.PropertyEditorCollection,Umbraco.Cms.Core.PropertyEditors.MediaUrlGeneratorCollection,Umbraco.Cms.Core.Scoping.IScopeProvider,Microsoft.Extensions.Logging.ILoggerFactory,Microsoft.Extensions.Options.IOptions{Umbraco.Cms.Core.Configuration.Models.ContentSettings},Umbraco.Cms.Core.Services.ILocalizationService,Umbraco.Cms.Core.Services.IContentTypeService,Umbraco.Cms.Core.Services.IDocumentUrlService,Umbraco.Cms.Core.Services.ILanguageService)</Target>
21+
<Left>lib/net10.0/Umbraco.Tests.Integration.dll</Left>
22+
<Right>lib/net10.0/Umbraco.Tests.Integration.dll</Right>
23+
<IsBaselineSuppression>true</IsBaselineSuppression>
24+
</Suppression>
425
<Suppression>
526
<DiagnosticId>CP0002</DiagnosticId>
6-
<Target>M:Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services.ContentEditingServiceTests.Updating_Single_Variant_Name_Does_Not_Change_Update_Dates_Of_Other_Vaiants</Target>
7-
<Left>lib/net9.0/Umbraco.Tests.Integration.dll</Left>
8-
<Right>lib/net9.0/Umbraco.Tests.Integration.dll</Right>
27+
<Target>M:Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services.ContentEditingServiceTests.Relate(Umbraco.Cms.Core.Models.IContent,Umbraco.Cms.Core.Models.IContent)</Target>
28+
<Left>lib/net10.0/Umbraco.Tests.Integration.dll</Left>
29+
<Right>lib/net10.0/Umbraco.Tests.Integration.dll</Right>
930
<IsBaselineSuppression>true</IsBaselineSuppression>
1031
</Suppression>
1132
</Suppressions>

0 commit comments

Comments
 (0)