Merge branch 'master' into merges/release/15.5-to-master-20171025-065942

This commit is contained in:
Livar 2017-10-26 15:13:01 -07:00 committed by GitHub
commit 954b9a3ee1

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<CLI_SharedFrameworkVersion>2.1.0-preview1-25823-01</CLI_SharedFrameworkVersion>
<CLI_SharedFrameworkVersion>2.1.0-preview1-25825-07</CLI_SharedFrameworkVersion>
<CLI_MSBuild_Version>15.5.0-preview-000165-1081473</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>
@ -27,8 +27,8 @@
<TemplateEngineTemplateVersion>1.0.0-beta2-20171004-309</TemplateEngineTemplateVersion>
<TemplateEngineTemplate2_0Version>1.0.0-beta2-20171004-309</TemplateEngineTemplate2_0Version>
<AspnetTemplateVersion>1.0.0-beta2-20171004-309</AspnetTemplateVersion>
<PlatformAbstractionsVersion>2.1.0-preview1-25823-01</PlatformAbstractionsVersion>
<DependencyModelVersion>2.1.0-preview1-25823-01</DependencyModelVersion>
<PlatformAbstractionsVersion>2.1.0-preview1-25825-07</PlatformAbstractionsVersion>
<DependencyModelVersion>2.1.0-preview1-25825-07</DependencyModelVersion>
<CliCommandLineParserVersion>0.1.1-alpha-167</CliCommandLineParserVersion>
<CliMigrateVersion>1.2.1-alpha-002133</CliMigrateVersion>
<MicroBuildVersion>0.2.0</MicroBuildVersion>