Browse Source

remove goto default in UniversalAssemblyResolver

pull/925/merge
Siegfried Pammer 8 years ago
parent
commit
a318b5df71
  1. 5
      ICSharpCode.Decompiler/DotNetCore/UniversalAssemblyResolver.cs

5
ICSharpCode.Decompiler/DotNetCore/UniversalAssemblyResolver.cs

@ -74,14 +74,15 @@ namespace ICSharpCode.Decompiler
switch (targetFramework[0]) { switch (targetFramework[0]) {
case ".NETCoreApp": case ".NETCoreApp":
case ".NETStandard": case ".NETStandard":
if (targetFramework.Length != 2) goto default; if (targetFramework.Length != 2)
return ResolveInternal(name, parameters);
if (dotNetCorePathFinder == null) { if (dotNetCorePathFinder == null) {
var version = targetFramework[1].Length == 3 ? targetFramework[1] + ".0" : targetFramework[1]; var version = targetFramework[1].Length == 3 ? targetFramework[1] + ".0" : targetFramework[1];
dotNetCorePathFinder = new DotNetCorePathFinder(mainAssemblyFileName, TargetFramework, version, this.loadedAssemblyReferences); dotNetCorePathFinder = new DotNetCorePathFinder(mainAssemblyFileName, TargetFramework, version, this.loadedAssemblyReferences);
} }
file = dotNetCorePathFinder.TryResolveDotNetCore(name); file = dotNetCorePathFinder.TryResolveDotNetCore(name);
if (file == null) if (file == null)
goto default; return ResolveInternal(name, parameters);
else { else {
var asm = ModuleDefinition.ReadModule(file, parameters).Assembly; var asm = ModuleDefinition.ReadModule(file, parameters).Assembly;
if (throwOnError && asm == null) if (throwOnError && asm == null)

Loading…
Cancel
Save