change - push

Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig

@@ -9,9 +9,11 @@ build_property.EnforceExtendedAnalyzerRules =
 build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = Admin.Core.Api
 build_property.RootNamespace = Admin.Core.Api
-build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Api\
+build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Api\
+build_property.EnableComHosting = 
+build_property.EnableGeneratedComInterfaceComImportInterop = 
 build_property.RazorLangVersion = 6.0
 build_property.SupportLocalizedComponentNames = 
 build_property.GenerateRazorMetadataSourceChecksumAttributes = 
-build_property.MSBuildProjectDirectory = E:\c#\AUCMA\new\Admin.Core.Api
+build_property.MSBuildProjectDirectory = E:\桌面\AUCMA_SCADA\Admin.Core.Api
 build_property._RazorSourceGeneratorDebug = 

Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig

@@ -8,4 +8,6 @@ build_property.PlatformNeutralAssembly =
 build_property.EnforceExtendedAnalyzerRules = 
 build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = Admin.Core.Model
-build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Model\
+build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Model\
+build_property.EnableComHosting = 
+build_property.EnableGeneratedComInterfaceComImportInterop = 

HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs

@@ -15,11 +15,7 @@ namespace XamlGeneratedNamespace {
     /// GeneratedInternalTypeHelper
     /// </summary>
     [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-<<<<<<< HEAD
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.9.0")]
-=======
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.2.0")]
->>>>>>> 346821a670b23ccc6bf0121bb0363fb2fb2b4f48
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.3.0")]
     [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
     public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
         

HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig

@@ -8,10 +8,6 @@ build_property.PlatformNeutralAssembly =
 build_property.EnforceExtendedAnalyzerRules = 
 build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = HwControlLib
-<<<<<<< HEAD
-build_property.ProjectDir = E:\c#\AUCMA\new\HwControlLib\
-=======
-build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\HwControlLib\
+build_property.ProjectDir = E:\桌面\AUCMA_SCADA\HwControlLib\
 build_property.EnableComHosting = 
 build_property.EnableGeneratedComInterfaceComImportInterop = 
->>>>>>> 346821a670b23ccc6bf0121bb0363fb2fb2b4f48

HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache

@@ -4,7 +4,7 @@
 library
 C#
 .cs
-D:\Project\gitea\AUCMA\SCADA\HwControlLib\obj\Debug\net6.0-windows\
+E:\桌面\AUCMA_SCADA\HwControlLib\obj\Debug\net6.0-windows\
 HwControlLib
 none
 false
@@ -13,8 +13,8 @@ TRACE;DEBUG;NET;NET6_0;NETCOREAPP
 1204305769
 
 71208292394
-194-428966090
+194-2005446070
 Themes\Generic.xaml;
 
-False
+True