Skip to content

Conversation

dotnet-maestro-bot
Copy link
Contributor

I detected changes in the release/6.0-rc2 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-rc2 by the following committers:

  • lewing
  • github-actions[bot]

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.

merge button instructions

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.

git fetch
git checkout release/6.0-rc2
git pull --ff-only
git checkout release/6.0
git pull --ff-only
git merge --no-ff release/6.0-rc2

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet-maestro-bot/runtime HEAD:merge/release/6.0-rc2-to-release/6.0
or if you are using SSH
git push git@github.com:dotnet-maestro-bot/runtime HEAD:merge/release/6.0-rc2-to-release/6.0

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

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-rc2-to-release/6.0'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/6.0-rc2-to-release/6.0 release/6.0
git pull https://github.com/dotnet-maestro-bot/runtime merge/release/6.0-rc2-to-release/6.0
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/runtime HEAD:merge/release/6.0-rc2-to-release/6.0
or if you are using SSH
git checkout -b merge/release/6.0-rc2-to-release/6.0 release/6.0
git pull git@github.com:dotnet-maestro-bot/runtime merge/release/6.0-rc2-to-release/6.0
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/runtime HEAD:merge/release/6.0-rc2-to-release/6.0

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.

github-actions bot and others added 2 commits September 20, 2021 18:40
… parsing double and float (dotnet#59366)

* User correct NumberStyle when parsing double and float

IParseable<float> and IParseable<double> would fail when parsing
a decimal point number due to incorrect NumberStyles parameter.

E.g. IParseable<double>.TryParse would fail as opposed to
IParseable<double>.Parse because the former explicitly states to use
NumberStyles.Integer

* Adding tests covering parse for float/double/half

* Delete MSBuild_pid-37116_6904092b1c9a481da960c9e28eba2a27.failure.txt

Co-authored-by: Richard Sefr <richard.sefr@solarwinds.com>
Co-authored-by: Tanner Gooding <tagoo@outlook.com>
@ghost
Copy link

ghost commented Sep 21, 2021

Tagging subscribers to this area: @Anipik, @safern, @ViktorHofer
See info in area-owners.md if you want to be subscribed.

Issue Details

I detected changes in the release/6.0-rc2 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-rc2 by the following committers:

  • lewing
  • github-actions[bot]

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.

merge button instructions

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.

git fetch
git checkout release/6.0-rc2
git pull --ff-only
git checkout release/6.0
git pull --ff-only
git merge --no-ff release/6.0-rc2

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet-maestro-bot/runtime HEAD:merge/release/6.0-rc2-to-release/6.0
or if you are using SSH
git push git@github.com:dotnet-maestro-bot/runtime HEAD:merge/release/6.0-rc2-to-release/6.0

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

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-rc2-to-release/6.0'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/6.0-rc2-to-release/6.0 release/6.0
git pull https://github.com/dotnet-maestro-bot/runtime merge/release/6.0-rc2-to-release/6.0
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/runtime HEAD:merge/release/6.0-rc2-to-release/6.0
or if you are using SSH
git checkout -b merge/release/6.0-rc2-to-release/6.0 release/6.0
git pull git@github.com:dotnet-maestro-bot/runtime merge/release/6.0-rc2-to-release/6.0
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/runtime HEAD:merge/release/6.0-rc2-to-release/6.0

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.

Author: dotnet-maestro-bot
Assignees: -
Labels:

area-Infrastructure-libraries

Milestone: -

…e id numeration (dotnet#59372)

* Keeping the old behavior of scope id what we have before start using debugger-agent.

* Fix compilation.

* Fix compilation.

Co-authored-by: Thays <thaystg@gmail.com>
directhex and others added 5 commits September 21, 2021 10:58
…#59263) (dotnet#59281)

Android apk names must be valid Java class names, and It is forbidden in Java for a class name component to have a leading numeric digit. So whilst "net.dot.foo3_1" is legal, "net.dot.foo3.1" is illegal. Use a Regex to detect and rewrite all cases of this in AndroidAppBuilder
…face.GetIsNetworkAvailable methods return the correct info (dotnet#59258)

Backport of dotnet#57096

This change makes sure some of the IPGlobalProperties stop throwing exceptions and return the correct values.

GetIPv4GlobalStatistics, GetIcmpV4Statistics, GetTcpIPv4Statistics, GetUdpIPv4Statistics no longer throw NetworkInformationException.

GetActiveTcpConnections no longer returns TcpConnectionInformation instances only with the State of Unknown.

GetActiveTcpListeners return the correct IPEndPoint details for the IPV6 loopback.

NetworkInterface.GetIsNetworkAvailable no longer returns false for every call.

The reason these methods were behaving incorrectly on iOS is due to Apple not including the public headers for icmp_var.h, ip_var.h, tcp_fsm.h, if_media.h, and udp_var.h in the iOS SDK. This would lead to, for example, pal_tcpstate.c always returning TcpState_Unknown even if the underlying native value was TCPS_ESTABLISHED. This change includes the missing public headers in our build.

Fixes dotnet#36890
…elease builds (dotnet#59269)

Backport of dotnet#59029

Profiling shows that large part of the GC transition overhead (~30%) in dotnet#58939 is caused by assert-style checks. Disabling them seems to be the best bang-for-the-buck option for reducing the overhead without fundamental changes to the code.

Co-authored-by: Filip Navara <navara@emclient.com>
…tores (dotnet#59262)

Backport of dotnet#59220

Add ldsdfld.w and stsfld.w opcodes to the interpreter. These are needed for some machine-generated methods in Android projects that use AndroidX, MAUI, SkiaSharp or other toolkits. The app's Resource::UpdateIdValues can grow to exceed 64k interpreter data items, which means that 16-bit data item indices will roll over.

Resolves https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1398069
github-actions bot and others added 14 commits September 21, 2021 16:53
…properly computed (dotnet#59377)

* Fix issues where the module index GUID table isn't properly computed - Since there are two possible places where the module indices must be up to date, ensure that they are finalized before either Node writes its data - Ensure that module indices are precomputed when needed from inlinee data

* Apparently the InstanceEntryPointTableNode also needs to materialize its signatures when an input bubble is present as well

Co-authored-by: David Wrighton <davidwr@microsoft.com>
Co-authored-by: Thays <thaystg@gmail.com>
…INT16 (dotnet#59261)

We store the var index in the guint16 slots of the instruction

Co-authored-by: Brezae Vlad <brezaevlad@gmail.com>
…otnet#59423)

* Fix concurrent access to cache.

* Fixing test case.

* Changing what was suggested by @radical.

Co-authored-by: Thays <thaystg@gmail.com>
… a GT_ALLOCOBJ node (dotnet#59438)

* Fix gtCloneExpr when cloning during R2R compilation a GT_ALLOCOBJ node - Without this fix cloned expressions with allocations will fail - This is most common in profile guided code around devirtualization, but I believe it can occur in other where gtCloneExpr is used - Symptom of the failure is a compilation failure during crossgen2

* Jit formatting

* 6.0 branch uses FEATURE_READYTORUN_COMPILER instead of FEATURE_READYTORUN

Co-authored-by: David Wrighton <davidwr@microsoft.com>
On non-Windows we used install_location file with multiple lines which contained locations per-architecture (and the default).

This changes the host to use separate file for each architecture:
* `install_location_<arch>` for the architecture specific
* `install_location` for the "legacy" file

This is a much easier format for installers to handle (and it also simplifies the apphost code a little bit).

Adapted tests to the new behavior. Removed some tests which don't make sense anymore. Some small test cleanup to deduplicate code.

Changed the test-only env. variable to point to the directory with configuration files instead of to the configuration file itself.
Also don't write to paths when running translated (rosetta)
)

* add uploading of intermediate package assets

* dont push or sign sourcebuild packages in normal leg to avoid duplication

* add comments
[release/6.0-rc2] Split install_location to file-per-architecture
Three bugs being fixed here:
1. The SlideCursorToStartOfBuffer method is incorrectly assuming that the buffer is filled to its end (that m_Buffer.Length = m_CharsRead).  As a result, two things happen.  First, we copy more data than is needed to the temporary buffer; that's just unnecessary but not harmful.  But second, when it issues a read to fill the remainder of the buffer, it does so at the wrong position, both leaving zeros in the buffer that end up getting parsed as real data and losing real data from the end.
2. IncreaseBufferSize assumes m_CharsRead = m_Buffer.Length, which may not be the case.  As with (1), this can result in it reading into the wrong part of the array and leaving garbage that gets processed.
3. IncreaseBufferSize is always increasing the buffer size, even if only a small portion of the buffer is used.  This can then result in the whole operation failing when it repeatedly increases the buffer size and ends up failing due to ticking over the max buffer threshold.

(1) doesn't exist in .NET Framework 4.8 but (2) and (3) do.  (1) is easily triggered by a stream that sporadically doesn't produce all the data requested; (2) and (3) end up needing a stream that frequently produces much less than requested.  This PR fixes all three.
* Fix byte order of debug directory fields

* Fix byte order of PDB stream data (PdbHeap::SetData)

Co-authored-by: Ulrich Weigand <ulrich.weigand@de.ibm.com>
…ase/6.0-rc2

[release/6.0-rc2] Fix buffering bugs in TextFieldParser
Co-authored-by: Larry Ewing <lewing@microsoft.com>
ericstj and others added 12 commits September 23, 2021 19:36
…ase/6.0-rc2

[release/6.0-rc2] Add execute bit to postinstall script
…ter a possible GC (dotnet#59436)

* Check if External Object Context is still active after a possible GC

* Update interoplibinterface_comwrappers.cpp

Check if `IsActive()` during consideration too.

* Issues can occur during the multiple managed allocations.

* Add validation of non-null elements in ReleaseObjects() API call. Use detach state instead of IsActive state for EOC.

* Apply suggestions from code review

Co-authored-by: Elinor Fung <elfung@microsoft.com>

* Apply suggestions from code review

Co-authored-by: Elinor Fung <elfung@microsoft.com>

* Review feedback

Co-authored-by: Aaron Robinson <arobins@microsoft.com>
Co-authored-by: Elinor Fung <elfung@microsoft.com>
…nd skip any precompiling (dotnet#58979)

* Refactor to allow fast-path

* implement fast-path for MonoAOTCompiler when nothing has changed

* re-enable some tests that got disabled by mistake
…923.5 (dotnet#59575)

Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , 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.21467.3 -> To Version 6.0.0-beta.21473.5

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Update dependencies from https://github.com/dotnet/emsdk build 20210923.1

Microsoft.NET.Workload.Emscripten.Manifest-6.0.100
 From Version 6.0.0-rc.2.21464.1 -> To Version 6.0.0-rc.2.21473.1

* Update dependencies from https://github.com/dotnet/emsdk build 20210924.1

Microsoft.NET.Workload.Emscripten.Manifest-6.0.100
 From Version 6.0.0-rc.2.21464.1 -> To Version 6.0.0-rc.2.21474.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…vior. (dotnet#59532)

* Align preallocationSize behavior (dotnet#58726)

Co-authored-by: Stephen Toub <stoub@microsoft.com>

* File preallocationSize: align Windows and Unix behavior. (dotnet#59338)

* File preallocationSize: align Windows and Unix behavior.

This aligns Windows and Unix behavior of preallocationSize for the
intended use-case of specifing the size of a file that will be written.

For this use-case, the expected FileAccess is Write, and the file should be
a new one (FileMode.Create*) or a truncated file (FileMode.Truncate).
Specifing a preallocationSize for other modes, or non-writable files throws ArgumentException.

The opened file will have a length of zero, and is ready to be written to by the user.

If the requested size cannot be allocated, an IOException is thrown.

When the OS/filesystem does not support pre-allocating, preallocationSize is ignored.

* fix pal_io preprocessor checks

* pal_io more fixes

* ctor_options_as.Windows.cs: fix compilation

* Update tests

* tests: use preallocationSize from all public APIs

* pal_io: add back FreeBSD, fix OSX

* tests: check allocated is zero when preallocation is not supported.

* Only throw for not enough space errors

* Fix compilation

* Add some more tests

* Fix ExtendedPathsAreSupported test

* Apply suggestions from code review

Co-authored-by: David Cantú <dacantu@microsoft.com>

* Update System.Private.CoreLib Strings.resx

* PR feedback

* Remove GetPathToNonExistingFile

* Fix compilation

* Skip checking allocated size on mobile platforms.

Co-authored-by: David Cantú <dacantu@microsoft.com>

* Fix unused fileDescriptor

* void fd when unused

* Address feedback

Co-authored-by: Adam Sitnik <adam.sitnik@gmail.com>
Co-authored-by: Stephen Toub <stoub@microsoft.com>
Co-authored-by: Tom Deseyn <tom.deseyn@gmail.com>
…lse (dotnet#59507)

* XmlSerializer support for IsDynamicCodeSupported=false

Add more checks to XmlSerializer to check the SerializationMode. Don't try to use Reflection.Emit if the SerializationMode is ReflectionOnly.

These changes were ported from
* dotnet/runtimelab#593
* dotnet/runtimelab#600

Fix dotnet#59167

* Fix a bug in XmlSerializer.CanDeserialize when in ReflectionOnly mode.

* Port UAP code for CanDeserialize

* PR feedback

* Add a linker test to ensure linker option '--enable-opt sealer' works when IsDynamicCodeSupported==false.

Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com>
The library name used in the shim is a name of the build time library which
is usually installed only for development purposes. We should use
libgssapi_krb5.so.2 which is the underlying runtime library.

Co-authored-by: Jan Vorlicek <janvorli@microsoft.com>
…very debugger message (dotnet#59523)

* Reusing buffer to avoid allocate every debugger message.

* Fixing what was suggested by @radical.

* cleaning code.

* Changing what was suggested by @radical

Co-authored-by: Thays <thaystg@gmail.com>
…ins (dotnet#59557)

* Fix behavior ObjectCollection for single item contains

* Address PR feedback

Co-authored-by: Juan Sebastian Hoyos Ayala <juhoyosa@microsoft.com>
[release/6.0-rc2] Fix ArrayPool leak with JsonDocument
Copy link
Member

@ViktorHofer ViktorHofer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@danmoseley with should try to get this in, for the sake of codeflow

@lewing
Copy link
Member

lewing commented Sep 28, 2021

@Anipik the outerloop failures don't look related and these changes are already in rc2 can you merge this?

@radical
Copy link
Member

radical commented Sep 28, 2021

Tests are failing to run with:

+ ./RunTests.sh --runtime-path /root/helix/work/correlation
----- start Tue Sep 28 00:18:10 UTC 2021 =============== To repro directly: =====================================================
pushd .
/root/helix/work/correlation/dotnet exec --runtimeconfig Common.Tests.runtimeconfig.json --depsfile Common.Tests.deps.json xunit.console.dll Common.Tests.dll -xml testResults.xml -nologo -nocolor -trait category=OuterLoop -notrait category=IgnoreForCI -notrait category=failing 
popd
===========================================================================================================
/root/helix/work/workitem/e /root/helix/work/workitem/e
./RunTests.sh: line 162: /root/helix/work/correlation/dotnet: No such file or directory
/root/helix/work/workitem/e

@marek-safar marek-safar merged commit b2b0619 into dotnet:release/6.0 Sep 28, 2021
@ViktorHofer
Copy link
Member

@marek-safar did you squash? This should have been a merge commit to preserve the individual commits, according to the PR's description.

@Anipik
Copy link
Contributor

Anipik commented Sep 29, 2021

we can do a merge commit independently if we want to get the history.

@ghost ghost locked as resolved and limited conversation to collaborators Nov 3, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.