Skip to content

Commit a533d3c

Browse files
dseefelddseefeld
authored
Merge pull request #2035 from dseefeld/2.1.521
Update to 2.1.521
2 parents afadaea + 426a726 commit a533d3c

File tree

11 files changed

+39
-50
lines changed

11 files changed

+39
-50
lines changed

‎DotnetCLIVersion.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.519
1+
2.1.520

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

‎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>20201118-02</OfficialBuildId>
24+
<OfficialBuildId>20210120-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>20201118-01</OfficialBuildId>
21+
<OfficialBuildId>20210119-03</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>20201118-01</OfficialBuildId>
27+
<OfficialBuildId>20210119-01</OfficialBuildId>
2828
</PropertyGroup>
2929

3030
<ItemGroup>

‎src/cli‎

‎src/core-setup‎

‎src/coreclr‎

‎src/corefx‎

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

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,15 @@
3030
<Dir>bin/obj/</Dir>
3131
<Dir></Dir>
3232
</ProjectDirectories>
33+
<NeverRestoredTarballPrebuilts>
34+
<PackageIdentity Id="Microsoft.DotNet.BuildTools" Version="2.1.0-rc1-06014-01" />
35+
<PackageIdentity Id="RoslynTools.RepoToolset" Version="1.0.0-custom-62805-03" />
36+
<PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.1.24" />
37+
<PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.ILAsm" Version="2.1.8-servicing-27317-03" />
38+
<PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.ILDAsm" Version="2.1.8-servicing-27317-03" />
39+
<PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.Jit" Version="2.1.8-servicing-27317-03" />
40+
<PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.Runtime.CoreCLR" Version="2.1.8-servicing-27317-03" />
41+
</NeverRestoredTarballPrebuilts>
3342
<Usages>
3443
<Usage Id="fmdev.ResX" Version="0.2.0" />
3544
<Usage Id="fmdev.xlftool" Version="0.1.3" IsDirectDependency="true" />
@@ -136,28 +145,18 @@
136145
<Usage Id="Newtonsoft.Json" Version="10.0.3" IsDirectDependency="true" />
137146
<Usage Id="NuGet.CommandLine" Version="3.4.3" IsDirectDependency="true" />
138147
<Usage Id="NuGet.Common" Version="4.0.0-rtm-2283" />
139-
<Usage Id="NuGet.Common" Version="4.3.0-preview1-2500" />
140148
<Usage Id="NuGet.Common" Version="4.3.0-preview2-4095" />
141-
<Usage Id="NuGet.Configuration" Version="4.3.0-preview1-2500" />
142149
<Usage Id="NuGet.Configuration" Version="4.3.0-preview2-4095" />
143-
<Usage Id="NuGet.DependencyResolver.Core" Version="4.3.0-preview1-2500" />
144150
<Usage Id="NuGet.DependencyResolver.Core" Version="4.3.0-preview2-4095" />
145151
<Usage Id="NuGet.Frameworks" Version="4.0.0-rtm-2283" />
146-
<Usage Id="NuGet.Frameworks" Version="4.3.0-preview1-2500" />
147152
<Usage Id="NuGet.Frameworks" Version="4.3.0-preview2-4095" />
148-
<Usage Id="NuGet.LibraryModel" Version="4.3.0-preview1-2500" />
149153
<Usage Id="NuGet.LibraryModel" Version="4.3.0-preview2-4095" />
150154
<Usage Id="NuGet.Packaging" Version="4.0.0-rtm-2283" />
151-
<Usage Id="NuGet.Packaging" Version="4.3.0-preview1-2500" />
152155
<Usage Id="NuGet.Packaging" Version="4.3.0-preview2-4095" />
153-
<Usage Id="NuGet.Packaging.Core" Version="4.3.0-preview1-2500" />
154156
<Usage Id="NuGet.Packaging.Core" Version="4.3.0-preview2-4095" />
155-
<Usage Id="NuGet.ProjectModel" Version="4.3.0-preview1-2500" IsDirectDependency="true" />
156157
<Usage Id="NuGet.ProjectModel" Version="4.3.0-preview2-4095" IsDirectDependency="true" />
157-
<Usage Id="NuGet.Protocol" Version="4.3.0-preview1-2500" />
158158
<Usage Id="NuGet.Protocol" Version="4.3.0-preview2-4095" />
159159
<Usage Id="NuGet.Versioning" Version="4.0.0-rtm-2283" />
160-
<Usage Id="NuGet.Versioning" Version="4.3.0-preview1-2500" />
161160
<Usage Id="NuGet.Versioning" Version="4.3.0-preview2-4095" />
162161
<Usage Id="NuGet.Versioning" Version="4.7.0-preview1-4992" />
163162
<Usage Id="optimization.linux-x64.PGO.CoreCLR" Version="2.1.0-release-20180912-0055" />
@@ -208,12 +207,12 @@
208207
<Usage Id="runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.2" Rid="fedora.24-x64" />
209208
<Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.0.0" Rid="linux-x64" />
210209
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.0.0" Rid="linux-x64" />
211-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.23" Rid="linux-x64" />
212-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.23" 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" />
213212
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" Rid="linux-x64" />
214-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.23" Rid="linux-x64" />
213+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.24" Rid="linux-x64" />
215214
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" Rid="linux-x64" />
216-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.23" Rid="linux-x64" />
215+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.24" Rid="linux-x64" />
217216
<Usage Id="runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.1" />
218217
<Usage Id="runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.0" Rid="opensuse.13.2-x64" />
219218
<Usage Id="runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.1" Rid="opensuse.13.2-x64" />
@@ -502,4 +501,4 @@
502501
<Usage Id="XliffTasks" Version="0.2.0-beta-62730-03" IsDirectDependency="true" />
503502
<Usage Id="XliffTasks" Version="0.2.0-beta-63004-01" IsDirectDependency="true" />
504503
</Usages>
505-
</UsageData>
504+
</UsageData>

0 commit comments

Comments
 (0)