.

10 months ago · 8df6c854ce
parent 410541322f
commit 8df6c854ce
7 changed files with 10 additions and 22 deletions
--- a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache
+++ b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache
--- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs
+++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs
@ -14,11 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.FrameWork")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-<<<<<<< HEAD
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
-=======
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+91808221759aca287573a9c1018fc2e65b1bfd59")]
->>>>>>> 95797c6d9a18bfc6da212ef8f1ab31fca740c669
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6c9deba793354fcee29055ee983f20320b0e4297")]
 [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.FrameWork")]
 [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.FrameWork")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
--- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache
+++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache
@ -1,5 +1 @@
-<<<<<<< HEAD
-7d60a94dd38c10522cbfe4a021ccb6e9c5da0354
-=======
-7a1813a9a5d1d19b18e25488399390e5b0d29d88f5978494e031c73a36870caf
->>>>>>> 95797c6d9a18bfc6da212ef8f1ab31fca740c669
+3f6f2c5c541bbfa5a69e8868dcff127c3e49b75abc7b903722f20b20f6c9cb84
--- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig
@ -1,3 +1,5 @@
 is_global = true
 build_property.RootNamespace = Admin.Core.FrameWork
-build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.FrameWork\
+build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.FrameWork\
+build_property.EnableComHosting = 
+build_property.EnableGeneratedComInterfaceComImportInterop = 
--- a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs
+++ b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs
@ -14,11 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.RealTimeService")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-<<<<<<< HEAD
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
-=======
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+91808221759aca287573a9c1018fc2e65b1bfd59")]
->>>>>>> 95797c6d9a18bfc6da212ef8f1ab31fca740c669
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6c9deba793354fcee29055ee983f20320b0e4297")]
 [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.RealTimeService")]
 [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.RealTimeService")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
--- a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache
+++ b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache
@ -1,5 +1 @@
-<<<<<<< HEAD
-0868e6bde5b49a65a126b91d794e990427a11761
-=======
-b90aaf21ce2e9da9e13b0fb64d65797eba9a93af543963c310c73e113c750708
->>>>>>> 95797c6d9a18bfc6da212ef8f1ab31fca740c669
+fe29d5924a370deb7261b0720bc0cde0083c745e8da42eaa4cdd69d6cd9f67ad
--- a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig
@ -8,4 +8,6 @@ build_property.PlatformNeutralAssembly =
 build_property.EnforceExtendedAnalyzerRules = 
 build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = Admin.Core.RealTimeService
-build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.RealTimeService\
+build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.RealTimeService\
+build_property.EnableComHosting = 
+build_property.EnableGeneratedComInterfaceComImportInterop =