Egalware/CMS-MTConn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.steamware.net/steamware/CMS-MTConn into develop

Browse Source
This commit is contained in:
Nicola
2021-12-09 08:55:54 +01:00
parent 857426d0c1 372a8547d6
commit 1e4e789af6
60 changed files with 3959 additions and 2926 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+5 -32
View File
@@ -11,11 +11,8 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=485']) {
// env.versionNumber = VersionNumber(versionNumberString : '2.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '2.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'SCMA'
}
env.versionNumber = VersionNumber(versionNumberString : '2.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILD_DATE_FORMATTED, "ddHH"}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'SCMA'
}
script {
currentBuild.displayName = "${env.versionNumber}"
@@ -50,7 +47,7 @@ pipeline {
},
MAIN: {
sleep 0
bat "\"${tool 'MSBuild-16.0'}\" MTC_Adapter/SCMA/SCMA.csproj -target:Build /p:DefineConstants=\"FS30D=1,SIEMENS=1\" /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m"
bat "\"${tool 'MSBuild-16.0'}\" MTC_Adapter/SCMA/SCMA.csproj -target:Build /p:DefineConstants=\"FS30D=1,SIEMENS=1\" /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /p:verbosity=minimal /m"
},
failFast: false)
}
@@ -81,7 +78,7 @@ pipeline {
// pulizia directory BIN
bat "RD /S /Q \"${WORKSPACE}\\MTC_Adapter\\MTC-ADB\\bin\" || EXIT /B 0"
// BUILD adapter MySql!
bat "\"${tool 'MSBuild-16.0'}\" MTC_Adapter/MTC-ADB/MTC-ADB.csproj -target:Build /p:Configuration=${env.BRANCH_NAME} /p:VisualStudioVersion=15.0 /p:RunCodeAnalysis=false /p:Platform=\"Any CPU\" /p:DebugSymbols=false /p:DebugType=None /p:OutputPath=bin/${env.versionNumber} /m"
bat "\"${tool 'MSBuild-16.0'}\" MTC_Adapter/MTC-ADB/MTC-ADB.csproj -target:Build /p:Configuration=${env.BRANCH_NAME} /p:VisualStudioVersion=15.0 /p:RunCodeAnalysis=false /p:Platform=\"Any CPU\" /p:DebugSymbols=false /p:DebugType=None /p:OutputPath=bin/${env.versionNumber} /p:verbosity=minimal /m"
}
else {
// pulizia directory BIN
@@ -102,8 +99,7 @@ pipeline {
env.currConfig='Release'
}
// Build adapters MTC/OPC-UA-RED
bat "\"${tool 'MSBuild-16.0'}\" MTC_Adapter/SCMA/SCMA.csproj -target:Build /p:DefineConstants=\"FS30D=1,SIEMENS=1\" /p:Configuration=${env.currConfig} /p:DebugSymbols=false /p:DebugType=None /p:OutputPath=bin/${env.versionNumber} /m"
// bat "\"${tool 'MSBuild-16.0'}\" MTC_Adapter/SCMA/SCMA.csproj -target:Build /p:FS30D=1 /p:SIEMENS=1 /p:Configuration=${env.currConfig} /p:DebugSymbols=false /p:DebugType=None /p:OutputPath=bin/${env.versionNumber} /m"
bat "\"${tool 'MSBuild-16.0'}\" MTC_Adapter/SCMA/SCMA.csproj -target:Build /p:DefineConstants=\"FS30D=1,SIEMENS=1\" /p:Configuration=${env.currConfig} /p:DebugSymbols=false /p:DebugType=None /p:OutputPath=bin/${env.versionNumber} /p:verbosity=minimal /m"
}
}
}
@@ -162,29 +158,6 @@ pipeline {
}
}
// // Funzione x pubblicazione su server IIS di deploy
// def publishToDeployServer(prjPath, iisPath, packName) {
// echo "Richiesto esecuzione publishToDeployServer con parametri: " + prjPath + " | " + iisPath + " | " + packName
// // inizio copiando files di base da area VersGen...
// bat "xcopy /y VersGen\\ChangeLog.html " + prjPath + "Resources\\ChangeLog.html "
// bat "xcopy /y VersGen\\logoSteamware.png " + prjPath + "Resources\\logoSteamware.png "
// bat "xcopy /y VersGen\\manifest.xml " + prjPath + "Resources\\manifest.xml "
// // manifest.xml: aggiorno versNumber ed URL del branch di update...
// bat "e:\\fart.exe " + prjPath + "Resources\\manifest.xml 1.0.0.0 ${env.versionNumber} || EXIT /B 0"
// bat "e:\\fart.exe " + prjPath + "Resources\\manifest.xml {{BRANCHNAME}} ${env.BRANCH_NAME} || EXIT /B 0"
// bat "e:\\fart.exe " + prjPath + "Resources\\manifest.xml {{PACKNAME}} " + packName + " || EXIT /B 0"
// bat "e:\\fart.exe " + prjPath + "Resources\\ChangeLog.html {{CURRENT-REL}} ${env.versionNumber} || EXIT /B 0"
// writeFile file: prjPath + 'changeLog.log', text: "${getChangeString()}"
// powershell '(Get-Content ' + prjPath + 'Resources\\ChangeLog.html) | ForEach-Object { $_ -replace \"{{LAST-CHANGES}}\", \"${getChangeString()}\" } | Set-Content ' + prjPath + 'Resources\\ChangeLog.html'
// // copio ed esporto in IIS02 i vari files .xml, .html, .zip
// bat "xcopy /y " + prjPath + "Resources\\manifest.xml " + iisPath + packName + "\\${env.BRANCH_NAME}\\ "
// bat "xcopy /y " + prjPath + "Resources\\ChangeLog.html " + iisPath + packName + "\\${env.BRANCH_NAME}\\ "
// bat "xcopy /y " + prjPath + "Resources\\logoSteamware.png " + iisPath + packName + "\\${env.BRANCH_NAME}\\ "
// // salvo copia della versione...
// bat "xcopy /y " + prjPath + "\\ReleaseClienti\\${env.BRANCH_NAME}\\* E:\\Staging\\byProd\\MP\\${env.BRANCH_NAME}\\" + packName + "\\${env.versionNumber}\\ "
// // copio x AutoUpdate deploy
// bat "xcopy /y " + prjPath + "\\ReleaseClienti\\${env.BRANCH_NAME}\\" + packName + ".zip " + iisPath + packName + "\\${env.BRANCH_NAME}\\ "
// }
@NonCPS
// Funzione x recupero changeLog
def getChangeString() {
MTC_Adapter/EsaCncLib/EsaCncLib.csproj
+1 -1
View File
@@ -43,7 +43,7 @@
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.4.7.2\lib\net45\NLog.dll</HintPath>
<HintPath>..\packages\NLog.4.7.10\lib\net45\NLog.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
MTC_Adapter/EsaCncLib/NLog.xsd
+12
View File
@@ -1101,6 +1101,7 @@
<xs:element name="precision" minOccurs="0" maxOccurs="1" type="xs:byte" />
<xs:element name="scale" minOccurs="0" maxOccurs="1" type="xs:byte" />
<xs:element name="parameterType" minOccurs="0" maxOccurs="1" type="xs:string" />
<xs:element name="allowDbNull" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="format" minOccurs="0" maxOccurs="1" type="xs:string" />
<xs:element name="culture" minOccurs="0" maxOccurs="1" type="xs:string" />
</xs:choice>
@@ -1139,6 +1140,11 @@
<xs:documentation>Type of the parameter.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="allowDbNull" type="xs:boolean">
<xs:annotation>
<xs:documentation>Whether empty value should translate into DbNull. Requires database column to allow NULL values.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="format" type="xs:string">
<xs:annotation>
<xs:documentation>Convert format of the database parameter value.</xs:documentation>
@@ -2978,6 +2984,7 @@
<xs:element name="renderEmptyObject" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="suppressSpaces" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="attribute" minOccurs="0" maxOccurs="unbounded" type="NLog.Layouts.JsonAttribute" />
<xs:element name="excludeEmptyProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="excludeProperties" minOccurs="0" maxOccurs="1" type="xs:string" />
<xs:element name="includeAllProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="includeGdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
@@ -3000,6 +3007,11 @@
<xs:documentation>Option to suppress the extra spaces in the output json</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="excludeEmptyProperties" type="xs:boolean">
<xs:annotation>
<xs:documentation>Option to exclude null/empty properties from the log event (as JSON)</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="excludeProperties" type="xs:string">
<xs:annotation>
<xs:documentation>List of property names to exclude when is true</xs:documentation>
MTC_Adapter/EsaCncLib/packages.config
+2 -2
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net452" />
<package id="NLog" version="4.7.2" targetFramework="net462" />
<package id="NLog.Schema" version="4.7.2" targetFramework="net462" />
<package id="NLog" version="4.7.10" targetFramework="net462" />
<package id="NLog.Schema" version="4.7.10" targetFramework="net462" />
</packages>
MTC_Adapter/EsaCncLib/thdNcEsaGvKvara.cs
+70 -56
View File
@@ -12,15 +12,15 @@ namespace EsaCncLib
[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
public struct TS_REG
{
byte board;
byte iBaseReg;
UInt16 wType;
UInt32 iSharedId;
UInt32 iNum;
UInt32 iMax;
UInt32 iSiz;
UInt32 iOff;
UInt32 ChkSum;
public byte board;
public byte iBaseReg;
public UInt16 wType;
public UInt32 iSharedId;
public UInt32 iNum;
public UInt32 iMax;
public UInt32 iSiz;
public UInt32 iOff;
public UInt32 ChkSum;
}
#endregion
@@ -119,6 +119,7 @@ namespace EsaCncLib
public EsaStringMem SCMA_MManCMS_Release;
public EsaStringMem SCMA_MManCMS_SerialNumber;
public EsaStringMem[] SCMA_MManCMS_Strings;
public EsaDWordMem SCMA_MMan_ACK;
public EsaDWordMem SCMA_MMan_STROBE;
public EsaDWordMem SCMA_MMan_ALM;
@@ -164,17 +165,24 @@ namespace EsaCncLib
private static extern int ConvComunicationChannel([MarshalAs(UnmanagedType.LPStr)] string sChannelType);
[DllImport("KvCom3x", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Ansi, EntryPoint = "_init_board@8")]
private static extern int init_board([MarshalAs(UnmanagedType.LPStr)]string defcn_name, int ChannelType);
private static extern int init_board([MarshalAs(UnmanagedType.LPStr)] string defcn_name, int ChannelType);
[DllImport("KvCom3x", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Ansi, EntryPoint = "_exit_board@0")]
private static extern int exit_board();
[DllImport("KvCom3x", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Ansi, EntryPoint = "_get_reg_by_name@8")]
private static extern int get_reg_by_name([MarshalAs(UnmanagedType.LPStr)]string name, ref TS_REG pReg);
private static extern int get_reg_by_name([MarshalAs(UnmanagedType.LPStr)] string name, ref TS_REG pReg);
[DllImport("KvCom3x", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Ansi, EntryPoint = "_read_regbuffer@16")]
private static extern int read_regbuffer(ref TS_REG pReg, UInt16 Offset, UInt16 Count, [MarshalAs(UnmanagedType.LPArray)] UInt32[] pDst);
[DllImport("KvCom3x", EntryPoint = "read_regstring")]
public static extern int read_regstring(ref TS_REG pReg, short Offset, short wNCharToRead, ref short wpNCharRead, [MarshalAs(UnmanagedType.LPArray)] byte[] pBuff);
//[DllImport(KVCOM3xDLL, EntryPoint = "read_regstring")]
//public static extern int read_regstring(ref TS_REG pReg, short Offset, short wNCharToRead, ref short wpNCharRead, [MarshalAs(UnmanagedType.LPArray)] byte[] pBuff);
[DllImport("KvCom3x", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Ansi, EntryPoint = "_write_regbuffer@16")]
private static extern int write_regbuffer(ref TS_REG pReg, UInt16 Offset, UInt16 Count, [MarshalAs(UnmanagedType.LPArray)] UInt32[] pSrc);
@@ -230,7 +238,7 @@ namespace EsaCncLib
DefCn = tempS.ToString() + "\\defcn";
// inizializzo le memorie in modo STANDARD
setupMemArea(fIni);
setupMemAreaFromIni(fIni);
if (!Connect())
Disconnect();
@@ -238,10 +246,11 @@ namespace EsaCncLib
/// <summary>
/// Setup aree di memoria standard SCMA x CMS
/// </summary>
private void setupMemArea(IniFile fIni)
private void setupMemAreaFromIni(IniFile fIni)
{
SCMA_MManCMS_Release = new EsaStringMem();
SCMA_MManCMS_SerialNumber = new EsaStringMem();
SCMA_MManCMS_Strings = new EsaStringMem[20];
SCMA_MMan_ACK = new EsaDWordMem();
SCMA_MMan_STROBE = new EsaDWordMem();
SCMA_MMan_WD = new EsaWordMem();
@@ -260,6 +269,11 @@ namespace EsaCncLib
// aree FIXED secondo necessità: indicazione dimensione x impiego // rif aree reali ESA reale (commento successivo)
SCMA_MManCMS_Release.MemorySize = 20;
SCMA_MManCMS_SerialNumber.MemorySize = 50;
for (int i = 0; i < 20; i++)
{
SCMA_MManCMS_Strings[i] = new EsaStringMem();
SCMA_MManCMS_Strings[i].MemorySize = 50;
}
SCMA_MMan_ACK.MemorySize = 4; // 32
SCMA_MMan_STROBE.MemorySize = 4; // 32
SCMA_MMan_WD.MemorySize = 1; // 1
@@ -279,6 +293,10 @@ namespace EsaCncLib
// indirizzo area ESA...
SCMA_MManCMS_Release.AddressName = "CMSretvariables.Release";
SCMA_MManCMS_SerialNumber.AddressName = "CMSretvariables.SerialNumber";
for (int i = 0; i < 20; i++)
{
SCMA_MManCMS_Strings[i].AddressName = $"scma.scmastring[{i}].tag";
}
SCMA_MMan_ACK.AddressName = "scma.ACK"; //fIni.ReadString("NC", "SCMA_AreaAddress_ACK", "scma.ACK");
SCMA_MMan_STROBE.AddressName = "scma.STROBE";
SCMA_MMan_WD.AddressName = "scma.WD";
@@ -298,6 +316,10 @@ namespace EsaCncLib
// Creazione buffers letture memoria
SCMA_MManCMS_Release.data = "Release";
SCMA_MManCMS_SerialNumber.data = "SerialNumber";
for (int i = 0; i < 20; i++)
{
SCMA_MManCMS_Strings[i].data = "";
}
SCMA_MMan_ACK.data = new UInt32[SCMA_MMan_ACK.MemorySize];
SCMA_MMan_STROBE.data = new UInt32[SCMA_MMan_STROBE.MemorySize];
SCMA_MMan_ALM.data = new UInt32[SCMA_MMan_ALM.MemorySize];
@@ -403,41 +425,27 @@ namespace EsaCncLib
{
// variabili di appoggio
TS_REG newTsReg = currData.AddresReg;
// effettuo lettura!
iError = read_regbuffer(ref newTsReg, 0, currData.MemorySize, currData.tempData);
currData.AddresReg = newTsReg;
// ...e copio in stringa...
try
{
string valString = "";
for (int i = 0; i < currData.MemorySize; i++)
{
try
{
valString += Convert.ToChar(currData.tempData[i]).ToString().Replace("\0", " ");
}
catch (Exception exc)
{
lg.Error(exc, $"Errore in decodifica {currData.AddressName}");
}
}
// trimmo!
valString = valString.Trim();
// salvo
currData.data = valString;
}
catch
{ }
// lettura diretta stringa metodo nuovo e dedicato
byte[] StringRead = new byte[newTsReg.iMax + 1];
StringRead.Initialize();
short nCharR = 0;
iError = read_regstring(ref newTsReg, 0, (short)newTsReg.iMax, ref nCharR, StringRead);
if (iError == 0)
currData.data = Encoding.ASCII.GetString(StringRead).Replace("\0", " ").Trim();
}
/// <summary>
/// Leggo il buffer di memorie STRING
/// </summary>
public void ReadStringData()
{
readConvString(SCMA_MManCMS_Release);
readConvString(SCMA_MManCMS_SerialNumber);
//readConvString(SCMA_MManCMS_Release);
//readConvString(SCMA_MManCMS_SerialNumber);
// leggo le 20 variabili stringa...
for (int i = 0; i < 20; i++)
{
readConvString(SCMA_MManCMS_Strings[i]);
}
}
/// <summary>
/// Leggo il buffer di memorie DWORD
@@ -565,20 +573,26 @@ namespace EsaCncLib
public void setupMemConf()
{
// Chiamo tutti i registri memoria!
setupMemArea(SCMA_MMan_ACK);
setupMemArea(SCMA_MMan_STROBE);
setupMemArea(SCMA_MMan_ALM);
setupMemArea(SCMA_MMan_MNT);
setupMemArea(SCMA_MMan_ANALOG);
setupMemArea(SCMA_MMan_CNT);
setupMemArea(SCMA_MMan_MF);
setupMemArea(SCMA_MMan_SF);
setupMemArea(SCMA_MMan_TF);
setupMemArea(SCMA_MMan_MNUM);
setupMemArea(SCMA_MMan_SNUM);
setupMemArea(SCMA_MMan_TNUM);
setupMemArea(SCMA_MMan_OVR);
setupMemArea(SCMA_MMan_status);
setupMemAreaSingle(SCMA_MMan_ACK);
setupMemAreaSingle(SCMA_MMan_STROBE);
setupMemAreaSingle(SCMA_MMan_ALM);
setupMemAreaSingle(SCMA_MMan_MNT);
setupMemAreaSingle(SCMA_MMan_ANALOG);
setupMemAreaSingle(SCMA_MMan_CNT);
setupMemAreaSingle(SCMA_MMan_MF);
setupMemAreaSingle(SCMA_MMan_SF);
setupMemAreaSingle(SCMA_MMan_TF);
setupMemAreaSingle(SCMA_MMan_MNUM);
setupMemAreaSingle(SCMA_MMan_SNUM);
setupMemAreaSingle(SCMA_MMan_TNUM);
setupMemAreaSingle(SCMA_MMan_OVR);
setupMemAreaSingle(SCMA_MMan_status);
setupMemAreaSingle(SCMA_MManCMS_Release);
setupMemAreaSingle(SCMA_MManCMS_SerialNumber);
foreach (var item in SCMA_MManCMS_Strings)
{
setupMemAreaSingle(item);
}
}
/// <summary>
/// Effettua setup preliminare dati assi
@@ -613,7 +627,7 @@ namespace EsaCncLib
/// Effettua setup registro
/// </summary>
/// <param name="currData"></param>
private void setupMemArea(EsaBaseMem currData)
private void setupMemAreaSingle(EsaBaseMem currData)
{
TS_REG newTsReg = new TS_REG();
if (iError == 0)
MTC_Adapter/MTC-ADB/MTC-ADB.csproj
+1 -1
View File
@@ -71,7 +71,7 @@
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.4.7.2\lib\net45\NLog.dll</HintPath>
<HintPath>..\packages\NLog.4.7.10\lib\net45\NLog.dll</HintPath>
</Reference>
<Reference Include="Renci.SshNet, Version=2016.1.0.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
<HintPath>..\packages\SSH.NET.2016.1.0\lib\net40\Renci.SshNet.dll</HintPath>
MTC_Adapter/MTC-ADB/NLog.xsd
+12
View File
@@ -1101,6 +1101,7 @@
<xs:element name="precision" minOccurs="0" maxOccurs="1" type="xs:byte" />
<xs:element name="scale" minOccurs="0" maxOccurs="1" type="xs:byte" />
<xs:element name="parameterType" minOccurs="0" maxOccurs="1" type="xs:string" />
<xs:element name="allowDbNull" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="format" minOccurs="0" maxOccurs="1" type="xs:string" />
<xs:element name="culture" minOccurs="0" maxOccurs="1" type="xs:string" />
</xs:choice>
@@ -1139,6 +1140,11 @@
<xs:documentation>Type of the parameter.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="allowDbNull" type="xs:boolean">
<xs:annotation>
<xs:documentation>Whether empty value should translate into DbNull. Requires database column to allow NULL values.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="format" type="xs:string">
<xs:annotation>
<xs:documentation>Convert format of the database parameter value.</xs:documentation>
@@ -2978,6 +2984,7 @@
<xs:element name="renderEmptyObject" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="suppressSpaces" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="attribute" minOccurs="0" maxOccurs="unbounded" type="NLog.Layouts.JsonAttribute" />
<xs:element name="excludeEmptyProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="excludeProperties" minOccurs="0" maxOccurs="1" type="xs:string" />
<xs:element name="includeAllProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="includeGdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
@@ -3000,6 +3007,11 @@
<xs:documentation>Option to suppress the extra spaces in the output json</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="excludeEmptyProperties" type="xs:boolean">
<xs:annotation>
<xs:documentation>Option to exclude null/empty properties from the log event (as JSON)</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="excludeProperties" type="xs:string">
<xs:annotation>
<xs:documentation>List of property names to exclude when is true</xs:documentation>
MTC_Adapter/MTC-ADB/packages.config
+2 -2
View File
@@ -8,8 +8,8 @@
<package id="Microsoft.VisualStudio.SlowCheetah" version="3.2.26" targetFramework="net462" developmentDependency="true" />
<package id="MySql.Data" version="8.0.21" targetFramework="net462" />
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net452" />
<package id="NLog" version="4.7.2" targetFramework="net462" />
<package id="NLog.Schema" version="4.7.2" targetFramework="net462" />
<package id="NLog" version="4.7.10" targetFramework="net462" />
<package id="NLog.Schema" version="4.7.10" targetFramework="net462" />
<package id="PrettyBin" version="1.1.0" targetFramework="net452" />
<package id="SSH.NET" version="2016.1.0" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
MTC_Adapter/MTC/MTC.csproj
+1 -1
View File
@@ -41,7 +41,7 @@
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.4.7.2\lib\net45\NLog.dll</HintPath>
<HintPath>..\packages\NLog.4.7.10\lib\net45\NLog.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
MTC_Adapter/MTC/NLog.xsd
+12
View File
@@ -1101,6 +1101,7 @@
<xs:element name="precision" minOccurs="0" maxOccurs="1" type="xs:byte" />
<xs:element name="scale" minOccurs="0" maxOccurs="1" type="xs:byte" />
<xs:element name="parameterType" minOccurs="0" maxOccurs="1" type="xs:string" />
<xs:element name="allowDbNull" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="format" minOccurs="0" maxOccurs="1" type="xs:string" />
<xs:element name="culture" minOccurs="0" maxOccurs="1" type="xs:string" />
</xs:choice>
@@ -1139,6 +1140,11 @@
<xs:documentation>Type of the parameter.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="allowDbNull" type="xs:boolean">
<xs:annotation>
<xs:documentation>Whether empty value should translate into DbNull. Requires database column to allow NULL values.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="format" type="xs:string">
<xs:annotation>
<xs:documentation>Convert format of the database parameter value.</xs:documentation>
@@ -2978,6 +2984,7 @@
<xs:element name="renderEmptyObject" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="suppressSpaces" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="attribute" minOccurs="0" maxOccurs="unbounded" type="NLog.Layouts.JsonAttribute" />
<xs:element name="excludeEmptyProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="excludeProperties" minOccurs="0" maxOccurs="1" type="xs:string" />
<xs:element name="includeAllProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="includeGdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
@@ -3000,6 +3007,11 @@
<xs:documentation>Option to suppress the extra spaces in the output json</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="excludeEmptyProperties" type="xs:boolean">
<xs:annotation>
<xs:documentation>Option to exclude null/empty properties from the log event (as JSON)</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="excludeProperties" type="xs:string">
<xs:annotation>
<xs:documentation>List of property names to exclude when is true</xs:documentation>
MTC_Adapter/MTC/packages.config
+2 -2
View File
@@ -3,6 +3,6 @@
<package id="AForge" version="2.2.5" targetFramework="net452" />
<package id="AForge.Math" version="2.2.5" targetFramework="net452" />
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net452" />
<package id="NLog" version="4.7.2" targetFramework="net462" />
<package id="NLog.Schema" version="4.7.2" targetFramework="net462" />
<package id="NLog" version="4.7.10" targetFramework="net462" />
<package id="NLog.Schema" version="4.7.10" targetFramework="net462" />
</packages>
MTC_Adapter/OPC-UA-REDIS/AdapterRed.cs
+1 -1
View File
@@ -246,7 +246,7 @@ namespace OPC_UA_REDIS
foreach (DataItemRed di in together)
{
hashKey = machineHash(di.Name);
hashVal = di.Value.ToString();
hashVal = di.Value.ToString().Trim();
saveHashKeyVal(hashKey, hashVal);
}
}
MTC_Adapter/OPC-UA-REDIS/NLog.xsd
+12
View File
@@ -1101,6 +1101,7 @@
<xs:element name="precision" minOccurs="0" maxOccurs="1" type="xs:byte" />
<xs:element name="scale" minOccurs="0" maxOccurs="1" type="xs:byte" />
<xs:element name="parameterType" minOccurs="0" maxOccurs="1" type="xs:string" />
<xs:element name="allowDbNull" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="format" minOccurs="0" maxOccurs="1" type="xs:string" />
<xs:element name="culture" minOccurs="0" maxOccurs="1" type="xs:string" />
</xs:choice>
@@ -1139,6 +1140,11 @@
<xs:documentation>Type of the parameter.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="allowDbNull" type="xs:boolean">
<xs:annotation>
<xs:documentation>Whether empty value should translate into DbNull. Requires database column to allow NULL values.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="format" type="xs:string">
<xs:annotation>
<xs:documentation>Convert format of the database parameter value.</xs:documentation>
@@ -2978,6 +2984,7 @@
<xs:element name="renderEmptyObject" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="suppressSpaces" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="attribute" minOccurs="0" maxOccurs="unbounded" type="NLog.Layouts.JsonAttribute" />
<xs:element name="excludeEmptyProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="excludeProperties" minOccurs="0" maxOccurs="1" type="xs:string" />
<xs:element name="includeAllProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="includeGdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
@@ -3000,6 +3007,11 @@
<xs:documentation>Option to suppress the extra spaces in the output json</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="excludeEmptyProperties" type="xs:boolean">
<xs:annotation>
<xs:documentation>Option to exclude null/empty properties from the log event (as JSON)</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="excludeProperties" type="xs:string">
<xs:annotation>
<xs:documentation>List of property names to exclude when is true</xs:documentation>
MTC_Adapter/OPC-UA-REDIS/OPC-UA-REDIS.csproj
+1 -1
View File
@@ -39,7 +39,7 @@
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.4.7.2\lib\net45\NLog.dll</HintPath>
<HintPath>..\packages\NLog.4.7.10\lib\net45\NLog.dll</HintPath>
</Reference>
<Reference Include="Pipelines.Sockets.Unofficial, Version=1.0.0.0, Culture=neutral, PublicKeyToken=42ea0a778e13fbe2, processorArchitecture=MSIL">
<HintPath>..\packages\Pipelines.Sockets.Unofficial.2.1.16\lib\net461\Pipelines.Sockets.Unofficial.dll</HintPath>
MTC_Adapter/OPC-UA-REDIS/packages.config
+2 -2
View File
@@ -2,8 +2,8 @@
<packages>
<package id="Microsoft.Bcl.AsyncInterfaces" version="1.1.1" targetFramework="net462" />
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net452" />
<package id="NLog" version="4.7.2" targetFramework="net462" />
<package id="NLog.Schema" version="4.7.2" targetFramework="net462" />
<package id="NLog" version="4.7.10" targetFramework="net462" />
<package id="NLog.Schema" version="4.7.10" targetFramework="net462" />
<package id="Pipelines.Sockets.Unofficial" version="2.1.16" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.1.58" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
MTC_Adapter/SCMA/AdapterPLC/CMS/EsaKosmos.cs
+37
View File
@@ -54,6 +54,7 @@ namespace SCMA.AdapterPLC.CMS
loadMaintData("CNT", 0, 1);
loadStatusData("MNT", 0, 1);
loadAnalogData("ANALOG", 0, 1);
loadStringData("STR", 0, 1);
loadAllarmiCNC();
}
@@ -597,6 +598,42 @@ namespace SCMA.AdapterPLC.CMS
}
return fatto;
}
/// <summary>
/// Gestione lettura dati stringa
/// </summary>
public override bool getStringDataFromPlc()
{
bool fatto = false;
try
{
// leggo e salvo var analogiche ANALOG
if (stringDataMaxNum > 0)
{
// recupero dati
inizio = DateTime.Now;
ncDevice.ReadStringData();
if (utils.CRB("recTime"))
{
TimingData.addResult("R-StringData", DateTime.Now.Subtract(inizio).Ticks);
}
string[] tabDatiString = new string[stringDataMaxNum];
for (int i = 0; i < stringDataMaxNum; i++)
{
tabDatiString[i] = ncDevice.SCMA_MManCMS_Strings[i].data.Trim();
}
// decodifico aree memoria secondo tab configurazione
processStringData(tabDatiString, stringData);
}
fatto = true;
}
catch (Exception exc)
{
lg.Error(string.Format("{0}", exc));
}
return fatto;
}
/// <summary>
/// Gestione lettura dati status da PLC
/// </summary>
MTC_Adapter/SCMA/AdapterPLC/Generic.cs
+160 -6
View File
@@ -4,12 +4,12 @@ using System.Globalization;
using System.IO;
using System.Linq;
using System.Text;
using NLog;
namespace SCMA.AdapterPLC
{
using AdapterCom;
using MTC;
using NLog;
using OPC_UA_REDIS;
#region macro oggetti da istanziare a blocchi da configurazione XML
@@ -754,7 +754,7 @@ namespace SCMA.AdapterPLC
currGateway.addItemNodeAndSet(vettUnOp[i].loadKey, itemType.Sample, availStatus.UNAVAILABLE.ToString().ToLower());
currGateway.addItemNodeAndSet(vettUnOp[i].accTimeKey, itemType.Sample, availStatus.UNAVAILABLE.ToString().ToLower());
currGateway.addItemNodeAndSet(vettUnOp[i].countKey, itemType.Sample, availStatus.UNAVAILABLE.ToString().ToLower());
// SOLO SE NON sono SOUR...
if (currGateway.protocollo != gwProtocol.SOURS)
{
@@ -794,7 +794,7 @@ namespace SCMA.AdapterPLC
// allarmi "base"
currGateway.addAlarmNodes();
//2019.07.22 NON RIPORTO USER_ACTION x SOUR
// 2019.07.22 NON RIPORTO USER_ACTION x SOUR
if (currGateway.protocollo != gwProtocol.SOURS)
{
// azioni utente
@@ -1093,6 +1093,11 @@ namespace SCMA.AdapterPLC
/// </summary>
public otherData[] analogData;
/// <summary>
/// Contenuto valori variabili stringa da PLC
/// </summary>
public otherData[] stringData;
/// <summary>
/// Contenuto valori status data da PLC
/// </summary>
@@ -1351,6 +1356,11 @@ namespace SCMA.AdapterPLC
/// </summary>
public List<string> elAnalogData;
/// <summary>
/// Vettore string data (SAMPLE)
/// </summary>
public List<string> elStringData;
#endregion Gestione contatori & obj specifici (Events & Samples)
#region oggetti complessi/completi
@@ -1889,6 +1899,76 @@ namespace SCMA.AdapterPLC
}
}
/// <summary>
/// Lettura file gestione dati stringa da PLC
/// </summary>
/// <param name="memPre"></param>
/// <param name="baseAddr"></param>
/// <param name="memSize"></param>
public void loadStringData(string memPre, int baseAddr, int memSize)
{
// carico dati x Maintenance
if (utils.CRB("verbose"))
{
lg.Info("Inizio caricamento vettore variabili stringa gestite");
}
int totRighe = 0;
string fileName = utils.StringListFile;
if (currGateway.protocollo == gwProtocol.SOURS)
{
fileName = utils.StringListFileSOUR;
}
string linea;
totRighe = File.ReadLines(fileName).Count();
// creo un vettore della dimensione corretta... conta anche commenti tanto poi riduco...
stringData = new otherData[File.ReadLines(fileName).Count()];
// carica da file...
StreamReader file = new StreamReader(fileName);
// leggo 1 linea alla volta...
int numRiga = 0;
while ((linea = file.ReadLine()) != null)
{
// se NON VUOTA...
if (linea != "")
{
// SE non è un commento...
if (linea.Substring(0, 1) != "#")
{
stringData[numRiga] = decodeOtherData(linea, utils.CRC("testCharSep"), memPre, baseAddr, memSize);
numRiga++;
}
}
}
// chiudo file
file.Close();
// ora trimmo vettore al solo numero VERO dei valori caricati...
Array.Resize<otherData>(ref stringData, numRiga);
if (utils.CRB("verbose"))
{
lg.Info(string.Format("Fine caricamento vettore di {0} variabili stringa gestite", numRiga));
}
// ora inizializzo l'insieme dei Samples delle var analogiche
elStringData = new List<string>();
string varName = "";
for (int i = 0; i < numRiga; i++)
{
varName = stringData[i].varName;
if (currGateway.protocollo != gwProtocol.SOURS)
{
varName = string.Format("STR_" + stringData[i].varName);
}
elStringData.Add(varName);
currGateway.addItemNodeByType(varName, itemType.Sample);
}
if (utils.CRB("verbose"))
{
lg.Info(string.Format("inizializzato vettore di {0} MTC.SAMPLES delle variabili string", numRiga));
}
}
/// <summary>
/// caricamento allarmi da file
/// </summary>
@@ -2736,6 +2816,15 @@ namespace SCMA.AdapterPLC
{
lg.Error($"Eccezione in getAnalogDataFromPlc:{Environment.NewLine}{exc}");
}
// gestisco lettura dati stringa da PLC...
try
{
getStringDataFromPlc();
}
catch (Exception exc)
{
lg.Error($"Eccezione in getStringDataFromPlc:{Environment.NewLine}{exc}");
}
}
/// <summary>
@@ -2783,6 +2872,15 @@ namespace SCMA.AdapterPLC
return fatto;
}
/// <summary>
/// Gestione lettura dati stringa
/// </summary>
public virtual bool getStringDataFromPlc()
{
bool fatto = false;
return fatto;
}
/// <summary>
/// Gestione lettura dati status da PLC
/// </summary>
@@ -4605,6 +4703,36 @@ namespace SCMA.AdapterPLC
return _analogDataMaxNum;
}
}
/// <summary>
/// Numero massimo (indice) valori string (privato)
/// </summary>
protected int _stringDataMaxNum = 0;
/// <summary>
/// Numero massimo (indice) valori string (calcolato)
/// </summary>
public int stringDataMaxNum
{
get
{
if (_stringDataMaxNum == 0)
{
if (stringData != null)
{
// prima stima
int idx = stringData.Length;
// ora ciclo...
foreach (var item in stringData)
{
int.TryParse(item.codNum, out idx);
_stringDataMaxNum = idx > _stringDataMaxNum ? idx : _stringDataMaxNum;
}
}
}
return _stringDataMaxNum;
}
}
/// <summary>
/// Processa la tabella di memoria dei dati analogici
/// </summary>
@@ -4664,7 +4792,7 @@ namespace SCMA.AdapterPLC
// gestisco in modalità "lazy" qualsiasi variabile (dividendo x opportuno fattore conversione...)
try
{
analogVal = (double) tabDatiAnag[idxTab] / (double) utils.CRI("fattDecVA");
analogVal = (double)tabDatiAnag[idxTab] / (double)utils.CRI("fattDecVA");
}
catch (Exception exc)
{
@@ -4679,6 +4807,32 @@ namespace SCMA.AdapterPLC
// aggiungo i vari analogici rilevati
parentForm.dataMonitor_3 += sb.ToString();
}
/// <summary>
/// Processa la tabella di memoria dei dati stringa
/// </summary>
/// <param name="tabDatiString"></param>
/// <param name="stringData"></param>
public void processStringData(string[] tabDatiString, otherData[] stringData)
{
// uno ad uno vado a inserirli nella mappa dei dati dell'adapter...
StringBuilder sb = new StringBuilder();
int idxTab = 0;
string origName = "";
for (int i = 0; i < stringData.Length; i++)
{
// calcolo idx a indice 0...
int.TryParse(stringData[i].codNum, out idxTab);
idxTab--;
origName = getOrigName(stringData[i].varName);
// salvo vettore...
currGateway.updateItemNodeValue(elStringData[idxTab], tabDatiString[idxTab]);
// accodo ultimi codici in visualizzazione...
sb.AppendLine(currGateway.getItemNode(elStringData[idxTab]).ToString().Replace("|", " | "));
}
// aggiungo i vari analogici rilevati
parentForm.dataMonitor_3 += sb.ToString();
}
/// <summary>
/// processa dataLayer e se necessario salva/mostra
@@ -4711,7 +4865,7 @@ namespace SCMA.AdapterPLC
needSave = procPzProd(needSave);
needSave = procGiriTotUnOp(needSave);
needSave = procNumCU(needSave);
needSave = procRepetitions(needSave);
needSave = procRepetitions(needSave);
needSave = procCounters(needSave);
needSave = procMovTotAssi(needSave);
needSave = procAccTimeAssi(needSave);
@@ -5783,7 +5937,7 @@ namespace SCMA.AdapterPLC
parentForm.dataMonitor_2 += string.Format("{0}{1}", outString.Substring(0, outString.Length - 3), Environment.NewLine);
return needSave;
}
/// <summary>
/// Processing delle variabili sul totale m percorsi dagli assi
MTC_Adapter/SCMA/App.config
+187 -186
View File
@@ -1,197 +1,198 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup useLegacyV2RuntimeActivationPolicy="true">
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
</startup>
<appSettings>
<!--MAIN CONF-->
<add key="appName" value="SCMA" />
<!--parametri protocollo comunicazione-->
<!--<add key="adpProto" value="MTC" />-->
<!--<add key="adpProto" value="SOURS" />-->
<add key="adpProto" value="SOURS" />
<add key="MTC_port" value="7878" />
<add key="SOURS_IP" value="localhost" />
<add key="SOURS_port" value="6379" />
<add key="SOURS_baseHash" value="SOUR" />
<add key="stChkEnabled" value="true" />
<add key="logRedConnWaitTime" value="5" />
<add key="fullReset" value="false" />
<!--gestione TIMERS e periodi multipli x thread lenti-->
<add key="startTimerMs" value="250" />
<add key="timerIntMs" value="5" />
<!--invio da adapter ad agent: 5ms-->
<add key="fastCount" value="20" />
<!--100ms-->
<add key="normCount" value="100" />
<!--500ms-->
<add key="slowCount" value="1000" />
<!--5 sec-->
<add key="alarmSyncCount" value="6000" />
<!--30 sec-->
<add key="waitEndCycle" value="0" />
<!--ms attesa dopo ogni ciclo lettura...-->
<!--30 sec-->
<!--num cicli PRIMA di leggere davvero GCode x rallentare-->
<add key="contChkGCod" value="2" />
<!--gestione FINESTRA campionamento x counter in secondi (dati validi dati DOPO che è piena la coda x la finestra richiesta, mantenuta a quella durata...)-->
<add key="countWindSize" value="10" />
<!--parametri gestione watchdog-->
<add key="maxAdapterLockSec" value="5" />
<!--disabilito letture avanzate che UCCIDONO il programma (x ora SOLO allarmi CNC x FANUC-->
<add key="disableAdvRead" value="true" />
<!--gestione x abilitare/disabilitare lettura nome asse e path di controllo (OSAI)-->
<add key="enableAxNamePath" value="true" />
<!--AREA CONF IP FANUC-->
<!--SIMULATORE LOCALE
<startup useLegacyV2RuntimeActivationPolicy="true">
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
</startup>
<appSettings>
<!--MAIN CONF-->
<add key="appName" value="SCMA" />
<!--parametri protocollo comunicazione-->
<!--<add key="adpProto" value="MTC" />-->
<!--<add key="adpProto" value="SOURS" />-->
<add key="adpProto" value="SOURS" />
<add key="MTC_port" value="7878" />
<add key="SOURS_IP" value="localhost" />
<add key="SOURS_port" value="6379" />
<add key="SOURS_baseHash" value="SOUR" />
<add key="stChkEnabled" value="true" />
<add key="logRedConnWaitTime" value="5" />
<add key="fullReset" value="false" />
<!--gestione TIMERS e periodi multipli x thread lenti-->
<add key="startTimerMs" value="250" />
<add key="timerIntMs" value="5" />
<!--invio da adapter ad agent: 5ms-->
<add key="fastCount" value="20" />
<!--100ms-->
<add key="normCount" value="100" />
<!--500ms-->
<add key="slowCount" value="1000" />
<!--5 sec-->
<add key="alarmSyncCount" value="6000" />
<!--30 sec-->
<add key="waitEndCycle" value="0" />
<!--ms attesa dopo ogni ciclo lettura...-->
<!--30 sec-->
<!--num cicli PRIMA di leggere davvero GCode x rallentare-->
<add key="contChkGCod" value="2" />
<!--gestione FINESTRA campionamento x counter in secondi (dati validi dati DOPO che è piena la coda x la finestra richiesta, mantenuta a quella durata...)-->
<add key="countWindSize" value="10" />
<!--parametri gestione watchdog-->
<add key="maxAdapterLockSec" value="5" />
<!--disabilito letture avanzate che UCCIDONO il programma (x ora SOLO allarmi CNC x FANUC-->
<add key="disableAdvRead" value="true" />
<!--gestione x abilitare/disabilitare lettura nome asse e path di controllo (OSAI)-->
<add key="enableAxNamePath" value="true" />
<!--AREA CONF IP FANUC-->
<!--SIMULATORE LOCALE
IP LOOPBACK: 192.168.211.5/255.255.255.0
ipPLC = "192.168.211.5"-->
<!--<add key="ipPLC" value="192.168.211.5" />-->
<!--SIM PC
<!--<add key="ipPLC" value="192.168.211.5" />-->
<!--SIM PC
IP ETH: 192.168.139.201/255.255.255.0
ipPLC = "192.168.139.100"-->
<!--<add key="ipPLC" value="192.168.139.100" />-->
<!--<add key="ipPLC" value="192.168.139.1" />-->
<!--<add key="ipPLC" value="192.168.157.2"/>-->
<!--Sviluppo Steamware
<!--<add key="ipPLC" value="192.168.139.100" />-->
<!--<add key="ipPLC" value="192.168.139.1" />-->
<!--<add key="ipPLC" value="192.168.157.2"/>-->
<!--Sviluppo Steamware
IP ETH: 10.74.82.110/255.255.255.0
ipPLC = "10.74.82.110"-->
<!--PRODUZIONE
<!--PRODUZIONE
IP ETH: 192.168.139.201/255.255.255.0
ipPLC = "192.168.139.1"-->
<!--<add key="ipPLC" value="192.168.157.2"/>-->
<!--OSAI DEV-->
<!--<add key="ipPLC" value="192.168.157.2" />-->
<!--SIEMENS DEV-->
<!--<add key="ipPLC" value="192.168.214.1" />-->
<!--CMS PROD-->
<!--<add key="ipPLC" value="192.168.139.1" />-->
<add key="ipPLC" value="192.168.139.1" />
<add key="recTime" value="true" />
<add key="verbose" value="true" />
<add key="loglevel" value="5" />
<add key="mode" value="prod" />
<!--Definizione avvio Adapter-->
<add key="autoLoadConf" value="false" />
<add key="autoStartOnLoad" value="true" />
<add key="openDumpOnStart" value="true" />
<add key="startMinimized" value="false" />
<add key="windowCanMax" value="true" />
<add key="trayClose" value="true" />
<add key="autoSaveSec" value="60" />
<add key="waitRecMSec" value="5000" />
<add key="testCharSep" value="|" />
<add key="fattdecimale" value="1000" />
<add key="fattConvDistAssi" value="1000" />
<add key="fattDecVA" value="1" />
<!--<add key="fattDecVA" value="1000" />-->
<add key="fattFeedFanuc" value="10" />
<!--pre-filtraggio XML-->
<add key="xmlSanitize" value="true" />
<!--conf file-->
<add key="dataPath" value="DATA" />
<add key="dataConfPath" value="DATA\CONF" />
<add key="dataDatPath" value="DATA\DAT" />
<add key="resxPath" value="Resources" />
<add key="AlarmList" value="AlarmList.map" />
<add key="NameRepRolesList" value="NameRepRolesList.map" />
<add key="MemCopyList" value="MemCopyList.map" />
<add key="DataModel" value="DataModel.xml" />
<add key="AlarmListCNC" value="AlarmListCNC.map" />
<add key="defaultConfFile" value="DataModel.xml" />
<!--<add key="defaultConfFile" value="Adapter_ItemList.xml" />-->
<add key="defaultPersLayerFile" value="PersistData.dat" />
<add key="maxNumDD" value="30" />
<add key="defaultEsaFile" value="EsaKvara.ini" />
<add key="CounterListFilePath" value="CounterList.map" />
<add key="AnalogDataFilePath" value="AnalogData.map" />
<add key="StatusListFilePath" value="StatusList.map" />
<add key="SubModeListFilePath" value="SubModeList.map" />
<!--Gestione pathFanuc-->
<add key="FanucPathComb" value="true" />
<add key="FanucAxPathAssign" value="1,1,1,2,2,2" />
<!--Gestione path siemens-->
<add key="SiemensBaseCountPath" value="0" />
<!--gestione FANUC con assi limitati-->
<add key="FanucLimit3D" value="true" />
<!--conf gestione "semplificata" accesso a tutta la memoria ogni volta-->
<!--conf x CMS-->
<add key="procIotMem" value="false" />
<!--conf x ESA-KVARA-->
<!--<add key="procIotMem" value="true"/>-->
<!--file configurazione IotMem (ESA KVARA)-->
<add key="IOTByteFilePath" value="IOT_ByteList.map" />
<add key="IOTWordFilePath" value="IOT_WordList.map" />
<add key="IOTDWordFilePath" value="IOT_DWordList.map" />
<add key="IOTStringFilePath" value="IOT_StringList.map" />
<!--percorso file scambio dati "lenti" e conf MaintData memory area -->
<add key="GeneralStatusFilePath" value="CmsGeneralStatus.mtc" />
<!--gestione trigger eventi da allarmi-->
<add key="eStopCode" value="152" />
<!--gestione watchdog CMS-->
<add key="sendWatchDog" value="true" />
<add key="cycleWatchDog" value="3" />
<add key="readAllTop" value="true" />
<add key="fastCopy" value="true" />
<add key="ClientSettingsProvider.ServiceUri" value="" />
<!--gestione spindle override gobale forzato da max valori letti...-->
<add key="getMaxSpOver" value="true" />
<!--gestione decodifica status-->
<add key="ouStatusByPlc" value="true" />
</appSettings>
<system.web>
<membership defaultProvider="ClientAuthenticationMembershipProvider">
<providers>
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
</providers>
</membership>
<roleManager defaultProvider="ClientRoleProvider" enabled="true">
<providers>
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
</providers>
</roleManager>
</system.web>
<system.serviceModel>
<bindings>
<basicHttpBinding>
<binding name="OPENcontrol" />
</basicHttpBinding>
</bindings>
<client>
<endpoint address="http://192.168.20.2:8080" binding="basicHttpBinding" bindingConfiguration="OPENcontrol" contract="OPENcontrol.OPENcontrolPortType" name="OPENcontrol" />
</client>
</system.serviceModel>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<probing privatePath="lib;libs" />
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.1" newVersion="4.0.2.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<!--<add key="ipPLC" value="192.168.157.2"/>-->
<!--OSAI DEV-->
<!--<add key="ipPLC" value="192.168.157.2" />-->
<!--SIEMENS DEV-->
<!--<add key="ipPLC" value="192.168.214.1" />-->
<!--CMS PROD-->
<!--<add key="ipPLC" value="192.168.139.1" />-->
<add key="ipPLC" value="192.168.139.1" />
<add key="recTime" value="true" />
<add key="verbose" value="true" />
<add key="loglevel" value="5" />
<add key="mode" value="prod" />
<!--Definizione avvio Adapter-->
<add key="autoLoadConf" value="false" />
<add key="autoStartOnLoad" value="true" />
<add key="openDumpOnStart" value="true" />
<add key="startMinimized" value="false" />
<add key="windowCanMax" value="true" />
<add key="trayClose" value="true" />
<add key="autoSaveSec" value="60" />
<add key="waitRecMSec" value="5000" />
<add key="testCharSep" value="|" />
<add key="fattdecimale" value="1000" />
<add key="fattConvDistAssi" value="1000" />
<add key="fattDecVA" value="1" />
<!--<add key="fattDecVA" value="1000" />-->
<add key="fattFeedFanuc" value="10" />
<!--pre-filtraggio XML-->
<add key="xmlSanitize" value="true" />
<!--conf file-->
<add key="dataPath" value="DATA" />
<add key="dataConfPath" value="DATA\CONF" />
<add key="dataDatPath" value="DATA\DAT" />
<add key="resxPath" value="Resources" />
<add key="AlarmList" value="AlarmList.map" />
<add key="NameRepRolesList" value="NameRepRolesList.map" />
<add key="MemCopyList" value="MemCopyList.map" />
<add key="DataModel" value="DataModel.xml" />
<add key="AlarmListCNC" value="AlarmListCNC.map" />
<add key="defaultConfFile" value="DataModel.xml" />
<!--<add key="defaultConfFile" value="Adapter_ItemList.xml" />-->
<add key="defaultPersLayerFile" value="PersistData.dat" />
<add key="maxNumDD" value="30" />
<add key="defaultEsaFile" value="EsaKvara.ini" />
<add key="CounterListFilePath" value="CounterList.map" />
<add key="AnalogDataFilePath" value="AnalogData.map" />
<add key="StatusListFilePath" value="StatusList.map" />
<add key="StringDataFilePath" value="StringData.map" />
<add key="SubModeListFilePath" value="SubModeList.map" />
<!--Gestione pathFanuc-->
<add key="FanucPathComb" value="true" />
<add key="FanucAxPathAssign" value="1,1,1,2,2,2" />
<!--Gestione path siemens-->
<add key="SiemensBaseCountPath" value="0" />
<!--gestione FANUC con assi limitati-->
<add key="FanucLimit3D" value="true" />
<!--conf gestione "semplificata" accesso a tutta la memoria ogni volta-->
<!--conf x CMS-->
<add key="procIotMem" value="false" />
<!--conf x ESA-KVARA-->
<!--<add key="procIotMem" value="true"/>-->
<!--file configurazione IotMem (ESA KVARA)-->
<add key="IOTByteFilePath" value="IOT_ByteList.map" />
<add key="IOTWordFilePath" value="IOT_WordList.map" />
<add key="IOTDWordFilePath" value="IOT_DWordList.map" />
<add key="IOTStringFilePath" value="IOT_StringList.map" />
<!--percorso file scambio dati "lenti" e conf MaintData memory area -->
<add key="GeneralStatusFilePath" value="CmsGeneralStatus.mtc" />
<!--gestione trigger eventi da allarmi-->
<add key="eStopCode" value="152" />
<!--gestione watchdog CMS-->
<add key="sendWatchDog" value="true" />
<add key="cycleWatchDog" value="3" />
<add key="readAllTop" value="true" />
<add key="fastCopy" value="true" />
<add key="ClientSettingsProvider.ServiceUri" value="" />
<!--gestione spindle override gobale forzato da max valori letti...-->
<add key="getMaxSpOver" value="true" />
<!--gestione decodifica status-->
<add key="ouStatusByPlc" value="true" />
</appSettings>
<system.web>
<membership defaultProvider="ClientAuthenticationMembershipProvider">
<providers>
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
</providers>
</membership>
<roleManager defaultProvider="ClientRoleProvider" enabled="true">
<providers>
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
</providers>
</roleManager>
</system.web>
<system.serviceModel>
<bindings>
<basicHttpBinding>
<binding name="OPENcontrol" />
</basicHttpBinding>
</bindings>
<client>
<endpoint address="http://192.168.20.2:8080" binding="basicHttpBinding" bindingConfiguration="OPENcontrol" contract="OPENcontrol.OPENcontrolPortType" name="OPENcontrol" />
</client>
</system.serviceModel>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<probing privatePath="lib;libs" />
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.1" newVersion="4.0.2.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
MTC_Adapter/SCMA/DATA/CONF/DataModel.xml
+63 -29
View File
@@ -2,9 +2,9 @@
<Machine>
<Property SymbolicName="Model" BrowseName="Model" DataType="ua:String" ValueRank="Scalar" Value="KOSMOS" />
<Property SymbolicName="Manufacturer" BrowseName="Manufacturer" DataType="ua:String" ValueRank="Scalar" Value="CMS Industries" />
<Property SymbolicName="Serial" BrowseName="Serial" DataType="ua:String" ValueRank="Scalar" Value="CMS00000" />
<Property SymbolicName="Serial" BrowseName="Serial" DataType="ua:String" ValueRank="Scalar" Value="B921" />
<Property SymbolicName="Type" BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Value="CNC_MACHINE" />
<Property SymbolicName="BuildYear" BrowseName="BuildYear" DataType="ua:String" ValueRank="Scalar" Value="2020" />
<Property SymbolicName="BuildYear" BrowseName="BuildYear" DataType="ua:String" ValueRank="Scalar" Value="2021" />
<Variable SymbolicName="Status" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" />
<Variable SymbolicName="Alarm" BrowseName="Alarm" DataType="ua:Boolean" ValueRank="Scalar" Units="Bool" />
<Variable SymbolicName="Emergency" BrowseName="Emergency" DataType="ua:Boolean" ValueRank="Scalar" Units="Bool" />
@@ -42,9 +42,9 @@
<Condition SymbolicName="Condition" BrowseName="Condition" DataType="ua:String" ValueRank="Scalar" Type="OffNormalAlarmState" Units="" />
</Component>
<Component Name="Hmi">
<Property SymbolicName="Name" BrowseName="Name" DataType="ua:String" ValueRank="Scalar" Value="CMS Active" />
<Property SymbolicName="Version" BrowseName="Version" DataType="ua:String" ValueRank="Scalar" Value="5.50" />
<Property SymbolicName="SerialNum" BrowseName="SerialNum" DataType="ua:String" ValueRank="Scalar" Value="B437" />
<Property SymbolicName="Name" BrowseName="Name" DataType="ua:String" ValueRank="Scalar" Value="CMS Active Saw" />
<Property SymbolicName="Version" BrowseName="Version" DataType="ua:String" ValueRank="Scalar" Value="8.00" />
<Property SymbolicName="SerialNum" BrowseName="SerialNum" DataType="ua:String" ValueRank="Scalar" Value="B921" />
<!--<Condition SymbolicName="Condition" BrowseName="Condition" DataType="ua:String" ValueRank="Scalar" Type="OffNormalAlarmState" Units="" />
<Variable SymbolicName="User" BrowseName="User" DataType="ua:String" ValueRank="Scalar" Units="" />
<Variable SymbolicName="Language" BrowseName="Language" DataType="ua:String" ValueRank="Scalar" Units="Enum" />
@@ -58,7 +58,7 @@
<Property SymbolicName="Role" BrowseName="Role" DataType="ua:String" ValueRank="Scalar" Value="MASTER" />
<Property SymbolicName="MasterId" BrowseName="MasterId" DataType="ua:String" ValueRank="Scalar" Value="0" />
<Property SymbolicName="ParentProc" BrowseName="ParentProc" DataType="ua:UInt32" ValueRank="Scalar" Value="1" />
<!--<Variable SymbolicName="ActiveTime" BrowseName="ActiveTime" DataType="ua:Float" ValueRank="Scalar" Units="h" CmsDataType="CounterList" CmsDataIndex="026" CmsDataOpt="HOURS" />-->
<Variable SymbolicName="ActiveTime" BrowseName="ActiveTime" DataType="ua:Float" ValueRank="Scalar" Units="h" CmsDataType="CounterList" CmsDataIndex="030" CmsDataOpt="HOURS" />
<Variable SymbolicName="Direction" BrowseName="Direction" DataType="ua:String" ValueRank="Scalar" Units="Enum" />
<Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" Units="Amp" />
<Variable SymbolicName="CurrentPos" BrowseName="CurrentPos" DataType="ua:Float" ValueRank="Scalar" Units="mm" SGroup="2" DBand="1" VGroup="P" />
@@ -75,7 +75,7 @@
<Property SymbolicName="Role" BrowseName="Role" DataType="ua:String" ValueRank="Scalar" Value="MASTER" />
<Property SymbolicName="MasterId" BrowseName="MasterId" DataType="ua:String" ValueRank="Scalar" Value="0" />
<Property SymbolicName="ParentProc" BrowseName="ParentProc" DataType="ua:UInt32" ValueRank="Scalar" Value="1" />
<!--<Variable SymbolicName="ActiveTime" BrowseName="ActiveTime" DataType="ua:Float" ValueRank="Scalar" Units="h" CmsDataType="CounterList" CmsDataIndex="027" CmsDataOpt="HOURS" />-->
<Variable SymbolicName="ActiveTime" BrowseName="ActiveTime" DataType="ua:Float" ValueRank="Scalar" Units="h" CmsDataType="CounterList" CmsDataIndex="031" CmsDataOpt="HOURS" />
<Variable SymbolicName="Direction" BrowseName="Direction" DataType="ua:String" ValueRank="Scalar" Units="Enum" />
<Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" Units="Amp" />
<Variable SymbolicName="CurrentPos" BrowseName="CurrentPos" DataType="ua:Float" ValueRank="Scalar" Units="mm" SGroup="2" DBand="1" VGroup="P" />
@@ -92,7 +92,7 @@
<Property SymbolicName="Role" BrowseName="Role" DataType="ua:String" ValueRank="Scalar" Value="MASTER" />
<Property SymbolicName="MasterId" BrowseName="MasterId" DataType="ua:String" ValueRank="Scalar" Value="0" />
<Property SymbolicName="ParentProc" BrowseName="ParentProc" DataType="ua:UInt32" ValueRank="Scalar" Value="1" />
<!--<Variable SymbolicName="ActiveTime" BrowseName="ActiveTime" DataType="ua:Float" ValueRank="Scalar" Units="h" CmsDataType="CounterList" CmsDataIndex="028" CmsDataOpt="HOURS" />-->
<Variable SymbolicName="ActiveTime" BrowseName="ActiveTime" DataType="ua:Float" ValueRank="Scalar" Units="h" CmsDataType="CounterList" CmsDataIndex="032" CmsDataOpt="HOURS" />
<Variable SymbolicName="Direction" BrowseName="Direction" DataType="ua:String" ValueRank="Scalar" Units="Enum" />
<Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" Units="Amp" />
<Variable SymbolicName="CurrentPos" BrowseName="CurrentPos" DataType="ua:Float" ValueRank="Scalar" Units="mm" SGroup="2" DBand="1" VGroup="P" />
@@ -109,9 +109,9 @@
<Property SymbolicName="Role" BrowseName="Role" DataType="ua:String" ValueRank="Scalar" Value="MASTER" />
<Property SymbolicName="MasterId" BrowseName="MasterId" DataType="ua:String" ValueRank="Scalar" Value="0" />
<Property SymbolicName="ParentProc" BrowseName="ParentProc" DataType="ua:UInt32" ValueRank="Scalar" Value="1" />
<!--<Variable SymbolicName="ActiveTime" BrowseName="ActiveTime" DataType="ua:Float" ValueRank="Scalar" Units="h" CmsDataType="CounterList" CmsDataIndex="029" CmsDataOpt="HOURS" />-->
<Variable SymbolicName="ActiveTime" BrowseName="ActiveTime" DataType="ua:Float" ValueRank="Scalar" Units="h" CmsDataType="CounterList" CmsDataIndex="033" CmsDataOpt="HOURS" />
<Variable SymbolicName="Direction" BrowseName="Direction" DataType="ua:String" ValueRank="Scalar" Units="Enum" />
<Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" Units="Amp" />
<!--<Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" Units="Amp" />-->
<Variable SymbolicName="CurrentPos" BrowseName="CurrentPos" DataType="ua:Float" ValueRank="Scalar" Units="Deg" SGroup="2" DBand="1" VGroup="P" />
<Variable SymbolicName="TargetPos" BrowseName="TargetPos" DataType="ua:Float" ValueRank="Scalar" Units="Deg" SGroup="4" DBand="1" VGroup="P" />
<Variable SymbolicName="Inversions" BrowseName="Inversions" DataType="ua:UInt32" ValueRank="Scalar" Units="Count" SGroup="4" DBand="1" VGroup="P" CmsDataType="CounterList" CmsDataIndex="011" CmsDataOpt="COUNT" />
@@ -126,12 +126,12 @@
<Property SymbolicName="Role" BrowseName="Role" DataType="ua:String" ValueRank="Scalar" Value="MASTER" />
<Property SymbolicName="MasterId" BrowseName="MasterId" DataType="ua:String" ValueRank="Scalar" Value="0" />
<Property SymbolicName="ParentProc" BrowseName="ParentProc" DataType="ua:UInt32" ValueRank="Scalar" Value="1" />
<!--<Variable SymbolicName="ActiveTime" BrowseName="ActiveTime" DataType="ua:Float" ValueRank="Scalar" Units="h" CmsDataType="CounterList" CmsDataIndex="030" CmsDataOpt="HOURS" />-->
<Variable SymbolicName="ActiveTime" BrowseName="ActiveTime" DataType="ua:Float" ValueRank="Scalar" Units="h" CmsDataType="CounterList" CmsDataIndex="034" CmsDataOpt="HOURS" />
<Variable SymbolicName="Direction" BrowseName="Direction" DataType="ua:String" ValueRank="Scalar" Units="Enum" />
<Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" Units="Amp" />
<Variable SymbolicName="CurrentPos" BrowseName="CurrentPos" DataType="ua:Float" ValueRank="Scalar" Units="Deg" SGroup="2" DBand="1" VGroup="P" />
<Variable SymbolicName="TargetPos" BrowseName="TargetPos" DataType="ua:Float" ValueRank="Scalar" Units="Deg" SGroup="4" DBand="1" VGroup="P" />
<Variable SymbolicName="Inversions" BrowseName="Inversions" DataType="ua:UInt32" ValueRank="Scalar" Units="Count" SGroup="4" DBand="1" VGroup="P" CmsDataType="CounterList" CmsDataIndex="013" CmsDataOpt="COUNT" />
<Variable SymbolicName="Inversions" BrowseName="Inversions" DataType="ua:UInt32" ValueRank="Scalar" Units="Count" SGroup="4" DBand="1" VGroup="P" CmsDataType="CounterList" CmsDataIndex="013" CmsDataOpt="COUNT"/>
<Variable SymbolicName="Distance" BrowseName="Distance" DataType="ua:Float" ValueRank="Scalar" Units="Rev" SGroup="4" DBand="1" VGroup="P" CmsDataType="CounterList" CmsDataIndex="012" CmsDataOpt="COUNT" CmsDataScale="360000" />
<Variable SymbolicName="FeedRate" BrowseName="FeedRate" DataType="ua:Float" ValueRank="Scalar" Units="Rpm/min" SGroup="4" DBand="1" VGroup="P" />
<Variable SymbolicName="FeedOverride" BrowseName="FeedOverride" DataType="ua:Float" ValueRank="Scalar" Units="Perc" />
@@ -143,18 +143,14 @@
<Property SymbolicName="Type" BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Value="SPINDLE" />
<Property SymbolicName="Location" BrowseName="Location" DataType="ua:String" ValueRank="Scalar" Value="Head 1" />
<Property SymbolicName="Model" BrowseName="Model" DataType="ua:String" ValueRank="Scalar" Value="ND" />
<!--<Variable SymbolicName="Status" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" CmsDataType="StatusList" CmsDataIndex="006" CmsDataOpt="BIT" />-->
<Variable SymbolicName="Status" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" CmsDataType="StatusList" CmsDataIndex="015" CmsDataOpt="BIT" />
<Variable SymbolicName="ActiveTime" BrowseName="ActiveTime" DataType="ua:Float" ValueRank="Scalar" Units="Krev" CmsDataType="CounterList" CmsDataIndex="016" CmsDataOpt="COUNT" CmsDataScale="1000" />
<Variable SymbolicName="SpeedRate" BrowseName="SpeedRate" DataType="ua:UInt32" ValueRank="Scalar" Units="rpm" />
<Variable SymbolicName="SpeedOverride" BrowseName="SpeedOverride" DataType="ua:Float" ValueRank="Scalar" Units="Perc" CmsDataType="AnalogData" CmsDataIndex="026" CmsDataOpt="NUM" />
<Variable SymbolicName="SpeedOverride" BrowseName="SpeedOverride" DataType="ua:Float" ValueRank="Scalar" Units="Perc" />
<Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" Units="Perc" CmsDataType="AnalogData" CmsDataIndex="001" CmsDataOpt="NUM" />
<!--<Variable SymbolicName="ToolChanges" BrowseName="ToolChanges" DataType="ua:Float" ValueRank="Scalar" Units="Count" CmsDataType="CounterList" CmsDataIndex="024" CmsDataOpt="NUM" />-->
<Variable SymbolicName="ToolId" BrowseName="ToolId" DataType="ua:Float" ValueRank="Scalar" Units="Count" CmsDataType="CounterList" CmsDataIndex="036" CmsDataOpt="NUM" />
<Variable SymbolicName="ToolChanges" BrowseName="ToolChanges" DataType="ua:Float" ValueRank="Scalar" Units="Count" CmsDataType="CounterList" CmsDataIndex="060" CmsDataOpt="NUM" />
<Variable SymbolicName="ParentProc" BrowseName="ParentProc" DataType="ua:UInt32" ValueRank="Scalar" Units="" />
<Variable SymbolicName="DiskTool" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" CmsDataType="StatusList" CmsDataIndex="011" CmsDataOpt="BIT" />
<Variable SymbolicName="DrillTool" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" CmsDataType="StatusList" CmsDataIndex="012" CmsDataOpt="BIT" />
<Variable SymbolicName="RouterTool" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" CmsDataType="StatusList" CmsDataIndex="013" CmsDataOpt="BIT" />
<Variable SymbolicName="WaterJet" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" CmsDataType="StatusList" CmsDataIndex="014" CmsDataOpt="BIT" />
<Variable SymbolicName="Repetitions" BrowseName="Repetitions" DataType="ua:Float" ValueRank="Scalar" Units="Count" CmsDataType="CounterList" CmsDataIndex="025" CmsDataOpt="COUNT" />
</Component>
</Component>
<Component Name="AuxiliaryGroups">
@@ -221,16 +217,54 @@
<Property SymbolicName="Type" BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Value="SlittaTastatore" />
<Variable SymbolicName="Repetitions" BrowseName="Repetitions" DataType="ua:Float" ValueRank="Scalar" Units="Count" CmsDataType="CounterList" CmsDataIndex="022" CmsDataOpt="COUNT" />
</Component>
<Component Name="14">
<Property SymbolicName="Type" BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Value="WJ_HEAD" />
<Property SymbolicName="Location" BrowseName="Location" DataType="ua:String" ValueRank="Scalar" Value="WJ_Head" />
<Variable SymbolicName="Status" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" CmsDataType="StatusList" CmsDataIndex="016" CmsDataOpt="BIT" />
<Variable SymbolicName="Repetitions" BrowseName="Repetitions" DataType="ua:Float" ValueRank="Scalar" Units="Count" CmsDataType="CounterList" CmsDataIndex="024" CmsDataOpt="COUNT" />
<Variable SymbolicName="OrificeTime" BrowseName="OrificeTime" DataType="ua:UInt32" ValueRank="Scalar" Units="h" CmsDataType="CounterList" CmsDataIndex="023" CmsDataOpt="HOURS" />
<Variable SymbolicName="FocuserTime" BrowseName="FocuserTime" DataType="ua:UInt32" ValueRank="Scalar" Units="h" CmsDataType="CounterList" CmsDataIndex="029" CmsDataOpt="HOURS" />
<Variable SymbolicName="InsertTime" BrowseName="InsertTime" DataType="ua:UInt32" ValueRank="Scalar" Units="h" CmsDataType="CounterList" CmsDataIndex="028" CmsDataOpt="HOURS" />
</Component>
<Component Name="15">
<Property SymbolicName="Type" BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Value="HOPPER" />
<Property SymbolicName="Location" BrowseName="Location" DataType="ua:String" ValueRank="Scalar" Value="Hopper" />
<Variable SymbolicName="Status" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" CmsDataType="StatusList" CmsDataIndex="017" CmsDataOpt="BIT" />
<Variable SymbolicName="Amount" BrowseName="Amount" DataType="ua:Float" ValueRank="Scalar" Units="Kg" CmsDataType="CounterList" CmsDataIndex="026" CmsDataOpt="COUNT" CmsDataScale="1000" />
<Variable SymbolicName="HopperSpeed" BrowseName="HopperSpeed" DataType="ua:Float" ValueRank="Scalar" Units="Count" CmsDataType="CounterList" CmsDataIndex="038" CmsDataOpt="NUM" />
<Variable SymbolicName="HopperTime" BrowseName="HopperTime" DataType="ua:UInt32" ValueRank="Scalar" Units="h" CmsDataType="CounterList" CmsDataIndex="025" CmsDataOpt="HOURS" />
</Component>
<Component Name="16">
<Property SymbolicName="Type" BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Value="INTENSIFIER" />
<Property SymbolicName="Location" BrowseName="Location" DataType="ua:String" ValueRank="Scalar" Value="Intensifier" />
<Variable SymbolicName="Status" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" CmsDataType="StatusList" CmsDataIndex="018" CmsDataOpt="BIT" />
<Variable SymbolicName="Pressure" BrowseName="Pressure" DataType="ua:Float" ValueRank="Scalar" Units="Count" CmsDataType="CounterList" CmsDataIndex="037" CmsDataOpt="NUM" />
<Variable SymbolicName="IntensTime" BrowseName="IntensTime" DataType="ua:UInt32" ValueRank="Scalar" Units="h" CmsDataType="CounterList" CmsDataIndex="027" CmsDataOpt="HOURS" />
</Component>
<Component Name="17">
<Property SymbolicName="Type" BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Value="TOOL" />
<Property SymbolicName="Location" BrowseName="Location" DataType="ua:String" ValueRank="Scalar" Value="ToolInfo" />
<Variable SymbolicName="ToolNumber" BrowseName="ToolNumber" DataType="ua:Float" ValueRank="Scalar" Units="Count" CmsDataType="CounterList" CmsDataIndex="036" CmsDataOpt="NUM" />
<Variable SymbolicName="DiskTool" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" CmsDataType="StatusList" CmsDataIndex="011" CmsDataOpt="BIT" />
<Variable SymbolicName="DrillTool" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" CmsDataType="StatusList" CmsDataIndex="012" CmsDataOpt="BIT" />
<Variable SymbolicName="RouterTool" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" CmsDataType="StatusList" CmsDataIndex="013" CmsDataOpt="BIT" />
<Variable SymbolicName="WaterJet" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" CmsDataType="StatusList" CmsDataIndex="014" CmsDataOpt="BIT" />
</Component>
</Component>
<!-- G480 C(0/1/-1) da mettere nei programmi ISO -->
<Component Name="ProductionProcesses">
<Component Name="01">
<Variable SymbolicName="Notification" BrowseName="Notification" DataType="ua:String" ValueRank="Scalar" Units="" CmsDataType="StringData" CmsDataIndex="02" />
<Component Name="Programs">
<Component Name="01">
<Variable SymbolicName="RepsDone" BrowseName="RepsDone" DataType="ua:UInt32" ValueRank="Scalar" Units="Count" CmsDataType="CounterList" CmsDataIndex="003" CmsDataOpt="RTV" />
<Variable SymbolicName="RepsTarget" BrowseName="RepsTarget" DataType="ua:Float" ValueRank="Scalar" Units="Count" CmsDataType="CounterList" CmsDataIndex="035" CmsDataOpt="COUNT" />
<Variable SymbolicName="Name" BrowseName="Name" DataType="ua:String" ValueRank="Scalar" Units="" CmsDataType="StringData" CmsDataIndex="01" />
</Component>
</Component>
</Component>
</Component>
<!-- M154 da mettere nei programmi ISO -->
<!-- <Component Name="ProductionProcesses"> -->
<!-- <Component Name="01"> -->
<!-- <Component Name="Programs"> -->
<!-- <Component Name="01"> -->
<!-- <Variable SymbolicName="RepsDone" BrowseName="RepsDone" DataType="ua:UInt32" ValueRank="Scalar" Units="Count" CmsDataType="CounterList" CmsDataIndex="003" CmsDataOpt="NUM" /> -->
<!--<Variable SymbolicName="RTCounter_002" BrowseName="ContaPzTav2" DataType="ua:UInt32" ValueRank="Scalar" Units="Count" CmsDataType="CounterList" CmsDataIndex="061" CmsDataOpt="NUM" />-->
<!-- </Component> -->
<!-- </Component> -->
<!-- </Component> -->
<!-- </Component> -->
</Machine>
MTC_Adapter/SCMA/DATA/CONF/StringList.map
+5
View File
@@ -0,0 +1,5 @@
# Commenti con cancelletto, struttura un variabile per riga, tipo chiave|valore (occhio che il separatore è configurato da .cofig come "testCharSep"); spazi e tabulazioni dovrei trimmarli in acquisizione (qui inseriti per comodità di lettura)
1 001|scma_scmastring_tag |STRING
2 002|scma_scmastring_tag |STRING
3 003|scma_scmastring_tag |STRING
4 004|scma_scmastring_tag |STRING
MTC_Adapter/SCMA/MainForm.cs
+2242 -2218
View File
File diff suppressed because it is too large Load Diff
MTC_Adapter/SCMA/NLog.xsd
+12
View File
@@ -1101,6 +1101,7 @@
<xs:element name="precision" minOccurs="0" maxOccurs="1" type="xs:byte" />
<xs:element name="scale" minOccurs="0" maxOccurs="1" type="xs:byte" />
<xs:element name="parameterType" minOccurs="0" maxOccurs="1" type="xs:string" />
<xs:element name="allowDbNull" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="format" minOccurs="0" maxOccurs="1" type="xs:string" />
<xs:element name="culture" minOccurs="0" maxOccurs="1" type="xs:string" />
</xs:choice>
@@ -1139,6 +1140,11 @@
<xs:documentation>Type of the parameter.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="allowDbNull" type="xs:boolean">
<xs:annotation>
<xs:documentation>Whether empty value should translate into DbNull. Requires database column to allow NULL values.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="format" type="xs:string">
<xs:annotation>
<xs:documentation>Convert format of the database parameter value.</xs:documentation>
@@ -2978,6 +2984,7 @@
<xs:element name="renderEmptyObject" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="suppressSpaces" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="attribute" minOccurs="0" maxOccurs="unbounded" type="NLog.Layouts.JsonAttribute" />
<xs:element name="excludeEmptyProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="excludeProperties" minOccurs="0" maxOccurs="1" type="xs:string" />
<xs:element name="includeAllProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="includeGdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
@@ -3000,6 +3007,11 @@
<xs:documentation>Option to suppress the extra spaces in the output json</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="excludeEmptyProperties" type="xs:boolean">
<xs:annotation>
<xs:documentation>Option to exclude null/empty properties from the log event (as JSON)</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="excludeProperties" type="xs:string">
<xs:annotation>
<xs:documentation>List of property names to exclude when is true</xs:documentation>
MTC_Adapter/SCMA/Resources/CMS/DataModel.Esa.xml
+62 -27
View File
@@ -2,9 +2,9 @@
<Machine>
<Property SymbolicName="Model" BrowseName="Model" DataType="ua:String" ValueRank="Scalar" Value="KOSMOS" />
<Property SymbolicName="Manufacturer" BrowseName="Manufacturer" DataType="ua:String" ValueRank="Scalar" Value="CMS Industries" />
<Property SymbolicName="Serial" BrowseName="Serial" DataType="ua:String" ValueRank="Scalar" Value="CMS09987" />
<Property SymbolicName="Serial" BrowseName="Serial" DataType="ua:String" ValueRank="Scalar" Value="B921" />
<Property SymbolicName="Type" BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Value="CNC_MACHINE" />
<Property SymbolicName="BuildYear" BrowseName="BuildYear" DataType="ua:String" ValueRank="Scalar" Value="2020" />
<Property SymbolicName="BuildYear" BrowseName="BuildYear" DataType="ua:String" ValueRank="Scalar" Value="2021" />
<Variable SymbolicName="Status" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" />
<Variable SymbolicName="Alarm" BrowseName="Alarm" DataType="ua:Boolean" ValueRank="Scalar" Units="Bool" />
<Variable SymbolicName="Emergency" BrowseName="Emergency" DataType="ua:Boolean" ValueRank="Scalar" Units="Bool" />
@@ -43,8 +43,8 @@
</Component>
<Component Name="Hmi">
<Property SymbolicName="Name" BrowseName="Name" DataType="ua:String" ValueRank="Scalar" Value="CMS Active Saw" />
<Property SymbolicName="Version" BrowseName="Version" DataType="ua:String" ValueRank="Scalar" Value="5.00" />
<Property SymbolicName="SerialNum" BrowseName="SerialNum" DataType="ua:String" ValueRank="Scalar" Value="9987" />
<Property SymbolicName="Version" BrowseName="Version" DataType="ua:String" ValueRank="Scalar" Value="8.00" />
<Property SymbolicName="SerialNum" BrowseName="SerialNum" DataType="ua:String" ValueRank="Scalar" Value="B921" />
<!--<Condition SymbolicName="Condition" BrowseName="Condition" DataType="ua:String" ValueRank="Scalar" Type="OffNormalAlarmState" Units="" />
<Variable SymbolicName="User" BrowseName="User" DataType="ua:String" ValueRank="Scalar" Units="" />
<Variable SymbolicName="Language" BrowseName="Language" DataType="ua:String" ValueRank="Scalar" Units="Enum" />
@@ -58,9 +58,9 @@
<Property SymbolicName="Role" BrowseName="Role" DataType="ua:String" ValueRank="Scalar" Value="MASTER" />
<Property SymbolicName="MasterId" BrowseName="MasterId" DataType="ua:String" ValueRank="Scalar" Value="0" />
<Property SymbolicName="ParentProc" BrowseName="ParentProc" DataType="ua:UInt32" ValueRank="Scalar" Value="1" />
<!--<Variable SymbolicName="ActiveTime" BrowseName="ActiveTime" DataType="ua:Float" ValueRank="Scalar" Units="h" CmsDataType="CounterList" CmsDataIndex="026" CmsDataOpt="HOURS" />-->
<Variable SymbolicName="ActiveTime" BrowseName="ActiveTime" DataType="ua:Float" ValueRank="Scalar" Units="h" CmsDataType="CounterList" CmsDataIndex="030" CmsDataOpt="HOURS" />
<Variable SymbolicName="Direction" BrowseName="Direction" DataType="ua:String" ValueRank="Scalar" Units="Enum" />
<!--<Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" Units="Amp" />-->
<Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" Units="Amp" />
<Variable SymbolicName="CurrentPos" BrowseName="CurrentPos" DataType="ua:Float" ValueRank="Scalar" Units="mm" SGroup="2" DBand="1" VGroup="P" />
<Variable SymbolicName="TargetPos" BrowseName="TargetPos" DataType="ua:Float" ValueRank="Scalar" Units="mm" SGroup="4" DBand="1" VGroup="P" />
<Variable SymbolicName="Inversions" BrowseName="Inversions" DataType="ua:UInt32" ValueRank="Scalar" Units="Count" SGroup="4" DBand="1" VGroup="P" CmsDataType="CounterList" CmsDataIndex="005" CmsDataOpt="COUNT" />
@@ -75,9 +75,9 @@
<Property SymbolicName="Role" BrowseName="Role" DataType="ua:String" ValueRank="Scalar" Value="MASTER" />
<Property SymbolicName="MasterId" BrowseName="MasterId" DataType="ua:String" ValueRank="Scalar" Value="0" />
<Property SymbolicName="ParentProc" BrowseName="ParentProc" DataType="ua:UInt32" ValueRank="Scalar" Value="1" />
<!--<Variable SymbolicName="ActiveTime" BrowseName="ActiveTime" DataType="ua:Float" ValueRank="Scalar" Units="h" CmsDataType="CounterList" CmsDataIndex="027" CmsDataOpt="HOURS" />-->
<Variable SymbolicName="ActiveTime" BrowseName="ActiveTime" DataType="ua:Float" ValueRank="Scalar" Units="h" CmsDataType="CounterList" CmsDataIndex="031" CmsDataOpt="HOURS" />
<Variable SymbolicName="Direction" BrowseName="Direction" DataType="ua:String" ValueRank="Scalar" Units="Enum" />
<!--<Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" Units="Amp" />-->
<Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" Units="Amp" />
<Variable SymbolicName="CurrentPos" BrowseName="CurrentPos" DataType="ua:Float" ValueRank="Scalar" Units="mm" SGroup="2" DBand="1" VGroup="P" />
<Variable SymbolicName="TargetPos" BrowseName="TargetPos" DataType="ua:Float" ValueRank="Scalar" Units="mm" SGroup="4" DBand="1" VGroup="P" />
<Variable SymbolicName="Inversions" BrowseName="Inversions" DataType="ua:UInt32" ValueRank="Scalar" Units="Count" SGroup="4" DBand="1" VGroup="P" CmsDataType="CounterList" CmsDataIndex="007" CmsDataOpt="COUNT" />
@@ -92,9 +92,9 @@
<Property SymbolicName="Role" BrowseName="Role" DataType="ua:String" ValueRank="Scalar" Value="MASTER" />
<Property SymbolicName="MasterId" BrowseName="MasterId" DataType="ua:String" ValueRank="Scalar" Value="0" />
<Property SymbolicName="ParentProc" BrowseName="ParentProc" DataType="ua:UInt32" ValueRank="Scalar" Value="1" />
<!--<Variable SymbolicName="ActiveTime" BrowseName="ActiveTime" DataType="ua:Float" ValueRank="Scalar" Units="h" CmsDataType="CounterList" CmsDataIndex="028" CmsDataOpt="HOURS" />-->
<Variable SymbolicName="ActiveTime" BrowseName="ActiveTime" DataType="ua:Float" ValueRank="Scalar" Units="h" CmsDataType="CounterList" CmsDataIndex="032" CmsDataOpt="HOURS" />
<Variable SymbolicName="Direction" BrowseName="Direction" DataType="ua:String" ValueRank="Scalar" Units="Enum" />
<!--<Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" Units="Amp" />-->
<Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" Units="Amp" />
<Variable SymbolicName="CurrentPos" BrowseName="CurrentPos" DataType="ua:Float" ValueRank="Scalar" Units="mm" SGroup="2" DBand="1" VGroup="P" />
<Variable SymbolicName="TargetPos" BrowseName="TargetPos" DataType="ua:Float" ValueRank="Scalar" Units="mm" SGroup="4" DBand="1" VGroup="P" />
<Variable SymbolicName="Inversions" BrowseName="Inversions" DataType="ua:UInt32" ValueRank="Scalar" Units="Count" SGroup="4" DBand="1" VGroup="P" CmsDataType="CounterList" CmsDataIndex="009" CmsDataOpt="COUNT" />
@@ -109,7 +109,7 @@
<Property SymbolicName="Role" BrowseName="Role" DataType="ua:String" ValueRank="Scalar" Value="MASTER" />
<Property SymbolicName="MasterId" BrowseName="MasterId" DataType="ua:String" ValueRank="Scalar" Value="0" />
<Property SymbolicName="ParentProc" BrowseName="ParentProc" DataType="ua:UInt32" ValueRank="Scalar" Value="1" />
<!--<Variable SymbolicName="ActiveTime" BrowseName="ActiveTime" DataType="ua:Float" ValueRank="Scalar" Units="h" CmsDataType="CounterList" CmsDataIndex="029" CmsDataOpt="HOURS" />-->
<Variable SymbolicName="ActiveTime" BrowseName="ActiveTime" DataType="ua:Float" ValueRank="Scalar" Units="h" CmsDataType="CounterList" CmsDataIndex="033" CmsDataOpt="HOURS" />
<Variable SymbolicName="Direction" BrowseName="Direction" DataType="ua:String" ValueRank="Scalar" Units="Enum" />
<!--<Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" Units="Amp" />-->
<Variable SymbolicName="CurrentPos" BrowseName="CurrentPos" DataType="ua:Float" ValueRank="Scalar" Units="Deg" SGroup="2" DBand="1" VGroup="P" />
@@ -126,9 +126,9 @@
<Property SymbolicName="Role" BrowseName="Role" DataType="ua:String" ValueRank="Scalar" Value="MASTER" />
<Property SymbolicName="MasterId" BrowseName="MasterId" DataType="ua:String" ValueRank="Scalar" Value="0" />
<Property SymbolicName="ParentProc" BrowseName="ParentProc" DataType="ua:UInt32" ValueRank="Scalar" Value="1" />
<!--<Variable SymbolicName="ActiveTime" BrowseName="ActiveTime" DataType="ua:Float" ValueRank="Scalar" Units="h" CmsDataType="CounterList" CmsDataIndex="030" CmsDataOpt="HOURS" />-->
<Variable SymbolicName="ActiveTime" BrowseName="ActiveTime" DataType="ua:Float" ValueRank="Scalar" Units="h" CmsDataType="CounterList" CmsDataIndex="034" CmsDataOpt="HOURS" />
<Variable SymbolicName="Direction" BrowseName="Direction" DataType="ua:String" ValueRank="Scalar" Units="Enum" />
<!--<Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" Units="Amp" />-->
<Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" Units="Amp" />
<Variable SymbolicName="CurrentPos" BrowseName="CurrentPos" DataType="ua:Float" ValueRank="Scalar" Units="Deg" SGroup="2" DBand="1" VGroup="P" />
<Variable SymbolicName="TargetPos" BrowseName="TargetPos" DataType="ua:Float" ValueRank="Scalar" Units="Deg" SGroup="4" DBand="1" VGroup="P" />
<Variable SymbolicName="Inversions" BrowseName="Inversions" DataType="ua:UInt32" ValueRank="Scalar" Units="Count" SGroup="4" DBand="1" VGroup="P" CmsDataType="CounterList" CmsDataIndex="013" CmsDataOpt="COUNT"/>
@@ -148,12 +148,9 @@
<Variable SymbolicName="SpeedRate" BrowseName="SpeedRate" DataType="ua:UInt32" ValueRank="Scalar" Units="rpm" />
<Variable SymbolicName="SpeedOverride" BrowseName="SpeedOverride" DataType="ua:Float" ValueRank="Scalar" Units="Perc" />
<Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" Units="Perc" CmsDataType="AnalogData" CmsDataIndex="001" CmsDataOpt="NUM" />
<!--<Variable SymbolicName="ToolChanges" BrowseName="ToolChanges" DataType="ua:Float" ValueRank="Scalar" Units="Count" CmsDataType="CounterList" CmsDataIndex="024" CmsDataOpt="NUM" />-->
<Variable SymbolicName="ToolId" BrowseName="ToolId" DataType="ua:Float" ValueRank="Scalar" Units="Count" CmsDataType="CounterList" CmsDataIndex="036" CmsDataOpt="NUM" />
<Variable SymbolicName="ToolChanges" BrowseName="ToolChanges" DataType="ua:Float" ValueRank="Scalar" Units="Count" CmsDataType="CounterList" CmsDataIndex="060" CmsDataOpt="NUM" />
<Variable SymbolicName="ParentProc" BrowseName="ParentProc" DataType="ua:UInt32" ValueRank="Scalar" Units="" />
<Variable SymbolicName="DiskTool" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" CmsDataType="StatusList" CmsDataIndex="011" CmsDataOpt="BIT" />
<Variable SymbolicName="DrillTool" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" CmsDataType="StatusList" CmsDataIndex="012" CmsDataOpt="BIT" />
<Variable SymbolicName="RouterTool" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" CmsDataType="StatusList" CmsDataIndex="013" CmsDataOpt="BIT" />
<Variable SymbolicName="WaterJet" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" CmsDataType="StatusList" CmsDataIndex="014" CmsDataOpt="BIT" />
</Component>
</Component>
<Component Name="AuxiliaryGroups">
@@ -220,16 +217,54 @@
<Property SymbolicName="Type" BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Value="SlittaTastatore" />
<Variable SymbolicName="Repetitions" BrowseName="Repetitions" DataType="ua:Float" ValueRank="Scalar" Units="Count" CmsDataType="CounterList" CmsDataIndex="022" CmsDataOpt="COUNT" />
</Component>
<Component Name="14">
<Property SymbolicName="Type" BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Value="WJ_HEAD" />
<Property SymbolicName="Location" BrowseName="Location" DataType="ua:String" ValueRank="Scalar" Value="WJ_Head" />
<Variable SymbolicName="Status" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" CmsDataType="StatusList" CmsDataIndex="016" CmsDataOpt="BIT" />
<Variable SymbolicName="Repetitions" BrowseName="Repetitions" DataType="ua:Float" ValueRank="Scalar" Units="Count" CmsDataType="CounterList" CmsDataIndex="024" CmsDataOpt="COUNT" />
<Variable SymbolicName="OrificeTime" BrowseName="OrificeTime" DataType="ua:UInt32" ValueRank="Scalar" Units="h" CmsDataType="CounterList" CmsDataIndex="023" CmsDataOpt="HOURS" />
<Variable SymbolicName="FocuserTime" BrowseName="FocuserTime" DataType="ua:UInt32" ValueRank="Scalar" Units="h" CmsDataType="CounterList" CmsDataIndex="029" CmsDataOpt="HOURS" />
<Variable SymbolicName="InsertTime" BrowseName="InsertTime" DataType="ua:UInt32" ValueRank="Scalar" Units="h" CmsDataType="CounterList" CmsDataIndex="028" CmsDataOpt="HOURS" />
</Component>
<Component Name="15">
<Property SymbolicName="Type" BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Value="HOPPER" />
<Property SymbolicName="Location" BrowseName="Location" DataType="ua:String" ValueRank="Scalar" Value="Hopper" />
<Variable SymbolicName="Status" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" CmsDataType="StatusList" CmsDataIndex="017" CmsDataOpt="BIT" />
<Variable SymbolicName="Amount" BrowseName="Amount" DataType="ua:Float" ValueRank="Scalar" Units="Kg" CmsDataType="CounterList" CmsDataIndex="026" CmsDataOpt="COUNT" CmsDataScale="1000" />
<Variable SymbolicName="HopperSpeed" BrowseName="HopperSpeed" DataType="ua:Float" ValueRank="Scalar" Units="Count" CmsDataType="CounterList" CmsDataIndex="038" CmsDataOpt="NUM" />
<Variable SymbolicName="HopperTime" BrowseName="HopperTime" DataType="ua:UInt32" ValueRank="Scalar" Units="h" CmsDataType="CounterList" CmsDataIndex="025" CmsDataOpt="HOURS" />
</Component>
<Component Name="16">
<Property SymbolicName="Type" BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Value="INTENSIFIER" />
<Property SymbolicName="Location" BrowseName="Location" DataType="ua:String" ValueRank="Scalar" Value="Intensifier" />
<Variable SymbolicName="Status" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" CmsDataType="StatusList" CmsDataIndex="018" CmsDataOpt="BIT" />
<Variable SymbolicName="Pressure" BrowseName="Pressure" DataType="ua:Float" ValueRank="Scalar" Units="Count" CmsDataType="CounterList" CmsDataIndex="037" CmsDataOpt="NUM" />
<Variable SymbolicName="IntensTime" BrowseName="IntensTime" DataType="ua:UInt32" ValueRank="Scalar" Units="h" CmsDataType="CounterList" CmsDataIndex="027" CmsDataOpt="HOURS" />
</Component>
<Component Name="17">
<Property SymbolicName="Type" BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Value="TOOL" />
<Property SymbolicName="Location" BrowseName="Location" DataType="ua:String" ValueRank="Scalar" Value="ToolInfo" />
<Variable SymbolicName="ToolNumber" BrowseName="ToolNumber" DataType="ua:Float" ValueRank="Scalar" Units="Count" CmsDataType="CounterList" CmsDataIndex="036" CmsDataOpt="NUM" />
<Variable SymbolicName="DiskTool" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" CmsDataType="StatusList" CmsDataIndex="011" CmsDataOpt="BIT" />
<Variable SymbolicName="DrillTool" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" CmsDataType="StatusList" CmsDataIndex="012" CmsDataOpt="BIT" />
<Variable SymbolicName="RouterTool" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" CmsDataType="StatusList" CmsDataIndex="013" CmsDataOpt="BIT" />
<Variable SymbolicName="WaterJet" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" CmsDataType="StatusList" CmsDataIndex="014" CmsDataOpt="BIT" />
</Component>
</Component>
<!-- G480 C(0/1/-1) da mettere nei programmi ISO -->
<Component Name="ProductionProcesses">
<Component Name="01">
<Variable SymbolicName="Notification" BrowseName="Notification" DataType="ua:String" ValueRank="Scalar" Units="" />
<Component Name="Programs">
<Component Name="01">
<Variable SymbolicName="RepsDone" BrowseName="RepsDone" DataType="ua:UInt32" ValueRank="Scalar" Units="Count" CmsDataType="CounterList" CmsDataIndex="003" CmsDataOpt="RTV" />
<Variable SymbolicName="RepsTarget" BrowseName="RepsTarget" DataType="ua:Float" ValueRank="Scalar" Units="Count" CmsDataType="CounterList" CmsDataIndex="035" CmsDataOpt="COUNT" />
<Variable SymbolicName="Name" BrowseName="Name" DataType="ua:String" ValueRank="Scalar" Units="" CmsDataType="StringData" CmsDataIndex="01" CmsDataOpt="" />
</Component>
</Component>
</Component>
</Component>
<!-- M154 da mettere nei programmi ISO -->
<!-- <Component Name="ProductionProcesses"> -->
<!-- <Component Name="01"> -->
<!-- <Component Name="Programs"> -->
<!-- <Component Name="01"> -->
<!-- <Variable SymbolicName="RepsDone" BrowseName="RepsDone" DataType="ua:UInt32" ValueRank="Scalar" Units="Count" CmsDataType="CounterList" CmsDataIndex="003" CmsDataOpt="NUM" /> -->
<!--<Variable SymbolicName="RTCounter_002" BrowseName="ContaPzTav2" DataType="ua:UInt32" ValueRank="Scalar" Units="Count" CmsDataType="CounterList" CmsDataIndex="061" CmsDataOpt="NUM" />-->
<!-- </Component> -->
<!-- </Component> -->
<!-- </Component> -->
<!-- </Component> -->
</Machine>
MTC_Adapter/SCMA/SCMA.csproj
+4 -2
View File
@@ -119,8 +119,7 @@
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.4.7.2\lib\net45\NLog.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\NLog.4.7.10\lib\net45\NLog.dll</HintPath>
</Reference>
<Reference Include="Pipelines.Sockets.Unofficial, Version=1.0.0.0, Culture=neutral, PublicKeyToken=42ea0a778e13fbe2, processorArchitecture=MSIL">
<HintPath>..\packages\Pipelines.Sockets.Unofficial.2.1.16\lib\net461\Pipelines.Sockets.Unofficial.dll</HintPath>
@@ -266,6 +265,9 @@
<DependentUpon>App.config</DependentUpon>
<IsTransformFile>true</IsTransformFile>
</None>
<None Include="DATA\CONF\StringList.map">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\NameRepRolesList.map">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
MTC_Adapter/SCMA/packages.config
+2 -2
View File
@@ -3,8 +3,8 @@
<package id="Microsoft.Bcl.AsyncInterfaces" version="1.1.1" targetFramework="net462" />
<package id="Microsoft.VisualStudio.SlowCheetah" version="3.2.26" targetFramework="net462" developmentDependency="true" />
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net452" />
<package id="NLog" version="4.7.2" targetFramework="net462" />
<package id="NLog.Schema" version="4.7.2" targetFramework="net462" />
<package id="NLog" version="4.7.10" targetFramework="net462" />
<package id="NLog.Schema" version="4.7.10" targetFramework="net462" />
<package id="Pipelines.Sockets.Unofficial" version="2.1.16" targetFramework="net462" />
<package id="PrettyBin" version="1.1.0" targetFramework="net452" />
<package id="StackExchange.Redis" version="2.1.58" targetFramework="net462" />
MTC_Adapter/SCMA/utils.cs
+179 -157
View File
@@ -4,165 +4,187 @@ using System.Xml;
namespace SCMA
{
public class utils : MTC.baseUtils
{
/// <summary>
/// folder archiviazione dati configurazione (DATA\CONF)
/// </summary>
public static string resxDir
public class utils : MTC.baseUtils
{
get
{
return string.Format(@"{0}\{1}", Application.StartupPath, CRS("resxPath"));
}
}
/// <summary>
/// folder archiviazione dati configurazione (DATA\CONF)
/// </summary>
public static string confDir
{
get
{
return string.Format(@"{0}\{1}", Application.StartupPath, CRS("dataConfPath"));
}
}
/// <summary>
/// folder archiviazione dati storici giornalieri (DATA\DAT)
/// </summary>
public static string dataDatDir
{
get
{
return string.Format(@"{0}\{1}", Application.StartupPath, CRS("dataDatPath"));
}
}
/// <summary>
/// folder archiviazione dati (DATA)
/// </summary>
public static string dataDir
{
get
{
return string.Format(@"{0}\{1}", Application.StartupPath, CRS("dataPath"));
}
}
/// <summary>
/// File x regole di replacement USER DEFINED
/// </summary>
public static string nameRepRoleFile
{
get
{
return string.Format(@"{0}\{1}", utils.confDir, utils.CRS("NameRepRolesList"));
}
}
/// <summary>
/// File x regole di replacement generato ad hoc x SOUR / OPC-UA
/// </summary>
public static string nameRepRoleFileSOUR
{
get
{
return nameRepRoleFile.Replace(".map", ".SOUR.map");
}
}
/// <summary>
/// File StatusList
/// </summary>
public static string StatusListFile
{
get
{
return string.Format(@"{0}\{1}", utils.confDir, utils.CRS("StatusListFilePath"));
}
}
/// <summary>
/// File StatusList generato ad hoc x SOUR / OPC-UA
///
/// </summary>
public static string StatusListFileSOUR
{
get
{
return StatusListFile.Replace(".map", ".SOUR.map");
}
}
/// <summary>
/// File CounterList
/// </summary>
public static string CounterListFile
{
get
{
return string.Format(@"{0}\{1}", utils.confDir, utils.CRS("CounterListFilePath"));
}
}
/// <summary>
/// File CounterList generato ad hoc x SOUR / OPC-UA
///
/// </summary>
public static string CounterListFileSOUR
{
get
{
return CounterListFile.Replace(".map", ".SOUR.map");
}
}
/// <summary>
/// File AnalogList
/// </summary>
public static string AnalogListFile
{
get
{
return string.Format(@"{0}\{1}", utils.confDir, utils.CRS("AnalogDataFilePath"));
}
}
/// <summary>
/// File AnalogList generato ad hoc x SOUR / OPC-UA
///
/// </summary>
public static string AnalogListFileSOUR
{
get
{
return AnalogListFile.Replace(".map", ".SOUR.map");
}
}
/// <summary>
/// Metodo di sanitizzazione XML
/// - elimina commenti
/// - formatta
/// </summary>
/// <param name="xmlOrig"></param>
/// <returns></returns>
public static string xmlSanitize(string xmlOrig)
{
string sXml = xmlOrig;
bool xmlSanitize = utils.CRB("xmlSanitize");
// se richeisto faccio sanitize xml (pulizia commenti...)
if (xmlSanitize)
{
// primo step: converto stringa in dox XML
XmlDocument xmlDoc = new XmlDocument();
xmlDoc.PreserveWhitespace = false;
xmlDoc.LoadXml(sXml);
// ora lo parso come lista eliminando i commenti
XmlNodeList list = xmlDoc.SelectNodes("//comment()");
foreach (XmlNode node in list)
/// <summary>
/// folder archiviazione dati configurazione (DATA\CONF)
/// </summary>
public static string resxDir
{
node.ParentNode.RemoveChild(node);
get
{
return string.Format(@"{0}\{1}", Application.StartupPath, CRS("resxPath"));
}
}
/// <summary>
/// folder archiviazione dati configurazione (DATA\CONF)
/// </summary>
public static string confDir
{
get
{
return string.Format(@"{0}\{1}", Application.StartupPath, CRS("dataConfPath"));
}
}
/// <summary>
/// folder archiviazione dati storici giornalieri (DATA\DAT)
/// </summary>
public static string dataDatDir
{
get
{
return string.Format(@"{0}\{1}", Application.StartupPath, CRS("dataDatPath"));
}
}
/// <summary>
/// folder archiviazione dati (DATA)
/// </summary>
public static string dataDir
{
get
{
return string.Format(@"{0}\{1}", Application.StartupPath, CRS("dataPath"));
}
}
/// <summary>
/// File x regole di replacement USER DEFINED
/// </summary>
public static string nameRepRoleFile
{
get
{
return string.Format(@"{0}\{1}", utils.confDir, utils.CRS("NameRepRolesList"));
}
}
/// <summary>
/// File x regole di replacement generato ad hoc x SOUR / OPC-UA
/// </summary>
public static string nameRepRoleFileSOUR
{
get
{
return nameRepRoleFile.Replace(".map", ".SOUR.map");
}
}
/// <summary>
/// File StatusList
/// </summary>
public static string StatusListFile
{
get
{
return string.Format(@"{0}\{1}", utils.confDir, utils.CRS("StatusListFilePath"));
}
}
/// <summary>
/// File StatusList generato ad hoc x SOUR / OPC-UA
///
/// </summary>
public static string StatusListFileSOUR
{
get
{
return StatusListFile.Replace(".map", ".SOUR.map");
}
}
/// <summary>
/// File CounterList
/// </summary>
public static string CounterListFile
{
get
{
return string.Format(@"{0}\{1}", utils.confDir, utils.CRS("CounterListFilePath"));
}
}
/// <summary>
/// File CounterList generato ad hoc x SOUR / OPC-UA
///
/// </summary>
public static string CounterListFileSOUR
{
get
{
return CounterListFile.Replace(".map", ".SOUR.map");
}
}
/// <summary>
/// File AnalogList
/// </summary>
public static string AnalogListFile
{
get
{
return string.Format(@"{0}\{1}", utils.confDir, utils.CRS("AnalogDataFilePath"));
}
}
/// <summary>
/// File AnalogList generato ad hoc x SOUR / OPC-UA
///
/// </summary>
public static string AnalogListFileSOUR
{
get
{
return AnalogListFile.Replace(".map", ".SOUR.map");
}
}
/// <summary>
/// File AnalogList
/// </summary>
public static string StringListFile
{
get
{
return string.Format(@"{0}\{1}", utils.confDir, utils.CRS("StringDataFilePath"));
}
}
/// <summary>
/// File AnalogList generato ad hoc x SOUR / OPC-UA
///
/// </summary>
public static string StringListFileSOUR
{
get
{
return StringListFile.Replace(".map", ".SOUR.map");
}
}
/// <summary>
/// Metodo di sanitizzazione XML
/// - elimina commenti
/// - formatta
/// </summary>
/// <param name="xmlOrig"></param>
/// <returns></returns>
public static string xmlSanitize(string xmlOrig)
{
string sXml = xmlOrig;
bool xmlSanitize = utils.CRB("xmlSanitize");
// se richeisto faccio sanitize xml (pulizia commenti...)
if (xmlSanitize)
{
// primo step: converto stringa in dox XML
XmlDocument xmlDoc = new XmlDocument();
xmlDoc.PreserveWhitespace = false;
xmlDoc.LoadXml(sXml);
// ora lo parso come lista eliminando i commenti
XmlNodeList list = xmlDoc.SelectNodes("//comment()");
foreach (XmlNode node in list)
{
node.ParentNode.RemoveChild(node);
}
// fix formattazione "riscrivendo" indentazione...
StringWriter string_writer = new StringWriter();
XmlTextWriter xml_text_writer = new XmlTextWriter(string_writer);
xml_text_writer.Formatting = Formatting.Indented;
xmlDoc.WriteTo(xml_text_writer);
sXml = string_writer.ToString();
}
// restituisco
return sXml;
}
// fix formattazione "riscrivendo" indentazione...
StringWriter string_writer = new StringWriter();
XmlTextWriter xml_text_writer = new XmlTextWriter(string_writer);
xml_text_writer.Formatting = Formatting.Indented;
xmlDoc.WriteTo(xml_text_writer);
sXml = string_writer.ToString();
}
// restituisco
return sXml;
}
}
}
MTC_Adapter/SCMCncLib/NLog.xsd
+12
View File
@@ -1101,6 +1101,7 @@
<xs:element name="precision" minOccurs="0" maxOccurs="1" type="xs:byte" />
<xs:element name="scale" minOccurs="0" maxOccurs="1" type="xs:byte" />
<xs:element name="parameterType" minOccurs="0" maxOccurs="1" type="xs:string" />
<xs:element name="allowDbNull" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="format" minOccurs="0" maxOccurs="1" type="xs:string" />
<xs:element name="culture" minOccurs="0" maxOccurs="1" type="xs:string" />
</xs:choice>
@@ -1139,6 +1140,11 @@
<xs:documentation>Type of the parameter.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="allowDbNull" type="xs:boolean">
<xs:annotation>
<xs:documentation>Whether empty value should translate into DbNull. Requires database column to allow NULL values.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="format" type="xs:string">
<xs:annotation>
<xs:documentation>Convert format of the database parameter value.</xs:documentation>
@@ -2978,6 +2984,7 @@
<xs:element name="renderEmptyObject" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="suppressSpaces" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="attribute" minOccurs="0" maxOccurs="unbounded" type="NLog.Layouts.JsonAttribute" />
<xs:element name="excludeEmptyProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="excludeProperties" minOccurs="0" maxOccurs="1" type="xs:string" />
<xs:element name="includeAllProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="includeGdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
@@ -3000,6 +3007,11 @@
<xs:documentation>Option to suppress the extra spaces in the output json</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="excludeEmptyProperties" type="xs:boolean">
<xs:annotation>
<xs:documentation>Option to exclude null/empty properties from the log event (as JSON)</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="excludeProperties" type="xs:string">
<xs:annotation>
<xs:documentation>List of property names to exclude when is true</xs:documentation>
MTC_Adapter/SCMCncLib/SCMCncLib.csproj
+1 -1
View File
@@ -39,7 +39,7 @@
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.4.7.2\lib\net45\NLog.dll</HintPath>
<HintPath>..\packages\NLog.4.7.10\lib\net45\NLog.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
MTC_Adapter/SCMCncLib/packages.config
+2 -2
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net452" />
<package id="NLog" version="4.7.2" targetFramework="net462" />
<package id="NLog.Schema" version="4.7.2" targetFramework="net462" />
<package id="NLog" version="4.7.10" targetFramework="net462" />
<package id="NLog.Schema" version="4.7.10" targetFramework="net462" />
</packages>
MTC_Adapter/packages/NLog.Schema.4.7.2/.signature.p7s → MTC_Adapter/packages/NLog.4.7.10/.signature.p7s
Vendored
BIN
View File
Binary file not shown.
MTC_Adapter/packages/NLog.4.7.10/NLog.4.7.10.nupkg
Vendored
BIN
View File
Binary file not shown.
MTC_Adapter/packages/NLog.4.7.10/lib/monoandroid44/NLog.dll
Vendored
BIN
View File
Binary file not shown.
MTC_Adapter/packages/NLog.4.7.2/lib/xamarinios10/NLog.xml → MTC_Adapter/packages/NLog.4.7.10/lib/monoandroid44/NLog.xml
Vendored
+119 -12
View File
@@ -1669,7 +1669,7 @@
with embedded ${}).
</summary>
</member>
<member name="M:NLog.Conditions.ConditionLayoutExpression.#ctor(NLog.Layouts.Layout)">
<member name="M:NLog.Conditions.ConditionLayoutExpression.#ctor(NLog.Layouts.SimpleLayout)">
<summary>
Initializes a new instance of the <see cref="T:NLog.Conditions.ConditionLayoutExpression" /> class.
</summary>
@@ -1718,11 +1718,12 @@
Condition literal expression (numeric, <b>LogLevel.XXX</b>, <b>true</b> or <b>false</b>).
</summary>
</member>
<member name="M:NLog.Conditions.ConditionLiteralExpression.#ctor(System.Object)">
<member name="M:NLog.Conditions.ConditionLiteralExpression.#ctor(System.Object,System.String)">
<summary>
Initializes a new instance of the <see cref="T:NLog.Conditions.ConditionLiteralExpression" /> class.
</summary>
<param name="literalValue">Literal value.</param>
<param name="toStringValue">ToString value.</param>
</member>
<member name="P:NLog.Conditions.ConditionLiteralExpression.LiteralValue">
<summary>
@@ -3461,7 +3462,7 @@
Get default file paths (including filename) for possible NLog config files.
</summary>
</member>
<member name="M:NLog.Config.LoggingConfigurationFileLoader.GetAppSpecificNLogLocations(System.String)">
<member name="M:NLog.Config.LoggingConfigurationFileLoader.GetAppSpecificNLogLocations(System.String,System.String)">
<summary>
Get default file paths (including filename) for possible NLog config files.
</summary>
@@ -4008,6 +4009,11 @@
- Update TemplateXSD.xml for changes outside targets
</remarks>
</member>
<member name="F:NLog.Config.XmlLoggingConfiguration.AssetsPrefix">
<summary>
Prefix for assets in Xamarin Android
</summary>
</member>
<member name="M:NLog.Config.XmlLoggingConfiguration.#ctor(System.String)">
<summary>
Initializes a new instance of the <see cref="T:NLog.Config.XmlLoggingConfiguration" /> class.
@@ -11373,6 +11379,11 @@
Gets or sets whether to render innermost Exception from <see cref="M:System.Exception.GetBaseException"/>
</summary>
</member>
<member name="P:NLog.LayoutRenderers.ExceptionLayoutRenderer.FlattenException">
<summary>
Gets or sets whether to collapse exception tree using <see cref="M:System.AggregateException.Flatten"/>
</summary>
</member>
<member name="P:NLog.LayoutRenderers.ExceptionLayoutRenderer.Formats">
<summary>
Gets the formats of the output of inner exceptions to be rendered in target.
@@ -11510,6 +11521,12 @@
A layout renderer which could have different behavior per instance by using a <see cref="T:System.Func`1"/>.
</summary>
</member>
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.#ctor(System.String)">
<summary>
Initializes a new instance of the <see cref="T:NLog.LayoutRenderers.FuncLayoutRenderer"/> class.
</summary>
<param name="layoutRendererName">Name without ${}.</param>
</member>
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.#ctor(System.String,System.Func{NLog.LogEventInfo,NLog.Config.LoggingConfiguration,System.Object})">
<summary>
Initializes a new instance of the <see cref="T:NLog.LayoutRenderers.FuncLayoutRenderer"/> class.
@@ -11523,9 +11540,11 @@
</summary>
</member>
<member name="P:NLog.LayoutRenderers.FuncLayoutRenderer.RenderMethod">
<summary>
Method that renders the layout.
</summary>
<summary>
Method that renders the layout.
This public property will be removed in NLog 5.
</summary>
</member>
<member name="P:NLog.LayoutRenderers.FuncLayoutRenderer.Format">
<summary>
@@ -11539,6 +11558,13 @@
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.NLog#Internal#IStringValueRenderer#GetFormattedString(NLog.LogEventInfo)">
<inheritdoc/>
</member>
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.RenderValue(NLog.LogEventInfo)">
<summary>
Render the value for this log event
</summary>
<param name="logEvent">The event info.</param>
<returns>The value.</returns>
</member>
<member name="T:NLog.LayoutRenderers.FuncThreadAgnosticLayoutRenderer">
<summary>
A layout renderer which could have different behavior per instance by using a <see cref="T:System.Func`1"/>.
@@ -11870,6 +11896,12 @@
<param name="name">Name of the layout renderer - without ${}.</param>
<param name="func">Callback that returns the value for the layout renderer.</param>
</member>
<member name="M:NLog.LayoutRenderers.LayoutRenderer.Register(NLog.LayoutRenderers.FuncLayoutRenderer)">
<summary>
Register a custom layout renderer with a callback function <paramref name="layoutRenderer"/>. The callback receives the logEvent and the current configuration.
</summary>
<param name="layoutRenderer">Renderer with callback func</param>
</member>
<member name="T:NLog.LayoutRenderers.LayoutRendererAttribute">
<summary>
Marks class as a layout renderer and assigns a name to it.
@@ -12382,6 +12414,27 @@
<member name="M:NLog.LayoutRenderers.ProcessDirLayoutRenderer.Append(System.Text.StringBuilder,NLog.LogEventInfo)">
<inheritdoc/>
</member>
<member name="T:NLog.LayoutRenderers.ProcessIdLayoutRenderer">
<summary>
The identifier of the current process.
</summary>
</member>
<member name="M:NLog.LayoutRenderers.ProcessIdLayoutRenderer.#ctor">
<summary>
Initializes a new instance of the <see cref="T:NLog.LayoutRenderers.ProcessIdLayoutRenderer" /> class.
</summary>
</member>
<member name="M:NLog.LayoutRenderers.ProcessIdLayoutRenderer.#ctor(NLog.Internal.Fakeables.IAppEnvironment)">
<summary>
Initializes a new instance of the <see cref="T:NLog.LayoutRenderers.ProcessIdLayoutRenderer" /> class.
</summary>
</member>
<member name="M:NLog.LayoutRenderers.ProcessIdLayoutRenderer.Append(System.Text.StringBuilder,NLog.LogEventInfo)">
<inheritdoc />
</member>
<member name="M:NLog.LayoutRenderers.ProcessIdLayoutRenderer.NLog#Internal#IRawValue#TryGetRawValue(NLog.LogEventInfo,System.Object@)">
<inheritdoc />
</member>
<member name="T:NLog.LayoutRenderers.ProcessInfoLayoutRenderer">
<summary>
The information about the running process.
@@ -12608,6 +12661,34 @@
Working Set Size (64-bit).
</summary>
</member>
<member name="T:NLog.LayoutRenderers.ProcessNameLayoutRenderer">
<summary>
The name of the current process.
</summary>
</member>
<member name="P:NLog.LayoutRenderers.ProcessNameLayoutRenderer.FullName">
<summary>
Gets or sets a value indicating whether to write the full path to the process executable.
</summary>
<docgen category='Rendering Options' order='10' />
</member>
<member name="M:NLog.LayoutRenderers.ProcessNameLayoutRenderer.#ctor">
<summary>
Initializes a new instance of the <see cref="T:NLog.LayoutRenderers.ProcessNameLayoutRenderer" /> class.
</summary>
</member>
<member name="M:NLog.LayoutRenderers.ProcessNameLayoutRenderer.#ctor(NLog.Internal.Fakeables.IAppEnvironment)">
<summary>
Initializes a new instance of the <see cref="T:NLog.LayoutRenderers.ProcessNameLayoutRenderer" /> class.
</summary>
</member>
<member name="M:NLog.LayoutRenderers.ProcessNameLayoutRenderer.Append(System.Text.StringBuilder,NLog.LogEventInfo)">
<summary>
Renders the current process name (optionally with a full path).
</summary>
<param name="builder">The <see cref="T:System.Text.StringBuilder"/> to append the rendered data to.</param>
<param name="logEvent">Logging event.</param>
</member>
<member name="T:NLog.LayoutRenderers.ProcessTimeLayoutRenderer">
<summary>
The process time in format HH:mm:ss.mmm.
@@ -13055,6 +13136,9 @@
<summary>
Should forward slashes be escaped? If true, / will be converted to \/
</summary>
<remarks>
If not set explicitly then the value of the parent will be used as default.
</remarks>
<docgen category="Transformation Options" order="10"/>
</member>
<member name="M:NLog.LayoutRenderers.Wrappers.JsonEncodeLayoutRendererWrapper.RenderInnerAndTransform(NLog.LogEventInfo,System.Text.StringBuilder,System.Int32)">
@@ -14075,8 +14159,11 @@
</member>
<member name="P:NLog.Layouts.JsonAttribute.EscapeForwardSlash">
<summary>
Should forward slashes be escaped? If true, / will be converted to \/
Should forward slashes be escaped? If true, / will be converted to \/
</summary>
<remarks>
If not set explicitly then the value of the parent will be used as default.
</remarks>
<docgen category='JSON Attribute Options' order='100' />
</member>
<member name="P:NLog.Layouts.JsonAttribute.IncludeEmptyValue">
@@ -14137,6 +14224,12 @@
</summary>
<docgen category='JSON Output' order='10' />
</member>
<member name="P:NLog.Layouts.JsonLayout.ExcludeEmptyProperties">
<summary>
Gets or sets the option to exclude null/empty properties from the log event (as JSON)
</summary>
<docgen category='JSON Output' order='10' />
</member>
<member name="P:NLog.Layouts.JsonLayout.ExcludeProperties">
<summary>
List of property names to exclude when <see cref="P:NLog.Layouts.JsonLayout.IncludeAllProperties"/> is true
@@ -14153,6 +14246,9 @@
<summary>
Should forward slashes be escaped? If true, / will be converted to \/
</summary>
<remarks>
If not set explicitly then the value of the parent will be used as default.
</remarks>
<docgen category='JSON Formating' order='10' />
</member>
<member name="M:NLog.Layouts.JsonLayout.InitializeLayout">
@@ -15549,6 +15645,11 @@
<param name="disposing"><c>True</c> to release both managed and unmanaged resources;
<c>false</c> to release only unmanaged resources.</param>
</member>
<member name="M:NLog.LogFactory.Shutdown">
<summary>
Dispose all targets, and shutdown logging.
</summary>
</member>
<member name="M:NLog.LogFactory.GetCandidateConfigFilePaths">
<summary>
Get file paths (including filename) for the possible NLog config files.
@@ -22788,7 +22889,6 @@
<summary>
Returns the correct filename to archive
</summary>
<returns></returns>
</member>
<member name="M:NLog.Targets.FileTarget.GetArchiveFileNameBasedOnFileSize(System.String,System.Int32,System.Boolean)">
<summary>
@@ -22799,6 +22899,11 @@
<param name="initializedNewFile">File has just been opened.</param>
<returns>Filename to archive. If <c>null</c>, then nothing to archive.</returns>
</member>
<member name="M:NLog.Targets.FileTarget.TryFallbackToPreviousLogFileName(System.String,System.Boolean)">
<summary>
Check if archive operation should check previous filename, because FileAppenderCache tells us current filename no longer exists
</summary>
</member>
<member name="M:NLog.Targets.FileTarget.GetArchiveFileNameBasedOnTime(System.String,NLog.LogEventInfo,System.DateTime,System.Boolean)">
<summary>
Returns the file name for archiving, or null if archiving should not occur based on date/time.
@@ -23407,7 +23512,7 @@
</member>
<member name="M:NLog.Targets.MailTarget.Write(NLog.Common.AsyncLogEventInfo)">
<summary>
Renders the logging event message and adds it to the internal ArrayList of log messages.
Writes async log event to the mail target.
</summary>
<param name="logEvent">The logging event.</param>
</member>
@@ -23423,7 +23528,7 @@
</member>
<member name="M:NLog.Targets.MailTarget.Write(System.Collections.Generic.IList{NLog.Common.AsyncLogEventInfo})">
<summary>
Renders an array logging events.
Writes log events to the mail target.
</summary>
<param name="logEvents">Array of logging events.</param>
</member>
@@ -23494,7 +23599,7 @@
</member>
<member name="T:NLog.Targets.MemoryTarget">
<summary>
Writes log messages to an ArrayList in memory for programmatic retrieval.
Writes log messages to <see cref="P:NLog.Targets.MemoryTarget.Logs"/> in memory for programmatic retrieval.
</summary>
<seealso href="https://github.com/nlog/nlog/wiki/Memory-target">Documentation on NLog Wiki</seealso>
<example>
@@ -23543,7 +23648,7 @@
</member>
<member name="M:NLog.Targets.MemoryTarget.Write(NLog.LogEventInfo)">
<summary>
Renders the logging event message and adds it to the internal ArrayList of log messages.
Renders the logging event message and adds to <see cref="P:NLog.Targets.MemoryTarget.Logs"/>
</summary>
<param name="logEvent">The logging event.</param>
</member>
@@ -25442,6 +25547,8 @@
<summary>
Delay the flush until the LogEvent has been confirmed as written
</summary>
<remarks>If not explicitly set, then disabled by default for <see cref="T:NLog.Targets.Wrappers.BufferingTargetWrapper"/> and AsyncTaskTarget
</remarks>
<docgen category='General Options' order='10' />
</member>
<member name="P:NLog.Targets.Wrappers.AutoFlushTargetWrapper.FlushOnConditionOnly">
MTC_Adapter/packages/NLog.4.7.10/lib/net35/NLog.dll
Vendored
BIN
View File
Binary file not shown.
MTC_Adapter/packages/NLog.4.7.2/lib/net35/NLog.xml → MTC_Adapter/packages/NLog.4.7.10/lib/net35/NLog.xml
Vendored
+72 -15
View File
@@ -1686,7 +1686,7 @@
with embedded ${}).
</summary>
</member>
<member name="M:NLog.Conditions.ConditionLayoutExpression.#ctor(NLog.Layouts.Layout)">
<member name="M:NLog.Conditions.ConditionLayoutExpression.#ctor(NLog.Layouts.SimpleLayout)">
<summary>
Initializes a new instance of the <see cref="T:NLog.Conditions.ConditionLayoutExpression" /> class.
</summary>
@@ -1735,11 +1735,12 @@
Condition literal expression (numeric, <b>LogLevel.XXX</b>, <b>true</b> or <b>false</b>).
</summary>
</member>
<member name="M:NLog.Conditions.ConditionLiteralExpression.#ctor(System.Object)">
<member name="M:NLog.Conditions.ConditionLiteralExpression.#ctor(System.Object,System.String)">
<summary>
Initializes a new instance of the <see cref="T:NLog.Conditions.ConditionLiteralExpression" /> class.
</summary>
<param name="literalValue">Literal value.</param>
<param name="toStringValue">ToString value.</param>
</member>
<member name="P:NLog.Conditions.ConditionLiteralExpression.LiteralValue">
<summary>
@@ -3492,7 +3493,7 @@
Get default file paths (including filename) for possible NLog config files.
</summary>
</member>
<member name="M:NLog.Config.LoggingConfigurationFileLoader.GetAppSpecificNLogLocations(System.String)">
<member name="M:NLog.Config.LoggingConfigurationFileLoader.GetAppSpecificNLogLocations(System.String,System.String)">
<summary>
Get default file paths (including filename) for possible NLog config files.
</summary>
@@ -11703,6 +11704,11 @@
Gets or sets whether to render innermost Exception from <see cref="M:System.Exception.GetBaseException"/>
</summary>
</member>
<member name="P:NLog.LayoutRenderers.ExceptionLayoutRenderer.FlattenException">
<summary>
Gets or sets whether to collapse exception tree using AggregateException.Flatten()
</summary>
</member>
<member name="P:NLog.LayoutRenderers.ExceptionLayoutRenderer.Formats">
<summary>
Gets the formats of the output of inner exceptions to be rendered in target.
@@ -11840,6 +11846,12 @@
A layout renderer which could have different behavior per instance by using a <see cref="T:System.Func`1"/>.
</summary>
</member>
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.#ctor(System.String)">
<summary>
Initializes a new instance of the <see cref="T:NLog.LayoutRenderers.FuncLayoutRenderer"/> class.
</summary>
<param name="layoutRendererName">Name without ${}.</param>
</member>
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.#ctor(System.String,System.Func{NLog.LogEventInfo,NLog.Config.LoggingConfiguration,System.Object})">
<summary>
Initializes a new instance of the <see cref="T:NLog.LayoutRenderers.FuncLayoutRenderer"/> class.
@@ -11853,9 +11865,11 @@
</summary>
</member>
<member name="P:NLog.LayoutRenderers.FuncLayoutRenderer.RenderMethod">
<summary>
Method that renders the layout.
</summary>
<summary>
Method that renders the layout.
This public property will be removed in NLog 5.
</summary>
</member>
<member name="P:NLog.LayoutRenderers.FuncLayoutRenderer.Format">
<summary>
@@ -11869,6 +11883,13 @@
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.NLog#Internal#IStringValueRenderer#GetFormattedString(NLog.LogEventInfo)">
<inheritdoc/>
</member>
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.RenderValue(NLog.LogEventInfo)">
<summary>
Render the value for this log event
</summary>
<param name="logEvent">The event info.</param>
<returns>The value.</returns>
</member>
<member name="T:NLog.LayoutRenderers.FuncThreadAgnosticLayoutRenderer">
<summary>
A layout renderer which could have different behavior per instance by using a <see cref="T:System.Func`1"/>.
@@ -12210,6 +12231,12 @@
<param name="name">Name of the layout renderer - without ${}.</param>
<param name="func">Callback that returns the value for the layout renderer.</param>
</member>
<member name="M:NLog.LayoutRenderers.LayoutRenderer.Register(NLog.LayoutRenderers.FuncLayoutRenderer)">
<summary>
Register a custom layout renderer with a callback function <paramref name="layoutRenderer"/>. The callback receives the logEvent and the current configuration.
</summary>
<param name="layoutRenderer">Renderer with callback func</param>
</member>
<member name="T:NLog.LayoutRenderers.LayoutRendererAttribute">
<summary>
Marks class as a layout renderer and assigns a name to it.
@@ -13658,6 +13685,9 @@
<summary>
Should forward slashes be escaped? If true, / will be converted to \/
</summary>
<remarks>
If not set explicitly then the value of the parent will be used as default.
</remarks>
<docgen category="Transformation Options" order="10"/>
</member>
<member name="M:NLog.LayoutRenderers.Wrappers.JsonEncodeLayoutRendererWrapper.RenderInnerAndTransform(NLog.LogEventInfo,System.Text.StringBuilder,System.Int32)">
@@ -14678,8 +14708,11 @@
</member>
<member name="P:NLog.Layouts.JsonAttribute.EscapeForwardSlash">
<summary>
Should forward slashes be escaped? If true, / will be converted to \/
Should forward slashes be escaped? If true, / will be converted to \/
</summary>
<remarks>
If not set explicitly then the value of the parent will be used as default.
</remarks>
<docgen category='JSON Attribute Options' order='100' />
</member>
<member name="P:NLog.Layouts.JsonAttribute.IncludeEmptyValue">
@@ -14740,6 +14773,12 @@
</summary>
<docgen category='JSON Output' order='10' />
</member>
<member name="P:NLog.Layouts.JsonLayout.ExcludeEmptyProperties">
<summary>
Gets or sets the option to exclude null/empty properties from the log event (as JSON)
</summary>
<docgen category='JSON Output' order='10' />
</member>
<member name="P:NLog.Layouts.JsonLayout.ExcludeProperties">
<summary>
List of property names to exclude when <see cref="P:NLog.Layouts.JsonLayout.IncludeAllProperties"/> is true
@@ -14756,6 +14795,9 @@
<summary>
Should forward slashes be escaped? If true, / will be converted to \/
</summary>
<remarks>
If not set explicitly then the value of the parent will be used as default.
</remarks>
<docgen category='JSON Formating' order='10' />
</member>
<member name="M:NLog.Layouts.JsonLayout.InitializeLayout">
@@ -16168,6 +16210,11 @@
<param name="disposing"><c>True</c> to release both managed and unmanaged resources;
<c>false</c> to release only unmanaged resources.</param>
</member>
<member name="M:NLog.LogFactory.Shutdown">
<summary>
Dispose all targets, and shutdown logging.
</summary>
</member>
<member name="M:NLog.LogFactory.GetCandidateConfigFilePaths">
<summary>
Get file paths (including filename) for the possible NLog config files.
@@ -23169,6 +23216,12 @@
</summary>
<docgen category='Parameter Options' order='9' />
</member>
<member name="P:NLog.Targets.DatabaseParameterInfo.AllowDbNull">
<summary>
Gets or sets whether empty value should translate into DbNull. Requires database column to allow NULL values.
</summary>
<docgen category='Parameter Options' order='8' />
</member>
<member name="T:NLog.Targets.DatabaseTarget">
<summary>
Writes log messages to the database using an ADO.NET provider.
@@ -23468,12 +23521,10 @@
<param name="logEvent">Current logevent.</param>
<param name="parameterInfo">Parameter configuration info.</param>
</member>
<member name="M:NLog.Targets.DatabaseTarget.CreateDefaultValue(System.Type)">
<member name="M:NLog.Targets.DatabaseTarget.CreateDefaultValue(System.Type,System.Boolean)">
<summary>
Create Default Value of Type
</summary>
<param name="dbParameterType"></param>
<returns></returns>
</member>
<member name="T:NLog.Targets.DateAndSequenceArchive">
<summary>
@@ -24873,7 +24924,6 @@
<summary>
Returns the correct filename to archive
</summary>
<returns></returns>
</member>
<member name="M:NLog.Targets.FileTarget.GetArchiveFileNameBasedOnFileSize(System.String,System.Int32,System.Boolean)">
<summary>
@@ -24884,6 +24934,11 @@
<param name="initializedNewFile">File has just been opened.</param>
<returns>Filename to archive. If <c>null</c>, then nothing to archive.</returns>
</member>
<member name="M:NLog.Targets.FileTarget.TryFallbackToPreviousLogFileName(System.String,System.Boolean)">
<summary>
Check if archive operation should check previous filename, because FileAppenderCache tells us current filename no longer exists
</summary>
</member>
<member name="M:NLog.Targets.FileTarget.GetArchiveFileNameBasedOnTime(System.String,NLog.LogEventInfo,System.DateTime,System.Boolean)">
<summary>
Returns the file name for archiving, or null if archiving should not occur based on date/time.
@@ -25629,7 +25684,7 @@
</member>
<member name="M:NLog.Targets.MailTarget.Write(NLog.Common.AsyncLogEventInfo)">
<summary>
Renders the logging event message and adds it to the internal ArrayList of log messages.
Writes async log event to the mail target.
</summary>
<param name="logEvent">The logging event.</param>
</member>
@@ -25645,7 +25700,7 @@
</member>
<member name="M:NLog.Targets.MailTarget.Write(System.Collections.Generic.IList{NLog.Common.AsyncLogEventInfo})">
<summary>
Renders an array logging events.
Writes log events to the mail target.
</summary>
<param name="logEvents">Array of logging events.</param>
</member>
@@ -25716,7 +25771,7 @@
</member>
<member name="T:NLog.Targets.MemoryTarget">
<summary>
Writes log messages to an ArrayList in memory for programmatic retrieval.
Writes log messages to <see cref="P:NLog.Targets.MemoryTarget.Logs"/> in memory for programmatic retrieval.
</summary>
<seealso href="https://github.com/nlog/nlog/wiki/Memory-target">Documentation on NLog Wiki</seealso>
<example>
@@ -25765,7 +25820,7 @@
</member>
<member name="M:NLog.Targets.MemoryTarget.Write(NLog.LogEventInfo)">
<summary>
Renders the logging event message and adds it to the internal ArrayList of log messages.
Renders the logging event message and adds to <see cref="P:NLog.Targets.MemoryTarget.Logs"/>
</summary>
<param name="logEvent">The logging event.</param>
</member>
@@ -27872,6 +27927,8 @@
<summary>
Delay the flush until the LogEvent has been confirmed as written
</summary>
<remarks>If not explicitly set, then disabled by default for <see cref="T:NLog.Targets.Wrappers.BufferingTargetWrapper"/> and AsyncTaskTarget
</remarks>
<docgen category='General Options' order='10' />
</member>
<member name="P:NLog.Targets.Wrappers.AutoFlushTargetWrapper.FlushOnConditionOnly">
MTC_Adapter/packages/NLog.4.7.10/lib/net40-client/NLog.dll
Vendored
BIN
View File
Binary file not shown.
MTC_Adapter/packages/NLog.4.7.2/lib/net40-client/NLog.xml → MTC_Adapter/packages/NLog.4.7.10/lib/net40-client/NLog.xml
Vendored
+72 -15
View File
@@ -1686,7 +1686,7 @@
with embedded ${}).
</summary>
</member>
<member name="M:NLog.Conditions.ConditionLayoutExpression.#ctor(NLog.Layouts.Layout)">
<member name="M:NLog.Conditions.ConditionLayoutExpression.#ctor(NLog.Layouts.SimpleLayout)">
<summary>
Initializes a new instance of the <see cref="T:NLog.Conditions.ConditionLayoutExpression" /> class.
</summary>
@@ -1735,11 +1735,12 @@
Condition literal expression (numeric, <b>LogLevel.XXX</b>, <b>true</b> or <b>false</b>).
</summary>
</member>
<member name="M:NLog.Conditions.ConditionLiteralExpression.#ctor(System.Object)">
<member name="M:NLog.Conditions.ConditionLiteralExpression.#ctor(System.Object,System.String)">
<summary>
Initializes a new instance of the <see cref="T:NLog.Conditions.ConditionLiteralExpression" /> class.
</summary>
<param name="literalValue">Literal value.</param>
<param name="toStringValue">ToString value.</param>
</member>
<member name="P:NLog.Conditions.ConditionLiteralExpression.LiteralValue">
<summary>
@@ -3492,7 +3493,7 @@
Get default file paths (including filename) for possible NLog config files.
</summary>
</member>
<member name="M:NLog.Config.LoggingConfigurationFileLoader.GetAppSpecificNLogLocations(System.String)">
<member name="M:NLog.Config.LoggingConfigurationFileLoader.GetAppSpecificNLogLocations(System.String,System.String)">
<summary>
Get default file paths (including filename) for possible NLog config files.
</summary>
@@ -11713,6 +11714,11 @@
Gets or sets whether to render innermost Exception from <see cref="M:System.Exception.GetBaseException"/>
</summary>
</member>
<member name="P:NLog.LayoutRenderers.ExceptionLayoutRenderer.FlattenException">
<summary>
Gets or sets whether to collapse exception tree using <see cref="M:System.AggregateException.Flatten"/>
</summary>
</member>
<member name="P:NLog.LayoutRenderers.ExceptionLayoutRenderer.Formats">
<summary>
Gets the formats of the output of inner exceptions to be rendered in target.
@@ -11850,6 +11856,12 @@
A layout renderer which could have different behavior per instance by using a <see cref="T:System.Func`1"/>.
</summary>
</member>
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.#ctor(System.String)">
<summary>
Initializes a new instance of the <see cref="T:NLog.LayoutRenderers.FuncLayoutRenderer"/> class.
</summary>
<param name="layoutRendererName">Name without ${}.</param>
</member>
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.#ctor(System.String,System.Func{NLog.LogEventInfo,NLog.Config.LoggingConfiguration,System.Object})">
<summary>
Initializes a new instance of the <see cref="T:NLog.LayoutRenderers.FuncLayoutRenderer"/> class.
@@ -11863,9 +11875,11 @@
</summary>
</member>
<member name="P:NLog.LayoutRenderers.FuncLayoutRenderer.RenderMethod">
<summary>
Method that renders the layout.
</summary>
<summary>
Method that renders the layout.
This public property will be removed in NLog 5.
</summary>
</member>
<member name="P:NLog.LayoutRenderers.FuncLayoutRenderer.Format">
<summary>
@@ -11879,6 +11893,13 @@
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.NLog#Internal#IStringValueRenderer#GetFormattedString(NLog.LogEventInfo)">
<inheritdoc/>
</member>
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.RenderValue(NLog.LogEventInfo)">
<summary>
Render the value for this log event
</summary>
<param name="logEvent">The event info.</param>
<returns>The value.</returns>
</member>
<member name="T:NLog.LayoutRenderers.FuncThreadAgnosticLayoutRenderer">
<summary>
A layout renderer which could have different behavior per instance by using a <see cref="T:System.Func`1"/>.
@@ -12220,6 +12241,12 @@
<param name="name">Name of the layout renderer - without ${}.</param>
<param name="func">Callback that returns the value for the layout renderer.</param>
</member>
<member name="M:NLog.LayoutRenderers.LayoutRenderer.Register(NLog.LayoutRenderers.FuncLayoutRenderer)">
<summary>
Register a custom layout renderer with a callback function <paramref name="layoutRenderer"/>. The callback receives the logEvent and the current configuration.
</summary>
<param name="layoutRenderer">Renderer with callback func</param>
</member>
<member name="T:NLog.LayoutRenderers.LayoutRendererAttribute">
<summary>
Marks class as a layout renderer and assigns a name to it.
@@ -13675,6 +13702,9 @@
<summary>
Should forward slashes be escaped? If true, / will be converted to \/
</summary>
<remarks>
If not set explicitly then the value of the parent will be used as default.
</remarks>
<docgen category="Transformation Options" order="10"/>
</member>
<member name="M:NLog.LayoutRenderers.Wrappers.JsonEncodeLayoutRendererWrapper.RenderInnerAndTransform(NLog.LogEventInfo,System.Text.StringBuilder,System.Int32)">
@@ -14695,8 +14725,11 @@
</member>
<member name="P:NLog.Layouts.JsonAttribute.EscapeForwardSlash">
<summary>
Should forward slashes be escaped? If true, / will be converted to \/
Should forward slashes be escaped? If true, / will be converted to \/
</summary>
<remarks>
If not set explicitly then the value of the parent will be used as default.
</remarks>
<docgen category='JSON Attribute Options' order='100' />
</member>
<member name="P:NLog.Layouts.JsonAttribute.IncludeEmptyValue">
@@ -14757,6 +14790,12 @@
</summary>
<docgen category='JSON Output' order='10' />
</member>
<member name="P:NLog.Layouts.JsonLayout.ExcludeEmptyProperties">
<summary>
Gets or sets the option to exclude null/empty properties from the log event (as JSON)
</summary>
<docgen category='JSON Output' order='10' />
</member>
<member name="P:NLog.Layouts.JsonLayout.ExcludeProperties">
<summary>
List of property names to exclude when <see cref="P:NLog.Layouts.JsonLayout.IncludeAllProperties"/> is true
@@ -14773,6 +14812,9 @@
<summary>
Should forward slashes be escaped? If true, / will be converted to \/
</summary>
<remarks>
If not set explicitly then the value of the parent will be used as default.
</remarks>
<docgen category='JSON Formating' order='10' />
</member>
<member name="M:NLog.Layouts.JsonLayout.InitializeLayout">
@@ -16185,6 +16227,11 @@
<param name="disposing"><c>True</c> to release both managed and unmanaged resources;
<c>false</c> to release only unmanaged resources.</param>
</member>
<member name="M:NLog.LogFactory.Shutdown">
<summary>
Dispose all targets, and shutdown logging.
</summary>
</member>
<member name="M:NLog.LogFactory.GetCandidateConfigFilePaths">
<summary>
Get file paths (including filename) for the possible NLog config files.
@@ -23352,6 +23399,12 @@
</summary>
<docgen category='Parameter Options' order='9' />
</member>
<member name="P:NLog.Targets.DatabaseParameterInfo.AllowDbNull">
<summary>
Gets or sets whether empty value should translate into DbNull. Requires database column to allow NULL values.
</summary>
<docgen category='Parameter Options' order='8' />
</member>
<member name="T:NLog.Targets.DatabaseTarget">
<summary>
Writes log messages to the database using an ADO.NET provider.
@@ -23651,12 +23704,10 @@
<param name="logEvent">Current logevent.</param>
<param name="parameterInfo">Parameter configuration info.</param>
</member>
<member name="M:NLog.Targets.DatabaseTarget.CreateDefaultValue(System.Type)">
<member name="M:NLog.Targets.DatabaseTarget.CreateDefaultValue(System.Type,System.Boolean)">
<summary>
Create Default Value of Type
</summary>
<param name="dbParameterType"></param>
<returns></returns>
</member>
<member name="T:NLog.Targets.DateAndSequenceArchive">
<summary>
@@ -25056,7 +25107,6 @@
<summary>
Returns the correct filename to archive
</summary>
<returns></returns>
</member>
<member name="M:NLog.Targets.FileTarget.GetArchiveFileNameBasedOnFileSize(System.String,System.Int32,System.Boolean)">
<summary>
@@ -25067,6 +25117,11 @@
<param name="initializedNewFile">File has just been opened.</param>
<returns>Filename to archive. If <c>null</c>, then nothing to archive.</returns>
</member>
<member name="M:NLog.Targets.FileTarget.TryFallbackToPreviousLogFileName(System.String,System.Boolean)">
<summary>
Check if archive operation should check previous filename, because FileAppenderCache tells us current filename no longer exists
</summary>
</member>
<member name="M:NLog.Targets.FileTarget.GetArchiveFileNameBasedOnTime(System.String,NLog.LogEventInfo,System.DateTime,System.Boolean)">
<summary>
Returns the file name for archiving, or null if archiving should not occur based on date/time.
@@ -25812,7 +25867,7 @@
</member>
<member name="M:NLog.Targets.MailTarget.Write(NLog.Common.AsyncLogEventInfo)">
<summary>
Renders the logging event message and adds it to the internal ArrayList of log messages.
Writes async log event to the mail target.
</summary>
<param name="logEvent">The logging event.</param>
</member>
@@ -25828,7 +25883,7 @@
</member>
<member name="M:NLog.Targets.MailTarget.Write(System.Collections.Generic.IList{NLog.Common.AsyncLogEventInfo})">
<summary>
Renders an array logging events.
Writes log events to the mail target.
</summary>
<param name="logEvents">Array of logging events.</param>
</member>
@@ -25899,7 +25954,7 @@
</member>
<member name="T:NLog.Targets.MemoryTarget">
<summary>
Writes log messages to an ArrayList in memory for programmatic retrieval.
Writes log messages to <see cref="P:NLog.Targets.MemoryTarget.Logs"/> in memory for programmatic retrieval.
</summary>
<seealso href="https://github.com/nlog/nlog/wiki/Memory-target">Documentation on NLog Wiki</seealso>
<example>
@@ -25948,7 +26003,7 @@
</member>
<member name="M:NLog.Targets.MemoryTarget.Write(NLog.LogEventInfo)">
<summary>
Renders the logging event message and adds it to the internal ArrayList of log messages.
Renders the logging event message and adds to <see cref="P:NLog.Targets.MemoryTarget.Logs"/>
</summary>
<param name="logEvent">The logging event.</param>
</member>
@@ -28055,6 +28110,8 @@
<summary>
Delay the flush until the LogEvent has been confirmed as written
</summary>
<remarks>If not explicitly set, then disabled by default for <see cref="T:NLog.Targets.Wrappers.BufferingTargetWrapper"/> and AsyncTaskTarget
</remarks>
<docgen category='General Options' order='10' />
</member>
<member name="P:NLog.Targets.Wrappers.AutoFlushTargetWrapper.FlushOnConditionOnly">
MTC_Adapter/packages/NLog.4.7.10/lib/net45/NLog.dll
Vendored
BIN
View File
Binary file not shown.
MTC_Adapter/packages/NLog.4.7.2/lib/net45/NLog.xml → MTC_Adapter/packages/NLog.4.7.10/lib/net45/NLog.xml
Vendored
+73 -16
View File
@@ -1686,7 +1686,7 @@
with embedded ${}).
</summary>
</member>
<member name="M:NLog.Conditions.ConditionLayoutExpression.#ctor(NLog.Layouts.Layout)">
<member name="M:NLog.Conditions.ConditionLayoutExpression.#ctor(NLog.Layouts.SimpleLayout)">
<summary>
Initializes a new instance of the <see cref="T:NLog.Conditions.ConditionLayoutExpression" /> class.
</summary>
@@ -1735,11 +1735,12 @@
Condition literal expression (numeric, <b>LogLevel.XXX</b>, <b>true</b> or <b>false</b>).
</summary>
</member>
<member name="M:NLog.Conditions.ConditionLiteralExpression.#ctor(System.Object)">
<member name="M:NLog.Conditions.ConditionLiteralExpression.#ctor(System.Object,System.String)">
<summary>
Initializes a new instance of the <see cref="T:NLog.Conditions.ConditionLiteralExpression" /> class.
</summary>
<param name="literalValue">Literal value.</param>
<param name="toStringValue">ToString value.</param>
</member>
<member name="P:NLog.Conditions.ConditionLiteralExpression.LiteralValue">
<summary>
@@ -3492,7 +3493,7 @@
Get default file paths (including filename) for possible NLog config files.
</summary>
</member>
<member name="M:NLog.Config.LoggingConfigurationFileLoader.GetAppSpecificNLogLocations(System.String)">
<member name="M:NLog.Config.LoggingConfigurationFileLoader.GetAppSpecificNLogLocations(System.String,System.String)">
<summary>
Get default file paths (including filename) for possible NLog config files.
</summary>
@@ -4653,7 +4654,7 @@
</member>
<member name="M:NLog.Fluent.Log.Level(NLog.LogLevel,System.String)">
<summary>
Starts building a log event with the specified <see cref="T:NLog.LogLevel" />.
Starts building a log event with the specified <see cref="T:System.LogLevel" />.
</summary>
<param name="logLevel">The log level.</param>
<param name="callerFilePath">The full path of the source file that contains the caller. This is the file path at the time of compile.</param>
@@ -11834,6 +11835,11 @@
Gets or sets whether to render innermost Exception from <see cref="M:System.Exception.GetBaseException"/>
</summary>
</member>
<member name="P:NLog.LayoutRenderers.ExceptionLayoutRenderer.FlattenException">
<summary>
Gets or sets whether to collapse exception tree using <see cref="M:System.AggregateException.Flatten"/>
</summary>
</member>
<member name="P:NLog.LayoutRenderers.ExceptionLayoutRenderer.Formats">
<summary>
Gets the formats of the output of inner exceptions to be rendered in target.
@@ -11971,6 +11977,12 @@
A layout renderer which could have different behavior per instance by using a <see cref="T:System.Func`1"/>.
</summary>
</member>
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.#ctor(System.String)">
<summary>
Initializes a new instance of the <see cref="T:NLog.LayoutRenderers.FuncLayoutRenderer"/> class.
</summary>
<param name="layoutRendererName">Name without ${}.</param>
</member>
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.#ctor(System.String,System.Func{NLog.LogEventInfo,NLog.Config.LoggingConfiguration,System.Object})">
<summary>
Initializes a new instance of the <see cref="T:NLog.LayoutRenderers.FuncLayoutRenderer"/> class.
@@ -11984,9 +11996,11 @@
</summary>
</member>
<member name="P:NLog.LayoutRenderers.FuncLayoutRenderer.RenderMethod">
<summary>
Method that renders the layout.
</summary>
<summary>
Method that renders the layout.
This public property will be removed in NLog 5.
</summary>
</member>
<member name="P:NLog.LayoutRenderers.FuncLayoutRenderer.Format">
<summary>
@@ -12000,6 +12014,13 @@
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.NLog#Internal#IStringValueRenderer#GetFormattedString(NLog.LogEventInfo)">
<inheritdoc/>
</member>
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.RenderValue(NLog.LogEventInfo)">
<summary>
Render the value for this log event
</summary>
<param name="logEvent">The event info.</param>
<returns>The value.</returns>
</member>
<member name="T:NLog.LayoutRenderers.FuncThreadAgnosticLayoutRenderer">
<summary>
A layout renderer which could have different behavior per instance by using a <see cref="T:System.Func`1"/>.
@@ -12341,6 +12362,12 @@
<param name="name">Name of the layout renderer - without ${}.</param>
<param name="func">Callback that returns the value for the layout renderer.</param>
</member>
<member name="M:NLog.LayoutRenderers.LayoutRenderer.Register(NLog.LayoutRenderers.FuncLayoutRenderer)">
<summary>
Register a custom layout renderer with a callback function <paramref name="layoutRenderer"/>. The callback receives the logEvent and the current configuration.
</summary>
<param name="layoutRenderer">Renderer with callback func</param>
</member>
<member name="T:NLog.LayoutRenderers.LayoutRendererAttribute">
<summary>
Marks class as a layout renderer and assigns a name to it.
@@ -13796,6 +13823,9 @@
<summary>
Should forward slashes be escaped? If true, / will be converted to \/
</summary>
<remarks>
If not set explicitly then the value of the parent will be used as default.
</remarks>
<docgen category="Transformation Options" order="10"/>
</member>
<member name="M:NLog.LayoutRenderers.Wrappers.JsonEncodeLayoutRendererWrapper.RenderInnerAndTransform(NLog.LogEventInfo,System.Text.StringBuilder,System.Int32)">
@@ -14816,8 +14846,11 @@
</member>
<member name="P:NLog.Layouts.JsonAttribute.EscapeForwardSlash">
<summary>
Should forward slashes be escaped? If true, / will be converted to \/
Should forward slashes be escaped? If true, / will be converted to \/
</summary>
<remarks>
If not set explicitly then the value of the parent will be used as default.
</remarks>
<docgen category='JSON Attribute Options' order='100' />
</member>
<member name="P:NLog.Layouts.JsonAttribute.IncludeEmptyValue">
@@ -14878,6 +14911,12 @@
</summary>
<docgen category='JSON Output' order='10' />
</member>
<member name="P:NLog.Layouts.JsonLayout.ExcludeEmptyProperties">
<summary>
Gets or sets the option to exclude null/empty properties from the log event (as JSON)
</summary>
<docgen category='JSON Output' order='10' />
</member>
<member name="P:NLog.Layouts.JsonLayout.ExcludeProperties">
<summary>
List of property names to exclude when <see cref="P:NLog.Layouts.JsonLayout.IncludeAllProperties"/> is true
@@ -14894,6 +14933,9 @@
<summary>
Should forward slashes be escaped? If true, / will be converted to \/
</summary>
<remarks>
If not set explicitly then the value of the parent will be used as default.
</remarks>
<docgen category='JSON Formating' order='10' />
</member>
<member name="M:NLog.Layouts.JsonLayout.InitializeLayout">
@@ -16306,6 +16348,11 @@
<param name="disposing"><c>True</c> to release both managed and unmanaged resources;
<c>false</c> to release only unmanaged resources.</param>
</member>
<member name="M:NLog.LogFactory.Shutdown">
<summary>
Dispose all targets, and shutdown logging.
</summary>
</member>
<member name="M:NLog.LogFactory.GetCandidateConfigFilePaths">
<summary>
Get file paths (including filename) for the possible NLog config files.
@@ -23537,6 +23584,12 @@
</summary>
<docgen category='Parameter Options' order='9' />
</member>
<member name="P:NLog.Targets.DatabaseParameterInfo.AllowDbNull">
<summary>
Gets or sets whether empty value should translate into DbNull. Requires database column to allow NULL values.
</summary>
<docgen category='Parameter Options' order='8' />
</member>
<member name="T:NLog.Targets.DatabaseTarget">
<summary>
Writes log messages to the database using an ADO.NET provider.
@@ -23836,12 +23889,10 @@
<param name="logEvent">Current logevent.</param>
<param name="parameterInfo">Parameter configuration info.</param>
</member>
<member name="M:NLog.Targets.DatabaseTarget.CreateDefaultValue(System.Type)">
<member name="M:NLog.Targets.DatabaseTarget.CreateDefaultValue(System.Type,System.Boolean)">
<summary>
Create Default Value of Type
</summary>
<param name="dbParameterType"></param>
<returns></returns>
</member>
<member name="T:NLog.Targets.DateAndSequenceArchive">
<summary>
@@ -25241,7 +25292,6 @@
<summary>
Returns the correct filename to archive
</summary>
<returns></returns>
</member>
<member name="M:NLog.Targets.FileTarget.GetArchiveFileNameBasedOnFileSize(System.String,System.Int32,System.Boolean)">
<summary>
@@ -25252,6 +25302,11 @@
<param name="initializedNewFile">File has just been opened.</param>
<returns>Filename to archive. If <c>null</c>, then nothing to archive.</returns>
</member>
<member name="M:NLog.Targets.FileTarget.TryFallbackToPreviousLogFileName(System.String,System.Boolean)">
<summary>
Check if archive operation should check previous filename, because FileAppenderCache tells us current filename no longer exists
</summary>
</member>
<member name="M:NLog.Targets.FileTarget.GetArchiveFileNameBasedOnTime(System.String,NLog.LogEventInfo,System.DateTime,System.Boolean)">
<summary>
Returns the file name for archiving, or null if archiving should not occur based on date/time.
@@ -25997,7 +26052,7 @@
</member>
<member name="M:NLog.Targets.MailTarget.Write(NLog.Common.AsyncLogEventInfo)">
<summary>
Renders the logging event message and adds it to the internal ArrayList of log messages.
Writes async log event to the mail target.
</summary>
<param name="logEvent">The logging event.</param>
</member>
@@ -26013,7 +26068,7 @@
</member>
<member name="M:NLog.Targets.MailTarget.Write(System.Collections.Generic.IList{NLog.Common.AsyncLogEventInfo})">
<summary>
Renders an array logging events.
Writes log events to the mail target.
</summary>
<param name="logEvents">Array of logging events.</param>
</member>
@@ -26084,7 +26139,7 @@
</member>
<member name="T:NLog.Targets.MemoryTarget">
<summary>
Writes log messages to an ArrayList in memory for programmatic retrieval.
Writes log messages to <see cref="P:NLog.Targets.MemoryTarget.Logs"/> in memory for programmatic retrieval.
</summary>
<seealso href="https://github.com/nlog/nlog/wiki/Memory-target">Documentation on NLog Wiki</seealso>
<example>
@@ -26133,7 +26188,7 @@
</member>
<member name="M:NLog.Targets.MemoryTarget.Write(NLog.LogEventInfo)">
<summary>
Renders the logging event message and adds it to the internal ArrayList of log messages.
Renders the logging event message and adds to <see cref="P:NLog.Targets.MemoryTarget.Logs"/>
</summary>
<param name="logEvent">The logging event.</param>
</member>
@@ -28240,6 +28295,8 @@
<summary>
Delay the flush until the LogEvent has been confirmed as written
</summary>
<remarks>If not explicitly set, then disabled by default for <see cref="T:NLog.Targets.Wrappers.BufferingTargetWrapper"/> and AsyncTaskTarget
</remarks>
<docgen category='General Options' order='10' />
</member>
<member name="P:NLog.Targets.Wrappers.AutoFlushTargetWrapper.FlushOnConditionOnly">
MTC_Adapter/packages/NLog.4.7.10/lib/netstandard1.3/NLog.dll
Vendored
BIN
View File
Binary file not shown.
MTC_Adapter/packages/NLog.4.7.2/lib/netstandard1.3/NLog.xml → MTC_Adapter/packages/NLog.4.7.10/lib/netstandard1.3/NLog.xml
Vendored
+70 -13
View File
@@ -1641,7 +1641,7 @@
with embedded ${}).
</summary>
</member>
<member name="M:NLog.Conditions.ConditionLayoutExpression.#ctor(NLog.Layouts.Layout)">
<member name="M:NLog.Conditions.ConditionLayoutExpression.#ctor(NLog.Layouts.SimpleLayout)">
<summary>
Initializes a new instance of the <see cref="T:NLog.Conditions.ConditionLayoutExpression" /> class.
</summary>
@@ -1690,11 +1690,12 @@
Condition literal expression (numeric, <b>LogLevel.XXX</b>, <b>true</b> or <b>false</b>).
</summary>
</member>
<member name="M:NLog.Conditions.ConditionLiteralExpression.#ctor(System.Object)">
<member name="M:NLog.Conditions.ConditionLiteralExpression.#ctor(System.Object,System.String)">
<summary>
Initializes a new instance of the <see cref="T:NLog.Conditions.ConditionLiteralExpression" /> class.
</summary>
<param name="literalValue">Literal value.</param>
<param name="toStringValue">ToString value.</param>
</member>
<member name="P:NLog.Conditions.ConditionLiteralExpression.LiteralValue">
<summary>
@@ -3415,7 +3416,7 @@
Get default file paths (including filename) for possible NLog config files.
</summary>
</member>
<member name="M:NLog.Config.LoggingConfigurationFileLoader.GetAppSpecificNLogLocations(System.String)">
<member name="M:NLog.Config.LoggingConfigurationFileLoader.GetAppSpecificNLogLocations(System.String,System.String)">
<summary>
Get default file paths (including filename) for possible NLog config files.
</summary>
@@ -11270,6 +11271,11 @@
Gets or sets whether to render innermost Exception from <see cref="M:System.Exception.GetBaseException"/>
</summary>
</member>
<member name="P:NLog.LayoutRenderers.ExceptionLayoutRenderer.FlattenException">
<summary>
Gets or sets whether to collapse exception tree using <see cref="M:System.AggregateException.Flatten"/>
</summary>
</member>
<member name="P:NLog.LayoutRenderers.ExceptionLayoutRenderer.Formats">
<summary>
Gets the formats of the output of inner exceptions to be rendered in target.
@@ -11414,6 +11420,12 @@
A layout renderer which could have different behavior per instance by using a <see cref="T:System.Func`1"/>.
</summary>
</member>
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.#ctor(System.String)">
<summary>
Initializes a new instance of the <see cref="T:NLog.LayoutRenderers.FuncLayoutRenderer"/> class.
</summary>
<param name="layoutRendererName">Name without ${}.</param>
</member>
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.#ctor(System.String,System.Func{NLog.LogEventInfo,NLog.Config.LoggingConfiguration,System.Object})">
<summary>
Initializes a new instance of the <see cref="T:NLog.LayoutRenderers.FuncLayoutRenderer"/> class.
@@ -11427,9 +11439,11 @@
</summary>
</member>
<member name="P:NLog.LayoutRenderers.FuncLayoutRenderer.RenderMethod">
<summary>
Method that renders the layout.
</summary>
<summary>
Method that renders the layout.
This public property will be removed in NLog 5.
</summary>
</member>
<member name="P:NLog.LayoutRenderers.FuncLayoutRenderer.Format">
<summary>
@@ -11443,6 +11457,13 @@
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.NLog#Internal#IStringValueRenderer#GetFormattedString(NLog.LogEventInfo)">
<inheritdoc/>
</member>
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.RenderValue(NLog.LogEventInfo)">
<summary>
Render the value for this log event
</summary>
<param name="logEvent">The event info.</param>
<returns>The value.</returns>
</member>
<member name="T:NLog.LayoutRenderers.FuncThreadAgnosticLayoutRenderer">
<summary>
A layout renderer which could have different behavior per instance by using a <see cref="T:System.Func`1"/>.
@@ -11741,6 +11762,12 @@
<param name="name">Name of the layout renderer - without ${}.</param>
<param name="func">Callback that returns the value for the layout renderer.</param>
</member>
<member name="M:NLog.LayoutRenderers.LayoutRenderer.Register(NLog.LayoutRenderers.FuncLayoutRenderer)">
<summary>
Register a custom layout renderer with a callback function <paramref name="layoutRenderer"/>. The callback receives the logEvent and the current configuration.
</summary>
<param name="layoutRenderer">Renderer with callback func</param>
</member>
<member name="T:NLog.LayoutRenderers.LayoutRendererAttribute">
<summary>
Marks class as a layout renderer and assigns a name to it.
@@ -12747,6 +12774,9 @@
<summary>
Should forward slashes be escaped? If true, / will be converted to \/
</summary>
<remarks>
If not set explicitly then the value of the parent will be used as default.
</remarks>
<docgen category="Transformation Options" order="10"/>
</member>
<member name="M:NLog.LayoutRenderers.Wrappers.JsonEncodeLayoutRendererWrapper.RenderInnerAndTransform(NLog.LogEventInfo,System.Text.StringBuilder,System.Int32)">
@@ -13767,8 +13797,11 @@
</member>
<member name="P:NLog.Layouts.JsonAttribute.EscapeForwardSlash">
<summary>
Should forward slashes be escaped? If true, / will be converted to \/
Should forward slashes be escaped? If true, / will be converted to \/
</summary>
<remarks>
If not set explicitly then the value of the parent will be used as default.
</remarks>
<docgen category='JSON Attribute Options' order='100' />
</member>
<member name="P:NLog.Layouts.JsonAttribute.IncludeEmptyValue">
@@ -13829,6 +13862,12 @@
</summary>
<docgen category='JSON Output' order='10' />
</member>
<member name="P:NLog.Layouts.JsonLayout.ExcludeEmptyProperties">
<summary>
Gets or sets the option to exclude null/empty properties from the log event (as JSON)
</summary>
<docgen category='JSON Output' order='10' />
</member>
<member name="P:NLog.Layouts.JsonLayout.ExcludeProperties">
<summary>
List of property names to exclude when <see cref="P:NLog.Layouts.JsonLayout.IncludeAllProperties"/> is true
@@ -13845,6 +13884,9 @@
<summary>
Should forward slashes be escaped? If true, / will be converted to \/
</summary>
<remarks>
If not set explicitly then the value of the parent will be used as default.
</remarks>
<docgen category='JSON Formating' order='10' />
</member>
<member name="M:NLog.Layouts.JsonLayout.InitializeLayout">
@@ -15241,6 +15283,11 @@
<param name="disposing"><c>True</c> to release both managed and unmanaged resources;
<c>false</c> to release only unmanaged resources.</param>
</member>
<member name="M:NLog.LogFactory.Shutdown">
<summary>
Dispose all targets, and shutdown logging.
</summary>
</member>
<member name="M:NLog.LogFactory.GetCandidateConfigFilePaths">
<summary>
Get file paths (including filename) for the possible NLog config files.
@@ -20953,6 +21000,12 @@
</summary>
<docgen category='Parameter Options' order='9' />
</member>
<member name="P:NLog.Targets.DatabaseParameterInfo.AllowDbNull">
<summary>
Gets or sets whether empty value should translate into DbNull. Requires database column to allow NULL values.
</summary>
<docgen category='Parameter Options' order='8' />
</member>
<member name="T:NLog.Targets.DatabaseTarget">
<summary>
Writes log messages to the database using an ADO.NET provider.
@@ -21246,12 +21299,10 @@
<param name="logEvent">Current logevent.</param>
<param name="parameterInfo">Parameter configuration info.</param>
</member>
<member name="M:NLog.Targets.DatabaseTarget.CreateDefaultValue(System.Type)">
<member name="M:NLog.Targets.DatabaseTarget.CreateDefaultValue(System.Type,System.Boolean)">
<summary>
Create Default Value of Type
</summary>
<param name="dbParameterType"></param>
<returns></returns>
</member>
<member name="T:NLog.Targets.DatabaseTarget.TransactionScope">
<summary>
@@ -22325,7 +22376,6 @@
<summary>
Returns the correct filename to archive
</summary>
<returns></returns>
</member>
<member name="M:NLog.Targets.FileTarget.GetArchiveFileNameBasedOnFileSize(System.String,System.Int32,System.Boolean)">
<summary>
@@ -22336,6 +22386,11 @@
<param name="initializedNewFile">File has just been opened.</param>
<returns>Filename to archive. If <c>null</c>, then nothing to archive.</returns>
</member>
<member name="M:NLog.Targets.FileTarget.TryFallbackToPreviousLogFileName(System.String,System.Boolean)">
<summary>
Check if archive operation should check previous filename, because FileAppenderCache tells us current filename no longer exists
</summary>
</member>
<member name="M:NLog.Targets.FileTarget.GetArchiveFileNameBasedOnTime(System.String,NLog.LogEventInfo,System.DateTime,System.Boolean)">
<summary>
Returns the file name for archiving, or null if archiving should not occur based on date/time.
@@ -22663,7 +22718,7 @@
</member>
<member name="T:NLog.Targets.MemoryTarget">
<summary>
Writes log messages to an ArrayList in memory for programmatic retrieval.
Writes log messages to <see cref="P:NLog.Targets.MemoryTarget.Logs"/> in memory for programmatic retrieval.
</summary>
<seealso href="https://github.com/nlog/nlog/wiki/Memory-target">Documentation on NLog Wiki</seealso>
<example>
@@ -22712,7 +22767,7 @@
</member>
<member name="M:NLog.Targets.MemoryTarget.Write(NLog.LogEventInfo)">
<summary>
Renders the logging event message and adds it to the internal ArrayList of log messages.
Renders the logging event message and adds to <see cref="P:NLog.Targets.MemoryTarget.Logs"/>
</summary>
<param name="logEvent">The logging event.</param>
</member>
@@ -24612,6 +24667,8 @@
<summary>
Delay the flush until the LogEvent has been confirmed as written
</summary>
<remarks>If not explicitly set, then disabled by default for <see cref="T:NLog.Targets.Wrappers.BufferingTargetWrapper"/> and AsyncTaskTarget
</remarks>
<docgen category='General Options' order='10' />
</member>
<member name="P:NLog.Targets.Wrappers.AutoFlushTargetWrapper.FlushOnConditionOnly">
MTC_Adapter/packages/NLog.4.7.10/lib/netstandard1.5/NLog.dll
Vendored
BIN
View File
Binary file not shown.
MTC_Adapter/packages/NLog.4.7.2/lib/netstandard1.5/NLog.xml → MTC_Adapter/packages/NLog.4.7.10/lib/netstandard1.5/NLog.xml
Vendored
+70 -13
View File
@@ -1673,7 +1673,7 @@
with embedded ${}).
</summary>
</member>
<member name="M:NLog.Conditions.ConditionLayoutExpression.#ctor(NLog.Layouts.Layout)">
<member name="M:NLog.Conditions.ConditionLayoutExpression.#ctor(NLog.Layouts.SimpleLayout)">
<summary>
Initializes a new instance of the <see cref="T:NLog.Conditions.ConditionLayoutExpression" /> class.
</summary>
@@ -1722,11 +1722,12 @@
Condition literal expression (numeric, <b>LogLevel.XXX</b>, <b>true</b> or <b>false</b>).
</summary>
</member>
<member name="M:NLog.Conditions.ConditionLiteralExpression.#ctor(System.Object)">
<member name="M:NLog.Conditions.ConditionLiteralExpression.#ctor(System.Object,System.String)">
<summary>
Initializes a new instance of the <see cref="T:NLog.Conditions.ConditionLiteralExpression" /> class.
</summary>
<param name="literalValue">Literal value.</param>
<param name="toStringValue">ToString value.</param>
</member>
<member name="P:NLog.Conditions.ConditionLiteralExpression.LiteralValue">
<summary>
@@ -3452,7 +3453,7 @@
Get default file paths (including filename) for possible NLog config files.
</summary>
</member>
<member name="M:NLog.Config.LoggingConfigurationFileLoader.GetAppSpecificNLogLocations(System.String)">
<member name="M:NLog.Config.LoggingConfigurationFileLoader.GetAppSpecificNLogLocations(System.String,System.String)">
<summary>
Get default file paths (including filename) for possible NLog config files.
</summary>
@@ -11538,6 +11539,11 @@
Gets or sets whether to render innermost Exception from <see cref="M:System.Exception.GetBaseException"/>
</summary>
</member>
<member name="P:NLog.LayoutRenderers.ExceptionLayoutRenderer.FlattenException">
<summary>
Gets or sets whether to collapse exception tree using <see cref="M:System.AggregateException.Flatten"/>
</summary>
</member>
<member name="P:NLog.LayoutRenderers.ExceptionLayoutRenderer.Formats">
<summary>
Gets the formats of the output of inner exceptions to be rendered in target.
@@ -11682,6 +11688,12 @@
A layout renderer which could have different behavior per instance by using a <see cref="T:System.Func`1"/>.
</summary>
</member>
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.#ctor(System.String)">
<summary>
Initializes a new instance of the <see cref="T:NLog.LayoutRenderers.FuncLayoutRenderer"/> class.
</summary>
<param name="layoutRendererName">Name without ${}.</param>
</member>
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.#ctor(System.String,System.Func{NLog.LogEventInfo,NLog.Config.LoggingConfiguration,System.Object})">
<summary>
Initializes a new instance of the <see cref="T:NLog.LayoutRenderers.FuncLayoutRenderer"/> class.
@@ -11695,9 +11707,11 @@
</summary>
</member>
<member name="P:NLog.LayoutRenderers.FuncLayoutRenderer.RenderMethod">
<summary>
Method that renders the layout.
</summary>
<summary>
Method that renders the layout.
This public property will be removed in NLog 5.
</summary>
</member>
<member name="P:NLog.LayoutRenderers.FuncLayoutRenderer.Format">
<summary>
@@ -11711,6 +11725,13 @@
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.NLog#Internal#IStringValueRenderer#GetFormattedString(NLog.LogEventInfo)">
<inheritdoc/>
</member>
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.RenderValue(NLog.LogEventInfo)">
<summary>
Render the value for this log event
</summary>
<param name="logEvent">The event info.</param>
<returns>The value.</returns>
</member>
<member name="T:NLog.LayoutRenderers.FuncThreadAgnosticLayoutRenderer">
<summary>
A layout renderer which could have different behavior per instance by using a <see cref="T:System.Func`1"/>.
@@ -12009,6 +12030,12 @@
<param name="name">Name of the layout renderer - without ${}.</param>
<param name="func">Callback that returns the value for the layout renderer.</param>
</member>
<member name="M:NLog.LayoutRenderers.LayoutRenderer.Register(NLog.LayoutRenderers.FuncLayoutRenderer)">
<summary>
Register a custom layout renderer with a callback function <paramref name="layoutRenderer"/>. The callback receives the logEvent and the current configuration.
</summary>
<param name="layoutRenderer">Renderer with callback func</param>
</member>
<member name="T:NLog.LayoutRenderers.LayoutRendererAttribute">
<summary>
Marks class as a layout renderer and assigns a name to it.
@@ -13160,6 +13187,9 @@
<summary>
Should forward slashes be escaped? If true, / will be converted to \/
</summary>
<remarks>
If not set explicitly then the value of the parent will be used as default.
</remarks>
<docgen category="Transformation Options" order="10"/>
</member>
<member name="M:NLog.LayoutRenderers.Wrappers.JsonEncodeLayoutRendererWrapper.RenderInnerAndTransform(NLog.LogEventInfo,System.Text.StringBuilder,System.Int32)">
@@ -14180,8 +14210,11 @@
</member>
<member name="P:NLog.Layouts.JsonAttribute.EscapeForwardSlash">
<summary>
Should forward slashes be escaped? If true, / will be converted to \/
Should forward slashes be escaped? If true, / will be converted to \/
</summary>
<remarks>
If not set explicitly then the value of the parent will be used as default.
</remarks>
<docgen category='JSON Attribute Options' order='100' />
</member>
<member name="P:NLog.Layouts.JsonAttribute.IncludeEmptyValue">
@@ -14242,6 +14275,12 @@
</summary>
<docgen category='JSON Output' order='10' />
</member>
<member name="P:NLog.Layouts.JsonLayout.ExcludeEmptyProperties">
<summary>
Gets or sets the option to exclude null/empty properties from the log event (as JSON)
</summary>
<docgen category='JSON Output' order='10' />
</member>
<member name="P:NLog.Layouts.JsonLayout.ExcludeProperties">
<summary>
List of property names to exclude when <see cref="P:NLog.Layouts.JsonLayout.IncludeAllProperties"/> is true
@@ -14258,6 +14297,9 @@
<summary>
Should forward slashes be escaped? If true, / will be converted to \/
</summary>
<remarks>
If not set explicitly then the value of the parent will be used as default.
</remarks>
<docgen category='JSON Formating' order='10' />
</member>
<member name="M:NLog.Layouts.JsonLayout.InitializeLayout">
@@ -15670,6 +15712,11 @@
<param name="disposing"><c>True</c> to release both managed and unmanaged resources;
<c>false</c> to release only unmanaged resources.</param>
</member>
<member name="M:NLog.LogFactory.Shutdown">
<summary>
Dispose all targets, and shutdown logging.
</summary>
</member>
<member name="M:NLog.LogFactory.GetCandidateConfigFilePaths">
<summary>
Get file paths (including filename) for the possible NLog config files.
@@ -21778,6 +21825,12 @@
</summary>
<docgen category='Parameter Options' order='9' />
</member>
<member name="P:NLog.Targets.DatabaseParameterInfo.AllowDbNull">
<summary>
Gets or sets whether empty value should translate into DbNull. Requires database column to allow NULL values.
</summary>
<docgen category='Parameter Options' order='8' />
</member>
<member name="T:NLog.Targets.DatabaseTarget">
<summary>
Writes log messages to the database using an ADO.NET provider.
@@ -22071,12 +22124,10 @@
<param name="logEvent">Current logevent.</param>
<param name="parameterInfo">Parameter configuration info.</param>
</member>
<member name="M:NLog.Targets.DatabaseTarget.CreateDefaultValue(System.Type)">
<member name="M:NLog.Targets.DatabaseTarget.CreateDefaultValue(System.Type,System.Boolean)">
<summary>
Create Default Value of Type
</summary>
<param name="dbParameterType"></param>
<returns></returns>
</member>
<member name="T:NLog.Targets.DatabaseTarget.TransactionScope">
<summary>
@@ -23156,7 +23207,6 @@
<summary>
Returns the correct filename to archive
</summary>
<returns></returns>
</member>
<member name="M:NLog.Targets.FileTarget.GetArchiveFileNameBasedOnFileSize(System.String,System.Int32,System.Boolean)">
<summary>
@@ -23167,6 +23217,11 @@
<param name="initializedNewFile">File has just been opened.</param>
<returns>Filename to archive. If <c>null</c>, then nothing to archive.</returns>
</member>
<member name="M:NLog.Targets.FileTarget.TryFallbackToPreviousLogFileName(System.String,System.Boolean)">
<summary>
Check if archive operation should check previous filename, because FileAppenderCache tells us current filename no longer exists
</summary>
</member>
<member name="M:NLog.Targets.FileTarget.GetArchiveFileNameBasedOnTime(System.String,NLog.LogEventInfo,System.DateTime,System.Boolean)">
<summary>
Returns the file name for archiving, or null if archiving should not occur based on date/time.
@@ -23594,7 +23649,7 @@
</member>
<member name="T:NLog.Targets.MemoryTarget">
<summary>
Writes log messages to an ArrayList in memory for programmatic retrieval.
Writes log messages to <see cref="P:NLog.Targets.MemoryTarget.Logs"/> in memory for programmatic retrieval.
</summary>
<seealso href="https://github.com/nlog/nlog/wiki/Memory-target">Documentation on NLog Wiki</seealso>
<example>
@@ -23643,7 +23698,7 @@
</member>
<member name="M:NLog.Targets.MemoryTarget.Write(NLog.LogEventInfo)">
<summary>
Renders the logging event message and adds it to the internal ArrayList of log messages.
Renders the logging event message and adds to <see cref="P:NLog.Targets.MemoryTarget.Logs"/>
</summary>
<param name="logEvent">The logging event.</param>
</member>
@@ -25611,6 +25666,8 @@
<summary>
Delay the flush until the LogEvent has been confirmed as written
</summary>
<remarks>If not explicitly set, then disabled by default for <see cref="T:NLog.Targets.Wrappers.BufferingTargetWrapper"/> and AsyncTaskTarget
</remarks>
<docgen category='General Options' order='10' />
</member>
<member name="P:NLog.Targets.Wrappers.AutoFlushTargetWrapper.FlushOnConditionOnly">
MTC_Adapter/packages/NLog.4.7.10/lib/netstandard2.0/NLog.dll
Vendored
BIN
View File
Binary file not shown.
MTC_Adapter/packages/NLog.4.7.2/lib/netstandard2.0/NLog.xml → MTC_Adapter/packages/NLog.4.7.10/lib/netstandard2.0/NLog.xml
Vendored
+72 -15
View File
@@ -1686,7 +1686,7 @@
with embedded ${}).
</summary>
</member>
<member name="M:NLog.Conditions.ConditionLayoutExpression.#ctor(NLog.Layouts.Layout)">
<member name="M:NLog.Conditions.ConditionLayoutExpression.#ctor(NLog.Layouts.SimpleLayout)">
<summary>
Initializes a new instance of the <see cref="T:NLog.Conditions.ConditionLayoutExpression" /> class.
</summary>
@@ -1735,11 +1735,12 @@
Condition literal expression (numeric, <b>LogLevel.XXX</b>, <b>true</b> or <b>false</b>).
</summary>
</member>
<member name="M:NLog.Conditions.ConditionLiteralExpression.#ctor(System.Object)">
<member name="M:NLog.Conditions.ConditionLiteralExpression.#ctor(System.Object,System.String)">
<summary>
Initializes a new instance of the <see cref="T:NLog.Conditions.ConditionLiteralExpression" /> class.
</summary>
<param name="literalValue">Literal value.</param>
<param name="toStringValue">ToString value.</param>
</member>
<member name="P:NLog.Conditions.ConditionLiteralExpression.LiteralValue">
<summary>
@@ -3478,7 +3479,7 @@
Get default file paths (including filename) for possible NLog config files.
</summary>
</member>
<member name="M:NLog.Config.LoggingConfigurationFileLoader.GetAppSpecificNLogLocations(System.String)">
<member name="M:NLog.Config.LoggingConfigurationFileLoader.GetAppSpecificNLogLocations(System.String,System.String)">
<summary>
Get default file paths (including filename) for possible NLog config files.
</summary>
@@ -11693,6 +11694,11 @@
Gets or sets whether to render innermost Exception from <see cref="M:System.Exception.GetBaseException"/>
</summary>
</member>
<member name="P:NLog.LayoutRenderers.ExceptionLayoutRenderer.FlattenException">
<summary>
Gets or sets whether to collapse exception tree using <see cref="M:System.AggregateException.Flatten"/>
</summary>
</member>
<member name="P:NLog.LayoutRenderers.ExceptionLayoutRenderer.Formats">
<summary>
Gets the formats of the output of inner exceptions to be rendered in target.
@@ -11830,6 +11836,12 @@
A layout renderer which could have different behavior per instance by using a <see cref="T:System.Func`1"/>.
</summary>
</member>
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.#ctor(System.String)">
<summary>
Initializes a new instance of the <see cref="T:NLog.LayoutRenderers.FuncLayoutRenderer"/> class.
</summary>
<param name="layoutRendererName">Name without ${}.</param>
</member>
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.#ctor(System.String,System.Func{NLog.LogEventInfo,NLog.Config.LoggingConfiguration,System.Object})">
<summary>
Initializes a new instance of the <see cref="T:NLog.LayoutRenderers.FuncLayoutRenderer"/> class.
@@ -11843,9 +11855,11 @@
</summary>
</member>
<member name="P:NLog.LayoutRenderers.FuncLayoutRenderer.RenderMethod">
<summary>
Method that renders the layout.
</summary>
<summary>
Method that renders the layout.
This public property will be removed in NLog 5.
</summary>
</member>
<member name="P:NLog.LayoutRenderers.FuncLayoutRenderer.Format">
<summary>
@@ -11859,6 +11873,13 @@
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.NLog#Internal#IStringValueRenderer#GetFormattedString(NLog.LogEventInfo)">
<inheritdoc/>
</member>
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.RenderValue(NLog.LogEventInfo)">
<summary>
Render the value for this log event
</summary>
<param name="logEvent">The event info.</param>
<returns>The value.</returns>
</member>
<member name="T:NLog.LayoutRenderers.FuncThreadAgnosticLayoutRenderer">
<summary>
A layout renderer which could have different behavior per instance by using a <see cref="T:System.Func`1"/>.
@@ -12200,6 +12221,12 @@
<param name="name">Name of the layout renderer - without ${}.</param>
<param name="func">Callback that returns the value for the layout renderer.</param>
</member>
<member name="M:NLog.LayoutRenderers.LayoutRenderer.Register(NLog.LayoutRenderers.FuncLayoutRenderer)">
<summary>
Register a custom layout renderer with a callback function <paramref name="layoutRenderer"/>. The callback receives the logEvent and the current configuration.
</summary>
<param name="layoutRenderer">Renderer with callback func</param>
</member>
<member name="T:NLog.LayoutRenderers.LayoutRendererAttribute">
<summary>
Marks class as a layout renderer and assigns a name to it.
@@ -13438,6 +13465,9 @@
<summary>
Should forward slashes be escaped? If true, / will be converted to \/
</summary>
<remarks>
If not set explicitly then the value of the parent will be used as default.
</remarks>
<docgen category="Transformation Options" order="10"/>
</member>
<member name="M:NLog.LayoutRenderers.Wrappers.JsonEncodeLayoutRendererWrapper.RenderInnerAndTransform(NLog.LogEventInfo,System.Text.StringBuilder,System.Int32)">
@@ -14458,8 +14488,11 @@
</member>
<member name="P:NLog.Layouts.JsonAttribute.EscapeForwardSlash">
<summary>
Should forward slashes be escaped? If true, / will be converted to \/
Should forward slashes be escaped? If true, / will be converted to \/
</summary>
<remarks>
If not set explicitly then the value of the parent will be used as default.
</remarks>
<docgen category='JSON Attribute Options' order='100' />
</member>
<member name="P:NLog.Layouts.JsonAttribute.IncludeEmptyValue">
@@ -14520,6 +14553,12 @@
</summary>
<docgen category='JSON Output' order='10' />
</member>
<member name="P:NLog.Layouts.JsonLayout.ExcludeEmptyProperties">
<summary>
Gets or sets the option to exclude null/empty properties from the log event (as JSON)
</summary>
<docgen category='JSON Output' order='10' />
</member>
<member name="P:NLog.Layouts.JsonLayout.ExcludeProperties">
<summary>
List of property names to exclude when <see cref="P:NLog.Layouts.JsonLayout.IncludeAllProperties"/> is true
@@ -14536,6 +14575,9 @@
<summary>
Should forward slashes be escaped? If true, / will be converted to \/
</summary>
<remarks>
If not set explicitly then the value of the parent will be used as default.
</remarks>
<docgen category='JSON Formating' order='10' />
</member>
<member name="M:NLog.Layouts.JsonLayout.InitializeLayout">
@@ -15948,6 +15990,11 @@
<param name="disposing"><c>True</c> to release both managed and unmanaged resources;
<c>false</c> to release only unmanaged resources.</param>
</member>
<member name="M:NLog.LogFactory.Shutdown">
<summary>
Dispose all targets, and shutdown logging.
</summary>
</member>
<member name="M:NLog.LogFactory.GetCandidateConfigFilePaths">
<summary>
Get file paths (including filename) for the possible NLog config files.
@@ -22262,6 +22309,12 @@
</summary>
<docgen category='Parameter Options' order='9' />
</member>
<member name="P:NLog.Targets.DatabaseParameterInfo.AllowDbNull">
<summary>
Gets or sets whether empty value should translate into DbNull. Requires database column to allow NULL values.
</summary>
<docgen category='Parameter Options' order='8' />
</member>
<member name="T:NLog.Targets.DatabaseTarget">
<summary>
Writes log messages to the database using an ADO.NET provider.
@@ -22555,12 +22608,10 @@
<param name="logEvent">Current logevent.</param>
<param name="parameterInfo">Parameter configuration info.</param>
</member>
<member name="M:NLog.Targets.DatabaseTarget.CreateDefaultValue(System.Type)">
<member name="M:NLog.Targets.DatabaseTarget.CreateDefaultValue(System.Type,System.Boolean)">
<summary>
Create Default Value of Type
</summary>
<param name="dbParameterType"></param>
<returns></returns>
</member>
<member name="T:NLog.Targets.DateAndSequenceArchive">
<summary>
@@ -23676,7 +23727,6 @@
<summary>
Returns the correct filename to archive
</summary>
<returns></returns>
</member>
<member name="M:NLog.Targets.FileTarget.GetArchiveFileNameBasedOnFileSize(System.String,System.Int32,System.Boolean)">
<summary>
@@ -23687,6 +23737,11 @@
<param name="initializedNewFile">File has just been opened.</param>
<returns>Filename to archive. If <c>null</c>, then nothing to archive.</returns>
</member>
<member name="M:NLog.Targets.FileTarget.TryFallbackToPreviousLogFileName(System.String,System.Boolean)">
<summary>
Check if archive operation should check previous filename, because FileAppenderCache tells us current filename no longer exists
</summary>
</member>
<member name="M:NLog.Targets.FileTarget.GetArchiveFileNameBasedOnTime(System.String,NLog.LogEventInfo,System.DateTime,System.Boolean)">
<summary>
Returns the file name for archiving, or null if archiving should not occur based on date/time.
@@ -24295,7 +24350,7 @@
</member>
<member name="M:NLog.Targets.MailTarget.Write(NLog.Common.AsyncLogEventInfo)">
<summary>
Renders the logging event message and adds it to the internal ArrayList of log messages.
Writes async log event to the mail target.
</summary>
<param name="logEvent">The logging event.</param>
</member>
@@ -24311,7 +24366,7 @@
</member>
<member name="M:NLog.Targets.MailTarget.Write(System.Collections.Generic.IList{NLog.Common.AsyncLogEventInfo})">
<summary>
Renders an array logging events.
Writes log events to the mail target.
</summary>
<param name="logEvents">Array of logging events.</param>
</member>
@@ -24382,7 +24437,7 @@
</member>
<member name="T:NLog.Targets.MemoryTarget">
<summary>
Writes log messages to an ArrayList in memory for programmatic retrieval.
Writes log messages to <see cref="P:NLog.Targets.MemoryTarget.Logs"/> in memory for programmatic retrieval.
</summary>
<seealso href="https://github.com/nlog/nlog/wiki/Memory-target">Documentation on NLog Wiki</seealso>
<example>
@@ -24431,7 +24486,7 @@
</member>
<member name="M:NLog.Targets.MemoryTarget.Write(NLog.LogEventInfo)">
<summary>
Renders the logging event message and adds it to the internal ArrayList of log messages.
Renders the logging event message and adds to <see cref="P:NLog.Targets.MemoryTarget.Logs"/>
</summary>
<param name="logEvent">The logging event.</param>
</member>
@@ -26419,6 +26474,8 @@
<summary>
Delay the flush until the LogEvent has been confirmed as written
</summary>
<remarks>If not explicitly set, then disabled by default for <see cref="T:NLog.Targets.Wrappers.BufferingTargetWrapper"/> and AsyncTaskTarget
</remarks>
<docgen category='General Options' order='10' />
</member>
<member name="P:NLog.Targets.Wrappers.AutoFlushTargetWrapper.FlushOnConditionOnly">
MTC_Adapter/packages/NLog.4.7.10/lib/sl4/NLog.dll
Vendored
BIN
View File
Binary file not shown.
MTC_Adapter/packages/NLog.4.7.2/lib/sl4/NLog.xml → MTC_Adapter/packages/NLog.4.7.10/lib/sl4/NLog.xml
Vendored
+63 -10
View File
@@ -1656,7 +1656,7 @@
with embedded ${}).
</summary>
</member>
<member name="M:NLog.Conditions.ConditionLayoutExpression.#ctor(NLog.Layouts.Layout)">
<member name="M:NLog.Conditions.ConditionLayoutExpression.#ctor(NLog.Layouts.SimpleLayout)">
<summary>
Initializes a new instance of the <see cref="T:NLog.Conditions.ConditionLayoutExpression" /> class.
</summary>
@@ -1705,11 +1705,12 @@
Condition literal expression (numeric, <b>LogLevel.XXX</b>, <b>true</b> or <b>false</b>).
</summary>
</member>
<member name="M:NLog.Conditions.ConditionLiteralExpression.#ctor(System.Object)">
<member name="M:NLog.Conditions.ConditionLiteralExpression.#ctor(System.Object,System.String)">
<summary>
Initializes a new instance of the <see cref="T:NLog.Conditions.ConditionLiteralExpression" /> class.
</summary>
<param name="literalValue">Literal value.</param>
<param name="toStringValue">ToString value.</param>
</member>
<member name="P:NLog.Conditions.ConditionLiteralExpression.LiteralValue">
<summary>
@@ -3430,7 +3431,7 @@
Get default file paths (including filename) for possible NLog config files.
</summary>
</member>
<member name="M:NLog.Config.LoggingConfigurationFileLoader.GetAppSpecificNLogLocations(System.String)">
<member name="M:NLog.Config.LoggingConfigurationFileLoader.GetAppSpecificNLogLocations(System.String,System.String)">
<summary>
Get default file paths (including filename) for possible NLog config files.
</summary>
@@ -9409,6 +9410,11 @@
Gets or sets whether to render innermost Exception from <see cref="M:System.Exception.GetBaseException"/>
</summary>
</member>
<member name="P:NLog.LayoutRenderers.ExceptionLayoutRenderer.FlattenException">
<summary>
Gets or sets whether to collapse exception tree using AggregateException.Flatten()
</summary>
</member>
<member name="P:NLog.LayoutRenderers.ExceptionLayoutRenderer.Formats">
<summary>
Gets the formats of the output of inner exceptions to be rendered in target.
@@ -9553,6 +9559,12 @@
A layout renderer which could have different behavior per instance by using a <see cref="T:System.Func`1"/>.
</summary>
</member>
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.#ctor(System.String)">
<summary>
Initializes a new instance of the <see cref="T:NLog.LayoutRenderers.FuncLayoutRenderer"/> class.
</summary>
<param name="layoutRendererName">Name without ${}.</param>
</member>
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.#ctor(System.String,System.Func{NLog.LogEventInfo,NLog.Config.LoggingConfiguration,System.Object})">
<summary>
Initializes a new instance of the <see cref="T:NLog.LayoutRenderers.FuncLayoutRenderer"/> class.
@@ -9566,9 +9578,11 @@
</summary>
</member>
<member name="P:NLog.LayoutRenderers.FuncLayoutRenderer.RenderMethod">
<summary>
Method that renders the layout.
</summary>
<summary>
Method that renders the layout.
This public property will be removed in NLog 5.
</summary>
</member>
<member name="P:NLog.LayoutRenderers.FuncLayoutRenderer.Format">
<summary>
@@ -9582,6 +9596,13 @@
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.NLog#Internal#IStringValueRenderer#GetFormattedString(NLog.LogEventInfo)">
<inheritdoc/>
</member>
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.RenderValue(NLog.LogEventInfo)">
<summary>
Render the value for this log event
</summary>
<param name="logEvent">The event info.</param>
<returns>The value.</returns>
</member>
<member name="T:NLog.LayoutRenderers.FuncThreadAgnosticLayoutRenderer">
<summary>
A layout renderer which could have different behavior per instance by using a <see cref="T:System.Func`1"/>.
@@ -9856,6 +9877,12 @@
<param name="name">Name of the layout renderer - without ${}.</param>
<param name="func">Callback that returns the value for the layout renderer.</param>
</member>
<member name="M:NLog.LayoutRenderers.LayoutRenderer.Register(NLog.LayoutRenderers.FuncLayoutRenderer)">
<summary>
Register a custom layout renderer with a callback function <paramref name="layoutRenderer"/>. The callback receives the logEvent and the current configuration.
</summary>
<param name="layoutRenderer">Renderer with callback func</param>
</member>
<member name="T:NLog.LayoutRenderers.LayoutRendererAttribute">
<summary>
Marks class as a layout renderer and assigns a name to it.
@@ -10634,6 +10661,9 @@
<summary>
Should forward slashes be escaped? If true, / will be converted to \/
</summary>
<remarks>
If not set explicitly then the value of the parent will be used as default.
</remarks>
<docgen category="Transformation Options" order="10"/>
</member>
<member name="M:NLog.LayoutRenderers.Wrappers.JsonEncodeLayoutRendererWrapper.RenderInnerAndTransform(NLog.LogEventInfo,System.Text.StringBuilder,System.Int32)">
@@ -11654,8 +11684,11 @@
</member>
<member name="P:NLog.Layouts.JsonAttribute.EscapeForwardSlash">
<summary>
Should forward slashes be escaped? If true, / will be converted to \/
Should forward slashes be escaped? If true, / will be converted to \/
</summary>
<remarks>
If not set explicitly then the value of the parent will be used as default.
</remarks>
<docgen category='JSON Attribute Options' order='100' />
</member>
<member name="P:NLog.Layouts.JsonAttribute.IncludeEmptyValue">
@@ -11710,6 +11743,12 @@
</summary>
<docgen category='JSON Output' order='10' />
</member>
<member name="P:NLog.Layouts.JsonLayout.ExcludeEmptyProperties">
<summary>
Gets or sets the option to exclude null/empty properties from the log event (as JSON)
</summary>
<docgen category='JSON Output' order='10' />
</member>
<member name="P:NLog.Layouts.JsonLayout.ExcludeProperties">
<summary>
List of property names to exclude when <see cref="P:NLog.Layouts.JsonLayout.IncludeAllProperties"/> is true
@@ -11726,6 +11765,9 @@
<summary>
Should forward slashes be escaped? If true, / will be converted to \/
</summary>
<remarks>
If not set explicitly then the value of the parent will be used as default.
</remarks>
<docgen category='JSON Formating' order='10' />
</member>
<member name="M:NLog.Layouts.JsonLayout.InitializeLayout">
@@ -13104,6 +13146,11 @@
<param name="disposing"><c>True</c> to release both managed and unmanaged resources;
<c>false</c> to release only unmanaged resources.</param>
</member>
<member name="M:NLog.LogFactory.Shutdown">
<summary>
Dispose all targets, and shutdown logging.
</summary>
</member>
<member name="M:NLog.LogFactory.GetCandidateConfigFilePaths">
<summary>
Get file paths (including filename) for the possible NLog config files.
@@ -18559,7 +18606,6 @@
<summary>
Returns the correct filename to archive
</summary>
<returns></returns>
</member>
<member name="M:NLog.Targets.FileTarget.GetArchiveFileNameBasedOnFileSize(System.String,System.Int32,System.Boolean)">
<summary>
@@ -18570,6 +18616,11 @@
<param name="initializedNewFile">File has just been opened.</param>
<returns>Filename to archive. If <c>null</c>, then nothing to archive.</returns>
</member>
<member name="M:NLog.Targets.FileTarget.TryFallbackToPreviousLogFileName(System.String,System.Boolean)">
<summary>
Check if archive operation should check previous filename, because FileAppenderCache tells us current filename no longer exists
</summary>
</member>
<member name="M:NLog.Targets.FileTarget.GetArchiveFileNameBasedOnTime(System.String,NLog.LogEventInfo,System.DateTime,System.Boolean)">
<summary>
Returns the file name for archiving, or null if archiving should not occur based on date/time.
@@ -19050,7 +19101,7 @@
</member>
<member name="T:NLog.Targets.MemoryTarget">
<summary>
Writes log messages to an ArrayList in memory for programmatic retrieval.
Writes log messages to <see cref="P:NLog.Targets.MemoryTarget.Logs"/> in memory for programmatic retrieval.
</summary>
<seealso href="https://github.com/nlog/nlog/wiki/Memory-target">Documentation on NLog Wiki</seealso>
<example>
@@ -19099,7 +19150,7 @@
</member>
<member name="M:NLog.Targets.MemoryTarget.Write(NLog.LogEventInfo)">
<summary>
Renders the logging event message and adds it to the internal ArrayList of log messages.
Renders the logging event message and adds to <see cref="P:NLog.Targets.MemoryTarget.Logs"/>
</summary>
<param name="logEvent">The logging event.</param>
</member>
@@ -20800,6 +20851,8 @@
<summary>
Delay the flush until the LogEvent has been confirmed as written
</summary>
<remarks>If not explicitly set, then disabled by default for <see cref="T:NLog.Targets.Wrappers.BufferingTargetWrapper"/> and AsyncTaskTarget
</remarks>
<docgen category='General Options' order='10' />
</member>
<member name="P:NLog.Targets.Wrappers.AutoFlushTargetWrapper.FlushOnConditionOnly">
MTC_Adapter/packages/NLog.4.7.10/lib/sl5/NLog.dll
Vendored
BIN
View File
Binary file not shown.
MTC_Adapter/packages/NLog.4.7.2/lib/sl5/NLog.xml → MTC_Adapter/packages/NLog.4.7.10/lib/sl5/NLog.xml
Vendored
+63 -10
View File
@@ -1656,7 +1656,7 @@
with embedded ${}).
</summary>
</member>
<member name="M:NLog.Conditions.ConditionLayoutExpression.#ctor(NLog.Layouts.Layout)">
<member name="M:NLog.Conditions.ConditionLayoutExpression.#ctor(NLog.Layouts.SimpleLayout)">
<summary>
Initializes a new instance of the <see cref="T:NLog.Conditions.ConditionLayoutExpression" /> class.
</summary>
@@ -1705,11 +1705,12 @@
Condition literal expression (numeric, <b>LogLevel.XXX</b>, <b>true</b> or <b>false</b>).
</summary>
</member>
<member name="M:NLog.Conditions.ConditionLiteralExpression.#ctor(System.Object)">
<member name="M:NLog.Conditions.ConditionLiteralExpression.#ctor(System.Object,System.String)">
<summary>
Initializes a new instance of the <see cref="T:NLog.Conditions.ConditionLiteralExpression" /> class.
</summary>
<param name="literalValue">Literal value.</param>
<param name="toStringValue">ToString value.</param>
</member>
<member name="P:NLog.Conditions.ConditionLiteralExpression.LiteralValue">
<summary>
@@ -3430,7 +3431,7 @@
Get default file paths (including filename) for possible NLog config files.
</summary>
</member>
<member name="M:NLog.Config.LoggingConfigurationFileLoader.GetAppSpecificNLogLocations(System.String)">
<member name="M:NLog.Config.LoggingConfigurationFileLoader.GetAppSpecificNLogLocations(System.String,System.String)">
<summary>
Get default file paths (including filename) for possible NLog config files.
</summary>
@@ -9409,6 +9410,11 @@
Gets or sets whether to render innermost Exception from <see cref="M:System.Exception.GetBaseException"/>
</summary>
</member>
<member name="P:NLog.LayoutRenderers.ExceptionLayoutRenderer.FlattenException">
<summary>
Gets or sets whether to collapse exception tree using <see cref="M:System.AggregateException.Flatten"/>
</summary>
</member>
<member name="P:NLog.LayoutRenderers.ExceptionLayoutRenderer.Formats">
<summary>
Gets the formats of the output of inner exceptions to be rendered in target.
@@ -9553,6 +9559,12 @@
A layout renderer which could have different behavior per instance by using a <see cref="T:System.Func`1"/>.
</summary>
</member>
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.#ctor(System.String)">
<summary>
Initializes a new instance of the <see cref="T:NLog.LayoutRenderers.FuncLayoutRenderer"/> class.
</summary>
<param name="layoutRendererName">Name without ${}.</param>
</member>
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.#ctor(System.String,System.Func{NLog.LogEventInfo,NLog.Config.LoggingConfiguration,System.Object})">
<summary>
Initializes a new instance of the <see cref="T:NLog.LayoutRenderers.FuncLayoutRenderer"/> class.
@@ -9566,9 +9578,11 @@
</summary>
</member>
<member name="P:NLog.LayoutRenderers.FuncLayoutRenderer.RenderMethod">
<summary>
Method that renders the layout.
</summary>
<summary>
Method that renders the layout.
This public property will be removed in NLog 5.
</summary>
</member>
<member name="P:NLog.LayoutRenderers.FuncLayoutRenderer.Format">
<summary>
@@ -9582,6 +9596,13 @@
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.NLog#Internal#IStringValueRenderer#GetFormattedString(NLog.LogEventInfo)">
<inheritdoc/>
</member>
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.RenderValue(NLog.LogEventInfo)">
<summary>
Render the value for this log event
</summary>
<param name="logEvent">The event info.</param>
<returns>The value.</returns>
</member>
<member name="T:NLog.LayoutRenderers.FuncThreadAgnosticLayoutRenderer">
<summary>
A layout renderer which could have different behavior per instance by using a <see cref="T:System.Func`1"/>.
@@ -9856,6 +9877,12 @@
<param name="name">Name of the layout renderer - without ${}.</param>
<param name="func">Callback that returns the value for the layout renderer.</param>
</member>
<member name="M:NLog.LayoutRenderers.LayoutRenderer.Register(NLog.LayoutRenderers.FuncLayoutRenderer)">
<summary>
Register a custom layout renderer with a callback function <paramref name="layoutRenderer"/>. The callback receives the logEvent and the current configuration.
</summary>
<param name="layoutRenderer">Renderer with callback func</param>
</member>
<member name="T:NLog.LayoutRenderers.LayoutRendererAttribute">
<summary>
Marks class as a layout renderer and assigns a name to it.
@@ -10634,6 +10661,9 @@
<summary>
Should forward slashes be escaped? If true, / will be converted to \/
</summary>
<remarks>
If not set explicitly then the value of the parent will be used as default.
</remarks>
<docgen category="Transformation Options" order="10"/>
</member>
<member name="M:NLog.LayoutRenderers.Wrappers.JsonEncodeLayoutRendererWrapper.RenderInnerAndTransform(NLog.LogEventInfo,System.Text.StringBuilder,System.Int32)">
@@ -11654,8 +11684,11 @@
</member>
<member name="P:NLog.Layouts.JsonAttribute.EscapeForwardSlash">
<summary>
Should forward slashes be escaped? If true, / will be converted to \/
Should forward slashes be escaped? If true, / will be converted to \/
</summary>
<remarks>
If not set explicitly then the value of the parent will be used as default.
</remarks>
<docgen category='JSON Attribute Options' order='100' />
</member>
<member name="P:NLog.Layouts.JsonAttribute.IncludeEmptyValue">
@@ -11710,6 +11743,12 @@
</summary>
<docgen category='JSON Output' order='10' />
</member>
<member name="P:NLog.Layouts.JsonLayout.ExcludeEmptyProperties">
<summary>
Gets or sets the option to exclude null/empty properties from the log event (as JSON)
</summary>
<docgen category='JSON Output' order='10' />
</member>
<member name="P:NLog.Layouts.JsonLayout.ExcludeProperties">
<summary>
List of property names to exclude when <see cref="P:NLog.Layouts.JsonLayout.IncludeAllProperties"/> is true
@@ -11726,6 +11765,9 @@
<summary>
Should forward slashes be escaped? If true, / will be converted to \/
</summary>
<remarks>
If not set explicitly then the value of the parent will be used as default.
</remarks>
<docgen category='JSON Formating' order='10' />
</member>
<member name="M:NLog.Layouts.JsonLayout.InitializeLayout">
@@ -13104,6 +13146,11 @@
<param name="disposing"><c>True</c> to release both managed and unmanaged resources;
<c>false</c> to release only unmanaged resources.</param>
</member>
<member name="M:NLog.LogFactory.Shutdown">
<summary>
Dispose all targets, and shutdown logging.
</summary>
</member>
<member name="M:NLog.LogFactory.GetCandidateConfigFilePaths">
<summary>
Get file paths (including filename) for the possible NLog config files.
@@ -18725,7 +18772,6 @@
<summary>
Returns the correct filename to archive
</summary>
<returns></returns>
</member>
<member name="M:NLog.Targets.FileTarget.GetArchiveFileNameBasedOnFileSize(System.String,System.Int32,System.Boolean)">
<summary>
@@ -18736,6 +18782,11 @@
<param name="initializedNewFile">File has just been opened.</param>
<returns>Filename to archive. If <c>null</c>, then nothing to archive.</returns>
</member>
<member name="M:NLog.Targets.FileTarget.TryFallbackToPreviousLogFileName(System.String,System.Boolean)">
<summary>
Check if archive operation should check previous filename, because FileAppenderCache tells us current filename no longer exists
</summary>
</member>
<member name="M:NLog.Targets.FileTarget.GetArchiveFileNameBasedOnTime(System.String,NLog.LogEventInfo,System.DateTime,System.Boolean)">
<summary>
Returns the file name for archiving, or null if archiving should not occur based on date/time.
@@ -19216,7 +19267,7 @@
</member>
<member name="T:NLog.Targets.MemoryTarget">
<summary>
Writes log messages to an ArrayList in memory for programmatic retrieval.
Writes log messages to <see cref="P:NLog.Targets.MemoryTarget.Logs"/> in memory for programmatic retrieval.
</summary>
<seealso href="https://github.com/nlog/nlog/wiki/Memory-target">Documentation on NLog Wiki</seealso>
<example>
@@ -19265,7 +19316,7 @@
</member>
<member name="M:NLog.Targets.MemoryTarget.Write(NLog.LogEventInfo)">
<summary>
Renders the logging event message and adds it to the internal ArrayList of log messages.
Renders the logging event message and adds to <see cref="P:NLog.Targets.MemoryTarget.Logs"/>
</summary>
<param name="logEvent">The logging event.</param>
</member>
@@ -20966,6 +21017,8 @@
<summary>
Delay the flush until the LogEvent has been confirmed as written
</summary>
<remarks>If not explicitly set, then disabled by default for <see cref="T:NLog.Targets.Wrappers.BufferingTargetWrapper"/> and AsyncTaskTarget
</remarks>
<docgen category='General Options' order='10' />
</member>
<member name="P:NLog.Targets.Wrappers.AutoFlushTargetWrapper.FlushOnConditionOnly">
MTC_Adapter/packages/NLog.4.7.10/lib/wp8/NLog.dll
Vendored
BIN
View File
Binary file not shown.
MTC_Adapter/packages/NLog.4.7.2/lib/wp8/NLog.xml → MTC_Adapter/packages/NLog.4.7.10/lib/wp8/NLog.xml
Vendored
+63 -10
View File
@@ -1656,7 +1656,7 @@
with embedded ${}).
</summary>
</member>
<member name="M:NLog.Conditions.ConditionLayoutExpression.#ctor(NLog.Layouts.Layout)">
<member name="M:NLog.Conditions.ConditionLayoutExpression.#ctor(NLog.Layouts.SimpleLayout)">
<summary>
Initializes a new instance of the <see cref="T:NLog.Conditions.ConditionLayoutExpression" /> class.
</summary>
@@ -1705,11 +1705,12 @@
Condition literal expression (numeric, <b>LogLevel.XXX</b>, <b>true</b> or <b>false</b>).
</summary>
</member>
<member name="M:NLog.Conditions.ConditionLiteralExpression.#ctor(System.Object)">
<member name="M:NLog.Conditions.ConditionLiteralExpression.#ctor(System.Object,System.String)">
<summary>
Initializes a new instance of the <see cref="T:NLog.Conditions.ConditionLiteralExpression" /> class.
</summary>
<param name="literalValue">Literal value.</param>
<param name="toStringValue">ToString value.</param>
</member>
<member name="P:NLog.Conditions.ConditionLiteralExpression.LiteralValue">
<summary>
@@ -3430,7 +3431,7 @@
Get default file paths (including filename) for possible NLog config files.
</summary>
</member>
<member name="M:NLog.Config.LoggingConfigurationFileLoader.GetAppSpecificNLogLocations(System.String)">
<member name="M:NLog.Config.LoggingConfigurationFileLoader.GetAppSpecificNLogLocations(System.String,System.String)">
<summary>
Get default file paths (including filename) for possible NLog config files.
</summary>
@@ -9402,6 +9403,11 @@
Gets or sets whether to render innermost Exception from <see cref="M:System.Exception.GetBaseException"/>
</summary>
</member>
<member name="P:NLog.LayoutRenderers.ExceptionLayoutRenderer.FlattenException">
<summary>
Gets or sets whether to collapse exception tree using <see cref="M:System.AggregateException.Flatten"/>
</summary>
</member>
<member name="P:NLog.LayoutRenderers.ExceptionLayoutRenderer.Formats">
<summary>
Gets the formats of the output of inner exceptions to be rendered in target.
@@ -9546,6 +9552,12 @@
A layout renderer which could have different behavior per instance by using a <see cref="T:System.Func`1"/>.
</summary>
</member>
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.#ctor(System.String)">
<summary>
Initializes a new instance of the <see cref="T:NLog.LayoutRenderers.FuncLayoutRenderer"/> class.
</summary>
<param name="layoutRendererName">Name without ${}.</param>
</member>
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.#ctor(System.String,System.Func{NLog.LogEventInfo,NLog.Config.LoggingConfiguration,System.Object})">
<summary>
Initializes a new instance of the <see cref="T:NLog.LayoutRenderers.FuncLayoutRenderer"/> class.
@@ -9559,9 +9571,11 @@
</summary>
</member>
<member name="P:NLog.LayoutRenderers.FuncLayoutRenderer.RenderMethod">
<summary>
Method that renders the layout.
</summary>
<summary>
Method that renders the layout.
This public property will be removed in NLog 5.
</summary>
</member>
<member name="P:NLog.LayoutRenderers.FuncLayoutRenderer.Format">
<summary>
@@ -9575,6 +9589,13 @@
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.NLog#Internal#IStringValueRenderer#GetFormattedString(NLog.LogEventInfo)">
<inheritdoc/>
</member>
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.RenderValue(NLog.LogEventInfo)">
<summary>
Render the value for this log event
</summary>
<param name="logEvent">The event info.</param>
<returns>The value.</returns>
</member>
<member name="T:NLog.LayoutRenderers.FuncThreadAgnosticLayoutRenderer">
<summary>
A layout renderer which could have different behavior per instance by using a <see cref="T:System.Func`1"/>.
@@ -9849,6 +9870,12 @@
<param name="name">Name of the layout renderer - without ${}.</param>
<param name="func">Callback that returns the value for the layout renderer.</param>
</member>
<member name="M:NLog.LayoutRenderers.LayoutRenderer.Register(NLog.LayoutRenderers.FuncLayoutRenderer)">
<summary>
Register a custom layout renderer with a callback function <paramref name="layoutRenderer"/>. The callback receives the logEvent and the current configuration.
</summary>
<param name="layoutRenderer">Renderer with callback func</param>
</member>
<member name="T:NLog.LayoutRenderers.LayoutRendererAttribute">
<summary>
Marks class as a layout renderer and assigns a name to it.
@@ -10604,6 +10631,9 @@
<summary>
Should forward slashes be escaped? If true, / will be converted to \/
</summary>
<remarks>
If not set explicitly then the value of the parent will be used as default.
</remarks>
<docgen category="Transformation Options" order="10"/>
</member>
<member name="M:NLog.LayoutRenderers.Wrappers.JsonEncodeLayoutRendererWrapper.RenderInnerAndTransform(NLog.LogEventInfo,System.Text.StringBuilder,System.Int32)">
@@ -11624,8 +11654,11 @@
</member>
<member name="P:NLog.Layouts.JsonAttribute.EscapeForwardSlash">
<summary>
Should forward slashes be escaped? If true, / will be converted to \/
Should forward slashes be escaped? If true, / will be converted to \/
</summary>
<remarks>
If not set explicitly then the value of the parent will be used as default.
</remarks>
<docgen category='JSON Attribute Options' order='100' />
</member>
<member name="P:NLog.Layouts.JsonAttribute.IncludeEmptyValue">
@@ -11680,6 +11713,12 @@
</summary>
<docgen category='JSON Output' order='10' />
</member>
<member name="P:NLog.Layouts.JsonLayout.ExcludeEmptyProperties">
<summary>
Gets or sets the option to exclude null/empty properties from the log event (as JSON)
</summary>
<docgen category='JSON Output' order='10' />
</member>
<member name="P:NLog.Layouts.JsonLayout.ExcludeProperties">
<summary>
List of property names to exclude when <see cref="P:NLog.Layouts.JsonLayout.IncludeAllProperties"/> is true
@@ -11696,6 +11735,9 @@
<summary>
Should forward slashes be escaped? If true, / will be converted to \/
</summary>
<remarks>
If not set explicitly then the value of the parent will be used as default.
</remarks>
<docgen category='JSON Formating' order='10' />
</member>
<member name="M:NLog.Layouts.JsonLayout.InitializeLayout">
@@ -13074,6 +13116,11 @@
<param name="disposing"><c>True</c> to release both managed and unmanaged resources;
<c>false</c> to release only unmanaged resources.</param>
</member>
<member name="M:NLog.LogFactory.Shutdown">
<summary>
Dispose all targets, and shutdown logging.
</summary>
</member>
<member name="M:NLog.LogFactory.GetCandidateConfigFilePaths">
<summary>
Get file paths (including filename) for the possible NLog config files.
@@ -18031,7 +18078,6 @@
<summary>
Returns the correct filename to archive
</summary>
<returns></returns>
</member>
<member name="M:NLog.Targets.FileTarget.GetArchiveFileNameBasedOnFileSize(System.String,System.Int32,System.Boolean)">
<summary>
@@ -18042,6 +18088,11 @@
<param name="initializedNewFile">File has just been opened.</param>
<returns>Filename to archive. If <c>null</c>, then nothing to archive.</returns>
</member>
<member name="M:NLog.Targets.FileTarget.TryFallbackToPreviousLogFileName(System.String,System.Boolean)">
<summary>
Check if archive operation should check previous filename, because FileAppenderCache tells us current filename no longer exists
</summary>
</member>
<member name="M:NLog.Targets.FileTarget.GetArchiveFileNameBasedOnTime(System.String,NLog.LogEventInfo,System.DateTime,System.Boolean)">
<summary>
Returns the file name for archiving, or null if archiving should not occur based on date/time.
@@ -18392,7 +18443,7 @@
</member>
<member name="T:NLog.Targets.MemoryTarget">
<summary>
Writes log messages to an ArrayList in memory for programmatic retrieval.
Writes log messages to <see cref="P:NLog.Targets.MemoryTarget.Logs"/> in memory for programmatic retrieval.
</summary>
<seealso href="https://github.com/nlog/nlog/wiki/Memory-target">Documentation on NLog Wiki</seealso>
<example>
@@ -18441,7 +18492,7 @@
</member>
<member name="M:NLog.Targets.MemoryTarget.Write(NLog.LogEventInfo)">
<summary>
Renders the logging event message and adds it to the internal ArrayList of log messages.
Renders the logging event message and adds to <see cref="P:NLog.Targets.MemoryTarget.Logs"/>
</summary>
<param name="logEvent">The logging event.</param>
</member>
@@ -20142,6 +20193,8 @@
<summary>
Delay the flush until the LogEvent has been confirmed as written
</summary>
<remarks>If not explicitly set, then disabled by default for <see cref="T:NLog.Targets.Wrappers.BufferingTargetWrapper"/> and AsyncTaskTarget
</remarks>
<docgen category='General Options' order='10' />
</member>
<member name="P:NLog.Targets.Wrappers.AutoFlushTargetWrapper.FlushOnConditionOnly">
MTC_Adapter/packages/NLog.4.7.10/lib/xamarinios10/NLog.dll
Vendored
BIN
View File
Binary file not shown.
MTC_Adapter/packages/NLog.4.7.2/lib/monoandroid44/NLog.xml → MTC_Adapter/packages/NLog.4.7.10/lib/xamarinios10/NLog.xml
Vendored
+65 -66
View File
@@ -1669,7 +1669,7 @@
with embedded ${}).
</summary>
</member>
<member name="M:NLog.Conditions.ConditionLayoutExpression.#ctor(NLog.Layouts.Layout)">
<member name="M:NLog.Conditions.ConditionLayoutExpression.#ctor(NLog.Layouts.SimpleLayout)">
<summary>
Initializes a new instance of the <see cref="T:NLog.Conditions.ConditionLayoutExpression" /> class.
</summary>
@@ -1718,11 +1718,12 @@
Condition literal expression (numeric, <b>LogLevel.XXX</b>, <b>true</b> or <b>false</b>).
</summary>
</member>
<member name="M:NLog.Conditions.ConditionLiteralExpression.#ctor(System.Object)">
<member name="M:NLog.Conditions.ConditionLiteralExpression.#ctor(System.Object,System.String)">
<summary>
Initializes a new instance of the <see cref="T:NLog.Conditions.ConditionLiteralExpression" /> class.
</summary>
<param name="literalValue">Literal value.</param>
<param name="toStringValue">ToString value.</param>
</member>
<member name="P:NLog.Conditions.ConditionLiteralExpression.LiteralValue">
<summary>
@@ -3461,7 +3462,7 @@
Get default file paths (including filename) for possible NLog config files.
</summary>
</member>
<member name="M:NLog.Config.LoggingConfigurationFileLoader.GetAppSpecificNLogLocations(System.String)">
<member name="M:NLog.Config.LoggingConfigurationFileLoader.GetAppSpecificNLogLocations(System.String,System.String)">
<summary>
Get default file paths (including filename) for possible NLog config files.
</summary>
@@ -4008,11 +4009,6 @@
- Update TemplateXSD.xml for changes outside targets
</remarks>
</member>
<member name="F:NLog.Config.XmlLoggingConfiguration.AssetsPrefix">
<summary>
Prefix for assets in Xamarin Android
</summary>
</member>
<member name="M:NLog.Config.XmlLoggingConfiguration.#ctor(System.String)">
<summary>
Initializes a new instance of the <see cref="T:NLog.Config.XmlLoggingConfiguration" /> class.
@@ -11378,6 +11374,11 @@
Gets or sets whether to render innermost Exception from <see cref="M:System.Exception.GetBaseException"/>
</summary>
</member>
<member name="P:NLog.LayoutRenderers.ExceptionLayoutRenderer.FlattenException">
<summary>
Gets or sets whether to collapse exception tree using <see cref="M:System.AggregateException.Flatten"/>
</summary>
</member>
<member name="P:NLog.LayoutRenderers.ExceptionLayoutRenderer.Formats">
<summary>
Gets the formats of the output of inner exceptions to be rendered in target.
@@ -11515,6 +11516,12 @@
A layout renderer which could have different behavior per instance by using a <see cref="T:System.Func`1"/>.
</summary>
</member>
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.#ctor(System.String)">
<summary>
Initializes a new instance of the <see cref="T:NLog.LayoutRenderers.FuncLayoutRenderer"/> class.
</summary>
<param name="layoutRendererName">Name without ${}.</param>
</member>
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.#ctor(System.String,System.Func{NLog.LogEventInfo,NLog.Config.LoggingConfiguration,System.Object})">
<summary>
Initializes a new instance of the <see cref="T:NLog.LayoutRenderers.FuncLayoutRenderer"/> class.
@@ -11528,9 +11535,11 @@
</summary>
</member>
<member name="P:NLog.LayoutRenderers.FuncLayoutRenderer.RenderMethod">
<summary>
Method that renders the layout.
</summary>
<summary>
Method that renders the layout.
This public property will be removed in NLog 5.
</summary>
</member>
<member name="P:NLog.LayoutRenderers.FuncLayoutRenderer.Format">
<summary>
@@ -11544,6 +11553,13 @@
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.NLog#Internal#IStringValueRenderer#GetFormattedString(NLog.LogEventInfo)">
<inheritdoc/>
</member>
<member name="M:NLog.LayoutRenderers.FuncLayoutRenderer.RenderValue(NLog.LogEventInfo)">
<summary>
Render the value for this log event
</summary>
<param name="logEvent">The event info.</param>
<returns>The value.</returns>
</member>
<member name="T:NLog.LayoutRenderers.FuncThreadAgnosticLayoutRenderer">
<summary>
A layout renderer which could have different behavior per instance by using a <see cref="T:System.Func`1"/>.
@@ -11875,6 +11891,12 @@
<param name="name">Name of the layout renderer - without ${}.</param>
<param name="func">Callback that returns the value for the layout renderer.</param>
</member>
<member name="M:NLog.LayoutRenderers.LayoutRenderer.Register(NLog.LayoutRenderers.FuncLayoutRenderer)">
<summary>
Register a custom layout renderer with a callback function <paramref name="layoutRenderer"/>. The callback receives the logEvent and the current configuration.
</summary>
<param name="layoutRenderer">Renderer with callback func</param>
</member>
<member name="T:NLog.LayoutRenderers.LayoutRendererAttribute">
<summary>
Marks class as a layout renderer and assigns a name to it.
@@ -12387,27 +12409,6 @@
<member name="M:NLog.LayoutRenderers.ProcessDirLayoutRenderer.Append(System.Text.StringBuilder,NLog.LogEventInfo)">
<inheritdoc/>
</member>
<member name="T:NLog.LayoutRenderers.ProcessIdLayoutRenderer">
<summary>
The identifier of the current process.
</summary>
</member>
<member name="M:NLog.LayoutRenderers.ProcessIdLayoutRenderer.#ctor">
<summary>
Initializes a new instance of the <see cref="T:NLog.LayoutRenderers.ProcessIdLayoutRenderer" /> class.
</summary>
</member>
<member name="M:NLog.LayoutRenderers.ProcessIdLayoutRenderer.#ctor(NLog.Internal.Fakeables.IAppEnvironment)">
<summary>
Initializes a new instance of the <see cref="T:NLog.LayoutRenderers.ProcessIdLayoutRenderer" /> class.
</summary>
</member>
<member name="M:NLog.LayoutRenderers.ProcessIdLayoutRenderer.Append(System.Text.StringBuilder,NLog.LogEventInfo)">
<inheritdoc />
</member>
<member name="M:NLog.LayoutRenderers.ProcessIdLayoutRenderer.NLog#Internal#IRawValue#TryGetRawValue(NLog.LogEventInfo,System.Object@)">
<inheritdoc />
</member>
<member name="T:NLog.LayoutRenderers.ProcessInfoLayoutRenderer">
<summary>
The information about the running process.
@@ -12634,34 +12635,6 @@
Working Set Size (64-bit).
</summary>
</member>
<member name="T:NLog.LayoutRenderers.ProcessNameLayoutRenderer">
<summary>
The name of the current process.
</summary>
</member>
<member name="P:NLog.LayoutRenderers.ProcessNameLayoutRenderer.FullName">
<summary>
Gets or sets a value indicating whether to write the full path to the process executable.
</summary>
<docgen category='Rendering Options' order='10' />
</member>
<member name="M:NLog.LayoutRenderers.ProcessNameLayoutRenderer.#ctor">
<summary>
Initializes a new instance of the <see cref="T:NLog.LayoutRenderers.ProcessNameLayoutRenderer" /> class.
</summary>
</member>
<member name="M:NLog.LayoutRenderers.ProcessNameLayoutRenderer.#ctor(NLog.Internal.Fakeables.IAppEnvironment)">
<summary>
Initializes a new instance of the <see cref="T:NLog.LayoutRenderers.ProcessNameLayoutRenderer" /> class.
</summary>
</member>
<member name="M:NLog.LayoutRenderers.ProcessNameLayoutRenderer.Append(System.Text.StringBuilder,NLog.LogEventInfo)">
<summary>
Renders the current process name (optionally with a full path).
</summary>
<param name="builder">The <see cref="T:System.Text.StringBuilder"/> to append the rendered data to.</param>
<param name="logEvent">Logging event.</param>
</member>
<member name="T:NLog.LayoutRenderers.ProcessTimeLayoutRenderer">
<summary>
The process time in format HH:mm:ss.mmm.
@@ -13109,6 +13082,9 @@
<summary>
Should forward slashes be escaped? If true, / will be converted to \/
</summary>
<remarks>
If not set explicitly then the value of the parent will be used as default.
</remarks>
<docgen category="Transformation Options" order="10"/>
</member>
<member name="M:NLog.LayoutRenderers.Wrappers.JsonEncodeLayoutRendererWrapper.RenderInnerAndTransform(NLog.LogEventInfo,System.Text.StringBuilder,System.Int32)">
@@ -14129,8 +14105,11 @@
</member>
<member name="P:NLog.Layouts.JsonAttribute.EscapeForwardSlash">
<summary>
Should forward slashes be escaped? If true, / will be converted to \/
Should forward slashes be escaped? If true, / will be converted to \/
</summary>
<remarks>
If not set explicitly then the value of the parent will be used as default.
</remarks>
<docgen category='JSON Attribute Options' order='100' />
</member>
<member name="P:NLog.Layouts.JsonAttribute.IncludeEmptyValue">
@@ -14191,6 +14170,12 @@
</summary>
<docgen category='JSON Output' order='10' />
</member>
<member name="P:NLog.Layouts.JsonLayout.ExcludeEmptyProperties">
<summary>
Gets or sets the option to exclude null/empty properties from the log event (as JSON)
</summary>
<docgen category='JSON Output' order='10' />
</member>
<member name="P:NLog.Layouts.JsonLayout.ExcludeProperties">
<summary>
List of property names to exclude when <see cref="P:NLog.Layouts.JsonLayout.IncludeAllProperties"/> is true
@@ -14207,6 +14192,9 @@
<summary>
Should forward slashes be escaped? If true, / will be converted to \/
</summary>
<remarks>
If not set explicitly then the value of the parent will be used as default.
</remarks>
<docgen category='JSON Formating' order='10' />
</member>
<member name="M:NLog.Layouts.JsonLayout.InitializeLayout">
@@ -15603,6 +15591,11 @@
<param name="disposing"><c>True</c> to release both managed and unmanaged resources;
<c>false</c> to release only unmanaged resources.</param>
</member>
<member name="M:NLog.LogFactory.Shutdown">
<summary>
Dispose all targets, and shutdown logging.
</summary>
</member>
<member name="M:NLog.LogFactory.GetCandidateConfigFilePaths">
<summary>
Get file paths (including filename) for the possible NLog config files.
@@ -22842,7 +22835,6 @@
<summary>
Returns the correct filename to archive
</summary>
<returns></returns>
</member>
<member name="M:NLog.Targets.FileTarget.GetArchiveFileNameBasedOnFileSize(System.String,System.Int32,System.Boolean)">
<summary>
@@ -22853,6 +22845,11 @@
<param name="initializedNewFile">File has just been opened.</param>
<returns>Filename to archive. If <c>null</c>, then nothing to archive.</returns>
</member>
<member name="M:NLog.Targets.FileTarget.TryFallbackToPreviousLogFileName(System.String,System.Boolean)">
<summary>
Check if archive operation should check previous filename, because FileAppenderCache tells us current filename no longer exists
</summary>
</member>
<member name="M:NLog.Targets.FileTarget.GetArchiveFileNameBasedOnTime(System.String,NLog.LogEventInfo,System.DateTime,System.Boolean)">
<summary>
Returns the file name for archiving, or null if archiving should not occur based on date/time.
@@ -23461,7 +23458,7 @@
</member>
<member name="M:NLog.Targets.MailTarget.Write(NLog.Common.AsyncLogEventInfo)">
<summary>
Renders the logging event message and adds it to the internal ArrayList of log messages.
Writes async log event to the mail target.
</summary>
<param name="logEvent">The logging event.</param>
</member>
@@ -23477,7 +23474,7 @@
</member>
<member name="M:NLog.Targets.MailTarget.Write(System.Collections.Generic.IList{NLog.Common.AsyncLogEventInfo})">
<summary>
Renders an array logging events.
Writes log events to the mail target.
</summary>
<param name="logEvents">Array of logging events.</param>
</member>
@@ -23548,7 +23545,7 @@
</member>
<member name="T:NLog.Targets.MemoryTarget">
<summary>
Writes log messages to an ArrayList in memory for programmatic retrieval.
Writes log messages to <see cref="P:NLog.Targets.MemoryTarget.Logs"/> in memory for programmatic retrieval.
</summary>
<seealso href="https://github.com/nlog/nlog/wiki/Memory-target">Documentation on NLog Wiki</seealso>
<example>
@@ -23597,7 +23594,7 @@
</member>
<member name="M:NLog.Targets.MemoryTarget.Write(NLog.LogEventInfo)">
<summary>
Renders the logging event message and adds it to the internal ArrayList of log messages.
Renders the logging event message and adds to <see cref="P:NLog.Targets.MemoryTarget.Logs"/>
</summary>
<param name="logEvent">The logging event.</param>
</member>
@@ -25496,6 +25493,8 @@
<summary>
Delay the flush until the LogEvent has been confirmed as written
</summary>
<remarks>If not explicitly set, then disabled by default for <see cref="T:NLog.Targets.Wrappers.BufferingTargetWrapper"/> and AsyncTaskTarget
</remarks>
<docgen category='General Options' order='10' />
</member>
<member name="P:NLog.Targets.Wrappers.AutoFlushTargetWrapper.FlushOnConditionOnly">
MTC_Adapter/packages/NLog.4.7.2/NLog.4.7.2.nupkg
Vendored
BIN
View File
Binary file not shown.
MTC_Adapter/packages/NLog.4.7.2/.signature.p7s → MTC_Adapter/packages/NLog.Schema.4.7.10/.signature.p7s
Vendored
BIN
View File
Binary file not shown.
MTC_Adapter/packages/NLog.Schema.4.7.10/NLog.Schema.4.7.10.nupkg
Vendored
BIN
View File
Binary file not shown.
MTC_Adapter/packages/NLog.Schema.4.7.2/content/NLog.xsd → MTC_Adapter/packages/NLog.Schema.4.7.10/content/NLog.xsd
Vendored
+12
View File
@@ -1101,6 +1101,7 @@
<xs:element name="precision" minOccurs="0" maxOccurs="1" type="xs:byte" />
<xs:element name="scale" minOccurs="0" maxOccurs="1" type="xs:byte" />
<xs:element name="parameterType" minOccurs="0" maxOccurs="1" type="xs:string" />
<xs:element name="allowDbNull" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="format" minOccurs="0" maxOccurs="1" type="xs:string" />
<xs:element name="culture" minOccurs="0" maxOccurs="1" type="xs:string" />
</xs:choice>
@@ -1139,6 +1140,11 @@
<xs:documentation>Type of the parameter.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="allowDbNull" type="xs:boolean">
<xs:annotation>
<xs:documentation>Whether empty value should translate into DbNull. Requires database column to allow NULL values.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="format" type="xs:string">
<xs:annotation>
<xs:documentation>Convert format of the database parameter value.</xs:documentation>
@@ -2978,6 +2984,7 @@
<xs:element name="renderEmptyObject" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="suppressSpaces" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="attribute" minOccurs="0" maxOccurs="unbounded" type="NLog.Layouts.JsonAttribute" />
<xs:element name="excludeEmptyProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="excludeProperties" minOccurs="0" maxOccurs="1" type="xs:string" />
<xs:element name="includeAllProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="includeGdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
@@ -3000,6 +3007,11 @@
<xs:documentation>Option to suppress the extra spaces in the output json</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="excludeEmptyProperties" type="xs:boolean">
<xs:annotation>
<xs:documentation>Option to exclude null/empty properties from the log event (as JSON)</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="excludeProperties" type="xs:string">
<xs:annotation>
<xs:documentation>List of property names to exclude when is true</xs:documentation>
MTC_Adapter/packages/NLog.Schema.4.7.2/contentFiles/any/any/NLog.xsd → MTC_Adapter/packages/NLog.Schema.4.7.10/contentFiles/any/any/NLog.xsd
Vendored
+12
View File
@@ -1101,6 +1101,7 @@
<xs:element name="precision" minOccurs="0" maxOccurs="1" type="xs:byte" />
<xs:element name="scale" minOccurs="0" maxOccurs="1" type="xs:byte" />
<xs:element name="parameterType" minOccurs="0" maxOccurs="1" type="xs:string" />
<xs:element name="allowDbNull" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="format" minOccurs="0" maxOccurs="1" type="xs:string" />
<xs:element name="culture" minOccurs="0" maxOccurs="1" type="xs:string" />
</xs:choice>
@@ -1139,6 +1140,11 @@
<xs:documentation>Type of the parameter.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="allowDbNull" type="xs:boolean">
<xs:annotation>
<xs:documentation>Whether empty value should translate into DbNull. Requires database column to allow NULL values.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="format" type="xs:string">
<xs:annotation>
<xs:documentation>Convert format of the database parameter value.</xs:documentation>
@@ -2978,6 +2984,7 @@
<xs:element name="renderEmptyObject" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="suppressSpaces" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="attribute" minOccurs="0" maxOccurs="unbounded" type="NLog.Layouts.JsonAttribute" />
<xs:element name="excludeEmptyProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="excludeProperties" minOccurs="0" maxOccurs="1" type="xs:string" />
<xs:element name="includeAllProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<xs:element name="includeGdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
@@ -3000,6 +3007,11 @@
<xs:documentation>Option to suppress the extra spaces in the output json</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="excludeEmptyProperties" type="xs:boolean">
<xs:annotation>
<xs:documentation>Option to exclude null/empty properties from the log event (as JSON)</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="excludeProperties" type="xs:string">
<xs:annotation>
<xs:documentation>List of property names to exclude when is true</xs:documentation>
MTC_Adapter/packages/NLog.Schema.4.7.2/NLog.Schema.4.7.2.nupkg
Vendored
BIN
View File
Binary file not shown.
gitSpread.bat
+29
View File
@@ -0,0 +1,29 @@
REM Script di replica su altri rami di un branch git
REM l'argomento è il replication level:
REM 0 = develop locale + ramo current remoto
REM 1 = .. + develop remoto
REM 2 = .. + master remoto
REM 3 = .. + ALL remoto
ECHO off
set baseBranch=%1
set pushRemote=%2
git push gitlab.steamware %baseBranch%:%baseBranch%
REM Faccio push remoto condizionale
if %pushRemote% GTR 0 ( git push . %baseBranch%:develop )
if %pushRemote% GTR 0 ( git push gitlab.steamware %baseBranch%:develop )
if %pushRemote% GTR 1 ( git push . %baseBranch%:master )
if %pushRemote% GTR 1 ( git push gitlab.steamware %baseBranch%:master )
if %pushRemote% GTR 2 ( git push . %baseBranch%:FANUC )
if %pushRemote% GTR 2 ( git push gitlab.steamware %baseBranch%:FANUC )
if %pushRemote% GTR 2 ( git push . %baseBranch%:OSAI )
if %pushRemote% GTR 2 ( git push gitlab.steamware %baseBranch%:OSAI )
if %pushRemote% GTR 2 ( git push . %baseBranch%:SIEMENS )
if %pushRemote% GTR 2 ( git push gitlab.steamware %baseBranch%:SIEMENS )
if %pushRemote% GTR 2 ( git push . %baseBranch%:KVARA )
if %pushRemote% GTR 2 ( git push gitlab.steamware %baseBranch%:KVARA )
ECHO on