代码合并

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

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

kC:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Windows.Forms.dll=D:\GIT源代码\ZyL-MES\Pub_Class\bin\x86\Debug\Pub_Class.dll    eC:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Drawing.dll
GE:\APS\欧讯LMES\Underly\Underly\Pub_Class\bin\x86\Debug\Pub_Class.dll                 +Microsoft.Build.Tasks.SystemState+FileStatemodmodkandepssfilesrtverfn
    
;ß­¥”Ì

 
 
 
v4.0.30319+Microsoft.Build.Tasks.SystemState+FileState
modmodkandepssfilesrtverfnfnVerfnIdfmProf


    ,Microsoft.Build.Shared.AssemblyNameExtension.Microsoft.Build.Shared.AssemblyNameExtension[]
System.Version»‡ëXÙ
            
v4.0.30319
     .NETFramework
 ;ß­¥”Ì

 
 
 
v4.0.30319+Microsoft.Build.Tasks.SystemState+FileState
modmodkandepssfilesrtverfnfnVerfnIdfmProf


    ,Microsoft.Build.Shared.AssemblyNameExtension.Microsoft.Build.Shared.AssemblyNameExtension[]
System.VersionS–kïØ
            
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]]
     Pub_Class
    !    "
Ýÿÿÿ5System.Configuration.Assemblies.AssemblyHashAlgorithm
value__€Üÿÿÿ<System.Configuration.Assemblies.AssemblyVersionCompatibility
value__
%Efile:///D:/GIT源代码/ZyL-MES/Pub_Class/bin/x86/Debug/Pub_Class.dll
&@Pub_Class, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null    '
,Microsoft.Build.Shared.AssemblyNameExtension    (    )    *    +    ,System.Version_Major_Minor_Build    _Revisionÿÿÿÿÿÿÿÿ

-    Pub_Class
    !    /

ÐÿÿÿÝÿÿÿ€
ÏÿÿÿÜÿÿÿ
2Ofile:///E:/APS/欧讯LMES/Underly/Underly/Pub_Class/bin/x86/Debug/Pub_Class.dll
3@Pub_Class, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null    4
,Microsoft.Build.Shared.AssemblyNameExtension    5    6    7    8    9
ÿÿÿÿÿÿÿÿ!
"
'´
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    :(,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]]
ASystem.Data
    B    C

¼ÿÿÿÝÿÿÿ
»ÿÿÿÜÿÿÿ

 
 
    F*,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]]
GSystem.Windows.Forms
    H    I

¶ÿÿÿÝÿÿÿ
µÿÿÿÜÿÿÿ

 
 
    L+,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]]
MSystem.Drawing
    N    O

°ÿÿÿÝÿÿÿ
¯ÿÿÿÜÿÿÿ

 
 
    R,,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]]
SSystem
    T    U

ªÿÿÿÝÿÿÿ
©ÿÿÿÜÿÿÿ

 
 
    X
/

4'    Y5,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]]
Zmscorlib
    [    \

£ÿÿÿÝÿÿÿ
¢ÿÿÿÜÿÿÿ

 
 
    _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]]
`System.Data
    a    b

ÿÿÿÝÿÿÿ
œÿÿÿÜÿÿÿ

 
 
    e7,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]]
fSystem.Windows.Forms
    g    h

—ÿÿÿÝÿÿÿ
–ÿÿÿÜÿÿÿ

 
 
    k8,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]]
lSystem.Drawing
    m    n

‘ÿÿÿÝÿÿÿ
ÿÿÿÜÿÿÿ

 
 
    q9,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]]
rSystem
    s    t

‹ÿÿÿÝÿÿÿ
ŠÿÿÿÜÿÿÿ

 
 
    w:+Microsoft.Build.Shared.AssemblyNameComparer
considerRetargetableFlag

<·z\V4à‰
=
@'    xB·z\V4à‰
C
F'    xH·z\V4à‰
I
L'    xN°?_Õ
:
O
R'    xT·z\V4à‰
U
X'    x
Y:
[·z\V4à‰
\
_'    ya·z\V4à‰
b
e'    yg·z\V4à‰
h
k'    ym°?_Õ
:
n
q'    ys·z\V4à‰
t
w'    y
x:

y: