Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Merge 3.1.19 to crossdac branch #28204

Merged

Conversation

hoyosjs
Copy link
Member

@hoyosjs hoyosjs commented Sep 15, 2021

Jan Jahoda and others added 26 commits June 4, 2021 09:25
…8143)

* CoreCLR PR26323 Port: Fix PIE options

* Added missing PIE and RELRO compilation flags.
…e files (dotnet#28143)

Port from 5.0: Fix Position Independent Code in CMake files (dotnet#28143)

* CoreCLR PR26323 Port: Fix PIE options

* Added missing PIE and RELRO compilation flags.
* Fix System.Globalization.Native build on Big Sur

* Fix build

* Add flags for Linux
…0210609.1 (dotnet#28178)

Microsoft.NETCore.App
 From Version 3.1.9-servicing.20459.3 -> To Version 3.1.17-servicing.21309.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Avoid upgrading packages that are explicitly installed.
* Use a brewfile
* Change shebang to use bash and directly execute.
[release/3.1] Update dependencies from dotnet/corefx


 - Add 3.1 AzDO feeds to the test build to ensure that the test build can correctly restore the CoreFX build.

It seems that the new CoreFX build isn't on the old blob feeds, so without this fix, we end up restoring the first 5.0.0-alpha.1 build instead of the build we want.

 - Exclude tests that depend on OOB assemblies.

 - Turn off CoreFX test legs in CI.

Now that the branch is on servicing, and the churn is low, exclude these as they
break far more often than they detect issues. These already run in CoreFX CI on release bits.
In case we want to bring them back for checked testing, we need to fix CoreFX.depproj.
It has a package - Microsoft.Private.CoreFx.OOB - that's supposed to bring in all deps
that are out of box. These are currently not getting restored and this ends up causing
File not found issues in the binder when compiling tests, making test exclusions impossible.
Please enter the commit message for your changes. Lines starting
with '#' will be ignored, and an empty message aborts the commit.
* Update branding for 3.1.19

* Update dir.common.props

Co-authored-by: Jan Jahoda <aik.jahoda@post.cz>
* Update dependencies from https://github.com/dotnet/arcade build 20210428.7

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Helix.Sdk
 From Version 1.0.0-beta.21161.1 -> To Version 1.0.0-beta.21228.7

* Update dependencies from https://github.com/dotnet/arcade build 20210622.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Helix.Sdk
 From Version 1.0.0-beta.21161.1 -> To Version 1.0.0-beta.21322.2

* Update dependencies from https://github.com/dotnet/arcade build 20210709.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Helix.Sdk
 From Version 1.0.0-beta.21161.1 -> To Version 1.0.0-beta.21359.1

* Update dependencies from https://github.com/dotnet/arcade build 20210726.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Helix.Sdk
 From Version 1.0.0-beta.21161.1 -> To Version 1.0.0-beta.21376.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
….1-2021-08-10-1317

Merging internal commits for release/3.1
@hoyosjs hoyosjs merged commit a982d0a into dotnet:release/3.1-crossdac Sep 15, 2021
@hoyosjs hoyosjs deleted the release/3.1-crossdac-v3.1.19 branch September 15, 2021 00:40
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants