All projects now read common AssemblyInfo items from GlobalAssemblyInfo.cs. The various AssemblyInfo.cs files now only contain project-specific information. Assembly versions are now controlled by Build.UpdateVersion.

This commit is contained in:
the_fiddler 2010-10-04 21:37:33 +00:00
parent 7fd64519bd
commit 9d562fb683
14 changed files with 40 additions and 157 deletions

View file

@ -1,19 +1,16 @@
[Immediate] [Immediate]
- Remove Build.exe and OpenTK.Build projects.
- Make a release from trunk. - Make a release from trunk.
[Short term] [Short term]
- Update contributors list.
- Automate uploads of nightly builds. - 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 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. - Implement GL3.3 and 4.1.
- Clean site and example documentation. - Clean up site and example documentation.
- Update contributors list.
[Mid term] [Mid term]
- Clean up warnings.
- Remove System.Windows.Forms reference from OpenTK.dll.
- Add mouse cursor visibility to NativeWindow. - Add mouse cursor visibility to NativeWindow.
- Add mouse cursor capture to NativeWindow. - Add mouse cursor capture to NativeWindow.
- Add joystick support to Mac OS X. - Add joystick support to Mac OS X.

View file

@ -136,6 +136,9 @@
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="..\GlobalAssemblyInfo.cs">
<Link>Properties\GlobalAssemblyInfo.cs</Link>
</Compile>
<Compile Include="IBind.cs"> <Compile Include="IBind.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>

View file

@ -5,29 +5,8 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following // General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information // set of attributes. Change these attribute values to modify the information
// associated with an assembly. // 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: 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 // The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("0d681958-ca78-4a67-b71c-ff8755488e23")] [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")]

View file

@ -137,6 +137,9 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="..\GlobalAssemblyInfo.cs">
<Link>Properties\GlobalAssemblyInfo.cs</Link>
</Compile>
<Compile Include="IPackable.cs"> <Compile Include="IPackable.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>

View file

@ -8,37 +8,12 @@ using System.Runtime.InteropServices;
// associated with an assembly. // associated with an assembly.
[assembly: AssemblyTitle("OpenTK.Compatibility")] [assembly: AssemblyTitle("OpenTK.Compatibility")]
[assembly: AssemblyDescription("Provides compatibility with previous versions of OpenTK and the Tao framework.")] [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 // The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("7c495044-4b1a-4bff-aee9-ff9dbf85433f")] [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.CLSCompliant(true)]
[assembly: System.Security.AllowPartiallyTrustedCallers] [assembly: System.Security.AllowPartiallyTrustedCallers]
#if NET40 #if NET40
[assembly: System.Security.SecurityRules(System.Security.SecurityRuleSet.Level1)] [assembly: System.Security.SecurityRules(System.Security.SecurityRuleSet.Level1)]
#endif #endif
#if SIGN_ASSEMBLY
[assembly: AssemblyKeyFile(@"../../../OpenTK.snk")]
#endif

View file

@ -138,6 +138,9 @@
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="..\GlobalAssemblyInfo.cs">
<Link>Properties\GlobalAssemblyInfo.cs</Link>
</Compile>
<Compile Include="Main.cs"> <Compile Include="Main.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>

View file

@ -5,29 +5,8 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following // General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information // set of attributes. Change these attribute values to modify the information
// associated with an assembly. // 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: 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 // The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("01d453bf-8648-4441-953e-7094a0ec1364")] [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")]

View file

@ -137,6 +137,9 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="..\GlobalAssemblyInfo.cs">
<Link>Properties\GlobalAssemblyInfo.cs</Link>
</Compile>
<Compile Include="ExampleInfo.cs"> <Compile Include="ExampleInfo.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>

View file

@ -7,31 +7,6 @@ using System.Runtime.InteropServices;
// associated with an assembly. // associated with an assembly.
[assembly: AssemblyTitle("OpenTK.Examples")] [assembly: AssemblyTitle("OpenTK.Examples")]
[assembly: AssemblyDescription("Examples showcasing OpenTK and OpenGL")] [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 // The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("f236c767-678f-4c20-9282-d051a3c39657")] [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

View file

@ -129,6 +129,9 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="..\GlobalAssemblyInfo.cs">
<Link>Properties\GlobalAssemblyInfo.cs</Link>
</Compile>
<Compile Include="GLControlFactory.cs"> <Compile Include="GLControlFactory.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>

View file

@ -7,40 +7,12 @@ using System.Runtime.InteropServices;
// associated with an assembly. // associated with an assembly.
[assembly: AssemblyTitle("OpenTK.GLControl")] [assembly: AssemblyTitle("OpenTK.GLControl")]
[assembly: AssemblyDescription("Provides integration with System.Windows.Forms.")] [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 // The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("5414b90b-d7be-4382-b0e1-f07ce154f7f7")] [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.CLSCompliant(true)]
[assembly: System.Security.AllowPartiallyTrustedCallers] [assembly: System.Security.AllowPartiallyTrustedCallers]
#if NET40 #if NET40
[assembly: System.Security.SecurityRules(System.Security.SecurityRuleSet.Level1)] [assembly: System.Security.SecurityRules(System.Security.SecurityRuleSet.Level1)]
#endif #endif
#if SIGN_ASSEMBLY
[assembly: AssemblyKeyFile(@"../../../OpenTK.snk")]
#endif

View file

@ -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")]

View file

@ -122,6 +122,9 @@
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="..\GlobalAssemblyInfo.cs">
<Link>Properties\GlobalAssemblyInfo.cs</Link>
</Compile>
<Compile Include="DisplayDevice.cs"> <Compile Include="DisplayDevice.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>

View file

@ -1,4 +1,4 @@
using System; using System;
using System.Reflection; using System.Reflection;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
@ -8,39 +8,12 @@ using System.Runtime.InteropServices;
// associated with an assembly. // associated with an assembly.
[assembly: AssemblyTitle("OpenTK")] [assembly: AssemblyTitle("OpenTK")]
[assembly: AssemblyDescription("Open source game development toolkit for .Net/Mono.")] [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 // The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("7652241e-158d-4eb1-85f4-ed40ee356791")] [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: CLSCompliant(true)]
[assembly: System.Security.AllowPartiallyTrustedCallers] [assembly: System.Security.AllowPartiallyTrustedCallers]
#if NET40 #if NET40
[assembly: System.Security.SecurityRules(System.Security.SecurityRuleSet.Level1)] [assembly: System.Security.SecurityRules(System.Security.SecurityRuleSet.Level1)]
#endif #endif
#if SIGN_ASSEMBLY
[assembly: AssemblyKeyFile(@"../../../OpenTK.snk")]
#endif