Merge branch 'release/15.5' into updateTpv215.5.0-preview-20171009-10

# Conflicts:
#	build/DependencyVersions.props
This commit is contained in:
faahmad 2017-10-11 12:09:40 +05:30
commit 6f41ca4de7

View file

@ -15,9 +15,9 @@
<CLI_NETSDK_Version>2.0.1-servicing-20170926-1</CLI_NETSDK_Version>
<CLI_MSBuildExtensions_Version>$(CLI_NETSDK_Version)</CLI_MSBuildExtensions_Version>
<CLI_NuGet_Version>4.4.0-preview3-4475</CLI_NuGet_Version>
<CLI_NuGet_Version>4.5.0-preview1-4526</CLI_NuGet_Version>
<CLI_NETStandardLibraryNETFrameworkVersion>2.0.0-preview3-25514-04</CLI_NETStandardLibraryNETFrameworkVersion>
<CLI_WEBSDK_Version>2.0.0-rel-20170908-653</CLI_WEBSDK_Version>
<CLI_WEBSDK_Version>2.0.0-rel-20171010-665</CLI_WEBSDK_Version>
<CLI_TestPlatform_Version>15.5.0-preview-20171009-10</CLI_TestPlatform_Version>
<SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>
<SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>