Setup and DB provider fixes

rxtur · rxtur · commit c95e7c574ba6 · 2015-12-24T15:53:58.000-06:00
diff --git a/BlogEngine/BlogEngine.Core/Properties/AssemblyInfo.cs b/BlogEngine/BlogEngine.Core/Properties/AssemblyInfo.cs
@@ -19,5 +19,5 @@
 [assembly: CLSCompliant(false)]
 [assembly: ComVisible(false)]
 [assembly: AllowPartiallyTrustedCallers]
-[assembly: AssemblyVersion("3.1.4.7")]
+[assembly: AssemblyVersion("3.1.4.8")]
 [assembly: SecurityRules(SecurityRuleSet.Level1)]
diff --git a/BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj b/BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj
@@ -707,7 +707,6 @@
     <Content Include="Custom\Themes\Standard\fonts\fontello.eot" />
     <Content Include="Custom\Themes\Standard\fonts\fontello.ttf" />
     <Content Include="Custom\Themes\Standard\fonts\fontello.woff" />
-    <Content Include="Custom\Themes\Standard\fonts\Yekan.woff" />
     <Content Include="Custom\Themes\Standard\site.master" />
     <None Include="Scripts\jquery-2.1.4.intellisense.js" />
     <Content Include="Scripts\i18n\angular-locale_aa-dj.js" />
diff --git a/BlogEngine/BlogEngine.NET/setup/SQLServer/Setup.sql b/BlogEngine/BlogEngine.NET/setup/SQLServer/Setup.sql
diff --git a/BlogEngine/BlogEngine.NET/setup/SQLServer/Upgrade.sql b/BlogEngine/BlogEngine.NET/setup/SQLServer/Upgrade.sql
@@ -8,4 +8,8 @@ GO
 ALTER TABLE dbo.be_Settings DROP CONSTRAINT AK_SettingName
 GO
 ALTER TABLE dbo.be_Settings ADD CONSTRAINT AK_SettingName UNIQUE (BlogId, SettingName)
+GO
+ALTER TABLE dbo.be_PackageFiles DROP CONSTRAINT PK_be_PackageFiles
+GO
+ALTER TABLE dbo.be_PackageFiles ADD CONSTRAINT PK_be_PackageFiles UNIQUE (PackageId, FilePath)
 GO
diff --git a/BlogEngine/BlogEngine.NET/setup/upgrade/Updater.asmx b/BlogEngine/BlogEngine.NET/setup/upgrade/Updater.asmx
@@ -246,6 +246,7 @@ public class Updater  : WebService {
             ReplaceDir("\\App_GlobalResources");
             ReplaceDir("\\Scripts");
             ReplaceDir("\\Content");
+            ReplaceDir("\\Custom\\Themes\\Standard");
 
             return "";
         }

Original file line number	Diff line number	Diff line change
`@@ -246,6 +246,7 @@ public class Updater : WebService {`
`246`	`246`	`ReplaceDir("\\App_GlobalResources");`
`247`	`247`	`ReplaceDir("\\Scripts");`
`248`	`248`	`ReplaceDir("\\Content");`
	`249`	`+ ReplaceDir("\\Custom\\Themes\\Standard");`
`249`	`250`
`250`	`251`	`return "";`
`251`	`252`	`}`