diff --git a/GMW.sln b/GMW.sln index 86e03c70..859c4575 100644 --- a/GMW.sln +++ b/GMW.sln @@ -9,6 +9,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GMW_data", "GMW_data\GMW_da EndProject Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "GMW_DB", "GMW_DB\GMW_DB.sqlproj", "{4A7C6325-D822-446C-BCE3-811FC178DCBE}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VersGen", "VersGen\VersGen.csproj", "{7C587950-A570-489C-9784-27256384E57E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -73,6 +75,18 @@ Global {4A7C6325-D822-446C-BCE3-811FC178DCBE}.TK_test|Any CPU.ActiveCfg = Debug|Any CPU {4A7C6325-D822-446C-BCE3-811FC178DCBE}.TK_test|Any CPU.Build.0 = Debug|Any CPU {4A7C6325-D822-446C-BCE3-811FC178DCBE}.TK_test|Any CPU.Deploy.0 = Debug|Any CPU + {7C587950-A570-489C-9784-27256384E57E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7C587950-A570-489C-9784-27256384E57E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7C587950-A570-489C-9784-27256384E57E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7C587950-A570-489C-9784-27256384E57E}.Release|Any CPU.Build.0 = Release|Any CPU + {7C587950-A570-489C-9784-27256384E57E}.SP_prod|Any CPU.ActiveCfg = Release|Any CPU + {7C587950-A570-489C-9784-27256384E57E}.SP_prod|Any CPU.Build.0 = Release|Any CPU + {7C587950-A570-489C-9784-27256384E57E}.SP_test|Any CPU.ActiveCfg = Release|Any CPU + {7C587950-A570-489C-9784-27256384E57E}.SP_test|Any CPU.Build.0 = Release|Any CPU + {7C587950-A570-489C-9784-27256384E57E}.TK_prod|Any CPU.ActiveCfg = Release|Any CPU + {7C587950-A570-489C-9784-27256384E57E}.TK_prod|Any CPU.Build.0 = Release|Any CPU + {7C587950-A570-489C-9784-27256384E57E}.TK_test|Any CPU.ActiveCfg = Release|Any CPU + {7C587950-A570-489C-9784-27256384E57E}.TK_test|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/GMW/GMW.csproj b/GMW/GMW.csproj index 212e1991..5922d6c5 100644 --- a/GMW/GMW.csproj +++ b/GMW/GMW.csproj @@ -246,6 +246,9 @@ + + GMW.cs + anagCelle.aspx ASPXCodeBehind diff --git a/GMW/Properties/AssemblyInfo.cs b/GMW/Properties/AssemblyInfo.cs index be6c935c..cd8b039c 100644 --- a/GMW/Properties/AssemblyInfo.cs +++ b/GMW/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Steamware")] [assembly: AssemblyProduct("GMW")] -[assembly: AssemblyCopyright("Copyright © Steamware 2010-2014")] +[assembly: AssemblyCopyright("Steamware © 2010-2014")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("2.4.*")] -[assembly: AssemblyFileVersion("2.4.*")] +//[assembly: AssemblyVersion("2.4.*")] +//[assembly: AssemblyFileVersion("2.4.*")] diff --git a/GMW/WebUserControls/mod_menuBottom.ascx b/GMW/WebUserControls/mod_menuBottom.ascx index 06c8748f..a44b9ba0 100644 --- a/GMW/WebUserControls/mod_menuBottom.ascx +++ b/GMW/WebUserControls/mod_menuBottom.ascx @@ -1,4 +1,7 @@ <%@ Control Language="C#" AutoEventWireup="true" - Inherits="mod_menuBottom" Codebehind="mod_menuBottom.ascx.cs" %> - - - + Inherits="mod_menuBottom" CodeBehind="mod_menuBottom.ascx.cs" %> +
+ - + +
+ diff --git a/GMW/WebUserControls/mod_menuBottom.ascx.designer.cs b/GMW/WebUserControls/mod_menuBottom.ascx.designer.cs index 70d58dbb..4ccf0aa2 100644 --- a/GMW/WebUserControls/mod_menuBottom.ascx.designer.cs +++ b/GMW/WebUserControls/mod_menuBottom.ascx.designer.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4927 // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ diff --git a/GMW/WebUserControls/mod_menuBottomFullpage.ascx.cs b/GMW/WebUserControls/mod_menuBottomFullpage.ascx.cs index fb29216b..b1e47a10 100644 --- a/GMW/WebUserControls/mod_menuBottomFullpage.ascx.cs +++ b/GMW/WebUserControls/mod_menuBottomFullpage.ascx.cs @@ -20,7 +20,8 @@ namespace GMW.WebUserControls { base.Page_Load(sender, e); // sistemo le stringhe... - lblApp.Text = string.Format("{0} v.{1}.{2}", ConfigurationManager.AppSettings.Get("appName"), ConfigurationManager.AppSettings.Get("mainRev"), ConfigurationManager.AppSettings.Get("minRev")); + lblApp.Text = string.Format("{0} v.{1}", ConfigurationManager.AppSettings.Get("appName"), System.Reflection.Assembly.GetExecutingAssembly().GetName().Version); + //lblApp.Text = string.Format("{0} v.{1}.{2}", ConfigurationManager.AppSettings.Get("appName"), ConfigurationManager.AppSettings.Get("mainRev"), ConfigurationManager.AppSettings.Get("minRev")); lblCopyRight.Text = string.Format("{0}-{1}", ConfigurationManager.AppSettings.Get("copyRight"), DateTime.Now.Year); setTimer(); setClock(); diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll index 81599202..95664a48 100644 Binary files a/GMW/bin/GMW.dll and b/GMW/bin/GMW.dll differ diff --git a/GMW_DB/bin/Release/GMW_DB.dacpac b/GMW_DB/bin/Release/GMW_DB.dacpac new file mode 100644 index 00000000..43f35ff8 Binary files /dev/null and b/GMW_DB/bin/Release/GMW_DB.dacpac differ diff --git a/GMW_DB/bin/Release/GMW_DB.dll b/GMW_DB/bin/Release/GMW_DB.dll new file mode 100644 index 00000000..c432d41f Binary files /dev/null and b/GMW_DB/bin/Release/GMW_DB.dll differ diff --git a/GMW_DB/bin/Release/ProduzionePossidonio.dacpac b/GMW_DB/bin/Release/ProduzionePossidonio.dacpac new file mode 100644 index 00000000..a10d496c Binary files /dev/null and b/GMW_DB/bin/Release/ProduzionePossidonio.dacpac differ diff --git a/GMW_DB/obj/Release/GMW_DB.sqlproj.FileListAbsolute.txt b/GMW_DB/obj/Release/GMW_DB.sqlproj.FileListAbsolute.txt index 26161134..7cecadfe 100644 --- a/GMW_DB/obj/Release/GMW_DB.sqlproj.FileListAbsolute.txt +++ b/GMW_DB/obj/Release/GMW_DB.sqlproj.FileListAbsolute.txt @@ -1,7 +1,6 @@ C:\Users\samuele\Documents\Visual Studio 2012\Projects\GMW\GMW_DB\bin\Release\GMW_DB.dacpac -C:\Users\samuele\Documents\Visual Studio 2012\Projects\GMW\GMW_DB\obj\Release\Model.xml -C:\Users\samuele\Documents\Visual Studio 2012\Projects\GMW\GMW_DB\obj\Release\refactor.xml -C:\Users\samuele\Documents\Visual Studio 2012\Projects\GMW\GMW_DB\obj\Release\postdeploy.sql -C:\Users\samuele\Documents\Visual Studio 2012\Projects\GMW\GMW_DB\obj\Release\predeploy.sql C:\Users\samuele\Documents\Visual Studio 2012\Projects\GMW\GMW_DB\obj\Release\GMW_DB.dll C:\Users\samuele\Documents\Visual Studio 2012\Projects\GMW\GMW_DB\obj\Release\GMW_DB.pdb +C:\Users\samuele\Documents\Visual Studio 2012\Projects\GMW\GMW_DB\bin\Release\GMW_DB.dll +C:\Users\samuele\Documents\Visual Studio 2012\Projects\GMW\GMW_DB\bin\Release\GMW_DB.pdb +C:\Users\samuele\Documents\Visual Studio 2012\Projects\GMW\GMW_DB\bin\Release\ProduzionePossidonio.dacpac