diff --git a/Documentation/Todo.txt b/Documentation/Todo.txt index c19e6c9b..81a3566f 100644 --- a/Documentation/Todo.txt +++ b/Documentation/Todo.txt @@ -1,19 +1,16 @@ [Immediate] -- Remove Build.exe and OpenTK.Build projects. - Make a release from trunk. [Short term] -- Update contributors list. - Automate uploads of nightly builds. -- Add generator project to OpenTK.sln. -- Update AssemblyInfo through the msbuild script. - Modify buildbot to generate zip package from the nsis installer. -- Modify nsis script to make source code and openal installer optional features. -- Modify nsis script to download openal installer from the web. - Implement GL3.3 and 4.1. -- Clean site and example documentation. +- Clean up site and example documentation. +- Update contributors list. [Mid term] +- Clean up warnings. +- Remove System.Windows.Forms reference from OpenTK.dll. - Add mouse cursor visibility to NativeWindow. - Add mouse cursor capture to NativeWindow. - Add joystick support to Mac OS X. diff --git a/Source/Bind/Generator.Bind.csproj b/Source/Bind/Generator.Bind.csproj index fe1c17be..d41f86a6 100644 --- a/Source/Bind/Generator.Bind.csproj +++ b/Source/Bind/Generator.Bind.csproj @@ -136,6 +136,9 @@ + + Properties\GlobalAssemblyInfo.cs + Code diff --git a/Source/Bind/Properties/AssemblyInfo.cs b/Source/Bind/Properties/AssemblyInfo.cs index 95445226..e1aeedee 100644 --- a/Source/Bind/Properties/AssemblyInfo.cs +++ b/Source/Bind/Properties/AssemblyInfo.cs @@ -5,29 +5,8 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("The Open Toolkit Library Binding Generator")] +[assembly: AssemblyTitle("Generator.Bind")] [assembly: AssemblyDescription("Generates C# bindings for the the Open Toolkit Library")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("The Open Toolkit Library")] -[assembly: AssemblyProduct("The Open Toolkit Library")] -[assembly: AssemblyCopyright("Copyright © 2006-2009 the Open Toolkit Library")] -[assembly: AssemblyTrademark("OpenTK")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("0d681958-ca78-4a67-b71c-ff8755488e23")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -[assembly: AssemblyVersion("0.9.9.14")] -[assembly: AssemblyFileVersion("0.9.9.14")] diff --git a/Source/Compatibility/OpenTK.Compatibility.csproj b/Source/Compatibility/OpenTK.Compatibility.csproj index 07299d69..6a47f980 100644 --- a/Source/Compatibility/OpenTK.Compatibility.csproj +++ b/Source/Compatibility/OpenTK.Compatibility.csproj @@ -137,6 +137,9 @@ + + Properties\GlobalAssemblyInfo.cs + Code diff --git a/Source/Compatibility/Properties/AssemblyInfo.cs b/Source/Compatibility/Properties/AssemblyInfo.cs index f6dcacfe..3bdf013a 100644 --- a/Source/Compatibility/Properties/AssemblyInfo.cs +++ b/Source/Compatibility/Properties/AssemblyInfo.cs @@ -8,37 +8,12 @@ using System.Runtime.InteropServices; // associated with an assembly. [assembly: AssemblyTitle("OpenTK.Compatibility")] [assembly: AssemblyDescription("Provides compatibility with previous versions of OpenTK and the Tao framework.")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("The Open Toolkit Library")] -[assembly: AssemblyProduct("The Open Toolkit Library")] -[assembly: AssemblyCopyright("Copyright © 2006-2010 the Open Toolkit Library")] -[assembly: AssemblyTrademark("OpenTK")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("7c495044-4b1a-4bff-aee9-ff9dbf85433f")] -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -[assembly: AssemblyVersion("1.0.0.201")] -[assembly: AssemblyFileVersion("1.0.0.201")] - [assembly: System.CLSCompliant(true)] [assembly: System.Security.AllowPartiallyTrustedCallers] #if NET40 [assembly: System.Security.SecurityRules(System.Security.SecurityRuleSet.Level1)] #endif - -#if SIGN_ASSEMBLY -[assembly: AssemblyKeyFile(@"../../../OpenTK.snk")] -#endif \ No newline at end of file diff --git a/Source/Converter/Generator.Convert.csproj b/Source/Converter/Generator.Convert.csproj index c627802f..dc64a57c 100644 --- a/Source/Converter/Generator.Convert.csproj +++ b/Source/Converter/Generator.Convert.csproj @@ -138,6 +138,9 @@ + + Properties\GlobalAssemblyInfo.cs + Code diff --git a/Source/Converter/Properties/AssemblyInfo.cs b/Source/Converter/Properties/AssemblyInfo.cs index f78065d5..5261c0ea 100644 --- a/Source/Converter/Properties/AssemblyInfo.cs +++ b/Source/Converter/Properties/AssemblyInfo.cs @@ -5,29 +5,8 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("The Open Toolkit Library Header Converter")] +[assembly: AssemblyTitle("Generator.Convert")] [assembly: AssemblyDescription("Converts C headers into XML suitable for the binding generator")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("The Open Toolkit Library")] -[assembly: AssemblyProduct("The Open Toolkit Library")] -[assembly: AssemblyCopyright("Copyright © 2009 the Open Toolkit Library")] -[assembly: AssemblyTrademark("OpenTK")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("01d453bf-8648-4441-953e-7094a0ec1364")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -[assembly: AssemblyVersion("0.9.9.4")] -[assembly: AssemblyFileVersion("0.9.9.4")] diff --git a/Source/Examples/OpenTK.Examples.csproj b/Source/Examples/OpenTK.Examples.csproj index 3385b9fb..8f0cdccd 100644 --- a/Source/Examples/OpenTK.Examples.csproj +++ b/Source/Examples/OpenTK.Examples.csproj @@ -137,6 +137,9 @@ + + Properties\GlobalAssemblyInfo.cs + Code diff --git a/Source/Examples/Properties/AssemblyInfo.cs b/Source/Examples/Properties/AssemblyInfo.cs index 5d05e0d3..f39180d4 100644 --- a/Source/Examples/Properties/AssemblyInfo.cs +++ b/Source/Examples/Properties/AssemblyInfo.cs @@ -7,31 +7,6 @@ using System.Runtime.InteropServices; // associated with an assembly. [assembly: AssemblyTitle("OpenTK.Examples")] [assembly: AssemblyDescription("Examples showcasing OpenTK and OpenGL")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("The Open Toolkit Library")] -[assembly: AssemblyProduct("The Open Toolkit Library")] -[assembly: AssemblyCopyright("Copyright © 2006-2010 the Open Toolkit Library")] -[assembly: AssemblyTrademark("OpenTK")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("f236c767-678f-4c20-9282-d051a3c39657")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -[assembly: AssemblyVersion("1.0.0.201")] -[assembly: AssemblyFileVersion("1.0.0.201")] - -#if SIGN_ASSEMBLY -[assembly: AssemblyKeyFile(@"../../../OpenTK.snk")] -#endif \ No newline at end of file diff --git a/Source/GLControl/OpenTK.GLControl.csproj b/Source/GLControl/OpenTK.GLControl.csproj index fe69539d..f2e53c94 100644 --- a/Source/GLControl/OpenTK.GLControl.csproj +++ b/Source/GLControl/OpenTK.GLControl.csproj @@ -129,6 +129,9 @@ + + Properties\GlobalAssemblyInfo.cs + Code diff --git a/Source/GLControl/Properties/AssemblyInfo.cs b/Source/GLControl/Properties/AssemblyInfo.cs index 064ffd84..258fb0d9 100644 --- a/Source/GLControl/Properties/AssemblyInfo.cs +++ b/Source/GLControl/Properties/AssemblyInfo.cs @@ -7,40 +7,12 @@ using System.Runtime.InteropServices; // associated with an assembly. [assembly: AssemblyTitle("OpenTK.GLControl")] [assembly: AssemblyDescription("Provides integration with System.Windows.Forms.")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("The Open Toolkit Library")] -[assembly: AssemblyProduct("The Open Toolkit Library")] -[assembly: AssemblyCopyright("Copyright © 2006-2010 the Open Toolkit Library")] -[assembly: AssemblyTrademark("OpenTK")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("5414b90b-d7be-4382-b0e1-f07ce154f7f7")] -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.201")] -[assembly: AssemblyFileVersion("1.0.0.201")] - [assembly: System.CLSCompliant(true)] [assembly: System.Security.AllowPartiallyTrustedCallers] #if NET40 [assembly: System.Security.SecurityRules(System.Security.SecurityRuleSet.Level1)] #endif - -#if SIGN_ASSEMBLY -[assembly: AssemblyKeyFile(@"../../../OpenTK.snk")] -#endif \ No newline at end of file diff --git a/Source/GlobalAssemblyInfo.cs b/Source/GlobalAssemblyInfo.cs new file mode 100644 index 00000000..ea7c3693 --- /dev/null +++ b/Source/GlobalAssemblyInfo.cs @@ -0,0 +1,15 @@ +// This file is auto-generated through Source.Build.Tasks/AssemblyInfo.cs. +// Do not edit by hand! + +using System; +using System.Reflection; +using System.Resources; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +[assembly: AssemblyCompany("The Open Toolkit Library")] +[assembly: AssemblyProduct("The Open Toolkit Library")] +[assembly: AssemblyCopyright("Copyright © 2006 - 2010 the Open Toolkit Library")] +[assembly: AssemblyTrademark("OpenTK")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.276.58940")] diff --git a/Source/OpenTK/OpenTK.csproj b/Source/OpenTK/OpenTK.csproj index e86f2a64..dc177639 100644 --- a/Source/OpenTK/OpenTK.csproj +++ b/Source/OpenTK/OpenTK.csproj @@ -122,6 +122,9 @@ + + Properties\GlobalAssemblyInfo.cs + Code diff --git a/Source/OpenTK/Properties/AssemblyInfo.cs b/Source/OpenTK/Properties/AssemblyInfo.cs index 6ffc69ef..299fff60 100644 --- a/Source/OpenTK/Properties/AssemblyInfo.cs +++ b/Source/OpenTK/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; @@ -8,39 +8,12 @@ using System.Runtime.InteropServices; // associated with an assembly. [assembly: AssemblyTitle("OpenTK")] [assembly: AssemblyDescription("Open source game development toolkit for .Net/Mono.")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("The Open Toolkit Library")] -[assembly: AssemblyProduct("The Open Toolkit Library")] -[assembly: AssemblyCopyright("Copyright © 2006-2010 the Open Toolkit Library")] -[assembly: AssemblyTrademark("OpenTK")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("7652241e-158d-4eb1-85f4-ed40ee356791")] -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Revision and Build Numbers -// by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.0.201")] -[assembly: AssemblyFileVersion("1.0.0.201")] - [assembly: CLSCompliant(true)] [assembly: System.Security.AllowPartiallyTrustedCallers] #if NET40 [assembly: System.Security.SecurityRules(System.Security.SecurityRuleSet.Level1)] #endif - -#if SIGN_ASSEMBLY -[assembly: AssemblyKeyFile(@"../../../OpenTK.snk")] -#endif \ No newline at end of file