Merge VcpkgPowershellUtils into bootstrap.ps1

2 files changed, 25 insertions, 27 deletions

diff --git a/scripts/VcpkgPowershellUtils.ps1 b/scripts/VcpkgPowershellUtils.ps1
deleted file mode 100644
index 259df4acb..000000000
--- a/scripts/VcpkgPowershellUtils.ps1
+++ /dev/null
@@ -1,25 +0,0 @@
-function vcpkgHasProperty([Parameter(Mandatory=$true)][AllowNull()]$object, [Parameter(Mandatory=$true)]$propertyName)
-{
-    if ($object -eq $null)
-    {
-        return $false
-    }
-
-    return [bool]($object.psobject.Properties | Where-Object { $_.Name -eq "$propertyName"})
-}
-
-function getProgramFiles32bit()
-{
-    $out = ${env:PROGRAMFILES(X86)}
-    if ($out -eq $null)
-    {
-        $out = ${env:PROGRAMFILES}
-    }
-
-    if ($out -eq $null)
-    {
-        throw "Could not find [Program Files 32-bit]"
-    }
-
-    return $out
-}
\ No newline at end of file
diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1
index a2d9103dd..09c138bb3 100644
--- a/scripts/bootstrap.ps1
+++ b/scripts/bootstrap.ps1
@@ -5,10 +5,33 @@ param(
 )
 Set-StrictMode -Version Latest
 $scriptsDir = split-path -parent $script:MyInvocation.MyCommand.Definition
-. "$scriptsDir\VcpkgPowershellUtils.ps1"
-
 $vcpkgRootDir = $scriptsDir
 $withVSPath = $withVSPath -replace "\\$" # Remove potential trailing backslash
+function vcpkgHasProperty([Parameter(Mandatory=$true)][AllowNull()]$object, [Parameter(Mandatory=$true)]$propertyName)
+{
+    if ($object -eq $null)
+    {
+        return $false
+    }
+
+    return [bool]($object.psobject.Properties | Where-Object { $_.Name -eq "$propertyName"})
+}
+
+function getProgramFiles32bit()
+{
+    $out = ${env:PROGRAMFILES(X86)}
+    if ($out -eq $null)
+    {
+        $out = ${env:PROGRAMFILES}
+    }
+
+    if ($out -eq $null)
+    {
+        throw "Could not find [Program Files 32-bit]"
+    }
+
+    return $out
+}
 
 while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root"))
 {