From f0ec6f540b35aef08059eac950c99411b3c4997a Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 27 Nov 2019 10:33:28 +0100 Subject: [PATCH] Update packages Nuget + testing IClays_02 --- CVCncLib/testSam.dll | Bin 967680 -> 967680 bytes IOB-UT/IOB-UT.csproj | 32 +++++++++++++++------------- IOB-UT/app.config | 4 ++-- IOB-UT/packages.config | 10 ++++----- IOB-WIN/DATA/CONF/MAIN.ini | 4 ++-- IOB-WIN/IOB-WIN.csproj | 42 ++++++++++++++++++------------------- IOB-WIN/IobGeneric.cs | 9 ++++---- IOB-WIN/packages.config | 12 +++++------ Jenkinsfile | 25 +++++++++++++++++----- 9 files changed, 79 insertions(+), 59 deletions(-) diff --git a/CVCncLib/testSam.dll b/CVCncLib/testSam.dll index 18e6426d3399e3169e1f2b55ffa57638151dde02..bae740d8a4a596d48662693e472f50d1182e3c3e 100644 GIT binary patch delta 152 zcmZqZux{wEp3uR3%;{cZcWXCeYd2GCH*;$@OKUf4Yd2eKH+yS0M{74{Yd2SGH}}?V z9>awK=Tzi7CmmOGo42O7sBw#PVEdVcJV4C5{meqXKYSpgrk~!xC#k*Eka4U0j|lH& z6>%z#k9j6BGB7YWTg8MHrxq2*6es4ErskyT6_=zY=9W+A*vKb0U40|p`R#u;^05d3 E0KjiOl>h($ delta 150 zcmZqZux{wEp3uSkit%b=cWXCeYd2GCH*;$@OKUf4Yd2eKH+yS0M{74{Yd2SGH}}?V z9>awKS6)0lE2bghxL=~@(uRt&zuM0%IQ=FJvnwpb3oqr>r9Aoix-Hm+bCmOJA|Fe;gMF;@0 CWj%EO diff --git a/IOB-UT/IOB-UT.csproj b/IOB-UT/IOB-UT.csproj index 2b0790f8..1679b1a5 100644 --- a/IOB-UT/IOB-UT.csproj +++ b/IOB-UT/IOB-UT.csproj @@ -12,6 +12,8 @@ v4.0 512 Client + + true @@ -52,8 +54,8 @@ ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - - ..\packages\MapoSDK.6.8.1911.1251\lib\net40\MapoSDK.dll + + ..\packages\MapoSDK.6.9.1911.1260\lib\net40\MapoSDK.dll ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll @@ -65,26 +67,26 @@ ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll - ..\packages\Newtonsoft.Json.12.0.2\lib\net40\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll - ..\packages\NLog.4.6.7\lib\net40-client\NLog.dll + ..\packages\NLog.4.6.8\lib\net40-client\NLog.dll - - ..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.IO.dll + + ..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.IO.dll - - ..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Runtime.dll + + ..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Runtime.dll - - ..\packages\Microsoft.Bcl.1.1.8\lib\net40\System.Threading.Tasks.dll + + ..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Threading.Tasks.dll @@ -110,9 +112,11 @@ - - - - + + + + Questo progetto fa riferimento a uno o più pacchetti NuGet che non sono presenti in questo computer. Usare lo strumento di ripristino dei pacchetti NuGet per scaricarli. Per altre informazioni, vedere http://go.microsoft.com/fwlink/?LinkID=322105. Il file mancante è {0}. + + \ No newline at end of file diff --git a/IOB-UT/app.config b/IOB-UT/app.config index 3c737829..e03ea0a5 100644 --- a/IOB-UT/app.config +++ b/IOB-UT/app.config @@ -4,11 +4,11 @@ - + - + diff --git a/IOB-UT/packages.config b/IOB-UT/packages.config index dc440a8e..32616f53 100644 --- a/IOB-UT/packages.config +++ b/IOB-UT/packages.config @@ -1,10 +1,10 @@  - - + + - - - + + + \ No newline at end of file diff --git a/IOB-WIN/DATA/CONF/MAIN.ini b/IOB-WIN/DATA/CONF/MAIN.ini index 7321f5cd..5fd133fb 100644 --- a/IOB-WIN/DATA/CONF/MAIN.ini +++ b/IOB-WIN/DATA/CONF/MAIN.ini @@ -45,7 +45,7 @@ CMDIOB2CALL=/IOB/getIob2call?GWIP= ;STARTLIST=INTERCL_01 ; INTERCLAYS MISCELA -;STARTLIST=INTERCL_02 +STARTLIST=INTERCL_02 ; IMI REMOSA ;STARTLIST=IMI_50 @@ -53,6 +53,6 @@ CMDIOB2CALL=/IOB/getIob2call?GWIP= ; SIMULAZIONE verso server ufficio ;STARTLIST=SIMUL_01,SIMUL_02,SIMUL_03,SIMUL_04 ;STARTLIST=SIMUL_01 -STARTLIST=TEST +;STARTLIST=TEST MAXCNC=10 \ No newline at end of file diff --git a/IOB-WIN/IOB-WIN.csproj b/IOB-WIN/IOB-WIN.csproj index 781e8f70..da75369f 100644 --- a/IOB-WIN/IOB-WIN.csproj +++ b/IOB-WIN/IOB-WIN.csproj @@ -1,10 +1,10 @@  - - - - - + + + + + Debug @@ -83,8 +83,8 @@ False ExtLib\krcc.dll - - ..\packages\MapoSDK.6.9.1911.1258\lib\net40\MapoSDK.dll + + ..\packages\MapoSDK.6.9.1911.1260\lib\net40\MapoSDK.dll ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll @@ -526,15 +526,15 @@ - - - - - - - - - + + + + + + + + + @@ -555,13 +555,13 @@ - - - - - + + + + + diff --git a/IOB-WIN/IobGeneric.cs b/IOB-WIN/IobGeneric.cs index b3682276..fb82cb91 100644 --- a/IOB-WIN/IobGeneric.cs +++ b/IOB-WIN/IobGeneric.cs @@ -169,7 +169,7 @@ namespace IOB_WIN /// /// Coda valori MESSAGGI/EVENTI (da non sottocampionare come samples)... /// - public ConcurrentQueue QueueMessages = new ConcurrentQueue(); + public ConcurrentQueue QueueMessages = new ConcurrentQueue(); /// /// valore booleano di check se sia in fase di COMUNICAZIONE ATTIVA con il PLC/NC @@ -3461,9 +3461,10 @@ namespace IOB_WIN { // mostro dati variati letti... displayOtherData(val); - // !!!FARE!!! !!!FIXME!!! accodare alla CODA CORRETTA!!! QueueAlarm - // --> accodo (valore già formattato)! + // accodo IN PRIMIS al FluxLog --> accodo (valore già formattato)! QueueFLog.Enqueue(encodedVal); + // accodo ANCHE alla coda allarmi che trasmetterò SOLO SE a scadenza impostata (10 sec?) ho allarmi perdurati... + // loggo! lgInfo(string.Format("[QUEUE-ALARM-LOG] {0}", encodedVal)); counterFLog++; @@ -3676,7 +3677,7 @@ namespace IOB_WIN public void accodaOtherData(string newLine) { // inserisco in cima allo stack, trimmo e aggiorno display - string strOtherData= limitLine2show(string.Format("{0}{1}{2}", newLine, Environment.NewLine, parentForm.dataMonitor_3)); + string strOtherData = limitLine2show(string.Format("{0}{1}{2}", newLine, Environment.NewLine, parentForm.dataMonitor_3)); //parentForm.dataMonitor_3 = strOtherData; parentForm.WriteTextSafe(strOtherData); } diff --git a/IOB-WIN/packages.config b/IOB-WIN/packages.config index 19497eb1..608f1d95 100644 --- a/IOB-WIN/packages.config +++ b/IOB-WIN/packages.config @@ -1,15 +1,15 @@  - + - - - - - + + + + + diff --git a/Jenkinsfile b/Jenkinsfile index a4a97607..8e0a5c0f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -43,9 +43,9 @@ pipeline { // compilo installers in base al BRANCH del cliente... if (env.BRANCH_NAME == "develop") { // CAMBIO numero versione in file sorgente!!! - bat "e:\\fart.exe VersGen\\VersGen.cs 1.0.0.0 ${env.versionNumber} || EXIT /B 0" - // restore nuget packages - bat "e:\\nuget.exe restore ${WORKSPACE}\\IOB-WIN.sln" + bat "e:\\fart.exe VersGen\\VersGen.cs 1.0.0.0 ${env.versionNumber} || EXIT /B 0" + // checkout NuGet in file sorgente!!! + fixNuget("${WORKSPACE}\\IOB-WIN.sln") // BUILD! bat "\"${tool 'MSBuild-14.0'}\" IOB-WIN/IOB-WIN.csproj -target:Build /p:Configuration=Release /p:Platform=\"x86\" /p:OutputPath=bin/ /m" } @@ -69,8 +69,8 @@ pipeline { if (env.BRANCH_NAME != "docum") { // CAMBIO numero versione in file sorgente!!! bat "e:\\fart.exe VersGen\\VersGen.cs 1.0.0.0 ${env.versionNumber} || EXIT /B 0" - // restore nuget packages - bat "e:\\nuget.exe restore ${WORKSPACE}\\IOB-WIN.sln" + // checkout NuGet in file sorgente!!! + fixNuget("${WORKSPACE}\\IOB-WIN.sln") // BUILD! bat "\"${tool 'MSBuild-14.0'}\" IOB-WIN/IOB-WIN.csproj -target:Build /p:Configuration=Release /p:Platform=\"x86\" /p:OutputPath=bin/ /m" } @@ -175,3 +175,18 @@ def sendSlack(status, colorCode) { "Modifiche:\n " + getChangeString() + "\n\n Verifica build: <${env.BUILD_URL}|Apri>" + "\n" ) } +// funzione x fix pacchetti nuget da NOSTRO repo Nexus con proxy +def fixNuget(solutionFile) { + // bat "e:\\nuget setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-group" + // solo la prima volta va aggiunta... + hasSource = bat "e:\\nuget sources list | find \"Steamware\" /C" + if (hasSource == "0") + { + bat "e:\\nuget sources Add -Name \"Steamware Nexus\" -Source http://nexus.steamware.net/repository/nuget-group -username \"nugetUser\" -password \"viaDante16\"" + } + else + { + bat "e:\\nuget sources Update -Name \"Steamware Nexus\" -Source http://nexus.steamware.net/repository/nuget-group -username \"nugetUser\" -password \"viaDante16\"" + } + bat "e:\\nuget.exe restore ${solutionFile}" +} \ No newline at end of file