From 61aa827d5c837553088df3c2fbd584564641ca3b Mon Sep 17 00:00:00 2001
From: Daniel Jurek <djurek@microsoft.com>
Date: Mon, 26 Apr 2021 08:56:37 -0700
Subject: [PATCH] EngSys updates to support new vcpkg.json format (#2153)

* Use linux for vcpkg release

* Force lf line endings

* Set config correctly

* Better core.eol syntax and sequencing

* Try using linux host which uses LF by default

* Revert "Try using linux host which uses LF by default"

This reverts commit 160eb22b647e851a50f9d1e7b157a1e385fe946f.

* Use vcpkg.exe to format the manifest

* Spell correctly

* Move format-manfiest
---
 eng/scripts/Update-VcpkgPort.ps1 | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/eng/scripts/Update-VcpkgPort.ps1 b/eng/scripts/Update-VcpkgPort.ps1
index 35708e720..6f83c1750 100644
--- a/eng/scripts/Update-VcpkgPort.ps1
+++ b/eng/scripts/Update-VcpkgPort.ps1
@@ -58,6 +58,13 @@ Copy-Item `
 Write-Host "Files in destination directory:" 
 Get-ChildItem -Recurse $PortDestinationDirectory | Out-String | Write-Host
 
+Write-Host "./bootstrap-vcpkg.bat"
+./bootstrap-vcpkg.bat
+
+# Format the manifest file
+Write-Host "./vcpkg.exe format-manifest $PortDestinationDirectory/vcpkg.json"
+./vcpkg.exe format-manifest $PortDestinationDirectory/vcpkg.json
+
 Write-Host "git status"
 git status
 
@@ -68,10 +75,6 @@ git add -A
 Write-Host "git $GitCommitParameters commit -m 'Temporary commit to reset after x-add-version'"
 "git $GitCommitParameters commit -m 'Temporary commit to reset after x-add-version'" | Invoke-Expression -Verbose | Write-Host
 
-
-Write-Host "./bootstrap-vcpkg.bat"
-./bootstrap-vcpkg.bat
-
 if ($LASTEXITCODE -ne 0) { 
     Write-Error "Failed to run bootstrap-vcpkg.bat"
     exit 1
@@ -82,6 +85,7 @@ if ($DailyRelease) {
     $addVersionAdditionalParameters = '--overwrite-version'
 }
 
+
 Write-Host "./vcpkg.exe x-add-version $VcpkgPortName $addVersionAdditionalParameters"
 ./vcpkg.exe x-add-version $VcpkgPortName $addVersionAdditionalParameters