Skip to content

Commit 1ad05cf

Browse files
crummelcrummel
committed
Merged PR 1985: Update to 2.1.508.
1 parent 0e541d0 commit 1ad05cf

9 files changed

+30
-32
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/20190417-04/final/index.json
1+
https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20190617-02/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.11</MicrosoftAspNetCoreAllPackageVersion>
26-
<MicrosoftAspNetCoreAppPackageVersion>2.1.11</MicrosoftAspNetCoreAppPackageVersion>
25+
<MicrosoftAspNetCoreAllPackageVersion>2.1.12</MicrosoftAspNetCoreAllPackageVersion>
26+
<MicrosoftAspNetCoreAppPackageVersion>2.1.12</MicrosoftAspNetCoreAppPackageVersion>
2727
<MicrosoftNETSdkRazorPackageVersion>2.2.0</MicrosoftNETSdkRazorPackageVersion>
2828
</PropertyGroup>
2929

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 3f9e2fc33d74da5d0b72137879e6e7fefe08a9db Mon Sep 17 00:00:00 2001
1+
From 5321545d00a6e5931d987b95fac468225ff314f2 Mon Sep 17 00:00:00 2001
22
From: Davis Goodin <dagood@microsoft.com>
33
Date: Wed, 13 Jun 2018 09:46:43 -0500
44
Subject: [PATCH] Persist ASP.NET runtime patch targeting default
@@ -18,12 +18,9 @@ index 73b6f88a2..6fc609c30 100644
1818
<DefaultPatchVersionForAspNetCoreApp2_1>$(_DefaultPatchVersionForAspNetCoreApp2_1)</DefaultPatchVersionForAspNetCoreApp2_1>
1919

2020
<!-- 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>
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>
2724
+
2825
+ <!-- In source-build, override the default behavior to always target the latest ASP.NET Core runtime.
2926
+ Normally, a published application will use the latest patch version of the shared ASP.NET framework.
@@ -36,5 +33,5 @@ index 73b6f88a2..6fc609c30 100644
3633
</Project>
3734
]]>
3835
--
39-
2.18.0
36+
2.21.0
4037

‎src/cli

‎src/core-setup

Submodule core-setup updated 16 files

‎src/coreclr

‎src/corefx

Submodule corefx updated 22 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.10" Rid="linux-x64" />
221-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.10" Rid="linux-x64" />
220+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.11" Rid="linux-x64" />
221+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.11" 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.10" Rid="linux-x64" />
223+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.11" 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.10" Rid="linux-x64" />
225+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.11" 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: 14 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.11" />
99-
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="2.1.11" />
100-
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates" Version="2.1.11" />
98+
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.1.12" />
99+
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="2.1.12" />
100+
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates" Version="2.1.12" />
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.10" />
125+
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.11" />
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.10" IsDirectDependency="true" />
128+
<Usage Id="Microsoft.NETCore.DotNetHost" Version="2.1.11" 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.10" IsDirectDependency="true" />
136+
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.11" 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.10" />
142+
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.11" />
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,6 +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.4" IsDirectDependency="true" />
157158
<Usage Id="Microsoft.NETCore.Runtime.CoreCLR" Version="1.0.5" />
158159
<Usage Id="Microsoft.NETCore.Runtime.CoreCLR" Version="1.0.7" />
159160
<Usage Id="Microsoft.NETCore.Runtime.CoreCLR" Version="1.1.1" />
@@ -272,12 +273,12 @@
272273
<Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.0.0" Rid="linux-x64" />
273274
<Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.1.8" Rid="linux-x64" />
274275
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.0.0" Rid="linux-x64" />
275-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.10" Rid="linux-x64" />
276-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.10" Rid="linux-x64" />
276+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.11" Rid="linux-x64" />
277+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.11" Rid="linux-x64" />
277278
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" Rid="linux-x64" />
278-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.10" Rid="linux-x64" />
279+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.11" Rid="linux-x64" />
279280
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" Rid="linux-x64" />
280-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.10" Rid="linux-x64" />
281+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.11" Rid="linux-x64" />
281282
<Usage Id="runtime.linux-x64.Microsoft.NETCore.ILAsm" Version="2.2.2-servicing-27317-07" Rid="linux-x64" />
282283
<Usage Id="runtime.linux-x64.Microsoft.NETCore.ILDAsm" Version="2.2.2-servicing-27317-07" Rid="linux-x64" />
283284
<Usage Id="runtime.linux-x64.Microsoft.NETCore.Jit" Version="2.2.2-servicing-27317-07" Rid="linux-x64" />
@@ -447,7 +448,7 @@
447448
<Usage Id="System.IO.Compression.ZipFile" Version="4.0.1" />
448449
<Usage Id="System.IO.Compression.ZipFile" Version="4.3.0" />
449450
<Usage Id="System.IO.FileSystem" Version="4.0.1" />
450-
<Usage Id="System.IO.FileSystem" Version="4.3.0" />
451+
<Usage Id="System.IO.FileSystem" Version="4.3.0" IsDirectDependency="true" />
451452
<Usage Id="System.IO.FileSystem.Primitives" Version="4.0.1" />
452453
<Usage Id="System.IO.FileSystem.Primitives" Version="4.3.0" />
453454
<Usage Id="System.IO.FileSystem.Watcher" Version="4.0.0" />
@@ -613,4 +614,4 @@
613614
<Usage Id="XliffTasks" Version="0.2.0-beta-62730-03" IsDirectDependency="true" />
614615
<Usage Id="XliffTasks" Version="0.2.0-beta-63004-01" IsDirectDependency="true" />
615616
</Usages>
616-
</UsageData>
617+
</UsageData>

0 commit comments

Comments
 (0)