Remove System.Drawing.Common from runtime

System.Drawing.Common was merged into winforms with dotnet/winforms#8633. Removing its sources and using PackageReferences to reference it.
dotnet · Mar 13, 2023 · 2c34b7b · 2c34b7b
1 parent e247ef3
commit 2c34b7b
Show file tree

Hide file tree

Showing 335 changed files with 14 additions and 80,161 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -90,6 +90,10 @@
       <Sha>352d64e0ce9b99a8cff6207621432a986920ffd9</Sha>
       <SourceBuild RepoName="emsdk" ManagedOnly="true" />
     </Dependency>
+    <Dependency Name="System.Drawing.Common" Version="8.0.0-preview.3.23163.8">
+      <Uri>https://github.com/dotnet/winforms</Uri>
+      <Sha>f941e8818a55393e65c38770e33a58721687e3d6</Sha>
+    </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
     <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23159.1">

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -124,6 +124,7 @@
     <SystemComponentModelAnnotationsVersion>5.0.0</SystemComponentModelAnnotationsVersion>
     <SystemDataSqlClientVersion>4.8.5</SystemDataSqlClientVersion>
     <SystemDataDataSetExtensionsVersion>4.5.0</SystemDataDataSetExtensionsVersion>
+    <SystemDrawingCommonVersion>8.0.0-preview.3.23163.8</SystemDrawingCommonVersion>
     <SystemIOFileSystemAccessControlVersion>5.0.0</SystemIOFileSystemAccessControlVersion>
     <SystemIOPipesAccessControlVersion>5.0.0</SystemIOPipesAccessControlVersion>
     <SystemMemoryVersion>4.5.5</SystemMemoryVersion>

diff --git a/src/libraries/Microsoft.Windows.Compatibility/src/Microsoft.Windows.Compatibility.csproj b/src/libraries/Microsoft.Windows.Compatibility/src/Microsoft.Windows.Compatibility.csproj
@@ -23,7 +23,6 @@
     <ProjectReference Include="$(LibrariesProjectRoot)System.DirectoryServices.AccountManagement\src\System.DirectoryServices.AccountManagement.csproj" />
     <ProjectReference Include="$(LibrariesProjectRoot)System.DirectoryServices.Protocols\src\System.DirectoryServices.Protocols.csproj" />
     <ProjectReference Include="$(LibrariesProjectRoot)System.DirectoryServices\src\System.DirectoryServices.csproj" />
-    <ProjectReference Include="$(LibrariesProjectRoot)System.Drawing.Common\src\System.Drawing.Common.csproj" />
     <ProjectReference Include="$(LibrariesProjectRoot)System.IO.Packaging\src\System.IO.Packaging.csproj" />
     <ProjectReference Include="$(LibrariesProjectRoot)System.IO.Ports\src\System.IO.Ports.csproj" />
     <ProjectReference Include="$(LibrariesProjectRoot)System.Management\src\System.Management.csproj" />
@@ -45,6 +44,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="System.Drawing.Common" Version="$(SystemDrawingCommonVersion)" />
     <PackageReference Include="System.Data.SqlClient" Version="$(SystemDataSqlClientVersion)" />  
     <PackageReference Include="System.ServiceModel.Primitives;
                                      System.ServiceModel.Duplex;

diff --git a/src/libraries/NetCoreAppLibrary.props b/src/libraries/NetCoreAppLibrary.props
@@ -236,7 +236,6 @@
       System.Diagnostics.EventLog;
       System.Diagnostics.PerformanceCounter;
       System.DirectoryServices;
-      System.Drawing.Common;
       System.IO.Packaging;
       System.Resources.Extensions;
       System.Security.Cryptography.Pkcs;

diff --git a/...s/System.Configuration.ConfigurationManager/System.Configuration.ConfigurationManager.sln b/...s/System.Configuration.ConfigurationManager/System.Configuration.ConfigurationManager.sln
@@ -17,10 +17,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog", "..\System.Diagnostics.EventLog\src\System.Diagnostics.EventLog.csproj", "{808D1F6A-2605-4BEB-A64B-0D09CDE558C8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{6B586A50-5DFE-4FBE-A65B-9152B992C2E1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\src\System.Drawing.Common.csproj", "{E49D2841-A288-4B5F-89FC-857CCE0401F0}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{355B775A-BFE1-4384-BC83-C6B5D1FB77BB}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{66EC63BC-99DC-40CA-B53B-B4D8BF6D1630}"
@@ -87,14 +83,6 @@ Global
 		{808D1F6A-2605-4BEB-A64B-0D09CDE558C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{808D1F6A-2605-4BEB-A64B-0D09CDE558C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{808D1F6A-2605-4BEB-A64B-0D09CDE558C8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6B586A50-5DFE-4FBE-A65B-9152B992C2E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6B586A50-5DFE-4FBE-A65B-9152B992C2E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6B586A50-5DFE-4FBE-A65B-9152B992C2E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6B586A50-5DFE-4FBE-A65B-9152B992C2E1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E49D2841-A288-4B5F-89FC-857CCE0401F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E49D2841-A288-4B5F-89FC-857CCE0401F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E49D2841-A288-4B5F-89FC-857CCE0401F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E49D2841-A288-4B5F-89FC-857CCE0401F0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{355B775A-BFE1-4384-BC83-C6B5D1FB77BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{355B775A-BFE1-4384-BC83-C6B5D1FB77BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{355B775A-BFE1-4384-BC83-C6B5D1FB77BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -137,15 +125,13 @@ Global
 		{C7D1410B-8CF0-48DB-A0DF-C8E3A341FD12} = {751DA007-D916-4F22-AF16-85F343C2992C}
 		{6F662E39-BB56-4BCF-B053-B4A1782A33E1} = {751DA007-D916-4F22-AF16-85F343C2992C}
 		{C70C30E4-56DC-44FA-B621-9BB4C4E365D0} = {751DA007-D916-4F22-AF16-85F343C2992C}
-		{6B586A50-5DFE-4FBE-A65B-9152B992C2E1} = {751DA007-D916-4F22-AF16-85F343C2992C}
 		{1C48B652-BA62-4D46-9CDD-24A1670EE3E3} = {751DA007-D916-4F22-AF16-85F343C2992C}
 		{CFF7519C-4D41-4713-991D-27777DA2DB21} = {751DA007-D916-4F22-AF16-85F343C2992C}
 		{3278A0F9-8E0A-42E1-8FE3-1A01851A6248} = {751DA007-D916-4F22-AF16-85F343C2992C}
 		{D54AFFF7-9BEE-42C8-89C3-96E7228A23FA} = {A3B7282E-7D62-48ED-B5FC-E6AB32DA6F0A}
 		{7C9D7BE4-BF9C-486C-8ADF-53DE282E018A} = {A3B7282E-7D62-48ED-B5FC-E6AB32DA6F0A}
 		{B9C6FFBB-A992-4402-93DC-254C660CF16A} = {A3B7282E-7D62-48ED-B5FC-E6AB32DA6F0A}
 		{808D1F6A-2605-4BEB-A64B-0D09CDE558C8} = {A3B7282E-7D62-48ED-B5FC-E6AB32DA6F0A}
-		{E49D2841-A288-4B5F-89FC-857CCE0401F0} = {A3B7282E-7D62-48ED-B5FC-E6AB32DA6F0A}
 		{7B2CA04A-9DFB-471E-B4CB-1937D0049B96} = {A3B7282E-7D62-48ED-B5FC-E6AB32DA6F0A}
 		{2BE20C4A-C20B-4A0C-8E4A-31B681B6967D} = {A3B7282E-7D62-48ED-B5FC-E6AB32DA6F0A}
 		{E34EBFC8-D1BC-4ED7-8335-C183A5994EE1} = {A3B7282E-7D62-48ED-B5FC-E6AB32DA6F0A}

diff --git a/src/libraries/System.Data.OleDb/System.Data.Oledb.sln b/src/libraries/System.Data.OleDb/System.Data.Oledb.sln
@@ -25,10 +25,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Performa
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.PerformanceCounter", "..\System.Diagnostics.PerformanceCounter\src\System.Diagnostics.PerformanceCounter.csproj", "{362A9152-D46A-4DD0-8EB7-D36FC95D1AF1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{C4B1668A-2512-4832-A298-3A10230C8B82}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\src\System.Drawing.Common.csproj", "{23D4BAFD-851B-4718-A3FA-B30631F87F91}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{A2ED3B1E-5AAC-47AF-BDCE-B59226B65E63}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{C273C3A4-5651-489C-9FA4-2DCAAA7A7D97}"
@@ -111,14 +107,6 @@ Global
 		{362A9152-D46A-4DD0-8EB7-D36FC95D1AF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{362A9152-D46A-4DD0-8EB7-D36FC95D1AF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{362A9152-D46A-4DD0-8EB7-D36FC95D1AF1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C4B1668A-2512-4832-A298-3A10230C8B82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C4B1668A-2512-4832-A298-3A10230C8B82}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C4B1668A-2512-4832-A298-3A10230C8B82}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C4B1668A-2512-4832-A298-3A10230C8B82}.Release|Any CPU.Build.0 = Release|Any CPU
-		{23D4BAFD-851B-4718-A3FA-B30631F87F91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{23D4BAFD-851B-4718-A3FA-B30631F87F91}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{23D4BAFD-851B-4718-A3FA-B30631F87F91}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{23D4BAFD-851B-4718-A3FA-B30631F87F91}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A2ED3B1E-5AAC-47AF-BDCE-B59226B65E63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A2ED3B1E-5AAC-47AF-BDCE-B59226B65E63}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A2ED3B1E-5AAC-47AF-BDCE-B59226B65E63}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -163,7 +151,6 @@ Global
 		{55F3CDEC-EA5D-4483-AD1A-47A0DC4B5222} = {9AB0B44D-9A64-449F-A0CD-07D39ABEF343}
 		{F7379254-05CC-4F91-B230-4DD992502C75} = {9AB0B44D-9A64-449F-A0CD-07D39ABEF343}
 		{F5BFD2E9-5399-4D16-901A-554E1DF2D6E1} = {9AB0B44D-9A64-449F-A0CD-07D39ABEF343}
-		{C4B1668A-2512-4832-A298-3A10230C8B82} = {9AB0B44D-9A64-449F-A0CD-07D39ABEF343}
 		{EF8D1526-9463-401B-9EAE-D4B98C86E046} = {9AB0B44D-9A64-449F-A0CD-07D39ABEF343}
 		{C73C11A5-863A-440D-B568-00CA5E7C9DA0} = {9AB0B44D-9A64-449F-A0CD-07D39ABEF343}
 		{D7C9E59C-0B7B-491E-9FC5-63A29290EE06} = {9AB0B44D-9A64-449F-A0CD-07D39ABEF343}
@@ -173,7 +160,6 @@ Global
 		{CE5ACEBD-8B25-4523-842C-1BF961044C17} = {4B964147-AE9C-454F-B971-4F4BD9541280}
 		{3F0940D6-1697-4468-A2D6-8AC3891C4FB7} = {4B964147-AE9C-454F-B971-4F4BD9541280}
 		{362A9152-D46A-4DD0-8EB7-D36FC95D1AF1} = {4B964147-AE9C-454F-B971-4F4BD9541280}
-		{23D4BAFD-851B-4718-A3FA-B30631F87F91} = {4B964147-AE9C-454F-B971-4F4BD9541280}
 		{15628477-9D25-41FA-81B0-59D43D1363F4} = {4B964147-AE9C-454F-B971-4F4BD9541280}
 		{877B4329-854A-412F-B631-6315D77F9C8A} = {4B964147-AE9C-454F-B971-4F4BD9541280}
 		{A3AC9584-763B-4686-B6D8-49140FC62EC4} = {4B964147-AE9C-454F-B971-4F4BD9541280}

diff --git a/...libraries/System.Diagnostics.PerformanceCounter/System.Diagnostics.PerformanceCounter.sln b/...libraries/System.Diagnostics.PerformanceCounter/System.Diagnostics.PerformanceCounter.sln
@@ -21,10 +21,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Performa
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.PerformanceCounter.Tests", "tests\System.Diagnostics.PerformanceCounter.Tests.csproj", "{EB8EF358-4028-4272-B71E-523F8D0A73F0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{F237AE76-582E-45B8-AC46-B0CE8C65780B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\src\System.Drawing.Common.csproj", "{A6AC1A1B-F02F-4F0B-8C6B-1A004EE79893}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{11F700BE-429D-4AAA-B797-4C6322503872}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.SourceGeneration", "..\System.Runtime.InteropServices\gen\Microsoft.Interop.SourceGeneration\Microsoft.Interop.SourceGeneration.csproj", "{B690A8D8-E3BF-44D3-8FBC-D64A517B8AF3}"
@@ -99,14 +95,6 @@ Global
 		{EB8EF358-4028-4272-B71E-523F8D0A73F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EB8EF358-4028-4272-B71E-523F8D0A73F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EB8EF358-4028-4272-B71E-523F8D0A73F0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F237AE76-582E-45B8-AC46-B0CE8C65780B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F237AE76-582E-45B8-AC46-B0CE8C65780B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F237AE76-582E-45B8-AC46-B0CE8C65780B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F237AE76-582E-45B8-AC46-B0CE8C65780B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A6AC1A1B-F02F-4F0B-8C6B-1A004EE79893}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A6AC1A1B-F02F-4F0B-8C6B-1A004EE79893}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A6AC1A1B-F02F-4F0B-8C6B-1A004EE79893}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A6AC1A1B-F02F-4F0B-8C6B-1A004EE79893}.Release|Any CPU.Build.0 = Release|Any CPU
 		{11F700BE-429D-4AAA-B797-4C6322503872}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{11F700BE-429D-4AAA-B797-4C6322503872}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{11F700BE-429D-4AAA-B797-4C6322503872}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -150,7 +138,6 @@ Global
 		{067570A0-D55A-4ECC-A478-B1CBC676E9F3} = {BFF04E9C-277E-4CE3-8D38-FAFCA9B2D872}
 		{084CF5E8-1BD4-4AD3-A80F-FD9E1C269826} = {BFF04E9C-277E-4CE3-8D38-FAFCA9B2D872}
 		{D0C681EE-D578-4CD6-AA62-33874FCE3E37} = {BFF04E9C-277E-4CE3-8D38-FAFCA9B2D872}
-		{F237AE76-582E-45B8-AC46-B0CE8C65780B} = {BFF04E9C-277E-4CE3-8D38-FAFCA9B2D872}
 		{2C707BFF-6BA9-4EB8-BC75-5341391B5FC6} = {BFF04E9C-277E-4CE3-8D38-FAFCA9B2D872}
 		{F8480484-A2CA-4215-AC4B-82F6149FEC02} = {BFF04E9C-277E-4CE3-8D38-FAFCA9B2D872}
 		{97932D09-4DF9-4836-ADEF-C52DBC0661CD} = {BFF04E9C-277E-4CE3-8D38-FAFCA9B2D872}
@@ -159,7 +146,6 @@ Global
 		{4D35D50B-936F-4867-A600-8D3A9A0CD0B5} = {F2408438-D7E0-4D89-97B1-EDCC83EA8442}
 		{E9DA420E-43B7-4A00-99A7-7DBDE3FF3F20} = {F2408438-D7E0-4D89-97B1-EDCC83EA8442}
 		{2B7C465F-44E2-4D0B-9A9F-30F20FA49A16} = {F2408438-D7E0-4D89-97B1-EDCC83EA8442}
-		{A6AC1A1B-F02F-4F0B-8C6B-1A004EE79893} = {F2408438-D7E0-4D89-97B1-EDCC83EA8442}
 		{43214093-FA08-4699-A62B-D7BC858BAC78} = {F2408438-D7E0-4D89-97B1-EDCC83EA8442}
 		{1E0AB255-7FD0-4DE0-9675-59DE81B12E54} = {F2408438-D7E0-4D89-97B1-EDCC83EA8442}
 		{60DB3C65-9EDA-45AA-85E6-37F1375CF1E7} = {F2408438-D7E0-4D89-97B1-EDCC83EA8442}

diff --git a/src/libraries/System.Diagnostics.Process/System.Diagnostics.Process.sln b/src/libraries/System.Diagnostics.Process/System.Diagnostics.Process.sln
@@ -33,10 +33,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices", "..\System.DirectoryServices\src\System.DirectoryServices.csproj", "{84075D59-9D5E-40F7-A914-911087419FE4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{6155E80C-6CE0-4A93-8BDF-80494E489BB1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\src\System.Drawing.Common.csproj", "{65CC713C-0735-4043-A4F2-9E1A2057A21B}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ObjectModel", "..\System.ObjectModel\ref\System.ObjectModel.csproj", "{E4D48405-30B4-4CEC-925B-851133BACC3D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryImportGenerator", "..\System.Runtime.InteropServices\gen\LibraryImportGenerator\LibraryImportGenerator.csproj", "{C8F1CF01-F4E9-4459-9FBB-34363A0C377E}"
@@ -143,14 +139,6 @@ Global
 		{84075D59-9D5E-40F7-A914-911087419FE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{84075D59-9D5E-40F7-A914-911087419FE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{84075D59-9D5E-40F7-A914-911087419FE4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6155E80C-6CE0-4A93-8BDF-80494E489BB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6155E80C-6CE0-4A93-8BDF-80494E489BB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6155E80C-6CE0-4A93-8BDF-80494E489BB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6155E80C-6CE0-4A93-8BDF-80494E489BB1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{65CC713C-0735-4043-A4F2-9E1A2057A21B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{65CC713C-0735-4043-A4F2-9E1A2057A21B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{65CC713C-0735-4043-A4F2-9E1A2057A21B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{65CC713C-0735-4043-A4F2-9E1A2057A21B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E4D48405-30B4-4CEC-925B-851133BACC3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E4D48405-30B4-4CEC-925B-851133BACC3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E4D48405-30B4-4CEC-925B-851133BACC3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -217,7 +205,6 @@ Global
 		{0AD2A3C7-CA69-4E73-A27E-2F143F7B9830} = {8A0AABD7-E3CA-40EA-8290-CEB1D3D0F9AD}
 		{4792FFA1-1AD2-4230-8DE3-D2BCF1CF804F} = {8A0AABD7-E3CA-40EA-8290-CEB1D3D0F9AD}
 		{F485B36D-8DDB-44EE-A993-2FCAEC81BE3E} = {8A0AABD7-E3CA-40EA-8290-CEB1D3D0F9AD}
-		{6155E80C-6CE0-4A93-8BDF-80494E489BB1} = {8A0AABD7-E3CA-40EA-8290-CEB1D3D0F9AD}
 		{E4D48405-30B4-4CEC-925B-851133BACC3D} = {8A0AABD7-E3CA-40EA-8290-CEB1D3D0F9AD}
 		{6C9EC55A-BE5D-40FD-A161-ABB87CE20E89} = {8A0AABD7-E3CA-40EA-8290-CEB1D3D0F9AD}
 		{5823DDA1-6CCB-4EBC-89DF-6AC430C64204} = {8A0AABD7-E3CA-40EA-8290-CEB1D3D0F9AD}
@@ -230,7 +217,6 @@ Global
 		{66D22E7A-EEEE-49DF-9AE1-CFFAFBEE9B52} = {B27D0964-41D3-4520-8D68-AD69F010A6B9}
 		{314810DF-262E-490E-8F05-F31695C31F0C} = {B27D0964-41D3-4520-8D68-AD69F010A6B9}
 		{84075D59-9D5E-40F7-A914-911087419FE4} = {B27D0964-41D3-4520-8D68-AD69F010A6B9}
-		{65CC713C-0735-4043-A4F2-9E1A2057A21B} = {B27D0964-41D3-4520-8D68-AD69F010A6B9}
 		{B8F3933C-7C0D-41B3-8B1F-D507EF92156B} = {B27D0964-41D3-4520-8D68-AD69F010A6B9}
 		{9C521ED1-5221-4C93-BBA0-86C13D4C23C7} = {B27D0964-41D3-4520-8D68-AD69F010A6B9}
 		{C8F1CF01-F4E9-4459-9FBB-34363A0C377E} = {8CB89ED5-7600-48B5-B7F4-72026EB9F533}