-
Notifications
You must be signed in to change notification settings - Fork 5.2k
[automated] Merge branch 'release/6.0-rc1' => 'release/6.0' #58280
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
Merged
ViktorHofer
merged 14 commits into
dotnet:release/6.0
from
dotnet-maestro-bot:merge/release/6.0-rc1-to-release/6.0
Aug 30, 2021
Merged
[automated] Merge branch 'release/6.0-rc1' => 'release/6.0' #58280
ViktorHofer
merged 14 commits into
dotnet:release/6.0
from
dotnet-maestro-bot:merge/release/6.0-rc1-to-release/6.0
Aug 30, 2021
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Add Crossgen2 symbol files to package * Slight improvement Co-authored-by: Anton Lapounov <[email protected]>
Workaround for dotnet#57560. Co-authored-by: Zoltan Varga <[email protected]>
…ipherSuites check for 32 bit & 16 bit SSLCipherSuite (dotnet#58182) * [MacCatalyst] Make AppleCryptoNative_SslSetEnabledCipherSuites check for 32 bit & 16 bit SSLCipherSuite According to CipherSuites.h, SSLCipherSuite is a 16 bit value on iOS/tvOS x64 & arm64, but on MacCatalyst that is only true on arm64. x64 is defined as 32 bit. ``` /* 16-bit value on iOS */ typedef uint16_t SSLCipherSuite; /* 32-bit value elsewhere */ typedef uint32_t SSLCipherSuite; ``` Fixes dotnet#53120 * Feedback Co-authored-by: Steve Pfister <[email protected]>
`-disable-fp-elim` was removed in LLVM 8 in commit b7cef81fd36c85e52b115b9ed6d1fb92d63781d6. Also see https://reviews.llvm.org/D56351. The replacement option, `-frame-pointer`, is still present in LLVM 11. Fixes dotnet#58112. Co-authored-by: Imran Hameed <[email protected]>
…#58278) * Make JsonGenerator be an incremental generator * Improve incrementalism by doing less work when not applicable * Change SourceGeneration.UnitTests to SourceGeneration.Unit.Tests so it is built and executed in CI * Get unit tests running after IIncrementalGenerator migration * Fix duplicate file name tests by working around dotnet/roslyn#54185. * Fix unit tests now that they are running in CI against non-English languages. * Fix System.Text.Json.SourceGeneration.Unit.Tests on WASM * Disable STJ.SourceGeneration.Unit.Tests on Browser Co-authored-by: Eric Erhardt <[email protected]> Co-authored-by: Chris Sienkiewicz <[email protected]>
…ator (dotnet#58271) * Migrate LoggerMessageGenerator to IIncrementalGenerator This reduces the time spent in the background in VS running the source generator, since we only need to respond to methods that have the LoggerMessageAttribute on them. Contributes to dotnet#56702 * PR feedback * PR feedback Co-authored-by: Eric Erhardt <[email protected]>
…58285) * Add mount point support to link APIs. * Add junction and virtual drive tests. * Move PrintName comment outside of if else of reparseTag check. * Add Windows platform specific attribute to junction and virtual drive test classes. * Revert FILE_NAME_OPENED to FILE_NAME_NORMALIZED * Revert addition of FILE_NAME_OPENED const. * Remove unnecessary enumeration junction test. * Rename GetNewCwdPath to ChangeCurrentDirectory * Make Junction_ResolveLinkTarget a theory and test both resolveFinalTarget * Shorter name for targetPath string. Typo in comment. Fix Debug.Assert. * Clarify test comment. Change PlatformDetection for OperatingSystem check. * Cleaner unit tests for virtual drive, add indirection test * Skip virtual drive tests in Windows Nano (subst not available). Small test rename. * Simplify Junctions tests, add indirection test * Address test suggestions. * Revert MountHelper.CreateSymbolicLink changes. Unrelated, and will be refactored/removed in the future. Detect if SUBST is available in Windows machine, to bring back Nano. * Add dwReserved0 check for mount points in GetFinalLinkTarget. * Use Yoda we don't. * Fix CI issues Co-authored-by: carlossanlop <[email protected]> Co-authored-by: David Cantu <[email protected]>
danmoseley
reviewed
Aug 28, 2021
| { | ||
| if (IsWindows) | ||
| { | ||
| string systemRoot = Environment.GetEnvironmentVariable("SystemRoot"); |
Member
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@carlossanlop I think Environment.GetFolderPath(Environment.SpecialFolder.System) would have worked here?
* Update dependencies from https://github.com/dotnet/emsdk build 20210828.2 Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.0-rc.1.21419.1 -> To Version 6.0.0-rc.1.21428.2 * Update dependencies from https://github.com/dotnet/emsdk build 20210829.1 Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.0-rc.1.21419.1 -> To Version 6.0.0-rc.1.21429.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Update dependencies from https://github.com/dotnet/arcade build 20210827.6 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 6.0.0-beta.21418.12 -> To Version 6.0.0-beta.21427.6 * Fix IDE0062 warning in NumberFormatInfo.cs Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Stephen Toub <[email protected]>
ViktorHofer
approved these changes
Aug 30, 2021
Member
|
Failures:
|
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I detected changes in the release/6.0-rc1 branch which have not been merged yet to release/6.0. I'm a robot and am configured to help you automatically keep release/6.0 up to date, so I've opened this PR.
This PR merges commits made on release/6.0-rc1 by the following committers:
Instructions for merging from UI
This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.
If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.
Instructions for merging via command line
Run these commands to merge this pull request from the command line.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
Instructions for updating this pull request
Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/6.0-rc1-to-release/6.0'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
or if you are using SSH
Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.