Reorder CI checks (#15662)

* Reorder CI checks

* Modify error message on local port changes

* Modify error message on local port changes - pt.2

2 files changed, 20 insertions, 21 deletions

diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml
index a7fb6408b..d97490093 100644
--- a/scripts/azure-pipelines/windows/azure-pipelines.yml
+++ b/scripts/azure-pipelines/windows/azure-pipelines.yml
@@ -25,6 +25,21 @@ jobs:
   # Note: D: is the Azure machines' temporary disk.

   - script: .\bootstrap-vcpkg.bat

     displayName: 'Build vcpkg'

+  - task: PowerShell@2

+    displayName: 'Run vcpkg end-to-end tests'

+    condition: eq('${{ parameters.triplet }}', 'x86-windows')

+    inputs:

+      filePath: 'scripts/azure-pipelines/end-to-end-tests.ps1'

+      arguments: '-Triplet ${{ parameters.triplet }} -WorkingRoot ${{ variables.WORKING_ROOT }}'

+      pwsh: true

+  - task: PowerShell@2

+    displayName: 'Validate version files'

+    condition: eq('${{ parameters.triplet }}', 'x86-windows')

+    inputs:

+      targetType: inline

+      script: |

+        ./vcpkg.exe --feature-flags=versions x-ci-verify-versions --verbose

+      pwsh: true

   - task: CmdLine@2

     displayName: "Build vcpkg with CMake, with older VS, and Run Tests"

     condition: eq('${{ parameters.triplet }}', 'x86-windows')

@@ -45,21 +60,6 @@ jobs:
         cmake --build build.x86.vs2017

       failOnStderr: true

   - task: PowerShell@2

-    displayName: 'Run vcpkg end-to-end tests'

-    condition: eq('${{ parameters.triplet }}', 'x86-windows')

-    inputs:

-      filePath: 'scripts/azure-pipelines/end-to-end-tests.ps1'

-      arguments: '-Triplet ${{ parameters.triplet }} -WorkingRoot ${{ variables.WORKING_ROOT }}'

-      pwsh: true

-  - task: PowerShell@2

-    displayName: 'Validate version files'

-    condition: eq('${{ parameters.triplet }}', 'x86-windows')

-    inputs:

-      targetType: inline

-      script: |

-        ./vcpkg.exe --feature-flags=versions x-ci-verify-versions --verbose

-      pwsh: true

-  - task: PowerShell@2

     displayName: '*** Test Modified Ports and Prepare Test Logs ***'

     inputs:

       failOnStderr: true

diff --git a/toolsrc/src/vcpkg/commands.civerifyversions.cpp b/toolsrc/src/vcpkg/commands.civerifyversions.cpp
index 7f142e279..82a98aa9d 100644
--- a/toolsrc/src/vcpkg/commands.civerifyversions.cpp
+++ b/toolsrc/src/vcpkg/commands.civerifyversions.cpp
@@ -229,11 +229,10 @@ namespace vcpkg::Commands::CIVerifyVersions
             return {
                 Strings::format("Error: While reading versions for port %s from file: %s\n"
                                 "       File declares version `%s` with SHA: %s\n"
-                                "       But local port with the same verion has a differint SHA: %s\n"
-                                "       This may be caused by locally commited changes to the port.\n"
-                                "       Run:\n\n"
-                                "           vcpkg x-add-version %s --overwrite-version\n\n"
-                                "       to overwrite the declared version's SHA.",
+                                "       But local port with the same verion has a different SHA: %s\n"
+                                "       Please update the port's version fields and then run:\n\n"
+                                "           vcpkg x-add-version %s\n\n"
+                                "       to add a new version.",
                                 port_name,
                                 fs::u8string(versions_file_path),
                                 top_entry.first.versiont,
@@ -402,7 +401,7 @@ namespace vcpkg::Commands::CIVerifyVersions
             }
             System::print2(System::Color::error,
                            "\nTo attempt to resolve all erros at once, run:\n\n"
-                           "    vcpkg x-add-version --all --overwrite-versions\n\n");
+                           "    vcpkg x-add-version --all\n\n");
             Checks::exit_fail(VCPKG_LINE_INFO);
         }
         Checks::exit_success(VCPKG_LINE_INFO);