diff --git a/release-tool.ps1 b/release-tool.ps1
index 368a18f6f..dd9f3cfdf 100644
--- a/release-tool.ps1
+++ b/release-tool.ps1
@@ -141,7 +141,8 @@ function Test-WorkingTreeClean {
 
 function Invoke-VSToolchain([String] $Toolchain, [String] $Path, [String] $Arch) {
     # Find Visual Studio installations
-    $vs = Get-CimInstance MSFT_VSInstance
+    $vs = Get-CimInstance MSFT_VSInstance -Namespace root/cimv2/vs
+  
     if ($vs.count -eq 0) {
         $err = "No Visual Studio installations found, download one from https://visualstudio.com/downloads."
         $err = "$err`nIf Visual Studio is installed, you may need to repair the install then restart."
@@ -429,8 +430,8 @@ if ($Merge) {
 # SIG # Begin signature block
 # MIIfXAYJKoZIhvcNAQcCoIIfTTCCH0kCAQExDzANBglghkgBZQMEAgEFADB5Bgor
 # BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG
-# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCC3+AltPeIvGycP
-# LJr+5kqYiFnGPXyfdXgAkgrw+aI/AqCCGSAwggU6MIIEIqADAgECAhBYotctjMD9
+# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCAKyIC1auPQLwaz
+# j39O2BD1plxMAn1GvZmzE7wp3XZ8nqCCGSAwggU6MIIEIqADAgECAhBYotctjMD9
 # icz/IeDU7cdKMA0GCSqGSIb3DQEBCwUAMHwxCzAJBgNVBAYTAkdCMRswGQYDVQQI
 # ExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcTB1NhbGZvcmQxGDAWBgNVBAoT
 # D1NlY3RpZ28gTGltaXRlZDEkMCIGA1UEAxMbU2VjdGlnbyBSU0EgQ29kZSBTaWdu
@@ -570,29 +571,29 @@ if ($Merge) {
 # Z28gUlNBIENvZGUgU2lnbmluZyBDQQIQWKLXLYzA/YnM/yHg1O3HSjANBglghkgB
 # ZQMEAgEFAKCBhDAYBgorBgEEAYI3AgEMMQowCKACgAChAoAAMBkGCSqGSIb3DQEJ
 # AzEMBgorBgEEAYI3AgEEMBwGCisGAQQBgjcCAQsxDjAMBgorBgEEAYI3AgEVMC8G
-# CSqGSIb3DQEJBDEiBCBp7GODztdZALJXKtlDO7iMqjlod5DXJQUaVMMwaRVDkzAN
-# BgkqhkiG9w0BAQEFAASCAQB8i7HZnhNcD6S7hrG+nk6bDcg8LyL+C3QOnmxIQKA3
-# +TQB02qB83WI+ErrH7GQHgi+7kB4K8NYs1dK/yYIp6pwgXUnYqQlsQCYzMRk9Shn
-# gvJWO04dV3V17NHfAXHT/+gHKTOOUJf58/Yabo87/vu4K5gE2g3TOrMHm0G9x1k8
-# PXgW6mzMD6xEz0tuvXdGZ8BSZ5VlDYV5ITchn8Eni29RTSIBIbZHbMWI5Gcsbzqd
-# ZLKHmVOoT2Las0VWNzq96+1X1HjFGhPqAIm19ByZyGI3OO9fgP6lfGuHyE2eyYUp
-# MKQ6qr8nfPzmp3bF0JLSGV3pEViDOqRgkkQmOXHfHlqsoYIDSzCCA0cGCSqGSIb3
+# CSqGSIb3DQEJBDEiBCBUpPGo/INvf4Xj406HDdE+sHXbcJv9Jglt3BtykWsFRjAN
+# BgkqhkiG9w0BAQEFAASCAQCfTwcZ5fDueiR2YyZstfXEmDKuaumamWEJiW1hxkrn
+# +qmb+pOD7z8h05KDYjgPNyUGIOTw6Fm6TT8k+liqHb+WdF+7X1Le0iUMwFud9Ayd
+# BpaKshMifv+WnyBqsXfdu5IL2WyLdhqfo7hx414Scig3Wo3BelQ78vflUC09ZQXB
+# HIufwRiJVvLH1w7sPubZcp9PbEAhLfmFdhJgj46Z953jFHKZ3ucB3CSCWz4gP8pO
+# ARYot+I7Sr+7rnhTnOxOF2r0XAH8LaRp8qKXf2b8EkHpzXKTRuEXDbtkPdfQQ1YB
+# Np6YcbgM8LsBBbDnwJRiLRzdLVxpI71nhWk9TIdH/orMoYIDSzCCA0cGCSqGSIb3
 # DQEJBjGCAzgwggM0AgEBMIGRMH0xCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVh
 # dGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcTB1NhbGZvcmQxGDAWBgNVBAoTD1NlY3Rp
 # Z28gTGltaXRlZDElMCMGA1UEAxMcU2VjdGlnbyBSU0EgVGltZSBTdGFtcGluZyBD
 # QQIQOUwl4XygbSeoZeI72R0i1DANBglghkgBZQMEAgIFAKB5MBgGCSqGSIb3DQEJ
-# AzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTIzMDUxNDE1NDIxNVowPwYJ
-# KoZIhvcNAQkEMTIEMKBb5TFeMuv1qxZqrDJfQEEWakbNGIkGSDjYiTjHu6rQDjE+
-# wn2WhvQ9S7rrqkZ4TzANBgkqhkiG9w0BAQEFAASCAgB9rwCunYwZmKK2yrW21JSE
-# mdzXgL1Hs6niOJCuFJM1+t3q9KNvLXMgc6E/kiwyHrLVEBrCTGLOp3+AbElJJ/Vu
-# NimG9BgS5/62lJEt/kBQkaO/x+wKctlrPzrPNK1FZurro3zpA+xFsXV+SZPzj7jW
-# BHmtVDGJFg3BEMaliXB4afT57sBKnm29qZW7x6SiZ8v5IQfNTOygaPCyKKg6LxKi
-# Nyq5cze9rBbXsbnSGp15mClRRdhaONGMpHtoEHRQ62GuLYT/frg5h4vaGZaAmIL+
-# 9EZhHzImr10MpZNhNO+PMzvaisBUy9+Bx/vSSXu4DNoqgKq5Q/m+cJAwaZendA3W
-# vFg2tk/uhfbosURr8XehcG3HsAtgE81xa/lKCqKkDLKmr4LVFoSdaUoYnT1X+WER
-# beo/4BzLganKwBktK/hz4kR94aZDdCXnIdJCVSAcH9bpUPcgiv2UoWxStswpcQLy
-# R/uYROrQ/AhVXZK3uZ7vAjZFJ+fNn6gELTz/fznrvw5wdLFZGR26/B0d+N9iqYZF
-# 4V15aFcVy+2lxn/uoTtfaBWXBz1ogtw5hMpFFYD7Ud5ulTG3akNqoOXBXoZ0tsEP
-# nlyuwg8R2Vne0am6tqOkZJGKZU+0IEBYL8AMAU7fdC6m7NToYMeprplYiHvZMubm
-# oEg70cKHaUX3Ydxx0QGHDQ==
+# AzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTI0MDEyNzEzNDU1MVowPwYJ
+# KoZIhvcNAQkEMTIEMKYUWPwJLmb0lULC6uSYvVRlCBaqMMyka0aOMAr1FN6C1A3/
+# ipipXIXvwJMb0N+3izANBgkqhkiG9w0BAQEFAASCAgBjXB7JXSY/Wx82IkLHAaYF
+# FWYYr3VIq0VWR3k9peGIh9M9yg00LHv8R2mGK5A6o6MFeJ1FPw+VBXcCb4zKDD3S
+# C5LE0fJB6V2o++JTdWh8u5OiJaSsfDhVSTqYJ/3Xl1EYIDx3CkKCdGLRmRUUvrUL
+# Nix2z0fen0BzCnq/RBpohwDwavZ3d16ms/Lj4MdMJtagZ92fBqa9t/MazCiiIdYP
+# VIVIyrGy3mnao07DNOzziXtaypEsVFiQZRNvrqtvXf9G9JqdpY0td69kdenVmwIB
+# L68AQngRtvLy8i/8ZybCc3enxKoqe//91EbKXeRWkRZrnX9zNcmU/dG97px4WlO1
+# dnQ6Jz1LvirhlAYLjaLyEnXziKDGMP9TCeBwUR2K/6oP6QKcCFo4R/BaVsIpln4h
+# ZhUonOKvleLbpvIDV7TPr8ZPNvLbGkqDlfvfR4dkqa3RVuSS029ruu0bbNL2fUft
+# Czq6/PNNRvEhnGzmikZycU7HlH9TjizmGU4Na7VrGhroPM8U7CWDwahPnSER8NNa
+# RZPA47j/3zgJsFCnCiy/Bv+UlWIOsuqJePZmDXm02ZQvXKYXe9QZH7GcmsdNEBNm
+# 3vVoXPZzYJaBxJ6r1khlWDEZQPDwuZ1jLxoReh7fA5hjdzTA5T0V4pY5RbCCSzZZ
+# ZLe2Rukc5sYs4p06MuiYyg==
 # SIG # End signature block