Skip to content

Commit 5e0e6d4

Browse files
otuncelliotuncelli
committed
use ILMerge.Fody instead of Costura.Fody
1 parent a69ddd3 commit 5e0e6d4

File tree

4 files changed

+34
-81
lines changed

4 files changed

+34
-81
lines changed

‎SvgFileType/FodyWeavers.xml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
2-
<Costura CreateTemporaryAssemblies="false" ExcludeRuntimeAssemblies="true" IncludeDebugSymbols="false" PreloadOrder="Fizzler|Svg">
3-
<IncludeAssemblies>
4-
Svg
5-
Fizzler
6-
</IncludeAssemblies>
7-
</Costura>
8-
</Weavers>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
3+
<ILMerge IncludeAssemblies="Svg|Fizzler" FullImport="true" />
4+
</Weavers>

‎SvgFileType/FodyWeavers.xsd

Lines changed: 28 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -4,118 +4,78 @@
44
<xs:element name="Weavers">
55
<xs:complexType>
66
<xs:all>
7-
<xs:element name="Costura" minOccurs="0" maxOccurs="1">
7+
<xs:element name="ILMerge" minOccurs="0" maxOccurs="1">
88
<xs:complexType>
99
<xs:all>
10-
<xs:element minOccurs="0" maxOccurs="1" name="ExcludeAssemblies" type="xs:string">
10+
<xs:element name="IncludeAssemblies" type="xs:string" minOccurs="0" maxOccurs="1">
1111
<xs:annotation>
12-
<xs:documentation>A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks</xs:documentation>
12+
<xs:documentation>A regular expression matching the assembly names to include in merging.</xs:documentation>
1313
</xs:annotation>
1414
</xs:element>
15-
<xs:element minOccurs="0" maxOccurs="1" name="IncludeAssemblies" type="xs:string">
15+
<xs:element name="ExcludeAssemblies" type="xs:string" minOccurs="0" maxOccurs="1">
1616
<xs:annotation>
17-
<xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
17+
<xs:documentation>A regular expression matching the assembly names to exclude from merging.</xs:documentation>
1818
</xs:annotation>
1919
</xs:element>
20-
<xs:element minOccurs="0" maxOccurs="1" name="ExcludeRuntimeAssemblies" type="xs:string">
20+
<xs:element name="IncludeResources" type="xs:string" minOccurs="0" maxOccurs="1">
2121
<xs:annotation>
22-
<xs:documentation>A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks</xs:documentation>
22+
<xs:documentation>A regular expression matching the resource names to include in merging.</xs:documentation>
2323
</xs:annotation>
2424
</xs:element>
25-
<xs:element minOccurs="0" maxOccurs="1" name="IncludeRuntimeAssemblies" type="xs:string">
25+
<xs:element name="ExcludeResources" type="xs:string" minOccurs="0" maxOccurs="1">
2626
<xs:annotation>
27-
<xs:documentation>A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
27+
<xs:documentation>A regular expression matching the resource names to exclude from merging.</xs:documentation>
2828
</xs:annotation>
2929
</xs:element>
30-
<xs:element minOccurs="0" maxOccurs="1" name="Unmanaged32Assemblies" type="xs:string">
30+
<xs:element name="HideImportedTypes" type="xs:boolean" minOccurs="0" maxOccurs="1">
3131
<xs:annotation>
32-
<xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with line breaks.</xs:documentation>
32+
<xs:documentation>A switch to control whether the imported types are hidden (made private) or keep their visibility unchanged. Default is 'true'</xs:documentation>
3333
</xs:annotation>
3434
</xs:element>
35-
<xs:element minOccurs="0" maxOccurs="1" name="Unmanaged64Assemblies" type="xs:string">
35+
<xs:element name="NamespacePrefix" type="xs:string" minOccurs="0" maxOccurs="1">
3636
<xs:annotation>
37-
<xs:documentation>A list of unmanaged 64 bit assembly names to include, delimited with line breaks.</xs:documentation>
37+
<xs:documentation>A string that is used as prefix for the namespace of the imported types.</xs:documentation>
3838
</xs:annotation>
3939
</xs:element>
40-
<xs:element minOccurs="0" maxOccurs="1" name="PreloadOrder" type="xs:string">
40+
<xs:element name="FullImport" type="xs:boolean" minOccurs="0" maxOccurs="1">
4141
<xs:annotation>
42-
<xs:documentation>The order of preloaded assemblies, delimited with line breaks.</xs:documentation>
42+
<xs:documentation>A switch to control whether to import the full assemblies or only the referenced types. Default is 'false'</xs:documentation>
4343
</xs:annotation>
4444
</xs:element>
4545
</xs:all>
46-
<xs:attribute name="CreateTemporaryAssemblies" type="xs:boolean">
47-
<xs:annotation>
48-
<xs:documentation>This will copy embedded files to disk before loading them into memory. This is helpful for some scenarios that expected an assembly to be loaded from a physical file.</xs:documentation>
49-
</xs:annotation>
50-
</xs:attribute>
51-
<xs:attribute name="IncludeDebugSymbols" type="xs:boolean">
52-
<xs:annotation>
53-
<xs:documentation>Controls if .pdbs for reference assemblies are also embedded.</xs:documentation>
54-
</xs:annotation>
55-
</xs:attribute>
56-
<xs:attribute name="IncludeRuntimeReferences" type="xs:boolean">
57-
<xs:annotation>
58-
<xs:documentation>Controls if runtime assemblies are also embedded.</xs:documentation>
59-
</xs:annotation>
60-
</xs:attribute>
61-
<xs:attribute name="UseRuntimeReferencePaths" type="xs:boolean">
62-
<xs:annotation>
63-
<xs:documentation>Controls whether the runtime assemblies are embedded with their full path or only with their assembly name.</xs:documentation>
64-
</xs:annotation>
65-
</xs:attribute>
66-
<xs:attribute name="DisableCompression" type="xs:boolean">
67-
<xs:annotation>
68-
<xs:documentation>Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option.</xs:documentation>
69-
</xs:annotation>
70-
</xs:attribute>
71-
<xs:attribute name="DisableCleanup" type="xs:boolean">
72-
<xs:annotation>
73-
<xs:documentation>As part of Costura, embedded assemblies are no longer included as part of the build. This cleanup can be turned off.</xs:documentation>
74-
</xs:annotation>
75-
</xs:attribute>
76-
<xs:attribute name="LoadAtModuleInit" type="xs:boolean">
77-
<xs:annotation>
78-
<xs:documentation>Costura by default will load as part of the module initialization. This flag disables that behavior. Make sure you call CosturaUtility.Initialize() somewhere in your code.</xs:documentation>
79-
</xs:annotation>
80-
</xs:attribute>
81-
<xs:attribute name="IgnoreSatelliteAssemblies" type="xs:boolean">
46+
<xs:attribute name="IncludeAssemblies" type="xs:string">
8247
<xs:annotation>
83-
<xs:documentation>Costura will by default use assemblies with a name like 'resources.dll' as a satellite resource and prepend the output path. This flag disables that behavior.</xs:documentation>
48+
<xs:documentation>A regular expression matching the assembly names to include in merging.</xs:documentation>
8449
</xs:annotation>
8550
</xs:attribute>
8651
<xs:attribute name="ExcludeAssemblies" type="xs:string">
8752
<xs:annotation>
88-
<xs:documentation>A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with |</xs:documentation>
89-
</xs:annotation>
90-
</xs:attribute>
91-
<xs:attribute name="IncludeAssemblies" type="xs:string">
92-
<xs:annotation>
93-
<xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
53+
<xs:documentation>A regular expression matching the assembly names to exclude from merging.</xs:documentation>
9454
</xs:annotation>
9555
</xs:attribute>
96-
<xs:attribute name="ExcludeRuntimeAssemblies" type="xs:string">
56+
<xs:attribute name="IncludeResources" type="xs:string">
9757
<xs:annotation>
98-
<xs:documentation>A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with |</xs:documentation>
58+
<xs:documentation>A regular expression matching the resource names to include in merging.</xs:documentation>
9959
</xs:annotation>
10060
</xs:attribute>
101-
<xs:attribute name="IncludeRuntimeAssemblies" type="xs:string">
61+
<xs:attribute name="ExcludeResources" type="xs:string">
10262
<xs:annotation>
103-
<xs:documentation>A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
63+
<xs:documentation>A regular expression matching the resource names to exclude from merging.</xs:documentation>
10464
</xs:annotation>
10565
</xs:attribute>
106-
<xs:attribute name="Unmanaged32Assemblies" type="xs:string">
66+
<xs:attribute name="HideImportedTypes" type="xs:boolean">
10767
<xs:annotation>
108-
<xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with |.</xs:documentation>
68+
<xs:documentation>A switch to control whether the imported types are hidden (made private) or keep their visibility unchanged. Default is 'true'</xs:documentation>
10969
</xs:annotation>
11070
</xs:attribute>
111-
<xs:attribute name="Unmanaged64Assemblies" type="xs:string">
71+
<xs:attribute name="NamespacePrefix" type="xs:string">
11272
<xs:annotation>
113-
<xs:documentation>A list of unmanaged 64 bit assembly names to include, delimited with |.</xs:documentation>
73+
<xs:documentation>A string that is used as prefix for the namespace of the imported types.</xs:documentation>
11474
</xs:annotation>
11575
</xs:attribute>
116-
<xs:attribute name="PreloadOrder" type="xs:string">
76+
<xs:attribute name="FullImport" type="xs:boolean">
11777
<xs:annotation>
118-
<xs:documentation>The order of preloaded assemblies, delimited with |.</xs:documentation>
78+
<xs:documentation>A switch to control whether to import the full assemblies or only the referenced types. Default is 'false'</xs:documentation>
11979
</xs:annotation>
12080
</xs:attribute>
12181
</xs:complexType>

‎SvgFileType/SvgFileType.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class SvgFileType : FileType
1515
{
1616
// https://forums.getpaint.net/topic/117086-scalable-vector-graphics-filetype-alternative-plugin-svg-svgz
1717

18-
public const string Version = "1.0.3";
18+
public const string Version = "1.0.3.1";
1919

2020
public SvgFileType() : base("Scalable Vector Graphics",
2121
new FileTypeOptions

‎SvgFileType/SvgFileTypePlugin.csproj

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,11 @@
2121
</PropertyGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="Costura.Fody" Version="5.3.0">
25-
<PrivateAssets>all</PrivateAssets>
26-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
27-
</PackageReference>
2824
<PackageReference Include="Fody" Version="6.5.2">
2925
<PrivateAssets>all</PrivateAssets>
3026
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3127
</PackageReference>
28+
<PackageReference Include="ILMerge.Fody" Version="1.16.0" />
3229
</ItemGroup>
3330

3431
<ItemGroup Condition="'$(TargetFramework)'=='net47'">

0 commit comments

Comments
 (0)