Merge branch 'main' into log-emitter-sdk

open-telemetry · Jul 7, 2022 · 80a4fc1 · 80a4fc1
2 parents b688959 + 624fa21
commit 80a4fc1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/build/Common.nonprod.props b/build/Common.nonprod.props
@@ -41,7 +41,7 @@
     <MicrosoftExtensionsLoggingPkgVer>[6.0.0,)</MicrosoftExtensionsLoggingPkgVer>
     <MicrosoftExtensionsLoggingAbstractionsPkgVer>[6.0.0,)</MicrosoftExtensionsLoggingAbstractionsPkgVer>
     <MicrosoftNETTestSdkPkgVer>[16.10.0]</MicrosoftNETTestSdkPkgVer>
-    <NewtonsoftJsonPkgVer>[12.0.2,13.0)</NewtonsoftJsonPkgVer>
+    <NewtonsoftJsonPkgVer>[13.0.1,14.0)</NewtonsoftJsonPkgVer>
     <MoqPkgVer>[4.14.5,5.0)</MoqPkgVer>
     <RabbitMQClientPkgVer>[6.1.0,7.0)</RabbitMQClientPkgVer>
     <RuntimeInstrumentationPkgVer>[1.0.0-rc.1,2.0)</RuntimeInstrumentationPkgVer>

diff --git a/build/Common.props b/build/Common.props
@@ -22,7 +22,7 @@
       Please sort alphabetically.
       Refer to https://docs.microsoft.com/nuget/concepts/package-versioning for semver syntax.
     -->
-    <MinVerPkgVer>[2.3.0,3.0)</MinVerPkgVer>
+    <MinVerPkgVer>[4.1.0,5.0)</MinVerPkgVer>
     <GoogleProtobufPkgVer>[3.19.4,4.0)</GoogleProtobufPkgVer>
     <GrpcPkgVer>[2.44.0,3.0)</GrpcPkgVer>
     <GrpcNetClientPkgVer>[2.43.0,3.0)</GrpcNetClientPkgVer>