diff --git a/Projects/ReleaseClienti/Somaschini ITA/GIM_site.SetParameters.xml b/Projects/ReleaseClienti/Somaschini ITA/GIM_site.SetParameters.xml new file mode 100644 index 0000000..2989795 --- /dev/null +++ b/Projects/ReleaseClienti/Somaschini ITA/GIM_site.SetParameters.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Projects/ReleaseClienti/Somaschini ITA/GIM_site.SourceManifest.xml b/Projects/ReleaseClienti/Somaschini ITA/GIM_site.SourceManifest.xml new file mode 100644 index 0000000..7b00da7 --- /dev/null +++ b/Projects/ReleaseClienti/Somaschini ITA/GIM_site.SourceManifest.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Projects/ReleaseClienti/Somaschini ITA/GIM_site.deploy-readme.txt b/Projects/ReleaseClienti/Somaschini ITA/GIM_site.deploy-readme.txt new file mode 100644 index 0000000..f251bca --- /dev/null +++ b/Projects/ReleaseClienti/Somaschini ITA/GIM_site.deploy-readme.txt @@ -0,0 +1,63 @@ + +=========================== +Prerequisites : +-------------------------- +To deploy this Web package, Web Deploy (msdeploy.exe) must be installed on the computer that runs the .cmd file. For information about how to install Web Deploy, see the following URL: +http://go.microsoft.com/?linkid=9278654 +This batch file requires that the package file "GIM_site.zip" and optionally provided the parameters file "GIM_site.SetParameters.xml" in the same folder or destination folder by environment variable. + +=========================== +Usage: +-------------------------- +GIM_site.deploy.cmd [/T|/Y] [/M:ComputerName] [/U:UserName] [/P:Password] [/G:UseTempAgent] [Additional msdeploy.exe flags ...] + + +=========================== +Required Flags: +-------------------------- +/T: + Calls msdeploy.exe with the "-whatif" flag, which simulates deployment. This does not deploy the package. Instead, it creates a report of what will happen when you actually deploy the package. +/Y: + Calls msdeploy.exe without the "-whatif" flag, which deploys the package to the current machine or a destination server. Use /Y after you have verified the output that was generated by using the /T flag. + +Note: Do not use /T and /Y in the same command. + +=========================== +Optional Flags: +-------------------------- + By Default, this script deploy on the current machine where this script is called with current user credential without agent service. Only pass the following value for advance scenario. + +/M: + If this flag is not specified, the package is installed on the computer where the command is run. The Service URL can be in the following format: + https://:8172/MSDeploy.axd + This format requires that IIS 7 be installed on the destination server and that IIS 7 Web Management Service(WMSvc) and Web Deployment Handler be set up. + The service URL can also be in the following format: + http:///MSDeployAgentService + This format requires administrative rights on the destination server, and it requires that Web Deploy Remote Service (MsDepSvc) be installed on the destination server. IIS 7 does not have to be installed on the destination server. + +/U: +/P: +/G: + Specifies that the package is deployed by creating a temporary listener on the destination server. This requires no special installation on the destination server, but it requires you to be an administrator on that server. The default value of this flag is False. + +/A: + Specifies the type of authentication to be used. The possible values are NTLM and Basic. If the wmsvc provider setting is specified, the default authentication type is Basic; otherwise, the default authentication type is NTLM. + +/L + Specifies that the package is deployed to local IISExpress user instance. + +[Additional msdeploy.exe flags] + The msdeploy.exe command supports additional flags. You can include any of these additional flags in the "$(ProjectName).Deploy.cmd" file, and the flags are passed through to msdeploy.exe during execution. + Alternatively, you can specify additional flags by setting the "_MsDeployAdditionalFlags" environment variable. These settings are used by this batch file. + Note: Any flag value that includes an equal sign (=) must be enclosed in double quotation marks, as shown in the following example, which will skip deploying the databases that are included in the package: + "-skip:objectName=dbFullSql" + +=========================== +Environment-Specific Settings: +-------------------------- + + To customize application-specific settings for each deployment environment (for example, the IIS application name, the physical path, and any connection strings), edit the settings in the following file: + "GIM_site.SetParameters.xml" +=========================== +For more information on this deploy script visit: http://go.microsoft.com/fwlink/?LinkID=183544 + diff --git a/Projects/ReleaseClienti/Somaschini ITA/GIM_site.deploy.cmd b/Projects/ReleaseClienti/Somaschini ITA/GIM_site.deploy.cmd new file mode 100644 index 0000000..3331fe6 --- /dev/null +++ b/Projects/ReleaseClienti/Somaschini ITA/GIM_site.deploy.cmd @@ -0,0 +1,311 @@ +@rem --------------------------------------------------------------------------------- +@rem Copyright 2008 Microsoft Corporation. All rights reserved. +@rem This is provided as sample to deploy the package using msdeploy.exe +@rem For information about IIS Web Deploy technology, +@rem please visit http://go.microsoft.com/?linkid=9278654 +@rem Note: This batch file assumes the package and setparametsrs.xml are in the same folder with this file +@rem --------------------------------------------------------------------------------- +@if %_echo%!==! echo off +setlocal +@rem --------------------------------------------------------------------------------- +@rem Please Make sure you have Web Deploy install in your machine. +@rem Alternatively, you can explicit set the MsDeployPath to the location it is on your machine +@rem set MSDeployPath="C:\Program Files (x86)\IIS\Microsoft Web Deploy V3\" +@rem --------------------------------------------------------------------------------- + +@rem --------------------------------------------------------------------------------- +@rem if user does not set MsDeployPath environment variable, we will try to retrieve it from registry. +@rem --------------------------------------------------------------------------------- +if "%MSDeployPath%" == "" ( +for /F "usebackq tokens=1,2,*" %%h in (`reg query "HKLM\SOFTWARE\Microsoft\IIS Extensions\MSDeploy" /s ^| findstr -i "InstallPath"`) do ( +if /I "%%h" == "InstallPath" ( +if /I "%%i" == "REG_SZ" ( +if not "%%j" == "" ( +if "%%~dpj" == "%%j" ( +set MSDeployPath=%%j +)))))) + +@rem ------------------------------------------ + +@rem ------------------------------------------ + + +if not exist "%MSDeployPath%msdeploy.exe" ( +echo. msdeploy.exe is not found on this machine. Please install Web Deploy before execute the script. +echo. Please visit http://go.microsoft.com/?linkid=9278654 +goto :usage +) + +set RootPath=%~dp0 +if /I "%_DeploySetParametersFile%" == "" ( +set _DeploySetParametersFile=%RootPath%GIM_site.SetParameters.xml +) + +@rem ------------------------------------------ + +@rem ------------------------------------------ + + +set _ArgTestDeploy= +set _ArgDestinationType=auto +set _ArgComputerNameWithQuote="" +set _ArgUserNameWithQuote="" +set _ArgPasswordWithQuote="" +set _ArgEncryptPasswordWithQuote="" +set _ArgIncludeAclsWithQuote="False" +set _ArgAuthTypeWithQuote="" +set _ArgtempAgentWithQuote="" +set _ArgLocalIIS= +set _ArgLocalIISVersion= +set _HaveArgMSDeployAdditonalFlags= + + +@rem --------------------------------------------------------------------------------- +@rem Simple Parse the arguments +@rem --------------------------------------------------------------------------------- +:NextArgument +set _ArgCurrent=%~1 +set _ArgFlagFirst=%_ArgCurrent:~0,1% +set _ArgFlag=%_ArgCurrent:~0,3% +set _ArgValue=%_ArgCurrent:~3% + +if /I "%_ArgFlag%" == "" goto :GetStarted +if /I "%_ArgFlag%" == "~0,3" goto :GetStarted +if /I "%_ArgFlag%" == "/T" set _ArgTestDeploy=true&goto :ArgumentOK +if /I "%_ArgFlag%" == "/Y" set _ArgTestDeploy=false&goto :ArgumentOK +if /I "%_ArgFlag%" == "/L" set _ArgLocalIIS=true&goto :ArgumentOK + +if /I "%_ArgFlag%" == "/M:" set _ArgComputerNameWithQuote="%_ArgValue%"&goto :ArgumentOK +if /I "%_ArgFlag%" == "/U:" set _ArgUserNameWithQuote="%_ArgValue%"&goto :ArgumentOK +if /I "%_ArgFlag%" == "/P:" set _ArgPasswordWithQuote="%_ArgValue%"&goto :ArgumentOK +if /I "%_ArgFlag%" == "/E:" set _ArgEncryptPasswordWithQuote="%_ArgValue%"&goto :ArgumentOK +if /I "%_ArgFlag%" == "/I:" set _ArgIncludeAclsWithQuote="%_ArgValue%"&goto :ArgumentOK +if /I "%_ArgFlag%" == "/A:" set _ArgAuthTypeWithQuote="%_ArgValue%"&goto :ArgumentOK +if /I "%_ArgFlag%" == "/G:" set _ArgtempAgentWithQuote="%_ArgValue%"&goto :ArgumentOK + +@rem Any addition flags, pass through to the msdeploy +if "%_HaveArgMSDeployAdditonalFlags%" == "" ( +goto :Assign_ArgMsDeployAdditionalFlags +) +set _ArgMsDeployAdditionalFlags=%_ArgMsDeployAdditionalFlags:&=^&% %_ArgCurrent:&=^&% +set _HaveArgMSDeployAdditonalFlags=1 +goto :ArgumentOK + + +:Assign_ArgMsDeployAdditionalFlags +set _ArgMsDeployAdditionalFlags=%_ArgCurrent:&=^&% +set _HaveArgMSDeployAdditonalFlags=1 +goto :ArgumentOK + +:ArgumentOK +shift +goto :NextArgument + +:GetStarted +@rem ------------------------------------------ + +@rem ------------------------------------------ +if /I "%_ArgTestDeploy%" == "" goto :usage +if /I "%_ArgDestinationType%" == "" goto :usage + +set _Destination=%_ArgDestinationType% +if not %_ArgComputerNameWithQuote% == "" set _Destination=%_Destination%,computerName=%_ArgComputerNameWithQuote% +if not %_ArgUserNameWithQuote% == "" set _Destination=%_Destination%,userName=%_ArgUserNameWithQuote% +if not %_ArgPasswordWithQuote% == "" set _Destination=%_Destination%,password=%_ArgPasswordWithQuote% +if not %_ArgAuthTypeWithQuote% == "" set _Destination=%_Destination%,authtype=%_ArgAuthTypeWithQuote% +if not %_ArgEncryptPasswordWithQuote% == "" set _Destination=%_Destination%,encryptPassword=%_ArgEncryptPasswordWithQuote% +if not %_ArgIncludeAclsWithQuote% == "" set _Destination=%_Destination%,includeAcls=%_ArgIncludeAclsWithQuote% +if not %_ArgtempAgentWithQuote% == "" set _Destination=%_Destination%,tempAgent=%_ArgtempAgentWithQuote% + +@rem ------------------------------------------ + +@rem ------------------------------------------ + + +@rem --------------------------------------------------------------------------------- +@rem add -whatif when -T is specified +@rem --------------------------------------------------------------------------------- +if /I "%_ArgTestDeploy%" NEQ "false" ( +set _MsDeployAdditionalFlags=-whatif %_MsDeployAdditionalFlags% +) + +@rem ------------------------------------------ + +@rem ------------------------------------------ + +@rem --------------------------------------------------------------------------------- +@rem add flags for IISExpress when -L is specified +@rem --------------------------------------------------------------------------------- + +if /I "%_ArgLocalIIS%" == "true" ( +call :SetIISExpressArguments +) +if /I "%_ArgLocalIIS%" == "true" ( +if not exist "%IISExpressPath%%IISExpressManifest%" ( +echo. IISExpress is not found on this machine. Please install through Web Platform Installer before execute the script. +echo. or remove /L flag +echo. Please visit http://go.microsoft.com/?linkid=9278654 +goto :usage +) +if not exist "%IISExpressUserProfileDirectory%" ( +echo. %IISExpressUserProfileDirectory% is not exists +echo. IISExpress is found on the machine. But the user have run IISExpress at least once. +echo. Please visit http://go.microsoft.com/?linkid=9278654 for detail +goto :usage +) + +set _MsDeployAdditionalFlags=%_MsDeployAdditionalFlags% -appHostConfigDir:%IISExpressUserProfileDirectory% -WebServerDir:"%IISExpressPath%" -webServerManifest:"%IISExpressManifest%" +) + +@rem --------------------------------------------------------------------------------- +@rem check the existence of the package file +@rem --------------------------------------------------------------------------------- +if not exist "%RootPath%GIM_site.zip" ( +echo "%RootPath%GIM_site.zip" does not exist. +echo This batch file relies on this deploy source file^(s^) in the same folder. +goto :usage +) + +@rem --------------------------------------------- + +@rem --------------------------------------------- + +@rem --------------------------------------------------------------------------------- +@rem Execute msdeploy.exe command line +@rem --------------------------------------------------------------------------------- +call :CheckParameterFile +echo. Start executing msdeploy.exe +echo ------------------------------------------------------- +if not exist "%_DeploySetParametersFile%" ( +set _MSDeployCommandline="%MSDeployPath%msdeploy.exe" -source:package='%RootPath%GIM_site.zip' -dest:%_Destination% -verb:sync -disableLink:AppPoolExtension -disableLink:ContentExtension -disableLink:CertificateExtension -skip:objectname='dirPath',absolutepath='obj\\Somaschini\\Package\\PackageTmp\\App_Data$' -skip:objectname='dirPath',absolutepath='Default\ Web\ Site/WebGIM\\App_Data$' +) else ( +set _MSDeployCommandline="%MSDeployPath%msdeploy.exe" -source:package='%RootPath%GIM_site.zip' -dest:%_Destination% -verb:sync -disableLink:AppPoolExtension -disableLink:ContentExtension -disableLink:CertificateExtension -skip:objectname='dirPath',absolutepath='obj\\Somaschini\\Package\\PackageTmp\\App_Data$' -skip:objectname='dirPath',absolutepath='Default\ Web\ Site/WebGIM\\App_Data$' -setParamFile:"%_DeploySetParametersFile%" +) + +if "%_HaveArgMSDeployAdditonalFlags%" == "" ( +goto :MSDeployWithOutArgMsDeployAdditionalFlag +) +goto :MSDeployWithArgMsDeployAdditionalFlag +goto :eof + +@rem --------------------------------------------------------------------------------- +@rem MSDeployWithArgMsDeployAdditionalFlag +@rem --------------------------------------------------------------------------------- +:MSDeployWithArgMsDeployAdditionalFlag +echo. %_MSDeployCommandline% %_MsDeployAdditionalFlags% %_ArgMsDeployAdditionalFlags:&=^&% +%_MSDeployCommandline% %_MsDeployAdditionalFlags% %_ArgMsDeployAdditionalFlags:&=^&% +goto :eof + +@rem --------------------------------------------------------------------------------- +@rem MSDeployWithOutArgMsDeployAdditionalFlag +@rem --------------------------------------------------------------------------------- +:MSDeployWithOutArgMsDeployAdditionalFlag +echo. %_MSDeployCommandline% %_MsDeployAdditionalFlags% +%_MSDeployCommandline% %_MsDeployAdditionalFlags% +goto :eof + +@rem --------------------------------------------------------------------------------- +@rem Find and set IISExpress argument. +@rem --------------------------------------------------------------------------------- +:SetIISExpressArguments + +if "%IISExpressPath%" == "" ( +for /F "usebackq tokens=1,2,*" %%h in (`reg query "HKLM\SOFTWARE\Microsoft\IISExpress" /s ^| findstr -i "InstallPath"`) do ( +if /I "%%h" == "InstallPath" ( +if /I "%%i" == "REG_SZ" ( +if not "%%j" == "" ( +if "%%~dpj" == "%%j" ( +set IISExpressPath=%%j +)))))) + +if "%IISExpressPath%" == "" ( +for /F "usebackq tokens=1,2,*" %%h in (`reg query "HKLM\SOFTWARE\Wow6432Node\Microsoft\IISExpress" /s ^| findstr -i "InstallPath"`) do ( +if /I "%%h" == "InstallPath" ( +if /I "%%i" == "REG_SZ" ( +if not "%%j" == "" ( +if "%%~dpj" == "%%j" ( +set IISExpressPath=%%j +)))))) + +if "%PersonalDocumentFolder%" == "" ( +for /F "usebackq tokens=2*" %%i in (`reg query "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" /v Personal`) do ( +set PersonalDocumentFolder=%%j +)) + +if "%IISExpressManifest%" == "" ( +for /F "usebackq tokens=1,2,*" %%h in (`reg query "HKLM\SOFTWARE\Microsoft\IISExpress" /s ^| findstr -i "Manifest"`) do ( +if /I "%%h" == "Manifest" ( +if /I "%%i" == "REG_SZ" ( +if not "%%j" == "" ( +set IISExpressManifest=%%j +))))) + +if "%IISExpressManifest%" == "" ( +for /F "usebackq tokens=1,2,*" %%h in (`reg query "HKLM\SOFTWARE\Wow6432Node\Microsoft\IISExpress" /s ^| findstr -i "Manifest"`) do ( +if /I "%%h" == "Manifest" ( +if /I "%%i" == "REG_SZ" ( +if not "%%j" == "" ( +set IISExpressManifest=%%j +))))) + +set IISExpressUserProfileDirectory="%PersonalDocumentFolder%\IISExpress\config" + +@rem --------------------------------------------- + +@rem --------------------------------------------- + +goto :eof + +@rem --------------------------------------------------------------------------------- +@rem CheckParameterFile -- check if the package's setparamters.xml exists or not +@rem --------------------------------------------------------------------------------- +:CheckParameterFile +if exist "%_DeploySetParametersFile%" ( +echo SetParameters from: +echo "%_DeploySetParametersFile%" +echo You can change IIS Application Name, Physical path, connectionString +echo or other deploy parameters in the above file. +) else ( +echo SetParamterFiles does not exist in package location. +echo Use package embedded defaultValue to deploy. +) +echo ------------------------------------------------------- +goto :eof + +@rem --------------------------------------------------------------------------------- +@rem Usage +@rem --------------------------------------------------------------------------------- +:usage +echo ========================================================= +if not exist "%RootPath%GIM_site.deploy-readme.txt" ( +echo Usage:%~nx0 [/T^|/Y] [/M:ComputerName] [/U:userName] [/P:password] [/G:tempAgent] [additional msdeploy flags ...] +echo Required flags: +echo /T Calls msdeploy.exe with the "-whatif" flag, which simulates deployment. +echo /Y Calls msdeploy.exe without the "-whatif" flag, which deploys the package to the current machine or destination server +echo Optional flags: +echo. By Default, this script deploy to the current machine where this script is invoked which will use current user credential without tempAgent. +echo. Only pass these arguments when in advance scenario. +echo /M: Msdeploy destination name of remote computer or proxy-URL. Default is local. +echo /U: Msdeploy destination user name. +echo /P: Msdeploy destination password. +echo /G: Msdeploy destination tempAgent. True or False. Default is false. +echo /A: specifies the type of authentication to be used. The possible values are NTLM and Basic. If the wmsvc provider setting is specified, the default authentication type is Basic +otherwise, the default authentication type is NTLM. +echo /L: Deploy to Local IISExpress User Instance. + +echo.[additional msdeploy flags]: note: " is required for passing = through command line. +echo "-skip:objectName=setAcl" "-skip:objectName=dbFullSql" +echo.Alternative environment variable _MsDeployAdditionalFlags is also honored. +echo. +echo. Please make sure MSDeploy is installed in the box http://go.microsoft.com/?linkid=9278654 +echo. +echo In addition, you can change IIS Application Name, Physical path, +echo connectionString and other deploy parameters in the following file: +echo "%_DeploySetParametersFile%" +echo. +echo For more information about this batch file, visit http://go.microsoft.com/fwlink/?LinkID=183544 +) else ( +start notepad "%RootPath%GIM_site.deploy-readme.txt" +) +echo ========================================================= +goto :eof diff --git a/Projects/ReleaseClienti/Somaschini ITA/GIM_site.zip b/Projects/ReleaseClienti/Somaschini ITA/GIM_site.zip new file mode 100644 index 0000000..9ec4dc7 Binary files /dev/null and b/Projects/ReleaseClienti/Somaschini ITA/GIM_site.zip differ diff --git a/Projects/WebGIM/GIM_data/bin/GIM_data.dll b/Projects/WebGIM/GIM_data/bin/GIM_data.dll index 0ea7e9d..fa2057c 100644 Binary files a/Projects/WebGIM/GIM_data/bin/GIM_data.dll and b/Projects/WebGIM/GIM_data/bin/GIM_data.dll differ diff --git a/Projects/WebGIM/GIM_data/bin/SteamWare.dll b/Projects/WebGIM/GIM_data/bin/SteamWare.dll index 51c4904..24e5a40 100644 Binary files a/Projects/WebGIM/GIM_data/bin/SteamWare.dll and b/Projects/WebGIM/GIM_data/bin/SteamWare.dll differ diff --git a/Projects/WebGIM/GIM_data/obj/Alumat/GIM_data.csprojResolveAssemblyReference.cache b/Projects/WebGIM/GIM_data/obj/Alumat/GIM_data.csprojResolveAssemblyReference.cache index b2cd3bf..f8aecc4 100644 Binary files a/Projects/WebGIM/GIM_data/obj/Alumat/GIM_data.csprojResolveAssemblyReference.cache and b/Projects/WebGIM/GIM_data/obj/Alumat/GIM_data.csprojResolveAssemblyReference.cache differ diff --git a/Projects/WebGIM/GIM_data/obj/Alumat/GIM_data.dll b/Projects/WebGIM/GIM_data/obj/Alumat/GIM_data.dll index 0ea7e9d..63aae45 100644 Binary files a/Projects/WebGIM/GIM_data/obj/Alumat/GIM_data.dll and b/Projects/WebGIM/GIM_data/obj/Alumat/GIM_data.dll differ diff --git a/Projects/WebGIM/GIM_site/GIM_site.csproj.user b/Projects/WebGIM/GIM_site/GIM_site.csproj.user index c3240b7..6f76b3c 100644 --- a/Projects/WebGIM/GIM_site/GIM_site.csproj.user +++ b/Projects/WebGIM/GIM_site/GIM_site.csproj.user @@ -2,7 +2,7 @@ ShowAllFiles - WinLab + Somaschini-ITA diff --git a/Projects/WebGIM/GIM_site/Properties/PublishProfiles/Somaschini-ITA.pubxml b/Projects/WebGIM/GIM_site/Properties/PublishProfiles/Somaschini-ITA.pubxml index 8a79309..4ba3b95 100644 --- a/Projects/WebGIM/GIM_site/Properties/PublishProfiles/Somaschini-ITA.pubxml +++ b/Projects/WebGIM/GIM_site/Properties/PublishProfiles/Somaschini-ITA.pubxml @@ -5,33 +5,50 @@ by editing this MSBuild file. In order to learn more about this please visit htt --> - MSDeploy - Release + Package + Somaschini Any CPU True - False - - - - True - InProc - False - - <_SavePWD>False + True + True + False + DonotMerge + True + C:\Users\samuele\Documents\Visual Studio 2012\Projects\WebGIM\Projects\ReleaseClienti\Somaschini ITA\GIM_site.zip + true + Default Web Site/WebGIM - + - + + + + + + + + + + + + + + False + + + False + + \ No newline at end of file diff --git a/Projects/WebGIM/GIM_site/Properties/PublishProfiles/Somaschini-USA.pubxml b/Projects/WebGIM/GIM_site/Properties/PublishProfiles/Somaschini-USA.pubxml index b5376ec..b7f4e23 100644 --- a/Projects/WebGIM/GIM_site/Properties/PublishProfiles/Somaschini-USA.pubxml +++ b/Projects/WebGIM/GIM_site/Properties/PublishProfiles/Somaschini-USA.pubxml @@ -19,11 +19,21 @@ by editing this MSBuild file. In order to learn more about this please visit htt - + - + + + + + + + + + + + @@ -31,5 +41,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt + \ No newline at end of file diff --git a/Projects/WebGIM/GIM_site/Properties/PublishProfiles/Ufficio-ITA (.218).pubxml b/Projects/WebGIM/GIM_site/Properties/PublishProfiles/Ufficio-ITA (IIS02).pubxml similarity index 100% rename from Projects/WebGIM/GIM_site/Properties/PublishProfiles/Ufficio-ITA (.218).pubxml rename to Projects/WebGIM/GIM_site/Properties/PublishProfiles/Ufficio-ITA (IIS02).pubxml diff --git a/Projects/WebGIM/GIM_site/Properties/PublishProfiles/Ufficio-ITA (.218).pubxml.user b/Projects/WebGIM/GIM_site/Properties/PublishProfiles/Ufficio-ITA (IIS02).pubxml.user similarity index 100% rename from Projects/WebGIM/GIM_site/Properties/PublishProfiles/Ufficio-ITA (.218).pubxml.user rename to Projects/WebGIM/GIM_site/Properties/PublishProfiles/Ufficio-ITA (IIS02).pubxml.user diff --git a/Projects/WebGIM/GIM_site/Reports/EN/MacchineReparti.rdlc b/Projects/WebGIM/GIM_site/Reports/EN/MacchineReparti.rdlc index d9ff266..c2b7f91 100644 --- a/Projects/WebGIM/GIM_site/Reports/EN/MacchineReparti.rdlc +++ b/Projects/WebGIM/GIM_site/Reports/EN/MacchineReparti.rdlc @@ -12,7 +12,7 @@ String - Alumat SRL + Somaschini SpA true diff --git a/Projects/WebGIM/GIM_site/Reports/EN/ReportInterventi.rdlc b/Projects/WebGIM/GIM_site/Reports/EN/ReportInterventi.rdlc index 352b65f..4e73438 100644 --- a/Projects/WebGIM/GIM_site/Reports/EN/ReportInterventi.rdlc +++ b/Projects/WebGIM/GIM_site/Reports/EN/ReportInterventi.rdlc @@ -12,7 +12,7 @@ String - Alumat SRL + Somaschini SpA true diff --git a/Projects/WebGIM/GIM_site/Reports/EN/Report_MTBF_MTTR.rdlc b/Projects/WebGIM/GIM_site/Reports/EN/Report_MTBF_MTTR.rdlc index d574675..53651d7 100644 --- a/Projects/WebGIM/GIM_site/Reports/EN/Report_MTBF_MTTR.rdlc +++ b/Projects/WebGIM/GIM_site/Reports/EN/Report_MTBF_MTTR.rdlc @@ -17,7 +17,7 @@ String - Alumat SRL + Somaschini SpA true diff --git a/Projects/WebGIM/GIM_site/Reports/EN/RichiestaIntervento.rdlc b/Projects/WebGIM/GIM_site/Reports/EN/RichiestaIntervento.rdlc index 8c089fa..a2531e3 100644 --- a/Projects/WebGIM/GIM_site/Reports/EN/RichiestaIntervento.rdlc +++ b/Projects/WebGIM/GIM_site/Reports/EN/RichiestaIntervento.rdlc @@ -12,7 +12,7 @@ String - Alumat SRL + Somaschini SpA true diff --git a/Projects/WebGIM/GIM_site/Reports/IT/MacchineReparti.rdlc b/Projects/WebGIM/GIM_site/Reports/IT/MacchineReparti.rdlc index d8fad51..5f43847 100644 --- a/Projects/WebGIM/GIM_site/Reports/IT/MacchineReparti.rdlc +++ b/Projects/WebGIM/GIM_site/Reports/IT/MacchineReparti.rdlc @@ -12,7 +12,7 @@ String - Alumat SRL + Somaschini SpA true diff --git a/Projects/WebGIM/GIM_site/Reports/IT/ReportInterventi.rdlc b/Projects/WebGIM/GIM_site/Reports/IT/ReportInterventi.rdlc index 05937cc..497efc0 100644 --- a/Projects/WebGIM/GIM_site/Reports/IT/ReportInterventi.rdlc +++ b/Projects/WebGIM/GIM_site/Reports/IT/ReportInterventi.rdlc @@ -12,7 +12,7 @@ String - Alumat SRL + Somaschini SpA true diff --git a/Projects/WebGIM/GIM_site/Reports/IT/Report_MTBF_MTTR.rdlc b/Projects/WebGIM/GIM_site/Reports/IT/Report_MTBF_MTTR.rdlc index 080eafd..dc74144 100644 --- a/Projects/WebGIM/GIM_site/Reports/IT/Report_MTBF_MTTR.rdlc +++ b/Projects/WebGIM/GIM_site/Reports/IT/Report_MTBF_MTTR.rdlc @@ -17,7 +17,7 @@ String - Alumat SRL + Somaschini SpA true diff --git a/Projects/WebGIM/GIM_site/Reports/IT/RichiestaIntervento.rdlc b/Projects/WebGIM/GIM_site/Reports/IT/RichiestaIntervento.rdlc index fd3c05f..875c90e 100644 --- a/Projects/WebGIM/GIM_site/Reports/IT/RichiestaIntervento.rdlc +++ b/Projects/WebGIM/GIM_site/Reports/IT/RichiestaIntervento.rdlc @@ -12,7 +12,7 @@ String - Alumat SRL + Somaschini SpA true diff --git a/Projects/WebGIM/GIM_site/Reports/logo.png b/Projects/WebGIM/GIM_site/Reports/logo.png index 131b722..7daf8a5 100644 Binary files a/Projects/WebGIM/GIM_site/Reports/logo.png and b/Projects/WebGIM/GIM_site/Reports/logo.png differ diff --git a/Projects/WebGIM/GIM_site/Web.Alumat.config b/Projects/WebGIM/GIM_site/Web.Alumat.config index 2716846..b612a3f 100644 --- a/Projects/WebGIM/GIM_site/Web.Alumat.config +++ b/Projects/WebGIM/GIM_site/Web.Alumat.config @@ -4,6 +4,8 @@ + + diff --git a/Projects/WebGIM/GIM_site/Web.Somaschini.config b/Projects/WebGIM/GIM_site/Web.Somaschini.config index eb8b2dd..888717d 100644 --- a/Projects/WebGIM/GIM_site/Web.Somaschini.config +++ b/Projects/WebGIM/GIM_site/Web.Somaschini.config @@ -1,9 +1,9 @@ - - - - - - + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + --> + \ No newline at end of file diff --git a/Projects/WebGIM/GIM_site/Web.SomaschiniUSA.config b/Projects/WebGIM/GIM_site/Web.SomaschiniUSA.config index 8630984..a9db7b0 100644 --- a/Projects/WebGIM/GIM_site/Web.SomaschiniUSA.config +++ b/Projects/WebGIM/GIM_site/Web.SomaschiniUSA.config @@ -7,6 +7,8 @@ + + diff --git a/Projects/WebGIM/GIM_site/Web.WinLab.config b/Projects/WebGIM/GIM_site/Web.WinLab.config index f977bcd..ae32380 100644 --- a/Projects/WebGIM/GIM_site/Web.WinLab.config +++ b/Projects/WebGIM/GIM_site/Web.WinLab.config @@ -1,9 +1,9 @@ - - - - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + --> + \ No newline at end of file diff --git a/Projects/WebGIM/GIM_site/Web.config b/Projects/WebGIM/GIM_site/Web.config index 31564f0..992b653 100644 --- a/Projects/WebGIM/GIM_site/Web.config +++ b/Projects/WebGIM/GIM_site/Web.config @@ -117,6 +117,9 @@ + + + diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx index ce0ff6d..370cdbe 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx @@ -92,7 +92,7 @@ -
+

diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx.cs index 6c55ec3..aeedff2 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx.cs @@ -15,7 +15,8 @@ public partial class mod_reportInterventi : System.Web.UI.UserControl traduciObj(); // popolo valori default setDefaultValues(); - // aggancio evento selezione x aggiornare hyperlink + // fixed visibilità modulo export excel + divExcelExp.Visible = memLayer.ML.confReadBool("showExcelExpRep"); } } diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx.designer.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx.designer.cs index cd72342..46eb320 100644 --- a/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx.designer.cs +++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx.designer.cs @@ -182,6 +182,15 @@ public partial class mod_reportInterventi { /// protected global::System.Web.UI.WebControls.HyperLink lnkGuidaPerReport; + /// + /// divExcelExp control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divExcelExp; + /// /// lblExcelExportAllData control. /// diff --git a/Projects/WebGIM/GIM_site/bin/GIM_data.dll b/Projects/WebGIM/GIM_site/bin/GIM_data.dll index 0ea7e9d..fa2057c 100644 Binary files a/Projects/WebGIM/GIM_site/bin/GIM_data.dll and b/Projects/WebGIM/GIM_site/bin/GIM_data.dll differ diff --git a/Projects/WebGIM/GIM_site/bin/GIM_site.dll b/Projects/WebGIM/GIM_site/bin/GIM_site.dll index d69d147..e3e180f 100644 Binary files a/Projects/WebGIM/GIM_site/bin/GIM_site.dll and b/Projects/WebGIM/GIM_site/bin/GIM_site.dll differ diff --git a/Projects/WebGIM/GIM_site/bin/SteamWare.dll b/Projects/WebGIM/GIM_site/bin/SteamWare.dll index 51c4904..24e5a40 100644 Binary files a/Projects/WebGIM/GIM_site/bin/SteamWare.dll and b/Projects/WebGIM/GIM_site/bin/SteamWare.dll differ diff --git a/Projects/WebGIM/GIM_site/bin/VersGen.dll b/Projects/WebGIM/GIM_site/bin/VersGen.dll index 2afb028..5d6161a 100644 Binary files a/Projects/WebGIM/GIM_site/bin/VersGen.dll and b/Projects/WebGIM/GIM_site/bin/VersGen.dll differ diff --git a/Projects/WebGIM/GIM_site/obj/Somaschini/CSAutoParameterize.parameters.xml b/Projects/WebGIM/GIM_site/obj/Somaschini/CSAutoParameterize.parameters.xml index 8d63762..9b55380 100644 --- a/Projects/WebGIM/GIM_site/obj/Somaschini/CSAutoParameterize.parameters.xml +++ b/Projects/WebGIM/GIM_site/obj/Somaschini/CSAutoParameterize.parameters.xml @@ -1,6 +1,9 @@  - - + + + + + \ No newline at end of file diff --git a/Projects/WebGIM/GIM_site/obj/Somaschini/RdlCompile.cache b/Projects/WebGIM/GIM_site/obj/Somaschini/RdlCompile.cache index cfddf10..4af2380 100644 Binary files a/Projects/WebGIM/GIM_site/obj/Somaschini/RdlCompile.cache and b/Projects/WebGIM/GIM_site/obj/Somaschini/RdlCompile.cache differ diff --git a/Projects/WebGIM/VersGen/WebGIM.cs b/Projects/WebGIM/VersGen/WebGIM.cs index 15494f8..2e35ccc 100644 --- a/Projects/WebGIM/VersGen/WebGIM.cs +++ b/Projects/WebGIM/VersGen/WebGIM.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("1.4.246.480")] -[assembly: AssemblyFileVersion("1.4.246.480")] +[assembly: AssemblyVersion("1.4.247.484")] +[assembly: AssemblyFileVersion("1.4.247.484")] [assembly: AssemblyCopyright("Steamware © 2006-2015")] [assembly: AssemblyCompany("Steamware")] diff --git a/Projects/WebGIM/VersGen/WebGIM.tt b/Projects/WebGIM/VersGen/WebGIM.tt index 4335e60..b983e0a 100644 --- a/Projects/WebGIM/VersGen/WebGIM.tt +++ b/Projects/WebGIM/VersGen/WebGIM.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("1.4.246.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("1.4.246.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("1.4.247.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("1.4.247.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware © 2006-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+ diff --git a/Projects/WebGIM/VersGen/bin/Release/VersGen.dll b/Projects/WebGIM/VersGen/bin/Release/VersGen.dll index 2afb028..5d6161a 100644 Binary files a/Projects/WebGIM/VersGen/bin/Release/VersGen.dll and b/Projects/WebGIM/VersGen/bin/Release/VersGen.dll differ