diff --git a/GIM_dataLayer/GIM_dataLayer.csproj b/GIM_dataLayer/GIM_dataLayer.csproj index 8eba5a4..d5347eb 100644 --- a/GIM_dataLayer/GIM_dataLayer.csproj +++ b/GIM_dataLayer/GIM_dataLayer.csproj @@ -29,6 +29,15 @@ prompt 4 + + bin\AlumatTest\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + False diff --git a/GIM_dataLayer/bin/Release/GIM_dataLayer.dll b/GIM_dataLayer/bin/Release/GIM_dataLayer.dll index 839f7cb..3ad1900 100644 Binary files a/GIM_dataLayer/bin/Release/GIM_dataLayer.dll and b/GIM_dataLayer/bin/Release/GIM_dataLayer.dll differ diff --git a/GIM_dataLayer/bin/Release/SteamWare.dll b/GIM_dataLayer/bin/Release/SteamWare.dll index dac26c9..3dbfeb4 100644 Binary files a/GIM_dataLayer/bin/Release/SteamWare.dll and b/GIM_dataLayer/bin/Release/SteamWare.dll differ diff --git a/GIM_dataLayer/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/GIM_dataLayer/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache index 9d50efc..1b70b72 100644 Binary files a/GIM_dataLayer/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/GIM_dataLayer/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/GIM_dataLayer/obj/Release/GIM_dataLayer.csprojResolveAssemblyReference.cache b/GIM_dataLayer/obj/Release/GIM_dataLayer.csprojResolveAssemblyReference.cache index e59ff7d..b4503a8 100644 Binary files a/GIM_dataLayer/obj/Release/GIM_dataLayer.csprojResolveAssemblyReference.cache and b/GIM_dataLayer/obj/Release/GIM_dataLayer.csprojResolveAssemblyReference.cache differ diff --git a/GIM_dataLayer/obj/Release/GIM_dataLayer.dll b/GIM_dataLayer/obj/Release/GIM_dataLayer.dll index 839f7cb..3ad1900 100644 Binary files a/GIM_dataLayer/obj/Release/GIM_dataLayer.dll and b/GIM_dataLayer/obj/Release/GIM_dataLayer.dll differ diff --git a/GIM_site/GIM_site.csproj b/GIM_site/GIM_site.csproj index 2c27db6..9dc8718 100644 --- a/GIM_site/GIM_site.csproj +++ b/GIM_site/GIM_site.csproj @@ -103,6 +103,16 @@ prompt AllRules.ruleset + + bin\ + true + pdbonly + AnyCPU + prompt + AllRules.ruleset + false + false + Debug @@ -868,6 +878,9 @@ Web.config Designer + + Web.config + Web.config diff --git a/GIM_site/Web.Alumat.config b/GIM_site/Web.Alumat.config index 797b8c1..d9202c2 100644 --- a/GIM_site/Web.Alumat.config +++ b/GIM_site/Web.Alumat.config @@ -10,11 +10,11 @@ - - - - - + + + + + @@ -23,8 +23,8 @@ - - + + diff --git a/GIM_site/Web.AlumatTest.config b/GIM_site/Web.AlumatTest.config new file mode 100644 index 0000000..83b8f22 --- /dev/null +++ b/GIM_site/Web.AlumatTest.config @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GIM_site/bin/SteamWare.dll b/GIM_site/bin/SteamWare.dll index dac26c9..3dbfeb4 100644 Binary files a/GIM_site/bin/SteamWare.dll and b/GIM_site/bin/SteamWare.dll differ diff --git a/GIM_site/chLang.aspx b/GIM_site/chLang.aspx index 3cae886..2abbb6f 100644 --- a/GIM_site/chLang.aspx +++ b/GIM_site/chLang.aspx @@ -1,4 +1,4 @@ -<%@ Page Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" Inherits="chLang" Title="Untitled Page" CodeBehind="chLang.aspx.cs" %> +<%@ Page Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" Inherits="chLang" Title="WebGIM" CodeBehind="chLang.aspx.cs" %> <%@ Register Src="~/WebUserControls/mod_chLang.ascx" TagName="mod_chLang" TagPrefix="uc1" %> diff --git a/GIM_site/forceUser.aspx b/GIM_site/forceUser.aspx index d453e45..5e47494 100644 --- a/GIM_site/forceUser.aspx +++ b/GIM_site/forceUser.aspx @@ -1,5 +1,5 @@ <%@ Page Language="C#" MasterPageFile="~/Bootstrap.master" AutoEventWireup="true" - Inherits="forceUser" Title="Untitled Page" CodeBehind="forceUser.aspx.cs" %> + Inherits="forceUser" Title="WebGIM" CodeBehind="forceUser.aspx.cs" %> <%@ Register Src="~/WebUserControls/mod_login.ascx" TagName="mod_login" TagPrefix="uc1" %> diff --git a/GIM_site/images/LogoCli.png b/GIM_site/images/LogoCli.png index 6e1bdcb..7877e1f 100644 Binary files a/GIM_site/images/LogoCli.png and b/GIM_site/images/LogoCli.png differ diff --git a/GIM_site/menu.aspx b/GIM_site/menu.aspx index d785700..953c7ea 100644 --- a/GIM_site/menu.aspx +++ b/GIM_site/menu.aspx @@ -1,4 +1,4 @@ -<%@ Page Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" Inherits="menu" Title="Untitled Page" CodeBehind="menu.aspx.cs" %> +<%@ Page Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" Inherits="menu" Title="WebGIM" CodeBehind="menu.aspx.cs" %> <%@ Register Src="~/WebUserControls/mod_main_help.ascx" TagName="mod_main_help" TagPrefix="uc2" %> diff --git a/GIM_site/setupTgt.bat b/GIM_site/setupTgt.bat index 2203c32..deaa795 100644 --- a/GIM_site/setupTgt.bat +++ b/GIM_site/setupTgt.bat @@ -2,6 +2,7 @@ echo Effettua setup dei file specifici per i clienti pre build installer: verifica da nome configurazione %1 if %1 == "Alumat" goto Alumat +if %1 == "AlumatTest" goto Alumat if %1 == "Debug" goto Debug if %1 == "IIS02" goto IIS02 if %1 == "Release" goto Release diff --git a/GIM_site/unauthorized.aspx b/GIM_site/unauthorized.aspx index b587730..4cb08ba 100644 --- a/GIM_site/unauthorized.aspx +++ b/GIM_site/unauthorized.aspx @@ -1,4 +1,4 @@ -<%@ Page Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" Inherits="unauthorized" Title="Untitled Page" CodeBehind="unauthorized.aspx.cs" %> +<%@ Page Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" Inherits="unauthorized" Title="WebGIM" CodeBehind="unauthorized.aspx.cs" %> <%@ Register Src="~/WebUserControls/mod_unauthorized.ascx" TagName="mod_unauthorized" TagPrefix="uc1" %> diff --git a/GIM_site/vocabolario.aspx b/GIM_site/vocabolario.aspx index 48470a7..896991b 100644 --- a/GIM_site/vocabolario.aspx +++ b/GIM_site/vocabolario.aspx @@ -1,4 +1,4 @@ -<%@ Page Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" Inherits="vocabolario" Title="Untitled Page" CodeBehind="vocabolario.aspx.cs" %> +<%@ Page Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" Inherits="vocabolario" Title="WebGIM" CodeBehind="vocabolario.aspx.cs" %> <%@ Register Src="~/WebUserControls/mod_vocabolario.ascx" TagName="mod_vocabolario" TagPrefix="uc1" %> <%@ Register Src="~/WebUserControls/mod_lemmiVocab.ascx" TagName="mod_lemmiVocab" TagPrefix="uc2" %> diff --git a/VersGen/VersGen.csproj b/VersGen/VersGen.csproj index 7340910..96c6668 100644 --- a/VersGen/VersGen.csproj +++ b/VersGen/VersGen.csproj @@ -32,6 +32,15 @@ 4 false + + bin\AlumatTest\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + diff --git a/VersGen/bin/Release/VersGen.dll b/VersGen/bin/Release/VersGen.dll index f6a41dd..6853d57 100644 Binary files a/VersGen/bin/Release/VersGen.dll and b/VersGen/bin/Release/VersGen.dll differ diff --git a/WebGIM.sln b/WebGIM.sln index fcb4d27..8b04919 100644 --- a/WebGIM.sln +++ b/WebGIM.sln @@ -14,6 +14,7 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Alumat|Any CPU = Alumat|Any CPU + AlumatTest|Any CPU = AlumatTest|Any CPU Debug|Any CPU = Debug|Any CPU IIS01|Any CPU = IIS01|Any CPU IIS02|Any CPU = IIS02|Any CPU @@ -25,6 +26,8 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {02C16B9B-9E89-42A7-A59C-E85A21E102F3}.Alumat|Any CPU.ActiveCfg = Alumat|Any CPU {02C16B9B-9E89-42A7-A59C-E85A21E102F3}.Alumat|Any CPU.Build.0 = Alumat|Any CPU + {02C16B9B-9E89-42A7-A59C-E85A21E102F3}.AlumatTest|Any CPU.ActiveCfg = AlumatTest|Any CPU + {02C16B9B-9E89-42A7-A59C-E85A21E102F3}.AlumatTest|Any CPU.Build.0 = AlumatTest|Any CPU {02C16B9B-9E89-42A7-A59C-E85A21E102F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {02C16B9B-9E89-42A7-A59C-E85A21E102F3}.Debug|Any CPU.Build.0 = Debug|Any CPU {02C16B9B-9E89-42A7-A59C-E85A21E102F3}.IIS01|Any CPU.ActiveCfg = IIS01|Any CPU @@ -41,6 +44,8 @@ Global {02C16B9B-9E89-42A7-A59C-E85A21E102F3}.SomaschiniUSA|Any CPU.Build.0 = SomaschiniUSA|Any CPU {BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.Alumat|Any CPU.ActiveCfg = Release|Any CPU {BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.Alumat|Any CPU.Build.0 = Release|Any CPU + {BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.AlumatTest|Any CPU.ActiveCfg = Release|Any CPU + {BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.AlumatTest|Any CPU.Build.0 = Release|Any CPU {BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.Debug|Any CPU.Build.0 = Debug|Any CPU {BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.IIS01|Any CPU.ActiveCfg = Release|Any CPU @@ -57,6 +62,8 @@ Global {BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.SomaschiniUSA|Any CPU.Build.0 = Release|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Alumat|Any CPU.ActiveCfg = Release|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Alumat|Any CPU.Build.0 = Release|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.AlumatTest|Any CPU.ActiveCfg = Release|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.AlumatTest|Any CPU.Build.0 = Release|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Any CPU.Build.0 = Debug|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS01|Any CPU.ActiveCfg = Release|Any CPU @@ -73,6 +80,8 @@ Global {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.SomaschiniUSA|Any CPU.Build.0 = Release|Any CPU {B430E135-72EC-49D1-9C82-274294CF2F80}.Alumat|Any CPU.ActiveCfg = Release|Any CPU {B430E135-72EC-49D1-9C82-274294CF2F80}.Alumat|Any CPU.Build.0 = Release|Any CPU + {B430E135-72EC-49D1-9C82-274294CF2F80}.AlumatTest|Any CPU.ActiveCfg = Release|Any CPU + {B430E135-72EC-49D1-9C82-274294CF2F80}.AlumatTest|Any CPU.Build.0 = Release|Any CPU {B430E135-72EC-49D1-9C82-274294CF2F80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B430E135-72EC-49D1-9C82-274294CF2F80}.Debug|Any CPU.Build.0 = Debug|Any CPU {B430E135-72EC-49D1-9C82-274294CF2F80}.IIS01|Any CPU.ActiveCfg = Release|Any CPU