diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_WeChatApplet.Api.AssemblyInfo.cs b/Server/YD_XinWei/obj/Debug/net6.0/YD_WeChatApplet.Api.AssemblyInfo.cs index c73c43b..3908103 100644 --- a/Server/YD_XinWei/obj/Debug/net6.0/YD_WeChatApplet.Api.AssemblyInfo.cs +++ b/Server/YD_XinWei/obj/Debug/net6.0/YD_WeChatApplet.Api.AssemblyInfo.cs @@ -14,9 +14,15 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("YD_WeChatApplet.Api")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [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.AssemblyProductAttribute("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")] // 由 MSBuild WriteCodeFragment 类生成。 diff --git a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.AssemblyInfo.cs b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.AssemblyInfo.cs index 4a100b2..661a352 100644 --- a/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.AssemblyInfo.cs +++ b/Server/YD_XinWei/obj/Debug/net6.0/linux-x64/YD_XinWei.Api.AssemblyInfo.cs @@ -14,7 +14,11 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("YD_XinWei.Api")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [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+430192efcea6e5ea0cfd1f0fbdd7c1644f5745cb")] +>>>>>>> Stashed changes:YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfo.cs [assembly: System.Reflection.AssemblyProductAttribute("YD_XinWei.Api")] [assembly: System.Reflection.AssemblyTitleAttribute("YD_XinWei.Api")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache b/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache new file mode 100644 index 0000000..d388daa --- /dev/null +++ b/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +f5b4b4a2234d2484c34b72bce42c91b9c357eff4ad5a7da45e8f8175db341278 diff --git a/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfoInputs.cache b/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfoInputs.cache new file mode 100644 index 0000000..cd8d20b --- /dev/null +++ b/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +d5fd021e8f53192b6f0abf33975e92c219ef333b4501c226f178a0e416604ec7