From 2fd3f8ca3b72f3ca2d511b1671a91501c4212eec Mon Sep 17 00:00:00 2001
From: Arooshi Avasthy <aavasthy@microsoft.com>
Date: Tue, 29 Oct 2024 23:30:47 -0700
Subject: [PATCH] Update targets file to ensure newtonsoft update can cater to
 more scenarios.

---
 .../src/Microsoft.Azure.Cosmos.targets        | 42 +++++++++++++++----
 1 file changed, 35 insertions(+), 7 deletions(-)

diff --git a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
index 5fa5bd68f7..6f7765dbf8 100644
--- a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
+++ b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
@@ -55,16 +55,44 @@ Copyright (C) Microsoft Corporation. All rights reserved.
   </ItemGroup>
 
 
-  <!-- Add check for Newtonsoft.Json package in cosnumer app.  -->
-  <Target Name="CheckNewtonsoftJsonVersion" BeforeTargets="CoreCompile" Condition="'$(ExcludeRestorePackageImports)' != 'true'">
-
+  <!-- Add check for Newtonsoft.Json package in consumer app.  -->
+  <Target Name="CheckNewtonsoftJsonPresence" BeforeTargets="CoreCompile" Condition="'$(ExcludeRestorePackageImports)' != 'true'">
+  
+    <!-- Allow consumers to disable this check -->
+    <PropertyGroup>
+        <DisableNewtonsoftJsonCheck Condition="'$(DisableNewtonsoftJsonCheck)' == ''">false</DisableNewtonsoftJsonCheck>
+    </PropertyGroup>
+    
+    <!-- Check for PackageReference to Newtonsoft.Json -->
     <ItemGroup>
         <NewtonsoftJsonPackageReference Include="@(PackageReference)" Condition="'%(PackageReference.Identity)' == 'Newtonsoft.Json'" />
     </ItemGroup>
-    <!-- If Newtonsoft.Json is not referenced, fail the build -->
-    <Error Text="The Newtonsoft.Json package must be explicitly referenced with version >= 10.0.2."
-        Condition="'@(NewtonsoftJsonPackageReference)' == ''" />
-
+    
+    <!-- Check for assembly references to Newtonsoft.Json (including transitive dependencies) -->
+    <ItemGroup>
+        <NewtonsoftJsonAssemblyReference Include="@(ReferencePath)" Condition="'%(FileName)' == 'Newtonsoft.Json'" />
+    </ItemGroup>
+    
+    <!-- Check for Newtonsoft.Json in packages.config -->
+    <PropertyGroup>
+        <PackagesConfigPath>packages.config</PackagesConfigPath>
+        <NewtonsoftJsonInPackagesConfig>false</NewtonsoftJsonInPackagesConfig>
+    </PropertyGroup>
+    
+    <XmlPeek Condition="Exists('$(PackagesConfigPath)')"
+         XmlInputPath="$(PackagesConfigPath)"
+         Query="/packages/package[@id='Newtonsoft.Json']">
+        <Output TaskParameter="Result" PropertyName="NewtonsoftJsonPackagesConfigResult" />
+    </XmlPeek>
+    
+    <PropertyGroup>
+        <NewtonsoftJsonInPackagesConfig Condition="'$(NewtonsoftJsonPackagesConfigResult)' != ''">true</NewtonsoftJsonInPackagesConfig>
+    </PropertyGroup>
+    
+    <!-- Produce an error if Newtonsoft.Json is not found and the check is not disabled -->
+    <Error Text="The Newtonsoft.Json package must be explicitly referenced with version >= 10.0.2. Please add a reference to Newtonsoft.Json, or set the 'DisableNewtonsoftJsonCheck' property to 'true' to bypass this check."
+           Condition="'$(DisableNewtonsoftJsonCheck)' != 'true' and '@(NewtonsoftJsonPackageReference)' == '' and '@(NewtonsoftJsonAssemblyReference)' == '' and '$(NewtonsoftJsonInPackagesConfig)' != 'true'" />
+  
   </Target>
 
 </Project>
\ No newline at end of file