Skip to content

Commit 89d956f

Browse files
rxturrxtur
committed
Database provider updates, VistaDB removed
1 parent d64d44a commit 89d956f

9 files changed

Lines changed: 29 additions & 657 deletions

‎BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1484,11 +1484,13 @@
14841484
<Content Include="setup\MySQL\Archive\MySQLUpgradeFrom3.0To3.1.sql" />
14851485
<Content Include="setup\MySQL\Archive\MySQLUpgradeFrom2.6To3.0.sql" />
14861486
<Content Include="setup\MySQL\Archive\MySQLWeb.Config" />
1487+
<Content Include="setup\MySQL\MySql.Data.dll" />
14871488
<Content Include="setup\MySQL\Setup.sql" />
14881489
<Content Include="setup\SQLite\BlogEngine.s3db" />
1489-
<Content Include="setup\SQLite\SQLiteUpgradeFrom3.0To3.1.txt" />
1490-
<Content Include="setup\SQLite\SQLiteUpgradeFrom2.6To3.0.txt" />
1490+
<Content Include="setup\SQLite\Archive\SQLiteUpgradeFrom3.0To3.1.txt" />
1491+
<Content Include="setup\SQLite\Archive\SQLiteUpgradeFrom2.6To3.0.txt" />
14911492
<Content Include="setup\SQLite\SQLiteWeb.Config" />
1493+
<Content Include="setup\SQLite\System.Data.SQLite.dll" />
14921494
<Content Include="setup\SQLServer\Setup.sql" />
14931495
<Content Include="setup\SQLServer\Archive\MSSQLSetup3.1.0.0.sql" />
14941496
<Content Include="setup\SQLServer\Upgrade.sql" />
@@ -1506,12 +1508,6 @@
15061508
<Content Include="setup\upgrade\spinner.gif" />
15071509
<Content Include="setup\upgrade\Updater.asmx" />
15081510
<Content Include="setup\upgrade\Updater.js" />
1509-
<Content Include="setup\VistaDB\BlogEngine.vdb3" />
1510-
<Content Include="setup\VistaDB\BlogEngine.vdb4" />
1511-
<Content Include="setup\VistaDB\VistaDB.NET_4.0_Web.Config" />
1512-
<Content Include="setup\VistaDB\VistaDBUpgradeTo1.5.0.0From1.4.5.0.vsql3" />
1513-
<Content Include="setup\VistaDB\VistaDBUpgradeTo1.6From1.5.vsql3" />
1514-
<Content Include="setup\VistaDB\VistaDBWeb.Config" />
15151511
<Content Include="Custom\Themes\Garland-Revisited\CommentForm.cshtml" />
15161512
<Content Include="Custom\Themes\Garland-Revisited\CommentView.cshtml" />
15171513
<Content Include="Custom\Themes\Garland-Revisited\PostNavigation.cshtml" />
@@ -1689,12 +1685,12 @@
16891685
<Content Include="setup\MySQL\ReadMe.txt" />
16901686
<Content Include="setup\ReadMe.txt" />
16911687
<Content Include="setup\SQLite\ReadMe.txt" />
1692-
<Content Include="setup\SQLite\SQLiteUpgradeFrom1.4.5.0To1.4.0.0.txt" />
1693-
<Content Include="setup\SQLite\SQLiteUpgradeFrom1.5To1.6.txt" />
1694-
<Content Include="setup\SQLite\SQLiteUpgradeFrom1.6To2.0.txt" />
1695-
<Content Include="setup\SQLite\SQLiteUpgradeFrom2.0To2.5.txt" />
1696-
<Content Include="setup\SQLite\SQLiteUpgradeFrom2.5To2.6.txt" />
1697-
<Content Include="setup\SQLite\SQLiteUpgradeTo1.5.0From1.4.5.txt" />
1688+
<Content Include="setup\SQLite\Archive\SQLiteUpgradeFrom1.4.5.0To1.4.0.0.txt" />
1689+
<Content Include="setup\SQLite\Archive\SQLiteUpgradeFrom1.5To1.6.txt" />
1690+
<Content Include="setup\SQLite\Archive\SQLiteUpgradeFrom1.6To2.0.txt" />
1691+
<Content Include="setup\SQLite\Archive\SQLiteUpgradeFrom2.0To2.5.txt" />
1692+
<Content Include="setup\SQLite\Archive\SQLiteUpgradeFrom2.5To2.6.txt" />
1693+
<Content Include="setup\SQLite\Archive\SQLiteUpgradeTo1.5.0From1.4.5.txt" />
16981694
<Content Include="setup\SQLServer\Archive\MSSQLSetup1.4.5.0.sql" />
16991695
<Content Include="setup\SQLServer\Archive\MSSQLSetup1.5.0.0.sql" />
17001696
<Content Include="setup\SQLServer\Archive\MSSQLSetup1.6.0.0.sql" />
@@ -1725,7 +1721,6 @@
17251721
<Content Include="setup\SQL_CE\Archive\SQL_CE_UpgradeFrom2.6to3.0.sql" />
17261722
<Content Include="setup\TestFiles\sample.png" />
17271723
<Content Include="setup\TestFiles\sample.txt" />
1728-
<Content Include="setup\VistaDB\ReadMe.txt" />
17291724
<Content Include="Custom\Themes\Garland-Revisited\images\bg-content-left.png" />
17301725
<Content Include="Custom\Themes\Garland-Revisited\images\bg-content-right.png" />
17311726
<Content Include="Custom\Themes\Garland-Revisited\images\bg-content.png" />

‎BlogEngine/BlogEngine.NET/setup/SQLite/SQLiteWeb.Config‎

Lines changed: 19 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
<blogFileSystemProvider defaultProvider="XmlBlogProvider">
1717
<providers>
1818
<add description="Xml Blog Provider" name="XmlBlogProvider" type="BlogEngine.Core.Providers.XmlFileSystemProvider, BlogEngine.Core" />
19-
<add storageVariable="BlogEngine" description="Sql Database Provider" name="DbBlogProvider" type="BlogEngine.Core.Providers.DbFileSystemProvider, BlogEngine.Core" />
20-
<!--<add storageVariable="\\UNCPath\BlogFiles" description="UNC Path Provider" name="UNCBlogProvider" type="BlogEngine.Core.Providers.UNCFileSystemProvider, BlogEngine.Core"/>-->
2119
</providers>
2220
</blogFileSystemProvider>
2321
</BlogEngine>
@@ -26,33 +24,9 @@
2624
<add name="BlogEngine" connectionString="Data Source=|DataDirectory|\BlogEngine.s3db;Version=3;BinaryGUID=False;" providerName="System.Data.SQLite"/>
2725
</connectionStrings>
2826
<appSettings>
29-
<!-- Set to WebForms causes some jQuery dependant scripts throw errors -->
30-
<add key="ValidationSettings:UnobtrusiveValidationMode" value="None" />
31-
<add key="BlogEngine.FileExtension" value=".aspx" />
32-
<!-- You can e.g. use "~/blog/" if BlogEngine.NET is not located in the root of the application -->
33-
<add key="BlogEngine.VirtualPath" value="~/" />
34-
<!-- The regex used to identify mobile devices so a different theme can be shown -->
35-
<add key="BlogEngine.MobileDevices" value="(iemobile|iphone|ipod|android|nokia|sonyericsson|blackberry|samsung|sec\-|windows ce|motorola|mot\-|up.b|midp\-)" />
36-
<!-- The name of the role with administrator permissions -->
37-
<add key="BlogEngine.AdminRole" value="Administrators" />
38-
<!-- The name of the role for anonymous(non-authenticated) users. -->
39-
<add key="BlogEngine.AnonymousRole" value="Anonymous" />
40-
<!-- The name of the role for Editors -->
41-
<add key="BlogEngine.EditorsRole" value="Editors" />
42-
<!--This value is to provide an alternative location for storing data.-->
43-
<add key="StorageLocation" value="~/App_Data/" />
44-
<!--This value is the folder name under the StorageLocation that data for blog instances will be stored in.-->
45-
<add key="BlogInstancesFolderName" value="blogs" />
46-
<!--A comma separated list of script names to hard minify. It's case-sensitive. -->
47-
<add key="BlogEngine.HardMinify" value="blog.js,widget.js,WebResource.axd" />
48-
<!--Any data grid in the admin panel should use this value for default number of items per page.-->
49-
<add key="BlogEngine.GenericPageSize" value="15" />
50-
<!--Single Sign On Support.-->
51-
<add key="BlogEngine.SingleSignOn" value="false" />
52-
<!--Sitemap schema URL.-->
53-
<add key="BlogEngine.SiteMapUrlSet" value="http://www.sitemaps.org/schemas/sitemap/0.9" />
54-
<!--Default admin editor (~/admin/editors/summernote/editor.cshtml is default) -->
55-
<add key="BlogEngine.DefaultEditor" value="~/admin/editors/summernote/editor.cshtml" />
27+
<!-- Override default application settings here -->
28+
<!-- blog usage scenario: singleblog, multiusers or multiblogs -->
29+
<add key="BlogEngine.UsageScenario" value="multiusers" />
5630
</appSettings>
5731
<system.serviceModel>
5832
<services>
@@ -145,15 +119,13 @@
145119
<providers>
146120
<clear />
147121
<add name="XmlMembershipProvider" type="BlogEngine.Core.Providers.XmlMembershipProvider, BlogEngine.Core" description="XML membership provider" passwordFormat="Hashed" />
148-
<add name="SqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="BlogEngine" applicationName="BlogEngine" />
149122
<add name="DbMembershipProvider" type="BlogEngine.Core.Providers.DbMembershipProvider, BlogEngine.Core" passwordFormat="Hashed" connectionStringName="BlogEngine" />
150123
</providers>
151124
</membership>
152125
<roleManager defaultProvider="DbRoleProvider" enabled="true" cacheRolesInCookie="false">
153126
<providers>
154127
<clear />
155128
<add name="XmlRoleProvider" type="BlogEngine.Core.Providers.XmlRoleProvider, BlogEngine.Core" description="XML role provider" />
156-
<add name="SqlRoleProvider" type="System.Web.Security.SqlRoleProvider" connectionStringName="BlogEngine" applicationName="BlogEngine" />
157129
<add name="DbRoleProvider" type="BlogEngine.Core.Providers.DbRoleProvider, BlogEngine.Core" connectionStringName="BlogEngine" />
158130
</providers>
159131
</roleManager>
@@ -184,15 +156,14 @@
184156
<add verb="*" path="pingback.axd" type="BlogEngine.Core.Web.HttpHandlers.PingbackHandler, BlogEngine.Core" validate="false" />
185157
<add verb="*" path="opensearch.axd" type="BlogEngine.Core.Web.HttpHandlers.OpenSearchHandler, BlogEngine.Core" validate="false" />
186158
<add verb="*" path="metaweblog.axd" type="BlogEngine.Core.API.MetaWeblog.MetaWeblogHandler, BlogEngine.Core" validate="false" />
187-
<add verb="*" path="rsd.axd" type="BlogEngine.Core.Web.HttpHandlers.RsdHandler, BlogEngine.Core" validate="false" />
188-
<!--<add verb="*" path="css.axd" type="BlogEngine.Core.Web.HttpHandlers.CssHandler, BlogEngine.Core" validate="false"/>-->
189159
<add verb="*" path="*.js.axd" type="BlogEngine.Core.Web.HttpHandlers.JavaScriptHandler, BlogEngine.Core" validate="false" />
190160
<add verb="*" path="*.res.axd" type="BlogEngine.Core.Web.HttpHandlers.ResourceHandler, BlogEngine.Core" validate="false" />
191161
<add verb="*" path="rating.axd" type="BlogEngine.Core.Web.HttpHandlers.RatingHandler, BlogEngine.Core" validate="false" />
192-
<add verb="*" path="opml.axd" type="BlogEngine.Core.Web.HttpHandlers.OpmlHandler, BlogEngine.Core" validate="false" />
193162
<add verb="*" path="blogml.axd" type="BlogEngine.Core.Web.HttpHandlers.BlogMLExportHandler, BlogEngine.Core" validate="false" />
194-
<add verb="*" path="sioc.axd" type="BlogEngine.Core.Web.HttpHandlers.Sioc, BlogEngine.Core" validate="false" />
163+
<add verb="*" path="opml.axd" type="BlogEngine.Core.Web.HttpHandlers.OpmlHandler, BlogEngine.Core" validate="false" />
195164
<add verb="*" path="apml.axd" type="BlogEngine.Core.Web.HttpHandlers.Apml, BlogEngine.Core" validate="false" />
165+
<add verb="*" path="rsd.axd" type="BlogEngine.Core.Web.HttpHandlers.RsdHandler, BlogEngine.Core" validate="false" />
166+
<add verb="*" path="sioc.axd" type="BlogEngine.Core.Web.HttpHandlers.Sioc, BlogEngine.Core" validate="false" />
196167
<add verb="*" path="foaf*.axd" type="BlogEngine.Core.Web.HttpHandlers.Foaf, BlogEngine.Core" validate="false" />
197168
<add verb="*" path="*.htm" type="System.Web.StaticFileHandler" />
198169
</httpHandlers>
@@ -225,15 +196,14 @@
225196
<add name="Pingback" verb="*" path="pingback.axd" type="BlogEngine.Core.Web.HttpHandlers.PingbackHandler, BlogEngine.Core" resourceType="Unspecified" requireAccess="Script" preCondition="integratedMode" />
226197
<add name="OpenSearch" verb="*" path="opensearch.axd" type="BlogEngine.Core.Web.HttpHandlers.OpenSearchHandler, BlogEngine.Core" resourceType="Unspecified" requireAccess="Script" preCondition="integratedMode" />
227198
<add name="MetaWeblog" verb="*" path="metaweblog.axd" type="BlogEngine.Core.API.MetaWeblog.MetaWeblogHandler, BlogEngine.Core" resourceType="Unspecified" requireAccess="Script" preCondition="integratedMode" />
228-
<add name="RSD" verb="*" path="rsd.axd" type="BlogEngine.Core.Web.HttpHandlers.RsdHandler, BlogEngine.Core" resourceType="Unspecified" requireAccess="Script" preCondition="integratedMode" />
229-
<!--<add name="CssHandler" verb="*" path="css.axd" type="BlogEngine.Core.Web.HttpHandlers.CssHandler, BlogEngine.Core" resourceType="Unspecified" requireAccess="Script" preCondition="integratedMode"/>-->
230199
<add name="WebResource" path="*.js.axd" verb="*" type="BlogEngine.Core.Web.HttpHandlers.JavaScriptHandler, BlogEngine.Core" resourceType="Unspecified" requireAccess="Script" preCondition="integratedMode" />
231200
<add name="Resource" verb="*" path="*.res.axd" type="BlogEngine.Core.Web.HttpHandlers.ResourceHandler, BlogEngine.Core" resourceType="Unspecified" requireAccess="Script" preCondition="integratedMode" />
232201
<add name="Rating" verb="*" path="rating.axd" type="BlogEngine.Core.Web.HttpHandlers.RatingHandler, BlogEngine.Core" resourceType="Unspecified" requireAccess="Script" preCondition="integratedMode" />
233-
<add name="Opml" verb="*" path="opml.axd" type="BlogEngine.Core.Web.HttpHandlers.OpmlHandler, BlogEngine.Core" resourceType="Unspecified" requireAccess="Script" preCondition="integratedMode" />
234202
<add name="BlogML" verb="*" path="blogml.axd" type="BlogEngine.Core.Web.HttpHandlers.BlogMLExportHandler, BlogEngine.Core" resourceType="Unspecified" requireAccess="Script" preCondition="integratedMode" />
235-
<add name="SIOC" verb="*" path="sioc.axd" type="BlogEngine.Core.Web.HttpHandlers.Sioc, BlogEngine.Core" resourceType="Unspecified" requireAccess="Script" preCondition="integratedMode" />
203+
<add name="Opml" verb="*" path="opml.axd" type="BlogEngine.Core.Web.HttpHandlers.OpmlHandler, BlogEngine.Core" resourceType="Unspecified" requireAccess="Script" preCondition="integratedMode" />
236204
<add name="Apml" verb="*" path="apml.axd" type="BlogEngine.Core.Web.HttpHandlers.Apml, BlogEngine.Core" resourceType="Unspecified" requireAccess="Script" preCondition="integratedMode" />
205+
<add name="RSD" verb="*" path="rsd.axd" type="BlogEngine.Core.Web.HttpHandlers.RsdHandler, BlogEngine.Core" resourceType="Unspecified" requireAccess="Script" preCondition="integratedMode" />
206+
<add name="SIOC" verb="*" path="sioc.axd" type="BlogEngine.Core.Web.HttpHandlers.Sioc, BlogEngine.Core" resourceType="Unspecified" requireAccess="Script" preCondition="integratedMode" />
237207
<add name="Foaf" verb="*" path="foaf*.axd" type="BlogEngine.Core.Web.HttpHandlers.Foaf, BlogEngine.Core" resourceType="Unspecified" requireAccess="Script" preCondition="integratedMode" />
238208
<add name="Html" path="*.htm" verb="*" type="System.Web.StaticFileHandler" resourceType="Unspecified" preCondition="integratedMode" />
239209
<add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
@@ -267,6 +237,8 @@
267237
<mimeMap fileExtension=".ico" mimeType="image/x-icon" />
268238
<remove fileExtension=".woff" />
269239
<mimeMap fileExtension=".woff" mimeType="font/x-woff" />
240+
<remove fileExtension=".svg" />
241+
<mimeMap fileExtension=".svg" mimeType="image/svg+xml" />
270242
</staticContent>
271243
</system.webServer>
272244
<runtime>
@@ -284,20 +256,20 @@
284256
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0" />
285257
</dependentAssembly>
286258
<dependentAssembly>
287-
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
288-
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0" />
259+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
260+
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
289261
</dependentAssembly>
290262
<dependentAssembly>
291-
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
292-
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
263+
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
264+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
293265
</dependentAssembly>
294266
<dependentAssembly>
295-
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
296-
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
267+
<assemblyIdentity name="SimpleInjector" publicKeyToken="984cb50dea722e99" culture="neutral" />
268+
<bindingRedirect oldVersion="0.0.0.0-3.0.5.0" newVersion="3.0.5.0" />
297269
</dependentAssembly>
298270
<dependentAssembly>
299-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
300-
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
271+
<assemblyIdentity name="SimpleInjector.Extensions.ExecutionContextScoping" publicKeyToken="984cb50dea722e99" culture="neutral" />
272+
<bindingRedirect oldVersion="0.0.0.0-3.0.5.0" newVersion="3.0.5.0" />
301273
</dependentAssembly>
302274
</assemblyBinding>
303275
</runtime>

‎BlogEngine/BlogEngine.NET/setup/VistaDB/BlogEngine.vdb3‎

-448 KB
Binary file not shown.

‎BlogEngine/BlogEngine.NET/setup/VistaDB/BlogEngine.vdb4‎

-448 KB
Binary file not shown.

0 commit comments

Comments
 (0)