yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master-v7' into dev-v7

Browse Source 
Conflicts:
	src/Umbraco.Core/MainDom.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Tests/packages.config
	src/Umbraco.Web.UI.Client/src/canvasdesigner/index.html
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
	src/UmbracoExamine/UmbracoExamine.csproj
	src/umbraco.MacroEngines/packages.config
	src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
This commit is contained in:
Shannon
2015-07-15 14:58:19 +02:00
parent a5d5809385 8baaae4da6
commit ba1d546579
17 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/NuSpecs/UmbracoCms.Core.nuspec
View File

@@ -33,7 +33,7 @@
<dependency id="ClientDependency-Mvc" version="[1.8.0, 2.0.0)" />
<dependency id="AutoMapper" version="[3.3.1, 4.0.0)" />
<dependency id="Newtonsoft.Json" version="[6.0.5, 7.0.0)" />
<dependency id="Examine" version="[0.1.64, 1.0.0)" />
<dependency id="Examine" version="[0.1.65, 1.0.0)" />
<dependency id="ImageProcessor" version="[1.9.5, 3.0.0)" />
<dependency id="ImageProcessor.Web" version="[3.3.1, 5.0.0)" />
<dependency id="semver" version="[1.1.2, 2.0.0)" />

2
src/Umbraco.Core/Events/MigrationEventArgs.cs
View File

@@ -77,7 +77,7 @@ namespace Umbraco.Core.Events
get { return EventObject; }
}
[Obsolete("Use ConfiguredUmbracoVersion instead")]
[Obsolete("Use ConfiguredSemVersion instead")]
[EditorBrowsable(EditorBrowsableState.Never)]
public Version ConfiguredVersion
{

5
src/Umbraco.Core/MainDom.cs
View File

@@ -47,7 +47,10 @@ namespace Umbraco.Core
{
_logger = logger;
var appId = HostingEnvironment.ApplicationID.ReplaceNonAlphanumericChars(string.Empty);
var appId = string.Empty;
// HostingEnvironment.ApplicationID is null in unit tests, making ReplaceNonAlphanumericChars fail
if (HostingEnvironment.ApplicationID != null)
appId = HostingEnvironment.ApplicationID.ReplaceNonAlphanumericChars(string.Empty);
var lockName = "UMBRACO-" + appId + "-MAINDOM-LCK";
_asyncLock = new AsyncLock(lockName);

4
src/Umbraco.Tests/Umbraco.Tests.csproj
View File

@@ -59,9 +59,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
</Reference>
<Reference Include="Examine, Version=0.1.64.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="Examine, Version=0.1.65.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Examine.0.1.64.0\lib\Examine.dll</HintPath>
<HintPath>..\packages\Examine.0.1.65.0\lib\Examine.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>

2
src/Umbraco.Tests/UmbracoExamine/EventsTest.cs
View File

@@ -14,7 +14,7 @@ namespace Umbraco.Tests.UmbracoExamine
public void Events_Ignoring_Node()
{
//change the parent id so that they are all ignored
var existingCriteria = ((IndexCriteria)_indexer.IndexerData);
var existingCriteria = _indexer.IndexerData;
_indexer.IndexerData = new IndexCriteria(existingCriteria.StandardFields, existingCriteria.UserFields, existingCriteria.IncludeNodeTypes, existingCriteria.ExcludeNodeTypes,
999); //change to 999

4
src/Umbraco.Tests/UmbracoExamine/IndexTest.cs
View File

@@ -53,7 +53,7 @@ namespace Umbraco.Tests.UmbracoExamine
public void Index_Move_Media_From_Non_Indexable_To_Indexable_ParentID()
{
//change parent id to 1116
var existingCriteria = ((IndexCriteria)_indexer.IndexerData);
var existingCriteria = _indexer.IndexerData;
_indexer.IndexerData = new IndexCriteria(existingCriteria.StandardFields, existingCriteria.UserFields, existingCriteria.IncludeNodeTypes, existingCriteria.ExcludeNodeTypes,
1116);
@@ -110,7 +110,7 @@ namespace Umbraco.Tests.UmbracoExamine
_indexer.ReIndexNode(node, IndexTypes.Media);
//change the parent node id to be the one it used to exist under
var existingCriteria = ((IndexCriteria)_indexer.IndexerData);
var existingCriteria = _indexer.IndexerData;
_indexer.IndexerData = new IndexCriteria(existingCriteria.StandardFields, existingCriteria.UserFields, existingCriteria.IncludeNodeTypes, existingCriteria.ExcludeNodeTypes,
2222);

2
src/Umbraco.Tests/packages.config
View File

@@ -2,7 +2,7 @@
<packages>
<package id="AspNetWebApi.SelfHost" version="4.0.20710.0" targetFramework="net45" />
<package id="AutoMapper" version="3.3.1" targetFramework="net45" />
<package id="Examine" version="0.1.64.0" targetFramework="net45" />
<package id="Examine" version="0.1.65.0" targetFramework="net45" />
<package id="log4net-mediumtrust" version="2.0.0" targetFramework="net45" />
<package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
<package id="Microsoft.AspNet.Mvc" version="4.0.40804.0" targetFramework="net45" />

4
src/Umbraco.Web.UI.Client/src/installer/installer.service.js
View File

@@ -28,7 +28,7 @@ angular.module("umbraco.install").factory('installerService', function($rootScop
'Umbraco is the best of both worlds: 100% free and open source, and backed by a professional and profitable company',
"There's a pretty big chance, you've visited a website powered by Umbraco today",
"'Umbraco-spotting' is the game of spotting big brands running Umbraco",
"At least 2 people have the Umbraco logo tattooed on them",
"At least 3 people have the Umbraco logo tattooed on them",
"'Umbraco' is the danish name for an allen key",
"Umbraco has been around since 2005, that's a looong time in IT",
"More than 400 people from all over the world meet each year in Denmark in June for our annual conference <a target='_blank' href='http://codegarden14.com'>CodeGarden</a>",
@@ -335,4 +335,4 @@ angular.module("umbraco.install").factory('installerService', function($rootScop
};
return service;
});
});

4
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -127,9 +127,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\dotless.1.4.1.0\lib\dotless.Core.dll</HintPath>
</Reference>
<Reference Include="Examine, Version=0.1.64.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="Examine, Version=0.1.65.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Examine.0.1.64.0\lib\Examine.dll</HintPath>
<HintPath>..\packages\Examine.0.1.65.0\lib\Examine.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>

2
src/Umbraco.Web.UI/packages.config
View File

@@ -4,7 +4,7 @@
<package id="ClientDependency" version="1.8.4" targetFramework="net45" />
<package id="ClientDependency-Mvc" version="1.8.0.0" targetFramework="net45" />
<package id="dotless" version="1.4.1.0" targetFramework="net45" />
<package id="Examine" version="0.1.64.0" targetFramework="net45" />
<package id="Examine" version="0.1.65.0" targetFramework="net45" />
<package id="ImageProcessor" version="1.9.5.0" targetFramework="net45" />
<package id="ImageProcessor.Web" version="3.3.1.0" targetFramework="net45" />
<package id="log4net-mediumtrust" version="2.0.0" targetFramework="net45" />

3
src/Umbraco.Web/Strategies/Migrations/EnsureListViewDataTypeIsCreated.cs
View File

@@ -31,9 +31,6 @@ namespace Umbraco.Web.Strategies.Migrations
private void EnsureListViewDataTypeCreated(MigrationEventArgs e)
{
var exists = e.MigrationContext.Database.ExecuteScalar<int>("SELECT COUNT(*) FROM umbracoNode WHERE id=1037");
if (exists > 0) return;
using (var transaction = e.MigrationContext.Database.GetTransaction())
{
try

6
src/Umbraco.Web/Umbraco.Web.csproj
View File

@@ -116,9 +116,9 @@
<Reference Include="dotless.Core">
<HintPath>..\packages\dotless.1.4.1.0\lib\dotless.Core.dll</HintPath>
</Reference>
<Reference Include="Examine">
<HintPath>..\packages\Examine.0.1.64.0\lib\Examine.dll</HintPath>
<Private>True</Private>
<Reference Include="Examine, Version=0.1.65.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Examine.0.1.65.0\lib\Examine.dll</HintPath>
</Reference>
<Reference Include="HtmlAgilityPack, Version=1.4.9.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>

2
src/Umbraco.Web/packages.config
View File

@@ -3,7 +3,7 @@
<package id="AutoMapper" version="3.3.1" targetFramework="net45" />
<package id="ClientDependency" version="1.8.4" targetFramework="net45" />
<package id="dotless" version="1.4.1.0" targetFramework="net45" />
<package id="Examine" version="0.1.64.0" targetFramework="net45" />
<package id="Examine" version="0.1.65.0" targetFramework="net45" />
<package id="HtmlAgilityPack" version="1.4.9" targetFramework="net45" />
<package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net45" />

4
src/UmbracoExamine/UmbracoExamine.csproj
View File

@@ -82,9 +82,9 @@
<AssemblyOriginatorKeyFile>..\Solution Items\TheFARM-Public.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Examine, Version=0.1.64.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="Examine, Version=0.1.65.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Examine.0.1.64.0\lib\Examine.dll</HintPath>
<HintPath>..\packages\Examine.0.1.65.0\lib\Examine.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>

2
src/UmbracoExamine/packages.config
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Examine" version="0.1.64.0" targetFramework="net45" />
<package id="Examine" version="0.1.65.0" targetFramework="net45" />
<package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
</packages>

2
src/umbraco.MacroEngines/packages.config
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Examine" version="0.1.64.0" targetFramework="net45" />
<package id="Examine" version="0.1.65.0" targetFramework="net45" />
<package id="HtmlAgilityPack" version="1.4.9" targetFramework="net45" />
<package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
<package id="Microsoft.AspNet.Mvc" version="4.0.40804.0" targetFramework="net45" />

4
src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
View File

@@ -45,9 +45,9 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Examine, Version=0.1.64.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="Examine, Version=0.1.65.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Examine.0.1.64.0\lib\Examine.dll</HintPath>
<HintPath>..\packages\Examine.0.1.65.0\lib\Examine.dll</HintPath>
</Reference>
<Reference Include="HtmlAgilityPack, Version=1.4.9.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>