合并解决冲突

AUTS_Studio/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.vb

@@ -1,7 +0,0 @@
-' <autogenerated/>
-            Option Strict Off
-            Option Explicit On
-
-            Imports System
-            Imports System.Reflection
-            <Assembly: Global.System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName:=".NET Framework 4.8")>

AUTS_Studio/obj/Debug/UTS_Studio.exe.config

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
-  </startup>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

AUTS_Studio/obj/Debug/UTS_Studio.vbproj.CoreCompileInputs.cache

@@ -1 +0,0 @@
-5d506a27bb1502797e0a8d80ee1ab5862d5ccecb

AUTS_Studio/obj/Debug/UTS_Studio.vbproj.FileListAbsolute.txt

@@ -1,158 +0,0 @@
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\UTS_Studio.exe.config
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\UTS_Studio.exe
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\UTS_Studio.pdb
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\UTS_Studio.xml
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\UTS_Core.dll
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\log4net.dll
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\System.Data.SQLite.dll
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\MySql.Data.dll
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\UTS_Core.pdb
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\UTS_Core.xml
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.vbprojAssemblyReference.cache
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.Resources.resources
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.vbproj.GenerateResource.cache
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.vbproj.CoreCompileInputs.cache
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.vbproj.CopyComplete
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.exe
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.xml
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.pdb
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\UTS_Core.dll.config
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.FrmMain.resources
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\FlexCell.dll
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\SharpCompress.dll
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\System.Memory.dll
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\System.Buffers.dll
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\System.Numerics.Vectors.dll
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\System.Memory.xml
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\System.Buffers.xml
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\System.Numerics.Vectors.xml
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\Newtonsoft.Json.dll
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\Zstandard.Net.dll
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\K4os.Compression.LZ4.Streams.dll
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\BouncyCastle.Crypto.dll
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\Ubiety.Dns.Core.dll
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\Renci.SshNet.dll
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\K4os.Compression.LZ4.dll
-H:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\K4os.Hash.xxHash.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\UTS_Studio.exe.config
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\UTS_Studio.exe
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\UTS_Studio.pdb
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\UTS_Studio.xml
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\FlexCell.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\MySql.Data.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\UTS_Core.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\SharpCompress.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\log4net.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\System.Data.SQLite.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\Newtonsoft.Json.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\Zstandard.Net.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\K4os.Compression.LZ4.Streams.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\BouncyCastle.Crypto.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\Ubiety.Dns.Core.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\Renci.SshNet.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\System.Memory.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\System.Buffers.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\K4os.Compression.LZ4.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\K4os.Hash.xxHash.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\System.Numerics.Vectors.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\UTS_Core.pdb
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\UTS_Core.xml
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\UTS_Core.dll.config
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\System.Memory.xml
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\System.Buffers.xml
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\System.Numerics.Vectors.xml
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.vbprojAssemblyReference.cache
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.FrmMain.resources
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.Resources.resources
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.vbproj.GenerateResource.cache
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.vbproj.CoreCompileInputs.cache
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.vbproj.CopyComplete
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.exe
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.xml
-D:\Sync\UTS\SW\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.pdb
-F:\ML\Project\UTS_Studio\UTS_Studio\bin\Debug\UTS_Studio.exe.config
-F:\ML\Project\UTS_Studio\UTS_Studio\bin\Debug\UTS_Studio.exe
-F:\ML\Project\UTS_Studio\UTS_Studio\bin\Debug\UTS_Studio.pdb
-F:\ML\Project\UTS_Studio\UTS_Studio\bin\Debug\UTS_Studio.xml
-F:\ML\Project\UTS_Studio\UTS_Studio\bin\Debug\FlexCell.dll
-F:\ML\Project\UTS_Studio\UTS_Studio\bin\Debug\MySql.Data.dll
-F:\ML\Project\UTS_Studio\UTS_Studio\bin\Debug\UTS_Core.dll
-F:\ML\Project\UTS_Studio\UTS_Studio\bin\Debug\SharpCompress.dll
-F:\ML\Project\UTS_Studio\UTS_Studio\bin\Debug\System.Data.SQLite.dll
-F:\ML\Project\UTS_Studio\UTS_Studio\bin\Debug\Newtonsoft.Json.dll
-F:\ML\Project\UTS_Studio\UTS_Studio\bin\Debug\Zstandard.Net.dll
-F:\ML\Project\UTS_Studio\UTS_Studio\bin\Debug\K4os.Compression.LZ4.Streams.dll
-F:\ML\Project\UTS_Studio\UTS_Studio\bin\Debug\BouncyCastle.Crypto.dll
-F:\ML\Project\UTS_Studio\UTS_Studio\bin\Debug\Ubiety.Dns.Core.dll
-F:\ML\Project\UTS_Studio\UTS_Studio\bin\Debug\Renci.SshNet.dll
-F:\ML\Project\UTS_Studio\UTS_Studio\bin\Debug\System.Memory.dll
-F:\ML\Project\UTS_Studio\UTS_Studio\bin\Debug\System.Buffers.dll
-F:\ML\Project\UTS_Studio\UTS_Studio\bin\Debug\K4os.Compression.LZ4.dll
-F:\ML\Project\UTS_Studio\UTS_Studio\bin\Debug\K4os.Hash.xxHash.dll
-F:\ML\Project\UTS_Studio\UTS_Studio\bin\Debug\System.Numerics.Vectors.dll
-F:\ML\Project\UTS_Studio\UTS_Studio\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll
-F:\ML\Project\UTS_Studio\UTS_Studio\bin\Debug\UTS_Core.pdb
-F:\ML\Project\UTS_Studio\UTS_Studio\bin\Debug\UTS_Core.xml
-F:\ML\Project\UTS_Studio\UTS_Studio\bin\Debug\UTS_Core.dll.config
-F:\ML\Project\UTS_Studio\UTS_Studio\bin\Debug\System.Memory.xml
-F:\ML\Project\UTS_Studio\UTS_Studio\bin\Debug\System.Buffers.xml
-F:\ML\Project\UTS_Studio\UTS_Studio\bin\Debug\System.Numerics.Vectors.xml
-F:\ML\Project\UTS_Studio\UTS_Studio\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml
-F:\ML\Project\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.vbprojAssemblyReference.cache
-F:\ML\Project\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.FrmMain.resources
-F:\ML\Project\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.Resources.resources
-F:\ML\Project\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.vbproj.GenerateResource.cache
-F:\ML\Project\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.vbproj.CoreCompileInputs.cache
-F:\ML\Project\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.vbproj.CopyComplete
-F:\ML\Project\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.exe
-F:\ML\Project\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.xml
-F:\ML\Project\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.pdb
-F:\ML\Project\UTS_Studio\UTS_Studio\bin\Debug\Google.Protobuf.dll
-F:\ML\Project\UTS_Studio\UTS_Studio\bin\Debug\MySql.Data.xml
-F:\ML\Project\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.exe.config
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\UTS_Studio.exe
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\FlexCell.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\MySql.Data.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\UTS_Core.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\SharpCompress.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\Newtonsoft.Json.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\System.Data.SQLite.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\Google.Protobuf.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\Zstandard.Net.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\K4os.Compression.LZ4.Streams.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\BouncyCastle.Crypto.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\Ubiety.Dns.Core.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\Renci.SshNet.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\System.Memory.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\System.Buffers.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\K4os.Compression.LZ4.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\K4os.Hash.xxHash.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\System.Numerics.Vectors.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.exe
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.vbproj.AssemblyReference.cache
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.exe.config
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.FrmMain.resources
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.Resources.resources
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.vbproj.GenerateResource.cache
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.vbproj.CoreCompileInputs.cache
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\UTS_Studio.exe.config
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\UTS_Studio.pdb
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\UTS_Studio.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\TeeChart.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\UTS_Core.pdb
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\UTS_Core.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\UTS_Core.dll.config
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\MySql.Data.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\TeeChart.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\System.Memory.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\System.Buffers.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\System.Numerics.Vectors.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.vbproj.CopyComplete
-E:\Sync\UTS\SW\UTS_Studio\UTS_Studio\obj\Debug\UTS_Studio.pdb