Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into SDK

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-10-02 22:11:58 +02:00
parent 73acf349ff e99544dd78
commit edeae62181
36 changed files with 46 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -12,7 +12,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=1296']) {
withEnv(['NEXT_BUILD_NUMBER=1297']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.10.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.10.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
MP-ADM/MP-ADM.csproj
+6 -3
View File
@@ -119,8 +119,8 @@
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll</HintPath>
</Reference>
<Reference Include="SteamWare, Version=4.9.2010.740, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.4.9.2010.740\lib\net462\SteamWare.dll</HintPath>
<Reference Include="SteamWare, Version=4.9.2010.741, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.4.9.2010.741\lib\net462\SteamWare.dll</HintPath>
</Reference>
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
@@ -439,6 +439,7 @@
<Content Include="images\view_m.png" />
<Content Include="images\view_s.gif" />
<Content Include="images\view_s.png" />
<Content Include="libzstd.dll" />
<Content Include="login.aspx" />
<Content Include="menu.aspx" />
<Content Include="mongocrypt.dll" />
@@ -454,7 +455,6 @@
<Content Include="Scripts\bootstrap.min.js" />
<Content Include="Content\fonts.less" />
<Content Include="Content\Style.less" />
<Content Include="App_Readme\SteamWare_demo\example-NLog.config" />
<Content Include="Scripts\esm\popper-utils.js" />
<Content Include="Scripts\esm\popper-utils.min.js" />
<Content Include="Scripts\esm\popper.js" />
@@ -464,6 +464,7 @@
<Content Include="Scripts\esm\popper.js.map" />
<Content Include="Scripts\esm\popper-utils.min.js.map" />
<Content Include="Scripts\esm\popper-utils.js.map" />
<Content Include="App_Readme\SteamWare_demo\example-NLog.config" />
<Content Include="App_Readme\SteamWare_demo\example-app.config" />
<None Include="Scripts\jquery-3.4.1.intellisense.js" />
<Content Include="Scripts\jquery-3.4.1.js" />
@@ -541,6 +542,8 @@
<Content Include="Scripts\umd\popper-utils.min.js" />
<Content Include="Scripts\umd\popper.js" />
<Content Include="Scripts\umd\popper.min.js" />
<Content Include="snappy32.dll" />
<Content Include="snappy64.dll" />
<Content Include="StoricoTC.aspx" />
<Content Include="test.aspx" />
<Content Include="testUtente.aspx" />
MP-ADM/libzstd.dll
BIN
View File
Binary file not shown.
MP-ADM/packages.config
+1 -1
View File
@@ -42,7 +42,7 @@
<package id="SharpZipLib" version="1.2.0" targetFramework="net462" />
<package id="Snappy.NET" version="1.1.1.8" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.1.58" targetFramework="net462" />
<package id="SteamWare" version="4.9.2010.740" targetFramework="net462" />
<package id="SteamWare" version="4.9.2010.741" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="4.7.0" targetFramework="net462" />
<package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
MP-ADM/snappy32.dll
BIN
View File
Binary file not shown.
MP-ADM/snappy64.dll
BIN
View File
Binary file not shown.
MP-IO/MP-IO.csproj
+5 -2
View File
@@ -116,8 +116,8 @@
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll</HintPath>
</Reference>
<Reference Include="SteamWare, Version=4.9.2010.740, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.4.9.2010.740\lib\net462\SteamWare.dll</HintPath>
<Reference Include="SteamWare, Version=4.9.2010.741, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.4.9.2010.741\lib\net462\SteamWare.dll</HintPath>
</Reference>
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
@@ -261,6 +261,7 @@
<Content Include="images\macchine\Transfer_Tecnotransfer.jpg" />
<Content Include="inputIOB.aspx" />
<Content Include="lastUpdate.aspx" />
<Content Include="libzstd.dll" />
<Content Include="mongocrypt.dll" />
<Content Include="PingPage.htm" />
<Content Include="Properties\PublishProfiles\IIS01.pubxml.user" />
@@ -276,6 +277,8 @@
</Content>
<Content Include="sendReboot.aspx" />
<Content Include="sigLogEnabled.aspx" />
<Content Include="snappy32.dll" />
<Content Include="snappy64.dll" />
<Content Include="status.aspx" />
<Content Include="Web.config">
<SubType>Designer</SubType>
MP-IO/libzstd.dll
BIN
View File
Binary file not shown.
MP-IO/packages.config
+1 -1
View File
@@ -42,7 +42,7 @@
<package id="SharpZipLib" version="1.2.0" targetFramework="net462" />
<package id="Snappy.NET" version="1.1.1.8" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.1.58" targetFramework="net462" />
<package id="SteamWare" version="4.9.2010.740" targetFramework="net462" />
<package id="SteamWare" version="4.9.2010.741" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="4.7.0" targetFramework="net462" />
<package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
MP-IO/snappy32.dll
BIN
View File
Binary file not shown.
MP-IO/snappy64.dll
BIN
View File
Binary file not shown.
MP-LAND/MP-LAND.csproj
+7 -4
View File
@@ -117,8 +117,8 @@
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll</HintPath>
</Reference>
<Reference Include="SteamWare, Version=4.9.2010.740, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.4.9.2010.740\lib\net462\SteamWare.dll</HintPath>
<Reference Include="SteamWare, Version=4.9.2010.741, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.4.9.2010.741\lib\net462\SteamWare.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -309,6 +309,7 @@
<Content Include="fonts\fontawesome-webfont.svg" />
<Content Include="images\LogoMapoFull.png" />
<Content Include="images\LogoSteamware.png" />
<Content Include="libzstd.dll" />
<Content Include="logs\PlaceHolder.file">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
@@ -337,8 +338,6 @@
<Content Include="Scripts\esm\popper.js.map" />
<Content Include="Scripts\esm\popper-utils.min.js.map" />
<Content Include="Scripts\esm\popper-utils.js.map" />
<Content Include="App_Readme\SteamWare_demo\example-NLog.config" />
<Content Include="App_Readme\SteamWare_demo\example-app.config" />
<Content Include="Scripts\bootstrap.min.js.map" />
<Content Include="Scripts\bootstrap.js.map" />
<Content Include="Scripts\bootstrap.bundle.min.js.map" />
@@ -349,6 +348,8 @@
<Content Include="Content\bootstrap-reboot.css.map" />
<Content Include="Content\bootstrap-grid.min.css.map" />
<Content Include="Content\bootstrap-grid.css.map" />
<Content Include="App_Readme\SteamWare_demo\example-NLog.config" />
<Content Include="App_Readme\SteamWare_demo\example-app.config" />
<None Include="Scripts\jquery-3.4.1.intellisense.js" />
<None Include="Scripts\jquery-3.5.1-vsdoc.js" />
<Content Include="Scripts\jquery-3.5.1.js" />
@@ -431,6 +432,8 @@
<Content Include="Scripts\umd\popper-utils.min.js" />
<Content Include="Scripts\umd\popper.js" />
<Content Include="Scripts\umd\popper.min.js" />
<Content Include="snappy32.dll" />
<Content Include="snappy64.dll" />
<Content Include="steamware.ico" />
<Content Include="Global.asax" />
<None Include="compilerconfig.json" />
MP-LAND/libzstd.dll
BIN
View File
Binary file not shown.
MP-LAND/packages.config
+1 -1
View File
@@ -46,7 +46,7 @@
<package id="SharpZipLib" version="1.2.0" targetFramework="net462" />
<package id="Snappy.NET" version="1.1.1.8" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.1.58" targetFramework="net462" />
<package id="SteamWare" version="4.9.2010.740" targetFramework="net462" />
<package id="SteamWare" version="4.9.2010.741" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="4.7.0" targetFramework="net462" />
<package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
MP-LAND/snappy32.dll
BIN
View File
Binary file not shown.
MP-LAND/snappy64.dll
BIN
View File
Binary file not shown.
MP-MON/MP-MON.csproj
+5 -2
View File
@@ -117,8 +117,8 @@
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll</HintPath>
</Reference>
<Reference Include="SteamWare, Version=4.9.2010.740, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.4.9.2010.740\lib\net462\SteamWare.dll</HintPath>
<Reference Include="SteamWare, Version=4.9.2010.741, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.4.9.2010.741\lib\net462\SteamWare.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -366,6 +366,7 @@
<LastGenOutput>MapoModel.Designer.cs</LastGenOutput>
</EntityDeploy>
<Content Include="images\LogoMapo.png" />
<Content Include="libzstd.dll" />
<Content Include="Models\MapoModel.edmx.diagram">
<DependentUpon>MapoModel.edmx</DependentUpon>
</Content>
@@ -511,6 +512,8 @@
<Content Include="Scripts\umd\popper.min.js" />
<Content Include="Scripts\_references.js" />
<Content Include="images\logoSteamware.png" />
<Content Include="snappy32.dll" />
<Content Include="snappy64.dll" />
<Content Include="Web.config">
<SubType>Designer</SubType>
</Content>
MP-MON/libzstd.dll
BIN
View File
Binary file not shown.
MP-MON/packages.config
+1 -1
View File
@@ -37,7 +37,7 @@
<package id="SharpZipLib" version="1.2.0" targetFramework="net462" />
<package id="Snappy.NET" version="1.1.1.8" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.1.58" targetFramework="net462" />
<package id="SteamWare" version="4.9.2010.740" targetFramework="net462" />
<package id="SteamWare" version="4.9.2010.741" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="4.7.0" targetFramework="net462" />
<package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
MP-MON/snappy32.dll
BIN
View File
Binary file not shown.
MP-MON/snappy64.dll
BIN
View File
Binary file not shown.
MP-SITE/libzstd.dll
BIN
View File
Binary file not shown.
MP-SITE/snappy32.dll
BIN
View File
Binary file not shown.
MP-SITE/snappy64.dll
BIN
View File
Binary file not shown.
MP-Site/MP-Site.csproj
+5 -2
View File
@@ -120,8 +120,8 @@
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll</HintPath>
</Reference>
<Reference Include="SteamWare, Version=4.9.2010.740, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.4.9.2010.740\lib\net462\SteamWare.dll</HintPath>
<Reference Include="SteamWare, Version=4.9.2010.741, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.4.9.2010.741\lib\net462\SteamWare.dll</HintPath>
</Reference>
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
@@ -304,6 +304,7 @@
<Content Include="images\view_s.png" />
<Content Include="inputSeriale.aspx" />
<Content Include="lastUpdate.aspx" />
<Content Include="libzstd.dll" />
<Content Include="M6Started.aspx" />
<Content Include="MappaStato.aspx" />
<Content Include="MappaStatoSeq.aspx" />
@@ -412,6 +413,8 @@
<Content Include="Scripts\umd\popper.js" />
<Content Include="Scripts\umd\popper.min.js" />
<Content Include="Semaforo.aspx" />
<Content Include="snappy32.dll" />
<Content Include="snappy64.dll" />
<Content Include="StatisticheImpiego.aspx" />
<Content Include="test.aspx" />
<Content Include="unauthorized.aspx" />
MP-Site/packages.config
+1 -1
View File
@@ -45,7 +45,7 @@
<package id="SharpZipLib" version="1.2.0" targetFramework="net462" />
<package id="Snappy.NET" version="1.1.1.8" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.1.58" targetFramework="net462" />
<package id="SteamWare" version="4.9.2010.740" targetFramework="net462" />
<package id="SteamWare" version="4.9.2010.741" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="4.7.0" targetFramework="net462" />
<package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
MP-TAB/MP-TAB.csproj
+8 -7
View File
@@ -21,11 +21,9 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>4.0</OldToolsVersion>
<IISExpressSSLPort>44384</IISExpressSSLPort>
<IISExpressAnonymousAuthentication>
</IISExpressAnonymousAuthentication>
<IISExpressWindowsAuthentication>
</IISExpressWindowsAuthentication>
<IISExpressSSLPort>44328</IISExpressSSLPort>
<IISExpressAnonymousAuthentication>enabled</IISExpressAnonymousAuthentication>
<IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>
<IISExpressUseClassicPipelineMode />
<TargetFrameworkProfile />
<UseGlobalApplicationHostFile />
@@ -178,8 +176,8 @@
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll</HintPath>
</Reference>
<Reference Include="SteamWare, Version=4.9.2010.740, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.4.9.2010.740\lib\net462\SteamWare.dll</HintPath>
<Reference Include="SteamWare, Version=4.9.2010.741, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.4.9.2010.741\lib\net462\SteamWare.dll</HintPath>
</Reference>
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
@@ -490,6 +488,7 @@
<Content Include="images\ST_img\Steamware.png" />
<Content Include="IOB-info.aspx" />
<Content Include="jumper.aspx" />
<Content Include="libzstd.dll" />
<Content Include="Logout.aspx" />
<Content Include="MappaStato.aspx" />
<Content Include="mongocrypt.dll" />
@@ -663,6 +662,8 @@
<Content Include="Scripts\WebForms\WebParts.js" />
<Content Include="Scripts\WebForms\WebUIValidation.js" />
<Content Include="SendParameters.aspx" />
<Content Include="snappy32.dll" />
<Content Include="snappy64.dll" />
<Content Include="StoricoTC.aspx" />
<Content Include="SheetTech.aspx" />
<Content Include="Test.aspx" />
MP-TAB/libzstd.dll
BIN
View File
Binary file not shown.
MP-TAB/packages.config
+1 -1
View File
@@ -43,7 +43,7 @@
<package id="SharpZipLib" version="1.2.0" targetFramework="net462" />
<package id="Snappy.NET" version="1.1.1.8" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.1.58" targetFramework="net462" />
<package id="SteamWare" version="4.9.2010.740" targetFramework="net462" />
<package id="SteamWare" version="4.9.2010.741" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="4.7.0" targetFramework="net462" />
<package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
MP-TAB/snappy32.dll
BIN
View File
Binary file not shown.
MP-TAB/snappy64.dll
BIN
View File
Binary file not shown.
MapoDb/Core/Compression/Snappy/lib/win/snappy32.dll
BIN
View File
Binary file not shown.
MapoDb/Core/Compression/Snappy/lib/win/snappy64.dll
BIN
View File
Binary file not shown.
MapoDb/Core/Compression/Zstandard/lib/win/libzstd.dll
BIN
View File
Binary file not shown.
MapoDb/MapoDb.csproj
+2 -5
View File
@@ -126,8 +126,8 @@
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll</HintPath>
</Reference>
<Reference Include="SteamWare, Version=4.9.2010.740, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.4.9.2010.740\lib\net462\SteamWare.dll</HintPath>
<Reference Include="SteamWare, Version=4.9.2010.741, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.4.9.2010.741\lib\net462\SteamWare.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -375,10 +375,7 @@
<Content Include="Core\Compression\Zstandard\lib\win\libzstd.dll" />
<Content Include="ExtLib\Microsoft.ReportViewer.WinForms.dll" />
<Content Include="ExtLib\Microsoft.ReportViewer.WinForms.xml" />
<Content Include="libzstd.dll" />
<Content Include="mongocrypt.dll" />
<Content Include="snappy32.dll" />
<Content Include="snappy64.dll" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MapoSDK\MapoSDK.csproj">
MapoDb/packages.config
+1 -1
View File
@@ -22,7 +22,7 @@
<package id="SharpZipLib" version="1.2.0" targetFramework="net462" />
<package id="Snappy.NET" version="1.1.1.8" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.1.58" targetFramework="net462" />
<package id="SteamWare" version="4.9.2010.740" targetFramework="net462" />
<package id="SteamWare" version="4.9.2010.741" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
<package id="System.Collections" version="4.3.0" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="4.7.0" targetFramework="net462" />