Skip to content

Commit f5b2e31

Browse files
rxturrxtur
committed
Refactoring in SQL server setup files
1 parent ac354aa commit f5b2e31

26 files changed

Lines changed: 49 additions & 106 deletions

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

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1434,11 +1434,11 @@
14341434
<Content Include="setup\SQLite\SQLiteUpgradeFrom3.0To3.1.txt" />
14351435
<Content Include="setup\SQLite\SQLiteUpgradeFrom2.6To3.0.txt" />
14361436
<Content Include="setup\SQLite\SQLiteWeb.Config" />
1437-
<Content Include="setup\SQLServer\MSSQLSetup3.2.0.0.sql" />
1438-
<Content Include="setup\SQLServer\MSSQLSetup3.1.0.0.sql" />
1439-
<Content Include="setup\SQLServer\MSSQLUpgradeFrom3.1to3.2.sql" />
1440-
<Content Include="setup\SQLServer\MSSQLUpgradeFrom3.0to3.1.sql" />
1441-
<Content Include="setup\SQLServer\SQLServerWeb.Config" />
1437+
<Content Include="setup\SQLServer\Setup.sql" />
1438+
<Content Include="setup\SQLServer\Archive\MSSQLSetup3.1.0.0.sql" />
1439+
<Content Include="setup\SQLServer\Upgrade.sql" />
1440+
<Content Include="setup\SQLServer\Archive\MSSQLUpgradeFrom3.0to3.1.sql" />
1441+
<Content Include="setup\SQLServer\DbWeb.Config" />
14421442
<Content Include="setup\SQL_CE\SQL_CE_Setup_3.1.sql" />
14431443
<Content Include="setup\SQL_CE\SQL_CE_UpgradeFrom3.0to3.1.sql" />
14441444
<Content Include="setup\SQL_CE\SQL_CE_Web.Config" />
@@ -1688,23 +1688,23 @@
16881688
<Content Include="setup\SQLite\SQLiteUpgradeFrom2.0To2.5.txt" />
16891689
<Content Include="setup\SQLite\SQLiteUpgradeFrom2.5To2.6.txt" />
16901690
<Content Include="setup\SQLite\SQLiteUpgradeTo1.5.0From1.4.5.txt" />
1691-
<Content Include="setup\SQLServer\MSSQLSetup1.4.5.0.sql" />
1692-
<Content Include="setup\SQLServer\MSSQLSetup1.5.0.0.sql" />
1693-
<Content Include="setup\SQLServer\MSSQLSetup1.6.0.0.sql" />
1694-
<Content Include="setup\SQLServer\MSSQLSetup2.0.0.0.sql" />
1695-
<Content Include="setup\SQLServer\MSSQLSetup2.5.0.0.sql" />
1696-
<Content Include="setup\SQLServer\MSSQLSetup2.6.0.0.sql" />
1697-
<Content Include="setup\SQLServer\MSSQLSetup2.7.0.0.sql" />
1698-
<Content Include="setup\SQLServer\MSSQLSetup2.8.0.0.sql" />
1699-
<Content Include="setup\SQLServer\MSSQLSetup3.0.0.0.sql" />
1700-
<Content Include="setup\SQLServer\MSSQLUpgradeFrom1.5To1.6.sql" />
1701-
<Content Include="setup\SQLServer\MSSQLUpgradeFrom1.6To2.0.sql" />
1702-
<Content Include="setup\SQLServer\MSSQLUpgradeFrom2.0to2.5.sql" />
1703-
<Content Include="setup\SQLServer\MSSQLUpgradeFrom2.5to2.6.sql" />
1704-
<Content Include="setup\SQLServer\MSSQLUpgradeFrom2.8to3.0.sql" />
1705-
<Content Include="setup\SQLServer\MSSQLUpgradeTo1.4.5.0From1.3.x.sql" />
1706-
<Content Include="setup\SQLServer\MSSQLUpgradeTo1.4.5.0From1.4.0.0.sql" />
1707-
<Content Include="setup\SQLServer\MSSQLUpgradeTo1.5.0.0From1.4.5.0.sql" />
1691+
<Content Include="setup\SQLServer\Archive\MSSQLSetup1.4.5.0.sql" />
1692+
<Content Include="setup\SQLServer\Archive\MSSQLSetup1.5.0.0.sql" />
1693+
<Content Include="setup\SQLServer\Archive\MSSQLSetup1.6.0.0.sql" />
1694+
<Content Include="setup\SQLServer\Archive\MSSQLSetup2.0.0.0.sql" />
1695+
<Content Include="setup\SQLServer\Archive\MSSQLSetup2.5.0.0.sql" />
1696+
<Content Include="setup\SQLServer\Archive\MSSQLSetup2.6.0.0.sql" />
1697+
<Content Include="setup\SQLServer\Archive\MSSQLSetup2.7.0.0.sql" />
1698+
<Content Include="setup\SQLServer\Archive\MSSQLSetup2.8.0.0.sql" />
1699+
<Content Include="setup\SQLServer\Archive\MSSQLSetup3.0.0.0.sql" />
1700+
<Content Include="setup\SQLServer\Archive\MSSQLUpgradeFrom1.5To1.6.sql" />
1701+
<Content Include="setup\SQLServer\Archive\MSSQLUpgradeFrom1.6To2.0.sql" />
1702+
<Content Include="setup\SQLServer\Archive\MSSQLUpgradeFrom2.0to2.5.sql" />
1703+
<Content Include="setup\SQLServer\Archive\MSSQLUpgradeFrom2.5to2.6.sql" />
1704+
<Content Include="setup\SQLServer\Archive\MSSQLUpgradeFrom2.8to3.0.sql" />
1705+
<Content Include="setup\SQLServer\Archive\MSSQLUpgradeTo1.4.5.0From1.3.x.sql" />
1706+
<Content Include="setup\SQLServer\Archive\MSSQLUpgradeTo1.4.5.0From1.4.0.0.sql" />
1707+
<Content Include="setup\SQLServer\Archive\MSSQLUpgradeTo1.5.0.0From1.4.5.0.sql" />
17081708
<Content Include="setup\SQLServer\ReadMe.txt" />
17091709
<Content Include="setup\SQL_CE\ReadMe.txt" />
17101710
<Content Include="setup\SQL_CE\SQL_CE_Setup_2.0.sql" />

‎BlogEngine/BlogEngine.NET/Custom/Widgets/Tag cloud/widget.ascx.cs‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -182,19 +182,23 @@ public static void Reload()
182182
/// </summary>
183183
public override void LoadWidget()
184184
{
185-
foreach (var key in this.WeightedList.Keys)
185+
try
186186
{
187-
using (var li = new HtmlGenericControl("li"))
187+
foreach (var key in WeightedList.Keys)
188188
{
189-
li.InnerHtml = string.Format(
190-
LinkFormat,
191-
string.Format("{0}/tag/{1}", Utils.AbsoluteWebRoot, Utils.RemoveIllegalCharacters(key)),
192-
this.WeightedList[key],
193-
Resources.labels.Tag + ": " + key,
194-
key);
195-
this.ulTags.Controls.Add(li);
189+
using (var li = new HtmlGenericControl("li"))
190+
{
191+
li.InnerHtml = string.Format(
192+
LinkFormat,
193+
string.Format("{0}/tag/{1}", Utils.AbsoluteWebRoot, Utils.RemoveIllegalCharacters(key)),
194+
this.WeightedList[key],
195+
Resources.labels.Tag + ": " + key,
196+
key);
197+
this.ulTags.Controls.Add(li);
198+
}
196199
}
197200
}
201+
catch (Exception){ }
198202
}
199203

200204
#endregion

‎BlogEngine/BlogEngine.NET/Web.Config‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,14 @@
1010
<blogProvider defaultProvider="XmlBlogProvider" fileStoreProvider="XmlBlogProvider">
1111
<providers>
1212
<add description="Xml Blog Provider" name="XmlBlogProvider" type="BlogEngine.Core.Providers.XmlBlogProvider, BlogEngine.Core" />
13-
<add connectionStringName="BlogEngine" description="Sql Database Provider" name="DbBlogProvider" type="BlogEngine.Core.Providers.DbBlogProvider, BlogEngine.Core" />
1413
</providers>
1514
</blogProvider>
1615
<blogFileSystemProvider defaultProvider="XmlBlogProvider">
1716
<providers>
1817
<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"/>-->
2118
</providers>
2219
</blogFileSystemProvider>
2320
</BlogEngine>
24-
<connectionStrings>
25-
<clear />
26-
<add name="BlogEngine" connectionString="Server=.\SQLEXPRESS;Database=BlogEngine;Trusted_Connection=True;" providerName="System.Data.SqlClient" />
27-
<!--<add name="BlogEngine" connectionString="Data Source=localhost;User ID=usernmae;Password=password;persist security info=False;initial catalog=BlogEngineFileStore;" providerName="System.Data.SqlClient"/>-->
28-
</connectionStrings>
2921
<appSettings>
3022
<!-- Override default application settings here -->
3123
</appSettings>
@@ -114,16 +106,12 @@
114106
<providers>
115107
<clear />
116108
<add name="XmlMembershipProvider" type="BlogEngine.Core.Providers.XmlMembershipProvider, BlogEngine.Core" description="XML membership provider" passwordFormat="Hashed" />
117-
<add name="SqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="BlogEngine" applicationName="BlogEngine" />
118-
<add name="DbMembershipProvider" type="BlogEngine.Core.Providers.DbMembershipProvider, BlogEngine.Core" passwordFormat="Hashed" connectionStringName="BlogEngine" />
119109
</providers>
120110
</membership>
121111
<roleManager defaultProvider="XmlRoleProvider" enabled="true" cacheRolesInCookie="false">
122112
<providers>
123113
<clear />
124114
<add name="XmlRoleProvider" type="BlogEngine.Core.Providers.XmlRoleProvider, BlogEngine.Core" description="XML role provider" />
125-
<add name="SqlRoleProvider" type="System.Web.Security.SqlRoleProvider" connectionStringName="BlogEngine" applicationName="BlogEngine" />
126-
<add name="DbRoleProvider" type="BlogEngine.Core.Providers.DbRoleProvider, BlogEngine.Core" connectionStringName="BlogEngine" />
127115
</providers>
128116
</roleManager>
129117
<siteMap defaultProvider="PageSiteMap" enabled="true">

BlogEngine/BlogEngine.NET/setup/SQLServer/MSSQLSetup1.4.5.0.sql renamed to BlogEngine/BlogEngine.NET/setup/SQLServer/Archive/MSSQLSetup1.4.5.0.sql

File renamed without changes.

BlogEngine/BlogEngine.NET/setup/SQLServer/MSSQLSetup1.5.0.0.sql renamed to BlogEngine/BlogEngine.NET/setup/SQLServer/Archive/MSSQLSetup1.5.0.0.sql

File renamed without changes.

BlogEngine/BlogEngine.NET/setup/SQLServer/MSSQLSetup1.6.0.0.sql renamed to BlogEngine/BlogEngine.NET/setup/SQLServer/Archive/MSSQLSetup1.6.0.0.sql

File renamed without changes.

BlogEngine/BlogEngine.NET/setup/SQLServer/MSSQLSetup2.0.0.0.sql renamed to BlogEngine/BlogEngine.NET/setup/SQLServer/Archive/MSSQLSetup2.0.0.0.sql

File renamed without changes.

BlogEngine/BlogEngine.NET/setup/SQLServer/MSSQLSetup2.5.0.0.sql renamed to BlogEngine/BlogEngine.NET/setup/SQLServer/Archive/MSSQLSetup2.5.0.0.sql

File renamed without changes.

BlogEngine/BlogEngine.NET/setup/SQLServer/MSSQLSetup2.6.0.0.sql renamed to BlogEngine/BlogEngine.NET/setup/SQLServer/Archive/MSSQLSetup2.6.0.0.sql

File renamed without changes.

BlogEngine/BlogEngine.NET/setup/SQLServer/MSSQLSetup2.7.0.0.sql renamed to BlogEngine/BlogEngine.NET/setup/SQLServer/Archive/MSSQLSetup2.7.0.0.sql

File renamed without changes.

0 commit comments

Comments
 (0)