Merge branch 'master' into templating_2.1.0-preview1_insertion_2017_11_09

This commit is contained in:
seancpeters 2017-11-10 17:28:33 -08:00 committed by GitHub
commit 02e82d5610
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,8 +1,8 @@
<?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-25907-02</CLI_SharedFrameworkVersion>
<CLI_MSBuild_Version>15.5.0-preview-000172-1103937</CLI_MSBuild_Version>
<CLI_SharedFrameworkVersion>2.1.0-preview1-25909-03</CLI_SharedFrameworkVersion>
<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-20171110-671</CLI_WEBSDK_Version>
<CLI_TestPlatform_Version>15.5.0-preview-20171031-01</CLI_TestPlatform_Version>
<SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>
@ -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-25907-02</PlatformAbstractionsVersion>
<DependencyModelVersion>2.1.0-preview1-25907-02</DependencyModelVersion>
<PlatformAbstractionsVersion>2.1.0-preview1-25909-03</PlatformAbstractionsVersion>
<DependencyModelVersion>2.1.0-preview1-25909-03</DependencyModelVersion>
<CliCommandLineParserVersion>0.1.1-alpha-174</CliCommandLineParserVersion>
<CliMigrateVersion>1.2.1-alpha-002133</CliMigrateVersion>
<MicroBuildVersion>0.2.0</MicroBuildVersion>