From 52017bf181afad69b5713510c5a678f8b84a6d01 Mon Sep 17 00:00:00 2001 From: JohannesFinsveen <56305961+JohannesFinsveen@users.noreply.github.com> Date: Mon, 22 Aug 2022 13:31:31 +0200 Subject: [PATCH 1/2] Switched from using 6 small Serializer nugets to one. --- PCAxis.Api/PCAxis.Api.csproj | 16 ++------- PCAxis.Api/Serializers/JsonSerializer.cs | 2 +- PCAxis.Api/Serializers/JsonStat2Seriaizer.cs | 2 +- PCAxis.Api/Serializers/JsonStatSeriaizer.cs | 2 +- PCAxis.Api/Serializers/SdmxDataSerializer.cs | 2 +- PCAxis.Api/Serializers/XlsxSerializer.cs | 4 +-- PCAxis.Api/packages.config | 6 +--- .../ExcelSerializerCreator.cs | 4 +-- .../PCAxis.Excel.Web.Controls.csproj | 16 +++++++-- PCAxis.Excel.Web.Controls/SaveAsXlsx.cs | 4 +-- PCAxis.Excel.Web.Controls/packages.config | 6 +++- .../Html5TableSerializerCreator.cs | 4 +-- .../PCAxis.Html5Table.Web.Controls.csproj | 33 +++++++++++++++++-- .../SaveAsHtml5Table.cs | 4 +-- .../packages.config | 12 ++++++- .../JsonStatFileType.cs | 4 +-- .../JsonStatSerializerCreator.cs | 2 +- .../PCAxis.JsonStat.Web.Controls.csproj | 27 +++++++++++++-- PCAxis.JsonStat.Web.Controls/packages.config | 10 +++++- .../JsonStat2FileType.cs | 4 +-- .../JsonStat2SerializerCreator.cs | 2 +- .../PCAxis.JsonStat2.Web.Controls.csproj | 27 +++++++++++++-- PCAxis.JsonStat2.Web.Controls/packages.config | 10 +++++- PX.Json.Web.Controls/JsonSerializerCreator.cs | 4 +-- .../PX.Json.Web.Controls.csproj | 24 ++++++++++++-- PX.Json.Web.Controls/SaveAsJson.cs | 4 +-- PX.Json.Web.Controls/packages.config | 9 ++++- 27 files changed, 186 insertions(+), 58 deletions(-) diff --git a/PCAxis.Api/PCAxis.Api.csproj b/PCAxis.Api/PCAxis.Api.csproj index 7e20b9e48..b725d24da 100644 --- a/PCAxis.Api/PCAxis.Api.csproj +++ b/PCAxis.Api/PCAxis.Api.csproj @@ -109,9 +109,6 @@ ..\packages\PCAxis.Encryption.1.0.0\lib\netstandard2.0\PCAxis.Encryption.dll - - ..\packages\PCAxis.Excel.1.0.2\lib\netstandard2.0\PCAxis.Excel.dll - ..\packages\PCAxis.Menu.1.0.1\lib\netstandard2.0\PCAxis.Menu.dll @@ -133,20 +130,11 @@ ..\packages\PcAxis.Query.1.0.2\lib\netstandard2.0\PCAxis.Query.dll - - ..\packages\PCAxis.Sdmx.1.0.1\lib\netstandard2.0\PCAxis.Sdmx.dll - - - ..\packages\PCAxis.Serializers.JsonStat.1.0.5\lib\netstandard2.0\PCAxis.Serializers.JsonStat.dll - - - ..\packages\PCAxis.Serializers.JsonStat2.1.0.1\lib\netstandard2.0\PCAxis.Serializers.JsonStat2.dll - ..\packages\PcAxis.Sql.1.1.3\lib\netstandard2.0\PCAxis.Sql.dll - - ..\packages\PX.Serializers.Json.1.0.1\lib\netstandard2.0\PX.Serializers.Json.dll + + ..\packages\PCAxis.Serializers.1.0.0\lib\netstandard2.0\Serializers.dll diff --git a/PCAxis.Api/Serializers/JsonSerializer.cs b/PCAxis.Api/Serializers/JsonSerializer.cs index b9e58c36c..e517f0942 100644 --- a/PCAxis.Api/Serializers/JsonSerializer.cs +++ b/PCAxis.Api/Serializers/JsonSerializer.cs @@ -20,7 +20,7 @@ public class JsonSerializer :IWebSerializer public void Serialize(PCAxis.Paxiom.PXModel model, ResponseBucket cacheResponse) { cacheResponse.ContentType = "application/json; charset=" + System.Text.Encoding.UTF8.WebName; - PCAxis.Paxiom.IPXModelStreamSerializer serializer = new PX.Serializers.Json.JsonSerializer(); + PCAxis.Paxiom.IPXModelStreamSerializer serializer = new PCAxis.Serializers.JsonSerializer(); using (System.IO.MemoryStream stream = new System.IO.MemoryStream()) { diff --git a/PCAxis.Api/Serializers/JsonStat2Seriaizer.cs b/PCAxis.Api/Serializers/JsonStat2Seriaizer.cs index f0b6ed9a2..9053f9e4b 100644 --- a/PCAxis.Api/Serializers/JsonStat2Seriaizer.cs +++ b/PCAxis.Api/Serializers/JsonStat2Seriaizer.cs @@ -13,7 +13,7 @@ class JsonStat2Seriaizer : IWebSerializer public void Serialize(PCAxis.Paxiom.PXModel model, ResponseBucket cacheResponse) { cacheResponse.ContentType = "application/json; charset=" + System.Text.Encoding.UTF8.WebName; - PCAxis.Paxiom.IPXModelStreamSerializer serializer = new PCAxis.Serializers.JsonStat2.JsonStat2Serializer(); + PCAxis.Paxiom.IPXModelStreamSerializer serializer = new PCAxis.Serializers.JsonStat2Serializer(); using (System.IO.MemoryStream stream = new System.IO.MemoryStream()) { diff --git a/PCAxis.Api/Serializers/JsonStatSeriaizer.cs b/PCAxis.Api/Serializers/JsonStatSeriaizer.cs index f54815860..ea7e3fb1b 100644 --- a/PCAxis.Api/Serializers/JsonStatSeriaizer.cs +++ b/PCAxis.Api/Serializers/JsonStatSeriaizer.cs @@ -14,7 +14,7 @@ class JsonStatSeriaizer : IWebSerializer public void Serialize(PCAxis.Paxiom.PXModel model, ResponseBucket cacheResponse) { cacheResponse.ContentType = "application/json; charset=" + System.Text.Encoding.UTF8.WebName; - var jsonStatSerializer = new PCAxis.Serializers.JsonStat.JsonStatSerializer(); + var jsonStatSerializer = new PCAxis.Serializers.JsonStatSerializer(); var geoVariablesStr = ConfigurationManager.AppSettings["geoVariables"]; diff --git a/PCAxis.Api/Serializers/SdmxDataSerializer.cs b/PCAxis.Api/Serializers/SdmxDataSerializer.cs index 36b9b9020..a492c7ac0 100644 --- a/PCAxis.Api/Serializers/SdmxDataSerializer.cs +++ b/PCAxis.Api/Serializers/SdmxDataSerializer.cs @@ -13,7 +13,7 @@ class SdmxDataSerializer : IWebSerializer public void Serialize(PCAxis.Paxiom.PXModel model, ResponseBucket cacheResponse) { cacheResponse.ContentType = "text/xml; charset=" + System.Text.Encoding.Default.WebName; - PCAxis.Paxiom.IPXModelStreamSerializer serializer = new PCAxis.Sdmx.SdmxDataSerializer(); + PCAxis.Paxiom.IPXModelStreamSerializer serializer = new PCAxis.Serializers.SdmxDataSerializer(); using (System.IO.MemoryStream stream = new System.IO.MemoryStream()) { diff --git a/PCAxis.Api/Serializers/XlsxSerializer.cs b/PCAxis.Api/Serializers/XlsxSerializer.cs index b990aeace..cb4e9407c 100644 --- a/PCAxis.Api/Serializers/XlsxSerializer.cs +++ b/PCAxis.Api/Serializers/XlsxSerializer.cs @@ -18,7 +18,7 @@ class XlsxSerializer : IWebSerializer public void Serialize(PCAxis.Paxiom.PXModel model, HttpResponse httpResponse) { - PCAxis.Excel.XlsxSerializer serializer = new PCAxis.Excel.XlsxSerializer(); + PCAxis.Serializers.XlsxSerializer serializer = new PCAxis.Serializers.XlsxSerializer(); serializer.InformationLevel = PCAxis.Paxiom.InformationLevelType.AllInformation; serializer.DoubleColumn = PCAxis.Paxiom.Settings.Files.DoubleColumnFile; httpResponse.AddHeader("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet; charset=" + System.Text.Encoding.Default.WebName); @@ -34,7 +34,7 @@ public void Serialize(PCAxis.Paxiom.PXModel model, HttpResponse httpResponse) public void Serialize(PCAxis.Paxiom.PXModel model, ResponseBucket cacheResponse) { cacheResponse.ContentType = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet; charset=" + System.Text.Encoding.Default.WebName; - PCAxis.Excel.XlsxSerializer serializer = new PCAxis.Excel.XlsxSerializer(); + PCAxis.Serializers.XlsxSerializer serializer = new PCAxis.Serializers.XlsxSerializer(); serializer.InformationLevel = PCAxis.Paxiom.InformationLevelType.AllInformation; serializer.DoubleColumn = PCAxis.Paxiom.Settings.Files.DoubleColumnFile; diff --git a/PCAxis.Api/packages.config b/PCAxis.Api/packages.config index dac89b969..8c2f158ad 100644 --- a/PCAxis.Api/packages.config +++ b/PCAxis.Api/packages.config @@ -18,7 +18,6 @@ - @@ -26,11 +25,8 @@ - - - + - diff --git a/PCAxis.Excel.Web.Controls/ExcelSerializerCreator.cs b/PCAxis.Excel.Web.Controls/ExcelSerializerCreator.cs index b8110b0a3..7612d2db7 100644 --- a/PCAxis.Excel.Web.Controls/ExcelSerializerCreator.cs +++ b/PCAxis.Excel.Web.Controls/ExcelSerializerCreator.cs @@ -11,8 +11,8 @@ public class ExcelSerializerCreator : PCAxis.Web.Core.ISerializerCreator public Paxiom.IPXModelStreamSerializer Create(string fileInfo) { - PCAxis.Excel.XlsxSerializer ser; - ser = new XlsxSerializer(); + PCAxis.Serializers.XlsxSerializer ser; + ser = new PCAxis.Serializers.XlsxSerializer(); if (fileInfo.Equals("FileTypeExcelXDoubleColumn")) { diff --git a/PCAxis.Excel.Web.Controls/PCAxis.Excel.Web.Controls.csproj b/PCAxis.Excel.Web.Controls/PCAxis.Excel.Web.Controls.csproj index 6d82ceeb6..4a1e0c693 100644 --- a/PCAxis.Excel.Web.Controls/PCAxis.Excel.Web.Controls.csproj +++ b/PCAxis.Excel.Web.Controls/PCAxis.Excel.Web.Controls.csproj @@ -71,11 +71,23 @@ ..\packages\log4net.2.0.12\lib\net45\log4net.dll + + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + + + ..\packages\PCAxis.Common.1.0.1\lib\netstandard2.0\PCAxis.Common.dll + ..\packages\PcAxis.Core.1.0.3\lib\netstandard2.0\PCAxis.Core.dll - - ..\packages\PCAxis.Excel.1.0.2\lib\netstandard2.0\PCAxis.Excel.dll + + ..\packages\PCAxis.Metadata.1.0.1\lib\netstandard2.0\PCAxis.Metadata.dll + + + ..\packages\PCAxis.Query.1.0.1\lib\netstandard2.0\PCAxis.Query.dll + + + ..\packages\PCAxis.Serializers.1.0.0\lib\netstandard2.0\Serializers.dll diff --git a/PCAxis.Excel.Web.Controls/SaveAsXlsx.cs b/PCAxis.Excel.Web.Controls/SaveAsXlsx.cs index 30564e5eb..a72f03b0e 100644 --- a/PCAxis.Excel.Web.Controls/SaveAsXlsx.cs +++ b/PCAxis.Excel.Web.Controls/SaveAsXlsx.cs @@ -39,8 +39,8 @@ public override void SerializeAndStream() using (System.IO.MemoryStream stream = new System.IO.MemoryStream()) { - PCAxis.Excel.XlsxSerializer ser; - ser = new XlsxSerializer(); + PCAxis.Serializers.XlsxSerializer ser; + ser = new PCAxis.Serializers.XlsxSerializer(); if (this.SelectedFormat.Equals("FileTypeExcelXDoubleColumn")) { diff --git a/PCAxis.Excel.Web.Controls/packages.config b/PCAxis.Excel.Web.Controls/packages.config index 034b13075..e46bf6e89 100644 --- a/PCAxis.Excel.Web.Controls/packages.config +++ b/PCAxis.Excel.Web.Controls/packages.config @@ -5,8 +5,12 @@ + + - + + + diff --git a/PCAxis.Html5Table.Web.Controls/Html5TableSerializerCreator.cs b/PCAxis.Html5Table.Web.Controls/Html5TableSerializerCreator.cs index 192490771..98c6ce47e 100644 --- a/PCAxis.Html5Table.Web.Controls/Html5TableSerializerCreator.cs +++ b/PCAxis.Html5Table.Web.Controls/Html5TableSerializerCreator.cs @@ -13,8 +13,8 @@ public class Html5TableSerializerCreator : PCAxis.Web.Core.ISerializerCreator public Paxiom.IPXModelStreamSerializer Create(string fileInfo) { - PCAxis.Html5Table.Html5TableSerializer ser; - ser = new Html5TableSerializer(); + PCAxis.Serializers.Html5TableSerializer ser; + ser = new PCAxis.Serializers.Html5TableSerializer(); return ser; } diff --git a/PCAxis.Html5Table.Web.Controls/PCAxis.Html5Table.Web.Controls.csproj b/PCAxis.Html5Table.Web.Controls/PCAxis.Html5Table.Web.Controls.csproj index 6ea5353e0..e61024c75 100644 --- a/PCAxis.Html5Table.Web.Controls/PCAxis.Html5Table.Web.Controls.csproj +++ b/PCAxis.Html5Table.Web.Controls/PCAxis.Html5Table.Web.Controls.csproj @@ -31,14 +31,35 @@ 4 + + ..\packages\ClosedXML.0.95.4\lib\net46\ClosedXML.dll + + + ..\packages\DocumentFormat.OpenXml.2.7.2\lib\net46\DocumentFormat.OpenXml.dll + + + ..\packages\ExcelNumberFormat.1.0.10\lib\net20\ExcelNumberFormat.dll + ..\packages\log4net.2.0.12\lib\net45\log4net.dll + + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + + + ..\packages\PCAxis.Common.1.0.1\lib\netstandard2.0\PCAxis.Common.dll + ..\packages\PcAxis.Core.1.0.3\lib\netstandard2.0\PCAxis.Core.dll - - ..\packages\PCAxis.Html5Table.1.0.2\lib\netstandard2.0\PCAxis.Html5Table.dll + + ..\packages\PCAxis.Metadata.1.0.1\lib\netstandard2.0\PCAxis.Metadata.dll + + + ..\packages\PCAxis.Query.1.0.1\lib\netstandard2.0\PCAxis.Query.dll + + + ..\packages\PCAxis.Serializers.1.0.0\lib\netstandard2.0\Serializers.dll @@ -48,6 +69,14 @@ + + ..\packages\System.IO.FileSystem.Primitives.4.0.1\lib\net46\System.IO.FileSystem.Primitives.dll + True + True + + + ..\packages\System.IO.Packaging.4.0.0\lib\net46\System.IO.Packaging.dll + diff --git a/PCAxis.Html5Table.Web.Controls/SaveAsHtml5Table.cs b/PCAxis.Html5Table.Web.Controls/SaveAsHtml5Table.cs index 0c486f045..0024369f3 100644 --- a/PCAxis.Html5Table.Web.Controls/SaveAsHtml5Table.cs +++ b/PCAxis.Html5Table.Web.Controls/SaveAsHtml5Table.cs @@ -21,8 +21,8 @@ public override void SerializeAndStream() { using (System.IO.MemoryStream stream = new System.IO.MemoryStream()) { - PCAxis.Html5Table.Html5TableSerializer ser; - ser = new Html5TableSerializer(); + PCAxis.Serializers.Html5TableSerializer ser; + ser = new PCAxis.Serializers.Html5TableSerializer(); ser.Serialize(PaxiomManager.PaxiomModel, stream); diff --git a/PCAxis.Html5Table.Web.Controls/packages.config b/PCAxis.Html5Table.Web.Controls/packages.config index 9258ab9a1..899e251c8 100644 --- a/PCAxis.Html5Table.Web.Controls/packages.config +++ b/PCAxis.Html5Table.Web.Controls/packages.config @@ -1,9 +1,19 @@  + + + + + + - + + + + + diff --git a/PCAxis.JsonStat.Web.Controls/JsonStatFileType.cs b/PCAxis.JsonStat.Web.Controls/JsonStatFileType.cs index 6da05d41d..4590a1c47 100644 --- a/PCAxis.JsonStat.Web.Controls/JsonStatFileType.cs +++ b/PCAxis.JsonStat.Web.Controls/JsonStatFileType.cs @@ -21,8 +21,8 @@ public override void SerializeAndStream() { using (System.IO.MemoryStream stream = new System.IO.MemoryStream()) { - PCAxis.Serializers.JsonStat.JsonStatSerializer ser; - ser = new Serializers.JsonStat.JsonStatSerializer(); + PCAxis.Serializers.JsonStatSerializer ser; + ser = new PCAxis.Serializers.JsonStatSerializer(); var geoVariablesStr = ConfigurationManager.AppSettings["geoVariables"]; diff --git a/PCAxis.JsonStat.Web.Controls/JsonStatSerializerCreator.cs b/PCAxis.JsonStat.Web.Controls/JsonStatSerializerCreator.cs index 1f7753861..1718b667f 100644 --- a/PCAxis.JsonStat.Web.Controls/JsonStatSerializerCreator.cs +++ b/PCAxis.JsonStat.Web.Controls/JsonStatSerializerCreator.cs @@ -11,7 +11,7 @@ public class JsonStatSerializerCreator : PCAxis.Web.Core.ISerializerCreator { public PCAxis.Paxiom.IPXModelStreamSerializer Create(string fileInfo) { - var ser = new PCAxis.Serializers.JsonStat.JsonStatSerializer(); + var ser = new PCAxis.Serializers.JsonStatSerializer(); var geoVariablesStr = ConfigurationManager.AppSettings["geoVariables"]; diff --git a/PCAxis.JsonStat.Web.Controls/PCAxis.JsonStat.Web.Controls.csproj b/PCAxis.JsonStat.Web.Controls/PCAxis.JsonStat.Web.Controls.csproj index f20e4465c..3ed9b5268 100644 --- a/PCAxis.JsonStat.Web.Controls/PCAxis.JsonStat.Web.Controls.csproj +++ b/PCAxis.JsonStat.Web.Controls/PCAxis.JsonStat.Web.Controls.csproj @@ -33,20 +33,35 @@ false + + ..\packages\ClosedXML.0.95.4\lib\net46\ClosedXML.dll + + + ..\packages\DocumentFormat.OpenXml.2.7.2\lib\net46\DocumentFormat.OpenXml.dll + + + ..\packages\ExcelNumberFormat.1.0.10\lib\net20\ExcelNumberFormat.dll + ..\packages\log4net.2.0.12\lib\net45\log4net.dll ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + + ..\packages\PCAxis.Common.1.0.1\lib\netstandard2.0\PCAxis.Common.dll + ..\packages\PcAxis.Core.1.0.3\lib\netstandard2.0\PCAxis.Core.dll ..\packages\PCAxis.Metadata.1.0.1\lib\netstandard2.0\PCAxis.Metadata.dll - - ..\packages\PCAxis.Serializers.JsonStat.1.0.5\lib\netstandard2.0\PCAxis.Serializers.JsonStat.dll + + ..\packages\PCAxis.Query.1.0.1\lib\netstandard2.0\PCAxis.Query.dll + + + ..\packages\PCAxis.Serializers.1.0.0\lib\netstandard2.0\Serializers.dll @@ -56,6 +71,14 @@ + + ..\packages\System.IO.FileSystem.Primitives.4.0.1\lib\net46\System.IO.FileSystem.Primitives.dll + True + True + + + ..\packages\System.IO.Packaging.4.0.0\lib\net46\System.IO.Packaging.dll + diff --git a/PCAxis.JsonStat.Web.Controls/packages.config b/PCAxis.JsonStat.Web.Controls/packages.config index 2ab7bd890..c1909d235 100644 --- a/PCAxis.JsonStat.Web.Controls/packages.config +++ b/PCAxis.JsonStat.Web.Controls/packages.config @@ -1,11 +1,19 @@  + + + + + - + + + + diff --git a/PCAxis.JsonStat2.Web.Controls/JsonStat2FileType.cs b/PCAxis.JsonStat2.Web.Controls/JsonStat2FileType.cs index 1f7859161..145b6512b 100644 --- a/PCAxis.JsonStat2.Web.Controls/JsonStat2FileType.cs +++ b/PCAxis.JsonStat2.Web.Controls/JsonStat2FileType.cs @@ -21,8 +21,8 @@ public override void SerializeAndStream() { using (System.IO.MemoryStream stream = new System.IO.MemoryStream()) { - PCAxis.Serializers.JsonStat2.JsonStat2Serializer ser; - ser = new Serializers.JsonStat2.JsonStat2Serializer(); + PCAxis.Serializers.JsonStat2Serializer ser; + ser = new PCAxis.Serializers.JsonStat2Serializer(); //var geoVariablesStr = ConfigurationManager.AppSettings["geoVariables"]; diff --git a/PCAxis.JsonStat2.Web.Controls/JsonStat2SerializerCreator.cs b/PCAxis.JsonStat2.Web.Controls/JsonStat2SerializerCreator.cs index b28ecda91..b94f7ca38 100644 --- a/PCAxis.JsonStat2.Web.Controls/JsonStat2SerializerCreator.cs +++ b/PCAxis.JsonStat2.Web.Controls/JsonStat2SerializerCreator.cs @@ -11,7 +11,7 @@ public class JsonStatSerializerCreator : PCAxis.Web.Core.ISerializerCreator { public PCAxis.Paxiom.IPXModelStreamSerializer Create(string fileInfo) { - var ser = new PCAxis.Serializers.JsonStat2.JsonStat2Serializer(); + var ser = new PCAxis.Serializers.JsonStat2Serializer(); //var geoVariablesStr = ConfigurationManager.AppSettings["geoVariables"]; diff --git a/PCAxis.JsonStat2.Web.Controls/PCAxis.JsonStat2.Web.Controls.csproj b/PCAxis.JsonStat2.Web.Controls/PCAxis.JsonStat2.Web.Controls.csproj index af19d97cc..a35117117 100644 --- a/PCAxis.JsonStat2.Web.Controls/PCAxis.JsonStat2.Web.Controls.csproj +++ b/PCAxis.JsonStat2.Web.Controls/PCAxis.JsonStat2.Web.Controls.csproj @@ -30,20 +30,35 @@ 4 + + ..\packages\ClosedXML.0.95.4\lib\net46\ClosedXML.dll + + + ..\packages\DocumentFormat.OpenXml.2.7.2\lib\net46\DocumentFormat.OpenXml.dll + + + ..\packages\ExcelNumberFormat.1.0.10\lib\net20\ExcelNumberFormat.dll + ..\packages\log4net.2.0.12\lib\net45\log4net.dll ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + + ..\packages\PCAxis.Common.1.0.1\lib\netstandard2.0\PCAxis.Common.dll + ..\packages\PcAxis.Core.1.0.3\lib\netstandard2.0\PCAxis.Core.dll ..\packages\PCAxis.Metadata.1.0.1\lib\netstandard2.0\PCAxis.Metadata.dll - - ..\packages\PCAxis.Serializers.JsonStat2.1.0.5\lib\netstandard2.0\PCAxis.Serializers.JsonStat2.dll + + ..\packages\PCAxis.Query.1.0.1\lib\netstandard2.0\PCAxis.Query.dll + + + ..\packages\PCAxis.Serializers.1.0.0\lib\netstandard2.0\Serializers.dll @@ -53,6 +68,14 @@ + + ..\packages\System.IO.FileSystem.Primitives.4.0.1\lib\net46\System.IO.FileSystem.Primitives.dll + True + True + + + ..\packages\System.IO.Packaging.4.0.0\lib\net46\System.IO.Packaging.dll + diff --git a/PCAxis.JsonStat2.Web.Controls/packages.config b/PCAxis.JsonStat2.Web.Controls/packages.config index b2ddd31d4..899e251c8 100644 --- a/PCAxis.JsonStat2.Web.Controls/packages.config +++ b/PCAxis.JsonStat2.Web.Controls/packages.config @@ -1,11 +1,19 @@  + + + + + - + + + + diff --git a/PX.Json.Web.Controls/JsonSerializerCreator.cs b/PX.Json.Web.Controls/JsonSerializerCreator.cs index 1173da8f2..fbb7c0c4c 100644 --- a/PX.Json.Web.Controls/JsonSerializerCreator.cs +++ b/PX.Json.Web.Controls/JsonSerializerCreator.cs @@ -11,8 +11,8 @@ public class JsonSerializerCreator : PCAxis.Web.Core.ISerializerCreator { public IPXModelStreamSerializer Create(string fileInfo) { - PX.Serializers.Json.JsonSerializer ser; - ser = new Serializers.Json.JsonSerializer(); + PCAxis.Serializers.JsonSerializer ser; + ser = new PCAxis.Serializers.JsonSerializer(); return ser; } diff --git a/PX.Json.Web.Controls/PX.Json.Web.Controls.csproj b/PX.Json.Web.Controls/PX.Json.Web.Controls.csproj index 90a0174a4..287a79ef9 100644 --- a/PX.Json.Web.Controls/PX.Json.Web.Controls.csproj +++ b/PX.Json.Web.Controls/PX.Json.Web.Controls.csproj @@ -30,6 +30,15 @@ 4 + + ..\packages\ClosedXML.0.95.4\lib\net46\ClosedXML.dll + + + ..\packages\DocumentFormat.OpenXml.2.7.2\lib\net46\DocumentFormat.OpenXml.dll + + + ..\packages\ExcelNumberFormat.1.0.10\lib\net20\ExcelNumberFormat.dll + ..\packages\log4net.2.0.12\lib\net45\log4net.dll @@ -42,11 +51,14 @@ ..\packages\PcAxis.Core.1.0.3\lib\netstandard2.0\PCAxis.Core.dll + + ..\packages\PCAxis.Metadata.1.0.1\lib\netstandard2.0\PCAxis.Metadata.dll + ..\packages\PcAxis.Query.1.0.2\lib\netstandard2.0\PCAxis.Query.dll - - ..\packages\PX.Serializers.Json.1.0.1\lib\netstandard2.0\PX.Serializers.Json.dll + + ..\packages\PCAxis.Serializers.1.0.0\lib\netstandard2.0\Serializers.dll @@ -56,6 +68,14 @@ + + ..\packages\System.IO.FileSystem.Primitives.4.0.1\lib\net46\System.IO.FileSystem.Primitives.dll + True + True + + + ..\packages\System.IO.Packaging.4.0.0\lib\net46\System.IO.Packaging.dll + diff --git a/PX.Json.Web.Controls/SaveAsJson.cs b/PX.Json.Web.Controls/SaveAsJson.cs index fa94d191f..7088ff961 100644 --- a/PX.Json.Web.Controls/SaveAsJson.cs +++ b/PX.Json.Web.Controls/SaveAsJson.cs @@ -20,8 +20,8 @@ public override void SerializeAndStream() { using (System.IO.MemoryStream stream = new System.IO.MemoryStream()) { - PX.Serializers.Json.JsonSerializer ser; - ser = new Serializers.Json.JsonSerializer(); + PCAxis.Serializers.JsonSerializer ser; + ser = new PCAxis.Serializers.JsonSerializer(); ser.Serialize(PaxiomManager.PaxiomModel, stream); diff --git a/PX.Json.Web.Controls/packages.config b/PX.Json.Web.Controls/packages.config index cd4a27357..cd30bfd12 100644 --- a/PX.Json.Web.Controls/packages.config +++ b/PX.Json.Web.Controls/packages.config @@ -1,12 +1,19 @@  + + + + + - + + + From 5f042d7f1d105c58453a86622db7a2200bd1ec74 Mon Sep 17 00:00:00 2001 From: petroslikidis Date: Tue, 23 Aug 2022 15:55:33 +0200 Subject: [PATCH 2/2] Added change information --- CHANGES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.txt b/CHANGES.txt index b299e957f..fe2655f6b 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,4 @@ +- Changed to the PcAxis.Serializers nuget package - Upgraded the Newtonsoft JSON library dependenvis to 13.0.1 due to a vulnerability issue - Fixed marking tips translation in Swedish - Fixed shortcut texts for file formats in commandbar