summaryrefslogtreecommitdiff
path: root/csharp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2016-03-10 15:39:08 +0100
committerJose <jose@zeroc.com>2016-03-10 15:39:08 +0100
commitc11abffddf7c1c440118a6c67e8ceea5062f0993 (patch)
treed5c6c9f76372f85e3e8d7f60a17ab72d2a2731ad /csharp
parentFixed ICE-7010 - Fixed bug with dynamicaly registered replica groups (diff)
downloadice-c11abffddf7c1c440118a6c67e8ceea5062f0993.tar.bz2
ice-c11abffddf7c1c440118a6c67e8ceea5062f0993.tar.xz
ice-c11abffddf7c1c440118a6c67e8ceea5062f0993.zip
Update version to 3.6.2
Diffstat (limited to 'csharp')
-rw-r--r--csharp/lib/pkgconfig/Glacier2.pc2
-rw-r--r--csharp/lib/pkgconfig/Ice.pc2
-rw-r--r--csharp/lib/pkgconfig/IceBox.pc2
-rw-r--r--csharp/lib/pkgconfig/IceGrid.pc2
-rw-r--r--csharp/lib/pkgconfig/IcePatch2.pc2
-rw-r--r--csharp/lib/pkgconfig/IceStorm.pc2
-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
-rw-r--r--csharp/test/TestCommon/Properties/AssemblyInfo.cs4
19 files changed, 23 insertions, 23 deletions
diff --git a/csharp/lib/pkgconfig/Glacier2.pc b/csharp/lib/pkgconfig/Glacier2.pc
index 1f00e0b6e0e..2a0ce2a70cc 100644
--- a/csharp/lib/pkgconfig/Glacier2.pc
+++ b/csharp/lib/pkgconfig/Glacier2.pc
@@ -1,4 +1,4 @@
-version = 3.6.1
+version = 3.6.2
mono_root = /usr
name = Glacier2
diff --git a/csharp/lib/pkgconfig/Ice.pc b/csharp/lib/pkgconfig/Ice.pc
index 37433063b89..1eae5cc089c 100644
--- a/csharp/lib/pkgconfig/Ice.pc
+++ b/csharp/lib/pkgconfig/Ice.pc
@@ -1,4 +1,4 @@
-version = 3.6.1
+version = 3.6.2
mono_root = /usr
name = Ice
diff --git a/csharp/lib/pkgconfig/IceBox.pc b/csharp/lib/pkgconfig/IceBox.pc
index 70a0e365bc4..37da7ca719b 100644
--- a/csharp/lib/pkgconfig/IceBox.pc
+++ b/csharp/lib/pkgconfig/IceBox.pc
@@ -1,4 +1,4 @@
-version = 3.6.1
+version = 3.6.2
mono_root = /usr
name = IceBox
diff --git a/csharp/lib/pkgconfig/IceGrid.pc b/csharp/lib/pkgconfig/IceGrid.pc
index 8146b13a100..7a7abefa04e 100644
--- a/csharp/lib/pkgconfig/IceGrid.pc
+++ b/csharp/lib/pkgconfig/IceGrid.pc
@@ -1,4 +1,4 @@
-version = 3.6.1
+version = 3.6.2
mono_root = /usr
name = IceGrid
diff --git a/csharp/lib/pkgconfig/IcePatch2.pc b/csharp/lib/pkgconfig/IcePatch2.pc
index e64bb4b03df..d386356cb14 100644
--- a/csharp/lib/pkgconfig/IcePatch2.pc
+++ b/csharp/lib/pkgconfig/IcePatch2.pc
@@ -1,4 +1,4 @@
-version = 3.6.1
+version = 3.6.2
mono_root = /usr
name = IcePatch2
diff --git a/csharp/lib/pkgconfig/IceStorm.pc b/csharp/lib/pkgconfig/IceStorm.pc
index 6b53cce5cb8..9fad9bf6800 100644
--- a/csharp/lib/pkgconfig/IceStorm.pc
+++ b/csharp/lib/pkgconfig/IceStorm.pc
@@ -1,4 +1,4 @@
-version = 3.6.1
+version = 3.6.2
mono_root = /usr
name = IceStorm
diff --git a/csharp/src/Glacier2/AssemblyInfo.cs b/csharp/src/Glacier2/AssemblyInfo.cs
index 4d410c8496d..4efee6e48af 100644
--- a/csharp/src/Glacier2/AssemblyInfo.cs
+++ b/csharp/src/Glacier2/AssemblyInfo.cs
@@ -21,7 +21,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyProduct("Ice")]
[assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.6.1")]
+[assembly: AssemblyVersion("3.6.2")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/src/Ice/AssemblyInfo.cs b/csharp/src/Ice/AssemblyInfo.cs
index 1dc07184971..afe1d8ca2fd 100644
--- a/csharp/src/Ice/AssemblyInfo.cs
+++ b/csharp/src/Ice/AssemblyInfo.cs
@@ -21,7 +21,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyProduct("Ice")]
[assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.6.1")]
+[assembly: AssemblyVersion("3.6.2")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/src/Ice/Util.cs b/csharp/src/Ice/Util.cs
index f1f6d2170ca..b5ba9879420 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.1"; // "A.B.C", with A=major, B=minor, C=patch
+ return "3.6.2"; // "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 30601; // AABBCC, with AA=major, BB=minor, CC=patch
+ return 30602; // AABBCC, with AA=major, BB=minor, CC=patch
}
/// <summary>
diff --git a/csharp/src/IceBox/AssemblyInfo.cs b/csharp/src/IceBox/AssemblyInfo.cs
index 387cd583441..5663af338f4 100644
--- a/csharp/src/IceBox/AssemblyInfo.cs
+++ b/csharp/src/IceBox/AssemblyInfo.cs
@@ -21,7 +21,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyProduct("Ice")]
[assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.6.1")]
+[assembly: AssemblyVersion("3.6.2")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/src/IceBox/AssemblyInfoExe.cs b/csharp/src/IceBox/AssemblyInfoExe.cs
index c35c1949f93..06d217d9389 100644
--- a/csharp/src/IceBox/AssemblyInfoExe.cs
+++ b/csharp/src/IceBox/AssemblyInfoExe.cs
@@ -21,7 +21,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyProduct("Ice")]
[assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.6.1")]
+[assembly: AssemblyVersion("3.6.2")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/src/IceBox/Makefile.mak b/csharp/src/IceBox/Makefile.mak
index 744421f30e9..acefe63a2d5 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.1.0" href="..\Assemblies\Ice.dll"/>
+ <codeBase version="3.6.2.0" href="..\Assemblies\Ice.dll"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IceBox" culture="neutral" publicKeyToken="$(publicKeyToken)"/>
- <codeBase version="3.6.1.0" href="..\Assemblies\IceBox.dll"/>
+ <codeBase version="3.6.2.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.1.0" href="..\Assemblies\IceSSL.dll"/>
+ <codeBase version="3.6.2.0" href="..\Assemblies\IceSSL.dll"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
diff --git a/csharp/src/IceDiscovery/AssemblyInfo.cs b/csharp/src/IceDiscovery/AssemblyInfo.cs
index 2e9263a7be0..8335539b4cc 100644
--- a/csharp/src/IceDiscovery/AssemblyInfo.cs
+++ b/csharp/src/IceDiscovery/AssemblyInfo.cs
@@ -21,7 +21,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyProduct("Ice")]
[assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.6.1")]
+[assembly: AssemblyVersion("3.6.2")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/src/IceGrid/AssemblyInfo.cs b/csharp/src/IceGrid/AssemblyInfo.cs
index cf6b3ce57b9..8374dcba033 100644
--- a/csharp/src/IceGrid/AssemblyInfo.cs
+++ b/csharp/src/IceGrid/AssemblyInfo.cs
@@ -21,7 +21,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyProduct("Ice")]
[assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.6.1")]
+[assembly: AssemblyVersion("3.6.2")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs b/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs
index de516247373..5850f929d22 100644
--- a/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs
+++ b/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs
@@ -21,7 +21,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyProduct("Ice")]
[assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.6.1")]
+[assembly: AssemblyVersion("3.6.2")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/src/IcePatch2/AssemblyInfo.cs b/csharp/src/IcePatch2/AssemblyInfo.cs
index 7f3f2b88fe2..bf9e76dac3a 100644
--- a/csharp/src/IcePatch2/AssemblyInfo.cs
+++ b/csharp/src/IcePatch2/AssemblyInfo.cs
@@ -21,7 +21,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyProduct("Ice")]
[assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.6.1")]
+[assembly: AssemblyVersion("3.6.2")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/src/IceSSL/AssemblyInfo.cs b/csharp/src/IceSSL/AssemblyInfo.cs
index eac1d413e00..589ec21f02e 100644
--- a/csharp/src/IceSSL/AssemblyInfo.cs
+++ b/csharp/src/IceSSL/AssemblyInfo.cs
@@ -21,7 +21,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyProduct("Ice")]
[assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.6.1")]
+[assembly: AssemblyVersion("3.6.2")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/src/IceStorm/AssemblyInfo.cs b/csharp/src/IceStorm/AssemblyInfo.cs
index 4dbae0e0730..5de3716f215 100644
--- a/csharp/src/IceStorm/AssemblyInfo.cs
+++ b/csharp/src/IceStorm/AssemblyInfo.cs
@@ -21,7 +21,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyProduct("Ice")]
[assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.6.1")]
+[assembly: AssemblyVersion("3.6.2")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/test/TestCommon/Properties/AssemblyInfo.cs b/csharp/test/TestCommon/Properties/AssemblyInfo.cs
index a8fcc8b051b..2ffa982f400 100644
--- a/csharp/test/TestCommon/Properties/AssemblyInfo.cs
+++ b/csharp/test/TestCommon/Properties/AssemblyInfo.cs
@@ -39,7 +39,7 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("3.6.1")]
-[assembly: AssemblyFileVersion("3.6.1")]
+[assembly: AssemblyVersion("3.6.2")]
+[assembly: AssemblyFileVersion("3.6.2")]
[assembly: System.CLSCompliant(true)]
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 22:56:10 +0000