3c3f2d7c8d
Conflicts: src/Umbraco.Core/Constants-Conventions.cs src/Umbraco.Core/DateTimeExtensions.cs src/Umbraco.Core/Models/PropertyType.cs src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs src/Umbraco.Core/Persistence/Factories/PropertyGroupFactory.cs src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs src/Umbraco.Core/Persistence/Repositories/Interfaces/IUserRepository.cs src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs src/Umbraco.Core/Persistence/Repositories/PermissionRepository.cs src/Umbraco.Tests/App.config src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs src/Umbraco.Tests/UmbracoExamine/ExamineBaseTest.cs src/Umbraco.Tests/packages.config src/Umbraco.Web.UI/packages.config src/Umbraco.Web/Umbraco.Web.csproj src/Umbraco.Web/app.config src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltInsertValueOf.aspx.cs src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/umbracoField.aspx.cs src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs src/umbraco.MacroEngines/App.Config src/umbraco.providers/members/UmbracoMembershipProvider.cs
31 lines
2.4 KiB
XML
31 lines
2.4 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<packages>
|
|
<package id="AutoMapper" version="3.0.0" targetFramework="net45" />
|
|
<package id="ClientDependency" version="1.7.1.1" targetFramework="net45" />
|
|
<package id="ClientDependency-Mvc" version="1.7.0.4" targetFramework="net40" />
|
|
<package id="Examine" version="0.1.55.2941" targetFramework="net40" />
|
|
<package id="ImageProcessor" version="1.8.3.0" targetFramework="net45" />
|
|
<package id="ImageProcessor.Web" version="3.1.1.0" targetFramework="net45" />
|
|
<package id="log4net-mediumtrust" version="2.0.0" targetFramework="net40" />
|
|
<package id="Lucene.Net" version="2.9.4.1" targetFramework="net40" />
|
|
<package id="Microsoft.AspNet.Mvc" version="4.0.30506.0" targetFramework="net40" />
|
|
<package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.1" targetFramework="net40" />
|
|
<package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net40" />
|
|
<package id="Microsoft.AspNet.WebApi" version="4.0.30506.0" targetFramework="net40" />
|
|
<package id="Microsoft.AspNet.WebApi.Client" version="4.0.30506.0" targetFramework="net40" />
|
|
<package id="Microsoft.AspNet.WebApi.Core" version="4.0.30506.0" targetFramework="net40" />
|
|
<package id="Microsoft.AspNet.WebApi.WebHost" version="4.0.30506.0" targetFramework="net40" />
|
|
<package id="Microsoft.AspNet.WebPages" version="2.0.30506.0" targetFramework="net40" />
|
|
<package id="Microsoft.Bcl" version="1.1.3" targetFramework="net45" />
|
|
<package id="Microsoft.Bcl.Async" version="1.0.165" targetFramework="net45" />
|
|
<package id="Microsoft.Bcl.Build" version="1.0.10" targetFramework="net45" />
|
|
<package id="Microsoft.Net.Http" version="2.2.15" targetFramework="net45" requireReinstallation="True" />
|
|
<package id="Microsoft.Web.Helpers" version="1.0.0" targetFramework="net40" />
|
|
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
|
|
<package id="MiniProfiler" version="2.1.0" targetFramework="net40" />
|
|
<package id="MySql.Data" version="6.6.5" targetFramework="net40" />
|
|
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
|
|
<package id="SharpZipLib" version="0.86.0" targetFramework="net40" />
|
|
<package id="SqlServerCE" version="4.0.0.0" targetFramework="net40" />
|
|
<package id="UrlRewritingNet.UrlRewriter" version="2.0.60829.1" targetFramework="net40" />
|
|
</packages> |