From 58abd9b32520c00fa2c9ba77db84e814c619bf74 Mon Sep 17 00:00:00 2001
From: "Arooshi Avasthy (from Dev Box)" <aavasthy@microsoft.com>
Date: Fri, 11 Oct 2024 00:23:30 -0700
Subject: [PATCH 01/22] Add target build for Newtonsoft package

---
 ...ft.Azure.Cosmos.PackageDependencies.targets | 18 ++++++++++++++++++
 .../src/Microsoft.Azure.Cosmos.csproj          |  3 ++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.PackageDependencies.targets

diff --git a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.PackageDependencies.targets b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.PackageDependencies.targets
new file mode 100644
index 0000000000..9115595805
--- /dev/null
+++ b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.PackageDependencies.targets
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+***********************************************************************************************
+Microsoft.Azure.Cosmos.PackageDependencies.targets
+
+Includes managed dependencies for internal use in the .NET SDK
+
+Copyright (C) Microsoft Corporation. All rights reserved.
+***********************************************************************************************
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <!-- Add the Newtonsoft.Json dependency as a private asset -->
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.2" PrivateAssets="all">
+      <NoWarn>NU1903</NoWarn>
+    </PackageReference>
+  </ItemGroup>
+</Project>
diff --git a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
index bfe90ace04..108d23d70a 100644
--- a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
+++ b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
@@ -118,7 +118,6 @@
 		<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
 		<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.0.0" />
 		<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="16.0.102" PrivateAssets="All" />
-		<PackageReference Include="Newtonsoft.Json" Version="10.0.2" NoWarn="NU1903" />
 		<PackageReference Include="System.Net.Http" Version="4.3.4" />
 		<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
 		<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
@@ -134,6 +133,8 @@
 		<PackageReference Include="System.ValueTuple" Version="4.5.0" />
 		<PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.0" />
 	</ItemGroup>
+	
+	<Import Project="$(MSBuildThisFileDirectory)\Microsoft.Azure.Cosmos.PackageDependencies.targets" Condition="Exists('$(MSBuildThisFileDirectory)\Microsoft.Azure.Cosmos.PackageDependencies.targets')" />
 
 	<ItemGroup Condition=" '$(ProjectRef)' != 'True' ">
 		<None Include="$(OutputPath)\Cosmos.CRTCompat.dll" Pack="true" IsAssembly="true" PackagePath="runtimes\win-x64\native" />

From dfde42cd30df43b743c1c618cd039bd245cacc8e Mon Sep 17 00:00:00 2001
From: Arooshi Avasthy <aavasthy@microsoft.com>
Date: Fri, 11 Oct 2024 10:24:47 -0700
Subject: [PATCH 02/22] Ensure project reference has newtonsoft but nuget
 reference doesnt.

---
 ...oft.Azure.Cosmos.PackageDependencies.targets | 17 +++++++++++------
 .../src/Microsoft.Azure.Cosmos.csproj           |  4 ++++
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.PackageDependencies.targets b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.PackageDependencies.targets
index 9115595805..b240ca5b32 100644
--- a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.PackageDependencies.targets
+++ b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.PackageDependencies.targets
@@ -9,10 +9,15 @@ Copyright (C) Microsoft Corporation. All rights reserved.
 ***********************************************************************************************
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <!-- Add the Newtonsoft.Json dependency as a private asset -->
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.2" PrivateAssets="all">
-      <NoWarn>NU1903</NoWarn>
-    </PackageReference>
-  </ItemGroup>
+	<!-- Include Newtonsoft.Json for internal project references -->
+	<ItemGroup Condition=" '$(SdkProjectRef)' == 'True' ">
+		<PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
+	</ItemGroup>
+	
+	<!-- Use PrivateAssets for external consumers via NuGet -->
+	<ItemGroup Condition=" '$(SdkProjectRef)' != 'True' ">
+		<PackageReference Include="Newtonsoft.Json" Version="10.0.2" PrivateAssets="all">
+			<NoWarn>NU1903</NoWarn>
+		</PackageReference>
+	</ItemGroup>
 </Project>
diff --git a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
index 108d23d70a..f837cdcfd5 100644
--- a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
+++ b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
@@ -44,6 +44,10 @@
 		<LangVersion>$(LangVersion)</LangVersion>
 		<PackageLicenseFile>LICENSE</PackageLicenseFile>
 	</PropertyGroup>
+	
+	<PropertyGroup Condition=" '$(ProjectReference)' == 'true' ">
+		<SdkProjectRef>True</SdkProjectRef>
+	</PropertyGroup>
 
 	<ItemGroup>
 		<None Include="..\..\LICENSE" Pack="true" PackagePath="" Visible="false" />

From 69bf9aae165b9c6d8884eab5a94ed1f461884655 Mon Sep 17 00:00:00 2001
From: Arooshi Avasthy <aavasthy@microsoft.com>
Date: Mon, 14 Oct 2024 14:44:32 -0700
Subject: [PATCH 03/22] Update code to ensure that newtonsoft package is
 available at runtime for consumer apps.

---
 ...ft.Azure.Cosmos.PackageDependencies.targets | 18 +++++++++++++++---
 .../src/Microsoft.Azure.Cosmos.csproj          |  1 +
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.PackageDependencies.targets b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.PackageDependencies.targets
index b240ca5b32..999f2ed5d8 100644
--- a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.PackageDependencies.targets
+++ b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.PackageDependencies.targets
@@ -9,15 +9,27 @@ Copyright (C) Microsoft Corporation. All rights reserved.
 ***********************************************************************************************
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<!-- Include Newtonsoft.Json for internal project references -->
+
+	<!-- Handle Newtonsoft.Json for internal project references -->
 	<ItemGroup Condition=" '$(SdkProjectRef)' == 'True' ">
 		<PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
 	</ItemGroup>
-	
-	<!-- Use PrivateAssets for external consumers via NuGet -->
+
+	<!-- Prevent Newtonsoft.Json from propagating to external consumers -->
 	<ItemGroup Condition=" '$(SdkProjectRef)' != 'True' ">
 		<PackageReference Include="Newtonsoft.Json" Version="10.0.2" PrivateAssets="all">
 			<NoWarn>NU1903</NoWarn>
 		</PackageReference>
 	</ItemGroup>
+
+	<Target Name="CopyNewtonsoftJsonToOutput" AfterTargets="Build">
+		<PropertyGroup>
+			<NewtonsoftJsonDll>$(NuGetPackageRoot)newtonsoft.json\10.0.2\lib\netstandard2.0\Newtonsoft.Json.dll</NewtonsoftJsonDll>
+			<ConsumerOutputPath>$(TargetDir)</ConsumerOutputPath>
+		</PropertyGroup>
+
+		<Copy SourceFiles="$(NewtonsoftJsonDll)"
+			  DestinationFolder="$(ConsumerOutputPath)"
+			  Condition="Exists('$(NewtonsoftJsonDll)') AND '$(ConsumerOutputPath)' != ''" />
+	</Target>
 </Project>
diff --git a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
index f837cdcfd5..6619f94bb9 100644
--- a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
+++ b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
@@ -146,6 +146,7 @@
 		<None Include="$(OutputPath)\vcruntime140_1.dll" Pack="true" IsAssembly="true" PackagePath="runtimes\win-x64\native" />
 		<None Include="$(OutputPath)\vcruntime140.dll" Pack="true" IsAssembly="true" PackagePath="runtimes\win-x64\native" />
 		<None Include="$(OutputPath)\msvcp140.dll" Pack="true" IsAssembly="true" PackagePath="runtimes\win-x64\native" />
+		<None Include="$(NuGetPackageRoot)\newtonsoft.json\10.0.2\lib\net20\Newtonsoft.Json.dll" Pack="true" IsAssembly="true" PackagePath="lib\netstandard2.0" />
 		<None Include="$(NugetPackageRoot)\Microsoft.HybridRow\$(HybridRowVersion)\lib\netstandard2.0\Microsoft.Azure.Cosmos.Core.dll" Pack="true" IsAssembly="true" PackagePath="lib\netstandard2.0" />
 		<None Include="$(NugetPackageRoot)\Microsoft.HybridRow\$(HybridRowVersion)\lib\netstandard2.0\Microsoft.Azure.Cosmos.Serialization.HybridRow.dll" Pack="true" IsAssembly="true" PackagePath="lib\netstandard2.0" />
 		<None Include="$(NugetPackageRoot)\Microsoft.Azure.Cosmos.Direct\$(DirectVersion)\lib\netstandard2.0\Microsoft.Azure.Cosmos.Direct.dll" Pack="true" IsAssembly="true" PackagePath="lib\netstandard2.0" />

From 83ccc4b5f729b0a19213c0e70e5bf481e575160f Mon Sep 17 00:00:00 2001
From: Arooshi Avasthy <aavasthy@microsoft.com>
Date: Mon, 14 Oct 2024 15:03:34 -0700
Subject: [PATCH 04/22] Code cleanup.

---
 .../Microsoft.Azure.Cosmos.PackageDependencies.targets   | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.PackageDependencies.targets b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.PackageDependencies.targets
index 999f2ed5d8..fc85f48b8c 100644
--- a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.PackageDependencies.targets
+++ b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.PackageDependencies.targets
@@ -21,15 +21,14 @@ Copyright (C) Microsoft Corporation. All rights reserved.
 			<NoWarn>NU1903</NoWarn>
 		</PackageReference>
 	</ItemGroup>
-
-	<Target Name="CopyNewtonsoftJsonToOutput" AfterTargets="Build">
+	
+	<Target Name="CopyNewtonsoftJson" AfterTargets="Build">
 		<PropertyGroup>
 			<NewtonsoftJsonDll>$(NuGetPackageRoot)newtonsoft.json\10.0.2\lib\netstandard2.0\Newtonsoft.Json.dll</NewtonsoftJsonDll>
-			<ConsumerOutputPath>$(TargetDir)</ConsumerOutputPath>
 		</PropertyGroup>
 
 		<Copy SourceFiles="$(NewtonsoftJsonDll)"
-			  DestinationFolder="$(ConsumerOutputPath)"
-			  Condition="Exists('$(NewtonsoftJsonDll)') AND '$(ConsumerOutputPath)' != ''" />
+			  DestinationFolder="$(TargetDir)"
+			  Condition="Exists('$(NewtonsoftJsonDll)')" />
 	</Target>
 </Project>

From 81a28755bde32b2e460cf9f082f4bb70eb840837 Mon Sep 17 00:00:00 2001
From: Arooshi Avasthy <aavasthy@microsoft.com>
Date: Mon, 14 Oct 2024 15:35:57 -0700
Subject: [PATCH 05/22] Code cleanup.

---
 .../src/Microsoft.Azure.Cosmos.PackageDependencies.targets  | 5 -----
 Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj    | 6 +-----
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.PackageDependencies.targets b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.PackageDependencies.targets
index fc85f48b8c..53f571f8ad 100644
--- a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.PackageDependencies.targets
+++ b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.PackageDependencies.targets
@@ -10,11 +10,6 @@ Copyright (C) Microsoft Corporation. All rights reserved.
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-	<!-- Handle Newtonsoft.Json for internal project references -->
-	<ItemGroup Condition=" '$(SdkProjectRef)' == 'True' ">
-		<PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
-	</ItemGroup>
-
 	<!-- Prevent Newtonsoft.Json from propagating to external consumers -->
 	<ItemGroup Condition=" '$(SdkProjectRef)' != 'True' ">
 		<PackageReference Include="Newtonsoft.Json" Version="10.0.2" PrivateAssets="all">
diff --git a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
index 6619f94bb9..acbfb1f4df 100644
--- a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
+++ b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
@@ -44,10 +44,6 @@
 		<LangVersion>$(LangVersion)</LangVersion>
 		<PackageLicenseFile>LICENSE</PackageLicenseFile>
 	</PropertyGroup>
-	
-	<PropertyGroup Condition=" '$(ProjectReference)' == 'true' ">
-		<SdkProjectRef>True</SdkProjectRef>
-	</PropertyGroup>
 
 	<ItemGroup>
 		<None Include="..\..\LICENSE" Pack="true" PackagePath="" Visible="false" />
@@ -146,7 +142,7 @@
 		<None Include="$(OutputPath)\vcruntime140_1.dll" Pack="true" IsAssembly="true" PackagePath="runtimes\win-x64\native" />
 		<None Include="$(OutputPath)\vcruntime140.dll" Pack="true" IsAssembly="true" PackagePath="runtimes\win-x64\native" />
 		<None Include="$(OutputPath)\msvcp140.dll" Pack="true" IsAssembly="true" PackagePath="runtimes\win-x64\native" />
-		<None Include="$(NuGetPackageRoot)\newtonsoft.json\10.0.2\lib\net20\Newtonsoft.Json.dll" Pack="true" IsAssembly="true" PackagePath="lib\netstandard2.0" />
+		<None Include="$(NuGetPackageRoot)\newtonsoft.json\10.0.2\lib\net20\Newtonsoft.Json.dll" Pack="true" IsAssembly="true" PackagePath="lib\netstandard2.0"/>
 		<None Include="$(NugetPackageRoot)\Microsoft.HybridRow\$(HybridRowVersion)\lib\netstandard2.0\Microsoft.Azure.Cosmos.Core.dll" Pack="true" IsAssembly="true" PackagePath="lib\netstandard2.0" />
 		<None Include="$(NugetPackageRoot)\Microsoft.HybridRow\$(HybridRowVersion)\lib\netstandard2.0\Microsoft.Azure.Cosmos.Serialization.HybridRow.dll" Pack="true" IsAssembly="true" PackagePath="lib\netstandard2.0" />
 		<None Include="$(NugetPackageRoot)\Microsoft.Azure.Cosmos.Direct\$(DirectVersion)\lib\netstandard2.0\Microsoft.Azure.Cosmos.Direct.dll" Pack="true" IsAssembly="true" PackagePath="lib\netstandard2.0" />

From e95ada8405b0c682da80a029c9e1ce025828cfdc Mon Sep 17 00:00:00 2001
From: Arooshi Avasthy <aavasthy@microsoft.com>
Date: Tue, 22 Oct 2024 00:25:37 -0700
Subject: [PATCH 06/22] Updated code to fail consumer app build

---
 ...t.Azure.Cosmos.PackageDependencies.targets | 29 ------
 .../src/Microsoft.Azure.Cosmos.csproj         |  2 -
 .../src/Microsoft.Azure.Cosmos.targets        | 98 +++++++++++--------
 3 files changed, 57 insertions(+), 72 deletions(-)
 delete mode 100644 Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.PackageDependencies.targets

diff --git a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.PackageDependencies.targets b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.PackageDependencies.targets
deleted file mode 100644
index 53f571f8ad..0000000000
--- a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.PackageDependencies.targets
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-***********************************************************************************************
-Microsoft.Azure.Cosmos.PackageDependencies.targets
-
-Includes managed dependencies for internal use in the .NET SDK
-
-Copyright (C) Microsoft Corporation. All rights reserved.
-***********************************************************************************************
--->
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-	<!-- Prevent Newtonsoft.Json from propagating to external consumers -->
-	<ItemGroup Condition=" '$(SdkProjectRef)' != 'True' ">
-		<PackageReference Include="Newtonsoft.Json" Version="10.0.2" PrivateAssets="all">
-			<NoWarn>NU1903</NoWarn>
-		</PackageReference>
-	</ItemGroup>
-	
-	<Target Name="CopyNewtonsoftJson" AfterTargets="Build">
-		<PropertyGroup>
-			<NewtonsoftJsonDll>$(NuGetPackageRoot)newtonsoft.json\10.0.2\lib\netstandard2.0\Newtonsoft.Json.dll</NewtonsoftJsonDll>
-		</PropertyGroup>
-
-		<Copy SourceFiles="$(NewtonsoftJsonDll)"
-			  DestinationFolder="$(TargetDir)"
-			  Condition="Exists('$(NewtonsoftJsonDll)')" />
-	</Target>
-</Project>
diff --git a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
index acbfb1f4df..30acaab317 100644
--- a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
+++ b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
@@ -134,7 +134,6 @@
 		<PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.0" />
 	</ItemGroup>
 	
-	<Import Project="$(MSBuildThisFileDirectory)\Microsoft.Azure.Cosmos.PackageDependencies.targets" Condition="Exists('$(MSBuildThisFileDirectory)\Microsoft.Azure.Cosmos.PackageDependencies.targets')" />
 
 	<ItemGroup Condition=" '$(ProjectRef)' != 'True' ">
 		<None Include="$(OutputPath)\Cosmos.CRTCompat.dll" Pack="true" IsAssembly="true" PackagePath="runtimes\win-x64\native" />
@@ -142,7 +141,6 @@
 		<None Include="$(OutputPath)\vcruntime140_1.dll" Pack="true" IsAssembly="true" PackagePath="runtimes\win-x64\native" />
 		<None Include="$(OutputPath)\vcruntime140.dll" Pack="true" IsAssembly="true" PackagePath="runtimes\win-x64\native" />
 		<None Include="$(OutputPath)\msvcp140.dll" Pack="true" IsAssembly="true" PackagePath="runtimes\win-x64\native" />
-		<None Include="$(NuGetPackageRoot)\newtonsoft.json\10.0.2\lib\net20\Newtonsoft.Json.dll" Pack="true" IsAssembly="true" PackagePath="lib\netstandard2.0"/>
 		<None Include="$(NugetPackageRoot)\Microsoft.HybridRow\$(HybridRowVersion)\lib\netstandard2.0\Microsoft.Azure.Cosmos.Core.dll" Pack="true" IsAssembly="true" PackagePath="lib\netstandard2.0" />
 		<None Include="$(NugetPackageRoot)\Microsoft.HybridRow\$(HybridRowVersion)\lib\netstandard2.0\Microsoft.Azure.Cosmos.Serialization.HybridRow.dll" Pack="true" IsAssembly="true" PackagePath="lib\netstandard2.0" />
 		<None Include="$(NugetPackageRoot)\Microsoft.Azure.Cosmos.Direct\$(DirectVersion)\lib\netstandard2.0\Microsoft.Azure.Cosmos.Direct.dll" Pack="true" IsAssembly="true" PackagePath="lib\netstandard2.0" />
diff --git a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
index e83f1c5ef8..782524b4be 100644
--- a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
+++ b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
@@ -13,45 +13,61 @@ Copyright (C) Microsoft Corporation. All rights reserved.
 ***********************************************************************************************
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    
-  <ItemGroup>
-    <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\Microsoft.Azure.Cosmos.ServiceInterop.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <TargetPath>Microsoft.Azure.Cosmos.ServiceInterop.dll</TargetPath>
-      <Visible>False</Visible>
-    </ContentWithTargetPath>
-  </ItemGroup>
-  
-  <ItemGroup>
-    <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\Cosmos.CRTCompat.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <TargetPath>Cosmos.CRTCompat.dll</TargetPath>
-      <Visible>False</Visible>
-    </ContentWithTargetPath>
-  </ItemGroup>
-
-  <ItemGroup>
-      <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\msvcp140.dll">
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-          <TargetPath>msvcp140.dll</TargetPath>
-          <Visible>False</Visible>
-      </ContentWithTargetPath>
-  </ItemGroup>
-
-  <ItemGroup>
-      <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\vcruntime140.dll">
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-          <TargetPath>vcruntime140.dll</TargetPath>
-          <Visible>False</Visible>
-      </ContentWithTargetPath>
-  </ItemGroup>
-
-  <ItemGroup>
-      <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\vcruntime140_1.dll">
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-          <TargetPath>vcruntime140_1.dll</TargetPath>
-          <Visible>False</Visible>
-      </ContentWithTargetPath>
-  </ItemGroup>
-    
+
+	<ItemGroup>
+		<ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\Microsoft.Azure.Cosmos.ServiceInterop.dll">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<TargetPath>Microsoft.Azure.Cosmos.ServiceInterop.dll</TargetPath>
+			<Visible>False</Visible>
+		</ContentWithTargetPath>
+	</ItemGroup>
+
+	<ItemGroup>
+		<ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\Cosmos.CRTCompat.dll">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<TargetPath>Cosmos.CRTCompat.dll</TargetPath>
+			<Visible>False</Visible>
+		</ContentWithTargetPath>
+	</ItemGroup>
+
+	<ItemGroup>
+		<ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\msvcp140.dll">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<TargetPath>msvcp140.dll</TargetPath>
+			<Visible>False</Visible>
+		</ContentWithTargetPath>
+	</ItemGroup>
+
+	<ItemGroup>
+		<ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\vcruntime140.dll">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<TargetPath>vcruntime140.dll</TargetPath>
+			<Visible>False</Visible>
+		</ContentWithTargetPath>
+	</ItemGroup>
+
+	<ItemGroup>
+		<ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\vcruntime140_1.dll">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<TargetPath>vcruntime140_1.dll</TargetPath>
+			<Visible>False</Visible>
+		</ContentWithTargetPath>
+	</ItemGroup>
+
+	<!-- Ensure validation before compilation -->
+	<Target Name="VerifyNewtonsoftJsonReference"
+			BeforeTargets="Compile"
+			Condition="'$(BuildingProject)' != 'true'">
+
+		<ItemGroup>
+			<ConsumerPackageReferences Include="@(PackageReference)" />
+			<NewtonsoftPackage Include="@(ConsumerPackageReferences)" Condition="'%(Identity)' == 'Newtonsoft.Json'" />
+			<NewtonsoftAssembly Include="@(ReferencePath)" Condition="'%(Filename)' == 'Newtonsoft.Json'" />
+		</ItemGroup>
+
+		<!-- Force build failure if Newtonsoft.Json is not found -->
+		<Error Text="The Newtonsoft.Json package must be explicitly referenced with version >= 13.x.x."
+			   Condition="'@(NewtonsoftPackage)' == '' AND '@(NewtonsoftAssembly)' == ''" />
+	</Target>
+	
 </Project>
\ No newline at end of file

From dbf48b8d5382effadab3c6fadace683a00ad898e Mon Sep 17 00:00:00 2001
From: Arooshi Avasthy <aavasthy@microsoft.com>
Date: Tue, 22 Oct 2024 01:02:15 -0700
Subject: [PATCH 07/22] update targets file.

---
 .../src/Microsoft.Azure.Cosmos.targets        | 104 +++++++++---------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
index 782524b4be..d7b70e623d 100644
--- a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
+++ b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
@@ -13,61 +13,61 @@ Copyright (C) Microsoft Corporation. All rights reserved.
 ***********************************************************************************************
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    
+  <ItemGroup>
+    <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\Microsoft.Azure.Cosmos.ServiceInterop.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <TargetPath>Microsoft.Azure.Cosmos.ServiceInterop.dll</TargetPath>
+      <Visible>False</Visible>
+    </ContentWithTargetPath>
+  </ItemGroup>
+  
+  <ItemGroup>
+    <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\Cosmos.CRTCompat.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <TargetPath>Cosmos.CRTCompat.dll</TargetPath>
+      <Visible>False</Visible>
+    </ContentWithTargetPath>
+  </ItemGroup>
 
-	<ItemGroup>
-		<ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\Microsoft.Azure.Cosmos.ServiceInterop.dll">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-			<TargetPath>Microsoft.Azure.Cosmos.ServiceInterop.dll</TargetPath>
-			<Visible>False</Visible>
-		</ContentWithTargetPath>
-	</ItemGroup>
+  <ItemGroup>
+      <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\msvcp140.dll">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+          <TargetPath>msvcp140.dll</TargetPath>
+          <Visible>False</Visible>
+      </ContentWithTargetPath>
+  </ItemGroup>
 
-	<ItemGroup>
-		<ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\Cosmos.CRTCompat.dll">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-			<TargetPath>Cosmos.CRTCompat.dll</TargetPath>
-			<Visible>False</Visible>
-		</ContentWithTargetPath>
-	</ItemGroup>
+  <ItemGroup>
+      <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\vcruntime140.dll">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+          <TargetPath>vcruntime140.dll</TargetPath>
+          <Visible>False</Visible>
+      </ContentWithTargetPath>
+  </ItemGroup>
 
-	<ItemGroup>
-		<ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\msvcp140.dll">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-			<TargetPath>msvcp140.dll</TargetPath>
-			<Visible>False</Visible>
-		</ContentWithTargetPath>
-	</ItemGroup>
+  <ItemGroup>
+      <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\vcruntime140_1.dll">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+          <TargetPath>vcruntime140_1.dll</TargetPath>
+          <Visible>False</Visible>
+      </ContentWithTargetPath>
+  </ItemGroup>
 
-	<ItemGroup>
-		<ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\vcruntime140.dll">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-			<TargetPath>vcruntime140.dll</TargetPath>
-			<Visible>False</Visible>
-		</ContentWithTargetPath>
-	</ItemGroup>
+  <!-- Ensure validation before compilation -->
+  <Target Name="VerifyNewtonsoftJsonReference"
+      BeforeTargets="Compile"
+      Condition="'$(BuildingProject)' != 'true'">
+  
+   <ItemGroup>
+      <ConsumerPackageReferences Include="@(PackageReference)" />
+      <NewtonsoftPackage Include="@(ConsumerPackageReferences)" Condition="'%(Identity)' == 'Newtonsoft.Json'" />
+      <NewtonsoftAssembly Include="@(ReferencePath)" Condition="'%(Filename)' == 'Newtonsoft.Json'" />
+   </ItemGroup>
+  
+   <!-- Force build failure if Newtonsoft.Json is not found -->
+   <Error Text="The Newtonsoft.Json package must be explicitly referenced with version >= 13.x.x."
+      Condition="'@(NewtonsoftPackage)' == '' AND '@(NewtonsoftAssembly)' == ''" />
+  </Target>
 
-	<ItemGroup>
-		<ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\vcruntime140_1.dll">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-			<TargetPath>vcruntime140_1.dll</TargetPath>
-			<Visible>False</Visible>
-		</ContentWithTargetPath>
-	</ItemGroup>
-
-	<!-- Ensure validation before compilation -->
-	<Target Name="VerifyNewtonsoftJsonReference"
-			BeforeTargets="Compile"
-			Condition="'$(BuildingProject)' != 'true'">
-
-		<ItemGroup>
-			<ConsumerPackageReferences Include="@(PackageReference)" />
-			<NewtonsoftPackage Include="@(ConsumerPackageReferences)" Condition="'%(Identity)' == 'Newtonsoft.Json'" />
-			<NewtonsoftAssembly Include="@(ReferencePath)" Condition="'%(Filename)' == 'Newtonsoft.Json'" />
-		</ItemGroup>
-
-		<!-- Force build failure if Newtonsoft.Json is not found -->
-		<Error Text="The Newtonsoft.Json package must be explicitly referenced with version >= 13.x.x."
-			   Condition="'@(NewtonsoftPackage)' == '' AND '@(NewtonsoftAssembly)' == ''" />
-	</Target>
-	
 </Project>
\ No newline at end of file

From a24235d2e10483127878ebc459e534640234ff52 Mon Sep 17 00:00:00 2001
From: Arooshi Avasthy <aavasthy@microsoft.com>
Date: Tue, 22 Oct 2024 01:32:47 -0700
Subject: [PATCH 08/22] Updating newtonsoft reference

---
 Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
index 21763c9901..718fbf961c 100644
--- a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
+++ b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
@@ -118,6 +118,7 @@
 		<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
 		<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
 		<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="16.0.102" PrivateAssets="All" />
+		<PackageReference Include="Newtonsoft.Json" Version="10.0.2" NoWarn="NU1903" PrivateAssets="All" />
 		<PackageReference Include="System.Net.Http" Version="4.3.4" />
 		<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
 		<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />

From e7cea529b4e77661d28f2d690d8889e073d0d02f Mon Sep 17 00:00:00 2001
From: Arooshi Avasthy <aavasthy@microsoft.com>
Date: Tue, 22 Oct 2024 01:45:15 -0700
Subject: [PATCH 09/22] Updating newtonsoft reference

---
 Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj  | 1 -
 Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets | 7 +++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
index 718fbf961c..21763c9901 100644
--- a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
+++ b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
@@ -118,7 +118,6 @@
 		<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
 		<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
 		<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="16.0.102" PrivateAssets="All" />
-		<PackageReference Include="Newtonsoft.Json" Version="10.0.2" NoWarn="NU1903" PrivateAssets="All" />
 		<PackageReference Include="System.Net.Http" Version="4.3.4" />
 		<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
 		<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
diff --git a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
index d7b70e623d..e2fe7bc7d3 100644
--- a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
+++ b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
@@ -54,6 +54,13 @@ Copyright (C) Microsoft Corporation. All rights reserved.
       </ContentWithTargetPath>
   </ItemGroup>
 
+  <!-- Prevent Newtonsoft.Json from propagating to external consumers -->
+  <ItemGroup Condition=" '$(SdkProjectRef)' != 'True' ">
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.2" PrivateAssets="all">
+        <NoWarn>NU1903</NoWarn>
+    </PackageReference>
+  </ItemGroup>
+
   <!-- Ensure validation before compilation -->
   <Target Name="VerifyNewtonsoftJsonReference"
       BeforeTargets="Compile"

From 5c47dfcb1be87d6fc359a82eb7c8f67f5c779cce Mon Sep 17 00:00:00 2001
From: Arooshi Avasthy <aavasthy@microsoft.com>
Date: Tue, 22 Oct 2024 15:31:44 -0700
Subject: [PATCH 10/22] Update targets file.

---
 .../src/Microsoft.Azure.Cosmos.csproj         |  1 +
 .../src/Microsoft.Azure.Cosmos.targets        | 37 +++++++++++--------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
index 21763c9901..718fbf961c 100644
--- a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
+++ b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
@@ -118,6 +118,7 @@
 		<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
 		<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
 		<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="16.0.102" PrivateAssets="All" />
+		<PackageReference Include="Newtonsoft.Json" Version="10.0.2" NoWarn="NU1903" PrivateAssets="All" />
 		<PackageReference Include="System.Net.Http" Version="4.3.4" />
 		<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
 		<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
diff --git a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
index e2fe7bc7d3..3f03a358ae 100644
--- a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
+++ b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
@@ -54,27 +54,34 @@ Copyright (C) Microsoft Corporation. All rights reserved.
       </ContentWithTargetPath>
   </ItemGroup>
 
-  <!-- Prevent Newtonsoft.Json from propagating to external consumers -->
-  <ItemGroup Condition=" '$(SdkProjectRef)' != 'True' ">
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.2" PrivateAssets="all">
-        <NoWarn>NU1903</NoWarn>
-    </PackageReference>
-  </ItemGroup>
 
-  <!-- Ensure validation before compilation -->
+  <!-- Run validation before compilation starts -->
   <Target Name="VerifyNewtonsoftJsonReference"
-      BeforeTargets="Compile"
-      Condition="'$(BuildingProject)' != 'true'">
+    BeforeTargets="PrepareForBuild;CoreCompile;GetCompileOutputs"
+    Condition="'$(BuildingProject)' != 'true'">
   
    <ItemGroup>
-      <ConsumerPackageReferences Include="@(PackageReference)" />
-      <NewtonsoftPackage Include="@(ConsumerPackageReferences)" Condition="'%(Identity)' == 'Newtonsoft.Json'" />
-      <NewtonsoftAssembly Include="@(ReferencePath)" Condition="'%(Filename)' == 'Newtonsoft.Json'" />
+    <ConsumerPackageReferences Include="@(PackageReference)" />
+    <NewtonsoftPackage Include="@(ConsumerPackageReferences)"
+           Condition="'%(Identity)' == 'Newtonsoft.Json'" />
+    <NewtonsoftAssembly Include="@(ReferencePath)"
+           Condition="'%(Filename)' == 'Newtonsoft.Json'" />
    </ItemGroup>
-  
-   <!-- Force build failure if Newtonsoft.Json is not found -->
+   
+   <!-- Debugging Messages -->
+   <Message Text="Validating Newtonsoft.Json reference..." Importance="high" />
+   <Message Text="Newtonsoft.Json Package Version: %(NewtonsoftPackage.Version)" Importance="high" />
+   <Message Text="Newtonsoft.Json Assembly Reference Found: @(NewtonsoftAssembly)" Importance="high" />
+   
+   <!-- Error Handling -->
    <Error Text="The Newtonsoft.Json package must be explicitly referenced with version >= 13.x.x."
-      Condition="'@(NewtonsoftPackage)' == '' AND '@(NewtonsoftAssembly)' == ''" />
+       Condition="'@(NewtonsoftPackage)' != '' AND 
+                   $([System.Version]::Parse('%(NewtonsoftPackage.Version)').Major) &lt; 13" />
+   
+   <Error Text="Newtonsoft.Json assembly reference detected. Please upgrade to version >= 13.x.x or higher."
+       Condition="'@(NewtonsoftAssembly)' != ''" />
+  
   </Target>
 
+
 </Project>
\ No newline at end of file

From 43cf584afc654f7d182b85ea6501033c6f8d1318 Mon Sep 17 00:00:00 2001
From: Arooshi Avasthy <aavasthy@microsoft.com>
Date: Thu, 24 Oct 2024 10:35:58 -0700
Subject: [PATCH 11/22] Update targets file to ensure build failure without
 Newtonsoft.

---
 .../src/Microsoft.Azure.Cosmos.targets        | 37 +++++--------------
 1 file changed, 10 insertions(+), 27 deletions(-)

diff --git a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
index 3f03a358ae..a57ae94780 100644
--- a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
+++ b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
@@ -55,33 +55,16 @@ Copyright (C) Microsoft Corporation. All rights reserved.
   </ItemGroup>
 
 
-  <!-- Run validation before compilation starts -->
-  <Target Name="VerifyNewtonsoftJsonReference"
-    BeforeTargets="PrepareForBuild;CoreCompile;GetCompileOutputs"
-    Condition="'$(BuildingProject)' != 'true'">
-  
-   <ItemGroup>
-    <ConsumerPackageReferences Include="@(PackageReference)" />
-    <NewtonsoftPackage Include="@(ConsumerPackageReferences)"
-           Condition="'%(Identity)' == 'Newtonsoft.Json'" />
-    <NewtonsoftAssembly Include="@(ReferencePath)"
-           Condition="'%(Filename)' == 'Newtonsoft.Json'" />
-   </ItemGroup>
-   
-   <!-- Debugging Messages -->
-   <Message Text="Validating Newtonsoft.Json reference..." Importance="high" />
-   <Message Text="Newtonsoft.Json Package Version: %(NewtonsoftPackage.Version)" Importance="high" />
-   <Message Text="Newtonsoft.Json Assembly Reference Found: @(NewtonsoftAssembly)" Importance="high" />
-   
-   <!-- Error Handling -->
-   <Error Text="The Newtonsoft.Json package must be explicitly referenced with version >= 13.x.x."
-       Condition="'@(NewtonsoftPackage)' != '' AND 
-                   $([System.Version]::Parse('%(NewtonsoftPackage.Version)').Major) &lt; 13" />
-   
-   <Error Text="Newtonsoft.Json assembly reference detected. Please upgrade to version >= 13.x.x or higher."
-       Condition="'@(NewtonsoftAssembly)' != ''" />
-  
-  </Target>
+  <!-- Add check for Newtonsoft.Json package in cosnumer app.  -->
+  <Target Name="CheckNewtonsoftJsonVersion" BeforeTargets="CoreCompile" Condition="'$(ExcludeRestorePackageImports)' != 'true'">
 
+    <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 >= 13.x.x."
+        Condition="'@(NewtonsoftJsonPackageReference)' == ''" />
+
+  </Target>
 
 </Project>
\ No newline at end of file

From 7351478fe08c28b051ac1457beae5c87bab367b4 Mon Sep 17 00:00:00 2001
From: Arooshi Avasthy <aavasthy@microsoft.com>
Date: Thu, 24 Oct 2024 12:51:55 -0700
Subject: [PATCH 12/22] Adding Newtonsoft for encryption projects.

---
 .../src/Microsoft.Azure.Cosmos.Encryption.Custom.csproj          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Microsoft.Azure.Cosmos.Encryption.Custom/src/Microsoft.Azure.Cosmos.Encryption.Custom.csproj b/Microsoft.Azure.Cosmos.Encryption.Custom/src/Microsoft.Azure.Cosmos.Encryption.Custom.csproj
index 3b94db54c2..463dc38c96 100644
--- a/Microsoft.Azure.Cosmos.Encryption.Custom/src/Microsoft.Azure.Cosmos.Encryption.Custom.csproj
+++ b/Microsoft.Azure.Cosmos.Encryption.Custom/src/Microsoft.Azure.Cosmos.Encryption.Custom.csproj
@@ -49,6 +49,7 @@
      <PackageReference Include="Azure.Identity" Version="1.11.4" />
      <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
      <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
+     <PackageReference Include="Newtonsoft.Json" Version="10.0.2" NoWarn="NU1903" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>

From add93b8a9a856eea3ee357ce0f3f6695085d31a8 Mon Sep 17 00:00:00 2001
From: Arooshi Avasthy <aavasthy@microsoft.com>
Date: Thu, 24 Oct 2024 13:20:17 -0700
Subject: [PATCH 13/22] Adding Newtonsoft for encryption projects.

---
 .../src/Microsoft.Azure.Cosmos.Encryption.csproj                 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Microsoft.Azure.Cosmos.Encryption/src/Microsoft.Azure.Cosmos.Encryption.csproj b/Microsoft.Azure.Cosmos.Encryption/src/Microsoft.Azure.Cosmos.Encryption.csproj
index d21b605ea9..ec354263b3 100644
--- a/Microsoft.Azure.Cosmos.Encryption/src/Microsoft.Azure.Cosmos.Encryption.csproj
+++ b/Microsoft.Azure.Cosmos.Encryption/src/Microsoft.Azure.Cosmos.Encryption.csproj
@@ -44,6 +44,7 @@
   <ItemGroup>
     <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.2" NoWarn="NU1903" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>

From 5114ae301021b3fef2000c2f775f45e8d47dc307 Mon Sep 17 00:00:00 2001
From: Arooshi Avasthy <aavasthy@microsoft.com>
Date: Fri, 25 Oct 2024 01:24:34 -0700
Subject: [PATCH 14/22] Update newtonsoft supported version in error message.

---
 Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
index a57ae94780..5fa5bd68f7 100644
--- a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
+++ b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
@@ -62,7 +62,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
         <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 >= 13.x.x."
+    <Error Text="The Newtonsoft.Json package must be explicitly referenced with version >= 10.0.2."
         Condition="'@(NewtonsoftJsonPackageReference)' == ''" />
 
   </Target>

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 15/22] 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

From 59796c8334c86e5a5cc77583d01b3b0ece57d882 Mon Sep 17 00:00:00 2001
From: Arooshi Avasthy <aavasthy@microsoft.com>
Date: Wed, 30 Oct 2024 15:41:44 -0700
Subject: [PATCH 16/22] Code cleanup for targets file with newtonsoft changes.

---
 .../src/Microsoft.Azure.Cosmos.targets        | 51 ++++++-------------
 1 file changed, 15 insertions(+), 36 deletions(-)

diff --git a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
index 6f7765dbf8..b916b4182b 100644
--- a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
+++ b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
@@ -56,43 +56,22 @@ Copyright (C) Microsoft Corporation. All rights reserved.
 
 
   <!-- 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>
-    
-    <!-- Check for assembly references to Newtonsoft.Json (including transitive dependencies) -->
-    <ItemGroup>
-        <NewtonsoftJsonAssemblyReference Include="@(ReferencePath)" Condition="'%(FileName)' == 'Newtonsoft.Json'" />
-    </ItemGroup>
+    <Target Name="CheckNewtonsoftJsonPresence" BeforeTargets="CoreCompile" Condition="'$(ExcludeRestorePackageImports)' != 'true' AND '$(DisableNewtonsoftJsonCheck)' != 'true'">
     
-    <!-- Check for Newtonsoft.Json in packages.config -->
-    <PropertyGroup>
-        <PackagesConfigPath>packages.config</PackagesConfigPath>
-        <NewtonsoftJsonInPackagesConfig>false</NewtonsoftJsonInPackagesConfig>
-    </PropertyGroup>
+        <!-- Check for PackageReference to Newtonsoft.Json -->
+        <ItemGroup>
+            <NewtonsoftJsonPackageReference Include="@(PackageReference)" Condition="'%(PackageReference.Identity)' == 'Newtonsoft.Json'" />
+        </ItemGroup>
+        
+        <!-- Check for assembly references to Newtonsoft.Json (including transitive dependencies) -->
+        <ItemGroup>
+            <NewtonsoftJsonAssemblyReference Include="@(ReferencePath)" Condition="'%(FileName)' == 'Newtonsoft.Json'" />
+        </ItemGroup>
+        
+        <!-- Produce an error if Newtonsoft.Json is not found -->
+        <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="'@(NewtonsoftJsonPackageReference)' == '' and '@(NewtonsoftJsonAssemblyReference)' == ''" />
     
-    <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>
+    </Target>
 
 </Project>
\ No newline at end of file

From 99664113425eff67cc4802c9e14796f93ab12b0e Mon Sep 17 00:00:00 2001
From: "Arooshi Avasthy (from Dev Box)" <aavasthy@microsoft.com>
Date: Mon, 4 Nov 2024 13:34:58 -0800
Subject: [PATCH 17/22] Update package path to ensure transitive depenedncy
 packages also receive the same build failure.

---
 .../src/Microsoft.Azure.Cosmos.csproj                  |  2 +-
 .../src/Microsoft.Azure.Cosmos.targets                 | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
index 718fbf961c..5ed5c60b96 100644
--- a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
+++ b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
@@ -145,7 +145,7 @@
 		<None Include="$(NugetPackageRoot)\Microsoft.HybridRow\$(HybridRowVersion)\lib\netstandard2.0\Microsoft.Azure.Cosmos.Core.dll" Pack="true" IsAssembly="true" PackagePath="lib\netstandard2.0" />
 		<None Include="$(NugetPackageRoot)\Microsoft.HybridRow\$(HybridRowVersion)\lib\netstandard2.0\Microsoft.Azure.Cosmos.Serialization.HybridRow.dll" Pack="true" IsAssembly="true" PackagePath="lib\netstandard2.0" />
 		<None Include="$(NugetPackageRoot)\Microsoft.Azure.Cosmos.Direct\$(DirectVersion)\lib\netstandard2.0\Microsoft.Azure.Cosmos.Direct.dll" Pack="true" IsAssembly="true" PackagePath="lib\netstandard2.0" />
-		<None Include="$(MSBuildThisFileDirectory)\Microsoft.Azure.Cosmos.targets" Pack="true" PackagePath="build\netstandard2.0">
+		<None Include="$(MSBuildThisFileDirectory)\Microsoft.Azure.Cosmos.targets" Pack="true" PackagePath="buildTransitive\">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 	</ItemGroup>
diff --git a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
index b916b4182b..25f25f6c5d 100644
--- a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
+++ b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
@@ -15,7 +15,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     
   <ItemGroup>
-    <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\Microsoft.Azure.Cosmos.ServiceInterop.dll">
+    <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\native\Microsoft.Azure.Cosmos.ServiceInterop.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <TargetPath>Microsoft.Azure.Cosmos.ServiceInterop.dll</TargetPath>
       <Visible>False</Visible>
@@ -23,7 +23,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
   </ItemGroup>
   
   <ItemGroup>
-    <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\Cosmos.CRTCompat.dll">
+    <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\native\Cosmos.CRTCompat.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <TargetPath>Cosmos.CRTCompat.dll</TargetPath>
       <Visible>False</Visible>
@@ -31,7 +31,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
   </ItemGroup>
 
   <ItemGroup>
-      <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\msvcp140.dll">
+      <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\native\msvcp140.dll">
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
           <TargetPath>msvcp140.dll</TargetPath>
           <Visible>False</Visible>
@@ -39,7 +39,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
   </ItemGroup>
 
   <ItemGroup>
-      <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\vcruntime140.dll">
+      <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\native\vcruntime140.dll">
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
           <TargetPath>vcruntime140.dll</TargetPath>
           <Visible>False</Visible>
@@ -47,7 +47,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
   </ItemGroup>
 
   <ItemGroup>
-      <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\vcruntime140_1.dll">
+      <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\native\vcruntime140_1.dll">
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
           <TargetPath>vcruntime140_1.dll</TargetPath>
           <Visible>False</Visible>

From d3bf695b3160a23921511315d4f9bb4b0dea6ded Mon Sep 17 00:00:00 2001
From: "Arooshi Avasthy (from Dev Box)" <aavasthy@microsoft.com>
Date: Tue, 5 Nov 2024 11:39:43 -0800
Subject: [PATCH 18/22] Updating disable check and updating packagepath for
 nugets.

---
 Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj  | 2 +-
 Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
index 5ed5c60b96..befe08602c 100644
--- a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
+++ b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
@@ -145,7 +145,7 @@
 		<None Include="$(NugetPackageRoot)\Microsoft.HybridRow\$(HybridRowVersion)\lib\netstandard2.0\Microsoft.Azure.Cosmos.Core.dll" Pack="true" IsAssembly="true" PackagePath="lib\netstandard2.0" />
 		<None Include="$(NugetPackageRoot)\Microsoft.HybridRow\$(HybridRowVersion)\lib\netstandard2.0\Microsoft.Azure.Cosmos.Serialization.HybridRow.dll" Pack="true" IsAssembly="true" PackagePath="lib\netstandard2.0" />
 		<None Include="$(NugetPackageRoot)\Microsoft.Azure.Cosmos.Direct\$(DirectVersion)\lib\netstandard2.0\Microsoft.Azure.Cosmos.Direct.dll" Pack="true" IsAssembly="true" PackagePath="lib\netstandard2.0" />
-		<None Include="$(MSBuildThisFileDirectory)\Microsoft.Azure.Cosmos.targets" Pack="true" PackagePath="buildTransitive\">
+		<None Include="$(MSBuildThisFileDirectory)\Microsoft.Azure.Cosmos.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 	</ItemGroup>
diff --git a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
index 25f25f6c5d..21edd0b1cb 100644
--- a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
+++ b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
@@ -56,7 +56,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
 
 
   <!-- Add check for Newtonsoft.Json package in consumer app.  -->
-    <Target Name="CheckNewtonsoftJsonPresence" BeforeTargets="CoreCompile" Condition="'$(ExcludeRestorePackageImports)' != 'true' AND '$(DisableNewtonsoftJsonCheck)' != 'true'">
+    <Target Name="CheckNewtonsoftJsonPresence" BeforeTargets="CoreCompile" Condition="'$(ExcludeRestorePackageImports)' != 'true' AND '$(AzureCosmosDisableNewtonsoftJsonCheck)' != 'true'">
     
         <!-- Check for PackageReference to Newtonsoft.Json -->
         <ItemGroup>
@@ -69,7 +69,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
         </ItemGroup>
         
         <!-- Produce an error if Newtonsoft.Json is not found -->
-        <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."
+        <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 'AzureCosmosDisableNewtonsoftJsonCheck' property to 'true' to bypass this check."
                Condition="'@(NewtonsoftJsonPackageReference)' == '' and '@(NewtonsoftJsonAssemblyReference)' == ''" />
     
     </Target>

From b879ccc4321c7c5a97276514d3c3ebf9147e2947 Mon Sep 17 00:00:00 2001
From: "Arooshi Avasthy (from Dev Box)" <aavasthy@microsoft.com>
Date: Tue, 5 Nov 2024 13:13:00 -0800
Subject: [PATCH 19/22] Updating realtive paths for packages.

---
 .../src/Microsoft.Azure.Cosmos.targets                 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
index 21edd0b1cb..017bc2e106 100644
--- a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
+++ b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
@@ -15,7 +15,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     
   <ItemGroup>
-    <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\native\Microsoft.Azure.Cosmos.ServiceInterop.dll">
+    <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\Microsoft.Azure.Cosmos.ServiceInterop.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <TargetPath>Microsoft.Azure.Cosmos.ServiceInterop.dll</TargetPath>
       <Visible>False</Visible>
@@ -23,7 +23,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
   </ItemGroup>
   
   <ItemGroup>
-    <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\native\Cosmos.CRTCompat.dll">
+    <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\Cosmos.CRTCompat.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <TargetPath>Cosmos.CRTCompat.dll</TargetPath>
       <Visible>False</Visible>
@@ -31,7 +31,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
   </ItemGroup>
 
   <ItemGroup>
-      <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\native\msvcp140.dll">
+      <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\msvcp140.dll">
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
           <TargetPath>msvcp140.dll</TargetPath>
           <Visible>False</Visible>
@@ -39,7 +39,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
   </ItemGroup>
 
   <ItemGroup>
-      <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\native\vcruntime140.dll">
+      <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\vcruntime140.dll">
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
           <TargetPath>vcruntime140.dll</TargetPath>
           <Visible>False</Visible>
@@ -47,7 +47,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
   </ItemGroup>
 
   <ItemGroup>
-      <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\native\vcruntime140_1.dll">
+      <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\vcruntime140_1.dll">
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
           <TargetPath>vcruntime140_1.dll</TargetPath>
           <Visible>False</Visible>

From 97b8ccd4b69c88c0bb3dd15d6c3223b43cd086c1 Mon Sep 17 00:00:00 2001
From: "Arooshi Avasthy (from Dev Box)" <aavasthy@microsoft.com>
Date: Thu, 7 Nov 2024 10:52:33 -0800
Subject: [PATCH 20/22] Adding two package paths to cover transitive dependency
 scenarios for package.config and package reference.

---
 Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
index befe08602c..7283784d1b 100644
--- a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
+++ b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
@@ -145,6 +145,9 @@
 		<None Include="$(NugetPackageRoot)\Microsoft.HybridRow\$(HybridRowVersion)\lib\netstandard2.0\Microsoft.Azure.Cosmos.Core.dll" Pack="true" IsAssembly="true" PackagePath="lib\netstandard2.0" />
 		<None Include="$(NugetPackageRoot)\Microsoft.HybridRow\$(HybridRowVersion)\lib\netstandard2.0\Microsoft.Azure.Cosmos.Serialization.HybridRow.dll" Pack="true" IsAssembly="true" PackagePath="lib\netstandard2.0" />
 		<None Include="$(NugetPackageRoot)\Microsoft.Azure.Cosmos.Direct\$(DirectVersion)\lib\netstandard2.0\Microsoft.Azure.Cosmos.Direct.dll" Pack="true" IsAssembly="true" PackagePath="lib\netstandard2.0" />
+		<None Include="$(MSBuildThisFileDirectory)\Microsoft.Azure.Cosmos.targets" Pack="true" PackagePath="build\netstandard2.0">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
 		<None Include="$(MSBuildThisFileDirectory)\Microsoft.Azure.Cosmos.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>

From 3b9282f3b56ee6badb25e964d69d59396ddafefa Mon Sep 17 00:00:00 2001
From: "Arooshi Avasthy (from Dev Box)" <aavasthy@microsoft.com>
Date: Thu, 7 Nov 2024 20:22:13 -0800
Subject: [PATCH 21/22] Update AfterTargets toResolveAssemblyReferences

---
 .../src/Microsoft.Azure.Cosmos.targets                   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
index 017bc2e106..9dc5bab81d 100644
--- a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
+++ b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
@@ -56,8 +56,9 @@ Copyright (C) Microsoft Corporation. All rights reserved.
 
 
   <!-- Add check for Newtonsoft.Json package in consumer app.  -->
-    <Target Name="CheckNewtonsoftJsonPresence" BeforeTargets="CoreCompile" Condition="'$(ExcludeRestorePackageImports)' != 'true' AND '$(AzureCosmosDisableNewtonsoftJsonCheck)' != 'true'">
-    
+    <Target Name="CheckNewtonsoftJsonPresence" AfterTargets="ResolveAssemblyReferences"
+        Condition="'$(ExcludeRestorePackageImports)' != 'true' AND '$(AzureCosmosDisableNewtonsoftJsonCheck)' != 'true'">
+        
         <!-- Check for PackageReference to Newtonsoft.Json -->
         <ItemGroup>
             <NewtonsoftJsonPackageReference Include="@(PackageReference)" Condition="'%(PackageReference.Identity)' == 'Newtonsoft.Json'" />
@@ -70,8 +71,8 @@ Copyright (C) Microsoft Corporation. All rights reserved.
         
         <!-- Produce an error if Newtonsoft.Json is not found -->
         <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 'AzureCosmosDisableNewtonsoftJsonCheck' property to 'true' to bypass this check."
-               Condition="'@(NewtonsoftJsonPackageReference)' == '' and '@(NewtonsoftJsonAssemblyReference)' == ''" />
-    
+            Condition="'@(NewtonsoftJsonAssemblyReference)' == ''" />
+
     </Target>
 
 </Project>
\ No newline at end of file

From 6d38b1e410f8dff3c88e51f07c9d6d6fb22b5f3b Mon Sep 17 00:00:00 2001
From: Arooshi Avasthy <aavasthy@microsoft.com>
Date: Thu, 7 Nov 2024 22:59:50 -0800
Subject: [PATCH 22/22] Code cleanup

---
 Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
index 9dc5bab81d..114513e916 100644
--- a/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
+++ b/Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.targets
@@ -70,8 +70,8 @@ Copyright (C) Microsoft Corporation. All rights reserved.
         </ItemGroup>
         
         <!-- Produce an error if Newtonsoft.Json is not found -->
-        <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 'AzureCosmosDisableNewtonsoftJsonCheck' property to 'true' to bypass this check."
-            Condition="'@(NewtonsoftJsonAssemblyReference)' == ''" />
+        <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 'AzureCosmosDisableNewtonsoftJsonCheck' property to 'true' to bypass this check."
+            Condition="'@(NewtonsoftJsonPackageReference)' == '' AND '@(NewtonsoftJsonAssemblyReference)' == ''" />
 
     </Target>