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

Merge branch 'v8/8.11' into v8/8.12 and bump version to 8.12.1

Browse Source 
# Conflicts:
#	src/SolutionInfo.cs
This commit is contained in:
Sebastiaan Janssen
2021-03-11 14:55:13 +01:00
parent e43ff6cff1 e5aaa20863
commit e0604e0a53
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.12.0")]
[assembly: AssemblyInformationalVersion("8.12.0")]
[assembly: AssemblyFileVersion("8.12.1")]
[assembly: AssemblyInformationalVersion("8.12.1")]

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

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