From 5dd4c0ac9ef566e75f00f1369986186e7960dcbf Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Thu, 10 Mar 2022 16:12:43 -0800
Subject: [PATCH] On run package validation for CSProj-built packages

This fixes an issue where a non-CSProj built package would load
MS.CA.dll , then a CSProj would try to load MS.CA.CS.dll of a different
version and it's MS.CA types would not agree with those already bound
to the task from previous load.

Further details:
https://github.com/dotnet/sdk/pull/22277
---
 eng/packaging.targets                                    | 9 ++++-----
 .../pkg/runtime.native.System.IO.Ports.proj              | 2 --
 .../pkg/runtime.native.System.IO.Ports.props             | 2 --
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/eng/packaging.targets b/eng/packaging.targets
index 32b96187eed74..d3d94a98fa7a0 100644
--- a/eng/packaging.targets
+++ b/eng/packaging.targets
@@ -2,12 +2,11 @@
 
   <PropertyGroup>
     <!--
-      Package validation causes flaky errors during the build. Validation isn't useful during
-      source-build (it is only a guardrail for devs), so disable it during source-build to avoid the
-      impact on build reliability. https://github.com/dotnet/runtime/issues/60883 tracks fixing the
-      flakiness and removing this condition.
+      Disable PackageValidation for non-CSProj since those will load only one roslyn assembly of the wrong
+      version causing the task to be in torn-state.  See https://github.com/dotnet/runtime/pull/61697.
+      https://github.com/dotnet/runtime/issues/60883 tracks fixing this in 6.0 and removing this condition.
     -->
-    <EnablePackageValidation Condition="'$(DotNetBuildFromSource)' != 'true'">true</EnablePackageValidation>
+    <EnablePackageValidation Condition="'$(MSBuildProjectExtension)' == '.csproj'">true</EnablePackageValidation>
     <!-- Don't restore prebuilt packages during sourcebuild. -->
     <DisablePackageBaselineValidation Condition="'$(DotNetBuildFromSource)' == 'true'">true</DisablePackageBaselineValidation>
     <PackageValidationBaselineVersion Condition="'$(PackageValidationBaselineVersion)' == ''">6.0.0</PackageValidationBaselineVersion>
diff --git a/src/libraries/System.IO.Ports/pkg/runtime.native.System.IO.Ports.proj b/src/libraries/System.IO.Ports/pkg/runtime.native.System.IO.Ports.proj
index ff96f2f4fca13..86043b1f0aa51 100644
--- a/src/libraries/System.IO.Ports/pkg/runtime.native.System.IO.Ports.proj
+++ b/src/libraries/System.IO.Ports/pkg/runtime.native.System.IO.Ports.proj
@@ -6,8 +6,6 @@
     <NoTargetsDoNotReferenceOutputAssemblies>false</NoTargetsDoNotReferenceOutputAssemblies>
     <!-- This is a meta package and doesn't contain any libs. -->
     <NoWarn>$(NoWarn);NU5128</NoWarn>
-    <!-- It doesn't make sense to run package validation on native packages -->
-    <EnablePackageValidation>false</EnablePackageValidation>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/libraries/System.IO.Ports/pkg/runtime.native.System.IO.Ports.props b/src/libraries/System.IO.Ports/pkg/runtime.native.System.IO.Ports.props
index 4824f36ff0a4b..dd4aff2fd0e45 100644
--- a/src/libraries/System.IO.Ports/pkg/runtime.native.System.IO.Ports.props
+++ b/src/libraries/System.IO.Ports/pkg/runtime.native.System.IO.Ports.props
@@ -13,8 +13,6 @@
     <UseRuntimePackageDisclaimer>true</UseRuntimePackageDisclaimer>
     <!-- This is a native package and doesn't contain any ref/lib assets. -->
     <NoWarn>$(NoWarn);NU5128</NoWarn>
-    <!-- It doesn't make sense to run package validation on native packages -->
-    <EnablePackageValidation>false</EnablePackageValidation>
   </PropertyGroup>
 
   <ItemGroup>