Compare commits

...

3 Commits

Author SHA1 Message Date
Dave Woestenborghs 354505fde3 U4-11149 fixed error when creating new xslt file (#2540)
* U4-10659 added create task back for xslt files

* Add fix to UI.Release.xml as well
2018-04-09 14:47:09 +02:00
Sebastiaan Janssen 95d40049f5 Bumps version to 7.10.2 2018-04-09 08:30:39 +02:00
Sebastiaan Janssen f003c3602c Merge pull request #2545 from dawoe/temp-U4-11155
U4-11155 fixed error when creating member groups
2018-04-09 08:28:03 +02:00
7 changed files with 9 additions and 7 deletions
+2 -2
View File
@@ -11,5 +11,5 @@ using System.Resources;
[assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyFileVersion("7.10.1")]
[assembly: AssemblyInformationalVersion("7.10.1")]
[assembly: AssemblyFileVersion("7.10.2")]
[assembly: AssemblyInformationalVersion("7.10.2")]
@@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration
{
public class UmbracoVersion
{
private static readonly Version Version = new Version("7.10.1");
private static readonly Version Version = new Version("7.10.2");
/// <summary>
/// Gets the current version of Umbraco.
@@ -5,7 +5,6 @@ using Umbraco.Web.UI;
using umbraco;
using umbraco.BusinessLogic;
using umbraco.interfaces;
using Umbraco.Web.umbraco.presentation.umbraco.create;
namespace Umbraco.Tests.UI
{
+2 -2
View File
@@ -1035,9 +1035,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
<WebProjectProperties>
<UseIIS>True</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>7101</DevelopmentServerPort>
<DevelopmentServerPort>7102</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:7101</IISUrl>
<IISUrl>http://localhost:7102</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>
@@ -19,6 +19,7 @@
<header>Macro</header>
<usercontrol>/create/xslt.ascx</usercontrol>
<tasks>
<create assembly="umbraco" type="XsltTasks" />
<delete assembly="umbraco" type="XsltTasks" />
</tasks>
</nodeType>
@@ -19,6 +19,7 @@
<header>Macro</header>
<usercontrol>/create/xslt.ascx</usercontrol>
<tasks>
<create assembly="umbraco" type="XsltTasks" />
<delete assembly="umbraco" type="XsltTasks" />
</tasks>
</nodeType>
@@ -2,9 +2,10 @@ using System.Linq;
using System.Web.Security;
using umbraco.BusinessLogic;
using umbraco.cms.businesslogic.member;
using Umbraco.Web;
using Umbraco.Web.UI;
namespace Umbraco.Web.umbraco.presentation.umbraco.create
namespace umbraco
{
public class MemberGroupTasks : LegacyDialogTask
{