代码合并

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

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

=D:\GIT源代码\ZyL-MES\Pub_Class\bin\x86\Debug\Pub_Class.dllGE:\APS\欧讯LMES\Underly\Underly\Pub_Class\bin\x86\Debug\Pub_Class.dll            
    +Microsoft.Build.Tasks.SystemState+FileState
modmodkandepssfilesrtverfnfnVerfnIdfmProf


    ,Microsoft.Build.Shared.AssemblyNameExtension.Microsoft.Build.Shared.AssemblyNameExtension[]
System.Version»‡ëXÙ
             
v4.0.30319
     .NETFramework

    S–kïØ
            
v4.0.30319
     .NETFramework    ,Microsoft.Build.Shared.AssemblyNameExtensionhasANnamepkpktverflagscpuarchhasCIcihashAlg    verCompatcodebasekeypairasStrisSName
hasCpuArch    immutableremapped



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



    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ÿÿÿÿÿÿÿÿ%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
    '    (

×ÿÿÿäÿÿÿ€
Öÿÿÿãÿÿÿ
+Ofile:///E:/APS/欧讯LMES/Underly/Underly/Pub_Class/bin/x86/Debug/Pub_Class.dll
,@Pub_Class, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null    -
,Microsoft.Build.Shared.AssemblyNameExtension    .    /    0    1    2
ÿÿÿÿÿÿÿÿ

 ,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]]%
3mscorlib
    4    5

Êÿÿÿäÿÿÿ
Éÿÿÿãÿÿÿ

 
 
    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]]%
9System.Data
    :    ;

Äÿÿÿäÿÿÿ
Ãÿÿÿãÿÿÿ

 
 
    >",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

¾ÿÿÿäÿÿÿ
½ÿÿÿãÿÿÿ

 
 
    D#,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]]%
ESystem.Drawing
    F    G

¸ÿÿÿäÿÿÿ
·ÿÿÿãÿÿÿ

 
 
    J$,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]]%
KSystem
    L    M

²ÿÿÿäÿÿÿ
±ÿÿÿãÿÿÿ

 
 
    P'
(
-´
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%    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]]%
Rmscorlib
    S    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.Data
    Y    Z

¥ÿÿÿäÿÿÿ
¤ÿÿÿãÿÿÿ

 
 
    ]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]]%
^System.Windows.Forms
    _    `

Ÿÿÿÿäÿÿÿ
žÿÿÿãÿÿÿ

 
 
    c1,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

™ÿÿÿäÿÿÿ
˜ÿÿÿãÿÿÿ

 
 
    i2,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]]%
jSystem
    k    l

“ÿÿÿäÿÿÿ
’ÿÿÿãÿÿÿ

 
 
    o4·z\V4à‰
5
8-    p:·z\V4à‰
;
>-    p@·z\V4à‰
A
D-    pF°?_Õ
:
G
J-    pL·z\V4à‰
M
P-    pQ+Microsoft.Build.Shared.AssemblyNameComparer
considerRetargetableFlag

S·z\V4à‰
T
W-    qY·z\V4à‰
Z
]-    q_·z\V4à‰
`
c-    qe°?_Õ
:
f
i-    qk·z\V4à‰
l
o-    q
pQ

qQ