[vcpkg] Rename `port_versions` to `versions` (#15784)

2 files changed, 15 insertions, 15 deletions

diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/registries.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/registries.ps1
index ef7023c85..1ea2cb36d 100644
--- a/scripts/azure-pipelines/end-to-end-tests-dir/registries.ps1
+++ b/scripts/azure-pipelines/end-to-end-tests-dir/registries.ps1
@@ -1,12 +1,12 @@
 . "$PSScriptRoot/../end-to-end-tests-prelude.ps1"
 
 
-$builtinRegistryArgs = $commonArgs + @("--x-builtin-port-versions-dir=$PSScriptRoot/../../e2e_ports/port_versions")
+$builtinRegistryArgs = $commonArgs + @("--x-builtin-registry-versions-dir=$PSScriptRoot/../../e2e_ports/versions")
 
 Run-Vcpkg install @builtinRegistryArgs 'vcpkg-internal-e2e-test-port'
 Throw-IfNotFailed
 
-# We should not look into the port_versions directory unless we have a baseline,
+# We should not look into the versions directory unless we have a baseline,
 # even if we pass the registries feature flag
 Run-Vcpkg install @builtinRegistryArgs --feature-flags=registries 'vcpkg-internal-e2e-test-port'
 Throw-IfNotFailed
@@ -28,13 +28,13 @@ Copy-Item -Recurse `
     -LiteralPath "$PSScriptRoot/../../e2e_ports/vcpkg-internal-e2e-test-port" `
     -Destination "$filesystemRegistry"
 New-Item `
-    -Path "$filesystemRegistry/port_versions" `
+    -Path "$filesystemRegistry/versions" `
     -ItemType Directory
 Copy-Item `
-    -LiteralPath "$PSScriptRoot/../../e2e_ports/port_versions/baseline.json" `
-    -Destination "$filesystemRegistry/port_versions/baseline.json"
+    -LiteralPath "$PSScriptRoot/../../e2e_ports/versions/baseline.json" `
+    -Destination "$filesystemRegistry/versions/baseline.json"
 New-Item `
-    -Path "$filesystemRegistry/port_versions/v-" `
+    -Path "$filesystemRegistry/versions/v-" `
     -ItemType Directory
 
 $vcpkgInternalE2eTestPortJson = @{
@@ -46,7 +46,7 @@ $vcpkgInternalE2eTestPortJson = @{
     )
 }
 New-Item `
-    -Path "$filesystemRegistry/port_versions/v-/vcpkg-internal-e2e-test-port.json" `
+    -Path "$filesystemRegistry/versions/v-/vcpkg-internal-e2e-test-port.json" `
     -ItemType File `
     -Value (ConvertTo-Json -Depth 5 -InputObject $vcpkgInternalE2eTestPortJson)
 
@@ -68,7 +68,7 @@ try
     $CurrentTest = 'git init .'
     git @gitConfigOptions init .
     Throw-IfFailed
-    Copy-Item -Recurse -LiteralPath "$PSScriptRoot/../../e2e_ports/port_versions" -Destination .
+    Copy-Item -Recurse -LiteralPath "$PSScriptRoot/../../e2e_ports/versions" -Destination .
     Copy-Item -Recurse -LiteralPath "$PSScriptRoot/../../e2e_ports/vcpkg-internal-e2e-test-port" -Destination .
 
     $CurrentTest = 'git add -A'
diff --git a/scripts/azure-pipelines/end-to-end-tests-dir/versions.ps1 b/scripts/azure-pipelines/end-to-end-tests-dir/versions.ps1
index 11550d7bd..7f927759f 100644
--- a/scripts/azure-pipelines/end-to-end-tests-dir/versions.ps1
+++ b/scripts/azure-pipelines/end-to-end-tests-dir/versions.ps1
@@ -2,16 +2,16 @@
 

 # Test verify versions

 mkdir $VersionFilesRoot

-Copy-Item -Recurse "scripts/testing/version-files/port_versions_incomplete" $VersionFilesRoot

+Copy-Item -Recurse "scripts/testing/version-files/versions_incomplete" $VersionFilesRoot

 $portsRedirectArgsOK = @(

     "--feature-flags=versions",

     "--x-builtin-ports-root=scripts/testing/version-files/ports",

-    "--x-builtin-port-versions-dir=scripts/testing/version-files/port_versions"

+    "--x-builtin-registry-versions-dir=scripts/testing/version-files/versions"

 )

 $portsRedirectArgsIncomplete = @(

     "--feature-flags=versions",

     "--x-builtin-ports-root=scripts/testing/version-files/ports_incomplete",

-    "--x-builtin-port-versions-dir=$VersionFilesRoot/port_versions_incomplete"

+    "--x-builtin-registry-versions-dir=$VersionFilesRoot/versions_incomplete"

 )

 $CurrentTest = "x-verify-ci-versions (All files OK)"

 Write-Host $CurrentTest

@@ -77,7 +77,7 @@ foreach ($opt_registries in @("",",registries"))
     ./vcpkg $commonArgs "--feature-flags=versions$opt_registries" install `

         "--dry-run" `

         "--x-manifest-root=scripts/testing/version-files/without-default-baseline-2" `

-        "--x-builtin-port-versions-dir=scripts/testing/version-files/default-baseline-2/port_versions"

+        "--x-builtin-registry-versions-dir=scripts/testing/version-files/default-baseline-2/versions"

     Throw-IfFailed

     Require-FileNotExists $buildtreesRoot/versioning

 

@@ -85,7 +85,7 @@ foreach ($opt_registries in @("",",registries"))
     ./vcpkg $commonArgs "--feature-flags=versions$opt_registries" install `

         "--dry-run" `

         "--x-manifest-root=scripts/testing/version-files/default-baseline-2" `

-        "--x-builtin-port-versions-dir=scripts/testing/version-files/default-baseline-2/port_versions"

+        "--x-builtin-registry-versions-dir=scripts/testing/version-files/default-baseline-2/versions"

     Throw-IfFailed

     Require-FileExists $buildtreesRoot/versioning

 

@@ -93,6 +93,6 @@ foreach ($opt_registries in @("",",registries"))
     ./vcpkg $commonArgs "--feature-flags=-versions$opt_registries" install `

         "--dry-run" `

         "--x-manifest-root=scripts/testing/version-files/default-baseline-2" `

-        "--x-builtin-port-versions-dir=scripts/testing/version-files/default-baseline-2/port_versions"

+        "--x-builtin-registry-versions-dir=scripts/testing/version-files/default-baseline-2/versions"

     Throw-IfNotFailed

-}
\ No newline at end of file
+}