zhongming
/
Shengpo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
圣珀
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
12 Commits
1 Branch
0 Tags
2.8 MiB
Tree: a9bc6e380c
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'a9bc6e380c'
${ noResults }
Shengpo/ICSSoft.WeiC.WebAPI.sln

250 lines
20 KiB
Raw Normal View History

1
2 years ago
​
接口修改
2 years ago
1
2 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
圣珀云系统-U9对接接口修改
2 years ago
​
新增
2 years ago
接口修改
2 years ago
新增
2 years ago
杂收杂发 完工报告接口修改
2 years ago
​
​
​
​
新增
2 years ago
接口修改
2 years ago
1
2 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
圣珀云系统-U9对接接口修改
2 years ago
​
​
​
新增
2 years ago
接口修改
2 years ago
​
​
​
新增
2 years ago
杂收杂发 完工报告接口修改
2 years ago
​
​
​
​
​
​
​
​
​
​
​
新增
2 years ago
1
2 years ago
​
​
​
​
​
​
​
  1. 
  2. Microsoft Visual Studio Solution File, Format Version 12.00
  3. # Visual Studio 2012
  4. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSSoft.WeiC.WebAPI", "ICSSoft.U8.WebAPI\ICSSoft.WeiC.WebAPI.csproj", "{1650F7A3-4E4B-4D49-909B-511F86CDECB6}"
  5. EndProject
  6. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSSoft.Entity", "ICSSoft.Entity\ICSSoft.Entity.csproj", "{7190B05C-BDA8-4472-BE6C-51E4A4CBD408}"
  7. EndProject
  8. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICS.WCF.Base", "ICS.WCF.Base\ICS.WCF.Base.csproj", "{F1C63329-BC46-4FB5-B0EB-902CEFFCAD9C}"
  9. EndProject
  10. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICS.CreateU9Customer", "ICS.CreateU9Customer\ICS.CreateU9Customer.csproj", "{4B635092-FB23-454F-B311-997C1AB3202C}"
  11. EndProject
  12. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICS.CreateSoSrvSub", "ICS.CreateSoSrvSub\ICS.CreateSoSrvSub.csproj", "{BCDF54D1-C5E3-4946-A972-8E80048E25A2}"
  13. EndProject
  14. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICS.ModifyU9Customer", "ICS.ModifyU9Customer\ICS.ModifyU9Customer.csproj", "{C6BD0CDC-E3E9-4702-A130-FC1DC6190D14}"
  15. EndProject
  16. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICS.CreateSOReturnRCV", "ICS.CreateSOReturnRCV\ICS.CreateSOReturnRCV.csproj", "{ABC3B465-CA0A-4E93-B410-3BD74B083923}"
  17. EndProject
  18. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICS.CreateRMASV.svc", "ICS.CreateRMASV.svc\ICS.CreateRMASV.svc.csproj", "{0111DC06-F43E-49AC-A7C6-B672D880F163}"
  19. EndProject
  20. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICS.CreateWCRCV", "ICS.CreateWCRCV\ICS.CreateWCRCV.csproj", "{296559CE-A018-4B61-A6DE-3B1A1D44EE8A}"
  21. EndProject
  22. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UFIDA.ISV.BFRCVDelete", "UFIDA.ISV.BFRCVDelete\UFIDA.ISV.BFRCVDelete.csproj", "{AE5237CF-0926-4340-B8B0-67DBDC73A8FD}"
  23. EndProject
  24. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UFIDA.ISV.BFRCVApprove", "UFIDA.ISV.BFRCVApprove\UFIDA.ISV.BFRCVApprove.csproj", "{3F56054A-143D-4EBB-B88C-FF042ECB80FB}"
  25. EndProject
  26. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICS.CreateLotMaster", "UFIDA.ISV.CreateLotMaster\ICS.CreateLotMaster.csproj", "{B9E5D785-3D91-4B18-A5BD-AC962BE86590}"
  27. EndProject
  28. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICS.CreateBFStandardShip", "ICS.CreateBFStandardShip\ICS.CreateBFStandardShip.csproj", "{1861205E-DD52-43D8-B147-4D3DBCE63AE5}"
  29. EndProject
  30. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICS.CustCreateBFRTNSrvSub", "ICS.CustCreateBFRTNSrvSub\ICS.CustCreateBFRTNSrvSub.csproj", "{C5A54A86-09BE-4A68-9E4E-D724B082AE26}"
  31. EndProject
  32. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICS.CreatBFPMRecede", "ICS.CreatBFPMRecede\ICS.CreatBFPMRecede.csproj", "{B45DB033-ECF2-474A-9212-0C31805F2BF9}"
  33. EndProject
  34. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICS.BFPMRecedeApprove", "ICS.BFTransferInApprove\ICS.BFPMRecedeApprove.csproj", "{E8E68997-ADBF-41AD-BBF5-6A5D26857F02}"
  35. EndProject
  36. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICS.BFPMRecedeDelete", "ICS.BFPMRecedeDelete\ICS.BFPMRecedeDelete.csproj", "{DD99D67D-AF4B-499F-9DED-A5584263DB75}"
  37. EndProject
  38. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICS.CreateIssue", "ICS.CreateIssue\ICS.CreateIssue.csproj", "{3F241467-1208-4F8B-8857-AC7161866303}"
  39. EndProject
  40. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICS.BFIssueApprove", "ICS.BFIssueApprove\ICS.BFIssueApprove.csproj", "{1EBD0034-2E8B-4911-AB51-36E48038AAF9}"
  41. EndProject
  42. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICS.BFIssueDelete", "ICS.BFIssueDelete\ICS.BFIssueDelete.csproj", "{959A866A-78F9-4CF5-ACCD-526A7B70767A}"
  43. EndProject
  44. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICS.CreateCompRpt", "ICS.CreateCompRpt\ICS.CreateCompRpt.csproj", "{230C986D-098C-418C-A1A7-D4E56E816ADC}"
  45. EndProject
  46. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICS.CreateBFMiscRcv", "ICS.CreateBFMiscRcv\ICS.CreateBFMiscRcv.csproj", "{35F6A291-4757-437B-AD89-3B8EE0806ABA}"
  47. EndProject
  48. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICS.SubmitMisRcv", "ICS.SubmitMisRcv\ICS.SubmitMisRcv.csproj", "{6E2D68D1-121E-4E17-8DD7-D52606562752}"
  49. EndProject
  50. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICS.CreateBFMisShip", "ICS.CreateBFMisShip\ICS.CreateBFMisShip.csproj", "{263BE961-B3CA-4276-A1FC-8CD9186BEE5C}"
  51. EndProject
  52. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UFIDA.U9.CreateSupplier", "UFIDA.U9.CreateSupplier\UFIDA.U9.CreateSupplier.csproj", "{592EE761-A8B4-4C7A-9994-9FC52EDE1609}"
  53. EndProject
  54. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Create_U9_ItemMaster", "Create_U9_ItemMaster\Create_U9_ItemMaster.csproj", "{116F9219-353D-4C79-82AD-6F0B84EB4983}"
  55. EndProject
  56. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UFIDA.ISV.CreatePoSrvSub", "UFIDA.ISV.CreatePoSrvSub\UFIDA.ISV.CreatePoSrvSub.csproj", "{E77B2FFE-2FF1-4274-B695-60376E449390}"
  57. EndProject
  58. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UFIDA.U9.Cust.ModifySOSV", "UFIDA.U9.Cust.ModifySOSV\UFIDA.U9.Cust.ModifySOSV\UFIDA.U9.Cust.ModifySOSV.csproj", "{1157A8F5-98AD-4459-87E0-9A1CED993090}"
  59. EndProject
  60. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICS.CreateTransInDoc", "ICS.CreateTransInDoc\ICS.CreateTransInDoc.csproj", "{D6F811F7-8F40-478F-AE2D-081ADC75C9FD}"
  61. EndProject
  62. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UFIDA.ISV.CreateMO", "UFIDA.ISV.CreateMO\UFIDA.ISV.CreateMO.csproj", "{E792F46B-4B0B-4EC7-A0E1-D8CC5729C014}"
  63. EndProject
  64. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICS.CreateCreateRcvRest", "ICS.CreateCreateRcvRest\ICS.CreateCreateRcvRest.csproj", "{E5476CF1-A6E4-4829-9BA7-C3B415FD3603}"
  65. EndProject
  66. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICS.CreateIssueIN", "ICS.CreateIssueIN\ICS.CreateIssueIN.csproj", "{984F71D9-7718-4D78-9CDF-A46494CA0502}"
  67. EndProject
  68. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICS.CreateOIssueIN", "ICS.CreateOIssueIN\ICS.CreateOIssueIN.csproj", "{13E1FD8D-94BE-4BB5-B2F8-E063ECB1B5F5}"
  69. EndProject
  70. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UFIDA.ISV.CreateAboveIssue", "UFIDA.ISV.CreateINVIssue\UFIDA.ISV.CreateAboveIssue.csproj", "{611244CC-FBDB-4443-919D-FBB6AFCA58C4}"
  71. EndProject
  72. <<<<<<< HEAD
  73. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICS.CreateSMShip", "ICS.CreateSMShip\ICS.CreateSMShip.csproj", "{590D616E-B6C0-47C3-B567-57D742735399}"
  74. =======
  75. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UFIDA.ISV.CommitMiscShip", "UFIDA.ISV.CommitMiscShip\UFIDA.ISV.CommitMiscShip.csproj", "{6CBBE718-11C1-4B3B-87AE-3694397834DD}"
  76. EndProject
  77. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UFIDA.ISV.ApproveMiscRcv", "UFIDA.ISV.ApproveMiscRcv\UFIDA.ISV.ApproveMiscRcv.csproj", "{C6FF5804-4825-4936-8141-CD3AF73C9C81}"
  78. EndProject
  79. Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UFIDA.ISV.ApproveMiscShip", "UFIDA.ISV.ApproveMiscShip\UFIDA.ISV.ApproveMiscShip.csproj", "{AF789A34-5FD3-40B2-AFE1-B6F9FFA842F2}"
  80. >>>>>>> 9e3d5255d00861f671c1e2d106b7f822ef8a8deb
  81. EndProject
  82. Global
  83. GlobalSection(SolutionConfigurationPlatforms) = preSolution
  84. Debug|Any CPU = Debug|Any CPU
  85. Release|Any CPU = Release|Any CPU
  86. EndGlobalSection
  87. GlobalSection(ProjectConfigurationPlatforms) = postSolution
  88. {1650F7A3-4E4B-4D49-909B-511F86CDECB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  89. {1650F7A3-4E4B-4D49-909B-511F86CDECB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
  90. {1650F7A3-4E4B-4D49-909B-511F86CDECB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
  91. {1650F7A3-4E4B-4D49-909B-511F86CDECB6}.Release|Any CPU.Build.0 = Release|Any CPU
  92. {7190B05C-BDA8-4472-BE6C-51E4A4CBD408}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  93. {7190B05C-BDA8-4472-BE6C-51E4A4CBD408}.Debug|Any CPU.Build.0 = Debug|Any CPU
  94. {7190B05C-BDA8-4472-BE6C-51E4A4CBD408}.Release|Any CPU.ActiveCfg = Release|Any CPU
  95. {7190B05C-BDA8-4472-BE6C-51E4A4CBD408}.Release|Any CPU.Build.0 = Release|Any CPU
  96. {F1C63329-BC46-4FB5-B0EB-902CEFFCAD9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  97. {F1C63329-BC46-4FB5-B0EB-902CEFFCAD9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
  98. {F1C63329-BC46-4FB5-B0EB-902CEFFCAD9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
  99. {F1C63329-BC46-4FB5-B0EB-902CEFFCAD9C}.Release|Any CPU.Build.0 = Release|Any CPU
  100. {4B635092-FB23-454F-B311-997C1AB3202C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  101. {4B635092-FB23-454F-B311-997C1AB3202C}.Debug|Any CPU.Build.0 = Debug|Any CPU
  102. {4B635092-FB23-454F-B311-997C1AB3202C}.Release|Any CPU.ActiveCfg = Release|Any CPU
  103. {4B635092-FB23-454F-B311-997C1AB3202C}.Release|Any CPU.Build.0 = Release|Any CPU
  104. {BCDF54D1-C5E3-4946-A972-8E80048E25A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  105. {BCDF54D1-C5E3-4946-A972-8E80048E25A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
  106. {BCDF54D1-C5E3-4946-A972-8E80048E25A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
  107. {BCDF54D1-C5E3-4946-A972-8E80048E25A2}.Release|Any CPU.Build.0 = Release|Any CPU
  108. {C6BD0CDC-E3E9-4702-A130-FC1DC6190D14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  109. {C6BD0CDC-E3E9-4702-A130-FC1DC6190D14}.Debug|Any CPU.Build.0 = Debug|Any CPU
  110. {C6BD0CDC-E3E9-4702-A130-FC1DC6190D14}.Release|Any CPU.ActiveCfg = Release|Any CPU
  111. {C6BD0CDC-E3E9-4702-A130-FC1DC6190D14}.Release|Any CPU.Build.0 = Release|Any CPU
  112. {ABC3B465-CA0A-4E93-B410-3BD74B083923}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  113. {ABC3B465-CA0A-4E93-B410-3BD74B083923}.Debug|Any CPU.Build.0 = Debug|Any CPU
  114. {ABC3B465-CA0A-4E93-B410-3BD74B083923}.Release|Any CPU.ActiveCfg = Release|Any CPU
  115. {ABC3B465-CA0A-4E93-B410-3BD74B083923}.Release|Any CPU.Build.0 = Release|Any CPU
  116. {0111DC06-F43E-49AC-A7C6-B672D880F163}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  117. {0111DC06-F43E-49AC-A7C6-B672D880F163}.Debug|Any CPU.Build.0 = Debug|Any CPU
  118. {0111DC06-F43E-49AC-A7C6-B672D880F163}.Release|Any CPU.ActiveCfg = Release|Any CPU
  119. {0111DC06-F43E-49AC-A7C6-B672D880F163}.Release|Any CPU.Build.0 = Release|Any CPU
  120. {296559CE-A018-4B61-A6DE-3B1A1D44EE8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  121. {296559CE-A018-4B61-A6DE-3B1A1D44EE8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
  122. {296559CE-A018-4B61-A6DE-3B1A1D44EE8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
  123. {296559CE-A018-4B61-A6DE-3B1A1D44EE8A}.Release|Any CPU.Build.0 = Release|Any CPU
  124. {AE5237CF-0926-4340-B8B0-67DBDC73A8FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  125. {AE5237CF-0926-4340-B8B0-67DBDC73A8FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
  126. {AE5237CF-0926-4340-B8B0-67DBDC73A8FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
  127. {AE5237CF-0926-4340-B8B0-67DBDC73A8FD}.Release|Any CPU.Build.0 = Release|Any CPU
  128. {3F56054A-143D-4EBB-B88C-FF042ECB80FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  129. {3F56054A-143D-4EBB-B88C-FF042ECB80FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
  130. {3F56054A-143D-4EBB-B88C-FF042ECB80FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
  131. {3F56054A-143D-4EBB-B88C-FF042ECB80FB}.Release|Any CPU.Build.0 = Release|Any CPU
  132. {B9E5D785-3D91-4B18-A5BD-AC962BE86590}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  133. {B9E5D785-3D91-4B18-A5BD-AC962BE86590}.Debug|Any CPU.Build.0 = Debug|Any CPU
  134. {B9E5D785-3D91-4B18-A5BD-AC962BE86590}.Release|Any CPU.ActiveCfg = Release|Any CPU
  135. {B9E5D785-3D91-4B18-A5BD-AC962BE86590}.Release|Any CPU.Build.0 = Release|Any CPU
  136. {1861205E-DD52-43D8-B147-4D3DBCE63AE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  137. {1861205E-DD52-43D8-B147-4D3DBCE63AE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
  138. {1861205E-DD52-43D8-B147-4D3DBCE63AE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
  139. {1861205E-DD52-43D8-B147-4D3DBCE63AE5}.Release|Any CPU.Build.0 = Release|Any CPU
  140. {C5A54A86-09BE-4A68-9E4E-D724B082AE26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  141. {C5A54A86-09BE-4A68-9E4E-D724B082AE26}.Debug|Any CPU.Build.0 = Debug|Any CPU
  142. {C5A54A86-09BE-4A68-9E4E-D724B082AE26}.Release|Any CPU.ActiveCfg = Release|Any CPU
  143. {C5A54A86-09BE-4A68-9E4E-D724B082AE26}.Release|Any CPU.Build.0 = Release|Any CPU
  144. {B45DB033-ECF2-474A-9212-0C31805F2BF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  145. {B45DB033-ECF2-474A-9212-0C31805F2BF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
  146. {B45DB033-ECF2-474A-9212-0C31805F2BF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
  147. {B45DB033-ECF2-474A-9212-0C31805F2BF9}.Release|Any CPU.Build.0 = Release|Any CPU
  148. {E8E68997-ADBF-41AD-BBF5-6A5D26857F02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  149. {E8E68997-ADBF-41AD-BBF5-6A5D26857F02}.Debug|Any CPU.Build.0 = Debug|Any CPU
  150. {E8E68997-ADBF-41AD-BBF5-6A5D26857F02}.Release|Any CPU.ActiveCfg = Release|Any CPU
  151. {E8E68997-ADBF-41AD-BBF5-6A5D26857F02}.Release|Any CPU.Build.0 = Release|Any CPU
  152. {DD99D67D-AF4B-499F-9DED-A5584263DB75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  153. {DD99D67D-AF4B-499F-9DED-A5584263DB75}.Debug|Any CPU.Build.0 = Debug|Any CPU
  154. {DD99D67D-AF4B-499F-9DED-A5584263DB75}.Release|Any CPU.ActiveCfg = Release|Any CPU
  155. {DD99D67D-AF4B-499F-9DED-A5584263DB75}.Release|Any CPU.Build.0 = Release|Any CPU
  156. {3F241467-1208-4F8B-8857-AC7161866303}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  157. {3F241467-1208-4F8B-8857-AC7161866303}.Debug|Any CPU.Build.0 = Debug|Any CPU
  158. {3F241467-1208-4F8B-8857-AC7161866303}.Release|Any CPU.ActiveCfg = Release|Any CPU
  159. {3F241467-1208-4F8B-8857-AC7161866303}.Release|Any CPU.Build.0 = Release|Any CPU
  160. {1EBD0034-2E8B-4911-AB51-36E48038AAF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  161. {1EBD0034-2E8B-4911-AB51-36E48038AAF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
  162. {1EBD0034-2E8B-4911-AB51-36E48038AAF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
  163. {1EBD0034-2E8B-4911-AB51-36E48038AAF9}.Release|Any CPU.Build.0 = Release|Any CPU
  164. {959A866A-78F9-4CF5-ACCD-526A7B70767A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  165. {959A866A-78F9-4CF5-ACCD-526A7B70767A}.Debug|Any CPU.Build.0 = Debug|Any CPU
  166. {959A866A-78F9-4CF5-ACCD-526A7B70767A}.Release|Any CPU.ActiveCfg = Release|Any CPU
  167. {959A866A-78F9-4CF5-ACCD-526A7B70767A}.Release|Any CPU.Build.0 = Release|Any CPU
  168. {230C986D-098C-418C-A1A7-D4E56E816ADC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  169. {230C986D-098C-418C-A1A7-D4E56E816ADC}.Debug|Any CPU.Build.0 = Debug|Any CPU
  170. {230C986D-098C-418C-A1A7-D4E56E816ADC}.Release|Any CPU.ActiveCfg = Release|Any CPU
  171. {230C986D-098C-418C-A1A7-D4E56E816ADC}.Release|Any CPU.Build.0 = Release|Any CPU
  172. {35F6A291-4757-437B-AD89-3B8EE0806ABA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  173. {35F6A291-4757-437B-AD89-3B8EE0806ABA}.Debug|Any CPU.Build.0 = Debug|Any CPU
  174. {35F6A291-4757-437B-AD89-3B8EE0806ABA}.Release|Any CPU.ActiveCfg = Release|Any CPU
  175. {35F6A291-4757-437B-AD89-3B8EE0806ABA}.Release|Any CPU.Build.0 = Release|Any CPU
  176. {6E2D68D1-121E-4E17-8DD7-D52606562752}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  177. {6E2D68D1-121E-4E17-8DD7-D52606562752}.Debug|Any CPU.Build.0 = Debug|Any CPU
  178. {6E2D68D1-121E-4E17-8DD7-D52606562752}.Release|Any CPU.ActiveCfg = Release|Any CPU
  179. {6E2D68D1-121E-4E17-8DD7-D52606562752}.Release|Any CPU.Build.0 = Release|Any CPU
  180. {263BE961-B3CA-4276-A1FC-8CD9186BEE5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  181. {263BE961-B3CA-4276-A1FC-8CD9186BEE5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
  182. {263BE961-B3CA-4276-A1FC-8CD9186BEE5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
  183. {263BE961-B3CA-4276-A1FC-8CD9186BEE5C}.Release|Any CPU.Build.0 = Release|Any CPU
  184. {592EE761-A8B4-4C7A-9994-9FC52EDE1609}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  185. {592EE761-A8B4-4C7A-9994-9FC52EDE1609}.Debug|Any CPU.Build.0 = Debug|Any CPU
  186. {592EE761-A8B4-4C7A-9994-9FC52EDE1609}.Release|Any CPU.ActiveCfg = Release|Any CPU
  187. {592EE761-A8B4-4C7A-9994-9FC52EDE1609}.Release|Any CPU.Build.0 = Release|Any CPU
  188. {116F9219-353D-4C79-82AD-6F0B84EB4983}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  189. {116F9219-353D-4C79-82AD-6F0B84EB4983}.Debug|Any CPU.Build.0 = Debug|Any CPU
  190. {116F9219-353D-4C79-82AD-6F0B84EB4983}.Release|Any CPU.ActiveCfg = Release|Any CPU
  191. {116F9219-353D-4C79-82AD-6F0B84EB4983}.Release|Any CPU.Build.0 = Release|Any CPU
  192. {E77B2FFE-2FF1-4274-B695-60376E449390}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  193. {E77B2FFE-2FF1-4274-B695-60376E449390}.Debug|Any CPU.Build.0 = Debug|Any CPU
  194. {E77B2FFE-2FF1-4274-B695-60376E449390}.Release|Any CPU.ActiveCfg = Release|Any CPU
  195. {E77B2FFE-2FF1-4274-B695-60376E449390}.Release|Any CPU.Build.0 = Release|Any CPU
  196. {1157A8F5-98AD-4459-87E0-9A1CED993090}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  197. {1157A8F5-98AD-4459-87E0-9A1CED993090}.Debug|Any CPU.Build.0 = Debug|Any CPU
  198. {1157A8F5-98AD-4459-87E0-9A1CED993090}.Release|Any CPU.ActiveCfg = Release|Any CPU
  199. {1157A8F5-98AD-4459-87E0-9A1CED993090}.Release|Any CPU.Build.0 = Release|Any CPU
  200. {D6F811F7-8F40-478F-AE2D-081ADC75C9FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  201. {D6F811F7-8F40-478F-AE2D-081ADC75C9FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
  202. {D6F811F7-8F40-478F-AE2D-081ADC75C9FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
  203. {D6F811F7-8F40-478F-AE2D-081ADC75C9FD}.Release|Any CPU.Build.0 = Release|Any CPU
  204. {E792F46B-4B0B-4EC7-A0E1-D8CC5729C014}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  205. {E792F46B-4B0B-4EC7-A0E1-D8CC5729C014}.Debug|Any CPU.Build.0 = Debug|Any CPU
  206. {E792F46B-4B0B-4EC7-A0E1-D8CC5729C014}.Release|Any CPU.ActiveCfg = Release|Any CPU
  207. {E792F46B-4B0B-4EC7-A0E1-D8CC5729C014}.Release|Any CPU.Build.0 = Release|Any CPU
  208. {E5476CF1-A6E4-4829-9BA7-C3B415FD3603}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  209. {E5476CF1-A6E4-4829-9BA7-C3B415FD3603}.Debug|Any CPU.Build.0 = Debug|Any CPU
  210. {E5476CF1-A6E4-4829-9BA7-C3B415FD3603}.Release|Any CPU.ActiveCfg = Release|Any CPU
  211. {E5476CF1-A6E4-4829-9BA7-C3B415FD3603}.Release|Any CPU.Build.0 = Release|Any CPU
  212. {984F71D9-7718-4D78-9CDF-A46494CA0502}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  213. {984F71D9-7718-4D78-9CDF-A46494CA0502}.Debug|Any CPU.Build.0 = Debug|Any CPU
  214. {984F71D9-7718-4D78-9CDF-A46494CA0502}.Release|Any CPU.ActiveCfg = Release|Any CPU
  215. {984F71D9-7718-4D78-9CDF-A46494CA0502}.Release|Any CPU.Build.0 = Release|Any CPU
  216. {13E1FD8D-94BE-4BB5-B2F8-E063ECB1B5F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  217. {13E1FD8D-94BE-4BB5-B2F8-E063ECB1B5F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
  218. {13E1FD8D-94BE-4BB5-B2F8-E063ECB1B5F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
  219. {13E1FD8D-94BE-4BB5-B2F8-E063ECB1B5F5}.Release|Any CPU.Build.0 = Release|Any CPU
  220. {611244CC-FBDB-4443-919D-FBB6AFCA58C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  221. {611244CC-FBDB-4443-919D-FBB6AFCA58C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
  222. {611244CC-FBDB-4443-919D-FBB6AFCA58C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
  223. {611244CC-FBDB-4443-919D-FBB6AFCA58C4}.Release|Any CPU.Build.0 = Release|Any CPU
  224. <<<<<<< HEAD
  225. {590D616E-B6C0-47C3-B567-57D742735399}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  226. {590D616E-B6C0-47C3-B567-57D742735399}.Debug|Any CPU.Build.0 = Debug|Any CPU
  227. {590D616E-B6C0-47C3-B567-57D742735399}.Release|Any CPU.ActiveCfg = Release|Any CPU
  228. {590D616E-B6C0-47C3-B567-57D742735399}.Release|Any CPU.Build.0 = Release|Any CPU
  229. =======
  230. {6CBBE718-11C1-4B3B-87AE-3694397834DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  231. {6CBBE718-11C1-4B3B-87AE-3694397834DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
  232. {6CBBE718-11C1-4B3B-87AE-3694397834DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
  233. {6CBBE718-11C1-4B3B-87AE-3694397834DD}.Release|Any CPU.Build.0 = Release|Any CPU
  234. {C6FF5804-4825-4936-8141-CD3AF73C9C81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  235. {C6FF5804-4825-4936-8141-CD3AF73C9C81}.Debug|Any CPU.Build.0 = Debug|Any CPU
  236. {C6FF5804-4825-4936-8141-CD3AF73C9C81}.Release|Any CPU.ActiveCfg = Release|Any CPU
  237. {C6FF5804-4825-4936-8141-CD3AF73C9C81}.Release|Any CPU.Build.0 = Release|Any CPU
  238. {AF789A34-5FD3-40B2-AFE1-B6F9FFA842F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  239. {AF789A34-5FD3-40B2-AFE1-B6F9FFA842F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
  240. {AF789A34-5FD3-40B2-AFE1-B6F9FFA842F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
  241. {AF789A34-5FD3-40B2-AFE1-B6F9FFA842F2}.Release|Any CPU.Build.0 = Release|Any CPU
  242. >>>>>>> 9e3d5255d00861f671c1e2d106b7f822ef8a8deb
  243. EndGlobalSection
  244. GlobalSection(SolutionProperties) = preSolution
  245. HideSolutionNode = FALSE
  246. EndGlobalSection
  247. GlobalSection(ExtensibilityGlobals) = postSolution
  248. SolutionGuid = {4C5835AE-E957-4788-940D-C3BCD061D390}
  249. EndGlobalSection
  250. EndGlobal