diff --git a/Jenkinsfile b/Jenkinsfile index d54c920..54f1e54 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,10 +11,10 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=685']) { - // env.versionNumber = VersionNumber(versionNumberString : '3.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) - env.versionNumber = VersionNumber(versionNumberString : '3.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') - env.versionNumberBeta = VersionNumber(versionNumberString : '3.3.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') + withEnv(['NEXT_BUILD_NUMBER=686']) { + // env.versionNumber = VersionNumber(versionNumberString : '3.4.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) + env.versionNumber = VersionNumber(versionNumberString : '3.4.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') + env.versionNumberBeta = VersionNumber(versionNumberString : '3.4.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'SteamWareLib' } } diff --git a/SteamWareLib/SteamWare.csproj b/SteamWareLib/SteamWare.csproj index 2308508..1404661 100644 --- a/SteamWareLib/SteamWare.csproj +++ b/SteamWareLib/SteamWare.csproj @@ -71,10 +71,25 @@ ..\packages\AjaxControlToolkit.19.1.0\lib\net40\AjaxControlToolkit.dll + + ..\..\MoonPro_dotnet\packages\Crc32C.NET.1.0.5.0\lib\net20\Crc32C.NET.dll + + + ..\..\MoonPro_dotnet\packages\DnsClient.1.2.0\lib\net45\DnsClient.dll + ..\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll + + ..\..\MoonPro_dotnet\packages\MongoDB.Bson.2.9.3\lib\net452\MongoDB.Bson.dll + + + ..\..\MoonPro_dotnet\packages\MongoDB.Driver.2.9.3\lib\net452\MongoDB.Driver.dll + + + ..\..\MoonPro_dotnet\packages\MongoDB.Driver.Core.2.9.3\lib\net452\MongoDB.Driver.Core.dll + ..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll @@ -84,6 +99,12 @@ ..\packages\Pipelines.Sockets.Unofficial.2.0.25\lib\net461\Pipelines.Sockets.Unofficial.dll + + ..\..\MoonPro_dotnet\packages\SharpCompress.0.23.0\lib\net45\SharpCompress.dll + + + ..\..\MoonPro_dotnet\packages\Snappy.NET.1.1.1.8\lib\net45\Snappy.NET.dll + ..\packages\StackExchange.Redis.2.0.601\lib\net461\StackExchange.Redis.dll @@ -119,6 +140,11 @@ ..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + ..\..\MoonPro_dotnet\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll + True + True + diff --git a/SteamWareLib/app.config b/SteamWareLib/app.config index 3cc6c31..afdbee7 100644 --- a/SteamWareLib/app.config +++ b/SteamWareLib/app.config @@ -14,6 +14,7 @@ + @@ -86,6 +87,10 @@ + + + + diff --git a/SteamWareLib/memLayer.cs b/SteamWareLib/memLayer.cs index 1148b4d..587834d 100644 --- a/SteamWareLib/memLayer.cs +++ b/SteamWareLib/memLayer.cs @@ -1,3 +1,4 @@ +using MongoDB.Driver; using Newtonsoft.Json; using StackExchange.Redis; using System; @@ -57,6 +58,7 @@ namespace SteamWare // avvio e configuro TA initTA(); setupConnectionStringBase(); + setupMongo(); } /// @@ -2149,6 +2151,50 @@ namespace SteamWare return string.Format("{0}/{1}", SteamWare.memLayer.ML.CRS("baseUrl"), urlRelPath); } + #endregion + + #region gestione mongoDb + + /// + /// Stringa di connessione mongoDb + /// + protected string mongoConnString + { + get + { + string answ = ""; + answ = confReadString("mdbConnString"); + if (string.IsNullOrEmpty(answ)) + { + answ = "mongodb://W2019-MONGODB:27017"; + } + return answ; + } + } + /// + /// Oggetto MongoDbCLient x accesso al motore + /// + protected MongoClient currMongoClient; + /// + /// Init accesso MongoDb + /// + private void setupMongo() + { + currMongoClient = new MongoClient(mongoConnString); + } + /// + /// Restituisce oggetto DB richiesto + /// + /// + /// + public IMongoDatabase getMongoDatabase(string dbName) + { + IMongoDatabase answ = currMongoClient.GetDatabase(dbName); + return answ; + } + + + #endregion } diff --git a/SteamWareLib/packages.config b/SteamWareLib/packages.config index 5456aac..db672da 100644 --- a/SteamWareLib/packages.config +++ b/SteamWareLib/packages.config @@ -2,10 +2,17 @@ + + + + + + + @@ -13,6 +20,7 @@ + \ No newline at end of file