Updating inbox source generators to Roslyn 4.4 and removing polyfill approach #75717
Conversation
This file contains 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
…approach * Updating inbox source generators to Roslyn 4.4 and removing polyfill approach * Updating the sdk to match Arcade's version
|
I couldn't figure out the best area label to add to this PR. If you have write-permissions please help me learn by adding exactly one area label. |
CyrusNajmabadi
approved these changes
Sep 15, 2022
jkoritzinsky
approved these changes
Sep 15, 2022
|
/azp run runtime |
|
Azure Pipelines successfully started running 1 pipeline(s). |
stephentoub
approved these changes
Sep 19, 2022
|
Failures are unrelated, so I'm merging now. |
|
/backport to release/7.0-rc2 |
|
Started backporting to release/7.0-rc2: https://github.com/dotnet/runtime/actions/runs/3087015104 |
|
@joperezr backporting to release/7.0-rc2 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Updating inbox source generators to Roslyn 4.4 and removing polyfill approach
.git/rebase-apply/patch:126: trailing whitespace.
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M eng/Versions.props
M global.json
M src/libraries/Microsoft.Internal.Runtime.AspNetCore.Transport/src/Microsoft.Internal.Runtime.AspNetCore.Transport.proj
M src/libraries/NetCoreAppLibrary.props
M src/libraries/System.Private.CoreLib/gen/EventSourceGenerator.Parser.cs
M src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/LibraryImportGenerator.cs
M src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/LibraryImportGenerator.csproj
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/LibraryImportGenerator.csproj
CONFLICT (content): Merge conflict in src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/LibraryImportGenerator.csproj
Auto-merging src/libraries/System.Runtime.InteropServices/gen/LibraryImportGenerator/LibraryImportGenerator.cs
Auto-merging src/libraries/System.Private.CoreLib/gen/EventSourceGenerator.Parser.cs
CONFLICT (content): Merge conflict in src/libraries/System.Private.CoreLib/gen/EventSourceGenerator.Parser.cs
Auto-merging src/libraries/NetCoreAppLibrary.props
CONFLICT (content): Merge conflict in src/libraries/NetCoreAppLibrary.props
Auto-merging src/libraries/Microsoft.Internal.Runtime.AspNetCore.Transport/src/Microsoft.Internal.Runtime.AspNetCore.Transport.proj
Auto-merging global.json
CONFLICT (content): Merge conflict in global.json
Auto-merging eng/Versions.props
CONFLICT (content): Merge conflict in eng/Versions.props
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Updating inbox source generators to Roslyn 4.4 and removing polyfill approach
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
joperezr
added a commit
to joperezr/runtime
that referenced
this pull request
Sep 20, 2022
carlossanlop
pushed a commit
that referenced
this pull request
Sep 20, 2022
carlossanlop
added a commit
that referenced
this pull request
Sep 26, 2022
* Fix querying L3 cache size on osx-x64 (#75870) Co-authored-by: Filip Navara <navara@emclient.com> * KeyChar should be preserved for Ctrl+Letter (#75861) Co-authored-by: Adam Sitnik <adam.sitnik@gmail.com> * Try re-enabling System.Transactions.Local tests on Arm64 (#75703) Co-authored-by: Jan Kotas <jkotas@microsoft.com> * Updating inbox source generators to Roslyn 4.4 and removing polyfill approach (#75717) (#75875) * Removed internalProperties group from proxy and tests. (#75906) Co-authored-by: Ilona Tomkowicz <itomkowicz@microsoft.com> * [release/7.0-rc2] Fixing SpanHelpers.LastIndexOfAnyValueType to no longer create out of bounds GC refs (#75885) * Fixing SpanHelpers.LastIndexOfAnyValueType to no longer create out of bounds GC refs * Apply suggestions from code review Co-authored-by: Adam Sitnik <adam.sitnik@gmail.com> * Adjusting the comment as per PR review feedback Co-authored-by: Tanner Gooding <tagoo@outlook.com> Co-authored-by: Adam Sitnik <adam.sitnik@gmail.com> * Bump intellisense package for RC2 to include latest comments for Numerics (#75938) Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com> * [release/7.0-rc2] [Mono] Restore old code to solve the recent SpanHelpers regressions (#75996) * bring back the old code... * bring back more old code * Use an ifdef around clr code instead of a separate file * Delete SpanHelpers.Clr.cs * Remove a remaining INumber<T> helper from mono Co-authored-by: Adam Sitnik <adam.sitnik@gmail.com> Co-authored-by: Jeff Handley <jeffhandley@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Filip Navara <navara@emclient.com> Co-authored-by: Adam Sitnik <adam.sitnik@gmail.com> Co-authored-by: Jan Kotas <jkotas@microsoft.com> Co-authored-by: Jose Perez Rodriguez <joperezr@microsoft.com> Co-authored-by: Ilona Tomkowicz <itomkowicz@microsoft.com> Co-authored-by: Tanner Gooding <tagoo@outlook.com> Co-authored-by: Carlos Sanchez <1175054+carlossanlop@users.noreply.github.com> Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com> Co-authored-by: Jeff Handley <jeffhandley@users.noreply.github.com>
ghost
locked as resolved and limited conversation to collaborators
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.
This is replaying the changes that were made into #74822 but on runtime's main branch. The plan is to get this into main branch, and then backport to rc2 branch since the change on release/7.0 branch had to be rolled back due to depending on RC1 shipping first.