summaryrefslogtreecommitdiff
path: root/csharp/src
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2015-07-31 11:57:38 -0230
committerDwayne Boone <dwayne@zeroc.com>2015-07-31 11:57:38 -0230
commit20eb6c6acc2d234750aa697f266f064f484308f5 (patch)
tree050d47a3a5385dcc1e098c450349b27d192dd3ef /csharp/src
parentFixed ICE-6625: warning when shutting IceDiscovery hello server (diff)
downloadice-20eb6c6acc2d234750aa697f266f064f484308f5.tar.bz2
ice-20eb6c6acc2d234750aa697f266f064f484308f5.tar.xz
ice-20eb6c6acc2d234750aa697f266f064f484308f5.zip
Updated version to 3.6.1
Diffstat (limited to 'csharp/src')
-rw-r--r--csharp/src/Glacier2/AssemblyInfo.cs2
-rw-r--r--csharp/src/Ice/AssemblyInfo.cs2
-rw-r--r--csharp/src/Ice/Util.cs4
-rw-r--r--csharp/src/IceBox/AssemblyInfo.cs2
-rw-r--r--csharp/src/IceBox/AssemblyInfoExe.cs2
-rw-r--r--csharp/src/IceBox/Makefile.mak6
-rw-r--r--csharp/src/IceDiscovery/AssemblyInfo.cs2
-rw-r--r--csharp/src/IceGrid/AssemblyInfo.cs2
-rw-r--r--csharp/src/IceLocatorDiscovery/AssemblyInfo.cs2
-rw-r--r--csharp/src/IcePatch2/AssemblyInfo.cs2
-rw-r--r--csharp/src/IceSSL/AssemblyInfo.cs2
-rw-r--r--csharp/src/IceStorm/AssemblyInfo.cs2
12 files changed, 15 insertions, 15 deletions
diff --git a/csharp/src/Glacier2/AssemblyInfo.cs b/csharp/src/Glacier2/AssemblyInfo.cs
index 661acc6d7e8..ddf90071823 100644
--- a/csharp/src/Glacier2/AssemblyInfo.cs
+++ b/csharp/src/Glacier2/AssemblyInfo.cs
@@ -22,7 +22,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCopyright("Copyright (c) 2003-2015 ZeroC, Inc.")]
[assembly: AssemblyTrademark("Ice")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.6.0")]
+[assembly: AssemblyVersion("3.6.1")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/src/Ice/AssemblyInfo.cs b/csharp/src/Ice/AssemblyInfo.cs
index d3280805a75..bce6638b7ec 100644
--- a/csharp/src/Ice/AssemblyInfo.cs
+++ b/csharp/src/Ice/AssemblyInfo.cs
@@ -22,7 +22,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCopyright("Copyright (c) 2003-2015 ZeroC, Inc.")]
[assembly: AssemblyTrademark("Ice")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.6.0")]
+[assembly: AssemblyVersion("3.6.1")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/src/Ice/Util.cs b/csharp/src/Ice/Util.cs
index 3f97251a2ee..021e080bb35 100644
--- a/csharp/src/Ice/Util.cs
+++ b/csharp/src/Ice/Util.cs
@@ -555,7 +555,7 @@ namespace Ice
/// <returns>The Ice version.</returns>
public static string stringVersion()
{
- return "3.6.0"; // "A.B.C", with A=major, B=minor, C=patch
+ return "3.6.1"; // "A.B.C", with A=major, B=minor, C=patch
}
/// <summary>
@@ -566,7 +566,7 @@ namespace Ice
/// <returns>The Ice version.</returns>
public static int intVersion()
{
- return 30600; // AABBCC, with AA=major, BB=minor, CC=patch
+ return 30601; // AABBCC, with AA=major, BB=minor, CC=patch
}
/// <summary>
diff --git a/csharp/src/IceBox/AssemblyInfo.cs b/csharp/src/IceBox/AssemblyInfo.cs
index 8c3d6231872..1546d5beda8 100644
--- a/csharp/src/IceBox/AssemblyInfo.cs
+++ b/csharp/src/IceBox/AssemblyInfo.cs
@@ -22,7 +22,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCopyright("Copyright (c) 2003-2015 ZeroC, Inc.")]
[assembly: AssemblyTrademark("Ice")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.6.0")]
+[assembly: AssemblyVersion("3.6.1")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/src/IceBox/AssemblyInfoExe.cs b/csharp/src/IceBox/AssemblyInfoExe.cs
index 2cf942e95f3..f96ab1e1766 100644
--- a/csharp/src/IceBox/AssemblyInfoExe.cs
+++ b/csharp/src/IceBox/AssemblyInfoExe.cs
@@ -22,7 +22,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCopyright("Copyright (c) 2003-2015 ZeroC, Inc.")]
[assembly: AssemblyTrademark("Ice")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.6.0")]
+[assembly: AssemblyVersion("3.6.1")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/src/IceBox/Makefile.mak b/csharp/src/IceBox/Makefile.mak
index b970f4721bf..255d8b126a1 100644
--- a/csharp/src/IceBox/Makefile.mak
+++ b/csharp/src/IceBox/Makefile.mak
@@ -74,11 +74,11 @@ iceboxnetconfig:
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Ice" culture="neutral" publicKeyToken="$(publicKeyToken)"/>
- <codeBase version="3.6.0.0" href="..\Assemblies\Ice.dll"/>
+ <codeBase version="3.6.1.0" href="..\Assemblies\Ice.dll"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IceBox" culture="neutral" publicKeyToken="$(publicKeyToken)"/>
- <codeBase version="3.6.0.0" href="..\Assemblies\IceBox.dll"/>
+ <codeBase version="3.6.1.0" href="..\Assemblies\IceBox.dll"/>
</dependentAssembly>
<!--
This allows iceboxnet to load the IceSSL plug-in using a strong name. We omit the
@@ -87,7 +87,7 @@ iceboxnetconfig:
-->
<dependentAssembly>
<assemblyIdentity name="IceSSL"/>
- <codeBase version="3.6.0.0" href="..\Assemblies\IceSSL.dll"/>
+ <codeBase version="3.6.1.0" href="..\Assemblies\IceSSL.dll"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
diff --git a/csharp/src/IceDiscovery/AssemblyInfo.cs b/csharp/src/IceDiscovery/AssemblyInfo.cs
index 9fc80df085a..8832c17074f 100644
--- a/csharp/src/IceDiscovery/AssemblyInfo.cs
+++ b/csharp/src/IceDiscovery/AssemblyInfo.cs
@@ -22,7 +22,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCopyright("Copyright (c) 2003-2015 ZeroC, Inc.")]
[assembly: AssemblyTrademark("Ice")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.6.0")]
+[assembly: AssemblyVersion("3.6.1")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/src/IceGrid/AssemblyInfo.cs b/csharp/src/IceGrid/AssemblyInfo.cs
index 55fe78eb54d..25cc8379786 100644
--- a/csharp/src/IceGrid/AssemblyInfo.cs
+++ b/csharp/src/IceGrid/AssemblyInfo.cs
@@ -22,7 +22,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCopyright("Copyright (c) 2003-2015 ZeroC, Inc.")]
[assembly: AssemblyTrademark("Ice")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.6.0")]
+[assembly: AssemblyVersion("3.6.1")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs b/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs
index 0e758129db3..c70a9a1d6bf 100644
--- a/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs
+++ b/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs
@@ -22,7 +22,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCopyright("Copyright (c) 2003-2015 ZeroC, Inc.")]
[assembly: AssemblyTrademark("Ice")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.6.0")]
+[assembly: AssemblyVersion("3.6.1")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/src/IcePatch2/AssemblyInfo.cs b/csharp/src/IcePatch2/AssemblyInfo.cs
index 8556d48518e..c71b8e07488 100644
--- a/csharp/src/IcePatch2/AssemblyInfo.cs
+++ b/csharp/src/IcePatch2/AssemblyInfo.cs
@@ -22,7 +22,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCopyright("Copyright (c) 2003-2015 ZeroC, Inc.")]
[assembly: AssemblyTrademark("Ice")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.6.0")]
+[assembly: AssemblyVersion("3.6.1")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/src/IceSSL/AssemblyInfo.cs b/csharp/src/IceSSL/AssemblyInfo.cs
index f75487dc2b1..6e00e1eecd6 100644
--- a/csharp/src/IceSSL/AssemblyInfo.cs
+++ b/csharp/src/IceSSL/AssemblyInfo.cs
@@ -22,7 +22,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCopyright("Copyright (c) 2003-2015 ZeroC, Inc.")]
[assembly: AssemblyTrademark("Ice")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.6.0")]
+[assembly: AssemblyVersion("3.6.1")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/src/IceStorm/AssemblyInfo.cs b/csharp/src/IceStorm/AssemblyInfo.cs
index 3ee62207196..594f922e97d 100644
--- a/csharp/src/IceStorm/AssemblyInfo.cs
+++ b/csharp/src/IceStorm/AssemblyInfo.cs
@@ -22,7 +22,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCopyright("Copyright (c) 2003-2015 ZeroC, Inc.")]
[assembly: AssemblyTrademark("Ice")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.6.0")]
+[assembly: AssemblyVersion("3.6.1")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 16:48:09 +0000