Add a message to vcpkg install where the licenses of the packages installed in this invocation are printed, and a separate license-report command that prints all information known in the installed tree.

Author: BillyONeal

azure-pipelines/e2e-ports/vcpkg-license-bsd-on-mit/portfile.cmake

@@ -0,0 +1 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

azure-pipelines/e2e-ports/vcpkg-license-bsd-on-mit/vcpkg.json

@@ -0,0 +1,8 @@
+{
+  "name": "vcpkg-license-bsd-on-mit",
+  "version": "0",
+  "license": "BSD-3-Clause",
+  "dependencies": [
+    "vcpkg-license-mit"
+  ]
+}

azure-pipelines/e2e-ports/vcpkg-license-bsd/portfile.cmake

@@ -0,0 +1 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

azure-pipelines/e2e-ports/vcpkg-license-bsd/vcpkg.json

@@ -0,0 +1,5 @@
+{
+  "name": "vcpkg-license-bsd",
+  "version": "0",
+  "license": "BSD-3-Clause"
+}

azure-pipelines/e2e-ports/vcpkg-license-mit/portfile.cmake

@@ -0,0 +1 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

azure-pipelines/e2e-ports/vcpkg-license-mit/vcpkg.json

@@ -0,0 +1,5 @@
+{
+  "name": "vcpkg-license-mit",
+  "version": "0",
+  "license": "MIT"
+}

azure-pipelines/e2e-ports/vcpkg-license-null/portfile.cmake

@@ -0,0 +1 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

azure-pipelines/e2e-ports/vcpkg-license-null/vcpkg.json

@@ -0,0 +1,5 @@
+{
+  "name": "vcpkg-license-null",
+  "version": "0",
+  "license": null
+}

azure-pipelines/end-to-end-tests-dir/build-test-ports.ps1

@@ -51,20 +51,25 @@ if ($output -notmatch 'Trailing comma') {
 # Check for msgAlreadyInstalled vs. msgAlreadyInstalledNotHead
 $output = Run-VcpkgAndCaptureOutput @commonArgs --overlay-ports="$PSScriptRoot/../e2e-ports" install vcpkg-internal-e2e-test-port3
 Throw-IfFailed
-if ($output -notmatch 'vcpkg-internal-e2e-test-port3:[^ ]+ is already installed') {
+if (-not $output -contains @"
+The following packages are already installed:
+    vcpkg-internal-e2e-test-port3:
+"@) {
     throw 'Wrong already installed message'
 }
 
 $output = Run-VcpkgAndCaptureOutput @commonArgs --overlay-ports="$PSScriptRoot/../e2e-ports" install vcpkg-internal-e2e-test-port3 --head
 Throw-IfFailed
-if ($output -notmatch 'vcpkg-internal-e2e-test-port3:[^ ]+ is already installed -- not building from HEAD') {
+if (-not $output -contains @"
+The following packages are already installed, but were requested at --head version. Their installed contents will not be changed. To get updated versions, remove these packages first:
+    vcpkg-internal-e2e-test-port3:
+"@) {
     throw 'Wrong already installed message for --head'
 }
 
 Refresh-TestRoot
 $output = Run-VcpkgAndCaptureOutput @commonArgs --x-builtin-ports-root="$PSScriptRoot/../e2e-ports" install vcpkg-bad-spdx-license
 Throw-IfFailed
-$output = $output.Replace("`r`n", "`n")
 $expected = @"
 vcpkg.json: warning: $.license (an SPDX license expression): warning: Unknown license identifier 'BSD-new'. Known values are listed at https://spdx.org/licenses/
   on expression: BSD-new

azure-pipelines/end-to-end-tests-dir/ci-verify-versions.ps1

@@ -1,6 +1,5 @@
 . "$PSScriptRoot/../end-to-end-tests-prelude.ps1"
 
-Refresh-TestRoot
 
 Copy-Item -Recurse "$PSScriptRoot/../e2e-assets/ci-verify-versions-registry" "$TestingRoot/ci-verify-versions-registry"
 git -C "$TestingRoot/ci-verify-versions-registry" @gitConfigOptions init
@@ -160,17 +159,12 @@ Throw-IfNotFailed
 
 function Sanitize() {
   Param([string]$text)
-  $workTreeRegex = 'error: failed to execute:[^\r\n]+' # Git command line has an unpredictable PID inside
-  $text = $text.Replace('\', '/').Replace("`r`n", "`n").Trim()
+  $workTreeRegex = 'error: failed to execute:[^\n]+' # Git command line has an unpredictable PID inside
+  $text = $text.Replace('\', '/').Trim()
   $text = [System.Text.RegularExpressions.Regex]::Replace($text, $workTreeRegex, '')
   return $text
 }
 
 $expected = Sanitize $expected
 $actual = Sanitize $actual
-if ($actual -ne $expected) {
-    Set-Content -Value $expected -LiteralPath "$TestingRoot/expected.txt"
-    Set-Content -Value $actual -LiteralPath "$TestingRoot/actual.txt"
-    git diff --no-index -- "$TestingRoot/expected.txt" "$TestingRoot/actual.txt"
-    throw "Bad x-ci-verify-versions output."
-}
+Throw-IfNonEqual -Expected $expected -Actual $actual