diff --git a/Jenkinsfile b/Jenkinsfile index e0bb1385..5c0296c9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1277']) { + withEnv(['NEXT_BUILD_NUMBER=1279']) { // env.versionNumber = VersionNumber(versionNumberString : '6.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO' diff --git a/MP-ADM/MP-ADM.csproj b/MP-ADM/MP-ADM.csproj index 1aff4af3..6ecaf08c 100644 --- a/MP-ADM/MP-ADM.csproj +++ b/MP-ADM/MP-ADM.csproj @@ -80,14 +80,17 @@ ..\packages\Microsoft.Web.RedisSessionStateProvider.4.0.1\lib\net462\Microsoft.Web.RedisSessionStateProvider.dll - - ..\packages\MongoDB.Bson.2.9.3\lib\net452\MongoDB.Bson.dll + + ..\packages\MongoDB.Bson.2.10.1\lib\net452\MongoDB.Bson.dll - - ..\packages\MongoDB.Driver.2.9.3\lib\net452\MongoDB.Driver.dll + + ..\packages\MongoDB.Driver.2.10.1\lib\net452\MongoDB.Driver.dll - - ..\packages\MongoDB.Driver.Core.2.9.3\lib\net452\MongoDB.Driver.Core.dll + + ..\packages\MongoDB.Driver.Core.2.10.1\lib\net452\MongoDB.Driver.Core.dll + + + ..\packages\MongoDB.Libmongocrypt.1.0.0\lib\net452\MongoDB.Libmongocrypt.dll ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -102,7 +105,7 @@ ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.Charting.dll - ..\packages\Pipelines.Sockets.Unofficial.2.1.0\lib\net461\Pipelines.Sockets.Unofficial.dll + ..\packages\Pipelines.Sockets.Unofficial.2.1.1\lib\net461\Pipelines.Sockets.Unofficial.dll ..\packages\SharpCompress.0.24.0\lib\net45\SharpCompress.dll @@ -113,8 +116,8 @@ ..\packages\StackExchange.Redis.2.0.601\lib\net461\StackExchange.Redis.dll - - ..\packages\SteamWare.3.5.1911.699\lib\net462\SteamWare.dll + + ..\packages\SteamWare.3.5.2001.711\lib\net462\SteamWare.dll ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll @@ -123,12 +126,12 @@ - - ..\packages\System.Diagnostics.PerformanceCounter.4.6.0\lib\net461\System.Diagnostics.PerformanceCounter.dll + + ..\packages\System.Diagnostics.PerformanceCounter.4.7.0\lib\net461\System.Diagnostics.PerformanceCounter.dll - - ..\packages\System.IO.Pipelines.4.6.0\lib\netstandard2.0\System.IO.Pipelines.dll + + ..\packages\System.IO.Pipelines.4.7.0\lib\netstandard2.0\System.IO.Pipelines.dll ..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll @@ -137,8 +140,8 @@ ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll @@ -147,8 +150,8 @@ - - ..\packages\System.Threading.Channels.4.6.0\lib\netstandard2.0\System.Threading.Channels.dll + + ..\packages\System.Threading.Channels.4.7.0\lib\netstandard2.0\System.Threading.Channels.dll ..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll @@ -418,6 +421,7 @@ + @@ -428,23 +432,95 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -509,14 +585,6 @@ - - - - - - - - @@ -961,8 +1029,11 @@ + + + @@ -970,8 +1041,6 @@ - - Web.config @@ -991,9 +1060,6 @@ - - - {4617a665-d6e3-4ceb-a689-ce2eecd45713} @@ -1004,6 +1070,9 @@ MapoSDK + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -1066,7 +1135,9 @@ 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}. + + es: 20181223180600000 @@ -185,7 +185,7 @@ namespace MP_IO.Controllers DateTime dataOraEvento = DateTime.Now; if (memLayer.ML.CRI("_logLevel") > 6) { - logger.lg.scriviLog(string.Format("Valori letti:{0}idxMacchina: {1}{0}flux: {6}{0}valore: {2}{0}dtEve: {3}{0}dtCurr: {4}{0}cnt: {5}", Environment.NewLine, id, valore, dtEve, dtCurr, cnt, flux), tipoLog.INFO); + logger.lg.scriviLog($"Valori letti: idxMacchina: {id} | flux: {flux} valore: {valore}", tipoLog.INFO); } try { @@ -1107,7 +1107,7 @@ namespace MP_IO.Controllers DateTime dataOraEvento = DateTime.Now; if (memLayer.ML.CRI("_logLevel") > 6) { - logger.lg.scriviLog(string.Format("Salvataggio counter:{0}idxMacchina: {1}{0}conteggio: {2}", Environment.NewLine, id, counter), tipoLog.INFO); + logger.lg.scriviLog($"Salvataggio counter | idxMacchina: {id}", tipoLog.INFO); } try { diff --git a/MP-IO/MP-IO.csproj b/MP-IO/MP-IO.csproj index c911a54c..90e369f3 100644 --- a/MP-IO/MP-IO.csproj +++ b/MP-IO/MP-IO.csproj @@ -74,14 +74,17 @@ ..\packages\Microsoft.Web.RedisSessionStateProvider.4.0.1\lib\net462\Microsoft.Web.RedisSessionStateProvider.dll - - ..\packages\MongoDB.Bson.2.9.3\lib\net452\MongoDB.Bson.dll + + ..\packages\MongoDB.Bson.2.10.1\lib\net452\MongoDB.Bson.dll - - ..\packages\MongoDB.Driver.2.9.3\lib\net452\MongoDB.Driver.dll + + ..\packages\MongoDB.Driver.2.10.1\lib\net452\MongoDB.Driver.dll - - ..\packages\MongoDB.Driver.Core.2.9.3\lib\net452\MongoDB.Driver.Core.dll + + ..\packages\MongoDB.Driver.Core.2.10.1\lib\net452\MongoDB.Driver.Core.dll + + + ..\packages\MongoDB.Libmongocrypt.1.0.0\lib\net452\MongoDB.Libmongocrypt.dll ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -96,7 +99,7 @@ ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.Charting.dll - ..\packages\Pipelines.Sockets.Unofficial.2.1.0\lib\net461\Pipelines.Sockets.Unofficial.dll + ..\packages\Pipelines.Sockets.Unofficial.2.1.1\lib\net461\Pipelines.Sockets.Unofficial.dll ..\packages\SharpCompress.0.24.0\lib\net45\SharpCompress.dll @@ -107,19 +110,19 @@ ..\packages\StackExchange.Redis.2.0.601\lib\net461\StackExchange.Redis.dll - - ..\packages\SteamWare.3.5.1911.699\lib\net462\SteamWare.dll + + ..\packages\SteamWare.3.5.2001.711\lib\net462\SteamWare.dll ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll - - ..\packages\System.Diagnostics.PerformanceCounter.4.6.0\lib\net461\System.Diagnostics.PerformanceCounter.dll + + ..\packages\System.Diagnostics.PerformanceCounter.4.7.0\lib\net461\System.Diagnostics.PerformanceCounter.dll - - ..\packages\System.IO.Pipelines.4.6.0\lib\netstandard2.0\System.IO.Pipelines.dll + + ..\packages\System.IO.Pipelines.4.7.0\lib\netstandard2.0\System.IO.Pipelines.dll ..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll @@ -128,8 +131,8 @@ ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll @@ -138,8 +141,8 @@ - - ..\packages\System.Threading.Channels.4.6.0\lib\netstandard2.0\System.Threading.Channels.dll + + ..\packages\System.Threading.Channels.4.7.0\lib\netstandard2.0\System.Threading.Channels.dll ..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll @@ -220,6 +223,7 @@ + @@ -443,7 +447,9 @@ 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}. + + - -

Popper.js

- -

- A library used to position poppers in web applications. -

- -

- Build Status - Stable Release Size - bitHound Overall Score - Istanbul Code Coverage - Get support or discuss -
- SauceLabs Reports -

- - - - - -## Wut? Poppers? - -A popper is an element on the screen which "pops out" from the natural flow of your application. -Common examples of poppers are tooltips, popovers and drop-downs. - - -## So, yet another tooltip library? - -Well, basically, **no**. -Popper.js is a **positioning engine**, its purpose is to calculate the position of an element -to make it possible to position it near a given reference element. - -The engine is completely modular and most of its features are implemented as **modifiers** -(similar to middlewares or plugins). -The whole code base is written in ES2015 and its features are automatically tested on real browsers thanks to [SauceLabs](https://saucelabs.com/) and [TravisCI](https://travis-ci.org/). - -Popper.js has zero dependencies. No jQuery, no LoDash, nothing. -It's used by big companies like [Twitter in Bootstrap v4](https://getbootstrap.com/), [Microsoft in WebClipper](https://github.com/OneNoteDev/WebClipper) and [Atlassian in AtlasKit](https://aui-cdn.atlassian.com/atlaskit/registry/). - -### Popper.js - -This is the engine, the library that computes and, optionally, applies the styles to -the poppers. - -Some of the key points are: - -- Position elements keeping them in their original DOM context (doesn't mess with your DOM!); -- Allows to export the computed informations to integrate with React and other view libraries; -- Supports Shadow DOM elements; -- Completely customizable thanks to the modifiers based structure; - -Visit our [project page](https://fezvrasta.github.io/popper.js) to see a lot of examples of what you can do with Popper.js! - -Find [the documentation here](/docs/_includes/popper-documentation.md). - - -### Tooltip.js - -Since lots of users just need a simple way to integrate powerful tooltips in their projects, -we created **Tooltip.js**. -It's a small library that makes it easy to automatically create tooltips using as engine Popper.js. -Its API is almost identical to the famous tooltip system of Bootstrap, in this way it will be -easy to integrate it in your projects. -The tooltips generated by Tooltip.js are accessible thanks to the `aria` tags. - -Find [the documentation here](/docs/_includes/tooltip-documentation.md). - - -## Installation -Popper.js is available on the following package managers and CDNs: - -| Source | | -|:-------|:---------------------------------------------------------------------------------| -| npm | `npm install popper.js --save` | -| yarn | `yarn add popper.js` | -| NuGet | `PM> Install-Package popper.js` | -| Bower | `bower install popper.js --save` | -| unpkg | [`https://unpkg.com/popper.js`](https://unpkg.com/popper.js) | -| cdnjs | [`https://cdnjs.com/libraries/popper.js`](https://cdnjs.com/libraries/popper.js) | - -Tooltip.js as well: - -| Source | | -|:-------|:---------------------------------------------------------------------------------| -| npm | `npm install tooltip.js --save` | -| yarn | `yarn add tooltip.js` | -| Bower* | `bower install tooltip.js=https://unpkg.com/tooltip.js --save` | -| unpkg | [`https://unpkg.com/tooltip.js`](https://unpkg.com/tooltip.js) | -| cdnjs | [`https://cdnjs.com/libraries/popper.js`](https://cdnjs.com/libraries/popper.js) | - -\*: Bower isn't officially supported, it can be used to install Tooltip.js only trough the unpkg.com CDN. This method has the limitation of not being able to define a specific version of the library. Bower and Popper.js suggests to use npm or Yarn for your projects. -For more info, [read the related issue](https://github.com/FezVrasta/popper.js/issues/390). - -### Dist targets - -Popper.js is currently shipped with 3 targets in mind: UMD, ESM and ESNext. - -- UMD - Universal Module Definition: AMD, RequireJS and globals; -- ESM - ES Modules: For webpack/Rollup or browser supporting the spec; -- ESNext: Available in `dist/`, can be used with webpack and `babel-preset-env`; - -Make sure to use the right one for your needs. If you want to import it with a `