代码合并

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

ÿÿÿÿ
^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

5D:\GIT源代码\ZyL-MES\Model\bin\x86\Debug\Model.dll=D:\GIT源代码\ZyL-MES\DBUtility\bin\x86\Debug\DBUtility.dll            
    +Microsoft.Build.Tasks.SystemState+FileState
modmodkandepssfilesrtverfnfnVerfnIdfmProf


    ,Microsoft.Build.Shared.AssemblyNameExtension.Microsoft.Build.Shared.AssemblyNameExtension[]
System.VersionÂ8"ŠëXÙ
             
v4.0.30319
     .NETFramework

    4^«‰ëXÙ
            
v4.0.30319
     .NETFramework    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]]
Model
        
ãÿÿÿ5System.Configuration.Assemblies.AssemblyHashAlgorithm
value__€âÿÿÿ<System.Configuration.Assemblies.AssemblyVersionCompatibility
value__
=file:///D:/GIT源代码/ZyL-MES/Model/bin/x86/Debug/Model.dll
 <Model, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null    !
,Microsoft.Build.Shared.AssemblyNameExtension    "    #    $ System.Version_Major_Minor_Build    _Revisionÿÿÿÿÿÿÿÿ

%    DBUtility
        '

Øÿÿÿãÿÿÿ€
×ÿÿÿâÿÿÿ
*Efile:///D:/GIT源代码/ZyL-MES/DBUtility/bin/x86/Debug/DBUtility.dll
+@DBUtility, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null    ,

,Microsoft.Build.Shared.AssemblyNameExtension    -    .    /    0    1    2    3    4    5    6
ÿÿÿÿÿÿÿÿ

!´
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    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]]
8mscorlib
    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]]
>    DBUtility
        @

¿ÿÿÿãÿÿÿ
¾ÿÿÿâÿÿÿ

 
 
    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]]
DSystem.Drawing
    E    F

¹ÿÿÿãÿÿÿ
¸ÿÿÿâÿÿÿ

 
 
    I
'

,!    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]]
Kmscorlib
    L    M

²ÿÿÿãÿÿÿ
±ÿÿÿâÿÿÿ

 
 
    P.,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]]
QSystem.Windows.Forms
    R    S

¬ÿÿÿãÿÿÿ
«ÿÿÿâÿÿÿ

 
 
    V/,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]]
WSystem
    X    Y

¦ÿÿÿãÿÿÿ
¥ÿÿÿâÿÿÿ

 
 
    \0,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_Class
        _

 ÿÿÿãÿÿÿ
Ÿÿÿÿâÿÿÿ

 
 
    b1,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]]
c    SQLHelper
        e

šÿÿÿãÿÿÿ
™ÿÿÿâÿÿÿ

 
 
    h2,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]]
iSystem.Data
    j    k

”ÿÿÿãÿÿÿ
“ÿÿÿâÿÿÿ

 
 
    n3,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]]
oPub_Control
        q

Žÿÿÿãÿÿÿ
ÿÿÿâÿÿÿ

 
 
    t4,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]]
uSystem.Drawing
    v    w

ˆÿÿÿãÿÿÿ
‡ÿÿÿâÿÿÿ

 
 
    z5,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.Core
    |    }

‚ÿÿÿãÿÿÿ
ÿÿÿâÿÿÿ

 
 
    €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]]
Microsoft.CSharp
    ‚    ƒ

|ÿÿÿãÿÿÿ
{ÿÿÿâÿÿÿ

 
 
    †7+Microsoft.Build.Shared.AssemblyNameComparer
considerRetargetableFlag

9·z\V4à‰
:
=!    ‡
@

C!    ‡E°?_Õ
:
F
I!    ‡L·z\V4à‰
M
P!    ‡R·z\V4à‰
S
V!    ‡X·z\V4à‰
Y
\!    ‡
_

b!    ‡
e

h!    ‡j·z\V4à‰
k
n!    ‡
q
ÐH¢
t!    ‡v°?_Õ
:
w
z!    ‡|·z\V4à‰
}
€!    ‡‚°?_Õ
:
ƒ
†!    ‡
‡7