diff --git a/TemplateProj_Data/TemplateProj_Data.csproj b/AppData/AppData.csproj similarity index 100% rename from TemplateProj_Data/TemplateProj_Data.csproj rename to AppData/AppData.csproj diff --git a/TemplateProj_Data/DS_Applicazione.Designer.cs b/AppData/DS_Applicazione.Designer.cs similarity index 99% rename from TemplateProj_Data/DS_Applicazione.Designer.cs rename to AppData/DS_Applicazione.Designer.cs index 455214e..ce9906c 100644 --- a/TemplateProj_Data/DS_Applicazione.Designer.cs +++ b/AppData/DS_Applicazione.Designer.cs @@ -10,7 +10,7 @@ #pragma warning disable 1591 -namespace TemplateProj_Data { +namespace App_Data { /// diff --git a/TemplateProj_Data/DS_Applicazione.xsc b/AppData/DS_Applicazione.xsc similarity index 100% rename from TemplateProj_Data/DS_Applicazione.xsc rename to AppData/DS_Applicazione.xsc diff --git a/TemplateProj_Data/DS_Applicazione.xsd b/AppData/DS_Applicazione.xsd similarity index 100% rename from TemplateProj_Data/DS_Applicazione.xsd rename to AppData/DS_Applicazione.xsd diff --git a/TemplateProj_Data/DS_Applicazione.xss b/AppData/DS_Applicazione.xss similarity index 100% rename from TemplateProj_Data/DS_Applicazione.xss rename to AppData/DS_Applicazione.xss diff --git a/TemplateProj_Data/DS_Utility.Designer.cs b/AppData/DS_Utility.Designer.cs similarity index 99% rename from TemplateProj_Data/DS_Utility.Designer.cs rename to AppData/DS_Utility.Designer.cs index 7c9c77d..c079ff1 100644 --- a/TemplateProj_Data/DS_Utility.Designer.cs +++ b/AppData/DS_Utility.Designer.cs @@ -10,7 +10,7 @@ #pragma warning disable 1591 -namespace TemplateProj_Data { +namespace App_Data { /// diff --git a/TemplateProj_Data/DS_Utility.xsc b/AppData/DS_Utility.xsc similarity index 100% rename from TemplateProj_Data/DS_Utility.xsc rename to AppData/DS_Utility.xsc diff --git a/TemplateProj_Data/DS_Utility.xsd b/AppData/DS_Utility.xsd similarity index 100% rename from TemplateProj_Data/DS_Utility.xsd rename to AppData/DS_Utility.xsd diff --git a/TemplateProj_Data/DS_Utility.xss b/AppData/DS_Utility.xss similarity index 100% rename from TemplateProj_Data/DS_Utility.xss rename to AppData/DS_Utility.xss diff --git a/TemplateProj_Data/DtProxy.cs b/AppData/DtProxy.cs similarity index 95% rename from TemplateProj_Data/DtProxy.cs rename to AppData/DtProxy.cs index fabaec2..cb5e8ce 100644 --- a/TemplateProj_Data/DtProxy.cs +++ b/AppData/DtProxy.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using SteamWare; -namespace TemplateProj_Data +namespace App_Data { public class DtProxy { @@ -37,7 +37,7 @@ namespace TemplateProj_Data /// protected virtual void setupConnectionString() { - string connStr = memLayer.ML.confReadString("TemplateProjConnectionString"); + string connStr = memLayer.ML.confReadString("AppConnectionString"); //string connStrFiles = memLayer.ML.confReadString("WebSCRFilesConnectionString"); // connections del db vocabolario //taAF.Connection.ConnectionString = connStr; diff --git a/TemplateProj_Data/Properties/AssemblyInfo.cs b/AppData/Properties/AssemblyInfo.cs similarity index 93% rename from TemplateProj_Data/Properties/AssemblyInfo.cs rename to AppData/Properties/AssemblyInfo.cs index 242fd96..774a547 100644 --- a/TemplateProj_Data/Properties/AssemblyInfo.cs +++ b/AppData/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("TemplateProj_Data")] +[assembly: AssemblyTitle("App_Data")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("TemplateProj_Data")] +[assembly: AssemblyProduct("App_Data")] [assembly: AssemblyCopyright("Copyright © 2015")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/TemplateProj_Data/app.config b/AppData/app.config similarity index 61% rename from TemplateProj_Data/app.config rename to AppData/app.config index d3d5ddd..2f872aa 100644 --- a/TemplateProj_Data/app.config +++ b/AppData/app.config @@ -3,8 +3,8 @@ - \ No newline at end of file diff --git a/TemplateProj_Data/bin/Debug/Flesk.ViewState.dll b/AppData/bin/Debug/Flesk.ViewState.dll similarity index 100% rename from TemplateProj_Data/bin/Debug/Flesk.ViewState.dll rename to AppData/bin/Debug/Flesk.ViewState.dll diff --git a/TemplateProj_Data/bin/Debug/ICSharpCode.SharpZipLib.dll b/AppData/bin/Debug/ICSharpCode.SharpZipLib.dll similarity index 100% rename from TemplateProj_Data/bin/Debug/ICSharpCode.SharpZipLib.dll rename to AppData/bin/Debug/ICSharpCode.SharpZipLib.dll diff --git a/TemplateProj_Data/bin/Debug/NLog.config b/AppData/bin/Debug/NLog.config similarity index 100% rename from TemplateProj_Data/bin/Debug/NLog.config rename to AppData/bin/Debug/NLog.config diff --git a/AppData/bin/Debug/RunVisor_Data.dll b/AppData/bin/Debug/RunVisor_Data.dll new file mode 100644 index 0000000..247a8b6 Binary files /dev/null and b/AppData/bin/Debug/RunVisor_Data.dll differ diff --git a/TemplateProj_Data/bin/Debug/RunVisor_Data.dll.config b/AppData/bin/Debug/RunVisor_Data.dll.config similarity index 61% rename from TemplateProj_Data/bin/Debug/RunVisor_Data.dll.config rename to AppData/bin/Debug/RunVisor_Data.dll.config index d3d5ddd..2f872aa 100644 --- a/TemplateProj_Data/bin/Debug/RunVisor_Data.dll.config +++ b/AppData/bin/Debug/RunVisor_Data.dll.config @@ -3,8 +3,8 @@ - \ No newline at end of file diff --git a/TemplateProj_Data/bin/Debug/SteamWare.dll b/AppData/bin/Debug/SteamWare.dll similarity index 99% rename from TemplateProj_Data/bin/Debug/SteamWare.dll rename to AppData/bin/Debug/SteamWare.dll index 2c8a703..bf7a2fd 100644 Binary files a/TemplateProj_Data/bin/Debug/SteamWare.dll and b/AppData/bin/Debug/SteamWare.dll differ diff --git a/TemplateProj_Data/bin/Debug/SteamWare.xml b/AppData/bin/Debug/SteamWare.xml similarity index 100% rename from TemplateProj_Data/bin/Debug/SteamWare.xml rename to AppData/bin/Debug/SteamWare.xml diff --git a/AppData/obj/Debug/AppData.csproj.FileListAbsolute.txt b/AppData/obj/Debug/AppData.csproj.FileListAbsolute.txt new file mode 100644 index 0000000..8772931 --- /dev/null +++ b/AppData/obj/Debug/AppData.csproj.FileListAbsolute.txt @@ -0,0 +1,12 @@ +C:\Users\samuele\Documents\Visual Studio 2012\Projects\TemplateProj\AppData\bin\Debug\NLog.config +C:\Users\samuele\Documents\Visual Studio 2012\Projects\TemplateProj\AppData\bin\Debug\RunVisor_Data.dll.config +C:\Users\samuele\Documents\Visual Studio 2012\Projects\TemplateProj\AppData\bin\Debug\RunVisor_Data.dll +C:\Users\samuele\Documents\Visual Studio 2012\Projects\TemplateProj\AppData\bin\Debug\RunVisor_Data.pdb +C:\Users\samuele\Documents\Visual Studio 2012\Projects\TemplateProj\AppData\bin\Debug\SteamWare.dll +C:\Users\samuele\Documents\Visual Studio 2012\Projects\TemplateProj\AppData\bin\Debug\Flesk.ViewState.dll +C:\Users\samuele\Documents\Visual Studio 2012\Projects\TemplateProj\AppData\bin\Debug\ICSharpCode.SharpZipLib.dll +C:\Users\samuele\Documents\Visual Studio 2012\Projects\TemplateProj\AppData\bin\Debug\SteamWare.pdb +C:\Users\samuele\Documents\Visual Studio 2012\Projects\TemplateProj\AppData\bin\Debug\SteamWare.xml +C:\Users\samuele\Documents\Visual Studio 2012\Projects\TemplateProj\AppData\obj\Debug\AppData.csprojResolveAssemblyReference.cache +C:\Users\samuele\Documents\Visual Studio 2012\Projects\TemplateProj\AppData\obj\Debug\RunVisor_Data.dll +C:\Users\samuele\Documents\Visual Studio 2012\Projects\TemplateProj\AppData\obj\Debug\RunVisor_Data.pdb diff --git a/AppData/obj/Debug/RunVisor_Data.csproj.FileListAbsolute.txt b/AppData/obj/Debug/RunVisor_Data.csproj.FileListAbsolute.txt new file mode 100644 index 0000000..4af9d4d --- /dev/null +++ b/AppData/obj/Debug/RunVisor_Data.csproj.FileListAbsolute.txt @@ -0,0 +1,12 @@ +C:\Users\samuele\Documents\Visual Studio 2012\Projects\RunVisor\RunVisor_Data\bin\Debug\RunVisor_Data.dll +C:\Users\samuele\Documents\Visual Studio 2012\Projects\RunVisor\RunVisor_Data\bin\Debug\RunVisor_Data.pdb +C:\Users\samuele\Documents\Visual Studio 2012\Projects\RunVisor\RunVisor_Data\obj\Debug\RunVisor_Data.csprojResolveAssemblyReference.cache +C:\Users\samuele\Documents\Visual Studio 2012\Projects\RunVisor\RunVisor_Data\obj\Debug\RunVisor_Data.dll +C:\Users\samuele\Documents\Visual Studio 2012\Projects\RunVisor\RunVisor_Data\obj\Debug\RunVisor_Data.pdb +C:\Users\samuele\Documents\Visual Studio 2012\Projects\RunVisor\RunVisor_Data\bin\Debug\NLog.config +C:\Users\samuele\Documents\Visual Studio 2012\Projects\RunVisor\RunVisor_Data\bin\Debug\RunVisor_Data.dll.config +C:\Users\samuele\Documents\Visual Studio 2012\Projects\RunVisor\RunVisor_Data\bin\Debug\SteamWare.dll +C:\Users\samuele\Documents\Visual Studio 2012\Projects\RunVisor\RunVisor_Data\bin\Debug\Flesk.ViewState.dll +C:\Users\samuele\Documents\Visual Studio 2012\Projects\RunVisor\RunVisor_Data\bin\Debug\ICSharpCode.SharpZipLib.dll +C:\Users\samuele\Documents\Visual Studio 2012\Projects\RunVisor\RunVisor_Data\bin\Debug\SteamWare.pdb +C:\Users\samuele\Documents\Visual Studio 2012\Projects\RunVisor\RunVisor_Data\bin\Debug\SteamWare.xml diff --git a/AppData/obj/Debug/RunVisor_Data.dll b/AppData/obj/Debug/RunVisor_Data.dll new file mode 100644 index 0000000..247a8b6 Binary files /dev/null and b/AppData/obj/Debug/RunVisor_Data.dll differ diff --git a/AppData/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll b/AppData/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll new file mode 100644 index 0000000..1ce146b Binary files /dev/null and b/AppData/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll differ diff --git a/AppData/obj/Debug/TempPE/DS_Utility.Designer.cs.dll b/AppData/obj/Debug/TempPE/DS_Utility.Designer.cs.dll new file mode 100644 index 0000000..77b29b7 Binary files /dev/null and b/AppData/obj/Debug/TempPE/DS_Utility.Designer.cs.dll differ diff --git a/AppData/obj/Debug/TempPE/DS_Utility1.Designer.cs.dll b/AppData/obj/Debug/TempPE/DS_Utility1.Designer.cs.dll new file mode 100644 index 0000000..a95e8ae Binary files /dev/null and b/AppData/obj/Debug/TempPE/DS_Utility1.Designer.cs.dll differ diff --git a/AppData/obj/Debug/TemplateProj_Data.csproj.FileListAbsolute.txt b/AppData/obj/Debug/TemplateProj_Data.csproj.FileListAbsolute.txt new file mode 100644 index 0000000..e6bbac3 --- /dev/null +++ b/AppData/obj/Debug/TemplateProj_Data.csproj.FileListAbsolute.txt @@ -0,0 +1,12 @@ +C:\Users\samuele\Documents\Visual Studio 2012\Projects\TemplateProj\TemplateProj_Data\bin\Debug\NLog.config +C:\Users\samuele\Documents\Visual Studio 2012\Projects\TemplateProj\TemplateProj_Data\bin\Debug\RunVisor_Data.dll.config +C:\Users\samuele\Documents\Visual Studio 2012\Projects\TemplateProj\TemplateProj_Data\bin\Debug\RunVisor_Data.dll +C:\Users\samuele\Documents\Visual Studio 2012\Projects\TemplateProj\TemplateProj_Data\bin\Debug\RunVisor_Data.pdb +C:\Users\samuele\Documents\Visual Studio 2012\Projects\TemplateProj\TemplateProj_Data\bin\Debug\SteamWare.dll +C:\Users\samuele\Documents\Visual Studio 2012\Projects\TemplateProj\TemplateProj_Data\bin\Debug\Flesk.ViewState.dll +C:\Users\samuele\Documents\Visual Studio 2012\Projects\TemplateProj\TemplateProj_Data\bin\Debug\ICSharpCode.SharpZipLib.dll +C:\Users\samuele\Documents\Visual Studio 2012\Projects\TemplateProj\TemplateProj_Data\bin\Debug\SteamWare.pdb +C:\Users\samuele\Documents\Visual Studio 2012\Projects\TemplateProj\TemplateProj_Data\bin\Debug\SteamWare.xml +C:\Users\samuele\Documents\Visual Studio 2012\Projects\TemplateProj\TemplateProj_Data\obj\Debug\TemplateProj_Data.csprojResolveAssemblyReference.cache +C:\Users\samuele\Documents\Visual Studio 2012\Projects\TemplateProj\TemplateProj_Data\obj\Debug\RunVisor_Data.dll +C:\Users\samuele\Documents\Visual Studio 2012\Projects\TemplateProj\TemplateProj_Data\obj\Debug\RunVisor_Data.pdb diff --git a/AppData/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs b/AppData/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs new file mode 100644 index 0000000..e69de29 diff --git a/AppData/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs b/AppData/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs new file mode 100644 index 0000000..e69de29 diff --git a/AppData/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs b/AppData/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs new file mode 100644 index 0000000..e69de29 diff --git a/TemplateProj.sln b/TemplateProj.sln index c09844c..b2e2c18 100644 --- a/TemplateProj.sln +++ b/TemplateProj.sln @@ -7,7 +7,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VersGen", "VersGen\VersGen. EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TemplateProj", "TemplateProj\TemplateProj.csproj", "{EF418EE6-AF58-40B2-A391-13E83106103D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TemplateProj_Data", "TemplateProj_Data\TemplateProj_Data.csproj", "{AA1279F0-5688-48DF-9A46-D420A795A6AA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppData", "AppData\AppData.csproj", "{AA1279F0-5688-48DF-9A46-D420A795A6AA}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/TemplateProj/TemplateProj.csproj b/TemplateProj/TemplateProj.csproj index 68597e1..85f6bfd 100644 --- a/TemplateProj/TemplateProj.csproj +++ b/TemplateProj/TemplateProj.csproj @@ -503,9 +503,9 @@ {2872dcfe-8b46-43b2-baa0-842a816a2dd5} SteamWare - + {aa1279f0-5688-48df-9a46-d420a795a6aa} - TemplateProj_Data + AppData {6c5e5faf-90cd-4164-8f78-5659d2a8cca1} diff --git a/TemplateProj/WebUserControls/mod_listValues.ascx.cs b/TemplateProj/WebUserControls/mod_listValues.ascx.cs index f6e187a..1744779 100644 --- a/TemplateProj/WebUserControls/mod_listValues.ascx.cs +++ b/TemplateProj/WebUserControls/mod_listValues.ascx.cs @@ -5,7 +5,7 @@ using System.Web; using System.Web.UI; using System.Web.UI.WebControls; using SteamWare; -using TemplateProj_Data; +using App_Data; namespace TemplateProj.WebUserControls { diff --git a/TemplateProj/bin/RunVisor.dll b/TemplateProj/bin/RunVisor.dll index 9fa209f..e4d8dc9 100644 Binary files a/TemplateProj/bin/RunVisor.dll and b/TemplateProj/bin/RunVisor.dll differ diff --git a/TemplateProj/bin/RunVisor_Data.dll b/TemplateProj/bin/RunVisor_Data.dll index 9415f57..247a8b6 100644 Binary files a/TemplateProj/bin/RunVisor_Data.dll and b/TemplateProj/bin/RunVisor_Data.dll differ diff --git a/TemplateProj/bin/SteamWare.dll b/TemplateProj/bin/SteamWare.dll index 2c8a703..bf7a2fd 100644 Binary files a/TemplateProj/bin/SteamWare.dll and b/TemplateProj/bin/SteamWare.dll differ diff --git a/TemplateProj/bin/VersGen.dll b/TemplateProj/bin/VersGen.dll index 71a4d27..81c87e0 100644 Binary files a/TemplateProj/bin/VersGen.dll and b/TemplateProj/bin/VersGen.dll differ diff --git a/TemplateProj_Data/bin/Debug/RunVisor_Data.dll b/TemplateProj_Data/bin/Debug/RunVisor_Data.dll deleted file mode 100644 index 9415f57..0000000 Binary files a/TemplateProj_Data/bin/Debug/RunVisor_Data.dll and /dev/null differ diff --git a/VersGen/CodeVersion.cs b/VersGen/CodeVersion.cs index 8455629..7f2b040 100644 --- a/VersGen/CodeVersion.cs +++ b/VersGen/CodeVersion.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("0.6.016.35")] -[assembly: AssemblyFileVersion("0.6.016.35")] +[assembly: AssemblyVersion("0.1.023.452")] +[assembly: AssemblyFileVersion("0.1.023.452")] [assembly: AssemblyCopyright("Steamware © 2014-2015")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/CodeVersion.tt b/VersGen/CodeVersion.tt index c1dcbbf..50dbdc8 100644 --- a/VersGen/CodeVersion.tt +++ b/VersGen/CodeVersion.tt @@ -6,10 +6,10 @@ using System.Reflection; -[assembly: AssemblyVersion("0.6.016.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("0.6.016.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("0.1.023.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("0.1.023.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware © 2014-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+ - int RevisionNumber = (int)(DateTime.UtcNow - new DateTime(2014,10,1)).TotalDays/7; + int RevisionNumber = (int)(DateTime.UtcNow - new DateTime(2006,10,1)).TotalDays / 7; #> \ No newline at end of file diff --git a/VersGen/bin/Debug/VersGen.dll b/VersGen/bin/Debug/VersGen.dll index 71a4d27..81c87e0 100644 Binary files a/VersGen/bin/Debug/VersGen.dll and b/VersGen/bin/Debug/VersGen.dll differ