From e03a8cd0e343516c7662b7155182860d5308a880 Mon Sep 17 00:00:00 2001
From: Jonas Houben <jonashoubenring@gmail.com>
Date: Wed, 26 Jun 2019 22:59:20 +0200
Subject: [PATCH] NuGet Updates
---
NLog.xsd | 42 +++++++++++++++++++++++++++--------------
TelemetryServer4.vbproj | 2 +-
packages.config | 4 ++--
3 files changed, 31 insertions(+), 17 deletions(-)
diff --git a/NLog.xsd b/NLog.xsd
index dd0e214..25f0617 100644
--- a/NLog.xsd
+++ b/NLog.xsd
@@ -72,7 +72,7 @@
</xs:attribute>
<xs:attribute name="parseMessageTemplates" type="xs:boolean">
<xs:annotation>
- <xs:documentation>Perform mesage template parsing and formatting of LogEvent messages (true = Always, false = Never, empty = Auto Detect). Default value is: empty.</xs:documentation>
+ <xs:documentation>Perform message template parsing and formatting of LogEvent messages (true = Always, false = Never, empty = Auto Detect). Default value is: empty.</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:complexType>
@@ -215,12 +215,19 @@
</xs:attribute>
</xs:complexType>
<xs:complexType name="NLogVariable">
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="value" minOccurs="0" maxOccurs="1" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>Variable value. Note, the 'value' attribute has precedence over this one.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:choice>
<xs:attribute name="name" type="xs:string" use="required">
<xs:annotation>
<xs:documentation>Variable name.</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="value" type="SimpleLayoutAttribute" use="required">
+ <xs:attribute name="value" type="SimpleLayoutAttribute">
<xs:annotation>
<xs:documentation>Variable value.</xs:documentation>
</xs:annotation>
@@ -630,7 +637,7 @@
</xs:choice>
<xs:attribute name="layout" type="SimpleLayoutAttribute">
<xs:annotation>
- <xs:documentation>Layout that should be use to calcuate the value for the parameter.</xs:documentation>
+ <xs:documentation>Layout that should be use to calculate the value for the parameter.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="name" type="xs:string">
@@ -1021,7 +1028,7 @@
</xs:attribute>
<xs:attribute name="layout" type="SimpleLayoutAttribute">
<xs:annotation>
- <xs:documentation>Layout that should be use to calcuate the value for the parameter.</xs:documentation>
+ <xs:documentation>Layout that should be use to calculate the value for the parameter.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="dbType" type="xs:string">
@@ -1369,7 +1376,7 @@
</xs:attribute>
<xs:attribute name="forceMutexConcurrentWrites" type="xs:boolean">
<xs:annotation>
- <xs:documentation>Value indicationg whether file creation calls should be synchronized by a system global mutex.</xs:documentation>
+ <xs:documentation>Indicates whether file creation calls should be synchronized by a system global mutex.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="replaceFileContentsOnEachWrite" type="xs:boolean">
@@ -1556,11 +1563,6 @@
<xs:documentation>Condition expression. Log events who meet this condition will be forwarded to the wrapped target.</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="filter" type="Filter">
- <xs:annotation>
- <xs:documentation>Filter. Log events who evaluates to will be discarded</xs:documentation>
- </xs:annotation>
- </xs:attribute>
<xs:attribute name="optimizeBufferReuse" type="xs:boolean">
<xs:annotation>
<xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
@@ -2944,7 +2946,7 @@
</xs:attribute>
<xs:attribute name="encode" type="xs:boolean">
<xs:annotation>
- <xs:documentation>Determines wether or not this attribute will be Json encoded.</xs:documentation>
+ <xs:documentation>Determines whether or not this attribute will be Json encoded.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="escapeUnicode" type="xs:boolean">
@@ -2989,10 +2991,12 @@
<xs:extension base="Layout">
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="includeAllProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+ <xs:element name="includeCallSite" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="includeMdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="includeMdlc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="includeNdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="includeNdlc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+ <xs:element name="includeSourceInfo" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="parameter" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.NLogViewerParameterInfo" />
</xs:choice>
<xs:attribute name="includeAllProperties" type="xs:boolean">
@@ -3000,6 +3004,11 @@
<xs:documentation>Option to include all properties from the log events</xs:documentation>
</xs:annotation>
</xs:attribute>
+ <xs:attribute name="includeCallSite" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>Indicates whether to include call site (class and method name) in the information sent over the network.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
<xs:attribute name="includeMdc" type="xs:boolean">
<xs:annotation>
<xs:documentation>Indicates whether to include contents of the dictionary.</xs:documentation>
@@ -3020,6 +3029,11 @@
<xs:documentation>Indicates whether to include contents of the stack.</xs:documentation>
</xs:annotation>
</xs:attribute>
+ <xs:attribute name="includeSourceInfo" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>Indicates whether to include source info (file name and line number) in the information sent over the network.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -3125,7 +3139,7 @@
</xs:attribute>
<xs:attribute name="elementEncode" type="xs:boolean">
<xs:annotation>
- <xs:documentation>Determines wether or not this attribute will be Xml encoded.</xs:documentation>
+ <xs:documentation>Determines whether or not this attribute will be Xml encoded.</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:extension>
@@ -3150,7 +3164,7 @@
</xs:attribute>
<xs:attribute name="encode" type="xs:boolean">
<xs:annotation>
- <xs:documentation>Determines wether or not this attribute will be Xml encoded.</xs:documentation>
+ <xs:documentation>Determines whether or not this attribute will be Xml encoded.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="includeEmptyValue" type="xs:boolean">
@@ -3180,7 +3194,7 @@
</xs:choice>
<xs:attribute name="encode" type="xs:boolean">
<xs:annotation>
- <xs:documentation>Determines wether or not this attribute will be Xml encoded.</xs:documentation>
+ <xs:documentation>Determines whether or not this attribute will be Xml encoded.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="name" type="xs:string">
diff --git a/TelemetryServer4.vbproj b/TelemetryServer4.vbproj
index 003dd20..a9a047f 100644
--- a/TelemetryServer4.vbproj
+++ b/TelemetryServer4.vbproj
@@ -61,7 +61,7 @@
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
- <HintPath>..\packages\NLog.4.6.4\lib\net45\NLog.dll</HintPath>
+ <HintPath>..\packages\NLog.4.6.5\lib\net45\NLog.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
diff --git a/packages.config b/packages.config
index 41afccf..7516657 100644
--- a/packages.config
+++ b/packages.config
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="NLog" version="4.6.4" targetFramework="net462" />
- <package id="NLog.Schema" version="4.6.4" targetFramework="net462" />
+ <package id="NLog" version="4.6.5" targetFramework="net462" />
+ <package id="NLog.Schema" version="4.6.5" targetFramework="net462" />
</packages>
\ No newline at end of file
--
GitLab