Merge branch 'release/2.0.0' into dev/mlorbe/UpdateToCoherence26412

This commit is contained in:
Livar 2017-07-21 11:58:03 -07:00 committed by GitHub
commit cc0dbd3c22

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<CLI_SharedFrameworkVersion>2.0.0-preview3-25518-01</CLI_SharedFrameworkVersion> <CLI_SharedFrameworkVersion>2.0.0</CLI_SharedFrameworkVersion>
<CLI_MSBuild_Version>15.3.407</CLI_MSBuild_Version> <CLI_MSBuild_Version>15.3.407</CLI_MSBuild_Version>
<CLI_Roslyn_Version>2.3.0-beta4-61830-03</CLI_Roslyn_Version> <CLI_Roslyn_Version>2.3.0-beta4-61830-03</CLI_Roslyn_Version>
<CLI_Roslyn_Satellites_Version>2.3.0-pre-20170624-6</CLI_Roslyn_Satellites_Version> <CLI_Roslyn_Satellites_Version>2.3.0-pre-20170624-6</CLI_Roslyn_Satellites_Version>
@ -12,7 +12,7 @@
<!-- We'll usually want to keep these versions in sync, but we may want to diverge in some <!-- We'll usually want to keep these versions in sync, but we may want to diverge in some
cases, so use separate properties but derive one from the other unless we want to cases, so use separate properties but derive one from the other unless we want to
explicitly use different versions. --> explicitly use different versions. -->
<CLI_NETSDK_Version>2.0.0-preview3-20170721-1</CLI_NETSDK_Version> <CLI_NETSDK_Version>2.0.0-preview3-20170717-1</CLI_NETSDK_Version>
<CLI_MSBuildExtensions_Version>$(CLI_NETSDK_Version)</CLI_MSBuildExtensions_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-4315</CLI_NuGet_Version>
@ -25,8 +25,8 @@
<TemplateEngineVersion>1.0.0-beta2-20170719-291</TemplateEngineVersion> <TemplateEngineVersion>1.0.0-beta2-20170719-291</TemplateEngineVersion>
<TemplateEngineTemplateVersion>1.0.0-beta2-20170720-295</TemplateEngineTemplateVersion> <TemplateEngineTemplateVersion>1.0.0-beta2-20170720-295</TemplateEngineTemplateVersion>
<TemplateEngineTemplate2_0Version>1.0.0-beta2-20170720-295</TemplateEngineTemplate2_0Version> <TemplateEngineTemplate2_0Version>1.0.0-beta2-20170720-295</TemplateEngineTemplate2_0Version>
<PlatformAbstractionsVersion>2.0.0-preview3-25518-01</PlatformAbstractionsVersion> <PlatformAbstractionsVersion>2.0.0</PlatformAbstractionsVersion>
<DependencyModelVersion>2.0.0-preview3-25518-01</DependencyModelVersion> <DependencyModelVersion>2.0.0</DependencyModelVersion>
<CliCommandLineParserVersion>0.1.1-alpha-167</CliCommandLineParserVersion> <CliCommandLineParserVersion>0.1.1-alpha-167</CliCommandLineParserVersion>
<CliMigrateVersion>1.2.1-alpha-002133</CliMigrateVersion> <CliMigrateVersion>1.2.1-alpha-002133</CliMigrateVersion>
<MicroBuildVersion>0.2.0</MicroBuildVersion> <MicroBuildVersion>0.2.0</MicroBuildVersion>