Skip to content

Commit bf95b7b

Browse files
haonantttHaonan Tang
andauthored
Fix the Sample Tests failure caused by ModifySampleAppsReferences.ps1 (#5877)
* Fix WASDKNugetDependencies value * update script * update arg * Fix WASDKNugetDependencies value * update script * update arg * update script * update script --------- Co-authored-by: Haonan Tang <[email protected]>
1 parent 5efb727 commit bf95b7b

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

build/AzurePipelinesTemplates/WindowsAppSDK-BuildSamplesCompat-Job.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,10 @@ jobs:
177177
inputs:
178178
filePath: '$(Build.SourcesDirectory)\$(SelfRepoName)\test\ModifySampleAppsReferences.ps1'
179179
arguments: >
180-
-SampleRepoRoot "$(Build.SourcesDirectory)\$(SamplesRepoName)"
180+
-SampleRepoRoot "$(Build.SourcesDirectory)\$(SamplesRepoName)\Samples"
181181
-FoundationVersion "$(FoundationVersion)"
182182
-FoundationPackagesFolder "$(Build.SourcesDirectory)\$(SamplesRepoName)\Samples\localpackages"
183-
-WASDKNugetDependencies variables['wasdkDependencies']
183+
-WASDKNugetDependencies "$(wasdkDependencies)"
184184
185185
# update the nuget.config file to point to the internal feed
186186
- powershell: |

test/ModifySampleAppsReferences.ps1

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Set-StrictMode -Version 3.0
1010
$ErrorActionPreference = 'Stop'
1111

1212
$packagesToRemoveList = $WASDKNugetDependencies -split ';'
13+
$packagesToRemoveList += @("Microsoft.WindowsAppSDK")
1314

1415
$packagesToUpdateTable = @{"Microsoft.WindowsAppSDK.Foundation" = $FoundationVersion}
1516

@@ -33,6 +34,7 @@ if (!($FoundationPackagesFolder -eq ""))
3334
}
3435
}
3536
Write-Host "NuGet packages to version table: $($packagesToUpdateTable | Out-String)"
37+
Write-Host "NuGet packages to remove: $($packagesToRemoveList | Out-String)"
3638

3739
Get-ChildItem -Recurse packages.config -Path $SampleRepoRoot | foreach-object {
3840
$content = Get-Content $_.FullName -Raw

0 commit comments

Comments
 (0)