Merge pull request #9242 from dotnet/merges/release/2.1.2xx-MSRC-to-2.1.2xx

CLI:release/2.1.2xx-MSRC to CLI:release/2.1.2xx
This commit is contained in:
John Beisner 2018-05-09 14:55:57 -07:00 committed by GitHub
commit 327b692b77
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -59,16 +59,16 @@
<SharedHostVersion>$(MicrosoftNETCoreAppPackageVersion)</SharedHostVersion> <SharedHostVersion>$(MicrosoftNETCoreAppPackageVersion)</SharedHostVersion>
<HostFxrVersion>$(MicrosoftNETCoreAppPackageVersion)</HostFxrVersion> <HostFxrVersion>$(MicrosoftNETCoreAppPackageVersion)</HostFxrVersion>
<AspNetCoreTemplatePackageVersion>2.0.7</AspNetCoreTemplatePackageVersion> <AspNetCoreTemplatePackageVersion>2.0.8</AspNetCoreTemplatePackageVersion>
<!-- This should either be timestamped or notimestamp as appropriate. <!-- This should either be timestamped or notimestamp as appropriate.
AspNetCoreRelease is only used if the value of this property is "timestamped" --> AspNetCoreRelease is only used if the value of this property is "timestamped" -->
<AspNetCoreRuntimePackageFlavor>notimestamp</AspNetCoreRuntimePackageFlavor> <AspNetCoreRuntimePackageFlavor>notimestamp</AspNetCoreRuntimePackageFlavor>
<!--BranchName and AspNetCoreVersion will not always be the same--> <!--BranchName and AspNetCoreVersion will not always be the same-->
<AspNetCoreBranchName>2.0.7</AspNetCoreBranchName> <AspNetCoreBranchName>2.0.8</AspNetCoreBranchName>
<AspNetCoreRelease>rtm</AspNetCoreRelease> <AspNetCoreRelease>rtm</AspNetCoreRelease>
<AspNetCoreVersion>2.0.7</AspNetCoreVersion> <AspNetCoreVersion>2.0.8</AspNetCoreVersion>
<AspNetCoreRuntimePackageTimestamp>231</AspNetCoreRuntimePackageTimestamp> <AspNetCoreRuntimePackageTimestamp>10026</AspNetCoreRuntimePackageTimestamp>
<CurrentAspNetCoreRuntimeVersion Condition="'$(AspNetCoreRuntimePackageFlavor)'=='notimestamp'">$(AspNetCoreVersion)</CurrentAspNetCoreRuntimeVersion> <CurrentAspNetCoreRuntimeVersion Condition="'$(AspNetCoreRuntimePackageFlavor)'=='notimestamp'">$(AspNetCoreVersion)</CurrentAspNetCoreRuntimeVersion>
<CurrentAspNetCoreRuntimeVersion Condition="'$(AspNetCoreRuntimePackageFlavor)'!='notimestamp'">$(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp)</CurrentAspNetCoreRuntimeVersion> <CurrentAspNetCoreRuntimeVersion Condition="'$(AspNetCoreRuntimePackageFlavor)'!='notimestamp'">$(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp)</CurrentAspNetCoreRuntimeVersion>
@ -82,6 +82,7 @@
This list should be sorted most recent version to oldest. This list should be sorted most recent version to oldest.
--> -->
<AspNetCoreRuntimeStoreVersion Include="$(CurrentAspNetCoreRuntimeVersion)" /> <AspNetCoreRuntimeStoreVersion Include="$(CurrentAspNetCoreRuntimeVersion)" />
<AspNetCoreRuntimeStoreVersion Include="2.0.7" />
<AspNetCoreRuntimeStoreVersion Include="2.0.6" /> <AspNetCoreRuntimeStoreVersion Include="2.0.6" />
<AspNetCoreRuntimeStoreVersion Include="2.0.5" /> <AspNetCoreRuntimeStoreVersion Include="2.0.5" />
<AspNetCoreRuntimeStoreVersion Include="2.0.3" /> <AspNetCoreRuntimeStoreVersion Include="2.0.3" />