Fix cross-os symbol generation#20481
Merged
davidwrighton merged 4 commits intodotnet:mainfrom Sep 3, 2021
Merged
Conversation
Member
davidwrighton
commented
Sep 1, 2021
- Use the target os to determine the symbol type, not the sdk os
- Add tests for cross os/cross arch crossgen compilation
- Use the target os to determine the symbol type, not the sdk os - Add tests for cross os/cross arch crossgen compilation
24 tasks
…ternal, as the new test logic demands correctness
| [InlineData("net6.0", "win-x86", "windows", "X86,X64,Arm64,Arm", "nonComposite", "nonselfcontained")] | ||
| public void It_supports_crossos_arch_compilation(string targetFramework, string runtimeIdentifier, string sdkSupportedOs, string sdkSupportedArch, string composite, string selfcontained) | ||
| { | ||
| var projectName = $"FrameworkDependentUsingCrossArchTest";// {targetFramework}{runtimeIdentifier.Replace("-",".")}{composite}{selfcontained}"; |
Member
There was a problem hiding this comment.
Do we need to fix this line?
| [InlineData("net6.0", "linux-x64", "windows,linux,osx", "X64,Arm64", "composite", "selfcontained")] // Composite in .NET 6.0 is only supported for self-contained builds | ||
| [InlineData("net6.0", "win-x64", "windows", "X64,Arm64", "composite", "selfcontained")] // Composite in .NET 6.0 is only supported for self-contained builds | ||
| [InlineData("net6.0", "osx-arm64", "windows,linux,osx", "X64,Arm64", "nonComposite", "nonselfcontained")] | ||
| // In .NET 6.0 building targetting Windows doesn't support emitting native symbols. |
Member
There was a problem hiding this comment.
This comment should be applied to win-x64 as well, correct?
| [InlineData("net6.0", "osx-arm64", "windows,linux,osx", "X64,Arm64", "nonComposite", "nonselfcontained")] | ||
| // In .NET 6.0 building targetting Windows doesn't support emitting native symbols. | ||
| [InlineData("net6.0", "win-x86", "windows", "X86,X64,Arm64,Arm", "nonComposite", "nonselfcontained")] | ||
| public void It_supports_crossos_arch_compilation(string targetFramework, string runtimeIdentifier, string sdkSupportedOs, string sdkSupportedArch, string composite, string selfcontained) |
Member
There was a problem hiding this comment.
I would use either just It_supports_cross_compilation or It_supports_cross_os_and_arch_compilation.
|
|
||
| private static bool IsTargetOsOsX(string runtimeIdentifier) | ||
| { | ||
| if (runtimeIdentifier.Contains("osx") || runtimeIdentifier.Contains("macOs")) |
Member
There was a problem hiding this comment.
I think macOs cannot be a part of a valid runtime identifier.
| }); | ||
| if (composite) | ||
| { | ||
| pdbFiles = new[] { GetPDBFileName(Path.ChangeExtension(mainProjectDll, "r2r.dll"), framework, testProject.RuntimeIdentifier) }; |
Member
There was a problem hiding this comment.
How would the composite tests pass without this line?
Member
Author
There was a problem hiding this comment.
The tests which set composite used to not set selfcontained. This resulted in the compiler not actually producing a composite build, so the test continued to pass. The tests have been adjusted to explicitly pass composite false now.
AntonLapounov
approved these changes
Sep 2, 2021
Member
AntonLapounov
left a comment
There was a problem hiding this comment.
Looks good in general. Thank you!
Member
Author
|
/backport to release/6.0.1xx |
davidwrighton
added a commit
to davidwrighton/sdk
that referenced
this pull request
Sep 3, 2021
* Fix cross-os symbol generation - Use the target os to determine the symbol type, not the sdk os - Add tests for cross os/cross arch crossgen compilation * Fix tests to specify composite accurately to TestProjectPublishing_Internal, as the new test logic demands correctness
davidwrighton
added a commit
that referenced
this pull request
Sep 3, 2021
* Fix cross-os symbol generation - Use the target os to determine the symbol type, not the sdk os - Add tests for cross os/cross arch crossgen compilation * Fix tests to specify composite accurately to TestProjectPublishing_Internal, as the new test logic demands correctness
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.