3 people 4f7cd8dc36 Normalize line endings during inbound mirror merge (#12114) ...

Configure Git's merge.renormalize option for the GitHub-to-ADO
integration merge.

This prevents CRLF/LF-only differences from causing merge conflicts
while preserving genuine content-conflict detection.

Validation:
- The exact commits from failed build 158964100 merged with zero
unresolved paths.
- A genuine same-line content conflict continued to fail as expected.

Co-authored-by: Sakshi Sharma <sakshishar@microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 8ba8a44d-4aa0-4ecb-acf6-2467ba4bc792

2026-10-01 11:02:20 +05:30

..

cleanup

Syncing content from committish 118587f2d9ed8fd8e980ded37f5e54eca433b480

2026-07-30 04:17:45 +00:00

dev

Merged PR 16168671: [WinUI OSS]Comment-only scrub across scripts, build, and dxaml files

2026-07-20 04:47:56 +00:00

init

Refine review guidance and narrow build workflow changes

2026-09-17 14:08:03 -07:00

aliases

Merged PR 15716130: Switch winui3/main source mirror to root layout (without src/ prefix)

2026-05-30 04:06:32 +00:00

buildSample.cmd

Syncing content from committish 118587f2d9ed8fd8e980ded37f5e54eca433b480

2026-07-30 04:17:45 +00:00

buildSample.ps1

Syncing content from committish 118587f2d9ed8fd8e980ded37f5e54eca433b480

2026-07-30 04:17:45 +00:00

buildWithSystemMemoryMonitor.cmd

Syncing content from committish 118587f2d9ed8fd8e980ded37f5e54eca433b480

2026-07-30 04:17:45 +00:00

createPullRequest.ps1

Syncing content from committish 118587f2d9ed8fd8e980ded37f5e54eca433b480

2026-07-30 04:17:45 +00:00

find-appx.ps1

Syncing content from committish 118587f2d9ed8fd8e980ded37f5e54eca433b480

2026-07-30 04:17:45 +00:00

GenerateTestPfx.ps1

Merged PR 15716130: Switch winui3/main source mirror to root layout (without src/ prefix)

2026-05-30 04:06:32 +00:00

InjectAzureMapsToken.ps1

Merged PR 16291924: Mirror Azure Maps token injection script

2026-07-28 08:28:47 +00:00

InjectGithubSourceInfoIntoSymbols.ps1

Syncing content from committish 118587f2d9ed8fd8e980ded37f5e54eca433b480

2026-07-30 04:17:45 +00:00

MarkTestsWithMasterFiles.ps1

Syncing content from committish 118587f2d9ed8fd8e980ded37f5e54eca433b480

2026-07-30 04:17:45 +00:00

MergePublicMirrorIntoInternalBranch.ps1

Normalize line endings during inbound mirror merge (#12114)

2026-10-01 11:02:20 +05:30

MirrorGitHubIssues.ps1

Merged PR 16387085: [WinUI OSS] Fix MirrorGitHubIssues query ID interpolation

2026-08-06 03:08:54 +00:00

MirrorGitHubIssuesHelperFunctions.ps1

Syncing content from committish 118587f2d9ed8fd8e980ded37f5e54eca433b480

2026-07-30 04:17:45 +00:00

MirrorGitRepositoryWithHistory.ps1

Consolidate mirror + integrate into a single two-stage pipeline (#11763)

2026-09-08 22:57:25 +05:30

MirrorGitRepositoryWithoutHistory.ps1

Syncing content from committish 118587f2d9ed8fd8e980ded37f5e54eca433b480

2026-07-30 04:17:45 +00:00

MockArm64ECFolder.ps1

Merged PR 16290275: [WinUI OSS] Scrub NuGet env and MockArm64EC scripts to resolve dependency-setup validation blocker

2026-07-27 18:52:27 +00:00

MSBuildFunctions.psm1

Merged PR 15716130: Switch winui3/main source mirror to root layout (without src/ prefix)

2026-05-30 04:06:32 +00:00

PostInit.ps1

Onboard WinAppSDK mono-build Integration (#12090)

2026-09-30 15:54:05 -07:00

RepackageInstalledAppxPackage.cmd

Syncing content from committish 118587f2d9ed8fd8e980ded37f5e54eca433b480

2026-07-30 04:17:45 +00:00

RepackageInstalledAppxPackage.ps1

Syncing content from committish 118587f2d9ed8fd8e980ded37f5e54eca433b480

2026-07-30 04:17:45 +00:00

setnugetenvvars.cmd

Merged PR 16290275: [WinUI OSS] Scrub NuGet env and MockArm64EC scripts to resolve dependency-setup validation blocker

2026-07-27 18:52:27 +00:00

systemmemory.ps1

Syncing content from committish 118587f2d9ed8fd8e980ded37f5e54eca433b480

2026-07-30 04:17:45 +00:00

updateCswinrt.cmd

Syncing content from committish 118587f2d9ed8fd8e980ded37f5e54eca433b480

2026-07-30 04:17:45 +00:00

updateCswinrt.ps1

Modernize XamlCompiler tests, Part II (test fixes only) (#11837)

2026-09-30 09:44:10 -07:00

updateIxp.cmd

Syncing content from committish 118587f2d9ed8fd8e980ded37f5e54eca433b480

2026-07-30 04:17:45 +00:00

updateIxp.ps1

Onboard WinAppSDK mono-build Integration (#12090)

2026-09-30 15:54:05 -07:00

UpdateMasterFiles.cmd

Syncing content from committish 118587f2d9ed8fd8e980ded37f5e54eca433b480

2026-07-30 04:17:45 +00:00

UpdateMasterFiles.ps1

Syncing content from committish 118587f2d9ed8fd8e980ded37f5e54eca433b480

2026-07-30 04:17:45 +00:00

updateWebview2.cmd

Syncing content from committish 118587f2d9ed8fd8e980ded37f5e54eca433b480

2026-07-30 04:17:45 +00:00

updateWebview2.ps1

Update WebView2 package publishing guidance (#11921)

2026-09-18 11:28:01 +05:30

WindowsSdkInstallerFunctions.psm1

Syncing content from committish 118587f2d9ed8fd8e980ded37f5e54eca433b480

2026-07-30 04:17:45 +00:00

winui.natvis

Syncing content from committish 118587f2d9ed8fd8e980ded37f5e54eca433b480

2026-07-30 04:17:45 +00:00