From 2dffb9c47bc3c7c7975bb97feef3cd165cac1e30 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 13 Mar 2017 17:43:32 +0100 Subject: [PATCH] term COMPILA!!!! update a 4.6.2 --- .vs/config/applicationhost.config | 2 +- GMW_Term/GMW_Term.csproj | 14 +- GMW_Term/Web.config | 321 +++++++++--------- GMW_Term/WebMasterPages/Compact.Master | 4 +- .../WebMasterPages/Compact.Master.designer.cs | 2 +- GMW_Term/WebMasterPages/CompactBCode.Master | 4 +- .../CompactBCode.Master.designer.cs | 2 +- .../WebUserControls/mod_searchResults.ascx.cs | 2 +- GMW_Term/packages.config | 5 +- packages/elmah.1.2.2/elmah.1.2.2.nuspec | 22 -- .../elmah.corelibrary.1.2.2.nuspec | 17 - 11 files changed, 180 insertions(+), 215 deletions(-) delete mode 100644 packages/elmah.1.2.2/elmah.1.2.2.nuspec delete mode 100644 packages/elmah.corelibrary.1.2.2/elmah.corelibrary.1.2.2.nuspec diff --git a/.vs/config/applicationhost.config b/.vs/config/applicationhost.config index b72cda28..975be018 100644 --- a/.vs/config/applicationhost.config +++ b/.vs/config/applicationhost.config @@ -186,7 +186,7 @@ - + diff --git a/GMW_Term/GMW_Term.csproj b/GMW_Term/GMW_Term.csproj index 9ddd4641..1efd1e43 100644 --- a/GMW_Term/GMW_Term.csproj +++ b/GMW_Term/GMW_Term.csproj @@ -1,5 +1,5 @@  - + bin\ @@ -110,7 +110,7 @@ Properties GMW_Term GMW_Term - v3.5 + v4.6.2 3.5 @@ -151,16 +151,18 @@ false - - False - ..\..\..\..\..\..\..\Library\AjaxControlToolkit1016\SampleWebSite\Bin\AjaxControlToolkit.dll + + ..\packages\AjaxControlToolkit.16.1.1.0\lib\net40\AjaxControlToolkit.dll + True - + ..\packages\elmah.corelibrary.1.2.2\lib\Elmah.dll + True + diff --git a/GMW_Term/Web.config b/GMW_Term/Web.config index 4a3d60ec..a15d88a1 100644 --- a/GMW_Term/Web.config +++ b/GMW_Term/Web.config @@ -1,14 +1,15 @@ - + - - -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + \ No newline at end of file diff --git a/GMW_Term/WebMasterPages/Compact.Master b/GMW_Term/WebMasterPages/Compact.Master index f5938ba2..34fe033f 100644 --- a/GMW_Term/WebMasterPages/Compact.Master +++ b/GMW_Term/WebMasterPages/Compact.Master @@ -13,8 +13,8 @@
- - + +
diff --git a/GMW_Term/WebMasterPages/Compact.Master.designer.cs b/GMW_Term/WebMasterPages/Compact.Master.designer.cs index f28bd4ae..bad0cc1d 100644 --- a/GMW_Term/WebMasterPages/Compact.Master.designer.cs +++ b/GMW_Term/WebMasterPages/Compact.Master.designer.cs @@ -46,7 +46,7 @@ namespace GMW_Term.WebMasterPages { /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::AjaxControlToolkit.ToolkitScriptManager sm; + protected global::System.Web.UI.ScriptManager sm; /// /// mod_menuTop1 control. diff --git a/GMW_Term/WebMasterPages/CompactBCode.Master b/GMW_Term/WebMasterPages/CompactBCode.Master index fbf5ff83..1bc0ebdf 100644 --- a/GMW_Term/WebMasterPages/CompactBCode.Master +++ b/GMW_Term/WebMasterPages/CompactBCode.Master @@ -13,8 +13,8 @@ - - + +
diff --git a/GMW_Term/WebMasterPages/CompactBCode.Master.designer.cs b/GMW_Term/WebMasterPages/CompactBCode.Master.designer.cs index 051ec849..d1c8f524 100644 --- a/GMW_Term/WebMasterPages/CompactBCode.Master.designer.cs +++ b/GMW_Term/WebMasterPages/CompactBCode.Master.designer.cs @@ -46,7 +46,7 @@ namespace GMW_Term.WebMasterPages { /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::AjaxControlToolkit.ToolkitScriptManager sm; + protected global::System.Web.UI.ScriptManager sm; /// /// mod_menuTop1 control. diff --git a/GMW_Term/WebUserControls/mod_searchResults.ascx.cs b/GMW_Term/WebUserControls/mod_searchResults.ascx.cs index 7a855f4d..916e939d 100644 --- a/GMW_Term/WebUserControls/mod_searchResults.ascx.cs +++ b/GMW_Term/WebUserControls/mod_searchResults.ascx.cs @@ -221,7 +221,7 @@ namespace GMW_Term.WebUserControls /// protected DataColumnCollection colonneObj() { - DS_Utility.stp_ricercaFullTerminalinoDataTable tabella = new DS_Utility.stp_ricercaFullTerminalinoDataTable(); + GMW_data.DS_Utility.stp_ricercaFullTerminalinoDataTable tabella = new GMW_data.DS_Utility.stp_ricercaFullTerminalinoDataTable(); DataColumnCollection colonne = tabella.Columns; return colonne; } diff --git a/GMW_Term/packages.config b/GMW_Term/packages.config index 868efee8..951d80fb 100644 --- a/GMW_Term/packages.config +++ b/GMW_Term/packages.config @@ -1,5 +1,6 @@  - - + + + \ No newline at end of file diff --git a/packages/elmah.1.2.2/elmah.1.2.2.nuspec b/packages/elmah.1.2.2/elmah.1.2.2.nuspec deleted file mode 100644 index 260abbac..00000000 --- a/packages/elmah.1.2.2/elmah.1.2.2.nuspec +++ /dev/null @@ -1,22 +0,0 @@ - - - - elmah - 1.2.2 - ELMAH - Atif Aziz - Atif Aziz - http://www.apache.org/licenses/LICENSE-2.0 - http://elmah.googlecode.com/ - false - ELMAH with initial configuration for getting started quickly. ELMAH (Error Logging Modules and Handlers) is an application-wide error logging facility that is completely pluggable. It can be dynamically added to a running ASP.NET web application, or even all ASP.NET web applications on a machine, without any need for re-compilation or re-deployment. - ELMAH with initial configuration for getting started quickly. ELMAH (Error Logging Modules and Handlers) is an application-wide error logging facility that is completely pluggable. It can be dynamically added to a running ASP.NET web application, or even all ASP.NET web applications on a machine, without any need for re-compilation or re-deployment. - This release updates the way the HTTP handler is registered in the web.config and is designed to work more strictly and securely when enabling remote access for authorized users. See http://code.google.com/p/elmah/wiki/SecuringErrorLogPages on the project site for more information. - - - elmah error logging unhandled exception - - - - - \ No newline at end of file diff --git a/packages/elmah.corelibrary.1.2.2/elmah.corelibrary.1.2.2.nuspec b/packages/elmah.corelibrary.1.2.2/elmah.corelibrary.1.2.2.nuspec deleted file mode 100644 index d6dd76ab..00000000 --- a/packages/elmah.corelibrary.1.2.2/elmah.corelibrary.1.2.2.nuspec +++ /dev/null @@ -1,17 +0,0 @@ - - - - elmah.corelibrary - 1.2.2 - ELMAH Core Library (no config) - Atif Aziz - Atif Aziz - http://www.apache.org/licenses/LICENSE-2.0 - http://elmah.googlecode.com/ - false - Core library for ELMAH (Error Logging Modules and Handlers) without any configuration. - Core library for ELMAH (Error Logging Modules and Handlers) without any configuration. - This release fixes the issues listed here: http://code.google.com/p/elmah/issues/list?q=label%3AMilestone-Release1.2SP2&can=1 - elmah error logging unhandled exception - - \ No newline at end of file