Skip to content

Commit 2a5ddf7

Browse files
crummelcrummel
authored
Update to 2.1.26/2.1.522 build 20210212-02-4489682. (#2087)
* Update to 2.1.26/2.1.522 build 20210212-02-4489682. * Remove legacy feeds.
1 parent a533d3c commit 2a5ddf7

13 files changed

+44
-52
lines changed

‎DotnetCLIVersion.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.520
1+
2.1.521

‎dependencies.props

+2-2
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.25</MicrosoftAspNetCoreAllPackageVersion>
26-
<MicrosoftAspNetCoreAppPackageVersion>2.1.25</MicrosoftAspNetCoreAppPackageVersion>
25+
<MicrosoftAspNetCoreAllPackageVersion>2.1.26</MicrosoftAspNetCoreAllPackageVersion>
26+
<MicrosoftAspNetCoreAppPackageVersion>2.1.26</MicrosoftAspNetCoreAppPackageVersion>
2727
<MicrosoftNETSdkRazorPackageVersion>2.2.0</MicrosoftNETSdkRazorPackageVersion>
2828
</PropertyGroup>
2929

‎patches/cli/0002-Remove-feed-that-no-longer-exists.patch

-24
This file was deleted.

‎repos/core-setup.proj

+1-1
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>20210120-01</OfficialBuildId>
24+
<OfficialBuildId>20210212-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

+1-1
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>20210119-03</OfficialBuildId>
21+
<OfficialBuildId>20210212-02</OfficialBuildId>
2222
</PropertyGroup>
2323

2424
<ItemGroup>

‎repos/corefx.proj

+1-1
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>20210119-01</OfficialBuildId>
27+
<OfficialBuildId>20210212-01</OfficialBuildId>
2828
</PropertyGroup>
2929

3030
<ItemGroup>

‎repos/dir.targets

+15
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,21 @@
223223
<LegacyFeedMapping
224224
Include="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json"
225225
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
226+
<LegacyFeedMapping
227+
Include="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json"
228+
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
229+
<LegacyFeedMapping
230+
Include="https://dotnet.myget.org/F/dotnet-coreclr/api/v3/index.json"
231+
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
232+
<LegacyFeedMapping
233+
Include="https://dotnet.myget.org/F/nuget-volatile/api/v3/index.json"
234+
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
235+
<LegacyFeedMapping
236+
Include="https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json"
237+
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
238+
<LegacyFeedMapping
239+
Include="https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json"
240+
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
226241
</ItemGroup>
227242

228243
<ReplaceFeedsInFile InputFile="%(LegacyFeedUpdateFiles.Identity)"

‎src/cli

‎src/core-setup

‎src/coreclr

‎src/corefx

Submodule corefx updated 17 files

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -207,12 +207,12 @@
207207
<Usage Id="runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.2" Rid="fedora.24-x64" />
208208
<Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.0.0" Rid="linux-x64" />
209209
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.0.0" Rid="linux-x64" />
210-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.24" Rid="linux-x64" />
211-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.24" Rid="linux-x64" />
210+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.25" Rid="linux-x64" />
211+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.25" Rid="linux-x64" />
212212
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" Rid="linux-x64" />
213-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.24" Rid="linux-x64" />
213+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.25" Rid="linux-x64" />
214214
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" Rid="linux-x64" />
215-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.24" Rid="linux-x64" />
215+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.25" Rid="linux-x64" />
216216
<Usage Id="runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.1" />
217217
<Usage Id="runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.0" Rid="opensuse.13.2-x64" />
218218
<Usage Id="runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.1" Rid="opensuse.13.2-x64" />
@@ -501,4 +501,4 @@
501501
<Usage Id="XliffTasks" Version="0.2.0-beta-62730-03" IsDirectDependency="true" />
502502
<Usage Id="XliffTasks" Version="0.2.0-beta-63004-01" IsDirectDependency="true" />
503503
</Usages>
504-
</UsageData>
504+
</UsageData>

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

+14-13
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-05113-01" IsDirectDependency="true" />
98-
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.1.25" />
99-
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="2.1.25" />
100-
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1" Version="2.1.25" />
98+
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.1.26" />
99+
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="2.1.26" />
100+
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1" Version="2.1.26" />
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" />
@@ -116,30 +116,30 @@
116116
<Usage Id="Microsoft.NETCore.App" Version="2.0.0" IsDirectDependency="true" IsAutoReferenced="true" />
117117
<Usage Id="Microsoft.NETCore.App" Version="2.1.0-preview1-26116-04" IsDirectDependency="true" />
118118
<Usage Id="Microsoft.NETCore.App" Version="2.1.0" IsDirectDependency="true" IsAutoReferenced="true" />
119-
<Usage Id="Microsoft.NETCore.App" Version="2.1.24" IsDirectDependency="true" />
119+
<Usage Id="Microsoft.NETCore.App" Version="2.1.25" IsDirectDependency="true" />
120120
<Usage Id="Microsoft.NETCore.Compilers" Version="2.8.0-beta2-62719-08" IsDirectDependency="true" />
121121
<Usage Id="Microsoft.NETCore.Compilers" Version="2.8.0-beta4-62824-10" />
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.24" />
125+
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.25" />
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.24" IsDirectDependency="true" />
128+
<Usage Id="Microsoft.NETCore.DotNetHost" Version="2.1.25" 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.24" IsDirectDependency="true" />
136+
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.25" 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.24" />
142+
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.25" />
143143
<Usage Id="Microsoft.NETCore.ILAsm" Version="2.1.8-servicing-27317-03" IsDirectDependency="true" />
144144
<Usage Id="Microsoft.NETCore.ILDAsm" Version="2.1.8-servicing-27317-03" 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.12" 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" />
@@ -260,14 +261,14 @@
260261
<Usage Id="runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.1" Rid="fedora.24-x64" />
261262
<Usage Id="runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.2" Rid="fedora.24-x64" />
262263
<Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.0.0" Rid="linux-x64" />
263-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.1.24" Rid="linux-x64" />
264+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.1.25" Rid="linux-x64" />
264265
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.0.0" Rid="linux-x64" />
265-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.24" Rid="linux-x64" />
266-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.24" Rid="linux-x64" />
266+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.25" Rid="linux-x64" />
267+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.25" Rid="linux-x64" />
267268
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" Rid="linux-x64" />
268-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.24" Rid="linux-x64" />
269+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.25" Rid="linux-x64" />
269270
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" Rid="linux-x64" />
270-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.24" Rid="linux-x64" />
271+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.25" Rid="linux-x64" />
271272
<Usage Id="runtime.linux-x64.Microsoft.NETCore.ILAsm" Version="2.1.8-servicing-27317-03" Rid="linux-x64" />
272273
<Usage Id="runtime.linux-x64.Microsoft.NETCore.ILDAsm" Version="2.1.8-servicing-27317-03" Rid="linux-x64" />
273274
<Usage Id="runtime.linux-x64.Microsoft.NETCore.Jit" Version="2.1.8-servicing-27317-03" Rid="linux-x64" />

0 commit comments

Comments
 (0)