Fix (ICE-8021) - Upgrade strong name key for 3.7

11 files changed, 9 insertions, 12 deletions

diff --git a/csharp/src/Glacier2/AssemblyInfo.cs b/csharp/src/Glacier2/AssemblyInfo.cs
index bf6f4b69d52..1e75930ea25 100644
--- a/csharp/src/Glacier2/AssemblyInfo.cs
+++ b/csharp/src/Glacier2/AssemblyInfo.cs
@@ -22,6 +22,5 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]
 [assembly: AssemblyVersion("3.7.0")]
-[assembly: AssemblyDelaySign(false)]
 
 [assembly: ComVisible(false)]
diff --git a/csharp/src/Ice/AssemblyInfo.cs b/csharp/src/Ice/AssemblyInfo.cs
index c975b555d6e..fe7d81466c7 100644
--- a/csharp/src/Ice/AssemblyInfo.cs
+++ b/csharp/src/Ice/AssemblyInfo.cs
@@ -22,6 +22,5 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]
 [assembly: AssemblyVersion("3.7.0")]
-[assembly: AssemblyDelaySign(false)]
 
 [assembly: ComVisible(false)]
diff --git a/csharp/src/IceBox/AssemblyInfo.cs b/csharp/src/IceBox/AssemblyInfo.cs
index b0525882a6f..4bf1eaa37e3 100644
--- a/csharp/src/IceBox/AssemblyInfo.cs
+++ b/csharp/src/IceBox/AssemblyInfo.cs
@@ -22,6 +22,5 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]
 [assembly: AssemblyVersion("3.7.0")]
-[assembly: AssemblyDelaySign(false)]
 
 [assembly: ComVisible(false)]
diff --git a/csharp/src/IceBox/AssemblyInfoExe.cs b/csharp/src/IceBox/AssemblyInfoExe.cs
index 37a0472dc30..6db8edfdb94 100644
--- a/csharp/src/IceBox/AssemblyInfoExe.cs
+++ b/csharp/src/IceBox/AssemblyInfoExe.cs
@@ -22,6 +22,5 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]
 [assembly: AssemblyVersion("3.7.0")]
-[assembly: AssemblyDelaySign(false)]
 
 [assembly: ComVisible(false)]
diff --git a/csharp/src/IceBox/msbuild/icebox/icebox.csproj b/csharp/src/IceBox/msbuild/icebox/icebox.csproj
index 294b12fd1b6..c7583e3c0f3 100644
--- a/csharp/src/IceBox/msbuild/icebox/icebox.csproj
+++ b/csharp/src/IceBox/msbuild/icebox/icebox.csproj
@@ -58,10 +58,17 @@
   <!-- Generate iceboxnet.exe.config with the correct assembly pulbic key token and
        assembly paths -->
   <Target Name="PostBuild" AfterTargets="Build">
-    <GetPublicKeyToken AssemblyFile="$(MSBuildThisFileDirectory)..\..\..\..\Assemblies\Ice.dll">
+    <GetPublicKeyToken AssemblyFile="$(MSBuildThisFileDirectory)..\..\..\..\Assemblies\Ice.dll" Condition="'$(KEYFILE)' != ''">
       <Output TaskParameter="PublicKeyToken" PropertyName="PublicKeyToken" />
     </GetPublicKeyToken>
-    <WriteFileWithReplacements InputFile="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\iceboxnet.exe.config" OutputFile="$(MSBuildThisFileDirectory)..\..\..\..\bin\iceboxnet.exe.config" Tokens="@PublicKeyToken@;@AssemblyDir@" Replacements="$(PublicKeyToken);..\Assemblies" />
+    <WriteFileWithReplacements InputFile="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\iceboxnet.exe.config.release" 
+                               OutputFile="$(MSBuildThisFileDirectory)..\..\..\..\bin\iceboxnet.exe.config"
+                               Tokens="@PublicKeyToken@;@AssemblyDir@"
+                               Replacements="$(PublicKeyToken);..\Assemblies"
+                               Condition="'$(KEYFILE)' != ''" />
+    <Copy SourceFiles="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\iceboxnet.exe.config.dev"
+          DestinationFiles="$(MSBuildThisFileDirectory)..\..\..\..\bin\iceboxnet.exe.config"
+          Condition="'$(KEYFILE)' == ''"/>
   </Target>
   <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
diff --git a/csharp/src/IceDiscovery/AssemblyInfo.cs b/csharp/src/IceDiscovery/AssemblyInfo.cs
index 0d6badca6f9..ede54f24764 100644
--- a/csharp/src/IceDiscovery/AssemblyInfo.cs
+++ b/csharp/src/IceDiscovery/AssemblyInfo.cs
@@ -22,6 +22,5 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]
 [assembly: AssemblyVersion("3.7.0")]
-[assembly: AssemblyDelaySign(false)]
 
 [assembly: ComVisible(false)]
diff --git a/csharp/src/IceGrid/AssemblyInfo.cs b/csharp/src/IceGrid/AssemblyInfo.cs
index 8fef16a6e6e..05acfeac8e0 100644
--- a/csharp/src/IceGrid/AssemblyInfo.cs
+++ b/csharp/src/IceGrid/AssemblyInfo.cs
@@ -22,6 +22,5 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]
 [assembly: AssemblyVersion("3.7.0")]
-[assembly: AssemblyDelaySign(false)]
 
 [assembly: ComVisible(false)]
diff --git a/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs b/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs
index 03ccb1a0d47..54c0943c032 100644
--- a/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs
+++ b/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs
@@ -22,6 +22,5 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]
 [assembly: AssemblyVersion("3.7.0")]
-[assembly: AssemblyDelaySign(false)]
 
 [assembly: ComVisible(false)]
diff --git a/csharp/src/IcePatch2/AssemblyInfo.cs b/csharp/src/IcePatch2/AssemblyInfo.cs
index 1f1b5d345e5..e944322499a 100644
--- a/csharp/src/IcePatch2/AssemblyInfo.cs
+++ b/csharp/src/IcePatch2/AssemblyInfo.cs
@@ -22,6 +22,5 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]
 [assembly: AssemblyVersion("3.7.0")]
-[assembly: AssemblyDelaySign(false)]
 
 [assembly: ComVisible(false)]
diff --git a/csharp/src/IceSSL/AssemblyInfo.cs b/csharp/src/IceSSL/AssemblyInfo.cs
index 06e09f741a0..f654b5201c4 100644
--- a/csharp/src/IceSSL/AssemblyInfo.cs
+++ b/csharp/src/IceSSL/AssemblyInfo.cs
@@ -22,6 +22,5 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]
 [assembly: AssemblyVersion("3.7.0")]
-[assembly: AssemblyDelaySign(false)]
 
 [assembly: ComVisible(false)]
diff --git a/csharp/src/IceStorm/AssemblyInfo.cs b/csharp/src/IceStorm/AssemblyInfo.cs
index 75bfd4646f8..47196497b3f 100644
--- a/csharp/src/IceStorm/AssemblyInfo.cs
+++ b/csharp/src/IceStorm/AssemblyInfo.cs
@@ -22,6 +22,5 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]
 [assembly: AssemblyVersion("3.7.0")]
-[assembly: AssemblyDelaySign(false)]
 
 [assembly: ComVisible(false)]