Skip to content

Commit 8eee7ca

Browse files
nul800sebastiaannul800sebastiaan
committed
Merge branch '6.1.6'
2 parents a353f6f + 226e35d commit 8eee7ca

34 files changed

+562
-197
lines changed

‎build/Build.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@ECHO OFF
2-
SET release=6.1.5
2+
SET release=6.1.6
33
SET comment=
44
SET version=%release%
55

‎build/NuSpecs/UmbracoCms.Core.nuspec

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<?xml version="1.0" encoding="utf-16"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>UmbracoCms.Core</id>
5-
<version>6.1.2</version>
5+
<version>6.2.0</version>
66
<title>Umbraco Cms Core Binaries</title>
77
<authors>Morten Christensen</authors>
88
<owners>Umbraco HQ</owners>
@@ -14,57 +14,57 @@
1414
<summary>Contains the core assemblies needed to run Umbraco Cms</summary>
1515
<language>en-US</language>
1616
<tags>umbraco</tags>
17-
<dependencies>
17+
<dependencies>
1818
<dependency id="Microsoft.AspNet.Mvc" version="4.0" />
19-
<dependency id="Microsoft.AspNet.WebApi" version="4.0" />
20-
<dependency id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.0" />
21-
<dependency id="MiniProfiler" version="2.1.0" />
22-
<dependency id="HtmlAgilityPack" version="1.4.6" />
23-
<dependency id="Lucene.Net" version="[2.9.4.1]" />
24-
<dependency id="SharpZipLib" version="0.86.0" />
25-
<dependency id="MySql.Data" version="[6.6.5]" />
26-
<dependency id="xmlrpcnet" version="2.5.0" />
27-
<dependency id="ClientDependency" version="[1.7.0,1.7.1)" />
28-
<dependency id="ClientDependency-Mvc" version="[1.7.0,1.7.1)" />
19+
<dependency id="Microsoft.AspNet.WebApi" version="4.0" />
20+
<dependency id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.0" />
21+
<dependency id="MiniProfiler" version="[2.1.0, 3.0.0)" />
22+
<dependency id="HtmlAgilityPack" version="[1.4.6, 2.0.0)" />
23+
<dependency id="Lucene.Net" version="[2.9.4.1, 3.0.0.0)" />
24+
<dependency id="SharpZipLib" version="[0.86.0, 1.0.0)" />
25+
<dependency id="MySql.Data" version="[6.6.5]" />
26+
<dependency id="xmlrpcnet" version="[2.5.0, 3.0.0)" />
27+
<dependency id="ClientDependency" version="[1.7.0, 2.0.0)" />
28+
<dependency id="ClientDependency-Mvc" version="[1.7.0, 2.0.0)" />
2929
</dependencies>
3030
</metadata>
31-
<files>
32-
<file src="..\_BuildOutput\WebApp\bin\businesslogic.dll" target="lib\businesslogic.dll" />
33-
<file src="..\_BuildOutput\WebApp\bin\businesslogic.xml" target="lib\businesslogic.xml" />
34-
<file src="..\_BuildOutput\WebApp\bin\cms.dll" target="lib\cms.dll" />
35-
<file src="..\_BuildOutput\WebApp\bin\cms.xml" target="lib\cms.xml" />
36-
<file src="..\_BuildOutput\WebApp\bin\controls.dll" target="lib\controls.dll" />
37-
<file src="..\_BuildOutput\WebApp\bin\controls.xml" target="lib\controls.xml" />
38-
<file src="..\_BuildOutput\WebApp\bin\Examine.dll" target="lib\Examine.dll" />
39-
<file src="..\_BuildOutput\WebApp\bin\interfaces.dll" target="lib\interfaces.dll" />
40-
<file src="..\_BuildOutput\WebApp\bin\interfaces.xml" target="lib\interfaces.xml" />
41-
<file src="..\_BuildOutput\WebApp\bin\log4net.dll" target="lib\log4net.dll" />
42-
<file src="..\_BuildOutput\WebApp\bin\Microsoft.ApplicationBlocks.Data.dll" target="lib\Microsoft.ApplicationBlocks.Data.dll" />
43-
<file src="..\_BuildOutput\WebApp\bin\Microsoft.Web.Helpers.dll" target="lib\Microsoft.Web.Helpers.dll" />
44-
<file src="..\_BuildOutput\WebApp\bin\Our.Umbraco.uGoLive.47x.dll" target="lib\Our.Umbraco.uGoLive.47x.dll" />
45-
<file src="..\_BuildOutput\WebApp\bin\Our.Umbraco.uGoLive.Checks.dll" target="lib\Our.Umbraco.uGoLive.Checks.dll" />
46-
<file src="..\_BuildOutput\WebApp\bin\Our.Umbraco.uGoLive.dll" target="lib\Our.Umbraco.uGoLive.dll" />
47-
<file src="..\_BuildOutput\WebApp\bin\SQLCE4Umbraco.dll" target="lib\SQLCE4Umbraco.dll" />
48-
<file src="..\_BuildOutput\WebApp\bin\System.Data.SqlServerCe.dll" target="lib\System.Data.SqlServerCe.dll" />
49-
<file src="..\_BuildOutput\WebApp\bin\System.Data.SqlServerCe.Entity.dll" target="lib\System.Data.SqlServerCe.Entity.dll" />
50-
<file src="..\_BuildOutput\WebApp\bin\TidyNet.dll" target="lib\TidyNet.dll" />
51-
<file src="..\_BuildOutput\WebApp\bin\Umbraco.Core.dll" target="lib\Umbraco.Core.dll" />
52-
<file src="..\_BuildOutput\WebApp\bin\Umbraco.Core.xml" target="lib\Umbraco.Core.xml" />
53-
<file src="..\_BuildOutput\WebApp\bin\umbraco.DataLayer.dll" target="lib\umbraco.DataLayer.dll" />
54-
<file src="..\_BuildOutput\WebApp\bin\umbraco.DataLayer.xml" target="lib\umbraco.DataLayer.xml" />
55-
<file src="..\_BuildOutput\WebApp\bin\umbraco.dll" target="lib\umbraco.dll" />
56-
<file src="..\_BuildOutput\WebApp\bin\umbraco.xml" target="lib\umbraco.xml" />
57-
<file src="..\_BuildOutput\WebApp\bin\umbraco.editorControls.dll" target="lib\umbraco.editorControls.dll" />
58-
<file src="..\_BuildOutput\WebApp\bin\umbraco.editorControls.xml" target="lib\umbraco.editorControls.xml" />
59-
<file src="..\_BuildOutput\WebApp\bin\umbraco.MacroEngines.dll" target="lib\umbraco.MacroEngines.dll" />
60-
<file src="..\_BuildOutput\WebApp\bin\umbraco.MacroEngines.xml" target="lib\umbraco.MacroEngines.xml" />
61-
<file src="..\_BuildOutput\WebApp\bin\umbraco.macroRenderings.dll" target="lib\umbraco.macroRenderings.dll" />
62-
<file src="..\_BuildOutput\WebApp\bin\umbraco.macroRenderings.xml" target="lib\umbraco.macroRenderings.xml" />
63-
<file src="..\_BuildOutput\WebApp\bin\umbraco.providers.dll" target="lib\umbraco.providers.dll" />
64-
<file src="..\_BuildOutput\WebApp\bin\umbraco.providers.xml" target="lib\umbraco.providers.xml" />
65-
<file src="..\_BuildOutput\WebApp\bin\Umbraco.Web.UI.dll" target="lib\Umbraco.Web.UI.dll" />
66-
<file src="..\_BuildOutput\WebApp\bin\umbraco.XmlSerializers.dll" target="lib\umbraco.XmlSerializers.dll" />
67-
<file src="..\_BuildOutput\WebApp\bin\UmbracoExamine.dll" target="lib\UmbracoExamine.dll" />
68-
<file src="..\_BuildOutput\WebApp\bin\UrlRewritingNet.UrlRewriter.dll" target="lib\UrlRewritingNet.UrlRewriter.dll" />
69-
</files>
31+
<files>
32+
<file src="..\_BuildOutput\WebApp\bin\businesslogic.dll" target="lib\businesslogic.dll" />
33+
<file src="..\_BuildOutput\WebApp\bin\businesslogic.xml" target="lib\businesslogic.xml" />
34+
<file src="..\_BuildOutput\WebApp\bin\cms.dll" target="lib\cms.dll" />
35+
<file src="..\_BuildOutput\WebApp\bin\cms.xml" target="lib\cms.xml" />
36+
<file src="..\_BuildOutput\WebApp\bin\controls.dll" target="lib\controls.dll" />
37+
<file src="..\_BuildOutput\WebApp\bin\controls.xml" target="lib\controls.xml" />
38+
<file src="..\_BuildOutput\WebApp\bin\Examine.dll" target="lib\Examine.dll" />
39+
<file src="..\_BuildOutput\WebApp\bin\interfaces.dll" target="lib\interfaces.dll" />
40+
<file src="..\_BuildOutput\WebApp\bin\interfaces.xml" target="lib\interfaces.xml" />
41+
<file src="..\_BuildOutput\WebApp\bin\log4net.dll" target="lib\log4net.dll" />
42+
<file src="..\_BuildOutput\WebApp\bin\Microsoft.ApplicationBlocks.Data.dll" target="lib\Microsoft.ApplicationBlocks.Data.dll" />
43+
<file src="..\_BuildOutput\WebApp\bin\Microsoft.Web.Helpers.dll" target="lib\Microsoft.Web.Helpers.dll" />
44+
<file src="..\_BuildOutput\WebApp\bin\Our.Umbraco.uGoLive.47x.dll" target="lib\Our.Umbraco.uGoLive.47x.dll" />
45+
<file src="..\_BuildOutput\WebApp\bin\Our.Umbraco.uGoLive.Checks.dll" target="lib\Our.Umbraco.uGoLive.Checks.dll" />
46+
<file src="..\_BuildOutput\WebApp\bin\Our.Umbraco.uGoLive.dll" target="lib\Our.Umbraco.uGoLive.dll" />
47+
<file src="..\_BuildOutput\WebApp\bin\SQLCE4Umbraco.dll" target="lib\SQLCE4Umbraco.dll" />
48+
<file src="..\_BuildOutput\WebApp\bin\System.Data.SqlServerCe.dll" target="lib\System.Data.SqlServerCe.dll" />
49+
<file src="..\_BuildOutput\WebApp\bin\System.Data.SqlServerCe.Entity.dll" target="lib\System.Data.SqlServerCe.Entity.dll" />
50+
<file src="..\_BuildOutput\WebApp\bin\TidyNet.dll" target="lib\TidyNet.dll" />
51+
<file src="..\_BuildOutput\WebApp\bin\Umbraco.Core.dll" target="lib\Umbraco.Core.dll" />
52+
<file src="..\_BuildOutput\WebApp\bin\Umbraco.Core.xml" target="lib\Umbraco.Core.xml" />
53+
<file src="..\_BuildOutput\WebApp\bin\umbraco.DataLayer.dll" target="lib\umbraco.DataLayer.dll" />
54+
<file src="..\_BuildOutput\WebApp\bin\umbraco.DataLayer.xml" target="lib\umbraco.DataLayer.xml" />
55+
<file src="..\_BuildOutput\WebApp\bin\umbraco.dll" target="lib\umbraco.dll" />
56+
<file src="..\_BuildOutput\WebApp\bin\umbraco.xml" target="lib\umbraco.xml" />
57+
<file src="..\_BuildOutput\WebApp\bin\umbraco.editorControls.dll" target="lib\umbraco.editorControls.dll" />
58+
<file src="..\_BuildOutput\WebApp\bin\umbraco.editorControls.xml" target="lib\umbraco.editorControls.xml" />
59+
<file src="..\_BuildOutput\WebApp\bin\umbraco.MacroEngines.dll" target="lib\umbraco.MacroEngines.dll" />
60+
<file src="..\_BuildOutput\WebApp\bin\umbraco.MacroEngines.xml" target="lib\umbraco.MacroEngines.xml" />
61+
<file src="..\_BuildOutput\WebApp\bin\umbraco.macroRenderings.dll" target="lib\umbraco.macroRenderings.dll" />
62+
<file src="..\_BuildOutput\WebApp\bin\umbraco.macroRenderings.xml" target="lib\umbraco.macroRenderings.xml" />
63+
<file src="..\_BuildOutput\WebApp\bin\umbraco.providers.dll" target="lib\umbraco.providers.dll" />
64+
<file src="..\_BuildOutput\WebApp\bin\umbraco.providers.xml" target="lib\umbraco.providers.xml" />
65+
<file src="..\_BuildOutput\WebApp\bin\Umbraco.Web.UI.dll" target="lib\Umbraco.Web.UI.dll" />
66+
<file src="..\_BuildOutput\WebApp\bin\umbraco.XmlSerializers.dll" target="lib\umbraco.XmlSerializers.dll" />
67+
<file src="..\_BuildOutput\WebApp\bin\UmbracoExamine.dll" target="lib\UmbracoExamine.dll" />
68+
<file src="..\_BuildOutput\WebApp\bin\UrlRewritingNet.UrlRewriter.dll" target="lib\UrlRewritingNet.UrlRewriter.dll" />
69+
</files>
7070
</package>

‎build/NuSpecs/UmbracoCms.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-16"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>UmbracoCms</id>

‎src/Umbraco.Core/Configuration/UmbracoVersion.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace Umbraco.Core.Configuration
55
{
66
public class UmbracoVersion
77
{
8-
private static readonly Version Version = new Version("6.1.5");
8+
private static readonly Version Version = new Version("6.1.6");
99

1010
/// <summary>
1111
/// Gets the current version of Umbraco.

‎src/Umbraco.Core/DatabaseContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public DatabaseProviders DatabaseProvider
112112
public void ConfigureEmbeddedDatabaseConnection()
113113
{
114114
const string providerName = "System.Data.SqlServerCe.4.0";
115-
const string connectionString = @"Data Source=|DataDirectory|\Umbraco.sdf;Flush Interval=1;File Access Retry Timeout=10";
115+
const string connectionString = @"Data Source=|DataDirectory|\Umbraco.sdf;Flush Interval=1;";
116116

117117
SaveConnectionString(connectionString, providerName);
118118

‎src/Umbraco.Core/IDisposeOnRequestEnd.cs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
6+
namespace Umbraco.Core
7+
{
8+
/// <summary>
9+
/// Any class implementing this interface that is added to the httpcontext.items keys or values will be disposed of at the end of the request.
10+
/// </summary>
11+
public interface IDisposeOnRequestEnd : IDisposable
12+
{
13+
}
14+
}

‎src/Umbraco.Core/Models/Rdbms/PropertyDataDto.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@ public object GetValue
6565
return Date.Value;
6666
}
6767

68-
if(!string.IsNullOrEmpty(VarChar))
68+
if(string.IsNullOrEmpty(VarChar) == false)
6969
{
7070
return VarChar;
7171
}
7272

73-
if(!string.IsNullOrEmpty(Text))
73+
if(string.IsNullOrEmpty(Text) == false)
7474
{
7575
return Text;
7676
}

‎src/Umbraco.Core/Models/UmbracoObjectTypesExtensions.cs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using System.Collections.Concurrent;
23
using System.Collections.Generic;
34
using Umbraco.Core.CodeAnnotations;
45

@@ -9,7 +10,8 @@ namespace Umbraco.Core.Models
910
/// </summary>
1011
public static class UmbracoObjectTypesExtensions
1112
{
12-
private static readonly Dictionary<UmbracoObjectTypes, Guid> UmbracoObjectTypeCache = new Dictionary<UmbracoObjectTypes,Guid>();
13+
//MUST be concurrent to avoid thread collisions!
14+
private static readonly ConcurrentDictionary<UmbracoObjectTypes, Guid> UmbracoObjectTypeCache = new ConcurrentDictionary<UmbracoObjectTypes, Guid>();
1315

1416
/// <summary>
1517
/// Get an UmbracoObjectTypes value from it's name
@@ -48,24 +50,22 @@ public static UmbracoObjectTypes GetUmbracoObjectType(Guid guid)
4850
/// <returns>a GUID value of the UmbracoObjectTypes</returns>
4951
public static Guid GetGuid(this UmbracoObjectTypes umbracoObjectType)
5052
{
51-
if (UmbracoObjectTypeCache.ContainsKey(umbracoObjectType))
52-
return UmbracoObjectTypeCache[umbracoObjectType];
53-
54-
var type = typeof(UmbracoObjectTypes);
55-
var memInfo = type.GetMember(umbracoObjectType.ToString());
56-
var attributes = memInfo[0].GetCustomAttributes(typeof(UmbracoObjectTypeAttribute),
57-
false);
58-
59-
if (attributes.Length == 0)
60-
return Guid.Empty;
53+
return UmbracoObjectTypeCache.GetOrAdd(umbracoObjectType, types =>
54+
{
55+
var type = typeof(UmbracoObjectTypes);
56+
var memInfo = type.GetMember(umbracoObjectType.ToString());
57+
var attributes = memInfo[0].GetCustomAttributes(typeof(UmbracoObjectTypeAttribute),
58+
false);
6159

62-
var attribute = ((UmbracoObjectTypeAttribute)attributes[0]);
63-
if (attribute == null)
64-
return Guid.Empty;
60+
if (attributes.Length == 0)
61+
return Guid.Empty;
6562

66-
UmbracoObjectTypeCache.Add(umbracoObjectType, attribute.ObjectId);
63+
var attribute = ((UmbracoObjectTypeAttribute)attributes[0]);
64+
if (attribute == null)
65+
return Guid.Empty;
6766

68-
return attribute.ObjectId;
67+
return attribute.ObjectId;
68+
});
6969
}
7070

7171
/// <summary>

‎src/Umbraco.Core/Persistence/UmbracoDatabase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace Umbraco.Core.Persistence
1616
/// can then override any additional execution (such as additional loggging, functionality, etc...) that we need to without breaking compatibility since we'll always be exposing
1717
/// this object instead of the base PetaPoco database object.
1818
/// </remarks>
19-
public class UmbracoDatabase : Database
19+
public class UmbracoDatabase : Database, IDisposeOnRequestEnd
2020
{
2121
private readonly Guid _instanceId = Guid.NewGuid();
2222
/// <summary>

‎src/Umbraco.Core/TypeHelper.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,16 @@ internal static class TypeHelper
1616
private static readonly ConcurrentDictionary<Type, FieldInfo[]> GetFieldsCache = new ConcurrentDictionary<Type, FieldInfo[]>();
1717
private static readonly ConcurrentDictionary<Tuple<Type, bool, bool, bool>, PropertyInfo[]> GetPropertiesCache = new ConcurrentDictionary<Tuple<Type, bool, bool, bool>, PropertyInfo[]>();
1818

19+
/// <summary>
20+
/// Checks if the method is actually overriding a base method
21+
/// </summary>
22+
/// <param name="m"></param>
23+
/// <returns></returns>
24+
public static bool IsOverride(MethodInfo m)
25+
{
26+
return m.GetBaseDefinition().DeclaringType != m.DeclaringType;
27+
}
28+
1929
/// <summary>
2030
/// Find all assembly references that are referencing the assignTypeFrom Type's assembly found in the assemblyList
2131
/// </summary>

‎src/Umbraco.Core/Umbraco.Core.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@
165165
<Compile Include="Events\SaveEventArgs.cs" />
166166
<Compile Include="Events\SendToPublishEventArgs.cs" />
167167
<Compile Include="IApplicationEventHandler.cs" />
168+
<Compile Include="IDisposeOnRequestEnd.cs" />
168169
<Compile Include="IO\ResizedImage.cs" />
169170
<Compile Include="IO\UmbracoMediaFile.cs" />
170171
<Compile Include="Media\MediaSubfolderCounter.cs" />

‎src/Umbraco.Tests/App.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</appSettings>
2727

2828
<connectionStrings>
29-
<add name="umbracoDbDSN" connectionString="Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;File Access Retry Timeout=10" providerName="System.Data.SqlServerCe.4.0"/>
29+
<add name="umbracoDbDSN" connectionString="Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;" providerName="System.Data.SqlServerCe.4.0"/>
3030
</connectionStrings>
3131

3232
<FileSystemProviders>

‎src/Umbraco.Tests/BusinessLogic/BaseTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ private void ClearDatabase()
5353

5454
private void InitializeDatabase()
5555
{
56-
ConfigurationManager.AppSettings.Set(Core.Configuration.GlobalSettings.UmbracoConnectionName, @"datalayer=SQLCE4Umbraco.SqlCEHelper,SQLCE4Umbraco;data source=|DataDirectory|\UmbracoPetaPocoTests.sdf;Flush Interval=1;File Access Retry Timeout=10");
56+
ConfigurationManager.AppSettings.Set(Core.Configuration.GlobalSettings.UmbracoConnectionName, @"datalayer=SQLCE4Umbraco.SqlCEHelper,SQLCE4Umbraco;data source=|DataDirectory|\UmbracoPetaPocoTests.sdf;Flush Interval=1;");
5757

5858
ClearDatabase();
5959

‎src/Umbraco.Tests/Migrations/Upgrades/SqlCeDataUpgradeTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public override ISqlSyntaxProvider GetSyntaxProvider()
5757

5858
public override UmbracoDatabase GetConfiguredDatabase()
5959
{
60-
return new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;File Access Retry Timeout=10", "System.Data.SqlServerCe.4.0");
60+
return new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;", "System.Data.SqlServerCe.4.0");
6161
}
6262

6363
public override DatabaseProviders GetDatabaseProvider()

‎src/Umbraco.Tests/Migrations/Upgrades/SqlCeUpgradeTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public override ISqlSyntaxProvider GetSyntaxProvider()
6363

6464
public override UmbracoDatabase GetConfiguredDatabase()
6565
{
66-
return new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;File Access Retry Timeout=10", "System.Data.SqlServerCe.4.0");
66+
return new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;", "System.Data.SqlServerCe.4.0");
6767
}
6868

6969
public override DatabaseProviders GetDatabaseProvider()

‎src/Umbraco.Tests/Migrations/Upgrades/ValidateOlderSchemaTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public virtual void TearDown()
100100

101101
public UmbracoDatabase GetConfiguredDatabase()
102102
{
103-
return new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;File Access Retry Timeout=10", "System.Data.SqlServerCe.4.0");
103+
return new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;", "System.Data.SqlServerCe.4.0");
104104
}
105105

106106
public string GetDatabaseSpecificSqlScript()

‎src/Umbraco.Tests/Persistence/DatabaseContextTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public void Can_Assert_Created_Database()
6969
//Get the connectionstring settings from config
7070
var settings = ConfigurationManager.ConnectionStrings[Core.Configuration.GlobalSettings.UmbracoConnectionName];
7171

72-
//by default the conn string is: Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;File Access Retry Timeout=10
72+
//by default the conn string is: Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;
7373
//we'll just replace the sdf file with our custom one:
7474
//Create the Sql CE database
7575
var engine = new SqlCeEngine(settings.ConnectionString.Replace("UmbracoPetaPocoTests", "DatabaseContextTests"));

0 commit comments

Comments
 (0)