From d89b6c39dfe0d306945b5c54eab95e632bd28ba3 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Thu, 26 Nov 2015 19:40:09 +0100 Subject: [PATCH] nouvelles configs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Makefile: * Yavsc.sln: * pkg.mdproj: * Presta.csproj: * TestAPI.csproj: * YavscModel.csproj: * YavscClient.csproj: * fortune.csproj: * WebControls.csproj: * SalesCatalog.csproj: * ITContentProvider.csproj: * NpgsqlMRPProviders.csproj: * NpgsqlBlogProvider.csproj: * Yavsc.csproj: * NpgsqlContentProvider.csproj: nouvelles configurations de déploiement * LocalizedText.resx: * LocalizedText.fr.resx: * LocalizedText.Designer.cs: * LocalizedText.fr.Designer.cs: internationalisation --- ChangeLog | 5 + ITContentProvider/ChangeLog | 5 + ITContentProvider/ITContentProvider.csproj | 21 ++++ Makefile | 14 ++- NpgsqlBlogProvider/ChangeLog | 5 + NpgsqlBlogProvider/NpgsqlBlogProvider.csproj | 21 ++++ NpgsqlContentProvider/ChangeLog | 5 + .../NpgsqlContentProvider.csproj | 21 ++++ NpgsqlMRPProviders/ChangeLog | 5 + NpgsqlMRPProviders/NpgsqlMRPProviders.csproj | 21 ++++ Presta/ChangeLog | 4 + Presta/Presta.csproj | 21 ++++ SalesCatalog/ChangeLog | 4 + SalesCatalog/SalesCatalog.csproj | 21 ++++ TestAPI/ChangeLog | 4 + TestAPI/TestAPI.csproj | 27 +++++- WebControls/ChangeLog | 4 + WebControls/WebControls.csproj | 25 ++++- Yavsc.sln | 96 ++++++++++++++++++- pkg/ChangeLog | 4 + pkg/pkg.mdproj | 2 +- plugins/fortune/ChangeLog | 4 + plugins/fortune/fortune.csproj | 21 ++++ web/ChangeLog | 5 + web/{Web.csproj => Yavsc.csproj} | 25 ++++- yavscModel/ChangeLog | 9 ++ yavscModel/LocalizedText.Designer.cs | 20 +++- yavscModel/LocalizedText.fr.Designer.cs | 20 +++- yavscModel/LocalizedText.fr.resx | 4 +- yavscModel/LocalizedText.resx | 4 +- yavscModel/YavscModel.csproj | 23 +++++ yavscclient/ChangeLog | 4 + yavscclient/YavscClient.csproj | 21 ++++ 33 files changed, 475 insertions(+), 20 deletions(-) rename web/{Web.csproj => Yavsc.csproj} (96%) diff --git a/ChangeLog b/ChangeLog index a445cb83..429cb6a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-11-26 Paul Schneider + + * Makefile: + * Yavsc.sln: nouvelles configurations de déploiement + 2015-11-23 Paul Schneider * .gitignore: ignorer les configuration des pré et prod totem. diff --git a/ITContentProvider/ChangeLog b/ITContentProvider/ChangeLog index cc66052e..cce4f12a 100644 --- a/ITContentProvider/ChangeLog +++ b/ITContentProvider/ChangeLog @@ -1,3 +1,8 @@ +2015-11-26 Paul Schneider + + * ITContentProvider.csproj: nouvelles configurations de + déploiement + 2015-11-19 Paul Schneider * ITContentProvider.csproj: adds a build target named "Lua" diff --git a/ITContentProvider/ITContentProvider.csproj b/ITContentProvider/ITContentProvider.csproj index 3b3de86f..5c2cb231 100644 --- a/ITContentProvider/ITContentProvider.csproj +++ b/ITContentProvider/ITContentProvider.csproj @@ -36,6 +36,27 @@ false bin\Lua 4 + v4.5 + + + false + bin\TotemPre + 4 + + + false + bin\TotemProd + 4 + + + false + bin\YavscPre + 4 + + + false + bin\Yavsc + 4 diff --git a/Makefile b/Makefile index fbda41d6..1280ce90 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,9 @@ DESTDIR_rsync_pre=/srv/www/yavscpre HOST_rsync_prod=lua.pschneider.fr DESTDIR_rsync_prod=/srv/www/yavsc +HOST_rsync_yavsc=lua.pschneider.fr +DESTDIR_rsync_yavsc=/srv/www/yavsc + HOST_rsync_lua=lua.pschneider.fr DESTDIR_rsync_lua=/srv/www/lua @@ -36,7 +39,7 @@ ddir: deploy: ddir build rm -rf $(LYDESTDIR) - xbuild /p:Configuration=$(CONFIG) /p:SkipCopyUnchangedFiles=$(COPYUNCHANGED) /p:DeployDir=../$(LDYDESTDIR) /t:Deploy web/Web.csproj + xbuild /p:Configuration=$(CONFIG) /p:SkipCopyUnchangedFiles=$(COPYUNCHANGED) /p:DeployDir=../$(LDYDESTDIR) /t:Deploy web/Yavsc.csproj rsync_% : HOST = $(HOST_$@) @@ -73,11 +76,13 @@ docdeploy-prod: htmldoc rsync_lua: CONFIG = Lua -rsync_yavsc: +rsync_pre: CONFIG = YavscPre + +rsync_prod: CONFIG = Yavsc -rsync_pre: +rsync_totempre: CONFIG = TotemPre -rsync_prod: +rsync_totemprod: CONFIG = TotemProd nuget_restore: for prj in ITContentProvider NpgsqlBlogProvider NpgsqlContentProvider NpgsqlMRPProviders Presta SalesCatalog TestAPI web WebControls yavscclient yavscModel; do nuget restore "$${prj}/packages.config" -SolutionDirectory . ; done @@ -86,3 +91,4 @@ nuget_update: for prj in ITContentProvider NpgsqlBlogProvider NpgsqlContentProvider NpgsqlMRPProviders Presta SalesCatalog TestAPI web WebControls yavscclient yavscModel; do nuget update "$${prj}/packages.config" ; done + diff --git a/NpgsqlBlogProvider/ChangeLog b/NpgsqlBlogProvider/ChangeLog index 60b3e728..8765f36b 100644 --- a/NpgsqlBlogProvider/ChangeLog +++ b/NpgsqlBlogProvider/ChangeLog @@ -1,3 +1,8 @@ +2015-11-26 Paul Schneider + + * NpgsqlBlogProvider.csproj: nouvelles configurations de + déploiement + 2015-11-19 Paul Schneider * NpgsqlBlogProvider.csproj: adds a build target named "Lua" diff --git a/NpgsqlBlogProvider/NpgsqlBlogProvider.csproj b/NpgsqlBlogProvider/NpgsqlBlogProvider.csproj index 92bf7b61..c3a849cb 100644 --- a/NpgsqlBlogProvider/NpgsqlBlogProvider.csproj +++ b/NpgsqlBlogProvider/NpgsqlBlogProvider.csproj @@ -36,6 +36,27 @@ false bin\Lua 4 + v4.5 + + + false + bin\TotemPre + 4 + + + false + bin\TotemProd + 4 + + + false + bin\YavscPre + 4 + + + false + bin\Yavsc + 4 diff --git a/NpgsqlContentProvider/ChangeLog b/NpgsqlContentProvider/ChangeLog index 3f8d2ff6..05dad7d5 100644 --- a/NpgsqlContentProvider/ChangeLog +++ b/NpgsqlContentProvider/ChangeLog @@ -1,3 +1,8 @@ +2015-11-26 Paul Schneider + + * NpgsqlContentProvider.csproj: nouvelles configurations de + déploiement + 2015-11-26 Paul Schneider * NpgsqlContentProvider.cs: reccupère la photo activité en diff --git a/NpgsqlContentProvider/NpgsqlContentProvider.csproj b/NpgsqlContentProvider/NpgsqlContentProvider.csproj index ee1609f9..1d94858a 100644 --- a/NpgsqlContentProvider/NpgsqlContentProvider.csproj +++ b/NpgsqlContentProvider/NpgsqlContentProvider.csproj @@ -36,6 +36,27 @@ false bin\Lua 4 + v4.5 + + + false + bin\TotemPre + 4 + + + false + bin\TotemProd + 4 + + + false + bin\YavscPre + 4 + + + false + bin\Yavsc + 4 diff --git a/NpgsqlMRPProviders/ChangeLog b/NpgsqlMRPProviders/ChangeLog index 6febb233..f592c921 100644 --- a/NpgsqlMRPProviders/ChangeLog +++ b/NpgsqlMRPProviders/ChangeLog @@ -1,3 +1,8 @@ +2015-11-26 Paul Schneider + + * NpgsqlMRPProviders.csproj: nouvelles configurations de + déploiement + 2015-11-23 Paul Schneider * NpgsqlProfileProvider.cs: Fixe un bug introduit avec diff --git a/NpgsqlMRPProviders/NpgsqlMRPProviders.csproj b/NpgsqlMRPProviders/NpgsqlMRPProviders.csproj index 2b7112eb..7091ab01 100644 --- a/NpgsqlMRPProviders/NpgsqlMRPProviders.csproj +++ b/NpgsqlMRPProviders/NpgsqlMRPProviders.csproj @@ -36,6 +36,27 @@ false bin\Lua 4 + v4.5 + + + false + bin\TotemPre + 4 + + + false + bin\TotemProd + 4 + + + false + bin\YavscPre + 4 + + + false + bin\Yavsc + 4 diff --git a/Presta/ChangeLog b/Presta/ChangeLog index 29f95d41..5318cd3c 100644 --- a/Presta/ChangeLog +++ b/Presta/ChangeLog @@ -1,3 +1,7 @@ +2015-11-26 Paul Schneider + + * Presta.csproj: nouvelles configurations de déploiement + 2015-11-19 Paul Schneider * Presta.csproj: adds a build target named "Lua" diff --git a/Presta/Presta.csproj b/Presta/Presta.csproj index c9005871..ede37bae 100644 --- a/Presta/Presta.csproj +++ b/Presta/Presta.csproj @@ -35,6 +35,27 @@ false bin\Lua 4 + v4.5 + + + false + bin\TotemPre + 4 + + + false + bin\TotemProd + 4 + + + false + bin\YavscPre + 4 + + + false + bin\Yavsc + 4 diff --git a/SalesCatalog/ChangeLog b/SalesCatalog/ChangeLog index 8434bb30..30937a6c 100644 --- a/SalesCatalog/ChangeLog +++ b/SalesCatalog/ChangeLog @@ -1,3 +1,7 @@ +2015-11-26 Paul Schneider + + * SalesCatalog.csproj: nouvelles configurations de déploiement + 2015-11-19 Paul Schneider * SalesCatalog.csproj: adds a build target named "Lua" diff --git a/SalesCatalog/SalesCatalog.csproj b/SalesCatalog/SalesCatalog.csproj index 7dcb9610..39b02a2b 100644 --- a/SalesCatalog/SalesCatalog.csproj +++ b/SalesCatalog/SalesCatalog.csproj @@ -36,6 +36,27 @@ false bin\Lua 4 + v4.5 + + + false + bin\TotemPre + 4 + + + false + bin\TotemProd + 4 + + + false + bin\YavscPre + 4 + + + false + bin\Yavsc + 4 diff --git a/TestAPI/ChangeLog b/TestAPI/ChangeLog index a84e530a..187eeb19 100644 --- a/TestAPI/ChangeLog +++ b/TestAPI/ChangeLog @@ -1,3 +1,7 @@ +2015-11-26 Paul Schneider + + * TestAPI.csproj: nouvelles configurations de déploiement + 2015-11-25 Paul Schneider * TestAPI.csproj: ... une référence au framework 4.5.1 en diff --git a/TestAPI/TestAPI.csproj b/TestAPI/TestAPI.csproj index 19963100..2dcfe548 100644 --- a/TestAPI/TestAPI.csproj +++ b/TestAPI/TestAPI.csproj @@ -20,6 +20,7 @@ prompt 4 false + v4.5.1 full @@ -28,11 +29,33 @@ prompt 4 false + v4.5.1 false bin\Lua 4 + v4.5.1 + + + false + bin\TotemPre + 4 + + + false + bin\TotemProd + 4 + + + false + bin\YavscPre + 4 + + + false + bin\Yavsc + 4 @@ -122,9 +145,9 @@ {90BF2234-7252-4CD5-B2A4-17501B19279B} SalesCatalog - + {77044C92-D2F1-45BD-80DD-AA25B311B027} - Web + Yavsc diff --git a/WebControls/ChangeLog b/WebControls/ChangeLog index 21f990ed..9fe72373 100644 --- a/WebControls/ChangeLog +++ b/WebControls/ChangeLog @@ -1,3 +1,7 @@ +2015-11-26 Paul Schneider + + * WebControls.csproj: nouvelles configurations de déploiement + 2015-11-19 Paul Schneider * WebControls.csproj: Lua config diff --git a/WebControls/WebControls.csproj b/WebControls/WebControls.csproj index f725dc32..121ffcdd 100644 --- a/WebControls/WebControls.csproj +++ b/WebControls/WebControls.csproj @@ -8,8 +8,8 @@ {59E1DF7B-FFA0-4DEB-B5F3-76EBD98D5356} Library WebControls - v4.5 Yavsc.WebControls + v4.5 true @@ -21,6 +21,7 @@ 4 false bin\Debug\Yavsc.WebControls.xml + v4.5 full @@ -29,11 +30,33 @@ prompt 4 false + v4.5 false bin\Lua 4 + v4.5 + + + false + bin\TotemPre + 4 + + + false + bin\TotemProd + 4 + + + false + bin\YavscPre + 4 + + + false + bin\Yavsc + 4 diff --git a/Yavsc.sln b/Yavsc.sln index e65a0921..97ea30c6 100644 --- a/Yavsc.sln +++ b/Yavsc.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Web", "web\Web.csproj", "{77044C92-D2F1-45BD-80DD-AA25B311B027}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yavsc", "web\Yavsc.csproj", "{77044C92-D2F1-45BD-80DD-AA25B311B027}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NpgsqlMRPProviders", "NpgsqlMRPProviders\NpgsqlMRPProviders.csproj", "{BBA7175D-7F92-4278-96FC-84C495A2B5A6}" EndProject @@ -41,6 +41,10 @@ Global Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU Lua|Any CPU = Lua|Any CPU + TotemPre|Any CPU = TotemPre|Any CPU + TotemProd|Any CPU = TotemProd|Any CPU + YavscPre|Any CPU = YavscPre|Any CPU + Yavsc|Any CPU = Yavsc|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {42B77C89-BF6D-4DB1-8763-6197F4030A95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -48,74 +52,164 @@ Global {42B77C89-BF6D-4DB1-8763-6197F4030A95}.Lua|Any CPU.ActiveCfg = Lua|Any CPU {42B77C89-BF6D-4DB1-8763-6197F4030A95}.Release|Any CPU.ActiveCfg = Release|Any CPU {42B77C89-BF6D-4DB1-8763-6197F4030A95}.Release|Any CPU.Build.0 = Release|Any CPU + {42B77C89-BF6D-4DB1-8763-6197F4030A95}.TotemPre|Any CPU.ActiveCfg = TotemPre|Any CPU + {42B77C89-BF6D-4DB1-8763-6197F4030A95}.TotemProd|Any CPU.ActiveCfg = TotemProd|Any CPU + {42B77C89-BF6D-4DB1-8763-6197F4030A95}.TotemProd|Any CPU.Build.0 = TotemProd|Any CPU + {42B77C89-BF6D-4DB1-8763-6197F4030A95}.Yavsc|Any CPU.ActiveCfg = Yavsc|Any CPU + {42B77C89-BF6D-4DB1-8763-6197F4030A95}.YavscPre|Any CPU.ActiveCfg = YavscPre|Any CPU {59E1DF7B-FFA0-4DEB-B5F3-76EBD98D5356}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {59E1DF7B-FFA0-4DEB-B5F3-76EBD98D5356}.Debug|Any CPU.Build.0 = Debug|Any CPU {59E1DF7B-FFA0-4DEB-B5F3-76EBD98D5356}.Lua|Any CPU.ActiveCfg = Lua|Any CPU {59E1DF7B-FFA0-4DEB-B5F3-76EBD98D5356}.Lua|Any CPU.Build.0 = Lua|Any CPU {59E1DF7B-FFA0-4DEB-B5F3-76EBD98D5356}.Release|Any CPU.ActiveCfg = Release|Any CPU {59E1DF7B-FFA0-4DEB-B5F3-76EBD98D5356}.Release|Any CPU.Build.0 = Release|Any CPU + {59E1DF7B-FFA0-4DEB-B5F3-76EBD98D5356}.TotemPre|Any CPU.ActiveCfg = TotemPre|Any CPU + {59E1DF7B-FFA0-4DEB-B5F3-76EBD98D5356}.TotemPre|Any CPU.Build.0 = TotemPre|Any CPU + {59E1DF7B-FFA0-4DEB-B5F3-76EBD98D5356}.TotemProd|Any CPU.ActiveCfg = TotemProd|Any CPU + {59E1DF7B-FFA0-4DEB-B5F3-76EBD98D5356}.TotemProd|Any CPU.Build.0 = TotemProd|Any CPU + {59E1DF7B-FFA0-4DEB-B5F3-76EBD98D5356}.Yavsc|Any CPU.ActiveCfg = Yavsc|Any CPU + {59E1DF7B-FFA0-4DEB-B5F3-76EBD98D5356}.Yavsc|Any CPU.Build.0 = Yavsc|Any CPU + {59E1DF7B-FFA0-4DEB-B5F3-76EBD98D5356}.YavscPre|Any CPU.ActiveCfg = YavscPre|Any CPU + {59E1DF7B-FFA0-4DEB-B5F3-76EBD98D5356}.YavscPre|Any CPU.Build.0 = YavscPre|Any CPU {68F5B80A-616E-4C3C-91A0-828AA40000BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {68F5B80A-616E-4C3C-91A0-828AA40000BD}.Debug|Any CPU.Build.0 = Debug|Any CPU {68F5B80A-616E-4C3C-91A0-828AA40000BD}.Lua|Any CPU.ActiveCfg = Lua|Any CPU {68F5B80A-616E-4C3C-91A0-828AA40000BD}.Lua|Any CPU.Build.0 = Lua|Any CPU {68F5B80A-616E-4C3C-91A0-828AA40000BD}.Release|Any CPU.ActiveCfg = Release|Any CPU {68F5B80A-616E-4C3C-91A0-828AA40000BD}.Release|Any CPU.Build.0 = Release|Any CPU + {68F5B80A-616E-4C3C-91A0-828AA40000BD}.TotemPre|Any CPU.ActiveCfg = TotemPre|Any CPU + {68F5B80A-616E-4C3C-91A0-828AA40000BD}.TotemPre|Any CPU.Build.0 = TotemPre|Any CPU + {68F5B80A-616E-4C3C-91A0-828AA40000BD}.TotemProd|Any CPU.ActiveCfg = TotemProd|Any CPU + {68F5B80A-616E-4C3C-91A0-828AA40000BD}.TotemProd|Any CPU.Build.0 = TotemProd|Any CPU + {68F5B80A-616E-4C3C-91A0-828AA40000BD}.Yavsc|Any CPU.ActiveCfg = Yavsc|Any CPU + {68F5B80A-616E-4C3C-91A0-828AA40000BD}.Yavsc|Any CPU.Build.0 = Yavsc|Any CPU + {68F5B80A-616E-4C3C-91A0-828AA40000BD}.YavscPre|Any CPU.ActiveCfg = YavscPre|Any CPU + {68F5B80A-616E-4C3C-91A0-828AA40000BD}.YavscPre|Any CPU.Build.0 = YavscPre|Any CPU {6A312228-9641-478D-916F-4681CC65A35D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6A312228-9641-478D-916F-4681CC65A35D}.Debug|Any CPU.Build.0 = Debug|Any CPU {6A312228-9641-478D-916F-4681CC65A35D}.Lua|Any CPU.ActiveCfg = Lua|Any CPU {6A312228-9641-478D-916F-4681CC65A35D}.Lua|Any CPU.Build.0 = Lua|Any CPU {6A312228-9641-478D-916F-4681CC65A35D}.Release|Any CPU.ActiveCfg = Release|Any CPU {6A312228-9641-478D-916F-4681CC65A35D}.Release|Any CPU.Build.0 = Release|Any CPU + {6A312228-9641-478D-916F-4681CC65A35D}.TotemPre|Any CPU.ActiveCfg = TotemPre|Any CPU + {6A312228-9641-478D-916F-4681CC65A35D}.TotemProd|Any CPU.ActiveCfg = TotemProd|Any CPU + {6A312228-9641-478D-916F-4681CC65A35D}.TotemProd|Any CPU.Build.0 = TotemProd|Any CPU + {6A312228-9641-478D-916F-4681CC65A35D}.Yavsc|Any CPU.ActiveCfg = Yavsc|Any CPU + {6A312228-9641-478D-916F-4681CC65A35D}.Yavsc|Any CPU.Build.0 = Yavsc|Any CPU + {6A312228-9641-478D-916F-4681CC65A35D}.YavscPre|Any CPU.ActiveCfg = YavscPre|Any CPU {77044C92-D2F1-45BD-80DD-AA25B311B027}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {77044C92-D2F1-45BD-80DD-AA25B311B027}.Debug|Any CPU.Build.0 = Debug|Any CPU {77044C92-D2F1-45BD-80DD-AA25B311B027}.Lua|Any CPU.ActiveCfg = Lua|Any CPU {77044C92-D2F1-45BD-80DD-AA25B311B027}.Lua|Any CPU.Build.0 = Lua|Any CPU {77044C92-D2F1-45BD-80DD-AA25B311B027}.Release|Any CPU.ActiveCfg = Release|Any CPU {77044C92-D2F1-45BD-80DD-AA25B311B027}.Release|Any CPU.Build.0 = Release|Any CPU + {77044C92-D2F1-45BD-80DD-AA25B311B027}.TotemPre|Any CPU.ActiveCfg = TotemPre|Any CPU + {77044C92-D2F1-45BD-80DD-AA25B311B027}.TotemPre|Any CPU.Build.0 = TotemPre|Any CPU + {77044C92-D2F1-45BD-80DD-AA25B311B027}.TotemProd|Any CPU.ActiveCfg = TotemProd|Any CPU + {77044C92-D2F1-45BD-80DD-AA25B311B027}.TotemProd|Any CPU.Build.0 = TotemProd|Any CPU + {77044C92-D2F1-45BD-80DD-AA25B311B027}.Yavsc|Any CPU.ActiveCfg = Yavsc|Any CPU + {77044C92-D2F1-45BD-80DD-AA25B311B027}.Yavsc|Any CPU.Build.0 = Yavsc|Any CPU + {77044C92-D2F1-45BD-80DD-AA25B311B027}.YavscPre|Any CPU.ActiveCfg = YavscPre|Any CPU + {77044C92-D2F1-45BD-80DD-AA25B311B027}.YavscPre|Any CPU.Build.0 = YavscPre|Any CPU {821FF72D-9F4B-4A2C-B95C-7B965291F119}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {821FF72D-9F4B-4A2C-B95C-7B965291F119}.Debug|Any CPU.Build.0 = Debug|Any CPU {821FF72D-9F4B-4A2C-B95C-7B965291F119}.Lua|Any CPU.ActiveCfg = Lua|Any CPU {821FF72D-9F4B-4A2C-B95C-7B965291F119}.Lua|Any CPU.Build.0 = Lua|Any CPU {821FF72D-9F4B-4A2C-B95C-7B965291F119}.Release|Any CPU.ActiveCfg = Release|Any CPU {821FF72D-9F4B-4A2C-B95C-7B965291F119}.Release|Any CPU.Build.0 = Release|Any CPU + {821FF72D-9F4B-4A2C-B95C-7B965291F119}.TotemPre|Any CPU.ActiveCfg = TotemPre|Any CPU + {821FF72D-9F4B-4A2C-B95C-7B965291F119}.TotemPre|Any CPU.Build.0 = TotemPre|Any CPU + {821FF72D-9F4B-4A2C-B95C-7B965291F119}.TotemProd|Any CPU.ActiveCfg = TotemProd|Any CPU + {821FF72D-9F4B-4A2C-B95C-7B965291F119}.TotemProd|Any CPU.Build.0 = TotemProd|Any CPU + {821FF72D-9F4B-4A2C-B95C-7B965291F119}.Yavsc|Any CPU.ActiveCfg = Yavsc|Any CPU + {821FF72D-9F4B-4A2C-B95C-7B965291F119}.Yavsc|Any CPU.Build.0 = Yavsc|Any CPU + {821FF72D-9F4B-4A2C-B95C-7B965291F119}.YavscPre|Any CPU.ActiveCfg = YavscPre|Any CPU + {821FF72D-9F4B-4A2C-B95C-7B965291F119}.YavscPre|Any CPU.Build.0 = YavscPre|Any CPU {90BF2234-7252-4CD5-B2A4-17501B19279B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {90BF2234-7252-4CD5-B2A4-17501B19279B}.Debug|Any CPU.Build.0 = Debug|Any CPU {90BF2234-7252-4CD5-B2A4-17501B19279B}.Lua|Any CPU.ActiveCfg = Lua|Any CPU {90BF2234-7252-4CD5-B2A4-17501B19279B}.Lua|Any CPU.Build.0 = Lua|Any CPU {90BF2234-7252-4CD5-B2A4-17501B19279B}.Release|Any CPU.ActiveCfg = Release|Any CPU {90BF2234-7252-4CD5-B2A4-17501B19279B}.Release|Any CPU.Build.0 = Release|Any CPU + {90BF2234-7252-4CD5-B2A4-17501B19279B}.TotemPre|Any CPU.ActiveCfg = TotemPre|Any CPU + {90BF2234-7252-4CD5-B2A4-17501B19279B}.TotemProd|Any CPU.ActiveCfg = TotemProd|Any CPU + {90BF2234-7252-4CD5-B2A4-17501B19279B}.TotemProd|Any CPU.Build.0 = TotemProd|Any CPU + {90BF2234-7252-4CD5-B2A4-17501B19279B}.Yavsc|Any CPU.ActiveCfg = Yavsc|Any CPU + {90BF2234-7252-4CD5-B2A4-17501B19279B}.Yavsc|Any CPU.Build.0 = Yavsc|Any CPU + {90BF2234-7252-4CD5-B2A4-17501B19279B}.YavscPre|Any CPU.ActiveCfg = YavscPre|Any CPU + {90BF2234-7252-4CD5-B2A4-17501B19279B}.YavscPre|Any CPU.Build.0 = YavscPre|Any CPU {9D7D892E-9B77-4713-892D-C26E1E944119}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9D7D892E-9B77-4713-892D-C26E1E944119}.Debug|Any CPU.Build.0 = Debug|Any CPU {9D7D892E-9B77-4713-892D-C26E1E944119}.Lua|Any CPU.ActiveCfg = Lua|Any CPU {9D7D892E-9B77-4713-892D-C26E1E944119}.Lua|Any CPU.Build.0 = Lua|Any CPU {9D7D892E-9B77-4713-892D-C26E1E944119}.Release|Any CPU.ActiveCfg = Release|Any CPU {9D7D892E-9B77-4713-892D-C26E1E944119}.Release|Any CPU.Build.0 = Release|Any CPU + {9D7D892E-9B77-4713-892D-C26E1E944119}.TotemPre|Any CPU.ActiveCfg = TotemPre|Any CPU + {9D7D892E-9B77-4713-892D-C26E1E944119}.TotemPre|Any CPU.Build.0 = TotemPre|Any CPU + {9D7D892E-9B77-4713-892D-C26E1E944119}.TotemProd|Any CPU.ActiveCfg = TotemProd|Any CPU + {9D7D892E-9B77-4713-892D-C26E1E944119}.TotemProd|Any CPU.Build.0 = TotemProd|Any CPU + {9D7D892E-9B77-4713-892D-C26E1E944119}.Yavsc|Any CPU.ActiveCfg = Yavsc|Any CPU + {9D7D892E-9B77-4713-892D-C26E1E944119}.Yavsc|Any CPU.Build.0 = Yavsc|Any CPU + {9D7D892E-9B77-4713-892D-C26E1E944119}.YavscPre|Any CPU.ActiveCfg = YavscPre|Any CPU + {9D7D892E-9B77-4713-892D-C26E1E944119}.YavscPre|Any CPU.Build.0 = YavscPre|Any CPU {B5F49C21-7BB3-4DC0-AE65-F4ED0F6D15BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B5F49C21-7BB3-4DC0-AE65-F4ED0F6D15BD}.Debug|Any CPU.Build.0 = Debug|Any CPU {B5F49C21-7BB3-4DC0-AE65-F4ED0F6D15BD}.Lua|Any CPU.ActiveCfg = Lua|Any CPU {B5F49C21-7BB3-4DC0-AE65-F4ED0F6D15BD}.Release|Any CPU.ActiveCfg = Release|Any CPU {B5F49C21-7BB3-4DC0-AE65-F4ED0F6D15BD}.Release|Any CPU.Build.0 = Release|Any CPU + {B5F49C21-7BB3-4DC0-AE65-F4ED0F6D15BD}.TotemPre|Any CPU.ActiveCfg = TotemPre|Any CPU + {B5F49C21-7BB3-4DC0-AE65-F4ED0F6D15BD}.TotemProd|Any CPU.ActiveCfg = TotemProd|Any CPU + {B5F49C21-7BB3-4DC0-AE65-F4ED0F6D15BD}.Yavsc|Any CPU.ActiveCfg = Yavsc|Any CPU + {B5F49C21-7BB3-4DC0-AE65-F4ED0F6D15BD}.Yavsc|Any CPU.Build.0 = Yavsc|Any CPU + {B5F49C21-7BB3-4DC0-AE65-F4ED0F6D15BD}.YavscPre|Any CPU.ActiveCfg = YavscPre|Any CPU {BBA7175D-7F92-4278-96FC-84C495A2B5A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BBA7175D-7F92-4278-96FC-84C495A2B5A6}.Debug|Any CPU.Build.0 = Debug|Any CPU {BBA7175D-7F92-4278-96FC-84C495A2B5A6}.Lua|Any CPU.ActiveCfg = Lua|Any CPU {BBA7175D-7F92-4278-96FC-84C495A2B5A6}.Lua|Any CPU.Build.0 = Lua|Any CPU {BBA7175D-7F92-4278-96FC-84C495A2B5A6}.Release|Any CPU.ActiveCfg = Release|Any CPU {BBA7175D-7F92-4278-96FC-84C495A2B5A6}.Release|Any CPU.Build.0 = Release|Any CPU + {BBA7175D-7F92-4278-96FC-84C495A2B5A6}.TotemPre|Any CPU.ActiveCfg = TotemPre|Any CPU + {BBA7175D-7F92-4278-96FC-84C495A2B5A6}.TotemPre|Any CPU.Build.0 = TotemPre|Any CPU + {BBA7175D-7F92-4278-96FC-84C495A2B5A6}.TotemProd|Any CPU.ActiveCfg = TotemProd|Any CPU + {BBA7175D-7F92-4278-96FC-84C495A2B5A6}.TotemProd|Any CPU.Build.0 = TotemProd|Any CPU + {BBA7175D-7F92-4278-96FC-84C495A2B5A6}.Yavsc|Any CPU.ActiveCfg = Yavsc|Any CPU + {BBA7175D-7F92-4278-96FC-84C495A2B5A6}.Yavsc|Any CPU.Build.0 = Yavsc|Any CPU + {BBA7175D-7F92-4278-96FC-84C495A2B5A6}.YavscPre|Any CPU.ActiveCfg = YavscPre|Any CPU + {BBA7175D-7F92-4278-96FC-84C495A2B5A6}.YavscPre|Any CPU.Build.0 = YavscPre|Any CPU {C6DBD1DC-B619-4DC7-BC92-15693508541E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C6DBD1DC-B619-4DC7-BC92-15693508541E}.Lua|Any CPU.ActiveCfg = Lua|Any CPU {C6DBD1DC-B619-4DC7-BC92-15693508541E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C6DBD1DC-B619-4DC7-BC92-15693508541E}.TotemPre|Any CPU.ActiveCfg = TotemPre|Any CPU + {C6DBD1DC-B619-4DC7-BC92-15693508541E}.TotemProd|Any CPU.ActiveCfg = TotemProd|Any CPU + {C6DBD1DC-B619-4DC7-BC92-15693508541E}.Yavsc|Any CPU.ActiveCfg = Yavsc|Any CPU + {C6DBD1DC-B619-4DC7-BC92-15693508541E}.YavscPre|Any CPU.ActiveCfg = YavscPre|Any CPU {C6E9E91B-97D3-48D9-8AA7-05356929E162}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C6E9E91B-97D3-48D9-8AA7-05356929E162}.Debug|Any CPU.Build.0 = Debug|Any CPU {C6E9E91B-97D3-48D9-8AA7-05356929E162}.Lua|Any CPU.ActiveCfg = Lua|Any CPU {C6E9E91B-97D3-48D9-8AA7-05356929E162}.Lua|Any CPU.Build.0 = Lua|Any CPU {C6E9E91B-97D3-48D9-8AA7-05356929E162}.Release|Any CPU.ActiveCfg = Release|Any CPU {C6E9E91B-97D3-48D9-8AA7-05356929E162}.Release|Any CPU.Build.0 = Release|Any CPU + {C6E9E91B-97D3-48D9-8AA7-05356929E162}.TotemPre|Any CPU.ActiveCfg = TotemPre|Any CPU + {C6E9E91B-97D3-48D9-8AA7-05356929E162}.TotemPre|Any CPU.Build.0 = TotemPre|Any CPU + {C6E9E91B-97D3-48D9-8AA7-05356929E162}.TotemProd|Any CPU.ActiveCfg = TotemProd|Any CPU + {C6E9E91B-97D3-48D9-8AA7-05356929E162}.TotemProd|Any CPU.Build.0 = TotemProd|Any CPU + {C6E9E91B-97D3-48D9-8AA7-05356929E162}.Yavsc|Any CPU.ActiveCfg = Yavsc|Any CPU + {C6E9E91B-97D3-48D9-8AA7-05356929E162}.Yavsc|Any CPU.Build.0 = Yavsc|Any CPU + {C6E9E91B-97D3-48D9-8AA7-05356929E162}.YavscPre|Any CPU.ActiveCfg = YavscPre|Any CPU + {C6E9E91B-97D3-48D9-8AA7-05356929E162}.YavscPre|Any CPU.Build.0 = YavscPre|Any CPU {EEFCECE6-3B7F-4BBE-B7AF-69377AF3CF39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EEFCECE6-3B7F-4BBE-B7AF-69377AF3CF39}.Debug|Any CPU.Build.0 = Debug|Any CPU {EEFCECE6-3B7F-4BBE-B7AF-69377AF3CF39}.Lua|Any CPU.ActiveCfg = Lua|Any CPU {EEFCECE6-3B7F-4BBE-B7AF-69377AF3CF39}.Lua|Any CPU.Build.0 = Lua|Any CPU {EEFCECE6-3B7F-4BBE-B7AF-69377AF3CF39}.Release|Any CPU.ActiveCfg = Release|Any CPU {EEFCECE6-3B7F-4BBE-B7AF-69377AF3CF39}.Release|Any CPU.Build.0 = Release|Any CPU + {EEFCECE6-3B7F-4BBE-B7AF-69377AF3CF39}.TotemPre|Any CPU.ActiveCfg = TotemPre|Any CPU + {EEFCECE6-3B7F-4BBE-B7AF-69377AF3CF39}.TotemProd|Any CPU.ActiveCfg = TotemProd|Any CPU + {EEFCECE6-3B7F-4BBE-B7AF-69377AF3CF39}.TotemProd|Any CPU.Build.0 = TotemProd|Any CPU + {EEFCECE6-3B7F-4BBE-B7AF-69377AF3CF39}.Yavsc|Any CPU.ActiveCfg = Yavsc|Any CPU + {EEFCECE6-3B7F-4BBE-B7AF-69377AF3CF39}.Yavsc|Any CPU.Build.0 = Yavsc|Any CPU + {EEFCECE6-3B7F-4BBE-B7AF-69377AF3CF39}.YavscPre|Any CPU.ActiveCfg = YavscPre|Any CPU + {EEFCECE6-3B7F-4BBE-B7AF-69377AF3CF39}.YavscPre|Any CPU.Build.0 = YavscPre|Any CPU EndGlobalSection GlobalSection(NestedProjects) = preSolution {B5F49C21-7BB3-4DC0-AE65-F4ED0F6D15BD} = {ECEC9074-ACB5-4A74-BE22-FF7B40F25A1A} diff --git a/pkg/ChangeLog b/pkg/ChangeLog index ac4c0ae0..e43e915c 100644 --- a/pkg/ChangeLog +++ b/pkg/ChangeLog @@ -1,3 +1,7 @@ +2015-11-26 Paul Schneider + + * pkg.mdproj: nouvelles configurations de déploiement + 2015-11-19 Paul Schneider * pkg.mdproj: adds a build target named "Lua" diff --git a/pkg/pkg.mdproj b/pkg/pkg.mdproj index 273c46e0..d0b72cd3 100644 --- a/pkg/pkg.mdproj +++ b/pkg/pkg.mdproj @@ -20,7 +20,7 @@ - Lua + TotemPre AnyCPU \ No newline at end of file diff --git a/plugins/fortune/ChangeLog b/plugins/fortune/ChangeLog index e212f9d0..13d3cb88 100644 --- a/plugins/fortune/ChangeLog +++ b/plugins/fortune/ChangeLog @@ -1,3 +1,7 @@ +2015-11-26 Paul Schneider + + * fortune.csproj: nouvelles configurations de déploiement + 2015-11-19 Paul Schneider * fortune.csproj: adds a build target named "Lua" diff --git a/plugins/fortune/fortune.csproj b/plugins/fortune/fortune.csproj index 55dadda6..3e02836a 100644 --- a/plugins/fortune/fortune.csproj +++ b/plugins/fortune/fortune.csproj @@ -35,6 +35,27 @@ false bin\Lua 4 + v4.5 + + + false + bin\TotemPre + 4 + + + false + bin\TotemProd + 4 + + + false + bin\YavscPre + 4 + + + false + bin\Yavsc + 4 diff --git a/web/ChangeLog b/web/ChangeLog index 15770b1d..2a7ab94b 100644 --- a/web/ChangeLog +++ b/web/ChangeLog @@ -1,3 +1,8 @@ +2015-11-26 Paul Schneider + + * Yavsc.csproj: nouvelles configurations de + déploiementnouvelles configurations de déploiement + 2015-11-26 Paul Schneider * BackOfficeController.cs: Impléménte un accès à l'API back diff --git a/web/Web.csproj b/web/Yavsc.csproj similarity index 96% rename from web/Web.csproj rename to web/Yavsc.csproj index 8abbe497..b006fa57 100644 --- a/web/Web.csproj +++ b/web/Yavsc.csproj @@ -9,8 +9,8 @@ {349C5851-65DF-11DA-9384-00065B846F21};{603C0E0B-DB56-11DC-BE95-000D561079B0};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Library Yavsc - v4.5.1 Yavsc + v4.5.1 true @@ -30,6 +30,7 @@ bin\Yavsc.xml true + v4.5.1 none @@ -39,11 +40,33 @@ 4 false bin\Yavsc.xml + v4.5.1 false bin 4 + v4.5.1 + + + false + bin + 4 + + + false + bin + 4 + + + false + bin + 4 + + + false + bin + 4 diff --git a/yavscModel/ChangeLog b/yavscModel/ChangeLog index ffa2a197..23bcf6f0 100644 --- a/yavscModel/ChangeLog +++ b/yavscModel/ChangeLog @@ -1,3 +1,12 @@ +2015-11-26 Paul Schneider + + * LocalizedText.resx: + * LocalizedText.fr.resx: + * LocalizedText.Designer.cs: + * LocalizedText.fr.Designer.cs: internationalisation + + * YavscModel.csproj: nouvelles configurations de déploiement + 2015-11-26 Paul Schneider * EventPub.cs: diff --git a/yavscModel/LocalizedText.Designer.cs b/yavscModel/LocalizedText.Designer.cs index a03bf7dd..a2e3bf1d 100644 --- a/yavscModel/LocalizedText.Designer.cs +++ b/yavscModel/LocalizedText.Designer.cs @@ -472,6 +472,12 @@ namespace Yavsc.Model { } } + public static string YourMEACode { + get { + return ResourceManager.GetString("YourMEACode", resourceCulture); + } + } + public static string ProviderId { get { return ResourceManager.GetString("ProviderId", resourceCulture); @@ -490,6 +496,12 @@ namespace Yavsc.Model { } } + public static string UsersInRole { + get { + return ResourceManager.GetString("UsersInRole", resourceCulture); + } + } + public static string ThisSiteUsesCookies { get { return ResourceManager.GetString("ThisSiteUsesCookies", resourceCulture); @@ -508,9 +520,9 @@ namespace Yavsc.Model { } } - public static string EndDate { + public static string Name { get { - return ResourceManager.GetString("EndDate", resourceCulture); + return ResourceManager.GetString("Name", resourceCulture); } } @@ -616,9 +628,9 @@ namespace Yavsc.Model { } } - public static string UsersInRole { + public static string EndDate { get { - return ResourceManager.GetString("UsersInRole", resourceCulture); + return ResourceManager.GetString("EndDate", resourceCulture); } } diff --git a/yavscModel/LocalizedText.fr.Designer.cs b/yavscModel/LocalizedText.fr.Designer.cs index c0692dd0..84af0580 100644 --- a/yavscModel/LocalizedText.fr.Designer.cs +++ b/yavscModel/LocalizedText.fr.Designer.cs @@ -82,6 +82,12 @@ namespace Yavsc.Model { } } + public static string YourMEACode { + get { + return ResourceManager.GetString("YourMEACode", resourceCulture); + } + } + public static string Photo { get { return ResourceManager.GetString("Photo", resourceCulture); @@ -478,6 +484,12 @@ namespace Yavsc.Model { } } + public static string UsersInRole { + get { + return ResourceManager.GetString("UsersInRole", resourceCulture); + } + } + public static string ThisSiteUsesCookies { get { return ResourceManager.GetString("ThisSiteUsesCookies", resourceCulture); @@ -496,9 +508,9 @@ namespace Yavsc.Model { } } - public static string EndDate { + public static string Name { get { - return ResourceManager.GetString("EndDate", resourceCulture); + return ResourceManager.GetString("Name", resourceCulture); } } @@ -604,9 +616,9 @@ namespace Yavsc.Model { } } - public static string UsersInRole { + public static string EndDate { get { - return ResourceManager.GetString("UsersInRole", resourceCulture); + return ResourceManager.GetString("EndDate", resourceCulture); } } diff --git a/yavscModel/LocalizedText.fr.resx b/yavscModel/LocalizedText.fr.resx index 9db1d62a..84543e71 100644 --- a/yavscModel/LocalizedText.fr.resx +++ b/yavscModel/LocalizedText.fr.resx @@ -59,12 +59,13 @@ Lieu Déconnection Date maximale du rendez-vous - Votre activité + Code activité principalement éxercée Membres Votre message a été envoyé Date minimale du rendez-vous Modifier Mes estimations + Nom Besoin Nouveau Tag pas de contenu @@ -113,5 +114,6 @@ Au vu de son calendrier, {0} devrait être disponible pour ce rendez-vous Vous n'êtes pas administrateur + Votre activité Votre demande a été transmise diff --git a/yavscModel/LocalizedText.resx b/yavscModel/LocalizedText.resx index 4a33bdcb..e87a259a 100644 --- a/yavscModel/LocalizedText.resx +++ b/yavscModel/LocalizedText.resx @@ -61,7 +61,8 @@ Location Logout Maximal date for the rendez-vous - Mainly Exerted Activity + Mainly Exerted Activity code + Name Members Your message has been sent. Minimal date for the rendez-vous @@ -117,6 +118,7 @@ regarding his calendar, {0} should be available for this booking You're not administrator + Your activity your query has been transmitted diff --git a/yavscModel/YavscModel.csproj b/yavscModel/YavscModel.csproj index 95aa1d0f..beceb460 100644 --- a/yavscModel/YavscModel.csproj +++ b/yavscModel/YavscModel.csproj @@ -21,6 +21,7 @@ 4 false bin\Debug\YavscModel.xml + v4.5 full @@ -29,11 +30,33 @@ prompt 4 false + v4.5 false bin\Lua 4 + v4.5 + + + false + bin\TotemPre + 4 + + + false + bin\TotemProd + 4 + + + false + bin\YavscPre + 4 + + + false + bin\Yavsc + 4 diff --git a/yavscclient/ChangeLog b/yavscclient/ChangeLog index a6e82cf1..d55fa31a 100644 --- a/yavscclient/ChangeLog +++ b/yavscclient/ChangeLog @@ -1,3 +1,7 @@ +2015-11-26 Paul Schneider + + * YavscClient.csproj: nouvelles configurations de déploiement + 2015-11-19 Paul Schneider * YavscClient.csproj: Lua config diff --git a/yavscclient/YavscClient.csproj b/yavscclient/YavscClient.csproj index c8800b62..3387d6da 100644 --- a/yavscclient/YavscClient.csproj +++ b/yavscclient/YavscClient.csproj @@ -38,6 +38,27 @@ false bin\Lua 4 + v4.5 + + + false + bin\TotemPre + 4 + + + false + bin\TotemProd + 4 + + + false + bin\YavscPre + 4 + + + false + bin\Yavsc + 4