huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'merge/release/2.1-to-release/2.2' into release/2.2

This commit is contained in:
Justin Kotalik 2018-09-04 14:10:35 -07:00
parent d22e542449 b5ff991eb9
commit 1b87f1e913
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc
View File

@ -3,7 +3,7 @@
#include <windows.h>
#include "version.h"
#include "resource.h"
#include "Aspnetcore_msg.rc"
#include "aspnetcore_msg.rc"
/////////////////////////////////////////////////////////////////////////////
// English (United States) resources

2
version.props
View File

@ -5,7 +5,7 @@
<DotNetPatchVersion>0</DotNetPatchVersion>
<VersionPrefix>$(DotNetMajorVersion).$(DotNetMinorVersion).$(DotNetPatchVersion)</VersionPrefix>
<AspNetCoreModuleVersionMajor>12</AspNetCoreModuleVersionMajor>
<AspNetCoreModuleVersionMinor>$(DotNetMajorVersion)</AspNetCoreModuleVersionMinor>
<AspNetCoreModuleVersionMinor>$(DotNetMinorVersion)</AspNetCoreModuleVersionMinor>
<AspNetCoreModuleVersionRevision>$(DotNetPatchVersion)</AspNetCoreModuleVersionRevision>
<VersionSuffix>preview2</VersionSuffix>
<PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion>