Browse files

Update project and solution files to use core DLR.

  • Loading branch information...
1 parent fcef2e5 commit 7e60aa3f5378275c7bc1feca3f97ee71f90a514c @jdhardy committed Apr 7, 2012
View
4 Runtime/Microsoft.Scripting.Core/Microsoft.Scripting.Core.csproj
@@ -22,10 +22,6 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'WP7Release|AnyCPU' ">
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AndroidDebug|AnyCPU' ">
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AndroidRelease|AnyCPU' ">
- </PropertyGroup>
<ItemGroup>
<Compile Include="..\..\Hosts\Silverlight\SilverlightVersion.cs" Condition=" '$(IsSilverlight)' == 'true' ">
<Link>Properties\SilverlightVersion.cs</Link>
View
4 Solutions/Common.proj
@@ -98,11 +98,11 @@
<NoStdLib>true</NoStdLib>
<TargetFrameworkIdentifier>MonoAndroid</TargetFrameworkIdentifier>
<TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
- <Features>FEATURE_CUSTOM_MODIFIERS;FEATURE_FUNCS_5_16;FEATURE_SERIALIZATION;FEATURE_ASSEMBLY_RESOLVE;FEATURE_DBNULL;FEATURE_THREAD;FEATURE_STACK_TRACE;FEATURE_REFEMIT;FEATURE_NUMERICS;FEATURE_VALUE_EQUALITY;FEATURE_COMPRESSION;FEATURE_APTCA;FEATURE_WIN32EXCEPTION;FEATURE_ASSEMBLY_LOCATION;FEATURE_ENUM_NAMES_VALUES;FEATURE_OS_SERVICEPACK;FEATURE_APPLICATIONEXCEPTION;FEATURE_STOPWATCH;FEATURE_APARTMENTSTATE;FEATURE_GETINVALIDFILENAMECHARS;FEATURE_LOADWITHPARTIALNAME;FEATURE_DRIVENOTFOUNDEXCEPTION;FEATURE_ASSEMBLY_CODEBASE;FEATURE_FULL_NET;FEATURE_FULL_CRYPTO;FEATURE_ICLONEABLE;FEATURE_ANSICP;FEATURE_TIMEZONE</Features>
+ <Features>FEATURE_CUSTOM_MODIFIERS;FEATURE_FUNCS_5_16;FEATURE_CORE_DLR;FEATURE_TASKS;FEATURE_SERIALIZATION;FEATURE_ASSEMBLY_RESOLVE;FEATURE_DBNULL;FEATURE_THREAD;FEATURE_STACK_TRACE;FEATURE_REFEMIT;FEATURE_NUMERICS;FEATURE_VALUE_EQUALITY;FEATURE_COMPRESSION;FEATURE_APTCA;FEATURE_WIN32EXCEPTION;FEATURE_ASSEMBLY_LOCATION;FEATURE_ENUM_NAMES_VALUES;FEATURE_OS_SERVICEPACK;FEATURE_APPLICATIONEXCEPTION;FEATURE_STOPWATCH;FEATURE_APARTMENTSTATE;FEATURE_GETINVALIDFILENAMECHARS;FEATURE_LOADWITHPARTIALNAME;FEATURE_DRIVENOTFOUNDEXCEPTION;FEATURE_ASSEMBLY_CODEBASE;FEATURE_FULL_NET;FEATURE_FULL_CRYPTO;FEATURE_ICLONEABLE;FEATURE_ANSICP;FEATURE_TIMEZONE</Features>
<PlatformSymbols>ANDROID</PlatformSymbols>
<IsSilverlight>false</IsSilverlight>
<IsFullFramework>false</IsFullFramework>
- <FeatureCoreDlr>false</FeatureCoreDlr>
+ <FeatureCoreDlr>true</FeatureCoreDlr>
</PropertyGroup>
<PropertyGroup Condition="'$(ReferencedPlatform)' == 'Silverlight4'">
View
2 Solutions/IronPython.sln
@@ -403,9 +403,7 @@ Global
{3272E46C-F4D9-418D-9EE9-081A1B658EE4}.WP7Debug|Any CPU.ActiveCfg = WP7Debug|Any CPU
{3272E46C-F4D9-418D-9EE9-081A1B658EE4}.WP7Release|Any CPU.ActiveCfg = WP7Release|Any CPU
{2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}.AndroidDebug|Any CPU.ActiveCfg = AndroidDebug|Any CPU
- {2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}.AndroidDebug|Any CPU.Build.0 = AndroidDebug|Any CPU
{2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}.AndroidRelease|Any CPU.ActiveCfg = AndroidRelease|Any CPU
- {2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}.AndroidRelease|Any CPU.Build.0 = AndroidRelease|Any CPU
{2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}.Debug|Any CPU.ActiveCfg = AndroidDebug|Any CPU
{2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}.FxCop|Any CPU.ActiveCfg = FxCop|Any CPU
{2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}.FxCop|Any CPU.Build.0 = FxCop|Any CPU

0 comments on commit 7e60aa3

Please sign in to comment.