Merge pull request #9631 from peterhuene/merge-1.1.0-msrc

Merge rel/1.1.0-MSRC to rel/1.1.0

Author: Peter Huene

branchinfo.txt

@@ -3,7 +3,7 @@
 # Each line is expected to be in the format "[Name]=[Value]".
 MAJOR_VERSION=1
 MINOR_VERSION=1
-PATCH_VERSION=9
+PATCH_VERSION=10
 RELEASE_SUFFIX=servicing
 CHANNEL=rel-1.1.0
 BRANCH_NAME=rel/1.1.0

build/Microsoft.DotNet.Cli.DependencyVersions.props

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <CLI_SharedFrameworkVersion>1.1.9-servicing-001731-00</CLI_SharedFrameworkVersion>
-    <CLI_CoreCLRVersion>1.1.9-servicing-26417-01</CLI_CoreCLRVersion>
-    <CLI_JitVersion>1.1.9-servicing-26417-01</CLI_JitVersion>
-    <CLI_SharedHostVersion>1.1.9-servicing-001731-00</CLI_SharedHostVersion>
-    <CLI_HostFxrContainerVersion>1.1.9-servicing-001731-00</CLI_HostFxrContainerVersion>
-    <CLI_HostFxrVersion Condition="'$(OS)' != 'Windows_NT'">1.1.9-servicing-001731-00</CLI_HostFxrVersion>
-    <CLI_HostFxrVersion Condition="'$(OS)' == 'Windows_NT'">1.1.2</CLI_HostFxrVersion>
+    <CLI_SharedFrameworkVersion>1.1.9</CLI_SharedFrameworkVersion>
+    <CLI_CoreCLRVersion>1.1.9</CLI_CoreCLRVersion>
+    <CLI_JitVersion>1.1.9</CLI_JitVersion>
+    <CLI_SharedHostVersion>1.1.9</CLI_SharedHostVersion>
+    <CLI_HostFxrContainerVersion>1.1.9</CLI_HostFxrContainerVersion>
+    <CLI_HostFxrVersion Condition="'$(OS)' != 'Windows_NT'">1.1.9</CLI_HostFxrVersion>
+    <CLI_HostFxrVersion Condition="'$(OS)' == 'Windows_NT'">1.1.9</CLI_HostFxrVersion>
 
-    <CLI_SharedFrameworkVersion_1_0>1.0.11</CLI_SharedFrameworkVersion_1_0>
+    <CLI_SharedFrameworkVersion_1_0>1.0.12</CLI_SharedFrameworkVersion_1_0>
     <CLI_SharedHostVersion_1_0>1.0.1</CLI_SharedHostVersion_1_0>
     <CLI_HostFxrContainerVersion_1_0>1.0.1</CLI_HostFxrContainerVersion_1_0>
     <CLI_HostFxrVersion_1_0 Condition="'$(OS)' != 'Windows_NT'">1.0.1</CLI_HostFxrVersion_1_0>
@@ -23,7 +23,7 @@
     <CLI_WEBSDK_Version>1.0.0-alpha-20170516-2-509</CLI_WEBSDK_Version>
     <CLI_TestPlatform_Version>15.0.0</CLI_TestPlatform_Version>
     <TemplateEngineVersion>1.0.0-beta2-20170629-269</TemplateEngineVersion>
-    <AspnetTemplateVersion>1.1.5-rtm-10863</AspnetTemplateVersion>
+    <AspnetTemplateVersion>1.1.6-rtm-11107</AspnetTemplateVersion>
     <TemplateEngineTemplateVersion>1.0.0-beta2-20170907-306</TemplateEngineTemplateVersion>
     <PlatformAbstractionsVersion>1.0.3</PlatformAbstractionsVersion>
     <DependencyModelVersion>1.0.3</DependencyModelVersion>

build/Microsoft.DotNet.Cli.Monikers.props

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <SdkBrandName>.NET Core SDK 1.1.9</SdkBrandName>
+    <SdkBrandName>.NET Core SDK 1.1.10</SdkBrandName>
     <SharedFrameworkBrandName>Microsoft .NET Core 1.1.9 - Runtime</SharedFrameworkBrandName>
     <SharedHostBrandName>Microsoft .NET Core 1.1.0 - Host</SharedHostBrandName>
     <HostFxrBrandName>Microsoft .NET Core 1.1.0 - Host FX Resolver</HostFxrBrandName>
 
-    <AdditionalSharedFrameworkBrandName>Microsoft .NET Core 1.0.11 - Runtime</AdditionalSharedFrameworkBrandName>
+    <AdditionalSharedFrameworkBrandName>Microsoft .NET Core 1.0.12 - Runtime</AdditionalSharedFrameworkBrandName>
     <AdditionalSharedHostBrandName>Microsoft .NET Core 1.0.1 - Host</AdditionalSharedHostBrandName>
     <AdditionalHostFxrBrandName>Microsoft .NET Core 1.0.1 - Host FX Resolver</AdditionalHostFxrBrandName>
 

dir.props

@@ -13,6 +13,6 @@
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
 
 
-    <CliVersionPrefix>1.1.9</CliVersionPrefix>
+    <CliVersionPrefix>1.1.10</CliVersionPrefix>
   </PropertyGroup>
 </Project>

test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs

@@ -355,7 +355,7 @@ public void ItRestoresTheNuGetPackagesToTheNuGetCacheFolder()
 
             _nugetCacheFolder
                 .GetDirectory("microsoft.aspnetcore.mvc")
-                .Should().HaveDirectories(new string[] { "1.0.6", "1.1.7" });
+                .Should().HaveDirectories(new string[] { "1.0.6", "1.1.8" });
         }
 
         private string GetDotnetVersion()