Skip to content

Commit

Permalink
Merge pull request #2164 from MichaelSimons/2.1.524-may2021
Browse files Browse the repository at this point in the history 
Update to the 2.1.28 / 2.1.524 release
  • Loading branch information
@MichaelSimons
MichaelSimons committed May 12, 2021
2 parents 3b15a88 + 9e9261c commit 524592e
Show file tree
Hide file tree
Showing 12 changed files with 31 additions and 31 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.522
2.1.523
2 changes: 1 addition & 1 deletion ProdConFeed.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20210316-03/final/index.json
https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20210415-01/final/index.json
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.27</MicrosoftAspNetCoreAllPackageVersion>
<MicrosoftAspNetCoreAppPackageVersion>2.1.27</MicrosoftAspNetCoreAppPackageVersion>
<MicrosoftAspNetCoreAllPackageVersion>2.1.28</MicrosoftAspNetCoreAllPackageVersion>
<MicrosoftAspNetCoreAppPackageVersion>2.1.28</MicrosoftAspNetCoreAppPackageVersion>
<MicrosoftNETSdkRazorPackageVersion>2.2.0</MicrosoftNETSdkRazorPackageVersion>
</PropertyGroup>

Expand Down
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>20210316-01</OfficialBuildId>
<OfficialBuildId>20210415-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>20210316-01</OfficialBuildId>
<OfficialBuildId>20210415-01</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>20210316-03</OfficialBuildId>
<OfficialBuildId>20210415-01</OfficialBuildId>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/cli
Submodule cli updated 177 files
2 changes: 1 addition & 1 deletion src/core-setup
Submodule core-setup updated 7 files
+1 −1 BranchInfo.props
+5 −5 dependencies.props
+45 −0 src/pkg/packaging/snap/snapcraft.yaml
+0 −41 src/pkg/packaging/snaps/dotnet-hosting-20/snap/snapcraft.yaml
+0 −45 src/pkg/packaging/snaps/dotnet-runtime-11/snap/snapcraft.yaml
+0 −45 src/pkg/packaging/snaps/dotnet-runtime-20/snap/snapcraft.yaml
+0 −48 src/pkg/packaging/snaps/dotnet-sdk/snap/snapcraft.yaml
2 changes: 1 addition & 1 deletion src/coreclr
Submodule coreclr updated 1 files
+1 −1 dependencies.props
2 changes: 1 addition & 1 deletion src/corefx
Submodule corefx updated 47 files
+19 −0 .config/CredScanSuppressions.json
+9 −9 dependencies.props
+1 −1 external/test-runtime/XUnit.Runtime.depproj
+1 −1 pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.pkgproj
+54 −0 pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+25 −0 pkg/Microsoft.NETCore.Platforms/runtime.json
+1 −1 pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+4 −2 pkg/Microsoft.Private.PackageBaseline/packageIndex.json
+2 −0 src/Common/src/Interop/Windows/winhttp/Interop.winhttp_types.cs
+2 −2 src/Common/tests/System/Net/Configuration.Certificates.cs
+0 −129 src/Common/tests/System/Net/Prerequisites/Deployment/setup_certificates.ps1
+31 −31 src/System.Data.Common/tests/System/Data/Common/DbConnectionStringBuilderTest.cs
+1 −0 src/System.Data.SqlClient/src/System/Data/SqlClient/TdsEnums.cs
+2 −2 src/System.Data.SqlClient/tests/FunctionalTests/DiagnosticTest.cs
+1 −1 src/System.Data.SqlClient/tests/FunctionalTests/ExceptionTest.cs
+2 −2 src/System.Data.SqlClient/tests/FunctionalTests/SqlConnectionBasicTests.cs
+1 −1 src/System.Data.SqlClient/tests/Tools/TDS/TDS.Servers/TDSServerArguments.cs
+ − src/System.Data.SqlClient/tests/Tools/TDS/TDS.Servers/TdsServerCertificate.pfx
+12 −1 src/System.Diagnostics.Process/tests/ProcessStartInfoTests.cs
+1 −0 src/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/constants.cs
+2 −1 src/System.DirectoryServices.AccountManagement/tests/PrincipalTest.cs
+0 −28 src/System.DirectoryServices.AccountManagement/tests/UserPrincipalTest.cs
+2 −0 src/System.IO.Pipelines/tests/PipeWriterTests.cs
+4 −1 src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.cs
+1 −1 src/System.Net.Http/tests/FunctionalTests/PostScenarioTest.cs
+1 −1 src/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj
+2 −2 src/System.Net.Http/tests/Performance/System.Net.Http.Performance.Tests.csproj
+1 −1 src/System.Net.Http/tests/UnitTests/DigestAuthenticationTests.cs
+9 −9 src/System.Net.Http/tests/UnitTests/Headers/CacheControlHeaderValueTest.cs
+3 −3 src/System.Net.Http/tests/UnitTests/HttpEnvironmentProxyTest.cs
+1 −0 src/System.Net.Requests/src/System/Net/FtpControlStream.cs
+1 −0 src/System.Net.Requests/src/System/Net/FtpWebRequest.cs
+1 −1 src/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj
+1 −1 src/System.Net.WebSockets.Client/tests/ConnectTest.cs
+2 −2 src/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj
+8 −8 src/System.Private.Uri/tests/ExtendedFunctionalTests/UriRelativeResolutionTest.cs
+1 −1 src/System.Private.Uri/tests/FunctionalTests/UriBuilderRefreshTest.cs
+1 −1 src/System.Private.Uri/tests/FunctionalTests/UriBuilderTests.cs
+11 −11 src/System.Private.Uri/tests/FunctionalTests/UriRelativeResolutionTest.cs
+1 −1 src/System.Runtime/tests/System/Uri.CreateStringTests.cs
+11 −11 src/System.Security.Cryptography.Algorithms/tests/Rfc2898Tests.cs
+3 −3 src/System.Security.Cryptography.X509Certificates/tests/ExportTests.cs
+2 −0 src/System.Security.Cryptography.Xml/tests/EncryptedXmlTest.cs
+7 −1 src/System.Security.Cryptography.Xml/tests/SignedXmlTest.cs
+1 −0 src/System.Security.Cryptography.Xml/tests/TestHelpers.cs
+0 −3 src/packages.builds
+1 −1 tools-local/ILAsmVersion.txt
12 changes: 6 additions & 6 deletions tools-local/prebuilt-baseline-offline.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<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.App" Version="2.1.27" />
<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" />
Expand Down 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.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.DotNetAppHost" Version="2.1.27" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.27" 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.25" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.27" 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.25" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.27" 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>
28 changes: 14 additions & 14 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.27" />
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="2.1.27" />
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1" Version="2.1.27" />
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.1.28" />
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="2.1.28" />
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1" Version="2.1.28" />
<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.26" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.App" Version="2.1.27" 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.25" />
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.27" />
<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.25" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.DotNetHost" Version="2.1.27" 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.25" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.27" 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.25" />
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.27" />
<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,7 +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.Platforms" Version="2.1.13" 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 @@ -261,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.26" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.1.27" 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.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.DotNetAppHost" Version="2.1.27" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.27" 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.25" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.27" 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.25" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.27" 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 524592e

Please sign in to comment.