- Updated Newtonsoft.Json to fix security issues

- Changed TargetFrameworks to only netstandard2.0
- Integrated original Pull-Request IG-Group#22 to fix localization issues

Author: teebeast

IGWebApiClient/IGStreamingApi.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Text;
 using com.lightstreamer.client;
@@ -114,43 +115,43 @@ public L1LsPriceData L1LsPriceUpdateData(ItemUpdate update)
 
                 if (!string.IsNullOrEmpty(midOpen))
                 {
-                    lsL1PriceData.MidOpen = Convert.ToDecimal(midOpen);
+                    lsL1PriceData.MidOpen = Convert.ToDecimal(midOpen, CultureInfo.InvariantCulture);
                 }
                 if (!string.IsNullOrEmpty(high))
                 {
-                    lsL1PriceData.High = Convert.ToDecimal(high);
+                    lsL1PriceData.High = Convert.ToDecimal(high, CultureInfo.InvariantCulture);
                 }
                 if (!string.IsNullOrEmpty(low))
                 {
-                    lsL1PriceData.Low = Convert.ToDecimal(low);
+                    lsL1PriceData.Low = Convert.ToDecimal(low, CultureInfo.InvariantCulture);
                 }
                 if (!string.IsNullOrEmpty(change))
                 {
-                    lsL1PriceData.Change = Convert.ToDecimal(change);
+                    lsL1PriceData.Change = Convert.ToDecimal(change, CultureInfo.InvariantCulture);
                 }
                 if (!string.IsNullOrEmpty(changePct))
                 {
-                    lsL1PriceData.ChangePct = Convert.ToDecimal(changePct);
+                    lsL1PriceData.ChangePct = Convert.ToDecimal(changePct, CultureInfo.InvariantCulture);
                 }
                 if (!string.IsNullOrEmpty(updateTime))
                 {
                     lsL1PriceData.UpdateTime = updateTime;
                 }
                 if (!string.IsNullOrEmpty(marketDelay))
                 {
-                    lsL1PriceData.MarketDelay = Convert.ToInt32(marketDelay);
+                    lsL1PriceData.MarketDelay = Convert.ToInt32(marketDelay, CultureInfo.InvariantCulture);
                 }
                 if (!string.IsNullOrEmpty(marketState))
                 {
                     lsL1PriceData.MarketState = marketState;
                 }
                 if (!string.IsNullOrEmpty(bid))
                 {
-                    lsL1PriceData.Bid = Convert.ToDecimal(bid);
+                    lsL1PriceData.Bid = Convert.ToDecimal(bid, CultureInfo.InvariantCulture);
                 }
                 if (!string.IsNullOrEmpty(offer))
                 {
-                    lsL1PriceData.Offer = Convert.ToDecimal(offer);
+                    lsL1PriceData.Offer = Convert.ToDecimal(offer, CultureInfo.InvariantCulture);
                 }
             }
             catch (Exception)
@@ -172,23 +173,23 @@ public StreamingAccountData StreamingAccountDataUpdates(ItemUpdate update)
 
                 if (!string.IsNullOrEmpty(pnl))
                 {
-                    streamingAccountData.ProfitAndLoss = Convert.ToDecimal(pnl);
+                    streamingAccountData.ProfitAndLoss = Convert.ToDecimal(pnl, CultureInfo.InvariantCulture);
                 }
                 if (!string.IsNullOrEmpty(deposit))
                 {
-                    streamingAccountData.Deposit = Convert.ToDecimal(deposit);
+                    streamingAccountData.Deposit = Convert.ToDecimal(deposit, CultureInfo.InvariantCulture);
                 }
                 if (!string.IsNullOrEmpty(usedMargin))
                 {
-                    streamingAccountData.UsedMargin = Convert.ToDecimal(usedMargin);
+                    streamingAccountData.UsedMargin = Convert.ToDecimal(usedMargin, CultureInfo.InvariantCulture);
                 }
                 if (!string.IsNullOrEmpty(amountDue))
                 {
-                    streamingAccountData.AmountDue = Convert.ToDecimal(amountDue);
+                    streamingAccountData.AmountDue = Convert.ToDecimal(amountDue, CultureInfo.InvariantCulture);
                 }
                 if (!string.IsNullOrEmpty(availableCash))
                 {
-                    streamingAccountData.AmountDue = Convert.ToDecimal(availableCash);
+                    streamingAccountData.AmountDue = Convert.ToDecimal(availableCash, CultureInfo.InvariantCulture);
                 }
 
             }

IGWebApiClient/IGWebApiClient.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net48;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>
     <SccAuxPath>SAK</SccAuxPath>
@@ -13,11 +13,11 @@
     <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <FileVersion>2.0.0.0</FileVersion>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>2.0.0-beta-2</Version>
+    <Version>2.0.0-beta-3</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Lightstreamer.DotNetStandard.Client" Version="5.0.5" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 </Project>

SampleWPFTrader/SampleWPFTrader.csproj

@@ -20,7 +20,7 @@
     <PackageReference Include="CommonServiceLocator" Version="2.0.6" />
     <PackageReference Include="Microsoft.Net.Http" Version="2.2.29" />
     <PackageReference Include="MvvmLightLibs" Version="5.4.1.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="Lightstreamer.DotNetStandard.Client" Version="5.0.5" />
   </ItemGroup>
   <ItemGroup>