Skip to content

Fix SamplesCompatTest NU1605: insert missing PackageVersion entries when rewriting samples' Directory.Packages.props #6473

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.

Sign up for GitHub

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

Open
v-arlysenko wants to merge 2 commits into
base: main
Choose a base branch
from
+19 −3
Open

Fix SamplesCompatTest NU1605: insert missing PackageVersion entries when rewriting samples' Directory.Packages.props #6473

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ff9a7b
Fix SamplesCompatTest NU1605: insert missing PackageVersion entries w…
v-arlysenko May 12, 2026
5690489
Merge branch 'main' into user/v-arlysenko/fix-sample-base-version-rew…
v-arlysenko May 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions test/ModifySampleAppsReferences.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,25 @@ Get-ChildItem -Recurse Directory.Packages.props -Path $SampleRepoRoot | foreach-

foreach ($nugetPackageToVersion in $packagesToUpdateTable.GetEnumerator())
{
$newVersionString = 'PackageVersion Include="' + $nugetPackageToVersion.Key + '" Version="' + $nugetPackageToVersion.Value + '"'
$oldVersionString = 'PackageVersion Include="' + $nugetPackageToVersion.Key + '" Version="[-.0-9a-zA-Z]*"'
$content = $content -replace $oldVersionString, $newVersionString
$packageId = $nugetPackageToVersion.Key
$packageVersion = $nugetPackageToVersion.Value
$newVersionString = 'PackageVersion Include="' + $packageId + '" Version="' + $packageVersion + '"'
$oldVersionPattern = 'PackageVersion Include="' + [regex]::Escape($packageId) + '" Version="[-.0-9a-zA-Z]*"'

if ($content -match $oldVersionPattern)
{
$content = $content -replace $oldVersionPattern, $newVersionString
}
else
{
# Missing entry: insert into the first ItemGroup. Ensures transitive
# Foundation dependencies (e.g. Microsoft.WindowsAppSDK.Base) get a
# centrally-managed PackageVersion matching Foundation; otherwise NuGet
# sees a downgrade and SamplesCompatTest fails with NU1605.
$insertion = "`r`n <" + $newVersionString + ' />'
$content = [regex]::Replace($content, '(<ItemGroup[^>]*>)', '$1' + $insertion, 1)
Write-Host "Inserted PackageVersion for $packageId ($packageVersion) into $($_.FullName)"
}
}

Set-Content -Path $_.FullName -Value $content
Expand Down
Loading