Skip to content

[release/2.1] Update to 2.1.519 (2.1.23) #1801

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.

Sign up for GitHub

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

Merged
dagood merged 5 commits into from
Oct 13, 2020
Merged

[release/2.1] Update to 2.1.519 (2.1.23) #1801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0addbc0
Update to ProdCon 20200921-03
dotnet-bot Sep 24, 2020
0cb3565
Update to N-1 SDK version
dagood Sep 24, 2020
7b03033
Update Tools/crossgen.sh feed
dagood Sep 24, 2020
61894e8
Update prebuilt baselines
dagood Sep 25, 2020
2ff5851
Merge 'release/2.1' into 2.1.519
dagood Oct 13, 2020
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.504
2.1.518
2 changes: 1 addition & 1 deletion ProdConFeed.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20200820-03/final/index.json
https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20200921-03/final/index.json
4 changes: 2 additions & 2 deletions dependencies.props
View file
Open in desktop
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.22</MicrosoftAspNetCoreAllPackageVersion>
<MicrosoftAspNetCoreAppPackageVersion>2.1.22</MicrosoftAspNetCoreAppPackageVersion>
<MicrosoftAspNetCoreAllPackageVersion>2.1.23</MicrosoftAspNetCoreAllPackageVersion>
<MicrosoftAspNetCoreAppPackageVersion>2.1.23</MicrosoftAspNetCoreAppPackageVersion>
<MicrosoftNETSdkRazorPackageVersion>2.2.0</MicrosoftNETSdkRazorPackageVersion>
</PropertyGroup>

Expand Down
3 changes: 3 additions & 0 deletions init-tools.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,9 @@ echo "Making all .sh files executable under Tools."
ls "$__scriptpath/Tools/"*.sh | xargs chmod +x
ls "$__scriptpath/Tools/scripts/docker/"*.sh | xargs chmod +x

# Get BuildTools crossgen dependencies from a better place. The script that's
# automatically downloaded points at MyGet, which doesn't have recent packages.
export BUILDTOOLS_CROSSGEN_FEED=https://api.nuget.org/v3/index.json
"$__scriptpath/Tools/crossgen.sh" "$__scriptpath/Tools"


Expand Down
2 changes: 1 addition & 1 deletion repos/core-setup.proj
View file
Open in desktop
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>20200821-01</OfficialBuildId>
<OfficialBuildId>20200922-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
Open in desktop
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>20200820-03</OfficialBuildId>
<OfficialBuildId>20200921-03</OfficialBuildId>
</PropertyGroup>

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

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/cli
Open in desktop
Submodule cli updated 3 files
+2 −2 build/DependencyVersions.props
+1 −1 build/Signing.proj
+1 −1 build/Version.props
2 changes: 1 addition & 1 deletion src/core-setup
Open in desktop
Submodule core-setup updated 8 files
+1 −1 BranchInfo.props
+1 −1 BuildToolsVersion.txt
+1 −1 buildpipeline/Core-Setup-Windows-Arm-BT.json
+1 −1 buildpipeline/Core-Setup-Windows-BT.json
+7 −7 dependencies.props
+4 −3 init-tools.cmd
+4 −3 init-tools.sh
+2 −0 src/pkg/packaging/windows/GetWix.ps1
2 changes: 1 addition & 1 deletion src/coreclr
Open in desktop
Submodule coreclr updated 9 files
+1 −1 BuildToolsVersion.txt
+1 −1 CMakeLists.txt
+1 −1 ILAsmVersion.txt
+5 −3 build.sh
+8 −8 dependencies.props
+4 −3 init-tools.cmd
+4 −3 init-tools.sh
+3 −2 src/mscorlib/System.Private.CoreLib.csproj
+19 −0 sync.sh
2 changes: 1 addition & 1 deletion src/corefx
Open in desktop
Submodule corefx updated 13 files
+1 −1 BuildToolsVersion.txt
+10 −10 dependencies.props
+4 −3 init-tools.cmd
+4 −3 init-tools.sh
+4 −2 pkg/Microsoft.Private.PackageBaseline/packageIndex.json
+2 −2 src/System.IO.Pipelines/dir.props
+6 −0 src/System.IO.Pipelines/src/System/IO/Pipelines/Pipe.cs
+76 −0 src/System.IO.Pipelines/tests/Infrastructure/DisposeTrackingBufferPool.cs
+0 −66 src/System.IO.Pipelines/tests/PipePoolTests.cs
+35 −0 src/System.IO.Pipelines/tests/PipeWriterTests.cs
+1 −0 src/System.IO.Pipelines/tests/System.IO.Pipelines.Tests.csproj
+3 −3 src/packages.builds
+1 −1 tools-local/ILAsmVersion.txt
10 changes: 5 additions & 5 deletions tools-local/prebuilt-baseline-offline.xml
View file
Open in desktop
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-03131-06" />
<PackageIdentity Id="RoslynTools.RepoToolset" Version="1.0.0-beta2-62805-03" />
<PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.1.8" />
<PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.1.22" />
<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 @@ -217,12 +217,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.21" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.21" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.22" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.22" 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.21" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.22" 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.21" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.22" 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
29 changes: 14 additions & 15 deletions tools-local/prebuilt-baseline-online.xml
View file
Open in desktop
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.22" />
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="2.1.22" />
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1" Version="2.1.22" />
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.1.23" />
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="2.1.23" />
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1" Version="2.1.23" />
<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.8" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.App" Version="2.1.22" 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.21" />
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.22" />
<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.21" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.DotNetHost" Version="2.1.22" 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.21" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.22" 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.21" />
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.22" />
<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,6 @@
<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.11" 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 @@ -271,14 +270,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.8" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.1.22" 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.21" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.21" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.22" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.22" 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.21" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.22" 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.21" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.22" 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 @@ -448,7 +447,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" IsDirectDependency="true" />
<Usage Id="System.IO.FileSystem" Version="4.3.0" />
<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