Fix Windows Defender virus reporting problem

by Remove Costuar/Fody
This commit is contained in:
2022-08-25 22:02:43 +08:00
parent 7dc7c7c8ac
commit a0cc908983
6 changed files with 1182 additions and 1136 deletions

View File

@ -42,6 +42,12 @@
<ApplicationManifest>Properties\app.manifest</ApplicationManifest> <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>Resources\Newtonsoft.Json.dll</HintPath>
<EmbedInteropTypes>False</EmbedInteropTypes>
<Private>False</Private>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Net.Http" /> <Reference Include="System.Net.Http" />
@ -220,6 +226,7 @@
<Content Include="Resources\en-us\Quest.txt" /> <Content Include="Resources\en-us\Quest.txt" />
<Content Include="Resources\en-us\Scene.txt" /> <Content Include="Resources\en-us\Scene.txt" />
<Content Include="Resources\en-us\Weapon.txt" /> <Content Include="Resources\en-us\Weapon.txt" />
<None Include="Resources\Newtonsoft.Json.dll" />
<Content Include="Resources\ru-ru\Animal.txt" /> <Content Include="Resources\ru-ru\Animal.txt" />
<Content Include="Resources\ru-ru\Artifact.txt" /> <Content Include="Resources\ru-ru\Artifact.txt" />
<Content Include="Resources\ru-ru\ArtifactCat.txt" /> <Content Include="Resources\ru-ru\ArtifactCat.txt" />
@ -278,17 +285,6 @@
</BootstrapperPackage> </BootstrapperPackage>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Costura.Fody">
<Version>5.7.0</Version>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Fody">
<Version>6.6.3</Version>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>13.0.1</Version>
</PackageReference>
<PackageReference Include="Resource.Embedder"> <PackageReference Include="Resource.Embedder">
<Version>2.2.0</Version> <Version>2.2.0</Version>
</PackageReference> </PackageReference>

View File

@ -17,6 +17,8 @@
* *
**/ **/
using System; using System;
using System.Globalization;
using System.Reflection;
using System.Text; using System.Text;
using System.Threading; using System.Threading;
using System.Windows.Forms; using System.Windows.Forms;
@ -27,6 +29,33 @@ namespace GrasscutterTools
{ {
internal static class Program internal static class Program
{ {
static Program()
{
AppDomain.CurrentDomain.AssemblyResolve += OnResolveAssembly;
}
private static Assembly OnResolveAssembly(object sender, ResolveEventArgs args)
{
//var executingAssembly = Assembly.GetExecutingAssembly();
//var assemblyName = new AssemblyName(args.Name);
//var path = assemblyName.Name + ".dll";
//if (assemblyName.CultureInfo.Equals(CultureInfo.InvariantCulture) == false)
// path = $@"{assemblyName.CultureInfo}\{path}";
//using (var stream = executingAssembly.GetManifestResourceStream(path))
//{
// if (stream == null) return null;
// var assemblyRawBytes = new byte[stream.Length];
// stream.Read(assemblyRawBytes, 0, assemblyRawBytes.Length);
// return Assembly.Load(assemblyRawBytes);
//}
// 手工加载嵌入的dll文件
if (new AssemblyName(args.Name).Name == "Newtonsoft.Json")
return Assembly.Load(Resources.Newtonsoft_Json);
return null;
}
/// <summary> /// <summary>
/// 应用程序的主入口点。 /// 应用程序的主入口点。
/// </summary> /// </summary>

View File

@ -5,12 +5,12 @@ using System.Runtime.InteropServices;
// 控制。更改这些特性值可修改 // 控制。更改这些特性值可修改
// 与程序集关联的信息。 // 与程序集关联的信息。
[assembly: AssemblyTitle("GrasscutterTools")] [assembly: AssemblyTitle("GrasscutterTools")]
[assembly: AssemblyDescription("")] [assembly: AssemblyDescription("Grasscutter Command Generator")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("jie65535")]
[assembly: AssemblyProduct("GrasscutterTools")] [assembly: AssemblyProduct("GrasscutterTools")]
[assembly: AssemblyCopyright("Copyright © jie65535 2022")] [assembly: AssemblyCopyright("Copyright © jie65535 2022")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("jie65535")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
// 将 ComVisible 设置为 false 会使此程序集中的类型 // 将 ComVisible 设置为 false 会使此程序集中的类型
@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值 //可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
//通过使用 "*",如下所示: //通过使用 "*",如下所示:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.6.0")] [assembly: AssemblyVersion("1.6.1")]
[assembly: AssemblyFileVersion("1.0.0")] [assembly: AssemblyFileVersion("1.0.0")]

File diff suppressed because it is too large Load Diff

View File

@ -273,4 +273,7 @@
<data name="GOODImportSuccess" xml:space="preserve"> <data name="GOODImportSuccess" xml:space="preserve">
<value>导入成功!</value> <value>导入成功!</value>
</data> </data>
<data name="Newtonsoft_Json" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Newtonsoft.Json.dll;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root> </root>

Binary file not shown.