diff --git a/docs/diff-tool.md b/docs/diff-tool.md index 72015f1a..cfad2f28 100644 --- a/docs/diff-tool.md +++ b/docs/diff-tool.md @@ -1303,18 +1303,18 @@ DiffTools.UseOrder(DiffTool.VisualStudio); /diff "tempFile.txt" "targetFile.txt" "tempFile.txt" "targetFile.txt" ``` * Scanned paths: - * `%ProgramFiles%\Microsoft Visual Studio\2022\Preview\Common7\IDE\devenv.exe` - * `%ProgramW6432%\Microsoft Visual Studio\2022\Preview\Common7\IDE\devenv.exe` - * `%ProgramFiles(x86)%\Microsoft Visual Studio\2022\Preview\Common7\IDE\devenv.exe` - * `%ProgramFiles%\Microsoft Visual Studio\2022\Community\Common7\IDE\devenv.exe` - * `%ProgramW6432%\Microsoft Visual Studio\2022\Community\Common7\IDE\devenv.exe` - * `%ProgramFiles(x86)%\Microsoft Visual Studio\2022\Community\Common7\IDE\devenv.exe` - * `%ProgramFiles%\Microsoft Visual Studio\2022\Professional\Common7\IDE\devenv.exe` - * `%ProgramW6432%\Microsoft Visual Studio\2022\Professional\Common7\IDE\devenv.exe` - * `%ProgramFiles(x86)%\Microsoft Visual Studio\2022\Professional\Common7\IDE\devenv.exe` - * `%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\devenv.exe` - * `%ProgramW6432%\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\devenv.exe` - * `%ProgramFiles(x86)%\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\devenv.exe` + * `%ProgramFiles%\Microsoft Visual Studio\*\Preview\Common7\IDE\devenv.exe` + * `%ProgramW6432%\Microsoft Visual Studio\*\Preview\Common7\IDE\devenv.exe` + * `%ProgramFiles(x86)%\Microsoft Visual Studio\*\Preview\Common7\IDE\devenv.exe` + * `%ProgramFiles%\Microsoft Visual Studio\*\Community\Common7\IDE\devenv.exe` + * `%ProgramW6432%\Microsoft Visual Studio\*\Community\Common7\IDE\devenv.exe` + * `%ProgramFiles(x86)%\Microsoft Visual Studio\*\Community\Common7\IDE\devenv.exe` + * `%ProgramFiles%\Microsoft Visual Studio\*\Professional\Common7\IDE\devenv.exe` + * `%ProgramW6432%\Microsoft Visual Studio\*\Professional\Common7\IDE\devenv.exe` + * `%ProgramFiles(x86)%\Microsoft Visual Studio\*\Professional\Common7\IDE\devenv.exe` + * `%ProgramFiles%\Microsoft Visual Studio\*\Enterprise\Common7\IDE\devenv.exe` + * `%ProgramW6432%\Microsoft Visual Studio\*\Enterprise\Common7\IDE\devenv.exe` + * `%ProgramFiles(x86)%\Microsoft Visual Studio\*\Enterprise\Common7\IDE\devenv.exe` * `%PATH%devenv.exe` ### [VisualStudioCode](https://code.visualstudio.com) diff --git a/src/DiffEngine.Tests/diffTools.include.md b/src/DiffEngine.Tests/diffTools.include.md index 14a8d20f..fb931b4e 100644 --- a/src/DiffEngine.Tests/diffTools.include.md +++ b/src/DiffEngine.Tests/diffTools.include.md @@ -1168,18 +1168,18 @@ DiffTools.UseOrder(DiffTool.VisualStudio); /diff "tempFile.txt" "targetFile.txt" "tempFile.txt" "targetFile.txt" ``` * Scanned paths: - * `%ProgramFiles%\Microsoft Visual Studio\2022\Preview\Common7\IDE\devenv.exe` - * `%ProgramW6432%\Microsoft Visual Studio\2022\Preview\Common7\IDE\devenv.exe` - * `%ProgramFiles(x86)%\Microsoft Visual Studio\2022\Preview\Common7\IDE\devenv.exe` - * `%ProgramFiles%\Microsoft Visual Studio\2022\Community\Common7\IDE\devenv.exe` - * `%ProgramW6432%\Microsoft Visual Studio\2022\Community\Common7\IDE\devenv.exe` - * `%ProgramFiles(x86)%\Microsoft Visual Studio\2022\Community\Common7\IDE\devenv.exe` - * `%ProgramFiles%\Microsoft Visual Studio\2022\Professional\Common7\IDE\devenv.exe` - * `%ProgramW6432%\Microsoft Visual Studio\2022\Professional\Common7\IDE\devenv.exe` - * `%ProgramFiles(x86)%\Microsoft Visual Studio\2022\Professional\Common7\IDE\devenv.exe` - * `%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\devenv.exe` - * `%ProgramW6432%\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\devenv.exe` - * `%ProgramFiles(x86)%\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\devenv.exe` + * `%ProgramFiles%\Microsoft Visual Studio\*\Preview\Common7\IDE\devenv.exe` + * `%ProgramW6432%\Microsoft Visual Studio\*\Preview\Common7\IDE\devenv.exe` + * `%ProgramFiles(x86)%\Microsoft Visual Studio\*\Preview\Common7\IDE\devenv.exe` + * `%ProgramFiles%\Microsoft Visual Studio\*\Community\Common7\IDE\devenv.exe` + * `%ProgramW6432%\Microsoft Visual Studio\*\Community\Common7\IDE\devenv.exe` + * `%ProgramFiles(x86)%\Microsoft Visual Studio\*\Community\Common7\IDE\devenv.exe` + * `%ProgramFiles%\Microsoft Visual Studio\*\Professional\Common7\IDE\devenv.exe` + * `%ProgramW6432%\Microsoft Visual Studio\*\Professional\Common7\IDE\devenv.exe` + * `%ProgramFiles(x86)%\Microsoft Visual Studio\*\Professional\Common7\IDE\devenv.exe` + * `%ProgramFiles%\Microsoft Visual Studio\*\Enterprise\Common7\IDE\devenv.exe` + * `%ProgramW6432%\Microsoft Visual Studio\*\Enterprise\Common7\IDE\devenv.exe` + * `%ProgramFiles(x86)%\Microsoft Visual Studio\*\Enterprise\Common7\IDE\devenv.exe` * `%PATH%devenv.exe` ### [VisualStudioCode](https://code.visualstudio.com) diff --git a/src/DiffEngine/Implementation/VisualStudio.cs b/src/DiffEngine/Implementation/VisualStudio.cs index 70c8aa8f..86853db6 100644 --- a/src/DiffEngine/Implementation/VisualStudio.cs +++ b/src/DiffEngine/Implementation/VisualStudio.cs @@ -31,9 +31,9 @@ static string RightArguments(string temp, string target) "devenv.exe", new( LeftArguments, RightArguments), - @"%ProgramFiles%\Microsoft Visual Studio\2022\Preview\Common7\IDE\", - @"%ProgramFiles%\Microsoft Visual Studio\2022\Community\Common7\IDE\", - @"%ProgramFiles%\Microsoft Visual Studio\2022\Professional\Common7\IDE\", - @"%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\"))); + @"%ProgramFiles%\Microsoft Visual Studio\*\Preview\Common7\IDE\", + @"%ProgramFiles%\Microsoft Visual Studio\*\Community\Common7\IDE\", + @"%ProgramFiles%\Microsoft Visual Studio\*\Professional\Common7\IDE\", + @"%ProgramFiles%\Microsoft Visual Studio\*\Enterprise\Common7\IDE\"))); } } \ No newline at end of file