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

Fix after merge

Browse Source
This commit is contained in:
Stephan
2016-07-20 11:31:20 +02:00
parent c9152e3aca
commit d6462370fc
8 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/project.json
View File

@@ -1,8 +1,8 @@
{
"dependencies": {
"AutoMapper": "4.2.*",
"HtmlAgilityPack": "1.4.9.5",
"ImageProcessor": "2.4.*",
"HtmlAgilityPack": "1.4.*",
"LightInject": "4.0.*",
"LightInject.Annotation": "1.0.*",
"log4net": "2.0.*",

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

@@ -209,7 +209,7 @@
<assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.4.9.0" newVersion="1.4.9.0" />
<bindingRedirect oldVersion="0.0.0.0-1.4.9.5" newVersion="1.4.9.5" />
</dependentAssembly>

2
src/Umbraco.Web.UI/web.Template.Debug.config
View File

@@ -371,7 +371,7 @@
xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='HtmlAgilityPack']])" />
<dependentAssembly xdt:Transform="Insert">
<assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.4.9.0" newVersion="1.4.9.0" />
<bindingRedirect oldVersion="0.0.0.0-1.4.9.5" newVersion="1.4.9.5" />
</dependentAssembly>
<dependentAssembly xdt:Transform="Remove"

2
src/Umbraco.Web.UI/web.Template.config
View File

@@ -368,7 +368,7 @@
<!-- Ensure correct version of HtmlAgilityPack -->
<dependentAssembly>
<assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.4.9.4" newVersion="1.4.9.4" />
<bindingRedirect oldVersion="0.0.0.0-1.4.9.5" newVersion="1.4.9.5" />
</dependentAssembly>
<dependentAssembly>

8
src/Umbraco.Web/project.json
View File

@@ -4,7 +4,7 @@
"ClientDependency": "1.8.*",
"dotless": "1.4.1.0",
"Examine": "2.0.0-beta2",
"HtmlAgilityPack": "1.4.*",
"HtmlAgilityPack": "1.4.9.5",
"LightInject": "4.0.*",
"LightInject.Annotation": "1.0.*",
"LightInject.Mvc": "1.0.*",
@@ -38,10 +38,10 @@
"xmlrpcnet": "2.5.0"
},
"frameworks": {
"net461": { }
"net461": {}
},
"runtimes": {
"win-anycpu": { },
"win": { }
"win-anycpu": {},
"win": {}
}
}

2
src/UmbracoExamine/app.config
View File

@@ -32,7 +32,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.4.9.0" newVersion="1.4.9.0" />
<bindingRedirect oldVersion="0.0.0.0-1.4.9.5" newVersion="1.4.9.5" />
</dependentAssembly>
</assemblyBinding>
</runtime>

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

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ClientDependency" version="1.9.0-beta4" targetFramework="net45" />
<package id="HtmlAgilityPack" version="1.4.9" targetFramework="net45" />
<package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net461" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net461" />
<package id="NPoco" version="3.3.4" targetFramework="net461" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net45" />

6
src/umbraco.cms/umbraco.cms.csproj
View File

@@ -110,9 +110,9 @@
<HintPath>..\packages\ClientDependency.1.9.0-beta4\lib\net45\ClientDependency.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="HtmlAgilityPack, Version=1.4.9.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\HtmlAgilityPack.1.4.9\lib\Net45\HtmlAgilityPack.dll</HintPath>
<Reference Include="HtmlAgilityPack, Version=1.4.9.5, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
<HintPath>..\packages\HtmlAgilityPack.1.4.9.5\lib\Net45\HtmlAgilityPack.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>