125 files changed, 128 insertions, 248 deletions
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>