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

update metodi x ricerca file...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-03-15 16:30:29 +01:00
parent d506872127
commit bddb0e0769
6 changed files with 47 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vs/config/applicationhost.config
+6 -6
View File
@@ -170,7 +170,7 @@
</site>
<site name="MP-Admin" id="3">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\samuele\Documents\VisualStudioProjects\MoonPro_dotnet\MP-Admin" />
<virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\MoonPro_dotnet\MP-Admin" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:56734:localhost" />
@@ -178,7 +178,7 @@
</site>
<site name="MoonProTablet" id="4">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\samuele\Documents\VisualStudioProjects\MoonPro_dotnet\MP-Tablet" />
<virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\MoonPro_dotnet\MP-Tablet" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:56739:localhost" />
@@ -186,7 +186,7 @@
</site>
<site name="MP-Site" id="5">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\samuele\Documents\VisualStudioProjects\MoonPro_dotnet\MP-Site" />
<virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\MoonPro_dotnet\MP-Site" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:54806:localhost" />
@@ -202,7 +202,7 @@
</site>
<site name="MP" id="7">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\samuele\Documents\VisualStudioProjects\MoonPro_dotnet\MP" />
<virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\MoonPro_dotnet\MP" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:2809:localhost" />
@@ -226,7 +226,7 @@
</site>
<site name="MP-IO(1)" id="10">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\samuele\Documents\VisualStudioProjects\MoonPro_dotnet\MP-IO" />
<virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\MoonPro_dotnet\MP-IO" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:20967:localhost" />
@@ -234,7 +234,7 @@
</site>
<site name="MP-MON(1)" id="11">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\samuele\Documents\VisualStudioProjects\MoonPro_dotnet\MP-MON" />
<virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\MoonPro_dotnet\MP-MON" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:14216:localhost" />
Jenkinsfile
Vendored
+1 -1
View File
@@ -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'
MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs
+10 -3
View File
@@ -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)
{
MP/MP.csproj
+4 -2
View File
@@ -166,6 +166,9 @@
</Content>
<Content Include="favicon.ico" />
<Content Include="fonts\fontawesome-webfont.svg" />
<Content Include="logs\PlaceHolder.file">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<None Include="Scripts\jquery-3.2.1.intellisense.js" />
<Content Include="Resources\ChangeLog.html">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -285,7 +288,6 @@
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
<Folder Include="logs\" />
<Folder Include="Resources\Donati\BASI\" />
</ItemGroup>
<ItemGroup>
@@ -363,7 +365,7 @@
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<UseIIS>True</UseIIS>
<UseIIS>False</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>2809</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
MP/MP.csproj.user
+25 -1
View File
@@ -12,5 +12,29 @@
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
</PropertyGroup>
<ProjectExtensions />
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<StartPageUrl>
</StartPageUrl>
<StartAction>CurrentPage</StartAction>
<AspNetDebugging>True</AspNetDebugging>
<SilverlightDebugging>False</SilverlightDebugging>
<NativeDebugging>False</NativeDebugging>
<SQLDebugging>False</SQLDebugging>
<ExternalProgram>
</ExternalProgram>
<StartExternalURL>
</StartExternalURL>
<StartCmdLineArguments>
</StartCmdLineArguments>
<StartWorkingDirectory>
</StartWorkingDirectory>
<EnableENC>True</EnableENC>
<AlwaysStartWebServerOnDebug>True</AlwaysStartWebServerOnDebug>
</WebProjectProperties>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
</Project>
MP/logs/PlaceHolder.file
+1
View File
@@ -0,0 +1 @@