From efc59fa97aeb70e973ec96721e8e58b778423b90 Mon Sep 17 00:00:00 2001 From: thefiddler Date: Mon, 24 Feb 2014 23:27:49 +0100 Subject: [PATCH] Squashed commit of the following: commit db75670cb94a61b78e4e096f995fab6d5349978a Author: thefiddler Date: Mon Feb 24 23:26:49 2014 +0100 [Build] Build both debug and release configurations commit 2a4a1dbc19d7ef2e12d3f4bb63b0e29b108e5050 Author: thefiddler Date: Mon Feb 24 23:20:51 2014 +0100 [Build] Invoke xbuild once now that build order is fixed commit 63b724d70e6b969dee11a740e5ac50e343cdcc48 Author: thefiddler Date: Mon Feb 24 23:19:23 2014 +0100 [Build] Maintain support for VS2012 commit d9aed1173373625d583b462bd8e0cad373246412 Author: Stefanos A Date: Mon Feb 24 23:16:57 2014 +0100 [Build] Attempt to fix xbuild build order --- .travis.yml | 3 +-- OpenTK.sln | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6a30a80c..fccc2cd7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,7 @@ before_install: - hdid "MonoFramework-MDK-${MONO_VER}.macos10.xamarin.x86.dmg" || true - sudo installer -pkg "/Volumes/Mono Framework MDK ${MONO_VER}/MonoFramework-MDK-${MONO_VER}.macos10.xamarin.x86.pkg" -target / || true - sudo installer -pkg "MonoFramework-MDK-${MONO_VER}.macos10.xamarin.x86.pkg" -target / || true - - xbuild /p:Configuration=Release || true script: - - xbuild /p:Configuration=Release + - xbuild && xbuild /p:Configuration=Release diff --git a/OpenTK.sln b/OpenTK.sln index ef7311d6..1e8cfd8d 100644 --- a/OpenTK.sln +++ b/OpenTK.sln @@ -9,10 +9,19 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTK", "Source\OpenTK\Ope EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTK.Compatibility", "Source\Compatibility\OpenTK.Compatibility.csproj", "{62C0DB35-0000-0000-0000-000000000000}" + ProjectSection(ProjectDependencies) = postProject + {75DC22B1-113F-4A66-96B9-2FF8208C10E8} = {75DC22B1-113F-4A66-96B9-2FF8208C10E8} + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTK.Examples", "Source\Examples\OpenTK.Examples.csproj", "{868E37B3-0000-0000-0000-000000000000}" + ProjectSection(ProjectDependencies) = postProject + {75DC22B1-113F-4A66-96B9-2FF8208C10E8} = {75DC22B1-113F-4A66-96B9-2FF8208C10E8} + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTK.GLControl", "Source\GLControl\OpenTK.GLControl.csproj", "{A625BE88-0000-0000-0000-000000000000}" + ProjectSection(ProjectDependencies) = postProject + {75DC22B1-113F-4A66-96B9-2FF8208C10E8} = {75DC22B1-113F-4A66-96B9-2FF8208C10E8} + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Build.Installer.Nsis", "Installers\Nsis\Build.Installer.Nsis.csproj", "{ADC34399-7613-44D2-90B2-19250F06FE7A}" ProjectSection(ProjectDependencies) = postProject @@ -25,10 +34,19 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Build.Installer.Nsis", "Ins EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Build.Docs", "Documentation\Build.Docs.csproj", "{650C6F3D-33B5-4216-9536-956AB42C0624}" + ProjectSection(ProjectDependencies) = postProject + {75DC22B1-113F-4A66-96B9-2FF8208C10E8} = {75DC22B1-113F-4A66-96B9-2FF8208C10E8} + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Generator.Bind", "Source\Bind\Generator.Bind.csproj", "{31D19132-0000-0000-0000-000000000000}" + ProjectSection(ProjectDependencies) = postProject + {75DC22B1-113F-4A66-96B9-2FF8208C10E8} = {75DC22B1-113F-4A66-96B9-2FF8208C10E8} + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Generator.Convert", "Source\Converter\Generator.Convert.csproj", "{5FDFF4B6-0000-0000-0000-000000000000}" + ProjectSection(ProjectDependencies) = postProject + {75DC22B1-113F-4A66-96B9-2FF8208C10E8} = {75DC22B1-113F-4A66-96B9-2FF8208C10E8} + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Build.UpdateVersion", "Source\Build.UpdateVersion\Build.UpdateVersion.csproj", "{75DC22B1-113F-4A66-96B9-2FF8208C10E8}" EndProject @@ -52,6 +70,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Build.Installer.Nuget", "In EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Generator.Rewrite", "Source\Generator.Rewrite\Generator.Rewrite.csproj", "{C426C9D1-8857-4E52-BAC7-4C05EE6070AB}" + ProjectSection(ProjectDependencies) = postProject + {75DC22B1-113F-4A66-96B9-2FF8208C10E8} = {75DC22B1-113F-4A66-96B9-2FF8208C10E8} + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution