diff --git a/ICSharpCode.Decompiler.Tests/Helpers/SdkUtility.cs b/ICSharpCode.Decompiler.Tests/Helpers/SdkUtility.cs index 4ad1af0eb..d25d076c3 100644 --- a/ICSharpCode.Decompiler.Tests/Helpers/SdkUtility.cs +++ b/ICSharpCode.Decompiler.Tests/Helpers/SdkUtility.cs @@ -160,6 +160,19 @@ namespace ICSharpCode.Decompiler.Tests.Helpers return windowsSdk80InstallRoot; } } + + static string WindowsSdk461InstallRoot = null; + /// + /// Location of the .NET 4.6.1 SDK install root. + /// + public static string WindowsSdk461NetFxTools { + get { + if (WindowsSdk461InstallRoot == null) { + WindowsSdk461InstallRoot = GetPathFromRegistryX86(@"SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\NETFXSDK\4.6.1\WinSDK-NetFx40Tools", "InstallationFolder") ?? string.Empty; + } + return WindowsSdk461InstallRoot; + } + } #endregion /// @@ -170,6 +183,10 @@ namespace ICSharpCode.Decompiler.Tests.Helpers /// The path of the executable, or null if the exe is not found. public static string GetSdkPath(string exeName) { string execPath; + if (!string.IsNullOrEmpty(WindowsSdk461NetFxTools)) { + execPath = Path.Combine(WindowsSdk461NetFxTools, exeName); + if (File.Exists(execPath)) { return execPath; } + } if (!string.IsNullOrEmpty(WindowsSdk80NetFxTools)) { execPath = Path.Combine(WindowsSdk80NetFxTools, exeName); if (File.Exists(execPath)) { return execPath; }