diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt index 2cc1ede..49cf7c7 100644 --- a/Builder/IISMainHandler/build.txt +++ b/Builder/IISMainHandler/build.txt @@ -1 +1 @@ -1929 \ No newline at end of file +1931 \ No newline at end of file diff --git a/Builder/IISMainHandler/postbuild.bat b/Builder/IISMainHandler/postbuild.bat index 52575db..81cf764 100644 --- a/Builder/IISMainHandler/postbuild.bat +++ b/Builder/IISMainHandler/postbuild.bat @@ -1,5 +1,5 @@ @echo off -del Templates.7z -del Static.7z +del Resources.FLocal.Templates.7z +del Resources.FLocal.Static.7z ping localhost -n 2 >nul del 7z.exe \ No newline at end of file diff --git a/Builder/IISMainHandler/prebuild.bat b/Builder/IISMainHandler/prebuild.bat index 24c680c..02da750 100644 --- a/Builder/IISMainHandler/prebuild.bat +++ b/Builder/IISMainHandler/prebuild.bat @@ -1,5 +1,5 @@ @echo off -"C:\Program Files\7-Zip\7z.exe" a Templates.7z ..\..\Resources\FLocal\templates\* -xr!.svn -"C:\Program Files\7-Zip\7z.exe" a Static.7z ..\..\Resources\FLocal\static\* -xr!.svn +"C:\Program Files\7-Zip\7z.exe" a Resources.FLocal.Templates.7z ..\..\Resources\FLocal\templates\* -xr!.svn +"C:\Program Files\7-Zip\7z.exe" a Resources.FLocal.Static.7z ..\..\Resources\FLocal\static\* -xr!.svn copy "C:\Program Files\7-Zip\7z.exe" 7z.exe exit diff --git a/Builder/IISMainHandler/product.wxs b/Builder/IISMainHandler/product.wxs index 1058ae8..dc4afb1 100644 --- a/Builder/IISMainHandler/product.wxs +++ b/Builder/IISMainHandler/product.wxs @@ -27,17 +27,17 @@ - - + + - - + + - - + + - - + + @@ -45,23 +45,23 @@ - - + + - - + + - - + + - - + + - - + + - - + + @@ -89,37 +89,37 @@ - - + + - - + + - - - + + + - + - - + + - - - + + + - - - + + + - - - + + + @@ -147,16 +147,16 @@ - - + + - - + + - - + + diff --git a/Builder/IISUploadHandler/product.wxs b/Builder/IISUploadHandler/product.wxs index 8c02139..d09afd9 100644 --- a/Builder/IISUploadHandler/product.wxs +++ b/Builder/IISUploadHandler/product.wxs @@ -25,27 +25,27 @@ - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/Builder/Properties/AssemblyInfo.cs b/Builder/Properties/AssemblyInfo.cs index 8133a15..622cfd6 100644 --- a/Builder/Properties/AssemblyInfo.cs +++ b/Builder/Properties/AssemblyInfo.cs @@ -8,9 +8,9 @@ using System.Runtime.InteropServices; [assembly: AssemblyTitle("Builder")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] +[assembly: AssemblyCompany("inga-lovinde")] [assembly: AssemblyProduct("Builder")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2010")] +[assembly: AssemblyCopyright("Copyright © inga-lovinde 2010-2012")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/FLocal.Common/Common.csproj b/FLocal.Common/FLocal.Common.csproj similarity index 96% rename from FLocal.Common/Common.csproj rename to FLocal.Common/FLocal.Common.csproj index 7d95e15..ce6788c 100644 --- a/FLocal.Common/Common.csproj +++ b/FLocal.Common/FLocal.Common.csproj @@ -9,7 +9,7 @@ Library Properties FLocal.Common - Common + FLocal.Common v3.5 512 @@ -185,7 +185,7 @@ - + {6F532626-E9F8-498E-9683-1538E7CD62CB} Core diff --git a/FLocal.Common/Properties/AssemblyInfo.cs b/FLocal.Common/Properties/AssemblyInfo.cs index b597615..43bd608 100644 --- a/FLocal.Common/Properties/AssemblyInfo.cs +++ b/FLocal.Common/Properties/AssemblyInfo.cs @@ -5,12 +5,12 @@ 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("Common")] +[assembly: AssemblyTitle("FLocal.Common")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("Common")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2010")] +[assembly: AssemblyCompany("inga-lovinde")] +[assembly: AssemblyProduct("FLocal.Common")] +[assembly: AssemblyCopyright("Copyright © inga-lovinde 2010-2012")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/FLocal.IISHandler/IISMainHandler.csproj b/FLocal.IISHandler/FLocal.IISHandler.csproj similarity index 94% rename from FLocal.IISHandler/IISMainHandler.csproj rename to FLocal.IISHandler/FLocal.IISHandler.csproj index 2e39902..182e07d 100644 --- a/FLocal.IISHandler/IISMainHandler.csproj +++ b/FLocal.IISHandler/FLocal.IISHandler.csproj @@ -9,7 +9,7 @@ Library Properties FLocal.IISHandler - IISMainHandler + FLocal.IISHandler v3.5 512 @@ -128,15 +128,15 @@ - + {CE888859-9E46-41F7-91CE-8EC106F3A625} Common - + {6F532626-E9F8-498E-9683-1538E7CD62CB} Core - + {E2ECF86C-C0BA-4782-A485-E267BB213BB2} Importer diff --git a/FLocal.IISHandler/Properties/AssemblyInfo.cs b/FLocal.IISHandler/Properties/AssemblyInfo.cs index a8f4f02..b835ef2 100644 --- a/FLocal.IISHandler/Properties/AssemblyInfo.cs +++ b/FLocal.IISHandler/Properties/AssemblyInfo.cs @@ -5,12 +5,12 @@ 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("IISMainHandler")] +[assembly: AssemblyTitle("FLocal.IISHandler")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("IISMainHandler")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2010")] +[assembly: AssemblyCompany("inga-lovinde")] +[assembly: AssemblyProduct("FLocal.IISHandler")] +[assembly: AssemblyCopyright("Copyright © inga-lovinde 2010-2012")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/FLocal.Migration.Console/ImportConsole.csproj b/FLocal.Migration.Console/FLocal.Migration.Console.csproj similarity index 89% rename from FLocal.Migration.Console/ImportConsole.csproj rename to FLocal.Migration.Console/FLocal.Migration.Console.csproj index b0a717b..f07e790 100644 --- a/FLocal.Migration.Console/ImportConsole.csproj +++ b/FLocal.Migration.Console/FLocal.Migration.Console.csproj @@ -9,7 +9,7 @@ Exe Properties FLocal.Migration.Console - ImportConsole + FLocal.Migration.Console v3.5 512 @@ -58,15 +58,15 @@ - + {CE888859-9E46-41F7-91CE-8EC106F3A625} Common - + {6F532626-E9F8-498E-9683-1538E7CD62CB} Core - + {E2ECF86C-C0BA-4782-A485-E267BB213BB2} Importer diff --git a/FLocal.Migration.Console/Properties/AssemblyInfo.cs b/FLocal.Migration.Console/Properties/AssemblyInfo.cs index 68f7cd7..ddd4625 100644 --- a/FLocal.Migration.Console/Properties/AssemblyInfo.cs +++ b/FLocal.Migration.Console/Properties/AssemblyInfo.cs @@ -5,12 +5,12 @@ 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("ImportConsole")] +[assembly: AssemblyTitle("FLocal.Migration.Console")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("ImportConsole")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2010")] +[assembly: AssemblyCompany("inga-lovinde")] +[assembly: AssemblyProduct("FLocal.Migration.Console")] +[assembly: AssemblyCopyright("Copyright © inga-lovinde 2010-2012")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/FLocal.Migration.Gateway/Importer.csproj b/FLocal.Migration.Gateway/FLocal.Migration.Gateway.csproj similarity index 95% rename from FLocal.Migration.Gateway/Importer.csproj rename to FLocal.Migration.Gateway/FLocal.Migration.Gateway.csproj index ed14ae9..985568a 100644 --- a/FLocal.Migration.Gateway/Importer.csproj +++ b/FLocal.Migration.Gateway/FLocal.Migration.Gateway.csproj @@ -9,7 +9,7 @@ Library Properties FLocal.Migration.Gateway - Importer + FLocal.Migration.Gateway v3.5 512 diff --git a/FLocal.Migration.Gateway/Properties/AssemblyInfo.cs b/FLocal.Migration.Gateway/Properties/AssemblyInfo.cs index 55b6543..dfce194 100644 --- a/FLocal.Migration.Gateway/Properties/AssemblyInfo.cs +++ b/FLocal.Migration.Gateway/Properties/AssemblyInfo.cs @@ -5,12 +5,12 @@ 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("Importer")] +[assembly: AssemblyTitle("FLocal.Migration.Gateway")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("Importer")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2010")] +[assembly: AssemblyCompany("inga-lovinde")] +[assembly: AssemblyProduct("FLocal.Migration.Gateway")] +[assembly: AssemblyCopyright("Copyright © inga-lovinde 2010-2012")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/FLocal.sln b/FLocal.sln index bc00f7b..45d3762 100644 --- a/FLocal.sln +++ b/FLocal.sln @@ -1,21 +1,21 @@  Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Web Developer Express 2008 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IISMainHandler", "FLocal.IISHandler\IISMainHandler.csproj", "{9A902732-E7F1-4F41-869B-316AF2254B36}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FLocal.IISHandler", "FLocal.IISHandler\FLocal.IISHandler.csproj", "{9A902732-E7F1-4F41-869B-316AF2254B36}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "Web.Core\Core.csproj", "{6F532626-E9F8-498E-9683-1538E7CD62CB}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Web.Core", "Web.Core\Web.Core.csproj", "{6F532626-E9F8-498E-9683-1538E7CD62CB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "FLocal.Common\Common.csproj", "{CE888859-9E46-41F7-91CE-8EC106F3A625}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FLocal.Common", "FLocal.Common\FLocal.Common.csproj", "{CE888859-9E46-41F7-91CE-8EC106F3A625}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySQLConnector", "MySQLConnector\MySQLConnector.csproj", "{E38DE5B1-F9C2-43BA-A5DF-0743ABD4DFC7}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Builder", "Builder\Builder.csproj", "{D8D6EFEC-76D7-4870-BD71-C90FA6D7368A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Importer", "FLocal.Migration.Gateway\Importer.csproj", "{E2ECF86C-C0BA-4782-A485-E267BB213BB2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FLocal.Migration.Gateway", "FLocal.Migration.Gateway\FLocal.Migration.Gateway.csproj", "{E2ECF86C-C0BA-4782-A485-E267BB213BB2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImportConsole", "FLocal.Migration.Console\ImportConsole.csproj", "{208B84AF-A5DD-4C20-83D5-160EA243BA43}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FLocal.Migration.Console", "FLocal.Migration.Console\FLocal.Migration.Console.csproj", "{208B84AF-A5DD-4C20-83D5-160EA243BA43}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IISUploadHandler", "Web.IISUploadHandler\IISUploadHandler.csproj", "{09F13185-3B2A-4FCB-AB6A-750112FFF920}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Web.IISUploadHandler", "Web.IISUploadHandler\Web.IISUploadHandler.csproj", "{09F13185-3B2A-4FCB-AB6A-750112FFF920}" EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "BBCode", "ThirdParty\PJonDevelopment.BBCode\BBCode.vbproj", "{ACDDD5D1-119F-4B82-8FE6-6515C812795B}" EndProject diff --git a/MySQLConnector/MySQLConnector.csproj b/MySQLConnector/MySQLConnector.csproj index 219400b..643e7a2 100644 --- a/MySQLConnector/MySQLConnector.csproj +++ b/MySQLConnector/MySQLConnector.csproj @@ -33,7 +33,7 @@ False - C:\Program Files (x86)\PostgreSQL\Npgsql\bin\Npgsql.dll + ..\ThirdParty\Npgsql\Npgsql.dll @@ -60,7 +60,7 @@ - + {6F532626-E9F8-498E-9683-1538E7CD62CB} Core diff --git a/MySQLConnector/Properties/AssemblyInfo.cs b/MySQLConnector/Properties/AssemblyInfo.cs index e67fbbe..0273097 100644 --- a/MySQLConnector/Properties/AssemblyInfo.cs +++ b/MySQLConnector/Properties/AssemblyInfo.cs @@ -8,9 +8,9 @@ using System.Runtime.InteropServices; [assembly: AssemblyTitle("MySQLConnector")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] +[assembly: AssemblyCompany("inga-lovinde")] [assembly: AssemblyProduct("MySQLConnector")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2010")] +[assembly: AssemblyCopyright("Copyright © inga-lovinde 2010-2012")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/TexCompiler/Properties/AssemblyInfo.cs b/TexCompiler/Properties/AssemblyInfo.cs index b530e4f..97f80cc 100644 --- a/TexCompiler/Properties/AssemblyInfo.cs +++ b/TexCompiler/Properties/AssemblyInfo.cs @@ -8,9 +8,9 @@ using System.Runtime.InteropServices; [assembly: AssemblyTitle("TexCompiler")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] +[assembly: AssemblyCompany("inga-lovinde")] [assembly: AssemblyProduct("TexCompiler")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2010")] +[assembly: AssemblyCopyright("Copyright © inga-lovinde 2010-2012")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/Web.Core/Properties/AssemblyInfo.cs b/Web.Core/Properties/AssemblyInfo.cs index becbcc6..0940fe4 100644 --- a/Web.Core/Properties/AssemblyInfo.cs +++ b/Web.Core/Properties/AssemblyInfo.cs @@ -5,12 +5,12 @@ 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("Core")] +[assembly: AssemblyTitle("Web.Core")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("Core")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2010")] +[assembly: AssemblyCompany("inga-lovinde")] +[assembly: AssemblyProduct("Web.Core")] +[assembly: AssemblyCopyright("Copyright © inga-lovinde 2010-2012")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/Web.Core/Core.csproj b/Web.Core/Web.Core.csproj similarity index 96% rename from Web.Core/Core.csproj rename to Web.Core/Web.Core.csproj index 6bfb3a3..adae440 100644 --- a/Web.Core/Core.csproj +++ b/Web.Core/Web.Core.csproj @@ -9,7 +9,7 @@ Library Properties Web.Core - Core + Web.Core v3.5 512 diff --git a/Web.IISUploadHandler/Properties/AssemblyInfo.cs b/Web.IISUploadHandler/Properties/AssemblyInfo.cs index 2a0c3d7..1f61fb4 100644 --- a/Web.IISUploadHandler/Properties/AssemblyInfo.cs +++ b/Web.IISUploadHandler/Properties/AssemblyInfo.cs @@ -5,12 +5,12 @@ 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("IISUploadHandler")] +[assembly: AssemblyTitle("Web.IISUploadHandler")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("IISUploadHandler")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2010")] +[assembly: AssemblyCompany("inga-lovinde")] +[assembly: AssemblyProduct("Web.IISUploadHandler")] +[assembly: AssemblyCopyright("Copyright © inga-lovinde 2010-2012")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/Web.IISUploadHandler/IISUploadHandler.csproj b/Web.IISUploadHandler/Web.IISUploadHandler.csproj similarity index 93% rename from Web.IISUploadHandler/IISUploadHandler.csproj rename to Web.IISUploadHandler/Web.IISUploadHandler.csproj index 6c9696c..e5d3887 100644 --- a/Web.IISUploadHandler/IISUploadHandler.csproj +++ b/Web.IISUploadHandler/Web.IISUploadHandler.csproj @@ -9,7 +9,7 @@ Library Properties Web.IISUploadHandler - IISUploadHandler + Web.IISUploadHandler v3.5 512 @@ -52,7 +52,7 @@ - + {6F532626-E9F8-498E-9683-1538E7CD62CB} Core