Merge pull request #9034 from dotnet/merges/release/2.1.1xx-to-release/2.1.2xx

Merge release/2.1.1xx to release/2.1.2xx
This commit is contained in:
John Beisner 2018-04-11 09:27:10 -07:00 committed by GitHub
commit a543dd3084
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -68,7 +68,7 @@
<AspNetCoreBranchName>2.0.7</AspNetCoreBranchName>
<AspNetCoreRelease>rtm</AspNetCoreRelease>
<AspNetCoreVersion>2.0.7</AspNetCoreVersion>
<AspNetCoreRuntimePackageTimestamp>230</AspNetCoreRuntimePackageTimestamp>
<AspNetCoreRuntimePackageTimestamp>231</AspNetCoreRuntimePackageTimestamp>
<CurrentAspNetCoreRuntimeVersion Condition="'$(AspNetCoreRuntimePackageFlavor)'=='notimestamp'">$(AspNetCoreVersion)</CurrentAspNetCoreRuntimeVersion>
<CurrentAspNetCoreRuntimeVersion Condition="'$(AspNetCoreRuntimePackageFlavor)'!='notimestamp'">$(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp)</CurrentAspNetCoreRuntimeVersion>