Merge pull request #7270 from dotnet/merges/release/2.0.0-to-master-20170726-070023
Merge release/2.0.0 to master
This commit is contained in:
commit
f80fac2c51
1 changed files with 5 additions and 5 deletions
|
@ -15,7 +15,7 @@
|
|||
<CLI_NETSDK_Version>2.0.0-preview3-20170721-7</CLI_NETSDK_Version>
|
||||
<CLI_MSBuildExtensions_Version>$(CLI_NETSDK_Version)</CLI_MSBuildExtensions_Version>
|
||||
|
||||
<CLI_NuGet_Version>4.3.0-rtm-4315</CLI_NuGet_Version>
|
||||
<CLI_NuGet_Version>4.3.0-rtm-4324</CLI_NuGet_Version>
|
||||
<CLI_NETStandardLibraryNETFrameworkVersion>2.0.0-preview3-25514-04</CLI_NETStandardLibraryNETFrameworkVersion>
|
||||
<CLI_WEBSDK_Version>2.0.0-rel-20170629-588</CLI_WEBSDK_Version>
|
||||
<CLI_TestPlatform_Version>15.3.0-preview-20170703-02</CLI_TestPlatform_Version>
|
||||
|
@ -23,8 +23,8 @@
|
|||
<SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
|
||||
<HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>
|
||||
<TemplateEngineVersion>1.0.0-beta2-20170719-291</TemplateEngineVersion>
|
||||
<TemplateEngineTemplateVersion>1.0.0-beta2-20170721-296</TemplateEngineTemplateVersion>
|
||||
<TemplateEngineTemplate2_0Version>1.0.0-beta2-20170721-296</TemplateEngineTemplate2_0Version>
|
||||
<TemplateEngineTemplateVersion>1.0.0-beta2-20170725-300</TemplateEngineTemplateVersion>
|
||||
<TemplateEngineTemplate2_0Version>1.0.0-beta2-20170725-300</TemplateEngineTemplate2_0Version>
|
||||
<PlatformAbstractionsVersion>2.0.0</PlatformAbstractionsVersion>
|
||||
<DependencyModelVersion>2.0.0</DependencyModelVersion>
|
||||
<CliCommandLineParserVersion>0.1.1-alpha-167</CliCommandLineParserVersion>
|
||||
|
@ -34,12 +34,12 @@
|
|||
<XliffTasksVersion>0.2.0-beta-000042</XliffTasksVersion>
|
||||
|
||||
<!-- This should either be timestamped or notimestamp as appropriate -->
|
||||
<AspNetCoreRuntimePackageFlavor>timestamped</AspNetCoreRuntimePackageFlavor>
|
||||
<AspNetCoreRuntimePackageFlavor>notimestamp</AspNetCoreRuntimePackageFlavor>
|
||||
<!--BranchName and AspNetCoreVersion will not always be the same-->
|
||||
<AspNetCoreBranchName>2.0.0</AspNetCoreBranchName>
|
||||
<AspNetCoreRelease>rtm</AspNetCoreRelease>
|
||||
<AspNetCoreVersion>2.0.0</AspNetCoreVersion>
|
||||
<AspNetCoreRuntimePackageTimestamp>26424</AspNetCoreRuntimePackageTimestamp>
|
||||
<AspNetCoreRuntimePackageTimestamp>26452</AspNetCoreRuntimePackageTimestamp>
|
||||
|
||||
<AspNetCoreRuntimePackageBrandName>aspnetcore-store</AspNetCoreRuntimePackageBrandName>
|
||||
<AspNetCoreVersionAndRelease>$(AspNetCoreVersion)-$(AspNetCoreRelease)</AspNetCoreVersionAndRelease>
|
||||
|
|
Loading…
Reference in a new issue