Skip to content
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

Merged

Conversation

dotnet-bot
Copy link
Collaborator

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

dotnet-maestro bot and others added 30 commits April 10, 2024 17:56
…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]>
…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
Cosifne and others added 5 commits May 20, 2024 10:10
…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]>
@dotnet-bot dotnet-bot requested review from a team as code owners May 24, 2024 00:07
@dotnet-bot dotnet-bot added Area-Infrastructure auto-merge Merge Conflicts There are merge conflicts with the base branch. labels May 24, 2024
@dotnet-bot
Copy link
Collaborator Author

⚠ This PR has merge conflicts. @Cosifne

@dotnet-bot dotnet-bot enabled auto-merge May 24, 2024 00:07
Copy link
Contributor

@dotnet-policy-service dotnet-policy-service bot left a 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]>
@jjonescz
Copy link
Member

jjonescz commented Jun 3, 2024

@dibarbet can you resolve the conflicts in IDE files here? Thanks.

@dibarbet dibarbet requested review from 333fred and dibarbet as code owners June 3, 2024 21:51
@dibarbet
Copy link
Member

dibarbet commented Jun 3, 2024

@dibarbet can you resolve the conflicts in IDE files here? Thanks.

@jjonescz addressed. there were a ton of conflicts in the src/Compilers/CSharp/Portable/PublicAPI.Unshipped.txt and src/Compilers/Core/Portable/PublicAPI.Unshipped.txt files. I did my best to resolve them, but please take a look to make sure it accurately reflects what you want shipped.

@dibarbet dibarbet force-pushed the merges/release/dev17.10-to-release/dev17.11 branch from d745af1 to 1ef637e Compare June 3, 2024 22:07
@dibarbet
Copy link
Member

dibarbet commented Jun 4, 2024

Source build is complaining about new prebuilts

/__w/1/s/.packages/microsoft.dotnet.arcade.sdk/9.0.0-beta.24270.3/tools/SourceBuild/AfterSourceBuild.proj(81,5): error : 5 new pre-builts discovered! Detailed usage report can be found at /__w/1/s/artifacts/sb/prebuilt-report/baseline-comparison.xml.
/__w/1/s/.packages/microsoft.dotnet.arcade.sdk/9.0.0-beta.24270.3/tools/SourceBuild/AfterSourceBuild.proj(81,5): error : See https://aka.ms/dotnet/prebuilts for guidance on what pre-builts are and how to eliminate them.
/__w/1/s/.packages/microsoft.dotnet.arcade.sdk/9.0.0-beta.24270.3/tools/SourceBuild/AfterSourceBuild.proj(81,5): error : Package IDs are:
/__w/1/s/.packages/microsoft.dotnet.arcade.sdk/9.0.0-beta.24270.3/tools/SourceBuild/AfterSourceBuild.proj(81,5): error : Microsoft.Build.17.3.4
/__w/1/s/.packages/microsoft.dotnet.arcade.sdk/9.0.0-beta.24270.3/tools/SourceBuild/AfterSourceBuild.proj(81,5): error : Microsoft.Build.Framework.17.3.4
/__w/1/s/.packages/microsoft.dotnet.arcade.sdk/9.0.0-beta.24270.3/tools/SourceBuild/AfterSourceBuild.proj(81,5): error : Microsoft.Build.Tasks.Core.17.3.4
/__w/1/s/.packages/microsoft.dotnet.arcade.sdk/9.0.0-beta.24270.3/tools/SourceBuild/AfterSourceBuild.proj(81,5): error : Microsoft.Build.Utilities.Core.17.3.4
/__w/1/s/.packages/microsoft.dotnet.arcade.sdk/9.0.0-beta.24270.3/tools/SourceBuild/AfterSourceBuild.proj(81,5): error : Microsoft.NET.StringTools.17.3.4

which were added in #73283 . However source build passed there. @marcpopMSFT any ideas on why source build is broken here?

@dotnet-bot dotnet-bot merged commit e68227e into release/dev17.11 Jun 4, 2024
28 checks passed
@jjonescz jjonescz deleted the merges/release/dev17.10-to-release/dev17.11 branch June 4, 2024 10:59
@MichaelSimons
Copy link
Member

@dibarbet - The source-build-reference-packages dependency needs to be updated to the latest version which contains this version.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-Infrastructure auto-merge Merge Conflicts There are merge conflicts with the base branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants