Teach the fetch test to force downloaded copy.

Author: BillyONeal

azure-pipelines/end-to-end-tests-dir/fetch.ps1

@@ -2,7 +2,7 @@
 
 $VcpkgToolsJsonSchemaFile = (Get-Item "$PSScriptRoot/../../docs/vcpkg-tools.schema.json").FullName
 if (-not (Test-Json -ea:0 -LiteralPath "$VcpkgRoot/scripts/vcpkg-tools.json" -SchemaFile $VcpkgToolsJsonSchemaFile)) {
-    throw "real vcpkg-tools.json doesn't conform to schema"
+    throw "real vcpkg-tools.json doesn't conform to schema"
 }
 
 if (-not $IsMacOS -and -not $IsLinux) {
@@ -20,7 +20,7 @@ if (-not $IsMacOS -and -not $IsLinux) {
 {
     "schema-version": 1,
     "tools": [{
-        "name": "7zip",
+        "name": "7zip_msi",
         "os": "windows",
         "version": "19.00",
         "executable": "Files\\7-Zip\\7z.exe",
@@ -86,13 +86,13 @@ if (-not $IsMacOS -and -not $IsLinux) {
 '@ | % { $_ -replace "`r","" } | Out-File -enc ascii $VcpkgToolsJson
 
     if (-not (Test-Json -ea:0 -LiteralPath $VcpkgToolsJson -SchemaFile $VcpkgToolsJsonSchemaFile)) {
-        throw "testing vcpkg-tools.json doesn't conform to schema"
+        throw "testing vcpkg-tools.json doesn't conform to schema"
     }
 
     $env:VCPKG_DOWNLOADS = Join-Path $TestingRoot 'down loads'
-    Run-Vcpkg -TestArgs ($commonArgs + @("fetch", "7zip", "--vcpkg-root=$TestingRoot"))
+    Run-Vcpkg -TestArgs ($commonArgs + @("fetch", "7zip_msi", "--vcpkg-root=$TestingRoot"))
     Throw-IfFailed
-    Require-FileExists "$env:VCPKG_DOWNLOADS/tools/7zip-19.00-windows/Files/7-Zip/7z.exe"
+    Require-FileExists "$env:VCPKG_DOWNLOADS/tools/7zip_msi-19.00-windows/Files/7-Zip/7z.exe"
 
     Run-Vcpkg -TestArgs ($commonArgs + @("fetch", "ninja-testing", "--vcpkg-root=$TestingRoot"))
     Throw-IfFailed