Merge branch 'CLR-3.0'

maul-esel · Nov 16, 2013 · 875487f · 875487f
2 parents 7e32c75 + 371828a
commit 875487f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,7 @@
 language: C
 
 env:
+  - FRAMEWORK_VERSION=v3.0
   - FRAMEWORK_VERSION=v3.5
   - FRAMEWORK_VERSION=v4.0
   - FRAMEWORK_VERSION=v4.5
@@ -11,7 +12,7 @@ before_install:
 
 install:
   - sudo apt-get install mono-devel mono-mcs nunit-console
-  - "if [ $FRAMEWORK_VERSION = 'v3.5' ]; then ./build-DLR.sh; fi;"
+  - "if [ $FRAMEWORK_VERSION \\< 'v4.0' ]; then ./build-DLR.sh; fi;"
 
 before_script:
   - xbuild /target:Travis /property:TargetFrameworkVersion=$FRAMEWORK_VERSION CobaltAHK.proj

diff --git a/CobaltAHK/CobaltAHK.csproj b/CobaltAHK/CobaltAHK.csproj
@@ -2,9 +2,11 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <CLR35 Condition=" '$(TargetFrameworkVersion)' == 'v3.5' Or '$(TargetFrameworkVersion)' == 'v3.0' ">true</CLR35>
     <CustomDLR Condition=" '$(CustomDLR)' == '' ">false</CustomDLR>
-    <CustomDLR Condition=" '$(TargetFrameworkVersion)' == 'v3.5' ">true</CustomDLR>
+    <CustomDLR Condition=" '$(CLR35)' == 'true' ">true</CustomDLR>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{27920BA7-FA6A-4AC5-9972-F205267BCCC4}</ProjectGuid>
@@ -36,10 +38,10 @@
   <PropertyGroup Condition=" '$(CustomDLR)|$(Configuration)' == 'true|Debug' ">
     <DefineConstants>CustomDLR;DEBUG</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(CustomDLR)|$(TargetFrameworkVersion)' == 'true|v3.5' ">
+  <PropertyGroup Condition=" '$(CustomDLR)|$(CLR35)' == 'true|true' ">
     <DefineConstants>CustomDLR;CLR_35</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(CustomDLR)|$(TargetFrameworkVersion)|$(Configuration)' == 'true|v3.5|Debug' ">
+  <PropertyGroup Condition=" '$(CustomDLR)|$(CLR35)|$(Configuration)' == 'true|true|Debug' ">
     <DefineConstants>CustomDLR;CLR_35;DEBUG</DefineConstants>
   </PropertyGroup>
   <ItemGroup Condition=" '$(CustomDLR)' == 'true' ">

diff --git a/build-DLR.sh b/build-DLR.sh
@@ -9,7 +9,7 @@ cd ..
 sed -i 's/444;//g' IronDLR/Solutions/Common.proj
 
 cp DLR.Core.sln IronDLR/Runtime/DLR.Core.sln
-xbuild /t:Build /p:Configuration=v2Release IronDLR/Runtime/DLR.Core.sln
+xbuild /t:Build /p:Configuration=v2Release /property:TargetFrameworkVersion=$FRAMEWORK_VERSION IronDLR/Runtime/DLR.Core.sln
 
 ls IronDLR/bin/v2Release