Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Commit 8a5ee11

Browse files
author
Peter Huene
committed
Merge branch 'rel/1.1.0-MSRC' into rel/1.1.0
* rel/1.1.0-MSRC: Empty commit to trigger new build. Update 1.x templates for aspentcore July 2018 patch Empty commit to trigger new build. Update 1.1.9 to stable versions Update 1.x templates for ASP.NET Core July 2018 patch The named-version of the installer is always "1.1.2" for Windows Use '1.1.9-servicing-001750-00' 'CLI_HostFxrVersion' for Windows. Update CLI components to '1.1.9-servicing-001750-00' - fixes a "sudo dpkg -i" call. Merged PR 128290: Update CLR versions to match what was built Updated Microsoft.DotNet.Cli.DependencyVersions.props Update branding for the 1.1/1.0 runtimes. Update runtime versions in 1.1.0 Update CLI branding to 1.1.10.
2 parents fce3363 + e077848 commit 8a5ee11

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

branchinfo.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Each line is expected to be in the format "[Name]=[Value]".
44
MAJOR_VERSION=1
55
MINOR_VERSION=1
6-
PATCH_VERSION=9
6+
PATCH_VERSION=10
77
RELEASE_SUFFIX=servicing
88
CHANNEL=rel-1.1.0
99
BRANCH_NAME=rel/1.1.0

build/Microsoft.DotNet.Cli.DependencyVersions.props

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<CLI_SharedFrameworkVersion>1.1.9-servicing-001731-00</CLI_SharedFrameworkVersion>
5-
<CLI_CoreCLRVersion>1.1.9-servicing-26417-01</CLI_CoreCLRVersion>
6-
<CLI_JitVersion>1.1.9-servicing-26417-01</CLI_JitVersion>
7-
<CLI_SharedHostVersion>1.1.9-servicing-001731-00</CLI_SharedHostVersion>
8-
<CLI_HostFxrContainerVersion>1.1.9-servicing-001731-00</CLI_HostFxrContainerVersion>
9-
<CLI_HostFxrVersion Condition="'$(OS)' != 'Windows_NT'">1.1.9-servicing-001731-00</CLI_HostFxrVersion>
10-
<CLI_HostFxrVersion Condition="'$(OS)' == 'Windows_NT'">1.1.2</CLI_HostFxrVersion>
4+
<CLI_SharedFrameworkVersion>1.1.9</CLI_SharedFrameworkVersion>
5+
<CLI_CoreCLRVersion>1.1.9</CLI_CoreCLRVersion>
6+
<CLI_JitVersion>1.1.9</CLI_JitVersion>
7+
<CLI_SharedHostVersion>1.1.9</CLI_SharedHostVersion>
8+
<CLI_HostFxrContainerVersion>1.1.9</CLI_HostFxrContainerVersion>
9+
<CLI_HostFxrVersion Condition="'$(OS)' != 'Windows_NT'">1.1.9</CLI_HostFxrVersion>
10+
<CLI_HostFxrVersion Condition="'$(OS)' == 'Windows_NT'">1.1.9</CLI_HostFxrVersion>
1111

12-
<CLI_SharedFrameworkVersion_1_0>1.0.11</CLI_SharedFrameworkVersion_1_0>
12+
<CLI_SharedFrameworkVersion_1_0>1.0.12</CLI_SharedFrameworkVersion_1_0>
1313
<CLI_SharedHostVersion_1_0>1.0.1</CLI_SharedHostVersion_1_0>
1414
<CLI_HostFxrContainerVersion_1_0>1.0.1</CLI_HostFxrContainerVersion_1_0>
1515
<CLI_HostFxrVersion_1_0 Condition="'$(OS)' != 'Windows_NT'">1.0.1</CLI_HostFxrVersion_1_0>
@@ -23,7 +23,7 @@
2323
<CLI_WEBSDK_Version>1.0.0-alpha-20170516-2-509</CLI_WEBSDK_Version>
2424
<CLI_TestPlatform_Version>15.0.0</CLI_TestPlatform_Version>
2525
<TemplateEngineVersion>1.0.0-beta2-20170629-269</TemplateEngineVersion>
26-
<AspnetTemplateVersion>1.1.5-rtm-10863</AspnetTemplateVersion>
26+
<AspnetTemplateVersion>1.1.6-rtm-11107</AspnetTemplateVersion>
2727
<TemplateEngineTemplateVersion>1.0.0-beta2-20170907-306</TemplateEngineTemplateVersion>
2828
<PlatformAbstractionsVersion>1.0.3</PlatformAbstractionsVersion>
2929
<DependencyModelVersion>1.0.3</DependencyModelVersion>

build/Microsoft.DotNet.Cli.Monikers.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<SdkBrandName>.NET Core SDK 1.1.9</SdkBrandName>
4+
<SdkBrandName>.NET Core SDK 1.1.10</SdkBrandName>
55
<SharedFrameworkBrandName>Microsoft .NET Core 1.1.9 - Runtime</SharedFrameworkBrandName>
66
<SharedHostBrandName>Microsoft .NET Core 1.1.0 - Host</SharedHostBrandName>
77
<HostFxrBrandName>Microsoft .NET Core 1.1.0 - Host FX Resolver</HostFxrBrandName>
88

9-
<AdditionalSharedFrameworkBrandName>Microsoft .NET Core 1.0.11 - Runtime</AdditionalSharedFrameworkBrandName>
9+
<AdditionalSharedFrameworkBrandName>Microsoft .NET Core 1.0.12 - Runtime</AdditionalSharedFrameworkBrandName>
1010
<AdditionalSharedHostBrandName>Microsoft .NET Core 1.0.1 - Host</AdditionalSharedHostBrandName>
1111
<AdditionalHostFxrBrandName>Microsoft .NET Core 1.0.1 - Host FX Resolver</AdditionalHostFxrBrandName>
1212

dir.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
1414

1515

16-
<CliVersionPrefix>1.1.9</CliVersionPrefix>
16+
<CliVersionPrefix>1.1.10</CliVersionPrefix>
1717
</PropertyGroup>
1818
</Project>

test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ public void ItRestoresTheNuGetPackagesToTheNuGetCacheFolder()
355355

356356
_nugetCacheFolder
357357
.GetDirectory("microsoft.aspnetcore.mvc")
358-
.Should().HaveDirectories(new string[] { "1.0.6", "1.1.7" });
358+
.Should().HaveDirectories(new string[] { "1.0.6", "1.1.8" });
359359
}
360360

361361
private string GetDotnetVersion()

0 commit comments

Comments
 (0)