This commit is contained in:
tanglong 2025-07-30 14:56:45 +08:00
parent 590052c7b0
commit 9db8634ffd
4 changed files with 12 additions and 0 deletions

View File

@ -14,9 +14,15 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("YD_WeChatApplet.Api")] [assembly: System.Reflection.AssemblyCompanyAttribute("YD_WeChatApplet.Api")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
<<<<<<< Updated upstream:Server/YD_XinWei/obj/Debug/net6.0/YD_WeChatApplet.Api.AssemblyInfo.cs
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyProductAttribute("YD_WeChatApplet.Api")] [assembly: System.Reflection.AssemblyProductAttribute("YD_WeChatApplet.Api")]
[assembly: System.Reflection.AssemblyTitleAttribute("YD_WeChatApplet.Api")] [assembly: System.Reflection.AssemblyTitleAttribute("YD_WeChatApplet.Api")]
=======
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+430192efcea6e5ea0cfd1f0fbdd7c1644f5745cb")]
[assembly: System.Reflection.AssemblyProductAttribute("YD_XinWei.Commons")]
[assembly: System.Reflection.AssemblyTitleAttribute("YD_XinWei.Commons")]
>>>>>>> Stashed changes:YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfo.cs
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
// 由 MSBuild WriteCodeFragment 类生成。 // 由 MSBuild WriteCodeFragment 类生成。

View File

@ -14,7 +14,11 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("YD_XinWei.Api")] [assembly: System.Reflection.AssemblyCompanyAttribute("YD_XinWei.Api")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
<<<<<<< Updated upstream:Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.AssemblyInfo.cs
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1d3570ab05d420c438e818c395b8f56cd2046e9e")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1d3570ab05d420c438e818c395b8f56cd2046e9e")]
=======
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+430192efcea6e5ea0cfd1f0fbdd7c1644f5745cb")]
>>>>>>> Stashed changes:YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfo.cs
[assembly: System.Reflection.AssemblyProductAttribute("YD_XinWei.Api")] [assembly: System.Reflection.AssemblyProductAttribute("YD_XinWei.Api")]
[assembly: System.Reflection.AssemblyTitleAttribute("YD_XinWei.Api")] [assembly: System.Reflection.AssemblyTitleAttribute("YD_XinWei.Api")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

View File

@ -0,0 +1 @@
f5b4b4a2234d2484c34b72bce42c91b9c357eff4ad5a7da45e8f8175db341278

View File

@ -0,0 +1 @@
d5fd021e8f53192b6f0abf33975e92c219ef333b4501c226f178a0e416604ec7