Skip to content

Commit

Permalink
Update to 2.1.26/2.1.522 build 20210212-02-4489682. (#2087)
Browse files Browse the repository at this point in the history 
* Update to 2.1.26/2.1.522 build 20210212-02-4489682.

* Remove legacy feeds.
  • Loading branch information
@crummel
crummel authored Mar 15, 2021
1 parent a533d3c commit 2a5ddf7
Show file tree
Hide file tree
Showing 13 changed files with 44 additions and 52 deletions.
2 changes: 1 addition & 1 deletion DotnetCLIVersion.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.520
2.1.521
4 changes: 2 additions & 2 deletions dependencies.props
View file
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.25</MicrosoftAspNetCoreAllPackageVersion>
<MicrosoftAspNetCoreAppPackageVersion>2.1.25</MicrosoftAspNetCoreAppPackageVersion>
<MicrosoftAspNetCoreAllPackageVersion>2.1.26</MicrosoftAspNetCoreAllPackageVersion>
<MicrosoftAspNetCoreAppPackageVersion>2.1.26</MicrosoftAspNetCoreAppPackageVersion>
<MicrosoftNETSdkRazorPackageVersion>2.2.0</MicrosoftNETSdkRazorPackageVersion>
</PropertyGroup>

Expand Down
24 changes: 0 additions & 24 deletions patches/cli/0002-Remove-feed-that-no-longer-exists.patch
View file

This file was deleted.

2 changes: 1 addition & 1 deletion repos/core-setup.proj
View file
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>20210120-01</OfficialBuildId>
<OfficialBuildId>20210212-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
View file
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>20210119-03</OfficialBuildId>
<OfficialBuildId>20210212-02</OfficialBuildId>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion repos/corefx.proj
View file
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>20210119-01</OfficialBuildId>
<OfficialBuildId>20210212-01</OfficialBuildId>
</PropertyGroup>

<ItemGroup>
Expand Down
15 changes: 15 additions & 0 deletions repos/dir.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,21 @@
<LegacyFeedMapping
Include="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json"
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
<LegacyFeedMapping
Include="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json"
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
<LegacyFeedMapping
Include="https://dotnet.myget.org/F/dotnet-coreclr/api/v3/index.json"
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
<LegacyFeedMapping
Include="https://dotnet.myget.org/F/nuget-volatile/api/v3/index.json"
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
<LegacyFeedMapping
Include="https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json"
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
<LegacyFeedMapping
Include="https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json"
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
</ItemGroup>

<ReplaceFeedsInFile InputFile="%(LegacyFeedUpdateFiles.Identity)"
Expand Down
2 changes: 1 addition & 1 deletion src/cli
Submodule cli updated 6 files
+2 −11 build/NugetConfigFile.targets
+1 −1 build/Version.props
+1 −1 build/package/Installer.MSI.targets
+3 −4 packaging/windows/clisdk/bundle.thm
+1 −0 packaging/windows/clisdk/bundle.wxl
+1 −1 test/dotnet-msbuild.Tests/GivenDotnetMSBuildBuildsProjects.cs
2 changes: 1 addition & 1 deletion src/core-setup
Submodule core-setup updated 4 files
+1 −1 BranchInfo.props
+4 −4 dependencies.props
+1 −1 dir.props
+1 −1 src/pkg/packaging/windows/package.props
2 changes: 1 addition & 1 deletion src/coreclr
Submodule coreclr updated 5 files
+6 −6 buildpipeline/DotNet-CoreClr-Trusted-Windows-x86.json
+6 −6 buildpipeline/DotNet-CoreClr-Trusted-Windows.json
+1 −1 dependencies.props
+2 −2 src/NuGet.Config
+1 −1 tests/src/NuGet.Config
2 changes: 1 addition & 1 deletion src/corefx
Submodule corefx updated 17 files
+6 −6 buildpipeline/DotNet-CoreFx-Trusted-Windows-NoTest.json
+6 −6 buildpipeline/DotNet-CoreFx-Trusted-Windows.json
+8 −8 dependencies.props
+1 −1 pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.pkgproj
+180 −0 pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+50 −0 pkg/Microsoft.NETCore.Platforms/runtime.json
+2 −2 pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+2 −1 pkg/Microsoft.Private.PackageBaseline/packageIndex.json
+2 −1 src/System.Text.Encodings.Web/dir.props
+2 −1 src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj
+118 −0 src/System.Text.Encodings.Web/src/System/Text/Encodings/Web/PinnedCharBuffer.cs
+95 −202 src/System.Text.Encodings.Web/src/System/Text/Encodings/Web/TextEncoder.cs
+88 −0 src/System.Text.Encodings.Web/tests/ConfigurableScalarTextEncoder.cs
+2 −0 src/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.csproj
+251 −0 src/System.Text.Encodings.Web/tests/TextEncoderBatteryTests.cs
+4 −1 src/packages.builds
+1 −1 tools-local/ILAsmVersion.txt
10 changes: 5 additions & 5 deletions tools-local/prebuilt-baseline-offline.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,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.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.DotNetAppHost" Version="2.1.25" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.25" 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.24" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.25" 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.24" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.25" 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 @@ -501,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>
27 changes: 14 additions & 13 deletions tools-local/prebuilt-baseline-online.xml
View file
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.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.DotNet.Web.ItemTemplates" Version="2.1.26" />
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="2.1.26" />
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1" Version="2.1.26" />
<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.24" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.App" Version="2.1.25" 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.24" />
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.25" />
<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.24" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.DotNetHost" Version="2.1.25" 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.24" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.25" 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.24" />
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.25" />
<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 All @@ -154,6 +154,7 @@
<Usage Id="Microsoft.NETCore.Platforms" Version="2.0.0" />
<Usage Id="Microsoft.NETCore.Platforms" Version="2.1.0-preview1-26116-01" />
<Usage Id="Microsoft.NETCore.Platforms" Version="2.1.0" />
<Usage Id="Microsoft.NETCore.Platforms" Version="2.1.12" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.Runtime.CoreCLR" Version="1.0.5" />
<Usage Id="Microsoft.NETCore.Runtime.CoreCLR" Version="1.0.7" />
<Usage Id="Microsoft.NETCore.Runtime.CoreCLR" Version="1.1.1" />
Expand Down Expand Up @@ -260,14 +261,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.24" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.1.25" 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.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.DotNetAppHost" Version="2.1.25" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.25" 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.24" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.25" 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.24" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.25" 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

0 comments on commit 2a5ddf7

Please sign in to comment.