diff options
168 files changed, 57 insertions, 13822 deletions
diff --git a/cpp/include/Ice/Ice.h b/cpp/include/Ice/Ice.h index 0a4d4d3c3d2..692dd6ee5c9 100644 --- a/cpp/include/Ice/Ice.h +++ b/cpp/include/Ice/Ice.h @@ -41,7 +41,6 @@ #include <Ice/NativePropertiesAdmin.h> #include <Ice/Instrumentation.h> #include <Ice/Metrics.h> -#include <Ice/SliceChecksums.h> #if !defined(ICE_OS_UWP) && (!defined(__APPLE__) || TARGET_OS_IPHONE == 0) # include <Ice/Service.h> #endif diff --git a/cpp/include/Ice/SliceChecksums.h b/cpp/include/Ice/SliceChecksums.h deleted file mode 100644 index 1f6a43341b0..00000000000 --- a/cpp/include/Ice/SliceChecksums.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#ifndef ICE_SLICE_CHECKSUM_H -#define ICE_SLICE_CHECKSUM_H - -#include <Ice/SliceChecksumDict.h> - -namespace Ice -{ - -/** - * Obtains the map containing the checksums for Slice definitions. - * @return The checksum map. - */ -ICE_API SliceChecksumDict sliceChecksums(); - -} - -namespace IceInternal -{ - -class ICE_API SliceChecksumInit : private IceUtil::noncopyable -{ -public: - - SliceChecksumInit(const char*[]); -}; - -} - -#endif diff --git a/cpp/msbuild/ice.test.sln b/cpp/msbuild/ice.test.sln index eab2f85fdcf..7598f84822d 100644 --- a/cpp/msbuild/ice.test.sln +++ b/cpp/msbuild/ice.test.sln @@ -97,8 +97,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dispatcher", "dispatcher", EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "background", "background", "{59E2D67C-A642-4728-BD71-0E2AC3B2E364}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "checksum", "checksum", "{0EB7A345-9609-44ED-816D-C27A35A58FF4}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "custom", "custom", "{93EB9A90-D79D-4F90-A008-EB72D68759D0}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "..\test\Ice\dispatcher\msbuild\client\client.vcxproj", "{BA3042D4-7E5B-461D-A31E-345753A8A726}" @@ -1102,16 +1100,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "..\test\Ice\strea {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "..\test\Ice\checksum\msbuild\client\client.vcxproj", "{59CA92B5-4500-43D3-B8A8-A69268D9BE08}" - ProjectSection(ProjectDependencies) = postProject - {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "..\test\Ice\checksum\msbuild\server\server.vcxproj", "{91D2AA7B-AAA2-410F-8D3C-17A930A70CD6}" - ProjectSection(ProjectDependencies) = postProject - {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client5", "..\test\Ice\logger\msbuild\client5\client5.vcxproj", "{A4E94959-FD6B-4280-B1B3-99E4829153C9}" ProjectSection(ProjectDependencies) = postProject {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} @@ -3879,38 +3867,6 @@ Global {263E5E46-AE57-4B3B-A3CE-7B639674F3A6}.Release|Win32.Build.0 = Release|Win32 {263E5E46-AE57-4B3B-A3CE-7B639674F3A6}.Release|x64.ActiveCfg = Release|x64 {263E5E46-AE57-4B3B-A3CE-7B639674F3A6}.Release|x64.Build.0 = Release|x64 - {59CA92B5-4500-43D3-B8A8-A69268D9BE08}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {59CA92B5-4500-43D3-B8A8-A69268D9BE08}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {59CA92B5-4500-43D3-B8A8-A69268D9BE08}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {59CA92B5-4500-43D3-B8A8-A69268D9BE08}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {59CA92B5-4500-43D3-B8A8-A69268D9BE08}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {59CA92B5-4500-43D3-B8A8-A69268D9BE08}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {59CA92B5-4500-43D3-B8A8-A69268D9BE08}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {59CA92B5-4500-43D3-B8A8-A69268D9BE08}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 - {59CA92B5-4500-43D3-B8A8-A69268D9BE08}.Debug|Win32.ActiveCfg = Debug|Win32 - {59CA92B5-4500-43D3-B8A8-A69268D9BE08}.Debug|Win32.Build.0 = Debug|Win32 - {59CA92B5-4500-43D3-B8A8-A69268D9BE08}.Debug|x64.ActiveCfg = Debug|x64 - {59CA92B5-4500-43D3-B8A8-A69268D9BE08}.Debug|x64.Build.0 = Debug|x64 - {59CA92B5-4500-43D3-B8A8-A69268D9BE08}.Release|Win32.ActiveCfg = Release|Win32 - {59CA92B5-4500-43D3-B8A8-A69268D9BE08}.Release|Win32.Build.0 = Release|Win32 - {59CA92B5-4500-43D3-B8A8-A69268D9BE08}.Release|x64.ActiveCfg = Release|x64 - {59CA92B5-4500-43D3-B8A8-A69268D9BE08}.Release|x64.Build.0 = Release|x64 - {91D2AA7B-AAA2-410F-8D3C-17A930A70CD6}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {91D2AA7B-AAA2-410F-8D3C-17A930A70CD6}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {91D2AA7B-AAA2-410F-8D3C-17A930A70CD6}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {91D2AA7B-AAA2-410F-8D3C-17A930A70CD6}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {91D2AA7B-AAA2-410F-8D3C-17A930A70CD6}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {91D2AA7B-AAA2-410F-8D3C-17A930A70CD6}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {91D2AA7B-AAA2-410F-8D3C-17A930A70CD6}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {91D2AA7B-AAA2-410F-8D3C-17A930A70CD6}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 - {91D2AA7B-AAA2-410F-8D3C-17A930A70CD6}.Debug|Win32.ActiveCfg = Debug|Win32 - {91D2AA7B-AAA2-410F-8D3C-17A930A70CD6}.Debug|Win32.Build.0 = Debug|Win32 - {91D2AA7B-AAA2-410F-8D3C-17A930A70CD6}.Debug|x64.ActiveCfg = Debug|x64 - {91D2AA7B-AAA2-410F-8D3C-17A930A70CD6}.Debug|x64.Build.0 = Debug|x64 - {91D2AA7B-AAA2-410F-8D3C-17A930A70CD6}.Release|Win32.ActiveCfg = Release|Win32 - {91D2AA7B-AAA2-410F-8D3C-17A930A70CD6}.Release|Win32.Build.0 = Release|Win32 - {91D2AA7B-AAA2-410F-8D3C-17A930A70CD6}.Release|x64.ActiveCfg = Release|x64 - {91D2AA7B-AAA2-410F-8D3C-17A930A70CD6}.Release|x64.Build.0 = Release|x64 {A4E94959-FD6B-4280-B1B3-99E4829153C9}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 {A4E94959-FD6B-4280-B1B3-99E4829153C9}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {A4E94959-FD6B-4280-B1B3-99E4829153C9}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 @@ -4152,7 +4108,6 @@ Global {5105B294-6DAB-4604-8BD7-10C126EED1FE} = {E50B2EC3-21EF-4408-9939-08A582D10ABE} {D7563BE6-592A-4459-8632-F933F1419EB8} = {2CAF9731-CB18-498C-A3EF-24F3D8A334AC} {59E2D67C-A642-4728-BD71-0E2AC3B2E364} = {2CAF9731-CB18-498C-A3EF-24F3D8A334AC} - {0EB7A345-9609-44ED-816D-C27A35A58FF4} = {2CAF9731-CB18-498C-A3EF-24F3D8A334AC} {93EB9A90-D79D-4F90-A008-EB72D68759D0} = {2CAF9731-CB18-498C-A3EF-24F3D8A334AC} {BA3042D4-7E5B-461D-A31E-345753A8A726} = {D7563BE6-592A-4459-8632-F933F1419EB8} {FBAC9C87-6A77-4663-9653-F0DFEFB00935} = {D7563BE6-592A-4459-8632-F933F1419EB8} @@ -4396,8 +4351,6 @@ Global {24E0F8DA-F197-4E4B-8820-0614713CD8A9} = {EB9CD01D-7316-4A53-BE1A-6C8EF693BF3D} {078030B1-68CF-4ABC-A21F-7C867477AEAC} = {3B6407D3-5D2C-42C6-900C-AD2B227928D3} {263E5E46-AE57-4B3B-A3CE-7B639674F3A6} = {D3D115EC-E09C-4673-B771-89C9F77CB21F} - {59CA92B5-4500-43D3-B8A8-A69268D9BE08} = {0EB7A345-9609-44ED-816D-C27A35A58FF4} - {91D2AA7B-AAA2-410F-8D3C-17A930A70CD6} = {0EB7A345-9609-44ED-816D-C27A35A58FF4} {A4E94959-FD6B-4280-B1B3-99E4829153C9} = {481C3CD0-B89F-408B-BA66-A78E96FCBE64} {36E32583-310E-48E3-B821-CE79701BDF1D} = {2CAF9731-CB18-498C-A3EF-24F3D8A334AC} {2454F754-3A55-4875-9D8E-57B63673C231} = {36E32583-310E-48E3-B821-CE79701BDF1D} diff --git a/cpp/msbuild/ice.test.v100.sln b/cpp/msbuild/ice.test.v100.sln index 528789be79f..39df05ea47b 100644 --- a/cpp/msbuild/ice.test.v100.sln +++ b/cpp/msbuild/ice.test.v100.sln @@ -95,8 +95,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dispatcher", "dispatcher", EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "background", "background", "{59E2D67C-A642-4728-BD71-0E2AC3B2E364}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "checksum", "checksum", "{0EB7A345-9609-44ED-816D-C27A35A58FF4}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "custom", "custom", "{93EB9A90-D79D-4F90-A008-EB72D68759D0}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "..\test\Ice\dispatcher\msbuild\client\client.vcxproj", "{BA3042D4-7E5B-461D-A31E-345753A8A726}" @@ -764,16 +762,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "..\test\Ice\strea {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "..\test\Ice\checksum\msbuild\client\client.vcxproj", "{59CA92B5-4500-43D3-B8A8-A69268D9BE08}" - ProjectSection(ProjectDependencies) = postProject - {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "..\test\Ice\checksum\msbuild\server\server.vcxproj", "{91D2AA7B-AAA2-410F-8D3C-17A930A70CD6}" - ProjectSection(ProjectDependencies) = postProject - {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client5", "..\test\Ice\logger\msbuild\client5\client5.vcxproj", "{A4E94959-FD6B-4280-B1B3-99E4829153C9}" ProjectSection(ProjectDependencies) = postProject {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} diff --git a/cpp/msbuild/ice.testuwp.sln b/cpp/msbuild/ice.testuwp.sln index 45875840033..3b72e9b075e 100644 --- a/cpp/msbuild/ice.testuwp.sln +++ b/cpp/msbuild/ice.testuwp.sln @@ -458,18 +458,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "controller", "..\test\uwp\c {8B90C6FC-ABBB-4784-BBDD-EC3EB76EE12E} = {8B90C6FC-ABBB-4784-BBDD-EC3EB76EE12E} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "checksum", "checksum", "{0FEE038E-7EC1-4F74-B5B3-D29068F91D32}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "..\test\Ice\checksum\msbuild\uwp\client\client.vcxproj", "{4F70E110-D2EE-4626-BD53-39C49F159C81}" - ProjectSection(ProjectDependencies) = postProject - {3C63CD50-8B47-41B9-B414-D74B918F9BE1} = {3C63CD50-8B47-41B9-B414-D74B918F9BE1} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "..\test\Ice\checksum\msbuild\uwp\server\server.vcxproj", "{BF016908-5C75-406E-BFB6-8427BF01D383}" - ProjectSection(ProjectDependencies) = postProject - {3C63CD50-8B47-41B9-B414-D74B918F9BE1} = {3C63CD50-8B47-41B9-B414-D74B918F9BE1} - EndProjectSection -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "custom", "custom", "{BF4478BE-9248-4422-A6A3-D383254A605C}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "..\test\Ice\custom\msbuild\uwp\client\client.vcxproj", "{25356ABA-3F53-4482-8D31-81048FACB77B}" diff --git a/cpp/src/Ice/SliceChecksums.cpp b/cpp/src/Ice/SliceChecksums.cpp deleted file mode 100644 index 3bd6cf6a6ff..00000000000 --- a/cpp/src/Ice/SliceChecksums.cpp +++ /dev/null @@ -1,75 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#include <Ice/SliceChecksums.h> -#include <IceUtil/Mutex.h> -#include <IceUtil/MutexPtrLock.h> - -using namespace std; -using namespace Ice; - -namespace -{ - -SliceChecksumDict* _sliceChecksums = 0; - -IceUtil::Mutex* _mutex = 0; - -class Init -{ -public: - - Init() - { - _mutex = new IceUtil::Mutex; - } - - ~Init() - { - delete _mutex; - _mutex = 0; - } -}; - -Init init; - -class SliceChecksumDictDestroyer -{ -public: - - ~SliceChecksumDictDestroyer() - { - delete _sliceChecksums; - _sliceChecksums = 0; - } -}; - -SliceChecksumDictDestroyer destroyer; - -} - -SliceChecksumDict -Ice::sliceChecksums() -{ - IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(_mutex); - if(_sliceChecksums == 0) - { - _sliceChecksums = new SliceChecksumDict(); - } - return *_sliceChecksums; -} - -IceInternal::SliceChecksumInit::SliceChecksumInit(const char* checksums[]) -{ - IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(_mutex); - if(_sliceChecksums == 0) - { - _sliceChecksums = new SliceChecksumDict(); - } - - for(int i = 0; checksums[i] != 0; i += 2) - { - _sliceChecksums->insert(SliceChecksumDict::value_type(checksums[i], checksums[i + 1])); - } -} diff --git a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj index e265b8a2b62..cbee9c217a0 100644 --- a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj +++ b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj @@ -164,7 +164,6 @@ <SliceCompile Include="..\..\..\..\..\slice\Ice\RouterF.ice" /> <SliceCompile Include="..\..\..\..\..\slice\Ice\ServantLocator.ice" /> <SliceCompile Include="..\..\..\..\..\slice\Ice\ServantLocatorF.ice" /> - <SliceCompile Include="..\..\..\..\..\slice\Ice\SliceChecksumDict.ice" /> <SliceCompile Include="..\..\..\..\..\slice\Ice\ValueFactory.ice" /> <SliceCompile Include="..\..\..\..\..\slice\Ice\Version.ice" /> </ItemGroup> @@ -406,12 +405,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClCompile> - <ClCompile Include="Win32\Debug\SliceChecksumDict.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\..\..\slice\Ice\SliceChecksumDict.ice</SliceCompileSource> - </ClCompile> <ClCompile Include="Win32\Debug\ValueFactory.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> @@ -640,12 +633,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClCompile> - <ClCompile Include="Win32\Release\SliceChecksumDict.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\..\..\slice\Ice\SliceChecksumDict.ice</SliceCompileSource> - </ClCompile> <ClCompile Include="Win32\Release\ValueFactory.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> @@ -874,12 +861,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClCompile> - <ClCompile Include="x64\Debug\SliceChecksumDict.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\..\..\slice\Ice\SliceChecksumDict.ice</SliceCompileSource> - </ClCompile> <ClCompile Include="x64\Debug\ValueFactory.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> @@ -1108,12 +1089,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClCompile> - <ClCompile Include="x64\Release\SliceChecksumDict.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\..\..\slice\Ice\SliceChecksumDict.ice</SliceCompileSource> - </ClCompile> <ClCompile Include="x64\Release\ValueFactory.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> @@ -1221,7 +1196,6 @@ <ClCompile Include="..\..\ServantManager.cpp" /> <ClCompile Include="..\..\Service.cpp" /> <ClCompile Include="..\..\SHA1.cpp" /> - <ClCompile Include="..\..\SliceChecksums.cpp" /> <ClCompile Include="..\..\SlicedData.cpp" /> <ClCompile Include="..\..\StreamSocket.cpp" /> <ClCompile Include="..\..\StringConverterPlugin.cpp" /> @@ -1464,12 +1438,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\SliceChecksumDict.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\..\..\slice\Ice\SliceChecksumDict.ice</SliceCompileSource> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\ValueFactory.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> @@ -1698,12 +1666,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\SliceChecksumDict.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\..\..\slice\Ice\SliceChecksumDict.ice</SliceCompileSource> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\ValueFactory.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> @@ -1932,12 +1894,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\SliceChecksumDict.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\..\..\slice\Ice\SliceChecksumDict.ice</SliceCompileSource> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\ValueFactory.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> @@ -2166,12 +2122,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\SliceChecksumDict.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\..\..\slice\Ice\SliceChecksumDict.ice</SliceCompileSource> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\ValueFactory.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> @@ -2206,4 +2156,4 @@ <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj.filters b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj.filters index 4931502d3d0..bdaf969dabe 100644 --- a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj.filters +++ b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj.filters @@ -198,9 +198,6 @@ <ClCompile Include="Win32\Debug\ServantLocatorF.cpp"> <Filter>Source Files\Win32\Debug</Filter> </ClCompile> - <ClCompile Include="Win32\Debug\SliceChecksumDict.cpp"> - <Filter>Source Files\Win32\Debug</Filter> - </ClCompile> <ClCompile Include="Win32\Debug\ValueFactory.cpp"> <Filter>Source Files\Win32\Debug</Filter> </ClCompile> @@ -315,9 +312,6 @@ <ClCompile Include="x64\Debug\ServantLocatorF.cpp"> <Filter>Source Files\x64\Debug</Filter> </ClCompile> - <ClCompile Include="x64\Debug\SliceChecksumDict.cpp"> - <Filter>Source Files\x64\Debug</Filter> - </ClCompile> <ClCompile Include="x64\Debug\ValueFactory.cpp"> <Filter>Source Files\x64\Debug</Filter> </ClCompile> @@ -432,9 +426,6 @@ <ClCompile Include="Win32\Release\ServantLocatorF.cpp"> <Filter>Source Files\Win32\Release</Filter> </ClCompile> - <ClCompile Include="Win32\Release\SliceChecksumDict.cpp"> - <Filter>Source Files\Win32\Release</Filter> - </ClCompile> <ClCompile Include="Win32\Release\ValueFactory.cpp"> <Filter>Source Files\Win32\Release</Filter> </ClCompile> @@ -549,9 +540,6 @@ <ClCompile Include="x64\Release\ServantLocatorF.cpp"> <Filter>Source Files\x64\Release</Filter> </ClCompile> - <ClCompile Include="x64\Release\SliceChecksumDict.cpp"> - <Filter>Source Files\x64\Release</Filter> - </ClCompile> <ClCompile Include="x64\Release\ValueFactory.cpp"> <Filter>Source Files\x64\Release</Filter> </ClCompile> @@ -843,9 +831,6 @@ <ClCompile Include="..\..\SHA1.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\SliceChecksums.cpp"> - <Filter>Source Files</Filter> - </ClCompile> <ClCompile Include="..\..\SlicedData.cpp"> <Filter>Source Files</Filter> </ClCompile> @@ -1036,9 +1021,6 @@ <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\ServantLocatorF.h"> <Filter>Header Files\Win32\Debug</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\SliceChecksumDict.h"> - <Filter>Header Files\Win32\Debug</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\ValueFactory.h"> <Filter>Header Files\Win32\Debug</Filter> </ClInclude> @@ -1153,9 +1135,6 @@ <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\ServantLocatorF.h"> <Filter>Header Files\x64\Debug</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\SliceChecksumDict.h"> - <Filter>Header Files\x64\Debug</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\ValueFactory.h"> <Filter>Header Files\x64\Debug</Filter> </ClInclude> @@ -1270,9 +1249,6 @@ <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\ServantLocatorF.h"> <Filter>Header Files\Win32\Release</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\SliceChecksumDict.h"> - <Filter>Header Files\Win32\Release</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\ValueFactory.h"> <Filter>Header Files\Win32\Release</Filter> </ClInclude> @@ -1387,9 +1363,6 @@ <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\ServantLocatorF.h"> <Filter>Header Files\x64\Release</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\SliceChecksumDict.h"> - <Filter>Header Files\x64\Release</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\ValueFactory.h"> <Filter>Header Files\x64\Release</Filter> </ClInclude> @@ -1506,9 +1479,6 @@ <SliceCompile Include="..\..\..\..\..\slice\Ice\ServantLocatorF.ice"> <Filter>Slice Files</Filter> </SliceCompile> - <SliceCompile Include="..\..\..\..\..\slice\Ice\SliceChecksumDict.ice"> - <Filter>Slice Files</Filter> - </SliceCompile> <SliceCompile Include="..\..\..\..\..\slice\Ice\ValueFactory.ice"> <Filter>Slice Files</Filter> </SliceCompile> @@ -1516,4 +1486,4 @@ <Filter>Slice Files</Filter> </SliceCompile> </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/src/Ice/msbuild/ice/ice.vcxproj b/cpp/src/Ice/msbuild/ice/ice.vcxproj index cc0f2cddb9d..a204e11119a 100644 --- a/cpp/src/Ice/msbuild/ice/ice.vcxproj +++ b/cpp/src/Ice/msbuild/ice/ice.vcxproj @@ -172,7 +172,6 @@ <SliceCompile Include="..\..\..\..\..\slice\Ice\RouterF.ice" /> <SliceCompile Include="..\..\..\..\..\slice\Ice\ServantLocator.ice" /> <SliceCompile Include="..\..\..\..\..\slice\Ice\ServantLocatorF.ice" /> - <SliceCompile Include="..\..\..\..\..\slice\Ice\SliceChecksumDict.ice" /> <SliceCompile Include="..\..\..\..\..\slice\Ice\ValueFactory.ice" /> <SliceCompile Include="..\..\..\..\..\slice\Ice\Version.ice" /> </ItemGroup> @@ -414,12 +413,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClCompile> - <ClCompile Include="Win32\Debug\SliceChecksumDict.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\..\..\slice\Ice\SliceChecksumDict.ice</SliceCompileSource> - </ClCompile> <ClCompile Include="Win32\Debug\ValueFactory.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> @@ -648,12 +641,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClCompile> - <ClCompile Include="Win32\Release\SliceChecksumDict.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\..\..\slice\Ice\SliceChecksumDict.ice</SliceCompileSource> - </ClCompile> <ClCompile Include="Win32\Release\ValueFactory.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> @@ -882,12 +869,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClCompile> - <ClCompile Include="x64\Debug\SliceChecksumDict.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\..\..\slice\Ice\SliceChecksumDict.ice</SliceCompileSource> - </ClCompile> <ClCompile Include="x64\Debug\ValueFactory.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> @@ -1116,12 +1097,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClCompile> - <ClCompile Include="x64\Release\SliceChecksumDict.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\..\..\slice\Ice\SliceChecksumDict.ice</SliceCompileSource> - </ClCompile> <ClCompile Include="x64\Release\ValueFactory.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> @@ -1229,7 +1204,6 @@ <ClCompile Include="..\..\ServantManager.cpp" /> <ClCompile Include="..\..\Service.cpp" /> <ClCompile Include="..\..\SHA1.cpp" /> - <ClCompile Include="..\..\SliceChecksums.cpp" /> <ClCompile Include="..\..\SlicedData.cpp" /> <ClCompile Include="..\..\StreamSocket.cpp" /> <ClCompile Include="..\..\StringConverterPlugin.cpp" /> @@ -1472,12 +1446,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\SliceChecksumDict.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\..\..\slice\Ice\SliceChecksumDict.ice</SliceCompileSource> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\ValueFactory.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> @@ -1706,12 +1674,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\SliceChecksumDict.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\..\..\slice\Ice\SliceChecksumDict.ice</SliceCompileSource> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\ValueFactory.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> @@ -1940,12 +1902,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\SliceChecksumDict.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\..\..\slice\Ice\SliceChecksumDict.ice</SliceCompileSource> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\ValueFactory.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> @@ -2174,12 +2130,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\SliceChecksumDict.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\..\..\slice\Ice\SliceChecksumDict.ice</SliceCompileSource> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\ValueFactory.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> @@ -2218,4 +2168,4 @@ <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/src/Ice/msbuild/ice/ice.vcxproj.filters b/cpp/src/Ice/msbuild/ice/ice.vcxproj.filters index 24b7056d670..1c47655b24a 100644 --- a/cpp/src/Ice/msbuild/ice/ice.vcxproj.filters +++ b/cpp/src/Ice/msbuild/ice/ice.vcxproj.filters @@ -197,9 +197,6 @@ <ClCompile Include="Win32\Debug\ServantLocatorF.cpp"> <Filter>Source Files\Win32\Debug</Filter> </ClCompile> - <ClCompile Include="Win32\Debug\SliceChecksumDict.cpp"> - <Filter>Source Files\Win32\Debug</Filter> - </ClCompile> <ClCompile Include="Win32\Debug\ValueFactory.cpp"> <Filter>Source Files\Win32\Debug</Filter> </ClCompile> @@ -314,9 +311,6 @@ <ClCompile Include="x64\Debug\ServantLocatorF.cpp"> <Filter>Source Files\x64\Debug</Filter> </ClCompile> - <ClCompile Include="x64\Debug\SliceChecksumDict.cpp"> - <Filter>Source Files\x64\Debug</Filter> - </ClCompile> <ClCompile Include="x64\Debug\ValueFactory.cpp"> <Filter>Source Files\x64\Debug</Filter> </ClCompile> @@ -431,9 +425,6 @@ <ClCompile Include="Win32\Release\ServantLocatorF.cpp"> <Filter>Source Files\Win32\Release</Filter> </ClCompile> - <ClCompile Include="Win32\Release\SliceChecksumDict.cpp"> - <Filter>Source Files\Win32\Release</Filter> - </ClCompile> <ClCompile Include="Win32\Release\ValueFactory.cpp"> <Filter>Source Files\Win32\Release</Filter> </ClCompile> @@ -548,9 +539,6 @@ <ClCompile Include="x64\Release\ServantLocatorF.cpp"> <Filter>Source Files\x64\Release</Filter> </ClCompile> - <ClCompile Include="x64\Release\SliceChecksumDict.cpp"> - <Filter>Source Files\x64\Release</Filter> - </ClCompile> <ClCompile Include="x64\Release\ValueFactory.cpp"> <Filter>Source Files\x64\Release</Filter> </ClCompile> @@ -842,9 +830,6 @@ <ClCompile Include="..\..\SHA1.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\SliceChecksums.cpp"> - <Filter>Source Files</Filter> - </ClCompile> <ClCompile Include="..\..\SlicedData.cpp"> <Filter>Source Files</Filter> </ClCompile> @@ -1035,9 +1020,6 @@ <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\ServantLocatorF.h"> <Filter>Header Files\Win32\Debug</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\SliceChecksumDict.h"> - <Filter>Header Files\Win32\Debug</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\ValueFactory.h"> <Filter>Header Files\Win32\Debug</Filter> </ClInclude> @@ -1152,9 +1134,6 @@ <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\ServantLocatorF.h"> <Filter>Header Files\x64\Debug</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\SliceChecksumDict.h"> - <Filter>Header Files\x64\Debug</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\ValueFactory.h"> <Filter>Header Files\x64\Debug</Filter> </ClInclude> @@ -1269,9 +1248,6 @@ <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\ServantLocatorF.h"> <Filter>Header Files\Win32\Release</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\SliceChecksumDict.h"> - <Filter>Header Files\Win32\Release</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\ValueFactory.h"> <Filter>Header Files\Win32\Release</Filter> </ClInclude> @@ -1386,9 +1362,6 @@ <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\ServantLocatorF.h"> <Filter>Header Files\x64\Release</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\SliceChecksumDict.h"> - <Filter>Header Files\x64\Release</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\ValueFactory.h"> <Filter>Header Files\x64\Release</Filter> </ClInclude> @@ -1505,9 +1478,6 @@ <SliceCompile Include="..\..\..\..\..\slice\Ice\ServantLocatorF.ice"> <Filter>Slice Files</Filter> </SliceCompile> - <SliceCompile Include="..\..\..\..\..\slice\Ice\SliceChecksumDict.ice"> - <Filter>Slice Files</Filter> - </SliceCompile> <SliceCompile Include="..\..\..\..\..\slice\Ice\ValueFactory.ice"> <Filter>Slice Files</Filter> </SliceCompile> @@ -1515,4 +1485,4 @@ <Filter>Slice Files</Filter> </SliceCompile> </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj b/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj index dde3576432e..70ebcef3696 100644 --- a/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj +++ b/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj @@ -231,7 +231,6 @@ <ClCompile Include="..\..\RouterInfo.cpp" /> <ClCompile Include="..\..\Selector.cpp" /> <ClCompile Include="..\..\ServantManager.cpp" /> - <ClCompile Include="..\..\SliceChecksums.cpp" /> <ClCompile Include="..\..\SlicedData.cpp" /> <ClCompile Include="..\..\ThreadPool.cpp" /> <ClCompile Include="..\..\TraceLevels.cpp" /> @@ -502,13 +501,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> </ClCompile> - <ClCompile Include="ARM\Debug\SliceChecksumDict.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> <ClCompile Include="ARM\Debug\ValueFactory.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> @@ -775,13 +767,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> </ClCompile> - <ClCompile Include="ARM\Release\SliceChecksumDict.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> <ClCompile Include="ARM\Release\ValueFactory.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> @@ -1048,13 +1033,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> </ClCompile> - <ClCompile Include="Win32\Debug\SliceChecksumDict.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> <ClCompile Include="Win32\Debug\ValueFactory.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> @@ -1321,13 +1299,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> </ClCompile> - <ClCompile Include="Win32\Release\SliceChecksumDict.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> <ClCompile Include="Win32\Release\ValueFactory.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> @@ -1594,13 +1565,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> </ClCompile> - <ClCompile Include="x64\Debug\SliceChecksumDict.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> <ClCompile Include="x64\Debug\ValueFactory.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> @@ -1867,13 +1831,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> </ClCompile> - <ClCompile Include="x64\Release\SliceChecksumDict.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - </ClCompile> <ClCompile Include="x64\Release\ValueFactory.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> @@ -1926,7 +1883,6 @@ <SliceCompile Include="..\..\..\..\..\slice\Ice\RouterF.ice" /> <SliceCompile Include="..\..\..\..\..\slice\Ice\ServantLocator.ice" /> <SliceCompile Include="..\..\..\..\..\slice\Ice\ServantLocatorF.ice" /> - <SliceCompile Include="..\..\..\..\..\slice\Ice\SliceChecksumDict.ice" /> <SliceCompile Include="..\..\..\..\..\slice\Ice\ValueFactory.ice" /> <SliceCompile Include="..\..\..\..\..\slice\Ice\Version.ice" /> </ItemGroup> @@ -2219,14 +2175,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\SliceChecksumDict.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\..\..\slice\Ice\SliceChecksumDict.ice</SliceCompileSource> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\ValueFactory.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> @@ -2531,14 +2479,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\SliceChecksumDict.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\..\..\slice\Ice\SliceChecksumDict.ice</SliceCompileSource> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\ValueFactory.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> @@ -2843,14 +2783,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\SliceChecksumDict.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\..\..\slice\Ice\SliceChecksumDict.ice</SliceCompileSource> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\ValueFactory.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> @@ -3155,14 +3087,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\SliceChecksumDict.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\..\..\slice\Ice\SliceChecksumDict.ice</SliceCompileSource> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\ValueFactory.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> @@ -3467,14 +3391,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\SliceChecksumDict.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\..\..\slice\Ice\SliceChecksumDict.ice</SliceCompileSource> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\ValueFactory.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> @@ -3779,14 +3695,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\SliceChecksumDict.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\..\..\slice\Ice\SliceChecksumDict.ice</SliceCompileSource> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\ValueFactory.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> @@ -3818,4 +3726,4 @@ <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj.filters b/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj.filters index ddb17caf05b..d2e3a446f6d 100644 --- a/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj.filters +++ b/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj.filters @@ -271,9 +271,6 @@ <ClCompile Include="..\..\ServantManager.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\SliceChecksums.cpp"> - <Filter>Source Files</Filter> - </ClCompile> <ClCompile Include="..\..\SlicedData.cpp"> <Filter>Source Files</Filter> </ClCompile> @@ -427,9 +424,6 @@ <ClCompile Include="Win32\Debug\ServantLocatorF.cpp"> <Filter>Source Files\Win32\Debug</Filter> </ClCompile> - <ClCompile Include="Win32\Debug\SliceChecksumDict.cpp"> - <Filter>Source Files\Win32\Debug</Filter> - </ClCompile> <ClCompile Include="Win32\Debug\ValueFactory.cpp"> <Filter>Source Files\Win32\Debug</Filter> </ClCompile> @@ -544,9 +538,6 @@ <ClCompile Include="ARM\Debug\ServantLocatorF.cpp"> <Filter>Source Files\ARM\Debug</Filter> </ClCompile> - <ClCompile Include="ARM\Debug\SliceChecksumDict.cpp"> - <Filter>Source Files\ARM\Debug</Filter> - </ClCompile> <ClCompile Include="ARM\Debug\ValueFactory.cpp"> <Filter>Source Files\ARM\Debug</Filter> </ClCompile> @@ -661,9 +652,6 @@ <ClCompile Include="x64\Debug\ServantLocatorF.cpp"> <Filter>Source Files\x64\Debug</Filter> </ClCompile> - <ClCompile Include="x64\Debug\SliceChecksumDict.cpp"> - <Filter>Source Files\x64\Debug</Filter> - </ClCompile> <ClCompile Include="x64\Debug\ValueFactory.cpp"> <Filter>Source Files\x64\Debug</Filter> </ClCompile> @@ -778,9 +766,6 @@ <ClCompile Include="Win32\Release\ServantLocatorF.cpp"> <Filter>Source Files\Win32\Release</Filter> </ClCompile> - <ClCompile Include="Win32\Release\SliceChecksumDict.cpp"> - <Filter>Source Files\Win32\Release</Filter> - </ClCompile> <ClCompile Include="Win32\Release\ValueFactory.cpp"> <Filter>Source Files\Win32\Release</Filter> </ClCompile> @@ -895,9 +880,6 @@ <ClCompile Include="ARM\Release\ServantLocatorF.cpp"> <Filter>Source Files\ARM\Release</Filter> </ClCompile> - <ClCompile Include="ARM\Release\SliceChecksumDict.cpp"> - <Filter>Source Files\ARM\Release</Filter> - </ClCompile> <ClCompile Include="ARM\Release\ValueFactory.cpp"> <Filter>Source Files\ARM\Release</Filter> </ClCompile> @@ -1012,9 +994,6 @@ <ClCompile Include="x64\Release\ServantLocatorF.cpp"> <Filter>Source Files\x64\Release</Filter> </ClCompile> - <ClCompile Include="x64\Release\SliceChecksumDict.cpp"> - <Filter>Source Files\x64\Release</Filter> - </ClCompile> <ClCompile Include="x64\Release\ValueFactory.cpp"> <Filter>Source Files\x64\Release</Filter> </ClCompile> @@ -1216,9 +1195,6 @@ <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\ServantLocatorF.h"> <Filter>Header Files\Win32\Debug</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\SliceChecksumDict.h"> - <Filter>Header Files\Win32\Debug</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\ValueFactory.h"> <Filter>Header Files\Win32\Debug</Filter> </ClInclude> @@ -1333,9 +1309,6 @@ <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\ServantLocatorF.h"> <Filter>Header Files\ARM\Debug</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\SliceChecksumDict.h"> - <Filter>Header Files\ARM\Debug</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\ValueFactory.h"> <Filter>Header Files\ARM\Debug</Filter> </ClInclude> @@ -1450,9 +1423,6 @@ <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\ServantLocatorF.h"> <Filter>Header Files\x64\Debug</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\SliceChecksumDict.h"> - <Filter>Header Files\x64\Debug</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\ValueFactory.h"> <Filter>Header Files\x64\Debug</Filter> </ClInclude> @@ -1567,9 +1537,6 @@ <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\ServantLocatorF.h"> <Filter>Header Files\Win32\Release</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\SliceChecksumDict.h"> - <Filter>Header Files\Win32\Release</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\ValueFactory.h"> <Filter>Header Files\Win32\Release</Filter> </ClInclude> @@ -1684,9 +1651,6 @@ <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\ServantLocatorF.h"> <Filter>Header Files\ARM\Release</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\SliceChecksumDict.h"> - <Filter>Header Files\ARM\Release</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\ValueFactory.h"> <Filter>Header Files\ARM\Release</Filter> </ClInclude> @@ -1801,9 +1765,6 @@ <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\ServantLocatorF.h"> <Filter>Header Files\x64\Release</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\SliceChecksumDict.h"> - <Filter>Header Files\x64\Release</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\ValueFactory.h"> <Filter>Header Files\x64\Release</Filter> </ClInclude> @@ -1920,9 +1881,6 @@ <SliceCompile Include="..\..\..\..\..\slice\Ice\ServantLocatorF.ice"> <Filter>Slice Files</Filter> </SliceCompile> - <SliceCompile Include="..\..\..\..\..\slice\Ice\SliceChecksumDict.ice"> - <Filter>Slice Files</Filter> - </SliceCompile> <SliceCompile Include="..\..\..\..\..\slice\Ice\ValueFactory.ice"> <Filter>Slice Files</Filter> </SliceCompile> @@ -1933,4 +1891,4 @@ <ItemGroup> <None Include="packages.config" /> </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/src/IceBox/Admin.cpp b/cpp/src/IceBox/Admin.cpp index da85420c93c..eef5f77850e 100644 --- a/cpp/src/IceBox/Admin.cpp +++ b/cpp/src/IceBox/Admin.cpp @@ -3,7 +3,6 @@ // #include <Ice/Ice.h> -#include <Ice/SliceChecksums.h> #include <Ice/ConsoleUtil.h> #include <IceUtil/Options.h> #include <IceBox/IceBox.h> diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp index 759acdb0637..41990589519 100644 --- a/cpp/src/IceBox/ServiceManagerI.cpp +++ b/cpp/src/IceBox/ServiceManagerI.cpp @@ -7,7 +7,6 @@ #include <Ice/Ice.h> #include <Ice/ConsoleUtil.h> #include <Ice/DynamicLibrary.h> -#include <Ice/SliceChecksums.h> #include <Ice/Initialize.h> #include <Ice/Instance.h> #include <IceBox/ServiceManagerI.h> @@ -115,12 +114,6 @@ IceBox::ServiceManagerI::~ServiceManagerI() { } -SliceChecksumDict -IceBox::ServiceManagerI::getSliceChecksums(const Current&) const -{ - return sliceChecksums(); -} - void IceBox::ServiceManagerI::startService(ICE_IN(string) name, const Current&) { diff --git a/cpp/src/IceBox/ServiceManagerI.h b/cpp/src/IceBox/ServiceManagerI.h index a307c050dfc..8cfe134fae1 100644 --- a/cpp/src/IceBox/ServiceManagerI.h +++ b/cpp/src/IceBox/ServiceManagerI.h @@ -25,8 +25,6 @@ public: ServiceManagerI(Ice::CommunicatorPtr, int&, char*[]); virtual ~ServiceManagerI(); - virtual Ice::SliceChecksumDict getSliceChecksums(const Ice::Current&) const; - virtual void startService(ICE_IN(std::string), const ::Ice::Current&); virtual void stopService(ICE_IN(std::string), const ::Ice::Current&); diff --git a/cpp/src/IceGrid/AdminI.cpp b/cpp/src/IceGrid/AdminI.cpp index 3596852add6..3c27f0a119f 100644 --- a/cpp/src/IceGrid/AdminI.cpp +++ b/cpp/src/IceGrid/AdminI.cpp @@ -7,7 +7,6 @@ #include <Ice/Ice.h> #include <Ice/LoggerUtil.h> #include <Ice/TraceUtil.h> -#include <Ice/SliceChecksums.h> #include <IceGrid/AdminI.h> #include <IceGrid/RegistryI.h> @@ -794,12 +793,6 @@ AdminI::shutdown(const Current&) _registry->shutdown(); } -SliceChecksumDict -AdminI::getSliceChecksums(const Current&) const -{ - return sliceChecksums(); -} - void AdminI::checkIsReadOnly() const { diff --git a/cpp/src/IceGrid/AdminI.h b/cpp/src/IceGrid/AdminI.h index 6ae5e4cd74c..ac294ae0445 100644 --- a/cpp/src/IceGrid/AdminI.h +++ b/cpp/src/IceGrid/AdminI.h @@ -82,8 +82,6 @@ public: virtual void shutdown(const Ice::Current&); - virtual Ice::SliceChecksumDict getSliceChecksums(const Ice::Current&) const; - private: void checkIsReadOnly() const; diff --git a/cpp/src/IceGrid/Client.cpp b/cpp/src/IceGrid/Client.cpp index df817c3e6d7..627cb87e95d 100644 --- a/cpp/src/IceGrid/Client.cpp +++ b/cpp/src/IceGrid/Client.cpp @@ -11,7 +11,6 @@ #include <IceUtil/Mutex.h> #include <IceUtil/MutexPtrLock.h> #include <Ice/Ice.h> -#include <Ice/SliceChecksums.h> #include <IceGrid/Parser.h> #include <IceGrid/FileParserI.h> #include <IceGrid/Registry.h> diff --git a/cpp/src/IceStorm/Admin.cpp b/cpp/src/IceStorm/Admin.cpp index 22c6ed1ac09..8307b04eb6a 100644 --- a/cpp/src/IceStorm/Admin.cpp +++ b/cpp/src/IceStorm/Admin.cpp @@ -5,7 +5,6 @@ #include <IceUtil/Options.h> #include <Ice/Ice.h> #include <Ice/ConsoleUtil.h> -#include <Ice/SliceChecksums.h> #include <IceStorm/Parser.h> #ifdef _WIN32 diff --git a/cpp/src/IceStorm/TopicManagerI.cpp b/cpp/src/IceStorm/TopicManagerI.cpp index 74a64a2198a..194a896a934 100644 --- a/cpp/src/IceStorm/TopicManagerI.cpp +++ b/cpp/src/IceStorm/TopicManagerI.cpp @@ -10,7 +10,6 @@ #include <IceStorm/Observers.h> #include <IceStorm/Subscriber.h> #include <IceStorm/Util.h> -#include <Ice/SliceChecksums.h> #include <functional> @@ -83,12 +82,6 @@ public: return _impl->retrieveAll(); } - virtual Ice::SliceChecksumDict getSliceChecksums(const Ice::Current&) const - { - // This doesn't require the replication to be running. - return Ice::sliceChecksums(); - } - virtual NodePrx getReplicaNode(const Ice::Current&) const { // This doesn't require the replication to be running. diff --git a/cpp/src/IceStorm/TransientTopicManagerI.cpp b/cpp/src/IceStorm/TransientTopicManagerI.cpp index 56cc3d37f17..016808d9335 100644 --- a/cpp/src/IceStorm/TransientTopicManagerI.cpp +++ b/cpp/src/IceStorm/TransientTopicManagerI.cpp @@ -10,8 +10,6 @@ #include <Ice/Ice.h> -#include <Ice/SliceChecksums.h> - #include <functional> using namespace IceStorm; @@ -106,11 +104,6 @@ TransientTopicManagerImpl::retrieveAll(const Ice::Current&) const return all; } -Ice::SliceChecksumDict -TransientTopicManagerImpl::getSliceChecksums(const Ice::Current&) const -{ - return Ice::sliceChecksums(); -} IceStormElection::NodePrx TransientTopicManagerImpl::getReplicaNode(const Ice::Current&) const diff --git a/cpp/src/IceStorm/TransientTopicManagerI.h b/cpp/src/IceStorm/TransientTopicManagerI.h index 4051a941327..8c84b6d85d5 100644 --- a/cpp/src/IceStorm/TransientTopicManagerI.h +++ b/cpp/src/IceStorm/TransientTopicManagerI.h @@ -33,7 +33,6 @@ public: virtual TopicPrx create(const std::string&, const Ice::Current&); virtual TopicPrx retrieve(const std::string&, const Ice::Current&) const; virtual TopicDict retrieveAll(const Ice::Current&) const; - virtual Ice::SliceChecksumDict getSliceChecksums(const Ice::Current&) const; virtual IceStormElection::NodePrx getReplicaNode(const Ice::Current&) const; void reap(); diff --git a/cpp/src/Slice/Checksum.cpp b/cpp/src/Slice/Checksum.cpp deleted file mode 100644 index 98aa11291d8..00000000000 --- a/cpp/src/Slice/Checksum.cpp +++ /dev/null @@ -1,447 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#include <Slice/Checksum.h> -#include <Slice/MD5.h> -#include <IceUtil/OutputUtil.h> - -using namespace std; -using namespace Slice; - -namespace Slice -{ - -class ChecksumVisitor : public ParserVisitor -{ -public: - - ChecksumVisitor(ChecksumMap&); - - virtual bool visitClassDefStart(const ClassDefPtr&); - virtual bool visitExceptionStart(const ExceptionPtr&); - virtual bool visitStructStart(const StructPtr&); - virtual void visitSequence(const SequencePtr&); - virtual void visitDictionary(const DictionaryPtr&); - virtual void visitEnum(const EnumPtr&); - virtual void visitConst(const ConstPtr&); - -private: - - string typeToString(const TypePtr&); - void updateMap(const string&, const string&); - - ChecksumMap& _map; -}; - -} - -Slice::ChecksumVisitor::ChecksumVisitor(ChecksumMap& m) : - _map(m) -{ -} - -bool -Slice::ChecksumVisitor::visitClassDefStart(const ClassDefPtr& p) -{ - if(p->isLocal()) - { - return false; - } - - ClassList bases = p->bases(); - - ostringstream ostr; - - if(p->isInterface()) - { - ostr << "interface "; - } - else - { - ostr << "class "; - } - - ostr << p->name(); - - if(p->compactId() >= 0) - { - ostr << '(' << p->compactId() << ')'; - } - - if(!bases.empty()) - { - if(!bases.front()->isInterface()) - { - ostr << " extends " << bases.front()->scoped(); - bases.erase(bases.begin()); - } - if(!bases.empty()) - { - if(p->isInterface()) - { - ostr << " extends "; - } - else - { - ostr << " implements "; - } - for(ClassList::iterator q = bases.begin(); q != bases.end(); ++q) - { - if(q != bases.begin()) - { - ostr << ", "; - } - ostr << (*q)->scoped(); - } - } - } - ostr << endl; - - if(p->hasDataMembers()) - { - DataMemberList members = p->dataMembers(); - DataMemberList optionals; - for(DataMemberList::iterator q = members.begin(); q != members.end(); ++q) - { - if((*q)->optional()) - { - optionals.push_back(*q); - } - else - { - ostr << typeToString((*q)->type()) << ' ' << (*q)->name() << endl; - } - } - - if(!optionals.empty()) - { - // - // Sort optional parameters by tag. - // - class SortFn - { - public: - static bool compare(const DataMemberPtr& lhs, const DataMemberPtr& rhs) - { - return lhs->tag() < rhs->tag(); - } - }; - optionals.sort(SortFn::compare); - - for(DataMemberList::iterator q = optionals.begin(); q != optionals.end(); ++q) - { - ostr << typeToString((*q)->type()) << ' ' << (*q)->tag() << ' ' << (*q)->name(); - } - } - } - - if(p->hasOperations()) - { - OperationList ops = p->operations(); - for(OperationList::iterator q = ops.begin(); q != ops.end(); ++q) - { - ostr << typeToString((*q)->returnType()) << ' '; - if((*q)->returnIsOptional()) - { - ostr << (*q)->returnTag() << ' '; - } - ostr << (*q)->name() << '('; - ParamDeclList params = (*q)->parameters(); - ParamDeclList optionals; - for(ParamDeclList::iterator r = params.begin(); r != params.end(); ++r) - { - if((*r)->optional()) - { - optionals.push_back(*r); - } - else - { - if(r != params.begin()) - { - ostr << ", "; - } - if((*r)->isOutParam()) - { - ostr << "out "; - } - ostr << typeToString((*r)->type()) << ' ' << (*r)->name(); - } - } - - if(!optionals.empty()) - { - // - // Sort optional parameters by tag. - // - class SortFn - { - public: - static bool compare(const ParamDeclPtr& lhs, const ParamDeclPtr& rhs) - { - return lhs->tag() < rhs->tag(); - } - }; - optionals.sort(SortFn::compare); - - for(ParamDeclList::iterator r = optionals.begin(); r != optionals.end(); ++r) - { - if(r != optionals.begin() || params.size() > optionals.size()) - { - ostr << ", "; - } - if((*r)->isOutParam()) - { - ostr << "out "; - } - ostr << typeToString((*r)->type()) << ' ' << (*r)->tag() << ' ' << (*r)->name(); - } - } - - ostr << ')'; - ExceptionList ex = (*q)->throws(); - if(!ex.empty()) - { - ostr << " throws "; - for(ExceptionList::iterator s = ex.begin(); s != ex.end(); ++s) - { - if(s != ex.begin()) - { - ostr << ", "; - } - ostr << (*s)->scoped(); - } - } - ostr << endl; - } - } - - updateMap(p->scoped(), ostr.str()); - - return false; -} - -bool -Slice::ChecksumVisitor::visitExceptionStart(const ExceptionPtr& p) -{ - if(p->isLocal()) - { - return false; - } - - ExceptionPtr base = p->base(); - - ostringstream ostr; - - ostr << "exception " << p->name(); - if(base) - { - ostr << " extends " << base->scoped(); - } - ostr << endl; - - DataMemberList members = p->dataMembers(); - DataMemberList optionals; - for(DataMemberList::iterator q = members.begin(); q != members.end(); ++q) - { - if((*q)->optional()) - { - optionals.push_back(*q); - } - else - { - ostr << typeToString((*q)->type()) << ' ' << (*q)->name() << endl; - } - } - - if(!optionals.empty()) - { - // - // Sort optional parameters by tag. - // - class SortFn - { - public: - static bool compare(const DataMemberPtr& lhs, const DataMemberPtr& rhs) - { - return lhs->tag() < rhs->tag(); - } - }; - optionals.sort(SortFn::compare); - - for(DataMemberList::iterator q = optionals.begin(); q != optionals.end(); ++q) - { - ostr << typeToString((*q)->type()) << ' ' << (*q)->tag() << ' ' << (*q)->name(); - } - } - - updateMap(p->scoped(), ostr.str()); - - return false; -} - -bool -Slice::ChecksumVisitor::visitStructStart(const StructPtr& p) -{ - if(p->isLocal()) - { - return false; - } - - ostringstream ostr; - - ostr << "struct " << p->name() << endl; - - DataMemberList members = p->dataMembers(); - for(DataMemberList::iterator q = members.begin(); q != members.end(); ++q) - { - ostr << typeToString((*q)->type()) << ' ' << (*q)->name() << endl; - } - - updateMap(p->scoped(), ostr.str()); - - return false; -} - -void -Slice::ChecksumVisitor::visitSequence(const SequencePtr& p) -{ - if(p->isLocal()) - { - return; - } - - ostringstream ostr; - ostr << "sequence<" << typeToString(p->type()) << "> " << p->name() << endl; - updateMap(p->scoped(), ostr.str()); -} - -void -Slice::ChecksumVisitor::visitDictionary(const DictionaryPtr& p) -{ - if(p->isLocal()) - { - return; - } - - ostringstream ostr; - ostr << "dictionary<" << typeToString(p->keyType()) << ", " << typeToString(p->valueType()) << "> " << p->name() - << endl; - updateMap(p->scoped(), ostr.str()); -} - -void -Slice::ChecksumVisitor::visitEnum(const EnumPtr& p) -{ - if(p->isLocal()) - { - return; - } - - ostringstream ostr; - - ostr << "enum " << p->name() << endl; - - // - // Check if any of the enumerators were assigned an explicit value. - // - const bool explicitValue = p->explicitValue(); - - EnumeratorList enums = p->enumerators(); - if(explicitValue) - { - // - // Sort enumerators by value. - // - class SortFn - { - public: - static bool compare(const EnumeratorPtr& lhs, const EnumeratorPtr& rhs) - { - return lhs->value() < rhs->value(); - } - }; - enums.sort(SortFn::compare); - for(EnumeratorList::iterator q = enums.begin(); q != enums.end(); ++q) - { - ostr << (*q)->name() << ' ' << IceUtilInternal::int64ToString((*q)->value()) << endl; - } - } - else - { - for(EnumeratorList::iterator q = enums.begin(); q != enums.end(); ++q) - { - ostr << (*q)->name() << endl; - } - } - updateMap(p->scoped(), ostr.str()); -} - -void -Slice::ChecksumVisitor::visitConst(const ConstPtr& p) -{ - ostringstream ostr; - ostr << "const " << typeToString(p->type()) << ' ' << p->name() << " = " << p->value() << endl; - updateMap(p->scoped(), ostr.str()); -} - -string -Slice::ChecksumVisitor::typeToString(const TypePtr& type) -{ - static const char* builtinTable[] = - { - "byte", - "boolean", - "short", - "int", - "long", - "float", - "double", - "string", - "Object", - "Object*", - "LocalObject" - }; - - if(!type) - { - return "void"; - } - - BuiltinPtr builtin = BuiltinPtr::dynamicCast(type); - if(builtin) - { - return builtinTable[builtin->kind()]; - } - - ProxyPtr proxy = ProxyPtr::dynamicCast(type); - if(proxy) - { - return proxy->_class()->scoped() + "*"; - } - - ContainedPtr cont = ContainedPtr::dynamicCast(type); - assert(cont); - return cont->scoped(); -} - -void -Slice::ChecksumVisitor::updateMap(const string& scoped, const string& data) -{ - MD5 md5(reinterpret_cast<const unsigned char*>(data.c_str()), static_cast<int>(data.size())); - vector<unsigned char> bytes; - bytes.resize(16); - md5.getDigest(reinterpret_cast<unsigned char*>(&bytes[0])); - _map.insert(ChecksumMap::value_type(scoped, bytes)); -} - -Slice::ChecksumMap -Slice::createChecksums(const UnitPtr& u) -{ - ChecksumMap result; - - ChecksumVisitor visitor(result); - u->visit(&visitor, false); - - return result; -} diff --git a/cpp/src/Slice/Checksum.h b/cpp/src/Slice/Checksum.h deleted file mode 100644 index 8be4395b12b..00000000000 --- a/cpp/src/Slice/Checksum.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#ifndef SLICE_CHECKSUM_H -#define SLICE_CHECKSUM_H - -#include <Slice/Parser.h> -#include <map> -#include <vector> - -namespace Slice -{ - -typedef std::map<std::string, std::vector<unsigned char> > ChecksumMap; - -ChecksumMap createChecksums(const UnitPtr&); - -} - -#endif diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp index 51b2a512181..af6d4e474b1 100644 --- a/cpp/src/Slice/JavaUtil.cpp +++ b/cpp/src/Slice/JavaUtil.cpp @@ -155,15 +155,10 @@ public: if(s.find(prefix) == 0) { static const string packagePrefix = "java:package:"; - static const string checksumPrefix = "java:checksum:"; if(s.find(packagePrefix) == 0 && s.size() > packagePrefix.size()) { continue; } - else if(s.find(checksumPrefix) == 0 && s.size() > checksumPrefix.size()) - { - continue; - } else { dc->warning(InvalidMetaData, file, "", "ignoring invalid file metadata `" + s + "'"); diff --git a/cpp/src/Slice/Python.cpp b/cpp/src/Slice/Python.cpp index 524c9831d0d..ae18777520f 100644 --- a/cpp/src/Slice/Python.cpp +++ b/cpp/src/Slice/Python.cpp @@ -453,7 +453,6 @@ usage(const string& n) "--depend-xml Generate dependencies in XML format.\n" "--depend-file FILE Write dependencies to FILE instead of standard output.\n" "--all Generate code for Slice definitions in included files.\n" - "--checksum Generate checksums for Slice definitions.\n" "--prefix PREFIX Prepend filenames of Python modules with PREFIX.\n" ; } @@ -480,7 +479,6 @@ Slice::Python::compile(const vector<string>& argv) opts.addOpt("", "all"); opts.addOpt("", "no-package"); opts.addOpt("", "build-package"); - opts.addOpt("", "checksum"); opts.addOpt("", "prefix", IceUtilInternal::Options::NeedArg); vector<string> args; @@ -548,8 +546,6 @@ Slice::Python::compile(const vector<string>& argv) bool buildPackage = opts.isSet("build-package"); - bool checksum = opts.isSet("checksum"); - string prefix = opts.optArg("prefix"); if(args.empty()) @@ -761,7 +757,7 @@ Slice::Python::compile(const vector<string>& argv) // // Generate Python code. // - generate(u, all, checksum, includePaths, out); + generate(u, all, includePaths, out); out.close(); } diff --git a/cpp/src/Slice/PythonUtil.cpp b/cpp/src/Slice/PythonUtil.cpp index 5649f9797d4..650cc18ac72 100644 --- a/cpp/src/Slice/PythonUtil.cpp +++ b/cpp/src/Slice/PythonUtil.cpp @@ -3,7 +3,6 @@ // #include <Slice/PythonUtil.h> -#include <Slice/Checksum.h> #include <Slice/Util.h> #include <IceUtil/IceUtil.h> #include <IceUtil/StringUtil.h> @@ -2917,7 +2916,7 @@ Slice::Python::getImportFileName(const string& file, const UnitPtr& ut, const ve } void -Slice::Python::generate(const UnitPtr& un, bool all, bool checksum, const vector<string>& includePaths, +Slice::Python::generate(const UnitPtr& un, bool all, const vector<string>& includePaths, Output& out) { Slice::Python::MetaDataVisitor visitor; @@ -2949,27 +2948,6 @@ Slice::Python::generate(const UnitPtr& un, bool all, bool checksum, const vector CodeVisitor codeVisitor(out, moduleHistory); un->visit(&codeVisitor, false); - if(checksum) - { - ChecksumMap checksums = createChecksums(un); - if(!checksums.empty()) - { - out << sp; - for(ChecksumMap::const_iterator p = checksums.begin(); p != checksums.end(); ++p) - { - out << nl << "Ice.sliceChecksums[\"" << p->first << "\"] = \""; - ostringstream str; - str.flags(ios_base::hex); - str.fill('0'); - for(vector<unsigned char>::const_iterator q = p->second.begin(); q != p->second.end(); ++q) - { - str << static_cast<int>(*q); - } - out << str.str() << "\""; - } - } - } - out << nl; // Trailing newline. } diff --git a/cpp/src/Slice/PythonUtil.h b/cpp/src/Slice/PythonUtil.h index d1b0d656906..137d3ee61cb 100644 --- a/cpp/src/Slice/PythonUtil.h +++ b/cpp/src/Slice/PythonUtil.h @@ -27,7 +27,7 @@ std::string getImportFileName(const std::string&, const Slice::UnitPtr&, const s // // Generate Python code for a translation unit. // -void generate(const Slice::UnitPtr&, bool, bool, const std::vector<std::string>&, IceUtilInternal::Output&); +void generate(const Slice::UnitPtr&, bool, const std::vector<std::string>&, IceUtilInternal::Output&); // // Convert a scoped name into a Python name. diff --git a/cpp/src/Slice/Ruby.cpp b/cpp/src/Slice/Ruby.cpp index ff9f46730eb..d13d0140330 100644 --- a/cpp/src/Slice/Ruby.cpp +++ b/cpp/src/Slice/Ruby.cpp @@ -71,7 +71,6 @@ usage(const string& n) "--depend-xml Generate dependencies in XML format.\n" "--depend-file FILE Write dependencies to FILE instead of standard output.\n" "--all Generate code for Slice definitions in included files.\n" - "--checksum Generate checksums for Slice definitions.\n" "--ice Allow reserved Ice prefix in Slice identifiers\n" " deprecated: use instead [[\"ice-prefix\"]] metadata.\n" "--underscore Allow underscores in Slice identifiers\n" @@ -99,7 +98,6 @@ Slice::Ruby::compile(const vector<string>& argv) opts.addOpt("", "ice"); opts.addOpt("", "underscore"); opts.addOpt("", "all"); - opts.addOpt("", "checksum"); vector<string> args; try @@ -162,8 +160,6 @@ Slice::Ruby::compile(const vector<string>& argv) bool all = opts.isSet("all"); - bool checksum = opts.isSet("checksum"); - if(args.empty()) { consoleErr << argv[0] << ": error: no input file" << endl; @@ -306,7 +302,7 @@ Slice::Ruby::compile(const vector<string>& argv) // // Generate the Ruby mapping. // - generate(u, all, checksum, includePaths, out); + generate(u, all, includePaths, out); out.close(); } diff --git a/cpp/src/Slice/RubyUtil.cpp b/cpp/src/Slice/RubyUtil.cpp index af1f273ac6d..39d6a594d0e 100644 --- a/cpp/src/Slice/RubyUtil.cpp +++ b/cpp/src/Slice/RubyUtil.cpp @@ -3,7 +3,6 @@ // #include <Slice/RubyUtil.h> -#include <Slice/Checksum.h> #include <Slice/Util.h> #include <IceUtil/Functional.h> #include <IceUtil/InputUtil.h> @@ -1434,7 +1433,7 @@ Slice::Ruby::CodeVisitor::collectExceptionMembers(const ExceptionPtr& p, MemberI } void -Slice::Ruby::generate(const UnitPtr& un, bool all, bool checksum, const vector<string>& includePaths, Output& out) +Slice::Ruby::generate(const UnitPtr& un, bool all, const vector<string>& includePaths, Output& out) { out << nl << "require 'Ice'"; @@ -1457,27 +1456,6 @@ Slice::Ruby::generate(const UnitPtr& un, bool all, bool checksum, const vector<s CodeVisitor codeVisitor(out); un->visit(&codeVisitor, false); - if(checksum) - { - ChecksumMap checksums = createChecksums(un); - if(!checksums.empty()) - { - out << sp; - for(ChecksumMap::const_iterator p = checksums.begin(); p != checksums.end(); ++p) - { - out << nl << "::Ice::SliceChecksums[\"" << p->first << "\"] = \""; - ostringstream str; - str.flags(ios_base::hex); - str.fill('0'); - for(vector<unsigned char>::const_iterator q = p->second.begin(); q != p->second.end(); ++q) - { - str << static_cast<int>(*q); - } - out << str.str() << "\""; - } - } - } - out << nl; // Trailing newline. } diff --git a/cpp/src/Slice/RubyUtil.h b/cpp/src/Slice/RubyUtil.h index f5fb4413f68..829abee438e 100644 --- a/cpp/src/Slice/RubyUtil.h +++ b/cpp/src/Slice/RubyUtil.h @@ -16,7 +16,7 @@ namespace Ruby // // Generate Ruby code for a translation unit. // -void generate(const Slice::UnitPtr&, bool, bool, const std::vector<std::string>&, IceUtilInternal::Output&); +void generate(const Slice::UnitPtr&, bool, const std::vector<std::string>&, IceUtilInternal::Output&); // // Check the given identifier against Ruby's list of reserved words. If it matches diff --git a/cpp/src/Slice/msbuild/slice.vcxproj b/cpp/src/Slice/msbuild/slice.vcxproj index c4cb45aa4ad..88a167a5fd9 100644 --- a/cpp/src/Slice/msbuild/slice.vcxproj +++ b/cpp/src/Slice/msbuild/slice.vcxproj @@ -90,7 +90,6 @@ </ClCompile> </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="..\Checksum.cpp" /> <ClCompile Include="..\CPlusPlusUtil.cpp" /> <ClCompile Include="..\FileTracker.cpp" /> <ClCompile Include="..\Grammar.cpp" /> @@ -109,7 +108,6 @@ <ClCompile Include="..\StringLiteralUtil.cpp" /> </ItemGroup> <ItemGroup> - <ClInclude Include="..\Checksum.h" /> <ClInclude Include="..\CPlusPlusUtil.h" /> <ClInclude Include="..\FileTracker.h" /> <ClInclude Include="..\Grammar.h" /> diff --git a/cpp/src/Slice/msbuild/slice.vcxproj.filters b/cpp/src/Slice/msbuild/slice.vcxproj.filters index dfec8f19d1c..1ff90b18d95 100644 --- a/cpp/src/Slice/msbuild/slice.vcxproj.filters +++ b/cpp/src/Slice/msbuild/slice.vcxproj.filters @@ -15,554 +15,94 @@ </Filter> </ItemGroup> <ItemGroup> - <ClCompile Include="..\Checksum.cpp"> + <ClCompile Include="..\CPlusPlusUtil.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\CPlusPlusUtil.cpp" /> - <ClCompile Include="..\FileTracker.cpp" /> - <ClCompile Include="..\Grammar.cpp" /> - <ClCompile Include="..\JavaUtil.cpp" /> - <ClCompile Include="..\MD5.cpp" /> - <ClCompile Include="..\MD5I.cpp" /> - <ClCompile Include="..\Parser.cpp" /> - <ClCompile Include="..\PHPUtil.cpp" /> - <ClCompile Include="..\Preprocessor.cpp" /> - <ClCompile Include="..\Python.cpp" /> - <ClCompile Include="..\PythonUtil.cpp" /> - <ClCompile Include="..\Ruby.cpp" /> - <ClCompile Include="..\RubyUtil.cpp" /> - <ClCompile Include="..\Scanner.cpp" /> - <ClCompile Include="..\SliceUtil.cpp" /> - <ClCompile Include="..\StringLiteralUtil.cpp" /> - <ClCompile Include="..\Checksum.cpp"> + <ClCompile Include="..\FileTracker.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\CPlusPlusUtil.cpp" /> - <ClCompile Include="..\FileTracker.cpp" /> - <ClCompile Include="..\Grammar.cpp" /> - <ClCompile Include="..\JavaUtil.cpp" /> - <ClCompile Include="..\MD5.cpp" /> - <ClCompile Include="..\MD5I.cpp" /> - <ClCompile Include="..\Parser.cpp" /> - <ClCompile Include="..\PHPUtil.cpp" /> - <ClCompile Include="..\Preprocessor.cpp" /> - <ClCompile Include="..\Python.cpp" /> - <ClCompile Include="..\PythonUtil.cpp" /> - <ClCompile Include="..\Ruby.cpp" /> - <ClCompile Include="..\RubyUtil.cpp" /> - <ClCompile Include="..\Scanner.cpp" /> - <ClCompile Include="..\SliceUtil.cpp" /> - <ClCompile Include="..\StringLiteralUtil.cpp" /> - <ClCompile Include="..\Checksum.cpp"> + <ClCompile Include="..\Grammar.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\CPlusPlusUtil.cpp" /> - <ClCompile Include="..\FileTracker.cpp" /> - <ClCompile Include="..\Grammar.cpp" /> - <ClCompile Include="..\JavaUtil.cpp" /> - <ClCompile Include="..\MD5.cpp" /> - <ClCompile Include="..\MD5I.cpp" /> - <ClCompile Include="..\Parser.cpp" /> - <ClCompile Include="..\PHPUtil.cpp" /> - <ClCompile Include="..\Preprocessor.cpp" /> - <ClCompile Include="..\Python.cpp" /> - <ClCompile Include="..\PythonUtil.cpp" /> - <ClCompile Include="..\Ruby.cpp" /> - <ClCompile Include="..\RubyUtil.cpp" /> - <ClCompile Include="..\Scanner.cpp" /> - <ClCompile Include="..\SliceUtil.cpp" /> - <ClCompile Include="..\StringLiteralUtil.cpp" /> - <ClCompile Include="..\Checksum.cpp"> + <ClCompile Include="..\JavaUtil.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\CPlusPlusUtil.cpp" /> - <ClCompile Include="..\FileTracker.cpp" /> - <ClCompile Include="..\Grammar.cpp" /> - <ClCompile Include="..\JavaUtil.cpp" /> - <ClCompile Include="..\MD5.cpp" /> - <ClCompile Include="..\MD5I.cpp" /> - <ClCompile Include="..\Parser.cpp" /> - <ClCompile Include="..\PHPUtil.cpp" /> - <ClCompile Include="..\Preprocessor.cpp" /> - <ClCompile Include="..\Python.cpp" /> - <ClCompile Include="..\PythonUtil.cpp" /> - <ClCompile Include="..\Ruby.cpp" /> - <ClCompile Include="..\RubyUtil.cpp" /> - <ClCompile Include="..\Scanner.cpp" /> - <ClCompile Include="..\SliceUtil.cpp" /> - <ClCompile Include="..\StringLiteralUtil.cpp" /> - <ClCompile Include="..\Checksum.cpp"> + <ClCompile Include="..\MD5.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\CPlusPlusUtil.cpp" /> - <ClCompile Include="..\FileTracker.cpp" /> - <ClCompile Include="..\Grammar.cpp" /> - <ClCompile Include="..\JavaUtil.cpp" /> - <ClCompile Include="..\MD5.cpp" /> - <ClCompile Include="..\MD5I.cpp" /> - <ClCompile Include="..\Parser.cpp" /> - <ClCompile Include="..\PHPUtil.cpp" /> - <ClCompile Include="..\Preprocessor.cpp" /> - <ClCompile Include="..\Python.cpp" /> - <ClCompile Include="..\PythonUtil.cpp" /> - <ClCompile Include="..\Ruby.cpp" /> - <ClCompile Include="..\RubyUtil.cpp" /> - <ClCompile Include="..\Scanner.cpp" /> - <ClCompile Include="..\SliceUtil.cpp" /> - <ClCompile Include="..\StringLiteralUtil.cpp" /> - <ClCompile Include="..\Checksum.cpp"> + <ClCompile Include="..\MD5I.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\CPlusPlusUtil.cpp" /> - <ClCompile Include="..\FileTracker.cpp" /> - <ClCompile Include="..\Grammar.cpp" /> - <ClCompile Include="..\JavaUtil.cpp" /> - <ClCompile Include="..\MD5.cpp" /> - <ClCompile Include="..\MD5I.cpp" /> - <ClCompile Include="..\Parser.cpp" /> - <ClCompile Include="..\PHPUtil.cpp" /> - <ClCompile Include="..\Preprocessor.cpp" /> - <ClCompile Include="..\Python.cpp" /> - <ClCompile Include="..\PythonUtil.cpp" /> - <ClCompile Include="..\Ruby.cpp" /> - <ClCompile Include="..\RubyUtil.cpp" /> - <ClCompile Include="..\Scanner.cpp" /> - <ClCompile Include="..\SliceUtil.cpp" /> - <ClCompile Include="..\StringLiteralUtil.cpp" /> - <ClCompile Include="..\Checksum.cpp"> + <ClCompile Include="..\Parser.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\CPlusPlusUtil.cpp" /> - <ClCompile Include="..\FileTracker.cpp" /> - <ClCompile Include="..\Grammar.cpp" /> - <ClCompile Include="..\JavaUtil.cpp" /> - <ClCompile Include="..\MD5.cpp" /> - <ClCompile Include="..\MD5I.cpp" /> - <ClCompile Include="..\Parser.cpp" /> - <ClCompile Include="..\PHPUtil.cpp" /> - <ClCompile Include="..\Preprocessor.cpp" /> - <ClCompile Include="..\Python.cpp" /> - <ClCompile Include="..\PythonUtil.cpp" /> - <ClCompile Include="..\Ruby.cpp" /> - <ClCompile Include="..\RubyUtil.cpp" /> - <ClCompile Include="..\Scanner.cpp" /> - <ClCompile Include="..\SliceUtil.cpp" /> - <ClCompile Include="..\StringLiteralUtil.cpp" /> - <ClCompile Include="..\Checksum.cpp"> + <ClCompile Include="..\PHPUtil.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\CPlusPlusUtil.cpp" /> - <ClCompile Include="..\FileTracker.cpp" /> - <ClCompile Include="..\Grammar.cpp" /> - <ClCompile Include="..\JavaUtil.cpp" /> - <ClCompile Include="..\MD5.cpp" /> - <ClCompile Include="..\MD5I.cpp" /> - <ClCompile Include="..\Parser.cpp" /> - <ClCompile Include="..\PHPUtil.cpp" /> - <ClCompile Include="..\Preprocessor.cpp" /> - <ClCompile Include="..\Python.cpp" /> - <ClCompile Include="..\PythonUtil.cpp" /> - <ClCompile Include="..\Ruby.cpp" /> - <ClCompile Include="..\RubyUtil.cpp" /> - <ClCompile Include="..\Scanner.cpp" /> - <ClCompile Include="..\SliceUtil.cpp" /> - <ClCompile Include="..\StringLiteralUtil.cpp" /> - <ClCompile Include="..\Checksum.cpp"> + <ClCompile Include="..\Preprocessor.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\CPlusPlusUtil.cpp" /> - <ClCompile Include="..\FileTracker.cpp" /> - <ClCompile Include="..\Grammar.cpp" /> - <ClCompile Include="..\JavaUtil.cpp" /> - <ClCompile Include="..\MD5.cpp" /> - <ClCompile Include="..\MD5I.cpp" /> - <ClCompile Include="..\Parser.cpp" /> - <ClCompile Include="..\PHPUtil.cpp" /> - <ClCompile Include="..\Preprocessor.cpp" /> - <ClCompile Include="..\Python.cpp" /> - <ClCompile Include="..\PythonUtil.cpp" /> - <ClCompile Include="..\Ruby.cpp" /> - <ClCompile Include="..\RubyUtil.cpp" /> - <ClCompile Include="..\Scanner.cpp" /> - <ClCompile Include="..\SliceUtil.cpp" /> - <ClCompile Include="..\StringLiteralUtil.cpp" /> - <ClCompile Include="..\Checksum.cpp"> + <ClCompile Include="..\Python.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\CPlusPlusUtil.cpp" /> - <ClCompile Include="..\FileTracker.cpp" /> - <ClCompile Include="..\Grammar.cpp" /> - <ClCompile Include="..\JavaUtil.cpp" /> - <ClCompile Include="..\MD5.cpp" /> - <ClCompile Include="..\MD5I.cpp" /> - <ClCompile Include="..\Parser.cpp" /> - <ClCompile Include="..\PHPUtil.cpp" /> - <ClCompile Include="..\Preprocessor.cpp" /> - <ClCompile Include="..\Python.cpp" /> - <ClCompile Include="..\PythonUtil.cpp" /> - <ClCompile Include="..\Ruby.cpp" /> - <ClCompile Include="..\RubyUtil.cpp" /> - <ClCompile Include="..\Scanner.cpp" /> - <ClCompile Include="..\SliceUtil.cpp" /> - <ClCompile Include="..\StringLiteralUtil.cpp" /> - <ClCompile Include="..\Checksum.cpp"> + <ClCompile Include="..\PythonUtil.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\CPlusPlusUtil.cpp" /> - <ClCompile Include="..\FileTracker.cpp" /> - <ClCompile Include="..\Grammar.cpp" /> - <ClCompile Include="..\JavaUtil.cpp" /> - <ClCompile Include="..\MD5.cpp" /> - <ClCompile Include="..\MD5I.cpp" /> - <ClCompile Include="..\Parser.cpp" /> - <ClCompile Include="..\PHPUtil.cpp" /> - <ClCompile Include="..\Preprocessor.cpp" /> - <ClCompile Include="..\Python.cpp" /> - <ClCompile Include="..\PythonUtil.cpp" /> - <ClCompile Include="..\Ruby.cpp" /> - <ClCompile Include="..\RubyUtil.cpp" /> - <ClCompile Include="..\Scanner.cpp" /> - <ClCompile Include="..\SliceUtil.cpp" /> - <ClCompile Include="..\StringLiteralUtil.cpp" /> - <ClCompile Include="..\Checksum.cpp"> + <ClCompile Include="..\Ruby.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\CPlusPlusUtil.cpp" /> - <ClCompile Include="..\FileTracker.cpp" /> - <ClCompile Include="..\Grammar.cpp" /> - <ClCompile Include="..\JavaUtil.cpp" /> - <ClCompile Include="..\MD5.cpp" /> - <ClCompile Include="..\MD5I.cpp" /> - <ClCompile Include="..\Parser.cpp" /> - <ClCompile Include="..\PHPUtil.cpp" /> - <ClCompile Include="..\Preprocessor.cpp" /> - <ClCompile Include="..\Python.cpp" /> - <ClCompile Include="..\PythonUtil.cpp" /> - <ClCompile Include="..\Ruby.cpp" /> - <ClCompile Include="..\RubyUtil.cpp" /> - <ClCompile Include="..\Scanner.cpp" /> - <ClCompile Include="..\SliceUtil.cpp" /> - <ClCompile Include="..\StringLiteralUtil.cpp" /> - <ClCompile Include="..\Checksum.cpp"> + <ClCompile Include="..\RubyUtil.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\CPlusPlusUtil.cpp" /> - <ClCompile Include="..\FileTracker.cpp" /> - <ClCompile Include="..\Grammar.cpp" /> - <ClCompile Include="..\JavaUtil.cpp" /> - <ClCompile Include="..\MD5.cpp" /> - <ClCompile Include="..\MD5I.cpp" /> - <ClCompile Include="..\Parser.cpp" /> - <ClCompile Include="..\PHPUtil.cpp" /> - <ClCompile Include="..\Preprocessor.cpp" /> - <ClCompile Include="..\Python.cpp" /> - <ClCompile Include="..\PythonUtil.cpp" /> - <ClCompile Include="..\Ruby.cpp" /> - <ClCompile Include="..\RubyUtil.cpp" /> - <ClCompile Include="..\Scanner.cpp" /> - <ClCompile Include="..\SliceUtil.cpp" /> - <ClCompile Include="..\StringLiteralUtil.cpp" /> - <ClCompile Include="..\Checksum.cpp"> + <ClCompile Include="..\Scanner.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\CPlusPlusUtil.cpp" /> - <ClCompile Include="..\FileTracker.cpp" /> - <ClCompile Include="..\Grammar.cpp" /> - <ClCompile Include="..\JavaUtil.cpp" /> - <ClCompile Include="..\MD5.cpp" /> - <ClCompile Include="..\MD5I.cpp" /> - <ClCompile Include="..\Parser.cpp" /> - <ClCompile Include="..\PHPUtil.cpp" /> - <ClCompile Include="..\Preprocessor.cpp" /> - <ClCompile Include="..\Python.cpp" /> - <ClCompile Include="..\PythonUtil.cpp" /> - <ClCompile Include="..\Ruby.cpp" /> - <ClCompile Include="..\RubyUtil.cpp" /> - <ClCompile Include="..\Scanner.cpp" /> - <ClCompile Include="..\SliceUtil.cpp" /> - <ClCompile Include="..\StringLiteralUtil.cpp" /> - <ClCompile Include="..\Checksum.cpp"> + <ClCompile Include="..\SliceUtil.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\CPlusPlusUtil.cpp" /> - <ClCompile Include="..\FileTracker.cpp" /> - <ClCompile Include="..\Grammar.cpp" /> - <ClCompile Include="..\JavaUtil.cpp" /> - <ClCompile Include="..\MD5.cpp" /> - <ClCompile Include="..\MD5I.cpp" /> - <ClCompile Include="..\Parser.cpp" /> - <ClCompile Include="..\PHPUtil.cpp" /> - <ClCompile Include="..\Preprocessor.cpp" /> - <ClCompile Include="..\Python.cpp" /> - <ClCompile Include="..\PythonUtil.cpp" /> - <ClCompile Include="..\Ruby.cpp" /> - <ClCompile Include="..\RubyUtil.cpp" /> - <ClCompile Include="..\Scanner.cpp" /> - <ClCompile Include="..\SliceUtil.cpp" /> - <ClCompile Include="..\StringLiteralUtil.cpp" /> - <ClCompile Include="..\Checksum.cpp"> + <ClCompile Include="..\StringLiteralUtil.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\CPlusPlusUtil.cpp" /> - <ClCompile Include="..\FileTracker.cpp" /> - <ClCompile Include="..\Grammar.cpp" /> - <ClCompile Include="..\JavaUtil.cpp" /> - <ClCompile Include="..\MD5.cpp" /> - <ClCompile Include="..\MD5I.cpp" /> - <ClCompile Include="..\Parser.cpp" /> - <ClCompile Include="..\PHPUtil.cpp" /> - <ClCompile Include="..\Preprocessor.cpp" /> - <ClCompile Include="..\Python.cpp" /> - <ClCompile Include="..\PythonUtil.cpp" /> - <ClCompile Include="..\Ruby.cpp" /> - <ClCompile Include="..\RubyUtil.cpp" /> - <ClCompile Include="..\Scanner.cpp" /> - <ClCompile Include="..\SliceUtil.cpp" /> - <ClCompile Include="..\StringLiteralUtil.cpp" /> - <ClCompile Include="..\Checksum.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\CPlusPlusUtil.cpp" /> - <ClCompile Include="..\FileTracker.cpp" /> - <ClCompile Include="..\Grammar.cpp" /> - <ClCompile Include="..\JavaUtil.cpp" /> - <ClCompile Include="..\MD5.cpp" /> - <ClCompile Include="..\MD5I.cpp" /> - <ClCompile Include="..\Parser.cpp" /> - <ClCompile Include="..\PHPUtil.cpp" /> - <ClCompile Include="..\Preprocessor.cpp" /> - <ClCompile Include="..\Python.cpp" /> - <ClCompile Include="..\PythonUtil.cpp" /> - <ClCompile Include="..\Ruby.cpp" /> - <ClCompile Include="..\RubyUtil.cpp" /> - <ClCompile Include="..\Scanner.cpp" /> - <ClCompile Include="..\SliceUtil.cpp" /> - <ClCompile Include="..\StringLiteralUtil.cpp" /> </ItemGroup> <ItemGroup> - <ClInclude Include="..\Checksum.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\CPlusPlusUtil.h" /> - <ClInclude Include="..\FileTracker.h" /> - <ClInclude Include="..\Grammar.h" /> - <ClInclude Include="..\GrammarUtil.h" /> - <ClInclude Include="..\JavaUtil.h" /> - <ClInclude Include="..\MD5.h" /> - <ClInclude Include="..\MD5I.h" /> - <ClInclude Include="..\Parser.h" /> - <ClInclude Include="..\PHPUtil.h" /> - <ClInclude Include="..\Preprocessor.h" /> - <ClInclude Include="..\PythonUtil.h" /> - <ClInclude Include="..\RubyUtil.h" /> - <ClInclude Include="..\Util.h" /> - <ClInclude Include="..\Checksum.h"> + <ClInclude Include="..\CPlusPlusUtil.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\CPlusPlusUtil.h" /> - <ClInclude Include="..\FileTracker.h" /> - <ClInclude Include="..\Grammar.h" /> - <ClInclude Include="..\GrammarUtil.h" /> - <ClInclude Include="..\JavaUtil.h" /> - <ClInclude Include="..\MD5.h" /> - <ClInclude Include="..\MD5I.h" /> - <ClInclude Include="..\Parser.h" /> - <ClInclude Include="..\PHPUtil.h" /> - <ClInclude Include="..\Preprocessor.h" /> - <ClInclude Include="..\PythonUtil.h" /> - <ClInclude Include="..\RubyUtil.h" /> - <ClInclude Include="..\Util.h" /> - <ClInclude Include="..\Checksum.h"> + <ClInclude Include="..\FileTracker.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\CPlusPlusUtil.h" /> - <ClInclude Include="..\FileTracker.h" /> - <ClInclude Include="..\Grammar.h" /> - <ClInclude Include="..\GrammarUtil.h" /> - <ClInclude Include="..\JavaUtil.h" /> - <ClInclude Include="..\MD5.h" /> - <ClInclude Include="..\MD5I.h" /> - <ClInclude Include="..\Parser.h" /> - <ClInclude Include="..\PHPUtil.h" /> - <ClInclude Include="..\Preprocessor.h" /> - <ClInclude Include="..\PythonUtil.h" /> - <ClInclude Include="..\RubyUtil.h" /> - <ClInclude Include="..\Util.h" /> - <ClInclude Include="..\Checksum.h"> + <ClInclude Include="..\Grammar.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\CPlusPlusUtil.h" /> - <ClInclude Include="..\FileTracker.h" /> - <ClInclude Include="..\Grammar.h" /> - <ClInclude Include="..\GrammarUtil.h" /> - <ClInclude Include="..\JavaUtil.h" /> - <ClInclude Include="..\MD5.h" /> - <ClInclude Include="..\MD5I.h" /> - <ClInclude Include="..\Parser.h" /> - <ClInclude Include="..\PHPUtil.h" /> - <ClInclude Include="..\Preprocessor.h" /> - <ClInclude Include="..\PythonUtil.h" /> - <ClInclude Include="..\RubyUtil.h" /> - <ClInclude Include="..\Util.h" /> - <ClInclude Include="..\Checksum.h"> + <ClInclude Include="..\GrammarUtil.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\CPlusPlusUtil.h" /> - <ClInclude Include="..\FileTracker.h" /> - <ClInclude Include="..\Grammar.h" /> - <ClInclude Include="..\GrammarUtil.h" /> - <ClInclude Include="..\JavaUtil.h" /> - <ClInclude Include="..\MD5.h" /> - <ClInclude Include="..\MD5I.h" /> - <ClInclude Include="..\Parser.h" /> - <ClInclude Include="..\PHPUtil.h" /> - <ClInclude Include="..\Preprocessor.h" /> - <ClInclude Include="..\PythonUtil.h" /> - <ClInclude Include="..\RubyUtil.h" /> - <ClInclude Include="..\Util.h" /> - <ClInclude Include="..\Checksum.h"> + <ClInclude Include="..\JavaUtil.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\CPlusPlusUtil.h" /> - <ClInclude Include="..\FileTracker.h" /> - <ClInclude Include="..\Grammar.h" /> - <ClInclude Include="..\GrammarUtil.h" /> - <ClInclude Include="..\JavaUtil.h" /> - <ClInclude Include="..\MD5.h" /> - <ClInclude Include="..\MD5I.h" /> - <ClInclude Include="..\Parser.h" /> - <ClInclude Include="..\PHPUtil.h" /> - <ClInclude Include="..\Preprocessor.h" /> - <ClInclude Include="..\PythonUtil.h" /> - <ClInclude Include="..\RubyUtil.h" /> - <ClInclude Include="..\Util.h" /> - <ClInclude Include="..\Checksum.h"> + <ClInclude Include="..\MD5.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\CPlusPlusUtil.h" /> - <ClInclude Include="..\FileTracker.h" /> - <ClInclude Include="..\Grammar.h" /> - <ClInclude Include="..\GrammarUtil.h" /> - <ClInclude Include="..\JavaUtil.h" /> - <ClInclude Include="..\MD5.h" /> - <ClInclude Include="..\MD5I.h" /> - <ClInclude Include="..\Parser.h" /> - <ClInclude Include="..\PHPUtil.h" /> - <ClInclude Include="..\Preprocessor.h" /> - <ClInclude Include="..\PythonUtil.h" /> - <ClInclude Include="..\RubyUtil.h" /> - <ClInclude Include="..\Util.h" /> - <ClInclude Include="..\Checksum.h"> + <ClInclude Include="..\MD5I.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\CPlusPlusUtil.h" /> - <ClInclude Include="..\FileTracker.h" /> - <ClInclude Include="..\Grammar.h" /> - <ClInclude Include="..\GrammarUtil.h" /> - <ClInclude Include="..\JavaUtil.h" /> - <ClInclude Include="..\MD5.h" /> - <ClInclude Include="..\MD5I.h" /> - <ClInclude Include="..\Parser.h" /> - <ClInclude Include="..\PHPUtil.h" /> - <ClInclude Include="..\Preprocessor.h" /> - <ClInclude Include="..\PythonUtil.h" /> - <ClInclude Include="..\RubyUtil.h" /> - <ClInclude Include="..\Util.h" /> - <ClInclude Include="..\Checksum.h"> + <ClInclude Include="..\Parser.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\CPlusPlusUtil.h" /> - <ClInclude Include="..\FileTracker.h" /> - <ClInclude Include="..\Grammar.h" /> - <ClInclude Include="..\GrammarUtil.h" /> - <ClInclude Include="..\JavaUtil.h" /> - <ClInclude Include="..\MD5.h" /> - <ClInclude Include="..\MD5I.h" /> - <ClInclude Include="..\Parser.h" /> - <ClInclude Include="..\PHPUtil.h" /> - <ClInclude Include="..\Preprocessor.h" /> - <ClInclude Include="..\PythonUtil.h" /> - <ClInclude Include="..\RubyUtil.h" /> - <ClInclude Include="..\Util.h" /> - <ClInclude Include="..\Checksum.h"> + <ClInclude Include="..\PHPUtil.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\CPlusPlusUtil.h" /> - <ClInclude Include="..\FileTracker.h" /> - <ClInclude Include="..\Grammar.h" /> - <ClInclude Include="..\GrammarUtil.h" /> - <ClInclude Include="..\JavaUtil.h" /> - <ClInclude Include="..\MD5.h" /> - <ClInclude Include="..\MD5I.h" /> - <ClInclude Include="..\Parser.h" /> - <ClInclude Include="..\PHPUtil.h" /> - <ClInclude Include="..\Preprocessor.h" /> - <ClInclude Include="..\PythonUtil.h" /> - <ClInclude Include="..\RubyUtil.h" /> - <ClInclude Include="..\Util.h" /> - <ClInclude Include="..\Checksum.h"> + <ClInclude Include="..\Preprocessor.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\CPlusPlusUtil.h" /> - <ClInclude Include="..\FileTracker.h" /> - <ClInclude Include="..\Grammar.h" /> - <ClInclude Include="..\GrammarUtil.h" /> - <ClInclude Include="..\JavaUtil.h" /> - <ClInclude Include="..\MD5.h" /> - <ClInclude Include="..\MD5I.h" /> - <ClInclude Include="..\Parser.h" /> - <ClInclude Include="..\PHPUtil.h" /> - <ClInclude Include="..\Preprocessor.h" /> - <ClInclude Include="..\PythonUtil.h" /> - <ClInclude Include="..\RubyUtil.h" /> - <ClInclude Include="..\Util.h" /> - <ClInclude Include="..\Checksum.h"> + <ClInclude Include="..\PythonUtil.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\CPlusPlusUtil.h" /> - <ClInclude Include="..\FileTracker.h" /> - <ClInclude Include="..\Grammar.h" /> - <ClInclude Include="..\GrammarUtil.h" /> - <ClInclude Include="..\JavaUtil.h" /> - <ClInclude Include="..\MD5.h" /> - <ClInclude Include="..\MD5I.h" /> - <ClInclude Include="..\Parser.h" /> - <ClInclude Include="..\PHPUtil.h" /> - <ClInclude Include="..\Preprocessor.h" /> - <ClInclude Include="..\PythonUtil.h" /> - <ClInclude Include="..\RubyUtil.h" /> - <ClInclude Include="..\Util.h" /> - <ClInclude Include="..\Checksum.h"> + <ClInclude Include="..\RubyUtil.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\CPlusPlusUtil.h" /> - <ClInclude Include="..\FileTracker.h" /> - <ClInclude Include="..\Grammar.h" /> - <ClInclude Include="..\GrammarUtil.h" /> - <ClInclude Include="..\JavaUtil.h" /> - <ClInclude Include="..\MD5.h" /> - <ClInclude Include="..\MD5I.h" /> - <ClInclude Include="..\Parser.h" /> - <ClInclude Include="..\PHPUtil.h" /> - <ClInclude Include="..\Preprocessor.h" /> - <ClInclude Include="..\PythonUtil.h" /> - <ClInclude Include="..\RubyUtil.h" /> - <ClInclude Include="..\Util.h" /> - <ClInclude Include="..\Checksum.h"> + <ClInclude Include="..\Util.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\CPlusPlusUtil.h" /> - <ClInclude Include="..\FileTracker.h" /> - <ClInclude Include="..\Grammar.h" /> - <ClInclude Include="..\GrammarUtil.h" /> - <ClInclude Include="..\JavaUtil.h" /> - <ClInclude Include="..\MD5.h" /> - <ClInclude Include="..\MD5I.h" /> - <ClInclude Include="..\Parser.h" /> - <ClInclude Include="..\PHPUtil.h" /> - <ClInclude Include="..\Preprocessor.h" /> - <ClInclude Include="..\PythonUtil.h" /> - <ClInclude Include="..\RubyUtil.h" /> - <ClInclude Include="..\Util.h" /> </ItemGroup> </Project>
\ No newline at end of file diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index fdabfd205e0..101512a6b09 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -8,7 +8,6 @@ #include <IceUtil/Functional.h> #include <IceUtil/Iterator.h> #include <IceUtil/StringUtil.h> -#include <Slice/Checksum.h> #include <Slice/FileTracker.h> #include <IceUtil/FileUtil.h> @@ -661,7 +660,7 @@ emitOpNameResult(IceUtilInternal::Output& H, const OperationPtr& p, int useWstri Slice::Gen::Gen(const string& base, const string& headerExtension, const string& sourceExtension, const vector<string>& extraHeaders, const string& include, const vector<string>& includePaths, const string& dllExport, const string& dir, - bool implCpp98, bool implCpp11, bool checksum, bool ice) : + bool implCpp98, bool implCpp11, bool ice) : _base(base), _headerExtension(headerExtension), _implHeaderExtension(headerExtension), @@ -673,7 +672,6 @@ Slice::Gen::Gen(const string& base, const string& headerExtension, const string& _dir(dir), _implCpp98(implCpp98), _implCpp11(implCpp11), - _checksum(checksum), _ice(ice) { for(vector<string>::iterator p = _includePaths.begin(); p != _includePaths.end(); ++p) @@ -702,38 +700,6 @@ Slice::Gen::~Gen() } void -Slice::Gen::generateChecksumMap(const UnitPtr& p) -{ - if(_checksum) - { - ChecksumMap map = createChecksums(p); - if(!map.empty()) - { - C << sp << nl << "namespace"; - C << nl << "{"; - C << sp << nl << "const char* iceSliceChecksums[] ="; - C << sb; - for(ChecksumMap::const_iterator q = map.begin(); q != map.end(); ++q) - { - C << nl << "\"" << q->first << "\", \""; - ostringstream str; - str.flags(ios_base::hex); - str.fill('0'); - for(vector<unsigned char>::const_iterator r = q->second.begin(); r != q->second.end(); ++r) - { - str << static_cast<int>(*r); - } - C << str.str() << "\","; - } - C << nl << "0"; - C << eb << ';'; - C << nl << "const IceInternal::SliceChecksumInit iceSliceChecksumInit(iceSliceChecksums);"; - C << sp << nl << "}"; - } - } -} - -void Slice::Gen::generate(const UnitPtr& p) { string file = p->topLevelFile(); @@ -944,11 +910,6 @@ Slice::Gen::generate(const UnitPtr& p) C << "\n#include <Ice/SlicedData.h>"; } - if(_checksum) - { - C << "\n#include <Ice/SliceChecksums.h>"; - } - C << "\n#include <IceUtil/PopDisableWarnings.h>"; StringList includes = p->includeFiles(); @@ -1088,8 +1049,6 @@ Slice::Gen::generate(const UnitPtr& p) Cpp11CompatibilityVisitor compatibilityVisitor(H, C, _dllExport); p->visit(&compatibilityVisitor, false); - - generateChecksumMap(p); } H << sp; H.zeroIndent(); @@ -1165,8 +1124,6 @@ Slice::Gen::generate(const UnitPtr& p) ImplVisitor implVisitor(implH, implC, _dllExport); p->visit(&implVisitor, false); } - - generateChecksumMap(p); } H << sp; diff --git a/cpp/src/slice2cpp/Gen.h b/cpp/src/slice2cpp/Gen.h index b9cae63c035..01a57f0c50f 100644 --- a/cpp/src/slice2cpp/Gen.h +++ b/cpp/src/slice2cpp/Gen.h @@ -25,12 +25,10 @@ public: const std::string&, bool, bool, - bool, bool); ~Gen(); void generate(const UnitPtr&); - void generateChecksumMap(const UnitPtr&); void closeOutput(); static int setUseWstring(ContainedPtr, std::list<int>&, int); @@ -69,7 +67,6 @@ private: std::string _dir; bool _implCpp98; bool _implCpp11; - bool _checksum; bool _ice; class TypesVisitor : private ::IceUtil::noncopyable, public ParserVisitor diff --git a/cpp/src/slice2cpp/Main.cpp b/cpp/src/slice2cpp/Main.cpp index fe5a95aa995..734f5ed3092 100644 --- a/cpp/src/slice2cpp/Main.cpp +++ b/cpp/src/slice2cpp/Main.cpp @@ -76,7 +76,6 @@ usage(const string& n) "--include-dir DIR Use DIR as the header include directory in source files.\n" "--impl-c++11 Generate sample implementations for C++11 mapping.\n" "--impl-c++98 Generate sample implementations for C++98 mapping.\n" - "--checksum Generate checksums for Slice definitions.\n" "--dll-export SYMBOL Use SYMBOL for DLL exports\n" " deprecated: use instead [[\"cpp:dll-export:SYMBOL\"]] metadata.\n" "--ice Allow reserved Ice prefix in Slice identifiers\n" @@ -111,7 +110,6 @@ compile(const vector<string>& argv) opts.addOpt("d", "debug"); opts.addOpt("", "ice"); opts.addOpt("", "underscore"); - opts.addOpt("", "checksum"); bool validate = find(argv.begin(), argv.end(), "--validate") != argv.end(); vector<string> args; @@ -190,8 +188,6 @@ compile(const vector<string>& argv) bool underscore = opts.isSet("underscore"); - bool checksum = opts.isSet("checksum"); - if(args.empty()) { consoleErr << argv[0] << ": error: no input file" << endl; @@ -335,7 +331,7 @@ compile(const vector<string>& argv) try { Gen gen(icecpp->getBaseName(), headerExtension, sourceExtension, extraHeaders, include, - includePaths, dllExport, output, implCpp98, implCpp11, checksum, ice); + includePaths, dllExport, output, implCpp98, implCpp11, ice); gen.generate(u); } catch(const Slice::FileException& ex) diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp index cbe3518cb94..2ba18346a34 100644 --- a/cpp/src/slice2cs/Gen.cpp +++ b/cpp/src/slice2cs/Gen.cpp @@ -16,7 +16,6 @@ #include <IceUtil/Iterator.h> #include <IceUtil/UUID.h> -#include <Slice/Checksum.h> #include <Slice/FileTracker.h> #include <Slice/Util.h> #include <DotNetNames.h> @@ -2066,51 +2065,6 @@ Slice::Gen::generateImplTie(const UnitPtr& p) } void -Slice::Gen::generateChecksums(const UnitPtr& u) -{ - ChecksumMap map = createChecksums(u); - if(!map.empty()) - { - string className = "X" + generateUUID(); - for(string::size_type pos = 1; pos < className.size(); ++pos) - { - if(!isalnum(static_cast<unsigned char>(className[pos]))) - { - className[pos] = '_'; - } - } - - _out << sp << nl << "namespace IceInternal"; - _out << sb; - _out << nl << "namespace SliceChecksums"; - _out << sb; - _out << nl << "[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"slice2cs\", \"" << ICE_STRING_VERSION - << "\")]"; - _out << nl << "public sealed class " << className; - _out << sb; - _out << nl << "public static global::System.Collections.Hashtable map = new global::System.Collections.Hashtable();"; - _out << sp << nl << "static " << className << "()"; - _out << sb; - for(ChecksumMap::const_iterator p = map.begin(); p != map.end(); ++p) - { - _out << nl << "map.Add(\"" << p->first << "\", \""; - ostringstream str; - str.flags(ios_base::hex); - str.fill('0'); - for(vector<unsigned char>::const_iterator q = p->second.begin(); q != p->second.end(); ++q) - { - str << static_cast<int>(*q); - } - _out << str.str() << "\");"; - } - _out << eb; - _out << eb << ';'; - _out << eb; - _out << eb; - } -} - -void Slice::Gen::closeOutput() { _out.close(); diff --git a/cpp/src/slice2cs/Gen.h b/cpp/src/slice2cs/Gen.h index 202998ea4ae..7bc78355a64 100644 --- a/cpp/src/slice2cs/Gen.h +++ b/cpp/src/slice2cs/Gen.h @@ -90,7 +90,6 @@ public: void generate(const UnitPtr&); void generateImpl(const UnitPtr&); void generateImplTie(const UnitPtr&); - void generateChecksums(const UnitPtr&); void closeOutput(); private: diff --git a/cpp/src/slice2cs/Main.cpp b/cpp/src/slice2cs/Main.cpp index a3826690354..0b01a6271ed 100644 --- a/cpp/src/slice2cs/Main.cpp +++ b/cpp/src/slice2cs/Main.cpp @@ -72,7 +72,6 @@ usage(const string& n) "--tie Generate tie classes.\n" "--impl Generate sample implementations.\n" "--impl-tie Generate sample tie implementations.\n" - "--checksum Generate checksums for Slice definitions.\n" "--ice Allow reserved Ice prefix in Slice identifiers\n" " deprecated: use instead [[\"ice-prefix\"]] metadata.\n" "--underscore Allow underscores in Slice identifiers\n" @@ -101,7 +100,6 @@ compile(const vector<string>& argv) opts.addOpt("d", "debug"); opts.addOpt("", "ice"); opts.addOpt("", "underscore"); - opts.addOpt("", "checksum"); bool validate = find(argv.begin(), argv.end(), "--validate") != argv.end(); vector<string> args; @@ -172,8 +170,6 @@ compile(const vector<string>& argv) bool underscore = opts.isSet("underscore"); - bool checksum = opts.isSet("checksum"); - if(args.empty()) { consoleErr << argv[0] << ": error: no input file" << endl; @@ -314,10 +310,6 @@ compile(const vector<string>& argv) { gen.generateImplTie(p); } - if(checksum) - { - gen.generateChecksums(p); - } } catch(const Slice::FileException& ex) { diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index 160ab5c238d..41299779644 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -3,7 +3,6 @@ // #include <Gen.h> -#include <Slice/Checksum.h> #include <Slice/Util.h> #include <IceUtil/Functional.h> #include <IceUtil/Iterator.h> @@ -2277,63 +2276,6 @@ Slice::Gen::generateImpl(const UnitPtr& p) p->visit(&implVisitor, false); } -void -Slice::Gen::writeChecksumClass(const string& checksumClass, const string& dir, const ChecksumMap& m) -{ - // - // Attempt to open the source file for the checksum class. - // - JavaOutput out; - out.openClass(checksumClass, dir); - - // - // Get the class name. - // - string className; - string::size_type pos = checksumClass.rfind('.'); - if(pos == string::npos) - { - className = checksumClass; - } - else - { - className = checksumClass.substr(pos + 1); - } - - // - // Emit the class. - // - out << sp; - out << nl << "/** @hidden */"; - out << nl << "public class " << className; - out << sb; - - // - // Use a static initializer to populate the checksum map. - // - out << sp << nl << "public static final java.util.Map<String, String> checksums;"; - out << sp << nl << "static"; - out << sb; - out << nl << "java.util.Map<String, String> map = new java.util.HashMap<>();"; - for(ChecksumMap::const_iterator p = m.begin(); p != m.end(); ++p) - { - out << nl << "map.put(\"" << p->first << "\", \""; - ostringstream str; - str.flags(ios_base::hex); - str.fill('0'); - for(vector<unsigned char>::const_iterator q = p->second.begin(); q != p->second.end(); ++q) - { - str << static_cast<int>(*q); - } - out << str.str() << "\");"; - } - out << nl << "checksums = java.util.Collections.unmodifiableMap(map);"; - - out << eb; - out << eb; - out << nl; -} - Slice::Gen::PackageVisitor::PackageVisitor(const string& dir) : JavaVisitor(dir) { diff --git a/cpp/src/slice2java/Gen.h b/cpp/src/slice2java/Gen.h index d9e286d1ad9..4a44bfff6c4 100644 --- a/cpp/src/slice2java/Gen.h +++ b/cpp/src/slice2java/Gen.h @@ -7,7 +7,6 @@ #include <Slice/Parser.h> #include <Slice/JavaUtil.h> -#include <Slice/Checksum.h> namespace Slice { @@ -121,8 +120,6 @@ public: void generate(const UnitPtr&); void generateImpl(const UnitPtr&); - static void writeChecksumClass(const std::string&, const std::string&, const ChecksumMap&); - private: std::string _base; diff --git a/cpp/src/slice2java/GenCompat.cpp b/cpp/src/slice2java/GenCompat.cpp index 0f390f01057..d3578fca4ca 100644 --- a/cpp/src/slice2java/GenCompat.cpp +++ b/cpp/src/slice2java/GenCompat.cpp @@ -3,7 +3,6 @@ // #include <GenCompat.h> -#include <Slice/Checksum.h> #include <Slice/Util.h> #include <IceUtil/Functional.h> #include <IceUtil/Iterator.h> @@ -2440,61 +2439,6 @@ Slice::GenCompat::generateImplTie(const UnitPtr& p) p->visit(&implTieVisitor, false); } -void -Slice::GenCompat::writeChecksumClass(const string& checksumClass, const string& dir, const ChecksumMap& m) -{ - // - // Attempt to open the source file for the checksum class. - // - JavaOutput out; - out.openClass(checksumClass, dir); - - // - // Get the class name. - // - string className; - string::size_type pos = checksumClass.rfind('.'); - if(pos == string::npos) - { - className = checksumClass; - } - else - { - className = checksumClass.substr(pos + 1); - } - - // - // Emit the class. - // - out << sp << nl << "public class " << className; - out << sb; - - // - // Use a static initializer to populate the checksum map. - // - out << sp << nl << "public static final java.util.Map<String, String> checksums;"; - out << sp << nl << "static"; - out << sb; - out << nl << "java.util.Map<String, String> map = new java.util.HashMap<String, String>();"; - for(ChecksumMap::const_iterator p = m.begin(); p != m.end(); ++p) - { - out << nl << "map.put(\"" << p->first << "\", \""; - ostringstream str; - str.flags(ios_base::hex); - str.fill('0'); - for(vector<unsigned char>::const_iterator q = p->second.begin(); q != p->second.end(); ++q) - { - str << static_cast<int>(*q); - } - out << str.str() << "\");"; - } - out << nl << "checksums = java.util.Collections.unmodifiableMap(map);"; - - out << eb; - out << eb; - out << nl; -} - Slice::GenCompat::OpsVisitor::OpsVisitor(const string& dir) : JavaCompatVisitor(dir) { diff --git a/cpp/src/slice2java/GenCompat.h b/cpp/src/slice2java/GenCompat.h index 8000f941d0d..4d10bb9c9ef 100644 --- a/cpp/src/slice2java/GenCompat.h +++ b/cpp/src/slice2java/GenCompat.h @@ -7,7 +7,6 @@ #include <Slice/Parser.h> #include <Slice/JavaUtil.h> -#include <Slice/Checksum.h> namespace Slice { @@ -133,8 +132,6 @@ public: void generateImpl(const UnitPtr&); void generateImplTie(const UnitPtr&); - static void writeChecksumClass(const std::string&, const std::string&, const ChecksumMap&); - private: std::string _base; diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp index a62eb17ed25..2474e0bded0 100644 --- a/cpp/src/slice2java/Main.cpp +++ b/cpp/src/slice2java/Main.cpp @@ -75,7 +75,6 @@ usage(const string& n) "--tie Generate tie classes. (Java Compat Only)\n" "--impl Generate sample implementations.\n" "--impl-tie Generate sample tie implementations. (Java Compat Only)\n" - "--checksum CLASS Generate checksums for Slice definitions into CLASS.\n" "--meta META Define file metadata directive META.\n" "--list-generated Emit list of generated files in XML format.\n" "--ice Allow reserved Ice prefix in Slice identifiers\n" @@ -107,7 +106,6 @@ compile(const vector<string>& argv) opts.addOpt("d", "debug"); opts.addOpt("", "ice"); opts.addOpt("", "underscore"); - opts.addOpt("", "checksum", IceUtilInternal::Options::NeedArg); opts.addOpt("", "meta", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat); opts.addOpt("", "compat"); @@ -178,8 +176,6 @@ compile(const vector<string>& argv) bool underscore = opts.isSet("underscore"); - string checksumClass = opts.optArg("checksum"); - bool listGenerated = opts.isSet("list-generated"); StringList globalMetadata; @@ -235,8 +231,6 @@ compile(const vector<string>& argv) int status = EXIT_SUCCESS; - ChecksumMap checksums; - IceUtil::CtrlCHandler ctrlCHandler; ctrlCHandler.setCallback(interruptedCallback); @@ -366,15 +360,6 @@ compile(const vector<string>& argv) gen.generateImpl(p); } } - - if(!checksumClass.empty()) - { - // - // Calculate checksums for the Slice definitions in the unit. - // - ChecksumMap m = createChecksums(p); - copy(m.begin(), m.end(), inserter(checksums, checksums.begin())); - } } catch(const Slice::FileException& ex) { @@ -417,23 +402,6 @@ compile(const vector<string>& argv) writeDependencies(os.str(), dependFile); } - if(status == EXIT_SUCCESS && !checksumClass.empty() && !dependxml) - { - try - { - Gen::writeChecksumClass(checksumClass, output, checksums); - } - catch(const Slice::FileException& ex) - { - // - // If a file could not be created, then cleanup any created files. - // - FileTracker::instance()->cleanup(); - consoleErr << argv[0] << ": error: " << ex.reason() << endl; - return EXIT_FAILURE; - } - } - if(listGenerated) { FileTracker::instance()->dumpxml(); diff --git a/cpp/src/slice2js/Gen.cpp b/cpp/src/slice2js/Gen.cpp index c85f0393748..2dbfcf090c8 100644 --- a/cpp/src/slice2js/Gen.cpp +++ b/cpp/src/slice2js/Gen.cpp @@ -8,7 +8,6 @@ #include <Gen.h> #include <IceUtil/Iterator.h> #include <IceUtil/UUID.h> -#include <Slice/Checksum.h> #include <Slice/FileTracker.h> #include <Slice/Util.h> diff --git a/cpp/src/slice2objc/Gen.cpp b/cpp/src/slice2objc/Gen.cpp index c11a95535cd..196d967d361 100644 --- a/cpp/src/slice2objc/Gen.cpp +++ b/cpp/src/slice2objc/Gen.cpp @@ -14,7 +14,6 @@ #endif #include <IceUtil/Iterator.h> #include <IceUtil/UUID.h> -#include <Slice/Checksum.h> #include <Slice/FileTracker.h> #include <Slice/Util.h> #include <string.h> diff --git a/cpp/src/slice2php/Main.cpp b/cpp/src/slice2php/Main.cpp index 89693422fc6..1fc644ae23c 100644 --- a/cpp/src/slice2php/Main.cpp +++ b/cpp/src/slice2php/Main.cpp @@ -11,7 +11,6 @@ #include <IceUtil/Mutex.h> #include <IceUtil/MutexPtrLock.h> #include <IceUtil/ConsoleUtil.h> -#include <Slice/Checksum.h> #include <Slice/Preprocessor.h> #include <Slice/FileTracker.h> #include <Slice/PHPUtil.h> @@ -1484,7 +1483,7 @@ CodeVisitor::collectExceptionMembers(const ExceptionPtr& p, MemberInfoList& allM } static void -generate(const UnitPtr& un, bool all, bool checksum, bool ns, const vector<string>& includePaths, Output& out) +generate(const UnitPtr& un, bool all, bool ns, const vector<string>& includePaths, Output& out) { if(!all) { @@ -1518,55 +1517,6 @@ generate(const UnitPtr& un, bool all, bool checksum, bool ns, const vector<strin CodeVisitor codeVisitor(out, ns); un->visit(&codeVisitor, false); - if(checksum) - { - ChecksumMap checksums = createChecksums(un); - if(!checksums.empty()) - { - out << sp; - if(ns) - { - out << "namespace"; // Global namespace. - out << sb; - out << "new Ice\\SliceChecksumInit(array("; - for(ChecksumMap::const_iterator p = checksums.begin(); p != checksums.end();) - { - out << nl << "\"" << p->first << "\" => \""; - ostringstream str; - str.flags(ios_base::hex); - str.fill('0'); - for(vector<unsigned char>::const_iterator q = p->second.begin(); q != p->second.end(); ++q) - { - str << static_cast<int>(*q); - } - out << str.str() << "\""; - if(++p != checksums.end()) - { - out << ","; - } - } - out << "));"; - out << eb; - } - else - { - out << nl << "global $Ice_sliceChecksums;"; - for(ChecksumMap::const_iterator p = checksums.begin(); p != checksums.end(); ++p) - { - out << nl << "$Ice_sliceChecksums[\"" << p->first << "\"] = \""; - ostringstream str; - str.flags(ios_base::hex); - str.fill('0'); - for(vector<unsigned char>::const_iterator q = p->second.begin(); q != p->second.end(); ++q) - { - str << static_cast<int>(*q); - } - out << str.str() << "\";"; - } - } - } - } - out << nl; // Trailing newline. } @@ -1640,7 +1590,6 @@ usage(const string& n) "--validate Validate command line options.\n" "--all Generate code for Slice definitions in included files.\n" "--no-namespace Do not use PHP namespaces (deprecated).\n" - "--checksum Generate checksums for Slice definitions.\n" "--ice Allow reserved Ice prefix in Slice identifiers\n" " deprecated: use instead [[\"ice-prefix\"]] metadata.\n" "--underscore Allow underscores in Slice identifiers\n" @@ -1667,7 +1616,6 @@ compile(const vector<string>& argv) opts.addOpt("", "ice"); opts.addOpt("", "underscore"); opts.addOpt("", "all"); - opts.addOpt("", "checksum"); opts.addOpt("n", "no-namespace"); bool validate = find(argv.begin(), argv.end(), "--validate") != argv.end(); @@ -1736,8 +1684,6 @@ compile(const vector<string>& argv) bool all = opts.isSet("all"); - bool checksum = opts.isSet("checksum"); - bool ns = !opts.isSet("no-namespace"); if(args.empty()) @@ -1891,7 +1837,7 @@ compile(const vector<string>& argv) // // Generate the PHP mapping. // - generate(u, all, checksum, ns, includePaths, out); + generate(u, all, ns, includePaths, out); out << "?>\n"; out.close(); diff --git a/cpp/test/Ice/checksum/AllTests.cpp b/cpp/test/Ice/checksum/AllTests.cpp deleted file mode 100644 index 1d76abfb2ec..00000000000 --- a/cpp/test/Ice/checksum/AllTests.cpp +++ /dev/null @@ -1,70 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#include <Ice/Ice.h> -#include <TestHelper.h> -#include <Test.h> - -using namespace std; - -Test::ChecksumPrxPtr -allTests(Test::TestHelper* helper) -{ - Ice::CommunicatorPtr communicator = helper->communicator(); - string ref = "test:" + helper->getTestEndpoint(); - Ice::ObjectPrxPtr base = communicator->stringToProxy(ref); - test(base); - - Test::ChecksumPrxPtr checksum = ICE_CHECKED_CAST(Test::ChecksumPrx, base); - test(checksum); - - Ice::SliceChecksumDict::const_iterator p; - - // - // Verify that no checksums are present for local types. - // - cout << "testing checksums... " << flush; - Ice::SliceChecksumDict localChecksums = Ice::sliceChecksums(); - test(!localChecksums.empty()); - for(p = localChecksums.begin(); p != localChecksums.end(); ++p) - { - string::size_type pos = p->first.find("Local"); - test(pos == string::npos); - } - - // - // Get server's Slice checksums. - // - Ice::SliceChecksumDict d = checksum->getSliceChecksums(); - - // - // Compare the checksums. For a type FooN whose name ends in an integer N, - // we assume that the server's type does not change for N = 1, and does - // change for N > 1. - // - for(p = d.begin(); p != d.end(); ++p) - { - int n = 0; - string::size_type pos = p->first.find_first_of("0123456789"); - if(pos != string::npos) - { - n = atoi(p->first.c_str() + pos); - } - - Ice::SliceChecksumDict::const_iterator q = localChecksums.find(p->first); - test(q != localChecksums.end()); - - if(n <= 1) - { - test(q->second == p->second); - } - else - { - test(q->second != p->second); - } - } - cout << "ok" << endl; - - return checksum; -} diff --git a/cpp/test/Ice/checksum/Client.cpp b/cpp/test/Ice/checksum/Client.cpp deleted file mode 100644 index 74e136c8a7b..00000000000 --- a/cpp/test/Ice/checksum/Client.cpp +++ /dev/null @@ -1,27 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#include <Ice/Ice.h> -#include <TestHelper.h> -#include <Test.h> - -using namespace std; - -class Client : public Test::TestHelper -{ -public: - - void run(int, char**); -}; - -void -Client::run(int argc, char** argv) -{ - Ice::CommunicatorHolder communicator = initialize(argc, argv); - Test::ChecksumPrxPtr allTests(Test::TestHelper*); - Test::ChecksumPrxPtr checksum = allTests(this); - checksum->shutdown(); -} - -DEFINE_TEST(Client) diff --git a/cpp/test/Ice/checksum/ClientTypes.ice b/cpp/test/Ice/checksum/ClientTypes.ice deleted file mode 100644 index 0c4052d76b0..00000000000 --- a/cpp/test/Ice/checksum/ClientTypes.ice +++ /dev/null @@ -1,609 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#pragma once - -module Test -{ - -// -// TEST: Same -// -const int IntConst1 = 100; - -// -// TEST: Value changed -// -const int IntConst2 = 100; - -// -// TEST: Type changed -// -const int IntConst3 = 100; - -// -// TEST: Same -// -enum Enum1 { Enum11, Enum12, Enum13 } - -// -// TEST: Add enumerator -// -enum Enum2 { Enum21, Enum22, Enum23 } - -// -// TEST: Remove enumerator -// -enum Enum3 { Enum31, Enum32, Enum33 } - -// -// TEST: Change to a different type -// -enum Enum4 { Enum41, Enum42, Enum43 } - -// -// TEST: Enum with explicit values. -// -enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 } - -// -// TEST: Enum with same explicit values, different order. -// -enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit12 = 2, EnumExplicit13 = 3 } - -// -// TEST: Enum with different explicit values. -// -enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 2, EnumExplicit23 = 3} - -// -// TEST: Enum with explicit values, removed enumerator. -// -enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2, EnumExplicit33 = 3} - -// -// TEST: Same -// -sequence<int> Sequence1; - -// -// TEST: Change sequence type -// -sequence<int> Sequence2; - -// -// TEST: Change to a different type -// -sequence<int> Sequence3; - -// -// TEST: Same -// -dictionary<string, int> Dictionary1; - -// -// TEST: Change key type -// -dictionary<string, int> Dictionary2; - -// -// TEST: Change value type -// -dictionary<string, int> Dictionary3; - -// -// TEST: Change to a different type -// -dictionary<string, int> Dictionary4; - -// -// TEST: Same -// -struct Struct1 -{ - string str; - bool b; -} - -// -// TEST: Add member -// -struct Struct2 -{ - string str; - bool b; -} - -// -// TEST: Change member type -// -struct Struct3 -{ - string str; - bool b; -} - -// -// TEST: Remove member -// -struct Struct4 -{ - string str; - bool b; -} - -// -// TEST: Change to a different type -// -struct Struct5 -{ - string str; - bool b; -} - -// -// TEST: Same -// -interface Interface1 -{ -} - -// -// TEST: Change interface to class -// -interface Interface2 -{ -} - -// -// TEST: Add base interface -// -interface Interface3 -{ -} - -// -// TEST: Add operation -// -interface Interface4 -{ -} - -// -// TEST: Same -// -class EmptyClass1 -{ -} - -// -// TEST: Add data member -// -class EmptyClass2 -{ -} - -// -// TEST: Add operation -// -class EmptyClass3 -{ -} - -// -// TEST: Add base class -// -class EmptyClass4 -{ -} - -// -// TEST: Add interface -// -class EmptyClass5 -{ -} - -// -// TEST: Same -// -class SimpleClass1 -{ - string str; - float f; -} - -// -// TEST: Add operation -// -class SimpleClass2 -{ - string str; - float f; -} - -// -// TEST: Rename member -// -class SimpleClass3 -{ - string str; - float f; -} - -// -// TEST: Add member -// -class SimpleClass4 -{ - string str; - float f; -} - -// -// TEST: Remove member -// -class SimpleClass5 -{ - string str; - float f; -} - -// -// TEST: Reorder members -// -class SimpleClass6 -{ - string str; - float f; -} - -// -// TEST: Change member type -// -class SimpleClass7 -{ - string str; - float f; -} - -// -// TEST: Same -// -exception Exception1 -{ - string str; - bool b; -} - -// -// TEST: Add member -// -exception Exception2 -{ - string str; - bool b; -} - -// -// TEST: Change member type -// -exception Exception3 -{ - string str; - bool b; -} - -// -// TEST: Remove member -// -exception Exception4 -{ - string str; - bool b; -} - -// -// TEST: Add base exception -// -exception Exception5 -{ -} - -// -// TEST: Change to a different type -// -exception Exception6 -{ - string str; - bool b; -} - -// -// TEST: Exception with optional members. -// -exception OptionalEx0 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Exception with optional members, different order, same tags. -// -exception OptionalEx1 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Exception with different optional members. -// -exception OptionalEx2 -{ - string firstName; - string secondName; - optional(1) string emailAddress; -} - -// -// TEST: Exception with different optional members. -// -exception OptionalEx3 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Exception with optional members using different tags. -// -exception OptionalEx4 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Same -// -interface BaseInterface1 -{ - void baseOp1(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Change return type -// -interface BaseInterface2 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add parameter -// -interface BaseInterface3 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add exception -// -interface BaseInterface4 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Change out parameter to in parameter -// -interface BaseInterface5 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Remove parameter -// -interface BaseInterface6 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Remove exception -// -interface BaseInterface7 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Remove operation -// -interface BaseInterface8 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add base interface -// -interface BaseInterface9 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Class with compact id -// -class Compact1(1) -{ - int id; -} - -// -// TEST: Derived from class with compact id -// -class Derived1 extends Compact1 -{ -} - -// -// TEST: Same class names but different compact id -// -class Compact2(2) -{ - int id; -} - -// -// TEST: Class with optional members. -// -class Optional0 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Class with optional members, different order, same tags. -// -class Optional1 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Class with different optional members. -// -class Optional2 -{ - string firstName; - string secondName; - optional(1) string emailAddress; -} - -// -// TEST: Class with different optional members. -// -class Optional3 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Class with optional members using different tags. -// -class Optional4 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Interface with optional parameters. -// -interface OptionalParameters0 -{ - void op1(string firstName, optional(1) string secondName, - optional(2) string emailAddress); -} - -// -// TEST: Interface with optional parameters, different order. -// -interface OptionalParameters1 -{ - void op1(string firstName, optional(1) string secondName, - optional(2) string emailAddress); -} - -// -// TEST: Interface with optional parameters, different tags. -// -interface OptionalParameters2 -{ - void op1(string firstName, optional(1) string emailAddress, - optional(2) string secondName); -} - -// -// TEST: Interface with different optional parameters. -// -interface OptionalParameters3 -{ - void op1(string firstName, optional(1) string emailAddress, - string secondName); -} - -// -// TEST: Interface with optional return type. -// -interface OptionalReturn0 -{ - optional(1) int op(); -} - -// -// TEST: Interface that changes optional return type. -// -interface OptionalReturn2 -{ - optional(1) int op(); -} - -// -// TEST: Local -// -local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 } - -// -// TEST: Local -// -local sequence<string> LocalSequence; - -// -// TEST: Local -// -local dictionary<string, string> LocalDictionary; - -// -// TEST: Local -// -local struct LocalStruct -{ - string str; -} - -// -// TEST: Local -// -local class LocalClass -{ -} - -} diff --git a/cpp/test/Ice/checksum/Makefile.mk b/cpp/test/Ice/checksum/Makefile.mk deleted file mode 100644 index c4f9599b6b5..00000000000 --- a/cpp/test/Ice/checksum/Makefile.mk +++ /dev/null @@ -1,9 +0,0 @@ -# -# Copyright (c) ZeroC, Inc. All rights reserved. -# - -$(test)_sliceflags = --checksum -$(test)_client_sources = $(test-client-sources) ClientTypes.ice -$(test)_server_sources = $(test-server-sources) ServerTypes.ice - -tests += $(test) diff --git a/cpp/test/Ice/checksum/Server.cpp b/cpp/test/Ice/checksum/Server.cpp deleted file mode 100644 index ebefed26bf4..00000000000 --- a/cpp/test/Ice/checksum/Server.cpp +++ /dev/null @@ -1,30 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#include <Ice/Ice.h> -#include <TestI.h> -#include <TestHelper.h> - -using namespace std; - -class Server : public Test::TestHelper -{ -public: - - void run(int, char**); -}; - -void -Server::run(int argc, char** argv) -{ - Ice::CommunicatorHolder communicator = initialize(argc, argv); - communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint() + " -t 10000"); - Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(ICE_MAKE_SHARED(ChecksumI), Ice::stringToIdentity("test")); - adapter->activate(); - serverReady(); - communicator->waitForShutdown(); -} - -DEFINE_TEST(Server) diff --git a/cpp/test/Ice/checksum/ServerTypes.ice b/cpp/test/Ice/checksum/ServerTypes.ice deleted file mode 100644 index 91ebef57d43..00000000000 --- a/cpp/test/Ice/checksum/ServerTypes.ice +++ /dev/null @@ -1,608 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#pragma once - -[["suppress-warning:deprecated"]] // For classes with operations - -module Test -{ - -// -// TEST: Same -// -const int IntConst1 = 100; - -// -// TEST: Value changed -// -const int IntConst2 = 1000; - -// -// TEST: Type changed -// -const short IntConst3 = 100; - -// -// TEST: Same -// -enum Enum1 { Enum11, Enum12, Enum13 } - -// -// TEST: Add enumerator -// -enum Enum2 { Enum21, Enum22, Enum23, Enum24 } - -// -// TEST: Remove enumerator -// -enum Enum3 { Enum32, Enum33 } - -// -// TEST: Enum with explicit values. -// -enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 } - -// -// TEST: Enum with same explicit values, different order. -// -enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit13 = 3, EnumExplicit12 = 2 } - -// -// TEST: Enum with different explicit values. -// -enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 3, EnumExplicit23 } - -// -// TEST: Enum with explicit values, removed enumerator. -// -enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2} - -// -// TEST: Change to a different type -// -class Enum4 {} - -// -// TEST: Same -// -sequence<int> Sequence1; - -// -// TEST: Change sequence type -// -sequence<short> Sequence2; - -// -// TEST: Change to a different type -// -class Sequence3 {} - -// -// TEST: Same -// -dictionary<string, int> Dictionary1; - -// -// TEST: Change key type -// -dictionary<long, int> Dictionary2; - -// -// TEST: Change value type -// -dictionary<string, bool> Dictionary3; - -// -// TEST: Change to a different type -// -class Dictionary4 {} - -// -// TEST: Same -// -struct Struct1 -{ - string str; - bool b; -} - -// -// TEST: Add member -// -struct Struct2 -{ - string str; - bool b; - float f; -} - -// -// TEST: Change member type -// -struct Struct3 -{ - string str; - double b; -} - -// -// TEST: Remove member -// -struct Struct4 -{ - bool b; -} - -// -// TEST: Change to a different type -// -class Struct5 {} - -// -// TEST: Same -// -interface Interface1 -{ -} - -// -// TEST: Change interface to class -// -class Interface2 -{ -} - -// -// TEST: Add base interface -// -interface Interface3 extends Interface1 -{ -} - -// -// TEST: Add operation -// -interface Interface4 -{ - void opInterface4(); -} - -// -// TEST: Same -// -class EmptyClass1 -{ -} - -// -// TEST: Add data member -// -class EmptyClass2 -{ - double d; -} - -// -// TEST: Add operation -// -class EmptyClass3 -{ - void newOp(); -} - -// -// TEST: Add base class -// -class EmptyClass4 extends EmptyClass1 -{ -} - -// -// TEST: Add interface -// -class EmptyClass5 implements Interface1 -{ -} - -// -// TEST: Same -// -class SimpleClass1 -{ - string str; - float f; -} - -// -// TEST: Add operation -// -class SimpleClass2 -{ - string str; - float f; - void newOp(); -} - -// -// TEST: Rename member -// -class SimpleClass3 -{ - string str; - float g; -} - -// -// TEST: Add member -// -class SimpleClass4 -{ - string str; - float f; - bool b; -} - -// -// TEST: Remove member -// -class SimpleClass5 -{ - string str; -} - -// -// TEST: Reorder members -// -class SimpleClass6 -{ - float f; - string str; -} - -// -// TEST: Change member type -// -class SimpleClass7 -{ - string str; - double f; -} - -// -// TEST: Same -// -exception Exception1 -{ - string str; - bool b; -} - -// -// TEST: Add member -// -exception Exception2 -{ - string str; - bool b; - float f; -} - -// -// TEST: Change member type -// -exception Exception3 -{ - string str; - double b; -} - -// -// TEST: Remove member -// -exception Exception4 -{ - bool b; -} - -// -// TEST: Add base exception -// -exception Exception5 extends Exception1 -{ -} - -// -// TEST: Change to a different type -// -class Exception6 {} - -// -// TEST: Exception with optional members. -// -exception OptionalEx0 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Exception with optional members, different order, same tags. -// -exception OptionalEx1 -{ - string firstName; - optional(2) string emailAddress; - optional(1) string secondName; -} - -// -// TEST: Exception with different optional members. -// -exception OptionalEx2 -{ - string firstName; - optional(1) string secondName; - string emailAddress; -} - -// -// TEST: Exception with different optional members. -// -exception OptionalEx3 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; - optional(3) string phoneNumber; -} - -// -// TEST: Exception with optional members using different tags. -// -exception OptionalEx4 -{ - string firstName; - optional(2) string secondName; - optional(1) string emailAddress; -} - -// -// TEST: Same -// -interface BaseInterface1 -{ - void baseOp1(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Change return type -// -interface BaseInterface2 -{ - int baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add parameter -// -interface BaseInterface3 -{ - void baseOp(Object o); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add exception -// -interface BaseInterface4 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1, Exception2; -} - -// -// TEST: Change out parameter to in parameter -// -interface BaseInterface5 -{ - void baseOp(); - void baseOp2(int i, string s) throws Exception1; -} - -// -// TEST: Remove parameter -// -interface BaseInterface6 -{ - void baseOp(); - void baseOp2(out string s) throws Exception1; -} - -// -// TEST: Remove exception -// -interface BaseInterface7 -{ - void baseOp(); - void baseOp2(int i, out string s); -} - -// -// TEST: Remove operation -// -interface BaseInterface8 -{ - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add base interface -// -interface BaseInterface9 extends Interface1 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Class with compact id -// -class Compact1(1) -{ - int id; -} - -// -// TEST: Derived from class with compact id -// -class Derived1 extends Compact1 -{ -} - -// -// TEST: Same class names but different compact id -// -class Compact2(3) -{ - int id; -} - -// -// TEST: Class with optional members. -// -class Optional0 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Class with optional members, different order, same tags. -// -class Optional1 -{ - string firstName; - optional(2) string emailAddress; - optional(1) string secondName; -} - -// -// TEST: Class with different optional members. -// -class Optional2 -{ - string firstName; - optional(1) string secondName; - string emailAddress; -} - -// -// TEST: Class with different optional members. -// -class Optional3 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; - optional(3) string phoneNumber; -} - -// -// TEST: Class with optional members using different tags. -// -class Optional4 -{ - string firstName; - optional(2) string secondName; - optional(1) string emailAddress; -} - -// -// TEST: Interface with optional parameters. -// -interface OptionalParameters0 -{ - void op1(string firstName, optional(1) string secondName, - optional(2) string emailAddress); -} - -// -// TEST: Interface with optional parameters, different order. -// -interface OptionalParameters1 -{ - void op1(string firstName, optional(2) string emailAddress, - optional(1) string secondName); -} - -// -// TEST: Interface with optional parameters, different tags. -// -interface OptionalParameters2 -{ - void op1(string firstName, optional(2) string emailAddress, - optional(1) string secondName); -} - -// -// TEST: Interface with different optional parameters. -// -interface OptionalParameters3 -{ - void op1(string firstName, string emailAddress, - optional(1) string secondName); -} - -// -// TEST: Interface with optional return type. -// -interface OptionalReturn0 -{ - optional(1) int op(); -} - -// -// TEST: Interface that changes optional return type. -// -interface OptionalReturn2 -{ - int op(); -} - -// -// TEST: Local -// -local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 } - -// -// TEST: Local -// -local sequence<string> LocalSequence; - -// -// TEST: Local -// -local dictionary<string, string> LocalDictionary; - -// -// TEST: Local -// -local struct LocalStruct -{ - string str; -} - -// -// TEST: Local -// -local class LocalClass -{ -} - -} diff --git a/cpp/test/Ice/checksum/Test.ice b/cpp/test/Ice/checksum/Test.ice deleted file mode 100644 index eef4fe6b1e3..00000000000 --- a/cpp/test/Ice/checksum/Test.ice +++ /dev/null @@ -1,19 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#pragma once - -#include <Ice/SliceChecksumDict.ice> - -module Test -{ - -interface Checksum -{ - ["cpp:const"] idempotent Ice::SliceChecksumDict getSliceChecksums(); - - void shutdown(); -} - -} diff --git a/cpp/test/Ice/checksum/TestI.cpp b/cpp/test/Ice/checksum/TestI.cpp deleted file mode 100644 index 90d251dd42a..00000000000 --- a/cpp/test/Ice/checksum/TestI.cpp +++ /dev/null @@ -1,23 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#include <Ice/Ice.h> -#include <Ice/SliceChecksums.h> -#include <TestI.h> - -ChecksumI::ChecksumI() -{ -} - -Ice::SliceChecksumDict -ChecksumI::getSliceChecksums(const Ice::Current&) const -{ - return Ice::sliceChecksums(); -} - -void -ChecksumI::shutdown(const Ice::Current& current) -{ - current.adapter->getCommunicator()->shutdown(); -} diff --git a/cpp/test/Ice/checksum/TestI.h b/cpp/test/Ice/checksum/TestI.h deleted file mode 100644 index 8f9fdbb9de5..00000000000 --- a/cpp/test/Ice/checksum/TestI.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#ifndef TEST_I_H -#define TEST_I_H - -#include <Test.h> - -class ChecksumI : public Test::Checksum -{ -public: - - ChecksumI(); - - virtual Ice::SliceChecksumDict getSliceChecksums(const Ice::Current&) const; - - virtual void shutdown(const Ice::Current&); -}; - -#endif diff --git a/cpp/test/Ice/checksum/msbuild/client/client.vcxproj b/cpp/test/Ice/checksum/msbuild/client/client.vcxproj deleted file mode 100644 index 35522ed91e4..00000000000 --- a/cpp/test/Ice/checksum/msbuild/client/client.vcxproj +++ /dev/null @@ -1,521 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Cpp11-Debug|Win32"> - <Configuration>Cpp11-Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Cpp11-Debug|x64"> - <Configuration>Cpp11-Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Cpp11-Release|Win32"> - <Configuration>Cpp11-Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Cpp11-Release|x64"> - <Configuration>Cpp11-Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{59CA92B5-4500-43D3-B8A8-A69268D9BE08}</ProjectGuid> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup> - <DefaultPlatformToolset Condition="'$(VisualStudioVersion)' == '10.0' And '$(DefaultPlatformToolset)' == ''">v100</DefaultPlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\msbuild\ice.test.props" /> - <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets')" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'"> - <ClCompile> - <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'"> - <ClCompile> - <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'"> - <ClCompile> - <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'"> - <ClCompile> - <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Label="IceBuilder"> - <SliceCompile> - <AdditionalOptions>--checksum</AdditionalOptions> - </SliceCompile> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="..\..\AllTests.cpp" /> - <ClCompile Include="..\..\Client.cpp" /> - <ClCompile Include="Win32\Cpp11-Debug\ClientTypes.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\ClientTypes.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="Win32\Cpp11-Debug\Test.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\Test.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="Win32\Cpp11-Release\ClientTypes.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\ClientTypes.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="Win32\Cpp11-Release\Test.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\Test.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="Win32\Debug\ClientTypes.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\ClientTypes.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="Win32\Debug\Test.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\Test.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="Win32\Release\ClientTypes.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\ClientTypes.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="Win32\Release\Test.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\Test.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="x64\Cpp11-Debug\ClientTypes.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\ClientTypes.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="x64\Cpp11-Debug\Test.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\Test.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="x64\Cpp11-Release\ClientTypes.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\ClientTypes.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="x64\Cpp11-Release\Test.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\Test.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="x64\Debug\ClientTypes.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\ClientTypes.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="x64\Debug\Test.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\Test.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="x64\Release\ClientTypes.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\ClientTypes.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="x64\Release\Test.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\Test.ice</SliceCompileSource> - </ClCompile> - </ItemGroup> - <ItemGroup> - <SliceCompile Include="..\..\ClientTypes.ice" /> - <SliceCompile Include="..\..\Test.ice" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="Win32\Cpp11-Debug\ClientTypes.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\ClientTypes.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="Win32\Cpp11-Debug\Test.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\Test.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="Win32\Cpp11-Release\ClientTypes.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\ClientTypes.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="Win32\Cpp11-Release\Test.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\Test.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="Win32\Debug\ClientTypes.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\ClientTypes.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="Win32\Debug\Test.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\Test.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="Win32\Release\ClientTypes.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\ClientTypes.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="Win32\Release\Test.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\Test.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="x64\Cpp11-Debug\ClientTypes.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\ClientTypes.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="x64\Cpp11-Debug\Test.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\Test.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="x64\Cpp11-Release\ClientTypes.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\ClientTypes.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="x64\Cpp11-Release\Test.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\Test.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="x64\Debug\ClientTypes.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\ClientTypes.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="x64\Debug\Test.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\Test.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="x64\Release\ClientTypes.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\ClientTypes.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="x64\Release\Test.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\Test.ice</SliceCompileSource> - </ClInclude> - </ItemGroup> - <ItemGroup> - <None Include="packages.config" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> - <PropertyGroup> - <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> - </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets'))" /> - </Target> -</Project>
\ No newline at end of file diff --git a/cpp/test/Ice/checksum/msbuild/client/client.vcxproj.filters b/cpp/test/Ice/checksum/msbuild/client/client.vcxproj.filters deleted file mode 100644 index 629729ed44d..00000000000 --- a/cpp/test/Ice/checksum/msbuild/client/client.vcxproj.filters +++ /dev/null @@ -1,192 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <ClCompile Include="x64\Cpp11-Debug\Test.cpp"> - <Filter>Source Files\x64\Cpp11-Debug</Filter> - </ClCompile> - <ClCompile Include="Win32\Cpp11-Debug\Test.cpp"> - <Filter>Source Files\Win32\Cpp11-Debug</Filter> - </ClCompile> - <ClCompile Include="x64\Debug\Test.cpp"> - <Filter>Source Files\x64\Debug</Filter> - </ClCompile> - <ClCompile Include="Win32\Debug\Test.cpp"> - <Filter>Source Files\Win32\Debug</Filter> - </ClCompile> - <ClCompile Include="x64\Release\Test.cpp"> - <Filter>Source Files\x64\Release</Filter> - </ClCompile> - <ClCompile Include="Win32\Release\Test.cpp"> - <Filter>Source Files\Win32\Release</Filter> - </ClCompile> - <ClCompile Include="x64\Cpp11-Release\Test.cpp"> - <Filter>Source Files\x64\Cpp11-Release</Filter> - </ClCompile> - <ClCompile Include="Win32\Cpp11-Release\Test.cpp"> - <Filter>Source Files\Win32\Cpp11-Release</Filter> - </ClCompile> - <ClCompile Include="x64\Cpp11-Debug\ClientTypes.cpp"> - <Filter>Source Files\x64\Cpp11-Debug</Filter> - </ClCompile> - <ClCompile Include="Win32\Cpp11-Debug\ClientTypes.cpp"> - <Filter>Source Files\Win32\Cpp11-Debug</Filter> - </ClCompile> - <ClCompile Include="x64\Debug\ClientTypes.cpp"> - <Filter>Source Files\x64\Debug</Filter> - </ClCompile> - <ClCompile Include="Win32\Debug\ClientTypes.cpp"> - <Filter>Source Files\Win32\Debug</Filter> - </ClCompile> - <ClCompile Include="x64\Release\ClientTypes.cpp"> - <Filter>Source Files\x64\Release</Filter> - </ClCompile> - <ClCompile Include="Win32\Release\ClientTypes.cpp"> - <Filter>Source Files\Win32\Release</Filter> - </ClCompile> - <ClCompile Include="x64\Cpp11-Release\ClientTypes.cpp"> - <Filter>Source Files\x64\Cpp11-Release</Filter> - </ClCompile> - <ClCompile Include="Win32\Cpp11-Release\ClientTypes.cpp"> - <Filter>Source Files\Win32\Cpp11-Release</Filter> - </ClCompile> - <ClCompile Include="..\..\AllTests.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\Client.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - </ItemGroup> - <ItemGroup> - <Filter Include="Header Files"> - <UniqueIdentifier>{05d6e14c-a5ff-4933-96c1-08be8c3517ea}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files"> - <UniqueIdentifier>{44ef11ea-da16-44e5-afdb-6fddc93115cc}</UniqueIdentifier> - </Filter> - <Filter Include="Slice Files"> - <UniqueIdentifier>{e9b70026-1724-4054-999b-b95fa460889f}</UniqueIdentifier> - <Extensions>ice</Extensions> - </Filter> - <Filter Include="Source Files\x64"> - <UniqueIdentifier>{635917ae-7a49-479c-b21c-a60c13b72f54}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\x64\Cpp11-Debug"> - <UniqueIdentifier>{bb5799d1-8458-466c-b7d8-e0b962d2e426}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\x64"> - <UniqueIdentifier>{434a357d-c2de-4b04-889a-5edd2d15a793}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\x64\Cpp11-Debug"> - <UniqueIdentifier>{ae96b6f3-aed3-4602-af35-e90a8f2b8ec2}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\Win32"> - <UniqueIdentifier>{60b451c8-d968-4d08-a7fb-e7bb6a2767fa}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\Win32\Cpp11-Debug"> - <UniqueIdentifier>{89202ba5-f656-47e5-8909-77a938da8078}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\Win32"> - <UniqueIdentifier>{0a597617-0f48-4671-9f41-d6ac61cc6a83}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\Win32\Cpp11-Debug"> - <UniqueIdentifier>{557a6551-eaa5-4cd6-8c1f-357d6af00bd9}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\x64\Debug"> - <UniqueIdentifier>{92318889-12a3-43ab-b944-285d7ef3f952}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\x64\Debug"> - <UniqueIdentifier>{0c0e4597-817c-4b25-81d1-59146d606819}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\Win32\Debug"> - <UniqueIdentifier>{7fa86bcb-05ba-4e6f-a8c5-148105de54a4}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\Win32\Debug"> - <UniqueIdentifier>{ecf96160-6541-4443-be93-72bfbd78dcef}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\x64\Release"> - <UniqueIdentifier>{0544d0f1-5b02-47e5-8184-557552c33f24}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\x64\Release"> - <UniqueIdentifier>{29bbe293-a44e-4686-8aa3-415f17433652}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\Win32\Release"> - <UniqueIdentifier>{335b62bc-7aeb-4fc0-9409-8b4652c55c70}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\Win32\Release"> - <UniqueIdentifier>{e40be86a-2d80-4236-a007-948ca205699f}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\x64\Cpp11-Release"> - <UniqueIdentifier>{df101639-61a3-4938-bf58-066ab36f3a35}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\x64\Cpp11-Release"> - <UniqueIdentifier>{e6e12fc5-8f07-4dcc-be5e-2df482a07ac9}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\Win32\Cpp11-Release"> - <UniqueIdentifier>{61ab166f-5639-4744-a6b4-9a40d61c07ce}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\Win32\Cpp11-Release"> - <UniqueIdentifier>{51b1cf9a-e275-4240-b767-8593e8fd98c1}</UniqueIdentifier> - </Filter> - </ItemGroup> - <ItemGroup> - <ClInclude Include="x64\Cpp11-Debug\Test.h"> - <Filter>Header Files\x64\Cpp11-Debug</Filter> - </ClInclude> - <ClInclude Include="Win32\Cpp11-Debug\Test.h"> - <Filter>Header Files\Win32\Cpp11-Debug</Filter> - </ClInclude> - <ClInclude Include="x64\Debug\Test.h"> - <Filter>Header Files\x64\Debug</Filter> - </ClInclude> - <ClInclude Include="Win32\Debug\Test.h"> - <Filter>Header Files\Win32\Debug</Filter> - </ClInclude> - <ClInclude Include="x64\Release\Test.h"> - <Filter>Header Files\x64\Release</Filter> - </ClInclude> - <ClInclude Include="Win32\Release\Test.h"> - <Filter>Header Files\Win32\Release</Filter> - </ClInclude> - <ClInclude Include="x64\Cpp11-Release\Test.h"> - <Filter>Header Files\x64\Cpp11-Release</Filter> - </ClInclude> - <ClInclude Include="Win32\Cpp11-Release\Test.h"> - <Filter>Header Files\Win32\Cpp11-Release</Filter> - </ClInclude> - <ClInclude Include="x64\Cpp11-Debug\ClientTypes.h"> - <Filter>Header Files\x64\Cpp11-Debug</Filter> - </ClInclude> - <ClInclude Include="Win32\Cpp11-Debug\ClientTypes.h"> - <Filter>Header Files\Win32\Cpp11-Debug</Filter> - </ClInclude> - <ClInclude Include="x64\Debug\ClientTypes.h"> - <Filter>Header Files\x64\Debug</Filter> - </ClInclude> - <ClInclude Include="Win32\Debug\ClientTypes.h"> - <Filter>Header Files\Win32\Debug</Filter> - </ClInclude> - <ClInclude Include="x64\Release\ClientTypes.h"> - <Filter>Header Files\x64\Release</Filter> - </ClInclude> - <ClInclude Include="Win32\Release\ClientTypes.h"> - <Filter>Header Files\Win32\Release</Filter> - </ClInclude> - <ClInclude Include="x64\Cpp11-Release\ClientTypes.h"> - <Filter>Header Files\x64\Cpp11-Release</Filter> - </ClInclude> - <ClInclude Include="Win32\Cpp11-Release\ClientTypes.h"> - <Filter>Header Files\Win32\Cpp11-Release</Filter> - </ClInclude> - </ItemGroup> - <ItemGroup> - <None Include="packages.config" /> - </ItemGroup> - <ItemGroup> - <SliceCompile Include="..\..\ClientTypes.ice"> - <Filter>Slice Files</Filter> - </SliceCompile> - <SliceCompile Include="..\..\Test.ice"> - <Filter>Slice Files</Filter> - </SliceCompile> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/cpp/test/Ice/checksum/msbuild/client/packages.config b/cpp/test/Ice/checksum/msbuild/client/packages.config deleted file mode 100644 index bf54aee7cc2..00000000000 --- a/cpp/test/Ice/checksum/msbuild/client/packages.config +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> - <package id="zeroc.icebuilder.msbuild" version="5.0.6" targetFramework="native" /> -</packages>
\ No newline at end of file diff --git a/cpp/test/Ice/checksum/msbuild/server/packages.config b/cpp/test/Ice/checksum/msbuild/server/packages.config deleted file mode 100644 index bf54aee7cc2..00000000000 --- a/cpp/test/Ice/checksum/msbuild/server/packages.config +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="zeroc.ice.v100" version="3.7.5" targetFramework="Native" /> - <package id="zeroc.ice.v120" version="3.7.5" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.5" targetFramework="native" /> - <package id="zeroc.ice.v141" version="3.7.5" targetFramework="native" /> - <package id="zeroc.ice.v142" version="3.7.5" targetFramework="native" /> - <package id="zeroc.icebuilder.msbuild" version="5.0.6" targetFramework="native" /> -</packages>
\ No newline at end of file diff --git a/cpp/test/Ice/checksum/msbuild/server/server.vcxproj b/cpp/test/Ice/checksum/msbuild/server/server.vcxproj deleted file mode 100644 index ef03f3a75b1..00000000000 --- a/cpp/test/Ice/checksum/msbuild/server/server.vcxproj +++ /dev/null @@ -1,522 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Cpp11-Debug|Win32"> - <Configuration>Cpp11-Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Cpp11-Debug|x64"> - <Configuration>Cpp11-Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Cpp11-Release|Win32"> - <Configuration>Cpp11-Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Cpp11-Release|x64"> - <Configuration>Cpp11-Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{91D2AA7B-AAA2-410F-8D3C-17A930A70CD6}</ProjectGuid> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup> - <DefaultPlatformToolset Condition="'$(VisualStudioVersion)' == '10.0' And '$(DefaultPlatformToolset)' == ''">v100</DefaultPlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\msbuild\ice.test.props" /> - <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets')" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'"> - <ClCompile> - <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'"> - <ClCompile> - <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'"> - <ClCompile> - <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'"> - <ClCompile> - <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Label="IceBuilder"> - <SliceCompile> - <AdditionalOptions>--checksum</AdditionalOptions> - </SliceCompile> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="..\..\Server.cpp" /> - <ClCompile Include="..\..\TestI.cpp" /> - <ClCompile Include="Win32\Cpp11-Debug\ServerTypes.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\ServerTypes.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="Win32\Cpp11-Debug\Test.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\Test.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="Win32\Cpp11-Release\ServerTypes.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\ServerTypes.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="Win32\Cpp11-Release\Test.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\Test.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="Win32\Debug\ServerTypes.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\ServerTypes.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="Win32\Debug\Test.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\Test.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="Win32\Release\ServerTypes.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\ServerTypes.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="Win32\Release\Test.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\Test.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="x64\Cpp11-Debug\ServerTypes.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\ServerTypes.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="x64\Cpp11-Debug\Test.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\Test.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="x64\Cpp11-Release\ServerTypes.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\ServerTypes.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="x64\Cpp11-Release\Test.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\Test.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="x64\Debug\ServerTypes.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\ServerTypes.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="x64\Debug\Test.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\Test.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="x64\Release\ServerTypes.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\ServerTypes.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="x64\Release\Test.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\Test.ice</SliceCompileSource> - </ClCompile> - </ItemGroup> - <ItemGroup> - <SliceCompile Include="..\..\ServerTypes.ice" /> - <SliceCompile Include="..\..\Test.ice" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\TestI.h" /> - <ClInclude Include="Win32\Cpp11-Debug\ServerTypes.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\ServerTypes.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="Win32\Cpp11-Debug\Test.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\Test.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="Win32\Cpp11-Release\ServerTypes.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\ServerTypes.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="Win32\Cpp11-Release\Test.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\Test.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="Win32\Debug\ServerTypes.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\ServerTypes.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="Win32\Debug\Test.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\Test.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="Win32\Release\ServerTypes.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\ServerTypes.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="Win32\Release\Test.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\Test.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="x64\Cpp11-Debug\ServerTypes.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\ServerTypes.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="x64\Cpp11-Debug\Test.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\Test.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="x64\Cpp11-Release\ServerTypes.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\ServerTypes.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="x64\Cpp11-Release\Test.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\Test.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="x64\Debug\ServerTypes.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\ServerTypes.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="x64\Debug\Test.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\Test.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="x64\Release\ServerTypes.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\ServerTypes.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="x64\Release\Test.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\Test.ice</SliceCompileSource> - </ClInclude> - </ItemGroup> - <ItemGroup> - <None Include="packages.config" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> - <PropertyGroup> - <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> - </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.5\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.5\build\native\zeroc.ice.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v141.3.7.5\build\native\zeroc.ice.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.props') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v100.3.7.5\build\native\zeroc.ice.v100.targets') )" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v142.3.7.5\build\native\zeroc.ice.v142.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets'))" /> - </Target> -</Project>
\ No newline at end of file diff --git a/cpp/test/Ice/checksum/msbuild/server/server.vcxproj.filters b/cpp/test/Ice/checksum/msbuild/server/server.vcxproj.filters deleted file mode 100644 index c11739a9454..00000000000 --- a/cpp/test/Ice/checksum/msbuild/server/server.vcxproj.filters +++ /dev/null @@ -1,191 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <ClCompile Include="x64\Cpp11-Debug\ServerTypes.cpp"> - <Filter>Source Files\x64\Cpp11-Debug</Filter> - </ClCompile> - <ClCompile Include="x64\Cpp11-Debug\Test.cpp"> - <Filter>Source Files\x64\Cpp11-Debug</Filter> - </ClCompile> - <ClCompile Include="Win32\Cpp11-Debug\ServerTypes.cpp"> - <Filter>Source Files\Win32\Cpp11-Debug</Filter> - </ClCompile> - <ClCompile Include="Win32\Cpp11-Debug\Test.cpp"> - <Filter>Source Files\Win32\Cpp11-Debug</Filter> - </ClCompile> - <ClCompile Include="x64\Debug\ServerTypes.cpp"> - <Filter>Source Files\x64\Debug</Filter> - </ClCompile> - <ClCompile Include="x64\Debug\Test.cpp"> - <Filter>Source Files\x64\Debug</Filter> - </ClCompile> - <ClCompile Include="Win32\Debug\ServerTypes.cpp"> - <Filter>Source Files\Win32\Debug</Filter> - </ClCompile> - <ClCompile Include="Win32\Debug\Test.cpp"> - <Filter>Source Files\Win32\Debug</Filter> - </ClCompile> - <ClCompile Include="x64\Release\ServerTypes.cpp"> - <Filter>Source Files\x64\Release</Filter> - </ClCompile> - <ClCompile Include="x64\Release\Test.cpp"> - <Filter>Source Files\x64\Release</Filter> - </ClCompile> - <ClCompile Include="Win32\Release\ServerTypes.cpp"> - <Filter>Source Files\Win32\Release</Filter> - </ClCompile> - <ClCompile Include="Win32\Release\Test.cpp"> - <Filter>Source Files\Win32\Release</Filter> - </ClCompile> - <ClCompile Include="x64\Cpp11-Release\ServerTypes.cpp"> - <Filter>Source Files\x64\Cpp11-Release</Filter> - </ClCompile> - <ClCompile Include="x64\Cpp11-Release\Test.cpp"> - <Filter>Source Files\x64\Cpp11-Release</Filter> - </ClCompile> - <ClCompile Include="Win32\Cpp11-Release\ServerTypes.cpp"> - <Filter>Source Files\Win32\Cpp11-Release</Filter> - </ClCompile> - <ClCompile Include="Win32\Cpp11-Release\Test.cpp"> - <Filter>Source Files\Win32\Cpp11-Release</Filter> - </ClCompile> - <ClCompile Include="..\..\Server.cpp" /> - <ClCompile Include="..\..\TestI.cpp" /> - </ItemGroup> - <ItemGroup> - <Filter Include="Source Files"> - <UniqueIdentifier>{7d02705b-9a2f-49cf-a0cb-42b30ca3cd72}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\x64"> - <UniqueIdentifier>{3ae97ae2-ecb9-465f-b593-2abcbb955015}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\x64\Cpp11-Debug"> - <UniqueIdentifier>{c843c938-ad8b-479d-b337-1664b882e646}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files"> - <UniqueIdentifier>{20715059-01ec-4519-8bad-d15957ae4037}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\x64"> - <UniqueIdentifier>{6adedce2-4b5d-4276-bdcf-37f80aad2bc3}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\x64\Cpp11-Debug"> - <UniqueIdentifier>{b6591623-bb7c-42ca-8e17-a4d9b36c534f}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\Win32"> - <UniqueIdentifier>{865cfb01-0700-442a-abe9-3bedceb97268}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\Win32\Cpp11-Debug"> - <UniqueIdentifier>{d7996e75-57e1-42d2-b8d1-7f4c47e2e4f6}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\Win32"> - <UniqueIdentifier>{65ddfd61-64ca-4250-905e-040c602e9287}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\Win32\Cpp11-Debug"> - <UniqueIdentifier>{8d248445-95c5-464a-9d5c-8387d925d4a0}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\x64\Debug"> - <UniqueIdentifier>{7be5fcb6-cb8e-44a5-a73b-0fed65b3579f}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\x64\Debug"> - <UniqueIdentifier>{a6681b29-aadc-4c49-8d19-9eb6e97b745b}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\Win32\Debug"> - <UniqueIdentifier>{12bb0cea-6675-496d-acf4-ebe88fd2647e}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\Win32\Debug"> - <UniqueIdentifier>{a3977c58-ce2f-4be0-8c5a-566ecf4d007d}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\x64\Release"> - <UniqueIdentifier>{9f16986d-027c-46e8-9be0-add866bf19f7}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\x64\Release"> - <UniqueIdentifier>{bd7077be-231e-4f19-b76f-dca4a66b1390}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\Win32\Release"> - <UniqueIdentifier>{177e23ae-072b-4b34-a9fa-1844c01bc0f9}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\Win32\Release"> - <UniqueIdentifier>{fe5809d2-1c15-4d0c-b836-e133f399489b}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\x64\Cpp11-Release"> - <UniqueIdentifier>{874b17e9-0e17-4ec7-85f8-5770996bf076}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\x64\Cpp11-Release"> - <UniqueIdentifier>{7c22c01e-3ba4-4794-9b15-b80b4fb649a1}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\Win32\Cpp11-Release"> - <UniqueIdentifier>{3c1058ef-fb4c-4416-9557-d5c999ed65a0}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\Win32\Cpp11-Release"> - <UniqueIdentifier>{1399f2a9-7db2-46db-a6f2-cb14ba9c3eec}</UniqueIdentifier> - </Filter> - <Filter Include="Slice Files"> - <UniqueIdentifier>{dde38d77-fde1-44a3-abf5-e4d9c7719e3b}</UniqueIdentifier> - <Extensions>ice</Extensions> - </Filter> - </ItemGroup> - <ItemGroup> - <ClInclude Include="x64\Cpp11-Debug\ServerTypes.h"> - <Filter>Header Files\x64\Cpp11-Debug</Filter> - </ClInclude> - <ClInclude Include="x64\Cpp11-Debug\Test.h"> - <Filter>Header Files\x64\Cpp11-Debug</Filter> - </ClInclude> - <ClInclude Include="Win32\Cpp11-Debug\ServerTypes.h"> - <Filter>Header Files\Win32\Cpp11-Debug</Filter> - </ClInclude> - <ClInclude Include="Win32\Cpp11-Debug\Test.h"> - <Filter>Header Files\Win32\Cpp11-Debug</Filter> - </ClInclude> - <ClInclude Include="x64\Debug\ServerTypes.h"> - <Filter>Header Files\x64\Debug</Filter> - </ClInclude> - <ClInclude Include="x64\Debug\Test.h"> - <Filter>Header Files\x64\Debug</Filter> - </ClInclude> - <ClInclude Include="Win32\Debug\ServerTypes.h"> - <Filter>Header Files\Win32\Debug</Filter> - </ClInclude> - <ClInclude Include="Win32\Debug\Test.h"> - <Filter>Header Files\Win32\Debug</Filter> - </ClInclude> - <ClInclude Include="x64\Release\ServerTypes.h"> - <Filter>Header Files\x64\Release</Filter> - </ClInclude> - <ClInclude Include="x64\Release\Test.h"> - <Filter>Header Files\x64\Release</Filter> - </ClInclude> - <ClInclude Include="Win32\Release\ServerTypes.h"> - <Filter>Header Files\Win32\Release</Filter> - </ClInclude> - <ClInclude Include="Win32\Release\Test.h"> - <Filter>Header Files\Win32\Release</Filter> - </ClInclude> - <ClInclude Include="x64\Cpp11-Release\ServerTypes.h"> - <Filter>Header Files\x64\Cpp11-Release</Filter> - </ClInclude> - <ClInclude Include="x64\Cpp11-Release\Test.h"> - <Filter>Header Files\x64\Cpp11-Release</Filter> - </ClInclude> - <ClInclude Include="Win32\Cpp11-Release\ServerTypes.h"> - <Filter>Header Files\Win32\Cpp11-Release</Filter> - </ClInclude> - <ClInclude Include="Win32\Cpp11-Release\Test.h"> - <Filter>Header Files\Win32\Cpp11-Release</Filter> - </ClInclude> - <ClInclude Include="..\..\TestI.h"> - <Filter>Header Files</Filter> - </ClInclude> - </ItemGroup> - <ItemGroup> - <None Include="packages.config" /> - </ItemGroup> - <ItemGroup> - <SliceCompile Include="..\..\ServerTypes.ice"> - <Filter>Slice Files</Filter> - </SliceCompile> - <SliceCompile Include="..\..\Test.ice"> - <Filter>Slice Files</Filter> - </SliceCompile> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/cpp/test/Ice/checksum/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/checksum/msbuild/uwp/client/client.vcxproj deleted file mode 100644 index 25259213d67..00000000000 --- a/cpp/test/Ice/checksum/msbuild/uwp/client/client.vcxproj +++ /dev/null @@ -1,350 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|ARM"> - <Configuration>Debug</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|ARM"> - <Configuration>Release</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{4F70E110-D2EE-4626-BD53-39C49F159C81}</ProjectGuid> - <Keyword>DynamicLibrary</Keyword> - <DefaultLanguage>en-US</DefaultLanguage> - <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion> - <AppContainerApplication>true</AppContainerApplication> - <ApplicationType>Windows Store</ApplicationType> - <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion> - <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> - <ApplicationTypeRevision>10.0</ApplicationTypeRevision> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets')" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <TargetName>Ice_checksum_client</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <TargetName>Ice_checksum_client</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <TargetName>Ice_checksum_client</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> - <TargetName>Ice_checksum_client</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <TargetName>Ice_checksum_client</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> - <TargetName>Ice_checksum_client</TargetName> - </PropertyGroup> - <ItemDefinitionGroup Label="IceBuilder"> - <SliceCompile> - <AdditionalOptions>--checksum</AdditionalOptions> - </SliceCompile> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="..\..\..\AllTests.cpp" /> - <ClCompile Include="..\..\..\Client.cpp" /> - <ClCompile Include="ARM\Debug\ClientTypes.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\ClientTypes.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="ARM\Debug\Test.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="ARM\Release\ClientTypes.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\ClientTypes.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="ARM\Release\Test.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="Win32\Debug\ClientTypes.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\ClientTypes.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="Win32\Debug\Test.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="Win32\Release\ClientTypes.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\ClientTypes.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="Win32\Release\Test.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="x64\Debug\ClientTypes.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\ClientTypes.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="x64\Debug\Test.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="x64\Release\ClientTypes.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\ClientTypes.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="x64\Release\Test.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource> - </ClCompile> - </ItemGroup> - <ItemGroup> - <SliceCompile Include="..\..\..\ClientTypes.ice" /> - <SliceCompile Include="..\..\..\Test.ice" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="ARM\Debug\ClientTypes.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\ClientTypes.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="ARM\Debug\Test.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="ARM\Release\ClientTypes.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\ClientTypes.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="ARM\Release\Test.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="Win32\Debug\ClientTypes.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\ClientTypes.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="Win32\Debug\Test.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="Win32\Release\ClientTypes.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\ClientTypes.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="Win32\Release\Test.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="x64\Debug\ClientTypes.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\ClientTypes.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="x64\Debug\Test.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="x64\Release\ClientTypes.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\ClientTypes.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="x64\Release\Test.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource> - </ClInclude> - </ItemGroup> - <ItemGroup> - <None Include="packages.config" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(ICE_BIN_DIST)' == 'all'"> - <PropertyGroup> - <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> - </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets'))" /> - </Target> -</Project>
\ No newline at end of file diff --git a/cpp/test/Ice/checksum/msbuild/uwp/client/client.vcxproj.filters b/cpp/test/Ice/checksum/msbuild/uwp/client/client.vcxproj.filters deleted file mode 100644 index a86c9dbde35..00000000000 --- a/cpp/test/Ice/checksum/msbuild/uwp/client/client.vcxproj.filters +++ /dev/null @@ -1,162 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <ClCompile Include="..\..\..\AllTests.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\..\Client.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="Win32\Debug\ClientTypes.cpp"> - <Filter>Source Files\Win32\Debug</Filter> - </ClCompile> - <ClCompile Include="ARM\Debug\ClientTypes.cpp"> - <Filter>Source Files\ARM\Debug</Filter> - </ClCompile> - <ClCompile Include="x64\Debug\ClientTypes.cpp"> - <Filter>Source Files\x64\Debug</Filter> - </ClCompile> - <ClCompile Include="Win32\Release\ClientTypes.cpp"> - <Filter>Source Files\Win32\Release</Filter> - </ClCompile> - <ClCompile Include="ARM\Release\ClientTypes.cpp"> - <Filter>Source Files\ARM\Release</Filter> - </ClCompile> - <ClCompile Include="x64\Release\ClientTypes.cpp"> - <Filter>Source Files\x64\Release</Filter> - </ClCompile> - <ClCompile Include="Win32\Debug\Test.cpp"> - <Filter>Source Files\Win32\Debug</Filter> - </ClCompile> - <ClCompile Include="ARM\Debug\Test.cpp"> - <Filter>Source Files\ARM\Debug</Filter> - </ClCompile> - <ClCompile Include="x64\Debug\Test.cpp"> - <Filter>Source Files\x64\Debug</Filter> - </ClCompile> - <ClCompile Include="Win32\Release\Test.cpp"> - <Filter>Source Files\Win32\Release</Filter> - </ClCompile> - <ClCompile Include="ARM\Release\Test.cpp"> - <Filter>Source Files\ARM\Release</Filter> - </ClCompile> - <ClCompile Include="x64\Release\Test.cpp"> - <Filter>Source Files\x64\Release</Filter> - </ClCompile> - </ItemGroup> - <ItemGroup> - <Filter Include="Source Files"> - <UniqueIdentifier>{7e812c17-5440-4eb0-9f94-950d25c9422b}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files"> - <UniqueIdentifier>{cafef398-3eb7-477e-9ae3-dc35cbeee8c5}</UniqueIdentifier> - </Filter> - <Filter Include="Slice Files"> - <UniqueIdentifier>{f8fd1e3d-1828-4515-b4a6-52bb0cbbe0c5}</UniqueIdentifier> - <Extensions>ice</Extensions> - </Filter> - <Filter Include="Source Files\Win32"> - <UniqueIdentifier>{17ca4fff-aa93-45c0-b1dc-69231695c3c8}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\Win32\Debug"> - <UniqueIdentifier>{1cd3eeac-77ae-426a-9046-5913dcd43733}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\Win32"> - <UniqueIdentifier>{69e07aaf-03d1-41de-96dd-6c50f21cd8f9}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\Win32\Debug"> - <UniqueIdentifier>{fb0f6cb8-9cae-48ec-af54-16d66726ff16}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\ARM"> - <UniqueIdentifier>{3515000f-a498-4f9d-8f0a-74fc86a80744}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\ARM\Debug"> - <UniqueIdentifier>{a077e73d-8746-4eae-957a-7a5546ba606a}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\ARM"> - <UniqueIdentifier>{560e51a6-2869-41e5-970e-bdd615844b3a}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\ARM\Debug"> - <UniqueIdentifier>{b414d89d-1a25-4774-a963-cfdb770e3884}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\x64"> - <UniqueIdentifier>{39f3bb7d-630c-404a-ab4a-129645aed69e}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\x64\Debug"> - <UniqueIdentifier>{486e8831-f458-4192-9e76-fa486606f86e}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\x64"> - <UniqueIdentifier>{ac26cba5-779c-4414-b7e9-7ccf8404fdab}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\x64\Debug"> - <UniqueIdentifier>{76d24ea0-1704-48f6-bb2b-73f75761faa7}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\Win32\Release"> - <UniqueIdentifier>{e5f86692-92fe-490e-abea-81d34caea245}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\Win32\Release"> - <UniqueIdentifier>{c84c6c38-8ed7-4e5f-9ea5-cc737fa826ba}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\ARM\Release"> - <UniqueIdentifier>{7885c071-a437-4f8a-81a9-c6ea146f9902}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\ARM\Release"> - <UniqueIdentifier>{1d0adbee-60cb-495c-bc7e-86902e1e8e51}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\x64\Release"> - <UniqueIdentifier>{49fe1c46-273a-4298-b331-07ef57f2306c}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\x64\Release"> - <UniqueIdentifier>{72e3d97a-24e1-4c6d-9fd5-649313c57059}</UniqueIdentifier> - </Filter> - </ItemGroup> - <ItemGroup> - <ClInclude Include="Win32\Debug\ClientTypes.h"> - <Filter>Header Files\Win32\Debug</Filter> - </ClInclude> - <ClInclude Include="ARM\Debug\ClientTypes.h"> - <Filter>Header Files\ARM\Debug</Filter> - </ClInclude> - <ClInclude Include="x64\Debug\ClientTypes.h"> - <Filter>Header Files\x64\Debug</Filter> - </ClInclude> - <ClInclude Include="Win32\Release\ClientTypes.h"> - <Filter>Header Files\Win32\Release</Filter> - </ClInclude> - <ClInclude Include="ARM\Release\ClientTypes.h"> - <Filter>Header Files\ARM\Release</Filter> - </ClInclude> - <ClInclude Include="x64\Release\ClientTypes.h"> - <Filter>Header Files\x64\Release</Filter> - </ClInclude> - <ClInclude Include="Win32\Debug\Test.h"> - <Filter>Header Files\Win32\Debug</Filter> - </ClInclude> - <ClInclude Include="ARM\Debug\Test.h"> - <Filter>Header Files\ARM\Debug</Filter> - </ClInclude> - <ClInclude Include="x64\Debug\Test.h"> - <Filter>Header Files\x64\Debug</Filter> - </ClInclude> - <ClInclude Include="Win32\Release\Test.h"> - <Filter>Header Files\Win32\Release</Filter> - </ClInclude> - <ClInclude Include="ARM\Release\Test.h"> - <Filter>Header Files\ARM\Release</Filter> - </ClInclude> - <ClInclude Include="x64\Release\Test.h"> - <Filter>Header Files\x64\Release</Filter> - </ClInclude> - </ItemGroup> - <ItemGroup> - <None Include="packages.config" /> - </ItemGroup> - <ItemGroup> - <SliceCompile Include="..\..\..\ClientTypes.ice"> - <Filter>Slice Files</Filter> - </SliceCompile> - <SliceCompile Include="..\..\..\Test.ice"> - <Filter>Slice Files</Filter> - </SliceCompile> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/cpp/test/Ice/checksum/msbuild/uwp/client/packages.config b/cpp/test/Ice/checksum/msbuild/uwp/client/packages.config deleted file mode 100644 index 79caa16fc27..00000000000 --- a/cpp/test/Ice/checksum/msbuild/uwp/client/packages.config +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> - <package id="zeroc.icebuilder.msbuild" version="5.0.6" targetFramework="native" /> -</packages>
\ No newline at end of file diff --git a/cpp/test/Ice/checksum/msbuild/uwp/server/packages.config b/cpp/test/Ice/checksum/msbuild/uwp/server/packages.config deleted file mode 100644 index 79caa16fc27..00000000000 --- a/cpp/test/Ice/checksum/msbuild/uwp/server/packages.config +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="zeroc.ice.uwp.v140" version="3.7.5" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x64" version="3.7.5" targetFramework="native" /> - <package id="zeroc.ice.uwp.v140.x86" version="3.7.5" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141" version="3.7.5" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x64" version="3.7.5" targetFramework="native" /> - <package id="zeroc.ice.uwp.v141.x86" version="3.7.5" targetFramework="native" /> - <package id="zeroc.icebuilder.msbuild" version="5.0.6" targetFramework="native" /> -</packages>
\ No newline at end of file diff --git a/cpp/test/Ice/checksum/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/checksum/msbuild/uwp/server/server.vcxproj deleted file mode 100644 index 58bb681c59b..00000000000 --- a/cpp/test/Ice/checksum/msbuild/uwp/server/server.vcxproj +++ /dev/null @@ -1,386 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props')" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" /> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|ARM"> - <Configuration>Debug</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|ARM"> - <Configuration>Release</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{BF016908-5C75-406E-BFB6-8427BF01D383}</ProjectGuid> - <Keyword>DynamicLibrary</Keyword> - <DefaultLanguage>en-US</DefaultLanguage> - <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion> - <AppContainerApplication>true</AppContainerApplication> - <ApplicationType>Windows Store</ApplicationType> - <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion> - <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> - <ApplicationTypeRevision>10.0</ApplicationTypeRevision> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\..\msbuild\ice.testuwp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets')" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <TargetName>Ice_checksum_server</TargetName> - <GenerateManifest>true</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <TargetName>Ice_checksum_server</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <TargetName>Ice_checksum_server</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> - <TargetName>Ice_checksum_server</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <TargetName>Ice_checksum_server</TargetName> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> - <TargetName>Ice_checksum_server</TargetName> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> - <ClCompile> - <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> - <ClCompile> - <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - <Link> - <WindowsMetadataFile /> - <TypeLibraryResourceID /> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Label="IceBuilder"> - <SliceCompile> - <AdditionalOptions>--checksum</AdditionalOptions> - </SliceCompile> - </ItemDefinitionGroup> - <ItemGroup> - <SliceCompile Include="..\..\..\ServerTypes.ice" /> - <SliceCompile Include="..\..\..\Test.ice" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\..\Server.cpp" /> - <ClCompile Include="..\..\..\TestI.cpp" /> - <ClCompile Include="ARM\Debug\ServerTypes.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\ServerTypes.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="ARM\Debug\Test.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="ARM\Release\ServerTypes.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\ServerTypes.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="ARM\Release\Test.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="Win32\Debug\ServerTypes.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\ServerTypes.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="Win32\Debug\Test.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="Win32\Release\ServerTypes.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\ServerTypes.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="Win32\Release\Test.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="x64\Debug\ServerTypes.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\ServerTypes.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="x64\Debug\Test.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="x64\Release\ServerTypes.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\ServerTypes.ice</SliceCompileSource> - </ClCompile> - <ClCompile Include="x64\Release\Test.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource> - </ClCompile> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\..\TestI.h" /> - <ClInclude Include="ARM\Debug\ServerTypes.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\ServerTypes.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="ARM\Debug\Test.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="ARM\Release\ServerTypes.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\ServerTypes.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="ARM\Release\Test.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="Win32\Debug\ServerTypes.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\ServerTypes.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="Win32\Debug\Test.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="Win32\Release\ServerTypes.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\ServerTypes.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="Win32\Release\Test.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="x64\Debug\ServerTypes.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\ServerTypes.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="x64\Debug\Test.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="x64\Release\ServerTypes.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\ServerTypes.ice</SliceCompileSource> - </ClInclude> - <ClInclude Include="x64\Release\Test.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\Test.ice</SliceCompileSource> - </ClInclude> - </ItemGroup> - <ItemGroup> - <None Include="packages.config" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(ICE_BIN_DIST)' == 'all'"> - <PropertyGroup> - <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> - </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x64.3.7.5\build\native\zeroc.ice.uwp.v141.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.5\build\native\zeroc.ice.uwp.v141.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.5\build\native\zeroc.ice.uwp.v141.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.5\build\native\zeroc.ice.uwp.v140.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.5\build\native\zeroc.ice.uwp.v140.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.5\build\native\zeroc.ice.uwp.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets'))" /> - </Target> -</Project>
\ No newline at end of file diff --git a/cpp/test/Ice/checksum/msbuild/uwp/server/server.vcxproj.filters b/cpp/test/Ice/checksum/msbuild/uwp/server/server.vcxproj.filters deleted file mode 100644 index 9d8c68e0e87..00000000000 --- a/cpp/test/Ice/checksum/msbuild/uwp/server/server.vcxproj.filters +++ /dev/null @@ -1,165 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <ClCompile Include="..\..\..\Server.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\..\TestI.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="Win32\Debug\ServerTypes.cpp"> - <Filter>Source Files\Win32\Debug</Filter> - </ClCompile> - <ClCompile Include="ARM\Debug\ServerTypes.cpp"> - <Filter>Source Files\ARM\Debug</Filter> - </ClCompile> - <ClCompile Include="x64\Debug\ServerTypes.cpp"> - <Filter>Source Files\x64\Debug</Filter> - </ClCompile> - <ClCompile Include="Win32\Release\ServerTypes.cpp"> - <Filter>Source Files\Win32\Release</Filter> - </ClCompile> - <ClCompile Include="ARM\Release\ServerTypes.cpp"> - <Filter>Source Files\ARM\Release</Filter> - </ClCompile> - <ClCompile Include="x64\Release\ServerTypes.cpp"> - <Filter>Source Files\x64\Release</Filter> - </ClCompile> - <ClCompile Include="Win32\Debug\Test.cpp"> - <Filter>Source Files\Win32\Debug</Filter> - </ClCompile> - <ClCompile Include="ARM\Debug\Test.cpp"> - <Filter>Source Files\ARM\Debug</Filter> - </ClCompile> - <ClCompile Include="x64\Debug\Test.cpp"> - <Filter>Source Files\x64\Debug</Filter> - </ClCompile> - <ClCompile Include="Win32\Release\Test.cpp"> - <Filter>Source Files\Win32\Release</Filter> - </ClCompile> - <ClCompile Include="ARM\Release\Test.cpp"> - <Filter>Source Files\ARM\Release</Filter> - </ClCompile> - <ClCompile Include="x64\Release\Test.cpp"> - <Filter>Source Files\x64\Release</Filter> - </ClCompile> - </ItemGroup> - <ItemGroup> - <Filter Include="Source Files"> - <UniqueIdentifier>{2e6c5d23-e463-4ad2-abf9-97f161dfa494}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files"> - <UniqueIdentifier>{f1b65a39-2f52-4dfb-b507-595a731c5b2f}</UniqueIdentifier> - </Filter> - <Filter Include="Slice Files"> - <UniqueIdentifier>{060daba1-f5a0-439e-a147-ae647ae4d559}</UniqueIdentifier> - <Extensions>ice</Extensions> - </Filter> - <Filter Include="Source Files\Win32"> - <UniqueIdentifier>{2b907810-df0b-40e4-8a76-a6c3a2835bee}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\Win32\Debug"> - <UniqueIdentifier>{99e96ab1-8db4-4721-919d-6cc25bf21679}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\Win32"> - <UniqueIdentifier>{2f8ed57a-2c11-49ca-a170-9a4a5a5ec82e}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\Win32\Debug"> - <UniqueIdentifier>{da91d5f0-6eea-481d-b894-39c2a66e1ddf}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\ARM"> - <UniqueIdentifier>{6f875a3a-6dc1-4634-a35e-774d1d97aca0}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\ARM\Debug"> - <UniqueIdentifier>{7f1717cb-0a83-482c-a682-bde6578fc202}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\ARM"> - <UniqueIdentifier>{18f98377-e1f4-45bd-b35a-5e5fe94ef159}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\ARM\Debug"> - <UniqueIdentifier>{8bd0d1ba-596b-49eb-b7fc-50e6c8da529d}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\x64"> - <UniqueIdentifier>{4367f030-b91f-4c39-8fde-f01ee4079cec}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\x64\Debug"> - <UniqueIdentifier>{b8b345b8-5a88-4169-b959-e4e094257d73}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\x64"> - <UniqueIdentifier>{d16fdd9d-9cfd-48df-94b5-29f8e4e48670}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\x64\Debug"> - <UniqueIdentifier>{b2e22a9a-33ee-42e7-a527-d19e43a3ba40}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\Win32\Release"> - <UniqueIdentifier>{ee75911b-dfa9-4c35-a942-766f30e04e3e}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\Win32\Release"> - <UniqueIdentifier>{129e4440-4997-42d9-80d0-8181f365fbb2}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\ARM\Release"> - <UniqueIdentifier>{d68ad82e-476b-43d7-aa03-53e1a76dfa18}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\ARM\Release"> - <UniqueIdentifier>{0d68e621-8581-47fa-b5d0-bd67ee466c5d}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\x64\Release"> - <UniqueIdentifier>{24fc68f9-9ccb-47ce-851f-75f3e2849a45}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\x64\Release"> - <UniqueIdentifier>{c5695bad-dc45-479e-a16e-5eaa46df2518}</UniqueIdentifier> - </Filter> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\..\TestI.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="Win32\Debug\ServerTypes.h"> - <Filter>Header Files\Win32\Debug</Filter> - </ClInclude> - <ClInclude Include="ARM\Debug\ServerTypes.h"> - <Filter>Header Files\ARM\Debug</Filter> - </ClInclude> - <ClInclude Include="x64\Debug\ServerTypes.h"> - <Filter>Header Files\x64\Debug</Filter> - </ClInclude> - <ClInclude Include="Win32\Release\ServerTypes.h"> - <Filter>Header Files\Win32\Release</Filter> - </ClInclude> - <ClInclude Include="ARM\Release\ServerTypes.h"> - <Filter>Header Files\ARM\Release</Filter> - </ClInclude> - <ClInclude Include="x64\Release\ServerTypes.h"> - <Filter>Header Files\x64\Release</Filter> - </ClInclude> - <ClInclude Include="Win32\Debug\Test.h"> - <Filter>Header Files\Win32\Debug</Filter> - </ClInclude> - <ClInclude Include="ARM\Debug\Test.h"> - <Filter>Header Files\ARM\Debug</Filter> - </ClInclude> - <ClInclude Include="x64\Debug\Test.h"> - <Filter>Header Files\x64\Debug</Filter> - </ClInclude> - <ClInclude Include="Win32\Release\Test.h"> - <Filter>Header Files\Win32\Release</Filter> - </ClInclude> - <ClInclude Include="ARM\Release\Test.h"> - <Filter>Header Files\ARM\Release</Filter> - </ClInclude> - <ClInclude Include="x64\Release\Test.h"> - <Filter>Header Files\x64\Release</Filter> - </ClInclude> - </ItemGroup> - <ItemGroup> - <None Include="packages.config" /> - </ItemGroup> - <ItemGroup> - <SliceCompile Include="..\..\..\ServerTypes.ice"> - <Filter>Slice Files</Filter> - </SliceCompile> - <SliceCompile Include="..\..\..\Test.ice"> - <Filter>Slice Files</Filter> - </SliceCompile> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/cpp/test/uwp/controller/msbuild/controller.vcxproj b/cpp/test/uwp/controller/msbuild/controller.vcxproj index bd97ad05011..5fe457de060 100644 --- a/cpp/test/uwp/controller/msbuild/controller.vcxproj +++ b/cpp/test/uwp/controller/msbuild/controller.vcxproj @@ -394,12 +394,6 @@ <None Include="..\..\..\Ice\binding\msbuild\uwp\server\x64\Debug\Ice_binding_server.dll"> <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent> </None> - <None Include="..\..\..\Ice\checksum\msbuild\uwp\client\x64\Debug\Ice_checksum_client.dll"> - <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent> - </None> - <None Include="..\..\..\Ice\checksum\msbuild\uwp\server\x64\Debug\Ice_checksum_server.dll"> - <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent> - </None> <None Include="..\..\..\Ice\custom\msbuild\uwp\client\x64\Debug\Ice_custom_client.dll"> <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent> </None> @@ -654,12 +648,6 @@ <None Include="..\..\..\Ice\binding\msbuild\uwp\server\x64\Release\Ice_binding_server.dll"> <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent> </None> - <None Include="..\..\..\Ice\checksum\msbuild\uwp\client\x64\Release\Ice_checksum_client.dll"> - <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent> - </None> - <None Include="..\..\..\Ice\checksum\msbuild\uwp\server\x64\Release\Ice_checksum_server.dll"> - <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent> - </None> <None Include="..\..\..\Ice\custom\msbuild\uwp\client\x64\Release\Ice_custom_client.dll"> <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent> </None> @@ -914,12 +902,6 @@ <None Include="..\..\..\Ice\binding\msbuild\uwp\server\Win32\Release\Ice_binding_server.dll"> <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent> </None> - <None Include="..\..\..\Ice\checksum\msbuild\uwp\client\Win32\Release\Ice_checksum_client.dll"> - <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent> - </None> - <None Include="..\..\..\Ice\checksum\msbuild\uwp\server\Win32\Release\Ice_checksum_server.dll"> - <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent> - </None> <None Include="..\..\..\Ice\custom\msbuild\uwp\client\Win32\Release\Ice_custom_client.dll"> <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent> </None> @@ -1174,12 +1156,6 @@ <None Include="..\..\..\Ice\binding\msbuild\uwp\server\Win32\Debug\Ice_binding_server.dll"> <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent> </None> - <None Include="..\..\..\Ice\checksum\msbuild\uwp\client\Win32\Debug\Ice_checksum_client.dll"> - <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent> - </None> - <None Include="..\..\..\Ice\checksum\msbuild\uwp\server\Win32\Debug\Ice_checksum_server.dll"> - <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent> - </None> <None Include="..\..\..\Ice\custom\msbuild\uwp\client\Win32\Debug\Ice_custom_client.dll"> <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent> </None> @@ -1434,12 +1410,6 @@ <None Include="..\..\..\Ice\binding\msbuild\uwp\server\ARM\Debug\Ice_binding_server.dll"> <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent> </None> - <None Include="..\..\..\Ice\checksum\msbuild\uwp\client\ARM\Debug\Ice_checksum_client.dll"> - <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent> - </None> - <None Include="..\..\..\Ice\checksum\msbuild\uwp\server\ARM\Debug\Ice_checksum_server.dll"> - <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent> - </None> <None Include="..\..\..\Ice\custom\msbuild\uwp\client\ARM\Debug\Ice_custom_client.dll"> <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent> </None> @@ -1694,12 +1664,6 @@ <None Include="..\..\..\Ice\binding\msbuild\uwp\server\ARM\Release\Ice_binding_server.dll"> <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent> </None> - <None Include="..\..\..\Ice\checksum\msbuild\uwp\client\ARM\Release\Ice_checksum_client.dll"> - <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent> - </None> - <None Include="..\..\..\Ice\checksum\msbuild\uwp\server\ARM\Release\Ice_checksum_server.dll"> - <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent> - </None> <None Include="..\..\..\Ice\custom\msbuild\uwp\client\ARM\Release\Ice_custom_client.dll"> <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent> </None> diff --git a/cpp/test/uwp/controller/msbuild/controller.vcxproj.filters b/cpp/test/uwp/controller/msbuild/controller.vcxproj.filters index 1b6da532335..d44261d8f40 100644 --- a/cpp/test/uwp/controller/msbuild/controller.vcxproj.filters +++ b/cpp/test/uwp/controller/msbuild/controller.vcxproj.filters @@ -266,12 +266,6 @@ <None Include="..\..\..\Ice\binding\msbuild\uwp\server\x64\Debug\Ice_binding_server.dll"> <Filter>Tests\x64\Debug</Filter> </None> - <None Include="..\..\..\Ice\checksum\msbuild\uwp\client\x64\Debug\Ice_checksum_client.dll"> - <Filter>Tests\x64\Debug</Filter> - </None> - <None Include="..\..\..\Ice\checksum\msbuild\uwp\server\x64\Debug\Ice_checksum_server.dll"> - <Filter>Tests\x64\Debug</Filter> - </None> <None Include="..\..\..\Ice\custom\msbuild\uwp\client\x64\Debug\Ice_custom_client.dll"> <Filter>Tests\x64\Debug</Filter> </None> @@ -524,12 +518,6 @@ <None Include="..\..\..\Ice\binding\msbuild\uwp\server\x64\Release\Ice_binding_server.dll"> <Filter>Tests\x64\Release</Filter> </None> - <None Include="..\..\..\Ice\checksum\msbuild\uwp\client\x64\Release\Ice_checksum_client.dll"> - <Filter>Tests\x64\Release</Filter> - </None> - <None Include="..\..\..\Ice\checksum\msbuild\uwp\server\x64\Release\Ice_checksum_server.dll"> - <Filter>Tests\x64\Release</Filter> - </None> <None Include="..\..\..\Ice\custom\msbuild\uwp\client\x64\Release\Ice_custom_client.dll"> <Filter>Tests\x64\Release</Filter> </None> @@ -782,12 +770,6 @@ <None Include="..\..\..\Ice\binding\msbuild\uwp\server\Win32\Release\Ice_binding_server.dll"> <Filter>Tests\Win32\Release</Filter> </None> - <None Include="..\..\..\Ice\checksum\msbuild\uwp\client\Win32\Release\Ice_checksum_client.dll"> - <Filter>Tests\Win32\Release</Filter> - </None> - <None Include="..\..\..\Ice\checksum\msbuild\uwp\server\Win32\Release\Ice_checksum_server.dll"> - <Filter>Tests\Win32\Release</Filter> - </None> <None Include="..\..\..\Ice\custom\msbuild\uwp\client\Win32\Release\Ice_custom_client.dll"> <Filter>Tests\Win32\Release</Filter> </None> @@ -1040,12 +1022,6 @@ <None Include="..\..\..\Ice\binding\msbuild\uwp\server\Win32\Debug\Ice_binding_server.dll"> <Filter>Tests\Win32\Debug</Filter> </None> - <None Include="..\..\..\Ice\checksum\msbuild\uwp\client\Win32\Debug\Ice_checksum_client.dll"> - <Filter>Tests\Win32\Debug</Filter> - </None> - <None Include="..\..\..\Ice\checksum\msbuild\uwp\server\Win32\Debug\Ice_checksum_server.dll"> - <Filter>Tests\Win32\Debug</Filter> - </None> <None Include="..\..\..\Ice\custom\msbuild\uwp\client\Win32\Debug\Ice_custom_client.dll"> <Filter>Tests\Win32\Debug</Filter> </None> @@ -1298,12 +1274,6 @@ <None Include="..\..\..\Ice\binding\msbuild\uwp\server\ARM\Debug\Ice_binding_server.dll"> <Filter>Tests\ARM\Debug</Filter> </None> - <None Include="..\..\..\Ice\checksum\msbuild\uwp\client\ARM\Debug\Ice_checksum_client.dll"> - <Filter>Tests\ARM\Debug</Filter> - </None> - <None Include="..\..\..\Ice\checksum\msbuild\uwp\server\ARM\Debug\Ice_checksum_server.dll"> - <Filter>Tests\ARM\Debug</Filter> - </None> <None Include="..\..\..\Ice\custom\msbuild\uwp\client\ARM\Debug\Ice_custom_client.dll"> <Filter>Tests\ARM\Debug</Filter> </None> @@ -1556,12 +1526,6 @@ <None Include="..\..\..\Ice\binding\msbuild\uwp\server\ARM\Release\Ice_binding_server.dll"> <Filter>Tests\ARM\Release</Filter> </None> - <None Include="..\..\..\Ice\checksum\msbuild\uwp\client\ARM\Release\Ice_checksum_client.dll"> - <Filter>Tests\ARM\Release</Filter> - </None> - <None Include="..\..\..\Ice\checksum\msbuild\uwp\server\ARM\Release\Ice_checksum_server.dll"> - <Filter>Tests\ARM\Release</Filter> - </None> <None Include="..\..\..\Ice\custom\msbuild\uwp\client\ARM\Release\Ice_custom_client.dll"> <Filter>Tests\ARM\Release</Filter> </None> diff --git a/csharp/msbuild/ice.net45.test.sln b/csharp/msbuild/ice.net45.test.sln index 9744ae92ac2..72a3130e7b8 100644 --- a/csharp/msbuild/ice.net45.test.sln +++ b/csharp/msbuild/ice.net45.test.sln @@ -361,12 +361,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "client", "..\test\Ice\plugi EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "plugin", "..\test\Ice\plugin\msbuild\plugin\net45\plugin.csproj", "{6BB08E6D-971D-4EEA-890F-8EFF41CBF727}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "checksum", "checksum", "{3D18DB62-F823-4812-9B79-CB7616B12A57}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "client", "..\test\Ice\checksum\msbuild\client\net45\client.csproj", "{BC907ED2-6883-4DFB-BDAB-957AFB986073}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "server", "..\test\Ice\checksum\msbuild\server\net45\server.csproj", "{AE7C3036-ADC3-44AB-B6DA-5C40E6E00527}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "escape", "escape", "{9549A2D9-ACA6-4962-8FF6-4170CD5F6C31}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "client", "..\test\Slice\escape\msbuild\client\net45\client.csproj", "{C7242DDD-86A7-43C7-B1F2-F3D60B392375}" @@ -1849,30 +1843,6 @@ Global {6BB08E6D-971D-4EEA-890F-8EFF41CBF727}.Release|x64.Build.0 = Release|x64 {6BB08E6D-971D-4EEA-890F-8EFF41CBF727}.Release|x86.ActiveCfg = Release|Win32 {6BB08E6D-971D-4EEA-890F-8EFF41CBF727}.Release|x86.Build.0 = Release|Win32 - {BC907ED2-6883-4DFB-BDAB-957AFB986073}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BC907ED2-6883-4DFB-BDAB-957AFB986073}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BC907ED2-6883-4DFB-BDAB-957AFB986073}.Debug|x64.ActiveCfg = Debug|x64 - {BC907ED2-6883-4DFB-BDAB-957AFB986073}.Debug|x64.Build.0 = Debug|x64 - {BC907ED2-6883-4DFB-BDAB-957AFB986073}.Debug|x86.ActiveCfg = Debug|Win32 - {BC907ED2-6883-4DFB-BDAB-957AFB986073}.Debug|x86.Build.0 = Debug|Win32 - {BC907ED2-6883-4DFB-BDAB-957AFB986073}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BC907ED2-6883-4DFB-BDAB-957AFB986073}.Release|Any CPU.Build.0 = Release|Any CPU - {BC907ED2-6883-4DFB-BDAB-957AFB986073}.Release|x64.ActiveCfg = Release|x64 - {BC907ED2-6883-4DFB-BDAB-957AFB986073}.Release|x64.Build.0 = Release|x64 - {BC907ED2-6883-4DFB-BDAB-957AFB986073}.Release|x86.ActiveCfg = Release|Win32 - {BC907ED2-6883-4DFB-BDAB-957AFB986073}.Release|x86.Build.0 = Release|Win32 - {AE7C3036-ADC3-44AB-B6DA-5C40E6E00527}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AE7C3036-ADC3-44AB-B6DA-5C40E6E00527}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AE7C3036-ADC3-44AB-B6DA-5C40E6E00527}.Debug|x64.ActiveCfg = Debug|x64 - {AE7C3036-ADC3-44AB-B6DA-5C40E6E00527}.Debug|x64.Build.0 = Debug|x64 - {AE7C3036-ADC3-44AB-B6DA-5C40E6E00527}.Debug|x86.ActiveCfg = Debug|Win32 - {AE7C3036-ADC3-44AB-B6DA-5C40E6E00527}.Debug|x86.Build.0 = Debug|Win32 - {AE7C3036-ADC3-44AB-B6DA-5C40E6E00527}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AE7C3036-ADC3-44AB-B6DA-5C40E6E00527}.Release|Any CPU.Build.0 = Release|Any CPU - {AE7C3036-ADC3-44AB-B6DA-5C40E6E00527}.Release|x64.ActiveCfg = Release|x64 - {AE7C3036-ADC3-44AB-B6DA-5C40E6E00527}.Release|x64.Build.0 = Release|x64 - {AE7C3036-ADC3-44AB-B6DA-5C40E6E00527}.Release|x86.ActiveCfg = Release|Win32 - {AE7C3036-ADC3-44AB-B6DA-5C40E6E00527}.Release|x86.Build.0 = Release|Win32 {C7242DDD-86A7-43C7-B1F2-F3D60B392375}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C7242DDD-86A7-43C7-B1F2-F3D60B392375}.Debug|Any CPU.Build.0 = Debug|Any CPU {C7242DDD-86A7-43C7-B1F2-F3D60B392375}.Debug|x64.ActiveCfg = Debug|x64 @@ -2229,9 +2199,6 @@ Global {795D56E7-49A4-4806-AF94-99BEE8A5DD9D} = {484370F6-E5AC-4355-8667-4E4E79CEF6FE} {86C132FD-A250-4F78-AE7E-8FCDDCFFFDE4} = {795D56E7-49A4-4806-AF94-99BEE8A5DD9D} {6BB08E6D-971D-4EEA-890F-8EFF41CBF727} = {795D56E7-49A4-4806-AF94-99BEE8A5DD9D} - {3D18DB62-F823-4812-9B79-CB7616B12A57} = {484370F6-E5AC-4355-8667-4E4E79CEF6FE} - {BC907ED2-6883-4DFB-BDAB-957AFB986073} = {3D18DB62-F823-4812-9B79-CB7616B12A57} - {AE7C3036-ADC3-44AB-B6DA-5C40E6E00527} = {3D18DB62-F823-4812-9B79-CB7616B12A57} {9549A2D9-ACA6-4962-8FF6-4170CD5F6C31} = {15A93BEB-F659-4C3C-AE6A-C84F9694909C} {C7242DDD-86A7-43C7-B1F2-F3D60B392375} = {9549A2D9-ACA6-4962-8FF6-4170CD5F6C31} {9DFAF661-EDED-4166-89AE-6731D44AB25E} = {484370F6-E5AC-4355-8667-4E4E79CEF6FE} diff --git a/csharp/msbuild/ice.net5.0.test.sln b/csharp/msbuild/ice.net5.0.test.sln index 3f569d0efeb..cfbf04f59c0 100644 --- a/csharp/msbuild/ice.net5.0.test.sln +++ b/csharp/msbuild/ice.net5.0.test.sln @@ -444,18 +444,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "client", "client", "{A313EF EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "client", "..\test\Ice\defaultValue\msbuild\client\net5.0\client.csproj", "{279C3FC6-CCEF-4D75-9DD0-0BC5ABDBD466}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "checksum", "checksum", "{E2F5B97C-9D80-4318-943D-F4D0D6F338C7}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "msbuild", "msbuild", "{8DBB5F22-BA3B-4BF7-9456-FDBD1D803E74}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "client", "client", "{22C308B6-D201-48F0-9606-0A7E16800857}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "client", "..\test\Ice\checksum\msbuild\client\net5.0\client.csproj", "{3B184D55-D349-43ED-BF6E-C624740317FA}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "server", "server", "{87B417E9-D816-4C6D-96E3-DE8B30629161}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "server", "..\test\Ice\checksum\msbuild\server\net5.0\server.csproj", "{DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "optional", "optional", "{3EF9C591-5A45-4490-B6AC-119A8FF2DD5B}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "msbuild", "msbuild", "{65E7885D-FA93-412D-822B-DC4510D9AD1B}" @@ -1728,30 +1716,6 @@ Global {279C3FC6-CCEF-4D75-9DD0-0BC5ABDBD466}.Release|x64.Build.0 = Release|Any CPU {279C3FC6-CCEF-4D75-9DD0-0BC5ABDBD466}.Release|x86.ActiveCfg = Release|Any CPU {279C3FC6-CCEF-4D75-9DD0-0BC5ABDBD466}.Release|x86.Build.0 = Release|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Debug|x64.ActiveCfg = Debug|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Debug|x64.Build.0 = Debug|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Debug|x86.ActiveCfg = Debug|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Debug|x86.Build.0 = Debug|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Release|Any CPU.Build.0 = Release|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Release|x64.ActiveCfg = Release|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Release|x64.Build.0 = Release|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Release|x86.ActiveCfg = Release|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Release|x86.Build.0 = Release|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Debug|x64.ActiveCfg = Debug|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Debug|x64.Build.0 = Debug|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Debug|x86.ActiveCfg = Debug|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Debug|x86.Build.0 = Debug|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Release|Any CPU.Build.0 = Release|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Release|x64.ActiveCfg = Release|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Release|x64.Build.0 = Release|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Release|x86.ActiveCfg = Release|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Release|x86.Build.0 = Release|Any CPU {9F385295-C422-48E2-9184-88773DC979F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9F385295-C422-48E2-9184-88773DC979F5}.Debug|Any CPU.Build.0 = Debug|Any CPU {9F385295-C422-48E2-9184-88773DC979F5}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -2589,12 +2553,6 @@ Global {067AD0E3-7AE3-4175-A84D-BD1C682E6D0C} = {B216E5A3-9285-4B4E-B0FA-86EAAC73929D} {A313EF12-CC3B-4BC1-95F2-1A963369DA3F} = {067AD0E3-7AE3-4175-A84D-BD1C682E6D0C} {279C3FC6-CCEF-4D75-9DD0-0BC5ABDBD466} = {A313EF12-CC3B-4BC1-95F2-1A963369DA3F} - {E2F5B97C-9D80-4318-943D-F4D0D6F338C7} = {85BCFA35-57C4-447A-BBD6-C81D2F12AD25} - {8DBB5F22-BA3B-4BF7-9456-FDBD1D803E74} = {E2F5B97C-9D80-4318-943D-F4D0D6F338C7} - {22C308B6-D201-48F0-9606-0A7E16800857} = {8DBB5F22-BA3B-4BF7-9456-FDBD1D803E74} - {3B184D55-D349-43ED-BF6E-C624740317FA} = {22C308B6-D201-48F0-9606-0A7E16800857} - {87B417E9-D816-4C6D-96E3-DE8B30629161} = {8DBB5F22-BA3B-4BF7-9456-FDBD1D803E74} - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0} = {87B417E9-D816-4C6D-96E3-DE8B30629161} {3EF9C591-5A45-4490-B6AC-119A8FF2DD5B} = {85BCFA35-57C4-447A-BBD6-C81D2F12AD25} {65E7885D-FA93-412D-822B-DC4510D9AD1B} = {3EF9C591-5A45-4490-B6AC-119A8FF2DD5B} {AE39F912-1A33-45E9-BDAB-39594BFF0CDD} = {65E7885D-FA93-412D-822B-DC4510D9AD1B} diff --git a/csharp/msbuild/ice.netstandard2.0.test.sln b/csharp/msbuild/ice.netstandard2.0.test.sln index c85b0351a5f..a28892f0d77 100644 --- a/csharp/msbuild/ice.netstandard2.0.test.sln +++ b/csharp/msbuild/ice.netstandard2.0.test.sln @@ -444,18 +444,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "client", "client", "{A313EF EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "client", "..\test\Ice\defaultValue\msbuild\client\netstandard2.0\client.csproj", "{279C3FC6-CCEF-4D75-9DD0-0BC5ABDBD466}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "checksum", "checksum", "{E2F5B97C-9D80-4318-943D-F4D0D6F338C7}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "msbuild", "msbuild", "{8DBB5F22-BA3B-4BF7-9456-FDBD1D803E74}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "client", "client", "{22C308B6-D201-48F0-9606-0A7E16800857}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "client", "..\test\Ice\checksum\msbuild\client\netstandard2.0\client.csproj", "{3B184D55-D349-43ED-BF6E-C624740317FA}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "server", "server", "{87B417E9-D816-4C6D-96E3-DE8B30629161}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "server", "..\test\Ice\checksum\msbuild\server\netstandard2.0\server.csproj", "{DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "optional", "optional", "{3EF9C591-5A45-4490-B6AC-119A8FF2DD5B}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "msbuild", "msbuild", "{65E7885D-FA93-412D-822B-DC4510D9AD1B}" @@ -1728,30 +1716,6 @@ Global {279C3FC6-CCEF-4D75-9DD0-0BC5ABDBD466}.Release|x64.Build.0 = Release|Any CPU {279C3FC6-CCEF-4D75-9DD0-0BC5ABDBD466}.Release|x86.ActiveCfg = Release|Any CPU {279C3FC6-CCEF-4D75-9DD0-0BC5ABDBD466}.Release|x86.Build.0 = Release|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Debug|x64.ActiveCfg = Debug|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Debug|x64.Build.0 = Debug|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Debug|x86.ActiveCfg = Debug|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Debug|x86.Build.0 = Debug|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Release|Any CPU.Build.0 = Release|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Release|x64.ActiveCfg = Release|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Release|x64.Build.0 = Release|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Release|x86.ActiveCfg = Release|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Release|x86.Build.0 = Release|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Debug|x64.ActiveCfg = Debug|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Debug|x64.Build.0 = Debug|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Debug|x86.ActiveCfg = Debug|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Debug|x86.Build.0 = Debug|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Release|Any CPU.Build.0 = Release|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Release|x64.ActiveCfg = Release|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Release|x64.Build.0 = Release|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Release|x86.ActiveCfg = Release|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Release|x86.Build.0 = Release|Any CPU {9F385295-C422-48E2-9184-88773DC979F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9F385295-C422-48E2-9184-88773DC979F5}.Debug|Any CPU.Build.0 = Debug|Any CPU {9F385295-C422-48E2-9184-88773DC979F5}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -2589,12 +2553,6 @@ Global {067AD0E3-7AE3-4175-A84D-BD1C682E6D0C} = {B216E5A3-9285-4B4E-B0FA-86EAAC73929D} {A313EF12-CC3B-4BC1-95F2-1A963369DA3F} = {067AD0E3-7AE3-4175-A84D-BD1C682E6D0C} {279C3FC6-CCEF-4D75-9DD0-0BC5ABDBD466} = {A313EF12-CC3B-4BC1-95F2-1A963369DA3F} - {E2F5B97C-9D80-4318-943D-F4D0D6F338C7} = {85BCFA35-57C4-447A-BBD6-C81D2F12AD25} - {8DBB5F22-BA3B-4BF7-9456-FDBD1D803E74} = {E2F5B97C-9D80-4318-943D-F4D0D6F338C7} - {22C308B6-D201-48F0-9606-0A7E16800857} = {8DBB5F22-BA3B-4BF7-9456-FDBD1D803E74} - {3B184D55-D349-43ED-BF6E-C624740317FA} = {22C308B6-D201-48F0-9606-0A7E16800857} - {87B417E9-D816-4C6D-96E3-DE8B30629161} = {8DBB5F22-BA3B-4BF7-9456-FDBD1D803E74} - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0} = {87B417E9-D816-4C6D-96E3-DE8B30629161} {3EF9C591-5A45-4490-B6AC-119A8FF2DD5B} = {85BCFA35-57C4-447A-BBD6-C81D2F12AD25} {65E7885D-FA93-412D-822B-DC4510D9AD1B} = {3EF9C591-5A45-4490-B6AC-119A8FF2DD5B} {AE39F912-1A33-45E9-BDAB-39594BFF0CDD} = {65E7885D-FA93-412D-822B-DC4510D9AD1B} diff --git a/csharp/msbuild/ice.xamarin.test.sln b/csharp/msbuild/ice.xamarin.test.sln index 4dcefe3f208..8dd3237b743 100644 --- a/csharp/msbuild/ice.xamarin.test.sln +++ b/csharp/msbuild/ice.xamarin.test.sln @@ -33,10 +33,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "binding", "binding", "{3758 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\binding\msbuild\test\netstandard2.0\test.csproj", "{723D6742-BFAC-4265-84C5-60EB6AB60A2C}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "checksum", "checksum", "{722AB792-C978-4633-A82A-02781EA97ECD}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\checksum\msbuild\test\netstandard2.0\test.csproj", "{0205DBD3-3A5C-4342-B511-79439D4A7801}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "defaultServant", "defaultServant", "{552AB952-499C-4B62-9F09-90BAA194FBE1}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\defaultServant\msbuild\test\netstandard2.0\test.csproj", "{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}" @@ -701,54 +697,6 @@ Global {723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Release|x64.Build.0 = Release|Any CPU {723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Release|x86.ActiveCfg = Release|Any CPU {723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Release|x86.Build.0 = Release|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Ad-Hoc|x64.Build.0 = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Ad-Hoc|x86.Build.0 = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.AppStore|Any CPU.Build.0 = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.AppStore|ARM.ActiveCfg = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.AppStore|ARM.Build.0 = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.AppStore|iPhone.ActiveCfg = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.AppStore|iPhone.Build.0 = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.AppStore|x64.ActiveCfg = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.AppStore|x64.Build.0 = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.AppStore|x86.ActiveCfg = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.AppStore|x86.Build.0 = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Debug|ARM.ActiveCfg = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Debug|ARM.Build.0 = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Debug|iPhone.Build.0 = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Debug|x64.ActiveCfg = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Debug|x64.Build.0 = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Debug|x86.ActiveCfg = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Debug|x86.Build.0 = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Release|Any CPU.Build.0 = Release|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Release|ARM.ActiveCfg = Release|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Release|ARM.Build.0 = Release|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Release|iPhone.ActiveCfg = Release|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Release|iPhone.Build.0 = Release|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Release|x64.ActiveCfg = Release|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Release|x64.Build.0 = Release|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Release|x86.ActiveCfg = Release|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Release|x86.Build.0 = Release|Any CPU {3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU {3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU {3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU @@ -2059,8 +2007,6 @@ Global {F949076A-E4E8-4662-8099-211F47199863} = {38CCD9BB-576F-4DB3-9928-756D4FD73CBE} {3758776C-A23F-4FDA-A406-2354908A3E43} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE} {723D6742-BFAC-4265-84C5-60EB6AB60A2C} = {3758776C-A23F-4FDA-A406-2354908A3E43} - {722AB792-C978-4633-A82A-02781EA97ECD} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE} - {0205DBD3-3A5C-4342-B511-79439D4A7801} = {722AB792-C978-4633-A82A-02781EA97ECD} {552AB952-499C-4B62-9F09-90BAA194FBE1} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE} {3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E} = {552AB952-499C-4B62-9F09-90BAA194FBE1} {816AF508-01A3-4B01-A699-949F65B25446} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE} diff --git a/csharp/src/Ice/SliceChecksums.cs b/csharp/src/Ice/SliceChecksums.cs deleted file mode 100644 index 6444be3dc8d..00000000000 --- a/csharp/src/Ice/SliceChecksums.cs +++ /dev/null @@ -1,30 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -namespace Ice -{ - using System; - using System.Collections; - using System.Collections.Generic; - using System.Reflection; - - public sealed class SliceChecksums - { - public static Dictionary<string, string> checksums = new Dictionary<string, string>(); - static SliceChecksums() - { - Type[] types = IceInternal.AssemblyUtil.findTypesWithPrefix("IceInternal.SliceChecksums"); - foreach(Type t in types) - { - FieldInfo f = t.GetField("map", BindingFlags.Public | BindingFlags.Static); - Hashtable map = (Hashtable)f.GetValue(null); - foreach(DictionaryEntry entry in map) - { - checksums.Add((string)entry.Key, (string)entry.Value); - } - } - } - } - -} diff --git a/csharp/src/Ice/msbuild/net45/ice.csproj b/csharp/src/Ice/msbuild/net45/ice.csproj index fa776c3cb8d..cb3ccc37e83 100644 --- a/csharp/src/Ice/msbuild/net45/ice.csproj +++ b/csharp/src/Ice/msbuild/net45/ice.csproj @@ -259,9 +259,6 @@ <Compile Include="..\..\ServantManager.cs"> <Link>ServantManager.cs</Link> </Compile> - <Compile Include="..\..\SliceChecksums.cs"> - <Link>SliceChecksums.cs</Link> - </Compile> <Compile Include="..\..\SlicedData.cs"> <Link>SlicedData.cs</Link> </Compile> @@ -372,7 +369,6 @@ <Compile Include="generated\RemoteLogger.cs"/> <Compile Include="generated\Router.cs"/> <Compile Include="generated\ServantLocator.cs"/> - <Compile Include="generated\SliceChecksumDict.cs"/> <Compile Include="generated\ValueFactory.cs"/> <Compile Include="generated\Version.cs"/> </ItemGroup> @@ -446,9 +442,6 @@ <SliceCompile Include="..\..\..\..\..\slice\Ice\ServantLocator.ice"> <Link>ServantLocator.ice</Link> </SliceCompile> - <SliceCompile Include="..\..\..\..\..\slice\Ice\SliceChecksumDict.ice"> - <Link>SliceChecksumDict.ice</Link> - </SliceCompile> <SliceCompile Include="..\..\..\..\..\slice\Ice\ValueFactory.ice"> <Link>ValueFactory.ice</Link> </SliceCompile> diff --git a/csharp/src/IceBox/ServiceManagerI.cs b/csharp/src/IceBox/ServiceManagerI.cs index bd0ef6e72ff..bdb631e0510 100644 --- a/csharp/src/IceBox/ServiceManagerI.cs +++ b/csharp/src/IceBox/ServiceManagerI.cs @@ -48,12 +48,6 @@ class ServiceManagerI : ServiceManagerDisp_ _argv = args; _traceServiceObserver = _communicator.getProperties().getPropertyAsInt("IceBox.Trace.ServiceObserver"); } - - public override Dictionary<string, string> getSliceChecksums(Ice.Current current) - { - return Ice.SliceChecksums.checksums; - } - public override void startService(string name, Ice.Current current) { ServiceInfo info = new ServiceInfo(); diff --git a/csharp/test/Ice/checksum/AllTests.cs b/csharp/test/Ice/checksum/AllTests.cs deleted file mode 100644 index 2c589a61fff..00000000000 --- a/csharp/test/Ice/checksum/AllTests.cs +++ /dev/null @@ -1,82 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -using System; -using System.Collections.Generic; - -namespace Ice -{ - namespace checksum - { - public class AllTests : global::Test.AllTests - { - public static Test.ChecksumPrx - allTests(global::Test.TestHelper helper, bool collocated) - { - var output = helper.getWriter(); - Ice.Communicator communicator = helper.communicator(); - string rf = "test:" + helper.getTestEndpoint(0); - Ice.ObjectPrx baseProxy = communicator.stringToProxy(rf); - test(baseProxy != null); - - Test.ChecksumPrx checksum = Test.ChecksumPrxHelper.checkedCast(baseProxy); - test(checksum != null); - - // - // Verify that no checksums are present for local types. - // - output.Write("testing checksums... "); - output.Flush(); - foreach(KeyValuePair<string, string> entry in Ice.SliceChecksums.checksums) - { - string key = entry.Key; - int pos = key.IndexOf("Local"); - test(pos == -1); - } - - // - // Get server's Slice checksums. - // - Dictionary<string, string> d = checksum.getSliceChecksums(); - - // - // Compare the checksums. For a type FooN whose name ends in an integer N, - // we assume that the server's type does not change for N = 1, and does - // change for N > 1. - // - char[] digits = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' }; - foreach(KeyValuePair<string, string> entry in d) - { - string key = entry.Key; - int start = key.IndexOfAny(digits); - if(start != -1) - { - int end = start; - while(end < key.Length && char.IsDigit(key[end])) - { - end++; - } - int n = int.Parse(key.Substring(start, end - start)); - - string value = Ice.SliceChecksums.checksums[key]; - test(value != null); - - if(n <= 1) - { - test(value.Equals(entry.Value)); - } - else - { - test(!value.Equals(entry.Value)); - } - } - } - - output.WriteLine("ok"); - - return checksum; - } - } - } -} diff --git a/csharp/test/Ice/checksum/Client.cs b/csharp/test/Ice/checksum/Client.cs deleted file mode 100644 index 01e85a15eaa..00000000000 --- a/csharp/test/Ice/checksum/Client.cs +++ /dev/null @@ -1,28 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -using Test; - -namespace Ice -{ - namespace checksum - { - public class Client : TestHelper - { - public override void run(string[] args) - { - using(var communicator = initialize(ref args)) - { - var checksum = AllTests.allTests(this, false); - checksum.shutdown(); - } - } - - public static int Main(string[] args) - { - return TestDriver.runTest<Client>(args); - } - } - } -} diff --git a/csharp/test/Ice/checksum/ClientTypes.ice b/csharp/test/Ice/checksum/ClientTypes.ice deleted file mode 100644 index a89f7af352a..00000000000 --- a/csharp/test/Ice/checksum/ClientTypes.ice +++ /dev/null @@ -1,618 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#pragma once - -module Test -{ - -// -// TEST: Same -// -const int IntConst1 = 100; - -// -// TEST: Value changed -// -const int IntConst2 = 100; - -// -// TEST: Type changed -// -const int IntConst3 = 100; - -// -// TEST: Same -// -enum Enum1 { Enum11, Enum12, Enum13 } - -// -// TEST: Add enumerator -// -enum Enum2 { Enum21, Enum22, Enum23 } - -// -// TEST: Remove enumerator -// -enum Enum3 { Enum31, Enum32, Enum33 } - -// -// TEST: Change to a different type -// -enum Enum4 { Enum41, Enum42, Enum43 } - -// -// TEST: Enum with explicit values. -// -enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 } - -// -// TEST: Enum with same explicit values, different order. -// -enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit12 = 2, EnumExplicit13 = 3 } - -// -// TEST: Enum with different explicit values. -// -enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 2, EnumExplicit23 = 3} - -// -// TEST: Enum with explicit values, removed enumerator. -// -enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2, EnumExplicit33 = 3} - -// -// TEST: Same -// -sequence<int> Sequence1; - -// -// TEST: Change sequence type -// -sequence<int> Sequence2; - -// -// TEST: Change to a different type -// -sequence<int> Sequence3; - -// -// TEST: Same -// -dictionary<string, int> Dictionary1; - -// -// TEST: Change key type -// -dictionary<string, int> Dictionary2; - -// -// TEST: Change value type -// -dictionary<string, int> Dictionary3; - -// -// TEST: Change to a different type -// -dictionary<string, int> Dictionary4; - -// -// TEST: Same -// -struct Struct1 -{ - string str; - bool b; -} - -// -// TEST: Add member -// -struct Struct2 -{ - string str; - bool b; -} - -// -// TEST: Change member type -// -struct Struct3 -{ - string str; - bool b; -} - -// -// TEST: Remove member -// -struct Struct4 -{ - string str; - bool b; -} - -// -// TEST: Change to a different type -// -struct Struct5 -{ - string str; - bool b; -} - -// -// TEST: Same -// -interface Interface1 -{ -} - -// -// TEST: Change interface to class -// -interface Interface2 -{ -} - -// -// TEST: Add base interface -// -interface Interface3 -{ -} - -// -// TEST: Add operation -// -interface Interface4 -{ -} - -// -// TEST: Same -// -class EmptyClass1 -{ -} - -// -// TEST: Add data member -// -class EmptyClass2 -{ -} - -// -// TEST: Add operation -// -class EmptyClass3 -{ -} - -// -// TEST: Add base class -// -class EmptyClass4 -{ -} - -// -// TEST: Add interface -// -class EmptyClass5 -{ -} - -// -// TEST: Same -// -class SimpleClass1 -{ - string str; - float f; -} - -// -// TEST: Add operation -// -class SimpleClass2 -{ - string str; - float f; -} - -// -// TEST: Rename member -// -class SimpleClass3 -{ - string str; - float f; -} - -// -// TEST: Add member -// -class SimpleClass4 -{ - string str; - float f; -} - -// -// TEST: Remove member -// -class SimpleClass5 -{ - string str; - float f; -} - -// -// TEST: Reorder members -// -class SimpleClass6 -{ - string str; - float f; -} - -// -// TEST: Change member type -// -class SimpleClass7 -{ - string str; - float f; -} - -// -// TEST: Same -// -exception Exception1 -{ - string str; - bool b; -} - -// -// TEST: Add member -// -exception Exception2 -{ - string str; - bool b; -} - -// -// TEST: Change member type -// -exception Exception3 -{ - string str; - bool b; -} - -// -// TEST: Remove member -// -exception Exception4 -{ - string str; - bool b; -} - -// -// TEST: Add base exception -// -exception Exception5 -{ -} - -// -// TEST: Change to a different type -// -exception Exception6 -{ - string str; - bool b; -} - -// -// TEST: Exception with optional members. -// -exception OptionalEx0 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Exception with optional members, different order, same tags. -// -exception OptionalEx1 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Exception with different optional members. -// -exception OptionalEx2 -{ - string firstName; - string secondName; - optional(1) string emailAddress; -} - -// -// TEST: Exception with different optional members. -// -exception OptionalEx3 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Exception with optional members using different tags. -// -exception OptionalEx4 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Same -// -interface BaseInterface1 -{ - void baseOp1(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Change return type -// -interface BaseInterface2 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add parameter -// -interface BaseInterface3 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add exception -// -interface BaseInterface4 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Change out parameter to in parameter -// -interface BaseInterface5 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Remove parameter -// -interface BaseInterface6 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Remove exception -// -interface BaseInterface7 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Remove operation -// -interface BaseInterface8 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add base interface -// -interface BaseInterface9 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add interface -// -interface BaseInterface10 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Class with compact id -// -class Compact1(1) -{ - int id; -} - -// -// TEST: Derived from class with compact id -// -class Derived1 extends Compact1 -{ -} - -// -// TEST: Same class names but different compact id -// -class Compact2(2) -{ - int id; -} - -// -// TEST: Class with optional members. -// -class Optional0 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Class with optional members, different order, same tags. -// -class Optional1 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Class with different optional members. -// -class Optional2 -{ - string firstName; - string secondName; - optional(1) string emailAddress; -} - -// -// TEST: Class with different optional members. -// -class Optional3 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Class with optional members using different tags. -// -class Optional4 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Interface with optional parameters. -// -interface OptionalParameters0 -{ - void op1(string firstName, optional(1) string secondName, - optional(2) string emailAddress); -} - -// -// TEST: Interface with optional parameters, different order. -// -interface OptionalParameters1 -{ - void op1(string firstName, optional(1) string secondName, - optional(2) string emailAddress); -} - -// -// TEST: Interface with optional parameters, different tags. -// -interface OptionalParameters2 -{ - void op1(string firstName, optional(1) string emailAddress, - optional(2) string secondName); -} - -// -// TEST: Interface with different optional parameters. -// -interface OptionalParameters3 -{ - void op1(string firstName, optional(1) string emailAddress, - string secondName); -} - -// -// TEST: Interface with optional return type. -// -interface OptionalReturn0 -{ - optional(1) int op(); -} - -// -// TEST: Interface that changes optional return type. -// -interface OptionalReturn2 -{ - optional(1) int op(); -} - -// -// TEST: Local -// -local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 } - -// -// TEST: Local -// -local sequence<string> LocalSequence; - -// -// TEST: Local -// -local dictionary<string, string> LocalDictionary; - -// -// TEST: Local -// -local struct LocalStruct -{ - string str; -} - -// -// TEST: Local -// -local class LocalClass -{ -} - -} diff --git a/csharp/test/Ice/checksum/Server.cs b/csharp/test/Ice/checksum/Server.cs deleted file mode 100644 index 56d5049d0ba..00000000000 --- a/csharp/test/Ice/checksum/Server.cs +++ /dev/null @@ -1,32 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -using Test; - -namespace Ice -{ - namespace checksum - { - public class Server : TestHelper - { - public override void run(string[] args) - { - using(var communicator = initialize(ref args)) - { - communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0) + " -t 2000"); - Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new ChecksumI(), Ice.Util.stringToIdentity("test")); - adapter.activate(); - serverReady(); - communicator.waitForShutdown(); - } - } - - public static int Main(string[] args) - { - return TestDriver.runTest<Server>(args); - } - } - } -} diff --git a/csharp/test/Ice/checksum/ServerTypes.ice b/csharp/test/Ice/checksum/ServerTypes.ice deleted file mode 100644 index 41deb9429af..00000000000 --- a/csharp/test/Ice/checksum/ServerTypes.ice +++ /dev/null @@ -1,617 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#pragma once - -[["suppress-warning:deprecated"]] // For classes with operations - -module Test -{ - -// -// TEST: Same -// -const int IntConst1 = 100; - -// -// TEST: Value changed -// -const int IntConst2 = 1000; - -// -// TEST: Type changed -// -const short IntConst3 = 100; - -// -// TEST: Same -// -enum Enum1 { Enum11, Enum12, Enum13 } - -// -// TEST: Add enumerator -// -enum Enum2 { Enum21, Enum22, Enum23, Enum24 } - -// -// TEST: Remove enumerator -// -enum Enum3 { Enum32, Enum33 } - -// -// TEST: Enum with explicit values. -// -enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 } - -// -// TEST: Enum with same explicit values, different order. -// -enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit13 = 3, EnumExplicit12 = 2 } - -// -// TEST: Enum with different explicit values. -// -enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 3, EnumExplicit23 } - -// -// TEST: Enum with explicit values, removed enumerator. -// -enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2} - -// -// TEST: Change to a different type -// -class Enum4 {} - -// -// TEST: Same -// -sequence<int> Sequence1; - -// -// TEST: Change sequence type -// -sequence<short> Sequence2; - -// -// TEST: Change to a different type -// -class Sequence3 {} - -// -// TEST: Same -// -dictionary<string, int> Dictionary1; - -// -// TEST: Change key type -// -dictionary<long, int> Dictionary2; - -// -// TEST: Change value type -// -dictionary<string, bool> Dictionary3; - -// -// TEST: Change to a different type -// -class Dictionary4 {} - -// -// TEST: Same -// -struct Struct1 -{ - string str; - bool b; -} - -// -// TEST: Add member -// -struct Struct2 -{ - string str; - bool b; - float f; -} - -// -// TEST: Change member type -// -struct Struct3 -{ - string str; - double b; -} - -// -// TEST: Remove member -// -struct Struct4 -{ - bool b; -} - -// -// TEST: Change to a different type -// -class Struct5 {} - -// -// TEST: Same -// -interface Interface1 -{ -} - -// -// TEST: Change interface to class -// -class Interface2 -{ -} - -// -// TEST: Add base interface -// -interface Interface3 extends Interface1 -{ -} - -// -// TEST: Add operation -// -interface Interface4 -{ - void opInterface4(); -} - -// -// TEST: Same -// -class EmptyClass1 -{ -} - -// -// TEST: Add data member -// -class EmptyClass2 -{ - double d; -} - -// -// TEST: Add operation -// -class EmptyClass3 -{ - void newOp(); -} - -// -// TEST: Add base class -// -class EmptyClass4 extends EmptyClass1 -{ -} - -// -// TEST: Add interface -// -class EmptyClass5 implements Interface1 -{ -} - -// -// TEST: Same -// -class SimpleClass1 -{ - string str; - float f; -} - -// -// TEST: Add operation -// -class SimpleClass2 -{ - string str; - float f; - void newOp(); -} - -// -// TEST: Rename member -// -class SimpleClass3 -{ - string str; - float g; -} - -// -// TEST: Add member -// -class SimpleClass4 -{ - string str; - float f; - bool b; -} - -// -// TEST: Remove member -// -class SimpleClass5 -{ - string str; -} - -// -// TEST: Reorder members -// -class SimpleClass6 -{ - float f; - string str; -} - -// -// TEST: Change member type -// -class SimpleClass7 -{ - string str; - double f; -} - -// -// TEST: Same -// -exception Exception1 -{ - string str; - bool b; -} - -// -// TEST: Add member -// -exception Exception2 -{ - string str; - bool b; - float f; -} - -// -// TEST: Change member type -// -exception Exception3 -{ - string str; - double b; -} - -// -// TEST: Remove member -// -exception Exception4 -{ - bool b; -} - -// -// TEST: Add base exception -// -exception Exception5 extends Exception1 -{ -} - -// -// TEST: Change to a different type -// -class Exception6 {} - -// -// TEST: Exception with optional members. -// -exception OptionalEx0 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Exception with optional members, different order, same tags. -// -exception OptionalEx1 -{ - string firstName; - optional(2) string emailAddress; - optional(1) string secondName; -} - -// -// TEST: Exception with different optional members. -// -exception OptionalEx2 -{ - string firstName; - optional(1) string secondName; - string emailAddress; -} - -// -// TEST: Exception with different optional members. -// -exception OptionalEx3 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; - optional(3) string phoneNumber; -} - -// -// TEST: Exception with optional members using different tags. -// -exception OptionalEx4 -{ - string firstName; - optional(2) string secondName; - optional(1) string emailAddress; -} - -// -// TEST: Same -// -interface BaseInterface1 -{ - void baseOp1(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Change return type -// -interface BaseInterface2 -{ - int baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add parameter -// -interface BaseInterface3 -{ - void baseOp(Object o); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add exception -// -interface BaseInterface4 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1, Exception2; -} - -// -// TEST: Change out parameter to in parameter -// -interface BaseInterface5 -{ - void baseOp(); - void baseOp2(int i, string s) throws Exception1; -} - -// -// TEST: Remove parameter -// -interface BaseInterface6 -{ - void baseOp(); - void baseOp2(out string s) throws Exception1; -} - -// -// TEST: Remove exception -// -interface BaseInterface7 -{ - void baseOp(); - void baseOp2(int i, out string s); -} - -// -// TEST: Remove operation -// -interface BaseInterface8 -{ - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add base interface -// -interface BaseInterface9 extends Interface1 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add interface -// -interface BaseInterface10 extends Interface1 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Class with compact id -// -class Compact1(1) -{ - int id; -} - -// -// TEST: Derived from class with compact id -// -class Derived1 extends Compact1 -{ -} - -// -// TEST: Same class names but different compact id -// -class Compact2(3) -{ - int id; -} - -// -// TEST: Class with optional members. -// -class Optional0 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Class with optional members, different order, same tags. -// -class Optional1 -{ - string firstName; - optional(2) string emailAddress; - optional(1) string secondName; -} - -// -// TEST: Class with different optional members. -// -class Optional2 -{ - string firstName; - optional(1) string secondName; - string emailAddress; -} - -// -// TEST: Class with different optional members. -// -class Optional3 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; - optional(3) string phoneNumber; -} - -// -// TEST: Class with optional members using different tags. -// -class Optional4 -{ - string firstName; - optional(2) string secondName; - optional(1) string emailAddress; -} - -// -// TEST: Interface with optional parameters. -// -interface OptionalParameters0 -{ - void op1(string firstName, optional(1) string secondName, - optional(2) string emailAddress); -} - -// -// TEST: Interface with optional parameters, different order. -// -interface OptionalParameters1 -{ - void op1(string firstName, optional(2) string emailAddress, - optional(1) string secondName); -} - -// -// TEST: Interface with optional parameters, different tags. -// -interface OptionalParameters2 -{ - void op1(string firstName, optional(2) string emailAddress, - optional(1) string secondName); -} - -// -// TEST: Interface with different optional parameters. -// -interface OptionalParameters3 -{ - void op1(string firstName, string emailAddress, - optional(1) string secondName); -} - -// -// TEST: Interface with optional return type. -// -interface OptionalReturn0 -{ - optional(1) int op(); -} - -// -// TEST: Interface that changes optional return type. -// -interface OptionalReturn2 -{ - int op(); -} - -// -// TEST: Local -// -local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 } - -// -// TEST: Local -// -local sequence<string> LocalSequence; - -// -// TEST: Local -// -local dictionary<string, string> LocalDictionary; - -// -// TEST: Local -// -local struct LocalStruct -{ - string str; -} - -// -// TEST: Local -// -local class LocalClass -{ -} - -} diff --git a/csharp/test/Ice/checksum/Test.ice b/csharp/test/Ice/checksum/Test.ice deleted file mode 100644 index a3d348a6451..00000000000 --- a/csharp/test/Ice/checksum/Test.ice +++ /dev/null @@ -1,20 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#pragma once - -#include <Ice/SliceChecksumDict.ice> - -["cs:namespace:Ice.checksum"] -module Test -{ - -interface Checksum -{ - idempotent Ice::SliceChecksumDict getSliceChecksums(); - - void shutdown(); -} - -} diff --git a/csharp/test/Ice/checksum/TestI.cs b/csharp/test/Ice/checksum/TestI.cs deleted file mode 100644 index f8560d7eb9d..00000000000 --- a/csharp/test/Ice/checksum/TestI.cs +++ /dev/null @@ -1,29 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -using System.Collections.Generic; - -namespace Ice -{ - namespace checksum - { - - public sealed class ChecksumI : Test.ChecksumDisp_ - { - public ChecksumI() - { - } - - public override Dictionary<string, string> getSliceChecksums(Ice.Current current) - { - return Ice.SliceChecksums.checksums; - } - - public override void shutdown(Ice.Current current) - { - current.adapter.getCommunicator().shutdown(); - } - } - } -} diff --git a/csharp/test/Ice/checksum/msbuild/client/net45/client.csproj b/csharp/test/Ice/checksum/msbuild/client/net45/client.csproj deleted file mode 100644 index fbe826ace5b..00000000000 --- a/csharp/test/Ice/checksum/msbuild/client/net45/client.csproj +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props')" /> - <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.5\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.5\build\zeroc.ice.net.props" /> - <PropertyGroup Label="Globals"> - <NuGetPackageImportStamp> - </NuGetPackageImportStamp> - <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> - </PropertyGroup> - <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" /> - <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{BC907ED2-6883-4DFB-BDAB-957AFB986073}</ProjectGuid> - <OutputType>Exe</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <AssemblyName>client</AssemblyName> - <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion> - <FileAlignment>512</FileAlignment> - <OutputPath>$(MSBuildThisFileDirectory)</OutputPath> - <DebugSymbols>true</DebugSymbols> - </PropertyGroup> - <ItemGroup> - <Reference Include="Ice, Version=3.7.5.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL"> - <SpecificVersion>False</SpecificVersion> - <Private>False</Private> - <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath> - </Reference> - <Reference Include="System" /> - <Reference Include="System.Core" /> - <Reference Include="Microsoft.CSharp" /> - </ItemGroup> - <ItemGroup> - <Folder Include="Properties\" /> - </ItemGroup> - <ItemGroup> - <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs"> - <Link>TestHelper.cs</Link> - </Compile> - <Compile Include="..\..\..\AllTests.cs"> - <Link>AllTests.cs</Link> - </Compile> - <Compile Include="..\..\..\Client.cs"> - <Link>Client.cs</Link> - </Compile> - <Compile Include="generated\Test.cs" /> - <Compile Include="generated\ClientTypes.cs" /> - </ItemGroup> - <ItemGroup> - <None Include="client.exe.config" /> - <SliceCompile Include="..\..\..\Test.ice"> - <Link>Test.ice</Link> - </SliceCompile> - <SliceCompile Include="..\..\..\ClientTypes.ice"> - <Link>ClientTypes.ice</Link> - </SliceCompile> - <None Include="packages.config" /> - </ItemGroup> - <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> - <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" /> - <ItemDefinitionGroup Label="IceBuilder"> - <SliceCompile> - <AdditionalOptions>--checksum</AdditionalOptions> - </SliceCompile> - </ItemDefinitionGroup> - <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports"> - <PropertyGroup> - <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> - </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.5\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.5\build\zeroc.ice.net.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets'))" /> - </Target> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets')" /> -</Project>
\ No newline at end of file diff --git a/csharp/test/Ice/checksum/msbuild/client/net45/client.exe.config b/csharp/test/Ice/checksum/msbuild/client/net45/client.exe.config deleted file mode 100644 index 418bdc2f8b2..00000000000 --- a/csharp/test/Ice/checksum/msbuild/client/net45/client.exe.config +++ /dev/null @@ -1,5 +0,0 @@ -<configuration> - <runtime> - <developmentMode developerInstallation="true"/> - </runtime> -</configuration> diff --git a/csharp/test/Ice/checksum/msbuild/client/net45/packages.config b/csharp/test/Ice/checksum/msbuild/client/net45/packages.config deleted file mode 100644 index 7f20c0c71e3..00000000000 --- a/csharp/test/Ice/checksum/msbuild/client/net45/packages.config +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="zeroc.ice.net" version="3.7.5" targetFramework="net452" /> - <package id="zeroc.icebuilder.msbuild" version="5.0.6" targetFramework="net451" /> -</packages>
\ No newline at end of file diff --git a/csharp/test/Ice/checksum/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/checksum/msbuild/client/net5.0/client.csproj deleted file mode 100644 index c03deaa1efd..00000000000 --- a/csharp/test/Ice/checksum/msbuild/client/net5.0/client.csproj +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project Sdk="Microsoft.NET.Sdk"> - <Import Project="../../../../../../msbuild/ice.common.props" /> - <PropertyGroup> - <AssemblyName>client</AssemblyName> - <OutputType>Exe</OutputType> - <TargetFramework>net5.0</TargetFramework> - <GenerateAssemblyInfo>false</GenerateAssemblyInfo> - <EnableDefaultCompileItems>false</EnableDefaultCompileItems> - <OutputPath>.</OutputPath> - <UseAppHost>true</UseAppHost> - <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> - </PropertyGroup> - <ItemDefinitionGroup Label="IceBuilder"> - <SliceCompile> - <AdditionalOptions>--checksum</AdditionalOptions> - </SliceCompile> - </ItemDefinitionGroup> - <ItemGroup> - <Compile Include="../../../../../TestCommon/TestHelper.cs" /> - <Compile Include="../../../AllTests.cs" /> - <Compile Include="../../../Client.cs" /> - <Compile Include="generated\ClientTypes.cs"> - <SliceCompileSource>../../../ClientTypes.ice</SliceCompileSource> - </Compile> - <Compile Include="generated\Test.cs"> - <SliceCompileSource>../../../Test.ice</SliceCompileSource> - </Compile> - <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.6" /> - <SliceCompile Include="../../../Test.ice" /> - <SliceCompile Include="../../../ClientTypes.ice" /> - </ItemGroup> - <Choose> - <When Condition="'$(ICE_BIN_DIST)' == 'all'"> - <ItemGroup> - <PackageReference Include="zeroc.ice.net" Version="3.7.5" /> - </ItemGroup> - </When> - <Otherwise> - <ItemGroup> - <Reference Include="../../../../../../lib/net5.0/Ice.dll" /> - </ItemGroup> - </Otherwise> - </Choose> -</Project> diff --git a/csharp/test/Ice/checksum/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/checksum/msbuild/client/netstandard2.0/client.csproj deleted file mode 100644 index 8037a7ec838..00000000000 --- a/csharp/test/Ice/checksum/msbuild/client/netstandard2.0/client.csproj +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project Sdk="Microsoft.NET.Sdk"> - <Import Project="../../../../../../msbuild/ice.common.props" /> - <PropertyGroup> - <AssemblyName>client</AssemblyName> - <OutputType>Exe</OutputType> - <TargetFramework>$(AppTargetFramework)</TargetFramework> - <GenerateAssemblyInfo>false</GenerateAssemblyInfo> - <EnableDefaultCompileItems>false</EnableDefaultCompileItems> - <OutputPath>.</OutputPath> - </PropertyGroup> - <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> - <UseAppHost>true</UseAppHost> - </PropertyGroup> - <ItemDefinitionGroup Label="IceBuilder"> - <SliceCompile> - <AdditionalOptions>--checksum</AdditionalOptions> - </SliceCompile> - </ItemDefinitionGroup> - <ItemGroup> - <Compile Include="../../../../../TestCommon/TestHelper.cs" /> - <Compile Include="../../../AllTests.cs" /> - <Compile Include="../../../Client.cs" /> - <Compile Include="generated\ClientTypes.cs"> - <SliceCompileSource>../../../ClientTypes.ice</SliceCompileSource> - </Compile> - <Compile Include="generated\Test.cs"> - <SliceCompileSource>../../../Test.ice</SliceCompileSource> - </Compile> - <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.6" /> - <SliceCompile Include="../../../Test.ice" /> - <SliceCompile Include="../../../ClientTypes.ice" /> - </ItemGroup> - <Choose> - <When Condition="'$(ICE_BIN_DIST)' == 'all'"> - <ItemGroup> - <PackageReference Include="zeroc.ice.net" Version="3.7.5" /> - </ItemGroup> - </When> - <Otherwise> - <ItemGroup> - <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" /> - </ItemGroup> - </Otherwise> - </Choose> -</Project> diff --git a/csharp/test/Ice/checksum/msbuild/server/net45/packages.config b/csharp/test/Ice/checksum/msbuild/server/net45/packages.config deleted file mode 100644 index 7f20c0c71e3..00000000000 --- a/csharp/test/Ice/checksum/msbuild/server/net45/packages.config +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="zeroc.ice.net" version="3.7.5" targetFramework="net452" /> - <package id="zeroc.icebuilder.msbuild" version="5.0.6" targetFramework="net451" /> -</packages>
\ No newline at end of file diff --git a/csharp/test/Ice/checksum/msbuild/server/net45/server.csproj b/csharp/test/Ice/checksum/msbuild/server/net45/server.csproj deleted file mode 100644 index 0ca9ca76287..00000000000 --- a/csharp/test/Ice/checksum/msbuild/server/net45/server.csproj +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props')" /> - <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.5\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.5\build\zeroc.ice.net.props" /> - <PropertyGroup Label="Globals"> - <NuGetPackageImportStamp> - </NuGetPackageImportStamp> - <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> - </PropertyGroup> - <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" /> - <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{AE7C3036-ADC3-44AB-B6DA-5C40E6E00527}</ProjectGuid> - <OutputType>Exe</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <AssemblyName>server</AssemblyName> - <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion> - <FileAlignment>512</FileAlignment> - <OutputPath>$(MSBuildThisFileDirectory)</OutputPath> - <DebugSymbols>true</DebugSymbols> - </PropertyGroup> - <ItemGroup> - <Reference Include="Ice, Version=3.7.5.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL"> - <SpecificVersion>False</SpecificVersion> - <Private>False</Private> - <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath> - </Reference> - <Reference Include="System" /> - <Reference Include="System.Core" /> - <Reference Include="Microsoft.CSharp" /> - </ItemGroup> - <ItemGroup> - <Folder Include="Properties\" /> - </ItemGroup> - <ItemGroup> - <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs"> - <Link>TestHelper.cs</Link> - </Compile> - <Compile Include="..\..\..\Server.cs"> - <Link>Server.cs</Link> - </Compile> - <Compile Include="..\..\..\TestI.cs"> - <Link>TestI.cs</Link> - </Compile> - <Compile Include="generated\Test.cs" /> - <Compile Include="generated\ServerTypes.cs" /> - </ItemGroup> - <ItemGroup> - <SliceCompile Include="..\..\..\Test.ice"> - <Link>Test.ice</Link> - </SliceCompile> - <SliceCompile Include="..\..\..\ServerTypes.ice"> - <Link>ServerTypes.ice</Link> - </SliceCompile> - <None Include="packages.config" /> - <None Include="server.exe.config" /> - </ItemGroup> - <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> - <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" /> - <ItemDefinitionGroup Label="IceBuilder"> - <SliceCompile> - <AdditionalOptions>--checksum</AdditionalOptions> - </SliceCompile> - </ItemDefinitionGroup> - <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports"> - <PropertyGroup> - <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> - </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.5\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.5\build\zeroc.ice.net.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets'))" /> - </Target> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets')" /> -</Project>
\ No newline at end of file diff --git a/csharp/test/Ice/checksum/msbuild/server/net45/server.exe.config b/csharp/test/Ice/checksum/msbuild/server/net45/server.exe.config deleted file mode 100644 index 418bdc2f8b2..00000000000 --- a/csharp/test/Ice/checksum/msbuild/server/net45/server.exe.config +++ /dev/null @@ -1,5 +0,0 @@ -<configuration> - <runtime> - <developmentMode developerInstallation="true"/> - </runtime> -</configuration> diff --git a/csharp/test/Ice/checksum/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/checksum/msbuild/server/net5.0/server.csproj deleted file mode 100644 index a6c1ff1d7fe..00000000000 --- a/csharp/test/Ice/checksum/msbuild/server/net5.0/server.csproj +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project Sdk="Microsoft.NET.Sdk"> - <Import Project="../../../../../../msbuild/ice.common.props" /> - <PropertyGroup> - <AssemblyName>server</AssemblyName> - <OutputType>Exe</OutputType> - <TargetFramework>net5.0</TargetFramework> - <GenerateAssemblyInfo>false</GenerateAssemblyInfo> - <EnableDefaultCompileItems>false</EnableDefaultCompileItems> - <OutputPath>.</OutputPath> - <UseAppHost>true</UseAppHost> - <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> - </PropertyGroup> - <ItemDefinitionGroup Label="IceBuilder"> - <SliceCompile> - <AdditionalOptions>--checksum</AdditionalOptions> - </SliceCompile> - </ItemDefinitionGroup> - <ItemGroup> - <Compile Include="../../../../../TestCommon/TestHelper.cs" /> - <Compile Include="../../../TestI.cs" /> - <Compile Include="../../../Server.cs" /> - <Compile Include="generated\ServerTypes.cs"> - <SliceCompileSource>../../../ServerTypes.ice</SliceCompileSource> - </Compile> - <Compile Include="generated\Test.cs"> - <SliceCompileSource>../../../Test.ice</SliceCompileSource> - </Compile> - <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.6" /> - <SliceCompile Include="../../../Test.ice" /> - <SliceCompile Include="../../../ServerTypes.ice" /> - </ItemGroup> - <Choose> - <When Condition="'$(ICE_BIN_DIST)' == 'all'"> - <ItemGroup> - <PackageReference Include="zeroc.ice.net" Version="3.7.5" /> - </ItemGroup> - </When> - <Otherwise> - <ItemGroup> - <Reference Include="../../../../../../lib/net5.0/Ice.dll" /> - </ItemGroup> - </Otherwise> - </Choose> -</Project> diff --git a/csharp/test/Ice/checksum/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/checksum/msbuild/server/netstandard2.0/server.csproj deleted file mode 100644 index e6e4c499910..00000000000 --- a/csharp/test/Ice/checksum/msbuild/server/netstandard2.0/server.csproj +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project Sdk="Microsoft.NET.Sdk"> - <Import Project="../../../../../../msbuild/ice.common.props" /> - <PropertyGroup> - <AssemblyName>server</AssemblyName> - <OutputType>Exe</OutputType> - <TargetFramework>$(AppTargetFramework)</TargetFramework> - <GenerateAssemblyInfo>false</GenerateAssemblyInfo> - <EnableDefaultCompileItems>false</EnableDefaultCompileItems> - <OutputPath>.</OutputPath> - </PropertyGroup> - <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> - <UseAppHost>true</UseAppHost> - </PropertyGroup> - <ItemDefinitionGroup Label="IceBuilder"> - <SliceCompile> - <AdditionalOptions>--checksum</AdditionalOptions> - </SliceCompile> - </ItemDefinitionGroup> - <ItemGroup> - <Compile Include="../../../../../TestCommon/TestHelper.cs" /> - <Compile Include="../../../TestI.cs" /> - <Compile Include="../../../Server.cs" /> - <Compile Include="generated\ServerTypes.cs"> - <SliceCompileSource>../../../ServerTypes.ice</SliceCompileSource> - </Compile> - <Compile Include="generated\Test.cs"> - <SliceCompileSource>../../../Test.ice</SliceCompileSource> - </Compile> - <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.6" /> - <SliceCompile Include="../../../Test.ice" /> - <SliceCompile Include="../../../ServerTypes.ice" /> - </ItemGroup> - <Choose> - <When Condition="'$(ICE_BIN_DIST)' == 'all'"> - <ItemGroup> - <PackageReference Include="zeroc.ice.net" Version="3.7.5" /> - </ItemGroup> - </When> - <Otherwise> - <ItemGroup> - <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" /> - </ItemGroup> - </Otherwise> - </Choose> -</Project> diff --git a/csharp/test/Ice/checksum/msbuild/test/netstandard2.0/test.csproj b/csharp/test/Ice/checksum/msbuild/test/netstandard2.0/test.csproj deleted file mode 100644 index 182dbb1587e..00000000000 --- a/csharp/test/Ice/checksum/msbuild/test/netstandard2.0/test.csproj +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project Sdk="Microsoft.NET.Sdk"> - <Import Project="../../../../../../msbuild/ice.common.props" /> - <PropertyGroup> - <AssemblyName>Ice.checksum</AssemblyName> - <TargetFramework>netstandard2.0</TargetFramework> - <GenerateAssemblyInfo>false</GenerateAssemblyInfo> - <EnableDefaultCompileItems>false</EnableDefaultCompileItems> - <OutputPath>.</OutputPath> - </PropertyGroup> - <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> - <UseAppHost>true</UseAppHost> - </PropertyGroup> - <ItemGroup> - <Compile Include="../../../AllTests.cs" /> - <Compile Include="../../../Client.cs" /> - <Compile Include="../../../TestI.cs" /> - <Compile Include="../../../Server.cs" /> - <Compile Include="generated\Test.cs"> - <SliceCompileSource>../../../Test.ice</SliceCompileSource> - </Compile> - <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.6" /> - <ProjectReference Include="..\..\..\..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj" /> - <SliceCompile Include="../../../Test.ice" /> - </ItemGroup> - <Choose> - <When Condition="'$(ICE_BIN_DIST)' == 'all'"> - <ItemGroup> - <PackageReference Include="zeroc.ice.net" Version="3.7.5" /> - </ItemGroup> - </When> - <Otherwise> - <ItemGroup> - <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" /> - </ItemGroup> - </Otherwise> - </Choose> -</Project> diff --git a/csharp/test/xamarin/controller/MainPage.xaml.cs b/csharp/test/xamarin/controller/MainPage.xaml.cs index 3cd2fdf60d5..7f0d345b7a8 100644 --- a/csharp/test/xamarin/controller/MainPage.xaml.cs +++ b/csharp/test/xamarin/controller/MainPage.xaml.cs @@ -77,16 +77,6 @@ namespace controller { return new Ice.binding.Client(); } - - else if(type.Equals("Ice.checksum.Server")) - { - return new Ice.checksum.Server(); - } - else if(type.Equals("Ice.checksum.Client")) - { - return new Ice.checksum.Client(); - } - else if(type.Equals("Ice.defaultServant.Client")) { return new Ice.defaultServant.Client(); diff --git a/csharp/test/xamarin/controller/controller.csproj b/csharp/test/xamarin/controller/controller.csproj index 0b0b8d43bb2..8d8dc92b86e 100644 --- a/csharp/test/xamarin/controller/controller.csproj +++ b/csharp/test/xamarin/controller/controller.csproj @@ -60,7 +60,6 @@ <ProjectReference Include="..\..\Ice\admin\msbuild\test\netstandard2.0\test.csproj" /> <ProjectReference Include="..\..\Ice\ami\msbuild\test\netstandard2.0\test.csproj" /> <ProjectReference Include="..\..\Ice\binding\msbuild\test\netstandard2.0\test.csproj" /> - <ProjectReference Include="..\..\Ice\checksum\msbuild\test\netstandard2.0\test.csproj" /> <ProjectReference Include="..\..\Ice\defaultServant\msbuild\test\netstandard2.0\test.csproj" /> <ProjectReference Include="..\..\Ice\defaultValue\msbuild\test\netstandard2.0\test.csproj" /> <ProjectReference Include="..\..\Ice\dictMapping\msbuild\test\netstandard2.0\test.csproj" /> diff --git a/java-compat/src/Glacier2/build.gradle b/java-compat/src/Glacier2/build.gradle index fa583f91fce..958dd57fc8b 100644 --- a/java-compat/src/Glacier2/build.gradle +++ b/java-compat/src/Glacier2/build.gradle @@ -7,7 +7,7 @@ project.ext.description = "Firewall traversal for Ice" slice { java { - args = "--tie --checksum Glacier2.SliceChecksums" + args = "--tie" files = fileTree(dir: "$project.ext.topSrcDir/slice/Glacier2", includes:['*.ice'], excludes:["*F.ice"]) } } diff --git a/java-compat/src/IceBox/build.gradle b/java-compat/src/IceBox/build.gradle index 97aaeeaac9b..812a3dd11fc 100644 --- a/java-compat/src/IceBox/build.gradle +++ b/java-compat/src/IceBox/build.gradle @@ -7,8 +7,8 @@ project.ext.description = "IceBox is an easy-to-use framework for Ice applicatio slice { java { - args = "--tie --checksum IceBox.SliceChecksums" - files = fileTree(dir: "$project.ext.topSrcDir/slice/IceBox", includes:['*.ice'], excludes:["*F.ice"]) + args = "--tie" + files = fileTree(dir: "$project.ext.topSrcDir/slice/IceBox", includes:['*.ice'], excludes:["*F.ice"]) } } diff --git a/java-compat/src/IceBox/src/main/java/IceBox/ServiceManagerI.java b/java-compat/src/IceBox/src/main/java/IceBox/ServiceManagerI.java index 0b2738cb64a..e58529083ae 100644 --- a/java-compat/src/IceBox/src/main/java/IceBox/ServiceManagerI.java +++ b/java-compat/src/IceBox/src/main/java/IceBox/ServiceManagerI.java @@ -69,13 +69,6 @@ public class ServiceManagerI extends _ServiceManagerDisp } @Override - public java.util.Map<String, String> - getSliceChecksums(Ice.Current current) - { - return SliceChecksums.checksums; - } - - @Override public void startService(String name, Ice.Current current) throws AlreadyStartedException, NoSuchServiceException diff --git a/java-compat/src/IceGrid/build.gradle b/java-compat/src/IceGrid/build.gradle index 1e4b21300e8..ea70299d7bb 100644 --- a/java-compat/src/IceGrid/build.gradle +++ b/java-compat/src/IceGrid/build.gradle @@ -7,7 +7,7 @@ project.ext.description = "Locate, deploy, and manage Ice servers" slice { java { - args = "--tie --checksum IceGrid.SliceChecksums" + args = "--tie" files = fileTree(dir: "$project.ext.topSrcDir/slice/IceGrid", includes:['*.ice'], excludes:["*F.ice"]) } } diff --git a/java-compat/src/IceStorm/build.gradle b/java-compat/src/IceStorm/build.gradle index 67fcb28ae87..88933dabd57 100644 --- a/java-compat/src/IceStorm/build.gradle +++ b/java-compat/src/IceStorm/build.gradle @@ -7,7 +7,7 @@ project.ext.description = "Publish-subscribe event distribution service" slice { java { - args = "--tie --checksum IceStorm.SliceChecksums" + args = "--tie" files = fileTree(dir: "$project.ext.topSrcDir/slice/IceStorm", includes:['*.ice'], excludes:["*F.ice"]) } } diff --git a/java-compat/test/slice.gradle b/java-compat/test/slice.gradle index b0fac9c0fa3..457fcd1002a 100644 --- a/java-compat/test/slice.gradle +++ b/java-compat/test/slice.gradle @@ -61,20 +61,10 @@ task testSliceTask { 'Slice/structure/*.ice']) } set2 { - args = "--checksum test.Ice.checksum.Test.SliceChecksums" - files = fileTree(dir: testDir, includes:['Ice/checksum/Test.ice', - 'Ice/checksum/Types.ice']) - } - set3 { include = ["${testDir}/Ice/packagemd"] files = fileTree(dir: testDir, includes:['Ice/packagemd/*.ice']) } - set4 { - args = "--checksum test.Ice.checksum.server.Test.SliceChecksums" - files = fileTree(dir: testDir, includes:['Ice/checksum/TestServer.ice', - 'Ice/checksum/TypesServer.ice']) - } - set5 { + set3 { args = "--impl" files = fileTree(dir: testDir, includes:['Ice/impl/Test.ice', 'Ice/impl/TestAMD.ice']) diff --git a/java-compat/test/src/main/java/test/Ice/checksum/AllTests.java b/java-compat/test/src/main/java/test/Ice/checksum/AllTests.java deleted file mode 100644 index 817ffc01bd4..00000000000 --- a/java-compat/test/src/main/java/test/Ice/checksum/AllTests.java +++ /dev/null @@ -1,90 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -package test.Ice.checksum; - -import java.io.PrintWriter; -import test.Ice.checksum.Test.*; - -public class AllTests -{ - private static void - test(boolean b) - { - if(!b) - { - throw new RuntimeException(); - } - } - - public static ChecksumPrx - allTests(test.TestHelper helper, boolean collocated) - { - Ice.Communicator communicator = helper.communicator(); - PrintWriter out = helper.getWriter(); - - String ref = "test:" + helper.getTestEndpoint(0); - Ice.ObjectPrx base = communicator.stringToProxy(ref); - test(base != null); - - ChecksumPrx checksum = ChecksumPrxHelper.checkedCast(base); - test(checksum != null); - - // - // Verify that no checksums are present for local types. - // - out.print("testing checksums... "); - out.flush(); - for(java.util.Map.Entry<String, String> p : SliceChecksums.checksums.entrySet()) - { - String key = p.getKey(); - int pos = key.indexOf("Local"); - test(pos == -1); - } - - // - // Get server's Slice checksums. - // - java.util.Map<String, String> d = checksum.getSliceChecksums(); - - // - // Compare the checksums. For a type FooN whose name ends in an integer N, - // we assume that the server's type does not change for N = 1, and does - // change for N > 1. - // - java.util.regex.Pattern patt = java.util.regex.Pattern.compile("\\d+"); - for(java.util.Map.Entry<String, String> p : d.entrySet()) - { - int n = 0; - String key = p.getKey(); - java.util.regex.Matcher m = patt.matcher(key); - if(m.find()) - { - try - { - n = Integer.parseInt(key.substring(m.start(), m.end())); - } - catch(NumberFormatException ex) - { - test(false); - } - } - - String value = SliceChecksums.checksums.get(key); - test(value != null); - - if(n <= 1) - { - test(value.equals(p.getValue())); - } - else - { - test(!value.equals(p.getValue())); - } - } - out.println("ok"); - - return checksum; - } -} diff --git a/java-compat/test/src/main/java/test/Ice/checksum/ChecksumI.java b/java-compat/test/src/main/java/test/Ice/checksum/ChecksumI.java deleted file mode 100644 index 37cf83b2d0d..00000000000 --- a/java-compat/test/src/main/java/test/Ice/checksum/ChecksumI.java +++ /dev/null @@ -1,29 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -package test.Ice.checksum; - -import test.Ice.checksum.server.Test.*; - -public final class ChecksumI extends _ChecksumDisp -{ - public - ChecksumI() - { - } - - @Override - public java.util.Map<String, String> - getSliceChecksums(Ice.Current current) - { - return SliceChecksums.checksums; - } - - @Override - public void - shutdown(Ice.Current current) - { - current.adapter.getCommunicator().shutdown(); - } -} diff --git a/java-compat/test/src/main/java/test/Ice/checksum/Client.java b/java-compat/test/src/main/java/test/Ice/checksum/Client.java deleted file mode 100644 index ec735866a94..00000000000 --- a/java-compat/test/src/main/java/test/Ice/checksum/Client.java +++ /dev/null @@ -1,22 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -package test.Ice.checksum; - -import test.Ice.checksum.Test.ChecksumPrx; - -public class Client extends test.TestHelper -{ - public void - run(String[] args) - { - Ice.Properties properties = createTestProperties(args); - properties.setProperty("Ice.Package.Test", "test.Ice.checksum"); - try(Ice.Communicator communicator = initialize(properties)) - { - ChecksumPrx checksum = AllTests.allTests(this, false); - checksum.shutdown(); - } - } -} diff --git a/java-compat/test/src/main/java/test/Ice/checksum/Server.java b/java-compat/test/src/main/java/test/Ice/checksum/Server.java deleted file mode 100644 index 18a0b92a78a..00000000000 --- a/java-compat/test/src/main/java/test/Ice/checksum/Server.java +++ /dev/null @@ -1,25 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -package test.Ice.checksum; - -public class Server extends test.TestHelper -{ - public void - run(String[] args) - { - Ice.Properties properties = createTestProperties(args); - properties.setProperty("Ice.Package.Test", "test.Ice.checksum.server"); - try(Ice.Communicator communicator = initialize(properties)) - { - communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); - Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - Ice.Object object = new ChecksumI(); - adapter.add(object, Ice.Util.stringToIdentity("test")); - adapter.activate(); - serverReady(); - communicator.waitForShutdown(); - } - } -} diff --git a/java-compat/test/src/main/java/test/Ice/checksum/Test.ice b/java-compat/test/src/main/java/test/Ice/checksum/Test.ice deleted file mode 100644 index f3e116d2577..00000000000 --- a/java-compat/test/src/main/java/test/Ice/checksum/Test.ice +++ /dev/null @@ -1,20 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#pragma once - -#include <Ice/SliceChecksumDict.ice> - -[["java:package:test.Ice.checksum"]] -module Test -{ - -interface Checksum -{ - idempotent Ice::SliceChecksumDict getSliceChecksums(); - - void shutdown(); -} - -} diff --git a/java-compat/test/src/main/java/test/Ice/checksum/TestServer.ice b/java-compat/test/src/main/java/test/Ice/checksum/TestServer.ice deleted file mode 100644 index 612c928db8a..00000000000 --- a/java-compat/test/src/main/java/test/Ice/checksum/TestServer.ice +++ /dev/null @@ -1,20 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#pragma once - -#include <Ice/SliceChecksumDict.ice> - -[["java:package:test.Ice.checksum.server"]] -module Test -{ - -interface Checksum -{ - idempotent Ice::SliceChecksumDict getSliceChecksums(); - - void shutdown(); -} - -} diff --git a/java-compat/test/src/main/java/test/Ice/checksum/Types.ice b/java-compat/test/src/main/java/test/Ice/checksum/Types.ice deleted file mode 100644 index 7ecbd2940de..00000000000 --- a/java-compat/test/src/main/java/test/Ice/checksum/Types.ice +++ /dev/null @@ -1,610 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#pragma once - -[["java:package:test.Ice.checksum"]] -module Test -{ - -// -// TEST: Same -// -const int IntConst1 = 100; - -// -// TEST: Value changed -// -const int IntConst2 = 100; - -// -// TEST: Type changed -// -const int IntConst3 = 100; - -// -// TEST: Same -// -enum Enum1 { Enum11, Enum12, Enum13 } - -// -// TEST: Add enumerator -// -enum Enum2 { Enum21, Enum22, Enum23 } - -// -// TEST: Remove enumerator -// -enum Enum3 { Enum31, Enum32, Enum33 } - -// -// TEST: Change to a different type -// -enum Enum4 { Enum41, Enum42, Enum43 } - -// -// TEST: Enum with explicit values. -// -enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 } - -// -// TEST: Enum with same explicit values, different order. -// -enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit12 = 2, EnumExplicit13 = 3 } - -// -// TEST: Enum with different explicit values. -// -enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 2, EnumExplicit23 = 3} - -// -// TEST: Enum with explicit values, removed enumerator. -// -enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2, EnumExplicit33 = 3} - -// -// TEST: Same -// -sequence<int> Sequence1; - -// -// TEST: Change sequence type -// -sequence<int> Sequence2; - -// -// TEST: Change to a different type -// -sequence<int> Sequence3; - -// -// TEST: Same -// -dictionary<string, int> Dictionary1; - -// -// TEST: Change key type -// -dictionary<string, int> Dictionary2; - -// -// TEST: Change value type -// -dictionary<string, int> Dictionary3; - -// -// TEST: Change to a different type -// -dictionary<string, int> Dictionary4; - -// -// TEST: Same -// -struct Struct1 -{ - string str; - bool b; -} - -// -// TEST: Add member -// -struct Struct2 -{ - string str; - bool b; -} - -// -// TEST: Change member type -// -struct Struct3 -{ - string str; - bool b; -} - -// -// TEST: Remove member -// -struct Struct4 -{ - string str; - bool b; -} - -// -// TEST: Change to a different type -// -struct Struct5 -{ - string str; - bool b; -} - -// -// TEST: Same -// -interface Interface1 -{ -} - -// -// TEST: Change interface to class -// -interface Interface2 -{ -} - -// -// TEST: Add base interface -// -interface Interface3 -{ -} - -// -// TEST: Add operation -// -interface Interface4 -{ -} - -// -// TEST: Same -// -class EmptyClass1 -{ -} - -// -// TEST: Add data member -// -class EmptyClass2 -{ -} - -// -// TEST: Add operation -// -class EmptyClass3 -{ -} - -// -// TEST: Add base class -// -class EmptyClass4 -{ -} - -// -// TEST: Add interface -// -class EmptyClass5 -{ -} - -// -// TEST: Same -// -class SimpleClass1 -{ - string str; - float f; -} - -// -// TEST: Add operation -// -class SimpleClass2 -{ - string str; - float f; -} - -// -// TEST: Rename member -// -class SimpleClass3 -{ - string str; - float f; -} - -// -// TEST: Add member -// -class SimpleClass4 -{ - string str; - float f; -} - -// -// TEST: Remove member -// -class SimpleClass5 -{ - string str; - float f; -} - -// -// TEST: Reorder members -// -class SimpleClass6 -{ - string str; - float f; -} - -// -// TEST: Change member type -// -class SimpleClass7 -{ - string str; - float f; -} - -// -// TEST: Same -// -exception Exception1 -{ - string str; - bool b; -} - -// -// TEST: Add member -// -exception Exception2 -{ - string str; - bool b; -} - -// -// TEST: Change member type -// -exception Exception3 -{ - string str; - bool b; -} - -// -// TEST: Remove member -// -exception Exception4 -{ - string str; - bool b; -} - -// -// TEST: Add base exception -// -exception Exception5 -{ -} - -// -// TEST: Change to a different type -// -exception Exception6 -{ - string str; - bool b; -} - -// -// TEST: Exception with optional members. -// -exception OptionalEx0 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Exception with optional members, different order, same tags. -// -exception OptionalEx1 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Exception with different optional members. -// -exception OptionalEx2 -{ - string firstName; - string secondName; - optional(1) string emailAddress; -} - -// -// TEST: Exception with different optional members. -// -exception OptionalEx3 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Exception with optional members using different tags. -// -exception OptionalEx4 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Same -// -interface BaseInterface1 -{ - void baseOp1(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Change return type -// -interface BaseInterface2 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add parameter -// -interface BaseInterface3 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add exception -// -interface BaseInterface4 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Change out parameter to in parameter -// -interface BaseInterface5 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Remove parameter -// -interface BaseInterface6 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Remove exception -// -interface BaseInterface7 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Remove operation -// -interface BaseInterface8 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add base interface -// -interface BaseInterface9 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Class with compact id -// -class Compact1(1) -{ - int id; -} - -// -// TEST: Derived from class with compact id -// -class Derived1 extends Compact1 -{ -} - -// -// TEST: Same class names but different compact id -// -class Compact2(2) -{ - int id; -} - -// -// TEST: Class with optional members. -// -class Optional0 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Class with optional members, different order, same tags. -// -class Optional1 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Class with different optional members. -// -class Optional2 -{ - string firstName; - string secondName; - optional(1) string emailAddress; -} - -// -// TEST: Class with different optional members. -// -class Optional3 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Class with optional members using different tags. -// -class Optional4 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Interface with optional parameters. -// -interface OptionalParameters0 -{ - void op1(string firstName, optional(1) string secondName, - optional(2) string emailAddress); -} - -// -// TEST: Interface with optional parameters, different order. -// -interface OptionalParameters1 -{ - void op1(string firstName, optional(1) string secondName, - optional(2) string emailAddress); -} - -// -// TEST: Interface with optional parameters, different tags. -// -interface OptionalParameters2 -{ - void op1(string firstName, optional(1) string emailAddress, - optional(2) string secondName); -} - -// -// TEST: Interface with different optional parameters. -// -interface OptionalParameters3 -{ - void op1(string firstName, optional(1) string emailAddress, - string secondName); -} - -// -// TEST: Interface with optional return type. -// -interface OptionalReturn0 -{ - optional(1) int op(); -} - -// -// TEST: Interface that changes optional return type. -// -interface OptionalReturn2 -{ - optional(1) int op(); -} - -// -// TEST: Local -// -local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 } - -// -// TEST: Local -// -local sequence<string> LocalSequence; - -// -// TEST: Local -// -local dictionary<string, string> LocalDictionary; - -// -// TEST: Local -// -local struct LocalStruct -{ - string str; -} - -// -// TEST: Local -// -local class LocalClass -{ -} - -} diff --git a/java-compat/test/src/main/java/test/Ice/checksum/TypesServer.ice b/java-compat/test/src/main/java/test/Ice/checksum/TypesServer.ice deleted file mode 100644 index 426d1eca734..00000000000 --- a/java-compat/test/src/main/java/test/Ice/checksum/TypesServer.ice +++ /dev/null @@ -1,608 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#pragma once - -[["java:package:test.Ice.checksum.server"]] -[["suppress-warning:deprecated"]] // For classes with operations -module Test -{ - -// -// TEST: Same -// -const int IntConst1 = 100; - -// -// TEST: Value changed -// -const int IntConst2 = 1000; - -// -// TEST: Type changed -// -const short IntConst3 = 100; - -// -// TEST: Same -// -enum Enum1 { Enum11, Enum12, Enum13 } - -// -// TEST: Add enumerator -// -enum Enum2 { Enum21, Enum22, Enum23, Enum24 } - -// -// TEST: Remove enumerator -// -enum Enum3 { Enum32, Enum33 } - -// -// TEST: Enum with explicit values. -// -enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 } - -// -// TEST: Enum with same explicit values, different order. -// -enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit13 = 3, EnumExplicit12 = 2 } - -// -// TEST: Enum with different explicit values. -// -enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 3, EnumExplicit23 } - -// -// TEST: Enum with explicit values, removed enumerator. -// -enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2} - -// -// TEST: Change to a different type -// -class Enum4 {} - -// -// TEST: Same -// -sequence<int> Sequence1; - -// -// TEST: Change sequence type -// -sequence<short> Sequence2; - -// -// TEST: Change to a different type -// -class Sequence3 {} - -// -// TEST: Same -// -dictionary<string, int> Dictionary1; - -// -// TEST: Change key type -// -dictionary<long, int> Dictionary2; - -// -// TEST: Change value type -// -dictionary<string, bool> Dictionary3; - -// -// TEST: Change to a different type -// -class Dictionary4 {} - -// -// TEST: Same -// -struct Struct1 -{ - string str; - bool b; -} - -// -// TEST: Add member -// -struct Struct2 -{ - string str; - bool b; - float f; -} - -// -// TEST: Change member type -// -struct Struct3 -{ - string str; - double b; -} - -// -// TEST: Remove member -// -struct Struct4 -{ - bool b; -} - -// -// TEST: Change to a different type -// -class Struct5 {} - -// -// TEST: Same -// -interface Interface1 -{ -} - -// -// TEST: Change interface to class -// -class Interface2 -{ -} - -// -// TEST: Add base interface -// -interface Interface3 extends Interface1 -{ -} - -// -// TEST: Add operation -// -interface Interface4 -{ - void opInterface4(); -} - -// -// TEST: Same -// -class EmptyClass1 -{ -} - -// -// TEST: Add data member -// -class EmptyClass2 -{ - double d; -} - -// -// TEST: Add operation -// -class EmptyClass3 -{ - void newOp(); -} - -// -// TEST: Add base class -// -class EmptyClass4 extends EmptyClass1 -{ -} - -// -// TEST: Add interface -// -class EmptyClass5 implements Interface1 -{ -} - -// -// TEST: Same -// -class SimpleClass1 -{ - string str; - float f; -} - -// -// TEST: Add operation -// -class SimpleClass2 -{ - string str; - float f; - void newOp(); -} - -// -// TEST: Rename member -// -class SimpleClass3 -{ - string str; - float g; -} - -// -// TEST: Add member -// -class SimpleClass4 -{ - string str; - float f; - bool b; -} - -// -// TEST: Remove member -// -class SimpleClass5 -{ - string str; -} - -// -// TEST: Reorder members -// -class SimpleClass6 -{ - float f; - string str; -} - -// -// TEST: Change member type -// -class SimpleClass7 -{ - string str; - double f; -} - -// -// TEST: Same -// -exception Exception1 -{ - string str; - bool b; -} - -// -// TEST: Add member -// -exception Exception2 -{ - string str; - bool b; - float f; -} - -// -// TEST: Change member type -// -exception Exception3 -{ - string str; - double b; -} - -// -// TEST: Remove member -// -exception Exception4 -{ - bool b; -} - -// -// TEST: Add base exception -// -exception Exception5 extends Exception1 -{ -} - -// -// TEST: Change to a different type -// -class Exception6 {} - -// -// TEST: Exception with optional members. -// -exception OptionalEx0 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Exception with optional members, different order, same tags. -// -exception OptionalEx1 -{ - string firstName; - optional(2) string emailAddress; - optional(1) string secondName; -} - -// -// TEST: Exception with different optional members. -// -exception OptionalEx2 -{ - string firstName; - optional(1) string secondName; - string emailAddress; -} - -// -// TEST: Exception with different optional members. -// -exception OptionalEx3 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; - optional(3) string phoneNumber; -} - -// -// TEST: Exception with optional members using different tags. -// -exception OptionalEx4 -{ - string firstName; - optional(2) string secondName; - optional(1) string emailAddress; -} - -// -// TEST: Same -// -interface BaseInterface1 -{ - void baseOp1(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Change return type -// -interface BaseInterface2 -{ - int baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add parameter -// -interface BaseInterface3 -{ - void baseOp(Object o); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add exception -// -interface BaseInterface4 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1, Exception2; -} - -// -// TEST: Change out parameter to in parameter -// -interface BaseInterface5 -{ - void baseOp(); - void baseOp2(int i, string s) throws Exception1; -} - -// -// TEST: Remove parameter -// -interface BaseInterface6 -{ - void baseOp(); - void baseOp2(out string s) throws Exception1; -} - -// -// TEST: Remove exception -// -interface BaseInterface7 -{ - void baseOp(); - void baseOp2(int i, out string s); -} - -// -// TEST: Remove operation -// -interface BaseInterface8 -{ - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add base class -// -interface BaseInterface9 extends Interface1 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Class with compact id -// -class Compact1(1) -{ - int id; -} - -// -// TEST: Derived from class with compact id -// -class Derived1 extends Compact1 -{ -} - -// -// TEST: Same class names but different compact id -// -class Compact2(3) -{ - int id; -} - -// -// TEST: Class with optional members. -// -class Optional0 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Interface with optional members, different order, same tags. -// -class Optional1 -{ - string firstName; - optional(2) string emailAddress; - optional(1) string secondName; -} - -// -// TEST: Interface with different optional members. -// -class Optional2 -{ - string firstName; - optional(1) string secondName; - string emailAddress; -} - -// -// TEST: Interface with different optional members. -// -class Optional3 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; - optional(3) string phoneNumber; -} - -// -// TEST: Interface with optional members using different tags. -// -class Optional4 -{ - string firstName; - optional(2) string secondName; - optional(1) string emailAddress; -} - -// -// TEST: Interface with optional parameters. -// -interface OptionalParameters0 -{ - void op1(string firstName, optional(1) string secondName, - optional(2) string emailAddress); -} - -// -// TEST: Interface with optional parameters, different order. -// -interface OptionalParameters1 -{ - void op1(string firstName, optional(2) string emailAddress, - optional(1) string secondName); -} - -// -// TEST: Interface with optional parameters, different tags. -// -interface OptionalParameters2 -{ - void op1(string firstName, optional(2) string emailAddress, - optional(1) string secondName); -} - -// -// TEST: Interface with different optional parameters. -// -interface OptionalParameters3 -{ - void op1(string firstName, string emailAddress, - optional(1) string secondName); -} - -// -// TEST: Interface with optional return type. -// -interface OptionalReturn0 -{ - optional(1) int op(); -} - -// -// TEST: Interface that changes optional return type. -// -interface OptionalReturn2 -{ - int op(); -} - -// -// TEST: Local -// -local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 } - -// -// TEST: Local -// -local sequence<string> LocalSequence; - -// -// TEST: Local -// -local dictionary<string, string> LocalDictionary; - -// -// TEST: Local -// -local struct LocalStruct -{ - string str; -} - -// -// TEST: Local -// -local class LocalClass -{ -} - -} diff --git a/java/src/Glacier2/build.gradle b/java/src/Glacier2/build.gradle index a95264612a7..f4b141c5e34 100644 --- a/java/src/Glacier2/build.gradle +++ b/java/src/Glacier2/build.gradle @@ -16,7 +16,6 @@ sourceSets { slice { java { - args = "--checksum com.zeroc.Glacier2.SliceChecksums" files = fileTree(dir: "$project.ext.topSrcDir/slice/Glacier2", includes:['*.ice'], excludes:["*F.ice"]) } } diff --git a/java/src/IceBox/build.gradle b/java/src/IceBox/build.gradle index a6cc45677cd..22c742cda5c 100644 --- a/java/src/IceBox/build.gradle +++ b/java/src/IceBox/build.gradle @@ -8,7 +8,6 @@ project.ext.description = "IceBox is an easy-to-use framework for Ice applicatio slice { java { - args = "--checksum com.zeroc.IceBox.SliceChecksums" files = fileTree(dir: "$project.ext.topSrcDir/slice/IceBox", includes:['*.ice'], excludes:["*F.ice"]) } } diff --git a/java/src/IceBox/src/main/java/com/zeroc/IceBox/ServiceManagerI.java b/java/src/IceBox/src/main/java/com/zeroc/IceBox/ServiceManagerI.java index b9fde6d039a..06c4cacb207 100644 --- a/java/src/IceBox/src/main/java/com/zeroc/IceBox/ServiceManagerI.java +++ b/java/src/IceBox/src/main/java/com/zeroc/IceBox/ServiceManagerI.java @@ -50,12 +50,6 @@ public class ServiceManagerI implements ServiceManager } @Override - public java.util.Map<String, String> getSliceChecksums(Current current) - { - return SliceChecksums.checksums; - } - - @Override public void startService(String name, Current current) throws AlreadyStartedException, NoSuchServiceException diff --git a/java/src/IceGrid/build.gradle b/java/src/IceGrid/build.gradle index 3d30b1bf6a7..8ad6d8ffdb0 100644 --- a/java/src/IceGrid/build.gradle +++ b/java/src/IceGrid/build.gradle @@ -7,7 +7,6 @@ project.ext.description = "Locate, deploy, and manage Ice servers" slice { java { - args = "--checksum com.zeroc.IceGrid.SliceChecksums" files = fileTree(dir: "$project.ext.topSrcDir/slice/IceGrid", includes:['*.ice'], excludes:["*F.ice"]) } } diff --git a/java/src/IceStorm/build.gradle b/java/src/IceStorm/build.gradle index 1cee467433e..cbff612fa23 100644 --- a/java/src/IceStorm/build.gradle +++ b/java/src/IceStorm/build.gradle @@ -16,7 +16,6 @@ sourceSets { slice { java { - args = "--checksum com.zeroc.IceStorm.SliceChecksums" files = fileTree(dir: "$project.ext.topSrcDir/slice/IceStorm", includes:['*.ice'], excludes:["*F.ice"]) } } diff --git a/java/test/slice.gradle b/java/test/slice.gradle index 432ba4d3f53..288290d483d 100644 --- a/java/test/slice.gradle +++ b/java/test/slice.gradle @@ -61,20 +61,10 @@ task testSliceTask { 'Slice/structure/*.ice']) } set2 { - args = "--checksum test.Ice.checksum.Test.SliceChecksums" - files = fileTree(dir: testDir, includes:['Ice/checksum/Test.ice', - 'Ice/checksum/Types.ice']) - } - set3 { - args = "--checksum test.Ice.checksum.server.Test.SliceChecksums" - files = fileTree(dir: testDir, includes:['Ice/checksum/TestServer.ice', - 'Ice/checksum/TypesServer.ice']) - } - set4 { include = ["${testDir}/Ice/packagemd"] files = fileTree(dir: testDir, includes:['Ice/packagemd/*.ice']) } - set5 { + set3 { args = "--impl" files = fileTree(dir: testDir, includes:['Ice/impl/Test.ice', 'Ice/impl/TestAMD.ice']) diff --git a/java/test/src/main/java/test/Ice/checksum/AllTests.java b/java/test/src/main/java/test/Ice/checksum/AllTests.java deleted file mode 100644 index ebe505599b7..00000000000 --- a/java/test/src/main/java/test/Ice/checksum/AllTests.java +++ /dev/null @@ -1,88 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -package test.Ice.checksum; - -import java.io.PrintWriter; -import test.Ice.checksum.Test.*; - -public class AllTests -{ - private static void test(boolean b) - { - if(!b) - { - throw new RuntimeException(); - } - } - - public static ChecksumPrx allTests(test.TestHelper helper, boolean collocated) - { - com.zeroc.Ice.Communicator communicator = helper.communicator(); - PrintWriter out = helper.getWriter(); - - String ref = "test:" + helper.getTestEndpoint(0); - com.zeroc.Ice.ObjectPrx base = communicator.stringToProxy(ref); - test(base != null); - - ChecksumPrx checksum = ChecksumPrx.checkedCast(base); - test(checksum != null); - - // - // Verify that no checksums are present for local types. - // - out.print("testing checksums... "); - out.flush(); - for(java.util.Map.Entry<String, String> p : SliceChecksums.checksums.entrySet()) - { - String key = p.getKey(); - int pos = key.indexOf("Local"); - test(pos == -1); - } - - // - // Get server's Slice checksums. - // - java.util.Map<String, String> d = checksum.getSliceChecksums(); - - // - // Compare the checksums. For a type FooN whose name ends in an integer N, - // we assume that the server's type does not change for N = 1, and does - // change for N > 1. - // - java.util.regex.Pattern patt = java.util.regex.Pattern.compile("\\d+"); - for(java.util.Map.Entry<String, String> p : d.entrySet()) - { - int n = 0; - String key = p.getKey(); - java.util.regex.Matcher m = patt.matcher(key); - if(m.find()) - { - try - { - n = Integer.parseInt(key.substring(m.start(), m.end())); - } - catch(NumberFormatException ex) - { - test(false); - } - } - - String value = SliceChecksums.checksums.get(key); - test(value != null); - - if(n <= 1) - { - test(value.equals(p.getValue())); - } - else - { - test(!value.equals(p.getValue())); - } - } - out.println("ok"); - - return checksum; - } -} diff --git a/java/test/src/main/java/test/Ice/checksum/ChecksumI.java b/java/test/src/main/java/test/Ice/checksum/ChecksumI.java deleted file mode 100644 index 14f78ee5ca9..00000000000 --- a/java/test/src/main/java/test/Ice/checksum/ChecksumI.java +++ /dev/null @@ -1,26 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -package test.Ice.checksum; - -import test.Ice.checksum.server.Test.*; - -public final class ChecksumI implements Checksum -{ - public ChecksumI() - { - } - - @Override - public java.util.Map<String, String> getSliceChecksums(com.zeroc.Ice.Current current) - { - return SliceChecksums.checksums; - } - - @Override - public void shutdown(com.zeroc.Ice.Current current) - { - current.adapter.getCommunicator().shutdown(); - } -} diff --git a/java/test/src/main/java/test/Ice/checksum/Client.java b/java/test/src/main/java/test/Ice/checksum/Client.java deleted file mode 100644 index 75b1ccf5b81..00000000000 --- a/java/test/src/main/java/test/Ice/checksum/Client.java +++ /dev/null @@ -1,21 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -package test.Ice.checksum; - -import test.Ice.checksum.Test.ChecksumPrx; - -public class Client extends test.TestHelper -{ - public void run(String[] args) - { - com.zeroc.Ice.Properties properties = createTestProperties(args); - properties.setProperty("Ice.Package.Test", "test.Ice.checksum"); - try(com.zeroc.Ice.Communicator communicator = initialize(properties)) - { - ChecksumPrx checksum = AllTests.allTests(this, false); - checksum.shutdown(); - } - } -} diff --git a/java/test/src/main/java/test/Ice/checksum/Server.java b/java/test/src/main/java/test/Ice/checksum/Server.java deleted file mode 100644 index e30afed1b90..00000000000 --- a/java/test/src/main/java/test/Ice/checksum/Server.java +++ /dev/null @@ -1,23 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -package test.Ice.checksum; - -public class Server extends test.TestHelper -{ - public void run(String[] args) - { - com.zeroc.Ice.Properties properties = createTestProperties(args); - properties.setProperty("Ice.Package.Test", "test.Ice.checksum.server"); - try(com.zeroc.Ice.Communicator communicator = initialize(properties)) - { - communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0)); - com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new ChecksumI(), com.zeroc.Ice.Util.stringToIdentity("test")); - adapter.activate(); - serverReady(); - communicator.waitForShutdown(); - } - } -} diff --git a/java/test/src/main/java/test/Ice/checksum/Test.ice b/java/test/src/main/java/test/Ice/checksum/Test.ice deleted file mode 100644 index f3e116d2577..00000000000 --- a/java/test/src/main/java/test/Ice/checksum/Test.ice +++ /dev/null @@ -1,20 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#pragma once - -#include <Ice/SliceChecksumDict.ice> - -[["java:package:test.Ice.checksum"]] -module Test -{ - -interface Checksum -{ - idempotent Ice::SliceChecksumDict getSliceChecksums(); - - void shutdown(); -} - -} diff --git a/java/test/src/main/java/test/Ice/checksum/TestServer.ice b/java/test/src/main/java/test/Ice/checksum/TestServer.ice deleted file mode 100644 index 3ef0e593a88..00000000000 --- a/java/test/src/main/java/test/Ice/checksum/TestServer.ice +++ /dev/null @@ -1,21 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#pragma once - -#include <Ice/SliceChecksumDict.ice> - -[["java:package:test.Ice.checksum.server"]] // For classes with operations - -module Test -{ - -interface Checksum -{ - idempotent Ice::SliceChecksumDict getSliceChecksums(); - - void shutdown(); -} - -} diff --git a/java/test/src/main/java/test/Ice/checksum/Types.ice b/java/test/src/main/java/test/Ice/checksum/Types.ice deleted file mode 100644 index 7ecbd2940de..00000000000 --- a/java/test/src/main/java/test/Ice/checksum/Types.ice +++ /dev/null @@ -1,610 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#pragma once - -[["java:package:test.Ice.checksum"]] -module Test -{ - -// -// TEST: Same -// -const int IntConst1 = 100; - -// -// TEST: Value changed -// -const int IntConst2 = 100; - -// -// TEST: Type changed -// -const int IntConst3 = 100; - -// -// TEST: Same -// -enum Enum1 { Enum11, Enum12, Enum13 } - -// -// TEST: Add enumerator -// -enum Enum2 { Enum21, Enum22, Enum23 } - -// -// TEST: Remove enumerator -// -enum Enum3 { Enum31, Enum32, Enum33 } - -// -// TEST: Change to a different type -// -enum Enum4 { Enum41, Enum42, Enum43 } - -// -// TEST: Enum with explicit values. -// -enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 } - -// -// TEST: Enum with same explicit values, different order. -// -enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit12 = 2, EnumExplicit13 = 3 } - -// -// TEST: Enum with different explicit values. -// -enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 2, EnumExplicit23 = 3} - -// -// TEST: Enum with explicit values, removed enumerator. -// -enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2, EnumExplicit33 = 3} - -// -// TEST: Same -// -sequence<int> Sequence1; - -// -// TEST: Change sequence type -// -sequence<int> Sequence2; - -// -// TEST: Change to a different type -// -sequence<int> Sequence3; - -// -// TEST: Same -// -dictionary<string, int> Dictionary1; - -// -// TEST: Change key type -// -dictionary<string, int> Dictionary2; - -// -// TEST: Change value type -// -dictionary<string, int> Dictionary3; - -// -// TEST: Change to a different type -// -dictionary<string, int> Dictionary4; - -// -// TEST: Same -// -struct Struct1 -{ - string str; - bool b; -} - -// -// TEST: Add member -// -struct Struct2 -{ - string str; - bool b; -} - -// -// TEST: Change member type -// -struct Struct3 -{ - string str; - bool b; -} - -// -// TEST: Remove member -// -struct Struct4 -{ - string str; - bool b; -} - -// -// TEST: Change to a different type -// -struct Struct5 -{ - string str; - bool b; -} - -// -// TEST: Same -// -interface Interface1 -{ -} - -// -// TEST: Change interface to class -// -interface Interface2 -{ -} - -// -// TEST: Add base interface -// -interface Interface3 -{ -} - -// -// TEST: Add operation -// -interface Interface4 -{ -} - -// -// TEST: Same -// -class EmptyClass1 -{ -} - -// -// TEST: Add data member -// -class EmptyClass2 -{ -} - -// -// TEST: Add operation -// -class EmptyClass3 -{ -} - -// -// TEST: Add base class -// -class EmptyClass4 -{ -} - -// -// TEST: Add interface -// -class EmptyClass5 -{ -} - -// -// TEST: Same -// -class SimpleClass1 -{ - string str; - float f; -} - -// -// TEST: Add operation -// -class SimpleClass2 -{ - string str; - float f; -} - -// -// TEST: Rename member -// -class SimpleClass3 -{ - string str; - float f; -} - -// -// TEST: Add member -// -class SimpleClass4 -{ - string str; - float f; -} - -// -// TEST: Remove member -// -class SimpleClass5 -{ - string str; - float f; -} - -// -// TEST: Reorder members -// -class SimpleClass6 -{ - string str; - float f; -} - -// -// TEST: Change member type -// -class SimpleClass7 -{ - string str; - float f; -} - -// -// TEST: Same -// -exception Exception1 -{ - string str; - bool b; -} - -// -// TEST: Add member -// -exception Exception2 -{ - string str; - bool b; -} - -// -// TEST: Change member type -// -exception Exception3 -{ - string str; - bool b; -} - -// -// TEST: Remove member -// -exception Exception4 -{ - string str; - bool b; -} - -// -// TEST: Add base exception -// -exception Exception5 -{ -} - -// -// TEST: Change to a different type -// -exception Exception6 -{ - string str; - bool b; -} - -// -// TEST: Exception with optional members. -// -exception OptionalEx0 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Exception with optional members, different order, same tags. -// -exception OptionalEx1 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Exception with different optional members. -// -exception OptionalEx2 -{ - string firstName; - string secondName; - optional(1) string emailAddress; -} - -// -// TEST: Exception with different optional members. -// -exception OptionalEx3 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Exception with optional members using different tags. -// -exception OptionalEx4 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Same -// -interface BaseInterface1 -{ - void baseOp1(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Change return type -// -interface BaseInterface2 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add parameter -// -interface BaseInterface3 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add exception -// -interface BaseInterface4 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Change out parameter to in parameter -// -interface BaseInterface5 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Remove parameter -// -interface BaseInterface6 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Remove exception -// -interface BaseInterface7 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Remove operation -// -interface BaseInterface8 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add base interface -// -interface BaseInterface9 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Class with compact id -// -class Compact1(1) -{ - int id; -} - -// -// TEST: Derived from class with compact id -// -class Derived1 extends Compact1 -{ -} - -// -// TEST: Same class names but different compact id -// -class Compact2(2) -{ - int id; -} - -// -// TEST: Class with optional members. -// -class Optional0 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Class with optional members, different order, same tags. -// -class Optional1 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Class with different optional members. -// -class Optional2 -{ - string firstName; - string secondName; - optional(1) string emailAddress; -} - -// -// TEST: Class with different optional members. -// -class Optional3 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Class with optional members using different tags. -// -class Optional4 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Interface with optional parameters. -// -interface OptionalParameters0 -{ - void op1(string firstName, optional(1) string secondName, - optional(2) string emailAddress); -} - -// -// TEST: Interface with optional parameters, different order. -// -interface OptionalParameters1 -{ - void op1(string firstName, optional(1) string secondName, - optional(2) string emailAddress); -} - -// -// TEST: Interface with optional parameters, different tags. -// -interface OptionalParameters2 -{ - void op1(string firstName, optional(1) string emailAddress, - optional(2) string secondName); -} - -// -// TEST: Interface with different optional parameters. -// -interface OptionalParameters3 -{ - void op1(string firstName, optional(1) string emailAddress, - string secondName); -} - -// -// TEST: Interface with optional return type. -// -interface OptionalReturn0 -{ - optional(1) int op(); -} - -// -// TEST: Interface that changes optional return type. -// -interface OptionalReturn2 -{ - optional(1) int op(); -} - -// -// TEST: Local -// -local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 } - -// -// TEST: Local -// -local sequence<string> LocalSequence; - -// -// TEST: Local -// -local dictionary<string, string> LocalDictionary; - -// -// TEST: Local -// -local struct LocalStruct -{ - string str; -} - -// -// TEST: Local -// -local class LocalClass -{ -} - -} diff --git a/java/test/src/main/java/test/Ice/checksum/TypesServer.ice b/java/test/src/main/java/test/Ice/checksum/TypesServer.ice deleted file mode 100644 index ff3a082ce27..00000000000 --- a/java/test/src/main/java/test/Ice/checksum/TypesServer.ice +++ /dev/null @@ -1,609 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#pragma once - -[["java:package:test.Ice.checksum.server"]] -[["suppress-warning:deprecated"]] - -module Test -{ - -// -// TEST: Same -// -const int IntConst1 = 100; - -// -// TEST: Value changed -// -const int IntConst2 = 1000; - -// -// TEST: Type changed -// -const short IntConst3 = 100; - -// -// TEST: Same -// -enum Enum1 { Enum11, Enum12, Enum13 } - -// -// TEST: Add enumerator -// -enum Enum2 { Enum21, Enum22, Enum23, Enum24 } - -// -// TEST: Remove enumerator -// -enum Enum3 { Enum32, Enum33 } - -// -// TEST: Enum with explicit values. -// -enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 } - -// -// TEST: Enum with same explicit values, different order. -// -enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit13 = 3, EnumExplicit12 = 2 } - -// -// TEST: Enum with different explicit values. -// -enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 3, EnumExplicit23 } - -// -// TEST: Enum with explicit values, removed enumerator. -// -enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2} - -// -// TEST: Change to a different type -// -class Enum4 {} - -// -// TEST: Same -// -sequence<int> Sequence1; - -// -// TEST: Change sequence type -// -sequence<short> Sequence2; - -// -// TEST: Change to a different type -// -class Sequence3 {} - -// -// TEST: Same -// -dictionary<string, int> Dictionary1; - -// -// TEST: Change key type -// -dictionary<long, int> Dictionary2; - -// -// TEST: Change value type -// -dictionary<string, bool> Dictionary3; - -// -// TEST: Change to a different type -// -class Dictionary4 {} - -// -// TEST: Same -// -struct Struct1 -{ - string str; - bool b; -} - -// -// TEST: Add member -// -struct Struct2 -{ - string str; - bool b; - float f; -} - -// -// TEST: Change member type -// -struct Struct3 -{ - string str; - double b; -} - -// -// TEST: Remove member -// -struct Struct4 -{ - bool b; -} - -// -// TEST: Change to a different type -// -class Struct5 {} - -// -// TEST: Same -// -interface Interface1 -{ -} - -// -// TEST: Change interface to class -// -class Interface2 -{ -} - -// -// TEST: Add base interface -// -interface Interface3 extends Interface1 -{ -} - -// -// TEST: Add operation -// -interface Interface4 -{ - void opInterface4(); -} - -// -// TEST: Same -// -class EmptyClass1 -{ -} - -// -// TEST: Add data member -// -class EmptyClass2 -{ - double d; -} - -// -// TEST: Add operation -// -class EmptyClass3 -{ - void newOp(); -} - -// -// TEST: Add base class -// -class EmptyClass4 extends EmptyClass1 -{ -} - -// -// TEST: Add interface -// -class EmptyClass5 implements Interface1 -{ -} - -// -// TEST: Same -// -class SimpleClass1 -{ - string str; - float f; -} - -// -// TEST: Add operation -// -class SimpleClass2 -{ - string str; - float f; - void newOp(); -} - -// -// TEST: Rename member -// -class SimpleClass3 -{ - string str; - float g; -} - -// -// TEST: Add member -// -class SimpleClass4 -{ - string str; - float f; - bool b; -} - -// -// TEST: Remove member -// -class SimpleClass5 -{ - string str; -} - -// -// TEST: Reorder members -// -class SimpleClass6 -{ - float f; - string str; -} - -// -// TEST: Change member type -// -class SimpleClass7 -{ - string str; - double f; -} - -// -// TEST: Same -// -exception Exception1 -{ - string str; - bool b; -} - -// -// TEST: Add member -// -exception Exception2 -{ - string str; - bool b; - float f; -} - -// -// TEST: Change member type -// -exception Exception3 -{ - string str; - double b; -} - -// -// TEST: Remove member -// -exception Exception4 -{ - bool b; -} - -// -// TEST: Add base exception -// -exception Exception5 extends Exception1 -{ -} - -// -// TEST: Change to a different type -// -class Exception6 {} - -// -// TEST: Exception with optional members. -// -exception OptionalEx0 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Exception with optional members, different order, same tags. -// -exception OptionalEx1 -{ - string firstName; - optional(2) string emailAddress; - optional(1) string secondName; -} - -// -// TEST: Exception with different optional members. -// -exception OptionalEx2 -{ - string firstName; - optional(1) string secondName; - string emailAddress; -} - -// -// TEST: Exception with different optional members. -// -exception OptionalEx3 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; - optional(3) string phoneNumber; -} - -// -// TEST: Exception with optional members using different tags. -// -exception OptionalEx4 -{ - string firstName; - optional(2) string secondName; - optional(1) string emailAddress; -} - -// -// TEST: Same -// -interface BaseInterface1 -{ - void baseOp1(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Change return type -// -interface BaseInterface2 -{ - int baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add parameter -// -interface BaseInterface3 -{ - void baseOp(Object o); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add exception -// -interface BaseInterface4 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1, Exception2; -} - -// -// TEST: Change out parameter to in parameter -// -interface BaseInterface5 -{ - void baseOp(); - void baseOp2(int i, string s) throws Exception1; -} - -// -// TEST: Remove parameter -// -interface BaseInterface6 -{ - void baseOp(); - void baseOp2(out string s) throws Exception1; -} - -// -// TEST: Remove exception -// -interface BaseInterface7 -{ - void baseOp(); - void baseOp2(int i, out string s); -} - -// -// TEST: Remove operation -// -interface BaseInterface8 -{ - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add base class -// -interface BaseInterface9 extends Interface1 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Class with compact id -// -class Compact1(1) -{ - int id; -} - -// -// TEST: Derived from class with compact id -// -class Derived1 extends Compact1 -{ -} - -// -// TEST: Same class names but different compact id -// -class Compact2(3) -{ - int id; -} - -// -// TEST: Class with optional members. -// -class Optional0 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Class with optional members, different order, same tags. -// -class Optional1 -{ - string firstName; - optional(2) string emailAddress; - optional(1) string secondName; -} - -// -// TEST: Class with different optional members. -// -class Optional2 -{ - string firstName; - optional(1) string secondName; - string emailAddress; -} - -// -// TEST: Class with different optional members. -// -class Optional3 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; - optional(3) string phoneNumber; -} - -// -// TEST: Class with optional members using different tags. -// -class Optional4 -{ - string firstName; - optional(2) string secondName; - optional(1) string emailAddress; -} - -// -// TEST: Interface with optional parameters. -// -interface OptionalParameters0 -{ - void op1(string firstName, optional(1) string secondName, - optional(2) string emailAddress); -} - -// -// TEST: Interface with optional parameters, different order. -// -interface OptionalParameters1 -{ - void op1(string firstName, optional(2) string emailAddress, - optional(1) string secondName); -} - -// -// TEST: Interface with optional parameters, different tags. -// -interface OptionalParameters2 -{ - void op1(string firstName, optional(2) string emailAddress, - optional(1) string secondName); -} - -// -// TEST: Interface with different optional parameters. -// -interface OptionalParameters3 -{ - void op1(string firstName, string emailAddress, - optional(1) string secondName); -} - -// -// TEST: Interface with optional return type. -// -interface OptionalReturn0 -{ - optional(1) int op(); -} - -// -// TEST: Interface that changes optional return type. -// -interface OptionalReturn2 -{ - int op(); -} - -// -// TEST: Local -// -local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 } - -// -// TEST: Local -// -local sequence<string> LocalSequence; - -// -// TEST: Local -// -local dictionary<string, string> LocalDictionary; - -// -// TEST: Local -// -local struct LocalStruct -{ - string str; -} - -// -// TEST: Local -// -local class LocalClass -{ -} - -} diff --git a/js/src/Ice/.gitignore b/js/src/Ice/.gitignore index 7055973191e..e429c9802cb 100644 --- a/js/src/Ice/.gitignore +++ b/js/src/Ice/.gitignore @@ -71,8 +71,6 @@ ServantLocator.d.ts ServantLocator.js ServantLocatorF.d.ts ServantLocatorF.js -SliceChecksumDict.d.ts -SliceChecksumDict.js ValueFactory.d.ts ValueFactory.js Version.d.ts diff --git a/js/src/Ice/sources.json b/js/src/Ice/sources.json index fea3eda4f95..6c37eea1603 100644 --- a/js/src/Ice/sources.json +++ b/js/src/Ice/sources.json @@ -37,7 +37,6 @@ "Ice/RouterF.ice", "Ice/ServantLocator.ice", "Ice/ServantLocatorF.ice", - "Ice/SliceChecksumDict.ice", "Ice/ValueFactory.ice", "Ice/Version.ice", "IceSSL/ConnectionInfo.ice", diff --git a/man/man1/slice2cpp.1 b/man/man1/slice2cpp.1 index 3ac2b924e1f..857cd7c0c9b 100644 --- a/man/man1/slice2cpp.1 +++ b/man/man1/slice2cpp.1 @@ -127,11 +127,6 @@ not overwrite an existing file. Generate sample implementation files for the C++98 mapping. This option will not overwrite an existing file. -.TP -.BR \-\-checksum\fR -.br -Generate checksums for Slice definitions. - .SH SEE ALSO .BR slice2cs (1), diff --git a/man/man1/slice2cs.1 b/man/man1/slice2cs.1 index 84631e5b927..57a8256c265 100644 --- a/man/man1/slice2cs.1 +++ b/man/man1/slice2cs.1 @@ -106,11 +106,6 @@ existing file. Generate sample implementation files using tie classes. This option will not overwrite an existing file. -.TP -.BR \-\-checksum " " CLASS\fR -.br -Generate checksums for Slice definitions. - .SH SEE ALSO .BR slice2cpp (1), diff --git a/man/man1/slice2java.1 b/man/man1/slice2java.1 index 967b483a4d4..fc9d5a47096 100644 --- a/man/man1/slice2java.1 +++ b/man/man1/slice2java.1 @@ -115,14 +115,6 @@ Generate sample implementation files using tie classes. This option will not overwrite an existing file. (Java Compat only) .TP -.BR \-\-checksum " " CLASS\fR -.br -Generate checksums for Slice definitions into the class CLASS. The given class -name may optionally contain a package specifier. The generated class contains -checksums for all of the Slice files being translated by this invocation of -the compiler. - -.TP .BR \-\-meta " " META\fR .br Define the file metadata directive META. Using this option is equivalent to diff --git a/man/man1/slice2php.1 b/man/man1/slice2php.1 index 82b5ddea1c7..6d4fec9f5fc 100644 --- a/man/man1/slice2php.1 +++ b/man/man1/slice2php.1 @@ -96,11 +96,6 @@ Generate code for all Slice definitions, including those from included files. .br Generate code without support for PHP namespaces (deprecated). -.TP -.BR \-\-checksum " " CLASS\fR -.br -Generate checksums for Slice definitions. - .SH SEE ALSO .BR slice2cpp (1), diff --git a/man/man1/slice2py.1 b/man/man1/slice2py.1 index 8c2e069f73b..fdeeed75e3c 100644 --- a/man/man1/slice2py.1 +++ b/man/man1/slice2py.1 @@ -89,11 +89,6 @@ format depends on whether --depend or --depend-xml is also specified. Generate code for all Slice definitions, including those from included files. .TP -.BR \-\-checksum " " CLASS\fR -.br -Generate checksums for Slice definitions. - -.TP .BR \-\-prefix " " PREFIX\fR .br Use PREFIX as the prefix for generated file names. diff --git a/man/man1/slice2rb.1 b/man/man1/slice2rb.1 index 2bf53e9d2e6..6b55c388583 100644 --- a/man/man1/slice2rb.1 +++ b/man/man1/slice2rb.1 @@ -88,11 +88,6 @@ format depends on whether --depend or --depend-xml is also specified. .br Generate code for all Slice definitions, including those from included files. -.TP -.BR \-\-checksum " " CLASS\fR -.br -Generate checksums for Slice definitions. - .SH SEE ALSO .BR slice2cpp (1), diff --git a/matlab/lib/msbuild/ice.proj b/matlab/lib/msbuild/ice.proj index 2b2f089d070..6b2303f206b 100644 --- a/matlab/lib/msbuild/ice.proj +++ b/matlab/lib/msbuild/ice.proj @@ -25,7 +25,6 @@ <SliceCompile Include="..\..\..\slice\Ice\PropertiesAdmin.ice" /> <SliceCompile Include="..\..\..\slice\Ice\RemoteLogger.ice" /> <SliceCompile Include="..\..\..\slice\Ice\Router.ice" /> - <SliceCompile Include="..\..\..\slice\Ice\SliceChecksumDict.ice" /> <SliceCompile Include="..\..\..\slice\Ice\ValueFactory.ice" /> <SliceCompile Include="..\..\..\slice\Ice\Version.ice" /> <SliceCompile Include="..\..\..\slice\Glacier2\*.ice" /> diff --git a/php/lib/Ice_no_ns.php b/php/lib/Ice_no_ns.php index 385d560aeb6..0cff88c4ab9 100644 --- a/php/lib/Ice_no_ns.php +++ b/php/lib/Ice_no_ns.php @@ -183,9 +183,6 @@ class Ice_FormatType const SlicedFormat = 2; } -global $Ice_sliceChecksums; -$Ice_sliceChecksums = array(); - // // Include certain generated files. // diff --git a/php/lib/Ice_ns.php b/php/lib/Ice_ns.php index ffe5c521135..da443206c1d 100644 --- a/php/lib/Ice_ns.php +++ b/php/lib/Ice_ns.php @@ -187,26 +187,6 @@ namespace Ice const CompactFormat = 1; const SlicedFormat = 2; } - - class SliceChecksumInit - { - public function __construct($checksums) - { - SliceChecksumInit::$_checksums = array_merge(SliceChecksumInit::$_checksums, $checksums); - } - - public static function checksums() - { - return SliceChecksumInit::$_checksums;; - } - - private static $_checksums = array(); - }; - - function sliceChecksums() - { - return SliceChecksumInit::checksums(); - } } namespace diff --git a/php/msbuild/ice.php.proj b/php/msbuild/ice.php.proj index b70a7cdbea0..d9fa4b88195 100644 --- a/php/msbuild/ice.php.proj +++ b/php/msbuild/ice.php.proj @@ -2,7 +2,7 @@ <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemDefinitionGroup> <SliceCompile> - <AdditionalOptions>--ice --checksum</AdditionalOptions> + <AdditionalOptions>--ice</AdditionalOptions> </SliceCompile> </ItemDefinitionGroup> diff --git a/php/msbuild/ice.php.test.proj b/php/msbuild/ice.php.test.proj index 14c93ec7816..8e5396778fc 100644 --- a/php/msbuild/ice.php.test.proj +++ b/php/msbuild/ice.php.test.proj @@ -2,17 +2,11 @@ <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <SliceCompile Include="..\test\**\*.ice" - Exclude="..\test\Ice\checksum\*.ice; - ..\test\Ice\optional\*.ice; + Exclude="..\test\Ice\optional\*.ice; ..\test\Ice\slicing\objects\*.ice"> <OutputDir>$(MSBuildThisFileDirectory)..\test\%(RecursiveDir)</OutputDir> </SliceCompile> - <SliceCompile Include="..\test\Ice\checksum\*.ice"> - <OutputDir>$(MSBuildThisFileDirectory)..\test\Ice\checksum</OutputDir> - <AdditionalOptions>--checksum</AdditionalOptions> - </SliceCompile> - <SliceCompile Include="..\test\Ice\optional\*.ice"> <OutputDir>$(MSBuildThisFileDirectory)..\test\Ice\optional</OutputDir> <AdditionalOptions>-I$(MSBuildThisFileDirectory)..\test\Ice\optional</AdditionalOptions> diff --git a/php/test/Ice/checksum/.gitignore b/php/test/Ice/checksum/.gitignore deleted file mode 100644 index 66cc0dff1cf..00000000000 --- a/php/test/Ice/checksum/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -CTypes.php -Test.php diff --git a/php/test/Ice/checksum/CTypes.ice b/php/test/Ice/checksum/CTypes.ice deleted file mode 100644 index 2de632ba2af..00000000000 --- a/php/test/Ice/checksum/CTypes.ice +++ /dev/null @@ -1,627 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#pragma once - -module Test -{ - -// -// TEST: Same -// -const int IntConst1 = 100; - -// -// TEST: Value changed -// -const int IntConst2 = 100; - -// -// TEST: Type changed -// -const int IntConst3 = 100; - -// -// TEST: Same -// -enum Enum1 { Enum11, Enum12, Enum13 } - -// -// TEST: Add enumerator -// -enum Enum2 { Enum21, Enum22, Enum23 } - -// -// TEST: Remove enumerator -// -enum Enum3 { Enum31, Enum32, Enum33 } - -// -// TEST: Change to a different type -// -enum Enum4 { Enum41, Enum42, Enum43 } - -// -// TEST: Enum with explicit values. -// -enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 } - -// -// TEST: Enum with same explicit values, different order. -// -enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit12 = 2, EnumExplicit13 = 3 } - -// -// TEST: Enum with different explicit values. -// -enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 2, EnumExplicit23 = 3} - -// -// TEST: Enum with explicit values, removed enumerator. -// -enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2, EnumExplicit33 = 3} - -// -// TEST: Same -// -sequence<int> Sequence1; - -// -// TEST: Change sequence type -// -sequence<int> Sequence2; - -// -// TEST: Change to a different type -// -sequence<int> Sequence3; - -// -// TEST: Same -// -dictionary<string, int> Dictionary1; - -// -// TEST: Change key type -// -dictionary<string, int> Dictionary2; - -// -// TEST: Change value type -// -dictionary<string, int> Dictionary3; - -// -// TEST: Change to a different type -// -dictionary<string, int> Dictionary4; - -// -// TEST: Same -// -struct Struct1 -{ - string str; - bool b; -} - -// -// TEST: Add member -// -struct Struct2 -{ - string str; - bool b; -} - -// -// TEST: Change member type -// -struct Struct3 -{ - string str; - bool b; -} - -// -// TEST: Remove member -// -struct Struct4 -{ - string str; - bool b; -} - -// -// TEST: Change to a different type -// -struct Struct5 -{ - string str; - bool b; -} - -// -// TEST: Same -// -interface Interface1 -{ -} - -// -// TEST: Change interface to class -// -interface Interface2 -{ -} - -// -// TEST: Add base interface -// -interface Interface3 -{ -} - -// -// TEST: Add operation -// -interface Interface4 -{ -} - -// -// TEST: Same -// -class EmptyClass1 -{ -} - -// -// TEST: Add data member -// -class EmptyClass2 -{ -} - -// -// TEST: Add operation -// -class EmptyClass3 -{ -} - -// -// TEST: Add base class -// -class EmptyClass4 -{ -} - -// -// TEST: Add interface -// -class EmptyClass5 -{ -} - -// -// TEST: Same -// -class SimpleClass1 -{ - string str; - float f; -} - -// -// TEST: Add operation -// -class SimpleClass2 -{ - string str; - float f; -} - -// -// TEST: Rename member -// -class SimpleClass3 -{ - string str; - float f; -} - -// -// TEST: Add member -// -class SimpleClass4 -{ - string str; - float f; -} - -// -// TEST: Remove member -// -class SimpleClass5 -{ - string str; - float f; -} - -// -// TEST: Reorder members -// -class SimpleClass6 -{ - string str; - float f; -} - -// -// TEST: Change member type -// -class SimpleClass7 -{ - string str; - float f; -} - -// -// TEST: Same -// -exception Exception1 -{ - string str; - bool b; -} - -// -// TEST: Add member -// -exception Exception2 -{ - string str; - bool b; -} - -// -// TEST: Change member type -// -exception Exception3 -{ - string str; - bool b; -} - -// -// TEST: Remove member -// -exception Exception4 -{ - string str; - bool b; -} - -// -// TEST: Add base exception -// -exception Exception5 -{ -} - -// -// TEST: Change to a different type -// -exception Exception6 -{ - string str; - bool b; -} - -// -// TEST: Exception with optional members. -// -exception OptionalEx0 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Exception with optional members, different order, same tags. -// -exception OptionalEx1 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Exception with different optional members. -// -exception OptionalEx2 -{ - string firstName; - string secondName; - optional(1) string emailAddress; -} - -// -// TEST: Exception with different optional members. -// -exception OptionalEx3 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Exception with optional members using different tags. -// -exception OptionalEx4 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Same -// -interface BaseInterface1 -{ - void baseOp1(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Change return type -// -interface BaseInterface2 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add parameter -// -interface BaseInterface3 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add exception -// -interface BaseInterface4 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Change out parameter to in parameter -// -interface BaseInterface5 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Remove parameter -// -interface BaseInterface6 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Remove exception -// -interface BaseInterface7 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Remove operation -// -interface BaseInterface8 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add base class -// -interface BaseInterface9 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add interface -// -interface BaseInterface10 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add base class and interface -// -interface BaseInterface11 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Class with compact id -// -class Compact1(1) -{ - int id; -} - -// -// TEST: Derived from class with compact id -// -class Derived1 extends Compact1 -{ -} - -// -// TEST: Same class names but different compact id -// -class Compact2(2) -{ - int id; -} - -// -// TEST: Class with optional members. -// -class Optional0 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Class with optional members, different order, same tags. -// -class Optional1 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Class with different optional members. -// -class Optional2 -{ - string firstName; - string secondName; - optional(1) string emailAddress; -} - -// -// TEST: Class with different optional members. -// -class Optional3 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Class with optional members using different tags. -// -class Optional4 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Interface with optional parameters. -// -interface OptionalParameters0 -{ - void op1(string firstName, optional(1) string secondName, - optional(2) string emailAddress); -} - -// -// TEST: Interface with optional parameters, different order. -// -interface OptionalParameters1 -{ - void op1(string firstName, optional(1) string secondName, - optional(2) string emailAddress); -} - -// -// TEST: Interface with optional parameters, different tags. -// -interface OptionalParameters2 -{ - void op1(string firstName, optional(1) string emailAddress, - optional(2) string secondName); -} - -// -// TEST: Interface with different optional parameters. -// -interface OptionalParameters3 -{ - void op1(string firstName, optional(1) string emailAddress, - string secondName); -} - -// -// TEST: Interface with optional return type. -// -interface OptionalReturn0 -{ - optional(1) int op(); -} - -// -// TEST: Interface that changes optional return type. -// -interface OptionalReturn2 -{ - optional(1) int op(); -} - -// -// TEST: Local -// -local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 } - -// -// TEST: Local -// -local sequence<string> LocalSequence; - -// -// TEST: Local -// -local dictionary<string, string> LocalDictionary; - -// -// TEST: Local -// -local struct LocalStruct -{ - string str; -} - -// -// TEST: Local -// -local class LocalClass -{ -} - -} diff --git a/php/test/Ice/checksum/Checksums_no_ns.php b/php/test/Ice/checksum/Checksums_no_ns.php deleted file mode 100644 index 4dec22e4a19..00000000000 --- a/php/test/Ice/checksum/Checksums_no_ns.php +++ /dev/null @@ -1,64 +0,0 @@ -<?php -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -function allTests($helper) -{ - global $Ice_sliceChecksums; - $communicator = $helper->communicator(); - $ref = sprintf("test:%s", $helper->getTestEndpoint()); - $base = $communicator->stringToProxy($ref); - test($base); - - $checksum = $base->ice_checkedCast("::Test::Checksum"); - test($checksum); - - // - // Verify that no checksums are present for local types. - // - echo "testing checksums... "; - flush(); - test(count($Ice_sliceChecksums) > 0); - foreach($Ice_sliceChecksums as $i => $value) - { - test(!strpos($i, "Local")); - } - - // - // Get server's Slice checksums. - // - $d = $checksum->getSliceChecksums(); - - // - // Compare the checksums. For a type FooN whose name ends in an integer N, - // we assume that the server's type does not change for N = 1, and does - // change for N > 1. - // - foreach($d as $i => $value) - { - $n = 0; - preg_match("/\\d+/", $i, $matches); - if($matches) - { - $n = (int)$matches[0]; - } - - test(isset($Ice_sliceChecksums[$i])); - - if($n <= 1) - { - test($Ice_sliceChecksums[$i] == $d[$i]); - } - else - { - test($Ice_sliceChecksums[$i] != $d[$i]); - } - } - - echo "ok\n"; - - return $checksum; -} - -?> diff --git a/php/test/Ice/checksum/Checksums_ns.php b/php/test/Ice/checksum/Checksums_ns.php deleted file mode 100644 index 462f7da27bd..00000000000 --- a/php/test/Ice/checksum/Checksums_ns.php +++ /dev/null @@ -1,64 +0,0 @@ -<?php -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -function allTests($helper) -{ - $communicator = $helper->communicator(); - $ref = sprintf("test:%s", $helper->getTestEndpoint()); - $base = $communicator->stringToProxy($ref); - test($base); - - $checksum = $base->ice_checkedCast("::Test::Checksum"); - test($checksum); - - // - // Verify that no checksums are present for local types. - // - echo "testing checksums... "; - flush(); - $localChecksums = Ice\sliceChecksums(); - test(count($localChecksums) > 0); - foreach($localChecksums as $i => $value) - { - test(!strpos($i, "Local")); - } - - // - // Get server's Slice checksums. - // - $d = $checksum->getSliceChecksums(); - - // - // Compare the checksums. For a type FooN whose name ends in an integer N, - // we assume that the server's type does not change for N = 1, and does - // change for N > 1. - // - foreach($d as $i => $value) - { - $n = 0; - preg_match("/\\d+/", $i, $matches); - if($matches) - { - $n = (int)$matches[0]; - } - - test(isset($localChecksums[$i])); - - if($n <= 1) - { - test($localChecksums[$i] == $d[$i]); - } - else - { - test($localChecksums[$i] != $d[$i]); - } - } - - echo "ok\n"; - - return $checksum; -} - -?> diff --git a/php/test/Ice/checksum/Client.php b/php/test/Ice/checksum/Client.php deleted file mode 100644 index 76199dcef49..00000000000 --- a/php/test/Ice/checksum/Client.php +++ /dev/null @@ -1,29 +0,0 @@ -<?php -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -require_once('Test.php'); -require_once('CTypes.php'); -global $NS; -require_once($NS ? "Checksums_ns.php" : "Checksums_no_ns.php"); - -class Client extends TestHelper -{ - function run($args) - { - try - { - $communicator = $this->initialize($args); - $checksum = allTests($this); - $checksum->shutdown(); - $communicator->destroy(); - } - catch(Exception $ex) - { - $communicator->destroy(); - throw $ex; - } - } -} -?> diff --git a/php/test/Ice/checksum/Makefile.mk b/php/test/Ice/checksum/Makefile.mk deleted file mode 100644 index d149f956cd6..00000000000 --- a/php/test/Ice/checksum/Makefile.mk +++ /dev/null @@ -1,7 +0,0 @@ -# -# Copyright (c) ZeroC, Inc. All rights reserved. -# - -$(test)_sliceflags = --checksum - -tests += $(test) diff --git a/php/test/Ice/checksum/Test.ice b/php/test/Ice/checksum/Test.ice deleted file mode 100644 index e487fe94669..00000000000 --- a/php/test/Ice/checksum/Test.ice +++ /dev/null @@ -1,19 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#pragma once - -#include <Ice/SliceChecksumDict.ice> - -module Test -{ - -interface Checksum -{ - idempotent Ice::SliceChecksumDict getSliceChecksums(); - - void shutdown(); -} - -} diff --git a/python/config/Make.rules b/python/config/Make.rules index 08121bf9026..eeff98c0d47 100644 --- a/python/config/Make.rules +++ b/python/config/Make.rules @@ -120,6 +120,6 @@ define make-python-slice $2/$3/$(or $4,%)_ice.py: $1/$3/$(or $4,%).ice $2/$3/.depend/$(or $4,%).ice.d $(slice2py_path) $(E) "Compiling $$<" $(Q)$(slice2py_path) -I$1 --output-dir $2 $5 --depend $$< > $2/$3/.depend/$(or $4,$$(*F)).ice.d - $(Q)$(slice2py_path) -I$1 --output-dir $2 --checksum $5 $$< + $(Q)$(slice2py_path) -I$1 --output-dir $2 $5 $$< endef diff --git a/python/modules/IcePy/Slice.cpp b/python/modules/IcePy/Slice.cpp index e11365d8d40..c0ab744a766 100644 --- a/python/modules/IcePy/Slice.cpp +++ b/python/modules/IcePy/Slice.cpp @@ -64,7 +64,6 @@ IcePy_loadSlice(PyObject* /*self*/, PyObject* args) opts.addOpt("d", "debug"); opts.addOpt("", "ice"); opts.addOpt("", "underscore"); - opts.addOpt("", "checksum"); opts.addOpt("", "all"); vector<string> files; @@ -95,7 +94,6 @@ IcePy_loadSlice(PyObject* /*self*/, PyObject* args) bool ice = true; // This must be true so that we can create Ice::Identity when necessary. bool underscore = opts.isSet("underscore"); bool all = false; - bool checksum = false; if(opts.isSet("D")) { vector<string> optargs = opts.argVec("D"); @@ -122,7 +120,6 @@ IcePy_loadSlice(PyObject* /*self*/, PyObject* args) } debug = opts.isSet("d") || opts.isSet("debug"); all = opts.isSet("all"); - checksum = opts.isSet("checksum"); bool ignoreRedefs = false; bool keepComments = true; @@ -161,7 +158,7 @@ IcePy_loadSlice(PyObject* /*self*/, PyObject* args) // It must be the first or second line. // out << "# -*- coding: utf-8 -*-\n"; - generate(u, all, checksum, includePaths, out); + generate(u, all, includePaths, out); u->destroy(); string code = codeStream.str(); diff --git a/python/modules/IcePy/msbuild/icepy.vcxproj b/python/modules/IcePy/msbuild/icepy.vcxproj index 024f18b923d..710f72888f1 100644 --- a/python/modules/IcePy/msbuild/icepy.vcxproj +++ b/python/modules/IcePy/msbuild/icepy.vcxproj @@ -19,7 +19,6 @@ </ProjectConfiguration> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\..\..\cpp\src\Slice\Checksum.cpp" /> <ClCompile Include="..\..\..\..\cpp\src\Slice\FileTracker.cpp" /> <ClCompile Include="..\..\..\..\cpp\src\Slice\Grammar.cpp" /> <ClCompile Include="..\..\..\..\cpp\src\Slice\MD5.cpp" /> diff --git a/python/modules/IcePy/msbuild/icepy.vcxproj.filters b/python/modules/IcePy/msbuild/icepy.vcxproj.filters index 2ce99eb8a4d..0ac1f90d193 100644 --- a/python/modules/IcePy/msbuild/icepy.vcxproj.filters +++ b/python/modules/IcePy/msbuild/icepy.vcxproj.filters @@ -102,9 +102,6 @@ <ClCompile Include="..\..\..\..\cpp\src\Slice\MD5I.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\..\..\cpp\src\Slice\Checksum.cpp"> - <Filter>Source Files</Filter> - </ClCompile> <ClCompile Include="..\..\..\..\cpp\src\Slice\StringLiteralUtil.cpp" /> <ClCompile Include="..\Dispatcher.cpp"> <Filter>Source Files</Filter> diff --git a/python/msbuild/ice.proj b/python/msbuild/ice.proj index afc65552588..90a5689e0b5 100644 --- a/python/msbuild/ice.proj +++ b/python/msbuild/ice.proj @@ -28,7 +28,6 @@ <ItemDefinitionGroup> <SliceCompile> <OutputDir>$(MSBuildThisFileDirectory)..\python</OutputDir> - <AdditionalOptions>--checksum</AdditionalOptions> </SliceCompile> </ItemDefinitionGroup> diff --git a/python/python/Ice/__init__.py b/python/python/Ice/__init__.py index 05cd803f90b..2fe9d154eee 100644 --- a/python/python/Ice/__init__.py +++ b/python/python/Ice/__init__.py @@ -744,11 +744,6 @@ IcePy._t_ObjectPrx = IcePy.declareProxy('::Ice::Object') IcePy._t_LocalObject = IcePy.declareValue('::Ice::LocalObject') # -# Slice checksum dictionary. -# -sliceChecksums = {} - -# # Import generated Ice modules. # import Ice.BuiltinSequences_ice diff --git a/python/test/Ice/checksum/AllTests.py b/python/test/Ice/checksum/AllTests.py deleted file mode 100644 index 332a32542ac..00000000000 --- a/python/test/Ice/checksum/AllTests.py +++ /dev/null @@ -1,53 +0,0 @@ -# -# Copyright (c) ZeroC, Inc. All rights reserved. -# - -import sys, string, re, traceback, Ice, Test - -def test(b): - if not b: - raise RuntimeError('test assertion failed') - -def allTests(helper, communicator): - ref = "test:{0}".format(helper.getTestEndpoint()) - base = communicator.stringToProxy(ref) - test(base) - - checksum = Test.ChecksumPrx.checkedCast(base) - test(checksum) - - # - # Verify that no checksums are present for local types. - # - sys.stdout.write("testing checksums... ") - sys.stdout.flush() - test(len(Ice.sliceChecksums) > 0) - for i in Ice.sliceChecksums: - test(i.find("Local") == -1) - - # - # Get server's Slice checksums. - # - d = checksum.getSliceChecksums() - - # - # Compare the checksums. For a type FooN whose name ends in an integer N, - # we assume that the server's type does not change for N = 1, and does - # change for N > 1. - # - patt = re.compile("\\d+") - for i in d: - n = 0 - m = patt.search(i) - if m: - n = int(i[m.start():]) - test(i in Ice.sliceChecksums) - - if n <= 1: - test(Ice.sliceChecksums[i] == d[i]) - else: - test(Ice.sliceChecksums[i] != d[i]) - - print("ok") - - checksum.shutdown() diff --git a/python/test/Ice/checksum/CTypes.ice b/python/test/Ice/checksum/CTypes.ice deleted file mode 100644 index 0c4052d76b0..00000000000 --- a/python/test/Ice/checksum/CTypes.ice +++ /dev/null @@ -1,609 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#pragma once - -module Test -{ - -// -// TEST: Same -// -const int IntConst1 = 100; - -// -// TEST: Value changed -// -const int IntConst2 = 100; - -// -// TEST: Type changed -// -const int IntConst3 = 100; - -// -// TEST: Same -// -enum Enum1 { Enum11, Enum12, Enum13 } - -// -// TEST: Add enumerator -// -enum Enum2 { Enum21, Enum22, Enum23 } - -// -// TEST: Remove enumerator -// -enum Enum3 { Enum31, Enum32, Enum33 } - -// -// TEST: Change to a different type -// -enum Enum4 { Enum41, Enum42, Enum43 } - -// -// TEST: Enum with explicit values. -// -enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 } - -// -// TEST: Enum with same explicit values, different order. -// -enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit12 = 2, EnumExplicit13 = 3 } - -// -// TEST: Enum with different explicit values. -// -enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 2, EnumExplicit23 = 3} - -// -// TEST: Enum with explicit values, removed enumerator. -// -enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2, EnumExplicit33 = 3} - -// -// TEST: Same -// -sequence<int> Sequence1; - -// -// TEST: Change sequence type -// -sequence<int> Sequence2; - -// -// TEST: Change to a different type -// -sequence<int> Sequence3; - -// -// TEST: Same -// -dictionary<string, int> Dictionary1; - -// -// TEST: Change key type -// -dictionary<string, int> Dictionary2; - -// -// TEST: Change value type -// -dictionary<string, int> Dictionary3; - -// -// TEST: Change to a different type -// -dictionary<string, int> Dictionary4; - -// -// TEST: Same -// -struct Struct1 -{ - string str; - bool b; -} - -// -// TEST: Add member -// -struct Struct2 -{ - string str; - bool b; -} - -// -// TEST: Change member type -// -struct Struct3 -{ - string str; - bool b; -} - -// -// TEST: Remove member -// -struct Struct4 -{ - string str; - bool b; -} - -// -// TEST: Change to a different type -// -struct Struct5 -{ - string str; - bool b; -} - -// -// TEST: Same -// -interface Interface1 -{ -} - -// -// TEST: Change interface to class -// -interface Interface2 -{ -} - -// -// TEST: Add base interface -// -interface Interface3 -{ -} - -// -// TEST: Add operation -// -interface Interface4 -{ -} - -// -// TEST: Same -// -class EmptyClass1 -{ -} - -// -// TEST: Add data member -// -class EmptyClass2 -{ -} - -// -// TEST: Add operation -// -class EmptyClass3 -{ -} - -// -// TEST: Add base class -// -class EmptyClass4 -{ -} - -// -// TEST: Add interface -// -class EmptyClass5 -{ -} - -// -// TEST: Same -// -class SimpleClass1 -{ - string str; - float f; -} - -// -// TEST: Add operation -// -class SimpleClass2 -{ - string str; - float f; -} - -// -// TEST: Rename member -// -class SimpleClass3 -{ - string str; - float f; -} - -// -// TEST: Add member -// -class SimpleClass4 -{ - string str; - float f; -} - -// -// TEST: Remove member -// -class SimpleClass5 -{ - string str; - float f; -} - -// -// TEST: Reorder members -// -class SimpleClass6 -{ - string str; - float f; -} - -// -// TEST: Change member type -// -class SimpleClass7 -{ - string str; - float f; -} - -// -// TEST: Same -// -exception Exception1 -{ - string str; - bool b; -} - -// -// TEST: Add member -// -exception Exception2 -{ - string str; - bool b; -} - -// -// TEST: Change member type -// -exception Exception3 -{ - string str; - bool b; -} - -// -// TEST: Remove member -// -exception Exception4 -{ - string str; - bool b; -} - -// -// TEST: Add base exception -// -exception Exception5 -{ -} - -// -// TEST: Change to a different type -// -exception Exception6 -{ - string str; - bool b; -} - -// -// TEST: Exception with optional members. -// -exception OptionalEx0 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Exception with optional members, different order, same tags. -// -exception OptionalEx1 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Exception with different optional members. -// -exception OptionalEx2 -{ - string firstName; - string secondName; - optional(1) string emailAddress; -} - -// -// TEST: Exception with different optional members. -// -exception OptionalEx3 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Exception with optional members using different tags. -// -exception OptionalEx4 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Same -// -interface BaseInterface1 -{ - void baseOp1(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Change return type -// -interface BaseInterface2 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add parameter -// -interface BaseInterface3 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add exception -// -interface BaseInterface4 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Change out parameter to in parameter -// -interface BaseInterface5 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Remove parameter -// -interface BaseInterface6 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Remove exception -// -interface BaseInterface7 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Remove operation -// -interface BaseInterface8 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add base interface -// -interface BaseInterface9 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Class with compact id -// -class Compact1(1) -{ - int id; -} - -// -// TEST: Derived from class with compact id -// -class Derived1 extends Compact1 -{ -} - -// -// TEST: Same class names but different compact id -// -class Compact2(2) -{ - int id; -} - -// -// TEST: Class with optional members. -// -class Optional0 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Class with optional members, different order, same tags. -// -class Optional1 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Class with different optional members. -// -class Optional2 -{ - string firstName; - string secondName; - optional(1) string emailAddress; -} - -// -// TEST: Class with different optional members. -// -class Optional3 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Class with optional members using different tags. -// -class Optional4 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Interface with optional parameters. -// -interface OptionalParameters0 -{ - void op1(string firstName, optional(1) string secondName, - optional(2) string emailAddress); -} - -// -// TEST: Interface with optional parameters, different order. -// -interface OptionalParameters1 -{ - void op1(string firstName, optional(1) string secondName, - optional(2) string emailAddress); -} - -// -// TEST: Interface with optional parameters, different tags. -// -interface OptionalParameters2 -{ - void op1(string firstName, optional(1) string emailAddress, - optional(2) string secondName); -} - -// -// TEST: Interface with different optional parameters. -// -interface OptionalParameters3 -{ - void op1(string firstName, optional(1) string emailAddress, - string secondName); -} - -// -// TEST: Interface with optional return type. -// -interface OptionalReturn0 -{ - optional(1) int op(); -} - -// -// TEST: Interface that changes optional return type. -// -interface OptionalReturn2 -{ - optional(1) int op(); -} - -// -// TEST: Local -// -local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 } - -// -// TEST: Local -// -local sequence<string> LocalSequence; - -// -// TEST: Local -// -local dictionary<string, string> LocalDictionary; - -// -// TEST: Local -// -local struct LocalStruct -{ - string str; -} - -// -// TEST: Local -// -local class LocalClass -{ -} - -} diff --git a/python/test/Ice/checksum/Client.py b/python/test/Ice/checksum/Client.py deleted file mode 100755 index 52544d95ffb..00000000000 --- a/python/test/Ice/checksum/Client.py +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env python -# -# Copyright (c) ZeroC, Inc. All rights reserved. -# - -from TestHelper import TestHelper -TestHelper.loadSlice("--checksum Test.ice CTypes.ice") -import AllTests - - -class Client(TestHelper): - - def run(self, args): - with self.initialize(args=args) as communicator: - AllTests.allTests(self, communicator) diff --git a/python/test/Ice/checksum/STypes.ice b/python/test/Ice/checksum/STypes.ice deleted file mode 100644 index 9f84edf2cbd..00000000000 --- a/python/test/Ice/checksum/STypes.ice +++ /dev/null @@ -1,606 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#pragma once - -module Test -{ - -// -// TEST: Same -// -const int IntConst1 = 100; - -// -// TEST: Value changed -// -const int IntConst2 = 1000; - -// -// TEST: Type changed -// -const short IntConst3 = 100; - -// -// TEST: Same -// -enum Enum1 { Enum11, Enum12, Enum13 } - -// -// TEST: Add enumerator -// -enum Enum2 { Enum21, Enum22, Enum23, Enum24 } - -// -// TEST: Remove enumerator -// -enum Enum3 { Enum32, Enum33 } - -// -// TEST: Enum with explicit values. -// -enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 } - -// -// TEST: Enum with same explicit values, different order. -// -enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit13 = 3, EnumExplicit12 = 2 } - -// -// TEST: Enum with different explicit values. -// -enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 3, EnumExplicit23 } - -// -// TEST: Enum with explicit values, removed enumerator. -// -enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2} - -// -// TEST: Change to a different type -// -class Enum4 {} - -// -// TEST: Same -// -sequence<int> Sequence1; - -// -// TEST: Change sequence type -// -sequence<short> Sequence2; - -// -// TEST: Change to a different type -// -class Sequence3 {} - -// -// TEST: Same -// -dictionary<string, int> Dictionary1; - -// -// TEST: Change key type -// -dictionary<long, int> Dictionary2; - -// -// TEST: Change value type -// -dictionary<string, bool> Dictionary3; - -// -// TEST: Change to a different type -// -class Dictionary4 {} - -// -// TEST: Same -// -struct Struct1 -{ - string str; - bool b; -} - -// -// TEST: Add member -// -struct Struct2 -{ - string str; - bool b; - float f; -} - -// -// TEST: Change member type -// -struct Struct3 -{ - string str; - double b; -} - -// -// TEST: Remove member -// -struct Struct4 -{ - bool b; -} - -// -// TEST: Change to a different type -// -class Struct5 {} - -// -// TEST: Same -// -interface Interface1 -{ -} - -// -// TEST: Change interface to class -// -class Interface2 -{ -} - -// -// TEST: Add base interface -// -interface Interface3 extends Interface1 -{ -} - -// -// TEST: Add operation -// -interface Interface4 -{ - void opInterface4(); -} - -// -// TEST: Same -// -class EmptyClass1 -{ -} - -// -// TEST: Add data member -// -class EmptyClass2 -{ - double d; -} - -// -// TEST: Add operation -// -class EmptyClass3 -{ - void newOp(); -} - -// -// TEST: Add base class -// -class EmptyClass4 extends EmptyClass1 -{ -} - -// -// TEST: Add interface -// -class EmptyClass5 implements Interface1 -{ -} - -// -// TEST: Same -// -class SimpleClass1 -{ - string str; - float f; -} - -// -// TEST: Add operation -// -class SimpleClass2 -{ - string str; - float f; - void newOp(); -} - -// -// TEST: Rename member -// -class SimpleClass3 -{ - string str; - float g; -} - -// -// TEST: Add member -// -class SimpleClass4 -{ - string str; - float f; - bool b; -} - -// -// TEST: Remove member -// -class SimpleClass5 -{ - string str; -} - -// -// TEST: Reorder members -// -class SimpleClass6 -{ - float f; - string str; -} - -// -// TEST: Change member type -// -class SimpleClass7 -{ - string str; - double f; -} - -// -// TEST: Same -// -exception Exception1 -{ - string str; - bool b; -} - -// -// TEST: Add member -// -exception Exception2 -{ - string str; - bool b; - float f; -} - -// -// TEST: Change member type -// -exception Exception3 -{ - string str; - double b; -} - -// -// TEST: Remove member -// -exception Exception4 -{ - bool b; -} - -// -// TEST: Add base exception -// -exception Exception5 extends Exception1 -{ -} - -// -// TEST: Change to a different type -// -class Exception6 {} - -// -// TEST: Exception with optional members. -// -exception OptionalEx0 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Exception with optional members, different order, same tags. -// -exception OptionalEx1 -{ - string firstName; - optional(2) string emailAddress; - optional(1) string secondName; -} - -// -// TEST: Exception with different optional members. -// -exception OptionalEx2 -{ - string firstName; - optional(1) string secondName; - string emailAddress; -} - -// -// TEST: Exception with different optional members. -// -exception OptionalEx3 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; - optional(3) string phoneNumber; -} - -// -// TEST: Exception with optional members using different tags. -// -exception OptionalEx4 -{ - string firstName; - optional(2) string secondName; - optional(1) string emailAddress; -} - -// -// TEST: Same -// -interface BaseInterface1 -{ - void baseOp1(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Change return type -// -interface BaseInterface2 -{ - int baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add parameter -// -interface BaseInterface3 -{ - void baseOp(Object o); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add exception -// -interface BaseInterface4 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1, Exception2; -} - -// -// TEST: Change out parameter to in parameter -// -interface BaseInterface5 -{ - void baseOp(); - void baseOp2(int i, string s) throws Exception1; -} - -// -// TEST: Remove parameter -// -interface BaseInterface6 -{ - void baseOp(); - void baseOp2(out string s) throws Exception1; -} - -// -// TEST: Remove exception -// -interface BaseInterface7 -{ - void baseOp(); - void baseOp2(int i, out string s); -} - -// -// TEST: Remove operation -// -interface BaseInterface8 -{ - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add base class -// -interface BaseInterface9 extends Interface1 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Class with compact id -// -class Compact1(1) -{ - int id; -} - -// -// TEST: Derived from class with compact id -// -class Derived1 extends Compact1 -{ -} - -// -// TEST: Same class names but different compact id -// -class Compact2(3) -{ - int id; -} - -// -// TEST: Class with optional members. -// -class Optional0 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Class with optional members, different order, same tags. -// -class Optional1 -{ - string firstName; - optional(2) string emailAddress; - optional(1) string secondName; -} - -// -// TEST: Class with different optional members. -// -class Optional2 -{ - string firstName; - optional(1) string secondName; - string emailAddress; -} - -// -// TEST: Class with different optional members. -// -class Optional3 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; - optional(3) string phoneNumber; -} - -// -// TEST: Class with optional members using different tags. -// -class Optional4 -{ - string firstName; - optional(2) string secondName; - optional(1) string emailAddress; -} - -// -// TEST: Interface with optional parameters. -// -interface OptionalParameters0 -{ - void op1(string firstName, optional(1) string secondName, - optional(2) string emailAddress); -} - -// -// TEST: Interface with optional parameters, different order. -// -interface OptionalParameters1 -{ - void op1(string firstName, optional(2) string emailAddress, - optional(1) string secondName); -} - -// -// TEST: Interface with optional parameters, different tags. -// -interface OptionalParameters2 -{ - void op1(string firstName, optional(2) string emailAddress, - optional(1) string secondName); -} - -// -// TEST: Interface with different optional parameters. -// -interface OptionalParameters3 -{ - void op1(string firstName, string emailAddress, - optional(1) string secondName); -} - -// -// TEST: Interface with optional return type. -// -interface OptionalReturn0 -{ - optional(1) int op(); -} - -// -// TEST: Interface that changes optional return type. -// -interface OptionalReturn2 -{ - int op(); -} - -// -// TEST: Local -// -local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 } - -// -// TEST: Local -// -local sequence<string> LocalSequence; - -// -// TEST: Local -// -local dictionary<string, string> LocalDictionary; - -// -// TEST: Local -// -local struct LocalStruct -{ - string str; -} - -// -// TEST: Local -// -local class LocalClass -{ -} - -} diff --git a/python/test/Ice/checksum/Server.py b/python/test/Ice/checksum/Server.py deleted file mode 100755 index ef3cb2bfe86..00000000000 --- a/python/test/Ice/checksum/Server.py +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env python -# -# Copyright (c) ZeroC, Inc. All rights reserved. -# - -import Ice -from TestHelper import TestHelper -TestHelper.loadSlice("--checksum Test.ice STypes.ice") -import Test - - -class ChecksumI(Test.Checksum): - def getSliceChecksums(self, current=None): - return Ice.sliceChecksums - - def shutdown(self, current=None): - current.adapter.getCommunicator().shutdown() - - -class Server(TestHelper): - - def run(self, args): - - with self.initialize(args=args) as communicator: - - communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint()) - adapter = communicator.createObjectAdapter("TestAdapter") - adapter.add(ChecksumI(), Ice.stringToIdentity("test")) - adapter.activate() - communicator.waitForShutdown() diff --git a/python/test/Ice/checksum/Test.ice b/python/test/Ice/checksum/Test.ice deleted file mode 100644 index e487fe94669..00000000000 --- a/python/test/Ice/checksum/Test.ice +++ /dev/null @@ -1,19 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#pragma once - -#include <Ice/SliceChecksumDict.ice> - -module Test -{ - -interface Checksum -{ - idempotent Ice::SliceChecksumDict getSliceChecksums(); - - void shutdown(); -} - -} diff --git a/ruby/ruby/Ice.rb b/ruby/ruby/Ice.rb index f0c7bbe1513..0fa18b35759 100644 --- a/ruby/ruby/Ice.rb +++ b/ruby/ruby/Ice.rb @@ -236,11 +236,6 @@ module Ice private_class_method :new end - - # - # Slice checksum dictionary. - # - SliceChecksums = {} end # diff --git a/ruby/src/IceRuby/Slice.cpp b/ruby/src/IceRuby/Slice.cpp index 7faf4c52d6e..904ef27c95a 100644 --- a/ruby/src/IceRuby/Slice.cpp +++ b/ruby/src/IceRuby/Slice.cpp @@ -55,7 +55,6 @@ IceRuby_loadSlice(int argc, VALUE* argv, VALUE /*self*/) opts.addOpt("d", "debug"); opts.addOpt("", "ice"); opts.addOpt("", "underscore"); - opts.addOpt("", "checksum"); opts.addOpt("", "all"); vector<string> files; @@ -83,7 +82,6 @@ IceRuby_loadSlice(int argc, VALUE* argv, VALUE /*self*/) bool ice = true; // This must be true so that we can create Ice::Identity when necessary. bool underscore = opts.isSet("underscore"); bool all = false; - bool checksum = false; if(opts.isSet("D")) { vector<string> optargs = opts.argVec("D"); @@ -110,7 +108,6 @@ IceRuby_loadSlice(int argc, VALUE* argv, VALUE /*self*/) } debug = opts.isSet("d") || opts.isSet("debug"); all = opts.isSet("all"); - checksum = opts.isSet("checksum"); bool ignoreRedefs = false; @@ -144,7 +141,7 @@ IceRuby_loadSlice(int argc, VALUE* argv, VALUE /*self*/) // Ruby magic comment to set the file encoding, it must be first or second line // out << "# encoding: utf-8\n"; - generate(u, all, checksum, includePaths, out); + generate(u, all, includePaths, out); u->destroy(); string code = codeStream.str(); diff --git a/ruby/test/Ice/checksum/AllTests.rb b/ruby/test/Ice/checksum/AllTests.rb deleted file mode 100644 index 0e71e5947c0..00000000000 --- a/ruby/test/Ice/checksum/AllTests.rb +++ /dev/null @@ -1,59 +0,0 @@ -# -# Copyright (c) ZeroC, Inc. All rights reserved. -# - -def test(b) - if !b - raise RuntimeError, 'test assertion failed' - end -end - -def allTests(helper, communicator) - ref = "test:#{helper.getTestEndpoint()}" - base = communicator.stringToProxy(ref) - test(base) - - checksum = Test::ChecksumPrx::checkedCast(base) - test(checksum) - - # - # Verify that no checksums are present for local types. - # - print "testing checksums... " - STDOUT.flush - test(Ice::SliceChecksums.length > 0) - for i in Ice::SliceChecksums.keys - test(!i.include?("Local")) - end - - # - # Get server's Slice checksums. - # - d = checksum.getSliceChecksums() - - # - # Compare the checksums. For a type FooN whose name ends in an integer N, - # we assume that the server's type does not change for N = 1, and does - # change for N > 1. - # - patt = Regexp.new("\\d+") - for i in d.keys - n = 0 - m = patt.match(i) - if m - n = i[m.begin(0)...i.length].to_i - end - - test(Ice::SliceChecksums.has_key?(i)) - - if n <= 1 - test(Ice::SliceChecksums[i] == d[i]) - else - test(Ice::SliceChecksums[i] != d[i]) - end - end - - puts "ok" - - return checksum -end diff --git a/ruby/test/Ice/checksum/CTypes.ice b/ruby/test/Ice/checksum/CTypes.ice deleted file mode 100644 index 0c4052d76b0..00000000000 --- a/ruby/test/Ice/checksum/CTypes.ice +++ /dev/null @@ -1,609 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#pragma once - -module Test -{ - -// -// TEST: Same -// -const int IntConst1 = 100; - -// -// TEST: Value changed -// -const int IntConst2 = 100; - -// -// TEST: Type changed -// -const int IntConst3 = 100; - -// -// TEST: Same -// -enum Enum1 { Enum11, Enum12, Enum13 } - -// -// TEST: Add enumerator -// -enum Enum2 { Enum21, Enum22, Enum23 } - -// -// TEST: Remove enumerator -// -enum Enum3 { Enum31, Enum32, Enum33 } - -// -// TEST: Change to a different type -// -enum Enum4 { Enum41, Enum42, Enum43 } - -// -// TEST: Enum with explicit values. -// -enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 } - -// -// TEST: Enum with same explicit values, different order. -// -enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit12 = 2, EnumExplicit13 = 3 } - -// -// TEST: Enum with different explicit values. -// -enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 2, EnumExplicit23 = 3} - -// -// TEST: Enum with explicit values, removed enumerator. -// -enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2, EnumExplicit33 = 3} - -// -// TEST: Same -// -sequence<int> Sequence1; - -// -// TEST: Change sequence type -// -sequence<int> Sequence2; - -// -// TEST: Change to a different type -// -sequence<int> Sequence3; - -// -// TEST: Same -// -dictionary<string, int> Dictionary1; - -// -// TEST: Change key type -// -dictionary<string, int> Dictionary2; - -// -// TEST: Change value type -// -dictionary<string, int> Dictionary3; - -// -// TEST: Change to a different type -// -dictionary<string, int> Dictionary4; - -// -// TEST: Same -// -struct Struct1 -{ - string str; - bool b; -} - -// -// TEST: Add member -// -struct Struct2 -{ - string str; - bool b; -} - -// -// TEST: Change member type -// -struct Struct3 -{ - string str; - bool b; -} - -// -// TEST: Remove member -// -struct Struct4 -{ - string str; - bool b; -} - -// -// TEST: Change to a different type -// -struct Struct5 -{ - string str; - bool b; -} - -// -// TEST: Same -// -interface Interface1 -{ -} - -// -// TEST: Change interface to class -// -interface Interface2 -{ -} - -// -// TEST: Add base interface -// -interface Interface3 -{ -} - -// -// TEST: Add operation -// -interface Interface4 -{ -} - -// -// TEST: Same -// -class EmptyClass1 -{ -} - -// -// TEST: Add data member -// -class EmptyClass2 -{ -} - -// -// TEST: Add operation -// -class EmptyClass3 -{ -} - -// -// TEST: Add base class -// -class EmptyClass4 -{ -} - -// -// TEST: Add interface -// -class EmptyClass5 -{ -} - -// -// TEST: Same -// -class SimpleClass1 -{ - string str; - float f; -} - -// -// TEST: Add operation -// -class SimpleClass2 -{ - string str; - float f; -} - -// -// TEST: Rename member -// -class SimpleClass3 -{ - string str; - float f; -} - -// -// TEST: Add member -// -class SimpleClass4 -{ - string str; - float f; -} - -// -// TEST: Remove member -// -class SimpleClass5 -{ - string str; - float f; -} - -// -// TEST: Reorder members -// -class SimpleClass6 -{ - string str; - float f; -} - -// -// TEST: Change member type -// -class SimpleClass7 -{ - string str; - float f; -} - -// -// TEST: Same -// -exception Exception1 -{ - string str; - bool b; -} - -// -// TEST: Add member -// -exception Exception2 -{ - string str; - bool b; -} - -// -// TEST: Change member type -// -exception Exception3 -{ - string str; - bool b; -} - -// -// TEST: Remove member -// -exception Exception4 -{ - string str; - bool b; -} - -// -// TEST: Add base exception -// -exception Exception5 -{ -} - -// -// TEST: Change to a different type -// -exception Exception6 -{ - string str; - bool b; -} - -// -// TEST: Exception with optional members. -// -exception OptionalEx0 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Exception with optional members, different order, same tags. -// -exception OptionalEx1 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Exception with different optional members. -// -exception OptionalEx2 -{ - string firstName; - string secondName; - optional(1) string emailAddress; -} - -// -// TEST: Exception with different optional members. -// -exception OptionalEx3 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Exception with optional members using different tags. -// -exception OptionalEx4 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Same -// -interface BaseInterface1 -{ - void baseOp1(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Change return type -// -interface BaseInterface2 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add parameter -// -interface BaseInterface3 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add exception -// -interface BaseInterface4 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Change out parameter to in parameter -// -interface BaseInterface5 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Remove parameter -// -interface BaseInterface6 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Remove exception -// -interface BaseInterface7 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Remove operation -// -interface BaseInterface8 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add base interface -// -interface BaseInterface9 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Class with compact id -// -class Compact1(1) -{ - int id; -} - -// -// TEST: Derived from class with compact id -// -class Derived1 extends Compact1 -{ -} - -// -// TEST: Same class names but different compact id -// -class Compact2(2) -{ - int id; -} - -// -// TEST: Class with optional members. -// -class Optional0 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Class with optional members, different order, same tags. -// -class Optional1 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Class with different optional members. -// -class Optional2 -{ - string firstName; - string secondName; - optional(1) string emailAddress; -} - -// -// TEST: Class with different optional members. -// -class Optional3 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Class with optional members using different tags. -// -class Optional4 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Interface with optional parameters. -// -interface OptionalParameters0 -{ - void op1(string firstName, optional(1) string secondName, - optional(2) string emailAddress); -} - -// -// TEST: Interface with optional parameters, different order. -// -interface OptionalParameters1 -{ - void op1(string firstName, optional(1) string secondName, - optional(2) string emailAddress); -} - -// -// TEST: Interface with optional parameters, different tags. -// -interface OptionalParameters2 -{ - void op1(string firstName, optional(1) string emailAddress, - optional(2) string secondName); -} - -// -// TEST: Interface with different optional parameters. -// -interface OptionalParameters3 -{ - void op1(string firstName, optional(1) string emailAddress, - string secondName); -} - -// -// TEST: Interface with optional return type. -// -interface OptionalReturn0 -{ - optional(1) int op(); -} - -// -// TEST: Interface that changes optional return type. -// -interface OptionalReturn2 -{ - optional(1) int op(); -} - -// -// TEST: Local -// -local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 } - -// -// TEST: Local -// -local sequence<string> LocalSequence; - -// -// TEST: Local -// -local dictionary<string, string> LocalDictionary; - -// -// TEST: Local -// -local struct LocalStruct -{ - string str; -} - -// -// TEST: Local -// -local class LocalClass -{ -} - -} diff --git a/ruby/test/Ice/checksum/Client.rb b/ruby/test/Ice/checksum/Client.rb deleted file mode 100755 index 0b74d4bf4e4..00000000000 --- a/ruby/test/Ice/checksum/Client.rb +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env ruby -# -# Copyright (c) ZeroC, Inc. All rights reserved. -# - -require "Ice" -Ice::loadSlice("'-I#{Ice.getSliceDir}' --checksum Test.ice CTypes.ice") -require './AllTests' - -class Client < ::TestHelper - def run(args) - self.init(args:args) do |communicator| - checksum = allTests(self, communicator) - checksum.shutdown() - end - end -end diff --git a/ruby/test/Ice/checksum/Test.ice b/ruby/test/Ice/checksum/Test.ice deleted file mode 100644 index e487fe94669..00000000000 --- a/ruby/test/Ice/checksum/Test.ice +++ /dev/null @@ -1,19 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#pragma once - -#include <Ice/SliceChecksumDict.ice> - -module Test -{ - -interface Checksum -{ - idempotent Ice::SliceChecksumDict getSliceChecksums(); - - void shutdown(); -} - -} diff --git a/slice/Ice/SliceChecksumDict.ice b/slice/Ice/SliceChecksumDict.ice deleted file mode 100644 index 3893002d177..00000000000 --- a/slice/Ice/SliceChecksumDict.ice +++ /dev/null @@ -1,35 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#pragma once - -[["cpp:dll-export:ICE_API"]] -[["cpp:doxygen:include:Ice/Ice.h"]] -[["cpp:header-ext:h"]] - -[["ice-prefix"]] - -[["js:module:ice"]] - -[["objc:dll-export:ICE_API"]] -[["objc:header-dir:objc"]] - -[["python:pkgdir:Ice"]] - -#ifndef __SLICE2JAVA_COMPAT__ -[["java:package:com.zeroc"]] -#endif - -["objc:prefix:ICE"] -module Ice -{ - -/** - * A mapping from type IDs to Slice checksums. The dictionary - * allows verification at run time that client and server - * use matching Slice definitions. - **/ -dictionary<string, string> SliceChecksumDict; - -} diff --git a/slice/IceBox/IceBox.ice b/slice/IceBox/IceBox.ice index 2daba18578f..31fa3a8ff09 100644 --- a/slice/IceBox/IceBox.ice +++ b/slice/IceBox/IceBox.ice @@ -20,7 +20,6 @@ #include <Ice/BuiltinSequences.ice> #include <Ice/CommunicatorF.ice> #include <Ice/PropertiesF.ice> -#include <Ice/SliceChecksumDict.ice> #ifndef __SLICE2JAVA_COMPAT__ [["java:package:com.zeroc"]] @@ -164,15 +163,6 @@ interface ServiceManager { /** * - * Returns the checksums for the IceBox Slice definitions. - * - * @return A dictionary mapping Slice type ids to their checksums. - * - **/ - ["nonmutating", "cpp:const"] idempotent Ice::SliceChecksumDict getSliceChecksums(); - - /** - * * Start an individual service. * * @param service The service name. diff --git a/slice/IceGrid/Admin.ice b/slice/IceGrid/Admin.ice index 01aa14cc802..065db2cb7f9 100644 --- a/slice/IceGrid/Admin.ice +++ b/slice/IceGrid/Admin.ice @@ -21,7 +21,6 @@ #include <Ice/Identity.ice> #include <Ice/BuiltinSequences.ice> #include <Ice/Properties.ice> -#include <Ice/SliceChecksumDict.ice> #include <Glacier2/Session.ice> #include <IceGrid/Exception.ice> #include <IceGrid/Descriptor.ice> @@ -1168,15 +1167,6 @@ interface Admin * **/ void shutdown(); - - /** - * - * Returns the checksums for the IceGrid Slice definitions. - * - * @return A dictionary mapping Slice type ids to their checksums. - * - **/ - ["nonmutating", "cpp:const"] idempotent Ice::SliceChecksumDict getSliceChecksums(); } /** diff --git a/slice/IceStorm/IceStorm.ice b/slice/IceStorm/IceStorm.ice index 6b576c9ac5d..91a1cb923c1 100644 --- a/slice/IceStorm/IceStorm.ice +++ b/slice/IceStorm/IceStorm.ice @@ -19,7 +19,6 @@ [["python:pkgdir:IceStorm"]] #include <Ice/Identity.ice> -#include <Ice/SliceChecksumDict.ice> #include <IceStorm/Metrics.ice> @@ -378,15 +377,6 @@ interface TopicManager * **/ ["nonmutating", "cpp:const"] idempotent TopicDict retrieveAll(); - - /** - * - * Returns the checksums for the IceStorm Slice definitions. - * - * @return A dictionary mapping Slice type ids to their checksums. - * - **/ - ["nonmutating", "cpp:const"] idempotent Ice::SliceChecksumDict getSliceChecksums(); } /** diff --git a/swift/ice.xcodeproj/project.pbxproj b/swift/ice.xcodeproj/project.pbxproj index 9eb1b7948f0..dc1e4db976d 100644 --- a/swift/ice.xcodeproj/project.pbxproj +++ b/swift/ice.xcodeproj/project.pbxproj @@ -283,7 +283,6 @@ 2F1FFADAC530E6B05E3A2BB5 /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = AB0075088BD497CEE1D89780 /* Client.swift */; }; 2F2C3FB2F72794F86AD04730 /* Util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E7E69875C244C5778EEC372 /* Util.cpp */; }; 2FCF5F07732A56A488FC30C7 /* Test.ice in Sources */ = {isa = PBXBuildFile; fileRef = EB489D1E2A8C2CF17A2F4330 /* Test.ice */; }; - 2FDD95D76E0A825FD90787B5 /* SliceChecksumDict.ice in Sources */ = {isa = PBXBuildFile; fileRef = C784636985C065D20545F5BE /* SliceChecksumDict.ice */; }; 2FE6B761F66C7B1B09DF0012 /* IceDiscovery.ice in Sources */ = {isa = PBXBuildFile; fileRef = B7D8B9A2D605FCFFC786AD11 /* IceDiscovery.ice */; }; 2FED9BFFE890ED8FE1563F6A /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEC9D0420245199FB5BBD345 /* Client.swift */; }; 302053A6F0E67A56D6B48E48 /* TestCommon.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 2033BDC3AF58A54C9EF1698B /* TestCommon.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; @@ -464,7 +463,6 @@ 4EFFB2A6C07DDDD71FC61D62 /* Locator.ice in Sources */ = {isa = PBXBuildFile; fileRef = 3EE292939C43A0B9A8B787D7 /* Locator.ice */; }; 5027C663A9B52FEE73B1CFEA /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0507C0145EE5B124FE90FA6E /* Client.swift */; }; 502F2C1998C22A5A96CFA8F3 /* LocatorInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D8565E6799EC944D42F00DB9 /* LocatorInfo.cpp */; }; - 503BF71A9FB17136AD834A30 /* SliceChecksumDict.ice in Sources */ = {isa = PBXBuildFile; fileRef = C784636985C065D20545F5BE /* SliceChecksumDict.ice */; }; 503C9110692E2CF296B51180 /* RequestHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4AEAEA1C49B0E4F1F69EF841 /* RequestHandler.cpp */; }; 508F3B86F0B341FC6C813968 /* InputStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A6CDAB227924D0610F81AD01 /* InputStream.cpp */; }; 50A2464D8179FA635F349213 /* IceOptionalAMD.bundle in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = C6AE8BE95F80EBF3D2C290AE /* IceOptionalAMD.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; @@ -758,12 +756,10 @@ 82910A79F1F8A522A8FA8A19 /* ProcessF.ice in Sources */ = {isa = PBXBuildFile; fileRef = C35F0E57B69EDEFC5E944EBC /* ProcessF.ice */; }; 8297502A78B247BBE4DBA6A9 /* WSConnector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9B240838C3B7EC5098985F9A /* WSConnector.cpp */; }; 82C6A3FB169AACDACF4F7B87 /* PluginF.ice in Sources */ = {isa = PBXBuildFile; fileRef = 059160A9429AADF7083C704C /* PluginF.ice */; }; - 82D152396ABCFB797FC8088F /* SliceChecksums.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDFA593815E37A8E3222D63E /* SliceChecksums.cpp */; }; 83542F5C0006AA10DEECA43F /* RouterF.ice in Sources */ = {isa = PBXBuildFile; fileRef = 450AD776C8151E42914041A8 /* RouterF.ice */; }; 8366C667CA0C68F21BBE67BC /* TestAMD.ice in Sources */ = {isa = PBXBuildFile; fileRef = 8C1E877ACC0DA38CB700CA31 /* TestAMD.ice */; }; 839B56DE7B4182BF0AD32EF1 /* PromiseKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5312EB0C18E1592B61C470D3 /* PromiseKit.framework */; }; 83ADE2EF029A457A440D043B /* OutputStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99AF1143034F0C3447D52DC6 /* OutputStream.swift */; }; - 844DE08FE4B28A8FB37C760A /* SliceChecksumDict.ice in Sources */ = {isa = PBXBuildFile; fileRef = C784636985C065D20545F5BE /* SliceChecksumDict.ice */; }; 8474A2C5AB5774475C3AD559 /* Transceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BE6BACEC2F33E91F4B617FB /* Transceiver.cpp */; }; 84A6A3703564A713960A8776 /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = 10FBC76F9EB72AA7D657AD6A /* Client.swift */; }; 84A7D6632D970C65E0985C67 /* Ice.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 630B53C4B0DCBF443CE3A899 /* Ice.framework */; }; @@ -839,7 +835,6 @@ 8F766BFE82FA086DF9C859ED /* ServerAMD.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E4DA6E69B6D870D4106D05D /* ServerAMD.swift */; }; 8FEF0E2B30301C6E07917CAF /* PluginI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8223AEBF7050FD7541E96A1 /* PluginI.cpp */; }; 8FFE205C24EF896369109535 /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = A17A6842456B978F70B5DFDD /* Client.swift */; }; - 902E1BB2B659564E9A23152C /* SliceChecksums.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDFA593815E37A8E3222D63E /* SliceChecksums.cpp */; }; 903BED45E35CB747537258C8 /* Network.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C3211C9FB66D58C1BDB91C18 /* Network.cpp */; }; 90778C6C17F29D68671DF2BA /* WSEndpoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 47A28B22A642C985FFB853F7 /* WSEndpoint.cpp */; }; 90D27EB960C1DFF768C002E0 /* SlicedData.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7D6AD5F74CE6D55E945CE35 /* SlicedData.swift */; }; @@ -1453,7 +1448,6 @@ F98B452B5D6D4D7BD3813985 /* IceExceptionsAMD.bundle in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 4E959F0B362795EC27EE97FA /* IceExceptionsAMD.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; F9CCEA8BB585C6CDF67F1FB5 /* Instance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A50EFAADF3111E3694A86697 /* Instance.cpp */; }; F9D785E1575E2236A2C69E22 /* Test.ice in Sources */ = {isa = PBXBuildFile; fileRef = 89D2FAA92C70159399181D22 /* Test.ice */; }; - FA026E17099CDC282180A0C5 /* SliceChecksumDict.ice in Sources */ = {isa = PBXBuildFile; fileRef = C784636985C065D20545F5BE /* SliceChecksumDict.ice */; }; FA2D34D2970117BE5702DEED /* ServerAMD.swift in Sources */ = {isa = PBXBuildFile; fileRef = 698F636B1C7F71C0D86FCEE2 /* ServerAMD.swift */; }; FA31B49A6063A7E1B097FD6D /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AC6F3EFDA8ACA3B1AF262A50 /* Cocoa.framework */; }; FA405E6DFF25B85F1653371E /* libIceLocatorDiscovery C++11 macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1B61A6FA40AFB5C32FEAA154 /* libIceLocatorDiscovery C++11 macOS.a */; }; @@ -1560,7 +1554,6 @@ "$SRCROOT/../slice/Ice/RouterF.ice", "$SRCROOT/../slice/Ice/ServantLocator.ice", "$SRCROOT/../slice/Ice/ServantLocatorF.ice", - "$SRCROOT/../slice/Ice/SliceChecksumDict.ice", "$SRCROOT/../slice/Ice/ValueFactory.ice", "$SRCROOT/../slice/Ice/Version.ice", ); @@ -1744,7 +1737,6 @@ "$SRCROOT/../slice/Ice/RouterF.ice", "$SRCROOT/../slice/Ice/ServantLocator.ice", "$SRCROOT/../slice/Ice/ServantLocatorF.ice", - "$SRCROOT/../slice/Ice/SliceChecksumDict.ice", "$SRCROOT/../slice/Ice/ValueFactory.ice", "$SRCROOT/../slice/Ice/Version.ice", ); @@ -2162,7 +2154,6 @@ "$SRCROOT/../slice/Ice/RouterF.ice", "$SRCROOT/../slice/Ice/ServantLocator.ice", "$SRCROOT/../slice/Ice/ServantLocatorF.ice", - "$SRCROOT/../slice/Ice/SliceChecksumDict.ice", "$SRCROOT/../slice/Ice/ValueFactory.ice", "$SRCROOT/../slice/Ice/Version.ice", ); @@ -2696,7 +2687,6 @@ "$SRCROOT/../slice/Ice/RouterF.ice", "$SRCROOT/../slice/Ice/ServantLocator.ice", "$SRCROOT/../slice/Ice/ServantLocatorF.ice", - "$SRCROOT/../slice/Ice/SliceChecksumDict.ice", "$SRCROOT/../slice/Ice/ValueFactory.ice", "$SRCROOT/../slice/Ice/Version.ice", ); @@ -4738,7 +4728,6 @@ C6AE8BE95F80EBF3D2C290AE /* IceOptionalAMD.bundle */ = {isa = PBXFileReference; explicitFileType = "wrapper.plug-in"; includeInIndex = 0; path = IceOptionalAMD.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; C6C69B957051A399B8A8D080 /* BatchRequestQueue.cpp */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.cpp.cpp; name = BatchRequestQueue.cpp; path = ../cpp/src/Ice/BatchRequestQueue.cpp; sourceTree = "<group>"; }; C6FBE40672797298F2C1C21A /* IceLocatorDiscovery.ice */ = {isa = PBXFileReference; includeInIndex = 1; name = IceLocatorDiscovery.ice; path = ../slice/IceLocatorDiscovery/IceLocatorDiscovery.ice; sourceTree = "<group>"; }; - C784636985C065D20545F5BE /* SliceChecksumDict.ice */ = {isa = PBXFileReference; includeInIndex = 1; name = SliceChecksumDict.ice; path = ../slice/Ice/SliceChecksumDict.ice; sourceTree = "<group>"; }; C7F15D84385C6FFC6EADD1FA /* IceInterceptor.bundle */ = {isa = PBXFileReference; explicitFileType = "wrapper.plug-in"; includeInIndex = 0; path = IceInterceptor.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; C84F7EAC0F5791E7D09AB072 /* PropertiesAdmin.ice */ = {isa = PBXFileReference; includeInIndex = 1; name = PropertiesAdmin.ice; path = ../slice/Ice/PropertiesAdmin.ice; sourceTree = "<group>"; }; C8C4EC7F377638ACA3789243 /* ConnectRequestHandler.cpp */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.cpp.cpp; name = ConnectRequestHandler.cpp; path = ../cpp/src/Ice/ConnectRequestHandler.cpp; sourceTree = "<group>"; }; @@ -4787,7 +4776,6 @@ DD068D7CC10CB319EE39A71B /* CommunicatorI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CommunicatorI.swift; path = src/Ice/CommunicatorI.swift; sourceTree = "<group>"; }; DDB4DD346430D46FA6ECB82A /* ThreadPool.cpp */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.cpp.cpp; name = ThreadPool.cpp; path = ../cpp/src/Ice/ThreadPool.cpp; sourceTree = "<group>"; }; DDC3D4E5B05D9FD2F3E929F5 /* ServerAMD.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ServerAMD.swift; path = test/Ice/proxy/ServerAMD.swift; sourceTree = "<group>"; }; - DDFA593815E37A8E3222D63E /* SliceChecksums.cpp */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.cpp.cpp; name = SliceChecksums.cpp; path = ../cpp/src/Ice/SliceChecksums.cpp; sourceTree = "<group>"; }; DDFDD649342AB148C5437BA5 /* RequestHandlerFactory.cpp */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.cpp.cpp; name = RequestHandlerFactory.cpp; path = ../cpp/src/Ice/RequestHandlerFactory.cpp; sourceTree = "<group>"; }; DE3C76073BBDB3D3E0B943F0 /* AllTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AllTests.swift; path = test/Ice/operations/AllTests.swift; sourceTree = "<group>"; }; DEB369D710EC587DFD76B069 /* IceSlicingObjects.bundle */ = {isa = PBXFileReference; explicitFileType = "wrapper.plug-in"; includeInIndex = 0; path = IceSlicingObjects.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -6752,7 +6740,6 @@ FB081EA6CBA368AB96ED96D6 /* ServantManager.cpp */, 18D84E7BFF897CD18E15CC92 /* Service.cpp */, 34FBA26DDA9D52224A61F465 /* SHA1.cpp */, - DDFA593815E37A8E3222D63E /* SliceChecksums.cpp */, AD045F681FB9F088DC230E0F /* SlicedData.cpp */, 931F3380F15851A31DB21B98 /* StreamSocket.cpp */, 5E338C63E5506C4DD6F7B043 /* StringConverterPlugin.cpp */, @@ -6866,7 +6853,6 @@ A8F736DDD2D36B64200A0023 /* RouterF.ice */, 2AC0FE6725FBB1C2DC5A9E78 /* ServantLocator.ice */, 9800A938F2930FC734B98F4D /* ServantLocatorF.ice */, - C784636985C065D20545F5BE /* SliceChecksumDict.ice */, 57017F902B7686C7579A7648 /* ValueFactory.ice */, 7603D7C27853E868765956CA /* Version.ice */, ); @@ -12888,8 +12874,6 @@ 5D965A97A2EAAA609263185F /* Service.cpp in Sources */, 7042388A0D63FE6DCDA9F654 /* SHA1.cpp in Sources */, 023484FAB909A9605F3269E7 /* Shared.cpp in Sources */, - FA026E17099CDC282180A0C5 /* SliceChecksumDict.ice in Sources */, - 902E1BB2B659564E9A23152C /* SliceChecksums.cpp in Sources */, DABE421785EC682E72B955E2 /* SlicedData.cpp in Sources */, D643A1F482314700C36462E8 /* StreamSocket.cpp in Sources */, E75CE1821F422A6D62359914 /* StringConverter.cpp in Sources */, @@ -13089,7 +13073,6 @@ 3CC13D43A7B2E44BAE751500 /* ServantLocator.ice in Sources */, B3437BA13D399428737F1B65 /* ServantLocatorF.ice in Sources */, 4CF2C72A53852238F87D4908 /* ServantManager.swift in Sources */, - 2FDD95D76E0A825FD90787B5 /* SliceChecksumDict.ice in Sources */, 90D27EB960C1DFF768C002E0 /* SlicedData.swift in Sources */, 39B5700E0EEECD0915EDDE7F /* SliceFlags.swift in Sources */, 8A18CD852FA002B4E62CC507 /* SliceInfo.swift in Sources */, @@ -13367,7 +13350,6 @@ 9288123451FE48CDD5B8A16A /* ServantLocator.ice in Sources */, 5A9F355C9A7982F4699B7221 /* ServantLocatorF.ice in Sources */, E79E897842121850A5AD1E50 /* ServantManager.swift in Sources */, - 844DE08FE4B28A8FB37C760A /* SliceChecksumDict.ice in Sources */, 22CEF1922E8EE385E1E3AE0B /* SlicedData.swift in Sources */, 5EF420F64CC50E2E86014ED1 /* SliceFlags.swift in Sources */, 806C749DC081459438AE7721 /* SliceInfo.swift in Sources */, @@ -13540,8 +13522,6 @@ 2991CC0127921A6738E5F6C1 /* Service.cpp in Sources */, D22A66BE3743E0AAAAB7C581 /* SHA1.cpp in Sources */, CD11B5459E9E30DB90A56F7A /* Shared.cpp in Sources */, - 503BF71A9FB17136AD834A30 /* SliceChecksumDict.ice in Sources */, - 82D152396ABCFB797FC8088F /* SliceChecksums.cpp in Sources */, 652209819ABB9C4CD7978770 /* SlicedData.cpp in Sources */, BBFE75E0B1B9B5E2433EDF61 /* StreamAcceptor.cpp in Sources */, 521AA491E0F12631E6B313F9 /* StreamConnector.cpp in Sources */, |