lith 4 gadi atpakaļ
vecāks
revīzija
2530f61e4d
23 mainītis faili ar 127 papildinājumiem un 49 dzēšanām
  1. 0 11
      dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/Client/README.md
  2. 13 0
      dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/CmClient/AutoPublish.bat
  3. 0 0
      dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/CmClient/CmClient.csproj
  4. 0 0
      dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/CmClient/ProgramQps.cs
  5. 0 0
      dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/CmClient/Properties/PublishProfiles/FolderProfile.pubxml
  6. 33 0
      dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/CmClient/README.md
  7. 7 0
      dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/CmClient/StartClient.bat
  8. 0 0
      dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/CmClient/StartConsole.bat
  9. 7 0
      dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/CmClient/StartServer.bat
  10. 0 0
      dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/CmClient/Statistics/StatisticsQpsInfo.cs
  11. 2 2
      dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/CmClient/appsettings.json
  12. 0 0
      dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/CmServer/CmServer.csproj
  13. 0 0
      dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/CmServer/Program.cs
  14. 0 0
      dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/CmServer/Properties/PublishProfiles/FolderProfile.pubxml
  15. 0 0
      dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/CmServer/StartConsole.bat
  16. 0 0
      dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/CmServer/Statistics/StatisticsQpsInfo.cs
  17. 2 2
      dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/CmServer/appsettings.json
  18. 16 7
      dotnet/Library/Sers/Sers.CL/Test/MessageDelivery/DeliveryClient/Program.cs
  19. 20 0
      dotnet/Library/Sers/Sers.CL/Test/MessageDelivery/DeliveryClient/README.md
  20. 1 1
      dotnet/Library/Sers/Sers.CL/Test/MessageDelivery/DeliveryClient/StartConsole.bat
  21. 3 3
      dotnet/Library/Sers/Sers.CL/Test/MessageDelivery/DeliveryServer/Program.cs
  22. 1 1
      dotnet/Library/Vit/Vit.Core/Vit.Core/Util/Pipelines/ByteData.cs
  23. 22 22
      dotnet/Sers.sln

+ 0 - 11
dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/Client/README.md

@@ -1,11 +0,0 @@
-
-#--------------------------------
-
-dotnet CLClient.dll > console.log 2>&1 &
-
-启动10个进程的qps为 10万
-
-启动1个进程的qps是4万
-
-
- 

+ 13 - 0
dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/CmClient/AutoPublish.bat

@@ -0,0 +1,13 @@
+echo 'publish Gateway' 
+dotnet build --configuration Release
+dotnet publish --configuration Release --output bin\CmClient 
+ 
+
+
+ 
+cd /d ..\CmServer
+dotnet build --configuration Release
+dotnet publish --configuration Release --output bin\CmServer
+ 
+
+

+ 0 - 0
dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/Client/CLClient.csproj → dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/CmClient/CmClient.csproj


+ 0 - 0
dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/Client/ProgramQps.cs → dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/CmClient/ProgramQps.cs


+ 0 - 0
dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/Client/Properties/PublishProfiles/FolderProfile.pubxml → dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/CmClient/Properties/PublishProfiles/FolderProfile.pubxml


+ 33 - 0
dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/CmClient/README.md

@@ -0,0 +1,33 @@
+
+
+1 server 
+20 client 1000thead   qps 160万
+
+cd /root/app
+dotnet DeliveryServer/DeliveryServer.dll
+
+
+
+
+cd /root/app
+dotnet CmServer/CmServer.dll
+
+
+
+dotnet CmClient/CmClient.dll > console.log 2>&1 &
+
+
+#杀死mc用户端 
+kill -s 9 `pgrep -f 'CmClient.dll'`
+
+#--------------------------------
+#--------------------------------
+
+dotnet CLClient.dll > console.log 2>&1 &
+
+启动10个进程的qps为 10万
+
+启动1个进程的qps是4万
+
+
+ 

+ 7 - 0
dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/CmClient/StartClient.bat

@@ -0,0 +1,7 @@
+
+cd bin\DeliveryClient 
+dotnet DeliveryClient.dll
+ 
+
+
+ 

+ 0 - 0
dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/Client/StartConsole.bat → dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/CmClient/StartConsole.bat


+ 7 - 0
dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/CmClient/StartServer.bat

@@ -0,0 +1,7 @@
+
+cd ..\DeliveryServer\bin\DeliveryServer 
+dotnet DeliveryServer.dll
+ 
+
+
+ 

+ 0 - 0
dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/Client/Statistics/StatisticsQpsInfo.cs → dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/CmClient/Statistics/StatisticsQpsInfo.cs


+ 2 - 2
dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/Client/appsettings.json → dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/CmClient/appsettings.json

@@ -30,7 +30,7 @@
           /* 在此Assembly中查找Builder */
           "assemblyFile": "Sers.CL.Ipc.NamedPipe.dll",
           /* the class of Builder in assemblyFile  */
-          "className": "Sers.CL.Ipc.NamedPipe.OrganizeClientBuilder",
+          //"className": "Sers.CL.Ipc.NamedPipe.OrganizeClientBuilder",
 
 
           /* (x.2) config */
@@ -46,7 +46,7 @@
           /* 在此Assembly中查找builder */
           "assemblyFile": "Sers.CL.Socket.Iocp.dll",
           /* the class of builder in assemblyFile  */
-          // "className": "Sers.CL.Socket.Iocp.OrganizeClientBuilder",
+           "className": "Sers.CL.Socket.Iocp.OrganizeClientBuilder",
 
 
           /* (x.2) config */

+ 0 - 0
dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/Server/CLServer.csproj → dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/CmServer/CmServer.csproj


+ 0 - 0
dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/Server/Program.cs → dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/CmServer/Program.cs


+ 0 - 0
dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/Server/Properties/PublishProfiles/FolderProfile.pubxml → dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/CmServer/Properties/PublishProfiles/FolderProfile.pubxml


+ 0 - 0
dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/Server/StartConsole.bat → dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/CmServer/StartConsole.bat


+ 0 - 0
dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/Server/Statistics/StatisticsQpsInfo.cs → dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/CmServer/Statistics/StatisticsQpsInfo.cs


+ 2 - 2
dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/Server/appsettings.json → dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/CmServer/appsettings.json

@@ -30,7 +30,7 @@
           /* 在此Assembly中查找Builder */
           "assemblyFile": "Sers.CL.Ipc.NamedPipe.dll",
           /* the class of Builder in assemblyFile  */
-          "className": "Sers.CL.Ipc.NamedPipe.OrganizeServerBuilder",
+          //"className": "Sers.CL.Ipc.NamedPipe.OrganizeServerBuilder",
 
 
           /* (x.2) config */
@@ -43,7 +43,7 @@
           /* 在此Assembly中查找builder */
           "assemblyFile": "Sers.CL.Socket.Iocp.dll",
           /* the class of Builder in assemblyFile  */
-          //"className": "Sers.CL.Socket.Iocp.OrganizeServerBuilder",
+          "className": "Sers.CL.Socket.Iocp.OrganizeServerBuilder",
 
 
           /* (x.2) config */

+ 16 - 7
dotnet/Library/Sers/Sers.CL/Test/MessageDelivery/DeliveryClient/Program.cs

@@ -53,6 +53,15 @@ namespace DeliveryTest
                 qpsInfo.Start("Msg");
 
                 StartClient();
+                //StartClient();
+                //StartClient();
+                //StartClient();
+                //StartClient();
+                //StartClient();
+                //StartClient();
+                //StartClient();
+                //StartClient();
+                //StartClient();
 
 
                 while (true)
@@ -70,24 +79,24 @@ namespace DeliveryTest
         static string host = "127.0.0.1";
         static int port = 4501;
 
-        static int thread = 200;
+        static int thread = 1000;
         static int msgLen = 1;
 
 
 
- 
+
 
         static void StartClient()
         {
-            //var client = new Sers.CL.Socket.Iocp.DeliveryClient();
-            //client.host = host;
-            //client.port = port;
+            var client = new Sers.CL.Socket.Iocp.DeliveryClient();
+            client.host = host;
+            client.port = port;
 
             //var client = new Sers.CL.WebSocket.DeliveryClient();
             //var client = new Sers.CL.ClrZmq.ThreadWait.DeliveryClient();
             //var client = new Sers.CL.Ipc.SharedMemory.DeliveryClient();
             //var client = new Sers.CL.Zmq.FullDuplex.DeliveryClient();
-            var client = new Sers.CL.Ipc.NamedPipe.DeliveryClient();
+            //var client = new Sers.CL.Ipc.NamedPipe.DeliveryClient();
 
             client.Conn_OnGetFrame = (conn, data) =>
            {
@@ -102,7 +111,7 @@ namespace DeliveryTest
                    //SpinWait sw = new SpinWait();
                    //sw.SpinOnce();
 
-                    var byteData = new Vit.Core.Util.Pipelines.ByteData(data);
+                   var byteData = new Vit.Core.Util.Pipelines.ByteData(data);
                    conn.SendFrameAsync(byteData);
                });
 

+ 20 - 0
dotnet/Library/Sers/Sers.CL/Test/MessageDelivery/DeliveryClient/README.md

@@ -1,5 +1,25 @@
 
 
+1 server 
+20 client 1000thead   qps 160Íò
+
+cd /root/app
+dotnet DeliveryServer/DeliveryServer.dll
+
+
+
+
+cd /root/app
+dotnet DeliveryClient/DeliveryClient.dll 127.0.0.1 4501 100 1
+
+
+
+dotnet DeliveryClient/DeliveryClient.dll 127.0.0.1 4501 100 1 > console.log 2>&1 &
+
+
+#ɱËÀmcÓû§¶Ë 
+kill -s 9 `pgrep -f 'DeliveryClient.dll'`
+
 #--------------------------------
  
 dotnet DeliveryClient.dll 192.168.10.11 4501 200 1

+ 1 - 1
dotnet/Library/Sers/Sers.CL/Test/MessageDelivery/DeliveryClient/StartConsole.bat

@@ -4,7 +4,7 @@
 
 :: dotnet DeliveryClient/DeliveryClient.dll 127.0.0.1 4501 200 1024
 
-:: dotnet DeliveryClient.dll 127.0.0.1 4501 200 1
+:: dotnet DeliveryClient.dll 127.0.0.1 4501 1000 1
 dotnet DeliveryClient.dll
 pause
 

+ 3 - 3
dotnet/Library/Sers/Sers.CL/Test/MessageDelivery/DeliveryServer/Program.cs

@@ -44,14 +44,14 @@ namespace DeliveryTest
 
         static void StartServer()
         {
-            //var server = new Sers.CL.Socket.Iocp.DeliveryServer();
-            //server.port = port;
+            var server = new Sers.CL.Socket.Iocp.DeliveryServer();
+            server.port = port;
 
             //var server = new Sers.CL.WebSocket.DeliveryServer();
             //var server = new Sers.CL.ClrZmq.ThreadWait.DeliveryServer();
             //var server = new Sers.CL.Ipc.SharedMemory.DeliveryServer();
             //var server = new Sers.CL.Zmq.FullDuplex.DeliveryServer();
-            var server = new Sers.CL.Ipc.NamedPipe.DeliveryServer();
+            //var server = new Sers.CL.Ipc.NamedPipe.DeliveryServer();
 
             server.Conn_OnConnected = (conn) =>
             {

+ 1 - 1
dotnet/Library/Vit/Vit.Core/Vit.Core/Util/Pipelines/ByteData.cs

@@ -60,7 +60,7 @@ namespace Vit.Core.Util.Pipelines
         //}
 
 
-        #region implicit
+        #region //implicit
         //[MethodImpl(MethodImplOptions.AggressiveInlining)]
         //public static implicit operator ByteData(List<ArraySegment<byte>> byteData)
         //{

+ 22 - 22
dotnet/Sers.sln

@@ -87,10 +87,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{077D1A80-2
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CommunicationManage", "CommunicationManage", "{0EF01864-BC8C-4C94-8F83-5BB6CC4FECB8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CLClient", "Library\Sers\Sers.CL\Test\CommunicationManage\Client\CLClient.csproj", "{0A1364C6-DAEA-431A-A4D9-BC26AFD085B5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CLServer", "Library\Sers\Sers.CL\Test\CommunicationManage\Server\CLServer.csproj", "{D99AFDEC-A949-4A08-80C8-F62D778D7207}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebSocket", "WebSocket", "{CDB42445-C074-4DF4-98C3-FD1978C3E372}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sers.CL.WebSocket", "Library\Sers\Sers.CL\WebSocket\Sers.CL.WebSocket\Sers.CL.WebSocket.csproj", "{E8965AC0-EB68-4027-AC4A-4FD1FBCB25AC}"
@@ -169,6 +165,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeliveryServer", "Library\S
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sers.Core.Util.Consumer.Test", "Library\Sers\Sers.Core\Test\Sers.Core.Util.Consumer.Test\Sers.Core.Util.Consumer.Test.csproj", "{B45BBA33-E315-409E-B44E-97FA40B33BFB}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CmClient", "Library\Sers\Sers.CL\Test\CommunicationManage\CmClient\CmClient.csproj", "{1B6172BF-405A-4752-B0A3-040F2E951F2A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CmServer", "Library\Sers\Sers.CL\Test\CommunicationManage\CmServer\CmServer.csproj", "{EBB905C2-7D58-4A4A-A7F7-2171DB1724AB}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -305,22 +305,6 @@ Global
 		{A6BFCFBE-54E5-4D3C-8668-932ACAD68304}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A6BFCFBE-54E5-4D3C-8668-932ACAD68304}.Release|x86.ActiveCfg = Release|Any CPU
 		{A6BFCFBE-54E5-4D3C-8668-932ACAD68304}.Release|x86.Build.0 = Release|Any CPU
-		{0A1364C6-DAEA-431A-A4D9-BC26AFD085B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0A1364C6-DAEA-431A-A4D9-BC26AFD085B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0A1364C6-DAEA-431A-A4D9-BC26AFD085B5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0A1364C6-DAEA-431A-A4D9-BC26AFD085B5}.Debug|x86.Build.0 = Debug|Any CPU
-		{0A1364C6-DAEA-431A-A4D9-BC26AFD085B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0A1364C6-DAEA-431A-A4D9-BC26AFD085B5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0A1364C6-DAEA-431A-A4D9-BC26AFD085B5}.Release|x86.ActiveCfg = Release|Any CPU
-		{0A1364C6-DAEA-431A-A4D9-BC26AFD085B5}.Release|x86.Build.0 = Release|Any CPU
-		{D99AFDEC-A949-4A08-80C8-F62D778D7207}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D99AFDEC-A949-4A08-80C8-F62D778D7207}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D99AFDEC-A949-4A08-80C8-F62D778D7207}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D99AFDEC-A949-4A08-80C8-F62D778D7207}.Debug|x86.Build.0 = Debug|Any CPU
-		{D99AFDEC-A949-4A08-80C8-F62D778D7207}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D99AFDEC-A949-4A08-80C8-F62D778D7207}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D99AFDEC-A949-4A08-80C8-F62D778D7207}.Release|x86.ActiveCfg = Release|Any CPU
-		{D99AFDEC-A949-4A08-80C8-F62D778D7207}.Release|x86.Build.0 = Release|Any CPU
 		{E8965AC0-EB68-4027-AC4A-4FD1FBCB25AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E8965AC0-EB68-4027-AC4A-4FD1FBCB25AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E8965AC0-EB68-4027-AC4A-4FD1FBCB25AC}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -545,6 +529,22 @@ Global
 		{B45BBA33-E315-409E-B44E-97FA40B33BFB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B45BBA33-E315-409E-B44E-97FA40B33BFB}.Release|x86.ActiveCfg = Release|Any CPU
 		{B45BBA33-E315-409E-B44E-97FA40B33BFB}.Release|x86.Build.0 = Release|Any CPU
+		{1B6172BF-405A-4752-B0A3-040F2E951F2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B6172BF-405A-4752-B0A3-040F2E951F2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B6172BF-405A-4752-B0A3-040F2E951F2A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1B6172BF-405A-4752-B0A3-040F2E951F2A}.Debug|x86.Build.0 = Debug|Any CPU
+		{1B6172BF-405A-4752-B0A3-040F2E951F2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1B6172BF-405A-4752-B0A3-040F2E951F2A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1B6172BF-405A-4752-B0A3-040F2E951F2A}.Release|x86.ActiveCfg = Release|Any CPU
+		{1B6172BF-405A-4752-B0A3-040F2E951F2A}.Release|x86.Build.0 = Release|Any CPU
+		{EBB905C2-7D58-4A4A-A7F7-2171DB1724AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EBB905C2-7D58-4A4A-A7F7-2171DB1724AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EBB905C2-7D58-4A4A-A7F7-2171DB1724AB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EBB905C2-7D58-4A4A-A7F7-2171DB1724AB}.Debug|x86.Build.0 = Debug|Any CPU
+		{EBB905C2-7D58-4A4A-A7F7-2171DB1724AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EBB905C2-7D58-4A4A-A7F7-2171DB1724AB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EBB905C2-7D58-4A4A-A7F7-2171DB1724AB}.Release|x86.ActiveCfg = Release|Any CPU
+		{EBB905C2-7D58-4A4A-A7F7-2171DB1724AB}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -590,8 +590,6 @@ Global
 		{A6BFCFBE-54E5-4D3C-8668-932ACAD68304} = {ECEEABBB-DEA2-4CD4-99EA-3E048DB23219}
 		{077D1A80-2842-4191-ABAA-BFC30661577D} = {43888F55-C8DF-43CA-94D5-8CED6AE66D67}
 		{0EF01864-BC8C-4C94-8F83-5BB6CC4FECB8} = {077D1A80-2842-4191-ABAA-BFC30661577D}
-		{0A1364C6-DAEA-431A-A4D9-BC26AFD085B5} = {0EF01864-BC8C-4C94-8F83-5BB6CC4FECB8}
-		{D99AFDEC-A949-4A08-80C8-F62D778D7207} = {0EF01864-BC8C-4C94-8F83-5BB6CC4FECB8}
 		{CDB42445-C074-4DF4-98C3-FD1978C3E372} = {43888F55-C8DF-43CA-94D5-8CED6AE66D67}
 		{E8965AC0-EB68-4027-AC4A-4FD1FBCB25AC} = {CDB42445-C074-4DF4-98C3-FD1978C3E372}
 		{4E874DC3-754A-4FE2-92B5-98ADFF74B369} = {077D1A80-2842-4191-ABAA-BFC30661577D}
@@ -629,6 +627,8 @@ Global
 		{72525D02-A366-4470-8BFB-797F26C3A6A7} = {4E874DC3-754A-4FE2-92B5-98ADFF74B369}
 		{67733A68-0505-4977-BC52-8200D536005B} = {4E874DC3-754A-4FE2-92B5-98ADFF74B369}
 		{B45BBA33-E315-409E-B44E-97FA40B33BFB} = {37633A5F-54B5-4179-8BCD-B7B422B4857C}
+		{1B6172BF-405A-4752-B0A3-040F2E951F2A} = {0EF01864-BC8C-4C94-8F83-5BB6CC4FECB8}
+		{EBB905C2-7D58-4A4A-A7F7-2171DB1724AB} = {0EF01864-BC8C-4C94-8F83-5BB6CC4FECB8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C7DA16E3-9949-49FA-B0B4-F830636DE60F}