diff --git a/ArinWarev1/Calculator/CHeating.vb b/ArinWarev1/Calculator/CHeating.vb
index 1adbeee..3984cf6 100644
--- a/ArinWarev1/Calculator/CHeating.vb
+++ b/ArinWarev1/Calculator/CHeating.vb
@@ -794,9 +794,11 @@
use_DH = use_DH + Q_w_outg_i * system_count '========2013.08.18 수정
Case "전기보일러" '전기보일러"
+
use_Elec = use_Elec + (Q_w_outg_i + (Q_w_outg_i * 0.09)) * system_count '========2013.08.18 수정 '2011.03.08 개별전기보일러 생산손실을 내부 생산식저장으로 설정
Q_w_outg = Q_w_outg + (Q_w_outg_i * 0.09) * system_count '========2013.11.6 수정
+
'====================================================================================2010.03.14 추가
Case "히트펌프"
@@ -2869,7 +2871,9 @@
use_DH = use_DH + Q_h_outg_i * system_count '========2013.08.18 수정
Case "전기보일러" '전기보일러"
+
use_Elec = use_Elec + (Q_h_outg_i + (Q_h_outg_i * 0.09)) * system_count '========2013.08.18 수정 '2011.03.08 전기보일러 생산손실을 내부 생산식 저장으로 설정
+ Q_h_outg = Q_h_outg + (Q_h_outg_i * 0.09) * system_count '========2023.11.12 수정
'====================================================================2010.2.21 수정
'====================================================================2010.03.14 추가
Case "히트펌프"
@@ -4008,6 +4012,7 @@
Case "전기보일러" '전기보일러"
use_Elec = use_Elec + (Q_h_outg_i + (Q_h_outg_i * 0.09)) * system_count '========2013.08.18 수정 '2011.03.08 전기보일러 생산손실을 내부 생산식 저장으로 설정
+ Q_h_outg = Q_h_outg + (Q_h_outg_i * 0.09) * system_count '========2023.11.12 수정
'====================================================================2010.2.21 수정
'====================================================================2010.03.14 추가
Case "히트펌프"
diff --git a/ArinWarev1/MdiMain.resx b/ArinWarev1/MdiMain.resx
index 2a1630b..a15e782 100644
--- a/ArinWarev1/MdiMain.resx
+++ b/ArinWarev1/MdiMain.resx
@@ -331,72 +331,72 @@
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
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAA89SURBVHhe7ZpZbFXXFYap2kRN2kptU6kP6VPV17z0sVJV
- VWorVa3al5CmaRuSpgkEMDZgMxl8sQEb4xmb2JgpA6MNmCkMMXAhgCdswhQSZjBgG882DvP16v+vvfc5
- 514cMBmkRLpb+rX2Ge65d333X+vsc+0R8REf8REf8REf8REfHKEt157O3dL/s8yNfc9QeTt7f5q1rfcn
- VEFVz48fpZxdrT+wl/p2jYSipkXJZSdu5qz7VL6sMkrO3klaeOTAyIqK79rLf/PHmIWHBk523Jc790WO
- td6XTR/f/ULafOqu7LpwX7I3hCOJRU2p9vLf/DFtWd3t908NyKEzt6VwR5/kvv846teYx/l2o5UNn0li
- wZFbCfPrfmHf4ps9Egs+urWkttck4BLDXJNSmSSjjge37bn++X0SKqoenLSo6aB9i2/2cAA0CU0KCW+n
- XEIWABWzPw/b+hqFgLnu65PS8A1JX/HpvQmFDUvGFdc/M7Yk/MOvU28sbnzCpvP4Y+qSkzfLa0xSDgIT
- MQlTJimTrJub/e41CoDHOOdrsV19+o6EFm4fHKpZfh1KKGysH51X86xNa/jDATDJBxK036iB4I7ZpF2y
- ep47P/r1y/ffkJa+iHTeEjnYNvi1qrZdJJT/weC4goZam9bwRwoBHHJJmSQ1ISarc38fo4Fh5MD4gNw+
- P/qvN9dzjjIOCm4Hr2WOe1+K/VzB1/vql+Lqftl+9p6MK2rsD4XC37OpPXqMHFnxXfaAxQd7Jed99IGo
- C5uLR7+p+SBOZv9Qx9y2u07Mcd5tvO3g3GxHx5hjO2I/D/f1SeEHNyRxQf2NiXk1T9n0Hj1+B1oEUAYA
- mRs7AjY2ymfExfmmuo9R54F9TkOdo8eirxl9DvWQaw1H/Hz2GuMWNvU/FoA33mh8IqW87nbpgV6ZU9km
- 8za2m6T1wibmBz+M2+fmUNRxT/6H0nOC59s5o76WCpyrr7fROwfHvXPdOe48K577hQAkA8BbH/ZK+roW
- yahoDUBgEuaNzJvfCHzgwH7vuBHnRjHnc5+NZtscj1XsdXWuijnfXcOdDz02gFGh8PcJoBQAQmuuSvra
- azIbIOauvy4527A4YklQeCPXnPhmrMFc9gz9ILaBaQ/hB+f5/gc1H96X2+eORymQjL/fgbyhCh43+/xz
- HxvA8xNrnsJC4s6i/b0yc2WzpK2CAGK2gmgFCFMW86raJWtTh2RWdUrW5k6Zv7kLQtxk5lmbuiR7c7fR
- FqOcrb2yYFuP5FIOkvvW+OF3EpSRbutxzHfa4wEYXsLunOA+QrD7CABpfcdkN4zxt5RNPyKAknC3THvn
- gsx45yJAXFbNAgy6IrTWAElfB61tkfTKVskAmDmIc1AyKvQPwlJtuC7zoDmEBydxTkfpfm6vB9ANEMBm
- Yl8m5pS3byP2ETrO02OIWes7JGtDh8zHfhXm2TpHxJeTjS8mG/sm4C4wYoQ4AIg6/3wgDkDx3i5JWXJG
- piw/JzPePi8z3r0IXQKISwpi1qorkrbaSKE4l1BrbAQoB8sAAyxCY2/hHPsyADCjwooAAY6ggppbcU3m
- 4vx5OD6vsgUAWlVZODcTx7M2tAEAtgHPqA0wsA/gxhQdGrCpjRAZhhP+GtrydHLoxF06IGXZWZm24pxM
- f/uCTIcTpgNC6nuEADesplgeFgATtInOViDXPDBDiWVl5nRVs8JKR6IZlRDjeqpF5mxA8huReBXKrwoO
- otQRVizFKhMzq+AKjXAC9rFEQ6GT92dhYfcwJS051T2+qOFUDIAeAKADDASWw3SWxHsoCUCYtcqURBog
- sHZrLtyV9s8G5WR7RI5dNzraZvQRdKQVaolII3QYaqCuRaQOqr0akRro0JWIHIQONEfkw8sR2Q/tg/Ze
- isieixHZDVVTFyKyy2rneaMdX1Dbz0Wk8vg9OC8cUQAjQxVPJoeO3y3Z1yPJ5adNGSw9K1MVxHkLAk5A
- KdANtO6mj25LZFDkk5Z7UrBrQPIhxoIPBqSw+jMpgBiLGHfflKLdmGs0WrjnphRDC/fekuKASsKI4dsa
- F2m8beI+bO/D/CtUxoqL9xQAV4Kjyo7fYwlMWvyJTC7/VJIBIXkpQKAkpqInTHsbZQEQqQBRXtMtK+tu
- ImHbfdmxCWGnhbALAKBCwFAQHxgYhYRQDQCYE8BCglAYtwyQvYRiQVgYTlEQCCUmmS+i0cW1PQqAXdIB
- SCz9WCaWnQqAOA03+GWRhtpdVt8jRUg+Rx9izH0514EABJV1hEaCcDA8GVcQgDrCukLlHOFgeCCMM0rw
- 4RXKl3BF9uYOSShqCmv6fBiaHDp+v2Rft0xYdEIS3zopSaWnDAgLQUHADSX7OqR0f5/M38IHJ0K4ITlc
- EMWAyHMgLAwHRN3AMnGuAAgtlSFKhM5wENQdhME5Iew15eHcoYkxDtMdSYtPdr+ZV/d7BcAxOXQMALpk
- fPExSSg5riCSAGIiHWHdwAa5rL4bq78eLIS4wCGAPlmgIJwjIAfCSZ1h3aEwWCIOhg+CpeEBcLIgopwR
- kCkVH4ZxxtBJO+WjgScU1F+yqZuhAMKdMrboKFZSxwDiOEDADYvoBoCAG3Leb5EyrBbnbuxWANlb+6B+
- WUBtC4CAG+gKRnWGdceDIIwrCgBBe0a174ygG4pcaXiuiIbBpIvhCDf3ZRJmyQQBJK84e2NsXv3rNnUz
- /lgWjhDAmIIj8mbhRzIOIMYDRAJATCAIuGFJbRfW+t0AgGXvZpYBhKVuNqKBAQgEAWcYd1AGQlAGBgDs
- gIJlwj5Bd3iusDAsENcvdA4IWh5aIraBOhhMXufWFZq46RlFez6ThPyG7geeFRyA0XmNMiavSUGMDYBI
- W31Byg704BbYgYVJt2Ru6lUXUAoCPYFyILItBAfCuSPXAQEEUyYD0f3CwlBX2ObpuUJlARCEc4UFQlc4
- Z2ivCMydK9JLmu+MLzxcYNP2xx8IYF+nvJ7TIG/kHjYg8pvkTQVxVEoPdOLDd2HlRgA9CkAhbEI/UBim
- LxgQhICoIALOIATPGQaGa6DOGXzqc7dVdzv1SsQ5wwMCCA4IALjo5DdQSF1xUyYUNvUmDPW3Cgfgtew6
- +d+CeguiESCaUP8fy+KDXVj6tsnsik7tAfMognAiCHWEBeHBsCViy8SUiA/DOIMgnCNsJISgOwL9otD1
- C+sKcyfxneFB2I3EEWl7OiOUXj04vuDwDpty9JgUem9wEQC8mlUr/51fBxD1FsRhXLgNtd+JVeA1PKh0
- Ya3ehac69gKqBzCsFAadQVc4IITRh2h6hpaHi655eiAg6wZ3N9F+oUAsDA9EAIhzhnWFrjwVCI8NKCSC
- SSpt6H4zt+E3NuXoQQB0wCvzDskrmTUK4jWAGA0X8NtPX9uKByE+AgOAqhsgACAoQJjL/gAQpkwMEFMi
- vrwy8UBALBULQmFYCIy+KwAh0DgVQEC68gwA4Zy/FxBGzrZu3OEOn7HpPjgmhd4FgA55ec5BGTX3oIJ4
- FSAyq5qlYGcHHovxxIf6T68EDCiDsjAykDxdoUDUFUauRLxS0Z4BhzgYABF0hotRrgAA7RdufUEwsa7Q
- nmH7hfYMghjAa/v1GB0wbfnpfix8XrbpPjgUQLhD/p3+ofwn44AFcUibH7/96QSwDnP0gPQKNkMbLQzj
- CitbIg6IXx4WCiHQHewXmGu/UGfwtmruKMYVLBFAcAqWCL5Z1zijYZgyYQ8hSALhueNzGztHhk4+adN9
- cDgA/5q9HxD2A8KHePg5I8W7O/Ec0Az7t6MJdkpoXYeC8GH4UDIqEekIK88VhOH1iwAQWyIGBt3BvsF+
- ARhcXxCCByKmV/B26ppnEIRqAOXVg9f2wr0DMrbkIm99mTbVocek0qO6zn8pLSwvhfYpiJJwl/7SM3XF
- FUlb26EKBaQgUBa8M3hAgiVCORjaM3wghKClAhDGHQBhobg7SRYdYe8kekuFFigQv0ycK4yMKwhp7sZO
- sw0gCbj1TSis/blNdejhALw4a6/8c1ZYnwkW7u7Gt38Z3R8NcE07ngQBwSrEGAXDATEgTGSpGCAKxYNh
- QPglYmNMAx2yeTpXOFlXeDCYfBVKEAAIIxTaMZhQ2FBl0/z8YQC0yz9S98iLM/eglrjqa5HkZfwVqN0I
- ZaAgNPowVB4MusGHMduDQHd0PuCMDOsMcxehzJ3EuIIg2DQdjBhnEIBtnOoOQKDt0yuu67kskyQse8fl
- 1/zapvn5gwAWAcALM3ZjHVCLW0k/vv1LMvXtqzITyc9E0jNXXdeoIJzUGdBaKgCCAABCewbdEHCH54qA
- IzQ6VwRgEIST9goFYl2h5WHuHs4Zc9bz/a8rDP4KnVDYeNKm+PDhAIycXo2Ld8qcynaZvIQ/gyFpJJ5K
- CCpu23ksCI10BKH4MDxHOHnOMDAecIWD4MGgKxwIUybmTmJBWPFOkraGvzJ3qDOSy4/1jc2vf8Gm+PBB
- ABuO9OgtkAuKaSsu4/m/WQE4zWRE4qkKwYiloXE1tj1HdHjRiT3DlYhxRywMVyaEgFJRZ8ARdsGldxGF
- YcpDHeGi7RcZSHzmqhbdZg8YnVPXPuw/kxPAnk/7cVH+UaJTEkvPPgDAE5PXuXMEZV0B+a4AiAAUVyoG
- BMQScbdWgrBA3N3EucKsLwjDlomWB4TkjTOMK5h82uo2BcC/do/NPzzLpvfoMbnsqGz9eEBa+yIyZdkF
- PP+fVQgTF5+X5KWXYnRZlYIGadSM1zSbiDXDlOVXZApunU7sI9Ood65BV7G+uGb0bgtWmBDuMqqVrYAK
- rWpFMlx601WMbUjsOgBCBLjuOmCxrNo1sr+krmyRFPSsdLiATXR8YWMv/y/JpvfokVx+Qn8w4B9Ck5B4
- 4ltnAuJ2QDweI74mSmXnECFGq4mxAlxqUiBOKne6gB4Eabxo5lbJSy9Ga9lFwL8EqFfVGamhrXjqa1xj
- U3v0WNwoT0xd+on+YJC1sUu/QX7gxwEQq9jkYxUE4IFg4jEQFIRTAIIqAIHrFZYOSyQxdPTuuLya52x6
- jx7F4TsvJpUcxb2/T1IrQPBbrOnoM2Py/b8NDmvMWN5YOXttODImp04Sik/IpLLTMnnxma9P5WckGTGZ
- 0Yl/iHFxyVlViuqcpCwdWlOgqcuczksKXj8+dPj+n0bNn4e0fgkN79/lnv3Vc8//9u+vj8b0z1+h/jLE
- vs/T45w7HDH5+IiP+IiP+IiP+IiP+Hj4GDHi//4gWqkHLJ1zAAAAAElFTkSuQmCC
+ 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
@@ -574,86 +574,86 @@
iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- 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
+ 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
diff --git a/Setup1/Setup1.vdproj b/Setup1/Setup1.vdproj
index d036fe4..ce50e0b 100644
--- a/Setup1/Setup1.vdproj
+++ b/Setup1/Setup1.vdproj
@@ -159,7 +159,7 @@
}
"Entry"
{
- "MsmKey" = "8:_70186860D51B4F1360607F1CE8BF7844"
+ "MsmKey" = "8:_6BB2F49C9D04D801E8DE021D6CE20C22"
"OwnerKey" = "8:_FF450D40DC624BBDB22749D13FD2AC4C"
"MsmSig" = "8:_UNDEFINED"
}
@@ -189,6 +189,18 @@
}
"Entry"
{
+ "MsmKey" = "8:_8BDE3E37C576268C85BFD64B9B0E7E24"
+ "OwnerKey" = "8:_FF450D40DC624BBDB22749D13FD2AC4C"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_8EC9C4E69441F73892A4C676310B7ABE"
+ "OwnerKey" = "8:_FF450D40DC624BBDB22749D13FD2AC4C"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_90CAF56871194E03B64DFF6744533C4D"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -207,7 +219,7 @@
}
"Entry"
{
- "MsmKey" = "8:_B0DC9257247DEB7F691B08D958F84652"
+ "MsmKey" = "8:_ADE6E41741BD7CD14907A44E54816E0D"
"OwnerKey" = "8:_FF450D40DC624BBDB22749D13FD2AC4C"
"MsmSig" = "8:_UNDEFINED"
}
@@ -219,31 +231,19 @@
}
"Entry"
{
- "MsmKey" = "8:_B9DDE50E6EB08A8826A34B6EF1C6B102"
- "OwnerKey" = "8:_F5985C6EBB62F4260014FDA4FEE2E39A"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_BFCB09EF0CA43B0269B207A4DB42D1BF"
"OwnerKey" = "8:_29FE169CCEBDEB4C07246AF3E1D7D1EF"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_C62405BEA01319249D77546FED7701AD"
- "OwnerKey" = "8:_FF450D40DC624BBDB22749D13FD2AC4C"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_CCE4CF0D896E4F54A89EC7254893A356"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_D78DBABCC6A31BDA17F20D829AA8A815"
+ "MsmKey" = "8:_CE47408D9D1AC3C1A1C987DBD7CA7F43"
"OwnerKey" = "8:_FF450D40DC624BBDB22749D13FD2AC4C"
"MsmSig" = "8:_UNDEFINED"
}
@@ -267,12 +267,6 @@
}
"Entry"
{
- "MsmKey" = "8:_E62468F59956B6E9375FA93FDEE8503B"
- "OwnerKey" = "8:_B9DDE50E6EB08A8826A34B6EF1C6B102"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_E904F31D33784D7CA7A4C94E05D10A6D"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -291,18 +285,6 @@
}
"Entry"
{
- "MsmKey" = "8:_F5985C6EBB62F4260014FDA4FEE2E39A"
- "OwnerKey" = "8:_FF450D40DC624BBDB22749D13FD2AC4C"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_F785EF53519B89A5111BC4F5E4FFF0FB"
- "OwnerKey" = "8:_FF450D40DC624BBDB22749D13FD2AC4C"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_F7DF6157CD83D46091E6404B3E2CE830"
"OwnerKey" = "8:_29FE169CCEBDEB4C07246AF3E1D7D1EF"
"MsmSig" = "8:_UNDEFINED"
@@ -316,7 +298,31 @@
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_F785EF53519B89A5111BC4F5E4FFF0FB"
+ "OwnerKey" = "8:_6BB2F49C9D04D801E8DE021D6CE20C22"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_UNDEFINED"
+ "OwnerKey" = "8:_8BDE3E37C576268C85BFD64B9B0E7E24"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_UNDEFINED"
+ "OwnerKey" = "8:_8EC9C4E69441F73892A4C676310B7ABE"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_UNDEFINED"
+ "OwnerKey" = "8:_ADE6E41741BD7CD14907A44E54816E0D"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_UNDEFINED"
+ "OwnerKey" = "8:_CE47408D9D1AC3C1A1C987DBD7CA7F43"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@@ -391,42 +397,6 @@
"OwnerKey" = "8:_E5FD918B4BE4C70000A151506717226F"
"MsmSig" = "8:_UNDEFINED"
}
- "Entry"
- {
- "MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_70186860D51B4F1360607F1CE8BF7844"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_F5985C6EBB62F4260014FDA4FEE2E39A"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_B9DDE50E6EB08A8826A34B6EF1C6B102"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_C62405BEA01319249D77546FED7701AD"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_B0DC9257247DEB7F691B08D958F84652"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_D78DBABCC6A31BDA17F20D829AA8A815"
- "MsmSig" = "8:_UNDEFINED"
- }
}
"Configurations"
{
@@ -1028,14 +998,14 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_70186860D51B4F1360607F1CE8BF7844"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6BB2F49C9D04D801E8DE021D6CE20C22"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:Utility, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86"
"ScatterAssemblies"
{
- "_70186860D51B4F1360607F1CE8BF7844"
+ "_6BB2F49C9D04D801E8DE021D6CE20C22"
{
"Name" = "8:Utility.DLL"
"Attributes" = "3:512"
@@ -1150,6 +1120,68 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8BDE3E37C576268C85BFD64B9B0E7E24"
+ {
+ "AssemblyRegister" = "3:1"
+ "AssemblyIsInGAC" = "11:FALSE"
+ "AssemblyAsmDisplayName" = "8:CEnergy, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL"
+ "ScatterAssemblies"
+ {
+ "_8BDE3E37C576268C85BFD64B9B0E7E24"
+ {
+ "Name" = "8:CEnergy.DLL"
+ "Attributes" = "3:512"
+ }
+ }
+ "SourcePath" = "8:CEnergy.DLL"
+ "TargetName" = "8:"
+ "Tag" = "8:"
+ "Folder" = "8:_6C7F44AB37914E6C92F78768ABD1BC22"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:TRUE"
+ "IsolateTo" = "8:"
+ }
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8EC9C4E69441F73892A4C676310B7ABE"
+ {
+ "AssemblyRegister" = "3:1"
+ "AssemblyIsInGAC" = "11:FALSE"
+ "AssemblyAsmDisplayName" = "8:ArinNet, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
+ "ScatterAssemblies"
+ {
+ "_8EC9C4E69441F73892A4C676310B7ABE"
+ {
+ "Name" = "8:ArinNet.DLL"
+ "Attributes" = "3:512"
+ }
+ }
+ "SourcePath" = "8:ArinNet.DLL"
+ "TargetName" = "8:"
+ "Tag" = "8:"
+ "Folder" = "8:_6C7F44AB37914E6C92F78768ABD1BC22"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:TRUE"
+ "IsolateTo" = "8:"
+ }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_90CAF56871194E03B64DFF6744533C4D"
{
"SourcePath" = "8:C:\\ECO2\\debug_2016\\Data\\weather_group.dat"
@@ -1210,20 +1242,20 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B0DC9257247DEB7F691B08D958F84652"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_ADE6E41741BD7CD14907A44E54816E0D"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:ArinNet, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
+ "AssemblyAsmDisplayName" = "8:ArinLogin, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_B0DC9257247DEB7F691B08D958F84652"
+ "_ADE6E41741BD7CD14907A44E54816E0D"
{
- "Name" = "8:ArinNet.DLL"
+ "Name" = "8:ArinLogin.DLL"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:ArinNet.DLL"
+ "SourcePath" = "8:ArinLogin.DLL"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_6C7F44AB37914E6C92F78768ABD1BC22"
@@ -1261,37 +1293,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B9DDE50E6EB08A8826A34B6EF1C6B102"
- {
- "AssemblyRegister" = "3:1"
- "AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:Interop.VBIDE, Version=5.3.0.0, Culture=neutral, processorArchitecture=MSIL"
- "ScatterAssemblies"
- {
- "_B9DDE50E6EB08A8826A34B6EF1C6B102"
- {
- "Name" = "8:Interop.VBIDE.DLL"
- "Attributes" = "3:512"
- }
- }
- "SourcePath" = "8:Interop.VBIDE.DLL"
- "TargetName" = "8:"
- "Tag" = "8:"
- "Folder" = "8:_6C7F44AB37914E6C92F78768ABD1BC22"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:TRUE"
- "IsolateTo" = "8:"
- }
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_BFCB09EF0CA43B0269B207A4DB42D1BF"
{
"AssemblyRegister" = "3:1"
@@ -1323,37 +1324,6 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C62405BEA01319249D77546FED7701AD"
- {
- "AssemblyRegister" = "3:1"
- "AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:CEnergy, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL"
- "ScatterAssemblies"
- {
- "_C62405BEA01319249D77546FED7701AD"
- {
- "Name" = "8:CEnergy.DLL"
- "Attributes" = "3:512"
- }
- }
- "SourcePath" = "8:CEnergy.DLL"
- "TargetName" = "8:"
- "Tag" = "8:"
- "Folder" = "8:_6C7F44AB37914E6C92F78768ABD1BC22"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:TRUE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CCE4CF0D896E4F54A89EC7254893A356"
{
"SourcePath" = "8:C:\\ECO2\\debug_2016\\Data\\weather_cha.dat"
@@ -1374,20 +1344,20 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D78DBABCC6A31BDA17F20D829AA8A815"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_CE47408D9D1AC3C1A1C987DBD7CA7F43"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:ArinLogin, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
+ "AssemblyAsmDisplayName" = "8:ArinLog.Net4, Version=15.1.30.1410, Culture=neutral, processorArchitecture=x86"
"ScatterAssemblies"
{
- "_D78DBABCC6A31BDA17F20D829AA8A815"
+ "_CE47408D9D1AC3C1A1C987DBD7CA7F43"
{
- "Name" = "8:ArinLogin.DLL"
+ "Name" = "8:ArinLog.Net4.DLL"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:ArinLogin.DLL"
+ "SourcePath" = "8:ArinLog.Net4.DLL"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_6C7F44AB37914E6C92F78768ABD1BC22"
@@ -1456,26 +1426,6 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E62468F59956B6E9375FA93FDEE8503B"
- {
- "SourcePath" = "8:VBE6EXT.OLB"
- "TargetName" = "8:VBE6EXT.OLB"
- "Tag" = "8:"
- "Folder" = "8:_6C7F44AB37914E6C92F78768ABD1BC22"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:TRUE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E904F31D33784D7CA7A4C94E05D10A6D"
{
"SourcePath" = "8:C:\\ECO2\\debug_2016\\Data\\weather_ch.xml"
@@ -1547,68 +1497,6 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F5985C6EBB62F4260014FDA4FEE2E39A"
- {
- "AssemblyRegister" = "3:1"
- "AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:Interop.Excel, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL"
- "ScatterAssemblies"
- {
- "_F5985C6EBB62F4260014FDA4FEE2E39A"
- {
- "Name" = "8:Interop.Excel.DLL"
- "Attributes" = "3:512"
- }
- }
- "SourcePath" = "8:Interop.Excel.DLL"
- "TargetName" = "8:"
- "Tag" = "8:"
- "Folder" = "8:_6C7F44AB37914E6C92F78768ABD1BC22"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:TRUE"
- "IsolateTo" = "8:"
- }
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F785EF53519B89A5111BC4F5E4FFF0FB"
- {
- "AssemblyRegister" = "3:1"
- "AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:ArinLog.Net4, Version=15.1.30.1410, Culture=neutral, processorArchitecture=x86"
- "ScatterAssemblies"
- {
- "_F785EF53519B89A5111BC4F5E4FFF0FB"
- {
- "Name" = "8:ArinLog.Net4.DLL"
- "Attributes" = "3:512"
- }
- }
- "SourcePath" = "8:ArinLog.Net4.DLL"
- "TargetName" = "8:"
- "Tag" = "8:"
- "Folder" = "8:_6C7F44AB37914E6C92F78768ABD1BC22"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:TRUE"
- "IsolateTo" = "8:"
- }
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F7DF6157CD83D46091E6404B3E2CE830"
{
"AssemblyRegister" = "3:1"
@@ -1750,7 +1638,7 @@
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:ECO2_2020V2"
"ProductCode" = "8:{1C694875-DBD9-43E7-A9DC-0EEE6342981E}"
- "PackageCode" = "8:{E54660F3-0019-4302-A137-4D693B32715E}"
+ "PackageCode" = "8:{59F018D9-1B18-4C1A-A262-8B0E838F4583}"
"UpgradeCode" = "8:{650A91F6-635B-4C09-8A64-C123C180E488}"
"AspNetVersion" = "8:2.0.50727.0"
"RestartWWWService" = "11:FALSE"