[internal/9.0.1xx] VMR Sync failing to synchronize repo sdk

[Winniexu01]

https://dev.azure.com/dnceng/internal/_build/results?buildId=2711871&view=logs&j=ac868591-5f39-5047-4b1f-0ffa6f6c3268&t=e582a637-0017-55a1-7459-349c940b3ec9 (internal Microsoft link)

[MichaelSimons]

@ellahathaway, Can you help invest? TIA

[ellahathaway]

Looks like a CRLF issue caused by dotnet/runtime#115413. Not sure what the fix is here... darc may have to be updated to handle these LE differences.

cc @premun @richlander

[MichaelSimons]

@dotnet/prodconsvcs - Can you provide guidance? TIA

[premun]

Is this urgent? As in - do we need a workaround asap?

From seeing similar things before, I believe what is happening is that the sync runs through just fine, except at the very end, when it tries to merge branches, the working tree is dirty because there are files with non-standard EOLs that were just checked out dirty (git does that sometimes, maybe you've experienced that).

@ellahathaway do you have a unix machine at hand? I would be good to try to run the sync manually using newest darc.
So the steps would be:

• Install darc
• Clone the dotnet-dotnet and dotnet-sdk repos locally (from AzDO dnceng/internal) as this is about internal branches and check them out at the appropriate release branches
• Run darc similarly to how the pipeline run does:

darc vmr update --vmr PATH-TO-DOTNET-DOTNET --tmp PATH-TO-TMP --azdev-pat AZDO-PAT-WITH-CODE-R --debug --recursive --additional-remotes sdk:PATH-TO-SDK --component-template PATH-TO-SDK/src/VirtualMonoRepo/Component.template.md --tpn-template PATH-TO-SDK/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt --discard-patches --generate-credscansuppressions sdk:b78419ffa70f8afed6d39dd134bad3298b72eba9

I wonder if newest darc resolves this. Then we could bump darc in the internal release branch and unblock the sync that way.

Alternatively, if we need the workaround asap, I can try to run this on Windows and open a manual PR against the dotnet-dotnet repo. Maybe the EOLs would be fine on Windows.

[ellahathaway]

I was able to successfully run the sync on my unix machine with the newest darc. The only hiccup was that the version of darc that I used doesn't support --component-template, so I had to forgo using that option, but it doesn't seem to have affected my local sync.

So maybe we bump darc internally and unblock that way?

[ellahathaway]

Opened https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/pullrequest/50250

[ellahathaway]

Is this urgent? As in - do we need a workaround asap?

We realized today that this is unfortunately blocking the next release, so this is now urgent. I've pinged FR for guidance on this, but I'm also responding here for visibility.

cc @dotnet/prodconsvcs

[mmitche]

@MichaelSimons How valuable is https://github.com/dotnet/dotnet/blob/release/9.0.1xx/Components.md? If it's needed, we'll need to re-introduce the option to Darc, which was removed way back in December.

[MichaelSimons]

How valuable is https://github.com/dotnet/dotnet/blob/release/9.0.1xx/Components.md?

I don't see it as important. All of the info exists in other places if needed (e.g. git-info and .gitmodules.