Skip to content

Commit 13e19e5

Browse files
crummelcrummel
committed
Merged PR 757: Update for 2.1.10 runtime/2.1.506 SDK April release.
2 parents 3da9418 + a385d6f commit 13e19e5

12 files changed

+40
-35
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-1/20190214-01/final/index.json
1+
https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20190314-05/final/index.json

‎dependencies.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
the product as version strings to be used by the SDK to fetch extra content.
2323
-->
2424
<PropertyGroup>
25-
<MicrosoftAspNetCoreAllPackageVersion>2.1.9</MicrosoftAspNetCoreAllPackageVersion>
26-
<MicrosoftAspNetCoreAppPackageVersion>2.1.9</MicrosoftAspNetCoreAppPackageVersion>
25+
<MicrosoftAspNetCoreAllPackageVersion>2.1.10</MicrosoftAspNetCoreAllPackageVersion>
26+
<MicrosoftAspNetCoreAppPackageVersion>2.1.10</MicrosoftAspNetCoreAppPackageVersion>
2727
<MicrosoftNETSdkRazorPackageVersion>2.2.0</MicrosoftNETSdkRazorPackageVersion>
2828
</PropertyGroup>
2929

‎patches/cli/0001-Persist-ASP.NET-runtime-patch-targeting-default.patch

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From d2609347aa91d0ef25388562ce4805748b4796cd Mon Sep 17 00:00:00 2001
1+
From 3f9e2fc33d74da5d0b72137879e6e7fefe08a9db Mon Sep 17 00:00:00 2001
22
From: Davis Goodin <[email protected]>
33
Date: Wed, 13 Jun 2018 09:46:43 -0500
44
Subject: [PATCH] Persist ASP.NET runtime patch targeting default
@@ -7,17 +7,23 @@ Let the CLI build take a default value for TargetLatestAspNetCoreRuntimePatch in
77

88
https://github.com/dotnet/cli/issues/9469 is required to remove this patch.
99
---
10-
build/MSBuildExtensions.targets | 8 ++++++++
11-
1 file changed, 8 insertions(+)
10+
build/MSBuildExtensions.targets | 14 +++++++++++---
11+
1 file changed, 11 insertions(+), 3 deletions(-)
1212

1313
diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets
14-
index 5ea081651..1ea4735ee 100644
14+
index 73b6f88a2..6fc609c30 100644
1515
--- a/build/MSBuildExtensions.targets
1616
+++ b/build/MSBuildExtensions.targets
17-
@@ -202,6 +202,14 @@ Copyright (c) .NET Foundation. All rights reserved.
18-
<LatestPatchVersionForNetCore1_0 Condition="'%24(LatestPatchVersionForNetCore1_0)' == ''">$(LatestPatchVersionForNetCore1_0)</LatestPatchVersionForNetCore1_0>
19-
<LatestPatchVersionForNetCore1_1 Condition="'%24(LatestPatchVersionForNetCore1_1)' == ''">$(LatestPatchVersionForNetCore1_1)</LatestPatchVersionForNetCore1_1>
20-
<LatestPatchVersionForNetCore2_0 Condition="'%24(LatestPatchVersionForNetCore2_0)' == ''">$(LatestPatchVersionForNetCore2_0)</LatestPatchVersionForNetCore2_0>
17+
@@ -199,9 +199,17 @@ Copyright (c) .NET Foundation. All rights reserved.
18+
<DefaultPatchVersionForAspNetCoreApp2_1>$(_DefaultPatchVersionForAspNetCoreApp2_1)</DefaultPatchVersionForAspNetCoreApp2_1>
19+
20+
<!-- Latest patch versions for each minor version of .NET Core -->
21+
- <LatestPatchVersionForNetCore1_0 Condition="'%24(LatestPatchVersionForNetCore1_0)' == ''">$(MicrosoftNETCoreAppLatestVersion1_0)</LatestPatchVersionForNetCore1_0>
22+
- <LatestPatchVersionForNetCore1_1 Condition="'%24(LatestPatchVersionForNetCore1_1)' == ''">$(MicrosoftNETCoreAppLatestVersion1_1)</LatestPatchVersionForNetCore1_1>
23+
- <LatestPatchVersionForNetCore2_0 Condition="'%24(LatestPatchVersionForNetCore2_0)' == ''">$(MicrosoftNETCoreAppLatestVersion2_0)</LatestPatchVersionForNetCore2_0>
24+
+ <LatestPatchVersionForNetCore1_0 Condition="'%24(LatestPatchVersionForNetCore1_0)' == ''">$(LatestPatchVersionForNetCore1_0)</LatestPatchVersionForNetCore1_0>
25+
+ <LatestPatchVersionForNetCore1_1 Condition="'%24(LatestPatchVersionForNetCore1_1)' == ''">$(LatestPatchVersionForNetCore1_1)</LatestPatchVersionForNetCore1_1>
26+
+ <LatestPatchVersionForNetCore2_0 Condition="'%24(LatestPatchVersionForNetCore2_0)' == ''">$(LatestPatchVersionForNetCore2_0)</LatestPatchVersionForNetCore2_0>
2127
+
2228
+ <!-- In source-build, override the default behavior to always target the latest ASP.NET Core runtime.
2329
+ Normally, a published application will use the latest patch version of the shared ASP.NET framework.

‎repos/core-setup.proj

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

24-
<OfficialBuildId>20190215-01</OfficialBuildId>
24+
<OfficialBuildId>20190314-01</OfficialBuildId>
2525

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

‎repos/coreclr.proj

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

2020
<CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
21-
<OfficialBuildId>20190214-06</OfficialBuildId>
21+
<OfficialBuildId>20190314-02</OfficialBuildId>
2222
</PropertyGroup>
2323

2424
<ItemGroup>

‎repos/corefx.proj

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

2525
<PackagesOutput>$(ProjectDirectory)/bin/packages/$(Configuration)</PackagesOutput>
2626
<CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
27-
<OfficialBuildId>20190215-01</OfficialBuildId>
27+
<OfficialBuildId>20190314-02</OfficialBuildId>
2828
</PropertyGroup>
2929

3030
<ItemGroup>

‎src/cli

‎src/core-setup

‎src/coreclr

‎src/corefx

Submodule corefx updated 48 files

‎tools-local/prebuilt-baseline-offline.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,12 +217,12 @@
217217
<Usage Id="runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.2" Rid="fedora.24-x64" />
218218
<Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.0.0" Rid="linux-x64" />
219219
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.0.0" Rid="linux-x64" />
220-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.8" Rid="linux-x64" />
221-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.8" Rid="linux-x64" />
220+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.9" Rid="linux-x64" />
221+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.9" Rid="linux-x64" />
222222
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" Rid="linux-x64" />
223-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.8" Rid="linux-x64" />
223+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.9" Rid="linux-x64" />
224224
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" Rid="linux-x64" />
225-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.8" Rid="linux-x64" />
225+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.9" Rid="linux-x64" />
226226
<Usage Id="runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.1" />
227227
<Usage Id="runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.0" Rid="opensuse.13.2-x64" />
228228
<Usage Id="runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.1" Rid="opensuse.13.2-x64" />

‎tools-local/prebuilt-baseline-online.xml

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@
9595
<Usage Id="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0-preview2-26306-03" />
9696
<Usage Id="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4-20181009-2100240" />
9797
<Usage Id="Microsoft.DotNet.VersionTools" Version="2.1.0-rc1-03130-05" IsDirectDependency="true" />
98-
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.1.9" />
99-
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="2.1.9" />
100-
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates" Version="2.1.9" />
98+
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.1.10" />
99+
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="2.1.10" />
100+
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates" Version="2.1.10" />
101101
<Usage Id="Microsoft.Extensions.CommandLineUtils" Version="1.1.0" IsDirectDependency="true" />
102102
<Usage Id="Microsoft.Extensions.CommandLineUtils.Sources" Version="2.2.0-rtm-35542" IsDirectDependency="true" />
103103
<Usage Id="Microsoft.Extensions.DependencyModel" Version="1.0.3" />
@@ -122,24 +122,24 @@
122122
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.0.0" />
123123
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.0-preview1-26116-04" />
124124
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.0" />
125-
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.8" />
125+
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.9" />
126126
<Usage Id="Microsoft.NETCore.DotNetHost" Version="1.0.1" />
127127
<Usage Id="Microsoft.NETCore.DotNetHost" Version="1.1.0" />
128-
<Usage Id="Microsoft.NETCore.DotNetHost" Version="2.1.8" IsDirectDependency="true" />
128+
<Usage Id="Microsoft.NETCore.DotNetHost" Version="2.1.9" IsDirectDependency="true" />
129129
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="1.0.3" />
130130
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="1.0.5" />
131131
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="1.1.0" />
132132
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="1.1.2" />
133133
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" />
134134
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0-preview1-26116-04" />
135135
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0" />
136-
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.8" IsDirectDependency="true" />
136+
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.9" IsDirectDependency="true" />
137137
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="1.0.1" />
138138
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="1.1.0" />
139139
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" />
140140
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.0-preview1-26116-04" />
141141
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.0" />
142-
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.8" />
142+
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.9" />
143143
<Usage Id="Microsoft.NETCore.ILAsm" Version="2.2.2-servicing-27317-07" IsDirectDependency="true" />
144144
<Usage Id="Microsoft.NETCore.ILDAsm" Version="2.2.2-servicing-27317-07" IsDirectDependency="true" />
145145
<Usage Id="Microsoft.NETCore.Jit" Version="1.0.5" />
@@ -154,7 +154,7 @@
154154
<Usage Id="Microsoft.NETCore.Platforms" Version="2.0.0" />
155155
<Usage Id="Microsoft.NETCore.Platforms" Version="2.1.0-preview1-26116-01" />
156156
<Usage Id="Microsoft.NETCore.Platforms" Version="2.1.0" />
157-
<Usage Id="Microsoft.NETCore.Platforms" Version="2.1.2" IsDirectDependency="true" />
157+
<Usage Id="Microsoft.NETCore.Platforms" Version="2.1.3" IsDirectDependency="true" />
158158
<Usage Id="Microsoft.NETCore.Runtime.CoreCLR" Version="1.0.5" />
159159
<Usage Id="Microsoft.NETCore.Runtime.CoreCLR" Version="1.0.7" />
160160
<Usage Id="Microsoft.NETCore.Runtime.CoreCLR" Version="1.1.1" />
@@ -191,7 +191,6 @@
191191
<Usage Id="NETStandard.Library" Version="1.6.1" IsDirectDependency="true" IsAutoReferenced="true" />
192192
<Usage Id="NETStandard.Library" Version="2.0.0" />
193193
<Usage Id="NETStandard.Library" Version="2.0.1" />
194-
<Usage Id="NETStandard.Library" Version="2.0.3" IsDirectDependency="true" IsAutoReferenced="true" />
195194
<Usage Id="NETStandard.Library.NETFramework" Version="2.0.1-servicing-26011-01" IsDirectDependency="true" />
196195
<Usage Id="Newtonsoft.Json" Version="6.0.4" />
197196
<Usage Id="Newtonsoft.Json" Version="8.0.3" IsDirectDependency="true" />
@@ -274,12 +273,12 @@
274273
<Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.0.0" Rid="linux-x64" />
275274
<Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.1.8" Rid="linux-x64" />
276275
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.0.0" Rid="linux-x64" />
277-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.8" Rid="linux-x64" />
278-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.8" Rid="linux-x64" />
276+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.9" Rid="linux-x64" />
277+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.9" Rid="linux-x64" />
279278
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" Rid="linux-x64" />
280-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.8" Rid="linux-x64" />
279+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.9" Rid="linux-x64" />
281280
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" Rid="linux-x64" />
282-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.8" Rid="linux-x64" />
281+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.9" Rid="linux-x64" />
283282
<Usage Id="runtime.linux-x64.Microsoft.NETCore.ILAsm" Version="2.2.2-servicing-27317-07" Rid="linux-x64" />
284283
<Usage Id="runtime.linux-x64.Microsoft.NETCore.ILDAsm" Version="2.2.2-servicing-27317-07" Rid="linux-x64" />
285284
<Usage Id="runtime.linux-x64.Microsoft.NETCore.Jit" Version="2.2.2-servicing-27317-07" Rid="linux-x64" />

0 commit comments

Comments
 (0)