From cd1cd6f5ba9297bf2b8e6cc631f9c4f3dc33a888 Mon Sep 17 00:00:00 2001
From: Andrew Timson <Andrew.Timson@wtwco.com>
Date: Tue, 1 Aug 2023 15:31:07 -0400
Subject: [PATCH] Support witadmin existing on path, and 32-bit PowerShell.

---
 Export/ExportProjectTemplate.ps1 | 12 ++++++------
 Import/ConformProject.ps1        | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Export/ExportProjectTemplate.ps1 b/Export/ExportProjectTemplate.ps1
index 2463de8..9b5fdfd 100644
--- a/Export/ExportProjectTemplate.ps1
+++ b/Export/ExportProjectTemplate.ps1
@@ -80,9 +80,9 @@ if(Test-Path $OutputDirectory) {
 
 #if your vs directory is someplace else other than the standard location, you will need to set it here
 $VSDirectories = @()
-$VSDirectories += "${env:ProgramFiles}\Microsoft Visual Studio\2022\TeamExplorer\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer"
-$VSDirectories += "${env:ProgramFiles}\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer"
-$VSDirectories += "${env:ProgramFiles}\Microsoft Visual Studio\2022\Professional\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer"
+$VSDirectories += "${env:ProgramW6432}\Microsoft Visual Studio\2022\TeamExplorer\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer"
+$VSDirectories += "${env:ProgramW6432}\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer"
+$VSDirectories += "${env:ProgramW6432}\Microsoft Visual Studio\2022\Professional\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer"
 $VSDirectories += "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer"
 $VSDirectories += "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer"
 $VSDirectories += "${env:ProgramFiles(x86)}\Microsoft Visual Studio 14.0\Common7\IDE"
@@ -101,10 +101,10 @@ if(-not (Get-Command $WitAdminExe -ErrorAction SilentlyContinue)) {
       break
     }
   }
-}
 
-if(-not (Test-Path $WitAdminExe)) {
-  throw "Unable to find the witadmin.exe in your path or in any VS install."
+  if(-not (Test-Path $WitAdminExe)) {
+	throw "Unable to find the witadmin.exe in your path or in any VS install."
+  }
 }
 
 # Format witadmin exe with quotes for the invoke-expression to like
diff --git a/Import/ConformProject.ps1 b/Import/ConformProject.ps1
index 1401163..40592c6 100644
--- a/Import/ConformProject.ps1
+++ b/Import/ConformProject.ps1
@@ -24,9 +24,9 @@ param
 $scriptFolder = Split-Path -Path $MyInvocation.MyCommand.Path
 
 $VSDirectories = @()
-$VSDirectories += "${env:ProgramFiles}\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer"
-$VSDirectories += "${env:ProgramFiles}\Microsoft Visual Studio\2022\Professional\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer"
-$VSDirectories += "${env:ProgramFiles}\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer"
+$VSDirectories += "${env:ProgramW6432}\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer"
+$VSDirectories += "${env:ProgramW6432}\Microsoft Visual Studio\2022\Professional\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer"
+$VSDirectories += "${env:ProgramW6432}\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer"
 $VSDirectories += "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer"
 $VSDirectories += "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\Professional\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer"
 $VSDirectories += "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer"
@@ -51,10 +51,10 @@ if(-not (Get-Command $WitAdminExe -ErrorAction SilentlyContinue)) {
       break
     }
   }
-}
 
-if(-not (Test-Path $WitAdminExe)) {
-  throw "Unable to find the witadmin.exe in your path or in any VS install."
+  if(-not (Test-Path $WitAdminExe)) {
+	throw "Unable to find the witadmin.exe in your path or in any VS install."
+  }
 }
 
 # Format witadmin exe with quotes for the invoke-expression to like