提交 12ee48cf 编写于 作者: R Robert Jeppesen 提交者: KevinRansom

Allow WsdlTypeProvider to work on a fresh install of Windows 10/VS2015.

Replaced the nesting with a list of candidates.

Fixes #637
上级 12b33caf
...@@ -102,15 +102,18 @@ module internal Util = ...@@ -102,15 +102,18 @@ module internal Util =
| null -> () | null -> ()
| _ -> key.Dispose() | _ -> key.Dispose()
reg32view.Dispose() // if reg32view were really null, we would not be here and the user would have more serious issues not being able to access HKLM reg32view.Dispose() // if reg32view were really null, we would not be here and the user would have more serious issues not being able to access HKLM
useKey @"SOFTWARE\Microsoft\Microsoft SDKs\Windows\v8.0A\WinSDK-NetFx40Tools" (fun key ->
match tryResult key with let SDK_REGPATHS = [ @"Software\Microsoft\Microsoft SDKs\NETFXSDK\4.6\WinSDK-NetFx40Tools"
| Some r -> r @"Software\Microsoft\Microsoft SDKs\Windows\v8.1A\WinSDK-NetFx40Tools"
| None -> @"Software\Microsoft\Microsoft SDKs\Windows\v8.0A\WinSDK-NetFx40Tools"
useKey @"SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A\WinSDK-NetFx40Tools" (fun key -> @"Software\Microsoft\Microsoft SDKs\Windows\v7.1\WinSDK-NetFx40Tools"
match tryResult key with @"Software\Microsoft\Microsoft SDKs\Windows\v7.0A\WinSDK-NetFx40Tools" ]
| Some r -> r
| None -> SDK_REGPATHS
raise <| System.NotSupportedException(FSData.SR.unsupportedFramework()))) |> Seq.tryPick (fun p -> useKey p tryResult)
|> function
| Some p -> p
| _ -> raise <| System.NotSupportedException(FSData.SR.unsupportedFramework())
let sdkUtil name = Path.Combine(sdkPath(), name) let sdkUtil name = Path.Combine(sdkPath(), name)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册