diff options
310 files changed, 832 insertions, 939 deletions
diff --git a/CHANGELOG-3.7.md b/CHANGELOG-3.7.md index 93bcf0f520c..2873c9abea2 100644 --- a/CHANGELOG-3.7.md +++ b/CHANGELOG-3.7.md @@ -74,6 +74,9 @@ These are the changes since Ice 3.6.3. `findObjectFactory` have been deprecated in favor of similar operations on the new interface `ValueFactoryManager`. +- The Slice compiler options --ice and --underscore are now deprecated, and + replaced by the global Slice metadata ice-prefix and underscore. + - Renamed local interface metadata `async` to `async-oneway`. - Replaced `ConnectionCallback` by delegates `CloseCallback` and `HeartbeatCallback`. @@ -92,12 +95,28 @@ These are the changes since Ice 3.6.3. - IcePatch2 and IceGrid's distribution mechanism have been deprecated. +## C++ Changes + +- The --dll-export option of slice2cpp is now deprecated, and replaced by the global + Slice metadata cpp:dll-export:SYMBOL. + +## C# Changes + +- Added new interface/class metadata cs:tie. Use this metadata to generate a tie + class for a given interface or class. + ## Java Changes - Fixed a bug where unmarshaling Ice objects was really slow when using compact type IDs. +- (Java Compat) Added new interface/class metadata java:tie. Use this metadata + to generate a tie class for a given interface or class. + ## Objective-C Changes - Fixed a bug where optional object dictionary parameters would trigger an assert on marshaling. + +- The --dll-export option of slice2objc is now deprecated, and replaced by the global + Slice metadata objc:dll-export:SYMBOL. diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules index 8b45bfad582..c7f5d1b2847 100644 --- a/cpp/config/Make.rules +++ b/cpp/config/Make.rules @@ -100,7 +100,7 @@ cpp11_targetdir = $(if $(filter %/build,$5),cpp11) define make-cpp-src-project ifneq ($(USE_BIN_DIST),yes) $1_slicecompiler := slice2cpp -$1_sliceflags += --ice -I$(slicedir) +$1_sliceflags += -I$(slicedir) $1_cppflags += -Isrc -I$1/generated -I$(includedir) -I$(includedir)/generated -DICE_BUILDING_SRC $(make-project) srcs:: $1 diff --git a/cpp/include/IceBox/Config.h b/cpp/include/IceBox/Config.h index 2c929a8c3e7..041f09b91d7 100644 --- a/cpp/include/IceBox/Config.h +++ b/cpp/include/IceBox/Config.h @@ -7,18 +7,18 @@ // // ********************************************************************** -#ifndef ICE_BOX_CONFIG_H -#define ICE_BOX_CONFIG_H +#ifndef ICEBOX_CONFIG_H +#define ICEBOX_CONFIG_H // // Automatically link with IceBox[D|++11|++11D].lib // -#if !defined(ICE_BUILDING_ICE_BOX) && defined(ICE_BOX_API_EXPORTS) -# define ICE_BUILDING_ICE_BOX +#if !defined(ICE_BUILDING_ICEBOX) && defined(ICEBOX_API_EXPORTS) +# define ICE_BUILDING_ICEBOX #endif -#if defined(_MSC_VER) && !defined(ICE_BUILDING_ICE_BOX) +#if defined(_MSC_VER) && !defined(ICE_BUILDING_ICEBOX) # pragma comment(lib, ICE_LIBNAME("IceBox")) #endif diff --git a/cpp/msbuild/ice.cpp.props b/cpp/msbuild/ice.cpp.props index bc7606f0329..69e9ca8ac41 100644 --- a/cpp/msbuild/ice.cpp.props +++ b/cpp/msbuild/ice.cpp.props @@ -21,7 +21,6 @@ <Ice_SrcRootDir>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..'))</Ice_SrcRootDir> <IntDir>$(Platform)\$(Configuration)\</IntDir> <IceBuilderOutputDir Condition="'$(IceBuilderOutputDir)' == ''">$(Platform)\$(Configuration)</IceBuilderOutputDir> - <IceBuilderAllowIcePrefix Condition="'$(IceBuilderAllowIcePrefix)' == ''">true</IceBuilderAllowIcePrefix> <LinkIncremental>false</LinkIncremental> </PropertyGroup> diff --git a/cpp/src/Glacier2/Instrumentation.ice b/cpp/src/Glacier2/Instrumentation.ice index 3f694720422..1e90d3c17d5 100644 --- a/cpp/src/Glacier2/Instrumentation.ice +++ b/cpp/src/Glacier2/Instrumentation.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h"]] +[["ice-prefix", "cpp:header-ext:h"]] #include <Ice/Instrumentation.ice> diff --git a/cpp/src/Glacier2Lib/Makefile.mk b/cpp/src/Glacier2Lib/Makefile.mk index 9e6c2e72ffd..e028365efc3 100644 --- a/cpp/src/Glacier2Lib/Makefile.mk +++ b/cpp/src/Glacier2Lib/Makefile.mk @@ -12,6 +12,6 @@ $(project)_libraries := Glacier2 Glacier2_targetdir := $(libdir) Glacier2_dependencies := Ice Glacier2_cppflags := -DGLACIER2_API_EXPORTS -Glacier2_sliceflags := --include-dir Glacier2 --dll-export GLACIER2_API +Glacier2_sliceflags := --include-dir Glacier2 projects += $(project) diff --git a/cpp/src/Glacier2Lib/msbuild/glacier2++11/glacier2++11.vcxproj b/cpp/src/Glacier2Lib/msbuild/glacier2++11/glacier2++11.vcxproj index 9bf5a617918..ebe432690b0 100644 --- a/cpp/src/Glacier2Lib/msbuild/glacier2++11/glacier2++11.vcxproj +++ b/cpp/src/Glacier2Lib/msbuild/glacier2++11/glacier2++11.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> @@ -69,7 +69,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Glacier2\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>Glacier2</IceBuilderBaseDirectoryForGeneratedInclude> - <IceBuilderDLLExport>GLACIER2_API</IceBuilderDLLExport> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -399,4 +398,4 @@ <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/src/Glacier2Lib/msbuild/glacier2/glacier2.vcxproj b/cpp/src/Glacier2Lib/msbuild/glacier2/glacier2.vcxproj index 377ca8e94f8..13ed3ca934b 100644 --- a/cpp/src/Glacier2Lib/msbuild/glacier2/glacier2.vcxproj +++ b/cpp/src/Glacier2Lib/msbuild/glacier2/glacier2.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> @@ -73,7 +73,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Glacier2\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>Glacier2</IceBuilderBaseDirectoryForGeneratedInclude> - <IceBuilderDLLExport>GLACIER2_API</IceBuilderDLLExport> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -402,4 +401,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> <ImportGroup Label="ExtensionTargets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/src/Ice/Makefile.mk b/cpp/src/Ice/Makefile.mk index cd0ae966451..c9c751d481e 100644 --- a/cpp/src/Ice/Makefile.mk +++ b/cpp/src/Ice/Makefile.mk @@ -17,7 +17,7 @@ ifeq ($(DEFAULT_MUTEX_PROTOCOL), PrioInherit) Ice_cppflags += -DICE_PRIO_INHERIT endif -Ice_sliceflags := --include-dir Ice --dll-export ICE_API +Ice_sliceflags := --include-dir Ice Ice_libs := bz2 Ice_extra_sources := $(wildcard src/IceUtil/*.cpp) Ice_excludes = src/Ice/DLLMain.cpp diff --git a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj index f7b60592918..93cb0e7c159 100644 --- a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj +++ b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj @@ -68,7 +68,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>Ice</IceBuilderBaseDirectoryForGeneratedInclude> - <IceBuilderDLLExport>ICE_API</IceBuilderDLLExport> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> diff --git a/cpp/src/Ice/msbuild/ice/ice.vcxproj b/cpp/src/Ice/msbuild/ice/ice.vcxproj index bec21218a56..96475ccb118 100644 --- a/cpp/src/Ice/msbuild/ice/ice.vcxproj +++ b/cpp/src/Ice/msbuild/ice/ice.vcxproj @@ -73,7 +73,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Ice\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>Ice</IceBuilderBaseDirectoryForGeneratedInclude> - <IceBuilderDLLExport>ICE_API</IceBuilderDLLExport> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> diff --git a/cpp/src/IceBT/Makefile.mk b/cpp/src/IceBT/Makefile.mk index b429d77a2d0..0bd6db23a64 100644 --- a/cpp/src/IceBT/Makefile.mk +++ b/cpp/src/IceBT/Makefile.mk @@ -15,7 +15,7 @@ IceBT_targetdir := $(libdir) IceBT_dependencies := Ice IceBT_cppflags := -DICE_BT_API_EXPORTS $(shell pkg-config --cflags dbus-1) IceBT_system_libs = $(IceSSL_system_libs) $(shell pkg-config --libs dbus-1) -IceBT_sliceflags := --include-dir IceBT --dll-export ICE_BT_API +IceBT_sliceflags := --include-dir IceBT projects += $(project) diff --git a/cpp/src/IceBox/Makefile.mk b/cpp/src/IceBox/Makefile.mk index 15d0798d6bd..cf862d18496 100644 --- a/cpp/src/IceBox/Makefile.mk +++ b/cpp/src/IceBox/Makefile.mk @@ -10,7 +10,7 @@ $(project)_libraries := IceBox $(project)_programs := icebox iceboxadmin $(project)_dependencies := Ice -$(project)_sliceflags := --include-dir IceBox --dll-export ICEBOX_API +$(project)_sliceflags := --include-dir IceBox IceBox_targetdir := $(libdir) IceBox_sources := $(slicedir)/IceBox/IceBox.ice $(currentdir)/Exception.cpp diff --git a/cpp/src/IceBox/msbuild/iceboxlib++11/iceboxlib++11.vcxproj b/cpp/src/IceBox/msbuild/iceboxlib++11/iceboxlib++11.vcxproj index 6acfc2ab55e..0614befbb36 100644 --- a/cpp/src/IceBox/msbuild/iceboxlib++11/iceboxlib++11.vcxproj +++ b/cpp/src/IceBox/msbuild/iceboxlib++11/iceboxlib++11.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> @@ -81,26 +81,25 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceBox\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceBox</IceBuilderBaseDirectoryForGeneratedInclude> - <IceBuilderDLLExport>ICE_BOX_API</IceBuilderDLLExport> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> - <PreprocessorDefinitions>ICE_BOX_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>ICEBOX_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> - <PreprocessorDefinitions>ICE_BOX_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>ICEBOX_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <PreprocessorDefinitions>;ICE_BOX_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>;ICEBOX_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> - <PreprocessorDefinitions>ICE_BOX_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>ICEBOX_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemDefinitionGroup> <ItemGroup> @@ -159,4 +158,4 @@ <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/src/IceBox/msbuild/iceboxlib/iceboxlib.vcxproj b/cpp/src/IceBox/msbuild/iceboxlib/iceboxlib.vcxproj index f4166edcc46..d35c7e581c0 100644 --- a/cpp/src/IceBox/msbuild/iceboxlib/iceboxlib.vcxproj +++ b/cpp/src/IceBox/msbuild/iceboxlib/iceboxlib.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> @@ -81,26 +81,25 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IceBox\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceBox</IceBuilderBaseDirectoryForGeneratedInclude> - <IceBuilderDLLExport>ICE_BOX_API</IceBuilderDLLExport> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> - <PreprocessorDefinitions>ICE_BOX_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>ICEBOX_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> - <PreprocessorDefinitions>ICE_BOX_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>ICEBOX_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <PreprocessorDefinitions>ICE_BOX_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>ICEBOX_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> - <PreprocessorDefinitions>ICE_BOX_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>ICEBOX_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemDefinitionGroup> <ItemGroup> @@ -159,4 +158,4 @@ <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/src/IceGrid/Internal.ice b/cpp/src/IceGrid/Internal.ice index 0208d8903f0..21282309477 100644 --- a/cpp/src/IceGrid/Internal.ice +++ b/cpp/src/IceGrid/Internal.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h"]] +[["ice-prefix", "cpp:header-ext:h"]] #include <Ice/Identity.ice> #include <Ice/BuiltinSequences.ice> diff --git a/cpp/src/IceGridLib/Makefile.mk b/cpp/src/IceGridLib/Makefile.mk index 577f900fbd9..cc78f18bf7d 100644 --- a/cpp/src/IceGridLib/Makefile.mk +++ b/cpp/src/IceGridLib/Makefile.mk @@ -11,6 +11,6 @@ $(project)_libraries := IceGrid IceGrid_targetdir := $(libdir) IceGrid_dependencies := Glacier2 Ice -IceGrid_sliceflags := --include-dir IceGrid --dll-export ICE_GRID_API +IceGrid_sliceflags := --include-dir IceGrid projects += $(project) diff --git a/cpp/src/IceGridLib/msbuild/icegrid++11/icegrid++11.vcxproj b/cpp/src/IceGridLib/msbuild/icegrid++11/icegrid++11.vcxproj index 9cad1eb92e6..2851e80aa03 100644 --- a/cpp/src/IceGridLib/msbuild/icegrid++11/icegrid++11.vcxproj +++ b/cpp/src/IceGridLib/msbuild/icegrid++11/icegrid++11.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> @@ -69,7 +69,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceGrid\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceGrid</IceBuilderBaseDirectoryForGeneratedInclude> - <IceBuilderDLLExport>ICE_GRID_API</IceBuilderDLLExport> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -440,4 +439,4 @@ <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/src/IceGridLib/msbuild/icegrid/icegrid.vcxproj b/cpp/src/IceGridLib/msbuild/icegrid/icegrid.vcxproj index 886ed61a4b0..b75e5ed32ef 100644 --- a/cpp/src/IceGridLib/msbuild/icegrid/icegrid.vcxproj +++ b/cpp/src/IceGridLib/msbuild/icegrid/icegrid.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> @@ -73,7 +73,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IceGrid\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceGrid</IceBuilderBaseDirectoryForGeneratedInclude> - <IceBuilderDLLExport>ICE_GRID_API</IceBuilderDLLExport> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -444,4 +443,4 @@ <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/src/IceIAP/Makefile.mk b/cpp/src/IceIAP/Makefile.mk index daeffbead19..ebf3b7c3f23 100644 --- a/cpp/src/IceIAP/Makefile.mk +++ b/cpp/src/IceIAP/Makefile.mk @@ -14,7 +14,7 @@ IceIAP_platforms := iphoneos iphonesimulator IceIAP_targetdir := $(libdir) IceIAP_dependencies := Ice -IceIAP_sliceflags := --include-dir IceIAP --dll-export ICE_IAP_API +IceIAP_sliceflags := --include-dir IceIAP IceIAP_cppflags := -DICE_IAP_API_EXPORTS projects += $(project) diff --git a/cpp/src/IcePatch2Lib/Makefile.mk b/cpp/src/IcePatch2Lib/Makefile.mk index ca8f7ab85ff..28ae8689c5c 100644 --- a/cpp/src/IcePatch2Lib/Makefile.mk +++ b/cpp/src/IcePatch2Lib/Makefile.mk @@ -12,7 +12,7 @@ $(project)_libraries := IcePatch2 IcePatch2_targetdir := $(libdir) IcePatch2_dependencies := Ice IcePatch2_libs := bz2 -IcePatch2_sliceflags := --include-dir IcePatch2 --dll-export ICE_PATCH2_API +IcePatch2_sliceflags := --include-dir IcePatch2 IcePatch2_cppflags := $(nodeprecatedwarnings-cppflags) projects += $(project) diff --git a/cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj b/cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj index 1fc3000d0b3..59616ccc418 100644 --- a/cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj +++ b/cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> @@ -68,7 +68,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IcePatch2\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IcePatch2</IceBuilderBaseDirectoryForGeneratedInclude> - <IceBuilderDLLExport>ICE_PATCH2_API</IceBuilderDLLExport> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -207,4 +206,4 @@ <Error Condition="!Exists('..\..\..\msbuild\packages\bzip2.v140.1.0.6.4\build\native\bzip2.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\bzip2.v140.1.0.6.4\build\native\bzip2.v140.targets'))" /> <Error Condition="!Exists('..\..\..\msbuild\packages\bzip2.v120.1.0.6.4\build\native\bzip2.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\bzip2.v120.1.0.6.4\build\native\bzip2.v120.targets'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/src/IceSSL/Makefile.mk b/cpp/src/IceSSL/Makefile.mk index 0e2e3d00e94..75a4535439a 100644 --- a/cpp/src/IceSSL/Makefile.mk +++ b/cpp/src/IceSSL/Makefile.mk @@ -12,6 +12,6 @@ $(project)_libraries := IceSSL IceSSL_targetdir := $(libdir) IceSSL_dependencies := Ice IceSSL_cppflags := -DICE_SSL_API_EXPORTS -IceSSL_sliceflags := --include-dir IceSSL --dll-export ICE_SSL_API +IceSSL_sliceflags := --include-dir IceSSL projects += $(project) diff --git a/cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj b/cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj index 046de28a09a..78f8038fd5a 100644 --- a/cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj +++ b/cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> @@ -68,7 +68,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceSSL\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceSSL</IceBuilderBaseDirectoryForGeneratedInclude> - <IceBuilderDLLExport>ICE_SSL_API</IceBuilderDLLExport> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -225,4 +224,4 @@ <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj b/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj index 4826c43666e..fb6ffc509d0 100644 --- a/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj +++ b/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> @@ -73,7 +73,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IceSSL\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceSSL</IceBuilderBaseDirectoryForGeneratedInclude> - <IceBuilderDLLExport>ICE_SSL_API</IceBuilderDLLExport> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -230,4 +229,4 @@ <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/src/IceStorm/DBTypes.ice b/cpp/src/IceStorm/DBTypes.ice index 79a9154c07f..582155d8b2f 100644 --- a/cpp/src/IceStorm/DBTypes.ice +++ b/cpp/src/IceStorm/DBTypes.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h"]] +[["ice-prefix", "cpp:header-ext:h"]] #include <IceStorm/SubscriberRecord.ice> #include <IceStorm/LLURecord.ice> diff --git a/cpp/src/IceStorm/Election.ice b/cpp/src/IceStorm/Election.ice index 0c2fc25c51f..96343e4559d 100644 --- a/cpp/src/IceStorm/Election.ice +++ b/cpp/src/IceStorm/Election.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h"]] +[["ice-prefix", "cpp:header-ext:h"]] #include <Ice/Identity.ice> #include <Ice/BuiltinSequences.ice> diff --git a/cpp/src/IceStorm/IceStormInternal.ice b/cpp/src/IceStorm/IceStormInternal.ice index bafb51717fa..009e4a29876 100644 --- a/cpp/src/IceStorm/IceStormInternal.ice +++ b/cpp/src/IceStorm/IceStormInternal.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h"]] +[["ice-prefix", "cpp:header-ext:h"]] #include <IceStorm/IceStorm.ice> #include <IceStorm/Election.ice> diff --git a/cpp/src/IceStorm/Instrumentation.ice b/cpp/src/IceStorm/Instrumentation.ice index 9ee8a8cba5c..2c488805b54 100644 --- a/cpp/src/IceStorm/Instrumentation.ice +++ b/cpp/src/IceStorm/Instrumentation.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h"]] +[["ice-prefix", "cpp:header-ext:h"]] #include <Ice/Instrumentation.ice> #include <IceStorm/IceStorm.ice> diff --git a/cpp/src/IceStorm/LLURecord.ice b/cpp/src/IceStorm/LLURecord.ice index 0bcb6032f43..2ec7a4eaf46 100644 --- a/cpp/src/IceStorm/LLURecord.ice +++ b/cpp/src/IceStorm/LLURecord.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h"]] +[["ice-prefix", "cpp:header-ext:h"]] module IceStormElection { diff --git a/cpp/src/IceStorm/LinkRecord.ice b/cpp/src/IceStorm/LinkRecord.ice index bff551353b7..f4a9a3ad615 100644 --- a/cpp/src/IceStorm/LinkRecord.ice +++ b/cpp/src/IceStorm/LinkRecord.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h"]] +[["ice-prefix", "cpp:header-ext:h"]] #include <Ice/Identity.ice> #include <IceStorm/IceStormInternal.ice> diff --git a/cpp/src/IceStorm/SubscriberRecord.ice b/cpp/src/IceStorm/SubscriberRecord.ice index e528d27c0ec..cfd1bc103a2 100644 --- a/cpp/src/IceStorm/SubscriberRecord.ice +++ b/cpp/src/IceStorm/SubscriberRecord.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h"]] +[["ice-prefix", "cpp:header-ext:h"]] #include <Ice/Identity.ice> #include <IceStorm/IceStorm.ice> diff --git a/cpp/src/IceStormLib/Makefile.mk b/cpp/src/IceStormLib/Makefile.mk index b00e2e3a72a..cad251df280 100644 --- a/cpp/src/IceStormLib/Makefile.mk +++ b/cpp/src/IceStormLib/Makefile.mk @@ -11,6 +11,6 @@ $(project)_libraries := IceStorm IceStorm_targetdir := $(libdir) IceStorm_dependencies := Ice -IceStorm_sliceflags := --include-dir IceStorm --dll-export ICE_STORM_LIB_API +IceStorm_sliceflags := --include-dir IceStorm projects += $(project) diff --git a/cpp/src/IceStormLib/msbuild/icestorm++11/icestorm++11.vcxproj b/cpp/src/IceStormLib/msbuild/icestorm++11/icestorm++11.vcxproj index cd8879e9d2b..af3aabd6daa 100644 --- a/cpp/src/IceStormLib/msbuild/icestorm++11/icestorm++11.vcxproj +++ b/cpp/src/IceStormLib/msbuild/icestorm++11/icestorm++11.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> @@ -68,7 +68,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceStorm\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceStorm</IceBuilderBaseDirectoryForGeneratedInclude> - <IceBuilderDLLExport>ICE_STORM_LIB_API</IceBuilderDLLExport> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -185,4 +184,4 @@ <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/src/IceStormLib/msbuild/icestorm/icestorm.vcxproj b/cpp/src/IceStormLib/msbuild/icestorm/icestorm.vcxproj index c1013ec34d5..268b1663156 100644 --- a/cpp/src/IceStormLib/msbuild/icestorm/icestorm.vcxproj +++ b/cpp/src/IceStormLib/msbuild/icestorm/icestorm.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> @@ -68,7 +68,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IceStorm\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceStorm</IceBuilderBaseDirectoryForGeneratedInclude> - <IceBuilderDLLExport>ICE_STORM_LIB_API</IceBuilderDLLExport> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -185,4 +184,4 @@ <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp index ad8d3628d65..0a20815d592 100644 --- a/cpp/src/Slice/JavaUtil.cpp +++ b/cpp/src/Slice/JavaUtil.cpp @@ -164,10 +164,15 @@ public: bool ok = false; static const string packagePrefix = "java:package:"; + static const string checksumPrefix = "java:checksum:"; if(s.find(packagePrefix) == 0 && s.size() > packagePrefix.size()) { ok = true; } + else if(s.find(checksumPrefix) == 0 && s.size() > checksumPrefix.size()) + { + ok = true; + } if(!ok) { @@ -369,12 +374,18 @@ private: if(rest == "getset") { result.push_back(s); + continue; } else if(rest == "buffer") { result.push_back(s); + continue; + } + else if(rest == "tie") + { + result.push_back(s); + continue; } - continue; } } else if(s.substr(prefix.size(), pos - prefix.size()) == "type") diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp index e1a88c3f559..e6e8fb768a6 100644 --- a/cpp/src/Slice/Parser.cpp +++ b/cpp/src/Slice/Parser.cpp @@ -2426,23 +2426,34 @@ Slice::Container::checkIdentifier(const string& name) const // // For rules controlled by a translator option, we don't complain about included files. // - _unit->error("illegal underscore in identifier `" + name + "'"); + + DefinitionContextPtr dc = _unit->currentDefinitionContext(); + assert(dc); + if(dc->findMetaData("underscore") != "underscore") // no "underscore" global metadata + { + _unit->error("illegal underscore in identifier `" + name + "'"); + } } + // + // For rules controlled by a translator option, we don't complain about included files. + // if(_unit->currentIncludeLevel() == 0 && !_unit->allowIcePrefix()) { - // - // For rules controlled by a translator option, we don't complain about included files. - // - if(name.size() >= 3) + DefinitionContextPtr dc = _unit->currentDefinitionContext(); + assert(dc); + if(dc->findMetaData("ice-prefix") != "ice-prefix") // no "ice-prefix" global metadata { - string prefix3; - prefix3 += ::tolower(static_cast<unsigned char>(name[0])); - prefix3 += ::tolower(static_cast<unsigned char>(name[1])); - prefix3 += ::tolower(static_cast<unsigned char>(name[2])); - if(prefix3 == "ice") + if(name.size() >= 3) { - _unit->error("illegal identifier `" + name + "': `" + name.substr(0, 3) + "' prefix is reserved"); + string prefix3; + prefix3 += ::tolower(static_cast<unsigned char>(name[0])); + prefix3 += ::tolower(static_cast<unsigned char>(name[1])); + prefix3 += ::tolower(static_cast<unsigned char>(name[2])); + if(prefix3 == "ice") + { + _unit->error("illegal identifier `" + name + "': `" + name.substr(0, 3) + "' prefix is reserved"); + } } } } diff --git a/cpp/src/Slice/Python.cpp b/cpp/src/Slice/Python.cpp index 73a470260c4..cf46117d345 100644 --- a/cpp/src/Slice/Python.cpp +++ b/cpp/src/Slice/Python.cpp @@ -398,11 +398,13 @@ usage(const string& n) "--depend-xml Generate dependencies in XML format.\n" "--depend-file FILE Write dependencies to FILE instead of standard output.\n" "-d, --debug Print debug messages.\n" - "--ice Permit `Ice' prefix (for building Ice source code only).\n" - "--underscore Permit underscores in Slice identifiers.\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" + "--ice Allow reserved Ice prefix in Slice identifiers\n" + " deprecated: use instead [[\"ice-prefix\"]] metadata.\n" + "--underscore Allow underscores in Slice identifiers\n" + " deprecated: use instead [[\"underscore\"]] metadata.\n" ; } diff --git a/cpp/src/Slice/Ruby.cpp b/cpp/src/Slice/Ruby.cpp index 799e72c264b..fe0a05ad0e2 100644 --- a/cpp/src/Slice/Ruby.cpp +++ b/cpp/src/Slice/Ruby.cpp @@ -73,10 +73,12 @@ usage(const string& n) "--depend-xml Generate dependencies in XML format.\n" "--depend-file FILE Write dependencies to FILE instead of standard output.\n" "-d, --debug Print debug messages.\n" - "--ice Permit `Ice' prefix (for building Ice source code only).\n" - "--underscore Permit underscores in Slice identifiers.\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" + " deprecated: use instead [[\"underscore\"]] metadata.\n" ; } diff --git a/cpp/src/icegriddb/DBTypes.ice b/cpp/src/icegriddb/DBTypes.ice index 6729a6bf434..daa4f59bda8 100644 --- a/cpp/src/icegriddb/DBTypes.ice +++ b/cpp/src/icegriddb/DBTypes.ice @@ -11,7 +11,7 @@ #include <IceGrid/Admin.ice> -[["cpp:header-ext:h"]] +[["ice-prefix", "cpp:header-ext:h"]] module IceGrid { diff --git a/cpp/src/icegriddb/Makefile.mk b/cpp/src/icegriddb/Makefile.mk index 7150b79492d..69e68ea9bbb 100644 --- a/cpp/src/icegriddb/Makefile.mk +++ b/cpp/src/icegriddb/Makefile.mk @@ -9,7 +9,7 @@ $(project)_programs := icegriddb $(project)_generated_includedir := $(project)/generated/IceGrid -$(project)_sliceflags := -Isrc --include-dir IceGrid +$(project)_sliceflags := -Isrc --include-dir IceGrid -DICE_BUILDING_ICEGRIDDB $(project)/IceGridDB.cpp: $(includedir)/generated/IceGrid/Admin.h $(project)/generated/DBTypes.cpp: $(includedir)/generated/IceGrid/Admin.h diff --git a/cpp/src/icegriddb/msbuild/icegriddb.vcxproj b/cpp/src/icegriddb/msbuild/icegriddb.vcxproj index 2ab0f884902..5670030372f 100644 --- a/cpp/src/icegriddb/msbuild/icegriddb.vcxproj +++ b/cpp/src/icegriddb/msbuild/icegriddb.vcxproj @@ -97,8 +97,7 @@ <IceBuilderIncludeDirectories>$(Ice_SrcRootDir)\src\;$(IceBuilderIncludeDirectories)</IceBuilderIncludeDirectories> <IceBuilderHeaderOutputDir>$(Platform)\$(Configuration)\IceGrid\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceGrid</IceBuilderBaseDirectoryForGeneratedInclude> - <IceBuilderAdditionalOptions> - </IceBuilderAdditionalOptions> + <IceBuilderAdditionalOptions>-DICE_BUILDING_ICEGRIDDB</IceBuilderAdditionalOptions> </PropertyGroup> <ItemGroup> <ResourceCompile Include="..\IceGridDB.rc" /> diff --git a/cpp/src/icegriddb/msbuild/icegriddb.vcxproj.filters b/cpp/src/icegriddb/msbuild/icegriddb.vcxproj.filters index 20bf3556d94..82743311913 100644 --- a/cpp/src/icegriddb/msbuild/icegriddb.vcxproj.filters +++ b/cpp/src/icegriddb/msbuild/icegriddb.vcxproj.filters @@ -55,7 +55,7 @@ </Filter> </ItemGroup> <ItemGroup> - <ResourceCompile Include="..\..\IceGridDB.rc"> + <ResourceCompile Include="..\IceGridDB.rc"> <Filter>Resource Files</Filter> </ResourceCompile> </ItemGroup> @@ -71,9 +71,6 @@ </IceBuilder> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\IceGridDB.cpp"> - <Filter>Source Files</Filter> - </ClCompile> <ClCompile Include="Win32\Debug\Descriptor.cpp"> <Filter>Source Files\Win32\Debug</Filter> </ClCompile> @@ -110,6 +107,9 @@ <ClCompile Include="x64\Release\DBTypes.cpp"> <Filter>Source Files\x64\Release</Filter> </ClCompile> + <ClCompile Include="..\IceGridDB.cpp"> + <Filter>Source Files</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="Win32\Debug\IceGrid\Descriptor.h"> diff --git a/cpp/src/slice2confluence/Main.cpp b/cpp/src/slice2confluence/Main.cpp index 8bf3cd85ba5..ad6b22c9307 100644 --- a/cpp/src/slice2confluence/Main.cpp +++ b/cpp/src/slice2confluence/Main.cpp @@ -103,8 +103,10 @@ usage(const string& n) "--index NUM Generate subindex if it has at least NUM entries (0 for no index, default=1).\n" "--summary NUM Print a warning if a summary sentence exceeds NUM characters.\n" "-d, --debug Print debug messages.\n" - "--ice Allow reserved Ice prefix in Slice identifiers.\n" - "--underscore Allow underscores in Slice identifiers.\n" + "--ice Allow reserved Ice prefix in Slice identifiers\n" + " deprecated: use instead [[\"ice-prefix\"]] metadata.\n" + "--underscore Allow underscores in Slice identifiers\n" + " deprecated: use instead [[\"underscore\"]] metadata.\n" ; } diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 978ab8114f2..ad125388647 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -463,6 +463,21 @@ Slice::Gen::generate(const UnitPtr& p) _headerExtension = headerExtension; } + // + // Give precedence to --dll-export command-line option + // + if(_dllExport.empty()) + { + DefinitionContextPtr dc = p->findDefinitionContext(file); + assert(dc); + static const string dllExportPrefix = "cpp:dll-export:"; + string meta = dc->findMetaData(dllExportPrefix); + if(meta.size() > dllExportPrefix.size()) + { + _dllExport = meta.substr(dllExportPrefix.size()); + } + } + if(_implCpp98 || _implCpp11) { string fileImplH = _base + "I." + _implHeaderExtension; @@ -4459,6 +4474,7 @@ Slice::Gen::MetaDataVisitor::visitUnitStart(const UnitPtr& p) assert(dc); StringList globalMetaData = dc->getMetaData(); int headerExtension = 0; + int dllExport = 0; for(StringList::const_iterator r = globalMetaData.begin(); r != globalMetaData.end(); ++r) { string s = *r; @@ -4468,6 +4484,8 @@ Slice::Gen::MetaDataVisitor::visitUnitStart(const UnitPtr& p) { static const string cppIncludePrefix = "cpp:include:"; static const string cppHeaderExtPrefix = "cpp:header-ext:"; + static const string cppDllExportPrefix = "cpp:dll-export:"; + if(s.find(cppIncludePrefix) == 0 && s.size() > cppIncludePrefix.size()) { continue; @@ -4485,6 +4503,20 @@ Slice::Gen::MetaDataVisitor::visitUnitStart(const UnitPtr& p) } continue; } + else if(s.find(cppDllExportPrefix) == 0 && s.size() > cppDllExportPrefix.size()) + { + dllExport++; + if(dllExport > 1) + { + ostringstream ostr; + ostr << "ignoring invalid global metadata `" << s + << "': directive can appear only once per file"; + emitWarning(file, -1, ostr.str()); + _history.insert(s); + } + continue; + } + ostringstream ostr; ostr << "ignoring invalid global metadata `" << s << "'"; emitWarning(file, -1, ostr.str()); diff --git a/cpp/src/slice2cpp/Main.cpp b/cpp/src/slice2cpp/Main.cpp index 27376433b57..72a549b454e 100644 --- a/cpp/src/slice2cpp/Main.cpp +++ b/cpp/src/slice2cpp/Main.cpp @@ -72,16 +72,19 @@ usage(const string& n) "-E Print preprocessor output on stdout.\n" "--include-dir DIR Use DIR as the header include directory in source files.\n" "--output-dir DIR Create files in the directory DIR.\n" - "--dll-export SYMBOL Use SYMBOL for DLL exports.\n" "--impl-c++98 Generate sample implementations for C++98 mapping.\n" "--impl-c++11 Generate sample implementations for C++11 mapping.\n" + "--checksum Generate checksums for Slice definitions.\n" "--depend Generate Makefile dependencies.\n" "--depend-xml Generate dependencies in XML format.\n" "--depend-file FILE Write dependencies to FILE instead of standard output.\n" "-d, --debug Print debug messages.\n" - "--ice Allow reserved Ice prefix in Slice identifiers.\n" - "--underscore Allow underscores in Slice identifiers.\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" + " deprecated: use instead [[\"ice-prefix\"]] metadata.\n" + "--underscore Allow underscores in Slice identifiers\n" + " deprecated: use instead [[\"underscore\"]] metadata.\n" ; } @@ -174,7 +177,7 @@ compile(const vector<string>& argv) string dllExport = opts.optArg("dll-export"); bool implCpp98 = opts.isSet("impl-c++98"); - + bool implCpp11 = opts.isSet("impl-c++11"); bool depend = opts.isSet("depend"); @@ -210,7 +213,7 @@ compile(const vector<string>& argv) } return EXIT_FAILURE; } - + if(implCpp98 && implCpp11) { getErrorStream() << argv[0] << ": error: cannot specify both --impl-c++98 and --impl-c++11" << endl; diff --git a/cpp/src/slice2cs/CsUtil.cpp b/cpp/src/slice2cs/CsUtil.cpp index 83aabc950d5..3487cde3fce 100644 --- a/cpp/src/slice2cs/CsUtil.cpp +++ b/cpp/src/slice2cs/CsUtil.cpp @@ -2531,10 +2531,15 @@ Slice::CsGenerator::MetaDataVisitor::validate(const ContainedPtr& cont) if(s.find(prefix) == 0) { static const string csAttributePrefix = prefix + "attribute:"; + static const string csTie = prefix + "tie"; if(s.find(csAttributePrefix) == 0 && s.size() > csAttributePrefix.size()) { continue; } + else if(s.find(csTie) == 0 && s.size() == csTie.size()) + { + continue; + } emitWarning(cont->file(), cont->line(), msg + " `" + s + "'"); _history.insert(s); } diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp index 1fe547582ab..9122c83a68b 100644 --- a/cpp/src/slice2cs/Gen.cpp +++ b/cpp/src/slice2cs/Gen.cpp @@ -1984,7 +1984,9 @@ Slice::CsVisitor::writeDocCommentParam(const OperationPtr& p, ParamDir paramType } Slice::Gen::Gen(const string& base, const vector<string>& includePaths, const string& dir, - bool impl, bool implTie) : _includePaths(includePaths) + bool tie, bool impl, bool implTie) : + _includePaths(includePaths), + _tie(tie) { string fileBase = base; string::size_type pos = base.find_last_of("/\\"); @@ -2084,18 +2086,11 @@ Slice::Gen::generate(const UnitPtr& p) HelperVisitor helperVisitor(_out); p->visit(&helperVisitor, false); - DispatcherVisitor dispatcherVisitor(_out); + DispatcherVisitor dispatcherVisitor(_out, _tie); p->visit(&dispatcherVisitor, false); } void -Slice::Gen::generateTie(const UnitPtr& p) -{ - TieVisitor tieVisitor(_out); - p->visit(&tieVisitor, false); -} - -void Slice::Gen::generateImpl(const UnitPtr& p) { ImplVisitor implVisitor(_impl); @@ -5149,8 +5144,9 @@ Slice::Gen::HelperVisitor::visitDictionary(const DictionaryPtr& p) _out << eb; } -Slice::Gen::DispatcherVisitor::DispatcherVisitor(::IceUtilInternal::Output &out) - : CsVisitor(out) +Slice::Gen::DispatcherVisitor::DispatcherVisitor(::IceUtilInternal::Output& out, bool tie) : + CsVisitor(out), + _tie(tie) { } @@ -5241,113 +5237,80 @@ Slice::Gen::DispatcherVisitor::visitClassDefStart(const ClassDefPtr& p) } writeInheritedOperations(p); - writeDispatch(p); - _out << eb; - - return true; -} - -Slice::Gen::TieVisitor::TieVisitor(IceUtilInternal::Output& out) - : CsVisitor(out) -{ -} - -bool -Slice::Gen::TieVisitor::visitModuleStart(const ModulePtr& p) -{ - if(!p->hasClassDefs()) + if((_tie || p->hasMetaData("cs:tie")) && !p->isLocal() && p->isAbstract()) { - return false; - } - - _out << sp << nl << "namespace " << fixId(p->name()); - _out << sb; + // Need to generate tie - return true; -} - -void -Slice::Gen::TieVisitor::visitModuleEnd(const ModulePtr&) -{ - _out << eb; -} - -bool -Slice::Gen::TieVisitor::visitClassDefStart(const ClassDefPtr& p) -{ - if(p->isLocal() || !p->isAbstract()) - { - return false; - } + // close previous class + _out << eb; - string name = p->name(); - string opIntfName = "Operations"; + string opIntfName = "Operations"; - _out << sp; - emitComVisibleAttribute(); - emitGeneratedCodeAttribute(); - _out << nl << "public class " << name << "Tie_ : " << name << "Disp_, Ice.TieBase"; + _out << sp; + emitComVisibleAttribute(); + emitGeneratedCodeAttribute(); + _out << nl << "public class " << name << "Tie_ : " << name << "Disp_, Ice.TieBase"; - _out << sb; + _out << sb; - _out << sp << nl << "public " << name << "Tie_()"; - _out << sb; - _out << eb; + _out << sp << nl << "public " << name << "Tie_()"; + _out << sb; + _out << eb; - _out << sp << nl << "public " << name << "Tie_(" << name << opIntfName << "_ del)"; - _out << sb; - _out << nl << "_ice_delegate = del;"; - _out << eb; + _out << sp << nl << "public " << name << "Tie_(" << name << opIntfName << "_ del)"; + _out << sb; + _out << nl << "_ice_delegate = del;"; + _out << eb; - _out << sp << nl << "public object ice_delegate()"; - _out << sb; - _out << nl << "return _ice_delegate;"; - _out << eb; + _out << sp << nl << "public object ice_delegate()"; + _out << sb; + _out << nl << "return _ice_delegate;"; + _out << eb; - _out << sp << nl << "public void ice_delegate(object del)"; - _out << sb; - _out << nl << "_ice_delegate = (" << name << opIntfName << "_)del;"; - _out << eb; + _out << sp << nl << "public void ice_delegate(object del)"; + _out << sb; + _out << nl << "_ice_delegate = (" << name << opIntfName << "_)del;"; + _out << eb; - _out << sp << nl << "public override int GetHashCode()"; - _out << sb; - _out << nl << "return _ice_delegate == null ? 0 : _ice_delegate.GetHashCode();"; - _out << eb; + _out << sp << nl << "public override int GetHashCode()"; + _out << sb; + _out << nl << "return _ice_delegate == null ? 0 : _ice_delegate.GetHashCode();"; + _out << eb; - _out << sp << nl << "public override bool Equals(object rhs)"; - _out << sb; - _out << nl << "if(object.ReferenceEquals(this, rhs))"; - _out << sb; - _out << nl << "return true;"; - _out << eb; - _out << nl << "if(!(rhs is " << name << "Tie_))"; - _out << sb; - _out << nl << "return false;"; - _out << eb; - _out << nl << "if(_ice_delegate == null)"; - _out << sb; - _out << nl << "return ((" << name << "Tie_)rhs)._ice_delegate == null;"; - _out << eb; - _out << nl << "return _ice_delegate.Equals(((" << name << "Tie_)rhs)._ice_delegate);"; - _out << eb; + _out << sp << nl << "public override bool Equals(object rhs)"; + _out << sb; + _out << nl << "if(object.ReferenceEquals(this, rhs))"; + _out << sb; + _out << nl << "return true;"; + _out << eb; + _out << nl << "if(!(rhs is " << name << "Tie_))"; + _out << sb; + _out << nl << "return false;"; + _out << eb; + _out << nl << "if(_ice_delegate == null)"; + _out << sb; + _out << nl << "return ((" << name << "Tie_)rhs)._ice_delegate == null;"; + _out << eb; + _out << nl << "return _ice_delegate.Equals(((" << name << "Tie_)rhs)._ice_delegate);"; + _out << eb; - writeOperations(p); + writeTieOperations(p); - _out << sp << nl << "private " << name << opIntfName << "_ _ice_delegate;"; + _out << sp << nl << "private " << name << opIntfName << "_ _ice_delegate;"; + } return true; } - void -Slice::Gen::TieVisitor::visitClassDefEnd(const ClassDefPtr&) +Slice::Gen::DispatcherVisitor::visitClassDefEnd(const ClassDefPtr&) { _out << eb; } void -Slice::Gen::TieVisitor::writeOperations(const ClassDefPtr& p, NameSet* opNames) +Slice::Gen::DispatcherVisitor::writeTieOperations(const ClassDefPtr& p, NameSet* opNames) { OperationList ops = p->operations(); for(OperationList::const_iterator r = ops.begin(); r != ops.end(); ++r) @@ -5382,7 +5345,7 @@ Slice::Gen::TieVisitor::writeOperations(const ClassDefPtr& p, NameSet* opNames) ClassList bases = p->bases(); for(ClassList::const_iterator i = bases.begin(); i != bases.end(); ++i) { - writeOperations(*i, &opNames); + writeTieOperations(*i, &opNames); } } else @@ -5390,7 +5353,7 @@ Slice::Gen::TieVisitor::writeOperations(const ClassDefPtr& p, NameSet* opNames) ClassList bases = p->bases(); for(ClassList::const_iterator i = bases.begin(); i != bases.end(); ++i) { - writeOperations(*i, opNames); + writeTieOperations(*i, opNames); } } } diff --git a/cpp/src/slice2cs/Gen.h b/cpp/src/slice2cs/Gen.h index 230c0fd5942..1b3096d415e 100644 --- a/cpp/src/slice2cs/Gen.h +++ b/cpp/src/slice2cs/Gen.h @@ -85,11 +85,11 @@ public: const std::vector<std::string>&, const std::string&, bool, + bool, bool); ~Gen(); void generate(const UnitPtr&); - void generateTie(const UnitPtr&); void generateImpl(const UnitPtr&); void generateImplTie(const UnitPtr&); void generateChecksums(const UnitPtr&); @@ -99,8 +99,8 @@ private: IceUtilInternal::Output _out; IceUtilInternal::Output _impl; - std::vector<std::string> _includePaths; + bool _tie; void printHeader(); @@ -219,18 +219,7 @@ private: { public: - DispatcherVisitor(::IceUtilInternal::Output&); - - virtual bool visitModuleStart(const ModulePtr&); - virtual void visitModuleEnd(const ModulePtr&); - virtual bool visitClassDefStart(const ClassDefPtr&); - }; - - class TieVisitor : public CsVisitor - { - public: - - TieVisitor(::IceUtilInternal::Output&); + DispatcherVisitor(::IceUtilInternal::Output&, bool); virtual bool visitModuleStart(const ModulePtr&); virtual void visitModuleEnd(const ModulePtr&); @@ -240,7 +229,9 @@ private: private: typedef std::set<std::string> NameSet; - void writeOperations(const ClassDefPtr&, NameSet* = 0); + void writeTieOperations(const ClassDefPtr&, NameSet* = 0); + + bool _tie; }; class BaseImplVisitor : public CsVisitor diff --git a/cpp/src/slice2cs/Main.cpp b/cpp/src/slice2cs/Main.cpp index 2268eb1fa0a..e9a18c20d6a 100644 --- a/cpp/src/slice2cs/Main.cpp +++ b/cpp/src/slice2cs/Main.cpp @@ -68,16 +68,18 @@ usage(const string& n) "-IDIR Put DIR in the include file search path.\n" "-E Print preprocessor output on stdout.\n" "--output-dir DIR Create files in the directory DIR.\n" - "--tie Generate TIE classes.\n" + "--tie Generate tie classes.\n" "--impl Generate sample implementations.\n" - "--impl-tie Generate sample TIE implementations.\n" + "--impl-tie Generate sample tie implementations.\n" "--depend Generate Makefile dependencies.\n" "--depend-xml Generate dependencies in XML format.\n" "--depend-file FILE Write dependencies to FILE instead of standard output.\n" "-d, --debug Print debug messages.\n" - "--ice Allow reserved Ice prefix in Slice identifiers.\n" - "--underscore Allow underscores in Slice identifiers.\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" + " deprecated: use instead [[\"underscore\"]] metadata.\n" ; } @@ -309,12 +311,8 @@ compile(const vector<string>& argv) { try { - Gen gen(icecpp->getBaseName(), includePaths, output, impl, implTie); + Gen gen(icecpp->getBaseName(), includePaths, output, tie, impl, implTie); gen.generate(p); - if(tie) - { - gen.generateTie(p); - } if(impl) { gen.generateImpl(p); diff --git a/cpp/src/slice2html/Main.cpp b/cpp/src/slice2html/Main.cpp index 818882ceb61..1bc84b6bde9 100644 --- a/cpp/src/slice2html/Main.cpp +++ b/cpp/src/slice2html/Main.cpp @@ -80,8 +80,10 @@ usage(const string& n) "--index NUM Generate subindex if it has at least NUM entries (0 for no index, default=1).\n" "--summary NUM Print a warning if a summary sentence exceeds NUM characters.\n" "-d, --debug Print debug messages.\n" - "--ice Allow reserved Ice prefix in Slice identifiers.\n" - "--underscore Allow underscores in Slice identifiers.\n" + "--ice Allow reserved Ice prefix in Slice identifiers\n" + " deprecated: use instead [[\"ice-prefix\"]] metadata.\n" + "--underscore Allow underscores in Slice identifiers\n" + " deprecated: use instead [[\"underscore\"]] metadata.\n" ; } diff --git a/cpp/src/slice2java/GenCompat.cpp b/cpp/src/slice2java/GenCompat.cpp index 205d4093750..43205b19db6 100644 --- a/cpp/src/slice2java/GenCompat.cpp +++ b/cpp/src/slice2java/GenCompat.cpp @@ -2199,10 +2199,11 @@ Slice::JavaCompatVisitor::writeDocCommentParam(Output& out, const OperationPtr& } } -Slice::GenCompat::GenCompat(const string& /*name*/, const string& base, const vector<string>& includePaths, const string& dir) : +Slice::GenCompat::GenCompat(const string& /*name*/, const string& base, const vector<string>& includePaths, const string& dir, bool tie) : _base(base), _includePaths(includePaths), - _dir(dir) + _dir(dir), + _tie(tie) { } @@ -2236,7 +2237,7 @@ Slice::GenCompat::generate(const UnitPtr& p) ProxyVisitor proxyVisitor(_dir); p->visit(&proxyVisitor, false); - DispatcherVisitor dispatcherVisitor(_dir); + DispatcherVisitor dispatcherVisitor(_dir, _tie); p->visit(&dispatcherVisitor, false); AsyncVisitor asyncVisitor(_dir); @@ -2244,13 +2245,6 @@ Slice::GenCompat::generate(const UnitPtr& p) } void -Slice::GenCompat::generateTie(const UnitPtr& p) -{ - TieVisitor tieVisitor(_dir); - p->visit(&tieVisitor, false); -} - -void Slice::GenCompat::generateImpl(const UnitPtr& p) { ImplVisitor implVisitor(_dir); @@ -2461,218 +2455,6 @@ Slice::GenCompat::OpsVisitor::writeOperations(const ClassDefPtr& p, bool noCurre close(); } -Slice::GenCompat::TieVisitor::TieVisitor(const string& dir) : - JavaCompatVisitor(dir) -{ -} - -bool -Slice::GenCompat::TieVisitor::visitClassDefStart(const ClassDefPtr& p) -{ - string name = p->name(); - ClassList bases = p->bases(); - string package = getPackage(p); - string absolute = getAbsolute(p, "", "_", "Tie"); - string opIntfName = "Operations"; - if(p->isLocal()) - { - opIntfName += "NC"; - } - - // - // Don't generate a TIE class for a non-abstract class - // - if(!p->isAbstract()) - { - return false; - } - - open(absolute, p->file()); - - Output& out = output(); - - // - // Generate the TIE class - // - out << sp << nl << "public class " << '_' << name << "Tie"; - if(p->isInterface()) - { - if(p->isLocal()) - { - out << " implements " << fixKwd(name) << ", Ice.TieBase"; - } - else - { - out << " extends " << '_' << name << "Disp implements Ice.TieBase"; - } - } - else - { - out << " extends " << fixKwd(name) << " implements Ice.TieBase"; - } - - out << sb; - - out << sp << nl << "public _" << name << "Tie()"; - out << sb; - out << eb; - - out << sp << nl << "public _" << name << "Tie(" << '_' << name << opIntfName << " delegate)"; - out << sb; - out << nl << "_ice_delegate = delegate;"; - out << eb; - - out << sp << nl << "public java.lang.Object ice_delegate()"; - out << sb; - out << nl << "return _ice_delegate;"; - out << eb; - - out << sp << nl << "public void ice_delegate(java.lang.Object delegate)"; - out << sb; - out << nl << "_ice_delegate = (_" << name << opIntfName << ")delegate;"; - out << eb; - - out << sp << nl << "public boolean equals(java.lang.Object rhs)"; - out << sb; - out << nl << "if(this == rhs)"; - out << sb; - out << nl << "return true;"; - out << eb; - out << nl << "if(!(rhs instanceof " << '_' << name << "Tie))"; - out << sb; - out << nl << "return false;"; - out << eb; - out << sp << nl << "return _ice_delegate.equals(((" << '_' << name << "Tie)rhs)._ice_delegate);"; - out << eb; - - out << sp << nl << "public int hashCode()"; - out << sb; - out << nl << "return _ice_delegate.hashCode();"; - out << eb; - - if(p->isLocal()) - { - out << sp << nl << "public _" << name << "Tie clone()"; - out.inc(); - out << nl << "throws java.lang.CloneNotSupportedException"; - out.dec(); - out << sb; - out << nl << "return (_" << name << "Tie)super.clone();"; - out << eb; - } - - OperationList ops = p->allOperations(); - for(OperationList::iterator r = ops.begin(); r != ops.end(); ++r) - { - ContainerPtr container = (*r)->container(); - ClassDefPtr cl = ClassDefPtr::dynamicCast(container); - const bool hasAMD = cl->hasMetaData("amd") || (*r)->hasMetaData("amd"); - const bool optionalMapping = useOptionalMapping(*r); - - string opName = hasAMD ? (*r)->name() + "_async" : fixKwd((*r)->name()); - - TypePtr ret = (*r)->returnType(); - string retS = typeToString(ret, TypeModeReturn, package, (*r)->getMetaData(), true, - optionalMapping && (*r)->returnIsOptional()); - - vector<string> params; - vector<string> args; - if(hasAMD) - { - params = getParamsAsync((*r), package, true, true); - args = getArgsAsync(*r); - } - else - { - params = getParams((*r), package, false, optionalMapping); - args = getArgs(*r); - } - - string deprecateReason = getDeprecateReason(*r, cl, "operation"); - - out << sp; - if(!deprecateReason.empty()) - { - out << nl << "@Deprecated"; - out << nl << "@SuppressWarnings(\"deprecation\")"; - } - out << nl << "public " << (hasAMD ? string("void") : retS) << ' ' << opName << spar << params; - if(!p->isLocal()) - { - out << "Ice.Current __current"; - } - out << epar; - - if((*r)->hasMetaData("UserException")) - { - out.inc(); - out << nl << "throws Ice.UserException"; - out.dec(); - } - else - { - ExceptionList throws = (*r)->throws(); - throws.sort(); - throws.unique(); - writeThrowsClause(package, throws); - } - out << sb; - out << nl; - if(ret && !hasAMD) - { - out << "return "; - } - out << "_ice_delegate." << opName << spar << args; - if(!p->isLocal()) - { - out << "__current"; - } - out << epar << ';'; - out << eb; - } - - out << sp << nl << "private " << '_' << name << opIntfName << " _ice_delegate;"; - out << sp << nl << "public static final long serialVersionUID = "; - string serialVersionUID; - if(p->findMetaData("java:serialVersionUID", serialVersionUID)) - { - string::size_type pos = serialVersionUID.rfind(":") + 1; - if(pos == string::npos) - { - ostringstream os; - os << "ignoring invalid serialVersionUID for class `" << p->scoped() << "'; generating default value"; - emitWarning("", "", os.str()); - out << computeSerialVersionUUID(p); - } - else - { - Int64 v = 0; - serialVersionUID = serialVersionUID.substr(pos); - if(serialVersionUID != "0") - { - if(!stringToInt64(serialVersionUID, v)) // conversion error - { - ostringstream os; - os << "ignoring invalid serialVersionUID for class `" << p->scoped() - << "'; generating default value"; - emitWarning("", "", os.str()); - out << computeSerialVersionUUID(p); - } - } - out << v; - } - } - else - { - out << computeSerialVersionUUID(p); - } - out << "L;"; - out << eb; - close(); - - return false; -} - Slice::GenCompat::PackageVisitor::PackageVisitor(const string& dir) : JavaCompatVisitor(dir) { @@ -2770,7 +2552,7 @@ Slice::GenCompat::TypesVisitor::visitClassDefStart(const ClassDefPtr& p) out << "class " << fixKwd(name); out.useCurrentPosAsIndent(); - StringList implements; + StringList implements; bool implementsOnNewLine = true; if(bases.empty() || bases.front()->isInterface()) @@ -2778,7 +2560,7 @@ Slice::GenCompat::TypesVisitor::visitClassDefStart(const ClassDefPtr& p) if(p->isLocal()) { implementsOnNewLine = false; - implements.push_back("java.lang.Cloneable"); + implements.push_back("java.lang.Cloneable"); } else { @@ -3134,28 +2916,28 @@ Slice::GenCompat::TypesVisitor::visitClassDefEnd(const ClassDefPtr& p) if(!p->isInterface()) { - out << sp << nl << "public " << name << nl << "clone()"; - out << sb; - - if(p->isLocal() && !baseClass) - { - out << nl << name << " c = null;"; - out << nl << "try"; - out << sb; - out << nl << "c = (" << name << ")super.clone();"; - out << eb; - out << nl << "catch(CloneNotSupportedException ex)"; - out << sb; - out << nl << "assert false; // impossible"; - out << eb; - out << nl << "return c;"; - - } - else - { - out << nl << "return (" << name << ")super.clone();"; - } - out << eb; + out << sp << nl << "public " << name << nl << "clone()"; + out << sb; + + if(p->isLocal() && !baseClass) + { + out << nl << name << " c = null;"; + out << nl << "try"; + out << sb; + out << nl << "c = (" << name << ")super.clone();"; + out << eb; + out << nl << "catch(CloneNotSupportedException ex)"; + out << sb; + out << nl << "assert false; // impossible"; + out << eb; + out << nl << "return c;"; + + } + else + { + out << nl << "return (" << name << ")super.clone();"; + } + out << eb; } if(p->isInterface() && !p->isLocal()) @@ -3566,7 +3348,7 @@ Slice::GenCompat::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p) if(p->usesClasses(false)) { - if(!base || (base && !base->usesClasses(false))) + if(!base || (base && !base->usesClasses(false))) { out << sp << nl << "public boolean" << nl << "__usesClasses()"; out << sb; @@ -5752,48 +5534,252 @@ Slice::GenCompat::ProxyVisitor::visitOperation(const OperationPtr& p) } } -Slice::GenCompat::DispatcherVisitor::DispatcherVisitor(const string& dir) : - JavaCompatVisitor(dir) +Slice::GenCompat::DispatcherVisitor::DispatcherVisitor(const string& dir, bool tie) : + JavaCompatVisitor(dir), + _tie(tie) { } bool Slice::GenCompat::DispatcherVisitor::visitClassDefStart(const ClassDefPtr& p) { - if(p->isLocal() || !p->isInterface()) + string name = p->name(); + ClassList bases = p->bases(); + + if(!p->isLocal() && p->isInterface()) { - return false; + string absolute = getAbsolute(p, "", "_", "Disp"); + + open(absolute, p->file()); + + Output& out = output(); + + out << sp; + writeDocComment(out, p, getDeprecateReason(p, 0, p->isInterface() ? "interface" : "class")); + out << nl << "public abstract class _" << name << "Disp extends Ice.ObjectImpl implements " << fixKwd(name); + out << sb; + + out << sp << nl << "protected void" << nl << "ice_copyStateFrom(Ice.Object __obj)"; + out.inc(); + out << nl << "throws java.lang.CloneNotSupportedException"; + out.dec(); + out << sb; + out << nl << "throw new java.lang.CloneNotSupportedException();"; + out << eb; + + writeDispatchAndMarshalling(out, p); + + // + // Avoid serialVersionUID warnings for dispatch classes. + // + out << sp << nl << "public static final long serialVersionUID = 0L;"; + out << eb; + close(); } - string name = p->name(); - ClassList bases = p->bases(); - string absolute = getAbsolute(p, "", "_", "Disp"); + if(_tie || p->hasMetaData("java:tie")) + { + // Tie class - open(absolute, p->file()); + string package = getPackage(p); + string absolute = getAbsolute(p, "", "_", "Tie"); + string opIntfName = "Operations"; + if(p->isLocal()) + { + opIntfName += "NC"; + } - Output& out = output(); + // + // Don't generate a tie class for a non-abstract class + // + if(!p->isAbstract()) + { + return false; + } - out << sp; - writeDocComment(out, p, getDeprecateReason(p, 0, p->isInterface() ? "interface" : "class")); - out << nl << "public abstract class _" << name << "Disp extends Ice.ObjectImpl implements " << fixKwd(name); - out << sb; + open(absolute, p->file()); - out << sp << nl << "protected void" << nl << "ice_copyStateFrom(Ice.Object __obj)"; - out.inc(); - out << nl << "throws java.lang.CloneNotSupportedException"; - out.dec(); - out << sb; - out << nl << "throw new java.lang.CloneNotSupportedException();"; - out << eb; + Output& out = output(); + + // + // Generate the tie class + // + out << sp << nl << "public class " << '_' << name << "Tie"; + if(p->isInterface()) + { + if(p->isLocal()) + { + out << " implements " << fixKwd(name) << ", Ice.TieBase"; + } + else + { + out << " extends " << '_' << name << "Disp implements Ice.TieBase"; + } + } + else + { + out << " extends " << fixKwd(name) << " implements Ice.TieBase"; + } - writeDispatchAndMarshalling(out, p); + out << sb; - // - // Avoid serialVersionUID warnings for dispatch classes. - // - out << sp << nl << "public static final long serialVersionUID = 0L;"; - out << eb; - close(); + out << sp << nl << "public _" << name << "Tie()"; + out << sb; + out << eb; + + out << sp << nl << "public _" << name << "Tie(" << '_' << name << opIntfName << " delegate)"; + out << sb; + out << nl << "_ice_delegate = delegate;"; + out << eb; + + out << sp << nl << "public java.lang.Object ice_delegate()"; + out << sb; + out << nl << "return _ice_delegate;"; + out << eb; + + out << sp << nl << "public void ice_delegate(java.lang.Object delegate)"; + out << sb; + out << nl << "_ice_delegate = (_" << name << opIntfName << ")delegate;"; + out << eb; + + out << sp << nl << "public boolean equals(java.lang.Object rhs)"; + out << sb; + out << nl << "if(this == rhs)"; + out << sb; + out << nl << "return true;"; + out << eb; + out << nl << "if(!(rhs instanceof " << '_' << name << "Tie))"; + out << sb; + out << nl << "return false;"; + out << eb; + out << sp << nl << "return _ice_delegate.equals(((" << '_' << name << "Tie)rhs)._ice_delegate);"; + out << eb; + + out << sp << nl << "public int hashCode()"; + out << sb; + out << nl << "return _ice_delegate.hashCode();"; + out << eb; + + if(p->isLocal()) + { + out << sp << nl << "public _" << name << "Tie clone()"; + out.inc(); + out << nl << "throws java.lang.CloneNotSupportedException"; + out.dec(); + out << sb; + out << nl << "return (_" << name << "Tie)super.clone();"; + out << eb; + } + + OperationList ops = p->allOperations(); + for(OperationList::iterator r = ops.begin(); r != ops.end(); ++r) + { + ContainerPtr container = (*r)->container(); + ClassDefPtr cl = ClassDefPtr::dynamicCast(container); + const bool hasAMD = cl->hasMetaData("amd") || (*r)->hasMetaData("amd"); + const bool optionalMapping = useOptionalMapping(*r); + + string opName = hasAMD ? (*r)->name() + "_async" : fixKwd((*r)->name()); + + TypePtr ret = (*r)->returnType(); + string retS = typeToString(ret, TypeModeReturn, package, (*r)->getMetaData(), true, + optionalMapping && (*r)->returnIsOptional()); + + vector<string> params; + vector<string> args; + if(hasAMD) + { + params = getParamsAsync((*r), package, true, true); + args = getArgsAsync(*r); + } + else + { + params = getParams((*r), package, false, optionalMapping); + args = getArgs(*r); + } + + string deprecateReason = getDeprecateReason(*r, cl, "operation"); + + out << sp; + if(!deprecateReason.empty()) + { + out << nl << "@Deprecated"; + out << nl << "@SuppressWarnings(\"deprecation\")"; + } + out << nl << "public " << (hasAMD ? string("void") : retS) << ' ' << opName << spar << params; + if(!p->isLocal()) + { + out << "Ice.Current __current"; + } + out << epar; + + if((*r)->hasMetaData("UserException")) + { + out.inc(); + out << nl << "throws Ice.UserException"; + out.dec(); + } + else + { + ExceptionList throws = (*r)->throws(); + throws.sort(); + throws.unique(); + writeThrowsClause(package, throws); + } + out << sb; + out << nl; + if(ret && !hasAMD) + { + out << "return "; + } + out << "_ice_delegate." << opName << spar << args; + if(!p->isLocal()) + { + out << "__current"; + } + out << epar << ';'; + out << eb; + } + + out << sp << nl << "private " << '_' << name << opIntfName << " _ice_delegate;"; + out << sp << nl << "public static final long serialVersionUID = "; + string serialVersionUID; + if(p->findMetaData("java:serialVersionUID", serialVersionUID)) + { + string::size_type pos = serialVersionUID.rfind(":") + 1; + if(pos == string::npos) + { + ostringstream os; + os << "ignoring invalid serialVersionUID for class `" << p->scoped() << "'; generating default value"; + emitWarning("", "", os.str()); + out << computeSerialVersionUUID(p); + } + else + { + Int64 v = 0; + serialVersionUID = serialVersionUID.substr(pos); + if(serialVersionUID != "0") + { + if(!stringToInt64(serialVersionUID, v)) // conversion error + { + ostringstream os; + os << "ignoring invalid serialVersionUID for class `" << p->scoped() + << "'; generating default value"; + emitWarning("", "", os.str()); + out << computeSerialVersionUUID(p); + } + } + out << v; + } + } + else + { + out << computeSerialVersionUUID(p); + } + out << "L;"; + out << eb; + close(); + } return false; } diff --git a/cpp/src/slice2java/GenCompat.h b/cpp/src/slice2java/GenCompat.h index c03d491f380..a55841a43c9 100644 --- a/cpp/src/slice2java/GenCompat.h +++ b/cpp/src/slice2java/GenCompat.h @@ -127,11 +127,11 @@ public: GenCompat(const std::string&, const std::string&, const std::vector<std::string>&, - const std::string&); + const std::string&, + bool); ~GenCompat(); void generate(const UnitPtr&); - void generateTie(const UnitPtr&); void generateImpl(const UnitPtr&); void generateImplTie(const UnitPtr&); @@ -142,6 +142,7 @@ private: std::string _base; std::vector<std::string> _includePaths; std::string _dir; + bool _tie; class OpsVisitor : public JavaCompatVisitor { @@ -155,15 +156,6 @@ private: void writeOperations(const ClassDefPtr&, bool); }; - class TieVisitor : public JavaCompatVisitor - { - public: - - TieVisitor(const std::string&); - - virtual bool visitClassDefStart(const ClassDefPtr&); - }; - class PackageVisitor : public JavaCompatVisitor { public: @@ -253,9 +245,12 @@ private: { public: - DispatcherVisitor(const std::string&); + DispatcherVisitor(const std::string&, bool); virtual bool visitClassDefStart(const ClassDefPtr&); + + private: + bool _tie; }; class BaseImplVisitor : public JavaCompatVisitor diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp index d864279a544..80fec0c32a0 100644 --- a/cpp/src/slice2java/Main.cpp +++ b/cpp/src/slice2java/Main.cpp @@ -70,19 +70,21 @@ usage(const string& n) "-IDIR Put DIR in the include file search path.\n" "-E Print preprocessor output on stdout.\n" "--output-dir DIR Create files in the directory DIR.\n" - "--tie Generate TIE classes.\n" + "--tie Generate tie classes.\n" "--impl Generate sample implementations.\n" - "--impl-tie Generate sample TIE implementations.\n" + "--impl-tie Generate sample tie implementations.\n" "--depend Generate Makefile dependencies.\n" "--depend-xml Generate dependencies in XML format.\n" "--depend-file FILE Write dependencies to FILE instead of standard output.\n" "--list-generated Emit list of generated files in XML format.\n" "-d, --debug Print debug messages.\n" - "--ice Allow reserved Ice prefix in Slice identifiers.\n" - "--underscore Allow underscores in Slice identifiers.\n" "--checksum CLASS Generate checksums for Slice definitions into CLASS.\n" "--meta META Define global metadata directive META.\n" "--compat Use the backward-compatible language mapping.\n" + "--ice Allow reserved Ice prefix in Slice identifiers\n" + " deprecated: use instead [[\"ice-prefix\"]] metadata.\n" + "--underscore Allow underscores in Slice identifiers\n" + " deprecated: use instead [[\"underscore\"]] metadata.\n" ; } @@ -363,12 +365,8 @@ compile(const vector<string>& argv) { if(compat) { - GenCompat gen(argv[0], icecpp->getBaseName(), includePaths, output); + GenCompat gen(argv[0], icecpp->getBaseName(), includePaths, output, tie); gen.generate(p); - if(tie) - { - gen.generateTie(p); - } if(impl) { gen.generateImpl(p); diff --git a/cpp/src/slice2js/Main.cpp b/cpp/src/slice2js/Main.cpp index 862e1343e02..a4d9023395c 100644 --- a/cpp/src/slice2js/Main.cpp +++ b/cpp/src/slice2js/Main.cpp @@ -74,8 +74,10 @@ usage(const string& n) "--depend-xml Generate dependencies in XML format.\n" "--depend-file FILE Write dependencies to FILE instead of standard output.\n" "-d, --debug Print debug messages.\n" - "--ice Allow reserved Ice prefix in Slice identifiers.\n" - "--underscore Allow underscores in Slice identifiers.\n" + "--ice Allow reserved Ice prefix in Slice identifiers\n" + " deprecated: use instead [[\"ice-prefix\"]] metadata.\n" + "--underscore Allow underscores in Slice identifiers\n" + " deprecated: use instead [[\"underscore\"]] metadata.\n" ; } diff --git a/cpp/src/slice2objc/Gen.cpp b/cpp/src/slice2objc/Gen.cpp index 9d51de398e4..794570bc4d0 100644 --- a/cpp/src/slice2objc/Gen.cpp +++ b/cpp/src/slice2objc/Gen.cpp @@ -690,6 +690,21 @@ Slice::Gen::generate(const UnitPtr& p) { ObjCGenerator::validateMetaData(p); + // + // Give precedence to --dll-export command-line option + // + if(_dllExport.empty()) + { + DefinitionContextPtr dc = p->findDefinitionContext(p->topLevelFile()); + assert(dc); + static const string dllExportPrefix = "objc:dll-export:"; + string meta = dc->findMetaData(dllExportPrefix); + if(meta.size() > dllExportPrefix.size()) + { + _dllExport = meta.substr(dllExportPrefix.size()); + } + } + _H << sp << nl << "#import <objc/Ice/Config.h>"; if(p->hasNonLocalClassDecls()) { diff --git a/cpp/src/slice2objc/Main.cpp b/cpp/src/slice2objc/Main.cpp index c8d68d39bf1..4d0df1c8a59 100644 --- a/cpp/src/slice2objc/Main.cpp +++ b/cpp/src/slice2objc/Main.cpp @@ -68,13 +68,16 @@ usage(const string& n) "-E Print preprocessor output on stdout.\n" "--include-dir DIR Use DIR as the header include directory in source files.\n" "--output-dir DIR Create files in the directory DIR.\n" - "--dll-export SYMBOL Use SYMBOL for DLL exports.\n" "--depend Generate Makefile dependencies.\n" "--depend-xml Generate dependencies in XML format.\n" "--depend-file FILE Write dependencies to FILE instead of standard output.\n" "-d, --debug Print debug messages.\n" - "--ice Allow reserved Ice prefix in Slice identifiers.\n" - "--underscore Allow underscores in Slice identifiers.\n" + "--dll-export SYMBOL Use SYMBOL for DLL exports\n" + " deprecated: use instead [[\"objc:dll-export:SYMBOL\"]] metadata.\n" + "--ice Allow reserved Ice prefix in Slice identifiers\n" + " deprecated: use instead [[\"ice-prefix\"]] metadata.\n" + "--underscore Allow underscores in Slice identifiers\n" + " deprecated: use instead [[\"underscore\"]] metadata.\n" ; // Note: --case-sensitive is intentionally not shown here! } diff --git a/cpp/src/slice2objc/ObjCUtil.cpp b/cpp/src/slice2objc/ObjCUtil.cpp index 8247915d841..852af9ba2af 100644 --- a/cpp/src/slice2objc/ObjCUtil.cpp +++ b/cpp/src/slice2objc/ObjCUtil.cpp @@ -1058,6 +1058,7 @@ Slice::ObjCGenerator::MetaDataVisitor::visitUnitStart(const UnitPtr& p) assert(dc); StringList globalMetaData = dc->getMetaData(); int headerDir = 0; + int dllExport = 0; for(StringList::const_iterator r = globalMetaData.begin(); r != globalMetaData.end(); ++r) { string s = *r; @@ -1066,6 +1067,7 @@ Slice::ObjCGenerator::MetaDataVisitor::visitUnitStart(const UnitPtr& p) if(s.find(_objcPrefix) == 0) { static const string objcHeaderDirPrefix = "objc:header-dir:"; + static const string objcDllExportPrefix = "objc:dll-export:"; if(s.find(objcHeaderDirPrefix) == 0 && s.size() > objcHeaderDirPrefix.size()) { headerDir++; @@ -1079,6 +1081,19 @@ Slice::ObjCGenerator::MetaDataVisitor::visitUnitStart(const UnitPtr& p) } continue; } + else if(s.find(objcDllExportPrefix) == 0 && s.size() > objcDllExportPrefix.size()) + { + dllExport++; + if(dllExport > 1) + { + ostringstream ostr; + ostr << "ignoring invalid global metadata `" << s + << "': directive can appear only once per file"; + emitWarning(file, -1, ostr.str()); + _history.insert(s); + } + continue; + } ostringstream ostr; ostr << "ignoring invalid global metadata `" << s << "'"; emitWarning(file, -1, ostr.str()); diff --git a/cpp/src/slice2php/Main.cpp b/cpp/src/slice2php/Main.cpp index d7b83782349..e5cb1ba7654 100644 --- a/cpp/src/slice2php/Main.cpp +++ b/cpp/src/slice2php/Main.cpp @@ -1517,11 +1517,13 @@ usage(const string& n) "--depend-xml Generate dependencies in XML format.\n" "--depend-file FILE Write dependencies to FILE instead of standard output.\n" "-d, --debug Print debug messages.\n" - "--ice Allow reserved Ice prefix in Slice identifiers.\n" - "--underscore Allow underscores in Slice identifiers.\n" "--all Generate code for Slice definitions in included files.\n" "--checksum Generate checksums for Slice definitions.\n" "-n, --namespace Use PHP namespaces (requires PHP 5.3 or later).\n" + "--ice Allow reserved Ice prefix in Slice identifiers\n" + " deprecated: use instead [[\"ice-prefix\"]] metadata.\n" + "--underscore Allow underscores in Slice identifiers\n" + " deprecated: use instead [[\"underscore\"]] metadata.\n" ; } diff --git a/cpp/test/Common/Controller.ice b/cpp/test/Common/Controller.ice index edc11307013..c3f631b7de5 100644 --- a/cpp/test/Common/Controller.ice +++ b/cpp/test/Common/Controller.ice @@ -7,6 +7,8 @@ // // ********************************************************************** +[["cpp:dll-export:TEST_API"]] + module Test { diff --git a/cpp/test/Common/Makefile.mk b/cpp/test/Common/Makefile.mk index 0f55337ffec..65d66dc527d 100644 --- a/cpp/test/Common/Makefile.mk +++ b/cpp/test/Common/Makefile.mk @@ -16,7 +16,6 @@ $(project)_noinstall := 1 # TestCommon[shared]_targetdir := lib TestCommon_dependencies := Ice -TestCommon_sliceflags := --dll-export TEST_API TestCommon_cppflags := -DTEST_API_EXPORTS -I$(includedir) -I$(project) -Itest/include projects += $(project) diff --git a/cpp/test/Common/msbuild/testcommon.vcxproj b/cpp/test/Common/msbuild/testcommon.vcxproj index 6b8ebfe1479..b8cfb0fba63 100644 --- a/cpp/test/Common/msbuild/testcommon.vcxproj +++ b/cpp/test/Common/msbuild/testcommon.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> <Import Project="..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> @@ -278,10 +278,6 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> - <PropertyGroup Label="IceBuilder"> - <IceBuilderAllowIcePrefix>true</IceBuilderAllowIcePrefix> - <IceBuilderDLLExport>TEST_API</IceBuilderDLLExport> - </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <PreprocessorDefinitions>TEST_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -337,4 +333,4 @@ <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props'))" /> <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.targets'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/test/Ice/interceptor/Test.ice b/cpp/test/Ice/interceptor/Test.ice index 64d1cee69cd..74daeea5414 100644 --- a/cpp/test/Ice/interceptor/Test.ice +++ b/cpp/test/Ice/interceptor/Test.ice @@ -9,6 +9,8 @@ #pragma once +[["cpp:dll-export:INTERCEPTOR_TEST_API"]] + module Test { diff --git a/cpp/test/Ice/interceptor/msbuild/interceptortest/interceptortest.vcxproj b/cpp/test/Ice/interceptor/msbuild/interceptortest/interceptortest.vcxproj index 9e676776ebd..1781923670f 100644 --- a/cpp/test/Ice/interceptor/msbuild/interceptortest/interceptortest.vcxproj +++ b/cpp/test/Ice/interceptor/msbuild/interceptortest/interceptortest.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> @@ -125,9 +125,6 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> - <PropertyGroup Label="IceBuilder"> - <IceBuilderDLLExport>INTERCEPTOR_TEST_API</IceBuilderDLLExport> - </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> @@ -334,4 +331,4 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.targets'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/test/Ice/library/Makefile.mk b/cpp/test/Ice/library/Makefile.mk index fd4643a9718..7cb01333720 100644 --- a/cpp/test/Ice/library/Makefile.mk +++ b/cpp/test/Ice/library/Makefile.mk @@ -10,7 +10,6 @@ $(test)_libraries := $(test)_GenCode $(test)_Consumer $(test)_AllTests $(test)_GenCode_sources := Test.ice -$(test)_sliceflags := --dll-export LIBRARY_TEST_API $(test)_Consumer_sources := Consumer.cpp $(test)_Consumer_dependencies := $(test)_GenCode diff --git a/cpp/test/Ice/library/Test.ice b/cpp/test/Ice/library/Test.ice index 1fbee615b42..7d9a7d40dbf 100644 --- a/cpp/test/Ice/library/Test.ice +++ b/cpp/test/Ice/library/Test.ice @@ -9,6 +9,8 @@ #pragma once +[["cpp:dll-export:LIBRARY_TEST_API"]] + module Test { diff --git a/cpp/test/Ice/library/msbuild/gencode/gencode.vcxproj b/cpp/test/Ice/library/msbuild/gencode/gencode.vcxproj index ff3a6e4b90e..fc243cbd152 100644 --- a/cpp/test/Ice/library/msbuild/gencode/gencode.vcxproj +++ b/cpp/test/Ice/library/msbuild/gencode/gencode.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> @@ -125,9 +125,6 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> - <PropertyGroup Label="IceBuilder"> - <IceBuilderDLLExport>LIBRARY_TEST_API</IceBuilderDLLExport> - </PropertyGroup> <ItemGroup> <IceBuilder Include="..\..\Test.ice" /> </ItemGroup> @@ -293,4 +290,4 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.targets'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/test/Slice/keyword/Key.ice b/cpp/test/Slice/keyword/Key.ice index 0e9fcb14cf7..86d9288493f 100644 --- a/cpp/test/Slice/keyword/Key.ice +++ b/cpp/test/Slice/keyword/Key.ice @@ -7,6 +7,8 @@ // // ********************************************************************** +[["underscore"]] + module and { diff --git a/cpp/test/Slice/keyword/Makefile.mk b/cpp/test/Slice/keyword/Makefile.mk index 952d4afaa0d..149eb460831 100644 --- a/cpp/test/Slice/keyword/Makefile.mk +++ b/cpp/test/Slice/keyword/Makefile.mk @@ -7,7 +7,6 @@ # # ********************************************************************** -$(test)_sliceflags = --underscore $(test)_client_sources = Client.cpp Key.ice -tests += $(test)
\ No newline at end of file +tests += $(test) diff --git a/cpp/test/Slice/keyword/msbuild/client.vcxproj b/cpp/test/Slice/keyword/msbuild/client.vcxproj index 05ae66e54b9..d557d068b29 100644 --- a/cpp/test/Slice/keyword/msbuild/client.vcxproj +++ b/cpp/test/Slice/keyword/msbuild/client.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> @@ -117,9 +117,6 @@ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> - <PropertyGroup Label="IceBuilder"> - <IceBuilderUnderscore>true</IceBuilderUnderscore> - </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> @@ -326,4 +323,4 @@ <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.targets'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/test/Slice/macros/msbuild/client.vcxproj b/cpp/test/Slice/macros/msbuild/client.vcxproj index 219c3ca8905..2745761f1ac 100644 --- a/cpp/test/Slice/macros/msbuild/client.vcxproj +++ b/cpp/test/Slice/macros/msbuild/client.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> @@ -117,9 +117,6 @@ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> - <PropertyGroup Label="IceBuilder"> - <IceBuilderUnderscore>true</IceBuilderUnderscore> - </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> @@ -326,4 +323,4 @@ <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.targets'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/test/Slice/parser/msbuild/client.vcxproj b/cpp/test/Slice/parser/msbuild/client.vcxproj index f6d0ba01393..52d857208f4 100644 --- a/cpp/test/Slice/parser/msbuild/client.vcxproj +++ b/cpp/test/Slice/parser/msbuild/client.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> @@ -417,7 +417,6 @@ </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup Label="IceBuilder"> - <IceBuilderUnderscore>true</IceBuilderUnderscore> <IceBuilderIncludeDirectories>..\;$(IceBuilderIncludeDirectories)</IceBuilderIncludeDirectories> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -471,4 +470,4 @@ <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.targets'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/test/Slice/structure/msbuild/client.vcxproj b/cpp/test/Slice/structure/msbuild/client.vcxproj index 2a1225bd7d6..add976bff4c 100644 --- a/cpp/test/Slice/structure/msbuild/client.vcxproj +++ b/cpp/test/Slice/structure/msbuild/client.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> @@ -117,9 +117,6 @@ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> - <PropertyGroup Label="IceBuilder"> - <IceBuilderUnderscore>true</IceBuilderUnderscore> - </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> @@ -326,4 +323,4 @@ <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.targets'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/test/Slice/utf8BOM/msbuild/client.vcxproj b/cpp/test/Slice/utf8BOM/msbuild/client.vcxproj index f95bf65adc3..6d6c2f7b292 100644 --- a/cpp/test/Slice/utf8BOM/msbuild/client.vcxproj +++ b/cpp/test/Slice/utf8BOM/msbuild/client.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseNugetBinDist)' == 'yes'" /> <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseNugetBinDist)' == 'yes'" /> @@ -117,9 +117,6 @@ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> - <PropertyGroup Label="IceBuilder"> - <IceBuilderUnderscore>true</IceBuilderUnderscore> - </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> @@ -325,4 +322,4 @@ <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.targets'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/src/Glacier2/msbuild/glacier2.csproj b/csharp/src/Glacier2/msbuild/glacier2.csproj index 87a7488f40f..ef23017b642 100644 --- a/csharp/src/Glacier2/msbuild/glacier2.csproj +++ b/csharp/src/Glacier2/msbuild/glacier2.csproj @@ -80,7 +80,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/src/Ice/msbuild/ice.csproj b/csharp/src/Ice/msbuild/ice.csproj index b2c3def001f..bc9157aab6a 100644 --- a/csharp/src/Ice/msbuild/ice.csproj +++ b/csharp/src/Ice/msbuild/ice.csproj @@ -467,7 +467,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/src/IceBox/msbuild/icebox/icebox.csproj b/csharp/src/IceBox/msbuild/icebox/icebox.csproj index 3f6c7ddf13d..a5827272a46 100644 --- a/csharp/src/IceBox/msbuild/icebox/icebox.csproj +++ b/csharp/src/IceBox/msbuild/icebox/icebox.csproj @@ -56,7 +56,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/src/IceBox/msbuild/iceboxlib/iceboxlib.csproj b/csharp/src/IceBox/msbuild/iceboxlib/iceboxlib.csproj index 40b0fac20e6..d2f7dd99ff0 100644 --- a/csharp/src/IceBox/msbuild/iceboxlib/iceboxlib.csproj +++ b/csharp/src/IceBox/msbuild/iceboxlib/iceboxlib.csproj @@ -44,7 +44,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/src/IceDiscovery/msbuild/icediscovery.csproj b/csharp/src/IceDiscovery/msbuild/icediscovery.csproj index 033ff4b039f..f46bd957b1e 100644 --- a/csharp/src/IceDiscovery/msbuild/icediscovery.csproj +++ b/csharp/src/IceDiscovery/msbuild/icediscovery.csproj @@ -53,7 +53,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/src/IceGrid/msbuild/icegrid.csproj b/csharp/src/IceGrid/msbuild/icegrid.csproj index c6d20ef1d40..dcdb77c6364 100644 --- a/csharp/src/IceGrid/msbuild/icegrid.csproj +++ b/csharp/src/IceGrid/msbuild/icegrid.csproj @@ -77,7 +77,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery.csproj b/csharp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery.csproj index 7c9ec6e28c8..a8425d3ce2b 100644 --- a/csharp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery.csproj +++ b/csharp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery.csproj @@ -47,7 +47,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/src/IcePatch2/msbuild/icepatch2.csproj b/csharp/src/IcePatch2/msbuild/icepatch2.csproj index ab798f96158..5d0480181c4 100644 --- a/csharp/src/IcePatch2/msbuild/icepatch2.csproj +++ b/csharp/src/IcePatch2/msbuild/icepatch2.csproj @@ -48,7 +48,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/src/IceSSL/msbuild/icessl.csproj b/csharp/src/IceSSL/msbuild/icessl.csproj index be538a53458..e347b0c6884 100644 --- a/csharp/src/IceSSL/msbuild/icessl.csproj +++ b/csharp/src/IceSSL/msbuild/icessl.csproj @@ -81,7 +81,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/src/IceStorm/msbuild/icestorm.csproj b/csharp/src/IceStorm/msbuild/icestorm.csproj index 0f065dac337..c59bdfac68f 100644 --- a/csharp/src/IceStorm/msbuild/icestorm.csproj +++ b/csharp/src/IceStorm/msbuild/icestorm.csproj @@ -48,7 +48,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Glacier2/router/msbuild/client/client.csproj b/csharp/test/Glacier2/router/msbuild/client/client.csproj index d8521a0bf30..b43b85bbc02 100644 --- a/csharp/test/Glacier2/router/msbuild/client/client.csproj +++ b/csharp/test/Glacier2/router/msbuild/client/client.csproj @@ -60,7 +60,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -69,4 +68,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Glacier2/router/msbuild/server/server.csproj b/csharp/test/Glacier2/router/msbuild/server/server.csproj index eaf6d163b23..2c9c0bd4428 100644 --- a/csharp/test/Glacier2/router/msbuild/server/server.csproj +++ b/csharp/test/Glacier2/router/msbuild/server/server.csproj @@ -55,7 +55,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -64,4 +63,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Glacier2/sessionHelper/msbuild/client/client.csproj b/csharp/test/Glacier2/sessionHelper/msbuild/client/client.csproj index 0c075dda154..82e90ffc480 100644 --- a/csharp/test/Glacier2/sessionHelper/msbuild/client/client.csproj +++ b/csharp/test/Glacier2/sessionHelper/msbuild/client/client.csproj @@ -60,7 +60,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -69,4 +68,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Glacier2/sessionHelper/msbuild/server/server.csproj b/csharp/test/Glacier2/sessionHelper/msbuild/server/server.csproj index 0abcb628faa..0903a4002be 100644 --- a/csharp/test/Glacier2/sessionHelper/msbuild/server/server.csproj +++ b/csharp/test/Glacier2/sessionHelper/msbuild/server/server.csproj @@ -55,7 +55,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -64,4 +63,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/acm/msbuild/client/client.csproj b/csharp/test/Ice/acm/msbuild/client/client.csproj index a27b5391220..8aa55539ec6 100644 --- a/csharp/test/Ice/acm/msbuild/client/client.csproj +++ b/csharp/test/Ice/acm/msbuild/client/client.csproj @@ -59,7 +59,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -68,4 +67,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/acm/msbuild/server/server.csproj b/csharp/test/Ice/acm/msbuild/server/server.csproj index 95af114ccf0..d3bd069cf7f 100644 --- a/csharp/test/Ice/acm/msbuild/server/server.csproj +++ b/csharp/test/Ice/acm/msbuild/server/server.csproj @@ -55,7 +55,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -64,4 +63,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/adapterDeactivation/msbuild/client/client.csproj b/csharp/test/Ice/adapterDeactivation/msbuild/client/client.csproj index c21592ade67..e7c2baa9436 100644 --- a/csharp/test/Ice/adapterDeactivation/msbuild/client/client.csproj +++ b/csharp/test/Ice/adapterDeactivation/msbuild/client/client.csproj @@ -58,7 +58,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -67,4 +66,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.csproj b/csharp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.csproj index c4b4b1ccc09..79cee2dc53b 100644 --- a/csharp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.csproj @@ -79,7 +79,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -88,4 +87,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/adapterDeactivation/msbuild/server/server.csproj b/csharp/test/Ice/adapterDeactivation/msbuild/server/server.csproj index b84de0c7c79..b84f3429600 100644 --- a/csharp/test/Ice/adapterDeactivation/msbuild/server/server.csproj +++ b/csharp/test/Ice/adapterDeactivation/msbuild/server/server.csproj @@ -61,7 +61,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -70,4 +69,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/admin/msbuild/client/client.csproj b/csharp/test/Ice/admin/msbuild/client/client.csproj index 11a14d65246..825d2e3cb62 100644 --- a/csharp/test/Ice/admin/msbuild/client/client.csproj +++ b/csharp/test/Ice/admin/msbuild/client/client.csproj @@ -61,7 +61,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -70,4 +69,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/admin/msbuild/server/server.csproj b/csharp/test/Ice/admin/msbuild/server/server.csproj index 4f3b6d6e94b..a41f4a936da 100644 --- a/csharp/test/Ice/admin/msbuild/server/server.csproj +++ b/csharp/test/Ice/admin/msbuild/server/server.csproj @@ -55,7 +55,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -64,4 +63,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/ami/msbuild/client/client.csproj b/csharp/test/Ice/ami/msbuild/client/client.csproj index 7cb0b28b8ba..b3a80d91683 100644 --- a/csharp/test/Ice/ami/msbuild/client/client.csproj +++ b/csharp/test/Ice/ami/msbuild/client/client.csproj @@ -58,7 +58,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -67,4 +66,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/ami/msbuild/collocated/collocated.csproj b/csharp/test/Ice/ami/msbuild/collocated/collocated.csproj index 5579d1c9e44..159cb93d3a8 100644 --- a/csharp/test/Ice/ami/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/ami/msbuild/collocated/collocated.csproj @@ -73,7 +73,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -82,4 +81,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/ami/msbuild/server/server.csproj b/csharp/test/Ice/ami/msbuild/server/server.csproj index 751fbbf603f..c79c6cbd05b 100644 --- a/csharp/test/Ice/ami/msbuild/server/server.csproj +++ b/csharp/test/Ice/ami/msbuild/server/server.csproj @@ -55,7 +55,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -64,4 +63,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/application/msbuild/client/client.csproj b/csharp/test/Ice/application/msbuild/client/client.csproj index 063f1e973a1..b46ec1a4e11 100644 --- a/csharp/test/Ice/application/msbuild/client/client.csproj +++ b/csharp/test/Ice/application/msbuild/client/client.csproj @@ -51,7 +51,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -60,4 +59,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/background/msbuild/client/client.csproj b/csharp/test/Ice/background/msbuild/client/client.csproj index 0255d0afddf..dc6c4f66c65 100644 --- a/csharp/test/Ice/background/msbuild/client/client.csproj +++ b/csharp/test/Ice/background/msbuild/client/client.csproj @@ -79,7 +79,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -88,4 +87,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/background/msbuild/server/server.csproj b/csharp/test/Ice/background/msbuild/server/server.csproj index 137316af8da..cf69a7c2de1 100644 --- a/csharp/test/Ice/background/msbuild/server/server.csproj +++ b/csharp/test/Ice/background/msbuild/server/server.csproj @@ -79,7 +79,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -88,4 +87,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/binding/msbuild/client/client.csproj b/csharp/test/Ice/binding/msbuild/client/client.csproj index f51654c7c86..4632c6caf77 100644 --- a/csharp/test/Ice/binding/msbuild/client/client.csproj +++ b/csharp/test/Ice/binding/msbuild/client/client.csproj @@ -58,7 +58,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -67,4 +66,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/binding/msbuild/server/server.csproj b/csharp/test/Ice/binding/msbuild/server/server.csproj index ad616a14aee..b91c017fa7f 100644 --- a/csharp/test/Ice/binding/msbuild/server/server.csproj +++ b/csharp/test/Ice/binding/msbuild/server/server.csproj @@ -61,7 +61,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -70,4 +69,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/checksum/msbuild/client/client.csproj b/csharp/test/Ice/checksum/msbuild/client/client.csproj index 68bc456050b..b92fa597ef2 100644 --- a/csharp/test/Ice/checksum/msbuild/client/client.csproj +++ b/csharp/test/Ice/checksum/msbuild/client/client.csproj @@ -59,7 +59,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> <IceBuilderChecksum>yes</IceBuilderChecksum> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> @@ -69,4 +68,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/checksum/server/msbuild/server/server.csproj b/csharp/test/Ice/checksum/server/msbuild/server/server.csproj index cf0e28d3d83..06d045fcc03 100644 --- a/csharp/test/Ice/checksum/server/msbuild/server/server.csproj +++ b/csharp/test/Ice/checksum/server/msbuild/server/server.csproj @@ -59,7 +59,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> <IceBuilderChecksum>yes</IceBuilderChecksum> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> @@ -69,4 +68,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/defaultServant/msbuild/client/client.csproj b/csharp/test/Ice/defaultServant/msbuild/client/client.csproj index 9abce53dca9..023fefaf532 100644 --- a/csharp/test/Ice/defaultServant/msbuild/client/client.csproj +++ b/csharp/test/Ice/defaultServant/msbuild/client/client.csproj @@ -61,7 +61,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -70,4 +69,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/defaultValue/msbuild/client/client.csproj b/csharp/test/Ice/defaultValue/msbuild/client/client.csproj index 88a5db4758b..44877078b65 100644 --- a/csharp/test/Ice/defaultValue/msbuild/client/client.csproj +++ b/csharp/test/Ice/defaultValue/msbuild/client/client.csproj @@ -58,7 +58,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -67,4 +66,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/dictMapping/msbuild/client/client.csproj b/csharp/test/Ice/dictMapping/msbuild/client/client.csproj index 9c9f6292b62..cb8e25c2d05 100644 --- a/csharp/test/Ice/dictMapping/msbuild/client/client.csproj +++ b/csharp/test/Ice/dictMapping/msbuild/client/client.csproj @@ -64,7 +64,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -73,4 +72,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/dictMapping/msbuild/collocated/collocated.csproj b/csharp/test/Ice/dictMapping/msbuild/collocated/collocated.csproj index 43d30bfeb01..c325f854cac 100644 --- a/csharp/test/Ice/dictMapping/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/dictMapping/msbuild/collocated/collocated.csproj @@ -79,7 +79,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -88,4 +87,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/dictMapping/msbuild/server/server.csproj b/csharp/test/Ice/dictMapping/msbuild/server/server.csproj index 1ffb4a36b8e..19774c20dac 100644 --- a/csharp/test/Ice/dictMapping/msbuild/server/server.csproj +++ b/csharp/test/Ice/dictMapping/msbuild/server/server.csproj @@ -55,7 +55,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -64,4 +63,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/dictMapping/msbuild/serveramd/serveramd.csproj b/csharp/test/Ice/dictMapping/msbuild/serveramd/serveramd.csproj index c4afc2182b7..cecf8ff320b 100644 --- a/csharp/test/Ice/dictMapping/msbuild/serveramd/serveramd.csproj +++ b/csharp/test/Ice/dictMapping/msbuild/serveramd/serveramd.csproj @@ -55,7 +55,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -64,4 +63,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/dispatcher/msbuild/client/client.csproj b/csharp/test/Ice/dispatcher/msbuild/client/client.csproj index 02760a164a7..d4c60677ecf 100644 --- a/csharp/test/Ice/dispatcher/msbuild/client/client.csproj +++ b/csharp/test/Ice/dispatcher/msbuild/client/client.csproj @@ -61,7 +61,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -70,4 +69,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/dispatcher/msbuild/collocated/collocated.csproj b/csharp/test/Ice/dispatcher/msbuild/collocated/collocated.csproj index 6a0934872fd..c26f2b0240e 100644 --- a/csharp/test/Ice/dispatcher/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/dispatcher/msbuild/collocated/collocated.csproj @@ -76,7 +76,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -85,4 +84,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/dispatcher/msbuild/server/server.csproj b/csharp/test/Ice/dispatcher/msbuild/server/server.csproj index c4417d2337b..23bfbc5c927 100644 --- a/csharp/test/Ice/dispatcher/msbuild/server/server.csproj +++ b/csharp/test/Ice/dispatcher/msbuild/server/server.csproj @@ -58,7 +58,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -67,4 +66,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/echo/msbuild/server/server.csproj b/csharp/test/Ice/echo/msbuild/server/server.csproj index afe5fbf91af..cff649448a1 100644 --- a/csharp/test/Ice/echo/msbuild/server/server.csproj +++ b/csharp/test/Ice/echo/msbuild/server/server.csproj @@ -55,7 +55,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -64,4 +63,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/enums/msbuild/client/client.csproj b/csharp/test/Ice/enums/msbuild/client/client.csproj index 6ee19870236..109e2e0c4b9 100644 --- a/csharp/test/Ice/enums/msbuild/client/client.csproj +++ b/csharp/test/Ice/enums/msbuild/client/client.csproj @@ -58,7 +58,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -67,4 +66,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/enums/msbuild/server/server.csproj b/csharp/test/Ice/enums/msbuild/server/server.csproj index 0db88f7b109..3673e87ac8d 100644 --- a/csharp/test/Ice/enums/msbuild/server/server.csproj +++ b/csharp/test/Ice/enums/msbuild/server/server.csproj @@ -55,7 +55,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -64,4 +63,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/exceptions/msbuild/client/client.csproj b/csharp/test/Ice/exceptions/msbuild/client/client.csproj index 74992a0e319..d8fcb588c72 100644 --- a/csharp/test/Ice/exceptions/msbuild/client/client.csproj +++ b/csharp/test/Ice/exceptions/msbuild/client/client.csproj @@ -64,7 +64,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -73,4 +72,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/exceptions/msbuild/collocated/collocated.csproj b/csharp/test/Ice/exceptions/msbuild/collocated/collocated.csproj index 5acc3d23c8d..08ae31d386c 100644 --- a/csharp/test/Ice/exceptions/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/exceptions/msbuild/collocated/collocated.csproj @@ -79,7 +79,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -88,4 +87,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/exceptions/msbuild/server/server.csproj b/csharp/test/Ice/exceptions/msbuild/server/server.csproj index 7e28151cbe1..affe3ba445a 100644 --- a/csharp/test/Ice/exceptions/msbuild/server/server.csproj +++ b/csharp/test/Ice/exceptions/msbuild/server/server.csproj @@ -61,7 +61,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -70,4 +69,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/exceptions/msbuild/serveramd/serveramd.csproj b/csharp/test/Ice/exceptions/msbuild/serveramd/serveramd.csproj index 196df28a80d..23ecade2787 100644 --- a/csharp/test/Ice/exceptions/msbuild/serveramd/serveramd.csproj +++ b/csharp/test/Ice/exceptions/msbuild/serveramd/serveramd.csproj @@ -61,7 +61,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -70,4 +69,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/facets/msbuild/client/client.csproj b/csharp/test/Ice/facets/msbuild/client/client.csproj index aa57733db01..e048317f56b 100644 --- a/csharp/test/Ice/facets/msbuild/client/client.csproj +++ b/csharp/test/Ice/facets/msbuild/client/client.csproj @@ -61,7 +61,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -70,4 +69,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/facets/msbuild/collocated/collocated.csproj b/csharp/test/Ice/facets/msbuild/collocated/collocated.csproj index a3fd163364d..6bf41e5328d 100644 --- a/csharp/test/Ice/facets/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/facets/msbuild/collocated/collocated.csproj @@ -97,7 +97,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -106,4 +105,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/facets/msbuild/server/server.csproj b/csharp/test/Ice/facets/msbuild/server/server.csproj index 82935b4130d..b0ba56bb160 100644 --- a/csharp/test/Ice/facets/msbuild/server/server.csproj +++ b/csharp/test/Ice/facets/msbuild/server/server.csproj @@ -79,7 +79,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -88,4 +87,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/faultTolerance/msbuild/client/client.csproj b/csharp/test/Ice/faultTolerance/msbuild/client/client.csproj index 8c3a273e490..2187d111e21 100644 --- a/csharp/test/Ice/faultTolerance/msbuild/client/client.csproj +++ b/csharp/test/Ice/faultTolerance/msbuild/client/client.csproj @@ -58,7 +58,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -67,4 +66,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/faultTolerance/msbuild/server/server.csproj b/csharp/test/Ice/faultTolerance/msbuild/server/server.csproj index 5e01dc7e5db..a02d5543ecd 100644 --- a/csharp/test/Ice/faultTolerance/msbuild/server/server.csproj +++ b/csharp/test/Ice/faultTolerance/msbuild/server/server.csproj @@ -55,7 +55,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -64,4 +63,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/hash/msbuild/client/client.csproj b/csharp/test/Ice/hash/msbuild/client/client.csproj index 348562cb7b5..abb6d6b80ac 100644 --- a/csharp/test/Ice/hash/msbuild/client/client.csproj +++ b/csharp/test/Ice/hash/msbuild/client/client.csproj @@ -52,7 +52,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -61,4 +60,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/hold/msbuild/client/client.csproj b/csharp/test/Ice/hold/msbuild/client/client.csproj index 1b5082d4881..963a494b8b5 100644 --- a/csharp/test/Ice/hold/msbuild/client/client.csproj +++ b/csharp/test/Ice/hold/msbuild/client/client.csproj @@ -58,7 +58,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -67,4 +66,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/hold/msbuild/server/server.csproj b/csharp/test/Ice/hold/msbuild/server/server.csproj index 647fb226cf5..2729ee31521 100644 --- a/csharp/test/Ice/hold/msbuild/server/server.csproj +++ b/csharp/test/Ice/hold/msbuild/server/server.csproj @@ -58,7 +58,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -67,4 +66,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/info/msbuild/client/client.csproj b/csharp/test/Ice/info/msbuild/client/client.csproj index 53fe1cdde26..f0b22110174 100644 --- a/csharp/test/Ice/info/msbuild/client/client.csproj +++ b/csharp/test/Ice/info/msbuild/client/client.csproj @@ -66,7 +66,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -75,4 +74,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/info/msbuild/server/server.csproj b/csharp/test/Ice/info/msbuild/server/server.csproj index b43bf1da772..25cf2b00aad 100644 --- a/csharp/test/Ice/info/msbuild/server/server.csproj +++ b/csharp/test/Ice/info/msbuild/server/server.csproj @@ -60,7 +60,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -69,4 +68,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/inheritance/msbuild/client/client.csproj b/csharp/test/Ice/inheritance/msbuild/client/client.csproj index 525d02f3d17..f96632005d7 100644 --- a/csharp/test/Ice/inheritance/msbuild/client/client.csproj +++ b/csharp/test/Ice/inheritance/msbuild/client/client.csproj @@ -58,7 +58,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -67,4 +66,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/inheritance/msbuild/collocated/collocated.csproj b/csharp/test/Ice/inheritance/msbuild/collocated/collocated.csproj index 0c3da8f1781..7266997330e 100644 --- a/csharp/test/Ice/inheritance/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/inheritance/msbuild/collocated/collocated.csproj @@ -97,7 +97,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -106,4 +105,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/inheritance/msbuild/server/server.csproj b/csharp/test/Ice/inheritance/msbuild/server/server.csproj index cb70ea766b8..4ab3f2210e6 100644 --- a/csharp/test/Ice/inheritance/msbuild/server/server.csproj +++ b/csharp/test/Ice/inheritance/msbuild/server/server.csproj @@ -110,7 +110,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -119,4 +118,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/interceptor/msbuild/client/client.csproj b/csharp/test/Ice/interceptor/msbuild/client/client.csproj index afe67a6ca87..2dd2b06dc96 100644 --- a/csharp/test/Ice/interceptor/msbuild/client/client.csproj +++ b/csharp/test/Ice/interceptor/msbuild/client/client.csproj @@ -63,7 +63,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -72,4 +71,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/invoke/msbuild/client/client.csproj b/csharp/test/Ice/invoke/msbuild/client/client.csproj index 9cd6f71b687..a75a6da2512 100644 --- a/csharp/test/Ice/invoke/msbuild/client/client.csproj +++ b/csharp/test/Ice/invoke/msbuild/client/client.csproj @@ -63,7 +63,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -72,4 +71,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/invoke/msbuild/server/server.csproj b/csharp/test/Ice/invoke/msbuild/server/server.csproj index 73943b1ac13..80dbcfbe12f 100644 --- a/csharp/test/Ice/invoke/msbuild/server/server.csproj +++ b/csharp/test/Ice/invoke/msbuild/server/server.csproj @@ -60,7 +60,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -69,4 +68,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/location/msbuild/client/client.csproj b/csharp/test/Ice/location/msbuild/client/client.csproj index 37b7c4b3fc3..56892592f73 100644 --- a/csharp/test/Ice/location/msbuild/client/client.csproj +++ b/csharp/test/Ice/location/msbuild/client/client.csproj @@ -66,7 +66,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -75,4 +74,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/location/msbuild/server/server.csproj b/csharp/test/Ice/location/msbuild/server/server.csproj index 08558798778..86748cc584c 100644 --- a/csharp/test/Ice/location/msbuild/server/server.csproj +++ b/csharp/test/Ice/location/msbuild/server/server.csproj @@ -72,7 +72,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -81,4 +80,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/metrics/msbuild/client/client.csproj b/csharp/test/Ice/metrics/msbuild/client/client.csproj index 632fc2c4e60..342b9ebf259 100644 --- a/csharp/test/Ice/metrics/msbuild/client/client.csproj +++ b/csharp/test/Ice/metrics/msbuild/client/client.csproj @@ -66,7 +66,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -75,4 +74,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/metrics/msbuild/collocated/collocated.csproj b/csharp/test/Ice/metrics/msbuild/collocated/collocated.csproj index 3d1ff613149..73b13902be6 100644 --- a/csharp/test/Ice/metrics/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/metrics/msbuild/collocated/collocated.csproj @@ -69,7 +69,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -78,4 +77,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/metrics/msbuild/server/server.csproj b/csharp/test/Ice/metrics/msbuild/server/server.csproj index 0ad936c3d85..ae89ac4410a 100644 --- a/csharp/test/Ice/metrics/msbuild/server/server.csproj +++ b/csharp/test/Ice/metrics/msbuild/server/server.csproj @@ -60,7 +60,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -69,4 +68,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/metrics/msbuild/serveramd/serveramd.csproj b/csharp/test/Ice/metrics/msbuild/serveramd/serveramd.csproj index 2920a41545e..f1ff61c8e43 100644 --- a/csharp/test/Ice/metrics/msbuild/serveramd/serveramd.csproj +++ b/csharp/test/Ice/metrics/msbuild/serveramd/serveramd.csproj @@ -60,7 +60,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -69,4 +68,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/networkProxy/msbuild/client/client.csproj b/csharp/test/Ice/networkProxy/msbuild/client/client.csproj index 51d87d66238..7e2ab4c4b3c 100644 --- a/csharp/test/Ice/networkProxy/msbuild/client/client.csproj +++ b/csharp/test/Ice/networkProxy/msbuild/client/client.csproj @@ -58,7 +58,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -67,4 +66,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/networkProxy/msbuild/server/server.csproj b/csharp/test/Ice/networkProxy/msbuild/server/server.csproj index 2faf71ffa7d..f24df7d3d61 100644 --- a/csharp/test/Ice/networkProxy/msbuild/server/server.csproj +++ b/csharp/test/Ice/networkProxy/msbuild/server/server.csproj @@ -52,7 +52,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -61,4 +60,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/objects/msbuild/client/client.csproj b/csharp/test/Ice/objects/msbuild/client/client.csproj index be01d11466a..4ca94d733d3 100644 --- a/csharp/test/Ice/objects/msbuild/client/client.csproj +++ b/csharp/test/Ice/objects/msbuild/client/client.csproj @@ -82,7 +82,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -91,4 +90,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/objects/msbuild/collocated/collocated.csproj b/csharp/test/Ice/objects/msbuild/collocated/collocated.csproj index 4eb51153d6e..13b2e199075 100644 --- a/csharp/test/Ice/objects/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/objects/msbuild/collocated/collocated.csproj @@ -100,7 +100,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -109,4 +108,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/objects/msbuild/server/server.csproj b/csharp/test/Ice/objects/msbuild/server/server.csproj index ae9b1f1e89a..67166da00c9 100644 --- a/csharp/test/Ice/objects/msbuild/server/server.csproj +++ b/csharp/test/Ice/objects/msbuild/server/server.csproj @@ -82,7 +82,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -91,4 +90,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/operations/Test.ice b/csharp/test/Ice/operations/Test.ice index 73e2e9f5614..72c2b857828 100644 --- a/csharp/test/Ice/operations/Test.ice +++ b/csharp/test/Ice/operations/Test.ice @@ -277,7 +277,7 @@ class MyClass1 string myClass1; // Same name as the enclosing class }; -class MyDerivedClass extends MyClass +["cs:tie"] class MyDerivedClass extends MyClass { void opDerived(); MyClass1 opMyClass1(MyClass1 opMyClass1); diff --git a/csharp/test/Ice/operations/TestAMD.ice b/csharp/test/Ice/operations/TestAMD.ice index 155ed3d99c2..6145d1fa002 100644 --- a/csharp/test/Ice/operations/TestAMD.ice +++ b/csharp/test/Ice/operations/TestAMD.ice @@ -275,7 +275,7 @@ class MyClass1 string myClass1; // Same name as the enclosing class }; -["amd"] class MyDerivedClass extends MyClass +["amd", "cs:tie"] class MyDerivedClass extends MyClass { void opDerived(); MyClass1 opMyClass1(MyClass1 opMyClass1); diff --git a/csharp/test/Ice/operations/msbuild/client/client.csproj b/csharp/test/Ice/operations/msbuild/client/client.csproj index 89cc10a6661..138e18857ae 100644 --- a/csharp/test/Ice/operations/msbuild/client/client.csproj +++ b/csharp/test/Ice/operations/msbuild/client/client.csproj @@ -76,7 +76,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -85,4 +84,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/operations/msbuild/collocated/collocated.csproj b/csharp/test/Ice/operations/msbuild/collocated/collocated.csproj index 16f6fe26d4b..60c5c6d50bf 100644 --- a/csharp/test/Ice/operations/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/operations/msbuild/collocated/collocated.csproj @@ -91,7 +91,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -100,4 +99,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/operations/msbuild/server/server.csproj b/csharp/test/Ice/operations/msbuild/server/server.csproj index aee7a430842..ca3d393f4e4 100644 --- a/csharp/test/Ice/operations/msbuild/server/server.csproj +++ b/csharp/test/Ice/operations/msbuild/server/server.csproj @@ -55,7 +55,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -64,4 +63,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/operations/msbuild/serveramd/serveramd.csproj b/csharp/test/Ice/operations/msbuild/serveramd/serveramd.csproj index 8762ac4f17b..59219e6eb8f 100644 --- a/csharp/test/Ice/operations/msbuild/serveramd/serveramd.csproj +++ b/csharp/test/Ice/operations/msbuild/serveramd/serveramd.csproj @@ -52,7 +52,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -61,4 +60,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/operations/msbuild/serveramdtie/serveramdtie.csproj b/csharp/test/Ice/operations/msbuild/serveramdtie/serveramdtie.csproj index 8bed7d1f4f9..b4dad63293e 100644 --- a/csharp/test/Ice/operations/msbuild/serveramdtie/serveramdtie.csproj +++ b/csharp/test/Ice/operations/msbuild/serveramdtie/serveramdtie.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" /> <PropertyGroup Label="Globals"> @@ -52,8 +52,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderTie>yes</IceBuilderTie> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -62,4 +60,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/operations/msbuild/servertie/servertie.csproj b/csharp/test/Ice/operations/msbuild/servertie/servertie.csproj index 0101d2c75e8..120465619c7 100644 --- a/csharp/test/Ice/operations/msbuild/servertie/servertie.csproj +++ b/csharp/test/Ice/operations/msbuild/servertie/servertie.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" /> <PropertyGroup Label="Globals"> @@ -55,8 +55,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderTie>yes</IceBuilderTie> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -65,4 +63,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/operations/run.py b/csharp/test/Ice/operations/run.py index 3aeb273d34d..5af929929e1 100755 --- a/csharp/test/Ice/operations/run.py +++ b/csharp/test/Ice/operations/run.py @@ -23,9 +23,9 @@ import TestUtil TestUtil.queueClientServerTest(additionalClientOptions = "--Ice.Warn.AMICallback=0") TestUtil.queueClientServerTest(configName = "amd", localOnly = True, message = "Running test with AMD server.", additionalClientOptions = "--Ice.Warn.AMICallback=0", server="serveramd") -TestUtil.queueClientServerTest(configName = "tie", message = "Running test with TIE server.", +TestUtil.queueClientServerTest(configName = "tie", message = "Running test with tie server.", additionalClientOptions = "--Ice.Warn.AMICallback=0", server="servertie") -TestUtil.queueClientServerTest(configName = "amdTie", localOnly = True, message = "Running test with AMD TIE server.", +TestUtil.queueClientServerTest(configName = "amdTie", localOnly = True, message = "Running test with AMD tie server.", additionalClientOptions = "--Ice.Warn.AMICallback=0", server="serveramdtie") TestUtil.queueCollocatedTest() TestUtil.runQueuedTests() diff --git a/csharp/test/Ice/optional/msbuild/client/client.csproj b/csharp/test/Ice/optional/msbuild/client/client.csproj index 20ad752312f..b0119402cf7 100644 --- a/csharp/test/Ice/optional/msbuild/client/client.csproj +++ b/csharp/test/Ice/optional/msbuild/client/client.csproj @@ -64,7 +64,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -73,4 +72,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/optional/msbuild/serializable/serializable.csproj b/csharp/test/Ice/optional/msbuild/serializable/serializable.csproj index 694516bd5af..8c0804f8576 100644 --- a/csharp/test/Ice/optional/msbuild/serializable/serializable.csproj +++ b/csharp/test/Ice/optional/msbuild/serializable/serializable.csproj @@ -42,4 +42,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/optional/msbuild/server/server.csproj b/csharp/test/Ice/optional/msbuild/server/server.csproj index f69a6758f73..b38183409e4 100644 --- a/csharp/test/Ice/optional/msbuild/server/server.csproj +++ b/csharp/test/Ice/optional/msbuild/server/server.csproj @@ -61,7 +61,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -70,4 +69,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/optional/msbuild/serveramd/serveramd.csproj b/csharp/test/Ice/optional/msbuild/serveramd/serveramd.csproj index bf7e4061812..a612181ae94 100644 --- a/csharp/test/Ice/optional/msbuild/serveramd/serveramd.csproj +++ b/csharp/test/Ice/optional/msbuild/serveramd/serveramd.csproj @@ -58,7 +58,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -67,4 +66,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/plugin/msbuild/client/client.csproj b/csharp/test/Ice/plugin/msbuild/client/client.csproj index 8d28908b06a..7f85dc5a94f 100644 --- a/csharp/test/Ice/plugin/msbuild/client/client.csproj +++ b/csharp/test/Ice/plugin/msbuild/client/client.csproj @@ -58,7 +58,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -67,4 +66,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/plugin/msbuild/plugin/plugin.csproj b/csharp/test/Ice/plugin/msbuild/plugin/plugin.csproj index 63a90dc5d3f..8498791d1d9 100644 --- a/csharp/test/Ice/plugin/msbuild/plugin/plugin.csproj +++ b/csharp/test/Ice/plugin/msbuild/plugin/plugin.csproj @@ -83,4 +83,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/properties/msbuild/client/client.csproj b/csharp/test/Ice/properties/msbuild/client/client.csproj index 419db77b1c6..d9dad55e12e 100644 --- a/csharp/test/Ice/properties/msbuild/client/client.csproj +++ b/csharp/test/Ice/properties/msbuild/client/client.csproj @@ -48,7 +48,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -57,4 +56,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/proxy/msbuild/client/client.csproj b/csharp/test/Ice/proxy/msbuild/client/client.csproj index c77c0d3d65b..701bccf1092 100644 --- a/csharp/test/Ice/proxy/msbuild/client/client.csproj +++ b/csharp/test/Ice/proxy/msbuild/client/client.csproj @@ -58,7 +58,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -67,4 +66,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/proxy/msbuild/collocated/collocated.csproj b/csharp/test/Ice/proxy/msbuild/collocated/collocated.csproj index 409f06f1813..e662bb98765 100644 --- a/csharp/test/Ice/proxy/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/proxy/msbuild/collocated/collocated.csproj @@ -73,7 +73,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -82,4 +81,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/proxy/msbuild/server/server.csproj b/csharp/test/Ice/proxy/msbuild/server/server.csproj index 96e2786c87c..c9a9c7d3fb7 100644 --- a/csharp/test/Ice/proxy/msbuild/server/server.csproj +++ b/csharp/test/Ice/proxy/msbuild/server/server.csproj @@ -55,7 +55,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -64,4 +63,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/proxy/msbuild/serveramd/serveramd.csproj b/csharp/test/Ice/proxy/msbuild/serveramd/serveramd.csproj index b9880e95676..56a99652d9c 100644 --- a/csharp/test/Ice/proxy/msbuild/serveramd/serveramd.csproj +++ b/csharp/test/Ice/proxy/msbuild/serveramd/serveramd.csproj @@ -52,7 +52,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -61,4 +60,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/retry/msbuild/client/client.csproj b/csharp/test/Ice/retry/msbuild/client/client.csproj index d16a100a010..dc04e7b5e28 100644 --- a/csharp/test/Ice/retry/msbuild/client/client.csproj +++ b/csharp/test/Ice/retry/msbuild/client/client.csproj @@ -64,7 +64,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -73,4 +72,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/retry/msbuild/collocated/collocated.csproj b/csharp/test/Ice/retry/msbuild/collocated/collocated.csproj index e54b8229149..ce48c05bf38 100644 --- a/csharp/test/Ice/retry/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/retry/msbuild/collocated/collocated.csproj @@ -79,7 +79,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -88,4 +87,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/retry/msbuild/server/server.csproj b/csharp/test/Ice/retry/msbuild/server/server.csproj index 2b80014ac18..9dc14bf6c34 100644 --- a/csharp/test/Ice/retry/msbuild/server/server.csproj +++ b/csharp/test/Ice/retry/msbuild/server/server.csproj @@ -58,7 +58,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -67,4 +66,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/seqMapping/msbuild/client/client.csproj b/csharp/test/Ice/seqMapping/msbuild/client/client.csproj index 149697b1d48..e20353dbdf3 100644 --- a/csharp/test/Ice/seqMapping/msbuild/client/client.csproj +++ b/csharp/test/Ice/seqMapping/msbuild/client/client.csproj @@ -73,7 +73,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -82,4 +81,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/seqMapping/msbuild/collocated/collocated.csproj b/csharp/test/Ice/seqMapping/msbuild/collocated/collocated.csproj index 3775d8cedc3..4fc5a43a702 100644 --- a/csharp/test/Ice/seqMapping/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/seqMapping/msbuild/collocated/collocated.csproj @@ -88,7 +88,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -97,4 +96,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/seqMapping/msbuild/serializable/serializable.csproj b/csharp/test/Ice/seqMapping/msbuild/serializable/serializable.csproj index 1abe37809b7..fc7a117f326 100644 --- a/csharp/test/Ice/seqMapping/msbuild/serializable/serializable.csproj +++ b/csharp/test/Ice/seqMapping/msbuild/serializable/serializable.csproj @@ -42,4 +42,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/seqMapping/msbuild/server/server.csproj b/csharp/test/Ice/seqMapping/msbuild/server/server.csproj index 53c95b7d3ee..1506627930d 100644 --- a/csharp/test/Ice/seqMapping/msbuild/server/server.csproj +++ b/csharp/test/Ice/seqMapping/msbuild/server/server.csproj @@ -64,7 +64,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -73,4 +72,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/seqMapping/msbuild/serveramd/serveramd.csproj b/csharp/test/Ice/seqMapping/msbuild/serveramd/serveramd.csproj index 5a84f9b70d2..1f5dab82ee9 100644 --- a/csharp/test/Ice/seqMapping/msbuild/serveramd/serveramd.csproj +++ b/csharp/test/Ice/seqMapping/msbuild/serveramd/serveramd.csproj @@ -61,7 +61,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -70,4 +69,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/serialize/msbuild/client/client.csproj b/csharp/test/Ice/serialize/msbuild/client/client.csproj index cd65562144e..bb59cb4df73 100644 --- a/csharp/test/Ice/serialize/msbuild/client/client.csproj +++ b/csharp/test/Ice/serialize/msbuild/client/client.csproj @@ -58,7 +58,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -67,4 +66,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/servantLocator/msbuild/client/client.csproj b/csharp/test/Ice/servantLocator/msbuild/client/client.csproj index 6f53f89db58..fb1ed8a5267 100644 --- a/csharp/test/Ice/servantLocator/msbuild/client/client.csproj +++ b/csharp/test/Ice/servantLocator/msbuild/client/client.csproj @@ -58,7 +58,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -67,4 +66,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/servantLocator/msbuild/collocated/collocated.csproj b/csharp/test/Ice/servantLocator/msbuild/collocated/collocated.csproj index 2e6788c5d3e..390903e00b1 100644 --- a/csharp/test/Ice/servantLocator/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/servantLocator/msbuild/collocated/collocated.csproj @@ -82,7 +82,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -91,4 +90,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/servantLocator/msbuild/server/server.csproj b/csharp/test/Ice/servantLocator/msbuild/server/server.csproj index 6d2773b38cd..bbb6e460da2 100644 --- a/csharp/test/Ice/servantLocator/msbuild/server/server.csproj +++ b/csharp/test/Ice/servantLocator/msbuild/server/server.csproj @@ -64,7 +64,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -73,4 +72,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/servantLocator/msbuild/serveramd/serveramd.csproj b/csharp/test/Ice/servantLocator/msbuild/serveramd/serveramd.csproj index 45f6d5564a1..cd5f7cea83f 100644 --- a/csharp/test/Ice/servantLocator/msbuild/serveramd/serveramd.csproj +++ b/csharp/test/Ice/servantLocator/msbuild/serveramd/serveramd.csproj @@ -61,7 +61,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -70,4 +69,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/slicing/exceptions/msbuild/client/client.csproj b/csharp/test/Ice/slicing/exceptions/msbuild/client/client.csproj index 2e5405f1fc9..9eee502a003 100644 --- a/csharp/test/Ice/slicing/exceptions/msbuild/client/client.csproj +++ b/csharp/test/Ice/slicing/exceptions/msbuild/client/client.csproj @@ -62,7 +62,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice;$(MSBuildProjectDirectory)\..\..</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -71,4 +70,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/slicing/exceptions/msbuild/server/server.csproj b/csharp/test/Ice/slicing/exceptions/msbuild/server/server.csproj index c930586c5b2..ecf65eb450a 100644 --- a/csharp/test/Ice/slicing/exceptions/msbuild/server/server.csproj +++ b/csharp/test/Ice/slicing/exceptions/msbuild/server/server.csproj @@ -59,7 +59,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice;$(MSBuildProjectDirectory)\..\..</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -68,4 +67,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.csproj b/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.csproj index b90da6b3d3d..d64d35537e7 100644 --- a/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.csproj +++ b/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.csproj @@ -56,7 +56,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice;$(MSBuildProjectDirectory)\..\..</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -65,4 +64,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/slicing/objects/msbuild/client/client.csproj b/csharp/test/Ice/slicing/objects/msbuild/client/client.csproj index a4e09ed0456..b38f2a8d914 100644 --- a/csharp/test/Ice/slicing/objects/msbuild/client/client.csproj +++ b/csharp/test/Ice/slicing/objects/msbuild/client/client.csproj @@ -62,7 +62,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice;$(MSBuildProjectDirectory)\..\..</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -71,4 +70,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/slicing/objects/msbuild/server/server.csproj b/csharp/test/Ice/slicing/objects/msbuild/server/server.csproj index a5abd62344a..111c6e44bca 100644 --- a/csharp/test/Ice/slicing/objects/msbuild/server/server.csproj +++ b/csharp/test/Ice/slicing/objects/msbuild/server/server.csproj @@ -59,7 +59,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice;$(MSBuildProjectDirectory)\..\..</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -68,4 +67,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.csproj b/csharp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.csproj index a006a7ef439..1e3ae82de03 100644 --- a/csharp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.csproj +++ b/csharp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.csproj @@ -56,7 +56,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice;$(MSBuildProjectDirectory)\..\..</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -65,4 +64,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/stream/msbuild/client/client.csproj b/csharp/test/Ice/stream/msbuild/client/client.csproj index 87c8169e2f1..d3285352ba8 100644 --- a/csharp/test/Ice/stream/msbuild/client/client.csproj +++ b/csharp/test/Ice/stream/msbuild/client/client.csproj @@ -64,7 +64,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -73,4 +72,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/stream/msbuild/serializable/serializable.csproj b/csharp/test/Ice/stream/msbuild/serializable/serializable.csproj index c568a7ec80d..7d00782ec06 100644 --- a/csharp/test/Ice/stream/msbuild/serializable/serializable.csproj +++ b/csharp/test/Ice/stream/msbuild/serializable/serializable.csproj @@ -42,4 +42,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/threadPoolPriority/msbuild/client/client.csproj b/csharp/test/Ice/threadPoolPriority/msbuild/client/client.csproj index 5c59337e61e..bf5993304bf 100644 --- a/csharp/test/Ice/threadPoolPriority/msbuild/client/client.csproj +++ b/csharp/test/Ice/threadPoolPriority/msbuild/client/client.csproj @@ -55,7 +55,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -64,4 +63,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/threadPoolPriority/msbuild/server/server.csproj b/csharp/test/Ice/threadPoolPriority/msbuild/server/server.csproj index 622964b2dcc..a6864e80ed8 100644 --- a/csharp/test/Ice/threadPoolPriority/msbuild/server/server.csproj +++ b/csharp/test/Ice/threadPoolPriority/msbuild/server/server.csproj @@ -55,7 +55,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -64,4 +63,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/timeout/msbuild/client/client.csproj b/csharp/test/Ice/timeout/msbuild/client/client.csproj index 02fa095b1dc..3c0679239ec 100644 --- a/csharp/test/Ice/timeout/msbuild/client/client.csproj +++ b/csharp/test/Ice/timeout/msbuild/client/client.csproj @@ -61,7 +61,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -70,4 +69,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/timeout/msbuild/server/server.csproj b/csharp/test/Ice/timeout/msbuild/server/server.csproj index fc5d99e7418..bdbfd2a9456 100644 --- a/csharp/test/Ice/timeout/msbuild/server/server.csproj +++ b/csharp/test/Ice/timeout/msbuild/server/server.csproj @@ -55,7 +55,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -64,4 +63,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/udp/msbuild/client/client.csproj b/csharp/test/Ice/udp/msbuild/client/client.csproj index 1d513af9065..9de1123f89a 100644 --- a/csharp/test/Ice/udp/msbuild/client/client.csproj +++ b/csharp/test/Ice/udp/msbuild/client/client.csproj @@ -58,7 +58,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -67,4 +66,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Ice/udp/msbuild/server/server.csproj b/csharp/test/Ice/udp/msbuild/server/server.csproj index 5330476003f..880aaf81f26 100644 --- a/csharp/test/Ice/udp/msbuild/server/server.csproj +++ b/csharp/test/Ice/udp/msbuild/server/server.csproj @@ -55,7 +55,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -64,4 +63,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/IceBox/admin/msbuild/client/client.csproj b/csharp/test/IceBox/admin/msbuild/client/client.csproj index e2deb9ce275..a4f3e0296e5 100644 --- a/csharp/test/IceBox/admin/msbuild/client/client.csproj +++ b/csharp/test/IceBox/admin/msbuild/client/client.csproj @@ -55,7 +55,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -64,4 +63,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/IceBox/admin/msbuild/testservice/testservice.csproj b/csharp/test/IceBox/admin/msbuild/testservice/testservice.csproj index f78a6ba91c4..4d053c3b691 100644 --- a/csharp/test/IceBox/admin/msbuild/testservice/testservice.csproj +++ b/csharp/test/IceBox/admin/msbuild/testservice/testservice.csproj @@ -60,7 +60,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -69,4 +68,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/IceBox/configuration/msbuild/client/client.csproj b/csharp/test/IceBox/configuration/msbuild/client/client.csproj index 6cd4f940700..8f0f72ab980 100644 --- a/csharp/test/IceBox/configuration/msbuild/client/client.csproj +++ b/csharp/test/IceBox/configuration/msbuild/client/client.csproj @@ -55,7 +55,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -64,4 +63,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/IceBox/configuration/msbuild/testservice/testservice.csproj b/csharp/test/IceBox/configuration/msbuild/testservice/testservice.csproj index 99a24454d55..ec3da3cca1a 100644 --- a/csharp/test/IceBox/configuration/msbuild/testservice/testservice.csproj +++ b/csharp/test/IceBox/configuration/msbuild/testservice/testservice.csproj @@ -60,7 +60,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -69,4 +68,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/IceDiscovery/simple/msbuild/client/client.csproj b/csharp/test/IceDiscovery/simple/msbuild/client/client.csproj index 0526243c13e..19c2e9e3e5c 100644 --- a/csharp/test/IceDiscovery/simple/msbuild/client/client.csproj +++ b/csharp/test/IceDiscovery/simple/msbuild/client/client.csproj @@ -55,7 +55,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -64,4 +63,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/IceDiscovery/simple/msbuild/server/server.csproj b/csharp/test/IceDiscovery/simple/msbuild/server/server.csproj index 6d58210595c..bcfc7ea433b 100644 --- a/csharp/test/IceDiscovery/simple/msbuild/server/server.csproj +++ b/csharp/test/IceDiscovery/simple/msbuild/server/server.csproj @@ -55,7 +55,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -64,4 +63,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/IceGrid/simple/msbuild/client/client.csproj b/csharp/test/IceGrid/simple/msbuild/client/client.csproj index e436d767666..e498d509f2e 100644 --- a/csharp/test/IceGrid/simple/msbuild/client/client.csproj +++ b/csharp/test/IceGrid/simple/msbuild/client/client.csproj @@ -65,7 +65,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -74,4 +73,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/IceGrid/simple/msbuild/server/server.csproj b/csharp/test/IceGrid/simple/msbuild/server/server.csproj index 265161b1f36..c0f9390285a 100644 --- a/csharp/test/IceGrid/simple/msbuild/server/server.csproj +++ b/csharp/test/IceGrid/simple/msbuild/server/server.csproj @@ -55,7 +55,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -64,4 +63,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/IceSSL/configuration/msbuild/client/client.csproj b/csharp/test/IceSSL/configuration/msbuild/client/client.csproj index 47db89468c4..6bf618a4c5b 100644 --- a/csharp/test/IceSSL/configuration/msbuild/client/client.csproj +++ b/csharp/test/IceSSL/configuration/msbuild/client/client.csproj @@ -66,7 +66,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -75,4 +74,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/IceSSL/configuration/msbuild/server/server.csproj b/csharp/test/IceSSL/configuration/msbuild/server/server.csproj index afbcf8e1c0d..3b759ff3a5f 100644 --- a/csharp/test/IceSSL/configuration/msbuild/server/server.csproj +++ b/csharp/test/IceSSL/configuration/msbuild/server/server.csproj @@ -60,7 +60,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -69,4 +68,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/IceUtil/inputUtil/msbuild/client/client.csproj b/csharp/test/IceUtil/inputUtil/msbuild/client/client.csproj index e3d8285892c..21dc2ea1058 100644 --- a/csharp/test/IceUtil/inputUtil/msbuild/client/client.csproj +++ b/csharp/test/IceUtil/inputUtil/msbuild/client/client.csproj @@ -48,7 +48,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -57,4 +56,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Slice/keyword/msbuild/client/client.csproj b/csharp/test/Slice/keyword/msbuild/client/client.csproj index efc8f8e1938..60da183f8ce 100644 --- a/csharp/test/Slice/keyword/msbuild/client/client.csproj +++ b/csharp/test/Slice/keyword/msbuild/client/client.csproj @@ -52,7 +52,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -61,4 +60,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Slice/macros/msbuild/client/client.csproj b/csharp/test/Slice/macros/msbuild/client/client.csproj index ea2f2ed37c5..9a6d7e2cfb6 100644 --- a/csharp/test/Slice/macros/msbuild/client/client.csproj +++ b/csharp/test/Slice/macros/msbuild/client/client.csproj @@ -52,7 +52,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -61,4 +60,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/csharp/test/Slice/structure/msbuild/client/client.csproj b/csharp/test/Slice/structure/msbuild/client/client.csproj index 9170e8bafce..2d89143d691 100644 --- a/csharp/test/Slice/structure/msbuild/client/client.csproj +++ b/csharp/test/Slice/structure/msbuild/client/client.csproj @@ -52,7 +52,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseNugetBinDist)' == 'yes'"> @@ -61,4 +60,4 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.0-alpha3\build\zeroc.ice.net.props'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/java-compat/src/Glacier2/build.gradle b/java-compat/src/Glacier2/build.gradle index d087e401336..78e1eb60929 100644 --- a/java-compat/src/Glacier2/build.gradle +++ b/java-compat/src/Glacier2/build.gradle @@ -16,7 +16,7 @@ project.ext.description = "Firewall traversal for Ice" slice { java { set1 { - args = "--ice --tie --checksum Glacier2.SliceChecksums" + args = "--tie --checksum Glacier2.SliceChecksums" files = fileTree(dir: "${sliceDir}/Glacier2", includes:['*.ice'], excludes:["*F.ice"]) } } diff --git a/java-compat/src/Ice/build.gradle b/java-compat/src/Ice/build.gradle index 3edcb8df149..e051ced349c 100644 --- a/java-compat/src/Ice/build.gradle +++ b/java-compat/src/Ice/build.gradle @@ -17,7 +17,6 @@ project.ext.description = "Ice is a comprehensive RPC framework that helps you b slice { java { set1 { - args = "--ice" files = fileTree(dir: "$sliceDir", includes:['Ice/*.ice', 'IceSSL/*.ice'], excludes:['Ice/*F.ice']) } } diff --git a/java-compat/src/IceBT/build.gradle b/java-compat/src/IceBT/build.gradle index 190900f0f07..7f3e8054372 100644 --- a/java-compat/src/IceBT/build.gradle +++ b/java-compat/src/IceBT/build.gradle @@ -16,7 +16,6 @@ project.ext.description = "Bluetooth support for Ice" slice { java { set1 { - args = "--ice" files = fileTree(dir: "$sliceDir/IceBT", includes:['*.ice'], excludes:["*F.ice"]) } } diff --git a/java-compat/src/IceBox/build.gradle b/java-compat/src/IceBox/build.gradle index 19aac05e3d3..3cb57d4a0e8 100644 --- a/java-compat/src/IceBox/build.gradle +++ b/java-compat/src/IceBox/build.gradle @@ -16,7 +16,7 @@ project.ext.description = "IceBox is an easy-to-use framework for Ice applicatio slice { java { set1 { - args = "--ice --tie --checksum IceBox.SliceChecksums" + args = "--tie --checksum IceBox.SliceChecksums" files = fileTree(dir: "$sliceDir/IceBox", includes:['*.ice'], excludes:["*F.ice"]) } } diff --git a/java-compat/src/IceDiscovery/build.gradle b/java-compat/src/IceDiscovery/build.gradle index c64a33f1ccd..4d7d1d8964a 100644 --- a/java-compat/src/IceDiscovery/build.gradle +++ b/java-compat/src/IceDiscovery/build.gradle @@ -15,7 +15,6 @@ project.ext.description = "Allow Ice applications to discover objects and object slice { java { - args = "--ice" files = fileTree(dir: "$sliceDir/IceDiscovery", includes:['*.ice'], excludes:["*F.ice"]) } } diff --git a/java-compat/src/IceGrid/build.gradle b/java-compat/src/IceGrid/build.gradle index d2bd4fc5f70..d26656acd41 100644 --- a/java-compat/src/IceGrid/build.gradle +++ b/java-compat/src/IceGrid/build.gradle @@ -16,7 +16,7 @@ project.ext.description = "Locate, deploy, and manage Ice servers" slice { java { set1 { - args = "--ice --tie --checksum IceGrid.SliceChecksums" + args = "--tie --checksum IceGrid.SliceChecksums" files = fileTree(dir: "$sliceDir/IceGrid", includes:['*.ice'], excludes:["*F.ice"]) } } diff --git a/java-compat/src/IceLocatorDiscovery/build.gradle b/java-compat/src/IceLocatorDiscovery/build.gradle index be398fe5e31..f28d08f1bf6 100644 --- a/java-compat/src/IceLocatorDiscovery/build.gradle +++ b/java-compat/src/IceLocatorDiscovery/build.gradle @@ -15,7 +15,6 @@ project.ext.description = "Ice plug-in that enables the discovery of IceGrid and slice { java { - args = "--ice" files = fileTree(dir: "$sliceDir/IceLocatorDiscovery", includes:['*.ice'], excludes:["*F.ice"]) } } diff --git a/java-compat/src/IcePatch2/build.gradle b/java-compat/src/IcePatch2/build.gradle index 31ede53de5a..e8a040d1843 100644 --- a/java-compat/src/IcePatch2/build.gradle +++ b/java-compat/src/IcePatch2/build.gradle @@ -16,7 +16,7 @@ project.ext.description = "File distribution and patching for Ice" slice { java { set1 { - args = "--ice --tie --checksum IcePatch2.SliceChecksums" + args = "--tie --checksum IcePatch2.SliceChecksums" files = fileTree(dir: "$sliceDir/IcePatch2", includes:['*.ice'], excludes:["*F.ice"]) } } diff --git a/java-compat/src/IceStorm/build.gradle b/java-compat/src/IceStorm/build.gradle index 9ce6d131b0f..546325df8fe 100644 --- a/java-compat/src/IceStorm/build.gradle +++ b/java-compat/src/IceStorm/build.gradle @@ -16,7 +16,7 @@ project.ext.description = "Publish-subscribe event distribution service" slice { java { set1 { - args = "--ice --tie --checksum IceStorm.SliceChecksums" + args = "--tie --checksum IceStorm.SliceChecksums" files = fileTree(dir: "$sliceDir/IceStorm", includes:['*.ice'], excludes:["*F.ice"]) } } diff --git a/java-compat/test/slice.gradle b/java-compat/test/slice.gradle index 8ffeca59ed1..a4056c562c8 100644 --- a/java-compat/test/slice.gradle +++ b/java-compat/test/slice.gradle @@ -34,6 +34,7 @@ task testSliceTask { 'Ice/invoke/*.ice', 'Ice/location/*.ice', 'Ice/metrics/*.ice', + 'Ice/operations/*.ice', 'Ice/networkProxy/*.ice', 'Ice/proxy/*.ice', 'Ice/retry/*.ice', @@ -63,19 +64,15 @@ task testSliceTask { 'Slice/structure/*.ice']) } set2 { - args = "--tie" - files = fileTree(dir: testDir, includes:['Ice/operations/*.ice']) - } - set4 { args = "--checksum test.Ice.checksum.Test.SliceChecksums" files = fileTree(dir: testDir, includes:['Ice/checksum/Test.ice', 'Ice/checksum/Types.ice']) } - set5 { + set3 { include = ["${testDir}/Ice/packagemd"] files = fileTree(dir: testDir, includes:['Ice/packagemd/*.ice']) } - set6 { + set4 { args = "--checksum test.Ice.checksum.server.Test.SliceChecksums" files = fileTree(dir: testDir, includes:['Ice/checksum/TestServer.ice', 'Ice/checksum/TypesServer.ice']) diff --git a/java-compat/test/src/main/java/test/Ice/operations/Test.ice b/java-compat/test/src/main/java/test/Ice/operations/Test.ice index 6571e3004cd..faf3f2cb495 100644 --- a/java-compat/test/src/main/java/test/Ice/operations/Test.ice +++ b/java-compat/test/src/main/java/test/Ice/operations/Test.ice @@ -276,7 +276,7 @@ class MyClass1 string myClass1; // Same name as the enclosing class }; -class MyDerivedClass extends MyClass +["java:tie"] class MyDerivedClass extends MyClass { void opDerived(); MyClass1 opMyClass1(MyClass1 opMyClass1); diff --git a/java-compat/test/src/main/java/test/Ice/operations/TestAMD.ice b/java-compat/test/src/main/java/test/Ice/operations/TestAMD.ice index 4776139c314..fb5d05a1f12 100644 --- a/java-compat/test/src/main/java/test/Ice/operations/TestAMD.ice +++ b/java-compat/test/src/main/java/test/Ice/operations/TestAMD.ice @@ -276,7 +276,7 @@ class MyClass1 string myClass1; // Same name as the enclosing class }; -["amd"] class MyDerivedClass extends MyClass +["amd", "java:tie"] class MyDerivedClass extends MyClass { void opDerived(); MyClass1 opMyClass1(MyClass1 opMyClass1); diff --git a/java-compat/test/src/main/java/test/Ice/operations/run.py b/java-compat/test/src/main/java/test/Ice/operations/run.py index 83401d7a990..2049cd7eeb6 100755 --- a/java-compat/test/src/main/java/test/Ice/operations/run.py +++ b/java-compat/test/src/main/java/test/Ice/operations/run.py @@ -27,11 +27,11 @@ TestUtil.queueClientServerTest(configName = "amd", localOnly = True, message = " additionalClientOptions = "--Ice.Warn.AMICallback=0", server="test.Ice.operations.AMDServer") -TestUtil.queueClientServerTest(configName = "tie", localOnly = True, message = "Running test with TIE server.", +TestUtil.queueClientServerTest(configName = "tie", localOnly = True, message = "Running test with tie server.", additionalClientOptions = "--Ice.Warn.AMICallback=0", server="test.Ice.operations.TieServer") -TestUtil.queueClientServerTest(configName = "amdTie", localOnly = True, message = "Running test with AMD TIE server.", +TestUtil.queueClientServerTest(configName = "amdTie", localOnly = True, message = "Running test with AMD tie server.", additionalClientOptions = "--Ice.Warn.AMICallback=0", server="test.Ice.operations.AMDTieServer") diff --git a/java/src/Glacier2/build.gradle b/java/src/Glacier2/build.gradle index c8c2a985fcb..e0f263c7531 100644 --- a/java/src/Glacier2/build.gradle +++ b/java/src/Glacier2/build.gradle @@ -27,7 +27,7 @@ sourceSets { slice { java { set1 { - args = "--ice --checksum com.zeroc.Glacier2.SliceChecksums" + args = "--checksum com.zeroc.Glacier2.SliceChecksums" files = fileTree(dir: "${sliceDir}/Glacier2", includes:['*.ice'], excludes:["*F.ice"]) } } diff --git a/java/src/Ice/build.gradle b/java/src/Ice/build.gradle index 7e687c43682..7b79d8b95cc 100644 --- a/java/src/Ice/build.gradle +++ b/java/src/Ice/build.gradle @@ -19,11 +19,9 @@ project.ext.description = "Ice is a comprehensive RPC framework that helps you b slice { java { stream { - args = "--ice" files = [file("$sliceDir/Ice/BuiltinSequences.ice")] } nostream { - args = "--ice" files = fileTree(dir: "$sliceDir", includes:['Ice/*.ice', 'IceSSL/*.ice'], excludes:['Ice/*F.ice', 'Ice/BuiltinSequences.ice']) } diff --git a/java/src/IceBox/build.gradle b/java/src/IceBox/build.gradle index 7d8bad65ca1..a2b805c8e7a 100644 --- a/java/src/IceBox/build.gradle +++ b/java/src/IceBox/build.gradle @@ -18,7 +18,7 @@ project.ext.description = "IceBox is an easy-to-use framework for Ice applicatio slice { java { set1 { - args = "--ice --checksum com.zeroc.IceBox.SliceChecksums" + args = "--checksum com.zeroc.IceBox.SliceChecksums" files = fileTree(dir: "$sliceDir/IceBox", includes:['*.ice'], excludes:["*F.ice"]) } } diff --git a/java/src/IceDiscovery/build.gradle b/java/src/IceDiscovery/build.gradle index 75e09daf79a..43dc7279b24 100644 --- a/java/src/IceDiscovery/build.gradle +++ b/java/src/IceDiscovery/build.gradle @@ -17,7 +17,6 @@ project.ext.description = "Allow Ice applications to discover objects and object slice { java { - args = "--ice" files = fileTree(dir: "$sliceDir/IceDiscovery", includes:['*.ice'], excludes:["*F.ice"]) } } diff --git a/java/src/IceGrid/build.gradle b/java/src/IceGrid/build.gradle index 30ec3c3d50d..02ab4534845 100644 --- a/java/src/IceGrid/build.gradle +++ b/java/src/IceGrid/build.gradle @@ -18,7 +18,7 @@ project.ext.description = "Locate, deploy, and manage Ice servers" slice { java { set1 { - args = "--ice --checksum com.zeroc.IceGrid.SliceChecksums" + args = "--checksum com.zeroc.IceGrid.SliceChecksums" files = fileTree(dir: "$sliceDir/IceGrid", includes:['*.ice'], excludes:["*F.ice"]) } } diff --git a/java/src/IceLocatorDiscovery/build.gradle b/java/src/IceLocatorDiscovery/build.gradle index 5d567924de1..dc45b8c5715 100644 --- a/java/src/IceLocatorDiscovery/build.gradle +++ b/java/src/IceLocatorDiscovery/build.gradle @@ -17,7 +17,6 @@ project.ext.description = "Ice plug-in that enables the discovery of IceGrid and slice { java { - args = "--ice" files = fileTree(dir: "$sliceDir/IceLocatorDiscovery", includes:['*.ice'], excludes:["*F.ice"]) } } diff --git a/java/src/IcePatch2/build.gradle b/java/src/IcePatch2/build.gradle index 4d30cffa9ae..fc13667fbad 100644 --- a/java/src/IcePatch2/build.gradle +++ b/java/src/IcePatch2/build.gradle @@ -18,7 +18,7 @@ project.ext.description = "File distribution and patching for Ice" slice { java { set1 { - args = "--ice --checksum com.zeroc.IcePatch2.SliceChecksums" + args = "--checksum com.zeroc.IcePatch2.SliceChecksums" files = fileTree(dir: "$sliceDir/IcePatch2", includes:['*.ice'], excludes:["*F.ice"]) } } diff --git a/java/src/IceStorm/build.gradle b/java/src/IceStorm/build.gradle index 2644a8da018..704dd83b5b3 100644 --- a/java/src/IceStorm/build.gradle +++ b/java/src/IceStorm/build.gradle @@ -27,7 +27,7 @@ sourceSets { slice { java { set1 { - args = "--ice --checksum com.zeroc.IceStorm.SliceChecksums" + args = "--checksum com.zeroc.IceStorm.SliceChecksums" files = fileTree(dir: "$sliceDir/IceStorm", includes:['*.ice'], excludes:["*F.ice"]) } } diff --git a/js/gulpfile.js b/js/gulpfile.js index be6ca15a7c2..f2417614cb2 100644 --- a/js/gulpfile.js +++ b/js/gulpfile.js @@ -346,7 +346,7 @@ libs.forEach( gulp.task(generateTask(lib), function(){ return gulp.src(sources.slice.map(sliceFile)) - .pipe(slice2js({args: ["--ice"], dest: srcDir(lib)})) + .pipe(slice2js({dest: srcDir(lib)})) .pipe(gulp.dest(srcDir(lib))); }); diff --git a/objective-c/config/Make.rules b/objective-c/config/Make.rules index cc955d8b499..e672919e837 100644 --- a/objective-c/config/Make.rules +++ b/objective-c/config/Make.rules @@ -70,7 +70,7 @@ endif define make-objc-src-project ifneq ($(USE_BIN_DIST),yes) $1_slicecompiler := slice2objc -$1_sliceflags += --ice -I$(slicedir) +$1_sliceflags += -I$(slicedir) $1_cppflags += -I$(includedir) -I$(includedir)/generated $1_ldflags += -framework Foundation $(make-project) diff --git a/objective-c/src/Glacier2/Makefile.mk b/objective-c/src/Glacier2/Makefile.mk index 9ea974aee73..1d28a2536c8 100644 --- a/objective-c/src/Glacier2/Makefile.mk +++ b/objective-c/src/Glacier2/Makefile.mk @@ -10,7 +10,7 @@ $(project)_libraries = Glacier2ObjC Glacier2ObjC_targetdir := $(libdir) -Glacier2ObjC_sliceflags := --include-dir objc/Glacier2 --dll-export GLACIER2_API +Glacier2ObjC_sliceflags := --include-dir objc/Glacier2 Glacier2ObjC_dependencies := IceObjC Glacier2ObjC_slicedir := $(slicedir)/Glacier2 Glacier2ObjC_includedir := $(includedir)/objc/Glacier2 diff --git a/objective-c/src/Ice/Makefile.mk b/objective-c/src/Ice/Makefile.mk index f0ffd62d000..d47e61d6d16 100644 --- a/objective-c/src/Ice/Makefile.mk +++ b/objective-c/src/Ice/Makefile.mk @@ -11,7 +11,7 @@ $(project)_libraries = IceObjC IceObjC_targetdir := $(libdir) IceObjC_cppflags := -DICE_API_EXPORTS -I$(project) -I$(top_srcdir)/cpp/include -I$(top_srcdir)/cpp/include/generated -IceObjC_sliceflags := --include-dir objc/Ice --dll-export ICE_API +IceObjC_sliceflags := --include-dir objc/Ice IceObjC_dependencies := Ice IceObjC_slicedir := $(slicedir)/Ice IceObjC_includedir := $(includedir)/objc/Ice diff --git a/objective-c/src/IceGrid/Makefile.mk b/objective-c/src/IceGrid/Makefile.mk index 954d1e55c85..3c631ddc9f7 100644 --- a/objective-c/src/IceGrid/Makefile.mk +++ b/objective-c/src/IceGrid/Makefile.mk @@ -10,7 +10,7 @@ $(project)_libraries = IceGridObjC IceGridObjC_targetdir := $(libdir) -IceGridObjC_sliceflags := --include-dir objc/IceGrid --dll-export ICEGRID_API +IceGridObjC_sliceflags := --include-dir objc/IceGrid IceGridObjC_dependencies := IceObjC Glacier2ObjC IceGridObjC_slicedir := $(slicedir)/IceGrid IceGridObjC_includedir := $(includedir)/objc/IceGrid diff --git a/objective-c/src/IceSSL/Makefile.mk b/objective-c/src/IceSSL/Makefile.mk index 12af2cd6b96..76bf3841719 100644 --- a/objective-c/src/IceSSL/Makefile.mk +++ b/objective-c/src/IceSSL/Makefile.mk @@ -11,7 +11,7 @@ $(project)_libraries = IceSSLObjC IceSSLObjC_targetdir := $(libdir) IceSSLObjC_cppflags := -DICESSL_API_EXPORTS -Isrc/Ice -I$(top_srcdir)/cpp/include -I$(top_srcdir)/cpp/include/generated -IceSSLObjC_sliceflags := --include-dir objc/IceSSL --dll-export ICESSL_API +IceSSLObjC_sliceflags := --include-dir objc/IceSSL IceSSLObjC_dependencies := IceObjC IceSSL Ice IceSSLObjC_slicedir := $(slicedir)/IceSSL IceSSLObjC_includedir := $(includedir)/objc/IceSSL diff --git a/objective-c/src/IceStorm/Makefile.mk b/objective-c/src/IceStorm/Makefile.mk index 12299b76a6b..cb2a622332f 100644 --- a/objective-c/src/IceStorm/Makefile.mk +++ b/objective-c/src/IceStorm/Makefile.mk @@ -10,7 +10,7 @@ $(project)_libraries = IceStormObjC IceStormObjC_targetdir := $(libdir) -IceStormObjC_sliceflags := --include-dir objc/IceStorm --dll-export ICESTORM_API +IceStormObjC_sliceflags := --include-dir objc/IceStorm IceStormObjC_dependencies := IceObjC IceStormObjC_slicedir := $(slicedir)/IceStorm IceStormObjC_includedir := $(includedir)/objc/IceStorm diff --git a/php/config/Make.rules b/php/config/Make.rules index a79f86909af..eaee88c5b26 100644 --- a/php/config/Make.rules +++ b/php/config/Make.rules @@ -73,9 +73,9 @@ endif $2/$3/%.php: $1/$3/%.ice $2/$3/.depend/%.ice.d $(slice2php_path) $(E) "Compiling $$<" - $(Q)$(slice2php_path) -I$1 --ice --output-dir $2/$3 $4 --depend $$< | \ + $(Q)$(slice2php_path) -I$1 --output-dir $2/$3 $4 --depend $$< | \ sed 's/\(.*: \\\)/$(subst /,\/,$2)\/$3\/\1/' > $2/$3/.depend/$$(*F).ice.d - $(Q)$(slice2php_path) -I$1 --ice --output-dir $2/$3 $4 $$< + $(Q)$(slice2php_path) -I$1 --output-dir $2/$3 $4 $$< distclean clean:: $(E) "Cleaning package $3" @@ -107,9 +107,9 @@ endif $1/%.php: $1/%.ice $1/.depend/%.ice.d $(slice2php_path) $(E) "Compiling $$<" - $(Q)$(slice2php_path) -I$(slicedir) -I$1 --ice --output-dir $1 $$($1_sliceflags) --depend $$< | \ + $(Q)$(slice2php_path) -I$(slicedir) -I$1 --output-dir $1 $$($1_sliceflags) --depend $$< | \ sed 's/\(.*: \\\)/$(subst /,\/,$2)\/$3\/\1/' > $1/.depend/$$(*F).ice.d - $(Q)$(slice2php_path) -I$(slicedir) -I$1 --ice --output-dir $1 $$($1_sliceflags) $$< + $(Q)$(slice2php_path) -I$(slicedir) -I$1 --output-dir $1 $$($1_sliceflags) $$< distclean clean:: $(E) "Cleaning $1" diff --git a/php/test/Slice/keyword/Key.ice b/php/test/Slice/keyword/Key.ice index 92a29d56bbc..ab73e3fa8e2 100644 --- a/php/test/Slice/keyword/Key.ice +++ b/php/test/Slice/keyword/Key.ice @@ -7,6 +7,8 @@ // // ********************************************************************** +[["underscore"]] + module and { enum array diff --git a/php/test/Slice/keyword/Makefile.mk b/php/test/Slice/keyword/Makefile.mk index 4a4b9ff50f3..c1c51736ab4 100644 --- a/php/test/Slice/keyword/Makefile.mk +++ b/php/test/Slice/keyword/Makefile.mk @@ -7,6 +7,4 @@ # # ********************************************************************** -$(test)_sliceflags = --underscore - tests += $(test) diff --git a/python/config/Make.rules b/python/config/Make.rules index d24b42c7227..4a478f9a81e 100644 --- a/python/config/Make.rules +++ b/python/config/Make.rules @@ -90,7 +90,7 @@ 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 --ice --output-dir $2 $5 --depend $$< > $2/$3/.depend/$(or $4,$$(*F)).ice.d - $(Q)$(slice2py_path) -I$1 --ice --output-dir $2 --prefix $3_ --checksum $5 $$< + $(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 --prefix $3_ --checksum $5 $$< endef diff --git a/ruby/config/Make.rules b/ruby/config/Make.rules index 34f1e844887..eec3423d6c0 100644 --- a/ruby/config/Make.rules +++ b/ruby/config/Make.rules @@ -76,9 +76,9 @@ endif $2/$3/%.rb: $1/$3/%.ice $2/$3/.depend/%.ice.d $(slice2rb_path) $(E) "Compiling $$<" - $(Q)$(slice2rb_path) -I$1 --ice --output-dir $2/$3 $4 --depend $$< | \ + $(Q)$(slice2rb_path) -I$1 --output-dir $2/$3 $4 --depend $$< | \ sed 's/\(.*: \\\)/$(subst /,\/,$2)\/$3\/\1/' > $2/$3/.depend/$$(*F).ice.d - $(Q)$(slice2rb_path) -I$1 --ice --output-dir $2/$3 $4 $$< + $(Q)$(slice2rb_path) -I$1 --output-dir $2/$3 $4 $$< distclean clean:: $(E) "Cleaning package $3" diff --git a/slice/Glacier2/Metrics.ice b/slice/Glacier2/Metrics.ice index e0dabe55fee..ece60739583 100644 --- a/slice/Glacier2/Metrics.ice +++ b/slice/Glacier2/Metrics.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API", "js:ice-build"]] [["cpp:include:Glacier2/Config.h"]] #include <Ice/Metrics.ice> diff --git a/slice/Glacier2/PermissionsVerifier.ice b/slice/Glacier2/PermissionsVerifier.ice index d82288d99cc..edef2d6a880 100644 --- a/slice/Glacier2/PermissionsVerifier.ice +++ b/slice/Glacier2/PermissionsVerifier.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API", "js:ice-build"]] [["cpp:include:Glacier2/Config.h"]] #include <Glacier2/SSLInfo.ice> diff --git a/slice/Glacier2/PermissionsVerifierF.ice b/slice/Glacier2/PermissionsVerifierF.ice index 903ca2d5da0..91e82b28dca 100644 --- a/slice/Glacier2/PermissionsVerifierF.ice +++ b/slice/Glacier2/PermissionsVerifierF.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API", "js:ice-build"]] #ifndef __SLICE2JAVA_COMPAT__ [["java:package:com.zeroc"]] diff --git a/slice/Glacier2/Router.ice b/slice/Glacier2/Router.ice index 669009d084a..0259d405b80 100644 --- a/slice/Glacier2/Router.ice +++ b/slice/Glacier2/Router.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API", "js:ice-build"]] [["cpp:include:Glacier2/Config.h"]] #include <Ice/Router.ice> diff --git a/slice/Glacier2/RouterF.ice b/slice/Glacier2/RouterF.ice index b5cfd6be312..09c3588227e 100644 --- a/slice/Glacier2/RouterF.ice +++ b/slice/Glacier2/RouterF.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API", "js:ice-build"]] #ifndef __SLICE2JAVA_COMPAT__ [["java:package:com.zeroc"]] diff --git a/slice/Glacier2/SSLInfo.ice b/slice/Glacier2/SSLInfo.ice index 5936f15a2c0..995810e34f1 100644 --- a/slice/Glacier2/SSLInfo.ice +++ b/slice/Glacier2/SSLInfo.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API", "js:ice-build"]] [["cpp:include:Glacier2/Config.h"]] #include <Ice/BuiltinSequences.ice> diff --git a/slice/Glacier2/Session.ice b/slice/Glacier2/Session.ice index 8350100dd51..ec70163ac95 100644 --- a/slice/Glacier2/Session.ice +++ b/slice/Glacier2/Session.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API", "js:ice-build"]] [["cpp:include:Glacier2/Config.h"]] #include <Ice/BuiltinSequences.ice> diff --git a/slice/Ice/BuiltinSequences.ice b/slice/Ice/BuiltinSequences.ice index dbc8216e9e7..1687b47732d 100644 --- a/slice/Ice/BuiltinSequences.ice +++ b/slice/Ice/BuiltinSequences.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build"]] #ifndef __SLICE2JAVA_COMPAT__ [["java:package:com.zeroc"]] diff --git a/slice/Ice/Communicator.ice b/slice/Ice/Communicator.ice index 3940e93691c..fea415508a7 100644 --- a/slice/Ice/Communicator.ice +++ b/slice/Ice/Communicator.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API"]] #include <Ice/LoggerF.ice> #include <Ice/InstrumentationF.ice> diff --git a/slice/Ice/CommunicatorF.ice b/slice/Ice/CommunicatorF.ice index c8b5865c3c5..0d756851135 100644 --- a/slice/Ice/CommunicatorF.ice +++ b/slice/Ice/CommunicatorF.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API"]] #ifndef __SLICE2JAVA_COMPAT__ [["java:package:com.zeroc"]] diff --git a/slice/Ice/Connection.ice b/slice/Ice/Connection.ice index e532474534b..e5f04ed95d6 100644 --- a/slice/Ice/Connection.ice +++ b/slice/Ice/Connection.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build"]] #include <Ice/ObjectAdapterF.ice> #include <Ice/Identity.ice> diff --git a/slice/Ice/ConnectionF.ice b/slice/Ice/ConnectionF.ice index 606212a2d6e..b85db9179f7 100644 --- a/slice/Ice/ConnectionF.ice +++ b/slice/Ice/ConnectionF.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build"]] #ifndef __SLICE2JAVA_COMPAT__ [["java:package:com.zeroc"]] diff --git a/slice/Ice/Current.ice b/slice/Ice/Current.ice index cbda600f6b9..709f3fc5531 100644 --- a/slice/Ice/Current.ice +++ b/slice/Ice/Current.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build"]] #include <Ice/ObjectAdapterF.ice> #include <Ice/ConnectionF.ice> diff --git a/slice/Ice/Endpoint.ice b/slice/Ice/Endpoint.ice index c0b128513a5..9dbd62826c3 100644 --- a/slice/Ice/Endpoint.ice +++ b/slice/Ice/Endpoint.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build"]] #include <Ice/Version.ice> #include <Ice/BuiltinSequences.ice> diff --git a/slice/Ice/EndpointF.ice b/slice/Ice/EndpointF.ice index 8aa46ac8a84..8eafe907173 100644 --- a/slice/Ice/EndpointF.ice +++ b/slice/Ice/EndpointF.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build"]] #ifndef __SLICE2JAVA_COMPAT__ [["java:package:com.zeroc"]] diff --git a/slice/Ice/EndpointTypes.ice b/slice/Ice/EndpointTypes.ice index 3c7ab04d117..a9f07f54c5f 100644 --- a/slice/Ice/EndpointTypes.ice +++ b/slice/Ice/EndpointTypes.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build"]] #ifndef __SLICE2JAVA_COMPAT__ [["java:package:com.zeroc"]] diff --git a/slice/Ice/FacetMap.ice b/slice/Ice/FacetMap.ice index a6524b61e34..a8d2bd08ca6 100644 --- a/slice/Ice/FacetMap.ice +++ b/slice/Ice/FacetMap.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API"]] #ifndef __SLICE2JAVA_COMPAT__ [["java:package:com.zeroc"]] diff --git a/slice/Ice/Identity.ice b/slice/Ice/Identity.ice index 197b44e2a31..49f80c6f38e 100644 --- a/slice/Ice/Identity.ice +++ b/slice/Ice/Identity.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build"]] #ifndef __SLICE2JAVA_COMPAT__ [["java:package:com.zeroc"]] diff --git a/slice/Ice/ImplicitContext.ice b/slice/Ice/ImplicitContext.ice index caa31c484cb..d0cc783da20 100644 --- a/slice/Ice/ImplicitContext.ice +++ b/slice/Ice/ImplicitContext.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API"]] #include <Ice/LocalException.ice> #include <Ice/Current.ice> diff --git a/slice/Ice/ImplicitContextF.ice b/slice/Ice/ImplicitContextF.ice index b87533701a3..24c90ac3c04 100644 --- a/slice/Ice/ImplicitContextF.ice +++ b/slice/Ice/ImplicitContextF.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API"]] #ifndef __SLICE2JAVA_COMPAT__ [["java:package:com.zeroc"]] diff --git a/slice/Ice/Instrumentation.ice b/slice/Ice/Instrumentation.ice index 794625ebfd0..0b32f68e0cc 100644 --- a/slice/Ice/Instrumentation.ice +++ b/slice/Ice/Instrumentation.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API"]] #include <Ice/EndpointF.ice> #include <Ice/ConnectionF.ice> diff --git a/slice/Ice/InstrumentationF.ice b/slice/Ice/InstrumentationF.ice index fa112862a96..a6a993332a3 100644 --- a/slice/Ice/InstrumentationF.ice +++ b/slice/Ice/InstrumentationF.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API"]] #ifndef __SLICE2JAVA_COMPAT__ [["java:package:com.zeroc"]] diff --git a/slice/Ice/LocalException.ice b/slice/Ice/LocalException.ice index 116486046cd..374a84d9e4c 100644 --- a/slice/Ice/LocalException.ice +++ b/slice/Ice/LocalException.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build"]] #include <Ice/Identity.ice> #include <Ice/Version.ice> diff --git a/slice/Ice/Locator.ice b/slice/Ice/Locator.ice index 9a46ac493ad..46cecbf4a70 100644 --- a/slice/Ice/Locator.ice +++ b/slice/Ice/Locator.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build"]] #include <Ice/Identity.ice> #include <Ice/Process.ice> diff --git a/slice/Ice/LocatorF.ice b/slice/Ice/LocatorF.ice index 09e6fbb2c08..c8c68f1dd69 100644 --- a/slice/Ice/LocatorF.ice +++ b/slice/Ice/LocatorF.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API"]] #ifndef __SLICE2JAVA_COMPAT__ [["java:package:com.zeroc"]] diff --git a/slice/Ice/Logger.ice b/slice/Ice/Logger.ice index 764b353055c..5cb92a3b88d 100644 --- a/slice/Ice/Logger.ice +++ b/slice/Ice/Logger.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API"]] #ifndef __SLICE2JAVA_COMPAT__ [["java:package:com.zeroc"]] diff --git a/slice/Ice/LoggerF.ice b/slice/Ice/LoggerF.ice index c7a969b3e34..39e6d69c518 100644 --- a/slice/Ice/LoggerF.ice +++ b/slice/Ice/LoggerF.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API"]] #ifndef __SLICE2JAVA_COMPAT__ [["java:package:com.zeroc"]] diff --git a/slice/Ice/Metrics.ice b/slice/Ice/Metrics.ice index a4f5e46479a..243dc94c2d9 100644 --- a/slice/Ice/Metrics.ice +++ b/slice/Ice/Metrics.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build"]] #include <Ice/BuiltinSequences.ice> diff --git a/slice/Ice/ObjectAdapter.ice b/slice/Ice/ObjectAdapter.ice index fe7c38fa159..2ab6b18aab6 100644 --- a/slice/Ice/ObjectAdapter.ice +++ b/slice/Ice/ObjectAdapter.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API"]] #include <Ice/CommunicatorF.ice> #include <Ice/ServantLocatorF.ice> diff --git a/slice/Ice/ObjectAdapterF.ice b/slice/Ice/ObjectAdapterF.ice index 8c288ee96a7..0181906036f 100644 --- a/slice/Ice/ObjectAdapterF.ice +++ b/slice/Ice/ObjectAdapterF.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build"]] #ifndef __SLICE2JAVA_COMPAT__ [["java:package:com.zeroc"]] diff --git a/slice/Ice/ObjectFactory.ice b/slice/Ice/ObjectFactory.ice index 895e8f7d9e4..dd456d2d84a 100644 --- a/slice/Ice/ObjectFactory.ice +++ b/slice/Ice/ObjectFactory.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API"]] #ifndef __SLICE2JAVA_COMPAT__ [["java:package:com.zeroc"]] diff --git a/slice/Ice/Plugin.ice b/slice/Ice/Plugin.ice index 40c7f77fe4b..ed77cf0fd98 100644 --- a/slice/Ice/Plugin.ice +++ b/slice/Ice/Plugin.ice @@ -10,7 +10,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API"]] #include <Ice/LoggerF.ice> #include <Ice/BuiltinSequences.ice> diff --git a/slice/Ice/PluginF.ice b/slice/Ice/PluginF.ice index 077faf5ef1b..22d4df577ee 100644 --- a/slice/Ice/PluginF.ice +++ b/slice/Ice/PluginF.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API"]] #ifndef __SLICE2JAVA_COMPAT__ [["java:package:com.zeroc"]] diff --git a/slice/Ice/Process.ice b/slice/Ice/Process.ice index 8692d69a0ee..58806e1b366 100644 --- a/slice/Ice/Process.ice +++ b/slice/Ice/Process.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build"]] #ifndef __SLICE2JAVA_COMPAT__ [["java:package:com.zeroc"]] diff --git a/slice/Ice/ProcessF.ice b/slice/Ice/ProcessF.ice index 270530c6cf9..58217e6bab6 100644 --- a/slice/Ice/ProcessF.ice +++ b/slice/Ice/ProcessF.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build"]] #ifndef __SLICE2JAVA_COMPAT__ [["java:package:com.zeroc"]] diff --git a/slice/Ice/Properties.ice b/slice/Ice/Properties.ice index f43a27a8055..494db29fdc5 100644 --- a/slice/Ice/Properties.ice +++ b/slice/Ice/Properties.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API"]] #include <Ice/PropertiesAdmin.ice> diff --git a/slice/Ice/PropertiesAdmin.ice b/slice/Ice/PropertiesAdmin.ice index 38f78f62ca4..63d00021755 100644 --- a/slice/Ice/PropertiesAdmin.ice +++ b/slice/Ice/PropertiesAdmin.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build"]] #include <Ice/BuiltinSequences.ice> diff --git a/slice/Ice/PropertiesF.ice b/slice/Ice/PropertiesF.ice index 277e096f72b..873ac10b2d1 100644 --- a/slice/Ice/PropertiesF.ice +++ b/slice/Ice/PropertiesF.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API"]] #ifndef __SLICE2JAVA_COMPAT__ [["java:package:com.zeroc"]] diff --git a/slice/Ice/RemoteLogger.ice b/slice/Ice/RemoteLogger.ice index 4d0bba02e25..9e3190d7c89 100644 --- a/slice/Ice/RemoteLogger.ice +++ b/slice/Ice/RemoteLogger.ice @@ -11,7 +11,7 @@ #include <Ice/BuiltinSequences.ice> -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build"]] [["cpp:include:list"]] #ifndef __SLICE2JAVA_COMPAT__ diff --git a/slice/Ice/Router.ice b/slice/Ice/Router.ice index 3368b8b5933..7bbc6ffed68 100644 --- a/slice/Ice/Router.ice +++ b/slice/Ice/Router.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build"]] #include <Ice/BuiltinSequences.ice> diff --git a/slice/Ice/RouterF.ice b/slice/Ice/RouterF.ice index a3adc8ba24c..f1fa6fc665d 100644 --- a/slice/Ice/RouterF.ice +++ b/slice/Ice/RouterF.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API"]] #ifndef __SLICE2JAVA_COMPAT__ [["java:package:com.zeroc"]] diff --git a/slice/Ice/ServantLocator.ice b/slice/Ice/ServantLocator.ice index afaa9a13597..8f80ed47e0f 100644 --- a/slice/Ice/ServantLocator.ice +++ b/slice/Ice/ServantLocator.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API"]] #include <Ice/ObjectAdapterF.ice> #include <Ice/Current.ice> diff --git a/slice/Ice/ServantLocatorF.ice b/slice/Ice/ServantLocatorF.ice index 541331c4db1..d0ab18b658f 100644 --- a/slice/Ice/ServantLocatorF.ice +++ b/slice/Ice/ServantLocatorF.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API"]] #ifndef __SLICE2JAVA_COMPAT__ [["java:package:com.zeroc"]] diff --git a/slice/Ice/SliceChecksumDict.ice b/slice/Ice/SliceChecksumDict.ice index 1488496e1b5..0be05ec6e7d 100644 --- a/slice/Ice/SliceChecksumDict.ice +++ b/slice/Ice/SliceChecksumDict.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build"]] #ifndef __SLICE2JAVA_COMPAT__ [["java:package:com.zeroc"]] diff --git a/slice/Ice/ValueFactory.ice b/slice/Ice/ValueFactory.ice index c06bde16fa2..1cf0c8c5ab5 100644 --- a/slice/Ice/ValueFactory.ice +++ b/slice/Ice/ValueFactory.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API"]] #ifndef __SLICE2JAVA_COMPAT__ [["java:package:com.zeroc"]] diff --git a/slice/Ice/Version.ice b/slice/Ice/Version.ice index e656b8ceffb..d3e5b3a7a29 100644 --- a/slice/Ice/Version.ice +++ b/slice/Ice/Version.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "objc:header-dir:objc", "objc:dll-export:ICE_API", "js:ice-build"]] #ifndef __SLICE2JAVA_COMPAT__ [["java:package:com.zeroc"]] diff --git a/slice/IceBT/ConnectionInfo.ice b/slice/IceBT/ConnectionInfo.ice index 10c283e0fd0..a747fdb2522 100644 --- a/slice/IceBT/ConnectionInfo.ice +++ b/slice/IceBT/ConnectionInfo.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_BT_API", "objc:header-dir:objc"]] #include <Ice/Connection.ice> diff --git a/slice/IceBT/EndpointInfo.ice b/slice/IceBT/EndpointInfo.ice index 258e048776d..4862e7e6248 100644 --- a/slice/IceBT/EndpointInfo.ice +++ b/slice/IceBT/EndpointInfo.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_BT_API", "objc:header-dir:objc", "js:ice-build"]] #include <Ice/Endpoint.ice> diff --git a/slice/IceBT/Types.ice b/slice/IceBT/Types.ice index dc381eba39a..cb49d200810 100644 --- a/slice/IceBT/Types.ice +++ b/slice/IceBT/Types.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_BT_API", "objc:header-dir:objc"]] #ifndef __SLICE2JAVA_COMPAT__ [["java:package:com.zeroc"]] diff --git a/slice/IceBox/IceBox.ice b/slice/IceBox/IceBox.ice index e669963f764..06516ab22c5 100644 --- a/slice/IceBox/IceBox.ice +++ b/slice/IceBox/IceBox.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEBOX_API", "objc:header-dir:objc"]] [["cpp:include:IceBox/Config.h"]] #include <Ice/BuiltinSequences.ice> diff --git a/slice/IceDiscovery/IceDiscovery.ice b/slice/IceDiscovery/IceDiscovery.ice index 0c275a2331b..43fbdf09714 100644 --- a/slice/IceDiscovery/IceDiscovery.ice +++ b/slice/IceDiscovery/IceDiscovery.ice @@ -8,7 +8,7 @@ // ********************************************************************** #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc"]] +[["ice-prefix", "cpp:header-ext:h", "objc:header-dir:objc"]] #include <Ice/Identity.ice> diff --git a/slice/IceGrid/Admin.ice b/slice/IceGrid/Admin.ice index 1d8cbfd93ce..72aa1e989df 100644 --- a/slice/IceGrid/Admin.ice +++ b/slice/IceGrid/Admin.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_GRID_API", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "js:ice-build"]] [["cpp:include:IceGrid/Config.h"]] #include <Ice/Identity.ice> diff --git a/slice/IceGrid/Descriptor.ice b/slice/IceGrid/Descriptor.ice index df0bf9de3f2..16032bd0291 100644 --- a/slice/IceGrid/Descriptor.ice +++ b/slice/IceGrid/Descriptor.ice @@ -9,7 +9,12 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["ice-prefix", "cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] + +#ifndef ICE_BUILDING_ICEGRIDDB +[["cpp:dll-export:ICE_GRID_API", "objc:dll-export:ICEGRID_API"]] +#endif + [["cpp:include:IceGrid/Config.h"]] #include <Ice/Identity.ice> diff --git a/slice/IceGrid/Exception.ice b/slice/IceGrid/Exception.ice index 572065804a1..144f9cd712a 100644 --- a/slice/IceGrid/Exception.ice +++ b/slice/IceGrid/Exception.ice @@ -9,7 +9,12 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["ice-prefix", "cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] + +#ifndef ICE_BUILDING_ICEGRIDDB +[["cpp:dll-export:ICE_GRID_API", "objc:dll-export:ICEGRID_API"]] +#endif + [["cpp:include:IceGrid/Config.h"]] #include <Ice/Identity.ice> diff --git a/slice/IceGrid/FileParser.ice b/slice/IceGrid/FileParser.ice index 541a39b9ff8..48917cad550 100644 --- a/slice/IceGrid/FileParser.ice +++ b/slice/IceGrid/FileParser.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_GRID_API", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "js:ice-build"]] [["cpp:include:IceGrid/Config.h"]] #include <IceGrid/Admin.ice> diff --git a/slice/IceGrid/PluginFacade.ice b/slice/IceGrid/PluginFacade.ice index 2806989c31b..9b59714c494 100644 --- a/slice/IceGrid/PluginFacade.ice +++ b/slice/IceGrid/PluginFacade.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_GRID_API", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API"]] [["cpp:include:IceGrid/Config.h"]] #include <Ice/BuiltinSequences.ice> diff --git a/slice/IceGrid/Registry.ice b/slice/IceGrid/Registry.ice index b7b06d5d068..9ef94db6755 100644 --- a/slice/IceGrid/Registry.ice +++ b/slice/IceGrid/Registry.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_GRID_API", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "js:ice-build"]] [["cpp:include:IceGrid/Config.h"]] #include <IceGrid/Exception.ice> diff --git a/slice/IceGrid/Session.ice b/slice/IceGrid/Session.ice index b92d7869d05..d91baea20a0 100644 --- a/slice/IceGrid/Session.ice +++ b/slice/IceGrid/Session.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_GRID_API", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "js:ice-build"]] [["cpp:include:IceGrid/Config.h"]] #include <Glacier2/Session.ice> diff --git a/slice/IceGrid/UserAccountMapper.ice b/slice/IceGrid/UserAccountMapper.ice index 8f77f57543b..4267956cd77 100644 --- a/slice/IceGrid/UserAccountMapper.ice +++ b/slice/IceGrid/UserAccountMapper.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_GRID_API", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "js:ice-build"]] [["cpp:include:IceGrid/Config.h"]] #ifndef __SLICE2JAVA_COMPAT__ diff --git a/slice/IceIAP/ConnectionInfo.ice b/slice/IceIAP/ConnectionInfo.ice index b4dfdddd392..f1bba0a332b 100644 --- a/slice/IceIAP/ConnectionInfo.ice +++ b/slice/IceIAP/ConnectionInfo.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_IAP_API", "objc:header-dir:objc", "js:ice-build"]] #include <Ice/Connection.ice> diff --git a/slice/IceIAP/EndpointInfo.ice b/slice/IceIAP/EndpointInfo.ice index 69404a8f00e..71ee3d695be 100644 --- a/slice/IceIAP/EndpointInfo.ice +++ b/slice/IceIAP/EndpointInfo.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_IAP_API", "objc:header-dir:objc", "js:ice-build"]] #include <Ice/Endpoint.ice> diff --git a/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice b/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice index a811f768264..c6e8364d13b 100644 --- a/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +++ b/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice @@ -8,7 +8,7 @@ // ********************************************************************** #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc"]] +[["ice-prefix", "cpp:header-ext:h", "objc:header-dir:objc"]] #include <Ice/Locator.ice> diff --git a/slice/IcePatch2/FileInfo.ice b/slice/IcePatch2/FileInfo.ice index 48b1caff9ad..db6a5d2fe4e 100644 --- a/slice/IcePatch2/FileInfo.ice +++ b/slice/IcePatch2/FileInfo.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_PATCH2_API", "objc:header-dir:objc"]] [["cpp:include:IcePatch2/Config.h"]] #include <Ice/BuiltinSequences.ice> diff --git a/slice/IcePatch2/FileServer.ice b/slice/IcePatch2/FileServer.ice index aef6c5f8fd7..0c02853c09a 100644 --- a/slice/IcePatch2/FileServer.ice +++ b/slice/IcePatch2/FileServer.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_PATCH2_API", "objc:header-dir:objc"]] [["cpp:include:IcePatch2/Config.h"]] #include <IcePatch2/FileInfo.ice> diff --git a/slice/IceSSL/ConnectionInfo.ice b/slice/IceSSL/ConnectionInfo.ice index dde7bd5a0a6..9c95fb736fb 100644 --- a/slice/IceSSL/ConnectionInfo.ice +++ b/slice/IceSSL/ConnectionInfo.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_SSL_API", "objc:header-dir:objc", "objc:dll-export:ICESSL_API", "js:ice-build"]] #include <Ice/Connection.ice> diff --git a/slice/IceSSL/EndpointInfo.ice b/slice/IceSSL/EndpointInfo.ice index cc8a186959f..3a1e5e44343 100644 --- a/slice/IceSSL/EndpointInfo.ice +++ b/slice/IceSSL/EndpointInfo.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_SSL_API", "objc:header-dir:objc", "objc:dll-export:ICESSL_API", "js:ice-build"]] #include <Ice/Endpoint.ice> diff --git a/slice/IceStorm/IceStorm.ice b/slice/IceStorm/IceStorm.ice index 1c9332ef5e2..32c259d5cea 100644 --- a/slice/IceStorm/IceStorm.ice +++ b/slice/IceStorm/IceStorm.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_STORM_LIB_API", "objc:header-dir:objc", "objc:dll-export:ICESTORM_API", "js:ice-build"]] [["cpp:include:IceStorm/Config.h"]] #include <Ice/Identity.ice> diff --git a/slice/IceStorm/Metrics.ice b/slice/IceStorm/Metrics.ice index 6292c03b8ea..775042cd64a 100644 --- a/slice/IceStorm/Metrics.ice +++ b/slice/IceStorm/Metrics.ice @@ -9,7 +9,7 @@ #pragma once -[["cpp:header-ext:h", "objc:header-dir:objc", "js:ice-build"]] +[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_STORM_LIB_API", "objc:header-dir:objc", "objc:dll-export:ICESTORM_API", "js:ice-build"]] [["cpp:include:IceStorm/Config.h"]] #include <Ice/Metrics.ice> |