summaryrefslogtreecommitdiff
path: root/csharp
diff options
context:
space:
mode:
Diffstat (limited to 'csharp')
-rw-r--r--csharp/BuildInstructions.md4
-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
20 files changed, 25 insertions, 25 deletions
diff --git a/csharp/BuildInstructions.md b/csharp/BuildInstructions.md
index ea016942c82..d6589bfcc01 100644
--- a/csharp/BuildInstructions.md
+++ b/csharp/BuildInstructions.md
@@ -25,7 +25,7 @@ The build system requires the Slice translator from Ice for C++. If you have not
built Ice for C++ in this source distribution, you must set the `ICE_HOME`
environment variable with the path name of your Ice installation:
- > set ICE_HOME=C:\Program Files (x86)\ZeroC\Ice-3.6.2
+ > set ICE_HOME=C:\Program Files (x86)\ZeroC\Ice-3.6.3
### Building Ice for .NET
@@ -49,7 +49,7 @@ C++ distribution. If you have not built Ice for C++ in this source distribution
then you must set the `ICE_HOME` environment variable with the path name of your
Ice installation:
- > set ICE_HOME=C:\Program Files (x86)\ZeroC\Ice-3.6.2
+ > set ICE_HOME=C:\Program Files (x86)\ZeroC\Ice-3.6.3
Python is required to run the test suite. Additionally, the Glacier2 tests
require the Python module `passlib`, which you can install with the command:
diff --git a/csharp/lib/pkgconfig/Glacier2.pc b/csharp/lib/pkgconfig/Glacier2.pc
index 2a0ce2a70cc..893f550a02f 100644
--- a/csharp/lib/pkgconfig/Glacier2.pc
+++ b/csharp/lib/pkgconfig/Glacier2.pc
@@ -1,4 +1,4 @@
-version = 3.6.2
+version = 3.6.3
mono_root = /usr
name = Glacier2
diff --git a/csharp/lib/pkgconfig/Ice.pc b/csharp/lib/pkgconfig/Ice.pc
index 1eae5cc089c..02f05125db0 100644
--- a/csharp/lib/pkgconfig/Ice.pc
+++ b/csharp/lib/pkgconfig/Ice.pc
@@ -1,4 +1,4 @@
-version = 3.6.2
+version = 3.6.3
mono_root = /usr
name = Ice
diff --git a/csharp/lib/pkgconfig/IceBox.pc b/csharp/lib/pkgconfig/IceBox.pc
index 37da7ca719b..f36f3fed414 100644
--- a/csharp/lib/pkgconfig/IceBox.pc
+++ b/csharp/lib/pkgconfig/IceBox.pc
@@ -1,4 +1,4 @@
-version = 3.6.2
+version = 3.6.3
mono_root = /usr
name = IceBox
diff --git a/csharp/lib/pkgconfig/IceGrid.pc b/csharp/lib/pkgconfig/IceGrid.pc
index 7a7abefa04e..38a7e5c01b3 100644
--- a/csharp/lib/pkgconfig/IceGrid.pc
+++ b/csharp/lib/pkgconfig/IceGrid.pc
@@ -1,4 +1,4 @@
-version = 3.6.2
+version = 3.6.3
mono_root = /usr
name = IceGrid
diff --git a/csharp/lib/pkgconfig/IcePatch2.pc b/csharp/lib/pkgconfig/IcePatch2.pc
index d386356cb14..9277935efe3 100644
--- a/csharp/lib/pkgconfig/IcePatch2.pc
+++ b/csharp/lib/pkgconfig/IcePatch2.pc
@@ -1,4 +1,4 @@
-version = 3.6.2
+version = 3.6.3
mono_root = /usr
name = IcePatch2
diff --git a/csharp/lib/pkgconfig/IceStorm.pc b/csharp/lib/pkgconfig/IceStorm.pc
index 9fad9bf6800..01b8fe987bf 100644
--- a/csharp/lib/pkgconfig/IceStorm.pc
+++ b/csharp/lib/pkgconfig/IceStorm.pc
@@ -1,4 +1,4 @@
-version = 3.6.2
+version = 3.6.3
mono_root = /usr
name = IceStorm
diff --git a/csharp/src/Glacier2/AssemblyInfo.cs b/csharp/src/Glacier2/AssemblyInfo.cs
index 4efee6e48af..0d11aca267a 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.2")]
+[assembly: AssemblyVersion("3.6.3")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/src/Ice/AssemblyInfo.cs b/csharp/src/Ice/AssemblyInfo.cs
index afe1d8ca2fd..55a800216ea 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.2")]
+[assembly: AssemblyVersion("3.6.3")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/src/Ice/Util.cs b/csharp/src/Ice/Util.cs
index b5ba9879420..429e9358634 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.2"; // "A.B.C", with A=major, B=minor, C=patch
+ return "3.6.3"; // "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 30602; // AABBCC, with AA=major, BB=minor, CC=patch
+ return 30603; // AABBCC, with AA=major, BB=minor, CC=patch
}
/// <summary>
diff --git a/csharp/src/IceBox/AssemblyInfo.cs b/csharp/src/IceBox/AssemblyInfo.cs
index 5663af338f4..d508a945d2b 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.2")]
+[assembly: AssemblyVersion("3.6.3")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/src/IceBox/AssemblyInfoExe.cs b/csharp/src/IceBox/AssemblyInfoExe.cs
index 06d217d9389..364ac72adb3 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.2")]
+[assembly: AssemblyVersion("3.6.3")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/src/IceBox/Makefile.mak b/csharp/src/IceBox/Makefile.mak
index acefe63a2d5..90e7fd24f87 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.2.0" href="..\Assemblies\Ice.dll"/>
+ <codeBase version="3.6.3.0" href="..\Assemblies\Ice.dll"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IceBox" culture="neutral" publicKeyToken="$(publicKeyToken)"/>
- <codeBase version="3.6.2.0" href="..\Assemblies\IceBox.dll"/>
+ <codeBase version="3.6.3.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.2.0" href="..\Assemblies\IceSSL.dll"/>
+ <codeBase version="3.6.3.0" href="..\Assemblies\IceSSL.dll"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
diff --git a/csharp/src/IceDiscovery/AssemblyInfo.cs b/csharp/src/IceDiscovery/AssemblyInfo.cs
index 8335539b4cc..0a83569de64 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.2")]
+[assembly: AssemblyVersion("3.6.3")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/src/IceGrid/AssemblyInfo.cs b/csharp/src/IceGrid/AssemblyInfo.cs
index 8374dcba033..36f475928df 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.2")]
+[assembly: AssemblyVersion("3.6.3")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs b/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs
index 5850f929d22..ab3a117745a 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.2")]
+[assembly: AssemblyVersion("3.6.3")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/src/IcePatch2/AssemblyInfo.cs b/csharp/src/IcePatch2/AssemblyInfo.cs
index bf9e76dac3a..d48ee9aa0da 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.2")]
+[assembly: AssemblyVersion("3.6.3")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/src/IceSSL/AssemblyInfo.cs b/csharp/src/IceSSL/AssemblyInfo.cs
index 589ec21f02e..d97caee42ac 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.2")]
+[assembly: AssemblyVersion("3.6.3")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/src/IceStorm/AssemblyInfo.cs b/csharp/src/IceStorm/AssemblyInfo.cs
index 5de3716f215..bebfee0ae48 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.2")]
+[assembly: AssemblyVersion("3.6.3")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/test/TestCommon/Properties/AssemblyInfo.cs b/csharp/test/TestCommon/Properties/AssemblyInfo.cs
index 2ffa982f400..dd592245bcb 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.2")]
-[assembly: AssemblyFileVersion("3.6.2")]
+[assembly: AssemblyVersion("3.6.3")]
+[assembly: AssemblyFileVersion("3.6.3")]
[assembly: System.CLSCompliant(true)]