diff --git a/.vs/config/applicationhost.config b/.vs/config/applicationhost.config
index 4c1a361d..45d32f0f 100644
--- a/.vs/config/applicationhost.config
+++ b/.vs/config/applicationhost.config
@@ -170,7 +170,7 @@
-
+
@@ -178,7 +178,7 @@
-
+
@@ -186,7 +186,7 @@
-
+
@@ -202,7 +202,7 @@
-
+
@@ -226,7 +226,7 @@
-
+
@@ -234,7 +234,7 @@
-
+
diff --git a/Jenkinsfile b/Jenkinsfile
index 5ce73480..38cbd26f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=720']) {
+ withEnv(['NEXT_BUILD_NUMBER=721']) {
// env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '5.0.${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-Tablet/WebUserControls/mod_dettMacchina.ascx.cs b/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs
index 1afc5303..b2a5116b 100644
--- a/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs
+++ b/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs
@@ -1,6 +1,7 @@
using MapoDb;
using SteamWare;
using System;
+using System.Web;
using System.Web.UI;
namespace MoonProTablet.WebUserControls
@@ -179,8 +180,13 @@ namespace MoonProTablet.WebUserControls
try
{
string filePath = docFilePath(Disegno);
- fileMover.obj.setDirectory("");
- answ = fileMover.obj.fileExist(filePath);
+ answ = fileMover.obj.fileExist(HttpRuntime.AppDomainAppPath, filePath);
+ // tolgo eventuale "~/" se non trova
+ if (!answ)
+ {
+ answ = fileMover.obj.fileExist(HttpRuntime.AppDomainAppPath, filePath.Replace("~/", ""));
+ }
+#if false
// se non trova provo a sostituire "~/" con "./"
if (!answ)
{
@@ -202,7 +208,8 @@ namespace MoonProTablet.WebUserControls
{
fileMover.obj.setDirectory(Server.MapPath(""));
answ = fileMover.obj.fileExist(filePath.Replace("~/", ""));
- }
+ }
+#endif
}
catch (Exception exc)
{
diff --git a/MP/MP.csproj b/MP/MP.csproj
index 757c03c1..a2c7aaab 100644
--- a/MP/MP.csproj
+++ b/MP/MP.csproj
@@ -166,6 +166,9 @@
+
+ Always
+
Always
@@ -285,7 +288,6 @@
-
@@ -363,7 +365,7 @@
- True
+ False
True
2809
/
diff --git a/MP/MP.csproj.user b/MP/MP.csproj.user
index 2695a840..4d6036df 100644
--- a/MP/MP.csproj.user
+++ b/MP/MP.csproj.user
@@ -12,5 +12,29 @@
Debug|Any CPU
-
+
+
+
+
+
+
+ CurrentPage
+ True
+ False
+ False
+ False
+
+
+
+
+
+
+
+
+ True
+ True
+
+
+
+
\ No newline at end of file
diff --git a/MP/logs/PlaceHolder.file b/MP/logs/PlaceHolder.file
new file mode 100644
index 00000000..5f282702
--- /dev/null
+++ b/MP/logs/PlaceHolder.file
@@ -0,0 +1 @@
+
\ No newline at end of file