代码合并

jingh

2021-08-06 91c049b47497db9d512fc356b52a50a7af617cd2

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111

ÿÿÿÿ
^Microsoft.Build.Tasks.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
!Microsoft.Build.Tasks.SystemState
    fileStateSystem.Collections.Hashtable    System.Collections.Hashtable
LoadFactorVersionKeyComparerHashSizeKeysValuesSystem.OrdinalComparerìQ8?            System.OrdinalComparer
_ignoreCase

3D:\GIT源代码\ZyL-MES\WarM\bin\x86\Debug\WarM.dllBD:\GIT源代码\ZyL-MES\WarM\bin\x86\Debug\AxInterop.gregn6Lib.dll            
    +Microsoft.Build.Tasks.SystemState+FileState
modmodkandepssfilesrtverfnfnVerfnIdfmProf


    ,Microsoft.Build.Shared.AssemblyNameExtension.Microsoft.Build.Shared.AssemblyNameExtension[]
System.VersionCóKÊVþØ
             
v4.0.30319
     .NETFramework
+Microsoft.Build.Tasks.SystemState+FileStatemodmodkandepssfilesrtverfn
    ,Microsoft.Build.Shared.AssemblyNameExtension.Microsoft.Build.Shared.AssemblyNameExtension[]
¯ÑæÇVþØ
            
v4.0.30319NSystem.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped



System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility


´
System.Collections.Generic.HashSet`1[[Microsoft.Build.Shared.AssemblyNameExtension, Microsoft.Build.Tasks.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]
WarM
        
æÿÿÿ5System.Configuration.Assemblies.AssemblyHashAlgorithm
value__€åÿÿÿ<System.Configuration.Assemblies.AssemblyVersionCompatibility
value__
;file:///D:/GIT源代码/ZyL-MES/WarM/bin/x86/Debug/WarM.dll
;WarM, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null    
,Microsoft.Build.Shared.AssemblyNameExtension             !    "    #    $    %    &    '    (    )    *    +    , System.Version_Major_Minor_Build    _Revisionÿÿÿÿÿÿÿÿ,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped


System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility


´
System.Collections.Generic.HashSet`1[[Microsoft.Build.Shared.AssemblyNameExtension, Microsoft.Build.Tasks.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]
-AxInterop.gregn6Lib
        /


Ðÿÿÿæÿÿÿ€
Ïÿÿÿåÿÿÿ
2Jfile:///D:/GIT源代码/ZyL-MES/WarM/bin/x86/Debug/AxInterop.gregn6Lib.dll
 
    3
,Microsoft.Build.Shared.AssemblyNameExtension    4    5    6    7    8

´
System.Collections.Generic.HashSet`1[[Microsoft.Build.Shared.AssemblyNameExtension, Microsoft.Build.Tasks.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]VersionComparerCapacity+Microsoft.Build.Shared.AssemblyNameComparer    9,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility


´
System.Collections.Generic.HashSet`1[[Microsoft.Build.Shared.AssemblyNameExtension, Microsoft.Build.Tasks.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]
:mscorlib
    ;    <

Ãÿÿÿæÿÿÿ
Âÿÿÿåÿÿÿ

 
 
    ? ,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility


´
System.Collections.Generic.HashSet`1[[Microsoft.Build.Shared.AssemblyNameExtension, Microsoft.Build.Tasks.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]
@System.Windows.Forms
    A    B

½ÿÿÿæÿÿÿ
¼ÿÿÿåÿÿÿ

 
 
    E!,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility


´
System.Collections.Generic.HashSet`1[[Microsoft.Build.Shared.AssemblyNameExtension, Microsoft.Build.Tasks.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]
F    Pub_Class
        H

·ÿÿÿæÿÿÿ
¶ÿÿÿåÿÿÿ

 
 
    K",Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility


´
System.Collections.Generic.HashSet`1[[Microsoft.Build.Shared.AssemblyNameExtension, Microsoft.Build.Tasks.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]
LDAL
        N

±ÿÿÿæÿÿÿ
°ÿÿÿåÿÿÿ

 
 
    Q#,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility


´
System.Collections.Generic.HashSet`1[[Microsoft.Build.Shared.AssemblyNameExtension, Microsoft.Build.Tasks.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]
RInterop.gregn6Lib
        T

«ÿÿÿæÿÿÿ
ªÿÿÿåÿÿÿ

 
 
    W$,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility


´
System.Collections.Generic.HashSet`1[[Microsoft.Build.Shared.AssemblyNameExtension, Microsoft.Build.Tasks.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]
XSystem
    Y    Z

¥ÿÿÿæÿÿÿ
¤ÿÿÿåÿÿÿ

 
 
    ]%,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility


´
System.Collections.Generic.HashSet`1[[Microsoft.Build.Shared.AssemblyNameExtension, Microsoft.Build.Tasks.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]
^System.Drawing
    _    `

Ÿÿÿÿæÿÿÿ
žÿÿÿåÿÿÿ

 
 
    c&,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility


´
System.Collections.Generic.HashSet`1[[Microsoft.Build.Shared.AssemblyNameExtension, Microsoft.Build.Tasks.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]
dModel
        f

™ÿÿÿæÿÿÿ
˜ÿÿÿåÿÿÿ

 
 
    i',Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility


´
System.Collections.Generic.HashSet`1[[Microsoft.Build.Shared.AssemblyNameExtension, Microsoft.Build.Tasks.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]
jBLL
        l

“ÿÿÿæÿÿÿ
’ÿÿÿåÿÿÿ

 
 
    o(,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility


´
System.Collections.Generic.HashSet`1[[Microsoft.Build.Shared.AssemblyNameExtension, Microsoft.Build.Tasks.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]
p    DBUtility
        r

ÿÿÿæÿÿÿ
Œÿÿÿåÿÿÿ

 
 
    u),Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility


´
System.Collections.Generic.HashSet`1[[Microsoft.Build.Shared.AssemblyNameExtension, Microsoft.Build.Tasks.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]
vSystem.Data
    w    x

‡ÿÿÿæÿÿÿ
†ÿÿÿåÿÿÿ

 
 
    {*,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility


´
System.Collections.Generic.HashSet`1[[Microsoft.Build.Shared.AssemblyNameExtension, Microsoft.Build.Tasks.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]
|    SQLHelper
        ~

ÿÿÿæÿÿÿ
€ÿÿÿåÿÿÿ

 
 
    +,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility


´
System.Collections.Generic.HashSet`1[[Microsoft.Build.Shared.AssemblyNameExtension, Microsoft.Build.Tasks.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]
‚Pub_Control
        „

{ÿÿÿæÿÿÿ
zÿÿÿåÿÿÿ

 
 
    ‡,,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility


´
System.Collections.Generic.HashSet`1[[Microsoft.Build.Shared.AssemblyNameExtension, Microsoft.Build.Tasks.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]
ˆAxInterop.gregn6Lib
        Š

uÿÿÿæÿÿÿ
tÿÿÿåÿÿÿ

 
 
    
/
3    94,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility


´
System.Collections.Generic.HashSet`1[[Microsoft.Build.Shared.AssemblyNameExtension, Microsoft.Build.Tasks.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]
System.Windows.Forms
        ‘

nÿÿÿæÿÿÿ
mÿÿÿåÿÿÿ

 
 
    ”5,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility


´
System.Collections.Generic.HashSet`1[[Microsoft.Build.Shared.AssemblyNameExtension, Microsoft.Build.Tasks.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]
•mscorlib
    –    —

hÿÿÿæÿÿÿ
gÿÿÿåÿÿÿ

 
 
    š6,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility


´
System.Collections.Generic.HashSet`1[[Microsoft.Build.Shared.AssemblyNameExtension, Microsoft.Build.Tasks.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]
›Interop.gregn6Lib
        

bÿÿÿæÿÿÿ
aÿÿÿåÿÿÿ

 
 
     7,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility


´
System.Collections.Generic.HashSet`1[[Microsoft.Build.Shared.AssemblyNameExtension, Microsoft.Build.Tasks.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]
¡System.Drawing
    ¢    £

\ÿÿÿæÿÿÿ
[ÿÿÿåÿÿÿ

 
 
    ¦8,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped

System.Version
5System.Configuration.Assemblies.AssemblyHashAlgorithm<System.Configuration.Assemblies.AssemblyVersionCompatibility


´
System.Collections.Generic.HashSet`1[[Microsoft.Build.Shared.AssemblyNameExtension, Microsoft.Build.Tasks.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]]
§System
    ¨    ©

Vÿÿÿæÿÿÿ
Uÿÿÿåÿÿÿ

 
 
    ¬9+Microsoft.Build.Shared.AssemblyNameComparer
considerRetargetableFlag

;·z\V4à‰
<
?    ­A·z\V4à‰
B
E    ­
H

K    ­
N

Q    ­
T
W    ­Y·z\V4à‰
Z
]    ­_°?_Õ
:
`
c    ­
f

i    ­
l

o    ­
r

u    ­w·z\V4à‰
x
{    ­
~

    ­
„
ƒ
‡    ­
Š
    ­·z\V4à‰
‘
”    ­–·z\V4à‰
—
š    ­

     ­¢°?_Õ
:
£
¦    ­¨·z\V4à‰
©
¬    ­
­9