Skip to content

Conversation

@dotnet-maestro
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Aug 6, 2025

Note

This is a codeflow update. It may contain both source code changes from the source repo as well as dependency updates. Learn more here.

This pull request brings the following source code changes

From https://github.com/dotnet/roslyn

@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Aug 6, 2025

Notification for subscribed users from https://github.com/dotnet/roslyn:

@dotnet/roslyn-infrastructure

Action requested: Please take a look at this failing automated dependency-flow pull request's checks; failures may be related to changes which originated in your repo.

@akoeplinger
Copy link
Member

@dotnet/source-build MSBuildLocator got bumped in dotnet/roslyn@9c6403e, do we just bump the submodule in SBRP or is there more?

@tannergooding
Copy link
Member

MSBuildLocator got bumped in dotnet/roslyn@9c6403e, do we just bump the submodule in SBRP or is there more?

ping @dotnet/source-build on the above. dotnet/runtime is pending some metadata changes around the extension members feature and it would be nice to ensure flow isn't blocked.

@mmitche
Copy link
Member

mmitche commented Aug 11, 2025

I think that is correct. @ellahathaway or @mthalman to confirm.

@ellahathaway
Copy link
Member

I think that is correct. @ellahathaway or @mthalman to confirm.

Yes, you'll have to update the submodule. The full set of instructions can be found here.

@tannergooding
Copy link
Member

Thanks! That was just completed in dotnet/source-build-reference-packages#1340

I'm going to try and push things through, but this should all flow automatically by tomorrow.

@ellahathaway
Copy link
Member

I merged in the latest SBRP flow which contains the MSBuildLocator update

@tannergooding
Copy link
Member

Thanks @ellahathaway!

Looks like there's a complaint about the SHA and BAR ID not being correct in the source-manifest.json. Is there an easy way to resolve that?

@tannergooding
Copy link
Member

@dotnet/product-construction on the code flow error. Is there an easy way to help ensure the source-manifest is correct for cases like this or is it manual?

The changes "look" simple, but want to ensure it's being handled correctly here.

@mmitche
Copy link
Member

mmitche commented Aug 11, 2025

@dkurepa @premun I think the Code flow verification failure is incorrect here. Based on the PR source, the last flow applied was 9c6403e, which the source manifest reflects. However, the PR tracking info seems to think build 28606 was applied on top of that,...and it doesn't appear to be the case. The code flow verification started failing earlier when new changes from main were merged in.

@mmitche
Copy link
Member

mmitche commented Aug 11, 2025

Attempting to manual forward flow the newer roslyn into the VMR shows the following error...so no idea how to get this into the right state.

info: Flowing roslyn's commit 7ead97f to VMR at C:\d\...
info: Last flow was back flow: b7ad826c308d3b0376ed21450271439a97f77f02 -> 73ea6887cb8abecabf3dcd3b8109d4336690afe9
info: Current flow is in the opposite direction
info: Synchronizing roslyn from 4b825dc642cb6eb9a060e54bf8d69288fbee4904 to C:\r\roslyn / 7ead97fc404947f81a4ee3c6543212d60fddfd03
info: Updating VMR roslyn from 9c6403e to 7ead97f..
info: Creating patches for roslyn in C:\Users\mmitche\AppData\Local\Temp\..
info: 1 patch created
info: Applying patch C:\Users\mmitche\AppData\Local\Temp\roslyn-4b825dc-7ead97f.patch to src/roslyn...
info: Cleaning the working tree directory C:\d\src\roslyn...
info: Updating .config/CredScanSuppressions.json...
info: .config/CredScanSuppressions.json updated
info: Committing..
info: Committed in 2 seconds
info: Cleaning the working tree directory C:\d\....
info: Cleaning up...
fail: Failed to synchronize repo to VMR
      Failed to create a patch C:\Users\mmitche\AppData\Local\Temp\78a4010c-3a8d-4f0c-ba46-1be6d4161d1a.patch
      Exit code: 128
      Std err:
      E: unsupported filetype C:\Users\mmitche\AppData\Local\Temp/git-blob-a21976/csharp-diag.docx
      fatal: unable to read files to diff

@tannergooding
Copy link
Member

@mmitche can we trigger a net new pr and cherry-pick everything but the source-manifest changes from dotnet/sbpr?

@dotnet-maestro dotnet-maestro bot deleted the darc-main-9942b1f1-612a-4cfd-b316-47c488a39a20 branch August 12, 2025 00:55
@tannergooding
Copy link
Member

tannergooding commented Aug 12, 2025

-- That's essentially what I ended up doing. Closed this one, ran the darc command to trigger a new update, and then cherry-pick the commiit into #1837

The following files had trivial conflicts which needed resolution, just ensuring 10.0.0-beta.25409.103 was picked instead of 10.0.0-beta.25407.105:

src/source-build-reference-packages/eng/Version.Details.props
src/source-build-reference-packages/eng/Version.Details.xml
src/source-build-reference-packages/global.json

And then source.manifest.json which only needed the dotnet/source-build-reference-packages entry fixed to match what was done by darc in that PR

The CI is no longer instantly failing and things are looking better

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

5 participants