diff options
author | Austin Henriksen <austin@zeroc.com> | 2021-02-03 18:11:49 -0500 |
---|---|---|
committer | Joe George <joe@zeroc.com> | 2021-02-09 13:15:43 -0500 |
commit | 24f320be8cfd21c1c5710e4590bb53561b72fdb5 (patch) | |
tree | 2a8e52388c4f9e35a4d01b9f3075393b98986468 | |
parent | Regenerated IceStorm scanner. (diff) | |
download | ice-24f320be8cfd21c1c5710e4590bb53561b72fdb5.tar.bz2 ice-24f320be8cfd21c1c5710e4590bb53561b72fdb5.tar.xz ice-24f320be8cfd21c1c5710e4590bb53561b72fdb5.zip |
Repaired VS project and solution files.
-rw-r--r-- | cpp/msbuild/ice.cpp.props | 1 | ||||
-rw-r--r-- | cpp/msbuild/ice.test.sln | 383 | ||||
-rw-r--r-- | cpp/msbuild/ice.v140.sln | 101 | ||||
-rw-r--r-- | cpp/msbuild/ice.v141.sln | 90 | ||||
-rw-r--r-- | cpp/msbuild/ice.v142.sln | 101 | ||||
-rw-r--r-- | cpp/src/Glacier2/msbuild/glacier2router.vcxproj | 2 | ||||
-rw-r--r-- | cpp/src/IceBox/msbuild/iceboxadmin/iceboxadmin.vcxproj | 2 | ||||
-rw-r--r-- | cpp/src/IceBridge/msbuild/icebridge.vcxproj | 2 | ||||
-rw-r--r-- | cpp/src/IceDB/msbuild/icedb.vcxproj | 2 | ||||
-rw-r--r-- | cpp/src/IceGrid/Scanner.cpp | 1 | ||||
-rw-r--r-- | cpp/src/IceGrid/msbuild/icegridadmin/icegridadmin.vcxproj | 2 | ||||
-rw-r--r-- | cpp/src/IceGrid/msbuild/icegridnode/icegridnode.vcxproj | 2 | ||||
-rw-r--r-- | cpp/src/IceGrid/msbuild/icegridregistry/icegridregistry.vcxproj | 2 | ||||
-rw-r--r-- | cpp/src/IceStorm/msbuild/icestormadmin/icestormadmin.vcxproj | 2 | ||||
-rw-r--r-- | cpp/src/IceStorm/msbuild/icestormdb/icestormdb.vcxproj | 2 | ||||
-rw-r--r-- | cpp/src/IceStorm/msbuild/icestormservice/icestormservice.vcxproj | 3 | ||||
-rw-r--r-- | cpp/src/IceXML/msbuild/icexml.vcxproj | 3 | ||||
-rw-r--r-- | cpp/src/icegriddb/msbuild/icegriddb.vcxproj | 2 |
18 files changed, 285 insertions, 418 deletions
diff --git a/cpp/msbuild/ice.cpp.props b/cpp/msbuild/ice.cpp.props index 9aad2473e84..eae41186a77 100644 --- a/cpp/msbuild/ice.cpp.props +++ b/cpp/msbuild/ice.cpp.props @@ -158,6 +158,7 @@ --> <ItemDefinitionGroup Condition="'$(IceCppMapping)' == 'cpp11'"> <ClCompile> + <LanguageStandard>stdcpp17</LanguageStandard> <PreprocessorDefinitions>ICE_CPP11_MAPPING;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalOptions Condition="'$(DefaultPlatformToolset)' == 'v141' OR '$(DefaultPlatformToolset)' == 'v142'">/utf-8 %(AdditionalOptions)</AdditionalOptions> </ClCompile> diff --git a/cpp/msbuild/ice.test.sln b/cpp/msbuild/ice.test.sln index cfaf61ba7c1..266bcb94a3d 100644 --- a/cpp/msbuild/ice.test.sln +++ b/cpp/msbuild/ice.test.sln @@ -1,7 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27703.2026 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30907.101 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "..\test\Ice\acm\msbuild\client\client.vcxproj", "{CD25A05C-228D-473F-A86F-6C2DD22085B4}" ProjectSection(ProjectDependencies) = postProject @@ -145,7 +145,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "collocated", "..\test\Ice\e {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "..\test\Ice\exceptions\msbuild\server\server.vcxproj", "{24550251-512C-4DC0-9B62-7DB6664DDCA8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "..\test\Ice\exceptions\msbuild\server\server.vcxproj", "{00000245-0000-0000-0000-000000000000}" ProjectSection(ProjectDependencies) = postProject {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} EndProjectSection @@ -1037,7 +1037,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "..\test\IceGrid\s {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "..\test\IceGrid\session\msbuild\server\server.vcxproj", "{35F085D1-34B8-450C-AE23-FCF994DE4879}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "..\test\IceGrid\session\msbuild\server\server.vcxproj", "{00000035-0000-0000-0000-000000000000}" ProjectSection(ProjectDependencies) = postProject {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} EndProjectSection @@ -1543,22 +1543,22 @@ Global {3A38F35B-3A61-4490-955D-D1CAE61CB7FD}.Release|Win32.Build.0 = Release|Win32 {3A38F35B-3A61-4490-955D-D1CAE61CB7FD}.Release|x64.ActiveCfg = Release|x64 {3A38F35B-3A61-4490-955D-D1CAE61CB7FD}.Release|x64.Build.0 = Release|x64 - {24550251-512C-4DC0-9B62-7DB6664DDCA8}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {24550251-512C-4DC0-9B62-7DB6664DDCA8}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {24550251-512C-4DC0-9B62-7DB6664DDCA8}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {24550251-512C-4DC0-9B62-7DB6664DDCA8}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {24550251-512C-4DC0-9B62-7DB6664DDCA8}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {24550251-512C-4DC0-9B62-7DB6664DDCA8}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {24550251-512C-4DC0-9B62-7DB6664DDCA8}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {24550251-512C-4DC0-9B62-7DB6664DDCA8}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 - {24550251-512C-4DC0-9B62-7DB6664DDCA8}.Debug|Win32.ActiveCfg = Debug|Win32 - {24550251-512C-4DC0-9B62-7DB6664DDCA8}.Debug|Win32.Build.0 = Debug|Win32 - {24550251-512C-4DC0-9B62-7DB6664DDCA8}.Debug|x64.ActiveCfg = Debug|x64 - {24550251-512C-4DC0-9B62-7DB6664DDCA8}.Debug|x64.Build.0 = Debug|x64 - {24550251-512C-4DC0-9B62-7DB6664DDCA8}.Release|Win32.ActiveCfg = Release|Win32 - {24550251-512C-4DC0-9B62-7DB6664DDCA8}.Release|Win32.Build.0 = Release|Win32 - {24550251-512C-4DC0-9B62-7DB6664DDCA8}.Release|x64.ActiveCfg = Release|x64 - {24550251-512C-4DC0-9B62-7DB6664DDCA8}.Release|x64.Build.0 = Release|x64 + {00000245-0000-0000-0000-000000000000}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {00000245-0000-0000-0000-000000000000}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 + {00000245-0000-0000-0000-000000000000}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 + {00000245-0000-0000-0000-000000000000}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 + {00000245-0000-0000-0000-000000000000}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {00000245-0000-0000-0000-000000000000}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 + {00000245-0000-0000-0000-000000000000}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 + {00000245-0000-0000-0000-000000000000}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {00000245-0000-0000-0000-000000000000}.Debug|Win32.ActiveCfg = Debug|Win32 + {00000245-0000-0000-0000-000000000000}.Debug|Win32.Build.0 = Debug|Win32 + {00000245-0000-0000-0000-000000000000}.Debug|x64.ActiveCfg = Debug|x64 + {00000245-0000-0000-0000-000000000000}.Debug|x64.Build.0 = Debug|x64 + {00000245-0000-0000-0000-000000000000}.Release|Win32.ActiveCfg = Release|Win32 + {00000245-0000-0000-0000-000000000000}.Release|Win32.Build.0 = Release|Win32 + {00000245-0000-0000-0000-000000000000}.Release|x64.ActiveCfg = Release|x64 + {00000245-0000-0000-0000-000000000000}.Release|x64.Build.0 = Release|x64 {8D0B611C-F9C2-4B53-8497-7BD8036BD831}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 {8D0B611C-F9C2-4B53-8497-7BD8036BD831}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {8D0B611C-F9C2-4B53-8497-7BD8036BD831}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 @@ -2628,125 +2628,105 @@ Global {74127AED-9D17-4789-8B2F-9CCD660E7204}.Release|x64.ActiveCfg = Release|x64 {74127AED-9D17-4789-8B2F-9CCD660E7204}.Release|x64.Build.0 = Release|x64 {DE360450-9BF9-42FB-98FD-3D29C5CAF6DA}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {DE360450-9BF9-42FB-98FD-3D29C5CAF6DA}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {DE360450-9BF9-42FB-98FD-3D29C5CAF6DA}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {DE360450-9BF9-42FB-98FD-3D29C5CAF6DA}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {DE360450-9BF9-42FB-98FD-3D29C5CAF6DA}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {DE360450-9BF9-42FB-98FD-3D29C5CAF6DA}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {DE360450-9BF9-42FB-98FD-3D29C5CAF6DA}.Debug|Win32.ActiveCfg = Debug|Win32 - {DE360450-9BF9-42FB-98FD-3D29C5CAF6DA}.Debug|Win32.Build.0 = Debug|Win32 {DE360450-9BF9-42FB-98FD-3D29C5CAF6DA}.Debug|x64.ActiveCfg = Debug|x64 - {DE360450-9BF9-42FB-98FD-3D29C5CAF6DA}.Debug|x64.Build.0 = Debug|x64 {DE360450-9BF9-42FB-98FD-3D29C5CAF6DA}.Release|Win32.ActiveCfg = Release|Win32 - {DE360450-9BF9-42FB-98FD-3D29C5CAF6DA}.Release|Win32.Build.0 = Release|Win32 {DE360450-9BF9-42FB-98FD-3D29C5CAF6DA}.Release|x64.ActiveCfg = Release|x64 - {DE360450-9BF9-42FB-98FD-3D29C5CAF6DA}.Release|x64.Build.0 = Release|x64 {D6C3E453-ED0B-41CA-84E6-7D07D8867A2D}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {D6C3E453-ED0B-41CA-84E6-7D07D8867A2D}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {D6C3E453-ED0B-41CA-84E6-7D07D8867A2D}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {D6C3E453-ED0B-41CA-84E6-7D07D8867A2D}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {D6C3E453-ED0B-41CA-84E6-7D07D8867A2D}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {D6C3E453-ED0B-41CA-84E6-7D07D8867A2D}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {D6C3E453-ED0B-41CA-84E6-7D07D8867A2D}.Debug|Win32.ActiveCfg = Debug|Win32 - {D6C3E453-ED0B-41CA-84E6-7D07D8867A2D}.Debug|Win32.Build.0 = Debug|Win32 {D6C3E453-ED0B-41CA-84E6-7D07D8867A2D}.Debug|x64.ActiveCfg = Debug|x64 - {D6C3E453-ED0B-41CA-84E6-7D07D8867A2D}.Debug|x64.Build.0 = Debug|x64 {D6C3E453-ED0B-41CA-84E6-7D07D8867A2D}.Release|Win32.ActiveCfg = Release|Win32 - {D6C3E453-ED0B-41CA-84E6-7D07D8867A2D}.Release|Win32.Build.0 = Release|Win32 {D6C3E453-ED0B-41CA-84E6-7D07D8867A2D}.Release|x64.ActiveCfg = Release|x64 - {D6C3E453-ED0B-41CA-84E6-7D07D8867A2D}.Release|x64.Build.0 = Release|x64 {14C78FC0-F80C-425F-A504-1DD264BCDD01}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {14C78FC0-F80C-425F-A504-1DD264BCDD01}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {14C78FC0-F80C-425F-A504-1DD264BCDD01}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {14C78FC0-F80C-425F-A504-1DD264BCDD01}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {14C78FC0-F80C-425F-A504-1DD264BCDD01}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {14C78FC0-F80C-425F-A504-1DD264BCDD01}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {14C78FC0-F80C-425F-A504-1DD264BCDD01}.Debug|Win32.ActiveCfg = Debug|Win32 - {14C78FC0-F80C-425F-A504-1DD264BCDD01}.Debug|Win32.Build.0 = Debug|Win32 {14C78FC0-F80C-425F-A504-1DD264BCDD01}.Debug|x64.ActiveCfg = Debug|x64 - {14C78FC0-F80C-425F-A504-1DD264BCDD01}.Debug|x64.Build.0 = Debug|x64 {14C78FC0-F80C-425F-A504-1DD264BCDD01}.Release|Win32.ActiveCfg = Release|Win32 - {14C78FC0-F80C-425F-A504-1DD264BCDD01}.Release|Win32.Build.0 = Release|Win32 {14C78FC0-F80C-425F-A504-1DD264BCDD01}.Release|x64.ActiveCfg = Release|x64 - {14C78FC0-F80C-425F-A504-1DD264BCDD01}.Release|x64.Build.0 = Release|x64 {814690FE-2C4F-4EF4-82CB-720BC4C8FF9B}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {814690FE-2C4F-4EF4-82CB-720BC4C8FF9B}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {814690FE-2C4F-4EF4-82CB-720BC4C8FF9B}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {814690FE-2C4F-4EF4-82CB-720BC4C8FF9B}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {814690FE-2C4F-4EF4-82CB-720BC4C8FF9B}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {814690FE-2C4F-4EF4-82CB-720BC4C8FF9B}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {814690FE-2C4F-4EF4-82CB-720BC4C8FF9B}.Debug|Win32.ActiveCfg = Debug|Win32 - {814690FE-2C4F-4EF4-82CB-720BC4C8FF9B}.Debug|Win32.Build.0 = Debug|Win32 {814690FE-2C4F-4EF4-82CB-720BC4C8FF9B}.Debug|x64.ActiveCfg = Debug|x64 - {814690FE-2C4F-4EF4-82CB-720BC4C8FF9B}.Debug|x64.Build.0 = Debug|x64 {814690FE-2C4F-4EF4-82CB-720BC4C8FF9B}.Release|Win32.ActiveCfg = Release|Win32 - {814690FE-2C4F-4EF4-82CB-720BC4C8FF9B}.Release|Win32.Build.0 = Release|Win32 {814690FE-2C4F-4EF4-82CB-720BC4C8FF9B}.Release|x64.ActiveCfg = Release|x64 - {814690FE-2C4F-4EF4-82CB-720BC4C8FF9B}.Release|x64.Build.0 = Release|x64 {3C394401-8E95-475B-8B35-B90A7CCAE578}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {3C394401-8E95-475B-8B35-B90A7CCAE578}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {3C394401-8E95-475B-8B35-B90A7CCAE578}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {3C394401-8E95-475B-8B35-B90A7CCAE578}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {3C394401-8E95-475B-8B35-B90A7CCAE578}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {3C394401-8E95-475B-8B35-B90A7CCAE578}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {3C394401-8E95-475B-8B35-B90A7CCAE578}.Debug|Win32.ActiveCfg = Debug|Win32 - {3C394401-8E95-475B-8B35-B90A7CCAE578}.Debug|Win32.Build.0 = Debug|Win32 {3C394401-8E95-475B-8B35-B90A7CCAE578}.Debug|x64.ActiveCfg = Debug|x64 - {3C394401-8E95-475B-8B35-B90A7CCAE578}.Debug|x64.Build.0 = Debug|x64 {3C394401-8E95-475B-8B35-B90A7CCAE578}.Release|Win32.ActiveCfg = Release|Win32 - {3C394401-8E95-475B-8B35-B90A7CCAE578}.Release|Win32.Build.0 = Release|Win32 {3C394401-8E95-475B-8B35-B90A7CCAE578}.Release|x64.ActiveCfg = Release|x64 - {3C394401-8E95-475B-8B35-B90A7CCAE578}.Release|x64.Build.0 = Release|x64 {E1510790-AF0B-4FFE-B6AA-B75119793AFC}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {E1510790-AF0B-4FFE-B6AA-B75119793AFC}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {E1510790-AF0B-4FFE-B6AA-B75119793AFC}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {E1510790-AF0B-4FFE-B6AA-B75119793AFC}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {E1510790-AF0B-4FFE-B6AA-B75119793AFC}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {E1510790-AF0B-4FFE-B6AA-B75119793AFC}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {E1510790-AF0B-4FFE-B6AA-B75119793AFC}.Debug|Win32.ActiveCfg = Debug|Win32 - {E1510790-AF0B-4FFE-B6AA-B75119793AFC}.Debug|Win32.Build.0 = Debug|Win32 {E1510790-AF0B-4FFE-B6AA-B75119793AFC}.Debug|x64.ActiveCfg = Debug|x64 - {E1510790-AF0B-4FFE-B6AA-B75119793AFC}.Debug|x64.Build.0 = Debug|x64 {E1510790-AF0B-4FFE-B6AA-B75119793AFC}.Release|Win32.ActiveCfg = Release|Win32 - {E1510790-AF0B-4FFE-B6AA-B75119793AFC}.Release|Win32.Build.0 = Release|Win32 {E1510790-AF0B-4FFE-B6AA-B75119793AFC}.Release|x64.ActiveCfg = Release|x64 - {E1510790-AF0B-4FFE-B6AA-B75119793AFC}.Release|x64.Build.0 = Release|x64 {7CB05069-58C9-4C7D-A6A6-DBFB1CE7C58C}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {7CB05069-58C9-4C7D-A6A6-DBFB1CE7C58C}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {7CB05069-58C9-4C7D-A6A6-DBFB1CE7C58C}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {7CB05069-58C9-4C7D-A6A6-DBFB1CE7C58C}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {7CB05069-58C9-4C7D-A6A6-DBFB1CE7C58C}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {7CB05069-58C9-4C7D-A6A6-DBFB1CE7C58C}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {7CB05069-58C9-4C7D-A6A6-DBFB1CE7C58C}.Debug|Win32.ActiveCfg = Debug|Win32 - {7CB05069-58C9-4C7D-A6A6-DBFB1CE7C58C}.Debug|Win32.Build.0 = Debug|Win32 {7CB05069-58C9-4C7D-A6A6-DBFB1CE7C58C}.Debug|x64.ActiveCfg = Debug|x64 - {7CB05069-58C9-4C7D-A6A6-DBFB1CE7C58C}.Debug|x64.Build.0 = Debug|x64 {7CB05069-58C9-4C7D-A6A6-DBFB1CE7C58C}.Release|Win32.ActiveCfg = Release|Win32 - {7CB05069-58C9-4C7D-A6A6-DBFB1CE7C58C}.Release|Win32.Build.0 = Release|Win32 {7CB05069-58C9-4C7D-A6A6-DBFB1CE7C58C}.Release|x64.ActiveCfg = Release|x64 - {7CB05069-58C9-4C7D-A6A6-DBFB1CE7C58C}.Release|x64.Build.0 = Release|x64 {3BD0D95D-8DC6-4A07-B4D9-72EC85C4C97A}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {3BD0D95D-8DC6-4A07-B4D9-72EC85C4C97A}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {3BD0D95D-8DC6-4A07-B4D9-72EC85C4C97A}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {3BD0D95D-8DC6-4A07-B4D9-72EC85C4C97A}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {3BD0D95D-8DC6-4A07-B4D9-72EC85C4C97A}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {3BD0D95D-8DC6-4A07-B4D9-72EC85C4C97A}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {3BD0D95D-8DC6-4A07-B4D9-72EC85C4C97A}.Debug|Win32.ActiveCfg = Debug|Win32 - {3BD0D95D-8DC6-4A07-B4D9-72EC85C4C97A}.Debug|Win32.Build.0 = Debug|Win32 {3BD0D95D-8DC6-4A07-B4D9-72EC85C4C97A}.Debug|x64.ActiveCfg = Debug|x64 - {3BD0D95D-8DC6-4A07-B4D9-72EC85C4C97A}.Debug|x64.Build.0 = Debug|x64 {3BD0D95D-8DC6-4A07-B4D9-72EC85C4C97A}.Release|Win32.ActiveCfg = Release|Win32 - {3BD0D95D-8DC6-4A07-B4D9-72EC85C4C97A}.Release|Win32.Build.0 = Release|Win32 {3BD0D95D-8DC6-4A07-B4D9-72EC85C4C97A}.Release|x64.ActiveCfg = Release|x64 - {3BD0D95D-8DC6-4A07-B4D9-72EC85C4C97A}.Release|x64.Build.0 = Release|x64 {8CCBFE0A-E0EE-40B7-A78A-C36B7615618A}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {8CCBFE0A-E0EE-40B7-A78A-C36B7615618A}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {8CCBFE0A-E0EE-40B7-A78A-C36B7615618A}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {8CCBFE0A-E0EE-40B7-A78A-C36B7615618A}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {8CCBFE0A-E0EE-40B7-A78A-C36B7615618A}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {8CCBFE0A-E0EE-40B7-A78A-C36B7615618A}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {8CCBFE0A-E0EE-40B7-A78A-C36B7615618A}.Debug|Win32.ActiveCfg = Debug|Win32 - {8CCBFE0A-E0EE-40B7-A78A-C36B7615618A}.Debug|Win32.Build.0 = Debug|Win32 {8CCBFE0A-E0EE-40B7-A78A-C36B7615618A}.Debug|x64.ActiveCfg = Debug|x64 - {8CCBFE0A-E0EE-40B7-A78A-C36B7615618A}.Debug|x64.Build.0 = Debug|x64 {8CCBFE0A-E0EE-40B7-A78A-C36B7615618A}.Release|Win32.ActiveCfg = Release|Win32 - {8CCBFE0A-E0EE-40B7-A78A-C36B7615618A}.Release|Win32.Build.0 = Release|Win32 {8CCBFE0A-E0EE-40B7-A78A-C36B7615618A}.Release|x64.ActiveCfg = Release|x64 - {8CCBFE0A-E0EE-40B7-A78A-C36B7615618A}.Release|x64.Build.0 = Release|x64 {40C0ABA8-A839-4988-AC60-04F649B44C54}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {40C0ABA8-A839-4988-AC60-04F649B44C54}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {40C0ABA8-A839-4988-AC60-04F649B44C54}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {40C0ABA8-A839-4988-AC60-04F649B44C54}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {40C0ABA8-A839-4988-AC60-04F649B44C54}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {40C0ABA8-A839-4988-AC60-04F649B44C54}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {40C0ABA8-A839-4988-AC60-04F649B44C54}.Debug|Win32.ActiveCfg = Debug|Win32 - {40C0ABA8-A839-4988-AC60-04F649B44C54}.Debug|Win32.Build.0 = Debug|Win32 {40C0ABA8-A839-4988-AC60-04F649B44C54}.Debug|x64.ActiveCfg = Debug|x64 - {40C0ABA8-A839-4988-AC60-04F649B44C54}.Debug|x64.Build.0 = Debug|x64 {40C0ABA8-A839-4988-AC60-04F649B44C54}.Release|Win32.ActiveCfg = Release|Win32 - {40C0ABA8-A839-4988-AC60-04F649B44C54}.Release|Win32.Build.0 = Release|Win32 {40C0ABA8-A839-4988-AC60-04F649B44C54}.Release|x64.ActiveCfg = Release|x64 - {40C0ABA8-A839-4988-AC60-04F649B44C54}.Release|x64.Build.0 = Release|x64 {BF42E24D-954E-47A6-8699-B2F764939757}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 {BF42E24D-954E-47A6-8699-B2F764939757}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {BF42E24D-954E-47A6-8699-B2F764939757}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 @@ -2756,13 +2736,9 @@ Global {BF42E24D-954E-47A6-8699-B2F764939757}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {BF42E24D-954E-47A6-8699-B2F764939757}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {BF42E24D-954E-47A6-8699-B2F764939757}.Debug|Win32.ActiveCfg = Debug|Win32 - {BF42E24D-954E-47A6-8699-B2F764939757}.Debug|Win32.Build.0 = Debug|Win32 {BF42E24D-954E-47A6-8699-B2F764939757}.Debug|x64.ActiveCfg = Debug|x64 - {BF42E24D-954E-47A6-8699-B2F764939757}.Debug|x64.Build.0 = Debug|x64 {BF42E24D-954E-47A6-8699-B2F764939757}.Release|Win32.ActiveCfg = Release|Win32 - {BF42E24D-954E-47A6-8699-B2F764939757}.Release|Win32.Build.0 = Release|Win32 {BF42E24D-954E-47A6-8699-B2F764939757}.Release|x64.ActiveCfg = Release|x64 - {BF42E24D-954E-47A6-8699-B2F764939757}.Release|x64.Build.0 = Release|x64 {D3978518-2640-48BE-9D42-F664742BCB45}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 {D3978518-2640-48BE-9D42-F664742BCB45}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {D3978518-2640-48BE-9D42-F664742BCB45}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 @@ -2772,61 +2748,49 @@ Global {D3978518-2640-48BE-9D42-F664742BCB45}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {D3978518-2640-48BE-9D42-F664742BCB45}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {D3978518-2640-48BE-9D42-F664742BCB45}.Debug|Win32.ActiveCfg = Debug|Win32 - {D3978518-2640-48BE-9D42-F664742BCB45}.Debug|Win32.Build.0 = Debug|Win32 {D3978518-2640-48BE-9D42-F664742BCB45}.Debug|x64.ActiveCfg = Debug|x64 - {D3978518-2640-48BE-9D42-F664742BCB45}.Debug|x64.Build.0 = Debug|x64 {D3978518-2640-48BE-9D42-F664742BCB45}.Release|Win32.ActiveCfg = Release|Win32 - {D3978518-2640-48BE-9D42-F664742BCB45}.Release|Win32.Build.0 = Release|Win32 {D3978518-2640-48BE-9D42-F664742BCB45}.Release|x64.ActiveCfg = Release|x64 - {D3978518-2640-48BE-9D42-F664742BCB45}.Release|x64.Build.0 = Release|x64 {F0F9CA32-65BC-4F71-9901-E231FD485CDA}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {F0F9CA32-65BC-4F71-9901-E231FD485CDA}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {F0F9CA32-65BC-4F71-9901-E231FD485CDA}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {F0F9CA32-65BC-4F71-9901-E231FD485CDA}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {F0F9CA32-65BC-4F71-9901-E231FD485CDA}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {F0F9CA32-65BC-4F71-9901-E231FD485CDA}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {F0F9CA32-65BC-4F71-9901-E231FD485CDA}.Debug|Win32.ActiveCfg = Debug|Win32 - {F0F9CA32-65BC-4F71-9901-E231FD485CDA}.Debug|Win32.Build.0 = Debug|Win32 {F0F9CA32-65BC-4F71-9901-E231FD485CDA}.Debug|x64.ActiveCfg = Debug|x64 - {F0F9CA32-65BC-4F71-9901-E231FD485CDA}.Debug|x64.Build.0 = Debug|x64 {F0F9CA32-65BC-4F71-9901-E231FD485CDA}.Release|Win32.ActiveCfg = Release|Win32 - {F0F9CA32-65BC-4F71-9901-E231FD485CDA}.Release|Win32.Build.0 = Release|Win32 {F0F9CA32-65BC-4F71-9901-E231FD485CDA}.Release|x64.ActiveCfg = Release|x64 - {F0F9CA32-65BC-4F71-9901-E231FD485CDA}.Release|x64.Build.0 = Release|x64 {5579253D-24F6-4001-BF9E-D0D6DA3EF928}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {5579253D-24F6-4001-BF9E-D0D6DA3EF928}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {5579253D-24F6-4001-BF9E-D0D6DA3EF928}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {5579253D-24F6-4001-BF9E-D0D6DA3EF928}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {5579253D-24F6-4001-BF9E-D0D6DA3EF928}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {5579253D-24F6-4001-BF9E-D0D6DA3EF928}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {5579253D-24F6-4001-BF9E-D0D6DA3EF928}.Debug|Win32.ActiveCfg = Debug|Win32 - {5579253D-24F6-4001-BF9E-D0D6DA3EF928}.Debug|Win32.Build.0 = Debug|Win32 {5579253D-24F6-4001-BF9E-D0D6DA3EF928}.Debug|x64.ActiveCfg = Debug|x64 - {5579253D-24F6-4001-BF9E-D0D6DA3EF928}.Debug|x64.Build.0 = Debug|x64 {5579253D-24F6-4001-BF9E-D0D6DA3EF928}.Release|Win32.ActiveCfg = Release|Win32 - {5579253D-24F6-4001-BF9E-D0D6DA3EF928}.Release|Win32.Build.0 = Release|Win32 {5579253D-24F6-4001-BF9E-D0D6DA3EF928}.Release|x64.ActiveCfg = Release|x64 - {5579253D-24F6-4001-BF9E-D0D6DA3EF928}.Release|x64.Build.0 = Release|x64 {C02402BC-608E-4E46-B432-3C0C39E3B346}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {C02402BC-608E-4E46-B432-3C0C39E3B346}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {C02402BC-608E-4E46-B432-3C0C39E3B346}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {C02402BC-608E-4E46-B432-3C0C39E3B346}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {C02402BC-608E-4E46-B432-3C0C39E3B346}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {C02402BC-608E-4E46-B432-3C0C39E3B346}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {C02402BC-608E-4E46-B432-3C0C39E3B346}.Debug|Win32.ActiveCfg = Debug|Win32 - {C02402BC-608E-4E46-B432-3C0C39E3B346}.Debug|Win32.Build.0 = Debug|Win32 {C02402BC-608E-4E46-B432-3C0C39E3B346}.Debug|x64.ActiveCfg = Debug|x64 - {C02402BC-608E-4E46-B432-3C0C39E3B346}.Debug|x64.Build.0 = Debug|x64 {C02402BC-608E-4E46-B432-3C0C39E3B346}.Release|Win32.ActiveCfg = Release|Win32 - {C02402BC-608E-4E46-B432-3C0C39E3B346}.Release|Win32.Build.0 = Release|Win32 {C02402BC-608E-4E46-B432-3C0C39E3B346}.Release|x64.ActiveCfg = Release|x64 - {C02402BC-608E-4E46-B432-3C0C39E3B346}.Release|x64.Build.0 = Release|x64 {5ED6FC18-EAED-4833-8CE8-FA19F5CD713B}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {5ED6FC18-EAED-4833-8CE8-FA19F5CD713B}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {5ED6FC18-EAED-4833-8CE8-FA19F5CD713B}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {5ED6FC18-EAED-4833-8CE8-FA19F5CD713B}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {5ED6FC18-EAED-4833-8CE8-FA19F5CD713B}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {5ED6FC18-EAED-4833-8CE8-FA19F5CD713B}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {5ED6FC18-EAED-4833-8CE8-FA19F5CD713B}.Debug|Win32.ActiveCfg = Debug|Win32 - {5ED6FC18-EAED-4833-8CE8-FA19F5CD713B}.Debug|Win32.Build.0 = Debug|Win32 {5ED6FC18-EAED-4833-8CE8-FA19F5CD713B}.Debug|x64.ActiveCfg = Debug|x64 - {5ED6FC18-EAED-4833-8CE8-FA19F5CD713B}.Debug|x64.Build.0 = Debug|x64 {5ED6FC18-EAED-4833-8CE8-FA19F5CD713B}.Release|Win32.ActiveCfg = Release|Win32 - {5ED6FC18-EAED-4833-8CE8-FA19F5CD713B}.Release|Win32.Build.0 = Release|Win32 {5ED6FC18-EAED-4833-8CE8-FA19F5CD713B}.Release|x64.ActiveCfg = Release|x64 - {5ED6FC18-EAED-4833-8CE8-FA19F5CD713B}.Release|x64.Build.0 = Release|x64 {0AF7FE2E-9C7F-4F87-A999-D397D39CE752}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 {0AF7FE2E-9C7F-4F87-A999-D397D39CE752}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {0AF7FE2E-9C7F-4F87-A999-D397D39CE752}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 @@ -2956,101 +2920,83 @@ Global {8A420B3E-C5C5-403B-874A-6D2A5A51783B}.Release|x64.ActiveCfg = Release|x64 {8A420B3E-C5C5-403B-874A-6D2A5A51783B}.Release|x64.Build.0 = Release|x64 {F2FC008C-2972-481A-9E30-2D194E1DBAD7}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {F2FC008C-2972-481A-9E30-2D194E1DBAD7}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {F2FC008C-2972-481A-9E30-2D194E1DBAD7}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {F2FC008C-2972-481A-9E30-2D194E1DBAD7}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {F2FC008C-2972-481A-9E30-2D194E1DBAD7}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {F2FC008C-2972-481A-9E30-2D194E1DBAD7}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {F2FC008C-2972-481A-9E30-2D194E1DBAD7}.Debug|Win32.ActiveCfg = Debug|Win32 - {F2FC008C-2972-481A-9E30-2D194E1DBAD7}.Debug|Win32.Build.0 = Debug|Win32 {F2FC008C-2972-481A-9E30-2D194E1DBAD7}.Debug|x64.ActiveCfg = Debug|x64 - {F2FC008C-2972-481A-9E30-2D194E1DBAD7}.Debug|x64.Build.0 = Debug|x64 {F2FC008C-2972-481A-9E30-2D194E1DBAD7}.Release|Win32.ActiveCfg = Release|Win32 - {F2FC008C-2972-481A-9E30-2D194E1DBAD7}.Release|Win32.Build.0 = Release|Win32 {F2FC008C-2972-481A-9E30-2D194E1DBAD7}.Release|x64.ActiveCfg = Release|x64 - {F2FC008C-2972-481A-9E30-2D194E1DBAD7}.Release|x64.Build.0 = Release|x64 {5150E36B-EDF1-410B-A7D7-7B0D75AB92C4}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {5150E36B-EDF1-410B-A7D7-7B0D75AB92C4}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {5150E36B-EDF1-410B-A7D7-7B0D75AB92C4}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {5150E36B-EDF1-410B-A7D7-7B0D75AB92C4}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {5150E36B-EDF1-410B-A7D7-7B0D75AB92C4}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {5150E36B-EDF1-410B-A7D7-7B0D75AB92C4}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {5150E36B-EDF1-410B-A7D7-7B0D75AB92C4}.Debug|Win32.ActiveCfg = Debug|Win32 - {5150E36B-EDF1-410B-A7D7-7B0D75AB92C4}.Debug|Win32.Build.0 = Debug|Win32 {5150E36B-EDF1-410B-A7D7-7B0D75AB92C4}.Debug|x64.ActiveCfg = Debug|x64 - {5150E36B-EDF1-410B-A7D7-7B0D75AB92C4}.Debug|x64.Build.0 = Debug|x64 {5150E36B-EDF1-410B-A7D7-7B0D75AB92C4}.Release|Win32.ActiveCfg = Release|Win32 - {5150E36B-EDF1-410B-A7D7-7B0D75AB92C4}.Release|Win32.Build.0 = Release|Win32 {5150E36B-EDF1-410B-A7D7-7B0D75AB92C4}.Release|x64.ActiveCfg = Release|x64 - {5150E36B-EDF1-410B-A7D7-7B0D75AB92C4}.Release|x64.Build.0 = Release|x64 {FA05E973-3F45-4C5A-8226-BBDAD8F9DE4F}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {FA05E973-3F45-4C5A-8226-BBDAD8F9DE4F}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {FA05E973-3F45-4C5A-8226-BBDAD8F9DE4F}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {FA05E973-3F45-4C5A-8226-BBDAD8F9DE4F}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {FA05E973-3F45-4C5A-8226-BBDAD8F9DE4F}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {FA05E973-3F45-4C5A-8226-BBDAD8F9DE4F}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {FA05E973-3F45-4C5A-8226-BBDAD8F9DE4F}.Debug|Win32.ActiveCfg = Debug|Win32 - {FA05E973-3F45-4C5A-8226-BBDAD8F9DE4F}.Debug|Win32.Build.0 = Debug|Win32 {FA05E973-3F45-4C5A-8226-BBDAD8F9DE4F}.Debug|x64.ActiveCfg = Debug|x64 - {FA05E973-3F45-4C5A-8226-BBDAD8F9DE4F}.Debug|x64.Build.0 = Debug|x64 {FA05E973-3F45-4C5A-8226-BBDAD8F9DE4F}.Release|Win32.ActiveCfg = Release|Win32 - {FA05E973-3F45-4C5A-8226-BBDAD8F9DE4F}.Release|Win32.Build.0 = Release|Win32 {FA05E973-3F45-4C5A-8226-BBDAD8F9DE4F}.Release|x64.ActiveCfg = Release|x64 - {FA05E973-3F45-4C5A-8226-BBDAD8F9DE4F}.Release|x64.Build.0 = Release|x64 {E879E538-6746-4EEE-8D70-0FC80B8A2FAC}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {E879E538-6746-4EEE-8D70-0FC80B8A2FAC}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {E879E538-6746-4EEE-8D70-0FC80B8A2FAC}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {E879E538-6746-4EEE-8D70-0FC80B8A2FAC}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {E879E538-6746-4EEE-8D70-0FC80B8A2FAC}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {E879E538-6746-4EEE-8D70-0FC80B8A2FAC}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {E879E538-6746-4EEE-8D70-0FC80B8A2FAC}.Debug|Win32.ActiveCfg = Debug|Win32 - {E879E538-6746-4EEE-8D70-0FC80B8A2FAC}.Debug|Win32.Build.0 = Debug|Win32 {E879E538-6746-4EEE-8D70-0FC80B8A2FAC}.Debug|x64.ActiveCfg = Debug|x64 - {E879E538-6746-4EEE-8D70-0FC80B8A2FAC}.Debug|x64.Build.0 = Debug|x64 {E879E538-6746-4EEE-8D70-0FC80B8A2FAC}.Release|Win32.ActiveCfg = Release|Win32 - {E879E538-6746-4EEE-8D70-0FC80B8A2FAC}.Release|Win32.Build.0 = Release|Win32 {E879E538-6746-4EEE-8D70-0FC80B8A2FAC}.Release|x64.ActiveCfg = Release|x64 - {E879E538-6746-4EEE-8D70-0FC80B8A2FAC}.Release|x64.Build.0 = Release|x64 {58B8CF53-AC7C-4FE5-ABA1-A356034BFE10}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {58B8CF53-AC7C-4FE5-ABA1-A356034BFE10}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {58B8CF53-AC7C-4FE5-ABA1-A356034BFE10}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {58B8CF53-AC7C-4FE5-ABA1-A356034BFE10}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {58B8CF53-AC7C-4FE5-ABA1-A356034BFE10}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {58B8CF53-AC7C-4FE5-ABA1-A356034BFE10}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {58B8CF53-AC7C-4FE5-ABA1-A356034BFE10}.Debug|Win32.ActiveCfg = Debug|Win32 - {58B8CF53-AC7C-4FE5-ABA1-A356034BFE10}.Debug|Win32.Build.0 = Debug|Win32 {58B8CF53-AC7C-4FE5-ABA1-A356034BFE10}.Debug|x64.ActiveCfg = Debug|x64 - {58B8CF53-AC7C-4FE5-ABA1-A356034BFE10}.Debug|x64.Build.0 = Debug|x64 {58B8CF53-AC7C-4FE5-ABA1-A356034BFE10}.Release|Win32.ActiveCfg = Release|Win32 - {58B8CF53-AC7C-4FE5-ABA1-A356034BFE10}.Release|Win32.Build.0 = Release|Win32 {58B8CF53-AC7C-4FE5-ABA1-A356034BFE10}.Release|x64.ActiveCfg = Release|x64 - {58B8CF53-AC7C-4FE5-ABA1-A356034BFE10}.Release|x64.Build.0 = Release|x64 {CB22725D-1669-4945-83D3-81CA767F0B56}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {CB22725D-1669-4945-83D3-81CA767F0B56}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {CB22725D-1669-4945-83D3-81CA767F0B56}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {CB22725D-1669-4945-83D3-81CA767F0B56}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {CB22725D-1669-4945-83D3-81CA767F0B56}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {CB22725D-1669-4945-83D3-81CA767F0B56}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {CB22725D-1669-4945-83D3-81CA767F0B56}.Debug|Win32.ActiveCfg = Debug|Win32 - {CB22725D-1669-4945-83D3-81CA767F0B56}.Debug|Win32.Build.0 = Debug|Win32 {CB22725D-1669-4945-83D3-81CA767F0B56}.Debug|x64.ActiveCfg = Debug|x64 - {CB22725D-1669-4945-83D3-81CA767F0B56}.Debug|x64.Build.0 = Debug|x64 {CB22725D-1669-4945-83D3-81CA767F0B56}.Release|Win32.ActiveCfg = Release|Win32 - {CB22725D-1669-4945-83D3-81CA767F0B56}.Release|Win32.Build.0 = Release|Win32 {CB22725D-1669-4945-83D3-81CA767F0B56}.Release|x64.ActiveCfg = Release|x64 - {CB22725D-1669-4945-83D3-81CA767F0B56}.Release|x64.Build.0 = Release|x64 {E6690528-7BB9-4B8E-8F15-4F3C58A736B9}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 {E6690528-7BB9-4B8E-8F15-4F3C58A736B9}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {E6690528-7BB9-4B8E-8F15-4F3C58A736B9}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 {E6690528-7BB9-4B8E-8F15-4F3C58A736B9}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {E6690528-7BB9-4B8E-8F15-4F3C58A736B9}.Debug|Win32.ActiveCfg = Debug|Win32 - {E6690528-7BB9-4B8E-8F15-4F3C58A736B9}.Debug|Win32.Build.0 = Debug|Win32 {E6690528-7BB9-4B8E-8F15-4F3C58A736B9}.Debug|x64.ActiveCfg = Debug|x64 - {E6690528-7BB9-4B8E-8F15-4F3C58A736B9}.Debug|x64.Build.0 = Debug|x64 {E6690528-7BB9-4B8E-8F15-4F3C58A736B9}.Release|Win32.ActiveCfg = Release|Win32 - {E6690528-7BB9-4B8E-8F15-4F3C58A736B9}.Release|Win32.Build.0 = Release|Win32 {E6690528-7BB9-4B8E-8F15-4F3C58A736B9}.Release|x64.ActiveCfg = Release|x64 - {E6690528-7BB9-4B8E-8F15-4F3C58A736B9}.Release|x64.Build.0 = Release|x64 {C988F9AD-ED3C-4796-A7F5-CE7678FD689A}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {C988F9AD-ED3C-4796-A7F5-CE7678FD689A}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {C988F9AD-ED3C-4796-A7F5-CE7678FD689A}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {C988F9AD-ED3C-4796-A7F5-CE7678FD689A}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {C988F9AD-ED3C-4796-A7F5-CE7678FD689A}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {C988F9AD-ED3C-4796-A7F5-CE7678FD689A}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {C988F9AD-ED3C-4796-A7F5-CE7678FD689A}.Debug|Win32.ActiveCfg = Debug|Win32 - {C988F9AD-ED3C-4796-A7F5-CE7678FD689A}.Debug|Win32.Build.0 = Debug|Win32 {C988F9AD-ED3C-4796-A7F5-CE7678FD689A}.Debug|x64.ActiveCfg = Debug|x64 - {C988F9AD-ED3C-4796-A7F5-CE7678FD689A}.Debug|x64.Build.0 = Debug|x64 {C988F9AD-ED3C-4796-A7F5-CE7678FD689A}.Release|Win32.ActiveCfg = Release|Win32 - {C988F9AD-ED3C-4796-A7F5-CE7678FD689A}.Release|Win32.Build.0 = Release|Win32 {C988F9AD-ED3C-4796-A7F5-CE7678FD689A}.Release|x64.ActiveCfg = Release|x64 - {C988F9AD-ED3C-4796-A7F5-CE7678FD689A}.Release|x64.Build.0 = Release|x64 {7C5AB509-3BB9-43F7-B4BA-D8D57BDED7BA}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 {7C5AB509-3BB9-43F7-B4BA-D8D57BDED7BA}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {7C5AB509-3BB9-43F7-B4BA-D8D57BDED7BA}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 @@ -3064,29 +3010,25 @@ Global {7C5AB509-3BB9-43F7-B4BA-D8D57BDED7BA}.Release|x64.ActiveCfg = Release|x64 {7C5AB509-3BB9-43F7-B4BA-D8D57BDED7BA}.Release|x64.Build.0 = Release|x64 {A6F10BA0-D8BC-4CE6-A6B0-E9C556F4FCC0}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {A6F10BA0-D8BC-4CE6-A6B0-E9C556F4FCC0}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {A6F10BA0-D8BC-4CE6-A6B0-E9C556F4FCC0}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {A6F10BA0-D8BC-4CE6-A6B0-E9C556F4FCC0}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {A6F10BA0-D8BC-4CE6-A6B0-E9C556F4FCC0}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {A6F10BA0-D8BC-4CE6-A6B0-E9C556F4FCC0}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {A6F10BA0-D8BC-4CE6-A6B0-E9C556F4FCC0}.Debug|Win32.ActiveCfg = Debug|Win32 - {A6F10BA0-D8BC-4CE6-A6B0-E9C556F4FCC0}.Debug|Win32.Build.0 = Debug|Win32 {A6F10BA0-D8BC-4CE6-A6B0-E9C556F4FCC0}.Debug|x64.ActiveCfg = Debug|x64 - {A6F10BA0-D8BC-4CE6-A6B0-E9C556F4FCC0}.Debug|x64.Build.0 = Debug|x64 {A6F10BA0-D8BC-4CE6-A6B0-E9C556F4FCC0}.Release|Win32.ActiveCfg = Release|Win32 - {A6F10BA0-D8BC-4CE6-A6B0-E9C556F4FCC0}.Release|Win32.Build.0 = Release|Win32 {A6F10BA0-D8BC-4CE6-A6B0-E9C556F4FCC0}.Release|x64.ActiveCfg = Release|x64 - {A6F10BA0-D8BC-4CE6-A6B0-E9C556F4FCC0}.Release|x64.Build.0 = Release|x64 {6020F924-5846-452A-B704-BA762AC106DD}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {6020F924-5846-452A-B704-BA762AC106DD}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {6020F924-5846-452A-B704-BA762AC106DD}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {6020F924-5846-452A-B704-BA762AC106DD}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {6020F924-5846-452A-B704-BA762AC106DD}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {6020F924-5846-452A-B704-BA762AC106DD}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {6020F924-5846-452A-B704-BA762AC106DD}.Debug|Win32.ActiveCfg = Debug|Win32 - {6020F924-5846-452A-B704-BA762AC106DD}.Debug|Win32.Build.0 = Debug|Win32 {6020F924-5846-452A-B704-BA762AC106DD}.Debug|x64.ActiveCfg = Debug|x64 - {6020F924-5846-452A-B704-BA762AC106DD}.Debug|x64.Build.0 = Debug|x64 {6020F924-5846-452A-B704-BA762AC106DD}.Release|Win32.ActiveCfg = Release|Win32 - {6020F924-5846-452A-B704-BA762AC106DD}.Release|Win32.Build.0 = Release|Win32 {6020F924-5846-452A-B704-BA762AC106DD}.Release|x64.ActiveCfg = Release|x64 - {6020F924-5846-452A-B704-BA762AC106DD}.Release|x64.Build.0 = Release|x64 {076446BE-553C-4938-9CF8-BC7DEB1BF235}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 {076446BE-553C-4938-9CF8-BC7DEB1BF235}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {076446BE-553C-4938-9CF8-BC7DEB1BF235}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 @@ -3420,305 +3362,242 @@ Global {948059F3-CD57-4ACC-9EA5-C4550D06CB19}.Release|x64.ActiveCfg = Release|x64 {948059F3-CD57-4ACC-9EA5-C4550D06CB19}.Release|x64.Build.0 = Release|x64 {83801760-CFF3-4B11-9CA5-4598C0DBC442}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {83801760-CFF3-4B11-9CA5-4598C0DBC442}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {83801760-CFF3-4B11-9CA5-4598C0DBC442}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {83801760-CFF3-4B11-9CA5-4598C0DBC442}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {83801760-CFF3-4B11-9CA5-4598C0DBC442}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {83801760-CFF3-4B11-9CA5-4598C0DBC442}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {83801760-CFF3-4B11-9CA5-4598C0DBC442}.Debug|Win32.ActiveCfg = Debug|Win32 - {83801760-CFF3-4B11-9CA5-4598C0DBC442}.Debug|Win32.Build.0 = Debug|Win32 {83801760-CFF3-4B11-9CA5-4598C0DBC442}.Debug|x64.ActiveCfg = Debug|x64 - {83801760-CFF3-4B11-9CA5-4598C0DBC442}.Debug|x64.Build.0 = Debug|x64 {83801760-CFF3-4B11-9CA5-4598C0DBC442}.Release|Win32.ActiveCfg = Release|Win32 - {83801760-CFF3-4B11-9CA5-4598C0DBC442}.Release|Win32.Build.0 = Release|Win32 {83801760-CFF3-4B11-9CA5-4598C0DBC442}.Release|x64.ActiveCfg = Release|x64 - {83801760-CFF3-4B11-9CA5-4598C0DBC442}.Release|x64.Build.0 = Release|x64 {7186CBA9-18FE-4868-8A2F-2CF50F66132A}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {7186CBA9-18FE-4868-8A2F-2CF50F66132A}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {7186CBA9-18FE-4868-8A2F-2CF50F66132A}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {7186CBA9-18FE-4868-8A2F-2CF50F66132A}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {7186CBA9-18FE-4868-8A2F-2CF50F66132A}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {7186CBA9-18FE-4868-8A2F-2CF50F66132A}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {7186CBA9-18FE-4868-8A2F-2CF50F66132A}.Debug|Win32.ActiveCfg = Debug|Win32 - {7186CBA9-18FE-4868-8A2F-2CF50F66132A}.Debug|Win32.Build.0 = Debug|Win32 {7186CBA9-18FE-4868-8A2F-2CF50F66132A}.Debug|x64.ActiveCfg = Debug|x64 - {7186CBA9-18FE-4868-8A2F-2CF50F66132A}.Debug|x64.Build.0 = Debug|x64 {7186CBA9-18FE-4868-8A2F-2CF50F66132A}.Release|Win32.ActiveCfg = Release|Win32 - {7186CBA9-18FE-4868-8A2F-2CF50F66132A}.Release|Win32.Build.0 = Release|Win32 {7186CBA9-18FE-4868-8A2F-2CF50F66132A}.Release|x64.ActiveCfg = Release|x64 - {7186CBA9-18FE-4868-8A2F-2CF50F66132A}.Release|x64.Build.0 = Release|x64 {1F040862-DAB3-4F65-893D-0023BD2BD0E4}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {1F040862-DAB3-4F65-893D-0023BD2BD0E4}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {1F040862-DAB3-4F65-893D-0023BD2BD0E4}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {1F040862-DAB3-4F65-893D-0023BD2BD0E4}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {1F040862-DAB3-4F65-893D-0023BD2BD0E4}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {1F040862-DAB3-4F65-893D-0023BD2BD0E4}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {1F040862-DAB3-4F65-893D-0023BD2BD0E4}.Debug|Win32.ActiveCfg = Debug|Win32 - {1F040862-DAB3-4F65-893D-0023BD2BD0E4}.Debug|Win32.Build.0 = Debug|Win32 {1F040862-DAB3-4F65-893D-0023BD2BD0E4}.Debug|x64.ActiveCfg = Debug|x64 - {1F040862-DAB3-4F65-893D-0023BD2BD0E4}.Debug|x64.Build.0 = Debug|x64 {1F040862-DAB3-4F65-893D-0023BD2BD0E4}.Release|Win32.ActiveCfg = Release|Win32 - {1F040862-DAB3-4F65-893D-0023BD2BD0E4}.Release|Win32.Build.0 = Release|Win32 {1F040862-DAB3-4F65-893D-0023BD2BD0E4}.Release|x64.ActiveCfg = Release|x64 - {1F040862-DAB3-4F65-893D-0023BD2BD0E4}.Release|x64.Build.0 = Release|x64 {529BDB9A-7714-4CC6-A116-189159D8CC4A}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {529BDB9A-7714-4CC6-A116-189159D8CC4A}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {529BDB9A-7714-4CC6-A116-189159D8CC4A}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {529BDB9A-7714-4CC6-A116-189159D8CC4A}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {529BDB9A-7714-4CC6-A116-189159D8CC4A}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {529BDB9A-7714-4CC6-A116-189159D8CC4A}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {529BDB9A-7714-4CC6-A116-189159D8CC4A}.Debug|Win32.ActiveCfg = Debug|Win32 - {529BDB9A-7714-4CC6-A116-189159D8CC4A}.Debug|Win32.Build.0 = Debug|Win32 {529BDB9A-7714-4CC6-A116-189159D8CC4A}.Debug|x64.ActiveCfg = Debug|x64 - {529BDB9A-7714-4CC6-A116-189159D8CC4A}.Debug|x64.Build.0 = Debug|x64 {529BDB9A-7714-4CC6-A116-189159D8CC4A}.Release|Win32.ActiveCfg = Release|Win32 - {529BDB9A-7714-4CC6-A116-189159D8CC4A}.Release|Win32.Build.0 = Release|Win32 {529BDB9A-7714-4CC6-A116-189159D8CC4A}.Release|x64.ActiveCfg = Release|x64 - {529BDB9A-7714-4CC6-A116-189159D8CC4A}.Release|x64.Build.0 = Release|x64 {F0DEFABC-1F27-4CDB-835A-1AF2958C3F9B}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {F0DEFABC-1F27-4CDB-835A-1AF2958C3F9B}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {F0DEFABC-1F27-4CDB-835A-1AF2958C3F9B}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {F0DEFABC-1F27-4CDB-835A-1AF2958C3F9B}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {F0DEFABC-1F27-4CDB-835A-1AF2958C3F9B}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {F0DEFABC-1F27-4CDB-835A-1AF2958C3F9B}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {F0DEFABC-1F27-4CDB-835A-1AF2958C3F9B}.Debug|Win32.ActiveCfg = Debug|Win32 - {F0DEFABC-1F27-4CDB-835A-1AF2958C3F9B}.Debug|Win32.Build.0 = Debug|Win32 {F0DEFABC-1F27-4CDB-835A-1AF2958C3F9B}.Debug|x64.ActiveCfg = Debug|x64 - {F0DEFABC-1F27-4CDB-835A-1AF2958C3F9B}.Debug|x64.Build.0 = Debug|x64 {F0DEFABC-1F27-4CDB-835A-1AF2958C3F9B}.Release|Win32.ActiveCfg = Release|Win32 - {F0DEFABC-1F27-4CDB-835A-1AF2958C3F9B}.Release|Win32.Build.0 = Release|Win32 {F0DEFABC-1F27-4CDB-835A-1AF2958C3F9B}.Release|x64.ActiveCfg = Release|x64 - {F0DEFABC-1F27-4CDB-835A-1AF2958C3F9B}.Release|x64.Build.0 = Release|x64 {C00984F2-B825-45AF-86EC-A4FEF70B02C8}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {C00984F2-B825-45AF-86EC-A4FEF70B02C8}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {C00984F2-B825-45AF-86EC-A4FEF70B02C8}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {C00984F2-B825-45AF-86EC-A4FEF70B02C8}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {C00984F2-B825-45AF-86EC-A4FEF70B02C8}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {C00984F2-B825-45AF-86EC-A4FEF70B02C8}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {C00984F2-B825-45AF-86EC-A4FEF70B02C8}.Debug|Win32.ActiveCfg = Debug|Win32 - {C00984F2-B825-45AF-86EC-A4FEF70B02C8}.Debug|Win32.Build.0 = Debug|Win32 {C00984F2-B825-45AF-86EC-A4FEF70B02C8}.Debug|x64.ActiveCfg = Debug|x64 - {C00984F2-B825-45AF-86EC-A4FEF70B02C8}.Debug|x64.Build.0 = Debug|x64 {C00984F2-B825-45AF-86EC-A4FEF70B02C8}.Release|Win32.ActiveCfg = Release|Win32 - {C00984F2-B825-45AF-86EC-A4FEF70B02C8}.Release|Win32.Build.0 = Release|Win32 {C00984F2-B825-45AF-86EC-A4FEF70B02C8}.Release|x64.ActiveCfg = Release|x64 - {C00984F2-B825-45AF-86EC-A4FEF70B02C8}.Release|x64.Build.0 = Release|x64 {2CF45619-1C69-4072-B869-817D7954CABF}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {2CF45619-1C69-4072-B869-817D7954CABF}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {2CF45619-1C69-4072-B869-817D7954CABF}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {2CF45619-1C69-4072-B869-817D7954CABF}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {2CF45619-1C69-4072-B869-817D7954CABF}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {2CF45619-1C69-4072-B869-817D7954CABF}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {2CF45619-1C69-4072-B869-817D7954CABF}.Debug|Win32.ActiveCfg = Debug|Win32 - {2CF45619-1C69-4072-B869-817D7954CABF}.Debug|Win32.Build.0 = Debug|Win32 {2CF45619-1C69-4072-B869-817D7954CABF}.Debug|x64.ActiveCfg = Debug|x64 - {2CF45619-1C69-4072-B869-817D7954CABF}.Debug|x64.Build.0 = Debug|x64 {2CF45619-1C69-4072-B869-817D7954CABF}.Release|Win32.ActiveCfg = Release|Win32 - {2CF45619-1C69-4072-B869-817D7954CABF}.Release|Win32.Build.0 = Release|Win32 {2CF45619-1C69-4072-B869-817D7954CABF}.Release|x64.ActiveCfg = Release|x64 - {2CF45619-1C69-4072-B869-817D7954CABF}.Release|x64.Build.0 = Release|x64 {0FC21E44-5EF6-4725-8B9E-CC3C91552BDE}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {0FC21E44-5EF6-4725-8B9E-CC3C91552BDE}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {0FC21E44-5EF6-4725-8B9E-CC3C91552BDE}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {0FC21E44-5EF6-4725-8B9E-CC3C91552BDE}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {0FC21E44-5EF6-4725-8B9E-CC3C91552BDE}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {0FC21E44-5EF6-4725-8B9E-CC3C91552BDE}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {0FC21E44-5EF6-4725-8B9E-CC3C91552BDE}.Debug|Win32.ActiveCfg = Debug|Win32 - {0FC21E44-5EF6-4725-8B9E-CC3C91552BDE}.Debug|Win32.Build.0 = Debug|Win32 {0FC21E44-5EF6-4725-8B9E-CC3C91552BDE}.Debug|x64.ActiveCfg = Debug|x64 - {0FC21E44-5EF6-4725-8B9E-CC3C91552BDE}.Debug|x64.Build.0 = Debug|x64 {0FC21E44-5EF6-4725-8B9E-CC3C91552BDE}.Release|Win32.ActiveCfg = Release|Win32 - {0FC21E44-5EF6-4725-8B9E-CC3C91552BDE}.Release|Win32.Build.0 = Release|Win32 {0FC21E44-5EF6-4725-8B9E-CC3C91552BDE}.Release|x64.ActiveCfg = Release|x64 - {0FC21E44-5EF6-4725-8B9E-CC3C91552BDE}.Release|x64.Build.0 = Release|x64 {5DBA95DD-954C-4B77-A2D1-42E959B27C36}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {5DBA95DD-954C-4B77-A2D1-42E959B27C36}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {5DBA95DD-954C-4B77-A2D1-42E959B27C36}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {5DBA95DD-954C-4B77-A2D1-42E959B27C36}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {5DBA95DD-954C-4B77-A2D1-42E959B27C36}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {5DBA95DD-954C-4B77-A2D1-42E959B27C36}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {5DBA95DD-954C-4B77-A2D1-42E959B27C36}.Debug|Win32.ActiveCfg = Debug|Win32 - {5DBA95DD-954C-4B77-A2D1-42E959B27C36}.Debug|Win32.Build.0 = Debug|Win32 {5DBA95DD-954C-4B77-A2D1-42E959B27C36}.Debug|x64.ActiveCfg = Debug|x64 - {5DBA95DD-954C-4B77-A2D1-42E959B27C36}.Debug|x64.Build.0 = Debug|x64 {5DBA95DD-954C-4B77-A2D1-42E959B27C36}.Release|Win32.ActiveCfg = Release|Win32 - {5DBA95DD-954C-4B77-A2D1-42E959B27C36}.Release|Win32.Build.0 = Release|Win32 {5DBA95DD-954C-4B77-A2D1-42E959B27C36}.Release|x64.ActiveCfg = Release|x64 - {5DBA95DD-954C-4B77-A2D1-42E959B27C36}.Release|x64.Build.0 = Release|x64 {9EA751B7-04D5-484C-89EF-03AA2782B1D6}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 {9EA751B7-04D5-484C-89EF-03AA2782B1D6}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {9EA751B7-04D5-484C-89EF-03AA2782B1D6}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 {9EA751B7-04D5-484C-89EF-03AA2782B1D6}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {9EA751B7-04D5-484C-89EF-03AA2782B1D6}.Debug|Win32.ActiveCfg = Debug|Win32 - {9EA751B7-04D5-484C-89EF-03AA2782B1D6}.Debug|Win32.Build.0 = Debug|Win32 {9EA751B7-04D5-484C-89EF-03AA2782B1D6}.Debug|x64.ActiveCfg = Debug|x64 - {9EA751B7-04D5-484C-89EF-03AA2782B1D6}.Debug|x64.Build.0 = Debug|x64 {9EA751B7-04D5-484C-89EF-03AA2782B1D6}.Release|Win32.ActiveCfg = Release|Win32 - {9EA751B7-04D5-484C-89EF-03AA2782B1D6}.Release|Win32.Build.0 = Release|Win32 {9EA751B7-04D5-484C-89EF-03AA2782B1D6}.Release|x64.ActiveCfg = Release|x64 - {9EA751B7-04D5-484C-89EF-03AA2782B1D6}.Release|x64.Build.0 = Release|x64 {3DF7D787-3F9C-48E9-BECE-B9E7030E01A7}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {3DF7D787-3F9C-48E9-BECE-B9E7030E01A7}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {3DF7D787-3F9C-48E9-BECE-B9E7030E01A7}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {3DF7D787-3F9C-48E9-BECE-B9E7030E01A7}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {3DF7D787-3F9C-48E9-BECE-B9E7030E01A7}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {3DF7D787-3F9C-48E9-BECE-B9E7030E01A7}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {3DF7D787-3F9C-48E9-BECE-B9E7030E01A7}.Debug|Win32.ActiveCfg = Debug|Win32 - {3DF7D787-3F9C-48E9-BECE-B9E7030E01A7}.Debug|Win32.Build.0 = Debug|Win32 {3DF7D787-3F9C-48E9-BECE-B9E7030E01A7}.Debug|x64.ActiveCfg = Debug|x64 - {3DF7D787-3F9C-48E9-BECE-B9E7030E01A7}.Debug|x64.Build.0 = Debug|x64 {3DF7D787-3F9C-48E9-BECE-B9E7030E01A7}.Release|Win32.ActiveCfg = Release|Win32 - {3DF7D787-3F9C-48E9-BECE-B9E7030E01A7}.Release|Win32.Build.0 = Release|Win32 {3DF7D787-3F9C-48E9-BECE-B9E7030E01A7}.Release|x64.ActiveCfg = Release|x64 - {3DF7D787-3F9C-48E9-BECE-B9E7030E01A7}.Release|x64.Build.0 = Release|x64 {727351F3-D1CC-42C5-9AA2-5840AD3F7A1A}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {727351F3-D1CC-42C5-9AA2-5840AD3F7A1A}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {727351F3-D1CC-42C5-9AA2-5840AD3F7A1A}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {727351F3-D1CC-42C5-9AA2-5840AD3F7A1A}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {727351F3-D1CC-42C5-9AA2-5840AD3F7A1A}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {727351F3-D1CC-42C5-9AA2-5840AD3F7A1A}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {727351F3-D1CC-42C5-9AA2-5840AD3F7A1A}.Debug|Win32.ActiveCfg = Debug|Win32 - {727351F3-D1CC-42C5-9AA2-5840AD3F7A1A}.Debug|Win32.Build.0 = Debug|Win32 {727351F3-D1CC-42C5-9AA2-5840AD3F7A1A}.Debug|x64.ActiveCfg = Debug|x64 - {727351F3-D1CC-42C5-9AA2-5840AD3F7A1A}.Debug|x64.Build.0 = Debug|x64 {727351F3-D1CC-42C5-9AA2-5840AD3F7A1A}.Release|Win32.ActiveCfg = Release|Win32 - {727351F3-D1CC-42C5-9AA2-5840AD3F7A1A}.Release|Win32.Build.0 = Release|Win32 {727351F3-D1CC-42C5-9AA2-5840AD3F7A1A}.Release|x64.ActiveCfg = Release|x64 - {727351F3-D1CC-42C5-9AA2-5840AD3F7A1A}.Release|x64.Build.0 = Release|x64 {C3955110-CB5E-484A-938C-D7861E08D43B}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 {C3955110-CB5E-484A-938C-D7861E08D43B}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {C3955110-CB5E-484A-938C-D7861E08D43B}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 {C3955110-CB5E-484A-938C-D7861E08D43B}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {C3955110-CB5E-484A-938C-D7861E08D43B}.Debug|Win32.ActiveCfg = Debug|Win32 - {C3955110-CB5E-484A-938C-D7861E08D43B}.Debug|Win32.Build.0 = Debug|Win32 {C3955110-CB5E-484A-938C-D7861E08D43B}.Debug|x64.ActiveCfg = Debug|x64 - {C3955110-CB5E-484A-938C-D7861E08D43B}.Debug|x64.Build.0 = Debug|x64 {C3955110-CB5E-484A-938C-D7861E08D43B}.Release|Win32.ActiveCfg = Release|Win32 - {C3955110-CB5E-484A-938C-D7861E08D43B}.Release|Win32.Build.0 = Release|Win32 {C3955110-CB5E-484A-938C-D7861E08D43B}.Release|x64.ActiveCfg = Release|x64 - {C3955110-CB5E-484A-938C-D7861E08D43B}.Release|x64.Build.0 = Release|x64 {D7F18F42-AD57-4F5C-B66E-FA0061BEB54F}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {D7F18F42-AD57-4F5C-B66E-FA0061BEB54F}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {D7F18F42-AD57-4F5C-B66E-FA0061BEB54F}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {D7F18F42-AD57-4F5C-B66E-FA0061BEB54F}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {D7F18F42-AD57-4F5C-B66E-FA0061BEB54F}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {D7F18F42-AD57-4F5C-B66E-FA0061BEB54F}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {D7F18F42-AD57-4F5C-B66E-FA0061BEB54F}.Debug|Win32.ActiveCfg = Debug|Win32 - {D7F18F42-AD57-4F5C-B66E-FA0061BEB54F}.Debug|Win32.Build.0 = Debug|Win32 {D7F18F42-AD57-4F5C-B66E-FA0061BEB54F}.Debug|x64.ActiveCfg = Debug|x64 - {D7F18F42-AD57-4F5C-B66E-FA0061BEB54F}.Debug|x64.Build.0 = Debug|x64 {D7F18F42-AD57-4F5C-B66E-FA0061BEB54F}.Release|Win32.ActiveCfg = Release|Win32 - {D7F18F42-AD57-4F5C-B66E-FA0061BEB54F}.Release|Win32.Build.0 = Release|Win32 {D7F18F42-AD57-4F5C-B66E-FA0061BEB54F}.Release|x64.ActiveCfg = Release|x64 - {D7F18F42-AD57-4F5C-B66E-FA0061BEB54F}.Release|x64.Build.0 = Release|x64 {8680F272-78C1-41E2-AE78-10E37BFC6F53}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {8680F272-78C1-41E2-AE78-10E37BFC6F53}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {8680F272-78C1-41E2-AE78-10E37BFC6F53}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {8680F272-78C1-41E2-AE78-10E37BFC6F53}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {8680F272-78C1-41E2-AE78-10E37BFC6F53}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {8680F272-78C1-41E2-AE78-10E37BFC6F53}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {8680F272-78C1-41E2-AE78-10E37BFC6F53}.Debug|Win32.ActiveCfg = Debug|Win32 - {8680F272-78C1-41E2-AE78-10E37BFC6F53}.Debug|Win32.Build.0 = Debug|Win32 {8680F272-78C1-41E2-AE78-10E37BFC6F53}.Debug|x64.ActiveCfg = Debug|x64 - {8680F272-78C1-41E2-AE78-10E37BFC6F53}.Debug|x64.Build.0 = Debug|x64 {8680F272-78C1-41E2-AE78-10E37BFC6F53}.Release|Win32.ActiveCfg = Release|Win32 - {8680F272-78C1-41E2-AE78-10E37BFC6F53}.Release|Win32.Build.0 = Release|Win32 {8680F272-78C1-41E2-AE78-10E37BFC6F53}.Release|x64.ActiveCfg = Release|x64 - {8680F272-78C1-41E2-AE78-10E37BFC6F53}.Release|x64.Build.0 = Release|x64 {6D4BA8B0-63B8-47D8-8B37-0A56A464BD4D}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 {6D4BA8B0-63B8-47D8-8B37-0A56A464BD4D}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {6D4BA8B0-63B8-47D8-8B37-0A56A464BD4D}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 {6D4BA8B0-63B8-47D8-8B37-0A56A464BD4D}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {6D4BA8B0-63B8-47D8-8B37-0A56A464BD4D}.Debug|Win32.ActiveCfg = Debug|Win32 - {6D4BA8B0-63B8-47D8-8B37-0A56A464BD4D}.Debug|Win32.Build.0 = Debug|Win32 {6D4BA8B0-63B8-47D8-8B37-0A56A464BD4D}.Debug|x64.ActiveCfg = Debug|x64 - {6D4BA8B0-63B8-47D8-8B37-0A56A464BD4D}.Debug|x64.Build.0 = Debug|x64 {6D4BA8B0-63B8-47D8-8B37-0A56A464BD4D}.Release|Win32.ActiveCfg = Release|Win32 - {6D4BA8B0-63B8-47D8-8B37-0A56A464BD4D}.Release|Win32.Build.0 = Release|Win32 {6D4BA8B0-63B8-47D8-8B37-0A56A464BD4D}.Release|x64.ActiveCfg = Release|x64 - {6D4BA8B0-63B8-47D8-8B37-0A56A464BD4D}.Release|x64.Build.0 = Release|x64 {849F83BA-7817-419C-93E5-9F92541F773F}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {849F83BA-7817-419C-93E5-9F92541F773F}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {849F83BA-7817-419C-93E5-9F92541F773F}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {849F83BA-7817-419C-93E5-9F92541F773F}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {849F83BA-7817-419C-93E5-9F92541F773F}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {849F83BA-7817-419C-93E5-9F92541F773F}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {849F83BA-7817-419C-93E5-9F92541F773F}.Debug|Win32.ActiveCfg = Debug|Win32 - {849F83BA-7817-419C-93E5-9F92541F773F}.Debug|Win32.Build.0 = Debug|Win32 {849F83BA-7817-419C-93E5-9F92541F773F}.Debug|x64.ActiveCfg = Debug|x64 - {849F83BA-7817-419C-93E5-9F92541F773F}.Debug|x64.Build.0 = Debug|x64 {849F83BA-7817-419C-93E5-9F92541F773F}.Release|Win32.ActiveCfg = Release|Win32 - {849F83BA-7817-419C-93E5-9F92541F773F}.Release|Win32.Build.0 = Release|Win32 {849F83BA-7817-419C-93E5-9F92541F773F}.Release|x64.ActiveCfg = Release|x64 - {849F83BA-7817-419C-93E5-9F92541F773F}.Release|x64.Build.0 = Release|x64 {DA51489E-AC9D-4D59-89FC-1F103449CC5A}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {DA51489E-AC9D-4D59-89FC-1F103449CC5A}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {DA51489E-AC9D-4D59-89FC-1F103449CC5A}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {DA51489E-AC9D-4D59-89FC-1F103449CC5A}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {DA51489E-AC9D-4D59-89FC-1F103449CC5A}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {DA51489E-AC9D-4D59-89FC-1F103449CC5A}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {DA51489E-AC9D-4D59-89FC-1F103449CC5A}.Debug|Win32.ActiveCfg = Debug|Win32 - {DA51489E-AC9D-4D59-89FC-1F103449CC5A}.Debug|Win32.Build.0 = Debug|Win32 {DA51489E-AC9D-4D59-89FC-1F103449CC5A}.Debug|x64.ActiveCfg = Debug|x64 - {DA51489E-AC9D-4D59-89FC-1F103449CC5A}.Debug|x64.Build.0 = Debug|x64 {DA51489E-AC9D-4D59-89FC-1F103449CC5A}.Release|Win32.ActiveCfg = Release|Win32 - {DA51489E-AC9D-4D59-89FC-1F103449CC5A}.Release|Win32.Build.0 = Release|Win32 {DA51489E-AC9D-4D59-89FC-1F103449CC5A}.Release|x64.ActiveCfg = Release|x64 - {DA51489E-AC9D-4D59-89FC-1F103449CC5A}.Release|x64.Build.0 = Release|x64 {299B54D9-A682-40D5-B87B-A0C21BF1E839}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 {299B54D9-A682-40D5-B87B-A0C21BF1E839}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {299B54D9-A682-40D5-B87B-A0C21BF1E839}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 {299B54D9-A682-40D5-B87B-A0C21BF1E839}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {299B54D9-A682-40D5-B87B-A0C21BF1E839}.Debug|Win32.ActiveCfg = Debug|Win32 - {299B54D9-A682-40D5-B87B-A0C21BF1E839}.Debug|Win32.Build.0 = Debug|Win32 {299B54D9-A682-40D5-B87B-A0C21BF1E839}.Debug|x64.ActiveCfg = Debug|x64 - {299B54D9-A682-40D5-B87B-A0C21BF1E839}.Debug|x64.Build.0 = Debug|x64 {299B54D9-A682-40D5-B87B-A0C21BF1E839}.Release|Win32.ActiveCfg = Release|Win32 - {299B54D9-A682-40D5-B87B-A0C21BF1E839}.Release|Win32.Build.0 = Release|Win32 {299B54D9-A682-40D5-B87B-A0C21BF1E839}.Release|x64.ActiveCfg = Release|x64 - {299B54D9-A682-40D5-B87B-A0C21BF1E839}.Release|x64.Build.0 = Release|x64 {77CB36FD-F130-4416-B6B7-C24EFD83630E}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 {77CB36FD-F130-4416-B6B7-C24EFD83630E}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {77CB36FD-F130-4416-B6B7-C24EFD83630E}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 {77CB36FD-F130-4416-B6B7-C24EFD83630E}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {77CB36FD-F130-4416-B6B7-C24EFD83630E}.Debug|Win32.ActiveCfg = Debug|Win32 - {77CB36FD-F130-4416-B6B7-C24EFD83630E}.Debug|Win32.Build.0 = Debug|Win32 {77CB36FD-F130-4416-B6B7-C24EFD83630E}.Debug|x64.ActiveCfg = Debug|x64 - {77CB36FD-F130-4416-B6B7-C24EFD83630E}.Debug|x64.Build.0 = Debug|x64 {77CB36FD-F130-4416-B6B7-C24EFD83630E}.Release|Win32.ActiveCfg = Release|Win32 - {77CB36FD-F130-4416-B6B7-C24EFD83630E}.Release|Win32.Build.0 = Release|Win32 {77CB36FD-F130-4416-B6B7-C24EFD83630E}.Release|x64.ActiveCfg = Release|x64 - {77CB36FD-F130-4416-B6B7-C24EFD83630E}.Release|x64.Build.0 = Release|x64 {D306ADCE-34A1-4599-BD50-8598BB92B47F}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {D306ADCE-34A1-4599-BD50-8598BB92B47F}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {D306ADCE-34A1-4599-BD50-8598BB92B47F}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {D306ADCE-34A1-4599-BD50-8598BB92B47F}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {D306ADCE-34A1-4599-BD50-8598BB92B47F}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {D306ADCE-34A1-4599-BD50-8598BB92B47F}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {D306ADCE-34A1-4599-BD50-8598BB92B47F}.Debug|Win32.ActiveCfg = Debug|Win32 - {D306ADCE-34A1-4599-BD50-8598BB92B47F}.Debug|Win32.Build.0 = Debug|Win32 {D306ADCE-34A1-4599-BD50-8598BB92B47F}.Debug|x64.ActiveCfg = Debug|x64 - {D306ADCE-34A1-4599-BD50-8598BB92B47F}.Debug|x64.Build.0 = Debug|x64 {D306ADCE-34A1-4599-BD50-8598BB92B47F}.Release|Win32.ActiveCfg = Release|Win32 - {D306ADCE-34A1-4599-BD50-8598BB92B47F}.Release|Win32.Build.0 = Release|Win32 {D306ADCE-34A1-4599-BD50-8598BB92B47F}.Release|x64.ActiveCfg = Release|x64 - {D306ADCE-34A1-4599-BD50-8598BB92B47F}.Release|x64.Build.0 = Release|x64 {3A517759-2BC3-4110-97AA-E5E7E45EA3D8}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {3A517759-2BC3-4110-97AA-E5E7E45EA3D8}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {3A517759-2BC3-4110-97AA-E5E7E45EA3D8}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {3A517759-2BC3-4110-97AA-E5E7E45EA3D8}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {3A517759-2BC3-4110-97AA-E5E7E45EA3D8}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {3A517759-2BC3-4110-97AA-E5E7E45EA3D8}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {3A517759-2BC3-4110-97AA-E5E7E45EA3D8}.Debug|Win32.ActiveCfg = Debug|Win32 - {3A517759-2BC3-4110-97AA-E5E7E45EA3D8}.Debug|Win32.Build.0 = Debug|Win32 {3A517759-2BC3-4110-97AA-E5E7E45EA3D8}.Debug|x64.ActiveCfg = Debug|x64 - {3A517759-2BC3-4110-97AA-E5E7E45EA3D8}.Debug|x64.Build.0 = Debug|x64 {3A517759-2BC3-4110-97AA-E5E7E45EA3D8}.Release|Win32.ActiveCfg = Release|Win32 - {3A517759-2BC3-4110-97AA-E5E7E45EA3D8}.Release|Win32.Build.0 = Release|Win32 {3A517759-2BC3-4110-97AA-E5E7E45EA3D8}.Release|x64.ActiveCfg = Release|x64 - {3A517759-2BC3-4110-97AA-E5E7E45EA3D8}.Release|x64.Build.0 = Release|x64 {8EBD7C12-5623-467F-B80D-CFBB4C695771}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {8EBD7C12-5623-467F-B80D-CFBB4C695771}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {8EBD7C12-5623-467F-B80D-CFBB4C695771}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {8EBD7C12-5623-467F-B80D-CFBB4C695771}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {8EBD7C12-5623-467F-B80D-CFBB4C695771}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {8EBD7C12-5623-467F-B80D-CFBB4C695771}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {8EBD7C12-5623-467F-B80D-CFBB4C695771}.Debug|Win32.ActiveCfg = Debug|Win32 - {8EBD7C12-5623-467F-B80D-CFBB4C695771}.Debug|Win32.Build.0 = Debug|Win32 {8EBD7C12-5623-467F-B80D-CFBB4C695771}.Debug|x64.ActiveCfg = Debug|x64 - {8EBD7C12-5623-467F-B80D-CFBB4C695771}.Debug|x64.Build.0 = Debug|x64 {8EBD7C12-5623-467F-B80D-CFBB4C695771}.Release|Win32.ActiveCfg = Release|Win32 - {8EBD7C12-5623-467F-B80D-CFBB4C695771}.Release|Win32.Build.0 = Release|Win32 {8EBD7C12-5623-467F-B80D-CFBB4C695771}.Release|x64.ActiveCfg = Release|x64 - {8EBD7C12-5623-467F-B80D-CFBB4C695771}.Release|x64.Build.0 = Release|x64 - {35F085D1-34B8-450C-AE23-FCF994DE4879}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {35F085D1-34B8-450C-AE23-FCF994DE4879}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {35F085D1-34B8-450C-AE23-FCF994DE4879}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {35F085D1-34B8-450C-AE23-FCF994DE4879}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {35F085D1-34B8-450C-AE23-FCF994DE4879}.Debug|Win32.ActiveCfg = Debug|Win32 - {35F085D1-34B8-450C-AE23-FCF994DE4879}.Debug|Win32.Build.0 = Debug|Win32 - {35F085D1-34B8-450C-AE23-FCF994DE4879}.Debug|x64.ActiveCfg = Debug|x64 - {35F085D1-34B8-450C-AE23-FCF994DE4879}.Debug|x64.Build.0 = Debug|x64 - {35F085D1-34B8-450C-AE23-FCF994DE4879}.Release|Win32.ActiveCfg = Release|Win32 - {35F085D1-34B8-450C-AE23-FCF994DE4879}.Release|Win32.Build.0 = Release|Win32 - {35F085D1-34B8-450C-AE23-FCF994DE4879}.Release|x64.ActiveCfg = Release|x64 - {35F085D1-34B8-450C-AE23-FCF994DE4879}.Release|x64.Build.0 = Release|x64 + {00000035-0000-0000-0000-000000000000}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {00000035-0000-0000-0000-000000000000}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 + {00000035-0000-0000-0000-000000000000}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 + {00000035-0000-0000-0000-000000000000}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {00000035-0000-0000-0000-000000000000}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 + {00000035-0000-0000-0000-000000000000}.Debug|Win32.ActiveCfg = Debug|Win32 + {00000035-0000-0000-0000-000000000000}.Debug|x64.ActiveCfg = Debug|x64 + {00000035-0000-0000-0000-000000000000}.Release|Win32.ActiveCfg = Release|Win32 + {00000035-0000-0000-0000-000000000000}.Release|x64.ActiveCfg = Release|x64 {16EED45E-8D20-40EF-BB30-9DDD5A11B352}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 {16EED45E-8D20-40EF-BB30-9DDD5A11B352}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {16EED45E-8D20-40EF-BB30-9DDD5A11B352}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 {16EED45E-8D20-40EF-BB30-9DDD5A11B352}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {16EED45E-8D20-40EF-BB30-9DDD5A11B352}.Debug|Win32.ActiveCfg = Debug|Win32 - {16EED45E-8D20-40EF-BB30-9DDD5A11B352}.Debug|Win32.Build.0 = Debug|Win32 {16EED45E-8D20-40EF-BB30-9DDD5A11B352}.Debug|x64.ActiveCfg = Debug|x64 - {16EED45E-8D20-40EF-BB30-9DDD5A11B352}.Debug|x64.Build.0 = Debug|x64 {16EED45E-8D20-40EF-BB30-9DDD5A11B352}.Release|Win32.ActiveCfg = Release|Win32 - {16EED45E-8D20-40EF-BB30-9DDD5A11B352}.Release|Win32.Build.0 = Release|Win32 {16EED45E-8D20-40EF-BB30-9DDD5A11B352}.Release|x64.ActiveCfg = Release|x64 - {16EED45E-8D20-40EF-BB30-9DDD5A11B352}.Release|x64.Build.0 = Release|x64 {2B721A85-96F1-4B92-BB31-1BCEF6ACFC8E}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 {2B721A85-96F1-4B92-BB31-1BCEF6ACFC8E}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {2B721A85-96F1-4B92-BB31-1BCEF6ACFC8E}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 @@ -3728,13 +3607,9 @@ Global {2B721A85-96F1-4B92-BB31-1BCEF6ACFC8E}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {2B721A85-96F1-4B92-BB31-1BCEF6ACFC8E}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {2B721A85-96F1-4B92-BB31-1BCEF6ACFC8E}.Debug|Win32.ActiveCfg = Debug|Win32 - {2B721A85-96F1-4B92-BB31-1BCEF6ACFC8E}.Debug|Win32.Build.0 = Debug|Win32 {2B721A85-96F1-4B92-BB31-1BCEF6ACFC8E}.Debug|x64.ActiveCfg = Debug|x64 - {2B721A85-96F1-4B92-BB31-1BCEF6ACFC8E}.Debug|x64.Build.0 = Debug|x64 {2B721A85-96F1-4B92-BB31-1BCEF6ACFC8E}.Release|Win32.ActiveCfg = Release|Win32 - {2B721A85-96F1-4B92-BB31-1BCEF6ACFC8E}.Release|Win32.Build.0 = Release|Win32 {2B721A85-96F1-4B92-BB31-1BCEF6ACFC8E}.Release|x64.ActiveCfg = Release|x64 - {2B721A85-96F1-4B92-BB31-1BCEF6ACFC8E}.Release|x64.Build.0 = Release|x64 {C5606B09-9FB7-4337-A490-2024CDCE4036}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 {C5606B09-9FB7-4337-A490-2024CDCE4036}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {C5606B09-9FB7-4337-A490-2024CDCE4036}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 @@ -3744,37 +3619,28 @@ Global {C5606B09-9FB7-4337-A490-2024CDCE4036}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {C5606B09-9FB7-4337-A490-2024CDCE4036}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {C5606B09-9FB7-4337-A490-2024CDCE4036}.Debug|Win32.ActiveCfg = Debug|Win32 - {C5606B09-9FB7-4337-A490-2024CDCE4036}.Debug|Win32.Build.0 = Debug|Win32 {C5606B09-9FB7-4337-A490-2024CDCE4036}.Debug|x64.ActiveCfg = Debug|x64 - {C5606B09-9FB7-4337-A490-2024CDCE4036}.Debug|x64.Build.0 = Debug|x64 {C5606B09-9FB7-4337-A490-2024CDCE4036}.Release|Win32.ActiveCfg = Release|Win32 - {C5606B09-9FB7-4337-A490-2024CDCE4036}.Release|Win32.Build.0 = Release|Win32 {C5606B09-9FB7-4337-A490-2024CDCE4036}.Release|x64.ActiveCfg = Release|x64 - {C5606B09-9FB7-4337-A490-2024CDCE4036}.Release|x64.Build.0 = Release|x64 {12405F8D-7361-450D-8AFE-85BFD3AEEFD7}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {12405F8D-7361-450D-8AFE-85BFD3AEEFD7}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {12405F8D-7361-450D-8AFE-85BFD3AEEFD7}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {12405F8D-7361-450D-8AFE-85BFD3AEEFD7}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {12405F8D-7361-450D-8AFE-85BFD3AEEFD7}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {12405F8D-7361-450D-8AFE-85BFD3AEEFD7}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {12405F8D-7361-450D-8AFE-85BFD3AEEFD7}.Debug|Win32.ActiveCfg = Debug|Win32 - {12405F8D-7361-450D-8AFE-85BFD3AEEFD7}.Debug|Win32.Build.0 = Debug|Win32 {12405F8D-7361-450D-8AFE-85BFD3AEEFD7}.Debug|x64.ActiveCfg = Debug|x64 - {12405F8D-7361-450D-8AFE-85BFD3AEEFD7}.Debug|x64.Build.0 = Debug|x64 {12405F8D-7361-450D-8AFE-85BFD3AEEFD7}.Release|Win32.ActiveCfg = Release|Win32 - {12405F8D-7361-450D-8AFE-85BFD3AEEFD7}.Release|Win32.Build.0 = Release|Win32 {12405F8D-7361-450D-8AFE-85BFD3AEEFD7}.Release|x64.ActiveCfg = Release|x64 - {12405F8D-7361-450D-8AFE-85BFD3AEEFD7}.Release|x64.Build.0 = Release|x64 {D7224A94-13EF-4253-B3EA-801295D5966B}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {D7224A94-13EF-4253-B3EA-801295D5966B}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {D7224A94-13EF-4253-B3EA-801295D5966B}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {D7224A94-13EF-4253-B3EA-801295D5966B}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 {D7224A94-13EF-4253-B3EA-801295D5966B}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {D7224A94-13EF-4253-B3EA-801295D5966B}.Debug|Win32.ActiveCfg = Debug|Win32 - {D7224A94-13EF-4253-B3EA-801295D5966B}.Debug|Win32.Build.0 = Debug|Win32 {D7224A94-13EF-4253-B3EA-801295D5966B}.Debug|x64.ActiveCfg = Debug|x64 - {D7224A94-13EF-4253-B3EA-801295D5966B}.Debug|x64.Build.0 = Debug|x64 {D7224A94-13EF-4253-B3EA-801295D5966B}.Release|Win32.ActiveCfg = Release|Win32 - {D7224A94-13EF-4253-B3EA-801295D5966B}.Release|Win32.Build.0 = Release|Win32 {D7224A94-13EF-4253-B3EA-801295D5966B}.Release|x64.ActiveCfg = Release|x64 - {D7224A94-13EF-4253-B3EA-801295D5966B}.Release|x64.Build.0 = Release|x64 {4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 {4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 @@ -3970,27 +3836,22 @@ Global {86FA255C-ED2F-44E3-989B-F9291165D3E1}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 {86FA255C-ED2F-44E3-989B-F9291165D3E1}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {86FA255C-ED2F-44E3-989B-F9291165D3E1}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {86FA255C-ED2F-44E3-989B-F9291165D3E1}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {86FA255C-ED2F-44E3-989B-F9291165D3E1}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {86FA255C-ED2F-44E3-989B-F9291165D3E1}.Debug|Win32.ActiveCfg = Debug|Win32 - {86FA255C-ED2F-44E3-989B-F9291165D3E1}.Debug|Win32.Build.0 = Debug|Win32 {86FA255C-ED2F-44E3-989B-F9291165D3E1}.Debug|x64.ActiveCfg = Debug|x64 - {86FA255C-ED2F-44E3-989B-F9291165D3E1}.Debug|x64.Build.0 = Debug|x64 {86FA255C-ED2F-44E3-989B-F9291165D3E1}.Release|Win32.ActiveCfg = Release|Win32 - {86FA255C-ED2F-44E3-989B-F9291165D3E1}.Release|Win32.Build.0 = Release|Win32 {86FA255C-ED2F-44E3-989B-F9291165D3E1}.Release|x64.ActiveCfg = Release|x64 - {86FA255C-ED2F-44E3-989B-F9291165D3E1}.Release|x64.Build.0 = Release|x64 {4D76D578-E858-485E-8498-9FC604B3B069}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {4D76D578-E858-485E-8498-9FC604B3B069}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {4D76D578-E858-485E-8498-9FC604B3B069}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {4D76D578-E858-485E-8498-9FC604B3B069}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {4D76D578-E858-485E-8498-9FC604B3B069}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {4D76D578-E858-485E-8498-9FC604B3B069}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {4D76D578-E858-485E-8498-9FC604B3B069}.Debug|Win32.ActiveCfg = Debug|Win32 - {4D76D578-E858-485E-8498-9FC604B3B069}.Debug|Win32.Build.0 = Debug|Win32 {4D76D578-E858-485E-8498-9FC604B3B069}.Debug|x64.ActiveCfg = Debug|x64 - {4D76D578-E858-485E-8498-9FC604B3B069}.Debug|x64.Build.0 = Debug|x64 {4D76D578-E858-485E-8498-9FC604B3B069}.Release|Win32.ActiveCfg = Release|Win32 - {4D76D578-E858-485E-8498-9FC604B3B069}.Release|Win32.Build.0 = Release|Win32 {4D76D578-E858-485E-8498-9FC604B3B069}.Release|x64.ActiveCfg = Release|x64 - {4D76D578-E858-485E-8498-9FC604B3B069}.Release|x64.Build.0 = Release|x64 {A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 {A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {A19DC61B-84AE-4983-9B4C-4F4A338178C5}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 @@ -4024,17 +3885,15 @@ Global {0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Release|x64.ActiveCfg = Release|x64 {0DDD44E0-E425-47BE-8DAA-06CA0E8704D2}.Release|x64.Build.0 = Release|x64 {7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 {7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 {7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 {7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Debug|Win32.ActiveCfg = Debug|Win32 - {7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Debug|Win32.Build.0 = Debug|Win32 {7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Debug|x64.ActiveCfg = Debug|x64 - {7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Debug|x64.Build.0 = Debug|x64 {7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Release|Win32.ActiveCfg = Release|Win32 - {7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Release|Win32.Build.0 = Release|Win32 {7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Release|x64.ActiveCfg = Release|x64 - {7D48DD81-247D-467E-B94C-D23EC94BDAB0}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -4076,7 +3935,7 @@ Global {7D0CD9C9-147B-49F3-BC9C-B2163496F188} = {2CAF9731-CB18-498C-A3EF-24F3D8A334AC} {6BF6F8F7-AF5F-4A4C-90C2-77473F6AFC2F} = {7D0CD9C9-147B-49F3-BC9C-B2163496F188} {3A38F35B-3A61-4490-955D-D1CAE61CB7FD} = {7D0CD9C9-147B-49F3-BC9C-B2163496F188} - {24550251-512C-4DC0-9B62-7DB6664DDCA8} = {7D0CD9C9-147B-49F3-BC9C-B2163496F188} + {00000245-0000-0000-0000-000000000000} = {7D0CD9C9-147B-49F3-BC9C-B2163496F188} {8D0B611C-F9C2-4B53-8497-7BD8036BD831} = {7D0CD9C9-147B-49F3-BC9C-B2163496F188} {09A35527-2103-4426-BD13-B54D5D953A38} = {2CAF9731-CB18-498C-A3EF-24F3D8A334AC} {386DD353-1314-407B-A394-476F4983461D} = {09A35527-2103-4426-BD13-B54D5D953A38} @@ -4292,7 +4151,7 @@ Global {D306ADCE-34A1-4599-BD50-8598BB92B47F} = {4FE5DD91-A8BD-4278-B526-DEED12113031} {3A517759-2BC3-4110-97AA-E5E7E45EA3D8} = {4FE5DD91-A8BD-4278-B526-DEED12113031} {8EBD7C12-5623-467F-B80D-CFBB4C695771} = {2AD4A6C4-4454-4DD3-9E86-A43FE46B1FAA} - {35F085D1-34B8-450C-AE23-FCF994DE4879} = {2AD4A6C4-4454-4DD3-9E86-A43FE46B1FAA} + {00000035-0000-0000-0000-000000000000} = {2AD4A6C4-4454-4DD3-9E86-A43FE46B1FAA} {16EED45E-8D20-40EF-BB30-9DDD5A11B352} = {2AD4A6C4-4454-4DD3-9E86-A43FE46B1FAA} {2B721A85-96F1-4B92-BB31-1BCEF6ACFC8E} = {6B5F8038-66D3-45D9-887B-88BAB9BDD52E} {C5606B09-9FB7-4337-A490-2024CDCE4036} = {6B5F8038-66D3-45D9-887B-88BAB9BDD52E} diff --git a/cpp/msbuild/ice.v140.sln b/cpp/msbuild/ice.v140.sln index 5cee69dbc8c..3e2e3a2447a 100644 --- a/cpp/msbuild/ice.v140.sln +++ b/cpp/msbuild/ice.v140.sln @@ -1,7 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30907.101 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iceutil", "..\src\IceUtil\msbuild\iceutil\iceutil.vcxproj", "{4D1A5110-3176-44BA-8BBB-57BF56519B9F}" EndProject @@ -55,7 +55,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ice++11", "..\src\Ice\msbui {763F88BB-37FD-4BCC-9D13-A7103596EA06} = {763F88BB-37FD-4BCC-9D13-A7103596EA06} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icexml", "..\src\IceXML\msbuild\icexml.vcxproj", "{90EC26E8-AFFA-4E44-B068-AB5849A96FDD}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icexml++11", "..\src\IceXML\msbuild\icexml.vcxproj", "{90EC26E8-AFFA-4E44-B068-AB5849A96FDD}" ProjectSection(ProjectDependencies) = postProject {6485EC94-6B47-428D-B42D-AAA11F08DB59} = {6485EC94-6B47-428D-B42D-AAA11F08DB59} EndProjectSection @@ -71,9 +71,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glacier2++11", "..\src\Glac {3AB9772C-6113-4F1C-90FB-5368E7486C11} = {3AB9772C-6113-4F1C-90FB-5368E7486C11} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icedb", "..\src\IceDB\msbuild\icedb.vcxproj", "{E8ACC848-F7DA-4B29-B52F-81D66E7D397E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icedb++11", "..\src\IceDB\msbuild\icedb.vcxproj", "{E8ACC848-F7DA-4B29-B52F-81D66E7D397E}" ProjectSection(ProjectDependencies) = postProject - {6485EC94-6B47-428D-B42D-AAA11F08DB59} = {6485EC94-6B47-428D-B42D-AAA11F08DB59} + {3AB9772C-6113-4F1C-90FB-5368E7486C11} = {3AB9772C-6113-4F1C-90FB-5368E7486C11} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icestorm", "..\src\IceStormLib\msbuild\icestorm\icestorm.vcxproj", "{E6864F0D-B2ED-406A-B98C-F3668A680005}" @@ -141,7 +141,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icebox++11", "..\src\IceBox EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iceboxadmin", "..\src\IceBox\msbuild\iceboxadmin\iceboxadmin.vcxproj", "{1B745EA3-C97A-41BB-8E6F-64AAE992BE55}" ProjectSection(ProjectDependencies) = postProject - {588F90CA-62AC-4101-83FC-19AB9DB6B509} = {588F90CA-62AC-4101-83FC-19AB9DB6B509} + {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} = {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iceserviceinstall", "..\src\iceserviceinstall\msbuild\iceserviceinstall.vcxproj", "{0E22B627-F1A6-4771-89DE-9E45FD51F124}" @@ -151,48 +151,48 @@ 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} + {A28E5839-97F3-4874-BB77-E425787CF2ED} = {A28E5839-97F3-4874-BB77-E425787CF2ED} + {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} = {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} {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} + {142A9562-8DEC-4B1B-9B15-2CAD8304447B} = {142A9562-8DEC-4B1B-9B15-2CAD8304447B} + {2940A3C2-A9BA-44AA-AF65-00479C783407} = {2940A3C2-A9BA-44AA-AF65-00479C783407} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icestormservice", "..\src\IceStorm\msbuild\icestormservice\icestormservice.vcxproj", "{9E13C4B5-5DA9-43C1-9304-AEAC035E854D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icestormservice++11", "..\src\IceStorm\msbuild\icestormservice\icestormservice.vcxproj", "{9E13C4B5-5DA9-43C1-9304-AEAC035E854D}" ProjectSection(ProjectDependencies) = postProject - {E6864F0D-B2ED-406A-B98C-F3668A680005} = {E6864F0D-B2ED-406A-B98C-F3668A680005} + {A28E5839-97F3-4874-BB77-E425787CF2ED} = {A28E5839-97F3-4874-BB77-E425787CF2ED} + {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} = {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} {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} + {142A9562-8DEC-4B1B-9B15-2CAD8304447B} = {142A9562-8DEC-4B1B-9B15-2CAD8304447B} + {2940A3C2-A9BA-44AA-AF65-00479C783407} = {2940A3C2-A9BA-44AA-AF65-00479C783407} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icestormadmin", "..\src\IceStorm\msbuild\icestormadmin\icestormadmin.vcxproj", "{8F1A1F99-DBE0-408D-99F7-D59142BD008C}" ProjectSection(ProjectDependencies) = postProject - {E6864F0D-B2ED-406A-B98C-F3668A680005} = {E6864F0D-B2ED-406A-B98C-F3668A680005} + {A28E5839-97F3-4874-BB77-E425787CF2ED} = {A28E5839-97F3-4874-BB77-E425787CF2ED} + {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} = {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} {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} + {142A9562-8DEC-4B1B-9B15-2CAD8304447B} = {142A9562-8DEC-4B1B-9B15-2CAD8304447B} + {2940A3C2-A9BA-44AA-AF65-00479C783407} = {2940A3C2-A9BA-44AA-AF65-00479C783407} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icegridadmin", "..\src\IceGrid\msbuild\icegridadmin\icegridadmin.vcxproj", "{1F4CA1BE-B405-400F-912E-F0CC7E369D59}" ProjectSection(ProjectDependencies) = postProject - {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} + {96161748-CE5E-4548-BC1D-AFD2F137A1DC} = {96161748-CE5E-4548-BC1D-AFD2F137A1DC} + {C694B856-3393-41B4-B3DC-3A5AD9A92A3D} = {C694B856-3393-41B4-B3DC-3A5AD9A92A3D} + {142A9562-8DEC-4B1B-9B15-2CAD8304447B} = {142A9562-8DEC-4B1B-9B15-2CAD8304447B} {90EC26E8-AFFA-4E44-B068-AB5849A96FDD} = {90EC26E8-AFFA-4E44-B068-AB5849A96FDD} 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} + {A28E5839-97F3-4874-BB77-E425787CF2ED} = {A28E5839-97F3-4874-BB77-E425787CF2ED} + {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} = {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} {E8ACC848-F7DA-4B29-B52F-81D66E7D397E} = {E8ACC848-F7DA-4B29-B52F-81D66E7D397E} - {72FA68A9-49B6-4AB6-94AE-34BB03770A51} = {72FA68A9-49B6-4AB6-94AE-34BB03770A51} + {142A9562-8DEC-4B1B-9B15-2CAD8304447B} = {142A9562-8DEC-4B1B-9B15-2CAD8304447B} + {5923B17D-2873-4245-87A7-FB8F4BE12501} = {5923B17D-2873-4245-87A7-FB8F4BE12501} {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} + {2940A3C2-A9BA-44AA-AF65-00479C783407} = {2940A3C2-A9BA-44AA-AF65-00479C783407} {90EC26E8-AFFA-4E44-B068-AB5849A96FDD} = {90EC26E8-AFFA-4E44-B068-AB5849A96FDD} EndProjectSection EndProject @@ -203,12 +203,12 @@ 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} - {72FA68A9-49B6-4AB6-94AE-34BB03770A51} = {72FA68A9-49B6-4AB6-94AE-34BB03770A51} + {A28E5839-97F3-4874-BB77-E425787CF2ED} = {A28E5839-97F3-4874-BB77-E425787CF2ED} + {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} = {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} + {142A9562-8DEC-4B1B-9B15-2CAD8304447B} = {142A9562-8DEC-4B1B-9B15-2CAD8304447B} + {5923B17D-2873-4245-87A7-FB8F4BE12501} = {5923B17D-2873-4245-87A7-FB8F4BE12501} {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} + {2940A3C2-A9BA-44AA-AF65-00479C783407} = {2940A3C2-A9BA-44AA-AF65-00479C783407} {90EC26E8-AFFA-4E44-B068-AB5849A96FDD} = {90EC26E8-AFFA-4E44-B068-AB5849A96FDD} EndProjectSection EndProject @@ -233,20 +233,20 @@ 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} + {5923B17D-2873-4245-87A7-FB8F4BE12501} = {5923B17D-2873-4245-87A7-FB8F4BE12501} + {2940A3C2-A9BA-44AA-AF65-00479C783407} = {2940A3C2-A9BA-44AA-AF65-00479C783407} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icegriddb", "..\src\icegriddb\msbuild\icegriddb.vcxproj", "{369524F4-D374-44F4-BCFD-408934595701}" ProjectSection(ProjectDependencies) = postProject + {3AB9772C-6113-4F1C-90FB-5368E7486C11} = {3AB9772C-6113-4F1C-90FB-5368E7486C11} {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} + {142A9562-8DEC-4B1B-9B15-2CAD8304447B} = {142A9562-8DEC-4B1B-9B15-2CAD8304447B} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icebridge", "..\src\IceBridge\msbuild\icebridge.vcxproj", "{1D6E8807-7C28-421F-B49E-BCB482FCB21D}" ProjectSection(ProjectDependencies) = postProject - {6485EC94-6B47-428D-B42D-AAA11F08DB59} = {6485EC94-6B47-428D-B42D-AAA11F08DB59} + {3AB9772C-6113-4F1C-90FB-5368E7486C11} = {3AB9772C-6113-4F1C-90FB-5368E7486C11} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icesslopenssl", "..\src\IceSSL\msbuild\icesslopenssl\icesslopenssl.vcxproj", "{0D08F6B8-39C0-413B-84CE-D73230BCC740}" @@ -665,10 +665,10 @@ Global {55A6E595-EFE4-47B9-957C-E4CFF2E75FD6} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} {ACAF39D3-B4BD-426B-98DE-D95944B0D3F6} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} {3AB9772C-6113-4F1C-90FB-5368E7486C11} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} - {90EC26E8-AFFA-4E44-B068-AB5849A96FDD} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} + {90EC26E8-AFFA-4E44-B068-AB5849A96FDD} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} {6485EC94-6B47-428D-B42D-AAA11F08DB59} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} {2940A3C2-A9BA-44AA-AF65-00479C783407} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} - {E8ACC848-F7DA-4B29-B52F-81D66E7D397E} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} + {E8ACC848-F7DA-4B29-B52F-81D66E7D397E} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} {E6864F0D-B2ED-406A-B98C-F3668A680005} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} {A28E5839-97F3-4874-BB77-E425787CF2ED} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} {18BF13D3-85D3-43A5-8C96-E52EB0672F72} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} @@ -681,25 +681,28 @@ Global {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} {81C8FC6A-CAC3-4B6D-AE4D-5DEAD29726C5} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} {96161748-CE5E-4548-BC1D-AFD2F137A1DC} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} - {1B745EA3-C97A-41BB-8E6F-64AAE992BE55} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} + {1B745EA3-C97A-41BB-8E6F-64AAE992BE55} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} {0E22B627-F1A6-4771-89DE-9E45FD51F124} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {F0B74B00-F252-4D38-A352-ED379CB196E9} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {9E13C4B5-5DA9-43C1-9304-AEAC035E854D} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {8F1A1F99-DBE0-408D-99F7-D59142BD008C} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {1F4CA1BE-B405-400F-912E-F0CC7E369D59} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {48EF9416-336F-4FA5-A376-FDFB7726ADBA} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} + {F0B74B00-F252-4D38-A352-ED379CB196E9} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} + {9E13C4B5-5DA9-43C1-9304-AEAC035E854D} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} + {8F1A1F99-DBE0-408D-99F7-D59142BD008C} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} + {1F4CA1BE-B405-400F-912E-F0CC7E369D59} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} + {48EF9416-336F-4FA5-A376-FDFB7726ADBA} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} {72FA68A9-49B6-4AB6-94AE-34BB03770A51} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {64490115-464B-4DC3-B7C6-D0AF1B68B6F9} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} + {64490115-464B-4DC3-B7C6-D0AF1B68B6F9} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} {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} - {369524F4-D374-44F4-BCFD-408934595701} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {1D6E8807-7C28-421F-B49E-BCB482FCB21D} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} + {541CF1D6-95FD-4499-AB02-75CCCEE660B0} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} + {369524F4-D374-44F4-BCFD-408934595701} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} + {1D6E8807-7C28-421F-B49E-BCB482FCB21D} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} {0D08F6B8-39C0-413B-84CE-D73230BCC740} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} {D0DC2305-37FE-4D03-BE05-AC8912678DC8} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} {D64AAD99-11C7-4C69-BD27-9FA9C71A36AC} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} {A79E9EB0-878C-4EDB-9804-2D262D6008DB} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} {8D237BBB-506A-4CC1-8C81-BDC2787DA88B} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {77DA9B68-F0E2-4385-8198-CA9E4E01C3BB} + EndGlobalSection EndGlobal diff --git a/cpp/msbuild/ice.v141.sln b/cpp/msbuild/ice.v141.sln index 3229c8abef5..4533de859ec 100644 --- a/cpp/msbuild/ice.v141.sln +++ b/cpp/msbuild/ice.v141.sln @@ -1,7 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26403.3 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30907.101 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iceutil", "..\src\IceUtil\msbuild\iceutil\iceutil.vcxproj", "{4D1A5110-3176-44BA-8BBB-57BF56519B9F}" EndProject @@ -55,7 +55,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ice++11", "..\src\Ice\msbui {763F88BB-37FD-4BCC-9D13-A7103596EA06} = {763F88BB-37FD-4BCC-9D13-A7103596EA06} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icexml", "..\src\IceXML\msbuild\icexml.vcxproj", "{90EC26E8-AFFA-4E44-B068-AB5849A96FDD}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icexml++11", "..\src\IceXML\msbuild\icexml.vcxproj", "{90EC26E8-AFFA-4E44-B068-AB5849A96FDD}" ProjectSection(ProjectDependencies) = postProject {6485EC94-6B47-428D-B42D-AAA11F08DB59} = {6485EC94-6B47-428D-B42D-AAA11F08DB59} EndProjectSection @@ -71,9 +71,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glacier2++11", "..\src\Glac {3AB9772C-6113-4F1C-90FB-5368E7486C11} = {3AB9772C-6113-4F1C-90FB-5368E7486C11} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icedb", "..\src\IceDB\msbuild\icedb.vcxproj", "{E8ACC848-F7DA-4B29-B52F-81D66E7D397E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icedb++11", "..\src\IceDB\msbuild\icedb.vcxproj", "{E8ACC848-F7DA-4B29-B52F-81D66E7D397E}" ProjectSection(ProjectDependencies) = postProject - {6485EC94-6B47-428D-B42D-AAA11F08DB59} = {6485EC94-6B47-428D-B42D-AAA11F08DB59} + {3AB9772C-6113-4F1C-90FB-5368E7486C11} = {3AB9772C-6113-4F1C-90FB-5368E7486C11} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icestorm", "..\src\IceStormLib\msbuild\icestorm\icestorm.vcxproj", "{E6864F0D-B2ED-406A-B98C-F3668A680005}" @@ -141,7 +141,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icebox++11", "..\src\IceBox EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iceboxadmin", "..\src\IceBox\msbuild\iceboxadmin\iceboxadmin.vcxproj", "{1B745EA3-C97A-41BB-8E6F-64AAE992BE55}" ProjectSection(ProjectDependencies) = postProject - {588F90CA-62AC-4101-83FC-19AB9DB6B509} = {588F90CA-62AC-4101-83FC-19AB9DB6B509} + {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} = {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iceserviceinstall", "..\src\iceserviceinstall\msbuild\iceserviceinstall.vcxproj", "{0E22B627-F1A6-4771-89DE-9E45FD51F124}" @@ -151,14 +151,14 @@ 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} + {A28E5839-97F3-4874-BB77-E425787CF2ED} = {A28E5839-97F3-4874-BB77-E425787CF2ED} + {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} = {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} {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} + {142A9562-8DEC-4B1B-9B15-2CAD8304447B} = {142A9562-8DEC-4B1B-9B15-2CAD8304447B} + {2940A3C2-A9BA-44AA-AF65-00479C783407} = {2940A3C2-A9BA-44AA-AF65-00479C783407} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icestormservice", "..\src\IceStorm\msbuild\icestormservice\icestormservice.vcxproj", "{9E13C4B5-5DA9-43C1-9304-AEAC035E854D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icestormservice++11", "..\src\IceStorm\msbuild\icestormservice\icestormservice.vcxproj", "{9E13C4B5-5DA9-43C1-9304-AEAC035E854D}" ProjectSection(ProjectDependencies) = postProject {E6864F0D-B2ED-406A-B98C-F3668A680005} = {E6864F0D-B2ED-406A-B98C-F3668A680005} {E8ACC848-F7DA-4B29-B52F-81D66E7D397E} = {E8ACC848-F7DA-4B29-B52F-81D66E7D397E} @@ -169,30 +169,30 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icestormservice", "..\src\I EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icestormadmin", "..\src\IceStorm\msbuild\icestormadmin\icestormadmin.vcxproj", "{8F1A1F99-DBE0-408D-99F7-D59142BD008C}" ProjectSection(ProjectDependencies) = postProject - {E6864F0D-B2ED-406A-B98C-F3668A680005} = {E6864F0D-B2ED-406A-B98C-F3668A680005} + {A28E5839-97F3-4874-BB77-E425787CF2ED} = {A28E5839-97F3-4874-BB77-E425787CF2ED} + {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} = {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} {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} + {142A9562-8DEC-4B1B-9B15-2CAD8304447B} = {142A9562-8DEC-4B1B-9B15-2CAD8304447B} + {2940A3C2-A9BA-44AA-AF65-00479C783407} = {2940A3C2-A9BA-44AA-AF65-00479C783407} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icegridadmin", "..\src\IceGrid\msbuild\icegridadmin\icegridadmin.vcxproj", "{1F4CA1BE-B405-400F-912E-F0CC7E369D59}" ProjectSection(ProjectDependencies) = postProject - {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} + {96161748-CE5E-4548-BC1D-AFD2F137A1DC} = {96161748-CE5E-4548-BC1D-AFD2F137A1DC} + {C694B856-3393-41B4-B3DC-3A5AD9A92A3D} = {C694B856-3393-41B4-B3DC-3A5AD9A92A3D} + {142A9562-8DEC-4B1B-9B15-2CAD8304447B} = {142A9562-8DEC-4B1B-9B15-2CAD8304447B} {90EC26E8-AFFA-4E44-B068-AB5849A96FDD} = {90EC26E8-AFFA-4E44-B068-AB5849A96FDD} 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} + {A28E5839-97F3-4874-BB77-E425787CF2ED} = {A28E5839-97F3-4874-BB77-E425787CF2ED} + {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} = {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} {E8ACC848-F7DA-4B29-B52F-81D66E7D397E} = {E8ACC848-F7DA-4B29-B52F-81D66E7D397E} - {72FA68A9-49B6-4AB6-94AE-34BB03770A51} = {72FA68A9-49B6-4AB6-94AE-34BB03770A51} + {142A9562-8DEC-4B1B-9B15-2CAD8304447B} = {142A9562-8DEC-4B1B-9B15-2CAD8304447B} + {5923B17D-2873-4245-87A7-FB8F4BE12501} = {5923B17D-2873-4245-87A7-FB8F4BE12501} {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} + {2940A3C2-A9BA-44AA-AF65-00479C783407} = {2940A3C2-A9BA-44AA-AF65-00479C783407} {90EC26E8-AFFA-4E44-B068-AB5849A96FDD} = {90EC26E8-AFFA-4E44-B068-AB5849A96FDD} EndProjectSection EndProject @@ -203,12 +203,12 @@ 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} - {72FA68A9-49B6-4AB6-94AE-34BB03770A51} = {72FA68A9-49B6-4AB6-94AE-34BB03770A51} + {A28E5839-97F3-4874-BB77-E425787CF2ED} = {A28E5839-97F3-4874-BB77-E425787CF2ED} + {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} = {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} + {142A9562-8DEC-4B1B-9B15-2CAD8304447B} = {142A9562-8DEC-4B1B-9B15-2CAD8304447B} + {5923B17D-2873-4245-87A7-FB8F4BE12501} = {5923B17D-2873-4245-87A7-FB8F4BE12501} {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} + {2940A3C2-A9BA-44AA-AF65-00479C783407} = {2940A3C2-A9BA-44AA-AF65-00479C783407} {90EC26E8-AFFA-4E44-B068-AB5849A96FDD} = {90EC26E8-AFFA-4E44-B068-AB5849A96FDD} EndProjectSection EndProject @@ -233,20 +233,20 @@ 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} + {5923B17D-2873-4245-87A7-FB8F4BE12501} = {5923B17D-2873-4245-87A7-FB8F4BE12501} + {2940A3C2-A9BA-44AA-AF65-00479C783407} = {2940A3C2-A9BA-44AA-AF65-00479C783407} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icegriddb", "..\src\icegriddb\msbuild\icegriddb.vcxproj", "{369524F4-D374-44F4-BCFD-408934595701}" ProjectSection(ProjectDependencies) = postProject + {3AB9772C-6113-4F1C-90FB-5368E7486C11} = {3AB9772C-6113-4F1C-90FB-5368E7486C11} {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} + {142A9562-8DEC-4B1B-9B15-2CAD8304447B} = {142A9562-8DEC-4B1B-9B15-2CAD8304447B} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icebridge", "..\src\IceBridge\msbuild\icebridge.vcxproj", "{1D6E8807-7C28-421F-B49E-BCB482FCB21D}" ProjectSection(ProjectDependencies) = postProject - {6485EC94-6B47-428D-B42D-AAA11F08DB59} = {6485EC94-6B47-428D-B42D-AAA11F08DB59} + {3AB9772C-6113-4F1C-90FB-5368E7486C11} = {3AB9772C-6113-4F1C-90FB-5368E7486C11} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slice2rb", "..\src\slice2rb\msbuild\slice2rb.vcxproj", "{A79E9EB0-878C-4EDB-9804-2D262D6008DB}" @@ -665,10 +665,10 @@ Global {55A6E595-EFE4-47B9-957C-E4CFF2E75FD6} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} {ACAF39D3-B4BD-426B-98DE-D95944B0D3F6} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} {3AB9772C-6113-4F1C-90FB-5368E7486C11} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} - {90EC26E8-AFFA-4E44-B068-AB5849A96FDD} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} + {90EC26E8-AFFA-4E44-B068-AB5849A96FDD} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} {6485EC94-6B47-428D-B42D-AAA11F08DB59} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} {2940A3C2-A9BA-44AA-AF65-00479C783407} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} - {E8ACC848-F7DA-4B29-B52F-81D66E7D397E} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} + {E8ACC848-F7DA-4B29-B52F-81D66E7D397E} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} {E6864F0D-B2ED-406A-B98C-F3668A680005} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} {A28E5839-97F3-4874-BB77-E425787CF2ED} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} {18BF13D3-85D3-43A5-8C96-E52EB0672F72} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} @@ -681,21 +681,21 @@ Global {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} {81C8FC6A-CAC3-4B6D-AE4D-5DEAD29726C5} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} {96161748-CE5E-4548-BC1D-AFD2F137A1DC} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} - {1B745EA3-C97A-41BB-8E6F-64AAE992BE55} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} + {1B745EA3-C97A-41BB-8E6F-64AAE992BE55} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} {0E22B627-F1A6-4771-89DE-9E45FD51F124} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {F0B74B00-F252-4D38-A352-ED379CB196E9} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {9E13C4B5-5DA9-43C1-9304-AEAC035E854D} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {8F1A1F99-DBE0-408D-99F7-D59142BD008C} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {1F4CA1BE-B405-400F-912E-F0CC7E369D59} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {48EF9416-336F-4FA5-A376-FDFB7726ADBA} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} + {F0B74B00-F252-4D38-A352-ED379CB196E9} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} + {9E13C4B5-5DA9-43C1-9304-AEAC035E854D} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} + {8F1A1F99-DBE0-408D-99F7-D59142BD008C} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} + {1F4CA1BE-B405-400F-912E-F0CC7E369D59} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} + {48EF9416-336F-4FA5-A376-FDFB7726ADBA} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} {72FA68A9-49B6-4AB6-94AE-34BB03770A51} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {64490115-464B-4DC3-B7C6-D0AF1B68B6F9} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} + {64490115-464B-4DC3-B7C6-D0AF1B68B6F9} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} {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} - {369524F4-D374-44F4-BCFD-408934595701} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {1D6E8807-7C28-421F-B49E-BCB482FCB21D} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} + {541CF1D6-95FD-4499-AB02-75CCCEE660B0} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} + {369524F4-D374-44F4-BCFD-408934595701} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} + {1D6E8807-7C28-421F-B49E-BCB482FCB21D} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} {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} diff --git a/cpp/msbuild/ice.v142.sln b/cpp/msbuild/ice.v142.sln index 7dcbd880d1b..3d1c2bade1f 100644 --- a/cpp/msbuild/ice.v142.sln +++ b/cpp/msbuild/ice.v142.sln @@ -1,7 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26403.3 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30907.101 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iceutil", "..\src\IceUtil\msbuild\iceutil\iceutil.vcxproj", "{4D1A5110-3176-44BA-8BBB-57BF56519B9F}" EndProject @@ -55,9 +55,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ice++11", "..\src\Ice\msbui {763F88BB-37FD-4BCC-9D13-A7103596EA06} = {763F88BB-37FD-4BCC-9D13-A7103596EA06} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icexml", "..\src\IceXML\msbuild\icexml.vcxproj", "{90EC26E8-AFFA-4E44-B068-AB5849A96FDD}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icexml++11", "..\src\IceXML\msbuild\icexml.vcxproj", "{90EC26E8-AFFA-4E44-B068-AB5849A96FDD}" ProjectSection(ProjectDependencies) = postProject - {6485EC94-6B47-428D-B42D-AAA11F08DB59} = {6485EC94-6B47-428D-B42D-AAA11F08DB59} + {3AB9772C-6113-4F1C-90FB-5368E7486C11} = {3AB9772C-6113-4F1C-90FB-5368E7486C11} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ice", "..\src\Ice\msbuild\ice\ice.vcxproj", "{6485EC94-6B47-428D-B42D-AAA11F08DB59}" @@ -71,9 +71,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glacier2++11", "..\src\Glac {3AB9772C-6113-4F1C-90FB-5368E7486C11} = {3AB9772C-6113-4F1C-90FB-5368E7486C11} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icedb", "..\src\IceDB\msbuild\icedb.vcxproj", "{E8ACC848-F7DA-4B29-B52F-81D66E7D397E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icedb++11", "..\src\IceDB\msbuild\icedb.vcxproj", "{E8ACC848-F7DA-4B29-B52F-81D66E7D397E}" ProjectSection(ProjectDependencies) = postProject - {6485EC94-6B47-428D-B42D-AAA11F08DB59} = {6485EC94-6B47-428D-B42D-AAA11F08DB59} + {3AB9772C-6113-4F1C-90FB-5368E7486C11} = {3AB9772C-6113-4F1C-90FB-5368E7486C11} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icestorm", "..\src\IceStormLib\msbuild\icestorm\icestorm.vcxproj", "{E6864F0D-B2ED-406A-B98C-F3668A680005}" @@ -141,7 +141,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icebox++11", "..\src\IceBox EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iceboxadmin", "..\src\IceBox\msbuild\iceboxadmin\iceboxadmin.vcxproj", "{1B745EA3-C97A-41BB-8E6F-64AAE992BE55}" ProjectSection(ProjectDependencies) = postProject - {588F90CA-62AC-4101-83FC-19AB9DB6B509} = {588F90CA-62AC-4101-83FC-19AB9DB6B509} + {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} = {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iceserviceinstall", "..\src\iceserviceinstall\msbuild\iceserviceinstall.vcxproj", "{0E22B627-F1A6-4771-89DE-9E45FD51F124}" @@ -151,48 +151,48 @@ 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} + {A28E5839-97F3-4874-BB77-E425787CF2ED} = {A28E5839-97F3-4874-BB77-E425787CF2ED} + {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} = {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} {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} + {142A9562-8DEC-4B1B-9B15-2CAD8304447B} = {142A9562-8DEC-4B1B-9B15-2CAD8304447B} + {2940A3C2-A9BA-44AA-AF65-00479C783407} = {2940A3C2-A9BA-44AA-AF65-00479C783407} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icestormservice", "..\src\IceStorm\msbuild\icestormservice\icestormservice.vcxproj", "{9E13C4B5-5DA9-43C1-9304-AEAC035E854D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icestormservice++11", "..\src\IceStorm\msbuild\icestormservice\icestormservice.vcxproj", "{9E13C4B5-5DA9-43C1-9304-AEAC035E854D}" ProjectSection(ProjectDependencies) = postProject - {E6864F0D-B2ED-406A-B98C-F3668A680005} = {E6864F0D-B2ED-406A-B98C-F3668A680005} + {A28E5839-97F3-4874-BB77-E425787CF2ED} = {A28E5839-97F3-4874-BB77-E425787CF2ED} + {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} = {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} {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} + {142A9562-8DEC-4B1B-9B15-2CAD8304447B} = {142A9562-8DEC-4B1B-9B15-2CAD8304447B} + {2940A3C2-A9BA-44AA-AF65-00479C783407} = {2940A3C2-A9BA-44AA-AF65-00479C783407} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icestormadmin", "..\src\IceStorm\msbuild\icestormadmin\icestormadmin.vcxproj", "{8F1A1F99-DBE0-408D-99F7-D59142BD008C}" ProjectSection(ProjectDependencies) = postProject - {E6864F0D-B2ED-406A-B98C-F3668A680005} = {E6864F0D-B2ED-406A-B98C-F3668A680005} + {A28E5839-97F3-4874-BB77-E425787CF2ED} = {A28E5839-97F3-4874-BB77-E425787CF2ED} + {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} = {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} {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} + {142A9562-8DEC-4B1B-9B15-2CAD8304447B} = {142A9562-8DEC-4B1B-9B15-2CAD8304447B} + {2940A3C2-A9BA-44AA-AF65-00479C783407} = {2940A3C2-A9BA-44AA-AF65-00479C783407} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icegridadmin", "..\src\IceGrid\msbuild\icegridadmin\icegridadmin.vcxproj", "{1F4CA1BE-B405-400F-912E-F0CC7E369D59}" ProjectSection(ProjectDependencies) = postProject - {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} + {96161748-CE5E-4548-BC1D-AFD2F137A1DC} = {96161748-CE5E-4548-BC1D-AFD2F137A1DC} + {C694B856-3393-41B4-B3DC-3A5AD9A92A3D} = {C694B856-3393-41B4-B3DC-3A5AD9A92A3D} + {142A9562-8DEC-4B1B-9B15-2CAD8304447B} = {142A9562-8DEC-4B1B-9B15-2CAD8304447B} {90EC26E8-AFFA-4E44-B068-AB5849A96FDD} = {90EC26E8-AFFA-4E44-B068-AB5849A96FDD} 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} + {A28E5839-97F3-4874-BB77-E425787CF2ED} = {A28E5839-97F3-4874-BB77-E425787CF2ED} + {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} = {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} {E8ACC848-F7DA-4B29-B52F-81D66E7D397E} = {E8ACC848-F7DA-4B29-B52F-81D66E7D397E} - {72FA68A9-49B6-4AB6-94AE-34BB03770A51} = {72FA68A9-49B6-4AB6-94AE-34BB03770A51} + {142A9562-8DEC-4B1B-9B15-2CAD8304447B} = {142A9562-8DEC-4B1B-9B15-2CAD8304447B} + {5923B17D-2873-4245-87A7-FB8F4BE12501} = {5923B17D-2873-4245-87A7-FB8F4BE12501} {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} + {2940A3C2-A9BA-44AA-AF65-00479C783407} = {2940A3C2-A9BA-44AA-AF65-00479C783407} {90EC26E8-AFFA-4E44-B068-AB5849A96FDD} = {90EC26E8-AFFA-4E44-B068-AB5849A96FDD} EndProjectSection EndProject @@ -203,12 +203,13 @@ 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} - {72FA68A9-49B6-4AB6-94AE-34BB03770A51} = {72FA68A9-49B6-4AB6-94AE-34BB03770A51} + {A28E5839-97F3-4874-BB77-E425787CF2ED} = {A28E5839-97F3-4874-BB77-E425787CF2ED} + {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} = {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} + {E8ACC848-F7DA-4B29-B52F-81D66E7D397E} = {E8ACC848-F7DA-4B29-B52F-81D66E7D397E} + {142A9562-8DEC-4B1B-9B15-2CAD8304447B} = {142A9562-8DEC-4B1B-9B15-2CAD8304447B} + {5923B17D-2873-4245-87A7-FB8F4BE12501} = {5923B17D-2873-4245-87A7-FB8F4BE12501} {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} + {2940A3C2-A9BA-44AA-AF65-00479C783407} = {2940A3C2-A9BA-44AA-AF65-00479C783407} {90EC26E8-AFFA-4E44-B068-AB5849A96FDD} = {90EC26E8-AFFA-4E44-B068-AB5849A96FDD} EndProjectSection EndProject @@ -233,20 +234,20 @@ 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} + {5923B17D-2873-4245-87A7-FB8F4BE12501} = {5923B17D-2873-4245-87A7-FB8F4BE12501} + {2940A3C2-A9BA-44AA-AF65-00479C783407} = {2940A3C2-A9BA-44AA-AF65-00479C783407} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icegriddb", "..\src\icegriddb\msbuild\icegriddb.vcxproj", "{369524F4-D374-44F4-BCFD-408934595701}" ProjectSection(ProjectDependencies) = postProject + {3AB9772C-6113-4F1C-90FB-5368E7486C11} = {3AB9772C-6113-4F1C-90FB-5368E7486C11} {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} + {142A9562-8DEC-4B1B-9B15-2CAD8304447B} = {142A9562-8DEC-4B1B-9B15-2CAD8304447B} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icebridge", "..\src\IceBridge\msbuild\icebridge.vcxproj", "{1D6E8807-7C28-421F-B49E-BCB482FCB21D}" ProjectSection(ProjectDependencies) = postProject - {6485EC94-6B47-428D-B42D-AAA11F08DB59} = {6485EC94-6B47-428D-B42D-AAA11F08DB59} + {3AB9772C-6113-4F1C-90FB-5368E7486C11} = {3AB9772C-6113-4F1C-90FB-5368E7486C11} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slice2rb", "..\src\slice2rb\msbuild\slice2rb.vcxproj", "{A79E9EB0-878C-4EDB-9804-2D262D6008DB}" @@ -655,10 +656,10 @@ Global {55A6E595-EFE4-47B9-957C-E4CFF2E75FD6} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} {ACAF39D3-B4BD-426B-98DE-D95944B0D3F6} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} {3AB9772C-6113-4F1C-90FB-5368E7486C11} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} - {90EC26E8-AFFA-4E44-B068-AB5849A96FDD} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} + {90EC26E8-AFFA-4E44-B068-AB5849A96FDD} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} {6485EC94-6B47-428D-B42D-AAA11F08DB59} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} {2940A3C2-A9BA-44AA-AF65-00479C783407} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} - {E8ACC848-F7DA-4B29-B52F-81D66E7D397E} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} + {E8ACC848-F7DA-4B29-B52F-81D66E7D397E} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} {E6864F0D-B2ED-406A-B98C-F3668A680005} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} {A28E5839-97F3-4874-BB77-E425787CF2ED} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} {18BF13D3-85D3-43A5-8C96-E52EB0672F72} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} @@ -671,21 +672,21 @@ Global {4F8DD63C-3359-42F2-A6A8-80F7D55593AC} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} {81C8FC6A-CAC3-4B6D-AE4D-5DEAD29726C5} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} {96161748-CE5E-4548-BC1D-AFD2F137A1DC} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} - {1B745EA3-C97A-41BB-8E6F-64AAE992BE55} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} + {1B745EA3-C97A-41BB-8E6F-64AAE992BE55} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} {0E22B627-F1A6-4771-89DE-9E45FD51F124} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {F0B74B00-F252-4D38-A352-ED379CB196E9} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {9E13C4B5-5DA9-43C1-9304-AEAC035E854D} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {8F1A1F99-DBE0-408D-99F7-D59142BD008C} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {1F4CA1BE-B405-400F-912E-F0CC7E369D59} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {48EF9416-336F-4FA5-A376-FDFB7726ADBA} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} + {F0B74B00-F252-4D38-A352-ED379CB196E9} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} + {9E13C4B5-5DA9-43C1-9304-AEAC035E854D} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} + {8F1A1F99-DBE0-408D-99F7-D59142BD008C} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} + {1F4CA1BE-B405-400F-912E-F0CC7E369D59} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} + {48EF9416-336F-4FA5-A376-FDFB7726ADBA} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} {72FA68A9-49B6-4AB6-94AE-34BB03770A51} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {64490115-464B-4DC3-B7C6-D0AF1B68B6F9} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} + {64490115-464B-4DC3-B7C6-D0AF1B68B6F9} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} {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} - {369524F4-D374-44F4-BCFD-408934595701} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} - {1D6E8807-7C28-421F-B49E-BCB482FCB21D} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9} + {541CF1D6-95FD-4499-AB02-75CCCEE660B0} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} + {369524F4-D374-44F4-BCFD-408934595701} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} + {1D6E8807-7C28-421F-B49E-BCB482FCB21D} = {F48CC091-6F26-4EC8-A2FB-485975E7C908} {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} diff --git a/cpp/src/Glacier2/msbuild/glacier2router.vcxproj b/cpp/src/Glacier2/msbuild/glacier2router.vcxproj index 03baefb49f0..afe34b9dc63 100644 --- a/cpp/src/Glacier2/msbuild/glacier2router.vcxproj +++ b/cpp/src/Glacier2/msbuild/glacier2router.vcxproj @@ -44,7 +44,7 @@ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp98.props" /> + <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp11.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> diff --git a/cpp/src/IceBox/msbuild/iceboxadmin/iceboxadmin.vcxproj b/cpp/src/IceBox/msbuild/iceboxadmin/iceboxadmin.vcxproj index 7b6a1069efd..5154cf78e28 100644 --- a/cpp/src/IceBox/msbuild/iceboxadmin/iceboxadmin.vcxproj +++ b/cpp/src/IceBox/msbuild/iceboxadmin/iceboxadmin.vcxproj @@ -47,7 +47,7 @@ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp98.props" /> + <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp11.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> diff --git a/cpp/src/IceBridge/msbuild/icebridge.vcxproj b/cpp/src/IceBridge/msbuild/icebridge.vcxproj index 29e41b1812c..471bee3db07 100644 --- a/cpp/src/IceBridge/msbuild/icebridge.vcxproj +++ b/cpp/src/IceBridge/msbuild/icebridge.vcxproj @@ -44,7 +44,7 @@ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp98.props" /> + <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp11.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> diff --git a/cpp/src/IceDB/msbuild/icedb.vcxproj b/cpp/src/IceDB/msbuild/icedb.vcxproj index 0bc68a1bfe1..00450091156 100644 --- a/cpp/src/IceDB/msbuild/icedb.vcxproj +++ b/cpp/src/IceDB/msbuild/icedb.vcxproj @@ -45,7 +45,7 @@ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp98.props" /> + <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp11.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> diff --git a/cpp/src/IceGrid/Scanner.cpp b/cpp/src/IceGrid/Scanner.cpp index 23958d4a7c9..9413d50a829 100644 --- a/cpp/src/IceGrid/Scanner.cpp +++ b/cpp/src/IceGrid/Scanner.cpp @@ -471,6 +471,7 @@ using namespace IceGrid; # undef yywrap # define yywrap() 1 # endif +# define YY_NO_UNISTD_H #endif #define YY_INPUT(buf, result, maxSize) parser->getInput(buf, result, maxSize) diff --git a/cpp/src/IceGrid/msbuild/icegridadmin/icegridadmin.vcxproj b/cpp/src/IceGrid/msbuild/icegridadmin/icegridadmin.vcxproj index 75df18d0cc6..f623b5763f7 100644 --- a/cpp/src/IceGrid/msbuild/icegridadmin/icegridadmin.vcxproj +++ b/cpp/src/IceGrid/msbuild/icegridadmin/icegridadmin.vcxproj @@ -44,7 +44,7 @@ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp98.props" /> + <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp11.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> diff --git a/cpp/src/IceGrid/msbuild/icegridnode/icegridnode.vcxproj b/cpp/src/IceGrid/msbuild/icegridnode/icegridnode.vcxproj index f33c1c1dc37..7d05d27eec4 100644 --- a/cpp/src/IceGrid/msbuild/icegridnode/icegridnode.vcxproj +++ b/cpp/src/IceGrid/msbuild/icegridnode/icegridnode.vcxproj @@ -44,7 +44,7 @@ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp98.props" /> + <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp11.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> diff --git a/cpp/src/IceGrid/msbuild/icegridregistry/icegridregistry.vcxproj b/cpp/src/IceGrid/msbuild/icegridregistry/icegridregistry.vcxproj index 9889b74db1c..7097a24b00e 100644 --- a/cpp/src/IceGrid/msbuild/icegridregistry/icegridregistry.vcxproj +++ b/cpp/src/IceGrid/msbuild/icegridregistry/icegridregistry.vcxproj @@ -44,7 +44,7 @@ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp98.props" /> + <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp11.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> diff --git a/cpp/src/IceStorm/msbuild/icestormadmin/icestormadmin.vcxproj b/cpp/src/IceStorm/msbuild/icestormadmin/icestormadmin.vcxproj index 97c2b8bd68b..53b4d096543 100644 --- a/cpp/src/IceStorm/msbuild/icestormadmin/icestormadmin.vcxproj +++ b/cpp/src/IceStorm/msbuild/icestormadmin/icestormadmin.vcxproj @@ -44,7 +44,7 @@ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp98.props" /> + <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp11.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> diff --git a/cpp/src/IceStorm/msbuild/icestormdb/icestormdb.vcxproj b/cpp/src/IceStorm/msbuild/icestormdb/icestormdb.vcxproj index 445cdfccca1..b1e066fa2c7 100644 --- a/cpp/src/IceStorm/msbuild/icestormdb/icestormdb.vcxproj +++ b/cpp/src/IceStorm/msbuild/icestormdb/icestormdb.vcxproj @@ -44,7 +44,7 @@ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp98.props" /> + <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp11.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> diff --git a/cpp/src/IceStorm/msbuild/icestormservice/icestormservice.vcxproj b/cpp/src/IceStorm/msbuild/icestormservice/icestormservice.vcxproj index 9f699aa6f25..a69d578400b 100644 --- a/cpp/src/IceStorm/msbuild/icestormservice/icestormservice.vcxproj +++ b/cpp/src/IceStorm/msbuild/icestormservice/icestormservice.vcxproj @@ -22,6 +22,7 @@ <PropertyGroup Label="Globals"> <ProjectGuid>{9E13C4B5-5DA9-43C1-9304-AEAC035E854D}</ProjectGuid> <RootNamespace>IceStorm</RootNamespace> + <ProjectName>icestormservice++11</ProjectName> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -45,7 +46,7 @@ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp98.props" /> + <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp11.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> diff --git a/cpp/src/IceXML/msbuild/icexml.vcxproj b/cpp/src/IceXML/msbuild/icexml.vcxproj index 473e84d52d5..123ca426a53 100644 --- a/cpp/src/IceXML/msbuild/icexml.vcxproj +++ b/cpp/src/IceXML/msbuild/icexml.vcxproj @@ -21,6 +21,7 @@ <PropertyGroup Label="Globals"> <ProjectGuid>{90EC26E8-AFFA-4E44-B068-AB5849A96FDD}</ProjectGuid> <RootNamespace>IceXML</RootNamespace> + <ProjectName>icexml++11</ProjectName> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -44,7 +45,7 @@ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp98.props" /> + <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp11.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> diff --git a/cpp/src/icegriddb/msbuild/icegriddb.vcxproj b/cpp/src/icegriddb/msbuild/icegriddb.vcxproj index c3aa4e09696..25d8cdb70ce 100644 --- a/cpp/src/icegriddb/msbuild/icegriddb.vcxproj +++ b/cpp/src/icegriddb/msbuild/icegriddb.vcxproj @@ -44,7 +44,7 @@ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp98.props" /> + <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp11.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> |