From f8e5205aa730f2023dbd79f8704c88e2d6890bd6 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 24 Mar 2023 08:40:51 +0100
Subject: [PATCH] Reverse the EnablePackageValidation in tests, so it is
 explicity opt-in. Otherwise the generated csproj file in Benchmarks will
 always fail (#14004)

---
 tests/Directory.Build.props                                    | 3 ++-
 tests/Umbraco.Tests.Common/Umbraco.Tests.Common.csproj         | 1 +
 .../Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
index 9768d3ee8e..a773c6a1c9 100644
--- a/tests/Directory.Build.props
+++ b/tests/Directory.Build.props
@@ -5,8 +5,9 @@
   <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 -->
   <PropertyGroup>
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)codeanalysis.ruleset</CodeAnalysisRuleSet>
diff --git a/tests/Umbraco.Tests.Common/Umbraco.Tests.Common.csproj b/tests/Umbraco.Tests.Common/Umbraco.Tests.Common.csproj
index 915c255e84..214840604e 100644
--- a/tests/Umbraco.Tests.Common/Umbraco.Tests.Common.csproj
+++ b/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>
+    <EnablePackageValidation>true</EnablePackageValidation>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj b/tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj
index bdcaeff60d..8159420040 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj
@@ -6,6 +6,7 @@
     <IsPackable>true</IsPackable>
     <IsTestProject>true</IsTestProject>
     <RootNamespace>Umbraco.Cms.Tests.Integration</RootNamespace>
+    <EnablePackageValidation>true</EnablePackageValidation>
   </PropertyGroup>
 
   <ItemGroup>