Fixed issues with package validation.

umbraco · Oct 26, 2022 · 0e2b8d1 · 0e2b8d1
1 parent b244a56
commit 0e2b8d1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 96 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -25,8 +25,9 @@
 
   <!-- Package Validation -->
   <PropertyGroup>
-    <EnablePackageValidation>true</EnablePackageValidation>
-    <PackageValidationBaselineVersion>10.0.0</PackageValidationBaselineVersion>
+    <!-- TODO: enable once we have 11.0.0 released -->
+    <EnablePackageValidation>false</EnablePackageValidation>
+    <PackageValidationBaselineVersion>11.0.0</PackageValidationBaselineVersion>
     <EnableStrictModeForCompatibleFrameworksInPackage>true</EnableStrictModeForCompatibleFrameworksInPackage>
     <EnableStrictModeForCompatibleTfms>true</EnableStrictModeForCompatibleTfms>
   </PropertyGroup>

diff --git a/src/Umbraco.Deploy.Contrib/CompatibilitySuppressions.xml b/src/Umbraco.Deploy.Contrib/CompatibilitySuppressions.xml
@@ -1,94 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Suppressions xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <Suppression>
-    <DiagnosticId>CP0007</DiagnosticId>
-    <Target>T:Umbraco.Deploy.Contrib.ValueConnectors.BlockEditorValueConnector</Target>
-    <Left>lib/net6.0/Umbraco.Deploy.Contrib.dll</Left>
-    <Right>lib/net6.0/Umbraco.Deploy.Contrib.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Umbraco.Deploy.Contrib.ValueConnectors.BlockEditorValueConnector</Target>
-    <Left>lib/net6.0/Umbraco.Deploy.Contrib.dll</Left>
-    <Right>lib/net6.0/Umbraco.Deploy.Contrib.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Umbraco.Deploy.Contrib.ValueConnectors.BlockEditorValueConnector.ToArtifact(System.Object,Umbraco.Cms.Core.Models.IPropertyType,System.Collections.Generic.ICollection{Umbraco.Cms.Core.Deploy.ArtifactDependency})</Target>
-    <Left>lib/net6.0/Umbraco.Deploy.Contrib.dll</Left>
-    <Right>lib/net6.0/Umbraco.Deploy.Contrib.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Umbraco.Deploy.Contrib.ValueConnectors.BlockEditorValueConnector.FromArtifact(System.String,Umbraco.Cms.Core.Models.IPropertyType,System.Object)</Target>
-    <Left>lib/net6.0/Umbraco.Deploy.Contrib.dll</Left>
-    <Right>lib/net6.0/Umbraco.Deploy.Contrib.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Umbraco.Deploy.Contrib.ValueConnectors.BlockListValueConnector</Target>
-    <Left>lib/net6.0/Umbraco.Deploy.Contrib.dll</Left>
-    <Right>lib/net6.0/Umbraco.Deploy.Contrib.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0007</DiagnosticId>
-    <Target>T:Umbraco.Deploy.Contrib.ValueConnectors.MultiUrlPickerValueConnector</Target>
-    <Left>lib/net6.0/Umbraco.Deploy.Contrib.dll</Left>
-    <Right>lib/net6.0/Umbraco.Deploy.Contrib.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Umbraco.Deploy.Contrib.ValueConnectors.MultiUrlPickerValueConnector</Target>
-    <Left>lib/net6.0/Umbraco.Deploy.Contrib.dll</Left>
-    <Right>lib/net6.0/Umbraco.Deploy.Contrib.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Umbraco.Deploy.Contrib.ValueConnectors.MultiUrlPickerValueConnector.ToArtifact(System.Object,Umbraco.Cms.Core.Models.IPropertyType,System.Collections.Generic.ICollection{Umbraco.Cms.Core.Deploy.ArtifactDependency})</Target>
-    <Left>lib/net6.0/Umbraco.Deploy.Contrib.dll</Left>
-    <Right>lib/net6.0/Umbraco.Deploy.Contrib.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Umbraco.Deploy.Contrib.ValueConnectors.MultiUrlPickerValueConnector.FromArtifact(System.String,Umbraco.Cms.Core.Models.IPropertyType,System.Object)</Target>
-    <Left>lib/net6.0/Umbraco.Deploy.Contrib.dll</Left>
-    <Right>lib/net6.0/Umbraco.Deploy.Contrib.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0007</DiagnosticId>
-    <Target>T:Umbraco.Deploy.Contrib.ValueConnectors.NestedContentValueConnector</Target>
-    <Left>lib/net6.0/Umbraco.Deploy.Contrib.dll</Left>
-    <Right>lib/net6.0/Umbraco.Deploy.Contrib.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0008</DiagnosticId>
-    <Target>T:Umbraco.Deploy.Contrib.ValueConnectors.NestedContentValueConnector</Target>
-    <Left>lib/net6.0/Umbraco.Deploy.Contrib.dll</Left>
-    <Right>lib/net6.0/Umbraco.Deploy.Contrib.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Umbraco.Deploy.Contrib.ValueConnectors.NestedContentValueConnector.ToArtifact(System.Object,Umbraco.Cms.Core.Models.IPropertyType,System.Collections.Generic.ICollection{Umbraco.Cms.Core.Deploy.ArtifactDependency})</Target>
-    <Left>lib/net6.0/Umbraco.Deploy.Contrib.dll</Left>
-    <Right>lib/net6.0/Umbraco.Deploy.Contrib.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Umbraco.Deploy.Contrib.ValueConnectors.NestedContentValueConnector.FromArtifact(System.String,Umbraco.Cms.Core.Models.IPropertyType,System.Object)</Target>
-    <Left>lib/net6.0/Umbraco.Deploy.Contrib.dll</Left>
-    <Right>lib/net6.0/Umbraco.Deploy.Contrib.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-</Suppressions>
+</Suppressions>
diff --git a/tests/Umbraco.Deploy.Contrib.Tests/Umbraco.Deploy.Contrib.Tests.csproj b/tests/Umbraco.Deploy.Contrib.Tests/Umbraco.Deploy.Contrib.Tests.csproj
@@ -8,7 +8,7 @@
   <ItemGroup>
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-    <PackageReference Include="Umbraco.Cms.Tests" Version="10.1.0" />
+    <PackageReference Include="Umbraco.Cms.Tests" Version="11.0.0-rc1" />
   </ItemGroup>
 
   <ItemGroup>