Skip to content

Commit 84721e2

Browse files
NatsukageNatsukage
committed
升级依赖项，将项目版本更新至1.400
1 parent 9e14a57 commit 84721e2

3 files changed

Lines changed: 75 additions & 8 deletions

File tree

‎渔人的直感/FodyWeavers.xsd‎

Lines changed: 69 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,39 @@
1717
<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>
1818
</xs:annotation>
1919
</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>
2030
<xs:element minOccurs="0" maxOccurs="1" name="Unmanaged32Assemblies" type="xs:string">
2131
<xs:annotation>
22-
<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>
2338
</xs:annotation>
2439
</xs:element>
2540
<xs:element minOccurs="0" maxOccurs="1" name="Unmanaged64Assemblies" type="xs:string">
2641
<xs:annotation>
27-
<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>
2853
</xs:annotation>
2954
</xs:element>
3055
<xs:element minOccurs="0" maxOccurs="1" name="PreloadOrder" type="xs:string">
@@ -43,6 +68,16 @@
4368
<xs:documentation>Controls if .pdbs for reference assemblies are also embedded.</xs:documentation>
4469
</xs:annotation>
4570
</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>
4681
<xs:attribute name="DisableCompression" type="xs:boolean">
4782
<xs:annotation>
4883
<xs:documentation>Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option.</xs:documentation>
@@ -53,6 +88,11 @@
5388
<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>
5489
</xs:annotation>
5590
</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>
5696
<xs:attribute name="LoadAtModuleInit" type="xs:boolean">
5797
<xs:annotation>
5898
<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>
@@ -73,14 +113,39 @@
73113
<xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
74114
</xs:annotation>
75115
</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>
76126
<xs:attribute name="Unmanaged32Assemblies" type="xs:string">
77127
<xs:annotation>
78-
<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>
79134
</xs:annotation>
80135
</xs:attribute>
81136
<xs:attribute name="Unmanaged64Assemblies" type="xs:string">
82137
<xs:annotation>
83-
<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>
84149
</xs:annotation>
85150
</xs:attribute>
86151
<xs:attribute name="PreloadOrder" type="xs:string">

‎渔人的直感/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@
5151
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
5252
//通过使用 "*"，如下所示:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("1.3.8.1")]
55-
[assembly: AssemblyFileVersion("1.3.8.1")]
54+
[assembly: AssemblyVersion("1.4.0.0")]
55+
[assembly: AssemblyFileVersion("1.4.0.0")]

‎渔人的直感/渔人的直感.csproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,12 @@
140140
</ItemGroup>
141141
<ItemGroup>
142142
<PackageReference Include="Costura.Fody">
143-
<Version>4.1.0</Version>
143+
<Version>6.0.0</Version>
144+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
145+
<PrivateAssets>all</PrivateAssets>
144146
</PackageReference>
145147
<PackageReference Include="Hardcodet.NotifyIcon.Wpf">
146-
<Version>1.0.8</Version>
148+
<Version>2.0.1</Version>
147149
</PackageReference>
148150
</ItemGroup>
149151
<ItemGroup />

0 commit comments

Comments
 (0)