Skip to content

Commit 3a0a5e6

Browse files
Elektryk-AndrzejElektryk-Andrzej
committed
add NCalc dependency directly to SER builds
1 parent ae8b3a0 commit 3a0a5e6

File tree

4 files changed

+191
-4
lines changed

4 files changed

+191
-4
lines changed

‎FodyWeavers.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
3+
<Costura CreateTemporaryAssemblies="true" IncludeAssemblies="NCalc" />
4+
</Weavers>

‎FodyWeavers.xsd‎

Lines changed: 176 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,176 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
3+
<!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
4+
<xs:element name="Weavers">
5+
<xs:complexType>
6+
<xs:all>
7+
<xs:element name="Costura" minOccurs="0" maxOccurs="1">
8+
<xs:complexType>
9+
<xs:all>
10+
<xs:element minOccurs="0" maxOccurs="1" name="ExcludeAssemblies" type="xs:string">
11+
<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>
13+
</xs:annotation>
14+
</xs:element>
15+
<xs:element minOccurs="0" maxOccurs="1" name="IncludeAssemblies" type="xs:string">
16+
<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>
18+
</xs:annotation>
19+
</xs:element>
20+
<xs:element minOccurs="0" maxOccurs="1" name="ExcludeRuntimeAssemblies" type="xs:string">
21+
<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>
23+
</xs:annotation>
24+
</xs:element>
25+
<xs:element minOccurs="0" maxOccurs="1" name="IncludeRuntimeAssemblies" type="xs:string">
26+
<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>
28+
</xs:annotation>
29+
</xs:element>
30+
<xs:element minOccurs="0" maxOccurs="1" name="Unmanaged32Assemblies" type="xs:string">
31+
<xs:annotation>
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>
38+
</xs:annotation>
39+
</xs:element>
40+
<xs:element minOccurs="0" maxOccurs="1" name="Unmanaged64Assemblies" type="xs:string">
41+
<xs:annotation>
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>
53+
</xs:annotation>
54+
</xs:element>
55+
<xs:element minOccurs="0" maxOccurs="1" name="PreloadOrder" type="xs:string">
56+
<xs:annotation>
57+
<xs:documentation>The order of preloaded assemblies, delimited with line breaks.</xs:documentation>
58+
</xs:annotation>
59+
</xs:element>
60+
</xs:all>
61+
<xs:attribute name="CreateTemporaryAssemblies" type="xs:boolean">
62+
<xs:annotation>
63+
<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>
64+
</xs:annotation>
65+
</xs:attribute>
66+
<xs:attribute name="IncludeDebugSymbols" type="xs:boolean">
67+
<xs:annotation>
68+
<xs:documentation>Controls if .pdbs for reference assemblies are also embedded.</xs:documentation>
69+
</xs:annotation>
70+
</xs:attribute>
71+
<xs:attribute name="IncludeRuntimeReferences" type="xs:boolean">
72+
<xs:annotation>
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>
79+
</xs:annotation>
80+
</xs:attribute>
81+
<xs:attribute name="DisableCompression" type="xs:boolean">
82+
<xs:annotation>
83+
<xs:documentation>Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option.</xs:documentation>
84+
</xs:annotation>
85+
</xs:attribute>
86+
<xs:attribute name="DisableCleanup" type="xs:boolean">
87+
<xs:annotation>
88+
<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>
89+
</xs:annotation>
90+
</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>
96+
<xs:attribute name="LoadAtModuleInit" type="xs:boolean">
97+
<xs:annotation>
98+
<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>
99+
</xs:annotation>
100+
</xs:attribute>
101+
<xs:attribute name="IgnoreSatelliteAssemblies" type="xs:boolean">
102+
<xs:annotation>
103+
<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>
104+
</xs:annotation>
105+
</xs:attribute>
106+
<xs:attribute name="ExcludeAssemblies" type="xs:string">
107+
<xs:annotation>
108+
<xs:documentation>A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with |</xs:documentation>
109+
</xs:annotation>
110+
</xs:attribute>
111+
<xs:attribute name="IncludeAssemblies" type="xs:string">
112+
<xs:annotation>
113+
<xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
114+
</xs:annotation>
115+
</xs:attribute>
116+
<xs:attribute name="ExcludeRuntimeAssemblies" type="xs:string">
117+
<xs:annotation>
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>
119+
</xs:annotation>
120+
</xs:attribute>
121+
<xs:attribute name="IncludeRuntimeAssemblies" type="xs:string">
122+
<xs:annotation>
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>
124+
</xs:annotation>
125+
</xs:attribute>
126+
<xs:attribute name="Unmanaged32Assemblies" type="xs:string">
127+
<xs:annotation>
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>
134+
</xs:annotation>
135+
</xs:attribute>
136+
<xs:attribute name="Unmanaged64Assemblies" type="xs:string">
137+
<xs:annotation>
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>
149+
</xs:annotation>
150+
</xs:attribute>
151+
<xs:attribute name="PreloadOrder" type="xs:string">
152+
<xs:annotation>
153+
<xs:documentation>The order of preloaded assemblies, delimited with |.</xs:documentation>
154+
</xs:annotation>
155+
</xs:attribute>
156+
</xs:complexType>
157+
</xs:element>
158+
</xs:all>
159+
<xs:attribute name="VerifyAssembly" type="xs:boolean">
160+
<xs:annotation>
161+
<xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
162+
</xs:annotation>
163+
</xs:attribute>
164+
<xs:attribute name="VerifyIgnoreCodes" type="xs:string">
165+
<xs:annotation>
166+
<xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
167+
</xs:annotation>
168+
</xs:attribute>
169+
<xs:attribute name="GenerateXsd" type="xs:boolean">
170+
<xs:annotation>
171+
<xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
172+
</xs:annotation>
173+
</xs:attribute>
174+
</xs:complexType>
175+
</xs:element>
176+
</xs:schema>

‎SER.csproj‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,6 @@
5050
<Reference Include="Mirror">
5151
<HintPath>$(SL_DEV_REFERENCES)\Mirror.dll</HintPath>
5252
</Reference>
53-
<Reference Include="NCalc">
54-
<HintPath>$(SL_DEV_REFERENCES)\NCalc.dll</HintPath>
55-
</Reference>
5653
<Reference Include="NorthwoodLib">
5754
<HintPath>$(SL_DEV_REFERENCES)\NorthwoodLib.dll</HintPath>
5855
</Reference>
@@ -75,8 +72,17 @@
7572
<ItemGroup>
7673
<None Include="App.config" />
7774
<None Include="packages.config" />
75+
<None Include="SER.sln.DotSettings.user" />
7876
<Content Include=".gitignore" />
7977
<Content Include="README.md" />
8078
</ItemGroup>
81-
79+
80+
<ItemGroup>
81+
<PackageReference Include="Costura.Fody" Version="6.0.0" PrivateAssets='All' />
82+
83+
<PackageReference Include="Fody" Version="6.9.3" />
84+
85+
<PackageReference Include="ncalc" Version="1.3.8" />
86+
</ItemGroup>
87+
8288
</Project>

‎SER.sln.DotSettings.user‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,7 @@
229229
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AException_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fb18a8b3398e74bca86895881dd02956c573648_003F71_003Fb75fe5c9_003FException_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
230230
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AExplosionUtils_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F9b41e261b6f7438da74257a46de8480732e000_003Fec_003F23ac95d4_003FExplosionUtils_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
231231
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AExpression_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F01bbcba18299494188b3dec4ab9879002f800_003F93_003F5b50f24b_003FExpression_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
232+
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AExpression_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F01bbcba18299494188b3dec4ab9879002f800_003F93_003F5b50f24b_003FExpression_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
232233
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AFacilityZone_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F9b41e261b6f7438da74257a46de8480732e000_003F77_003F77f001f1_003FFacilityZone_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
233234
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AFacilityZone_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F9b41e261b6f7438da74257a46de8480732e000_003F77_003F77f001f1_003FFacilityZone_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
234235
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AFile_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F3789ee403a53437cbb6b5d9ab6311f51573620_003F1f_003F9e0347e9_003FFile_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>

0 commit comments

Comments
 (0)