Update SystemTextJsonToolsetVersion (#108704) (#2715)

* Update SystemTextJsonToolsetVersion (#108704)

* Fix Linux build

* Avoid running tests

* Update src/coreclr/inc/stack.h

Co-authored-by: Aaron Robinson <arobins@microsoft.com>

* Format string

* Update src/coreclr/vm/interpreter.cpp

---------

Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
Co-authored-by: Aaron Robinson <arobins@microsoft.com>

Author: 3 people

eng/Versions.props

@@ -136,7 +136,7 @@
     <runtimenativeSystemIOPortsVersion>10.0.0-alpha.1.24472.5</runtimenativeSystemIOPortsVersion>
     <!-- Keep toolset versions in sync with dotnet/msbuild and dotnet/sdk -->
     <SystemCollectionsImmutableToolsetVersion>8.0.0</SystemCollectionsImmutableToolsetVersion>
-    <SystemTextJsonToolsetVersion>8.0.4</SystemTextJsonToolsetVersion>
+    <SystemTextJsonToolsetVersion>8.0.5</SystemTextJsonToolsetVersion>
     <SystemReflectionMetadataToolsetVersion>8.0.0</SystemReflectionMetadataToolsetVersion>
     <SystemReflectionMetadataLoadContextToolsetVersion>8.0.0</SystemReflectionMetadataLoadContextToolsetVersion>
     <!-- Runtime-Assets dependencies -->

eng/pipelines/runtimelab.yml

@@ -80,11 +80,6 @@ extends:
             jobParameters:
               timeoutInMinutes: 180
               buildArgs: -s clr+libs+libs.tests+clr.hosts+packs -c $(_BuildConfig) /p:ArchiveTests=true
-              postBuildSteps:
-                - template: /eng/pipelines/libraries/helix.yml
-                  parameters:
-                    creator: dotnet-bot
-                    testRunNamePrefixSuffix: Libraries_$(_BuildConfig)
               extraVariablesTemplates:
                 - template: /eng/pipelines/common/templates/runtimes/test-variables.yml
 

src/coreclr/inc/stack.h

@@ -17,12 +17,11 @@ class Stack
     unsigned m_elemsSize;
     unsigned m_elemsCount;
 
-    static const unsigned InitSize = 8;
-
     void GrowForPush()
     {
         if (m_elemsCount == m_elemsSize)
         {
+            const unsigned InitSize = 8;
             m_elemsSize = max(InitSize, 2*m_elemsSize);
             T* newElems = new T[m_elemsSize];
             if (m_elemsCount != 0)

src/coreclr/vm/interpreter.cpp

@@ -22,6 +22,20 @@
 #include "runtimehandles.h"
 #include "vars.hpp"
 #include "cycletimer.h"
+#include <math.h>
+#include <inttypes.h>
+
+#ifndef _I64_MIN
+#define _I64_MIN LLONG_MIN
+#endif
+
+#ifndef _I64_MAX
+#define _I64_MAX LLONG_MAX
+#endif
+
+#ifndef _UI64_MAX
+#define _UI64_MAX ULLONG_MAX
+#endif
 
 inline CORINFO_CALLINFO_FLAGS combine(CORINFO_CALLINFO_FLAGS flag1, CORINFO_CALLINFO_FLAGS flag2)
 {
@@ -6521,7 +6535,7 @@ void Interpreter::CkFinite()
         break;
     }
 
-    if (!isfinite(val))
+    if (!std::isfinite(val))
         ThrowSysArithException();
 }
 
@@ -6843,17 +6857,6 @@ void Interpreter::SetILInstrCategories()
 }
 #endif // INTERP_ILINSTR_PROFILE
 
-#ifndef TARGET_WINDOWS
-namespace
-{
-    bool isnan(float val)
-    {
-        UINT32 bits = *reinterpret_cast<UINT32*>(&val);
-        return (bits & 0x7FFFFFFFU) > 0x7F800000U;
-    }
-}
-#endif
-
 template<int op>
 void Interpreter::CompareOp()
 {
@@ -7160,7 +7163,7 @@ INT32 Interpreter::CompareOpRes(unsigned op1idx)
                 else if (op == CO_GT_UN)
                 {
                     // Check for NAN's here: if either is a NAN, they're unordered, so this comparison returns true.
-                    if (isnan(val1) || isnan(val2)) res = 1;
+                    if (std::isnan(val1) || std::isnan(val2)) res = 1;
                     else if (val1 > val2) res = 1;
                 }
                 else if (op == CO_LT)
@@ -7171,7 +7174,7 @@ INT32 Interpreter::CompareOpRes(unsigned op1idx)
                 {
                     _ASSERTE(op == CO_LT_UN);
                     // Check for NAN's here: if either is a NAN, they're unordered, so this comparison returns true.
-                    if (isnan(val1) || isnan(val2)) res = 1;
+                    if (std::isnan(val1) || std::isnan(val2)) res = 1;
                     else if (val1 < val2) res = 1;
                 }
             }
@@ -7202,7 +7205,7 @@ INT32 Interpreter::CompareOpRes(unsigned op1idx)
                 else if (op == CO_GT_UN)
                 {
                     // Check for NAN's here: if either is a NAN, they're unordered, so this comparison returns true.
-                    if (isnan(val1) || isnan(val2)) res = 1;
+                    if (std::isnan(val1) || std::isnan(val2)) res = 1;
                     else if (val1 > val2) res = 1;
                 }
                 else if (op == CO_LT)
@@ -7213,7 +7216,7 @@ INT32 Interpreter::CompareOpRes(unsigned op1idx)
                 {
                     _ASSERTE(op == CO_LT_UN);
                     // Check for NAN's here: if either is a NAN, they're unordered, so this comparison returns true.
-                    if (isnan(val1) || isnan(val2)) res = 1;
+                    if (std::isnan(val1) || std::isnan(val2)) res = 1;
                     else if (val1 < val2) res = 1;
                 }
             }
@@ -11917,10 +11920,6 @@ void Interpreter::OpStackNormalize()
     m_orOfPushedInterpreterTypes = 0;
 }
 
-#if INTERP_TRACING
-
-// Code copied from eeinterface.cpp in "compiler".  Should be common...
-
 static const char* CorInfoTypeNames[] = {
     "undef",
     "void",
@@ -12036,6 +12035,10 @@ const char* Interpreter::getMethodName(CEEInfo* info, CORINFO_METHOD_HANDLE hnd,
     return info->getMethodNameFromMetadata(hnd, className, namespaceName, nullptr, 0);
 }
 
+#if INTERP_TRACING
+
+// Code copied from eeinterface.cpp in "compiler".  Should be common...
+
 const char* eeGetMethodFullName(CEEInfo* info, CORINFO_METHOD_HANDLE hnd, const char** clsName)
 {
     CONTRACTL {
@@ -12316,13 +12319,13 @@ void Interpreter::PrintValue(InterpreterType it, BYTE* valAddr)
     case CORINFO_TYPE_NATIVEINT:
         {
             INT64 val = static_cast<INT64>(*reinterpret_cast<NativeInt*>(valAddr));
-            fprintf(GetLogFile(), "%lld (= 0x%llx)", val, val);
+            fprintf(GetLogFile(), "%" PRId64 " (= 0x%" PRIx64 ")", val, val);
         }
         break;
     case CORINFO_TYPE_NATIVEUINT:
         {
             UINT64 val = static_cast<UINT64>(*reinterpret_cast<NativeUInt*>(valAddr));
-            fprintf(GetLogFile(), "%lld (= 0x%llx)", val, val);
+            fprintf(GetLogFile(), "%" PRIu64 " (= 0x%" PRIx64 ")", val, val);
         }
         break;
 
@@ -12333,11 +12336,11 @@ void Interpreter::PrintValue(InterpreterType it, BYTE* valAddr)
     case CORINFO_TYPE_LONG:
         {
             INT64 val = *reinterpret_cast<INT64*>(valAddr);
-            fprintf(GetLogFile(), "%lld (= 0x%llx)", val, val);
+            fprintf(GetLogFile(), "%" PRId64 " (= 0x%" PRIx64 ")", val, val);
         }
         break;
     case CORINFO_TYPE_ULONG:
-        fprintf(GetLogFile(), "%lld", *reinterpret_cast<UINT64*>(valAddr));
+        fprintf(GetLogFile(), "%" PRIu64 "", *reinterpret_cast<UINT64*>(valAddr));
         break;
 
     case CORINFO_TYPE_CLASS:

src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj

@@ -23,6 +23,7 @@
     <PackageReference Include="LightInject.Microsoft.DependencyInjection" Version="3.7.1" />
     <PackageReference Include="Grace.DependencyInjection.Extensions" Version="7.1.0" />
     <PackageReference Include="Stashbox.Extensions.Dependencyinjection" Version="4.2.3" />
+    <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonToolsetVersion)" />
   </ItemGroup>
 
   <!-- These packages don't support .NETFramework -->

src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj

@@ -47,6 +47,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Playwright" Version="1.47.0" />
+    <PackageReference Include="MSBuild.StructuredLogger" Version="2.2.350" />
+    <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonToolsetVersion)" />
     <ProjectReference Include="$(RepoRoot)src\tasks\Microsoft.NET.Sdk.WebAssembly.Pack.Tasks\Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj" />
     <Compile Include="$(BrowserProjectRoot)debugger\DebuggerTestSuite\BrowserLocator.cs" />