From 9e39d42410e189659002b7741e2eaa33906a4ea2 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Mon, 1 Jun 2020 15:21:37 -0700 Subject: [PATCH] Updated nuget packages. --- BodyshopUploader/BodyshopPartner.csproj | 30 +++++++++---------- BodyshopUploader/Models/QbXmlResponse.cs | 5 ++-- BodyshopUploader/Utils/QuickBooksInterop.cs | 27 ----------------- .../ViewModels/MainViewModel.props.cs | 2 +- BodyshopUploader/packages.config | 18 +++++------ 5 files changed, 27 insertions(+), 55 deletions(-) diff --git a/BodyshopUploader/BodyshopPartner.csproj b/BodyshopUploader/BodyshopPartner.csproj index 5ed4fdb..67c5fcc 100644 --- a/BodyshopUploader/BodyshopPartner.csproj +++ b/BodyshopUploader/BodyshopPartner.csproj @@ -112,11 +112,11 @@ False ..\..\..\Program Files (x86)\Common Files\Intuit\QuickBooks\Interop.QBXMLRP2.dll - - ..\packages\MaterialDesignColors.1.2.2\lib\net45\MaterialDesignColors.dll + + ..\packages\MaterialDesignColors.1.2.6\lib\net45\MaterialDesignColors.dll - - ..\packages\MaterialDesignThemes.3.0.1\lib\net45\MaterialDesignThemes.Wpf.dll + + ..\packages\MaterialDesignThemes.3.1.3\lib\net45\MaterialDesignThemes.Wpf.dll ..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll @@ -127,22 +127,22 @@ ..\packages\MimeTypesMap.1.0.2\lib\net45\MimeTypesMap.dll - ..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.dll + ..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.dll - ..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Mdb.dll + ..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Mdb.dll - ..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Pdb.dll + ..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Pdb.dll - ..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Rocks.dll + ..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Rocks.dll ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.6.8\lib\net45\NLog.dll + ..\packages\NLog.4.7.2\lib\net45\NLog.dll ..\packages\squirrel.windows.1.9.1\lib\Net45\NuGet.Squirrel.dll @@ -169,7 +169,7 @@ True - ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll @@ -180,7 +180,7 @@ - ..\packages\System.Diagnostics.DiagnosticSource.4.7.0\lib\net46\System.Diagnostics.DiagnosticSource.dll + ..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll ..\packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll @@ -229,7 +229,7 @@ True - ..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll + ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll ..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll @@ -256,7 +256,7 @@ True - ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll ..\packages\System.Runtime.Extensions.4.3.1\lib\net462\System.Runtime.Extensions.dll @@ -460,16 +460,16 @@ - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + + \ No newline at end of file diff --git a/BodyshopUploader/Models/QbXmlResponse.cs b/BodyshopUploader/Models/QbXmlResponse.cs index 2936d94..a79858e 100644 --- a/BodyshopUploader/Models/QbXmlResponse.cs +++ b/BodyshopUploader/Models/QbXmlResponse.cs @@ -7,7 +7,7 @@ using System.Xml.Linq; namespace BodyshopPartner.Models { - public class QbXmlResponse : DTO_Base + public class QbXmlResponse : DTO_Base { public QbXmlResponse() { @@ -51,8 +51,7 @@ namespace BodyshopPartner.Models public override string ToString() { - string r = $"Response Type: {ResponseType} | Severity: {StatusSeverity} | Code: {StatusCode} | {StatusMessage}"; - return r; + return $"Response Type: {ResponseType} | Severity: {StatusSeverity} | Code: {StatusCode} | {StatusMessage}"; } } } diff --git a/BodyshopUploader/Utils/QuickBooksInterop.cs b/BodyshopUploader/Utils/QuickBooksInterop.cs index dcb651e..8f7d863 100644 --- a/BodyshopUploader/Utils/QuickBooksInterop.cs +++ b/BodyshopUploader/Utils/QuickBooksInterop.cs @@ -86,34 +86,7 @@ namespace BodyshopPartner.Utils ResponseType = System.Text.RegularExpressions.Regex.Unescape(QueryResponse.Name.LocalName), Response = response }; - //response. } - //public static string[] parseInvoiceAddRs(string xml) - //{ - // string[] retVal = new string[3]; - // try - // { - // XmlNodeList RsNodeList = null; - // XmlDocument Doc = new XmlDocument(); - // Doc.LoadXml(xml); - // RsNodeList = Doc.GetElementsByTagName("InvoiceAddRs"); - // XmlAttributeCollection rsAttributes = RsNodeList.Item(0).Attributes; - // XmlNode statusCode = rsAttributes.GetNamedItem("statusCode"); - // retVal[0] = Convert.ToString(statusCode.Value); - // XmlNode statusSeverity = rsAttributes.GetNamedItem("statusSeverity"); - // retVal[1] = Convert.ToString(statusSeverity.Value); - // XmlNode statusMessage = rsAttributes.GetNamedItem("statusMessage"); - // retVal[2] = Convert.ToString(statusMessage.Value); - // } - // catch (Exception e) - // { - // logger.Error("Error encountered when parsing Invoice info returned from QuickBooks: " + e.Message); - // retVal = null; - // } - // return retVal; - //} - - } } diff --git a/BodyshopUploader/ViewModels/MainViewModel.props.cs b/BodyshopUploader/ViewModels/MainViewModel.props.cs index 62e0db7..c8cf20b 100644 --- a/BodyshopUploader/ViewModels/MainViewModel.props.cs +++ b/BodyshopUploader/ViewModels/MainViewModel.props.cs @@ -49,7 +49,7 @@ namespace BodyshopPartner.ViewModels set { SetProperty(ref _activeShop, value); Task.Run(async () => await SetActiveBodyshop()); } } - private string _httpServerLog = "Status Log\nNewLine\n"; + private string _httpServerLog = ""; public string HttpServerLog { get { return _httpServerLog; } diff --git a/BodyshopUploader/packages.config b/BodyshopUploader/packages.config index 31a0cc5..684a8a2 100644 --- a/BodyshopUploader/packages.config +++ b/BodyshopUploader/packages.config @@ -6,16 +6,16 @@ - - + + - + - + - + @@ -24,12 +24,12 @@ - + - + @@ -41,7 +41,7 @@ - + @@ -52,7 +52,7 @@ - +