Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to 2.1.521 #2035

Merged
merged 5 commits into from
Feb 11, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DotnetCLIVersion.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.519
2.1.520
4 changes: 2 additions & 2 deletions dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
the product as version strings to be used by the SDK to fetch extra content.
-->
<PropertyGroup>
<MicrosoftAspNetCoreAllPackageVersion>2.1.24</MicrosoftAspNetCoreAllPackageVersion>
<MicrosoftAspNetCoreAppPackageVersion>2.1.24</MicrosoftAspNetCoreAppPackageVersion>
<MicrosoftAspNetCoreAllPackageVersion>2.1.25</MicrosoftAspNetCoreAllPackageVersion>
<MicrosoftAspNetCoreAppPackageVersion>2.1.25</MicrosoftAspNetCoreAppPackageVersion>
<MicrosoftNETSdkRazorPackageVersion>2.2.0</MicrosoftNETSdkRazorPackageVersion>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion repos/core-setup.proj
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildArguments)</BuildCommand>
<BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>

<OfficialBuildId>20201118-02</OfficialBuildId>
<OfficialBuildId>20210120-01</OfficialBuildId>

<!-- Need to set $(PackagesOutput) so WriteVersions writes the versions file for cli, until cli respects auto-dependency flow -->
<PackagesOutput>$(SourceBuiltPackagesPath)</PackagesOutput>
Expand Down
2 changes: 1 addition & 1 deletion repos/coreclr.proj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>

<CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
<OfficialBuildId>20201118-01</OfficialBuildId>
<OfficialBuildId>20210119-03</OfficialBuildId>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion repos/corefx.proj
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<PackagesOutput>$(ProjectDirectory)/bin/packages/$(Configuration)</PackagesOutput>
<CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
<OfficialBuildId>20201118-01</OfficialBuildId>
<OfficialBuildId>20210119-01</OfficialBuildId>
</PropertyGroup>

<ItemGroup>
Expand Down
29 changes: 14 additions & 15 deletions tools-local/prebuilt-baseline-offline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,15 @@
<Dir>bin/obj/</Dir>
<Dir></Dir>
</ProjectDirectories>
<NeverRestoredTarballPrebuilts>
<PackageIdentity Id="Microsoft.DotNet.BuildTools" Version="2.1.0-rc1-06014-01" />
<PackageIdentity Id="RoslynTools.RepoToolset" Version="1.0.0-custom-62805-03" />
<PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.1.24" />
<PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.ILAsm" Version="2.1.8-servicing-27317-03" />
<PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.ILDAsm" Version="2.1.8-servicing-27317-03" />
<PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.Jit" Version="2.1.8-servicing-27317-03" />
<PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.Runtime.CoreCLR" Version="2.1.8-servicing-27317-03" />
</NeverRestoredTarballPrebuilts>
<Usages>
<Usage Id="fmdev.ResX" Version="0.2.0" />
<Usage Id="fmdev.xlftool" Version="0.1.3" IsDirectDependency="true" />
Expand Down Expand Up @@ -136,28 +145,18 @@
<Usage Id="Newtonsoft.Json" Version="10.0.3" IsDirectDependency="true" />
<Usage Id="NuGet.CommandLine" Version="3.4.3" IsDirectDependency="true" />
<Usage Id="NuGet.Common" Version="4.0.0-rtm-2283" />
<Usage Id="NuGet.Common" Version="4.3.0-preview1-2500" />
<Usage Id="NuGet.Common" Version="4.3.0-preview2-4095" />
<Usage Id="NuGet.Configuration" Version="4.3.0-preview1-2500" />
<Usage Id="NuGet.Configuration" Version="4.3.0-preview2-4095" />
<Usage Id="NuGet.DependencyResolver.Core" Version="4.3.0-preview1-2500" />
<Usage Id="NuGet.DependencyResolver.Core" Version="4.3.0-preview2-4095" />
<Usage Id="NuGet.Frameworks" Version="4.0.0-rtm-2283" />
<Usage Id="NuGet.Frameworks" Version="4.3.0-preview1-2500" />
<Usage Id="NuGet.Frameworks" Version="4.3.0-preview2-4095" />
<Usage Id="NuGet.LibraryModel" Version="4.3.0-preview1-2500" />
<Usage Id="NuGet.LibraryModel" Version="4.3.0-preview2-4095" />
<Usage Id="NuGet.Packaging" Version="4.0.0-rtm-2283" />
<Usage Id="NuGet.Packaging" Version="4.3.0-preview1-2500" />
<Usage Id="NuGet.Packaging" Version="4.3.0-preview2-4095" />
<Usage Id="NuGet.Packaging.Core" Version="4.3.0-preview1-2500" />
<Usage Id="NuGet.Packaging.Core" Version="4.3.0-preview2-4095" />
<Usage Id="NuGet.ProjectModel" Version="4.3.0-preview1-2500" IsDirectDependency="true" />
<Usage Id="NuGet.ProjectModel" Version="4.3.0-preview2-4095" IsDirectDependency="true" />
<Usage Id="NuGet.Protocol" Version="4.3.0-preview1-2500" />
<Usage Id="NuGet.Protocol" Version="4.3.0-preview2-4095" />
<Usage Id="NuGet.Versioning" Version="4.0.0-rtm-2283" />
<Usage Id="NuGet.Versioning" Version="4.3.0-preview1-2500" />
<Usage Id="NuGet.Versioning" Version="4.3.0-preview2-4095" />
<Usage Id="NuGet.Versioning" Version="4.7.0-preview1-4992" />
<Usage Id="optimization.linux-x64.PGO.CoreCLR" Version="2.1.0-release-20180912-0055" />
Expand Down Expand Up @@ -208,12 +207,12 @@
<Usage Id="runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.2" Rid="fedora.24-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.0.0" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.0.0" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.23" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.23" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.24" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.24" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.23" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.24" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.23" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.24" Rid="linux-x64" />
<Usage Id="runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.1" />
<Usage Id="runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.0" Rid="opensuse.13.2-x64" />
<Usage Id="runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.1" Rid="opensuse.13.2-x64" />
Expand Down Expand Up @@ -502,4 +501,4 @@
<Usage Id="XliffTasks" Version="0.2.0-beta-62730-03" IsDirectDependency="true" />
<Usage Id="XliffTasks" Version="0.2.0-beta-63004-01" IsDirectDependency="true" />
</Usages>
</UsageData>
</UsageData>
40 changes: 15 additions & 25 deletions tools-local/prebuilt-baseline-online.xml
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@
<Usage Id="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0-preview2-26306-03" />
<Usage Id="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4-20181009-2100240" />
<Usage Id="Microsoft.DotNet.VersionTools" Version="2.1.0-rc1-05113-01" IsDirectDependency="true" />
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.1.24" />
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="2.1.24" />
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1" Version="2.1.24" />
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.1.25" />
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="2.1.25" />
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1" Version="2.1.25" />
<Usage Id="Microsoft.Extensions.CommandLineUtils" Version="1.1.0" IsDirectDependency="true" />
<Usage Id="Microsoft.Extensions.CommandLineUtils.Sources" Version="2.2.0-rtm-35542" IsDirectDependency="true" />
<Usage Id="Microsoft.Extensions.DependencyModel" Version="1.0.3" />
Expand All @@ -116,30 +116,30 @@
<Usage Id="Microsoft.NETCore.App" Version="2.0.0" IsDirectDependency="true" IsAutoReferenced="true" />
<Usage Id="Microsoft.NETCore.App" Version="2.1.0-preview1-26116-04" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.App" Version="2.1.0" IsDirectDependency="true" IsAutoReferenced="true" />
<Usage Id="Microsoft.NETCore.App" Version="2.1.23" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.App" Version="2.1.24" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.Compilers" Version="2.8.0-beta2-62719-08" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.Compilers" Version="2.8.0-beta4-62824-10" />
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.0.0" />
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.0-preview1-26116-04" />
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.0" />
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.23" />
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.24" />
<Usage Id="Microsoft.NETCore.DotNetHost" Version="1.0.1" />
<Usage Id="Microsoft.NETCore.DotNetHost" Version="1.1.0" />
<Usage Id="Microsoft.NETCore.DotNetHost" Version="2.1.23" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.DotNetHost" Version="2.1.24" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="1.0.3" />
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="1.0.5" />
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="1.1.0" />
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="1.1.2" />
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" />
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0-preview1-26116-04" />
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0" />
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.23" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.24" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="1.0.1" />
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="1.1.0" />
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" />
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.0-preview1-26116-04" />
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.0" />
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.23" />
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.24" />
<Usage Id="Microsoft.NETCore.ILAsm" Version="2.1.8-servicing-27317-03" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.ILDAsm" Version="2.1.8-servicing-27317-03" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.Jit" Version="1.0.5" />
Expand Down Expand Up @@ -196,28 +196,18 @@
<Usage Id="Newtonsoft.Json" Version="10.0.3" IsDirectDependency="true" />
<Usage Id="NuGet.CommandLine" Version="3.4.3" IsDirectDependency="true" />
<Usage Id="NuGet.Common" Version="4.0.0-rtm-2283" />
<Usage Id="NuGet.Common" Version="4.3.0-preview1-2500" />
<Usage Id="NuGet.Common" Version="4.3.0-preview2-4095" />
<Usage Id="NuGet.Configuration" Version="4.3.0-preview1-2500" />
<Usage Id="NuGet.Configuration" Version="4.3.0-preview2-4095" />
<Usage Id="NuGet.DependencyResolver.Core" Version="4.3.0-preview1-2500" />
<Usage Id="NuGet.DependencyResolver.Core" Version="4.3.0-preview2-4095" />
<Usage Id="NuGet.Frameworks" Version="4.0.0-rtm-2283" />
<Usage Id="NuGet.Frameworks" Version="4.3.0-preview1-2500" />
<Usage Id="NuGet.Frameworks" Version="4.3.0-preview2-4095" />
<Usage Id="NuGet.LibraryModel" Version="4.3.0-preview1-2500" />
<Usage Id="NuGet.LibraryModel" Version="4.3.0-preview2-4095" />
<Usage Id="NuGet.Packaging" Version="4.0.0-rtm-2283" />
<Usage Id="NuGet.Packaging" Version="4.3.0-preview1-2500" />
<Usage Id="NuGet.Packaging" Version="4.3.0-preview2-4095" />
<Usage Id="NuGet.Packaging.Core" Version="4.3.0-preview1-2500" />
<Usage Id="NuGet.Packaging.Core" Version="4.3.0-preview2-4095" />
<Usage Id="NuGet.ProjectModel" Version="4.3.0-preview1-2500" IsDirectDependency="true" />
<Usage Id="NuGet.ProjectModel" Version="4.3.0-preview2-4095" IsDirectDependency="true" />
<Usage Id="NuGet.Protocol" Version="4.3.0-preview1-2500" />
<Usage Id="NuGet.Protocol" Version="4.3.0-preview2-4095" />
<Usage Id="NuGet.Versioning" Version="4.0.0-rtm-2283" />
<Usage Id="NuGet.Versioning" Version="4.3.0-preview1-2500" />
<Usage Id="NuGet.Versioning" Version="4.3.0-preview2-4095" />
<Usage Id="NuGet.Versioning" Version="4.7.0-preview1-4992" />
<Usage Id="NUnit3.DotNetNew.Template" Version="1.5.3" />
Expand Down Expand Up @@ -270,14 +260,14 @@
<Usage Id="runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.1" Rid="fedora.24-x64" />
<Usage Id="runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.2" Rid="fedora.24-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.0.0" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.1.23" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.1.24" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.0.0" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.23" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.23" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.24" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.24" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.23" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.24" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.23" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.24" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.ILAsm" Version="2.1.8-servicing-27317-03" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.ILDAsm" Version="2.1.8-servicing-27317-03" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.Jit" Version="2.1.8-servicing-27317-03" Rid="linux-x64" />
Expand Down Expand Up @@ -447,7 +437,7 @@
<Usage Id="System.IO.Compression.ZipFile" Version="4.0.1" />
<Usage Id="System.IO.Compression.ZipFile" Version="4.3.0" />
<Usage Id="System.IO.FileSystem" Version="4.0.1" />
<Usage Id="System.IO.FileSystem" Version="4.3.0" />
<Usage Id="System.IO.FileSystem" Version="4.3.0" IsDirectDependency="true" />
<Usage Id="System.IO.FileSystem.Primitives" Version="4.0.1" />
<Usage Id="System.IO.FileSystem.Primitives" Version="4.3.0" />
<Usage Id="System.IO.FileSystem.Watcher" Version="4.0.0" />
Expand Down Expand Up @@ -613,4 +603,4 @@
<Usage Id="XliffTasks" Version="0.2.0-beta-62730-03" IsDirectDependency="true" />
<Usage Id="XliffTasks" Version="0.2.0-beta-63004-01" IsDirectDependency="true" />
</Usages>
</UsageData>
</UsageData>