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

Merge branch 'v8/8.10' into v8/8.11 and bump version to 8.11.2

Browse Source 
# Conflicts:
#	src/SolutionInfo.cs
This commit is contained in:
Sebastiaan Janssen
2021-03-11 14:52:58 +01:00
parent 5582b09614 3a5327a84d
commit e5aaa20863
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/SolutionInfo.cs
View File

@@ -18,5 +18,5 @@ using System.Resources;
[assembly: AssemblyVersion("8.0.0")]
// these are FYI and changed automatically
[assembly: AssemblyFileVersion("8.11.1")]
[assembly: AssemblyInformationalVersion("8.11.1")]
[assembly: AssemblyFileVersion("8.11.2")]
[assembly: AssemblyInformationalVersion("8.11.2")]

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

@@ -347,9 +347,9 @@
<WebProjectProperties>
<UseIIS>False</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>8111</DevelopmentServerPort>
<DevelopmentServerPort>8112</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:8111</IISUrl>
<IISUrl>http://localhost:8112</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>