summaryrefslogtreecommitdiff
path: root/csharp/src
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2016-04-08 09:46:21 -0400
committerJoe George <joe@zeroc.com>2016-04-08 09:46:21 -0400
commit2a89e7cdccecda313bfe2f5a4595a066cb15d208 (patch)
treee1d54638b77633e8306e635fe8ce1a8cf3394920 /csharp/src
parentReworked log file archiving entry (diff)
downloadice-2a89e7cdccecda313bfe2f5a4595a066cb15d208.tar.bz2
ice-2a89e7cdccecda313bfe2f5a4595a066cb15d208.tar.xz
ice-2a89e7cdccecda313bfe2f5a4595a066cb15d208.zip
Update Ice version to 3.6.3
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 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)]