Port Glacier2 to C++11 (#1615)

* Port Glacier2 to C++11 from #1615 --------- Co-authored-by: Joe George <[email protected]>
zeroc-ice · Dec 20, 2023 · 0ae9944 · 0ae9944
1 parent 8be4cf8
commit 0ae9944
Show file tree

Hide file tree

Showing 48 changed files with 1,734 additions and 1,742 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,6 +17,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
       - name: Build
-        run: make -j8 V=1
+        run: make -j8 V=1 CONFIGS="shared cpp98-shared cpp11-shared"
       - name: Test
         run: ./allTests.py --workers=4
diff --git a/config/PropertyNames.xml b/config/PropertyNames.xml
@@ -621,7 +621,6 @@ generated from the section label.
     <section name="Glacier2">
         <property name="AddConnectionContext"/>
         <property name="Client" class="objectadapter"/>
-        <property name="Client.AlwaysBatch" />
         <property name="Client.Buffered" />
         <property name="Client.ForwardContext" />
         <property name="Client.SleepTime" />
@@ -642,15 +641,13 @@ generated from the section label.
         <property name="SSLPermissionsVerifier" class="proxy" />
         <property name="RoutingTable.MaxSize" />
         <property name="Server" class="objectadapter" />
-        <property name="Server.AlwaysBatch" />
         <property name="Server.Buffered" />
         <property name="Server.ForwardContext" />
         <property name="Server.SleepTime" />
         <property name="Server.Trace.Override" />
         <property name="Server.Trace.Request" />
         <property name="SessionManager" class="proxy" />
         <property name="SSLSessionManager" class="proxy" />
-        <property name="SessionTimeout" />
         <property name="Trace.RoutingTable" />
         <property name="Trace.Session" />
     </section>

diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules
@@ -9,7 +9,7 @@
 #
 # Supported configurations
 #
-supported-configs = shared static cpp11-shared cpp11-static
+supported-configs = cpp98-shared cpp98-static cpp11-shared cpp11-static
 
 -include        $(lang_srcdir)/config/Make.rules.$(os)
 ifeq ($(os),Darwin)
@@ -59,10 +59,15 @@ static_projects         = test/Common \
 static_excludes         = test/Ice/library test/Ice/plugin
 
 #
-# Components and projects which are built with C++11
+# Components and projects which are built with C++98
 #
-cpp11_components        = $(coreandstub_components) icebox
+cpp98_projects          = %
+cpp98_excludes          = glacier2router
 
+#
+# Components and projects which are built with C++11
+#
+cpp11_components        = $(coreandstub_components) glacier2router Glacier2CryptPermissionsVerifier icebox
 cpp11_projects          = test/Common \
                           test/IceUtil/% \
                           test/Slice/% \
@@ -97,16 +102,7 @@ endif
 # the cpp11 name to the target directory if building outside the build
 # directory.
 #
-cpp11_cppflags          = -DICE_CPP11_MAPPING
-ifneq ($(shell $(CC) -E config/cplusplus_check.cpp 1> /dev/null 2>&1; echo $$?),0)
-ifeq ($(os),Darwin)
-# With Xcode 14.3 C++17 deprecations apply when building with -std=c++11, we pass -std=c++17
-# to enable C++17 mode conditional code.
-cpp11_cppflags          := $(cpp11_cppflags) -std=c++17
-else
-cpp11_cppflags          := $(cpp11_cppflags) -std=c++11
-endif
-endif
+cpp11_cppflags          = -DICE_CPP11_MAPPING -std=c++17
 cpp11_ldflags           = $(cpp11_cppflags)
 cpp11_targetname        = $(if $(or $(filter-out $($1_target),program),$(filter $(bindir)%,$($4_targetdir))),++11)
 cpp11_targetdir         = $(if $(filter %/build,$5),cpp11)

diff --git a/cpp/config/Make.xcodesdk.rules b/cpp/config/Make.xcodesdk.rules
@@ -4,7 +4,7 @@
 
 include $(top_srcdir)/config/Make.xcodesdk.rules
 
-supported-configs       += xcodesdk cpp11-xcodesdk
+supported-configs       += cpp98-xcodesdk cpp11-xcodesdk
 
 is-iostest-program      = $(and $(filter-out macosx,$2),$(filter test/%,$1))
 

diff --git a/cpp/config/cplusplus_check.cpp b/cpp/config/cplusplus_check.cpp
diff --git a/cpp/msbuild/ice.v143.sln b/cpp/msbuild/ice.v143.sln
@@ -94,14 +94,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icegrid", "..\src\IceGridLi
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icegrid++11", "..\src\IceGridLib\msbuild\icegrid++11\icegrid++11.vcxproj", "{142A9562-8DEC-4B1B-9B15-2CAD8304447B}"
 	ProjectSection(ProjectDependencies) = postProject
-		{3AB9772C-6113-4F1C-90FB-5368E7486C11} = {3AB9772C-6113-4F1C-90FB-5368E7486C11}
 		{2940A3C2-A9BA-44AA-AF65-00479C783407} = {2940A3C2-A9BA-44AA-AF65-00479C783407}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glacier2cryptpermissionsverifier", "..\src\Glacier2CryptPermissionsVerifier\msbuild\glacier2cryptpermissionsverifier.vcxproj", "{519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6485EC94-6B47-428D-B42D-AAA11F08DB59} = {6485EC94-6B47-428D-B42D-AAA11F08DB59}
-		{C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}
+		{3AB9772C-6113-4F1C-90FB-5368E7486C11} = {3AB9772C-6113-4F1C-90FB-5368E7486C11}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icediscovery++11", "..\src\IceDiscovery\msbuild\icediscovery++11\icediscovery++11.vcxproj", "{270BB666-62FB-49ED-BFA2-8F279DC9ABDD}"
@@ -166,52 +160,52 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iceserviceinstall", "..\src
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icestormdb", "..\src\IceStorm\msbuild\icestormdb\icestormdb.vcxproj", "{F0B74B00-F252-4D38-A352-ED379CB196E9}"
 	ProjectSection(ProjectDependencies) = postProject
-		{E6864F0D-B2ED-406A-B98C-F3668A680005} = {E6864F0D-B2ED-406A-B98C-F3668A680005}
+		{18BF13D3-85D3-43A5-8C96-E52EB0672F72} = {18BF13D3-85D3-43A5-8C96-E52EB0672F72}
+		{588F90CA-62AC-4101-83FC-19AB9DB6B509} = {588F90CA-62AC-4101-83FC-19AB9DB6B509}
 		{994ADD25-20A0-4715-A3EC-9F86AFD481D0} = {994ADD25-20A0-4715-A3EC-9F86AFD481D0}
-		{E8ACC848-F7DA-4B29-B52F-81D66E7D397E} = {E8ACC848-F7DA-4B29-B52F-81D66E7D397E}
 		{C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}
-		{588F90CA-62AC-4101-83FC-19AB9DB6B509} = {588F90CA-62AC-4101-83FC-19AB9DB6B509}
-		{18BF13D3-85D3-43A5-8C96-E52EB0672F72} = {18BF13D3-85D3-43A5-8C96-E52EB0672F72}
+		{E6864F0D-B2ED-406A-B98C-F3668A680005} = {E6864F0D-B2ED-406A-B98C-F3668A680005}
+		{E8ACC848-F7DA-4B29-B52F-81D66E7D397E} = {E8ACC848-F7DA-4B29-B52F-81D66E7D397E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icestormservice", "..\src\IceStorm\msbuild\icestormservice\icestormservice.vcxproj", "{9E13C4B5-5DA9-43C1-9304-AEAC035E854D}"
 	ProjectSection(ProjectDependencies) = postProject
+		{18BF13D3-85D3-43A5-8C96-E52EB0672F72} = {18BF13D3-85D3-43A5-8C96-E52EB0672F72}
+		{588F90CA-62AC-4101-83FC-19AB9DB6B509} = {588F90CA-62AC-4101-83FC-19AB9DB6B509}
+		{C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}
 		{E6864F0D-B2ED-406A-B98C-F3668A680005} = {E6864F0D-B2ED-406A-B98C-F3668A680005}
 		{E8ACC848-F7DA-4B29-B52F-81D66E7D397E} = {E8ACC848-F7DA-4B29-B52F-81D66E7D397E}
-		{C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}
-		{588F90CA-62AC-4101-83FC-19AB9DB6B509} = {588F90CA-62AC-4101-83FC-19AB9DB6B509}
-		{18BF13D3-85D3-43A5-8C96-E52EB0672F72} = {18BF13D3-85D3-43A5-8C96-E52EB0672F72}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icestormadmin", "..\src\IceStorm\msbuild\icestormadmin\icestormadmin.vcxproj", "{8F1A1F99-DBE0-408D-99F7-D59142BD008C}"
 	ProjectSection(ProjectDependencies) = postProject
+		{18BF13D3-85D3-43A5-8C96-E52EB0672F72} = {18BF13D3-85D3-43A5-8C96-E52EB0672F72}
+		{588F90CA-62AC-4101-83FC-19AB9DB6B509} = {588F90CA-62AC-4101-83FC-19AB9DB6B509}
+		{C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}
 		{E6864F0D-B2ED-406A-B98C-F3668A680005} = {E6864F0D-B2ED-406A-B98C-F3668A680005}
 		{E8ACC848-F7DA-4B29-B52F-81D66E7D397E} = {E8ACC848-F7DA-4B29-B52F-81D66E7D397E}
-		{C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}
-		{588F90CA-62AC-4101-83FC-19AB9DB6B509} = {588F90CA-62AC-4101-83FC-19AB9DB6B509}
-		{18BF13D3-85D3-43A5-8C96-E52EB0672F72} = {18BF13D3-85D3-43A5-8C96-E52EB0672F72}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icegridadmin", "..\src\IceGrid\msbuild\icegridadmin\icegridadmin.vcxproj", "{1F4CA1BE-B405-400F-912E-F0CC7E369D59}"
 	ProjectSection(ProjectDependencies) = postProject
-		{994ADD25-20A0-4715-A3EC-9F86AFD481D0} = {994ADD25-20A0-4715-A3EC-9F86AFD481D0}
-		{81C8FC6A-CAC3-4B6D-AE4D-5DEAD29726C5} = {81C8FC6A-CAC3-4B6D-AE4D-5DEAD29726C5}
-		{5A8CEAB6-9F57-495C-B554-F93F842A0A28} = {5A8CEAB6-9F57-495C-B554-F93F842A0A28}
 		{18BF13D3-85D3-43A5-8C96-E52EB0672F72} = {18BF13D3-85D3-43A5-8C96-E52EB0672F72}
+		{5A8CEAB6-9F57-495C-B554-F93F842A0A28} = {5A8CEAB6-9F57-495C-B554-F93F842A0A28}
+		{81C8FC6A-CAC3-4B6D-AE4D-5DEAD29726C5} = {81C8FC6A-CAC3-4B6D-AE4D-5DEAD29726C5}
 		{90EC26E8-AFFA-4E44-B068-AB5849A96FDD} = {90EC26E8-AFFA-4E44-B068-AB5849A96FDD}
+		{994ADD25-20A0-4715-A3EC-9F86AFD481D0} = {994ADD25-20A0-4715-A3EC-9F86AFD481D0}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icegridnode", "..\src\IceGrid\msbuild\icegridnode\icegridnode.vcxproj", "{48EF9416-336F-4FA5-A376-FDFB7726ADBA}"
 	ProjectSection(ProjectDependencies) = postProject
-		{E6864F0D-B2ED-406A-B98C-F3668A680005} = {E6864F0D-B2ED-406A-B98C-F3668A680005}
-		{994ADD25-20A0-4715-A3EC-9F86AFD481D0} = {994ADD25-20A0-4715-A3EC-9F86AFD481D0}
-		{E8ACC848-F7DA-4B29-B52F-81D66E7D397E} = {E8ACC848-F7DA-4B29-B52F-81D66E7D397E}
+		{18BF13D3-85D3-43A5-8C96-E52EB0672F72} = {18BF13D3-85D3-43A5-8C96-E52EB0672F72}
+		{588F90CA-62AC-4101-83FC-19AB9DB6B509} = {588F90CA-62AC-4101-83FC-19AB9DB6B509}
 		{72FA68A9-49B6-4AB6-94AE-34BB03770A51} = {72FA68A9-49B6-4AB6-94AE-34BB03770A51}
+		{90EC26E8-AFFA-4E44-B068-AB5849A96FDD} = {90EC26E8-AFFA-4E44-B068-AB5849A96FDD}
+		{994ADD25-20A0-4715-A3EC-9F86AFD481D0} = {994ADD25-20A0-4715-A3EC-9F86AFD481D0}
 		{9E13C4B5-5DA9-43C1-9304-AEAC035E854D} = {9E13C4B5-5DA9-43C1-9304-AEAC035E854D}
 		{C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}
-		{588F90CA-62AC-4101-83FC-19AB9DB6B509} = {588F90CA-62AC-4101-83FC-19AB9DB6B509}
-		{18BF13D3-85D3-43A5-8C96-E52EB0672F72} = {18BF13D3-85D3-43A5-8C96-E52EB0672F72}
-		{90EC26E8-AFFA-4E44-B068-AB5849A96FDD} = {90EC26E8-AFFA-4E44-B068-AB5849A96FDD}
+		{E6864F0D-B2ED-406A-B98C-F3668A680005} = {E6864F0D-B2ED-406A-B98C-F3668A680005}
+		{E8ACC848-F7DA-4B29-B52F-81D66E7D397E} = {E8ACC848-F7DA-4B29-B52F-81D66E7D397E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icessl", "..\src\IceSSL\msbuild\icessl\icessl.vcxproj", "{72FA68A9-49B6-4AB6-94AE-34BB03770A51}"
@@ -221,14 +215,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icessl", "..\src\IceSSL\msb
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icegridregistry", "..\src\IceGrid\msbuild\icegridregistry\icegridregistry.vcxproj", "{64490115-464B-4DC3-B7C6-D0AF1B68B6F9}"
 	ProjectSection(ProjectDependencies) = postProject
-		{E6864F0D-B2ED-406A-B98C-F3668A680005} = {E6864F0D-B2ED-406A-B98C-F3668A680005}
-		{994ADD25-20A0-4715-A3EC-9F86AFD481D0} = {994ADD25-20A0-4715-A3EC-9F86AFD481D0}
+		{18BF13D3-85D3-43A5-8C96-E52EB0672F72} = {18BF13D3-85D3-43A5-8C96-E52EB0672F72}
+		{588F90CA-62AC-4101-83FC-19AB9DB6B509} = {588F90CA-62AC-4101-83FC-19AB9DB6B509}
 		{72FA68A9-49B6-4AB6-94AE-34BB03770A51} = {72FA68A9-49B6-4AB6-94AE-34BB03770A51}
+		{90EC26E8-AFFA-4E44-B068-AB5849A96FDD} = {90EC26E8-AFFA-4E44-B068-AB5849A96FDD}
+		{994ADD25-20A0-4715-A3EC-9F86AFD481D0} = {994ADD25-20A0-4715-A3EC-9F86AFD481D0}
 		{9E13C4B5-5DA9-43C1-9304-AEAC035E854D} = {9E13C4B5-5DA9-43C1-9304-AEAC035E854D}
 		{C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}
-		{588F90CA-62AC-4101-83FC-19AB9DB6B509} = {588F90CA-62AC-4101-83FC-19AB9DB6B509}
-		{18BF13D3-85D3-43A5-8C96-E52EB0672F72} = {18BF13D3-85D3-43A5-8C96-E52EB0672F72}
-		{90EC26E8-AFFA-4E44-B068-AB5849A96FDD} = {90EC26E8-AFFA-4E44-B068-AB5849A96FDD}
+		{E6864F0D-B2ED-406A-B98C-F3668A680005} = {E6864F0D-B2ED-406A-B98C-F3668A680005}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icessl++11", "..\src\IceSSL\msbuild\icessl++11\icessl++11.vcxproj", "{5923B17D-2873-4245-87A7-FB8F4BE12501}"
@@ -252,15 +246,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "C++11", "C++11", "{F48CC091
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glacier2router", "..\src\Glacier2\msbuild\glacier2router.vcxproj", "{541CF1D6-95FD-4499-AB02-75CCCEE660B0}"
 	ProjectSection(ProjectDependencies) = postProject
-		{72FA68A9-49B6-4AB6-94AE-34BB03770A51} = {72FA68A9-49B6-4AB6-94AE-34BB03770A51}
-		{C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}
+		{2940A3C2-A9BA-44AA-AF65-00479C783407} = {2940A3C2-A9BA-44AA-AF65-00479C783407}
+		{3AB9772C-6113-4F1C-90FB-5368E7486C11} = {3AB9772C-6113-4F1C-90FB-5368E7486C11}
+		{5923B17D-2873-4245-87A7-FB8F4BE12501} = {5923B17D-2873-4245-87A7-FB8F4BE12501}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icegriddb", "..\src\icegriddb\msbuild\icegriddb.vcxproj", "{369524F4-D374-44F4-BCFD-408934595701}"
 	ProjectSection(ProjectDependencies) = postProject
-		{E8ACC848-F7DA-4B29-B52F-81D66E7D397E} = {E8ACC848-F7DA-4B29-B52F-81D66E7D397E}
-		{6485EC94-6B47-428D-B42D-AAA11F08DB59} = {6485EC94-6B47-428D-B42D-AAA11F08DB59}
 		{18BF13D3-85D3-43A5-8C96-E52EB0672F72} = {18BF13D3-85D3-43A5-8C96-E52EB0672F72}
+		{6485EC94-6B47-428D-B42D-AAA11F08DB59} = {6485EC94-6B47-428D-B42D-AAA11F08DB59}
+		{E8ACC848-F7DA-4B29-B52F-81D66E7D397E} = {E8ACC848-F7DA-4B29-B52F-81D66E7D397E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icebridge", "..\src\IceBridge\msbuild\icebridge.vcxproj", "{1D6E8807-7C28-421F-B49E-BCB482FCB21D}"
@@ -284,6 +279,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icesslopenssl", "..\src\Ice
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ice2slice", "..\src\ice2slice\msbuild\ice2slice.vcxproj", "{773EA63E-40AE-45B8-82B4-82B54CF309F8}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glacier2cryptpermissionsverifier", "..\src\Glacier2CryptPermissionsVerifier\msbuild\glacier2cryptpermissionsverifier\glacier2cryptpermissionsverifier.vcxproj", "{519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}"
+	ProjectSection(ProjectDependencies) = postProject
+		{2940A3C2-A9BA-44AA-AF65-00479C783407} = {2940A3C2-A9BA-44AA-AF65-00479C783407}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -444,14 +444,6 @@ Global
 		{142A9562-8DEC-4B1B-9B15-2CAD8304447B}.Release|Win32.Build.0 = Release|Win32
 		{142A9562-8DEC-4B1B-9B15-2CAD8304447B}.Release|x64.ActiveCfg = Release|x64
 		{142A9562-8DEC-4B1B-9B15-2CAD8304447B}.Release|x64.Build.0 = Release|x64
-		{519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}.Debug|Win32.Build.0 = Debug|Win32
-		{519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}.Debug|x64.ActiveCfg = Debug|x64
-		{519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}.Debug|x64.Build.0 = Debug|x64
-		{519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}.Release|Win32.ActiveCfg = Release|Win32
-		{519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}.Release|Win32.Build.0 = Release|Win32
-		{519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}.Release|x64.ActiveCfg = Release|x64
-		{519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}.Release|x64.Build.0 = Release|x64
 		{270BB666-62FB-49ED-BFA2-8F279DC9ABDD}.Debug|Win32.ActiveCfg = Debug|Win32
 		{270BB666-62FB-49ED-BFA2-8F279DC9ABDD}.Debug|Win32.Build.0 = Debug|Win32
 		{270BB666-62FB-49ED-BFA2-8F279DC9ABDD}.Debug|x64.ActiveCfg = Debug|x64
@@ -692,6 +684,14 @@ Global
 		{773EA63E-40AE-45B8-82B4-82B54CF309F8}.Release|Win32.Build.0 = Release|Win32
 		{773EA63E-40AE-45B8-82B4-82B54CF309F8}.Release|x64.ActiveCfg = Release|x64
 		{773EA63E-40AE-45B8-82B4-82B54CF309F8}.Release|x64.Build.0 = Release|x64
+		{519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}.Debug|Win32.Build.0 = Debug|Win32
+		{519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}.Debug|x64.ActiveCfg = Debug|x64
+		{519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}.Debug|x64.Build.0 = Debug|x64
+		{519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}.Release|Win32.ActiveCfg = Release|Win32
+		{519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}.Release|Win32.Build.0 = Release|Win32
+		{519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}.Release|x64.ActiveCfg = Release|x64
+		{519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -716,7 +716,6 @@ Global
 		{994ADD25-20A0-4715-A3EC-9F86AFD481D0} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9}
 		{18BF13D3-85D3-43A5-8C96-E52EB0672F72} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9}
 		{142A9562-8DEC-4B1B-9B15-2CAD8304447B} = {F48CC091-6F26-4EC8-A2FB-485975E7C908}
-		{519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9}
 		{270BB666-62FB-49ED-BFA2-8F279DC9ABDD} = {F48CC091-6F26-4EC8-A2FB-485975E7C908}
 		{5A8CEAB6-9F57-495C-B554-F93F842A0A28} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9}
 		{C694B856-3393-41B4-B3DC-3A5AD9A92A3D} = {F48CC091-6F26-4EC8-A2FB-485975E7C908}
@@ -739,14 +738,15 @@ Global
 		{5923B17D-2873-4245-87A7-FB8F4BE12501} = {F48CC091-6F26-4EC8-A2FB-485975E7C908}
 		{3850C9C9-BA92-4EE6-9E77-E5BAE2A9BC81} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9}
 		{C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9}
-		{541CF1D6-95FD-4499-AB02-75CCCEE660B0} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9}
+		{541CF1D6-95FD-4499-AB02-75CCCEE660B0} = {F48CC091-6F26-4EC8-A2FB-485975E7C908}
 		{369524F4-D374-44F4-BCFD-408934595701} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9}
 		{1D6E8807-7C28-421F-B49E-BCB482FCB21D} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9}
 		{A79E9EB0-878C-4EDB-9804-2D262D6008DB} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9}
 		{D64AAD99-11C7-4C69-BD27-9FA9C71A36AC} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9}
 		{D0DC2305-37FE-4D03-BE05-AC8912678DC8} = {F48CC091-6F26-4EC8-A2FB-485975E7C908}
 		{0D08F6B8-39C0-413B-84CE-D73230BCC740} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9}
 		{773EA63E-40AE-45B8-82B4-82B54CF309F8} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9}
+		{519CB7EF-8E49-4BC1-B3DB-181BEF5AC3B3} = {F48CC091-6F26-4EC8-A2FB-485975E7C908}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {AAB39BE9-A7ED-4C54-80FE-D63A173ABB06}