Compare commits
1
Commits
v10/dev
...
release-7.2.9
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2ef925f9dd |
@@ -1,2 +1,2 @@
|
||||
# Usage: on line 2 put the release version, on line 3 put the version comment (example: beta)
|
||||
7.2.8
|
||||
7.2.9
|
||||
+3
-3
@@ -2,7 +2,7 @@
|
||||
using System.Resources;
|
||||
|
||||
[assembly: AssemblyCompany("Umbraco")]
|
||||
[assembly: AssemblyCopyright("Copyright © Umbraco 2015")]
|
||||
[assembly: AssemblyCopyright("Copyright © Umbraco 2019")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
|
||||
@@ -11,5 +11,5 @@ using System.Resources;
|
||||
|
||||
[assembly: AssemblyVersion("1.0.*")]
|
||||
|
||||
[assembly: AssemblyFileVersion("7.2.8")]
|
||||
[assembly: AssemblyInformationalVersion("7.2.8")]
|
||||
[assembly: AssemblyFileVersion("7.2.9")]
|
||||
[assembly: AssemblyInformationalVersion("7.2.9")]
|
||||
@@ -5,7 +5,7 @@ namespace Umbraco.Core.Configuration
|
||||
{
|
||||
public class UmbracoVersion
|
||||
{
|
||||
private static readonly Version Version = new Version("7.2.8");
|
||||
private static readonly Version Version = new Version("7.2.9");
|
||||
|
||||
/// <summary>
|
||||
/// Gets the current version of Umbraco.
|
||||
|
||||
@@ -4,6 +4,8 @@ using StackExchange.Profiling;
|
||||
using StackExchange.Profiling.SqlFormatters;
|
||||
using Umbraco.Core.Configuration;
|
||||
using Umbraco.Core.Logging;
|
||||
using System.Web.Routing;
|
||||
using System.Linq;
|
||||
|
||||
namespace Umbraco.Core.Profiling
|
||||
{
|
||||
@@ -44,6 +46,24 @@ namespace Umbraco.Core.Profiling
|
||||
app.BeginRequest += UmbracoApplicationBeginRequest;
|
||||
app.EndRequest += UmbracoApplicationEndRequest;
|
||||
}
|
||||
|
||||
// Remove Mini Profiler routes when not in debug mode
|
||||
if (GlobalSettings.DebugMode == false)
|
||||
{
|
||||
//NOTE: Keep the global fully qualified name, for some reason without it I was getting null refs
|
||||
var prefix = global::StackExchange.Profiling.MiniProfiler.Settings.RouteBasePath.Replace("~/", string.Empty);
|
||||
|
||||
using (RouteTable.Routes.GetWriteLock())
|
||||
{
|
||||
var routes = RouteTable.Routes.Where(x =>
|
||||
{
|
||||
var route = x as Route;
|
||||
return route != null && route.Url.StartsWith(prefix);
|
||||
}).ToList();
|
||||
foreach (var r in routes)
|
||||
RouteTable.Routes.Remove(r);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
"jquery": "2.0.3",
|
||||
"jquery-file-upload": "~9.4.0",
|
||||
"jquery-ui": "1.10.3",
|
||||
"angular-dynamic-locale": "~0.1.27",
|
||||
"angular-dynamic-locale": "0.1.27",
|
||||
"bootstrap-tabdrop": "~1.0.0"
|
||||
},
|
||||
"exportsOverride": {
|
||||
|
||||
@@ -2541,9 +2541,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.0\x86\*.* "$(TargetDir)x86\"
|
||||
<WebProjectProperties>
|
||||
<UseIIS>True</UseIIS>
|
||||
<AutoAssignPort>True</AutoAssignPort>
|
||||
<DevelopmentServerPort>7280</DevelopmentServerPort>
|
||||
<DevelopmentServerPort>7290</DevelopmentServerPort>
|
||||
<DevelopmentServerVPath>/</DevelopmentServerVPath>
|
||||
<IISUrl>http://localhost:7280</IISUrl>
|
||||
<IISUrl>http://localhost:7290</IISUrl>
|
||||
<NTLMAuthentication>False</NTLMAuthentication>
|
||||
<UseCustomServer>False</UseCustomServer>
|
||||
<CustomServerUrl>
|
||||
|
||||
@@ -55,6 +55,10 @@
|
||||
<PropertyGroup Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v14.0\Web\Microsoft.Web.Publishing.Tasks.dll')">
|
||||
<WebPublishingTasks>$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v14.0\Web\Microsoft.Web.Publishing.Tasks.dll</WebPublishingTasks>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v15.0\Web\Microsoft.Web.Publishing.Tasks.dll')">
|
||||
<WebPublishingTasks>$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v15.0\Web\Microsoft.Web.Publishing.Tasks.dll</WebPublishingTasks>
|
||||
</PropertyGroup>
|
||||
|
||||
<!--
|
||||
****************************************************
|
||||
|
||||
Reference in New Issue
Block a user