[vcpkg] fix checking out git registry ports (#16009)

* [vcpkg] fix checking out git registry ports

* fix the new issues in builtinregistryentry

* fix tests

* fix tests boogaloo

* [vcpkg] Fix issue where baseline is requested for overlay during version resolution

* split BuiltinRegistryEntry into two types

Co-authored-by: Robert Schumacher <ras0219@outlook.com>

1 files changed, 31 insertions, 1 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 1ea2cb36d..bdeeb0a15 100644
--- a/scripts/azure-pipelines/end-to-end-tests-dir/registries.ps1
+++ b/scripts/azure-pipelines/end-to-end-tests-dir/registries.ps1
@@ -68,8 +68,8 @@ try
     $CurrentTest = 'git init .'
     git @gitConfigOptions init .
     Throw-IfFailed
-    Copy-Item -Recurse -LiteralPath "$PSScriptRoot/../../e2e_ports/versions" -Destination .
     Copy-Item -Recurse -LiteralPath "$PSScriptRoot/../../e2e_ports/vcpkg-internal-e2e-test-port" -Destination .
+    New-Item -Path './vcpkg-internal-e2e-test-port/foobar' -Value 'this is just to get a distinct git tree'
 
     $CurrentTest = 'git add -A'
     git @gitConfigOptions add -A
@@ -77,6 +77,36 @@ try
     $CurrentTest = 'git commit'
     git @gitConfigOptions commit -m 'initial commit'
     Throw-IfFailed
+
+    $vcpkgInternalE2eTestPortGitTree = git rev-parse 'HEAD:vcpkg-internal-e2e-test-port'
+    $vcpkgInternalE2eTestPortVersionsJson = @{
+        "versions" = @(
+            @{
+                "version-string" = "1.0.0";
+                "git-tree" = $vcpkgInternalE2eTestPortGitTree
+            }
+        )
+    }
+    $vcpkgBaseline = @{
+        "default" = @{
+            "vcpkg-internal-e2e-test-port" = @{
+                "baseline" = "1.0.0"
+            }
+        }
+    }
+
+    New-Item -Path './versions' -ItemType Directory
+    New-Item -Path './versions/v-' -ItemType Directory
+
+    New-Item -Path './versions/baseline.json' -Value (ConvertTo-Json -Depth 5 -InputObject $vcpkgBaseline)
+    New-Item -Path './versions/v-/vcpkg-internal-e2e-test-port.json' -Value (ConvertTo-Json -Depth 5 -InputObject $vcpkgInternalE2eTestPortVersionsJson)
+
+    $CurrentTest = 'git add -A'
+    git @gitConfigOptions add -A
+    Throw-IfFailed
+    $CurrentTest = 'git commit'
+    git @gitConfigOptions commit --amend --no-edit
+    Throw-IfFailed
 }
 finally
 {