summaryrefslogtreecommitdiff
path: root/csharp/src
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2016-04-07 19:09:14 +0200
committerBenoit Foucher <benoit@zeroc.com>2016-04-07 19:09:14 +0200
commit9cbdda5978ce61ce33b3f33e03862b18f40f323d (patch)
tree2d985d6c71edd2b476b53b1bb0a26d5054f8effc /csharp/src
parentFixes to support new versionning scheme for alpha/beta releases (diff)
downloadice-9cbdda5978ce61ce33b3f33e03862b18f40f323d.tar.bz2
ice-9cbdda5978ce61ce33b3f33e03862b18f40f323d.tar.xz
ice-9cbdda5978ce61ce33b3f33e03862b18f40f323d.zip
Updated Ice version to 3.7a0
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 752fb0b9ed1..e5f738f9c7c 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.7.0")]
+[assembly: AssemblyVersion("3.7.51")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/src/Ice/AssemblyInfo.cs b/csharp/src/Ice/AssemblyInfo.cs
index 3b2337c639b..fd3da61733b 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.0")]
+[assembly: AssemblyVersion("3.7.51")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/src/Ice/Util.cs b/csharp/src/Ice/Util.cs
index 0cae06cbb2d..2221b360565 100644
--- a/csharp/src/Ice/Util.cs
+++ b/csharp/src/Ice/Util.cs
@@ -487,7 +487,7 @@ namespace Ice
/// <returns>The Ice version.</returns>
public static string stringVersion()
{
- return "3.7.0"; // "A.B.C", with A=major, B=minor, C=patch
+ return "3.7a0"; // "A.B.C", with A=major, B=minor, C=patch
}
/// <summary>
@@ -498,7 +498,7 @@ namespace Ice
/// <returns>The Ice version.</returns>
public static int intVersion()
{
- return 30700; // AABBCC, with AA=major, BB=minor, CC=patch
+ return 30751; // AABBCC, with AA=major, BB=minor, CC=patch
}
/// <summary>
diff --git a/csharp/src/IceBox/AssemblyInfo.cs b/csharp/src/IceBox/AssemblyInfo.cs
index c6d473cbcfa..4172eca22c0 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.7.0")]
+[assembly: AssemblyVersion("3.7.51")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/src/IceBox/AssemblyInfoExe.cs b/csharp/src/IceBox/AssemblyInfoExe.cs
index 5b5f0dfe0e7..4bddf9f795e 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.7.0")]
+[assembly: AssemblyVersion("3.7.51")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/src/IceBox/Makefile.mak b/csharp/src/IceBox/Makefile.mak
index 59fd20b307d..dc5e336b600 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.7.0.0" href="..\Assemblies\Ice.dll"/>
+ <codeBase version="3.7.51.0" href="..\Assemblies\Ice.dll"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="IceBox" culture="neutral" publicKeyToken="$(publicKeyToken)"/>
- <codeBase version="3.7.0.0" href="..\Assemblies\IceBox.dll"/>
+ <codeBase version="3.7.51.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.7.0.0" href="..\Assemblies\IceSSL.dll"/>
+ <codeBase version="3.7.51.0" href="..\Assemblies\IceSSL.dll"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
diff --git a/csharp/src/IceDiscovery/AssemblyInfo.cs b/csharp/src/IceDiscovery/AssemblyInfo.cs
index 8fff410f384..e3589ff0992 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.7.0")]
+[assembly: AssemblyVersion("3.7.51")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/src/IceGrid/AssemblyInfo.cs b/csharp/src/IceGrid/AssemblyInfo.cs
index b5c667fde32..1586f02db25 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.7.0")]
+[assembly: AssemblyVersion("3.7.51")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs b/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs
index 36b8af0aec9..c894ed23c71 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.7.0")]
+[assembly: AssemblyVersion("3.7.51")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/src/IcePatch2/AssemblyInfo.cs b/csharp/src/IcePatch2/AssemblyInfo.cs
index 61e0857226c..ea082abeb37 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.7.0")]
+[assembly: AssemblyVersion("3.7.51")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/src/IceSSL/AssemblyInfo.cs b/csharp/src/IceSSL/AssemblyInfo.cs
index 0e84381afc2..03fce5bf546 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.7.0")]
+[assembly: AssemblyVersion("3.7.51")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
diff --git a/csharp/src/IceStorm/AssemblyInfo.cs b/csharp/src/IceStorm/AssemblyInfo.cs
index c757020ddd2..dfc6ca3f663 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.7.0")]
+[assembly: AssemblyVersion("3.7.51")]
[assembly: AssemblyDelaySign(false)]
[assembly: ComVisible(false)]
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-04 20:56:48 +0000