diff --git a/C2P/C2P.csproj b/C2P/C2P.csproj index 5892401..bfd38d1 100644 --- a/C2P/C2P.csproj +++ b/C2P/C2P.csproj @@ -86,8 +86,9 @@ False ..\packages\Newtonsoft.Json.6.0.3\lib\net45\Newtonsoft.Json.dll - - ..\packages\NLog.2.1.0\lib\net45\NLog.dll + + ..\packages\NLog.4.1.2\lib\net45\NLog.dll + True @@ -326,23 +327,27 @@ - - - - compilerconfig.json + + + + + + + Designer + - + Reference.svcmap @@ -461,9 +466,6 @@ - - Designer - diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index 58d04be..cfac693 100644 Binary files a/C2P/bin/C2P.dll and b/C2P/bin/C2P.dll differ diff --git a/C2P/bin/C2P_Data.dll b/C2P/bin/C2P_Data.dll index be2df69..ce0f2f5 100644 Binary files a/C2P/bin/C2P_Data.dll and b/C2P/bin/C2P_Data.dll differ diff --git a/C2P/bin/SteamWare.dll b/C2P/bin/SteamWare.dll index b40df9d..fb581d6 100644 Binary files a/C2P/bin/SteamWare.dll and b/C2P/bin/SteamWare.dll differ diff --git a/C2P/obj/deploy/C2P.csproj.FileListAbsolute.txt b/C2P/obj/deploy/C2P.csproj.FileListAbsolute.txt index 752b2fd..e8a5606 100644 --- a/C2P/obj/deploy/C2P.csproj.FileListAbsolute.txt +++ b/C2P/obj/deploy/C2P.csproj.FileListAbsolute.txt @@ -47,6 +47,7 @@ C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\C2P\C2P\bin\ C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\C2P\C2P\bin\ImageResizer.Plugins.SeamCarving.dll C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\C2P\C2P\bin\Microsoft.AspNet.FriendlyUrls.dll C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\C2P\C2P\bin\Microsoft.AspNet.Web.Optimization.WebForms.dll +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\C2P\C2P\bin\Microsoft.ReportViewer.WebForms.dll C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\C2P\C2P\bin\Microsoft.ScriptManager.MSAjax.dll C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\C2P\C2P\bin\Microsoft.ScriptManager.WebForms.dll C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\C2P\C2P\bin\Microsoft.Web.Infrastructure.dll @@ -57,20 +58,19 @@ C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\C2P\C2P\bin\ C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\C2P\C2P\bin\WebGrease.dll C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\C2P\C2P\bin\Flesk.ViewState.dll C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\C2P\C2P\bin\ICSharpCode.SharpZipLib.dll +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\C2P\C2P\bin\Microsoft.ReportViewer.WinForms.dll +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\C2P\C2P\bin\Microsoft.ReportViewer.Common.dll C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\C2P\C2P\bin\C2P_Data.pdb C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\C2P\C2P\bin\Antlr3.Runtime.pdb C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\C2P\C2P\bin\ImageResizer.xml C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\C2P\C2P\bin\ImageResizer.Mvc.xml C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\C2P\C2P\bin\ImageResizer.Plugins.SeamCarving.xml C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\C2P\C2P\bin\Microsoft.AspNet.FriendlyUrls.xml +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\C2P\C2P\bin\Microsoft.ReportViewer.WebForms.xml C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\C2P\C2P\bin\Newtonsoft.Json.xml C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\C2P\C2P\bin\NLog.xml C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\C2P\C2P\bin\System.Web.Optimization.xml +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\C2P\C2P\bin\Microsoft.ReportViewer.WinForms.xml C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\C2P\C2P\obj\deploy\C2P.csprojResolveAssemblyReference.cache C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\C2P\C2P\obj\deploy\C2P.dll C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\C2P\C2P\obj\deploy\C2P.pdb -C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\C2P\C2P\bin\Microsoft.ReportViewer.WebForms.dll -C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\C2P\C2P\bin\Microsoft.ReportViewer.WinForms.dll -C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\C2P\C2P\bin\Microsoft.ReportViewer.Common.dll -C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\C2P\C2P\bin\Microsoft.ReportViewer.WebForms.xml -C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\C2P\C2P\bin\Microsoft.ReportViewer.WinForms.xml diff --git a/C2P/obj/deploy/C2P.dll b/C2P/obj/deploy/C2P.dll index 58d04be..cfac693 100644 Binary files a/C2P/obj/deploy/C2P.dll and b/C2P/obj/deploy/C2P.dll differ diff --git a/C2P/packages.config b/C2P/packages.config index ea6379a..96e65d0 100644 --- a/C2P/packages.config +++ b/C2P/packages.config @@ -6,7 +6,7 @@ - + @@ -22,11 +22,11 @@ - + - - - + + + \ No newline at end of file diff --git a/C2P_CronJob/bin/Release/C2P_CronJob.application b/C2P_CronJob/bin/Release/C2P_CronJob.application index 28148ff..82f7dcf 100644 --- a/C2P_CronJob/bin/Release/C2P_CronJob.application +++ b/C2P_CronJob/bin/Release/C2P_CronJob.application @@ -11,7 +11,7 @@ - kgTlB14KxlDxkzDKKv9aFbwR+9A= + jeuhRMxkDXr/wIjE6bkkTBQ9sxA= diff --git a/C2P_CronJob/bin/Release/C2P_CronJob.exe.manifest b/C2P_CronJob/bin/Release/C2P_CronJob.exe.manifest index 7ad62bf..a1aee12 100644 --- a/C2P_CronJob/bin/Release/C2P_CronJob.exe.manifest +++ b/C2P_CronJob/bin/Release/C2P_CronJob.exe.manifest @@ -74,7 +74,7 @@ - sAWqYI9tJ5hP9BxgMhhGipijEyI= + FWUkwmlAeX/dhUzSClze/NjnF7U= @@ -86,7 +86,7 @@ - xczAIiQ+Vd1SyDS0337M5Kj4fss= + AVWz+sps21/9fbyzlJIi2C0u7JY= @@ -139,14 +139,14 @@ - + - 8bkCwr8xlrT9fwN5SF62CBSNTag= + xOI19Bm/blUoq5wkovLsFKbl18A= diff --git a/C2P_CronJob/bin/Release/C2P_Data.dll b/C2P_CronJob/bin/Release/C2P_Data.dll index be2df69..ce0f2f5 100644 Binary files a/C2P_CronJob/bin/Release/C2P_Data.dll and b/C2P_CronJob/bin/Release/C2P_Data.dll differ diff --git a/C2P_CronJob/bin/Release/SteamWare.dll b/C2P_CronJob/bin/Release/SteamWare.dll index b40df9d..fb581d6 100644 Binary files a/C2P_CronJob/bin/Release/SteamWare.dll and b/C2P_CronJob/bin/Release/SteamWare.dll differ diff --git a/C2P_Data/bin/Release/C2P_Data.dll b/C2P_Data/bin/Release/C2P_Data.dll index be2df69..ce0f2f5 100644 Binary files a/C2P_Data/bin/Release/C2P_Data.dll and b/C2P_Data/bin/Release/C2P_Data.dll differ diff --git a/C2P_Data/bin/Release/SteamWare.dll b/C2P_Data/bin/Release/SteamWare.dll index b40df9d..fb581d6 100644 Binary files a/C2P_Data/bin/Release/SteamWare.dll and b/C2P_Data/bin/Release/SteamWare.dll differ diff --git a/C2P_Report/Reports/OffertDOC.rdlc b/C2P_Report/Reports/OffertDOC.rdlc index b955cee..459f558 100644 --- a/C2P_Report/Reports/OffertDOC.rdlc +++ b/C2P_Report/Reports/OffertDOC.rdlc @@ -510,7 +510,7 @@ External - ="http://IIS02/C2P/Drawings/logo_OfferDOC.png" + ="http://COSTIMATE/C2P/Drawings/logo_OfferDOC.png" FitProportional 0.36903cm 0.44335cm diff --git a/C2P_Report/Reports/ReportOffers_Q.rdlc b/C2P_Report/Reports/ReportOffers_Q.rdlc index dd55b4b..87dc80b 100644 --- a/C2P_Report/Reports/ReportOffers_Q.rdlc +++ b/C2P_Report/Reports/ReportOffers_Q.rdlc @@ -7112,7 +7112,7 @@ Globals!ReportName="ReportOffers_S", Lookup("C2P_prt1_ReportTitle_S",Fields!Lemm WhiteSmoke - http://IIS02/C2P/Drawings/ + http://COSTIMATE/C2P/Drawings/ true diff --git a/C2P_Report/Reports/ReportOffers_S.rdlc b/C2P_Report/Reports/ReportOffers_S.rdlc index dd55b4b..87dc80b 100644 --- a/C2P_Report/Reports/ReportOffers_S.rdlc +++ b/C2P_Report/Reports/ReportOffers_S.rdlc @@ -7112,7 +7112,7 @@ Globals!ReportName="ReportOffers_S", Lookup("C2P_prt1_ReportTitle_S",Fields!Lemm WhiteSmoke - http://IIS02/C2P/Drawings/ + http://COSTIMATE/C2P/Drawings/ true diff --git a/C2P_Report/bin/C2P_Data.dll b/C2P_Report/bin/C2P_Data.dll index be2df69..ce0f2f5 100644 Binary files a/C2P_Report/bin/C2P_Data.dll and b/C2P_Report/bin/C2P_Data.dll differ diff --git a/C2P_Report/bin/C2P_Report.dll b/C2P_Report/bin/C2P_Report.dll index 5a7e373..f33125c 100644 Binary files a/C2P_Report/bin/C2P_Report.dll and b/C2P_Report/bin/C2P_Report.dll differ diff --git a/C2P_Report/bin/SteamWare.dll b/C2P_Report/bin/SteamWare.dll index b40df9d..fb581d6 100644 Binary files a/C2P_Report/bin/SteamWare.dll and b/C2P_Report/bin/SteamWare.dll differ diff --git a/ReleaseClienti/C2P.zip b/ReleaseClienti/C2P.zip index 1812713..2502c6c 100644 Binary files a/ReleaseClienti/C2P.zip and b/ReleaseClienti/C2P.zip differ