Bump version to 8.15.1 and merge branch 'v8/8.14' into v8/8.15
# Conflicts: # src/SolutionInfo.cs
This commit is contained in:
@@ -18,5 +18,5 @@ using System.Resources;
|
||||
[assembly: AssemblyVersion("8.0.0")]
|
||||
|
||||
// these are FYI and changed automatically
|
||||
[assembly: AssemblyFileVersion("8.15.0")]
|
||||
[assembly: AssemblyInformationalVersion("8.15.0")]
|
||||
[assembly: AssemblyFileVersion("8.15.1")]
|
||||
[assembly: AssemblyInformationalVersion("8.15.1")]
|
||||
|
||||
@@ -348,15 +348,9 @@
|
||||
<WebProjectProperties>
|
||||
<UseIIS>False</UseIIS>
|
||||
<AutoAssignPort>True</AutoAssignPort>
|
||||
<DevelopmentServerPort>8150</DevelopmentServerPort>
|
||||
<DevelopmentServerPort>8151</DevelopmentServerPort>
|
||||
<DevelopmentServerVPath>/</DevelopmentServerVPath>
|
||||
<IISUrl>http://localhost:8150</IISUrl>
|
||||
<DevelopmentServerPort>8141</DevelopmentServerPort>
|
||||
<DevelopmentServerVPath>/</DevelopmentServerVPath>
|
||||
<IISUrl>http://localhost:8141</IISUrl>
|
||||
<DevelopmentServerPort>8131</DevelopmentServerPort>
|
||||
<DevelopmentServerVPath>/</DevelopmentServerVPath>
|
||||
<IISUrl>http://localhost:8131</IISUrl>
|
||||
<IISUrl>http://localhost:8151</IISUrl>
|
||||
<NTLMAuthentication>False</NTLMAuthentication>
|
||||
<UseCustomServer>False</UseCustomServer>
|
||||
<CustomServerUrl>
|
||||
|
||||
Reference in New Issue
Block a user