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] 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>