Improve parsing of TargetFramework attribute in UniversalAssemblyReso…

…lver.
icsharpcode · Jul 28, 2018 · 3d68da7 · 3d68da7
1 parent 1d937bc
commit 3d68da7
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 18 deletions.
diff --git a/ICSharpCode.Decompiler/Metadata/DotNetCorePathFinder.cs b/ICSharpCode.Decompiler/Metadata/DotNetCorePathFinder.cs
@@ -57,15 +57,13 @@ public DotNetCorePackageInfo(string fullName, string type, string path, string[]
 		ISet<string> packageBasePaths = new HashSet<string>(StringComparer.Ordinal);
 		readonly string assemblyName;
 		readonly string basePath;
-		readonly string targetFrameworkId;
-		readonly string version;
+		readonly Version version;
 		readonly string dotnetBasePath = FindDotNetExeDirectory();
 
-		public DotNetCorePathFinder(string parentAssemblyFileName, string targetFrameworkId, string version, ReferenceLoadInfo loadInfo = null)
+		public DotNetCorePathFinder(string parentAssemblyFileName, string targetFrameworkId, Version version, ReferenceLoadInfo loadInfo = null)
 		{
 			this.assemblyName = Path.GetFileNameWithoutExtension(parentAssemblyFileName);
 			this.basePath = Path.GetDirectoryName(parentAssemblyFileName);
-			this.targetFrameworkId = targetFrameworkId;
 			this.version = version;
 
 			var depsJsonFileName = Path.Combine(basePath, $"{assemblyName}.deps.json");
@@ -98,7 +96,7 @@ public string TryResolveDotNetCore(IAssemblyReference name)
 				}
 			}
 
-			return FallbackToDotNetSharedDirectory(name, new Version(version));
+			return FallbackToDotNetSharedDirectory(name, version);
 		}
 
 		static IEnumerable<DotNetCorePackageInfo> LoadPackageInfos(string depsJsonFileName, string targetFramework)

diff --git a/ICSharpCode.Decompiler/Metadata/UniversalAssemblyResolver.cs b/ICSharpCode.Decompiler/Metadata/UniversalAssemblyResolver.cs
@@ -67,13 +67,24 @@ public string[] GetSearchDirectories()
 			return directories.ToArray();
 		}
 
-		public string TargetFramework { get; }
+		enum TargetFrameworkIdentifier
+		{
+			NETFramework,
+			NETCoreApp,
+			NETStandard,
+			Silverlight
+		}
+
+		string targetFramework;
+		TargetFrameworkIdentifier targetFrameworkIdentifier;
+		Version targetFrameworkVersion;
 
 		public UniversalAssemblyResolver(string mainAssemblyFileName, bool throwOnError, string targetFramework,
 			PEStreamOptions options = PEStreamOptions.Default)
 		{
 			this.options = options;
-			this.TargetFramework = targetFramework ?? string.Empty;
+			this.targetFramework = targetFramework ?? string.Empty;
+			(targetFrameworkIdentifier, targetFrameworkVersion) = ParseTargetFramework(this.targetFramework);
 			this.mainAssemblyFileName = mainAssemblyFileName;
 			this.baseDirectory = Path.GetDirectoryName(mainAssemblyFileName);
 			this.throwOnError = throwOnError;
@@ -82,6 +93,52 @@ public string[] GetSearchDirectories()
 			AddSearchDirectory(baseDirectory);
 		}
 
+		(TargetFrameworkIdentifier, Version) ParseTargetFramework(string targetFramework)
+		{
+			string[] tokens = targetFramework.Split(',');
+			TargetFrameworkIdentifier identifier;
+
+			switch (tokens[0].Trim().ToUpperInvariant()) {
+				case ".NETCOREAPP":
+					identifier = TargetFrameworkIdentifier.NETCoreApp;
+					break;
+				case ".NETSTANDARD":
+					identifier = TargetFrameworkIdentifier.NETStandard;
+					break;
+				case "SILVERLIGHT":
+					identifier = TargetFrameworkIdentifier.Silverlight;
+					break;
+				default:
+					identifier = TargetFrameworkIdentifier.NETFramework;
+					break;
+			}
+
+			Version version = null;
+
+			for (int i = 1; i < tokens.Length; i++) {
+				var pair = tokens[i].Trim().Split('=');
+
+				if (pair.Length != 2)
+					continue;
+
+				switch (pair[0].Trim().ToUpperInvariant()) {
+					case "VERSION":
+						var versionString = pair[1].TrimStart('v');
+						if (identifier == TargetFrameworkIdentifier.NETCoreApp ||
+							identifier == TargetFrameworkIdentifier.NETStandard)
+						{
+							if (versionString.Length == 3)
+								versionString += ".0";
+						}
+						if (!Version.TryParse(versionString, out version))
+							version = null;
+						break;
+				}
+			}
+
+			return (identifier, version ?? ZeroVersion);
+		}
+
 		public PEFile Resolve(IAssemblyReference name)
 		{
 			var file = FindAssemblyFile(name);
@@ -107,25 +164,23 @@ public PEFile ResolveModule(PEFile mainModule, string moduleName)
 
 		public string FindAssemblyFile(IAssemblyReference name)
 		{
-			var targetFramework = TargetFramework.Split(new[] { ",Version=v", ",Profile=" }, StringSplitOptions.None);
 			string file = null;
-			switch (targetFramework[0]) {
-				case ".NETCoreApp":
-				case ".NETStandard":
-					if (targetFramework.Length < 2)
+			switch (targetFrameworkIdentifier) {
+				case TargetFrameworkIdentifier.NETCoreApp:
+				case TargetFrameworkIdentifier.NETStandard:
+					if (IsZeroOrAllOnes(targetFrameworkVersion))
 						goto default;
 					if (dotNetCorePathFinder == null) {
-						var version = targetFramework[1].Length == 3 ? targetFramework[1] + ".0" : targetFramework[1];
-						dotNetCorePathFinder = new DotNetCorePathFinder(mainAssemblyFileName, TargetFramework, version);
+						dotNetCorePathFinder = new DotNetCorePathFinder(mainAssemblyFileName, targetFramework, targetFrameworkVersion);
 					}
 					file = dotNetCorePathFinder.TryResolveDotNetCore(name);
 					if (file != null)
 						return file;
 					goto default;
-				case "Silverlight":
-					if (targetFramework.Length < 2)
+				case TargetFrameworkIdentifier.Silverlight:
+					if (IsZeroOrAllOnes(targetFrameworkVersion))
 						goto default;
-					file = ResolveSilverlight(name, new Version(targetFramework[1]));
+					file = ResolveSilverlight(name, targetFrameworkVersion);
 					if (file != null)
 						return file;
 					goto default;

diff --git a/ILSpy.AddIn/AssemblyFileFinder.cs b/ILSpy.AddIn/AssemblyFileFinder.cs
@@ -30,7 +30,7 @@ public static string FindAssemblyFile(AssemblyDefinition assemblyDefinition, str
 				case ".NETStandard":
 					if (targetFramework.Length != 2)
 						return FindAssemblyFromGAC(assemblyDefinition);
-					var version = targetFramework[1].Length == 3 ? targetFramework[1] + ".0" : targetFramework[1];
+					var version = targetFramework[1].Length == 3 ? new Version(targetFramework[1] + ".0") : new Version(targetFramework[1]);
 					var dotNetCorePathFinder = new DotNetCorePathFinder(assemblyFile, detectedTargetFramework, version);
 					file = dotNetCorePathFinder.TryResolveDotNetCore(Decompiler.Metadata.AssemblyNameReference.Parse(assemblyName.FullName));
 					if (file != null)