Skip to content

Commit c5ec332

Browse files
dotnet-maestro-botdseefeld
authored andcommitted
Update CoreClr, ProdCon to preview3-27008-03, 20181010-04-2107448, respectively (release/2.2) (#765)
* Update CoreClr, ProdCon to preview3-27008-03, 20181010-04-2107448, respectively * Update cli patch * Update prebuilt baselines
1 parent f575975 commit c5ec332

17 files changed

+76
-68
lines changed

ProdConFeed.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-2/20180905-01/final/index.json
1+
https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-2/20181010-04/final/index.json

dependencies.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
for which dotnet/versions commit was last used to update the dependency.
66
-->
77
<PropertyGroup>
8-
<ProdConCurrentRef>37bc522eb90b9f80e2346829b8aefb25b792cdfc</ProdConCurrentRef>
9-
<CoreClrCurrentRef>c45fef92df48cbec1b73a48eb7b06e31b220986b</CoreClrCurrentRef>
8+
<ProdConCurrentRef>d2982064838c8c57e1f03ef9211679da72f4fd3a</ProdConCurrentRef>
9+
<CoreClrCurrentRef>d2982064838c8c57e1f03ef9211679da72f4fd3a</CoreClrCurrentRef>
1010
<BuildToolsCurrentRef>c45fef92df48cbec1b73a48eb7b06e31b220986b</BuildToolsCurrentRef>
1111
</PropertyGroup>
1212

@@ -22,9 +22,9 @@
2222
the product as version strings to be used by the SDK to fetch extra content.
2323
-->
2424
<PropertyGroup>
25-
<MicrosoftAspNetCoreAllPackageVersion>2.2.0-preview2-35157</MicrosoftAspNetCoreAllPackageVersion>
26-
<MicrosoftAspNetCoreAppPackageVersion>2.2.0-preview2-35157</MicrosoftAspNetCoreAppPackageVersion>
27-
<MicrosoftNETSdkRazorPackageVersion>2.2.0-preview2-35157</MicrosoftNETSdkRazorPackageVersion>
25+
<MicrosoftAspNetCoreAllPackageVersion>2.2.0-preview3-35458</MicrosoftAspNetCoreAllPackageVersion>
26+
<MicrosoftAspNetCoreAppPackageVersion>2.2.0-preview3-35458</MicrosoftAspNetCoreAppPackageVersion>
27+
<MicrosoftNETSdkRazorPackageVersion>2.2.0-preview3-35458</MicrosoftNETSdkRazorPackageVersion>
2828
</PropertyGroup>
2929

3030
<ItemGroup>
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From d6f6922c24e205a53bc5f2420695a4a177648808 Mon Sep 17 00:00:00 2001
2-
From: Davis Goodin <dagood@microsoft.com>
3-
Date: Wed, 13 Jun 2018 09:46:43 -0500
1+
From d52f43f0351e18604acfd7648d2e85e16e32dff9 Mon Sep 17 00:00:00 2001
2+
From: dseefeld <dseefeld@microsoft.com>
3+
Date: Fri, 12 Oct 2018 15:05:09 +0000
44
Subject: [PATCH] Persist ASP.NET runtime patch targeting default
55

66
Let the CLI build take a default value for TargetLatestAspNetCoreRuntimePatch in the output SDK.
@@ -11,19 +11,19 @@ https://github.com/dotnet/cli/issues/9469 is required to remove this patch.
1111
1 file changed, 3 insertions(+)
1212

1313
diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets
14-
index 9e0aa5db4..89c8503e1 100644
14+
index 54bd45b..afa2054 100644
1515
--- a/build/MSBuildExtensions.targets
1616
+++ b/build/MSBuildExtensions.targets
17-
@@ -197,6 +197,9 @@ Copyright (c) .NET Foundation. All rights reserved.
17+
@@ -237,6 +237,9 @@ Copyright (c) .NET Foundation. All rights reserved.
1818
<LatestPatchVersionForNetCore1_1 Condition="'%24(LatestPatchVersionForNetCore1_1)' == ''">1.1.9</LatestPatchVersionForNetCore1_1>
1919
<LatestPatchVersionForNetCore2_0 Condition="'%24(LatestPatchVersionForNetCore2_0)' == ''">2.0.9</LatestPatchVersionForNetCore2_0>
2020
<LatestPatchVersionForNetCore2_1 Condition="'%24(LatestPatchVersionForNetCore2_1)' == ''">2.1.2</LatestPatchVersionForNetCore2_1>
2121
+
2222
+ <!-- If true, always target the latest ASP.NET Core runtime by default -->
2323
+ <TargetLatestAspNetCoreRuntimePatch Condition="'$(TargetLatestAspNetCoreRuntimePatch)' == ''">$(DefaultTargetLatestAspNetCoreRuntimePatch)</TargetLatestAspNetCoreRuntimePatch>
2424
</PropertyGroup>
25-
</Project>
26-
]]>
25+
<ItemGroup>
26+
@(ImplicitPackageVariable->'<ImplicitPackageReferenceVersion Include="%(Identity)" TargetFrameworkVersion="%(TargetFrameworkVersion)" DefaultVersion="%(DefaultVersion)" LatestVersion="%(LatestVersion)"/>', '%0A ')
2727
--
28-
2.17.1.windows.2
28+
1.8.3.1
2929

repos/core-setup.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildArguments)</BuildCommand>
2323
<BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
2424

25-
<OfficialBuildId>20180905-02</OfficialBuildId>
25+
<OfficialBuildId>20181010-04</OfficialBuildId>
2626

2727
<!-- Need to set $(PackagesOutput) so WriteVersions writes the versions file for cli, until cli respects auto-dependency flow -->
2828
<PackagesOutput>$(SourceBuiltPackagesPath)</PackagesOutput>

repos/coreclr.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
2020

2121
<CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
22-
<OfficialBuildId>20180905-03</OfficialBuildId>
22+
<OfficialBuildId>20181010-07</OfficialBuildId>
2323
</PropertyGroup>
2424

2525
<ItemGroup>

repos/corefx.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
<PackagesOutput>$(ProjectDirectory)/bin/packages/$(Configuration)</PackagesOutput>
2424
<CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
25-
<OfficialBuildId>20180905-02</OfficialBuildId>
25+
<OfficialBuildId>20181010-06</OfficialBuildId>
2626
</PropertyGroup>
2727

2828
<ItemGroup>

repos/sdk.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))/dir.props" />
44
<PropertyGroup>
5-
<OfficialBuildId>20180905.2</OfficialBuildId>
5+
<OfficialBuildId>20181010.5</OfficialBuildId>
66

77
<OutputVersionArgs>/p:BUILD_BUILDNUMBER=$(OfficialBuildId)</OutputVersionArgs>
88

src/cli

Submodule cli updated 65 files

0 commit comments

Comments
 (0)