Fix net10.0-related bug in TargetServices.DetectTargetFramework

siegfriedpammer · siegfriedpammer · commit d4a27b9b7528 · 2025-07-09T22:48:24.000+02:00
diff --git a/ICSharpCode.Decompiler/CSharp/ProjectDecompiler/TargetServices.cs b/ICSharpCode.Decompiler/CSharp/ProjectDecompiler/TargetServices.cs
@@ -76,11 +76,11 @@ public static TargetFramework DetectTargetFramework(MetadataFile module)
 				targetFrameworkIdentifier = frameworkParts.FirstOrDefault(a => !a.StartsWith(VersionToken, StringComparison.OrdinalIgnoreCase) && !a.StartsWith(ProfileToken, StringComparison.OrdinalIgnoreCase));
 				string frameworkVersion = frameworkParts.FirstOrDefault(a => a.StartsWith(VersionToken, StringComparison.OrdinalIgnoreCase));
 
-				if (frameworkVersion != null)
+				if (frameworkVersion != null && Version.TryParse(frameworkVersion.Substring(VersionToken.Length).Replace("v", ""), out var version))
 				{
-					versionNumber = int.Parse(frameworkVersion.Substring(VersionToken.Length).Replace("v", "").Replace(".", ""));
-					if (versionNumber < 100)
-						versionNumber *= 10;
+					versionNumber = version.Major * 100 + version.Minor * 10;
+					if (version.Build > 0)
+						versionNumber += version.Build;
 				}
 
 				string frameworkProfile = frameworkParts.FirstOrDefault(a => a.StartsWith(ProfileToken, StringComparison.OrdinalIgnoreCase));

Original file line number	Diff line number	Diff line change
`@@ -76,11 +76,11 @@ public static TargetFramework DetectTargetFramework(MetadataFile module)`
`76`	`76`	`targetFrameworkIdentifier = frameworkParts.FirstOrDefault(a => !a.StartsWith(VersionToken, StringComparison.OrdinalIgnoreCase) && !a.StartsWith(ProfileToken, StringComparison.OrdinalIgnoreCase));`
`77`	`77`	`string frameworkVersion = frameworkParts.FirstOrDefault(a => a.StartsWith(VersionToken, StringComparison.OrdinalIgnoreCase));`
`78`	`78`
`79`		`- if (frameworkVersion != null)`
	`79`	`+ if (frameworkVersion != null && Version.TryParse(frameworkVersion.Substring(VersionToken.Length).Replace("v", ""), out var version))`
`80`	`80`	`{`
`81`		`- versionNumber = int.Parse(frameworkVersion.Substring(VersionToken.Length).Replace("v", "").Replace(".", ""));`
`82`		`- if (versionNumber < 100)`
`83`		`- versionNumber *= 10;`
	`81`	`+ versionNumber = version.Major * 100 + version.Minor * 10;`
	`82`	`+ if (version.Build > 0)`
	`83`	`+ versionNumber += version.Build;`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`string frameworkProfile = frameworkParts.FirstOrDefault(a => a.StartsWith(ProfileToken, StringComparison.OrdinalIgnoreCase));`