Merge pull request #653 from 0xced/runtime_references_netfx

Add support for including runtime references under .NET Framework
Fody · Feb 9, 2021 · cd177e1 · cd177e1
2 parents 72c75cf + 0a51465
commit cd177e1
Showing 1 changed file with 23 additions and 30 deletions.
diff --git a/src/Costura.Fody/ResourceEmbedder.cs b/src/Costura.Fody/ResourceEmbedder.cs
@@ -70,44 +70,37 @@ private void EmbedResources(Configuration config)
 
         if (config.IncludeRuntimeReferences)
         {
-            if (!ModuleDefinition.IsUsingDotNetCore())
+            var runtimeReferences = GetFilteredRuntimeReferences(references, config).ToList();
+            if (runtimeReferences.Any())
             {
-                WriteInfo("\tSkipping runtime references for this target framework, library doesn't target .NET Core");
-            }
-            else
-            {
-                var runtimeReferences = GetFilteredRuntimeReferences(references, config).ToList();
-                if (runtimeReferences.Any())
+                WriteInfo("\tIncluding runtime references");
+
+                foreach (var runtimeReference in runtimeReferences)
                 {
-                    WriteInfo("\tIncluding runtime references");
+                    var runtimeReferencePath = runtimeReference.FullPath;
+                    var relativeFileName = runtimeReference.RelativeFileName;
+                    var relativePrefix = runtimeReference.GetResourceNamePrefix("costura.");
 
-                    foreach (var runtimeReference in runtimeReferences)
+                    if (runtimeReference.IsResourcesAssembly && config.IgnoreSatelliteAssemblies)
                     {
-                        var runtimeReferencePath = runtimeReference.FullPath;
-                        var relativeFileName = runtimeReference.RelativeFileName;
-                        var relativePrefix = runtimeReference.GetResourceNamePrefix("costura.");
-
-                        if (runtimeReference.IsResourcesAssembly && config.IgnoreSatelliteAssemblies)
-                        {
-                            continue;
-                        }
+                        continue;
+                    }
 
-                        var embeddedReference = Embed(relativePrefix, relativeFileName, runtimeReferencePath, !disableCompression, createTemporaryAssemblies, config.DisableCleanup);
-                        if (embeddedReference is null == false)
-                        {
-                            embeddedReferences.Add(embeddedReference);
-                        }
+                    var embeddedReference = Embed(relativePrefix, relativeFileName, runtimeReferencePath, !disableCompression, createTemporaryAssemblies, config.DisableCleanup);
+                    if (embeddedReference is null == false)
+                    {
+                        embeddedReferences.Add(embeddedReference);
+                    }
 
-                        if (config.IncludeDebugSymbols)
+                    if (config.IncludeDebugSymbols)
+                    {
+                        var pdbFullPath = Path.ChangeExtension(runtimeReferencePath, "pdb");
+                        if (File.Exists(pdbFullPath))
                         {
-                            var pdbFullPath = Path.ChangeExtension(runtimeReferencePath, "pdb");
-                            if (File.Exists(pdbFullPath))
+                            var embeddedPdb = Embed(relativePrefix, Path.ChangeExtension(relativeFileName, "pdb"), pdbFullPath, !disableCompression, createTemporaryAssemblies, config.DisableCleanup);
+                            if (embeddedPdb is null == false)
                             {
-                                var embeddedPdb = Embed(relativePrefix, Path.ChangeExtension(relativeFileName, "pdb"), pdbFullPath, !disableCompression, createTemporaryAssemblies, config.DisableCleanup);
-                                if (embeddedPdb is null == false)
-                                {
-                                    embeddedReferences.Add(embeddedPdb);
-                                }
+                                embeddedReferences.Add(embeddedPdb);
                             }
                         }
                     }