diff options
| author | Jb Evain <jb@evain.net> | 2019-02-06 20:23:17 +0300 |
|---|---|---|
| committer | Jb Evain <jb@evain.net> | 2019-02-12 01:38:44 +0300 |
| commit | 3898dd6d1ecd5b325dc90de0838e8fcfc7f23def (patch) | |
| tree | 9c579c7358e63c7c986312d34e33f618490d5640 /Test/Mono.Cecil.Tests | |
| parent | 4f4c05135629e6a5afc14ce1d1ea894cde5cc676 (diff) | |
Remove NET_4_0 define; If needed we can now use the dotnet core provided one
Diffstat (limited to 'Test/Mono.Cecil.Tests')
| -rw-r--r-- | Test/Mono.Cecil.Tests/WindowsRuntimeAssemblyResolver.cs | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/Test/Mono.Cecil.Tests/WindowsRuntimeAssemblyResolver.cs b/Test/Mono.Cecil.Tests/WindowsRuntimeAssemblyResolver.cs index fb39e33..6561629 100644 --- a/Test/Mono.Cecil.Tests/WindowsRuntimeAssemblyResolver.cs +++ b/Test/Mono.Cecil.Tests/WindowsRuntimeAssemblyResolver.cs @@ -68,23 +68,13 @@ namespace Mono.Cecil.Tests { void LoadWindowsSdk (string registryVersion, string windowsKitsVersion, Action<string> registerAssembliesCallback) { -#if NET_4_0 using (var localMachine32Key = RegistryKey.OpenBaseKey (RegistryHive.LocalMachine, RegistryView.Registry32)) { using (var sdkKey = localMachine32Key.OpenSubKey (@"SOFTWARE\Microsoft\Microsoft SDKs\Windows\v" + registryVersion)) { -#else - { - // this will fail on 64-bit process as there's no way (other than pinoke) to read from 32-bit registry view - using (var sdkKey = Registry.LocalMachine.OpenSubKey (@"SOFTWARE\Microsoft\Microsoft SDKs\Windows\" + registryVersion)) { -#endif string installationFolder = null; if (sdkKey != null) installationFolder = (string)sdkKey.GetValue ("InstallationFolder"); if (string.IsNullOrEmpty (installationFolder)) { -#if NET_4_0 var programFilesX86 = Environment.GetFolderPath (Environment.SpecialFolder.ProgramFilesX86); -#else - var programFilesX86 = Environment.GetEnvironmentVariable ("ProgramFiles(x86)"); -#endif installationFolder = Path.Combine (programFilesX86, @"Windows Kits\" + windowsKitsVersion); } registerAssembliesCallback (installationFolder); |