Folder structure reorganized; Mono.Security and Npgsql libraries added to svn; FLocal docs added to svn

main
Inga 🏳‍🌈 13 years ago
parent 2b39bb505f
commit 6a354e440f
  1. 2
      Builder/IISMainHandler/build.txt
  2. 4
      Builder/IISMainHandler/prebuild.bat
  3. 52
      Builder/IISMainHandler/product.wxs
  4. 0
      FLocal.Common/BBCodes/AbstractLocalLink.cs
  5. 0
      FLocal.Common/BBCodes/B.cs
  6. 0
      FLocal.Common/BBCodes/Code.cs
  7. 0
      FLocal.Common/BBCodes/ECode.cs
  8. 0
      FLocal.Common/BBCodes/FUrl.cs
  9. 0
      FLocal.Common/BBCodes/Font.cs
  10. 0
      FLocal.Common/BBCodes/FontColor.cs
  11. 0
      FLocal.Common/BBCodes/FontSize.cs
  12. 0
      FLocal.Common/BBCodes/Google.cs
  13. 0
      FLocal.Common/BBCodes/I.cs
  14. 0
      FLocal.Common/BBCodes/Image.cs
  15. 0
      FLocal.Common/BBCodes/List.cs
  16. 0
      FLocal.Common/BBCodes/ListElem.cs
  17. 0
      FLocal.Common/BBCodes/Lurk.cs
  18. 0
      FLocal.Common/BBCodes/Math.cs
  19. 0
      FLocal.Common/BBCodes/Poll.cs
  20. 0
      FLocal.Common/BBCodes/Post.cs
  21. 0
      FLocal.Common/BBCodes/Quote.cs
  22. 0
      FLocal.Common/BBCodes/QuoteSkipper.cs
  23. 0
      FLocal.Common/BBCodes/RuWiki.cs
  24. 0
      FLocal.Common/BBCodes/S.cs
  25. 0
      FLocal.Common/BBCodes/Spoiler.cs
  26. 0
      FLocal.Common/BBCodes/Tex.cs
  27. 0
      FLocal.Common/BBCodes/Thread.cs
  28. 0
      FLocal.Common/BBCodes/U.cs
  29. 0
      FLocal.Common/BBCodes/UploadImage.cs
  30. 0
      FLocal.Common/BBCodes/UploadLink.cs
  31. 0
      FLocal.Common/BBCodes/Url.cs
  32. 0
      FLocal.Common/BBCodes/User.cs
  33. 0
      FLocal.Common/BBCodes/Wiki.cs
  34. 0
      FLocal.Common/BBCodes/helpers/BBCode.cs
  35. 0
      FLocal.Common/BBCodes/helpers/TexProcessor.cs
  36. 0
      FLocal.Common/BBCodes/helpers/UrlProcessor.cs
  37. 4
      FLocal.Common/Common.csproj
  38. 0
      FLocal.Common/Config.cs
  39. 0
      FLocal.Common/IComplexSqlObjectTableSpec.cs
  40. 0
      FLocal.Common/IOutputParams.cs
  41. 0
      FLocal.Common/ISqlObjectTableSpec.cs
  42. 0
      FLocal.Common/PostVisibilityEnum.cs
  43. 0
      FLocal.Common/Properties/AssemblyInfo.cs
  44. 0
      FLocal.Common/SqlObject.cs
  45. 0
      FLocal.Common/TableManager.cs
  46. 0
      FLocal.Common/TranslitManager.cs
  47. 0
      FLocal.Common/UBBParser.cs
  48. 0
      FLocal.Common/URL/AbstractUrl.cs
  49. 0
      FLocal.Common/URL/QuickLink.cs
  50. 0
      FLocal.Common/URL/Robots.cs
  51. 0
      FLocal.Common/URL/Static.cs
  52. 0
      FLocal.Common/URL/UrlManager.cs
  53. 0
      FLocal.Common/URL/forum/AllPosts.cs
  54. 0
      FLocal.Common/URL/forum/AllThreads.cs
  55. 0
      FLocal.Common/URL/forum/Boards.cs
  56. 0
      FLocal.Common/URL/forum/board/Abstract.cs
  57. 0
      FLocal.Common/URL/forum/board/Headlines.cs
  58. 0
      FLocal.Common/URL/forum/board/NewThread.cs
  59. 0
      FLocal.Common/URL/forum/board/Threads.cs
  60. 0
      FLocal.Common/URL/forum/board/thread/Abstract.cs
  61. 0
      FLocal.Common/URL/forum/board/thread/Posts.cs
  62. 0
      FLocal.Common/URL/forum/board/thread/post/Abstract.cs
  63. 0
      FLocal.Common/URL/forum/board/thread/post/Edit.cs
  64. 0
      FLocal.Common/URL/forum/board/thread/post/PMReply.cs
  65. 0
      FLocal.Common/URL/forum/board/thread/post/Punish.cs
  66. 0
      FLocal.Common/URL/forum/board/thread/post/Reply.cs
  67. 0
      FLocal.Common/URL/forum/board/thread/post/Show.cs
  68. 0
      FLocal.Common/URL/maintenance/CleanCache.cs
  69. 0
      FLocal.Common/URL/maintenance/LocalNetworks.cs
  70. 0
      FLocal.Common/URL/my/Avatars.cs
  71. 0
      FLocal.Common/URL/my/Settings.cs
  72. 0
      FLocal.Common/URL/my/UserData.cs
  73. 0
      FLocal.Common/URL/my/conversations/Conversation.cs
  74. 0
      FLocal.Common/URL/my/conversations/List.cs
  75. 0
      FLocal.Common/URL/my/conversations/NewPM.cs
  76. 0
      FLocal.Common/URL/my/conversations/Reply.cs
  77. 0
      FLocal.Common/URL/my/login/Login.cs
  78. 0
      FLocal.Common/URL/my/login/Migrate.cs
  79. 0
      FLocal.Common/URL/my/login/RegisterByInvite.cs
  80. 0
      FLocal.Common/URL/polls/Info.cs
  81. 0
      FLocal.Common/URL/polls/List.cs
  82. 0
      FLocal.Common/URL/polls/New.cs
  83. 0
      FLocal.Common/URL/upload/Info.cs
  84. 0
      FLocal.Common/URL/upload/Item.cs
  85. 0
      FLocal.Common/URL/upload/List.cs
  86. 0
      FLocal.Common/URL/upload/New.cs
  87. 0
      FLocal.Common/URL/users/Active.cs
  88. 0
      FLocal.Common/URL/users/All.cs
  89. 0
      FLocal.Common/URL/users/Online.cs
  90. 0
      FLocal.Common/URL/users/user/Abstract.cs
  91. 0
      FLocal.Common/URL/users/user/Info.cs
  92. 0
      FLocal.Common/URL/users/user/PollsParticipated.cs
  93. 0
      FLocal.Common/URL/users/user/Posts.cs
  94. 0
      FLocal.Common/URL/users/user/Replies.cs
  95. 0
      FLocal.Common/URL/users/user/Threads.cs
  96. 0
      FLocal.Common/UploadManager.cs
  97. 0
      FLocal.Common/UserContext.cs
  98. 0
      FLocal.Common/UserSettingsGateway.cs
  99. 0
      FLocal.Common/actions/AbstractChange.cs
  100. 0
      FLocal.Common/actions/AbstractFieldValue.cs
  101. Some files were not shown because too many files have changed in this diff Show More

@ -1,5 +1,5 @@
@echo off @echo off
"C:\Program Files\7-Zip\7z.exe" a Templates.7z ..\..\templates\* -xr!.svn "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 ..\..\static\* -xr!.svn "C:\Program Files\7-Zip\7z.exe" a Static.7z ..\..\Resources\FLocal\static\* -xr!.svn
copy "C:\Program Files\7-Zip\7z.exe" 7z.exe copy "C:\Program Files\7-Zip\7z.exe" 7z.exe
exit exit

@ -28,49 +28,58 @@
</Directory> </Directory>
<DirectoryRef Id="BINARIESROOTDIRECTORY"> <DirectoryRef Id="BINARIESROOTDIRECTORY">
<Component Id="Core.dll" Guid="B8542489-E367-4AC6-9FCF-EA3454F0D64{targetId}"> <Component Id="Core.dll" Guid="B8542489-E367-4AC6-9FCF-EA3454F0D64{targetId}">
<File Id="Core.dll" Source="..\..\Core\bin\Release\Core.dll" KeyPath="yes" Checksum="yes"/> <File Id="Core.dll" Source="..\..\Web.Core\bin\Release\Core.dll" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
<Component Id="Core.pdb" Guid="3109981C-0182-48CA-B1CA-8F68F1C0F4B{targetId}"> <Component Id="Core.pdb" Guid="3109981C-0182-48CA-B1CA-8F68F1C0F4B{targetId}">
<File Id="Core.pdb" Source="..\..\Core\bin\Release\Core.pdb" KeyPath="yes" Checksum="yes"/> <File Id="Core.pdb" Source="..\..\Web.Core\bin\Release\Core.pdb" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
<Component Id="Common.dll" Guid="4CD35090-702C-479D-826B-2DE966FB0D4{targetId}"> <Component Id="Common.dll" Guid="4CD35090-702C-479D-826B-2DE966FB0D4{targetId}">
<File Id="Common.dll" Source="..\..\Common\bin\Release\Common.dll" KeyPath="yes" Checksum="yes"/> <File Id="Common.dll" Source="..\..\FLocal.Common\bin\Release\Common.dll" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
<Component Id="Common.pdb" Guid="78F773B8-0B28-4657-8E13-739FDB16F3C{targetId}"> <Component Id="Common.pdb" Guid="78F773B8-0B28-4657-8E13-739FDB16F3C{targetId}">
<File Id="Common.pdb" Source="..\..\Common\bin\Release\Common.pdb" KeyPath="yes" Checksum="yes"/> <File Id="Common.pdb" Source="..\..\FLocal.Common\bin\Release\Common.pdb" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
<Component Id="MySQLConnector.dll" Guid="924EC439-F1F0-431F-A6EA-152C321F614{targetId}"> <Component Id="MySQLConnector.dll" Guid="924EC439-F1F0-431F-A6EA-152C321F614{targetId}">
<File Id="MySQLConnector.dll" Source="..\..\MySQLConnector\bin\Release\MySQLConnector.dll" KeyPath="yes" Checksum="yes"/> <File Id="MySQLConnector.dll" Source="..\..\MySQLConnector\bin\Release\MySQLConnector.dll" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
<Component Id="MySQLConnector.pdb" Guid="32AA82C5-1561-4612-A113-C7A099C3ECE{targetId}"> <Component Id="MySQLConnector.pdb" Guid="32AA82C5-1561-4612-A113-C7A099C3ECE{targetId}">
<File Id="MySQLConnector.pdb" Source="..\..\IISMainHandler\bin\Release\MySQLConnector.pdb" KeyPath="yes" Checksum="yes"/> <File Id="MySQLConnector.pdb" Source="..\..\MySQLConnector\bin\Release\MySQLConnector.pdb" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
<Component Id="IISMainHandler.dll" Guid="E3BCF3A1-75C0-4CD7-95D4-4A0245B1CA1{targetId}"> <Component Id="IISMainHandler.dll" Guid="E3BCF3A1-75C0-4CD7-95D4-4A0245B1CA1{targetId}">
<File Id="IISMainHandler.dll" Source="..\..\IISMainHandler\bin\Release\IISMainHandler.dll" KeyPath="yes" Checksum="yes"/> <File Id="IISMainHandler.dll" Source="..\..\FLocal.IISHandler\bin\Release\IISMainHandler.dll" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
<Component Id="IISMainHandler.pdb" Guid="4F5F1280-8EC8-4C56-80F4-8C810F0C839{targetId}"> <Component Id="IISMainHandler.pdb" Guid="4F5F1280-8EC8-4C56-80F4-8C810F0C839{targetId}">
<File Id="IISMainHandler.pdb" Source="..\..\IISMainHandler\bin\Release\IISMainHandler.pdb" KeyPath="yes" Checksum="yes"/> <File Id="IISMainHandler.pdb" Source="..\..\FLocal.IISHandler\bin\Release\IISMainHandler.pdb" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
<Component Id="Importer.dll" Guid="F25304A3-2705-4E97-B0E9-1DF04C277AD{targetId}"> <Component Id="Importer.dll" Guid="F25304A3-2705-4E97-B0E9-1DF04C277AD{targetId}">
<File Id="Importer.dll" Source="..\..\Importer\bin\Release\Importer.dll" KeyPath="yes" Checksum="yes"/> <File Id="Importer.dll" Source="..\..\FLocal.Migration.Gateway\bin\Release\Importer.dll" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
<Component Id="Importer.pdb" Guid="6AE31E67-EFC6-471B-BB55-0DF628399D3{targetId}"> <Component Id="Importer.pdb" Guid="6AE31E67-EFC6-471B-BB55-0DF628399D3{targetId}">
<File Id="Importer.pdb" Source="..\..\Importer\bin\Release\Importer.pdb" KeyPath="yes" Checksum="yes"/> <File Id="Importer.pdb" Source="..\..\FLocal.Migration.Gateway\bin\Release\Importer.pdb" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
<Component Id="ImportConsole.exe" Guid="45962809-9BE4-4792-9759-21C49FCA57F{targetId}"> <Component Id="ImportConsole.exe" Guid="45962809-9BE4-4792-9759-21C49FCA57F{targetId}">
<File Id="ImportConsole.exe" Source="..\..\ImportConsole\bin\Release\ImportConsole.exe" KeyPath="yes" Checksum="yes"/> <File Id="ImportConsole.exe" Source="..\..\FLocal.Migration.Console\bin\Release\ImportConsole.exe" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
<Component Id="ImportConsole.pdb" Guid="6E5DCF23-7247-4DE0-BB6D-1A846372343{targetId}"> <Component Id="ImportConsole.pdb" Guid="6E5DCF23-7247-4DE0-BB6D-1A846372343{targetId}">
<File Id="ImportConsole.pdb" Source="..\..\ImportConsole\bin\Release\ImportConsole.pdb" KeyPath="yes" Checksum="yes"/> <File Id="ImportConsole.pdb" Source="..\..\FLocal.Migration.Console\bin\Release\ImportConsole.pdb" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
<Component Id="NConsoler.dll" Guid="F39FD087-8961-4871-9D59-FDB83002BC9{targetId}"> <Component Id="NConsoler.dll" Guid="F39FD087-8961-4871-9D59-FDB83002BC9{targetId}">
<File Id="NConsoler.dll" Source="..\..\ThirdParty\NConsoler\NConsoler.dll" KeyPath="yes" Checksum="yes"/> <File Id="NConsoler.dll" Source="..\..\ThirdParty\NConsoler\NConsoler.dll" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
<Component Id="Mono.Security.dll" Guid="FCE3247F-DF6C-4F48-B6B9-F72C20D4E51{targetId}">
<File Id="Mono.Security.dll" Source="..\..\ThirdParty\Mono.Security\Mono.Security.dll" KeyPath="yes" Checksum="yes"/>
</Component>
<Component Id="Npgsql.dll" Guid="BE0FFB89-9304-41DE-B365-7213AD44114{targetId}">
<File Id="Npgsql.dll" Source="..\..\ThirdParty\Npgsql\Npgsql.dll" KeyPath="yes" Checksum="yes"/>
</Component>
<Component Id="Npgsql.pdb" Guid="1AFEC953-FAE1-4B51-A24B-BFF09C4CFBC{targetId}">
<File Id="Npgsql.pdb" Source="..\..\ThirdParty\Npgsql\Npgsql.pdb" KeyPath="yes" Checksum="yes"/>
</Component>
<Component Id="PJonDevelopment.BBCode.dll" Guid="5271E184-FCCB-433C-B789-959B410D6DD{targetId}"> <Component Id="PJonDevelopment.BBCode.dll" Guid="5271E184-FCCB-433C-B789-959B410D6DD{targetId}">
<File Id="PJonDevelopment.BBCode.dll" Source="..\..\ThirdParty\BBCode\bin\Release\PJonDevelopment.BBCode.dll" KeyPath="yes" Checksum="yes"/> <File Id="PJonDevelopment.BBCode.dll" Source="..\..\ThirdParty\PJonDevelopment.BBCode\bin\Release\PJonDevelopment.BBCode.dll" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
<Component Id="PJonDevelopment.BBCode.pdb" Guid="EFFBA1FA-A3A8-4D20-8894-AFD255B9F00{targetId}"> <Component Id="PJonDevelopment.BBCode.pdb" Guid="EFFBA1FA-A3A8-4D20-8894-AFD255B9F00{targetId}">
<File Id="PJonDevelopment.BBCode.pdb" Source="..\..\ThirdParty\BBCode\bin\Release\PJonDevelopment.BBCode.pdb" KeyPath="yes" Checksum="yes"/> <File Id="PJonDevelopment.BBCode.pdb" Source="..\..\ThirdParty\PJonDevelopment.BBCode\bin\Release\PJonDevelopment.BBCode.pdb" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
<Component Id="TexCompiler.dll" Guid="6FD050AF-61D7-4BFF-B206-A4420A83FB5{targetId}"> <Component Id="TexCompiler.dll" Guid="6FD050AF-61D7-4BFF-B206-A4420A83FB5{targetId}">
<File Id="TexCompiler.dll" Source="..\..\TexCompiler\bin\Release\TexCompiler.dll" KeyPath="yes" Checksum="yes"/> <File Id="TexCompiler.dll" Source="..\..\TexCompiler\bin\Release\TexCompiler.dll" KeyPath="yes" Checksum="yes"/>
@ -78,12 +87,6 @@
<Component Id="TexCompiler.pdb" Guid="707304A1-9774-446F-B672-FA25EAD8E4F{targetId}"> <Component Id="TexCompiler.pdb" Guid="707304A1-9774-446F-B672-FA25EAD8E4F{targetId}">
<File Id="TexCompiler.pdb" Source="..\..\TexCompiler\bin\Release\TexCompiler.pdb" KeyPath="yes" Checksum="yes"/> <File Id="TexCompiler.pdb" Source="..\..\TexCompiler\bin\Release\TexCompiler.pdb" KeyPath="yes" Checksum="yes"/>
</Component> </Component>
<!--Component Id="MySql.Data.dll" Guid="90646729-6B21-4BEE-94C3-F39F5288EFB{targetId}">
<File Id="MySql.Data.dll" Source="..\..\ThirdParty\mysql-connector-net-6.2.3\MySql.Data\Provider\bin\Release\MySql.Data.dll" KeyPath="yes" Checksum="yes"/>
</Component>
<Component Id="MySql.Data.pdb" Guid="7105BA2A-A10A-4E41-AA4F-30FA66499BE{targetId}">
<File Id="MySql.Data.pdb" Source="..\..\ThirdParty\mysql-connector-net-6.2.3\MySql.Data\Provider\bin\Release\MySql.Data.pdb" KeyPath="yes" Checksum="yes"/>
</Component-->
</DirectoryRef> </DirectoryRef>
<DirectoryRef Id="ARCHIVEDIRECTORY"> <DirectoryRef Id="ARCHIVEDIRECTORY">
<Component Id="Templates.7z" Guid="B41F4142-A39C-43BE-8D20-F31BFFA9B48{targetId}"> <Component Id="Templates.7z" Guid="B41F4142-A39C-43BE-8D20-F31BFFA9B48{targetId}">
@ -134,10 +137,13 @@
<ComponentRef Id='PJonDevelopment.BBCode.dll' /> <ComponentRef Id='PJonDevelopment.BBCode.dll' />
<ComponentRef Id='PJonDevelopment.BBCode.pdb' /> <ComponentRef Id='PJonDevelopment.BBCode.pdb' />
</Feature> </Feature>
<!--Feature Id='MySql.Data' Title='MySql Connector/NET' Level='1'> <Feature Id='Mono.Security' Title='Mono.Security' Level='1'>
<ComponentRef Id='MySql.Data.dll' /> <ComponentRef Id='Mono.Security.dll' />
<ComponentRef Id='MySql.Data.pdb' /> </Feature>
</Feature--> <Feature Id='Npgsql' Title='PostgreSQL driver' Level='1'>
<ComponentRef Id='Npgsql.dll' />
<ComponentRef Id='Npgsql.pdb' />
</Feature>
</Feature> </Feature>
<Feature Id="Data" Title="Various data sets" Level="1"> <Feature Id="Data" Title="Various data sets" Level="1">
<ComponentRef Id="_7z.exe"/> <ComponentRef Id="_7z.exe"/>

@ -185,7 +185,7 @@
<Compile Include="UserSettingsGateway.cs" /> <Compile Include="UserSettingsGateway.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Core\Core.csproj"> <ProjectReference Include="..\Web.Core\Core.csproj">
<Project>{6F532626-E9F8-498E-9683-1538E7CD62CB}</Project> <Project>{6F532626-E9F8-498E-9683-1538E7CD62CB}</Project>
<Name>Core</Name> <Name>Core</Name>
</ProjectReference> </ProjectReference>
@ -197,7 +197,7 @@
<Project>{7D2A38F8-C42D-4F9F-AF64-1DDD5842C7EC}</Project> <Project>{7D2A38F8-C42D-4F9F-AF64-1DDD5842C7EC}</Project>
<Name>TexCompiler</Name> <Name>TexCompiler</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\ThirdParty\BBCode\BBCode.vbproj"> <ProjectReference Include="..\ThirdParty\PJonDevelopment.BBCode\BBCode.vbproj">
<Project>{ACDDD5D1-119F-4B82-8FE6-6515C812795B}</Project> <Project>{ACDDD5D1-119F-4B82-8FE6-6515C812795B}</Project>
<Name>BBCode</Name> <Name>BBCode</Name>
</ProjectReference> </ProjectReference>

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save