From bb70c6a023897f15dc5fbd82e9a263886697379c Mon Sep 17 00:00:00 2001
From: Heath Stewart <heaths@microsoft.com>
Date: Sat, 4 Apr 2020 11:00:48 -0700
Subject: [PATCH] Find any product with MSBuild component

Fixes #7
---
 README.md         | 6 +++---
 dist/index.js     | 4 ++--
 package-lock.json | 2 +-
 package.json      | 2 +-
 src/main.ts       | 5 ++---
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 14b3c41..f344874 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ You know how handy that 'Visual Studio Developer Command Prompt' is on your loca
 
 ```
 - name: Add msbuild to PATH
-  uses: microsoft/setup-msbuild@v1.0.0
+  uses: microsoft/setup-msbuild@v1.0.1
 ```
 
 ## Specifying specific versions of Visual Studio
@@ -13,7 +13,7 @@ You may have a situation where your Actions runner has multiple versions of Visu
 
 ```
 - name: Add msbuild to PATH
-  uses: microsoft/setup-msbuild@v1.0.0
+  uses: microsoft/setup-msbuild@v1.0.1
     with:
       vs-version: [16.4,16.5]
 ```
@@ -23,7 +23,7 @@ This makes use of the vswhere tool which is a tool is delivered by Microsoft to
 
 ```
 - name: Add msbuild to PATH
-  uses: microsoft/setup-msbuild@v1.0.0
+  uses: microsoft/setup-msbuild@v1.0.1
     with:
       vswhere-path: 'C:\path\to\your\tools\'
 ```
diff --git a/dist/index.js b/dist/index.js
index e18b6fb..28bede8 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -979,7 +979,7 @@ const VS_VERSION = core.getInput('vs-version') || 'latest';
 const VSWHERE_PATH = core.getInput('vswhere-path') ||
     path.join(process.env['ProgramFiles(x86)'], 'Microsoft Visual Studio\\Installer');
 // if a specific version of VS is requested
-let VSWHERE_EXEC = '';
+let VSWHERE_EXEC = '-products * -requires Microsoft.Component.MSBuild ';
 if (VS_VERSION === 'latest') {
     VSWHERE_EXEC += '-latest ';
 }
@@ -987,7 +987,7 @@ else {
     VSWHERE_EXEC += `-version ${VS_VERSION} `;
 }
 VSWHERE_EXEC +=
-    '-requires Microsoft.Component.MSBuild -find MSBuild\\**\\Bin\\MSBuild.exe';
+    '-find MSBuild\\**\\Bin\\MSBuild.exe';
 core.debug(`Execution arguments: ${VSWHERE_EXEC}`);
 function run() {
     return __awaiter(this, void 0, void 0, function* () {
diff --git a/package-lock.json b/package-lock.json
index df1a425..cdeacc6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "setup-msbuild",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 8677b81..6db9f93 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "setup-msbuild",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "private": true,
   "description": "Helps set up specific MSBuild tool into PATH for later usage.",
   "main": "lib/main.js",
diff --git a/src/main.ts b/src/main.ts
index 82715aa..e891173 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -14,14 +14,13 @@ const VSWHERE_PATH =
   )
 
 // if a specific version of VS is requested
-let VSWHERE_EXEC = ''
+let VSWHERE_EXEC = '-products * -requires Microsoft.Component.MSBuild '
 if (VS_VERSION === 'latest') {
   VSWHERE_EXEC += '-latest '
 } else {
   VSWHERE_EXEC += `-version ${VS_VERSION} `
 }
-VSWHERE_EXEC +=
-  '-requires Microsoft.Component.MSBuild -find MSBuild\\**\\Bin\\MSBuild.exe'
+VSWHERE_EXEC += '-find MSBuild\\**\\Bin\\MSBuild.exe'
 
 core.debug(`Execution arguments: ${VSWHERE_EXEC}`)