[Infra] Fix dependency versions

Fix-up dependency versions to (almost) match main.

Author: martincostello

Directory.Packages.props

@@ -47,7 +47,7 @@
     <PackageVersion Include="Microsoft.Extensions.Options" Version="[9.0.0,)" />
     <PackageVersion Include="Microsoft.Owin" Version="[4.2.2,)" />
     <PackageVersion Include="Microsoft.Win32.Registry" Version="[5.0.0,)" />
-    <PackageVersion Include="System.Drawing.Common" Version="[4.7.3,)" />
+    <PackageVersion Include="System.Drawing.Common" Version="[4.7.2,)" />
     <PackageVersion Include="System.Net.Http" Version="[4.3.4,)" />
     <PackageVersion Include="System.Private.Uri" Version="[4.3.2,)" />
     <PackageVersion Include="System.Reflection.Emit.Lightweight" Version="[4.7.0,)" />

src/OpenTelemetry.Exporter.OneCollector/OpenTelemetry.Exporter.OneCollector.csproj

@@ -19,7 +19,11 @@
 
   <ItemGroup>
     <PackageReference Include="OpenTelemetry" />
-    <PackageReference Include="System.Text.Json" VersionOverride="[6.0.10,)" />
+    <PackageReference Include="System.Text.Json" />
+  </ItemGroup>
+
+  <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
+    <PackageReference Update="System.Text.Json" VersionOverride="[6.0.10,)" />
   </ItemGroup>
 
   <ItemGroup>

src/OpenTelemetry.Instrumentation.AWSLambda/OpenTelemetry.Instrumentation.AWSLambda.csproj

@@ -22,7 +22,11 @@
     <PackageReference Include="Amazon.Lambda.Core" />
     <PackageReference Include="Amazon.Lambda.SNSEvents" />
     <PackageReference Include="Amazon.Lambda.SQSEvents" />
-    <PackageReference Include="System.Text.Json" VersionOverride="[6.0.10,)" />
+    <PackageReference Include="System.Text.Json" />
+  </ItemGroup>
+
+  <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
+    <PackageReference Update="System.Text.Json" VersionOverride="[6.0.10,)" />
   </ItemGroup>
 
   <ItemGroup>

src/OpenTelemetry.Instrumentation.ElasticsearchClient/OpenTelemetry.Instrumentation.ElasticsearchClient.csproj

@@ -17,7 +17,8 @@
 
   <ItemGroup>
     <PackageReference Include="OpenTelemetry" />
-    <PackageReference Include="System.Text.Json" />
+    <PackageReference Include="System.Text.Encodings.Web" />
+    <PackageReference Include="System.Text.Json" VersionOverride="[4.7.2,)" />
   </ItemGroup>
 
   <ItemGroup>

src/OpenTelemetry.Resources.Azure/OpenTelemetry.Resources.Azure.csproj

@@ -18,6 +18,11 @@
     <PackageReference Include="System.Text.Json" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$([MSBuild]::GetTargetFrameworkIdentifier(`$(TargetFramework)`))' == '.NETStandard'">
+    <PackageReference Include="System.Text.Encodings.Web" />
+    <PackageReference Update="System.Text.Json" VersionOverride="[4.7.2,)" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Include="$(RepoRoot)\src\Shared\Guard.cs" Link="Includes\Guard.cs" />
     <Compile Include="$(RepoRoot)\src\Shared\ResourceSemanticConventions.cs" Link="Includes\ResourceSemanticConventions.cs"/>

src/OpenTelemetry.Resources.Gcp/OpenTelemetry.Resources.Gcp.csproj

@@ -16,6 +16,12 @@
   <ItemGroup>
     <PackageReference Include="Google.Api.Gax" VersionOverride="[4.8.0,)" />
     <PackageReference Include="OpenTelemetry" />
+    <PackageReference Include="System.Text.Json" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$([MSBuild]::GetTargetFrameworkIdentifier(`$(TargetFramework)`))' == '.NETStandard'">
+    <PackageReference Include="System.Text.Encodings.Web" />
+    <PackageReference Update="System.Text.Json" VersionOverride="[4.7.2,)" />
   </ItemGroup>
 
   <ItemGroup>

src/OpenTelemetry.Sampler.AWS/OpenTelemetry.Sampler.AWS.csproj

@@ -16,7 +16,11 @@
 
   <ItemGroup>
     <PackageReference Include="OpenTelemetry" />
-    <PackageReference Include="System.Text.Json" VersionOverride="[6.0.10,)" />
+    <PackageReference Include="System.Text.Json" />
+  </ItemGroup>
+
+  <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
+    <PackageReference Update="System.Text.Json" VersionOverride="[6.0.10,)" />
   </ItemGroup>
 
   <ItemGroup Condition="'$([MSBuild]::GetTargetFrameworkIdentifier(`$(TargetFramework)`))' == '.NETFramework'">