Skip to content

Commit

Permalink
update | updated nuget packages
Browse files Browse the repository at this point in the history
  • Loading branch information
Mike Pohatu committed Jan 30, 2024
1 parent f75946b commit 91297ff
Show file tree
Hide file tree
Showing 8 changed files with 108 additions and 96 deletions.
2 changes: 1 addition & 1 deletion Core/Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.5.2.4\lib\net46\NLog.dll</HintPath>
<HintPath>..\packages\NLog.5.2.8\lib\net46\NLog.dll</HintPath>
</Reference>
<Reference Include="PresentationFramework" />
<Reference Include="System" />
Expand Down
88 changes: 47 additions & 41 deletions Core/NLog.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -1358,40 +1358,41 @@
<xs:element name="layout" type="Layout" minOccurs="0" maxOccurs="1" />
<xs:element name="header" type="Layout" minOccurs="0" maxOccurs="1" />
<xs:element name="footer" type="Layout" minOccurs="0" maxOccurs="1" />
<xs:element name="writeFooterOnArchivingOnly" type="xs:boolean" minOccurs="0" maxOccurs="1" default="false" />
<xs:element name="maxArchiveFiles" type="xs:integer" minOccurs="0" maxOccurs="1" default="0" />
<xs:element name="maxArchiveDays" type="xs:integer" minOccurs="0" maxOccurs="1" default="0" />
<xs:element name="enableArchiveFileCompression" type="xs:boolean" minOccurs="0" maxOccurs="1" default="false" />
<xs:element name="archiveOldFileOnStartupAboveSize" type="xs:long" minOccurs="0" maxOccurs="1" default="0" />
<xs:element name="archiveOldFileOnStartup" type="xs:boolean" minOccurs="0" maxOccurs="1" default="false" />
<xs:element name="enableArchiveFileCompression" type="xs:boolean" minOccurs="0" maxOccurs="1" default="false" />
<xs:element name="archiveFileName" type="Layout" minOccurs="0" maxOccurs="1" />
<xs:element name="archiveFileKind" type="NLog.Targets.FilePathKind" minOccurs="0" maxOccurs="1" default="Unknown" />
<xs:element name="archiveFileName" type="Layout" minOccurs="0" maxOccurs="1" />
<xs:element name="maxArchiveFiles" type="xs:integer" minOccurs="0" maxOccurs="1" default="0" />
<xs:element name="archiveEvery" type="NLog.Targets.FileArchivePeriod" minOccurs="0" maxOccurs="1" default="None" />
<xs:element name="archiveDateFormat" type="xs:string" minOccurs="0" maxOccurs="1" />
<xs:element name="archiveAboveSize" type="xs:long" minOccurs="0" maxOccurs="1" default="-1" />
<xs:element name="archiveNumbering" type="NLog.Targets.ArchiveNumberingMode" minOccurs="0" maxOccurs="1" default="Sequence" />
<xs:element name="writeFooterOnArchivingOnly" type="xs:boolean" minOccurs="0" maxOccurs="1" default="false" />
<xs:element name="writeHeaderWhenInitialFileNotEmpty" type="xs:boolean" minOccurs="0" maxOccurs="1" default="false" />
<xs:element name="createDirs" type="xs:boolean" minOccurs="0" maxOccurs="1" default="true" />
<xs:element name="replaceFileContentsOnEachWrite" type="xs:boolean" minOccurs="0" maxOccurs="1" default="false" />
<xs:element name="lineEnding" type="LineEndingMode" minOccurs="0" maxOccurs="1" />
<xs:element name="forceMutexConcurrentWrites" type="xs:boolean" minOccurs="0" maxOccurs="1" default="false" />
<xs:element name="forceManaged" type="xs:boolean" minOccurs="0" maxOccurs="1" default="true" />
<xs:element name="fileNameKind" type="NLog.Targets.FilePathKind" minOccurs="0" maxOccurs="1" default="Unknown" />
<xs:element name="fileAttributes" type="NLog.Targets.Win32FileAttributes" minOccurs="0" maxOccurs="1" default="Normal" />
<xs:element name="cleanupFileName" type="xs:boolean" minOccurs="0" maxOccurs="1" default="true" />
<xs:element name="writeBom" type="xs:boolean" minOccurs="0" maxOccurs="1" default="false" />
<xs:element name="enableFileDelete" type="xs:boolean" minOccurs="0" maxOccurs="1" default="true" />
<xs:element name="deleteOldFileOnStartup" type="xs:boolean" minOccurs="0" maxOccurs="1" default="false" />
<xs:element name="encoding" type="xs:string" minOccurs="0" maxOccurs="1" default="utf-8" />
<xs:element name="replaceFileContentsOnEachWrite" type="xs:boolean" minOccurs="0" maxOccurs="1" default="false" />
<xs:element name="lineEnding" type="LineEndingMode" minOccurs="0" maxOccurs="1" />
<xs:element name="deleteOldFileOnStartup" type="xs:boolean" minOccurs="0" maxOccurs="1" default="false" />
<xs:element name="keepFileOpen" type="xs:boolean" minOccurs="0" maxOccurs="1" default="true" />
<xs:element name="discardAll" type="xs:boolean" minOccurs="0" maxOccurs="1" default="false" />
<xs:element name="concurrentWriteAttempts" type="xs:integer" minOccurs="0" maxOccurs="1" default="10" />
<xs:element name="concurrentWriteAttemptDelay" type="xs:integer" minOccurs="0" maxOccurs="1" default="1" />
<xs:element name="openFileFlushTimeout" type="xs:integer" minOccurs="0" maxOccurs="1" default="0" />
<xs:element name="openFileCacheTimeout" type="xs:integer" minOccurs="0" maxOccurs="1" default="0" />
<xs:element name="networkWrites" type="xs:boolean" minOccurs="0" maxOccurs="1" default="false" />
<xs:element name="bufferSize" type="xs:integer" minOccurs="0" maxOccurs="1" default="32768" />
<xs:element name="autoFlush" type="xs:boolean" minOccurs="0" maxOccurs="1" default="true" />
<xs:element name="keepFileOpen" type="xs:boolean" minOccurs="0" maxOccurs="1" default="true" />
<xs:element name="concurrentWrites" type="xs:boolean" minOccurs="0" maxOccurs="1" default="false" />
<xs:element name="discardAll" type="xs:boolean" minOccurs="0" maxOccurs="1" default="false" />
<xs:element name="openFileCacheSize" type="xs:integer" minOccurs="0" maxOccurs="1" default="5" />
</xs:choice>
<xs:attribute name="name" type="xs:string">
Expand Down Expand Up @@ -1419,19 +1420,14 @@
<xs:documentation>Footer.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="writeFooterOnArchivingOnly" type="xs:boolean">
<xs:annotation>
<xs:documentation>Indicates whether the footer should be written only when the file is archived.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="maxArchiveFiles" type="xs:integer">
<xs:attribute name="maxArchiveDays" type="xs:integer">
<xs:annotation>
<xs:documentation>Maximum number of archive files that should be kept.</xs:documentation>
<xs:documentation>Maximum days of archive files that should be kept.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="maxArchiveDays" type="xs:integer">
<xs:attribute name="enableArchiveFileCompression" type="xs:boolean">
<xs:annotation>
<xs:documentation>Maximum days of archive files that should be kept.</xs:documentation>
<xs:documentation>Indicates whether to compress archive files into the zip archive format.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="archiveOldFileOnStartupAboveSize" type="xs:long">
Expand All @@ -1444,19 +1440,19 @@
<xs:documentation>Indicates whether to archive old log file on startup.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="enableArchiveFileCompression" type="xs:boolean">
<xs:attribute name="archiveFileKind" type="NLog.Targets.FilePathKind">
<xs:annotation>
<xs:documentation>Indicates whether to compress archive files into the zip archive format.</xs:documentation>
<xs:documentation>Is the P:NLog.Targets.FileTarget.ArchiveFileName an absolute or relative path?</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="archiveFileName" type="SimpleLayoutAttribute">
<xs:annotation>
<xs:documentation>Name of the file to be used for an archive.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="archiveFileKind" type="NLog.Targets.FilePathKind">
<xs:attribute name="maxArchiveFiles" type="xs:integer">
<xs:annotation>
<xs:documentation>Is the P:NLog.Targets.FileTarget.ArchiveFileName an absolute or relative path?</xs:documentation>
<xs:documentation>Maximum number of archive files that should be kept.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="archiveEvery" type="NLog.Targets.FileArchivePeriod">
Expand All @@ -1479,11 +1475,31 @@
<xs:documentation>Way file archives are numbered.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="writeFooterOnArchivingOnly" type="xs:boolean">
<xs:annotation>
<xs:documentation>Indicates whether the footer should be written only when the file is archived.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="writeHeaderWhenInitialFileNotEmpty" type="xs:boolean">
<xs:annotation>
<xs:documentation>Whether to write the Header on initial creation of file appender, even if the file is not empty. Default value is false, which means only write header when initial file is empty (Ex. ensures valid CSV files)</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="createDirs" type="xs:boolean">
<xs:annotation>
<xs:documentation>Indicates whether to create directories if they do not exist.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="replaceFileContentsOnEachWrite" type="xs:boolean">
<xs:annotation>
<xs:documentation>Indicates whether to replace file contents on each write instead of appending log message at the end.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="lineEnding" type="LineEndingMode">
<xs:annotation>
<xs:documentation>Line ending mode.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="forceMutexConcurrentWrites" type="xs:boolean">
<xs:annotation>
<xs:documentation>Indicates whether file creation calls should be synchronized by a system global mutex.</xs:documentation>
Expand Down Expand Up @@ -1519,24 +1535,24 @@
<xs:documentation>Indicates whether to enable log file(s) to be deleted.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="deleteOldFileOnStartup" type="xs:boolean">
<xs:attribute name="encoding" type="xs:string">
<xs:annotation>
<xs:documentation>Indicates whether to delete old log file on startup.</xs:documentation>
<xs:documentation>File encoding.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="encoding" type="xs:string">
<xs:attribute name="deleteOldFileOnStartup" type="xs:boolean">
<xs:annotation>
<xs:documentation>File encoding.</xs:documentation>
<xs:documentation>Indicates whether to delete old log file on startup.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="replaceFileContentsOnEachWrite" type="xs:boolean">
<xs:attribute name="keepFileOpen" type="xs:boolean">
<xs:annotation>
<xs:documentation>Indicates whether to replace file contents on each write instead of appending log message at the end.</xs:documentation>
<xs:documentation>Indicates whether to keep log file open instead of opening and closing it on each logging event.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="lineEnding" type="LineEndingMode">
<xs:attribute name="discardAll" type="xs:boolean">
<xs:annotation>
<xs:documentation>Line ending mode.</xs:documentation>
<xs:documentation>Whether or not this target should just discard all data that its asked to write. Mostly used for when testing NLog Stack except final write</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="concurrentWriteAttempts" type="xs:integer">
Expand Down Expand Up @@ -1574,21 +1590,11 @@
<xs:documentation>Indicates whether to automatically flush the file buffers after each log message.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="keepFileOpen" type="xs:boolean">
<xs:annotation>
<xs:documentation>Indicates whether to keep log file open instead of opening and closing it on each logging event.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="concurrentWrites" type="xs:boolean">
<xs:annotation>
<xs:documentation>Indicates whether concurrent writes to the log file by multiple processes on the same host.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="discardAll" type="xs:boolean">
<xs:annotation>
<xs:documentation>Whether or not this target should just discard all data that its asked to write. Mostly used for when testing NLog Stack except final write</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="openFileCacheSize" type="xs:integer">
<xs:annotation>
<xs:documentation>Number of files to be kept open. Setting this to a higher value may improve performance in a situation where a single File target is writing to many files (such as splitting by level or by logger).</xs:documentation>
Expand Down Expand Up @@ -2628,7 +2634,7 @@
</xs:choice>
<xs:attribute name="customColumnDelimiter" type="xs:string">
<xs:annotation>
<xs:documentation>Custom column delimiter value (valid when ColumnDelimiter is set to 'Custom').</xs:documentation>
<xs:documentation>Custom column delimiter value (valid when P:NLog.Layouts.CsvLayout.Delimiter is set to F:NLog.Layouts.CsvColumnDelimiterMode.Custom).</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="delimiter" type="NLog.Layouts.CsvColumnDelimiterMode">
Expand Down
4 changes: 2 additions & 2 deletions Core/packages.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NLog" version="5.2.4" targetFramework="net46" />
<package id="NLog.Schema" version="5.2.4" targetFramework="net46" />
<package id="NLog" version="5.2.8" targetFramework="net46" />
<package id="NLog.Schema" version="5.2.8" targetFramework="net46" />
</packages>
12 changes: 6 additions & 6 deletions TsGui.Tests/TsGui.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\NUnit3TestAdapter.4.3.1\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.4.3.1\build\net35\NUnit3TestAdapter.props')" />
<Import Project="..\packages\NUnit.3.13.3\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.13.3\build\NUnit.props')" />
<Import Project="..\packages\NUnit3TestAdapter.4.3.2\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.4.3.2\build\net35\NUnit3TestAdapter.props')" />
<Import Project="..\packages\NUnit.3.14.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.14.0\build\NUnit.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -41,8 +41,8 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=3.13.3.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll</HintPath>
<Reference Include="nunit.framework, Version=3.14.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\packages\NUnit.3.14.0\lib\net45\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
Expand Down Expand Up @@ -96,8 +96,8 @@
<PropertyGroup>
<ErrorText>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}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\NUnit.3.13.3\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.13.3\build\NUnit.props'))" />
<Error Condition="!Exists('..\packages\NUnit3TestAdapter.4.3.1\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.4.3.1\build\net35\NUnit3TestAdapter.props'))" />
<Error Condition="!Exists('..\packages\NUnit.3.14.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.14.0\build\NUnit.props'))" />
<Error Condition="!Exists('..\packages\NUnit3TestAdapter.4.3.2\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.4.3.2\build\net35\NUnit3TestAdapter.props'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
4 changes: 2 additions & 2 deletions TsGui.Tests/packages.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="3.13.3" targetFramework="net46" />
<package id="NUnit3TestAdapter" version="4.3.1" targetFramework="net46" />
<package id="NUnit" version="3.14.0" targetFramework="net46" />
<package id="NUnit3TestAdapter" version="4.3.2" targetFramework="net46" />
</packages>
Loading

0 comments on commit 91297ff

Please sign in to comment.