summaryrefslogtreecommitdiff
path: root/csharp/src/Ice
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-05-03 18:28:04 +0200
committerBenoit Foucher <benoit@zeroc.com>2017-05-03 18:28:04 +0200
commit9cd4736682f76b22eb3e7e947a73171df2c86c32 (patch)
treee013fab8900b9ba58a8b85de106c97d5c5330ee2 /csharp/src/Ice
parentMerge remote-tracking branch 'origin/3.7' (diff)
downloadice-9cd4736682f76b22eb3e7e947a73171df2c86c32.tar.bz2
ice-9cd4736682f76b22eb3e7e947a73171df2c86c32.tar.xz
ice-9cd4736682f76b22eb3e7e947a73171df2c86c32.zip
Updated version to 3.7.0
Diffstat (limited to 'csharp/src/Ice')
-rw-r--r--csharp/src/Ice/AssemblyInfo.cs2
-rw-r--r--csharp/src/Ice/Util.cs4
2 files changed, 3 insertions, 3 deletions
diff --git a/csharp/src/Ice/AssemblyInfo.cs b/csharp/src/Ice/AssemblyInfo.cs
index adb14233030..c975b555d6e 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.7.60")]
+[assembly: AssemblyVersion("3.7.0")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/src/Ice/Util.cs b/csharp/src/Ice/Util.cs
index 71477616998..9a34f9eea1f 100644
--- a/csharp/src/Ice/Util.cs
+++ b/csharp/src/Ice/Util.cs
@@ -515,7 +515,7 @@ namespace Ice
/// <returns>The Ice version.</returns>
public static string stringVersion()
{
- return "3.7b0"; // "A.B.C", with A=major, B=minor, C=patch
+ return "3.7.0"; // "A.B.C", with A=major, B=minor, C=patch
}
/// <summary>
@@ -526,7 +526,7 @@ namespace Ice
/// <returns>The Ice version.</returns>
public static int intVersion()
{
- return 30760; // AABBCC, with AA=major, BB=minor, CC=patch
+ return 30700; // AABBCC, with AA=major, BB=minor, CC=patch
}
/// <summary>