Merge branch 'main' into cmake-windows

lalitb · web-flow · commit 31cf7573a41e · 2022-06-28T11:12:10.000-07:00
diff --git a/lib/modules b/lib/modules
@@ -1 +1 @@
-Subproject commit d241d2ef4ad305cd9243c2ee7bbb9dc078d35b68
+Subproject commit 78c37db54c5085da5149b572358a2633d03aa7b3
diff --git a/tests/unittests/PalTests.cpp b/tests/unittests/PalTests.cpp
@@ -122,7 +122,7 @@ TEST_F(PalTests, SdkVersion)
     EXPECT_THAT(std::count(v.cbegin(), v.cend(), '-'), Eq(4));
     EXPECT_THAT(v, StartsWith(EVTSDK_VERSION_PREFIX "-"));
     EXPECT_THAT(v.at(v.find('-', 0) + 1), Ne('-'));
-    EXPECT_THAT(v, HasSubstr("-C++-No-"));
+    EXPECT_THAT(v, HasSubstr(std::string("-C++-" ECS_SUPP "-")));
     EXPECT_THAT(v, EndsWith(BUILD_VERSION_STR));
 
     EXPECT_THAT(PAL::getSdkVersion(), Eq(v));
diff --git a/tools/fiddler/OneDSInspector/packages.config b/tools/fiddler/OneDSInspector/packages.config
@@ -3,5 +3,5 @@
   <package id="Bond.Compiler" version="9.0.4" targetFramework="net461" />
   <package id="Bond.Core.CSharp" version="9.0.3" targetFramework="net461" />
   <package id="Bond.Runtime.CSharp" version="9.0.3" targetFramework="net461" />
-  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
 </packages>
diff --git a/tools/server/server.csproj b/tools/server/server.csproj
@@ -19,7 +19,7 @@
     <PackageReference Include="Bond.Compiler" Version="9.0.4" />
     <PackageReference Include="Bond.Core.CSharp" Version="9.0.3" />
     <PackageReference Include="Bond.Runtime.CSharp" Version="9.0.3" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
   <Import Project="../decoder/decoder.projitems" Label="Shared" />
diff --git a/wrappers/obj-c/ODWLogConfiguration.mm b/wrappers/obj-c/ODWLogConfiguration.mm
@@ -311,8 +311,8 @@ -(nullable ILogConfiguration*)getWrappedConfiguration
 +(nullable ODWLogConfiguration *)getLogConfigurationCopy
 {
     auto& config = LogManager::GetLogConfiguration();
-    static ILogConfiguration configCopy(config);
-    return [[ODWLogConfiguration alloc] initWithILogConfiguration: &configCopy];
+    auto configCopy = new ILogConfiguration(config);
+    return [[ODWLogConfiguration alloc] initWithILogConfiguration: configCopy];
 }
 
 +(void)setEventCollectorUri:(nonnull NSString *)eventCollectorUri

Original file line number	Diff line number	Diff line change
`@@ -311,8 +311,8 @@ -(nullable ILogConfiguration*)getWrappedConfiguration`
`311`	`311`	`+(nullable ODWLogConfiguration *)getLogConfigurationCopy`
`312`	`312`	`{`
`313`	`313`	`auto& config = LogManager::GetLogConfiguration();`
`314`		`- static ILogConfiguration configCopy(config);`
`315`		`- return [[ODWLogConfiguration alloc] initWithILogConfiguration: &configCopy];`
	`314`	`+ auto configCopy = new ILogConfiguration(config);`
	`315`	`+ return [[ODWLogConfiguration alloc] initWithILogConfiguration: configCopy];`
`316`	`316`	`}`
`317`	`317`
`318`	`318`	`+(void)setEventCollectorUri:(nonnull NSString *)eventCollectorUri`