Skip to content

Commit 374dfea

Browse files
ivandroflyivandrofly
committed
Upgrade Costura.Fody and update XSD for assembly management.
Updated Costura.Fody package to version 6.0.0 and added Fody 6.9.1, ensuring compatibility and improving dependency management. Enhanced XSD schema by introducing new attributes, marking certain elements as obsolete, and clarifying documentation for unmanaged assemblies. These changes improve clarity and extend functionality for assembly embedding and configuration.
1 parent b02e681 commit 374dfea

File tree

3 files changed

+79
-35
lines changed

3 files changed

+79
-35
lines changed

‎source/DictionariesProvider/DictionariesProvider.csproj‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<OutputType>Library</OutputType>
4-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
5-
<UseWindowsForms>true</UseWindowsForms>
6-
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
7-
</PropertyGroup>
8-
<ItemGroup>
9-
<Reference Include="System.IO.Compression" />
10-
<Reference Include="System.Net.Http" />
11-
</ItemGroup>
12-
<ItemGroup>
13-
<PackageReference Include="Costura.Fody">
14-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
15-
<PrivateAssets>all</PrivateAssets>
16-
</PackageReference>
17-
<PackageReference Include="Fody">
18-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
19-
<PrivateAssets>all</PrivateAssets>
20-
</PackageReference>
21-
<PackageReference Include="Newtonsoft.Json" />
22-
</ItemGroup>
23-
<PropertyGroup>
24-
<!-- <PostBuildEvent Condition="$(SE_Plugin) != ''">xcopy /s /y $(TargetDir)*.* "$(SE_Plugin)"</PostBuildEvent>-->
25-
</PropertyGroup>
26-
<Import Project="..\Plugin-Shared\Plugin-Shared.projitems" Label="Shared" />
2+
<PropertyGroup>
3+
<OutputType>Library</OutputType>
4+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
5+
<UseWindowsForms>true</UseWindowsForms>
6+
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
7+
</PropertyGroup>
8+
<ItemGroup>
9+
<Reference Include="System.IO.Compression"/>
10+
<Reference Include="System.Net.Http"/>
11+
</ItemGroup>
12+
<ItemGroup>
13+
<PackageReference Include="Costura.Fody">
14+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
15+
<PrivateAssets>all</PrivateAssets>
16+
</PackageReference>
17+
<PackageReference Include="Fody">
18+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
19+
<PrivateAssets>all</PrivateAssets>
20+
</PackageReference>
21+
<PackageReference Include="Newtonsoft.Json"/>
22+
</ItemGroup>
23+
<PropertyGroup>
24+
<!-- <PostBuildEvent Condition="$(SE_Plugin) != ''">xcopy /s /y $(TargetDir)*.* "$(SE_Plugin)"</PostBuildEvent>-->
25+
</PropertyGroup>
26+
<Import Project="..\Plugin-Shared\Plugin-Shared.projitems" Label="Shared"/>
2727
</Project>

‎source/DictionariesProvider/FodyWeavers.xsd‎

Lines changed: 49 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,37 @@
1919
</xs:element>
2020
<xs:element minOccurs="0" maxOccurs="1" name="ExcludeRuntimeAssemblies" type="xs:string">
2121
<xs:annotation>
22-
<xs:documentation>A list of (.NET Core) 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 list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks</xs:documentation>
2323
</xs:annotation>
2424
</xs:element>
2525
<xs:element minOccurs="0" maxOccurs="1" name="IncludeRuntimeAssemblies" type="xs:string">
2626
<xs:annotation>
27-
<xs:documentation>A list of (.NET Core) 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 list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
2828
</xs:annotation>
2929
</xs:element>
3030
<xs:element minOccurs="0" maxOccurs="1" name="Unmanaged32Assemblies" type="xs:string">
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>Obsolete, use UnmanagedWinX86Assemblies instead</xs:documentation>
33+
</xs:annotation>
34+
</xs:element>
35+
<xs:element minOccurs="0" maxOccurs="1" name="UnmanagedWinX86Assemblies" type="xs:string">
36+
<xs:annotation>
37+
<xs:documentation>A list of unmanaged X86 (32 bit) assembly names to include, delimited with line breaks.</xs:documentation>
3338
</xs:annotation>
3439
</xs:element>
3540
<xs:element minOccurs="0" maxOccurs="1" name="Unmanaged64Assemblies" type="xs:string">
3641
<xs:annotation>
37-
<xs:documentation>A list of unmanaged 64 bit assembly names to include, delimited with line breaks.</xs:documentation>
42+
<xs:documentation>Obsolete, use UnmanagedWinX64Assemblies instead.</xs:documentation>
43+
</xs:annotation>
44+
</xs:element>
45+
<xs:element minOccurs="0" maxOccurs="1" name="UnmanagedWinX64Assemblies" type="xs:string">
46+
<xs:annotation>
47+
<xs:documentation>A list of unmanaged X64 (64 bit) assembly names to include, delimited with line breaks.</xs:documentation>
48+
</xs:annotation>
49+
</xs:element>
50+
<xs:element minOccurs="0" maxOccurs="1" name="UnmanagedWinArm64Assemblies" type="xs:string">
51+
<xs:annotation>
52+
<xs:documentation>A list of unmanaged Arm64 (64 bit) assembly names to include, delimited with line breaks.</xs:documentation>
3853
</xs:annotation>
3954
</xs:element>
4055
<xs:element minOccurs="0" maxOccurs="1" name="PreloadOrder" type="xs:string">
@@ -55,7 +70,12 @@
5570
</xs:attribute>
5671
<xs:attribute name="IncludeRuntimeReferences" type="xs:boolean">
5772
<xs:annotation>
58-
<xs:documentation>Controls if (.NET Core) runtime assemblies are also embedded.</xs:documentation>
73+
<xs:documentation>Controls if runtime assemblies are also embedded.</xs:documentation>
74+
</xs:annotation>
75+
</xs:attribute>
76+
<xs:attribute name="UseRuntimeReferencePaths" type="xs:boolean">
77+
<xs:annotation>
78+
<xs:documentation>Controls whether the runtime assemblies are embedded with their full path or only with their assembly name.</xs:documentation>
5979
</xs:annotation>
6080
</xs:attribute>
6181
<xs:attribute name="DisableCompression" type="xs:boolean">
@@ -68,6 +88,11 @@
6888
<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>
6989
</xs:annotation>
7090
</xs:attribute>
91+
<xs:attribute name="DisableEventSubscription" type="xs:boolean">
92+
<xs:annotation>
93+
<xs:documentation>The attach method no longer subscribes to the `AppDomain.AssemblyResolve` (.NET 4.x) and `AssemblyLoadContext.Resolving` (.NET 6.0+) events.</xs:documentation>
94+
</xs:annotation>
95+
</xs:attribute>
7196
<xs:attribute name="LoadAtModuleInit" type="xs:boolean">
7297
<xs:annotation>
7398
<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>
@@ -90,22 +115,37 @@
90115
</xs:attribute>
91116
<xs:attribute name="ExcludeRuntimeAssemblies" type="xs:string">
92117
<xs:annotation>
93-
<xs:documentation>A list of (.NET Core) runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with |</xs:documentation>
118+
<xs:documentation>A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with |</xs:documentation>
94119
</xs:annotation>
95120
</xs:attribute>
96121
<xs:attribute name="IncludeRuntimeAssemblies" type="xs:string">
97122
<xs:annotation>
98-
<xs:documentation>A list of (.NET Core) runtime assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
123+
<xs:documentation>A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
99124
</xs:annotation>
100125
</xs:attribute>
101126
<xs:attribute name="Unmanaged32Assemblies" type="xs:string">
102127
<xs:annotation>
103-
<xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with |.</xs:documentation>
128+
<xs:documentation>Obsolete, use UnmanagedWinX86Assemblies instead</xs:documentation>
129+
</xs:annotation>
130+
</xs:attribute>
131+
<xs:attribute name="UnmanagedWinX86Assemblies" type="xs:string">
132+
<xs:annotation>
133+
<xs:documentation>A list of unmanaged X86 (32 bit) assembly names to include, delimited with |.</xs:documentation>
104134
</xs:annotation>
105135
</xs:attribute>
106136
<xs:attribute name="Unmanaged64Assemblies" type="xs:string">
107137
<xs:annotation>
108-
<xs:documentation>A list of unmanaged 64 bit assembly names to include, delimited with |.</xs:documentation>
138+
<xs:documentation>Obsolete, use UnmanagedWinX64Assemblies instead</xs:documentation>
139+
</xs:annotation>
140+
</xs:attribute>
141+
<xs:attribute name="UnmanagedWinX64Assemblies" type="xs:string">
142+
<xs:annotation>
143+
<xs:documentation>A list of unmanaged X64 (64 bit) assembly names to include, delimited with |.</xs:documentation>
144+
</xs:annotation>
145+
</xs:attribute>
146+
<xs:attribute name="UnmanagedWinArm64Assemblies" type="xs:string">
147+
<xs:annotation>
148+
<xs:documentation>A list of unmanaged Arm64 (64 bit) assembly names to include, delimited with |.</xs:documentation>
109149
</xs:annotation>
110150
</xs:attribute>
111151
<xs:attribute name="PreloadOrder" type="xs:string">

‎source/Directory.Packages.props‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@
44
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageVersion Include="Costura.Fody" Version="5.7.0" />
7+
<PackageVersion Include="Costura.Fody" Version="6.0.0">
8+
<PrivateAssets>all</PrivateAssets>
9+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
10+
</PackageVersion>
11+
<PackageVersion Include="Fody" Version="6.9.1" />
812
<PackageVersion Include="libse" Version="3.6.13" />
913
<PackageVersion Include="Microsoft.Office.Interop.Word" Version="15.0.4797.1004" />
1014
<PackageVersion Include="Microsoft.Toolkit.Forms.UI.Controls.WebView" Version="5.1.1" />

0 commit comments

Comments
 (0)