Merge pull request #7987 from dotnet/merges/release/15.5-to-master-20171109-080038

Merge release/15.5 to master
This commit is contained in:
Nick Guerrera 2017-11-10 10:20:37 -08:00 committed by GitHub
commit f15495cee3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2,7 +2,7 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<CLI_SharedFrameworkVersion>2.1.0-preview1-25909-03</CLI_SharedFrameworkVersion>
<CLI_MSBuild_Version>15.5.0-preview-000172-1103937</CLI_MSBuild_Version>
<CLI_MSBuild_Version>15.5.0-preview-000178-1116824</CLI_MSBuild_Version>
<CLI_Roslyn_Version>2.6.0-beta2-62210-01</CLI_Roslyn_Version>
<CLI_DiaSymNative_Version>1.6.0-beta2-25304</CLI_DiaSymNative_Version>
<CLI_FSharp_Version>4.2.0-rtm-171027-0</CLI_FSharp_Version>
@ -17,7 +17,7 @@
<CLI_MSBuildExtensions_Version>$(CLI_NETSDK_Version)</CLI_MSBuildExtensions_Version>
<CLI_NuGet_Version>4.5.0-preview2-4529</CLI_NuGet_Version>
<CLI_NETStandardLibraryNETFrameworkVersion>2.0.0-preview3-25514-04</CLI_NETStandardLibraryNETFrameworkVersion>
<CLI_NETStandardLibraryNETFrameworkVersion>2.0.1-servicing-25908-02</CLI_NETStandardLibraryNETFrameworkVersion>
<CLI_WEBSDK_Version>2.0.0-rel-20171010-665</CLI_WEBSDK_Version>
<CLI_TestPlatform_Version>15.5.0-preview-20171031-01</CLI_TestPlatform_Version>
<SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>