From 10f333c24f26f3050ac09fde48278c2bcae4ddb3 Mon Sep 17 00:00:00 2001 From: the_fiddler Date: Sun, 3 Oct 2010 12:30:39 +0000 Subject: [PATCH] Added Generator.Bind and Generator.Convert projects. Fixed msbuild compilation by removing the 3.5 bootstrap ItemGroups. (VS2010 added those on its own - hey, we are targeting v2.0 and we are not using ClickOnce!) --- OpenTK.sln | 18 + Source/Bind/Generator.Bind.csproj | 942 ++++++++++++++++++ .../Compatibility/OpenTK.Compatibility.csproj | 39 +- Source/Converter/Generator.Convert.csproj | 182 ++++ Source/Examples/OpenTK.Examples.csproj | 42 +- Source/GLControl/OpenTK.GLControl.csproj | 17 - Source/OpenTK/OpenTK.csproj | 41 +- 7 files changed, 1175 insertions(+), 106 deletions(-) create mode 100644 Source/Bind/Generator.Bind.csproj create mode 100644 Source/Converter/Generator.Convert.csproj diff --git a/OpenTK.sln b/OpenTK.sln index cd66d1aa..65186353 100644 --- a/OpenTK.sln +++ b/OpenTK.sln @@ -33,6 +33,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Build.Docs", "Documentation {CCE26215-7591-4CC3-8E39-9A08F8BF35E2} = {CCE26215-7591-4CC3-8E39-9A08F8BF35E2} EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Generator.Bind", "Source\Bind\Generator.Bind.csproj", "{31D19132-0000-0000-0000-000000000000}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Generator.Convert", "Source\Converter\Generator.Convert.csproj", "{5FDFF4B6-0000-0000-0000-000000000000}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -88,6 +92,20 @@ Global {650C6F3D-33B5-4216-9536-956AB42C0624}.Nsis|Any CPU.ActiveCfg = Nsis|Any CPU {650C6F3D-33B5-4216-9536-956AB42C0624}.Nsis|Any CPU.Build.0 = Nsis|Any CPU {650C6F3D-33B5-4216-9536-956AB42C0624}.Release|Any CPU.ActiveCfg = Release|Any CPU + {31D19132-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {31D19132-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {31D19132-0000-0000-0000-000000000000}.Documentation|Any CPU.ActiveCfg = Documentation|Any CPU + {31D19132-0000-0000-0000-000000000000}.Nsis|Any CPU.ActiveCfg = Nsis|Any CPU + {31D19132-0000-0000-0000-000000000000}.Nsis|Any CPU.Build.0 = Nsis|Any CPU + {31D19132-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {31D19132-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {5FDFF4B6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5FDFF4B6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5FDFF4B6-0000-0000-0000-000000000000}.Documentation|Any CPU.ActiveCfg = Documentation|Any CPU + {5FDFF4B6-0000-0000-0000-000000000000}.Nsis|Any CPU.ActiveCfg = Nsis|Any CPU + {5FDFF4B6-0000-0000-0000-000000000000}.Nsis|Any CPU.Build.0 = Nsis|Any CPU + {5FDFF4B6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5FDFF4B6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Source/Bind/Generator.Bind.csproj b/Source/Bind/Generator.Bind.csproj new file mode 100644 index 00000000..757537a9 --- /dev/null +++ b/Source/Bind/Generator.Bind.csproj @@ -0,0 +1,942 @@ + + + + Local + 8.0.50727 + 2.0 + {31D19132-0000-0000-0000-000000000000} + Debug + AnyCPU + + + + + Bind + JScript + Grid + IE50 + false + v3.5 + Exe + + + Bind + + + + + + + 2.0 + + + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + + + False + 285212672 + False + + + DEBUG;TRACE; + + + True + 4096 + False + ..\..\Binaries\OpenTK\Debug\ + False + False + False + 4 + False + + + AllRules.ruleset + + + False + 285212672 + False + + + TRACE; + + + False + 4096 + True + ..\..\Binaries\OpenTK\Release\ + False + False + False + 4 + False + + + AllRules.ruleset + + + False + 285212672 + False + + + TRACE; + + + False + 4096 + True + ..\..\Binaries\OpenTK\Release\ + False + False + False + 4 + False + + + AllRules.ruleset + + + ..\..\Binaries\OpenTK\Release\ + + + + System + False + + + System.Core + False + + + System.Xml + False + + + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/Compatibility/OpenTK.Compatibility.csproj b/Source/Compatibility/OpenTK.Compatibility.csproj index 76373abc..b9ebced9 100644 --- a/Source/Compatibility/OpenTK.Compatibility.csproj +++ b/Source/Compatibility/OpenTK.Compatibility.csproj @@ -80,23 +80,21 @@ ..\..\Binaries\OpenTK\Release\ - ..\..\Binaries\OpenTK\Release\ - TRACE; - 285212672 true + 285212672 + + + TRACE; OpenTK.Compatibility.xml - true 4096 + true + ..\..\Binaries\OpenTK\Release\ + False + False + 4 1591 - AnyCPU - ..\..\Binaries\OpenTK\Release\OpenTK.Compatibility.dll.CodeAnalysisLog.xml - true - GlobalSuppressions.cs AllRules.ruleset - ;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets - true - ;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules - true + none @@ -465,23 +463,6 @@ Always - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - diff --git a/Source/Converter/Generator.Convert.csproj b/Source/Converter/Generator.Convert.csproj new file mode 100644 index 00000000..052b7820 --- /dev/null +++ b/Source/Converter/Generator.Convert.csproj @@ -0,0 +1,182 @@ + + + + Local + 8.0.50727 + 2.0 + {5FDFF4B6-0000-0000-0000-000000000000} + Debug + AnyCPU + + + + + Convert + JScript + Grid + IE50 + false + v3.5 + Exe + + + Convert + + + + + + + 2.0 + + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + + + + False + 285212672 + False + + + DEBUG;TRACE; + + + True + 4096 + False + ..\..\Binaries\OpenTK\Debug\ + False + False + False + 4 + False + + + AllRules.ruleset + + + False + 285212672 + False + + + TRACE; + + + False + 4096 + True + ..\..\Binaries\OpenTK\Release\ + False + False + False + 4 + False + + + AllRules.ruleset + + + ..\..\Binaries\OpenTK\Release\ + + + False + 285212672 + False + + + TRACE; + + + False + 4096 + True + ..\..\Binaries\OpenTK\Release\ + False + False + False + 4 + False + + + AllRules.ruleset + + + + System + False + + + System.Core + False + + + System.Xml + False + + + System.Xml.Linq + False + + + + + Code + + + Code + + + Code + + + Code + + + Code + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/Examples/OpenTK.Examples.csproj b/Source/Examples/OpenTK.Examples.csproj index 338debce..1a0c52b6 100644 --- a/Source/Examples/OpenTK.Examples.csproj +++ b/Source/Examples/OpenTK.Examples.csproj @@ -82,22 +82,21 @@ ..\..\Binaries\OpenTK\Release\ - ..\..\Binaries\OpenTK\Release\ - TRACE; - 285212672 true - true + 285212672 + + + TRACE; + + 4096 - AnyCPU - ..\..\Binaries\OpenTK\Release\Examples.exe.CodeAnalysisLog.xml - true - GlobalSuppressions.cs + true + ..\..\Binaries\OpenTK\Release\ + False + False + 4 AllRules.ruleset - ;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets - false - ;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules - false - false + none @@ -538,23 +537,6 @@ Always - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - diff --git a/Source/GLControl/OpenTK.GLControl.csproj b/Source/GLControl/OpenTK.GLControl.csproj index a8d82254..1deee620 100644 --- a/Source/GLControl/OpenTK.GLControl.csproj +++ b/Source/GLControl/OpenTK.GLControl.csproj @@ -152,23 +152,6 @@ Code - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - diff --git a/Source/OpenTK/OpenTK.csproj b/Source/OpenTK/OpenTK.csproj index a44f0cf5..473db17d 100644 --- a/Source/OpenTK/OpenTK.csproj +++ b/Source/OpenTK/OpenTK.csproj @@ -1,4 +1,4 @@ - + Local @@ -78,20 +78,20 @@ ..\..\Binaries\OpenTK\Release\ - ..\..\Binaries\OpenTK\Release\ - TRACE; - 285212672 true + 285212672 + + + TRACE; OpenTK.xml - true 4096 - AnyCPU - ..\..\Binaries\OpenTK\Release\OpenTK.dll.CodeAnalysisLog.xml - true - GlobalSuppressions.cs + true + ..\..\Binaries\OpenTK\Release\ + False + False + 4 AllRules.ruleset - ;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets - ;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules + none @@ -115,25 +115,6 @@ False - Code