Fix sdk.sln merge conflict

Author: carlossanlop

sdk.sln

@@ -1,3 +1,4 @@
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.1.31903.286
@@ -529,6 +530,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VS.Redist.Common.Net.Core.S
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VS.Redist.Common.NetCore.Templates", "src\Layout\VS.Redist.Common.NetCore.Templates\VS.Redist.Common.NetCore.Templates.proj", "{6A7E16BE-FF2F-7927-AAF7-366CC0C42AE4}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ApiDiff", "ApiDiff", "{C66B5859-B05E-5DF4-58E9-78CA919DB89A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ApiDiff", "ApiDiff", "{AFA55F45-CFCB-9821-A210-2D3496088416}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.ApiDiff.Tool", "src\Compatibility\ApiDiff\Microsoft.DotNet.ApiDiff.Tool\Microsoft.DotNet.ApiDiff.Tool.csproj", "{3F0093BF-A64D-4EE8-8A2A-22800BB25CFF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.ApiDiff.Tests", "test\Microsoft.DotNet.ApiDiff.Tests\Microsoft.DotNet.ApiDiff.Tests.csproj", "{A57B724D-D12B-483E-82F2-2183DEA2DFA7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.ApiDiff", "src\Compatibility\ApiDiff\Microsoft.DotNet.ApiDiff\Microsoft.DotNet.ApiDiff.csproj", "{4F23A9C8-945A-A4F4-51E9-FCA215943C0D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -1439,18 +1450,6 @@ Global
 		{F08F3E99-5294-4CE7-B492-38FE588D8428}.Release|x64.Build.0 = Release|Any CPU
 		{F08F3E99-5294-4CE7-B492-38FE588D8428}.Release|x86.ActiveCfg = Release|Any CPU
 		{F08F3E99-5294-4CE7-B492-38FE588D8428}.Release|x86.Build.0 = Release|Any CPU
-		{628C09B7-BE6B-4AD4-AF41-C8863C809B31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{628C09B7-BE6B-4AD4-AF41-C8863C809B31}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{628C09B7-BE6B-4AD4-AF41-C8863C809B31}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{628C09B7-BE6B-4AD4-AF41-C8863C809B31}.Debug|x64.Build.0 = Debug|Any CPU
-		{628C09B7-BE6B-4AD4-AF41-C8863C809B31}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{628C09B7-BE6B-4AD4-AF41-C8863C809B31}.Debug|x86.Build.0 = Debug|Any CPU
-		{628C09B7-BE6B-4AD4-AF41-C8863C809B31}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{628C09B7-BE6B-4AD4-AF41-C8863C809B31}.Release|Any CPU.Build.0 = Release|Any CPU
-		{628C09B7-BE6B-4AD4-AF41-C8863C809B31}.Release|x64.ActiveCfg = Release|Any CPU
-		{628C09B7-BE6B-4AD4-AF41-C8863C809B31}.Release|x64.Build.0 = Release|Any CPU
-		{628C09B7-BE6B-4AD4-AF41-C8863C809B31}.Release|x86.ActiveCfg = Release|Any CPU
-		{628C09B7-BE6B-4AD4-AF41-C8863C809B31}.Release|x86.Build.0 = Release|Any CPU
 		{92F4E400-8C28-41B9-9D7D-8E9A4535636B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{92F4E400-8C28-41B9-9D7D-8E9A4535636B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{92F4E400-8C28-41B9-9D7D-8E9A4535636B}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1771,10 +1770,22 @@ Global
 		{32DA04FF-A951-43EA-B2FA-86A825009A97}.Debug|x86.Build.0 = Debug|Any CPU
 		{32DA04FF-A951-43EA-B2FA-86A825009A97}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{32DA04FF-A951-43EA-B2FA-86A825009A97}.Release|Any CPU.Build.0 = Release|Any CPU
+		{32DA04FF-A951-43EA-B2FA-86A825009A97}.Release|x64.ActiveCfg = Release|Any CPU
+		{32DA04FF-A951-43EA-B2FA-86A825009A97}.Release|x64.Build.0 = Release|Any CPU
+		{32DA04FF-A951-43EA-B2FA-86A825009A97}.Release|x86.ActiveCfg = Release|Any CPU
+		{32DA04FF-A951-43EA-B2FA-86A825009A97}.Release|x86.Build.0 = Release|Any CPU
 		{8D6A9984-118D-4415-A8FA-AB1F26CF5C44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8D6A9984-118D-4415-A8FA-AB1F26CF5C44}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8D6A9984-118D-4415-A8FA-AB1F26CF5C44}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8D6A9984-118D-4415-A8FA-AB1F26CF5C44}.Debug|x64.Build.0 = Debug|Any CPU
+		{8D6A9984-118D-4415-A8FA-AB1F26CF5C44}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8D6A9984-118D-4415-A8FA-AB1F26CF5C44}.Debug|x86.Build.0 = Debug|Any CPU
 		{8D6A9984-118D-4415-A8FA-AB1F26CF5C44}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8D6A9984-118D-4415-A8FA-AB1F26CF5C44}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8D6A9984-118D-4415-A8FA-AB1F26CF5C44}.Release|x64.ActiveCfg = Release|Any CPU
+		{8D6A9984-118D-4415-A8FA-AB1F26CF5C44}.Release|x64.Build.0 = Release|Any CPU
+		{8D6A9984-118D-4415-A8FA-AB1F26CF5C44}.Release|x86.ActiveCfg = Release|Any CPU
+		{8D6A9984-118D-4415-A8FA-AB1F26CF5C44}.Release|x86.Build.0 = Release|Any CPU
 		{0CBA5FB8-71A3-457A-89F3-E52B9602164A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0CBA5FB8-71A3-457A-89F3-E52B9602164A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0CBA5FB8-71A3-457A-89F3-E52B9602164A}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1843,6 +1854,10 @@ Global
 		{D9617F63-15F4-4CA2-8ECF-728A94B45D82}.Debug|x86.Build.0 = Debug|Any CPU
 		{D9617F63-15F4-4CA2-8ECF-728A94B45D82}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D9617F63-15F4-4CA2-8ECF-728A94B45D82}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D9617F63-15F4-4CA2-8ECF-728A94B45D82}.Release|x64.ActiveCfg = Release|Any CPU
+		{D9617F63-15F4-4CA2-8ECF-728A94B45D82}.Release|x64.Build.0 = Release|Any CPU
+		{D9617F63-15F4-4CA2-8ECF-728A94B45D82}.Release|x86.ActiveCfg = Release|Any CPU
+		{D9617F63-15F4-4CA2-8ECF-728A94B45D82}.Release|x86.Build.0 = Release|Any CPU
 		{2FF79F82-60C1-349A-4726-7783D5A6D5DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2FF79F82-60C1-349A-4726-7783D5A6D5DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2FF79F82-60C1-349A-4726-7783D5A6D5DF}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1851,14 +1866,34 @@ Global
 		{2FF79F82-60C1-349A-4726-7783D5A6D5DF}.Debug|x86.Build.0 = Debug|Any CPU
 		{2FF79F82-60C1-349A-4726-7783D5A6D5DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2FF79F82-60C1-349A-4726-7783D5A6D5DF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2FF79F82-60C1-349A-4726-7783D5A6D5DF}.Release|x64.ActiveCfg = Release|Any CPU
+		{2FF79F82-60C1-349A-4726-7783D5A6D5DF}.Release|x64.Build.0 = Release|Any CPU
+		{2FF79F82-60C1-349A-4726-7783D5A6D5DF}.Release|x86.ActiveCfg = Release|Any CPU
+		{2FF79F82-60C1-349A-4726-7783D5A6D5DF}.Release|x86.Build.0 = Release|Any CPU
 		{B84E0837-40AF-484E-A71D-941595568BE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B84E0837-40AF-484E-A71D-941595568BE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B84E0837-40AF-484E-A71D-941595568BE7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B84E0837-40AF-484E-A71D-941595568BE7}.Debug|x64.Build.0 = Debug|Any CPU
+		{B84E0837-40AF-484E-A71D-941595568BE7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B84E0837-40AF-484E-A71D-941595568BE7}.Debug|x86.Build.0 = Debug|Any CPU
 		{B84E0837-40AF-484E-A71D-941595568BE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B84E0837-40AF-484E-A71D-941595568BE7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B84E0837-40AF-484E-A71D-941595568BE7}.Release|x64.ActiveCfg = Release|Any CPU
+		{B84E0837-40AF-484E-A71D-941595568BE7}.Release|x64.Build.0 = Release|Any CPU
+		{B84E0837-40AF-484E-A71D-941595568BE7}.Release|x86.ActiveCfg = Release|Any CPU
+		{B84E0837-40AF-484E-A71D-941595568BE7}.Release|x86.Build.0 = Release|Any CPU
 		{0C13E7D0-5335-4D60-B0F2-12595E8FC451}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0C13E7D0-5335-4D60-B0F2-12595E8FC451}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0C13E7D0-5335-4D60-B0F2-12595E8FC451}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0C13E7D0-5335-4D60-B0F2-12595E8FC451}.Debug|x64.Build.0 = Debug|Any CPU
+		{0C13E7D0-5335-4D60-B0F2-12595E8FC451}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0C13E7D0-5335-4D60-B0F2-12595E8FC451}.Debug|x86.Build.0 = Debug|Any CPU
 		{0C13E7D0-5335-4D60-B0F2-12595E8FC451}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0C13E7D0-5335-4D60-B0F2-12595E8FC451}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0C13E7D0-5335-4D60-B0F2-12595E8FC451}.Release|x64.ActiveCfg = Release|Any CPU
+		{0C13E7D0-5335-4D60-B0F2-12595E8FC451}.Release|x64.Build.0 = Release|Any CPU
+		{0C13E7D0-5335-4D60-B0F2-12595E8FC451}.Release|x86.ActiveCfg = Release|Any CPU
+		{0C13E7D0-5335-4D60-B0F2-12595E8FC451}.Release|x86.Build.0 = Release|Any CPU
 		{692B71D8-9C31-D1EE-6C1B-570A12B18E39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{692B71D8-9C31-D1EE-6C1B-570A12B18E39}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{692B71D8-9C31-D1EE-6C1B-570A12B18E39}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1867,34 +1902,134 @@ Global
 		{692B71D8-9C31-D1EE-6C1B-570A12B18E39}.Debug|x86.Build.0 = Debug|Any CPU
 		{692B71D8-9C31-D1EE-6C1B-570A12B18E39}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{692B71D8-9C31-D1EE-6C1B-570A12B18E39}.Release|Any CPU.Build.0 = Release|Any CPU
+		{692B71D8-9C31-D1EE-6C1B-570A12B18E39}.Release|x64.ActiveCfg = Release|Any CPU
+		{692B71D8-9C31-D1EE-6C1B-570A12B18E39}.Release|x64.Build.0 = Release|Any CPU
+		{692B71D8-9C31-D1EE-6C1B-570A12B18E39}.Release|x86.ActiveCfg = Release|Any CPU
+		{692B71D8-9C31-D1EE-6C1B-570A12B18E39}.Release|x86.Build.0 = Release|Any CPU
 		{3DF5A9B8-6F90-4CFB-4518-0E97982B6748}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3DF5A9B8-6F90-4CFB-4518-0E97982B6748}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3DF5A9B8-6F90-4CFB-4518-0E97982B6748}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3DF5A9B8-6F90-4CFB-4518-0E97982B6748}.Debug|x64.Build.0 = Debug|Any CPU
+		{3DF5A9B8-6F90-4CFB-4518-0E97982B6748}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3DF5A9B8-6F90-4CFB-4518-0E97982B6748}.Debug|x86.Build.0 = Debug|Any CPU
 		{3DF5A9B8-6F90-4CFB-4518-0E97982B6748}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3DF5A9B8-6F90-4CFB-4518-0E97982B6748}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3DF5A9B8-6F90-4CFB-4518-0E97982B6748}.Release|x64.ActiveCfg = Release|Any CPU
+		{3DF5A9B8-6F90-4CFB-4518-0E97982B6748}.Release|x64.Build.0 = Release|Any CPU
+		{3DF5A9B8-6F90-4CFB-4518-0E97982B6748}.Release|x86.ActiveCfg = Release|Any CPU
+		{3DF5A9B8-6F90-4CFB-4518-0E97982B6748}.Release|x86.Build.0 = Release|Any CPU
 		{27BBE29B-CE6F-401F-B3CF-B07DC556FAD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{27BBE29B-CE6F-401F-B3CF-B07DC556FAD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{27BBE29B-CE6F-401F-B3CF-B07DC556FAD1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{27BBE29B-CE6F-401F-B3CF-B07DC556FAD1}.Debug|x64.Build.0 = Debug|Any CPU
+		{27BBE29B-CE6F-401F-B3CF-B07DC556FAD1}.Debug|x64.Deploy.0 = Debug|Any CPU
+		{27BBE29B-CE6F-401F-B3CF-B07DC556FAD1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{27BBE29B-CE6F-401F-B3CF-B07DC556FAD1}.Debug|x86.Build.0 = Debug|Any CPU
+		{27BBE29B-CE6F-401F-B3CF-B07DC556FAD1}.Debug|x86.Deploy.0 = Debug|Any CPU
 		{27BBE29B-CE6F-401F-B3CF-B07DC556FAD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{27BBE29B-CE6F-401F-B3CF-B07DC556FAD1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{27BBE29B-CE6F-401F-B3CF-B07DC556FAD1}.Release|x64.ActiveCfg = Release|Any CPU
+		{27BBE29B-CE6F-401F-B3CF-B07DC556FAD1}.Release|x64.Build.0 = Release|Any CPU
+		{27BBE29B-CE6F-401F-B3CF-B07DC556FAD1}.Release|x64.Deploy.0 = Release|Any CPU
+		{27BBE29B-CE6F-401F-B3CF-B07DC556FAD1}.Release|x86.ActiveCfg = Release|Any CPU
+		{27BBE29B-CE6F-401F-B3CF-B07DC556FAD1}.Release|x86.Build.0 = Release|Any CPU
+		{27BBE29B-CE6F-401F-B3CF-B07DC556FAD1}.Release|x86.Deploy.0 = Release|Any CPU
 		{234BE46E-4AD6-485C-B0D3-E704EF504312}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{234BE46E-4AD6-485C-B0D3-E704EF504312}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{234BE46E-4AD6-485C-B0D3-E704EF504312}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{234BE46E-4AD6-485C-B0D3-E704EF504312}.Debug|x64.Build.0 = Debug|Any CPU
+		{234BE46E-4AD6-485C-B0D3-E704EF504312}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{234BE46E-4AD6-485C-B0D3-E704EF504312}.Debug|x86.Build.0 = Debug|Any CPU
 		{234BE46E-4AD6-485C-B0D3-E704EF504312}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{234BE46E-4AD6-485C-B0D3-E704EF504312}.Release|Any CPU.Build.0 = Release|Any CPU
+		{234BE46E-4AD6-485C-B0D3-E704EF504312}.Release|x64.ActiveCfg = Release|Any CPU
+		{234BE46E-4AD6-485C-B0D3-E704EF504312}.Release|x64.Build.0 = Release|Any CPU
+		{234BE46E-4AD6-485C-B0D3-E704EF504312}.Release|x86.ActiveCfg = Release|Any CPU
+		{234BE46E-4AD6-485C-B0D3-E704EF504312}.Release|x86.Build.0 = Release|Any CPU
 		{20CA4572-8865-38BF-31C9-E58855D0CD40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{20CA4572-8865-38BF-31C9-E58855D0CD40}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{20CA4572-8865-38BF-31C9-E58855D0CD40}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{20CA4572-8865-38BF-31C9-E58855D0CD40}.Debug|x64.Build.0 = Debug|Any CPU
+		{20CA4572-8865-38BF-31C9-E58855D0CD40}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{20CA4572-8865-38BF-31C9-E58855D0CD40}.Debug|x86.Build.0 = Debug|Any CPU
 		{20CA4572-8865-38BF-31C9-E58855D0CD40}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{20CA4572-8865-38BF-31C9-E58855D0CD40}.Release|Any CPU.Build.0 = Release|Any CPU
+		{20CA4572-8865-38BF-31C9-E58855D0CD40}.Release|x64.ActiveCfg = Release|Any CPU
+		{20CA4572-8865-38BF-31C9-E58855D0CD40}.Release|x64.Build.0 = Release|Any CPU
+		{20CA4572-8865-38BF-31C9-E58855D0CD40}.Release|x86.ActiveCfg = Release|Any CPU
+		{20CA4572-8865-38BF-31C9-E58855D0CD40}.Release|x86.Build.0 = Release|Any CPU
 		{93A4A3DA-9D0F-FAEA-5AD7-A34650D326D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{93A4A3DA-9D0F-FAEA-5AD7-A34650D326D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{93A4A3DA-9D0F-FAEA-5AD7-A34650D326D0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{93A4A3DA-9D0F-FAEA-5AD7-A34650D326D0}.Debug|x64.Build.0 = Debug|Any CPU
+		{93A4A3DA-9D0F-FAEA-5AD7-A34650D326D0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{93A4A3DA-9D0F-FAEA-5AD7-A34650D326D0}.Debug|x86.Build.0 = Debug|Any CPU
 		{93A4A3DA-9D0F-FAEA-5AD7-A34650D326D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{93A4A3DA-9D0F-FAEA-5AD7-A34650D326D0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{93A4A3DA-9D0F-FAEA-5AD7-A34650D326D0}.Release|x64.ActiveCfg = Release|Any CPU
+		{93A4A3DA-9D0F-FAEA-5AD7-A34650D326D0}.Release|x64.Build.0 = Release|Any CPU
+		{93A4A3DA-9D0F-FAEA-5AD7-A34650D326D0}.Release|x86.ActiveCfg = Release|Any CPU
+		{93A4A3DA-9D0F-FAEA-5AD7-A34650D326D0}.Release|x86.Build.0 = Release|Any CPU
 		{C5C4F9CA-25B8-2B20-826D-EA93F667C316}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C5C4F9CA-25B8-2B20-826D-EA93F667C316}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C5C4F9CA-25B8-2B20-826D-EA93F667C316}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C5C4F9CA-25B8-2B20-826D-EA93F667C316}.Debug|x64.Build.0 = Debug|Any CPU
+		{C5C4F9CA-25B8-2B20-826D-EA93F667C316}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C5C4F9CA-25B8-2B20-826D-EA93F667C316}.Debug|x86.Build.0 = Debug|Any CPU
 		{C5C4F9CA-25B8-2B20-826D-EA93F667C316}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C5C4F9CA-25B8-2B20-826D-EA93F667C316}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C5C4F9CA-25B8-2B20-826D-EA93F667C316}.Release|x64.ActiveCfg = Release|Any CPU
+		{C5C4F9CA-25B8-2B20-826D-EA93F667C316}.Release|x64.Build.0 = Release|Any CPU
+		{C5C4F9CA-25B8-2B20-826D-EA93F667C316}.Release|x86.ActiveCfg = Release|Any CPU
+		{C5C4F9CA-25B8-2B20-826D-EA93F667C316}.Release|x86.Build.0 = Release|Any CPU
 		{6A7E16BE-FF2F-7927-AAF7-366CC0C42AE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6A7E16BE-FF2F-7927-AAF7-366CC0C42AE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6A7E16BE-FF2F-7927-AAF7-366CC0C42AE4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6A7E16BE-FF2F-7927-AAF7-366CC0C42AE4}.Debug|x64.Build.0 = Debug|Any CPU
+		{6A7E16BE-FF2F-7927-AAF7-366CC0C42AE4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6A7E16BE-FF2F-7927-AAF7-366CC0C42AE4}.Debug|x86.Build.0 = Debug|Any CPU
 		{6A7E16BE-FF2F-7927-AAF7-366CC0C42AE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6A7E16BE-FF2F-7927-AAF7-366CC0C42AE4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6A7E16BE-FF2F-7927-AAF7-366CC0C42AE4}.Release|x64.ActiveCfg = Release|Any CPU
+		{6A7E16BE-FF2F-7927-AAF7-366CC0C42AE4}.Release|x64.Build.0 = Release|Any CPU
+		{6A7E16BE-FF2F-7927-AAF7-366CC0C42AE4}.Release|x86.ActiveCfg = Release|Any CPU
+		{6A7E16BE-FF2F-7927-AAF7-366CC0C42AE4}.Release|x86.Build.0 = Release|Any CPU
+		{3F0093BF-A64D-4EE8-8A2A-22800BB25CFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F0093BF-A64D-4EE8-8A2A-22800BB25CFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3F0093BF-A64D-4EE8-8A2A-22800BB25CFF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3F0093BF-A64D-4EE8-8A2A-22800BB25CFF}.Debug|x64.Build.0 = Debug|Any CPU
+		{3F0093BF-A64D-4EE8-8A2A-22800BB25CFF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3F0093BF-A64D-4EE8-8A2A-22800BB25CFF}.Debug|x86.Build.0 = Debug|Any CPU
+		{3F0093BF-A64D-4EE8-8A2A-22800BB25CFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3F0093BF-A64D-4EE8-8A2A-22800BB25CFF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3F0093BF-A64D-4EE8-8A2A-22800BB25CFF}.Release|x64.ActiveCfg = Release|Any CPU
+		{3F0093BF-A64D-4EE8-8A2A-22800BB25CFF}.Release|x64.Build.0 = Release|Any CPU
+		{3F0093BF-A64D-4EE8-8A2A-22800BB25CFF}.Release|x86.ActiveCfg = Release|Any CPU
+		{3F0093BF-A64D-4EE8-8A2A-22800BB25CFF}.Release|x86.Build.0 = Release|Any CPU
+		{A57B724D-D12B-483E-82F2-2183DEA2DFA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A57B724D-D12B-483E-82F2-2183DEA2DFA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A57B724D-D12B-483E-82F2-2183DEA2DFA7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A57B724D-D12B-483E-82F2-2183DEA2DFA7}.Debug|x64.Build.0 = Debug|Any CPU
+		{A57B724D-D12B-483E-82F2-2183DEA2DFA7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A57B724D-D12B-483E-82F2-2183DEA2DFA7}.Debug|x86.Build.0 = Debug|Any CPU
+		{A57B724D-D12B-483E-82F2-2183DEA2DFA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A57B724D-D12B-483E-82F2-2183DEA2DFA7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A57B724D-D12B-483E-82F2-2183DEA2DFA7}.Release|x64.ActiveCfg = Release|Any CPU
+		{A57B724D-D12B-483E-82F2-2183DEA2DFA7}.Release|x64.Build.0 = Release|Any CPU
+		{A57B724D-D12B-483E-82F2-2183DEA2DFA7}.Release|x86.ActiveCfg = Release|Any CPU
+		{A57B724D-D12B-483E-82F2-2183DEA2DFA7}.Release|x86.Build.0 = Release|Any CPU
+		{4F23A9C8-945A-A4F4-51E9-FCA215943C0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4F23A9C8-945A-A4F4-51E9-FCA215943C0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4F23A9C8-945A-A4F4-51E9-FCA215943C0D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4F23A9C8-945A-A4F4-51E9-FCA215943C0D}.Debug|x64.Build.0 = Debug|Any CPU
+		{4F23A9C8-945A-A4F4-51E9-FCA215943C0D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4F23A9C8-945A-A4F4-51E9-FCA215943C0D}.Debug|x86.Build.0 = Debug|Any CPU
+		{4F23A9C8-945A-A4F4-51E9-FCA215943C0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4F23A9C8-945A-A4F4-51E9-FCA215943C0D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4F23A9C8-945A-A4F4-51E9-FCA215943C0D}.Release|x64.ActiveCfg = Release|Any CPU
+		{4F23A9C8-945A-A4F4-51E9-FCA215943C0D}.Release|x64.Build.0 = Release|Any CPU
+		{4F23A9C8-945A-A4F4-51E9-FCA215943C0D}.Release|x86.ActiveCfg = Release|Any CPU
+		{4F23A9C8-945A-A4F4-51E9-FCA215943C0D}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2080,6 +2215,11 @@ Global
 		{93A4A3DA-9D0F-FAEA-5AD7-A34650D326D0} = {71C279BD-E850-4A8D-9775-11CA26B8E5BA}
 		{C5C4F9CA-25B8-2B20-826D-EA93F667C316} = {71C279BD-E850-4A8D-9775-11CA26B8E5BA}
 		{6A7E16BE-FF2F-7927-AAF7-366CC0C42AE4} = {71C279BD-E850-4A8D-9775-11CA26B8E5BA}
+		{C66B5859-B05E-5DF4-58E9-78CA919DB89A} = {44E564E1-AE0D-4313-A4E9-CBF2109397E3}
+		{AFA55F45-CFCB-9821-A210-2D3496088416} = {3AD322BF-405B-4A53-9858-51CF66E8509F}
+		{3F0093BF-A64D-4EE8-8A2A-22800BB25CFF} = {C66B5859-B05E-5DF4-58E9-78CA919DB89A}
+		{A57B724D-D12B-483E-82F2-2183DEA2DFA7} = {AFA55F45-CFCB-9821-A210-2D3496088416}
+		{4F23A9C8-945A-A4F4-51E9-FCA215943C0D} = {C66B5859-B05E-5DF4-58E9-78CA919DB89A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {FB8F26CE-4DE6-433F-B32A-79183020BBD6}