From 30210f5de51ad3c5bca552d692101c05e859fba2 Mon Sep 17 00:00:00 2001
From: Ronald Barendse <ronald@barend.se>
Date: Tue, 2 Aug 2022 12:02:46 +0200
Subject: [PATCH 1/2] Enable package validation

---
 src/Directory.Build.props                | 8 ++++++++
 src/JsonSchema/JsonSchema.csproj         | 2 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index b7d39cc6f5..ce54e08edd 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -42,4 +42,12 @@
   <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
   </PropertyGroup>
+
+  <!-- Package Validation -->
+  <PropertyGroup>
+    <EnablePackageValidation>true</EnablePackageValidation>
+    <PackageValidationBaselineVersion>10.0.0</PackageValidationBaselineVersion>
+    <EnableStrictModeForCompatibleFrameworksInPackage>true</EnableStrictModeForCompatibleFrameworksInPackage>
+    <EnableStrictModeForCompatibleTfms>true</EnableStrictModeForCompatibleTfms>
+  </PropertyGroup>
 </Project>
diff --git a/src/JsonSchema/JsonSchema.csproj b/src/JsonSchema/JsonSchema.csproj
index 5ab8db1d99..ea0ce9b7c3 100644
--- a/src/JsonSchema/JsonSchema.csproj
+++ b/src/JsonSchema/JsonSchema.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IsPackable>false</IsPackable>
+    <EnablePackageValidation>false</EnablePackageValidation>
   </PropertyGroup>
 
     <ItemGroup>
@@ -34,5 +35,4 @@
     </ItemGroup>
     <Copy SourceFiles="@(PackageReferenceFiles)" DestinationFolder="$(OutDir)" />
   </Target>
-
 </Project>
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 5f067d8a9d..cf86519c8e 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Umbraco.Cms.Web.UI</RootNamespace>
+    <EnablePackageValidation>false</EnablePackageValidation>
   </PropertyGroup>
 
   <Import Project="..\Umbraco.Cms\buildTransitive\Umbraco.Cms.props" />

From 47c1f7b22b902a6826979d09894821c08cd9161d Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 2 Aug 2022 13:39:21 +0200
Subject: [PATCH 2/2] Added CompatibilitySuppressions.xml to Examine.Lucene
 project

---
 .../CompatibilitySuppressions.xml                      | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 src/Umbraco.Examine.Lucene/CompatibilitySuppressions.xml

diff --git a/src/Umbraco.Examine.Lucene/CompatibilitySuppressions.xml b/src/Umbraco.Examine.Lucene/CompatibilitySuppressions.xml
new file mode 100644
index 0000000000..681c7cdab5
--- /dev/null
+++ b/src/Umbraco.Examine.Lucene/CompatibilitySuppressions.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Suppression>
+    <DiagnosticId>CP0008</DiagnosticId>
+    <Target>T:Umbraco.Cms.Infrastructure.Examine.UmbracoContentIndex</Target>
+    <Left>lib/net6.0/Umbraco.Examine.Lucene.dll</Left>
+    <Right>lib/net6.0/Umbraco.Examine.Lucene.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+</Suppressions>
\ No newline at end of file