Fix build and dependencies

elastic · Nov 25, 2024 · 76068de · 76068de
1 parent f61a166
commit 76068de
Show file tree

Hide file tree

Showing 9 changed files with 255 additions and 245 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -111,15 +111,15 @@
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.2" />
 
     <PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.1" />
 
-    <PackageVersion Include="Microsoft.NET.Sdk.Functions" Version="4.1.1" />
+    <PackageVersion Include="Microsoft.NET.Sdk.Functions" Version="4.6.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageVersion Include="Microsoft.Owin.Host.SystemWeb" Version="4.1.1" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />

diff --git a/src/Elastic.Apm/Libraries/Newtonsoft.Json/JsonException.cs b/src/Elastic.Apm/Libraries/Newtonsoft.Json/JsonException.cs
@@ -73,9 +73,11 @@ public JsonException(string message, Exception? innerException)
         /// <exception cref="ArgumentNullException">The <paramref name="info"/> parameter is <c>null</c>.</exception>
         /// <exception cref="SerializationException">The class name is <c>null</c> or <see cref="Exception.HResult"/> is zero (0).</exception>
         public JsonException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
+#pragma warning disable SYSLIB0051
+			: base(info, context)
+#pragma warning restore SYSLIB0051
+		{
+		}
 #endif
 
 		internal static JsonException Create(IJsonLineInfo lineInfo, string path, string message)

diff --git a/src/Elastic.Apm/Libraries/Newtonsoft.Json/Serialization/JsonFormatterConverter.cs b/src/Elastic.Apm/Libraries/Newtonsoft.Json/Serialization/JsonFormatterConverter.cs
@@ -1,4 +1,4 @@
-#region License
+#region License
 
 // Copyright (c) 2007 James Newton-King
 //
@@ -35,9 +35,11 @@
 #nullable enable
 namespace Elastic.Apm.Libraries.Newtonsoft.Json.Serialization
 {
-    internal class JsonFormatterConverter : IFormatterConverter
-    {
-        private readonly JsonSerializerInternalReader _reader;
+#pragma warning disable SYSLIB0050
+	internal class JsonFormatterConverter : IFormatterConverter
+#pragma warning restore SYSLIB0050
+	{
+		private readonly JsonSerializerInternalReader _reader;
         private readonly JsonISerializableContract _contract;
         private readonly JsonProperty? _member;
 

diff --git a/src/Elastic.Apm/Libraries/Newtonsoft.Json/Serialization/JsonObjectContract.cs b/src/Elastic.Apm/Libraries/Newtonsoft.Json/Serialization/JsonObjectContract.cs
@@ -1,4 +1,4 @@
-#region License
+#region License
 
 // Copyright (c) 2007 James Newton-King
 //
@@ -183,8 +183,10 @@ internal object GetUninitializedObject()
                 throw new JsonException("Insufficient permissions. Creating an uninitialized '{0}' type requires full trust.".FormatWith(CultureInfo.InvariantCulture, NonNullableUnderlyingType));
             }
 
-            return FormatterServices.GetUninitializedObject(NonNullableUnderlyingType);
-        }
+#pragma warning disable SYSLIB0050
+			return FormatterServices.GetUninitializedObject(NonNullableUnderlyingType);
+#pragma warning restore SYSLIB0050
+		}
 #endif
 	}
 }
diff --git a/src/Elastic.Apm/Libraries/Newtonsoft.Json/Serialization/JsonSerializerInternalReader.cs b/src/Elastic.Apm/Libraries/Newtonsoft.Json/Serialization/JsonSerializerInternalReader.cs
@@ -1552,9 +1552,11 @@ private object CreateISerializable(JsonReader reader, JsonISerializableContract
                 TraceWriter.Trace(TraceLevel.Info, JsonPosition.FormatMessage(reader as IJsonLineInfo, reader.Path, "Deserializing {0} using ISerializable constructor.".FormatWith(CultureInfo.InvariantCulture, contract.UnderlyingType)), null);
             }
 
-            SerializationInfo serializationInfo = new SerializationInfo(contract.UnderlyingType, new JsonFormatterConverter(this, contract, member));
+#pragma warning disable SYSLIB0050
+			SerializationInfo serializationInfo = new SerializationInfo(contract.UnderlyingType, new JsonFormatterConverter(this, contract, member));
+#pragma warning restore SYSLIB0050
 
-            bool finished = false;
+			bool finished = false;
             do
             {
                 switch (reader.TokenType)

diff --git a/src/Elastic.Apm/Libraries/Newtonsoft.Json/Serialization/JsonSerializerInternalWriter.cs b/src/Elastic.Apm/Libraries/Newtonsoft.Json/Serialization/JsonSerializerInternalWriter.cs
@@ -761,10 +761,12 @@ private void SerializeISerializable(JsonWriter writer, ISerializable value, Json
 
             WriteObjectStart(writer, value, contract, member, collectionContract, containerProperty);
 
-            SerializationInfo serializationInfo = new SerializationInfo(contract.UnderlyingType, new FormatterConverter());
+#pragma warning disable SYSLIB0050
+			SerializationInfo serializationInfo = new SerializationInfo(contract.UnderlyingType, new FormatterConverter());
             value.GetObjectData(serializationInfo, Serializer._context);
+#pragma warning restore SYSLIB0050
 
-            foreach (SerializationEntry serializationEntry in serializationInfo)
+			foreach (SerializationEntry serializationEntry in serializationInfo)
             {
                 JsonContract? valueContract = GetContractSafe(serializationEntry.Value);