yuysh/ExtInstrument_Cal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix MetaData file confilct

Browse Source
This commit is contained in:
YuYang Shen
2025-04-08 16:22:31 +08:00
parent bee8715471
commit fc794c971c
15 changed files with 104 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Testrong.User.Program/obj/x64/Debug/Testrong.User.Program.csproj.AssemblyReference.cache
BIN
View File
Binary file not shown.
Testrong.User.Program/obj/x64/Debug/Testrong.User.Program.csproj.CoreCompileInputs.cache
+1 -1
View File
@@ -1 +1 @@
8336289dafd7be8d8ceb71ec0bfb414b5e10ce0020e044e9f7d2ae18b0c1e638
1c5e67c428e7ea9ad83db74e3225f3a6ee4bdaaf429227caea859a4df23e5fee
Testrong.User.Program/obj/x64/Debug/Testrong.User.Program.csproj.FileListAbsolute.txt
+50 -37
View File
@@ -2580,40 +2580,53 @@ C:\Users\testrong\Desktop\UserProgram_ReWorked_v0.6\UserProgram_time\Testrong.Us
C:\Users\testrong\Desktop\UserProgram_ReWorked_v0.6\UserProgram_time\Testrong.User.Program\obj\x64\Debug\Testrong.A8AD3C05.Up2Date
C:\Users\testrong\Desktop\UserProgram_ReWorked_v0.6\UserProgram_time\Testrong.User.Program\obj\x64\Debug\UserProgram.dll
C:\Users\testrong\Desktop\UserProgram_ReWorked_v0.6\UserProgram_time\Testrong.User.Program\obj\x64\Debug\UserProgram.pdb
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\NLog.dll
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Transport.dll
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Buffers.dll
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Codecs.dll
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\System.Threading.Tasks.Dataflow.dll
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Common.dll
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Globalization.dll
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\AutoMapper.dll
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Datalog.Interfaces.dll
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Hardware.dll
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\MxFFTCalc.dll
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\MWArray.dll
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\MathNet.Numerics.dll
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Gramar.dll
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\System.Threading.Tasks.Extensions.dll
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\System.Runtime.CompilerServices.Unsafe.dll
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Extensions.Logging.Abstractions.dll
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Extensions.Logging.dll
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\STDF.Library.dll
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\System.Memory.dll
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\System.ValueTuple.dll
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Antlr4.Runtime.Standard.dll
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Extensions.DependencyInjection.Abstractions.dll
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Extensions.Options.dll
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Extensions.DependencyInjection.dll
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\System.Numerics.Vectors.dll
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Extensions.Primitives.dll
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Bcl.AsyncInterfaces.dll
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Model.xml
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Primitives.xml
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Transport.xml
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Buffers.xml
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Codecs.xml
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\System.Threading.Tasks.Dataflow.xml
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Common.xml
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\AutoMapper.xml
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\STDF.Library.xml
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\UserProgram.xml
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\UserProgram.dll
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\UserProgram.pdb
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Ivi.Visa.dll
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\NationalInstruments.Visa.dll
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Common.dll
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Communicate.dll
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Model.dll
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Primitives.dll
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\NLog.dll
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Transport.dll
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Buffers.dll
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Codecs.dll
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\System.Threading.Tasks.Dataflow.dll
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Common.dll
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\System.Buffers.dll
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Globalization.dll
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\AutoMapper.dll
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Datalog.Interfaces.dll
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Hardware.dll
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\MxFFTCalc.dll
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\MWArray.dll
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\MathNet.Numerics.dll
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Gramar.dll
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\System.Threading.Tasks.Extensions.dll
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\System.Runtime.CompilerServices.Unsafe.dll
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Extensions.Logging.Abstractions.dll
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Extensions.Logging.dll
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\STDF.Library.dll
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\System.ValueTuple.dll
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Antlr4.Runtime.Standard.dll
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Extensions.DependencyInjection.Abstractions.dll
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Extensions.Options.dll
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Extensions.DependencyInjection.dll
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Extensions.Primitives.dll
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Bcl.AsyncInterfaces.dll
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Model.xml
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Primitives.xml
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Transport.xml
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Buffers.xml
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Codecs.xml
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\System.Threading.Tasks.Dataflow.xml
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Common.xml
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\AutoMapper.xml
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\bin\x64\Debug\STDF.Library.xml
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\obj\x64\Debug\Testrong.User.Program.csproj.AssemblyReference.cache
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\obj\x64\Debug\Testrong.User.Program.csproj.CoreCompileInputs.cache
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\obj\x64\Debug\Testrong.A8AD3C05.Up2Date
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\obj\x64\Debug\UserProgram.dll
C:\Users\230210\Desktop\WC\UserProgram_ReWorked_v0.8_t\UserProgram_time\Testrong.User.Program\obj\x64\Debug\UserProgram.pdb
Testrong.User.Program/obj/x64/Debug/UserProgram.dll
BIN
View File
Binary file not shown.
Testrong.User.Program/obj/x64/Debug/UserProgram.pdb
BIN
View File
Binary file not shown.