-
Notifications
You must be signed in to change notification settings - Fork 4.1k
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
Merge release/dev17.10 to release/dev17.11 #73682
Merge release/dev17.10 to release/dev17.11 #73682
Conversation
…425.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.24204.3 -> To Version 8.0.0-beta.24225.1
…425.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.24204.3 -> To Version 8.0.0-beta.24225.1
…425.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.24204.3 -> To Version 8.0.0-beta.24225.1
…425.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.24204.3 -> To Version 8.0.0-beta.24225.1
…425.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.24204.3 -> To Version 8.0.0-beta.24225.1
…425.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.24204.3 -> To Version 8.0.0-beta.24225.1
…425.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.24204.3 -> To Version 8.0.0-beta.24225.1
…425.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.24204.3 -> To Version 8.0.0-beta.24225.1
…425.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.24204.3 -> To Version 8.0.0-beta.24225.1
…425.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.24204.3 -> To Version 8.0.0-beta.24225.1
…425.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.24204.3 -> To Version 8.0.0-beta.24225.1
…425.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.24204.3 -> To Version 8.0.0-beta.24225.1
…425.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.24204.3 -> To Version 8.0.0-beta.24225.1
…425.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.24204.3 -> To Version 8.0.0-beta.24225.1
…425.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.24204.3 -> To Version 8.0.0-beta.24225.1
…425.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.24204.3 -> To Version 8.0.0-beta.24225.1
…425.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.24204.3 -> To Version 8.0.0-beta.24225.1
…425.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.24204.3 -> To Version 8.0.0-beta.24225.1
…425.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.24204.3 -> To Version 8.0.0-beta.24225.1
* Update msbuild version to 17.3.4 * Update the source build version to 17.3.4 * Update to the source build build with the 17.3.4 msbuild version Remove the xliff-tasks coherency as that dependency doesn't exist in arcade * try updating externals to the 8.0 version as well to see if that fixes source build * Add allowed prebuilts for assemblies declared in Version.Details.xml as non-Source-build * Add System.Threading.Tasks.Dataflow product dependency --------- Co-authored-by: Michael Simons <[email protected]>
service instead of via Roslyn
…425.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.24204.3 -> To Version 8.0.0-beta.24225.1
Report external build errors using the platform's diagnostic brokered
…514.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.24204.3 -> To Version 8.0.0-beta.24264.1
…514.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.24225.1 -> To Version 8.0.0-beta.24264.1
…516.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.24204.3 -> To Version 8.0.0-beta.24266.3
…516.3 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.24225.1 -> To Version 8.0.0-beta.24266.3
* Add a pinned pkcs entry * Try 7.0.2 which is reportedly already in SBRP
…3ab-4482-b66a-02a8d55e5ffe [release/dev17.9] Update dependencies from dotnet/arcade
…se/dev17.10 Merge release/dev17.9 to release/dev17.10
* Update nuget versions to release where possible. * Mark APIs as shipped * Suppress new warnings * Update unit tests to set required VSTelemetry environment variable * Remove unneeded workaround --------- Co-authored-by: David Barbet <[email protected]>
⚠ This PR has merge conflicts. @Cosifne |
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.
Auto-approval
* Restore RazorCompiler EA layer for desktop * Fix nuget * Tests * Apply suggestions from code review Co-authored-by: Jan Jones <[email protected]> * Apply suggestions from code review Co-authored-by: Jan Jones <[email protected]> --------- Co-authored-by: Jan Jones <[email protected]>
@dibarbet can you resolve the conflicts in IDE files here? Thanks. |
@jjonescz addressed. there were a ton of conflicts in the |
…release/dev17.10-to-release/dev17.11
d745af1
to
1ef637e
Compare
Source build is complaining about new prebuilts
which were added in #73283 . However source build passed there. @marcpopMSFT any ideas on why source build is broken here? |
@dibarbet - The source-build-reference-packages dependency needs to be updated to the latest version which contains this version. |
This is an automatically generated pull request from release/dev17.10 into release/dev17.11.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
Troubleshooting conflicts
Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file containing conflicts copy its path into the following searches:
Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts.
Resolve merge conflicts using your local repo
Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub.
git fetch --all git checkout -t upstream/merges/release/dev17.10-to-release/dev17.11 git reset --hard upstream/release/dev17.11 git merge upstream/release/dev17.10 # Fix merge conflicts git commit git push upstream merges/release/dev17.10-to-release/dev17.11 --force