diff --git a/.vs/Admin.Core/DesignTimeBuild/.dtbcache.v2 b/.vs/Admin.Core/DesignTimeBuild/.dtbcache.v2 index d5409a27..8fa57ac9 100644 Binary files a/.vs/Admin.Core/DesignTimeBuild/.dtbcache.v2 and b/.vs/Admin.Core/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/Admin.Core/v17/.futdcache.v2 b/.vs/Admin.Core/v17/.futdcache.v2 index b7f2b403..85c24550 100644 Binary files a/.vs/Admin.Core/v17/.futdcache.v2 and b/.vs/Admin.Core/v17/.futdcache.v2 differ diff --git a/.vs/Admin.Core/v17/.suo b/.vs/Admin.Core/v17/.suo index fc38c025..be415a41 100644 Binary files a/.vs/Admin.Core/v17/.suo and b/.vs/Admin.Core/v17/.suo differ diff --git a/.vs/Admin.Core/v17/fileList.bin b/.vs/Admin.Core/v17/fileList.bin index 4d31613f..44609628 100644 Binary files a/.vs/Admin.Core/v17/fileList.bin and b/.vs/Admin.Core/v17/fileList.bin differ diff --git a/.vs/ProjectEvaluation/admin.core.metadata.v7.bin b/.vs/ProjectEvaluation/admin.core.metadata.v7.bin index 21685da7..7a7f99eb 100644 Binary files a/.vs/ProjectEvaluation/admin.core.metadata.v7.bin and b/.vs/ProjectEvaluation/admin.core.metadata.v7.bin differ diff --git a/.vs/ProjectEvaluation/admin.core.projects.v7.bin b/.vs/ProjectEvaluation/admin.core.projects.v7.bin index 678f839f..d0dacbb4 100644 Binary files a/.vs/ProjectEvaluation/admin.core.projects.v7.bin and b/.vs/ProjectEvaluation/admin.core.projects.v7.bin differ diff --git a/.vs/SCADA/FileContentIndex/5d257901-d147-4773-a50c-04d9aec6279a.vsidx b/.vs/SCADA/FileContentIndex/5d257901-d147-4773-a50c-04d9aec6279a.vsidx new file mode 100644 index 00000000..f2c7c9f9 Binary files /dev/null and b/.vs/SCADA/FileContentIndex/5d257901-d147-4773-a50c-04d9aec6279a.vsidx differ diff --git a/.vs/SCADA/FileContentIndex/8f49333f-2723-4b75-ae83-fcdebb37b8e9.vsidx b/.vs/SCADA/FileContentIndex/8f49333f-2723-4b75-ae83-fcdebb37b8e9.vsidx new file mode 100644 index 00000000..396b0145 Binary files /dev/null and b/.vs/SCADA/FileContentIndex/8f49333f-2723-4b75-ae83-fcdebb37b8e9.vsidx differ diff --git a/.vs/SCADA/FileContentIndex/8fcb89da-90df-469c-8b93-4f3600c3ddd6.vsidx b/.vs/SCADA/FileContentIndex/8fcb89da-90df-469c-8b93-4f3600c3ddd6.vsidx new file mode 100644 index 00000000..729da7ed Binary files /dev/null and b/.vs/SCADA/FileContentIndex/8fcb89da-90df-469c-8b93-4f3600c3ddd6.vsidx differ diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite new file mode 100644 index 00000000..901c7718 Binary files /dev/null and b/.vs/slnx.sqlite differ diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.csproj.AssemblyReference.cache b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.csproj.AssemblyReference.cache index b647d8b5..ed0b4a83 100644 Binary files a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.csproj.AssemblyReference.cache and b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.Api/obj/Release/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Api/obj/Release/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig index 6ecdde77..601c80d9 100644 --- a/Admin.Core.Api/obj/Release/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Api/obj/Release/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig @@ -9,9 +9,9 @@ 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:\document\Gitee\admin-core\admin-core-api\Admin.Core.Api\ +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Api\ build_property.RazorLangVersion = 6.0 build_property.SupportLocalizedComponentNames = build_property.GenerateRazorMetadataSourceChecksumAttributes = -build_property.MSBuildProjectDirectory = E:\document\Gitee\admin-core\admin-core-api\Admin.Core.Api +build_property.MSBuildProjectDirectory = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Api build_property._RazorSourceGeneratorDebug = diff --git a/Admin.Core.Api/obj/Release/net6.0/Admin.Core.Api.assets.cache b/Admin.Core.Api/obj/Release/net6.0/Admin.Core.Api.assets.cache index 99c3ecb3..358507ed 100644 Binary files a/Admin.Core.Api/obj/Release/net6.0/Admin.Core.Api.assets.cache and b/Admin.Core.Api/obj/Release/net6.0/Admin.Core.Api.assets.cache differ diff --git a/Admin.Core.Api/obj/Release/net6.0/Admin.Core.Api.csproj.AssemblyReference.cache b/Admin.Core.Api/obj/Release/net6.0/Admin.Core.Api.csproj.AssemblyReference.cache index 761ede59..9e83a8ac 100644 Binary files a/Admin.Core.Api/obj/Release/net6.0/Admin.Core.Api.csproj.AssemblyReference.cache and b/Admin.Core.Api/obj/Release/net6.0/Admin.Core.Api.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.Common/obj/Release/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Common/obj/Release/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig index 0af9f0d0..decf85c2 100644 --- a/Admin.Core.Common/obj/Release/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Common/obj/Release/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Common -build_property.ProjectDir = D:\gitea\AUCMA\AUCMA_SCADA\Admin.Core.Common\ +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Common\ diff --git a/Admin.Core.Common/obj/Release/net6.0/Admin.Core.Common.assets.cache b/Admin.Core.Common/obj/Release/net6.0/Admin.Core.Common.assets.cache index 800d8a29..c73f4858 100644 Binary files a/Admin.Core.Common/obj/Release/net6.0/Admin.Core.Common.assets.cache and b/Admin.Core.Common/obj/Release/net6.0/Admin.Core.Common.assets.cache differ diff --git a/Admin.Core.Common/obj/Release/net6.0/Admin.Core.Common.csproj.AssemblyReference.cache b/Admin.Core.Common/obj/Release/net6.0/Admin.Core.Common.csproj.AssemblyReference.cache index 91201061..67afa230 100644 Binary files a/Admin.Core.Common/obj/Release/net6.0/Admin.Core.Common.csproj.AssemblyReference.cache and b/Admin.Core.Common/obj/Release/net6.0/Admin.Core.Common.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.EventBus/obj/Release/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.EventBus/obj/Release/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig index cec73802..f38a35e7 100644 --- a/Admin.Core.EventBus/obj/Release/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.EventBus/obj/Release/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.EventBus -build_property.ProjectDir = D:\gitea\AUCMA\AUCMA_SCADA\Admin.Core.EventBus\ +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.EventBus\ diff --git a/Admin.Core.EventBus/obj/Release/net6.0/Admin.Core.EventBus.assets.cache b/Admin.Core.EventBus/obj/Release/net6.0/Admin.Core.EventBus.assets.cache index 902dbf25..d5ad291a 100644 Binary files a/Admin.Core.EventBus/obj/Release/net6.0/Admin.Core.EventBus.assets.cache and b/Admin.Core.EventBus/obj/Release/net6.0/Admin.Core.EventBus.assets.cache differ diff --git a/Admin.Core.EventBus/obj/Release/net6.0/Admin.Core.EventBus.csproj.AssemblyReference.cache b/Admin.Core.EventBus/obj/Release/net6.0/Admin.Core.EventBus.csproj.AssemblyReference.cache index 8262c906..162bb7ea 100644 Binary files a/Admin.Core.EventBus/obj/Release/net6.0/Admin.Core.EventBus.csproj.AssemblyReference.cache and b/Admin.Core.EventBus/obj/Release/net6.0/Admin.Core.EventBus.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.csproj.AssemblyReference.cache b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.csproj.AssemblyReference.cache index 2ce37ae2..1d936b5a 100644 Binary files a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.csproj.AssemblyReference.cache and b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.Extensions/obj/Release/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Extensions/obj/Release/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig index 69830dea..2ffa7b25 100644 --- a/Admin.Core.Extensions/obj/Release/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Extensions/obj/Release/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Extensions -build_property.ProjectDir = D:\gitea\AUCMA\AUCMA_SCADA\Admin.Core.Extensions\ +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\ diff --git a/Admin.Core.Extensions/obj/Release/net6.0/Admin.Core.Extensions.assets.cache b/Admin.Core.Extensions/obj/Release/net6.0/Admin.Core.Extensions.assets.cache index 1981f4ee..85ca98b4 100644 Binary files a/Admin.Core.Extensions/obj/Release/net6.0/Admin.Core.Extensions.assets.cache and b/Admin.Core.Extensions/obj/Release/net6.0/Admin.Core.Extensions.assets.cache differ diff --git a/Admin.Core.Extensions/obj/Release/net6.0/Admin.Core.Extensions.csproj.AssemblyReference.cache b/Admin.Core.Extensions/obj/Release/net6.0/Admin.Core.Extensions.csproj.AssemblyReference.cache index 1295e824..7c813344 100644 Binary files a/Admin.Core.Extensions/obj/Release/net6.0/Admin.Core.Extensions.csproj.AssemblyReference.cache and b/Admin.Core.Extensions/obj/Release/net6.0/Admin.Core.Extensions.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.FrameWork/obj/Release/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.FrameWork/obj/Release/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig index bdc6b4c3..34f11e1e 100644 --- a/Admin.Core.FrameWork/obj/Release/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.FrameWork/obj/Release/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig @@ -1,3 +1,3 @@ is_global = true build_property.RootNamespace = Admin.Core.FrameWork -build_property.ProjectDir = D:\gitea\AUCMA\AUCMA_SCADA\Admin.Core.FrameWork\ +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.FrameWork\ diff --git a/Admin.Core.FrameWork/obj/Release/netcoreapp3.1/Admin.Core.FrameWork.assets.cache b/Admin.Core.FrameWork/obj/Release/netcoreapp3.1/Admin.Core.FrameWork.assets.cache index d4194c61..527ca700 100644 Binary files a/Admin.Core.FrameWork/obj/Release/netcoreapp3.1/Admin.Core.FrameWork.assets.cache and b/Admin.Core.FrameWork/obj/Release/netcoreapp3.1/Admin.Core.FrameWork.assets.cache differ diff --git a/Admin.Core.FrameWork/obj/Release/netcoreapp3.1/Admin.Core.FrameWork.csproj.AssemblyReference.cache b/Admin.Core.FrameWork/obj/Release/netcoreapp3.1/Admin.Core.FrameWork.csproj.AssemblyReference.cache deleted file mode 100644 index 89a13494..00000000 Binary files a/Admin.Core.FrameWork/obj/Release/netcoreapp3.1/Admin.Core.FrameWork.csproj.AssemblyReference.cache and /dev/null differ diff --git a/Admin.Core.IRepository/obj/Release/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.IRepository/obj/Release/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig index 880bdbce..2b7e2280 100644 --- a/Admin.Core.IRepository/obj/Release/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.IRepository/obj/Release/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.IRepository -build_property.ProjectDir = D:\gitea\AUCMA\AUCMA_SCADA\Admin.Core.IRepository\ +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.IRepository\ diff --git a/Admin.Core.IRepository/obj/Release/net6.0/Admin.Core.IRepository.assets.cache b/Admin.Core.IRepository/obj/Release/net6.0/Admin.Core.IRepository.assets.cache index 34101f5e..43e4105d 100644 Binary files a/Admin.Core.IRepository/obj/Release/net6.0/Admin.Core.IRepository.assets.cache and b/Admin.Core.IRepository/obj/Release/net6.0/Admin.Core.IRepository.assets.cache differ diff --git a/Admin.Core.IRepository/obj/Release/net6.0/Admin.Core.IRepository.csproj.AssemblyReference.cache b/Admin.Core.IRepository/obj/Release/net6.0/Admin.Core.IRepository.csproj.AssemblyReference.cache index 3e42dbcf..baa7b06a 100644 Binary files a/Admin.Core.IRepository/obj/Release/net6.0/Admin.Core.IRepository.csproj.AssemblyReference.cache and b/Admin.Core.IRepository/obj/Release/net6.0/Admin.Core.IRepository.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.IService/obj/Release/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.IService/obj/Release/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig index f836138c..ba998751 100644 --- a/Admin.Core.IService/obj/Release/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.IService/obj/Release/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.IService -build_property.ProjectDir = D:\gitea\AUCMA\AUCMA_SCADA\Admin.Core.IService\ +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.IService\ diff --git a/Admin.Core.IService/obj/Release/net6.0/Admin.Core.IService.assets.cache b/Admin.Core.IService/obj/Release/net6.0/Admin.Core.IService.assets.cache index 8aaaddde..30803e2e 100644 Binary files a/Admin.Core.IService/obj/Release/net6.0/Admin.Core.IService.assets.cache and b/Admin.Core.IService/obj/Release/net6.0/Admin.Core.IService.assets.cache differ diff --git a/Admin.Core.IService/obj/Release/net6.0/Admin.Core.IService.csproj.AssemblyReference.cache b/Admin.Core.IService/obj/Release/net6.0/Admin.Core.IService.csproj.AssemblyReference.cache index a2f94429..baa7b06a 100644 Binary files a/Admin.Core.IService/obj/Release/net6.0/Admin.Core.IService.csproj.AssemblyReference.cache and b/Admin.Core.IService/obj/Release/net6.0/Admin.Core.IService.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.Model/obj/Release/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Model/obj/Release/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig index e7946edc..f17e3fdc 100644 --- a/Admin.Core.Model/obj/Release/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Model/obj/Release/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Model -build_property.ProjectDir = D:\gitea\AUCMA\AUCMA_SCADA\Admin.Core.Model\ +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Model\ diff --git a/Admin.Core.Model/obj/Release/net6.0/Admin.Core.Model.assets.cache b/Admin.Core.Model/obj/Release/net6.0/Admin.Core.Model.assets.cache index 590cf6d6..b5bbacc2 100644 Binary files a/Admin.Core.Model/obj/Release/net6.0/Admin.Core.Model.assets.cache and b/Admin.Core.Model/obj/Release/net6.0/Admin.Core.Model.assets.cache differ diff --git a/Admin.Core.Model/obj/Release/net6.0/Admin.Core.Model.csproj.AssemblyReference.cache b/Admin.Core.Model/obj/Release/net6.0/Admin.Core.Model.csproj.AssemblyReference.cache index a58ee625..930e6220 100644 Binary files a/Admin.Core.Model/obj/Release/net6.0/Admin.Core.Model.csproj.AssemblyReference.cache and b/Admin.Core.Model/obj/Release/net6.0/Admin.Core.Model.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.csproj.AssemblyReference.cache b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.csproj.AssemblyReference.cache index 5d18cd9b..3ed904f8 100644 Binary files a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.csproj.AssemblyReference.cache and b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.RealTimeService/obj/Release/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.RealTimeService/obj/Release/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig index 3559cc05..ce84cb9f 100644 --- a/Admin.Core.RealTimeService/obj/Release/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.RealTimeService/obj/Release/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.RealTimeService -build_property.ProjectDir = D:\gitea\AUCMA\AUCMA_SCADA\Admin.Core.RealTimeService\ +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.RealTimeService\ diff --git a/Admin.Core.RealTimeService/obj/Release/net6.0/Admin.Core.RealTimeService.assets.cache b/Admin.Core.RealTimeService/obj/Release/net6.0/Admin.Core.RealTimeService.assets.cache index d2c13bd9..f3899365 100644 Binary files a/Admin.Core.RealTimeService/obj/Release/net6.0/Admin.Core.RealTimeService.assets.cache and b/Admin.Core.RealTimeService/obj/Release/net6.0/Admin.Core.RealTimeService.assets.cache differ diff --git a/Admin.Core.RealTimeService/obj/Release/net6.0/Admin.Core.RealTimeService.csproj.AssemblyReference.cache b/Admin.Core.RealTimeService/obj/Release/net6.0/Admin.Core.RealTimeService.csproj.AssemblyReference.cache index 9ac1799f..13b11492 100644 Binary files a/Admin.Core.RealTimeService/obj/Release/net6.0/Admin.Core.RealTimeService.csproj.AssemblyReference.cache and b/Admin.Core.RealTimeService/obj/Release/net6.0/Admin.Core.RealTimeService.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.Repository/obj/Release/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Repository/obj/Release/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig index f5980b26..41538400 100644 --- a/Admin.Core.Repository/obj/Release/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Repository/obj/Release/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Repository -build_property.ProjectDir = D:\gitea\AUCMA\AUCMA_SCADA\Admin.Core.Repository\ +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Repository\ diff --git a/Admin.Core.Repository/obj/Release/net6.0/Admin.Core.Repository.assets.cache b/Admin.Core.Repository/obj/Release/net6.0/Admin.Core.Repository.assets.cache index 66659fef..ff4b7500 100644 Binary files a/Admin.Core.Repository/obj/Release/net6.0/Admin.Core.Repository.assets.cache and b/Admin.Core.Repository/obj/Release/net6.0/Admin.Core.Repository.assets.cache differ diff --git a/Admin.Core.Repository/obj/Release/net6.0/Admin.Core.Repository.csproj.AssemblyReference.cache b/Admin.Core.Repository/obj/Release/net6.0/Admin.Core.Repository.csproj.AssemblyReference.cache index 470a9f44..3999b7bd 100644 Binary files a/Admin.Core.Repository/obj/Release/net6.0/Admin.Core.Repository.csproj.AssemblyReference.cache and b/Admin.Core.Repository/obj/Release/net6.0/Admin.Core.Repository.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.Serilog.Es/obj/Release/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Serilog.Es/obj/Release/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig index f0d4f9f5..a581a844 100644 --- a/Admin.Core.Serilog.Es/obj/Release/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Serilog.Es/obj/Release/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Serilog.Es -build_property.ProjectDir = D:\gitea\AUCMA\AUCMA_SCADA\Admin.Core.Serilog.Es\ +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Serilog.Es\ diff --git a/Admin.Core.Serilog.Es/obj/Release/net6.0/Admin.Core.Serilog.Es.assets.cache b/Admin.Core.Serilog.Es/obj/Release/net6.0/Admin.Core.Serilog.Es.assets.cache index 2999730f..e343f638 100644 Binary files a/Admin.Core.Serilog.Es/obj/Release/net6.0/Admin.Core.Serilog.Es.assets.cache and b/Admin.Core.Serilog.Es/obj/Release/net6.0/Admin.Core.Serilog.Es.assets.cache differ diff --git a/Admin.Core.Serilog.Es/obj/Release/net6.0/Admin.Core.Serilog.Es.csproj.AssemblyReference.cache b/Admin.Core.Serilog.Es/obj/Release/net6.0/Admin.Core.Serilog.Es.csproj.AssemblyReference.cache index 48023c04..1e649d5e 100644 Binary files a/Admin.Core.Serilog.Es/obj/Release/net6.0/Admin.Core.Serilog.Es.csproj.AssemblyReference.cache and b/Admin.Core.Serilog.Es/obj/Release/net6.0/Admin.Core.Serilog.Es.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.Service/obj/Release/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Service/obj/Release/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig index 84e97c12..19486c3e 100644 --- a/Admin.Core.Service/obj/Release/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Service/obj/Release/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Service -build_property.ProjectDir = D:\gitea\AUCMA\AUCMA_SCADA\Admin.Core.Service\ +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Service\ diff --git a/Admin.Core.Service/obj/Release/net6.0/Admin.Core.Service.assets.cache b/Admin.Core.Service/obj/Release/net6.0/Admin.Core.Service.assets.cache index 2eb24b67..76746847 100644 Binary files a/Admin.Core.Service/obj/Release/net6.0/Admin.Core.Service.assets.cache and b/Admin.Core.Service/obj/Release/net6.0/Admin.Core.Service.assets.cache differ diff --git a/Admin.Core.Service/obj/Release/net6.0/Admin.Core.Service.csproj.AssemblyReference.cache b/Admin.Core.Service/obj/Release/net6.0/Admin.Core.Service.csproj.AssemblyReference.cache index acefedb8..7d2087e3 100644 Binary files a/Admin.Core.Service/obj/Release/net6.0/Admin.Core.Service.csproj.AssemblyReference.cache and b/Admin.Core.Service/obj/Release/net6.0/Admin.Core.Service.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.csproj.AssemblyReference.cache b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.csproj.AssemblyReference.cache index 3dcf8bc4..de7ffa61 100644 Binary files a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.csproj.AssemblyReference.cache and b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.Tasks/obj/Release/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Tasks/obj/Release/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig index caf0ddc6..d114eba8 100644 --- a/Admin.Core.Tasks/obj/Release/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig +++ b/Admin.Core.Tasks/obj/Release/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Admin.Core.Tasks -build_property.ProjectDir = D:\gitea\AUCMA\AUCMA_SCADA\Admin.Core.Tasks\ +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\ diff --git a/Admin.Core.Tasks/obj/Release/net6.0/Admin.Core.Tasks.assets.cache b/Admin.Core.Tasks/obj/Release/net6.0/Admin.Core.Tasks.assets.cache index 005afd8f..2db264a0 100644 Binary files a/Admin.Core.Tasks/obj/Release/net6.0/Admin.Core.Tasks.assets.cache and b/Admin.Core.Tasks/obj/Release/net6.0/Admin.Core.Tasks.assets.cache differ diff --git a/Admin.Core.Tasks/obj/Release/net6.0/Admin.Core.Tasks.csproj.AssemblyReference.cache b/Admin.Core.Tasks/obj/Release/net6.0/Admin.Core.Tasks.csproj.AssemblyReference.cache index 0c47fd79..7fe8eaac 100644 Binary files a/Admin.Core.Tasks/obj/Release/net6.0/Admin.Core.Tasks.csproj.AssemblyReference.cache and b/Admin.Core.Tasks/obj/Release/net6.0/Admin.Core.Tasks.csproj.AssemblyReference.cache differ diff --git a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/App.baml b/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/App.baml deleted file mode 100644 index e1946129..00000000 Binary files a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/App.baml and /dev/null differ diff --git a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam.csproj.AssemblyReference.cache b/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam.csproj.AssemblyReference.cache index babb8e88..70ae94fa 100644 Binary files a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam.csproj.AssemblyReference.cache and b/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam.csproj.AssemblyReference.cache differ diff --git a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam_MarkupCompile.cache b/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam_MarkupCompile.cache index 4a66139c..0c2b996f 100644 --- a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam_MarkupCompile.cache +++ b/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam_MarkupCompile.cache @@ -13,8 +13,8 @@ D:\Project\gitea\AUCMA\SCADA\Aucma.Core.BoxFoam\App.xaml 9-1290854581 21064389523 281610457503 -4151507094533 +415-624484903 Assets\Styles\DefaultStyles.xaml;Views\EnterWarehouseStatisticsPageView.xaml;Views\IndexPageView.xaml;Views\MainWindow.xaml;Views\MonitorPageView.xaml;Views\RealTimeInventoryPageView.xaml;Views\UserPage\AfterFoamingPageView.xaml;Views\UserPage\BeforeFoamingPageView.xaml;Views\UserPage\SpaceDetailPageView.xaml; -False +True diff --git a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.cs b/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.cs index c65238fb..36288f46 100644 --- a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.cs +++ b/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.cs @@ -1,2 +1,62 @@ - +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +namespace XamlGeneratedNamespace { + + + /// + /// GeneratedInternalTypeHelper + /// + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] + public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper { + + /// + /// CreateInstance + /// + protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) { + return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) + | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture); + } + + /// + /// GetPropertyValue + /// + protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) { + return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture); + } + + /// + /// SetPropertyValue + /// + protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) { + propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture); + } + + /// + /// CreateDelegate + /// + protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) { + return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod + | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] { + delegateType, + handler}, null))); + } + + /// + /// AddEventHandler + /// + protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) { + eventInfo.AddEventHandler(target, handler); + } + } +} diff --git a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Views/EnterWarehouseStatisticsPageView.baml b/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Views/EnterWarehouseStatisticsPageView.baml deleted file mode 100644 index 0490edaf..00000000 Binary files a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Views/EnterWarehouseStatisticsPageView.baml and /dev/null differ diff --git a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Views/IndexPageView.baml b/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Views/IndexPageView.baml deleted file mode 100644 index b39a0ae9..00000000 Binary files a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Views/IndexPageView.baml and /dev/null differ diff --git a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Views/MonitorPageView.baml b/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Views/MonitorPageView.baml deleted file mode 100644 index c6a497f7..00000000 Binary files a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Views/MonitorPageView.baml and /dev/null differ diff --git a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Views/RealTimeInventoryPageView.baml b/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Views/RealTimeInventoryPageView.baml deleted file mode 100644 index d04d0cab..00000000 Binary files a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Views/RealTimeInventoryPageView.baml and /dev/null differ diff --git a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Views/UserPage/AfterFoamingPageView.baml b/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Views/UserPage/AfterFoamingPageView.baml deleted file mode 100644 index 555ac580..00000000 Binary files a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Views/UserPage/AfterFoamingPageView.baml and /dev/null differ diff --git a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Views/UserPage/SpaceDetailPageView.baml b/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Views/UserPage/SpaceDetailPageView.baml deleted file mode 100644 index ece313ac..00000000 Binary files a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Views/UserPage/SpaceDetailPageView.baml and /dev/null differ diff --git a/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/App.g.cs b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/App.g.cs index e52ba240..9afe9236 100644 --- a/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/App.g.cs +++ b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/App.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "96B2E01642CA103E00DF0A9DA221B77797CDB64B" +#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "B81D578565512BCED33960C09254A5AC8A26DDE6" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -9,7 +9,7 @@ // //------------------------------------------------------------------------------ -using Aucma.Core.BoxFoaming; +using Aucma.Core.BoxFoam; using System; using System.Diagnostics; using System.Windows; @@ -34,7 +34,7 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Aucma.Core.BoxFoaming { +namespace Aucma.Core.BoxFoam { /// @@ -48,13 +48,13 @@ namespace Aucma.Core.BoxFoaming { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public void InitializeComponent() { if (_contentLoaded) { return; } _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/Aucma.Core.BoxFoaming;component/app.xaml", System.UriKind.Relative); + System.Uri resourceLocater = new System.Uri("/Aucma.Core.BoxFoam;component/app.xaml", System.UriKind.Relative); #line 1 "..\..\..\App.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); @@ -68,9 +68,9 @@ namespace Aucma.Core.BoxFoaming { /// [System.STAThreadAttribute()] [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public static void Main() { - Aucma.Core.BoxFoaming.App app = new Aucma.Core.BoxFoaming.App(); + Aucma.Core.BoxFoam.App app = new Aucma.Core.BoxFoam.App(); app.InitializeComponent(); app.Run(); } diff --git a/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam.AssemblyInfo.cs b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam.AssemblyInfo.cs new file mode 100644 index 00000000..59a9d398 --- /dev/null +++ b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam.AssemblyInfo.cs @@ -0,0 +1,25 @@ +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("Aucma.Core.BoxFoam")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyProductAttribute("Aucma.Core.BoxFoam")] +[assembly: System.Reflection.AssemblyTitleAttribute("Aucma.Core.BoxFoam")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] +[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")] +[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")] + +// 由 MSBuild WriteCodeFragment 类生成。 + diff --git a/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam.AssemblyInfoInputs.cache b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam.AssemblyInfoInputs.cache new file mode 100644 index 00000000..b8c82381 --- /dev/null +++ b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +e93061bbe1049f9ba430fe2c32071fa951ba738a diff --git a/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam.GeneratedMSBuildEditorConfig.editorconfig b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 00000000..4129ed4a --- /dev/null +++ b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,17 @@ +is_global = true +build_property.ApplicationManifest = +build_property.StartupObject = +build_property.ApplicationDefaultFont = +build_property.ApplicationHighDpiMode = +build_property.ApplicationUseCompatibleTextRendering = +build_property.ApplicationVisualStyles = +build_property.TargetFramework = net6.0-windows +build_property.TargetPlatformMinVersion = 7.0 +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = Aucma.Core.BoxFoam +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Aucma.Core.BoxFoam\ diff --git a/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam.assets.cache b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam.assets.cache new file mode 100644 index 00000000..5e3599b9 Binary files /dev/null and b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam.assets.cache differ diff --git a/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam.csproj.AssemblyReference.cache b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam.csproj.AssemblyReference.cache new file mode 100644 index 00000000..5704f1aa Binary files /dev/null and b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam.csproj.AssemblyReference.cache differ diff --git a/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam_Content.g.cs b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam_Content.g.cs new file mode 100644 index 00000000..a997cfd0 --- /dev/null +++ b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam_Content.g.cs @@ -0,0 +1,14 @@ +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +[assembly: System.Windows.Resources.AssemblyAssociatedContentFileAttribute("appsettings.json")] +[assembly: System.Windows.Resources.AssemblyAssociatedContentFileAttribute("log4net.config")] + + diff --git a/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam_MarkupCompile.cache b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam_MarkupCompile.cache new file mode 100644 index 00000000..be3574fd --- /dev/null +++ b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam_MarkupCompile.cache @@ -0,0 +1,20 @@ +Aucma.Core.BoxFoam + + +winexe +C# +.cs +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.BoxFoam\obj\Release\net6.0-windows\ +Aucma.Core.BoxFoam +none +false +TRACE;RELEASE;NET;NET6_0;NETCOREAPP +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.BoxFoam\App.xaml +9-1290854581 +21064389523 +281610457503 +415286307481 +Assets\Styles\DefaultStyles.xaml;Views\EnterWarehouseStatisticsPageView.xaml;Views\IndexPageView.xaml;Views\MainWindow.xaml;Views\MonitorPageView.xaml;Views\RealTimeInventoryPageView.xaml;Views\UserPage\AfterFoamingPageView.xaml;Views\UserPage\BeforeFoamingPageView.xaml;Views\UserPage\SpaceDetailPageView.xaml; + +True + diff --git a/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam_MarkupCompile.lref b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam_MarkupCompile.lref new file mode 100644 index 00000000..74827328 --- /dev/null +++ b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Aucma.Core.BoxFoam_MarkupCompile.lref @@ -0,0 +1,9 @@ +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.BoxFoam\obj\Release\net6.0-windows\GeneratedInternalTypeHelper.g.cs +FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.BoxFoam\App.xaml;; +FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.BoxFoam\Views\EnterWarehouseStatisticsPageView.xaml;; +FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.BoxFoam\Views\IndexPageView.xaml;; +FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.BoxFoam\Views\MonitorPageView.xaml;; +FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.BoxFoam\Views\RealTimeInventoryPageView.xaml;; +FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.BoxFoam\Views\UserPage\AfterFoamingPageView.xaml;; +FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.BoxFoam\Views\UserPage\SpaceDetailPageView.xaml;; + diff --git a/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/GeneratedInternalTypeHelper.g.cs b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/GeneratedInternalTypeHelper.g.cs index 6e2e519f..36288f46 100644 --- a/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/GeneratedInternalTypeHelper.g.cs +++ b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/GeneratedInternalTypeHelper.g.cs @@ -15,7 +15,7 @@ namespace XamlGeneratedNamespace { /// GeneratedInternalTypeHelper /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper { diff --git a/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Views/EnterWarehouseStatisticsPageView.g.cs b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Views/EnterWarehouseStatisticsPageView.g.cs index a0de668d..353c876f 100644 --- a/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Views/EnterWarehouseStatisticsPageView.g.cs +++ b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Views/EnterWarehouseStatisticsPageView.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\EnterWarehouseStatisticsPageView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "7A600E9D34806C4B3235E06EB627E32AD1D26682" +#pragma checksum "..\..\..\..\Views\EnterWarehouseStatisticsPageView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "EA1C03FE763B213952CAE6F1838EFBBD83E6BBCE" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -9,8 +9,8 @@ // //------------------------------------------------------------------------------ -using Aucma.Core.BoxFoaming.ConvertTo; -using Aucma.Core.BoxFoaming.Views; +using Aucma.Core.BoxFoam.ConvertTo; +using Aucma.Core.BoxFoam.Views; using MaterialDesignThemes.Wpf; using MaterialDesignThemes.Wpf.Converters; using MaterialDesignThemes.Wpf.Transitions; @@ -38,7 +38,7 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Aucma.Core.BoxFoaming.Views { +namespace Aucma.Core.BoxFoam.Views { /// @@ -68,13 +68,13 @@ namespace Aucma.Core.BoxFoaming.Views { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public void InitializeComponent() { if (_contentLoaded) { return; } _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/Aucma.Core.BoxFoaming;component/views/enterwarehousestatisticspageview.xaml", System.UriKind.Relative); + System.Uri resourceLocater = new System.Uri("/Aucma.Core.BoxFoam;component/views/enterwarehousestatisticspageview.xaml", System.UriKind.Relative); #line 1 "..\..\..\..\Views\EnterWarehouseStatisticsPageView.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); @@ -84,7 +84,7 @@ namespace Aucma.Core.BoxFoaming.Views { } [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] diff --git a/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Views/IndexPageView.g.cs b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Views/IndexPageView.g.cs index fcbd707d..a092df04 100644 --- a/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Views/IndexPageView.g.cs +++ b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Views/IndexPageView.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\IndexPageView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "F2AAB771D7635EDB6300E97DD9A4B2AC5435C8A5" +#pragma checksum "..\..\..\..\Views\IndexPageView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "BBFFB101B9ECD559FFEE70EC5911A67BAADB7842" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -9,8 +9,7 @@ // //------------------------------------------------------------------------------ -using Aucma.Core.BoxFoaming.Views; -using LiveChartsCore.SkiaSharpView.WPF; +using Aucma.Core.BoxFoam.Views; using System; using System.Diagnostics; using System.Windows; @@ -35,7 +34,7 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Aucma.Core.BoxFoaming.Views { +namespace Aucma.Core.BoxFoam.Views { /// @@ -44,7 +43,7 @@ namespace Aucma.Core.BoxFoaming.Views { public partial class IndexPageView : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { - #line 108 "..\..\..\..\Views\IndexPageView.xaml" + #line 114 "..\..\..\..\Views\IndexPageView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Border HeightHelperPanel; @@ -52,7 +51,7 @@ namespace Aucma.Core.BoxFoaming.Views { #line hidden - #line 110 "..\..\..\..\Views\IndexPageView.xaml" + #line 116 "..\..\..\..\Views\IndexPageView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ListBox listBox; @@ -60,7 +59,7 @@ namespace Aucma.Core.BoxFoaming.Views { #line hidden - #line 127 "..\..\..\..\Views\IndexPageView.xaml" + #line 133 "..\..\..\..\Views\IndexPageView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Border ScanPanel; @@ -73,13 +72,13 @@ namespace Aucma.Core.BoxFoaming.Views { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public void InitializeComponent() { if (_contentLoaded) { return; } _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/Aucma.Core.BoxFoaming;component/views/indexpageview.xaml", System.UriKind.Relative); + System.Uri resourceLocater = new System.Uri("/Aucma.Core.BoxFoam;component/views/indexpageview.xaml", System.UriKind.Relative); #line 1 "..\..\..\..\Views\IndexPageView.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); @@ -89,7 +88,7 @@ namespace Aucma.Core.BoxFoaming.Views { } [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] diff --git a/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Views/MainWindow.baml b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Views/MainWindow.baml index 1367833d..830d7de4 100644 Binary files a/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Views/MainWindow.baml and b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Views/MainWindow.baml differ diff --git a/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Views/MainWindow.g.cs b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Views/MainWindow.g.cs index 2b55d255..95feffb1 100644 --- a/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Views/MainWindow.g.cs +++ b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Views/MainWindow.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "1CD528D83D43393BD831DDDC2D38E1DABB325C99" +#pragma checksum "..\..\..\..\Views\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "E90B32D4CD4DD4324235082CF55DA14A532483B2" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -36,7 +36,7 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Aucma.Core.BoxFoaming.Views { +namespace Aucma.Core.BoxFoam.Views { /// @@ -77,14 +77,6 @@ namespace Aucma.Core.BoxFoaming.Views { #line hidden - #line 67 "..\..\..\..\Views\MainWindow.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Button MonitorPage; - - #line default - #line hidden - - #line 68 "..\..\..\..\Views\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button StatisticsPage; @@ -170,13 +162,13 @@ namespace Aucma.Core.BoxFoaming.Views { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public void InitializeComponent() { if (_contentLoaded) { return; } _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/Aucma.Core.BoxFoaming;component/views/mainwindow.xaml", System.UriKind.Relative); + System.Uri resourceLocater = new System.Uri("/Aucma.Core.BoxFoam;component/views/mainwindow.xaml", System.UriKind.Relative); #line 1 "..\..\..\..\Views\MainWindow.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); @@ -186,7 +178,7 @@ namespace Aucma.Core.BoxFoaming.Views { } [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] @@ -207,36 +199,33 @@ namespace Aucma.Core.BoxFoaming.Views { this.RealTimeInventoryPage = ((System.Windows.Controls.Button)(target)); return; case 5: - this.MonitorPage = ((System.Windows.Controls.Button)(target)); - return; - case 6: this.StatisticsPage = ((System.Windows.Controls.Button)(target)); return; - case 7: + case 6: this.TabTip = ((System.Windows.Controls.Button)(target)); return; - case 8: + case 7: this.Minimized = ((System.Windows.Controls.Button)(target)); return; - case 9: + case 8: this.Exit = ((System.Windows.Controls.Button)(target)); return; - case 10: + case 9: this.PlcStatus = ((System.Windows.Media.ImageBrush)(target)); return; - case 11: + case 10: this.PLCState = ((System.Windows.Controls.TextBlock)(target)); return; - case 12: + case 11: this.PlcStatusImage = ((System.Windows.Media.ImageBrush)(target)); return; - case 13: + case 12: this.DB = ((System.Windows.Controls.TextBlock)(target)); return; - case 14: + case 13: this.BarCodeStatus = ((System.Windows.Media.ImageBrush)(target)); return; - case 15: + case 14: this.BarCodeStatusTxt = ((System.Windows.Controls.TextBlock)(target)); return; } diff --git a/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Views/MonitorPageView.g.cs b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Views/MonitorPageView.g.cs index 1557d7aa..262af22b 100644 --- a/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Views/MonitorPageView.g.cs +++ b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Views/MonitorPageView.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\MonitorPageView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "7962D1326A63DA5DD7409E04E413BD89826E7B5F" +#pragma checksum "..\..\..\..\Views\MonitorPageView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "5050CCCB3D8442B5AB1EA9811B309C19CA41A1A9" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -9,7 +9,7 @@ // //------------------------------------------------------------------------------ -using Aucma.Core.BoxFoaming.Views; +using Aucma.Core.BoxFoam.Views; using System; using System.Diagnostics; using System.Windows; @@ -34,7 +34,7 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Aucma.Core.BoxFoaming.Views { +namespace Aucma.Core.BoxFoam.Views { /// @@ -48,13 +48,13 @@ namespace Aucma.Core.BoxFoaming.Views { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public void InitializeComponent() { if (_contentLoaded) { return; } _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/Aucma.Core.BoxFoaming;component/views/monitorpageview.xaml", System.UriKind.Relative); + System.Uri resourceLocater = new System.Uri("/Aucma.Core.BoxFoam;component/views/monitorpageview.xaml", System.UriKind.Relative); #line 1 "..\..\..\..\Views\MonitorPageView.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); @@ -64,7 +64,7 @@ namespace Aucma.Core.BoxFoaming.Views { } [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] diff --git a/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Views/RealTimeInventoryPageView.g.cs b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Views/RealTimeInventoryPageView.g.cs index 6b0bcbab..e024a0af 100644 --- a/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Views/RealTimeInventoryPageView.g.cs +++ b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Views/RealTimeInventoryPageView.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\RealTimeInventoryPageView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "12388B0831A6B6343DAA76042EB8C1FFB8F96AE3" +#pragma checksum "..\..\..\..\Views\RealTimeInventoryPageView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "6C07CCCE1B3F8D060B8D6C39D3B2FE5442DC3522" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -9,8 +9,7 @@ // //------------------------------------------------------------------------------ -using Aucma.Core.BoxFoaming.UserPage; -using Aucma.Core.BoxFoaming.Views; +using Aucma.Core.BoxFoam.Views; using MaterialDesignThemes.Wpf; using MaterialDesignThemes.Wpf.Converters; using MaterialDesignThemes.Wpf.Transitions; @@ -38,7 +37,7 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Aucma.Core.BoxFoaming.Views { +namespace Aucma.Core.BoxFoam.Views { /// @@ -46,19 +45,35 @@ namespace Aucma.Core.BoxFoaming.Views { /// public partial class RealTimeInventoryPageView : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { + + #line 19 "..\..\..\..\Views\RealTimeInventoryPageView.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.Button PqInventory; + + #line default + #line hidden + + + #line 20 "..\..\..\..\Views\RealTimeInventoryPageView.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.Button PhInventory; + + #line default + #line hidden + private bool _contentLoaded; /// /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public void InitializeComponent() { if (_contentLoaded) { return; } _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/Aucma.Core.BoxFoaming;component/views/realtimeinventorypageview.xaml", System.UriKind.Relative); + System.Uri resourceLocater = new System.Uri("/Aucma.Core.BoxFoam;component/views/realtimeinventorypageview.xaml", System.UriKind.Relative); #line 1 "..\..\..\..\Views\RealTimeInventoryPageView.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); @@ -68,12 +83,21 @@ namespace Aucma.Core.BoxFoaming.Views { } [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")] void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) { + switch (connectionId) + { + case 1: + this.PqInventory = ((System.Windows.Controls.Button)(target)); + return; + case 2: + this.PhInventory = ((System.Windows.Controls.Button)(target)); + return; + } this._contentLoaded = true; } } diff --git a/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Views/UserPage/AfterFoamingPageView.g.cs b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Views/UserPage/AfterFoamingPageView.g.cs new file mode 100644 index 00000000..b0dbd036 --- /dev/null +++ b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Views/UserPage/AfterFoamingPageView.g.cs @@ -0,0 +1,94 @@ +#pragma checksum "..\..\..\..\..\Views\UserPage\AfterFoamingPageView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "C8B3729024CC4D671D141A4461312C3D708AB996" +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +using Aucma.Core.BoxFoam.Views.UserPage; +using MaterialDesignThemes.Wpf; +using MaterialDesignThemes.Wpf.Converters; +using MaterialDesignThemes.Wpf.Transitions; +using System; +using System.Diagnostics; +using System.Windows; +using System.Windows.Automation; +using System.Windows.Controls; +using System.Windows.Controls.Primitives; +using System.Windows.Controls.Ribbon; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Forms.Integration; +using System.Windows.Ink; +using System.Windows.Input; +using System.Windows.Markup; +using System.Windows.Media; +using System.Windows.Media.Animation; +using System.Windows.Media.Effects; +using System.Windows.Media.Imaging; +using System.Windows.Media.Media3D; +using System.Windows.Media.TextFormatting; +using System.Windows.Navigation; +using System.Windows.Shapes; +using System.Windows.Shell; + + +namespace Aucma.Core.BoxFoam.Views.UserPage { + + + /// + /// AfterFoamingPageView + /// + public partial class AfterFoamingPageView : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { + + + #line 20 "..\..\..\..\..\Views\UserPage\AfterFoamingPageView.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.ScrollViewer MainScrollViewer; + + #line default + #line hidden + + private bool _contentLoaded; + + /// + /// InitializeComponent + /// + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] + public void InitializeComponent() { + if (_contentLoaded) { + return; + } + _contentLoaded = true; + System.Uri resourceLocater = new System.Uri("/Aucma.Core.BoxFoam;component/views/userpage/afterfoamingpageview.xaml", System.UriKind.Relative); + + #line 1 "..\..\..\..\..\Views\UserPage\AfterFoamingPageView.xaml" + System.Windows.Application.LoadComponent(this, resourceLocater); + + #line default + #line hidden + } + + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")] + void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) { + switch (connectionId) + { + case 1: + this.MainScrollViewer = ((System.Windows.Controls.ScrollViewer)(target)); + return; + } + this._contentLoaded = true; + } + } +} + diff --git a/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Views/UserPage/BeforeFoamingPageView.baml b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Views/UserPage/BeforeFoamingPageView.baml new file mode 100644 index 00000000..ef996240 Binary files /dev/null and b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Views/UserPage/BeforeFoamingPageView.baml differ diff --git a/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Views/UserPage/BeforeFoamingPageView.g.cs b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Views/UserPage/BeforeFoamingPageView.g.cs new file mode 100644 index 00000000..5d066cda --- /dev/null +++ b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Views/UserPage/BeforeFoamingPageView.g.cs @@ -0,0 +1,93 @@ +#pragma checksum "..\..\..\..\..\Views\UserPage\BeforeFoamingPageView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D5C9A4BBA45C30B93472E0C8D6172B932F960152" +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +using MaterialDesignThemes.Wpf; +using MaterialDesignThemes.Wpf.Converters; +using MaterialDesignThemes.Wpf.Transitions; +using System; +using System.Diagnostics; +using System.Windows; +using System.Windows.Automation; +using System.Windows.Controls; +using System.Windows.Controls.Primitives; +using System.Windows.Controls.Ribbon; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Forms.Integration; +using System.Windows.Ink; +using System.Windows.Input; +using System.Windows.Markup; +using System.Windows.Media; +using System.Windows.Media.Animation; +using System.Windows.Media.Effects; +using System.Windows.Media.Imaging; +using System.Windows.Media.Media3D; +using System.Windows.Media.TextFormatting; +using System.Windows.Navigation; +using System.Windows.Shapes; +using System.Windows.Shell; + + +namespace Aucma.Core.BoxFoam.Views.UserPage { + + + /// + /// BeforeFoamingPageView + /// + public partial class BeforeFoamingPageView : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { + + + #line 19 "..\..\..\..\..\Views\UserPage\BeforeFoamingPageView.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.ScrollViewer MainScrollViewer; + + #line default + #line hidden + + private bool _contentLoaded; + + /// + /// InitializeComponent + /// + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] + public void InitializeComponent() { + if (_contentLoaded) { + return; + } + _contentLoaded = true; + System.Uri resourceLocater = new System.Uri("/Aucma.Core.BoxFoam;component/views/userpage/beforefoamingpageview.xaml", System.UriKind.Relative); + + #line 1 "..\..\..\..\..\Views\UserPage\BeforeFoamingPageView.xaml" + System.Windows.Application.LoadComponent(this, resourceLocater); + + #line default + #line hidden + } + + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")] + void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) { + switch (connectionId) + { + case 1: + this.MainScrollViewer = ((System.Windows.Controls.ScrollViewer)(target)); + return; + } + this._contentLoaded = true; + } + } +} + diff --git a/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Views/UserPage/SpaceDetailPageView.g.cs b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Views/UserPage/SpaceDetailPageView.g.cs new file mode 100644 index 00000000..fc12116c --- /dev/null +++ b/Aucma.Core.BoxFoam/obj/Release/net6.0-windows/Views/UserPage/SpaceDetailPageView.g.cs @@ -0,0 +1,91 @@ +#pragma checksum "..\..\..\..\..\Views\UserPage\SpaceDetailPageView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "6F642D60542EF803E0CFA3DB71FBC04396BA0F9C" +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +using Aucma.Core.BoxFoam.Views.UserPage; +using System; +using System.Diagnostics; +using System.Windows; +using System.Windows.Automation; +using System.Windows.Controls; +using System.Windows.Controls.Primitives; +using System.Windows.Controls.Ribbon; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Forms.Integration; +using System.Windows.Ink; +using System.Windows.Input; +using System.Windows.Markup; +using System.Windows.Media; +using System.Windows.Media.Animation; +using System.Windows.Media.Effects; +using System.Windows.Media.Imaging; +using System.Windows.Media.Media3D; +using System.Windows.Media.TextFormatting; +using System.Windows.Navigation; +using System.Windows.Shapes; +using System.Windows.Shell; + + +namespace Aucma.Core.BoxFoam.Views.UserPage { + + + /// + /// SpaceDetailPageView + /// + public partial class SpaceDetailPageView : System.Windows.Window, System.Windows.Markup.IComponentConnector { + + + #line 21 "..\..\..\..\..\Views\UserPage\SpaceDetailPageView.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.Border SpaceDetailPanel; + + #line default + #line hidden + + private bool _contentLoaded; + + /// + /// InitializeComponent + /// + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] + public void InitializeComponent() { + if (_contentLoaded) { + return; + } + _contentLoaded = true; + System.Uri resourceLocater = new System.Uri("/Aucma.Core.BoxFoam;component/views/userpage/spacedetailpageview.xaml", System.UriKind.Relative); + + #line 1 "..\..\..\..\..\Views\UserPage\SpaceDetailPageView.xaml" + System.Windows.Application.LoadComponent(this, resourceLocater); + + #line default + #line hidden + } + + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")] + void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) { + switch (connectionId) + { + case 1: + this.SpaceDetailPanel = ((System.Windows.Controls.Border)(target)); + return; + } + this._contentLoaded = true; + } + } +} + diff --git a/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/App.baml b/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/App.baml deleted file mode 100644 index f3148e99..00000000 Binary files a/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/App.baml and /dev/null differ diff --git a/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Aucma.Core.DoorFoam.csproj.AssemblyReference.cache b/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Aucma.Core.DoorFoam.csproj.AssemblyReference.cache index aa5a4b7a..41544368 100644 Binary files a/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Aucma.Core.DoorFoam.csproj.AssemblyReference.cache and b/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Aucma.Core.DoorFoam.csproj.AssemblyReference.cache differ diff --git a/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Aucma.Core.DoorFoam_MarkupCompile.cache b/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Aucma.Core.DoorFoam_MarkupCompile.cache index 13f498cd..bbbc93d0 100644 --- a/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Aucma.Core.DoorFoam_MarkupCompile.cache +++ b/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Aucma.Core.DoorFoam_MarkupCompile.cache @@ -13,8 +13,8 @@ D:\Project\gitea\AUCMA\SCADA\Aucma.Core.DoorFoam\App.xaml 4820000597 21064389523 171935592671 -417-1607165741 +417556222119 Assets\Styles\DefaultStyles.xaml;Views\IndexPageView.xaml;Views\MainWindow.xaml;Views\StatisticsPageView.xaml; -False +True diff --git a/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.cs b/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.cs index c65238fb..36288f46 100644 --- a/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.cs +++ b/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.cs @@ -1,2 +1,62 @@ - +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +namespace XamlGeneratedNamespace { + + + /// + /// GeneratedInternalTypeHelper + /// + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] + public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper { + + /// + /// CreateInstance + /// + protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) { + return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) + | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture); + } + + /// + /// GetPropertyValue + /// + protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) { + return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture); + } + + /// + /// SetPropertyValue + /// + protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) { + propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture); + } + + /// + /// CreateDelegate + /// + protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) { + return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod + | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] { + delegateType, + handler}, null))); + } + + /// + /// AddEventHandler + /// + protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) { + eventInfo.AddEventHandler(target, handler); + } + } +} diff --git a/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Views/IndexPageView.baml b/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Views/IndexPageView.baml deleted file mode 100644 index 9c0f7bee..00000000 Binary files a/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Views/IndexPageView.baml and /dev/null differ diff --git a/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Views/StatisticsPageView.baml b/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Views/StatisticsPageView.baml deleted file mode 100644 index de6d397b..00000000 Binary files a/Aucma.Core.DoorFoam/obj/Debug/net6.0-windows/Views/StatisticsPageView.baml and /dev/null differ diff --git a/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/App.g.cs b/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/App.g.cs index e59ef319..50832fd9 100644 --- a/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/App.g.cs +++ b/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/App.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "872B0DBB43EBA9185935B2ECDD7C2B53BE932843" +#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "FCA081785CDA4C530590073E3B7A84B0CEE711DD" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -9,7 +9,7 @@ // //------------------------------------------------------------------------------ -using Aucma.Core.DoorFoaming; +using Aucma.Core.DoorFoam; using System; using System.Diagnostics; using System.Windows; @@ -34,7 +34,7 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Aucma.Core.DoorFoaming { +namespace Aucma.Core.DoorFoam { /// @@ -48,13 +48,13 @@ namespace Aucma.Core.DoorFoaming { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public void InitializeComponent() { if (_contentLoaded) { return; } _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/Aucma.Core.DoorFoaming;component/app.xaml", System.UriKind.Relative); + System.Uri resourceLocater = new System.Uri("/Aucma.Core.DoorFoam;component/app.xaml", System.UriKind.Relative); #line 1 "..\..\..\App.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); @@ -68,9 +68,9 @@ namespace Aucma.Core.DoorFoaming { /// [System.STAThreadAttribute()] [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public static void Main() { - Aucma.Core.DoorFoaming.App app = new Aucma.Core.DoorFoaming.App(); + Aucma.Core.DoorFoam.App app = new Aucma.Core.DoorFoam.App(); app.InitializeComponent(); app.Run(); } diff --git a/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam.AssemblyInfo.cs b/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam.AssemblyInfo.cs new file mode 100644 index 00000000..bac4052f --- /dev/null +++ b/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam.AssemblyInfo.cs @@ -0,0 +1,25 @@ +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("Aucma.Core.DoorFoam")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyProductAttribute("Aucma.Core.DoorFoam")] +[assembly: System.Reflection.AssemblyTitleAttribute("Aucma.Core.DoorFoam")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] +[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")] +[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")] + +// 由 MSBuild WriteCodeFragment 类生成。 + diff --git a/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam.AssemblyInfoInputs.cache b/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam.AssemblyInfoInputs.cache new file mode 100644 index 00000000..41cc5f04 --- /dev/null +++ b/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +eb1facfd7a81fa72bf7174e13c747355178173e1 diff --git a/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam.GeneratedMSBuildEditorConfig.editorconfig b/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 00000000..e3835487 --- /dev/null +++ b/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,17 @@ +is_global = true +build_property.ApplicationManifest = +build_property.StartupObject = +build_property.ApplicationDefaultFont = +build_property.ApplicationHighDpiMode = +build_property.ApplicationUseCompatibleTextRendering = +build_property.ApplicationVisualStyles = +build_property.TargetFramework = net6.0-windows +build_property.TargetPlatformMinVersion = 7.0 +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = Aucma.Core.DoorFoam +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Aucma.Core.DoorFoam\ diff --git a/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam.assets.cache b/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam.assets.cache new file mode 100644 index 00000000..2430443d Binary files /dev/null and b/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam.assets.cache differ diff --git a/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam.csproj.AssemblyReference.cache b/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam.csproj.AssemblyReference.cache new file mode 100644 index 00000000..ecdbb02c Binary files /dev/null and b/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam.csproj.AssemblyReference.cache differ diff --git a/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam_Content.g.cs b/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam_Content.g.cs new file mode 100644 index 00000000..a997cfd0 --- /dev/null +++ b/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam_Content.g.cs @@ -0,0 +1,14 @@ +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +[assembly: System.Windows.Resources.AssemblyAssociatedContentFileAttribute("appsettings.json")] +[assembly: System.Windows.Resources.AssemblyAssociatedContentFileAttribute("log4net.config")] + + diff --git a/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam_MarkupCompile.cache b/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam_MarkupCompile.cache new file mode 100644 index 00000000..c3f86edf --- /dev/null +++ b/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam_MarkupCompile.cache @@ -0,0 +1,20 @@ +Aucma.Core.DoorFoam + + +winexe +C# +.cs +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.DoorFoam\obj\Release\net6.0-windows\ +Aucma.Core.DoorFoam +none +false +TRACE;RELEASE;NET;NET6_0;NETCOREAPP +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.DoorFoam\App.xaml +4820000597 +21064389523 +171935592671 +4171467014503 +Assets\Styles\DefaultStyles.xaml;Views\IndexPageView.xaml;Views\MainWindow.xaml;Views\StatisticsPageView.xaml; + +True + diff --git a/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam_MarkupCompile.lref b/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam_MarkupCompile.lref new file mode 100644 index 00000000..7a514bda --- /dev/null +++ b/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Aucma.Core.DoorFoam_MarkupCompile.lref @@ -0,0 +1,5 @@ +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.DoorFoam\obj\Release\net6.0-windows\GeneratedInternalTypeHelper.g.cs +FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.DoorFoam\App.xaml;; +FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.DoorFoam\Views\IndexPageView.xaml;; +FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.DoorFoam\Views\StatisticsPageView.xaml;; + diff --git a/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/GeneratedInternalTypeHelper.g.cs b/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/GeneratedInternalTypeHelper.g.cs index 6e2e519f..36288f46 100644 --- a/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/GeneratedInternalTypeHelper.g.cs +++ b/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/GeneratedInternalTypeHelper.g.cs @@ -15,7 +15,7 @@ namespace XamlGeneratedNamespace { /// GeneratedInternalTypeHelper /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper { diff --git a/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Views/IndexPageView.g.cs b/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Views/IndexPageView.g.cs index 745d5b0f..6db5ccd8 100644 --- a/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Views/IndexPageView.g.cs +++ b/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Views/IndexPageView.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\IndexPageView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "831E2AE8A7E2AABF0A66DF2C7A29B663866084E4" +#pragma checksum "..\..\..\..\Views\IndexPageView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "9844205D039FB64FE6F55F7D5DE87DBE67E33A51" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -9,8 +9,8 @@ // //------------------------------------------------------------------------------ -using Aucma.Core.DoorFoaming.Views; -using LiveChartsCore.SkiaSharpView.WPF; +using Aucma.Core.DoorFoam.Views; +using LiveCharts.Wpf; using System; using System.Diagnostics; using System.Windows; @@ -35,7 +35,7 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Aucma.Core.DoorFoaming.Views { +namespace Aucma.Core.DoorFoam.Views { /// @@ -44,7 +44,7 @@ namespace Aucma.Core.DoorFoaming.Views { public partial class IndexPageView : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { - #line 105 "..\..\..\..\Views\IndexPageView.xaml" + #line 100 "..\..\..\..\Views\IndexPageView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Border HeightHelperPanel; @@ -52,7 +52,7 @@ namespace Aucma.Core.DoorFoaming.Views { #line hidden - #line 122 "..\..\..\..\Views\IndexPageView.xaml" + #line 124 "..\..\..\..\Views\IndexPageView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Border ScanPanel; @@ -65,13 +65,13 @@ namespace Aucma.Core.DoorFoaming.Views { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public void InitializeComponent() { if (_contentLoaded) { return; } _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/Aucma.Core.DoorFoaming;component/views/indexpageview.xaml", System.UriKind.Relative); + System.Uri resourceLocater = new System.Uri("/Aucma.Core.DoorFoam;component/views/indexpageview.xaml", System.UriKind.Relative); #line 1 "..\..\..\..\Views\IndexPageView.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); @@ -81,7 +81,7 @@ namespace Aucma.Core.DoorFoaming.Views { } [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] diff --git a/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Views/MainWindow.baml b/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Views/MainWindow.baml index e04efc91..78aec8a8 100644 Binary files a/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Views/MainWindow.baml and b/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Views/MainWindow.baml differ diff --git a/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Views/MainWindow.g.cs b/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Views/MainWindow.g.cs index d1f635bc..b0904697 100644 --- a/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Views/MainWindow.g.cs +++ b/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Views/MainWindow.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "EA63D7F954D7FCD93D7A01511BC0CF310479A778" +#pragma checksum "..\..\..\..\Views\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "DBFBD9E5B947B7D789323D6A4FE7CDD24D7D4168" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -36,7 +36,7 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Aucma.Core.DoorFoaming.Views { +namespace Aucma.Core.DoorFoam.Views { /// @@ -154,13 +154,13 @@ namespace Aucma.Core.DoorFoaming.Views { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public void InitializeComponent() { if (_contentLoaded) { return; } _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/Aucma.Core.DoorFoaming;component/views/mainwindow.xaml", System.UriKind.Relative); + System.Uri resourceLocater = new System.Uri("/Aucma.Core.DoorFoam;component/views/mainwindow.xaml", System.UriKind.Relative); #line 1 "..\..\..\..\Views\MainWindow.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); @@ -170,7 +170,7 @@ namespace Aucma.Core.DoorFoaming.Views { } [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] diff --git a/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Views/StatisticsPageView.g.cs b/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Views/StatisticsPageView.g.cs index 7f3ca981..2702136f 100644 --- a/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Views/StatisticsPageView.g.cs +++ b/Aucma.Core.DoorFoam/obj/Release/net6.0-windows/Views/StatisticsPageView.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\StatisticsPageView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "58E929D6995A395E76ECF090330395E6D1816DC3" +#pragma checksum "..\..\..\..\Views\StatisticsPageView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "04469BE57AD38C6E7A7FD0A83E3243A0BF463F54" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -9,8 +9,8 @@ // //------------------------------------------------------------------------------ -using Aucma.Core.DoorFoaming.ConvertTo; -using Aucma.Core.DoorFoaming.Views; +using Aucma.Core.DoorFoam.ConvertTo; +using Aucma.Core.DoorFoam.Views; using MaterialDesignThemes.Wpf; using MaterialDesignThemes.Wpf.Converters; using MaterialDesignThemes.Wpf.Transitions; @@ -38,7 +38,7 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Aucma.Core.DoorFoaming.Views { +namespace Aucma.Core.DoorFoam.Views { /// @@ -47,7 +47,7 @@ namespace Aucma.Core.DoorFoaming.Views { public partial class StatisticsPageView : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { - #line 131 "..\..\..\..\Views\StatisticsPageView.xaml" + #line 130 "..\..\..\..\Views\StatisticsPageView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.DatePicker BeginTime; @@ -55,7 +55,7 @@ namespace Aucma.Core.DoorFoaming.Views { #line hidden - #line 147 "..\..\..\..\Views\StatisticsPageView.xaml" + #line 146 "..\..\..\..\Views\StatisticsPageView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.DatePicker EndTime; @@ -68,13 +68,13 @@ namespace Aucma.Core.DoorFoaming.Views { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public void InitializeComponent() { if (_contentLoaded) { return; } _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/Aucma.Core.DoorFoaming;component/views/statisticspageview.xaml", System.UriKind.Relative); + System.Uri resourceLocater = new System.Uri("/Aucma.Core.DoorFoam;component/views/statisticspageview.xaml", System.UriKind.Relative); #line 1 "..\..\..\..\Views\StatisticsPageView.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); @@ -84,7 +84,7 @@ namespace Aucma.Core.DoorFoaming.Views { } [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] diff --git a/Aucma.Core.Melsec/obj/Debug/net6.0/Aucma.Core.Melsec.csproj.AssemblyReference.cache b/Aucma.Core.Melsec/obj/Debug/net6.0/Aucma.Core.Melsec.csproj.AssemblyReference.cache index 9cec4f14..25a70784 100644 Binary files a/Aucma.Core.Melsec/obj/Debug/net6.0/Aucma.Core.Melsec.csproj.AssemblyReference.cache and b/Aucma.Core.Melsec/obj/Debug/net6.0/Aucma.Core.Melsec.csproj.AssemblyReference.cache differ diff --git a/Aucma.Core.Melsec/obj/Release/net6.0/Aucma.Core.Melsec.AssemblyInfo.cs b/Aucma.Core.Melsec/obj/Release/net6.0/Aucma.Core.Melsec.AssemblyInfo.cs new file mode 100644 index 00000000..aed959f1 --- /dev/null +++ b/Aucma.Core.Melsec/obj/Release/net6.0/Aucma.Core.Melsec.AssemblyInfo.cs @@ -0,0 +1,23 @@ +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("Aucma.Core.Melsec")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyProductAttribute("Aucma.Core.Melsec")] +[assembly: System.Reflection.AssemblyTitleAttribute("Aucma.Core.Melsec")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] + +// 由 MSBuild WriteCodeFragment 类生成。 + diff --git a/Aucma.Core.Melsec/obj/Release/net6.0/Aucma.Core.Melsec.AssemblyInfoInputs.cache b/Aucma.Core.Melsec/obj/Release/net6.0/Aucma.Core.Melsec.AssemblyInfoInputs.cache new file mode 100644 index 00000000..682bccd4 --- /dev/null +++ b/Aucma.Core.Melsec/obj/Release/net6.0/Aucma.Core.Melsec.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +c3a1cfe5fae89b203088e865c0fd4b5d87b46aa1 diff --git a/Aucma.Core.Melsec/obj/Release/net6.0/Aucma.Core.Melsec.GeneratedMSBuildEditorConfig.editorconfig b/Aucma.Core.Melsec/obj/Release/net6.0/Aucma.Core.Melsec.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 00000000..41c27889 --- /dev/null +++ b/Aucma.Core.Melsec/obj/Release/net6.0/Aucma.Core.Melsec.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,11 @@ +is_global = true +build_property.TargetFramework = net6.0 +build_property.TargetPlatformMinVersion = +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = Aucma.Core.Melsec +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Aucma.Core.Melsec\ diff --git a/Aucma.Core.Melsec/obj/Release/net6.0/Aucma.Core.Melsec.GlobalUsings.g.cs b/Aucma.Core.Melsec/obj/Release/net6.0/Aucma.Core.Melsec.GlobalUsings.g.cs new file mode 100644 index 00000000..8578f3d0 --- /dev/null +++ b/Aucma.Core.Melsec/obj/Release/net6.0/Aucma.Core.Melsec.GlobalUsings.g.cs @@ -0,0 +1,8 @@ +// +global using global::System; +global using global::System.Collections.Generic; +global using global::System.IO; +global using global::System.Linq; +global using global::System.Net.Http; +global using global::System.Threading; +global using global::System.Threading.Tasks; diff --git a/Aucma.Core.Melsec/obj/Release/net6.0/Aucma.Core.Melsec.assets.cache b/Aucma.Core.Melsec/obj/Release/net6.0/Aucma.Core.Melsec.assets.cache new file mode 100644 index 00000000..f19c56ce Binary files /dev/null and b/Aucma.Core.Melsec/obj/Release/net6.0/Aucma.Core.Melsec.assets.cache differ diff --git a/Aucma.Core.Melsec/obj/Release/net6.0/Aucma.Core.Melsec.csproj.AssemblyReference.cache b/Aucma.Core.Melsec/obj/Release/net6.0/Aucma.Core.Melsec.csproj.AssemblyReference.cache new file mode 100644 index 00000000..930e6220 Binary files /dev/null and b/Aucma.Core.Melsec/obj/Release/net6.0/Aucma.Core.Melsec.csproj.AssemblyReference.cache differ diff --git a/Aucma.Core.MelsecPLc/obj/Release/netstandard2.1/.NETStandard,Version=v2.1.AssemblyAttributes.cs b/Aucma.Core.MelsecPLc/obj/Release/netstandard2.1/.NETStandard,Version=v2.1.AssemblyAttributes.cs new file mode 100644 index 00000000..348b87f0 --- /dev/null +++ b/Aucma.Core.MelsecPLc/obj/Release/netstandard2.1/.NETStandard,Version=v2.1.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETStandard,Version=v2.1", FrameworkDisplayName = ".NET Standard 2.1")] diff --git a/Aucma.Core.MelsecPLc/obj/Release/netstandard2.1/Aucma.Core.MelsecPLc.AssemblyInfo.cs b/Aucma.Core.MelsecPLc/obj/Release/netstandard2.1/Aucma.Core.MelsecPLc.AssemblyInfo.cs new file mode 100644 index 00000000..b95705cb --- /dev/null +++ b/Aucma.Core.MelsecPLc/obj/Release/netstandard2.1/Aucma.Core.MelsecPLc.AssemblyInfo.cs @@ -0,0 +1,23 @@ +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("Aucma.Core.MelsecPLc")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyProductAttribute("Aucma.Core.MelsecPLc")] +[assembly: System.Reflection.AssemblyTitleAttribute("Aucma.Core.MelsecPLc")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] + +// 由 MSBuild WriteCodeFragment 类生成。 + diff --git a/Aucma.Core.MelsecPLc/obj/Release/netstandard2.1/Aucma.Core.MelsecPLc.AssemblyInfoInputs.cache b/Aucma.Core.MelsecPLc/obj/Release/netstandard2.1/Aucma.Core.MelsecPLc.AssemblyInfoInputs.cache new file mode 100644 index 00000000..d893a9d5 --- /dev/null +++ b/Aucma.Core.MelsecPLc/obj/Release/netstandard2.1/Aucma.Core.MelsecPLc.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +cc6629f1df497d776b4217781d8ad1fc5824b2c8 diff --git a/Aucma.Core.MelsecPLc/obj/Release/netstandard2.1/Aucma.Core.MelsecPLc.GeneratedMSBuildEditorConfig.editorconfig b/Aucma.Core.MelsecPLc/obj/Release/netstandard2.1/Aucma.Core.MelsecPLc.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 00000000..4c69a738 --- /dev/null +++ b/Aucma.Core.MelsecPLc/obj/Release/netstandard2.1/Aucma.Core.MelsecPLc.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,3 @@ +is_global = true +build_property.RootNamespace = Aucma.Core.MelsecPLc +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Aucma.Core.MelsecPLc\ diff --git a/Aucma.Core.MelsecPLc/obj/Release/netstandard2.1/Aucma.Core.MelsecPLc.assets.cache b/Aucma.Core.MelsecPLc/obj/Release/netstandard2.1/Aucma.Core.MelsecPLc.assets.cache new file mode 100644 index 00000000..97b7b78e Binary files /dev/null and b/Aucma.Core.MelsecPLc/obj/Release/netstandard2.1/Aucma.Core.MelsecPLc.assets.cache differ diff --git a/Aucma.Core.MelsecPLc/obj/Release/netstandard2.1/Aucma.Core.MelsecPLc.csproj.AssemblyReference.cache b/Aucma.Core.MelsecPLc/obj/Release/netstandard2.1/Aucma.Core.MelsecPLc.csproj.AssemblyReference.cache new file mode 100644 index 00000000..64cd09d1 Binary files /dev/null and b/Aucma.Core.MelsecPLc/obj/Release/netstandard2.1/Aucma.Core.MelsecPLc.csproj.AssemblyReference.cache differ diff --git a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/App.baml b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/App.baml deleted file mode 100644 index ca02cea7..00000000 Binary files a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/App.baml and /dev/null differ diff --git a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz.csproj.AssemblyReference.cache b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz.csproj.AssemblyReference.cache index 3464b347..3b82d023 100644 Binary files a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz.csproj.AssemblyReference.cache and b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz.csproj.AssemblyReference.cache differ diff --git a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_MarkupCompile.cache b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_MarkupCompile.cache index 50a1fd16..99689caf 100644 --- a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_MarkupCompile.cache +++ b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Aucma.Core.Palletiz_MarkupCompile.cache @@ -13,8 +13,8 @@ D:\Project\gitea\AUCMA\SCADA\Aucma.Core.Palletiz\App.xaml 4820000597 21064389523 16764066740 -417-1607165741 +417556222119 Assets\Styles\DefaultStyles.xaml;Views\IndexPageView.xaml;Views\MainWindow.xaml;Views\StatisticsPageView.xaml; -False +True diff --git a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.cs b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.cs index c65238fb..36288f46 100644 --- a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.cs +++ b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.cs @@ -1,2 +1,62 @@ - +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +namespace XamlGeneratedNamespace { + + + /// + /// GeneratedInternalTypeHelper + /// + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] + public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper { + + /// + /// CreateInstance + /// + protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) { + return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) + | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture); + } + + /// + /// GetPropertyValue + /// + protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) { + return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture); + } + + /// + /// SetPropertyValue + /// + protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) { + propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture); + } + + /// + /// CreateDelegate + /// + protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) { + return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod + | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] { + delegateType, + handler}, null))); + } + + /// + /// AddEventHandler + /// + protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) { + eventInfo.AddEventHandler(target, handler); + } + } +} diff --git a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Views/IndexPageView.baml b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Views/IndexPageView.baml deleted file mode 100644 index 2191dc19..00000000 Binary files a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Views/IndexPageView.baml and /dev/null differ diff --git a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Views/StatisticsPageView.baml b/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Views/StatisticsPageView.baml deleted file mode 100644 index 9187fd0c..00000000 Binary files a/Aucma.Core.Palletiz/obj/Debug/net6.0-windows/Views/StatisticsPageView.baml and /dev/null differ diff --git a/Aucma.Core.Palletiz/obj/Release/net6.0-windows/App.g.cs b/Aucma.Core.Palletiz/obj/Release/net6.0-windows/App.g.cs index 95920641..95e975e8 100644 --- a/Aucma.Core.Palletiz/obj/Release/net6.0-windows/App.g.cs +++ b/Aucma.Core.Palletiz/obj/Release/net6.0-windows/App.g.cs @@ -48,7 +48,7 @@ namespace Aucma.Core.Palletiz { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public void InitializeComponent() { if (_contentLoaded) { return; @@ -68,7 +68,7 @@ namespace Aucma.Core.Palletiz { /// [System.STAThreadAttribute()] [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public static void Main() { Aucma.Core.Palletiz.App app = new Aucma.Core.Palletiz.App(); app.InitializeComponent(); diff --git a/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Aucma.Core.Palletiz.GeneratedMSBuildEditorConfig.editorconfig b/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Aucma.Core.Palletiz.GeneratedMSBuildEditorConfig.editorconfig index 640cbaa5..9a3ae24d 100644 --- a/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Aucma.Core.Palletiz.GeneratedMSBuildEditorConfig.editorconfig +++ b/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Aucma.Core.Palletiz.GeneratedMSBuildEditorConfig.editorconfig @@ -14,4 +14,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Aucma.Core.Palletiz -build_property.ProjectDir = D:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.Palletiz\ +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Aucma.Core.Palletiz\ diff --git a/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Aucma.Core.Palletiz.assets.cache b/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Aucma.Core.Palletiz.assets.cache index 1a24cd16..74ce2245 100644 Binary files a/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Aucma.Core.Palletiz.assets.cache and b/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Aucma.Core.Palletiz.assets.cache differ diff --git a/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Aucma.Core.Palletiz.csproj.AssemblyReference.cache b/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Aucma.Core.Palletiz.csproj.AssemblyReference.cache index 3de7b023..ecdbb02c 100644 Binary files a/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Aucma.Core.Palletiz.csproj.AssemblyReference.cache and b/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Aucma.Core.Palletiz.csproj.AssemblyReference.cache differ diff --git a/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Aucma.Core.Palletiz_MarkupCompile.cache b/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Aucma.Core.Palletiz_MarkupCompile.cache index e51c06a4..4c941a2e 100644 --- a/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Aucma.Core.Palletiz_MarkupCompile.cache +++ b/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Aucma.Core.Palletiz_MarkupCompile.cache @@ -4,16 +4,16 @@ winexe C# .cs -D:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.Palletiz\obj\Release\net6.0-windows\ +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.Palletiz\obj\Release\net6.0-windows\ Aucma.Core.Palletiz none false TRACE;RELEASE;NET;NET6_0;NETCOREAPP -D:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.Palletiz\App.xaml +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.Palletiz\App.xaml 4820000597 21064389523 -17-1795124032 -420295811452 +16764066740 +4171467014503 Assets\Styles\DefaultStyles.xaml;Views\IndexPageView.xaml;Views\MainWindow.xaml;Views\StatisticsPageView.xaml; True diff --git a/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Aucma.Core.Palletiz_MarkupCompile.lref b/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Aucma.Core.Palletiz_MarkupCompile.lref index a628771a..93a446d1 100644 --- a/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Aucma.Core.Palletiz_MarkupCompile.lref +++ b/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Aucma.Core.Palletiz_MarkupCompile.lref @@ -1,5 +1,5 @@ -D:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.Palletiz\obj\Release\net6.0-windows\GeneratedInternalTypeHelper.g.cs -FD:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.Palletiz\App.xaml;; -FD:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.Palletiz\Views\IndexPageView.xaml;; -FD:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.Palletiz\Views\StatisticsPageView.xaml;; +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.Palletiz\obj\Release\net6.0-windows\GeneratedInternalTypeHelper.g.cs +FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.Palletiz\App.xaml;; +FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.Palletiz\Views\IndexPageView.xaml;; +FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.Palletiz\Views\StatisticsPageView.xaml;; diff --git a/Aucma.Core.Palletiz/obj/Release/net6.0-windows/GeneratedInternalTypeHelper.g.cs b/Aucma.Core.Palletiz/obj/Release/net6.0-windows/GeneratedInternalTypeHelper.g.cs index 6e2e519f..36288f46 100644 --- a/Aucma.Core.Palletiz/obj/Release/net6.0-windows/GeneratedInternalTypeHelper.g.cs +++ b/Aucma.Core.Palletiz/obj/Release/net6.0-windows/GeneratedInternalTypeHelper.g.cs @@ -15,7 +15,7 @@ namespace XamlGeneratedNamespace { /// GeneratedInternalTypeHelper /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper { diff --git a/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Views/IndexPageView.g.cs b/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Views/IndexPageView.g.cs index 1bede1d2..646fddbd 100644 --- a/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Views/IndexPageView.g.cs +++ b/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Views/IndexPageView.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\IndexPageView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "972B5FB7256F671879321605E42074225626CD63" +#pragma checksum "..\..\..\..\Views\IndexPageView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "F2117B1BFB754DE66A7DBEACD064150E2AF72EC4" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ using Aucma.Core.Palletiz.Views; -using LiveChartsCore.SkiaSharpView.WPF; +using LiveCharts.Wpf; using System; using System.Diagnostics; using System.Windows; @@ -43,29 +43,13 @@ namespace Aucma.Core.Palletiz.Views { /// public partial class IndexPageView : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { - - #line 105 "..\..\..\..\Views\IndexPageView.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Border HeightHelperPanel; - - #line default - #line hidden - - - #line 122 "..\..\..\..\Views\IndexPageView.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Border ScanPanel; - - #line default - #line hidden - private bool _contentLoaded; /// /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public void InitializeComponent() { if (_contentLoaded) { return; @@ -81,21 +65,12 @@ namespace Aucma.Core.Palletiz.Views { } [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")] void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) { - switch (connectionId) - { - case 1: - this.HeightHelperPanel = ((System.Windows.Controls.Border)(target)); - return; - case 2: - this.ScanPanel = ((System.Windows.Controls.Border)(target)); - return; - } this._contentLoaded = true; } } diff --git a/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Views/MainWindow.baml b/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Views/MainWindow.baml index 5d7770a7..57957f89 100644 Binary files a/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Views/MainWindow.baml and b/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Views/MainWindow.baml differ diff --git a/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Views/MainWindow.g.cs b/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Views/MainWindow.g.cs index d51084ca..58ef7350 100644 --- a/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Views/MainWindow.g.cs +++ b/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Views/MainWindow.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "6F17AB664AAB9B2BC28E65FBEA592B06326C8137" +#pragma checksum "..\..\..\..\Views\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "9EA185F2672643F120603CBCA763261FA51650D7" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -154,7 +154,7 @@ namespace Aucma.Core.Palletiz.Views { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public void InitializeComponent() { if (_contentLoaded) { return; @@ -170,7 +170,7 @@ namespace Aucma.Core.Palletiz.Views { } [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] diff --git a/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Views/StatisticsPageView.g.cs b/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Views/StatisticsPageView.g.cs index 891d957e..7ceb61d1 100644 --- a/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Views/StatisticsPageView.g.cs +++ b/Aucma.Core.Palletiz/obj/Release/net6.0-windows/Views/StatisticsPageView.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\StatisticsPageView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "7823A7B9EF0017AE8CAF6A8A775B5BFCB69E99AB" +#pragma checksum "..\..\..\..\Views\StatisticsPageView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "B7559F47DB0FA7CD5BC3C4D203BEE3900953E927" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -47,7 +47,7 @@ namespace Aucma.Core.Palletiz.Views { public partial class StatisticsPageView : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { - #line 131 "..\..\..\..\Views\StatisticsPageView.xaml" + #line 48 "..\..\..\..\Views\StatisticsPageView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.DatePicker BeginTime; @@ -55,7 +55,7 @@ namespace Aucma.Core.Palletiz.Views { #line hidden - #line 147 "..\..\..\..\Views\StatisticsPageView.xaml" + #line 64 "..\..\..\..\Views\StatisticsPageView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.DatePicker EndTime; @@ -68,7 +68,7 @@ namespace Aucma.Core.Palletiz.Views { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public void InitializeComponent() { if (_contentLoaded) { return; @@ -84,7 +84,7 @@ namespace Aucma.Core.Palletiz.Views { } [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/App.baml b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/App.baml deleted file mode 100644 index 21c206e5..00000000 Binary files a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/App.baml and /dev/null differ diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.csproj.AssemblyReference.cache b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.csproj.AssemblyReference.cache index 67c58446..3a663980 100644 Binary files a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.csproj.AssemblyReference.cache and b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.csproj.AssemblyReference.cache differ diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.cache b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.cache index d9926c25..039eb4a9 100644 --- a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.cache +++ b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.cache @@ -13,8 +13,8 @@ D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\App.xaml 7-1193702131 21064389523 20-584291401 -4151507094533 +415-624484903 Assets\Styles\DefaultStyles.xaml;Views\ButtomPageView.xaml;Views\HomeWindowView.xaml;Views\IndexPage.xaml;Views\MainWindow.xaml;Views\PrintToDevView.xaml;Views\SupplementPrintPageView.xaml; -False +True diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/ButtomPageView.baml b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/ButtomPageView.baml deleted file mode 100644 index d8c44005..00000000 Binary files a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/ButtomPageView.baml and /dev/null differ diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/HomeWindowView.baml b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/HomeWindowView.baml deleted file mode 100644 index 2f290648..00000000 Binary files a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/HomeWindowView.baml and /dev/null differ diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/IndexPage.baml b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/IndexPage.baml deleted file mode 100644 index a67a98b7..00000000 Binary files a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/IndexPage.baml and /dev/null differ diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/PrintToDevView.baml b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/PrintToDevView.baml deleted file mode 100644 index 8faa0973..00000000 Binary files a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/PrintToDevView.baml and /dev/null differ diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/SupplementPrintPageView.baml b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/SupplementPrintPageView.baml deleted file mode 100644 index 997adc62..00000000 Binary files a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Views/SupplementPrintPageView.baml and /dev/null differ diff --git a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/App.g.cs b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/App.g.cs index a848c1c1..0cbee99d 100644 --- a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/App.g.cs +++ b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/App.g.cs @@ -48,7 +48,7 @@ namespace Admin.Core.Wpf { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public void InitializeComponent() { if (_contentLoaded) { return; @@ -68,7 +68,7 @@ namespace Admin.Core.Wpf { /// [System.STAThreadAttribute()] [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public static void Main() { Admin.Core.Wpf.App app = new Admin.Core.Wpf.App(); app.InitializeComponent(); diff --git a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Aucma.Core.PrintTo.GeneratedMSBuildEditorConfig.editorconfig b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Aucma.Core.PrintTo.GeneratedMSBuildEditorConfig.editorconfig index cbd76313..14f2508d 100644 --- a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Aucma.Core.PrintTo.GeneratedMSBuildEditorConfig.editorconfig +++ b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Aucma.Core.PrintTo.GeneratedMSBuildEditorConfig.editorconfig @@ -14,4 +14,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Aucma.Core.PrintTo -build_property.ProjectDir = D:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.PrintTo\ +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\ diff --git a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Aucma.Core.PrintTo.assets.cache b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Aucma.Core.PrintTo.assets.cache index e3ac0199..4ebcba7b 100644 Binary files a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Aucma.Core.PrintTo.assets.cache and b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Aucma.Core.PrintTo.assets.cache differ diff --git a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Aucma.Core.PrintTo.csproj.AssemblyReference.cache b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Aucma.Core.PrintTo.csproj.AssemblyReference.cache index 3252373a..5704f1aa 100644 Binary files a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Aucma.Core.PrintTo.csproj.AssemblyReference.cache and b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Aucma.Core.PrintTo.csproj.AssemblyReference.cache differ diff --git a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.cache b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.cache index 99036b25..5a9b8b0a 100644 --- a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.cache +++ b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.cache @@ -4,16 +4,16 @@ winexe C# .cs -D:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.PrintTo\obj\Release\net6.0-windows\ +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Release\net6.0-windows\ Aucma.Core.PrintTo none false TRACE;RELEASE;NET;NET6_0;NETCOREAPP -D:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.PrintTo\App.xaml +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\App.xaml 7-1193702131 21064389523 20-584291401 -412-920747248 +415286307481 Assets\Styles\DefaultStyles.xaml;Views\ButtomPageView.xaml;Views\HomeWindowView.xaml;Views\IndexPage.xaml;Views\MainWindow.xaml;Views\PrintToDevView.xaml;Views\SupplementPrintPageView.xaml; True diff --git a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.lref b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.lref index 68a8d128..540539cb 100644 --- a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.lref +++ b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Aucma.Core.PrintTo_MarkupCompile.lref @@ -1,8 +1,8 @@  -FD:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.PrintTo\App.xaml;; -FD:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.PrintTo\Views\ButtomPageView.xaml;; -FD:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.PrintTo\Views\HomeWindowView.xaml;; -FD:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.PrintTo\Views\IndexPage.xaml;; -FD:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.PrintTo\Views\PrintToDevView.xaml;; -FD:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.PrintTo\Views\SupplementPrintPageView.xaml;; +FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\App.xaml;; +FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\Views\ButtomPageView.xaml;; +FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\Views\HomeWindowView.xaml;; +FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\Views\IndexPage.xaml;; +FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\Views\PrintToDevView.xaml;; +FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\Views\SupplementPrintPageView.xaml;; diff --git a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/ButtomPageView.g.cs b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/ButtomPageView.g.cs index 631b5481..e26e0dbb 100644 --- a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/ButtomPageView.g.cs +++ b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/ButtomPageView.g.cs @@ -96,7 +96,7 @@ namespace Admin.Core.Wpf.Views { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public void InitializeComponent() { if (_contentLoaded) { return; @@ -112,7 +112,7 @@ namespace Admin.Core.Wpf.Views { } [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] diff --git a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/HomeWindowView.g.cs b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/HomeWindowView.g.cs index 21eeba87..7bb8501b 100644 --- a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/HomeWindowView.g.cs +++ b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/HomeWindowView.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\HomeWindowView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2385F866CB4EFED545C5F2DA7FE185822AEECD77" +#pragma checksum "..\..\..\..\Views\HomeWindowView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "CA7E88C30A0F19FE2CCB63E734A6F5CC81DF5406" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -51,7 +51,7 @@ namespace Admin.Core.Wpf.Views { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public void InitializeComponent() { if (_contentLoaded) { return; @@ -67,7 +67,7 @@ namespace Admin.Core.Wpf.Views { } [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] diff --git a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/IndexPage.g.cs b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/IndexPage.g.cs index 727ce621..0d3ea251 100644 --- a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/IndexPage.g.cs +++ b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/IndexPage.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\IndexPage.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "FFC54FFFC65BFF0C1DAE8FC1C79F0A99844A7228" +#pragma checksum "..\..\..\..\Views\IndexPage.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "B160123D6CD58ECF9A8C91185B14E0F5C8F579E8" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -46,7 +46,7 @@ namespace Admin.Core.Wpf.Views { public partial class IndexPage : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { - #line 108 "..\..\..\..\Views\IndexPage.xaml" + #line 109 "..\..\..\..\Views\IndexPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBox queryParam; @@ -54,7 +54,7 @@ namespace Admin.Core.Wpf.Views { #line hidden - #line 113 "..\..\..\..\Views\IndexPage.xaml" + #line 114 "..\..\..\..\Views\IndexPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Primitives.UniformGrid HeightPanel; @@ -62,7 +62,7 @@ namespace Admin.Core.Wpf.Views { #line hidden - #line 119 "..\..\..\..\Views\IndexPage.xaml" + #line 120 "..\..\..\..\Views\IndexPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.DataGrid dgvMH; @@ -70,7 +70,7 @@ namespace Admin.Core.Wpf.Views { #line hidden - #line 156 "..\..\..\..\Views\IndexPage.xaml" + #line 157 "..\..\..\..\Views\IndexPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBox ProductNo; @@ -78,7 +78,7 @@ namespace Admin.Core.Wpf.Views { #line hidden - #line 162 "..\..\..\..\Views\IndexPage.xaml" + #line 163 "..\..\..\..\Views\IndexPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBox ProductName; @@ -86,7 +86,7 @@ namespace Admin.Core.Wpf.Views { #line hidden - #line 167 "..\..\..\..\Views\IndexPage.xaml" + #line 168 "..\..\..\..\Views\IndexPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBox MaterialName; @@ -94,7 +94,7 @@ namespace Admin.Core.Wpf.Views { #line hidden - #line 172 "..\..\..\..\Views\IndexPage.xaml" + #line 173 "..\..\..\..\Views\IndexPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBox PlanAmount; @@ -102,7 +102,7 @@ namespace Admin.Core.Wpf.Views { #line hidden - #line 178 "..\..\..\..\Views\IndexPage.xaml" + #line 179 "..\..\..\..\Views\IndexPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton 内胆; @@ -110,7 +110,7 @@ namespace Admin.Core.Wpf.Views { #line hidden - #line 179 "..\..\..\..\Views\IndexPage.xaml" + #line 180 "..\..\..\..\Views\IndexPage.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton U壳; @@ -123,7 +123,7 @@ namespace Admin.Core.Wpf.Views { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public void InitializeComponent() { if (_contentLoaded) { return; @@ -139,7 +139,7 @@ namespace Admin.Core.Wpf.Views { } [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] diff --git a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/MainWindow.baml b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/MainWindow.baml index 46c504da..1fdad497 100644 Binary files a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/MainWindow.baml and b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/MainWindow.baml differ diff --git a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/MainWindow.g.cs b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/MainWindow.g.cs index 8e745be1..c977e97e 100644 --- a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/MainWindow.g.cs +++ b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/MainWindow.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "5DEEB20C1B1F3341EF9EB3A1DE3E97AAC1945350" +#pragma checksum "..\..\..\..\Views\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D8A256CF883917A8B1B4089CB7A02D2E485F8835" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -45,7 +45,23 @@ namespace Admin.Core.Wpf.Views { public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector { - #line 68 "..\..\..\..\Views\MainWindow.xaml" + #line 36 "..\..\..\..\Views\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.TextBlock TestTB; + + #line default + #line hidden + + + #line 38 "..\..\..\..\Views\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.TextBlock loginUser; + + #line default + #line hidden + + + #line 59 "..\..\..\..\Views\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button TabTip; @@ -53,7 +69,7 @@ namespace Admin.Core.Wpf.Views { #line hidden - #line 69 "..\..\..\..\Views\MainWindow.xaml" + #line 60 "..\..\..\..\Views\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button Minimized; @@ -61,7 +77,7 @@ namespace Admin.Core.Wpf.Views { #line hidden - #line 70 "..\..\..\..\Views\MainWindow.xaml" + #line 61 "..\..\..\..\Views\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button Exit; @@ -74,7 +90,7 @@ namespace Admin.Core.Wpf.Views { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public void InitializeComponent() { if (_contentLoaded) { return; @@ -90,7 +106,7 @@ namespace Admin.Core.Wpf.Views { } [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] @@ -99,12 +115,18 @@ namespace Admin.Core.Wpf.Views { switch (connectionId) { case 1: - this.TabTip = ((System.Windows.Controls.Button)(target)); + this.TestTB = ((System.Windows.Controls.TextBlock)(target)); return; case 2: - this.Minimized = ((System.Windows.Controls.Button)(target)); + this.loginUser = ((System.Windows.Controls.TextBlock)(target)); return; case 3: + this.TabTip = ((System.Windows.Controls.Button)(target)); + return; + case 4: + this.Minimized = ((System.Windows.Controls.Button)(target)); + return; + case 5: this.Exit = ((System.Windows.Controls.Button)(target)); return; } diff --git a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/PrintToDevView.g.cs b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/PrintToDevView.g.cs index 2098dfc4..77268d4a 100644 --- a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/PrintToDevView.g.cs +++ b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/PrintToDevView.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\PrintToDevView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "8F593AFA8EF7E9566CBAFAFD8D367AA38B1C6B87" +#pragma checksum "..\..\..\..\Views\PrintToDevView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "4A43B003400FFDD767F1B5BF08E8677B743532B3" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -64,7 +64,7 @@ namespace Admin.Core.Wpf.Views { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public void InitializeComponent() { if (_contentLoaded) { return; @@ -80,7 +80,7 @@ namespace Admin.Core.Wpf.Views { } [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] diff --git a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/SupplementPrintPageView.g.cs b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/SupplementPrintPageView.g.cs index 408eba5d..ff60db8e 100644 --- a/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/SupplementPrintPageView.g.cs +++ b/Aucma.Core.PrintTo/obj/Release/net6.0-windows/Views/SupplementPrintPageView.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\SupplementPrintPageView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "4FF1B5168067C49DCB84A3313DDDB37DC69F2076" +#pragma checksum "..\..\..\..\Views\SupplementPrintPageView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "528D6F879BF54FB4AB2D83EC1CEEB407168C2D88" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -46,7 +46,7 @@ namespace Admin.Core.Wpf.Views { public partial class SupplementPrintPageView : System.Windows.Window, System.Windows.Markup.IComponentConnector { - #line 36 "..\..\..\..\Views\SupplementPrintPageView.xaml" + #line 92 "..\..\..\..\Views\SupplementPrintPageView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBox queryParam; @@ -54,7 +54,7 @@ namespace Admin.Core.Wpf.Views { #line hidden - #line 39 "..\..\..\..\Views\SupplementPrintPageView.xaml" + #line 95 "..\..\..\..\Views\SupplementPrintPageView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Primitives.UniformGrid HeightPanel; @@ -62,7 +62,7 @@ namespace Admin.Core.Wpf.Views { #line hidden - #line 40 "..\..\..\..\Views\SupplementPrintPageView.xaml" + #line 96 "..\..\..\..\Views\SupplementPrintPageView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.DataGrid dgvMH; @@ -70,7 +70,7 @@ namespace Admin.Core.Wpf.Views { #line hidden - #line 69 "..\..\..\..\Views\SupplementPrintPageView.xaml" + #line 125 "..\..\..\..\Views\SupplementPrintPageView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBox ProductNo; @@ -78,7 +78,7 @@ namespace Admin.Core.Wpf.Views { #line hidden - #line 74 "..\..\..\..\Views\SupplementPrintPageView.xaml" + #line 130 "..\..\..\..\Views\SupplementPrintPageView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBox MaterialCode; @@ -86,7 +86,7 @@ namespace Admin.Core.Wpf.Views { #line hidden - #line 79 "..\..\..\..\Views\SupplementPrintPageView.xaml" + #line 135 "..\..\..\..\Views\SupplementPrintPageView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBox MaterialName; @@ -94,7 +94,7 @@ namespace Admin.Core.Wpf.Views { #line hidden - #line 84 "..\..\..\..\Views\SupplementPrintPageView.xaml" + #line 140 "..\..\..\..\Views\SupplementPrintPageView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBox BarCode; @@ -107,7 +107,7 @@ namespace Admin.Core.Wpf.Views { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public void InitializeComponent() { if (_contentLoaded) { return; @@ -123,7 +123,7 @@ namespace Admin.Core.Wpf.Views { } [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] diff --git a/Aucma.Core.Scanner/obj/Release/net6.0/.NETCoreApp,Version=v6.0.AssemblyAttributes.cs b/Aucma.Core.Scanner/obj/Release/net6.0/.NETCoreApp,Version=v6.0.AssemblyAttributes.cs new file mode 100644 index 00000000..ed926950 --- /dev/null +++ b/Aucma.Core.Scanner/obj/Release/net6.0/.NETCoreApp,Version=v6.0.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v6.0", FrameworkDisplayName = ".NET 6.0")] diff --git a/Aucma.Core.Scanner/obj/Release/net6.0/Aucma.Core.Scanner.AssemblyInfo.cs b/Aucma.Core.Scanner/obj/Release/net6.0/Aucma.Core.Scanner.AssemblyInfo.cs new file mode 100644 index 00000000..7e3601a3 --- /dev/null +++ b/Aucma.Core.Scanner/obj/Release/net6.0/Aucma.Core.Scanner.AssemblyInfo.cs @@ -0,0 +1,23 @@ +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("Aucma.Core.Scanner")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyProductAttribute("Aucma.Core.Scanner")] +[assembly: System.Reflection.AssemblyTitleAttribute("Aucma.Core.Scanner")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] + +// 由 MSBuild WriteCodeFragment 类生成。 + diff --git a/Aucma.Core.Scanner/obj/Release/net6.0/Aucma.Core.Scanner.AssemblyInfoInputs.cache b/Aucma.Core.Scanner/obj/Release/net6.0/Aucma.Core.Scanner.AssemblyInfoInputs.cache new file mode 100644 index 00000000..21a167d7 --- /dev/null +++ b/Aucma.Core.Scanner/obj/Release/net6.0/Aucma.Core.Scanner.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +cd2b78b2fe3e7a165ab5c563c04708480e51f654 diff --git a/Aucma.Core.Scanner/obj/Release/net6.0/Aucma.Core.Scanner.GeneratedMSBuildEditorConfig.editorconfig b/Aucma.Core.Scanner/obj/Release/net6.0/Aucma.Core.Scanner.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 00000000..0dc92bad --- /dev/null +++ b/Aucma.Core.Scanner/obj/Release/net6.0/Aucma.Core.Scanner.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,11 @@ +is_global = true +build_property.TargetFramework = net6.0 +build_property.TargetPlatformMinVersion = +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = Aucma.Core.Scanner +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Aucma.Core.Scanner\ diff --git a/Aucma.Core.Scanner/obj/Release/net6.0/Aucma.Core.Scanner.GlobalUsings.g.cs b/Aucma.Core.Scanner/obj/Release/net6.0/Aucma.Core.Scanner.GlobalUsings.g.cs new file mode 100644 index 00000000..8578f3d0 --- /dev/null +++ b/Aucma.Core.Scanner/obj/Release/net6.0/Aucma.Core.Scanner.GlobalUsings.g.cs @@ -0,0 +1,8 @@ +// +global using global::System; +global using global::System.Collections.Generic; +global using global::System.IO; +global using global::System.Linq; +global using global::System.Net.Http; +global using global::System.Threading; +global using global::System.Threading.Tasks; diff --git a/Aucma.Core.Scanner/obj/Release/net6.0/Aucma.Core.Scanner.assets.cache b/Aucma.Core.Scanner/obj/Release/net6.0/Aucma.Core.Scanner.assets.cache new file mode 100644 index 00000000..af41b5e6 Binary files /dev/null and b/Aucma.Core.Scanner/obj/Release/net6.0/Aucma.Core.Scanner.assets.cache differ diff --git a/Aucma.Core.Scanner/obj/Release/net6.0/Aucma.Core.Scanner.csproj.AssemblyReference.cache b/Aucma.Core.Scanner/obj/Release/net6.0/Aucma.Core.Scanner.csproj.AssemblyReference.cache new file mode 100644 index 00000000..a642936f Binary files /dev/null and b/Aucma.Core.Scanner/obj/Release/net6.0/Aucma.Core.Scanner.csproj.AssemblyReference.cache differ diff --git a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/App.baml b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/App.baml deleted file mode 100644 index 4c94d21b..00000000 Binary files a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/App.baml and /dev/null differ diff --git a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal.csproj.AssemblyReference.cache b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal.csproj.AssemblyReference.cache index aa5a4b7a..f220c3f5 100644 Binary files a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal.csproj.AssemblyReference.cache and b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal.csproj.AssemblyReference.cache differ diff --git a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal_MarkupCompile.cache b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal_MarkupCompile.cache index 871803e7..21985332 100644 --- a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal_MarkupCompile.cache +++ b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Aucma.Core.SheetMetal_MarkupCompile.cache @@ -13,8 +13,8 @@ D:\Project\gitea\AUCMA\SCADA\Aucma.Core.SheetMetal\App.xaml 61326282298 21064389523 23-37594985 -417-1607165741 +417556222119 Assets\Styles\DefaultStyles.xaml;Views\IndexPage.xaml;Views\LogPageView.xaml;Views\MainWindow.xaml;Views\SplitPlanView.xaml;Views\StatisticsPageView.xaml; -False +True diff --git a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.cs b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.cs index c65238fb..36288f46 100644 --- a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.cs +++ b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.cs @@ -1,2 +1,62 @@ - +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +namespace XamlGeneratedNamespace { + + + /// + /// GeneratedInternalTypeHelper + /// + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] + public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper { + + /// + /// CreateInstance + /// + protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) { + return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) + | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture); + } + + /// + /// GetPropertyValue + /// + protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) { + return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture); + } + + /// + /// SetPropertyValue + /// + protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) { + propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture); + } + + /// + /// CreateDelegate + /// + protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) { + return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod + | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] { + delegateType, + handler}, null))); + } + + /// + /// AddEventHandler + /// + protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) { + eventInfo.AddEventHandler(target, handler); + } + } +} diff --git a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Views/IndexPage.baml b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Views/IndexPage.baml deleted file mode 100644 index 79cb228a..00000000 Binary files a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Views/IndexPage.baml and /dev/null differ diff --git a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Views/LogPageView.baml b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Views/LogPageView.baml deleted file mode 100644 index 3c0f750d..00000000 Binary files a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Views/LogPageView.baml and /dev/null differ diff --git a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Views/SplitPlanView.baml b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Views/SplitPlanView.baml deleted file mode 100644 index 45fc76a7..00000000 Binary files a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Views/SplitPlanView.baml and /dev/null differ diff --git a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Views/StatisticsPageView.baml b/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Views/StatisticsPageView.baml deleted file mode 100644 index ea68b690..00000000 Binary files a/Aucma.Core.SheetMetal/obj/Debug/net6.0-windows/Views/StatisticsPageView.baml and /dev/null differ diff --git a/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/App.g.cs b/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/App.g.cs index 7370b089..89e6aa05 100644 --- a/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/App.g.cs +++ b/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/App.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "57F3955820CFE7EB5354FD1FCC89EAA9C6B292AD" +#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "8E2C8D561D2E4055A519491B7E818343DDBCF621" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -9,7 +9,7 @@ // //------------------------------------------------------------------------------ -using Admin.Core.Wpf; +using Aucma.Core.SheetMetal; using System; using System.Diagnostics; using System.Windows; @@ -34,7 +34,7 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Admin.Core.Wpf { +namespace Aucma.Core.SheetMetal { /// @@ -48,7 +48,7 @@ namespace Admin.Core.Wpf { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public void InitializeComponent() { if (_contentLoaded) { return; @@ -68,9 +68,9 @@ namespace Admin.Core.Wpf { /// [System.STAThreadAttribute()] [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public static void Main() { - Admin.Core.Wpf.App app = new Admin.Core.Wpf.App(); + Aucma.Core.SheetMetal.App app = new Aucma.Core.SheetMetal.App(); app.InitializeComponent(); app.Run(); } diff --git a/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Aucma.Core.SheetMetal.GeneratedMSBuildEditorConfig.editorconfig b/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Aucma.Core.SheetMetal.GeneratedMSBuildEditorConfig.editorconfig index dfe66b97..53eeb543 100644 --- a/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Aucma.Core.SheetMetal.GeneratedMSBuildEditorConfig.editorconfig +++ b/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Aucma.Core.SheetMetal.GeneratedMSBuildEditorConfig.editorconfig @@ -14,4 +14,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Aucma.Core.SheetMetal -build_property.ProjectDir = D:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.SheetMetal\ +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Aucma.Core.SheetMetal\ diff --git a/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Aucma.Core.SheetMetal.assets.cache b/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Aucma.Core.SheetMetal.assets.cache index dff5cb51..d8a0a569 100644 Binary files a/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Aucma.Core.SheetMetal.assets.cache and b/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Aucma.Core.SheetMetal.assets.cache differ diff --git a/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Aucma.Core.SheetMetal.csproj.AssemblyReference.cache b/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Aucma.Core.SheetMetal.csproj.AssemblyReference.cache index 3de7b023..ecdbb02c 100644 Binary files a/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Aucma.Core.SheetMetal.csproj.AssemblyReference.cache and b/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Aucma.Core.SheetMetal.csproj.AssemblyReference.cache differ diff --git a/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Aucma.Core.SheetMetal_MarkupCompile.cache b/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Aucma.Core.SheetMetal_MarkupCompile.cache index 5a82da78..eb685d8f 100644 --- a/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Aucma.Core.SheetMetal_MarkupCompile.cache +++ b/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Aucma.Core.SheetMetal_MarkupCompile.cache @@ -1,19 +1,19 @@ Aucma.Core.SheetMetal -exe +winexe C# .cs -D:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.SheetMetal\obj\Release\net6.0-windows\ +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.SheetMetal\obj\Release\net6.0-windows\ Aucma.Core.SheetMetal none false TRACE;RELEASE;NET;NET6_0;NETCOREAPP -D:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.SheetMetal\App.xaml +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.SheetMetal\App.xaml 61326282298 21064389523 -241698181539 -420295811452 +23-37594985 +4171467014503 Assets\Styles\DefaultStyles.xaml;Views\IndexPage.xaml;Views\LogPageView.xaml;Views\MainWindow.xaml;Views\SplitPlanView.xaml;Views\StatisticsPageView.xaml; True diff --git a/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Aucma.Core.SheetMetal_MarkupCompile.lref b/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Aucma.Core.SheetMetal_MarkupCompile.lref index fe0f3690..3ba42a5a 100644 --- a/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Aucma.Core.SheetMetal_MarkupCompile.lref +++ b/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Aucma.Core.SheetMetal_MarkupCompile.lref @@ -1,7 +1,7 @@ -D:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.SheetMetal\obj\Release\net6.0-windows\GeneratedInternalTypeHelper.g.cs -FD:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.SheetMetal\App.xaml;; -FD:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.SheetMetal\Views\IndexPage.xaml;; -FD:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.SheetMetal\Views\LogPageView.xaml;; -FD:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.SheetMetal\Views\SplitPlanView.xaml;; -FD:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.SheetMetal\Views\StatisticsPageView.xaml;; +D:\Project\gitea\AUCMA\SCADA\Aucma.Core.SheetMetal\obj\Release\net6.0-windows\GeneratedInternalTypeHelper.g.cs +FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.SheetMetal\App.xaml;; +FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.SheetMetal\Views\IndexPage.xaml;; +FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.SheetMetal\Views\LogPageView.xaml;; +FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.SheetMetal\Views\SplitPlanView.xaml;; +FD:\Project\gitea\AUCMA\SCADA\Aucma.Core.SheetMetal\Views\StatisticsPageView.xaml;; diff --git a/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/GeneratedInternalTypeHelper.g.cs b/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/GeneratedInternalTypeHelper.g.cs index 6e2e519f..36288f46 100644 --- a/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/GeneratedInternalTypeHelper.g.cs +++ b/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/GeneratedInternalTypeHelper.g.cs @@ -15,7 +15,7 @@ namespace XamlGeneratedNamespace { /// GeneratedInternalTypeHelper /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper { diff --git a/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Views/IndexPage.g.cs b/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Views/IndexPage.g.cs index 926a66f1..95e69829 100644 --- a/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Views/IndexPage.g.cs +++ b/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Views/IndexPage.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\IndexPage.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "44653E2D30FF4D9889FE28760916FE46376031D4" +#pragma checksum "..\..\..\..\Views\IndexPage.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "C2BCEDDB48DC1E2357E3AD73FD6F7CEBAFD7EB2B" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ using Aucma.Core.SheetMetal.Views; -using LiveChartsCore.SkiaSharpView.WPF; +using LiveCharts.Wpf; using System; using System.Diagnostics; using System.Windows; @@ -49,7 +49,7 @@ namespace Aucma.Core.SheetMetal.Views { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public void InitializeComponent() { if (_contentLoaded) { return; @@ -65,7 +65,7 @@ namespace Aucma.Core.SheetMetal.Views { } [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] diff --git a/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Views/LogPageView.g.cs b/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Views/LogPageView.g.cs index 406b5515..3111bf16 100644 --- a/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Views/LogPageView.g.cs +++ b/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Views/LogPageView.g.cs @@ -56,7 +56,7 @@ namespace Aucma.Core.SheetMetal.Views { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public void InitializeComponent() { if (_contentLoaded) { return; @@ -72,7 +72,7 @@ namespace Aucma.Core.SheetMetal.Views { } [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] diff --git a/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Views/MainWindow.g.cs b/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Views/MainWindow.g.cs index fef5c9eb..5f55850b 100644 --- a/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Views/MainWindow.g.cs +++ b/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Views/MainWindow.g.cs @@ -162,7 +162,7 @@ namespace Aucma.Core.SheetMetal.Views { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public void InitializeComponent() { if (_contentLoaded) { return; @@ -178,7 +178,7 @@ namespace Aucma.Core.SheetMetal.Views { } [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] diff --git a/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Views/SplitPlanView.g.cs b/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Views/SplitPlanView.g.cs index 579c94d0..c4aaf1fc 100644 --- a/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Views/SplitPlanView.g.cs +++ b/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Views/SplitPlanView.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\SplitPlanView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "6939BEBD311E7F4851F8A87E10A3A5162C4518F3" +#pragma checksum "..\..\..\..\Views\SplitPlanView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "DA49B438EC06188DE7AA0119AC6AF7C9DF40724F" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -62,7 +62,7 @@ namespace Aucma.Core.SheetMetal.Views { #line hidden - #line 94 "..\..\..\..\Views\SplitPlanView.xaml" + #line 95 "..\..\..\..\Views\SplitPlanView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBox PlanCode; @@ -70,7 +70,7 @@ namespace Aucma.Core.SheetMetal.Views { #line hidden - #line 99 "..\..\..\..\Views\SplitPlanView.xaml" + #line 100 "..\..\..\..\Views\SplitPlanView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBox OrderCode; @@ -78,7 +78,7 @@ namespace Aucma.Core.SheetMetal.Views { #line hidden - #line 105 "..\..\..\..\Views\SplitPlanView.xaml" + #line 106 "..\..\..\..\Views\SplitPlanView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBox OrderNo; @@ -86,7 +86,7 @@ namespace Aucma.Core.SheetMetal.Views { #line hidden - #line 111 "..\..\..\..\Views\SplitPlanView.xaml" + #line 112 "..\..\..\..\Views\SplitPlanView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBox MaterialName; @@ -94,9 +94,9 @@ namespace Aucma.Core.SheetMetal.Views { #line hidden - #line 117 "..\..\..\..\Views\SplitPlanView.xaml" + #line 118 "..\..\..\..\Views\SplitPlanView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.TextBox PlanAmount; + internal System.Windows.Controls.TextBox SpliteResidueAmount; #line default #line hidden @@ -107,7 +107,7 @@ namespace Aucma.Core.SheetMetal.Views { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public void InitializeComponent() { if (_contentLoaded) { return; @@ -123,7 +123,7 @@ namespace Aucma.Core.SheetMetal.Views { } [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] @@ -150,7 +150,7 @@ namespace Aucma.Core.SheetMetal.Views { this.MaterialName = ((System.Windows.Controls.TextBox)(target)); return; case 7: - this.PlanAmount = ((System.Windows.Controls.TextBox)(target)); + this.SpliteResidueAmount = ((System.Windows.Controls.TextBox)(target)); return; } this._contentLoaded = true; diff --git a/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Views/StatisticsPageView.g.cs b/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Views/StatisticsPageView.g.cs index 0e2663a8..d696af33 100644 --- a/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Views/StatisticsPageView.g.cs +++ b/Aucma.Core.SheetMetal/obj/Release/net6.0-windows/Views/StatisticsPageView.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\StatisticsPageView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "6A58881608E4D228270BFF68E10D9AA5C2D27177" +#pragma checksum "..\..\..\..\Views\StatisticsPageView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "BF05622290AC42D4DB201298981B023D0AB3213C" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -47,7 +47,7 @@ namespace Aucma.Core.SheetMetal.Views { public partial class StatisticsPageView : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { - #line 131 "..\..\..\..\Views\StatisticsPageView.xaml" + #line 39 "..\..\..\..\Views\StatisticsPageView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.DatePicker BeginTime; @@ -55,7 +55,7 @@ namespace Aucma.Core.SheetMetal.Views { #line hidden - #line 147 "..\..\..\..\Views\StatisticsPageView.xaml" + #line 55 "..\..\..\..\Views\StatisticsPageView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.DatePicker EndTime; @@ -68,7 +68,7 @@ namespace Aucma.Core.SheetMetal.Views { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] public void InitializeComponent() { if (_contentLoaded) { return; @@ -84,7 +84,7 @@ namespace Aucma.Core.SheetMetal.Views { } [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] diff --git a/Aucma.Core.Zebra/obj/Release/net6.0/.NETCoreApp,Version=v6.0.AssemblyAttributes.cs b/Aucma.Core.Zebra/obj/Release/net6.0/.NETCoreApp,Version=v6.0.AssemblyAttributes.cs new file mode 100644 index 00000000..ed926950 --- /dev/null +++ b/Aucma.Core.Zebra/obj/Release/net6.0/.NETCoreApp,Version=v6.0.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v6.0", FrameworkDisplayName = ".NET 6.0")] diff --git a/Aucma.Core.Zebra/obj/Release/net6.0/Aucma.Core.Zebra.AssemblyInfo.cs b/Aucma.Core.Zebra/obj/Release/net6.0/Aucma.Core.Zebra.AssemblyInfo.cs new file mode 100644 index 00000000..036b7697 --- /dev/null +++ b/Aucma.Core.Zebra/obj/Release/net6.0/Aucma.Core.Zebra.AssemblyInfo.cs @@ -0,0 +1,23 @@ +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("Aucma.Core.Zebra")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyProductAttribute("Aucma.Core.Zebra")] +[assembly: System.Reflection.AssemblyTitleAttribute("Aucma.Core.Zebra")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] + +// 由 MSBuild WriteCodeFragment 类生成。 + diff --git a/Aucma.Core.Zebra/obj/Release/net6.0/Aucma.Core.Zebra.AssemblyInfoInputs.cache b/Aucma.Core.Zebra/obj/Release/net6.0/Aucma.Core.Zebra.AssemblyInfoInputs.cache new file mode 100644 index 00000000..675e2b7f --- /dev/null +++ b/Aucma.Core.Zebra/obj/Release/net6.0/Aucma.Core.Zebra.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +60220722165c32774ff4ad601243d2287e9bb126 diff --git a/Aucma.Core.Zebra/obj/Release/net6.0/Aucma.Core.Zebra.GeneratedMSBuildEditorConfig.editorconfig b/Aucma.Core.Zebra/obj/Release/net6.0/Aucma.Core.Zebra.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 00000000..cc25873b --- /dev/null +++ b/Aucma.Core.Zebra/obj/Release/net6.0/Aucma.Core.Zebra.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,11 @@ +is_global = true +build_property.TargetFramework = net6.0 +build_property.TargetPlatformMinVersion = +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = Aucma.Core.Zebra +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Aucma.Core.Zebra\ diff --git a/Aucma.Core.Zebra/obj/Release/net6.0/Aucma.Core.Zebra.GlobalUsings.g.cs b/Aucma.Core.Zebra/obj/Release/net6.0/Aucma.Core.Zebra.GlobalUsings.g.cs new file mode 100644 index 00000000..8578f3d0 --- /dev/null +++ b/Aucma.Core.Zebra/obj/Release/net6.0/Aucma.Core.Zebra.GlobalUsings.g.cs @@ -0,0 +1,8 @@ +// +global using global::System; +global using global::System.Collections.Generic; +global using global::System.IO; +global using global::System.Linq; +global using global::System.Net.Http; +global using global::System.Threading; +global using global::System.Threading.Tasks; diff --git a/Aucma.Core.Zebra/obj/Release/net6.0/Aucma.Core.Zebra.assets.cache b/Aucma.Core.Zebra/obj/Release/net6.0/Aucma.Core.Zebra.assets.cache new file mode 100644 index 00000000..c76598f7 Binary files /dev/null and b/Aucma.Core.Zebra/obj/Release/net6.0/Aucma.Core.Zebra.assets.cache differ diff --git a/HwControlLib/obj/Release/net6.0-windows/GeneratedInternalTypeHelper.g.cs b/HwControlLib/obj/Release/net6.0-windows/GeneratedInternalTypeHelper.g.cs index 6e2e519f..36288f46 100644 --- a/HwControlLib/obj/Release/net6.0-windows/GeneratedInternalTypeHelper.g.cs +++ b/HwControlLib/obj/Release/net6.0-windows/GeneratedInternalTypeHelper.g.cs @@ -15,7 +15,7 @@ namespace XamlGeneratedNamespace { /// GeneratedInternalTypeHelper /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.5.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper { diff --git a/HwControlLib/obj/Release/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig b/HwControlLib/obj/Release/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig index e1bf18d0..a4db58d9 100644 --- a/HwControlLib/obj/Release/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig +++ b/HwControlLib/obj/Release/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = HwControlLib -build_property.ProjectDir = D:\gitea\AUCMA\AUCMA_SCADA\HwControlLib\ +build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\HwControlLib\ diff --git a/HwControlLib/obj/Release/net6.0-windows/HwControlLib.assets.cache b/HwControlLib/obj/Release/net6.0-windows/HwControlLib.assets.cache index 276fad27..61d0fb09 100644 Binary files a/HwControlLib/obj/Release/net6.0-windows/HwControlLib.assets.cache and b/HwControlLib/obj/Release/net6.0-windows/HwControlLib.assets.cache differ diff --git a/HwControlLib/obj/Release/net6.0-windows/HwControlLib.csproj.AssemblyReference.cache b/HwControlLib/obj/Release/net6.0-windows/HwControlLib.csproj.AssemblyReference.cache deleted file mode 100644 index 37013506..00000000 Binary files a/HwControlLib/obj/Release/net6.0-windows/HwControlLib.csproj.AssemblyReference.cache and /dev/null differ diff --git a/HwControlLib/obj/Release/net6.0-windows/HwControlLib_MarkupCompile.cache b/HwControlLib/obj/Release/net6.0-windows/HwControlLib_MarkupCompile.cache index 18cf9a51..27a448fd 100644 --- a/HwControlLib/obj/Release/net6.0-windows/HwControlLib_MarkupCompile.cache +++ b/HwControlLib/obj/Release/net6.0-windows/HwControlLib_MarkupCompile.cache @@ -4,7 +4,7 @@ library C# .cs -D:\gitea\AUCMA\AUCMA_SCADA\HwControlLib\obj\Release\net6.0-windows\ +D:\Project\gitea\AUCMA\SCADA\HwControlLib\obj\Release\net6.0-windows\ HwControlLib none false @@ -13,7 +13,7 @@ TRACE;RELEASE;NET;NET6_0;NETCOREAPP 1204305769 3-783178491 -1941709816142 +194-2067936865 Themes\Generic.xaml; True diff --git a/HwControlLib/obj/Release/net6.0-windows/HwControlLib_MarkupCompile.lref b/HwControlLib/obj/Release/net6.0-windows/HwControlLib_MarkupCompile.lref index 1d08ddda..2692d65a 100644 --- a/HwControlLib/obj/Release/net6.0-windows/HwControlLib_MarkupCompile.lref +++ b/HwControlLib/obj/Release/net6.0-windows/HwControlLib_MarkupCompile.lref @@ -1,4 +1,4 @@ - +D:\Project\gitea\AUCMA\SCADA\HwControlLib\obj\Release\net6.0-windows\GeneratedInternalTypeHelper.g.cs -FD:\gitea\AUCMA\AUCMA_SCADA\HwControlLib\Themes\Generic.xaml;; +FD:\Project\gitea\AUCMA\SCADA\HwControlLib\Themes\Generic.xaml;; diff --git a/dll/HslCommunication.dll b/dll/HslCommunication.dll new file mode 100644 index 00000000..7082ca24 Binary files /dev/null and b/dll/HslCommunication.dll differ