Merge 728e205 into a60be60

mkaring · web-flow · commit 2f74e9f12163 · 2021-01-09T18:33:51.000+01:00
diff --git a/Confuser.Core/Helpers/InjectHelper.cs b/Confuser.Core/Helpers/InjectHelper.cs
@@ -272,6 +272,18 @@ public InjectContext(ModuleDef module, ModuleDef target) {
 			public override ITypeDefOrRef Map(ITypeDefOrRef source) {
 				if (DefMap.TryGetValue(source, out var mappedRef))
 					return mappedRef as ITypeDefOrRef;
+				
+				// check if the assembly reference needs to be fixed.
+				if (source is TypeRef sourceRef) {
+					var targetAssemblyRef = TargetModule.GetAssemblyRef(sourceRef.DefinitionAssembly.Name);
+					if (!(targetAssemblyRef is null) && !string.Equals(targetAssemblyRef.FullName, source.DefinitionAssembly.FullName, StringComparison.Ordinal)) {
+						// We got a matching assembly by the simple name, but not by the full name.
+						// This means the injected code uses a different assembly version than the target assembly.
+						// We'll fix the assembly reference, to avoid breaking anything.
+						var fixedTypeRef = new TypeRefUser(sourceRef.Module, sourceRef.Namespace, sourceRef.Name, targetAssemblyRef);
+						return Importer.Import(fixedTypeRef);
+					}
+				}
 				return null;
 			}
 
diff --git a/Confuser.Runtime/Confuser.Runtime.csproj b/Confuser.Runtime/Confuser.Runtime.csproj
@@ -4,7 +4,7 @@
   <Import Project="..\ConfuserEx.Common.props" Condition="Exists('..\ConfuserEx.Common.props')" />
 
   <PropertyGroup Label="Assembly Settings">
-    <TargetFrameworks>net461</TargetFrameworks>
+    <TargetFrameworks>net20</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\ConfuserEx.snk</AssemblyOriginatorKeyFile>
@@ -15,6 +15,13 @@
     <Description>Runtime library of ConfuserEx</Description>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
   <Import Project="..\ConfuserEx.Common.targets" Condition="Exists('..\ConfuserEx.Common.targets')" />
 
 </Project>
diff --git a/Confuser.Runtime/ExcludeFromCodeCoverageAttribute.cs b/Confuser.Runtime/ExcludeFromCodeCoverageAttribute.cs
@@ -0,0 +1,7 @@
+﻿#if NETFRAMEWORK && (NET20 || NET35)
+// ReSharper disable once CheckNamespace
+namespace System.Diagnostics.CodeAnalysis {
+	internal sealed class ExcludeFromCodeCoverageAttribute : Attribute {
+	}
+}
+#endif
