Updated AssemblyInfo and StringFileInfo on Windows

11 files changed, 42 insertions, 53 deletions

diff --git a/csharp/src/Glacier2/AssemblyInfo.cs b/csharp/src/Glacier2/AssemblyInfo.cs
index ddf90071823..72db61feb5e 100644
--- a/csharp/src/Glacier2/AssemblyInfo.cs
+++ b/csharp/src/Glacier2/AssemblyInfo.cs
@@ -14,13 +14,12 @@ using System.Runtime.InteropServices;
 
 [assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("Glacier2")]
-[assembly: AssemblyDescription("Glacier2 run-time support")]
+[assembly: AssemblyTitle("Glacier2 .NET Client Library")]
+[assembly: AssemblyDescription("Glacier2 .NET Client Library")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyProduct("Glacier2 for .NET")]
-[assembly: AssemblyCopyright("Copyright (c) 2003-2015 ZeroC, Inc.")]
-[assembly: AssemblyTrademark("Ice")]
+[assembly: AssemblyProduct("Ice")]
+[assembly: AssemblyCopyright("© 2003-2015 ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]         
 [assembly: AssemblyVersion("3.6.1")]
 [assembly: AssemblyDelaySign(false)]
diff --git a/csharp/src/Ice/AssemblyInfo.cs b/csharp/src/Ice/AssemblyInfo.cs
index bce6638b7ec..7a91e37cae7 100644
--- a/csharp/src/Ice/AssemblyInfo.cs
+++ b/csharp/src/Ice/AssemblyInfo.cs
@@ -14,13 +14,12 @@ using System.Runtime.InteropServices;
 
 [assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("Ice")]
-[assembly: AssemblyDescription("Ice core run-time support")]
+[assembly: AssemblyTitle("Ice .NET Core Library")]
+[assembly: AssemblyDescription("Ice .NET Core Library")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyProduct("Ice for .NET")]
-[assembly: AssemblyCopyright("Copyright (c) 2003-2015 ZeroC, Inc.")]
-[assembly: AssemblyTrademark("Ice")]
+[assembly: AssemblyProduct("Ice")]
+[assembly: AssemblyCopyright("© 2003-2015 ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]         
 [assembly: AssemblyVersion("3.6.1")]
 [assembly: AssemblyDelaySign(false)]
diff --git a/csharp/src/IceBox/AssemblyInfo.cs b/csharp/src/IceBox/AssemblyInfo.cs
index 1546d5beda8..256397ec48d 100644
--- a/csharp/src/IceBox/AssemblyInfo.cs
+++ b/csharp/src/IceBox/AssemblyInfo.cs
@@ -14,13 +14,12 @@ using System.Runtime.InteropServices;
 
 [assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceBox")]
-[assembly: AssemblyDescription("IceBox run-time support")]
+[assembly: AssemblyTitle("IceBox .NET Library")]
+[assembly: AssemblyDescription("IceBox .NET Library")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyProduct("IceBox for .NET")]
-[assembly: AssemblyCopyright("Copyright (c) 2003-2015 ZeroC, Inc.")]
-[assembly: AssemblyTrademark("Ice")]
+[assembly: AssemblyProduct("Ice")]
+[assembly: AssemblyCopyright("© 2003-2015 ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]         
 [assembly: AssemblyVersion("3.6.1")]
 [assembly: AssemblyDelaySign(false)]
diff --git a/csharp/src/IceBox/AssemblyInfoExe.cs b/csharp/src/IceBox/AssemblyInfoExe.cs
index f96ab1e1766..332ccd14db9 100644
--- a/csharp/src/IceBox/AssemblyInfoExe.cs
+++ b/csharp/src/IceBox/AssemblyInfoExe.cs
@@ -14,13 +14,12 @@ using System.Runtime.InteropServices;
 
 [assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceBox")]
-[assembly: AssemblyDescription("IceBox")]
+[assembly: AssemblyTitle("IceBox .NET Server")]
+[assembly: AssemblyDescription("IceBox .NET Server")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyProduct("IceBox for .NET")]
-[assembly: AssemblyCopyright("Copyright (c) 2003-2015 ZeroC, Inc.")]
-[assembly: AssemblyTrademark("Ice")]
+[assembly: AssemblyProduct("Ice")]
+[assembly: AssemblyCopyright("© 2003-2015 ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]         
 [assembly: AssemblyVersion("3.6.1")]
 [assembly: AssemblyDelaySign(false)]
diff --git a/csharp/src/IceDiscovery/AssemblyInfo.cs b/csharp/src/IceDiscovery/AssemblyInfo.cs
index 8832c17074f..49d15790da3 100644
--- a/csharp/src/IceDiscovery/AssemblyInfo.cs
+++ b/csharp/src/IceDiscovery/AssemblyInfo.cs
@@ -14,13 +14,12 @@ using System.Runtime.InteropServices;
 
 [assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceDiscovery")]
-[assembly: AssemblyDescription("IceDiscovery core run-time support")]
+[assembly: AssemblyTitle("IceDiscovery .NET Plug-in")]
+[assembly: AssemblyDescription("IceDiscovery .NET Plug-in")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyProduct("IceDiscovery for .NET")]
-[assembly: AssemblyCopyright("Copyright (c) 2003-2015 ZeroC, Inc.")]
-[assembly: AssemblyTrademark("Ice")]
+[assembly: AssemblyProduct("Ice")]
+[assembly: AssemblyCopyright("© 2003-2015 ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]         
 [assembly: AssemblyVersion("3.6.1")]
 [assembly: AssemblyDelaySign(false)]
diff --git a/csharp/src/IceGrid/AssemblyInfo.cs b/csharp/src/IceGrid/AssemblyInfo.cs
index 25cc8379786..4142091d8b5 100644
--- a/csharp/src/IceGrid/AssemblyInfo.cs
+++ b/csharp/src/IceGrid/AssemblyInfo.cs
@@ -14,13 +14,12 @@ using System.Runtime.InteropServices;
 
 [assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceGrid")]
-[assembly: AssemblyDescription("IceGrid run-time support")]
+[assembly: AssemblyTitle("IceGrid .NET Client Library")]
+[assembly: AssemblyDescription("IceGrid .NET Client Library")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyProduct("IceGrid for .NET")]
-[assembly: AssemblyCopyright("Copyright (c) 2003-2015 ZeroC, Inc.")]
-[assembly: AssemblyTrademark("Ice")]
+[assembly: AssemblyProduct("Ice")]
+[assembly: AssemblyCopyright("© 2003-2015 ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]         
 [assembly: AssemblyVersion("3.6.1")]
 [assembly: AssemblyDelaySign(false)]
diff --git a/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs b/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs
index c70a9a1d6bf..e0b6bdc281c 100644
--- a/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs
+++ b/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs
@@ -14,13 +14,12 @@ using System.Runtime.InteropServices;
 
 [assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceLocatorDiscovery")]
-[assembly: AssemblyDescription("IceLocatorDiscovery core run-time support")]
+[assembly: AssemblyTitle("IceLocatorDiscovery .NET Plug-in")]
+[assembly: AssemblyDescription("IceLocatorDiscovery .NET Plug-in")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyProduct("IceLocatorDiscovery for .NET")]
-[assembly: AssemblyCopyright("Copyright (c) 2003-2015 ZeroC, Inc.")]
-[assembly: AssemblyTrademark("Ice")]
+[assembly: AssemblyProduct("Ice")]
+[assembly: AssemblyCopyright("© 2003-2015 ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]         
 [assembly: AssemblyVersion("3.6.1")]
 [assembly: AssemblyDelaySign(false)]
diff --git a/csharp/src/IcePatch2/AssemblyInfo.cs b/csharp/src/IcePatch2/AssemblyInfo.cs
index c71b8e07488..1f3b7866b6a 100644
--- a/csharp/src/IcePatch2/AssemblyInfo.cs
+++ b/csharp/src/IcePatch2/AssemblyInfo.cs
@@ -14,13 +14,12 @@ using System.Runtime.InteropServices;
 
 [assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IcePatch2")]
-[assembly: AssemblyDescription("IcePatch2 run-time support")]
+[assembly: AssemblyTitle("IcePatch2 .NET Client Library")]
+[assembly: AssemblyDescription("IcePatch2 .NET Client Library")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyProduct("IcePatch2 for .NET")]
-[assembly: AssemblyCopyright("Copyright (c) 2003-2015 ZeroC, Inc.")]
-[assembly: AssemblyTrademark("Ice")]
+[assembly: AssemblyProduct("Ice")]
+[assembly: AssemblyCopyright("© 2003-2015 ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]         
 [assembly: AssemblyVersion("3.6.1")]
 [assembly: AssemblyDelaySign(false)]
diff --git a/csharp/src/IceSSL/AssemblyInfo.cs b/csharp/src/IceSSL/AssemblyInfo.cs
index 6e00e1eecd6..22b75e774b0 100644
--- a/csharp/src/IceSSL/AssemblyInfo.cs
+++ b/csharp/src/IceSSL/AssemblyInfo.cs
@@ -14,13 +14,12 @@ using System.Runtime.InteropServices;
 
 [assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceSSL")]
-[assembly: AssemblyDescription("IceSSL run-time support")]
+[assembly: AssemblyTitle("IceSSL .NET Plug-in")]
+[assembly: AssemblyDescription("IceSSL .NET Plug-in")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyProduct("IceSSL for .NET")]
-[assembly: AssemblyCopyright("Copyright (c) 2003-2015 ZeroC, Inc.")]
-[assembly: AssemblyTrademark("Ice")]
+[assembly: AssemblyProduct("Ice")]
+[assembly: AssemblyCopyright("© 2003-2015 ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]         
 [assembly: AssemblyVersion("3.6.1")]
 [assembly: AssemblyDelaySign(false)]
diff --git a/csharp/src/IceStorm/AssemblyInfo.cs b/csharp/src/IceStorm/AssemblyInfo.cs
index 594f922e97d..9a3be8a72f5 100644
--- a/csharp/src/IceStorm/AssemblyInfo.cs
+++ b/csharp/src/IceStorm/AssemblyInfo.cs
@@ -14,13 +14,12 @@ using System.Runtime.InteropServices;
 
 [assembly: CLSCompliant(true)]
 
-[assembly: AssemblyTitle("IceStorm")]
-[assembly: AssemblyDescription("IceStorm run-time support")]
+[assembly: AssemblyTitle("IceStorm .NET Client Library")]
+[assembly: AssemblyDescription("IceStorm .NET Client Library")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyProduct("IceStorm for .NET")]
-[assembly: AssemblyCopyright("Copyright (c) 2003-2015 ZeroC, Inc.")]
-[assembly: AssemblyTrademark("Ice")]
+[assembly: AssemblyProduct("Ice")]
+[assembly: AssemblyCopyright("© 2003-2015 ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]         
 [assembly: AssemblyVersion("3.6.1")]
 [assembly: AssemblyDelaySign(false)]
diff --git a/csharp/test/TestCommon/Properties/AssemblyInfo.cs b/csharp/test/TestCommon/Properties/AssemblyInfo.cs
index a415e57f52c..c74d5290b65 100644
--- a/csharp/test/TestCommon/Properties/AssemblyInfo.cs
+++ b/csharp/test/TestCommon/Properties/AssemblyInfo.cs
@@ -18,9 +18,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
-[assembly: AssemblyProduct("TestCommon")]
-[assembly: AssemblyCopyright("Copyright © ZeroC 2012-2013")]
-[assembly: AssemblyTrademark("")]
+[assembly: AssemblyProduct("Ice")]
+[assembly: AssemblyCopyright("© 2003-2015 ZeroC, Inc.")]
 [assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible