summaryrefslogtreecommitdiff
path: root/csharp/src
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2017-06-26 13:18:16 +0200
committerJose <jose@zeroc.com>2017-06-26 13:18:16 +0200
commit3d148aaa114d7611ce25cd94ba3810f600786cfd (patch)
tree934aee94a9ad398a371bb5c092a0a1fc98250a7e /csharp/src
parentAttempted fix for occasional timeout overrides test failure (ICE-8141) (diff)
downloadice-3d148aaa114d7611ce25cd94ba3810f600786cfd.tar.bz2
ice-3d148aaa114d7611ce25cd94ba3810f600786cfd.tar.xz
ice-3d148aaa114d7611ce25cd94ba3810f600786cfd.zip
Fixed (ICE-8155) - Ice.dll .NET assembly not signed
Diffstat (limited to 'csharp/src')
-rw-r--r--csharp/src/Glacier2/msbuild/glacier2.csproj2
-rw-r--r--csharp/src/Ice/msbuild/ice.csproj2
-rw-r--r--csharp/src/IceBox/msbuild/icebox/icebox.csproj2
-rw-r--r--csharp/src/IceBox/msbuild/iceboxlib/iceboxlib.csproj2
-rw-r--r--csharp/src/IceDiscovery/msbuild/icediscovery.csproj2
-rw-r--r--csharp/src/IceGrid/msbuild/icegrid.csproj2
-rw-r--r--csharp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery.csproj2
-rw-r--r--csharp/src/IcePatch2/msbuild/icepatch2.csproj2
-rw-r--r--csharp/src/IceSSL/msbuild/icessl.csproj2
-rw-r--r--csharp/src/IceStorm/msbuild/icestorm.csproj2
10 files changed, 10 insertions, 10 deletions
diff --git a/csharp/src/Glacier2/msbuild/glacier2.csproj b/csharp/src/Glacier2/msbuild/glacier2.csproj
index 2bfdcb84ca8..942a5d702f2 100644
--- a/csharp/src/Glacier2/msbuild/glacier2.csproj
+++ b/csharp/src/Glacier2/msbuild/glacier2.csproj
@@ -83,7 +83,7 @@
<IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories>
</PropertyGroup>
<Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" />
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/csharp/src/Ice/msbuild/ice.csproj b/csharp/src/Ice/msbuild/ice.csproj
index ed21534e3fc..c85e02da0e4 100644
--- a/csharp/src/Ice/msbuild/ice.csproj
+++ b/csharp/src/Ice/msbuild/ice.csproj
@@ -464,7 +464,7 @@
<IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories>
</PropertyGroup>
<Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" />
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/csharp/src/IceBox/msbuild/icebox/icebox.csproj b/csharp/src/IceBox/msbuild/icebox/icebox.csproj
index 4363a263b70..067e54d6023 100644
--- a/csharp/src/IceBox/msbuild/icebox/icebox.csproj
+++ b/csharp/src/IceBox/msbuild/icebox/icebox.csproj
@@ -53,7 +53,7 @@
<IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories>
</PropertyGroup>
<Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" />
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
<Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.common.targets" />
<!-- Generate iceboxnet.exe.config with the correct assembly pulbic key token and
assembly paths -->
diff --git a/csharp/src/IceBox/msbuild/iceboxlib/iceboxlib.csproj b/csharp/src/IceBox/msbuild/iceboxlib/iceboxlib.csproj
index d161f13b9a0..50477702c49 100644
--- a/csharp/src/IceBox/msbuild/iceboxlib/iceboxlib.csproj
+++ b/csharp/src/IceBox/msbuild/iceboxlib/iceboxlib.csproj
@@ -47,7 +47,7 @@
<IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories>
</PropertyGroup>
<Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" />
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/csharp/src/IceDiscovery/msbuild/icediscovery.csproj b/csharp/src/IceDiscovery/msbuild/icediscovery.csproj
index 89ea1449060..9880c1c42a2 100644
--- a/csharp/src/IceDiscovery/msbuild/icediscovery.csproj
+++ b/csharp/src/IceDiscovery/msbuild/icediscovery.csproj
@@ -56,7 +56,7 @@
<IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories>
</PropertyGroup>
<Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" />
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/csharp/src/IceGrid/msbuild/icegrid.csproj b/csharp/src/IceGrid/msbuild/icegrid.csproj
index 247957019a4..ca77df8adb4 100644
--- a/csharp/src/IceGrid/msbuild/icegrid.csproj
+++ b/csharp/src/IceGrid/msbuild/icegrid.csproj
@@ -80,7 +80,7 @@
<IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories>
</PropertyGroup>
<Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" />
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/csharp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery.csproj b/csharp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery.csproj
index ba547df8c4b..b9725f04b8c 100644
--- a/csharp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery.csproj
+++ b/csharp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery.csproj
@@ -50,7 +50,7 @@
<IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories>
</PropertyGroup>
<Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" />
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/csharp/src/IcePatch2/msbuild/icepatch2.csproj b/csharp/src/IcePatch2/msbuild/icepatch2.csproj
index 03fd874c9b7..741a1532e97 100644
--- a/csharp/src/IcePatch2/msbuild/icepatch2.csproj
+++ b/csharp/src/IcePatch2/msbuild/icepatch2.csproj
@@ -51,7 +51,7 @@
<IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories>
</PropertyGroup>
<Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" />
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/csharp/src/IceSSL/msbuild/icessl.csproj b/csharp/src/IceSSL/msbuild/icessl.csproj
index 7a82fcc0bd6..ab4d9644ee2 100644
--- a/csharp/src/IceSSL/msbuild/icessl.csproj
+++ b/csharp/src/IceSSL/msbuild/icessl.csproj
@@ -84,7 +84,7 @@
<IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories>
</PropertyGroup>
<Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" />
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/csharp/src/IceStorm/msbuild/icestorm.csproj b/csharp/src/IceStorm/msbuild/icestorm.csproj
index a3ac58fb7a0..f8d768f1e6a 100644
--- a/csharp/src/IceStorm/msbuild/icestorm.csproj
+++ b/csharp/src/IceStorm/msbuild/icestorm.csproj
@@ -51,7 +51,7 @@
<IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories>
</PropertyGroup>
<Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" />
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>