diff options
author | Marek Safar <marek.safar@gmail.com> | 2012-06-08 12:40:15 +0400 |
---|---|---|
committer | Marek Safar <marek.safar@gmail.com> | 2012-06-08 12:40:15 +0400 |
commit | c14d3585bd3139250d63c9db99a3ad5a978d2e63 (patch) | |
tree | be1c3c37a05eb39ea3eec28d4b61faa3ee88449f /mcs/class/dlr | |
parent | 3f0aa3e3c8d150490b804d2c248ae9f427da33a0 (diff) |
Update to the latest dlr
Diffstat (limited to 'mcs/class/dlr')
118 files changed, 949 insertions, 1527 deletions
diff --git a/mcs/class/dlr/Runtime/Microsoft.Dynamic/Microsoft.Dynamic.csproj b/mcs/class/dlr/Runtime/Microsoft.Dynamic/Microsoft.Dynamic.csproj index e7c31692743..1cc17a8c9c7 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Dynamic/Microsoft.Dynamic.csproj +++ b/mcs/class/dlr/Runtime/Microsoft.Dynamic/Microsoft.Dynamic.csproj @@ -1,539 +1,463 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
- <Import Project="$(SolutionDir)..\Solutions\Common.proj" />
-
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{EB66B766-6354-4208-A3D4-AACBDCB5C3B3}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Microsoft.Scripting</RootNamespace>
- <AssemblyName>Microsoft.Dynamic</AssemblyName>
- <DocumentationFile>$(SolutionDir)..\bin\$(Configuration)\Microsoft.Dynamic.xml</DocumentationFile>
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- <WarningsNotAsErrors>618</WarningsNotAsErrors>
- <NoWarn>1591</NoWarn>
- <BaseAddress>859832320</BaseAddress>
- <CodeAnalysisRuleSet>Microsoft.Dynamic.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'FxCop|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>$(SolutionDir)..\bin\FxCop</OutputPath>
- <DefineConstants>TRACE;CLR4;$(SignedSym)</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <RunCodeAnalysis>true</RunCodeAnalysis>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'v2Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>$(SolutionDir)..\bin\v2Debug</OutputPath>
- <DefineConstants>DEBUG;TRACE;CLR2;$(SignedSym)</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <RunCodeAnalysis>false</RunCodeAnalysis>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'v2Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>$(SolutionDir)..\bin\v2Release</OutputPath>
- <DefineConstants>TRACE;CLR2;$(SignedSym)</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <RunCodeAnalysis>false</RunCodeAnalysis>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Silverlight3Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <OutputPath>$(SolutionDir)..\bin\Silverlight3Debug</OutputPath>
- <DefineConstants>TRACE;DEBUG;SILVERLIGHT;CLR2;$(SignedSym)</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>AnyCPU</PlatformTarget>
- <RunCodeAnalysis>false</RunCodeAnalysis>
- <ErrorReport>prompt</ErrorReport>
- <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Silverlight3Release|AnyCPU' ">
- <OutputPath>$(SolutionDir)..\bin\Silverlight3Release</OutputPath>
- <DefineConstants>TRACE;SILVERLIGHT;CLR2;$(SignedSym)</DefineConstants>
- <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>AnyCPU</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>$(SolutionDir)..\bin\Debug</OutputPath>
- <DefineConstants>DEBUG;TRACE;CLR4;$(SignedSym)</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <RunCodeAnalysis>false</RunCodeAnalysis>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>$(SolutionDir)..\bin\Release</OutputPath>
- <DefineConstants>TRACE;CLR4;$(SignedSym)</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <RunCodeAnalysis>false</RunCodeAnalysis>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Silverlight4Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>$(SolutionDir)..\bin\Silverlight4Debug</OutputPath>
- <DefineConstants>TRACE;DEBUG;SILVERLIGHT;CLR4;$(SignedSym)</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
- <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <PlatformTarget>AnyCPU</PlatformTarget>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Silverlight4Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <PlatformTarget>AnyCPU</PlatformTarget>
- <OutputPath>$(SolutionDir)..\bin\Silverlight4Release</OutputPath>
- <DefineConstants>TRACE;SILVERLIGHT;CLR4;$(SignedSym)</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
- </PropertyGroup>
- <ItemGroup>
- <Compile Include="..\..\Hosts\Silverlight\SilverlightVersion.cs" Condition=" '$(SilverlightBuild)' == 'true' ">
- <Link>Properties\SilverlightVersion.cs</Link>
- </Compile>
- <Compile Include="Actions\Calls\ActualArguments.cs" />
- <Compile Include="Actions\Calls\ApplicableCandidate.cs" />
- <Compile Include="Actions\Calls\ArgBuilder.cs" />
- <Compile Include="Actions\Calls\ArgumentBinding.cs" />
- <Compile Include="Actions\Calls\BindingResult.cs" />
- <Compile Include="Actions\Calls\BindingTarget.cs" />
- <Compile Include="Actions\Calls\ByRefReturnBuilder.cs" />
- <Compile Include="Actions\Calls\CallFailure.cs" />
- <Compile Include="Actions\Calls\CallFailureReason.cs" />
- <Compile Include="Actions\Calls\CandidateSet.cs" />
- <Compile Include="Actions\Calls\ConversionResult.cs" />
- <Compile Include="Actions\Calls\DefaultArgBuilder.cs" />
- <Compile Include="Actions\Calls\DefaultOverloadResolver.cs" />
- <Compile Include="Actions\Calls\InstanceBuilder.cs" />
- <Compile Include="Actions\Calls\KeywordArgBuilder.cs" />
- <Compile Include="Actions\Calls\KeywordConstructorReturnBuilder.cs" />
- <Compile Include="Actions\Calls\MethodCandidate.cs" />
- <Compile Include="Actions\Calls\NarrowingLevel.cs" />
- <Compile Include="Actions\Calls\OutArgBuilder.cs" />
- <Compile Include="Actions\Calls\OverloadInfo.cs" />
- <Compile Include="Actions\Calls\OverloadResolver.cs" />
- <Compile Include="Actions\Calls\OverloadResolverFactory.cs" />
- <Compile Include="Actions\Calls\ParameterMapping.cs" />
- <Compile Include="Actions\Calls\ParameterWrapper.cs" />
- <Compile Include="Actions\Calls\ParamsArgBuilder.cs" />
- <Compile Include="Actions\Calls\ParamsDictArgBuilder.cs" />
- <Compile Include="Actions\Calls\ReferenceArgBuilder.cs" />
- <Compile Include="Actions\Calls\RestrictedArguments.cs" />
- <Compile Include="Actions\Calls\ReturnBuilder.cs" />
- <Compile Include="Actions\Calls\ReturnReferenceArgBuilder.cs" />
- <Compile Include="Actions\Calls\SimpleArgBuilder.cs" />
- <Compile Include="Actions\Calls\TypeInferer.cs" />
- <Compile Include="Actions\ConversionResultKind.cs" />
- <Compile Include="Actions\DefaultBinder.Operations.cs" />
- <Compile Include="Actions\Interceptor.cs" />
- <Compile Include="Actions\DynamicSiteHelper.cs" />
- <Compile Include="Actions\ExtensionBinaryOperationBinder.cs" />
- <Compile Include="Actions\ExtensionUnaryOperationBinder.cs" />
- <Compile Include="Actions\MemberRequestKind.cs" />
- <Compile Include="Actions\OperationBinder.cs" />
- <Compile Include="Actions\OperationMetaObject.cs" />
- <Compile Include="Ast\BlockBuilder.cs" />
- <Compile Include="Ast\ExpressionCollectionBuilder.cs" />
- <Compile Include="Ast\FinallyFlowControlExpression.cs" />
- <Compile Include="Ast\FlowControlRewriter.cs" />
- <Compile Include="Ast\ILightExceptionAwareExpression.cs" />
- <Compile Include="Actions\ILightExceptionBinder.cs" />
- <Compile Include="Ast\LightCheckAndThrowExpression.cs" />
- <Compile Include="Ast\LightExceptionConvertingExpression.cs" />
- <Compile Include="Ast\LightLambdaExpression.cs" />
- <Compile Include="Ast\LightThrowExpression.cs" />
- <Compile Include="Debugging\CollectionUtils.cs" />
- <Compile Include="Debugging\CompilerServices\DebugLambdaInfo.cs" />
- <Compile Include="Debugging\CompilerServices\IDebugCompilerSupport.cs" />
- <Compile Include="Debugging\DebugContext.cs" />
- <Compile Include="Debugging\DebugContext.GeneratorLoopProc.cs" />
- <Compile Include="Debugging\DebugFrame.cs" />
- <Compile Include="Debugging\DebuggableLambdaBuilder.cs" />
- <Compile Include="Debugging\DebugGenerator.cs" />
- <Compile Include="Debugging\DebugInfoRewriter.cs" />
- <Compile Include="Debugging\DebugMode.cs" />
- <Compile Include="Debugging\DebugSourceFile.cs" />
- <Compile Include="Debugging\DebugSourceSpan.cs" />
- <Compile Include="Debugging\DebugThread.cs" />
- <Compile Include="Debugging\DefaultRuntimeVariablesImpl\DebugRuntimeVariables.cs" />
- <Compile Include="Debugging\DefaultRuntimeVariablesImpl\DefaultDebugThread.cs" />
- <Compile Include="Debugging\DefaultRuntimeVariablesImpl\DefaultDebugThreadFactory.cs" />
- <Compile Include="Debugging\DelegateHelpers.cs" />
- <Compile Include="Debugging\ForceToGeneratorLoopException.cs" />
- <Compile Include="Debugging\FunctionInfo.cs" />
- <Compile Include="Debugging\IDebugCallback.cs" />
- <Compile Include="Debugging\InvokeTargets.cs" />
- <Compile Include="Debugging\LambdaWalker.cs" />
- <Compile Include="Debugging\Microsoft.Scripting.Debugging.Generated.cs" />
- <Compile Include="Debugging\RuntimeOps.cs" />
- <Compile Include="Debugging\RuntimeVariablesSupport\IDebugRuntimeVariables.cs" />
- <Compile Include="Debugging\RuntimeVariablesSupport\IDebugThreadFactory.cs" />
- <Compile Include="Debugging\ScopedRuntimeVariables.cs" />
- <Compile Include="Debugging\ThreadLocal.cs" />
- <Compile Include="Debugging\TraceEventKind.cs" />
- <Compile Include="Debugging\TracePipeline\ITraceCallback.cs" />
- <Compile Include="Debugging\TracePipeline\ITracePipeline.cs" />
- <Compile Include="Debugging\TracePipeline\TracePipeline.cs" />
- <Compile Include="Debugging\VariableInfo.cs" />
- <Compile Include="Runtime\DynamicXamlReader.cs" />
- <Compile Include="Runtime\LightThrowingAttribute.cs" />
- <Compile Include="Ast\LightExceptionRewriter.cs" />
- <Compile Include="Runtime\LightExceptions.cs" />
- <Compile Include="Ast\SourceFileInformation.cs" />
- <Compile Include="Ast\LightDynamicExpression.cs" />
- <Compile Include="Ast\Utils.cs" />
- <Compile Include="Ast\NewArrayExpression.cs" />
- <Compile Include="Ast\NewExpression.cs" />
- <Compile Include="Ast\UnaryExpression.cs" />
- <Compile Include="ComInterop\ArgBuilder.cs" />
- <Compile Include="ComInterop\BoolArgBuilder.cs" />
- <Compile Include="ComInterop\BoundDispEvent.cs" />
- <Compile Include="ComInterop\CollectionExtensions.cs" />
- <Compile Include="ComInterop\ComBinder.cs" />
- <Compile Include="ComInterop\ComBinderHelpers.cs" />
- <Compile Include="ComInterop\ComClassMetaObject.cs" />
- <Compile Include="ComInterop\ComDispIds.cs" />
- <Compile Include="ComInterop\ComEventDesc.cs" />
- <Compile Include="ComInterop\ComEventSink.cs" />
- <Compile Include="ComInterop\ComEventSinkProxy.cs" />
- <Compile Include="ComInterop\ComEventSinksContainer.cs" />
- <Compile Include="ComInterop\ComFallbackMetaObject.cs" />
- <Compile Include="ComInterop\ComHresults.cs" />
- <Compile Include="ComInterop\ComInterop.cs" />
- <Compile Include="ComInterop\ComInvokeAction.cs" />
- <Compile Include="ComInterop\ComInvokeBinder.cs" />
- <Compile Include="ComInterop\ComMetaObject.cs" />
- <Compile Include="ComInterop\ComMethodDesc.cs" />
- <Compile Include="ComInterop\ComObject.cs" />
- <Compile Include="ComInterop\ComParamDesc.cs" />
- <Compile Include="ComInterop\ComRuntimeHelpers.cs" />
- <Compile Include="ComInterop\ComType.cs" />
- <Compile Include="ComInterop\ComTypeClassDesc.cs" />
- <Compile Include="ComInterop\ComTypeDesc.cs" />
- <Compile Include="ComInterop\ComTypeEnumDesc.cs" />
- <Compile Include="ComInterop\ComTypeLibDesc.cs" />
- <Compile Include="ComInterop\ComTypeLibInfo.cs" />
- <Compile Include="ComInterop\ComTypeLibMemberDesc.cs" />
- <Compile Include="ComInterop\ConversionArgBuilder.cs" />
- <Compile Include="ComInterop\ConvertArgBuilder.cs" />
- <Compile Include="ComInterop\ConvertibleArgBuilder.cs" />
- <Compile Include="ComInterop\CurrencyArgBuilder.cs" />
- <Compile Include="ComInterop\DateTimeArgBuilder.cs" />
- <Compile Include="ComInterop\DispatchArgBuilder.cs" />
- <Compile Include="ComInterop\DispCallable.cs" />
- <Compile Include="ComInterop\DispCallableMetaObject.cs" />
- <Compile Include="ComInterop\ErrorArgBuilder.cs" />
- <Compile Include="ComInterop\Errors.cs" />
- <Compile Include="ComInterop\ExcepInfo.cs" />
- <Compile Include="ComInterop\Helpers.cs" />
- <Compile Include="ComInterop\IDispatchComObject.cs" />
- <Compile Include="ComInterop\IDispatchMetaObject.cs" />
- <Compile Include="ComInterop\IPseudoComObject.cs" />
- <Compile Include="ComInterop\NullArgBuilder.cs" />
- <Compile Include="ComInterop\SimpleArgBuilder.cs" />
- <Compile Include="ComInterop\SplatCallSite.cs" />
- <Compile Include="ComInterop\StringArgBuilder.cs" />
- <Compile Include="ComInterop\TypeEnumMetaObject.cs" />
- <Compile Include="ComInterop\TypeLibInfoMetaObject.cs" />
- <Compile Include="ComInterop\TypeLibMetaObject.cs" />
- <Compile Include="ComInterop\TypeUtils.cs" />
- <Compile Include="ComInterop\UnknownArgBuilder.cs" />
- <Compile Include="ComInterop\VarEnumSelector.cs" />
- <Compile Include="ComInterop\Variant.cs" />
- <Compile Include="ComInterop\VariantArgBuilder.cs" />
- <Compile Include="ComInterop\VariantArray.cs" />
- <Compile Include="ComInterop\VariantBuilder.cs" />
- <Compile Include="Generation\FieldBuilderExpression.cs" />
- <Compile Include="Hosting\Shell\ICommandDispatcher.cs" />
- <Compile Include="Hosting\Shell\Remote\ConsoleRestartManager.cs" />
- <Compile Include="Hosting\Shell\Remote\RemoteCommandDispatcher.cs" />
- <Compile Include="Hosting\Shell\Remote\RemoteConsoleCommandLine.cs" />
- <Compile Include="Hosting\Shell\Remote\RemoteConsoleHost.cs" />
- <Compile Include="Hosting\Shell\Remote\RemoteRuntimeServer.cs" />
- <Compile Include="Interpreter\BranchLabel.cs" />
- <Compile Include="Interpreter\Instructions\AddInstruction.cs" />
- <Compile Include="Interpreter\Instructions\ArrayOperations.cs" />
- <Compile Include="Interpreter\Instructions\CallInstruction.cs" />
- <Compile Include="Interpreter\Instructions\CallInstruction.Generated.cs" />
- <Compile Include="Interpreter\Instructions\ControlFlowInstructions.cs" />
- <Compile Include="Interpreter\Instructions\DivInstruction.cs" />
- <Compile Include="Interpreter\Instructions\DynamicSplatInstruction.cs" />
- <Compile Include="Interpreter\Instructions\EqualInstruction.cs" />
- <Compile Include="Interpreter\Instructions\FieldOperations.cs" />
- <Compile Include="Interpreter\Instructions\GreaterThanInstruction.cs" />
- <Compile Include="Interpreter\Instructions\InstructionFactory.cs" />
- <Compile Include="Interpreter\Instructions\LabelInfo.cs" />
- <Compile Include="Interpreter\Instructions\LessThanInstruction.cs" />
- <Compile Include="Interpreter\Instructions\LocalAccess.cs" />
- <Compile Include="Interpreter\Instructions\InstructionList.cs" />
- <Compile Include="Interpreter\Instructions\NotEqualInstruction.cs" />
- <Compile Include="Interpreter\Instructions\NumericConvertInstruction.cs" />
- <Compile Include="Interpreter\Instructions\StackOperations.cs" />
- <Compile Include="Interpreter\Instructions\TypeOperations.cs" />
- <Compile Include="Interpreter\ILightCallSiteBinder.cs" />
- <Compile Include="Interpreter\LightDelegateCreator.cs" />
- <Compile Include="Interpreter\LightLambda.Generated.cs" />
- <Compile Include="Interpreter\Interpreter.cs" />
- <Compile Include="Interpreter\Instructions\DynamicInstructions.Generated.cs" />
- <Compile Include="Interpreter\Instructions\DynamicInstructionN.cs" />
- <Compile Include="Interpreter\LightLambdaClosureVisitor.cs" />
- <Compile Include="Interpreter\LightLambda.cs" />
- <Compile Include="Interpreter\Instructions\Instruction.cs" />
- <Compile Include="Interpreter\LightCompiler.cs" />
- <Compile Include="Interpreter\LocalVariables.cs" />
- <Compile Include="Interpreter\LoopCompiler.cs" />
- <Compile Include="Interpreter\RuntimeVariables.cs" />
- <Compile Include="Interpreter\InterpretedFrame.cs" />
- <Compile Include="Math\BigIntegerV2.cs" />
- <Compile Include="Math\BigIntegerV4.cs" />
- <Compile Include="Runtime\ArgumentArray.cs" />
- <Compile Include="Runtime\BindingRestrictionsHelpers.cs" />
- <Compile Include="Runtime\DynamicDelegateCreator.cs" />
- <Compile Include="Runtime\DynamicNull.cs" />
- <Compile Include="Runtime\Generator.cs" />
- <Compile Include="Ast\GeneratorExpression.cs" />
- <Compile Include="Ast\GeneratorRewriter.cs" />
- <Compile Include="Actions\Calls\Candidate.cs" />
- <Compile Include="Ast\YieldExpression.cs" />
- <Compile Include="Generation\DelegateHelpers.cs" />
- <Compile Include="Generation\DelegateHelpers.Generated.cs" />
- <Compile Include="Generation\AssemblyGen.cs" />
- <Compile Include="Generation\ConstantCheck.cs" />
- <Compile Include="Generation\DynamicILGen.cs" />
- <Compile Include="Generation\ILGen.cs" />
- <Compile Include="Generation\KeyedQueue.cs" />
- <Compile Include="Generation\Snippets.cs" />
- <Compile Include="Generation\TypeGen.cs" />
- <Compile Include="Actions\ComboActionRewriter.cs" />
- <Compile Include="Actions\ComboBinder.cs" />
- <Compile Include="Actions\ConditionalBuilder.cs" />
- <Compile Include="Actions\DefaultBinder.Conversions.cs" />
- <Compile Include="Actions\DefaultBinder.DeleteMember.cs" />
- <Compile Include="Actions\DefaultBinder.GetMember.cs" />
- <Compile Include="Actions\DefaultBinder.Invoke.cs" />
- <Compile Include="Actions\DefaultBinder.MethodCalls.cs" />
- <Compile Include="Actions\DefaultBinder.SetMember.cs" />
- <Compile Include="Actions\DefaultBinder.cs" />
- <Compile Include="Actions\NoSideEffectsAttribute.cs" />
- <Compile Include="Actions\OperatorInfo.cs" />
- <Compile Include="Ast\BinaryExpression.cs" />
- <Compile Include="Ast\Block.cs" />
- <Compile Include="Ast\ConstantExpression.cs" />
- <Compile Include="Ast\EmptyStatements.cs" />
- <Compile Include="Ast\LambdaBuilder.cs" />
- <Compile Include="Ast\LambdaParameterRewriter.cs" />
- <Compile Include="Ast\LoopStatement.cs" />
- <Compile Include="Ast\MethodCallExpression.cs" />
- <Compile Include="Ast\TryStatementBuilder.cs" />
- <Compile Include="MultiRuntimeAwareAttribute.cs" />
- <Compile Include="PerfTrack.cs" />
- <Compile Include="Runtime\CompilerContext.cs" />
- <Compile Include="Runtime\DynamicLanguageProviderAttribute.cs" />
- <Compile Include="Runtime\IConvertibleMetaObject.cs" />
- <Compile Include="Runtime\ICustomScriptCodeData.cs" />
- <Compile Include="Runtime\IRestrictedMetaObject.cs" />
- <Compile Include="Runtime\LegacyScriptCode.cs" />
- <Compile Include="Runtime\MetaObjectExtensions.cs" />
- <Compile Include="Runtime\RestrictedMetaObject.cs" />
- <Compile Include="Runtime\SavableScriptCode.cs" />
- <Compile Include="Runtime\TokenizerBuffer.cs" />
- <Compile Include="Generation\MethodSignatureInfo.cs" />
- <Compile Include="Hosting\Shell\BasicConsole.cs" />
- <Compile Include="Hosting\Shell\CommandLine.cs" />
- <Compile Include="Hosting\Shell\ConsoleHost.cs" />
- <Compile Include="Hosting\Shell\ConsoleHostOptions.cs" />
- <Compile Include="Hosting\Shell\ConsoleHostOptionsParser.cs" />
- <Compile Include="Hosting\Shell\ConsoleOptions.cs" />
- <Compile Include="Hosting\Shell\IConsole.cs" />
- <Compile Include="Hosting\Shell\OptionsParser.cs" />
- <Compile Include="Hosting\Shell\Style.cs" />
- <Compile Include="Hosting\Shell\SuperConsole.cs" />
- <Compile Include="GlobalSuppressions.cs" />
- <Compile Include="Math\Complex64.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Runtime\AmbiguousFileNameException.cs" />
- <Compile Include="Runtime\BinderOps.cs" />
- <Compile Include="Runtime\CallTypes.cs" />
- <Compile Include="Runtime\Cast.Generated.cs" />
- <Compile Include="Runtime\Cast.cs" />
- <Compile Include="Runtime\CodeDomCodeGen.cs" />
- <Compile Include="Runtime\DelegateInfo.cs" />
- <Compile Include="Runtime\DelegateSignatureInfo.cs" />
- <Compile Include="Runtime\ISlice.cs" />
- <Compile Include="Runtime\IdDispenser.cs" />
- <Compile Include="Runtime\LanguageBoundTextContentProvider.cs" />
- <Compile Include="Runtime\LocalsDictionary.cs" />
- <Compile Include="Runtime\PositionTrackingWriter.cs" />
- <Compile Include="Runtime\ReturnFixer.cs" />
- <Compile Include="Runtime\SourceStringContentProvider.cs" />
- <Compile Include="Utils\CacheDict.cs" />
- <Compile Include="Utils\CollectionExtensions.cs" />
- <Compile Include="Utils\CopyOnWriteList.cs" />
- <Compile Include="Utils\DynamicUtils.cs" />
- <Compile Include="Utils\EnumUtils.cs" />
- <Compile Include="Utils\HybridReferenceDictionary.cs" />
- <Compile Include="Utils\ListEqualityComparer.cs" />
- <Compile Include="Utils\MathUtils.cs" />
- <Compile Include="Utils\MonitorUtils.cs" />
- <Compile Include="Utils\Publisher.cs" />
- <Compile Include="Utils\ReadOnlyDictionary.cs" />
- <Compile Include="Utils\ReferenceEqualityComparer.cs" />
- <Compile Include="Utils\HashSet.cs" />
- <Compile Include="Utils\SynchronizedDictionary.cs" />
- <Compile Include="Utils\ThreadLocal.cs" />
- <Compile Include="Utils\TypeUtils.cs" />
- <Compile Include="Utils\ValueArray.cs" />
- <Compile Include="Utils\WeakCollection.cs" />
- <Compile Include="Utils\WeakDictionary.cs" />
- <Compile Include="Utils\WeakHandle.cs" />
- <Compile Include="DebugOptions.cs" />
- <Compile Include="SpecSharp.cs" />
- <Compile Include="MutableTuple.cs" />
- <Compile Include="Actions\ActionBinder.cs" />
- <Compile Include="Actions\Argument.cs" />
- <Compile Include="Actions\ArgumentType.cs" />
- <Compile Include="Actions\BoundMemberTracker.cs" />
- <Compile Include="Actions\CallSignature.cs" />
- <Compile Include="Actions\ConstructorTracker.cs" />
- <Compile Include="Actions\CustomTracker.cs" />
- <Compile Include="Actions\ErrorInfo.cs" />
- <Compile Include="Actions\EventTracker.cs" />
- <Compile Include="Actions\ExtensionMethodTracker.cs" />
- <Compile Include="Actions\ExtensionPropertyTracker.cs" />
- <Compile Include="Actions\FieldTracker.cs" />
- <Compile Include="Actions\MemberGroup.cs" />
- <Compile Include="Actions\MemberTracker.cs" />
- <Compile Include="Actions\MethodGroup.cs" />
- <Compile Include="Actions\MethodTracker.cs" />
- <Compile Include="Actions\NamespaceTracker.cs" />
- <Compile Include="Actions\NestedTypeTracker.cs" />
- <Compile Include="Actions\PropertyTracker.cs" />
- <Compile Include="Actions\ReflectedPropertyTracker.cs" />
- <Compile Include="Actions\TopNamespaceTracker.cs" />
- <Compile Include="Actions\TrackerTypes.cs" />
- <Compile Include="Actions\TypeGroup.cs" />
- <Compile Include="Actions\TypeTracker.cs" />
- <Compile Include="Ast\DebugStatement.cs" />
- <Compile Include="Ast\IfStatementBuilder.cs" />
- <Compile Include="Ast\IfStatementTest.cs" />
- <Compile Include="Generation\CompilerHelpers.cs" />
- <Compile Include="Generation\IExpressionSerializable.cs" />
- <Compile Include="Generation\ToDiskRewriter.cs" />
- <Compile Include="Runtime\AssemblyTypeNames.cs" />
- <Compile Include="Runtime\BinderType.cs" />
- <Compile Include="Runtime\CallTargets.cs" />
- <Compile Include="Runtime\CustomStringDictionary.cs" />
- <Compile Include="Runtime\DlrCachedCodeAttribute.cs" />
- <Compile Include="Runtime\DocumentationAttribute.cs" />
- <Compile Include="Runtime\ExceptionHelpers.cs" />
- <Compile Include="Runtime\ExplicitConversionMethodAttribute.cs" />
- <Compile Include="Runtime\Extensible.cs" />
- <Compile Include="Runtime\ExtensionTypeAttribute.cs" />
- <Compile Include="Runtime\ExtraKeyEnumerator.cs" />
- <Compile Include="Runtime\IMembersList.cs" />
- <Compile Include="Runtime\ImplicitConversionMethodAttribute.cs" />
- <Compile Include="Runtime\ModuleChangeEventArgs.cs" />
- <Compile Include="Runtime\ModuleChangeEventType.cs" />
- <Compile Include="Runtime\NullTextContentProvider.cs" />
- <Compile Include="Runtime\OperationFailed.cs" />
- <Compile Include="Runtime\OperatorSlotAttribute.cs" />
- <Compile Include="Runtime\PropertyMethodAttribute.cs" />
- <Compile Include="Runtime\ReflectionCache.cs" />
- <Compile Include="Runtime\ScriptingRuntimeHelpers.cs" />
- <Compile Include="Runtime\StaticExtensionMethodAttribute.cs" />
- <Compile Include="Runtime\Uninitialized.cs" />
- <Compile Include="Utils\ArrayUtils.cs" />
- <Compile Include="Utils\AssemblyQualifiedTypeName.cs" />
- <Compile Include="Utils\Assert.cs" />
- <Compile Include="Utils\CheckedDictionaryEnumerator.cs" />
- <Compile Include="Utils\CollectionUtils.cs" />
- <Compile Include="Utils\ContractUtils.cs" />
- <Compile Include="Utils\DictionaryUnionEnumerator.cs" />
- <Compile Include="Utils\ExceptionFactory.Generated.cs" />
- <Compile Include="Utils\ExceptionUtils.cs" />
- <Compile Include="Utils\IOUtils.cs" />
- <Compile Include="Utils\ReflectionUtils.cs" />
- <Compile Include="Utils\StringUtils.cs" />
- <Compile Include="Utils\TextStream.cs" />
- <Compile Include="IValueEquality.cs" />
- <Compile Include="KeyboardInterruptException.cs" />
- <Compile Include="SourceFileContentProvider.cs" />
- </ItemGroup>
- <ItemGroup Condition=" '$(SilverlightBuild)' != 'true' ">
- <Reference Include="System" />
- <Reference Include="System.Xml" />
- <Reference Include="System.Configuration" />
- <Reference Include="System.Numerics" Condition=" '$(TargetFrameworkVersion)' == 'v4.0' " />
- <Reference Include="System.Core" />
- <Reference Include="System.Data" />
- <Reference Include="System.Runtime.Remoting" />
- <Reference Include="System.Xaml" Condition="'$(TargetFrameworkVersion)' == 'v4.0'" />
- </ItemGroup>
- <ItemGroup Condition=" '$(SilverlightBuild)' == 'true' ">
- <Reference Include="mscorlib, Version=2.0.5.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>$(SilverlightPath)\mscorlib.dll</HintPath>
- </Reference>
- <Reference Include="System, Version=2.0.5.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>$(SilverlightPath)\System.dll</HintPath>
- </Reference>
- <Reference Include="System.Core, Version=2.0.5.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>$(SilverlightPath)\System.Core.dll</HintPath>
- </Reference>
- <Reference Include="System.Numerics, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" Condition="'$(TargetFrameworkVersion)' == 'v4.0' ">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>$(SilverlightPath)\System.Numerics.dll</HintPath>
- </Reference>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\Microsoft.Scripting.Core\Microsoft.Scripting.Core.csproj" Condition="'$(TargetFrameworkVersion)' != 'v4.0'">
- <Project>{2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}</Project>
- <Name>Microsoft.Scripting.Core</Name>
- <Private>False</Private>
- </ProjectReference>
- <ProjectReference Include="..\Microsoft.Scripting\Microsoft.Scripting.csproj">
- <Project>{02FF0909-F5AD-48CF-A86A-345E721B7E40}</Project>
- <Name>Microsoft.Scripting</Name>
- </ProjectReference>
- <ProjectReference Include="..\Microsoft.Scripting.Metadata\Microsoft.Scripting.Metadata.csproj" Condition=" '$(SilverlightBuild)' != 'true' ">
- <Project>{ACDD9B9E-8FE6-439C-9521-1CCBA47F6143}</Project>
- <Name>Microsoft.Scripting.Metadata</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <Content Include="Microsoft.Scripting.txt" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Microsoft.Dynamic.ruleset" />
- </ItemGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" Condition=" '$(SilverlightTreeBuild)' != 'true' " />
-</Project>
+<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> + <Import Project="$(ProjectDir)..\..\Solutions\Common.proj" /> + <PropertyGroup> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{EB66B766-6354-4208-A3D4-AACBDCB5C3B3}</ProjectGuid> + <OutputType>Library</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <RootNamespace>Microsoft.Scripting</RootNamespace> + <AssemblyName>Microsoft.Dynamic</AssemblyName> + <BaseAddress>859832320</BaseAddress> + <CodeAnalysisRuleSet>$(AssemblyName).ruleset</CodeAnalysisRuleSet> + <DocumentationFile>$(SolutionDir)..\bin\$(Configuration)\$(AssemblyName).xml</DocumentationFile> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'FxCop|AnyCPU' "> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Win8Debug|AnyCPU' "> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Win8Release|AnyCPU' "> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'v2Debug|AnyCPU' "> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'v2Release|AnyCPU' "> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'WP7Debug|AnyCPU' "> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'WP7Release|AnyCPU' "> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Silverlight4Debug|AnyCPU' "> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Silverlight4Release|AnyCPU' "> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Silverlight5Debug|AnyCPU' "> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Silverlight5Release|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> + </Compile> + <Compile Include="Actions\Calls\ActualArguments.cs" /> + <Compile Include="Actions\Calls\ApplicableCandidate.cs" /> + <Compile Include="Actions\Calls\ArgBuilder.cs" /> + <Compile Include="Actions\Calls\ArgumentBinding.cs" /> + <Compile Include="Actions\Calls\BindingResult.cs" /> + <Compile Include="Actions\Calls\BindingTarget.cs" /> + <Compile Include="Actions\Calls\ByRefReturnBuilder.cs" /> + <Compile Include="Actions\Calls\CallFailure.cs" /> + <Compile Include="Actions\Calls\CallFailureReason.cs" /> + <Compile Include="Actions\Calls\CandidateSet.cs" /> + <Compile Include="Actions\Calls\ConversionResult.cs" /> + <Compile Include="Actions\Calls\DefaultArgBuilder.cs" /> + <Compile Include="Actions\Calls\DefaultOverloadResolver.cs" /> + <Compile Include="Actions\Calls\InstanceBuilder.cs" /> + <Compile Include="Actions\Calls\KeywordArgBuilder.cs" /> + <Compile Include="Actions\Calls\KeywordConstructorReturnBuilder.cs" /> + <Compile Include="Actions\Calls\MethodCandidate.cs" /> + <Compile Include="Actions\Calls\NarrowingLevel.cs" /> + <Compile Include="Actions\Calls\OutArgBuilder.cs" /> + <Compile Include="Actions\Calls\OverloadInfo.cs" /> + <Compile Include="Actions\Calls\OverloadResolver.cs" /> + <Compile Include="Actions\Calls\OverloadResolverFactory.cs" /> + <Compile Include="Actions\Calls\ParameterMapping.cs" /> + <Compile Include="Actions\Calls\ParameterWrapper.cs" /> + <Compile Include="Actions\Calls\ParamsArgBuilder.cs" /> + <Compile Include="Actions\Calls\ParamsDictArgBuilder.cs" /> + <Compile Include="Actions\Calls\ReferenceArgBuilder.cs" /> + <Compile Include="Actions\Calls\RestrictedArguments.cs" /> + <Compile Include="Actions\Calls\ReturnBuilder.cs" /> + <Compile Include="Actions\Calls\ReturnReferenceArgBuilder.cs" /> + <Compile Include="Actions\Calls\SimpleArgBuilder.cs" /> + <Compile Include="Actions\Calls\TypeInferer.cs" /> + <Compile Include="Actions\ConversionResultKind.cs" /> + <Compile Include="Actions\DefaultBinder.Operations.cs" /> + <Compile Include="Actions\ErrorMetaObject.cs" /> + <Compile Include="Actions\Interceptor.cs" /> + <Compile Include="Actions\DynamicSiteHelper.cs" /> + <Compile Include="Actions\ExtensionBinaryOperationBinder.cs" /> + <Compile Include="Actions\ExtensionUnaryOperationBinder.cs" /> + <Compile Include="Actions\MemberRequestKind.cs" /> + <Compile Include="Actions\OperationBinder.cs" /> + <Compile Include="Actions\OperationMetaObject.cs" /> + <Compile Include="Ast\BlockBuilder.cs" /> + <Compile Include="Ast\ExpressionCollectionBuilder.cs" /> + <Compile Include="Ast\FinallyFlowControlExpression.cs" /> + <Compile Include="Ast\FlowControlRewriter.cs" /> + <Compile Include="Ast\ILightExceptionAwareExpression.cs" /> + <Compile Include="Actions\ILightExceptionBinder.cs" /> + <Compile Include="Ast\LightCheckAndThrowExpression.cs" /> + <Compile Include="Ast\LightExceptionConvertingExpression.cs" /> + <Compile Include="Ast\LightLambdaExpression.cs" /> + <Compile Include="Ast\LightThrowExpression.cs" /> + <Compile Include="Debugging\CollectionUtils.cs" /> + <Compile Include="Debugging\CompilerServices\DebugLambdaInfo.cs" /> + <Compile Include="Debugging\CompilerServices\IDebugCompilerSupport.cs" /> + <Compile Include="Debugging\DebugContext.cs" /> + <Compile Include="Debugging\DebugContext.GeneratorLoopProc.cs" /> + <Compile Include="Debugging\DebugFrame.cs" /> + <Compile Include="Debugging\DebuggableLambdaBuilder.cs" /> + <Compile Include="Debugging\DebugGenerator.cs" /> + <Compile Include="Debugging\DebugInfoRewriter.cs" /> + <Compile Include="Debugging\DebugMode.cs" /> + <Compile Include="Debugging\DebugSourceFile.cs" /> + <Compile Include="Debugging\DebugSourceSpan.cs" /> + <Compile Include="Debugging\DebugThread.cs" /> + <Compile Include="Debugging\DefaultRuntimeVariablesImpl\DebugRuntimeVariables.cs" /> + <Compile Include="Debugging\DefaultRuntimeVariablesImpl\DefaultDebugThread.cs" /> + <Compile Include="Debugging\DefaultRuntimeVariablesImpl\DefaultDebugThreadFactory.cs" /> + <Compile Include="Debugging\DelegateHelpers.cs" /> + <Compile Include="Debugging\ForceToGeneratorLoopException.cs" /> + <Compile Include="Debugging\FunctionInfo.cs" /> + <Compile Include="Debugging\IDebugCallback.cs" /> + <Compile Include="Debugging\InvokeTargets.cs" /> + <Compile Include="Debugging\LambdaWalker.cs" /> + <Compile Include="Debugging\Microsoft.Scripting.Debugging.Generated.cs" /> + <Compile Include="Debugging\RuntimeOps.cs" /> + <Compile Include="Debugging\RuntimeVariablesSupport\IDebugRuntimeVariables.cs" /> + <Compile Include="Debugging\RuntimeVariablesSupport\IDebugThreadFactory.cs" /> + <Compile Include="Debugging\ScopedRuntimeVariables.cs" /> + <Compile Include="Debugging\ThreadLocal.cs" /> + <Compile Include="Debugging\TraceEventKind.cs" /> + <Compile Include="Debugging\TracePipeline\ITraceCallback.cs" /> + <Compile Include="Debugging\TracePipeline\ITracePipeline.cs" /> + <Compile Include="Debugging\TracePipeline\TracePipeline.cs" /> + <Compile Include="Debugging\VariableInfo.cs" /> + <Compile Include="Generation\SymbolGuids.cs" /> + <Compile Include="Utils\IRuntimeVariables.cs" /> + <Compile Include="Utils\ReadOnlyCollectionBuilder.cs" /> + <Compile Include="Utils\ThreadingUtils.cs" /> + <Compile Include="Utils\TypeMemberCache.cs" /> + <Compile Include="Xaml\DynamicXamlReader.cs" /> + <Compile Include="Runtime\LightThrowingAttribute.cs" /> + <Compile Include="Ast\LightExceptionRewriter.cs" /> + <Compile Include="Runtime\LightExceptions.cs" /> + <Compile Include="Ast\SourceFileInformation.cs" /> + <Compile Include="Ast\LightDynamicExpression.cs" /> + <Compile Include="Ast\Utils.cs" /> + <Compile Include="Ast\NewArrayExpression.cs" /> + <Compile Include="Ast\NewExpression.cs" /> + <Compile Include="Ast\UnaryExpression.cs" /> + <Compile Include="ComInterop\ArgBuilder.cs" /> + <Compile Include="ComInterop\BoolArgBuilder.cs" /> + <Compile Include="ComInterop\BoundDispEvent.cs" /> + <Compile Include="ComInterop\CollectionExtensions.cs" /> + <Compile Include="ComInterop\ComBinder.cs" /> + <Compile Include="ComInterop\ComBinderHelpers.cs" /> + <Compile Include="ComInterop\ComClassMetaObject.cs" /> + <Compile Include="ComInterop\ComDispIds.cs" /> + <Compile Include="ComInterop\ComEventDesc.cs" /> + <Compile Include="ComInterop\ComEventSink.cs" /> + <Compile Include="ComInterop\ComEventSinkProxy.cs" /> + <Compile Include="ComInterop\ComEventSinksContainer.cs" /> + <Compile Include="ComInterop\ComFallbackMetaObject.cs" /> + <Compile Include="ComInterop\ComHresults.cs" /> + <Compile Include="ComInterop\ComInterop.cs" /> + <Compile Include="ComInterop\ComInvokeAction.cs" /> + <Compile Include="ComInterop\ComInvokeBinder.cs" /> + <Compile Include="ComInterop\ComMetaObject.cs" /> + <Compile Include="ComInterop\ComMethodDesc.cs" /> + <Compile Include="ComInterop\ComObject.cs" /> + <Compile Include="ComInterop\ComParamDesc.cs" /> + <Compile Include="ComInterop\ComRuntimeHelpers.cs" /> + <Compile Include="ComInterop\ComType.cs" /> + <Compile Include="ComInterop\ComTypeClassDesc.cs" /> + <Compile Include="ComInterop\ComTypeDesc.cs" /> + <Compile Include="ComInterop\ComTypeEnumDesc.cs" /> + <Compile Include="ComInterop\ComTypeLibDesc.cs" /> + <Compile Include="ComInterop\ComTypeLibInfo.cs" /> + <Compile Include="ComInterop\ComTypeLibMemberDesc.cs" /> + <Compile Include="ComInterop\ConversionArgBuilder.cs" /> + <Compile Include="ComInterop\ConvertArgBuilder.cs" /> + <Compile Include="ComInterop\ConvertibleArgBuilder.cs" /> + <Compile Include="ComInterop\CurrencyArgBuilder.cs" /> + <Compile Include="ComInterop\DateTimeArgBuilder.cs" /> + <Compile Include="ComInterop\DispatchArgBuilder.cs" /> + <Compile Include="ComInterop\DispCallable.cs" /> + <Compile Include="ComInterop\DispCallableMetaObject.cs" /> + <Compile Include="ComInterop\ErrorArgBuilder.cs" /> + <Compile Include="ComInterop\Errors.cs" /> + <Compile Include="ComInterop\ExcepInfo.cs" /> + <Compile Include="ComInterop\Helpers.cs" /> + <Compile Include="ComInterop\IDispatchComObject.cs" /> + <Compile Include="ComInterop\IDispatchMetaObject.cs" /> + <Compile Include="ComInterop\IPseudoComObject.cs" /> + <Compile Include="ComInterop\NullArgBuilder.cs" /> + <Compile Include="ComInterop\SimpleArgBuilder.cs" /> + <Compile Include="ComInterop\SplatCallSite.cs" /> + <Compile Include="ComInterop\StringArgBuilder.cs" /> + <Compile Include="ComInterop\TypeEnumMetaObject.cs" /> + <Compile Include="ComInterop\TypeLibInfoMetaObject.cs" /> + <Compile Include="ComInterop\TypeLibMetaObject.cs" /> + <Compile Include="ComInterop\TypeUtils.cs" /> + <Compile Include="ComInterop\UnknownArgBuilder.cs" /> + <Compile Include="ComInterop\VarEnumSelector.cs" /> + <Compile Include="ComInterop\Variant.cs" /> + <Compile Include="ComInterop\VariantArgBuilder.cs" /> + <Compile Include="ComInterop\VariantArray.cs" /> + <Compile Include="ComInterop\VariantBuilder.cs" /> + <Compile Include="Generation\FieldBuilderExpression.cs" /> + <Compile Include="Hosting\Shell\ICommandDispatcher.cs" /> + <Compile Include="Hosting\Shell\Remote\ConsoleRestartManager.cs" /> + <Compile Include="Hosting\Shell\Remote\RemoteCommandDispatcher.cs" /> + <Compile Include="Hosting\Shell\Remote\RemoteConsoleCommandLine.cs" /> + <Compile Include="Hosting\Shell\Remote\RemoteConsoleHost.cs" /> + <Compile Include="Hosting\Shell\Remote\RemoteRuntimeServer.cs" /> + <Compile Include="Interpreter\BranchLabel.cs" /> + <Compile Include="Interpreter\Instructions\AddInstruction.cs" /> + <Compile Include="Interpreter\Instructions\ArrayOperations.cs" /> + <Compile Include="Interpreter\Instructions\CallInstruction.cs" /> + <Compile Include="Interpreter\Instructions\CallInstruction.Generated.cs" /> + <Compile Include="Interpreter\Instructions\ControlFlowInstructions.cs" /> + <Compile Include="Interpreter\Instructions\DivInstruction.cs" /> + <Compile Include="Interpreter\Instructions\DynamicSplatInstruction.cs" /> + <Compile Include="Interpreter\Instructions\EqualInstruction.cs" /> + <Compile Include="Interpreter\Instructions\FieldOperations.cs" /> + <Compile Include="Interpreter\Instructions\GreaterThanInstruction.cs" /> + <Compile Include="Interpreter\Instructions\InstructionFactory.cs" /> + <Compile Include="Interpreter\Instructions\LabelInfo.cs" /> + <Compile Include="Interpreter\Instructions\LessThanInstruction.cs" /> + <Compile Include="Interpreter\Instructions\LocalAccess.cs" /> + <Compile Include="Interpreter\Instructions\InstructionList.cs" /> + <Compile Include="Interpreter\Instructions\NotEqualInstruction.cs" /> + <Compile Include="Interpreter\Instructions\NumericConvertInstruction.cs" /> + <Compile Include="Interpreter\Instructions\StackOperations.cs" /> + <Compile Include="Interpreter\Instructions\TypeOperations.cs" /> + <Compile Include="Interpreter\ILightCallSiteBinder.cs" /> + <Compile Include="Interpreter\LightDelegateCreator.cs" /> + <Compile Include="Interpreter\LightLambda.Generated.cs" /> + <Compile Include="Interpreter\Interpreter.cs" /> + <Compile Include="Interpreter\Instructions\DynamicInstructions.Generated.cs" /> + <Compile Include="Interpreter\Instructions\DynamicInstructionN.cs" /> + <Compile Include="Interpreter\LightLambdaClosureVisitor.cs" /> + <Compile Include="Interpreter\LightLambda.cs" /> + <Compile Include="Interpreter\Instructions\Instruction.cs" /> + <Compile Include="Interpreter\LightCompiler.cs" /> + <Compile Include="Interpreter\LocalVariables.cs" /> + <Compile Include="Interpreter\LoopCompiler.cs" /> + <Compile Include="Interpreter\RuntimeVariables.cs" /> + <Compile Include="Interpreter\InterpretedFrame.cs" /> + <Compile Include="Math\BigIntegerV2.cs" /> + <Compile Include="Math\BigIntegerV4.cs" /> + <Compile Include="Runtime\ArgumentArray.cs" /> + <Compile Include="Runtime\BindingRestrictionsHelpers.cs" /> + <Compile Include="Runtime\DynamicDelegateCreator.cs" /> + <Compile Include="Runtime\DynamicNull.cs" /> + <Compile Include="Runtime\Generator.cs" /> + <Compile Include="Ast\GeneratorExpression.cs" /> + <Compile Include="Ast\GeneratorRewriter.cs" /> + <Compile Include="Actions\Calls\Candidate.cs" /> + <Compile Include="Ast\YieldExpression.cs" /> + <Compile Include="Generation\DelegateHelpers.cs" /> + <Compile Include="Generation\DelegateHelpers.Generated.cs" /> + <Compile Include="Generation\AssemblyGen.cs" /> + <Compile Include="Generation\ConstantCheck.cs" /> + <Compile Include="Generation\DynamicILGen.cs" /> + <Compile Include="Generation\ILGen.cs" /> + <Compile Include="Generation\KeyedQueue.cs" /> + <Compile Include="Generation\Snippets.cs" /> + <Compile Include="Generation\TypeGen.cs" /> + <Compile Include="Actions\ComboActionRewriter.cs" /> + <Compile Include="Actions\ComboBinder.cs" /> + <Compile Include="Actions\ConditionalBuilder.cs" /> + <Compile Include="Actions\DefaultBinder.Conversions.cs" /> + <Compile Include="Actions\DefaultBinder.DeleteMember.cs" /> + <Compile Include="Actions\DefaultBinder.GetMember.cs" /> + <Compile Include="Actions\DefaultBinder.Invoke.cs" /> + <Compile Include="Actions\DefaultBinder.MethodCalls.cs" /> + <Compile Include="Actions\DefaultBinder.SetMember.cs" /> + <Compile Include="Actions\DefaultBinder.cs" /> + <Compile Include="Actions\NoSideEffectsAttribute.cs" /> + <Compile Include="Actions\OperatorInfo.cs" /> + <Compile Include="Ast\BinaryExpression.cs" /> + <Compile Include="Ast\Block.cs" /> + <Compile Include="Ast\ConstantExpression.cs" /> + <Compile Include="Ast\EmptyStatements.cs" /> + <Compile Include="Ast\LambdaBuilder.cs" /> + <Compile Include="Ast\LambdaParameterRewriter.cs" /> + <Compile Include="Ast\LoopStatement.cs" /> + <Compile Include="Ast\MethodCallExpression.cs" /> + <Compile Include="Ast\TryStatementBuilder.cs" /> + <Compile Include="MultiRuntimeAwareAttribute.cs" /> + <Compile Include="PerfTrack.cs" /> + <Compile Include="Runtime\CompilerContext.cs" /> + <Compile Include="Runtime\DynamicLanguageProviderAttribute.cs" /> + <Compile Include="Runtime\IConvertibleMetaObject.cs" /> + <Compile Include="Runtime\ICustomScriptCodeData.cs" /> + <Compile Include="Runtime\IRestrictedMetaObject.cs" /> + <Compile Include="Runtime\LegacyScriptCode.cs" /> + <Compile Include="Runtime\MetaObjectExtensions.cs" /> + <Compile Include="Runtime\RestrictedMetaObject.cs" /> + <Compile Include="Runtime\SavableScriptCode.cs" /> + <Compile Include="Runtime\TokenizerBuffer.cs" /> + <Compile Include="Generation\MethodSignatureInfo.cs" /> + <Compile Include="Hosting\Shell\BasicConsole.cs" /> + <Compile Include="Hosting\Shell\CommandLine.cs" /> + <Compile Include="Hosting\Shell\ConsoleHost.cs" /> + <Compile Include="Hosting\Shell\ConsoleHostOptions.cs" /> + <Compile Include="Hosting\Shell\ConsoleHostOptionsParser.cs" /> + <Compile Include="Hosting\Shell\ConsoleOptions.cs" /> + <Compile Include="Hosting\Shell\IConsole.cs" /> + <Compile Include="Hosting\Shell\OptionsParser.cs" /> + <Compile Include="Hosting\Shell\Style.cs" /> + <Compile Include="Hosting\Shell\SuperConsole.cs" /> + <Compile Include="GlobalSuppressions.cs" /> + <Compile Include="Math\Complex64.cs" /> + <Compile Include="Properties\AssemblyInfo.cs" /> + <Compile Include="Runtime\AmbiguousFileNameException.cs" /> + <Compile Include="Runtime\BinderOps.cs" /> + <Compile Include="Runtime\CallTypes.cs" /> + <Compile Include="Runtime\Cast.Generated.cs" /> + <Compile Include="Runtime\Cast.cs" /> + <Compile Include="Runtime\CodeDomCodeGen.cs" /> + <Compile Include="Runtime\DelegateInfo.cs" /> + <Compile Include="Runtime\DelegateSignatureInfo.cs" /> + <Compile Include="Runtime\ISlice.cs" /> + <Compile Include="Runtime\IdDispenser.cs" /> + <Compile Include="Runtime\LanguageBoundTextContentProvider.cs" /> + <Compile Include="Runtime\LocalsDictionary.cs" /> + <Compile Include="Runtime\PositionTrackingWriter.cs" /> + <Compile Include="Runtime\ReturnFixer.cs" /> + <Compile Include="Runtime\SourceStringContentProvider.cs" /> + <Compile Include="Utils\CacheDict.cs" /> + <Compile Include="Utils\CollectionExtensions.cs" /> + <Compile Include="Utils\CopyOnWriteList.cs" /> + <Compile Include="Utils\DynamicUtils.cs" /> + <Compile Include="Utils\EnumUtils.cs" /> + <Compile Include="Utils\HybridReferenceDictionary.cs" /> + <Compile Include="Utils\ListEqualityComparer.cs" /> + <Compile Include="Utils\MathUtils.cs" /> + <Compile Include="Utils\MonitorUtils.cs" /> + <Compile Include="Utils\Publisher.cs" /> + <Compile Include="Utils\ReadOnlyDictionary.cs" /> + <Compile Include="Utils\ReferenceEqualityComparer.cs" /> + <Compile Include="Utils\HashSet.cs" /> + <Compile Include="Utils\SynchronizedDictionary.cs" /> + <Compile Include="Utils\ThreadLocal.cs" /> + <Compile Include="Utils\TypeUtils.cs" /> + <Compile Include="Utils\ValueArray.cs" /> + <Compile Include="Utils\WeakCollection.cs" /> + <Compile Include="Utils\WeakDictionary.cs" /> + <Compile Include="Utils\WeakHandle.cs" /> + <Compile Include="DebugOptions.cs" /> + <Compile Include="MutableTuple.cs" /> + <Compile Include="Actions\ActionBinder.cs" /> + <Compile Include="Actions\Argument.cs" /> + <Compile Include="Actions\ArgumentType.cs" /> + <Compile Include="Actions\BoundMemberTracker.cs" /> + <Compile Include="Actions\CallSignature.cs" /> + <Compile Include="Actions\ConstructorTracker.cs" /> + <Compile Include="Actions\CustomTracker.cs" /> + <Compile Include="Actions\ErrorInfo.cs" /> + <Compile Include="Actions\EventTracker.cs" /> + <Compile Include="Actions\ExtensionMethodTracker.cs" /> + <Compile Include="Actions\ExtensionPropertyTracker.cs" /> + <Compile Include="Actions\FieldTracker.cs" /> + <Compile Include="Actions\MemberGroup.cs" /> + <Compile Include="Actions\MemberTracker.cs" /> + <Compile Include="Actions\MethodGroup.cs" /> + <Compile Include="Actions\MethodTracker.cs" /> + <Compile Include="Actions\NamespaceTracker.cs" /> + <Compile Include="Actions\NestedTypeTracker.cs" /> + <Compile Include="Actions\PropertyTracker.cs" /> + <Compile Include="Actions\ReflectedPropertyTracker.cs" /> + <Compile Include="Actions\TopNamespaceTracker.cs" /> + <Compile Include="Actions\TrackerTypes.cs" /> + <Compile Include="Actions\TypeGroup.cs" /> + <Compile Include="Actions\TypeTracker.cs" /> + <Compile Include="Ast\DebugStatement.cs" /> + <Compile Include="Ast\IfStatementBuilder.cs" /> + <Compile Include="Ast\IfStatementTest.cs" /> + <Compile Include="Generation\CompilerHelpers.cs" /> + <Compile Include="Generation\IExpressionSerializable.cs" /> + <Compile Include="Generation\ToDiskRewriter.cs" /> + <Compile Include="Runtime\AssemblyTypeNames.cs" /> + <Compile Include="Runtime\BinderType.cs" /> + <Compile Include="Runtime\CallTargets.cs" /> + <Compile Include="Runtime\CustomStringDictionary.cs" /> + <Compile Include="Runtime\DlrCachedCodeAttribute.cs" /> + <Compile Include="Runtime\DocumentationAttribute.cs" /> + <Compile Include="Runtime\ExceptionHelpers.cs" /> + <Compile Include="Runtime\ExplicitConversionMethodAttribute.cs" /> + <Compile Include="Runtime\Extensible.cs" /> + <Compile Include="Runtime\ExtensionTypeAttribute.cs" /> + <Compile Include="Runtime\ExtraKeyEnumerator.cs" /> + <Compile Include="Runtime\IMembersList.cs" /> + <Compile Include="Runtime\ImplicitConversionMethodAttribute.cs" /> + <Compile Include="Runtime\ModuleChangeEventArgs.cs" /> + <Compile Include="Runtime\ModuleChangeEventType.cs" /> + <Compile Include="Runtime\NullTextContentProvider.cs" /> + <Compile Include="Runtime\OperationFailed.cs" /> + <Compile Include="Runtime\OperatorSlotAttribute.cs" /> + <Compile Include="Runtime\PropertyMethodAttribute.cs" /> + <Compile Include="Runtime\ReflectionCache.cs" /> + <Compile Include="Runtime\ScriptingRuntimeHelpers.cs" /> + <Compile Include="Runtime\StaticExtensionMethodAttribute.cs" /> + <Compile Include="Runtime\Uninitialized.cs" /> + <Compile Include="Utils\ArrayUtils.cs" /> + <Compile Include="Utils\AssemblyQualifiedTypeName.cs" /> + <Compile Include="Utils\Assert.cs" /> + <Compile Include="Utils\CheckedDictionaryEnumerator.cs" /> + <Compile Include="Utils\CollectionUtils.cs" /> + <Compile Include="Utils\ContractUtils.cs" /> + <Compile Include="Utils\DictionaryUnionEnumerator.cs" /> + <Compile Include="Utils\ExceptionFactory.Generated.cs" /> + <Compile Include="Utils\ExceptionUtils.cs" /> + <Compile Include="Utils\IOUtils.cs" /> + <Compile Include="Utils\ReflectionUtils.cs" /> + <Compile Include="Utils\StringUtils.cs" /> + <Compile Include="Utils\TextStream.cs" /> + <Compile Include="IValueEquality.cs" /> + <Compile Include="KeyboardInterruptException.cs" /> + <Compile Include="SourceFileContentProvider.cs" /> + <Compile Include="zlib.net\Adler32.cs" /> + <Compile Include="zlib.net\Deflate.cs" /> + <Compile Include="zlib.net\InfBlocks.cs" /> + <Compile Include="zlib.net\InfCodes.cs" /> + <Compile Include="zlib.net\Inflate.cs" /> + <Compile Include="zlib.net\InfTree.cs" /> + <Compile Include="zlib.net\StaticTree.cs" /> + <Compile Include="zlib.net\Tree.cs" /> + <Compile Include="zlib.net\Zlib.cs" /> + <Compile Include="zlib.net\ZStream.cs" /> + <Compile Include="zlib.net\ZStreamException.cs" /> + </ItemGroup> + <ItemGroup> + <Content Include="Microsoft.Scripting.txt" /> + <Content Include="zlib.net\history.txt" /> + <Content Include="zlib.net\license.txt" /> + <Content Include="zlib.net\readme.txt" /> + <None Include="Microsoft.Dynamic.ruleset" /> + </ItemGroup> + <ItemGroup Condition=" '$(IsFullFramework)' == 'true' "> + <Reference Include="System.Configuration" /> + <Reference Include="System.Runtime.Remoting" /> + </ItemGroup> + <ItemGroup Condition="'$(ReferencedPlatform)' == 'V4'"> + <Reference Include="System.Xaml" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\Microsoft.Scripting.Core\Microsoft.Scripting.Core.csproj" Condition="'$(FeatureCoreDlr)' != 'true'"> + <Project>{2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}</Project> + <Name>Microsoft.Scripting.Core</Name> + <Private>False</Private> + </ProjectReference> + <ProjectReference Include="..\Microsoft.Scripting\Microsoft.Scripting.csproj"> + <Project>{02FF0909-F5AD-48CF-A86A-345E721B7E40}</Project> + <Name>Microsoft.Scripting</Name> + </ProjectReference> + <ProjectReference Include="..\Microsoft.Scripting.Metadata\Microsoft.Scripting.Metadata.csproj" Condition=" '$(IsFullFramework)' == 'true' "> + <Project>{ACDD9B9E-8FE6-439C-9521-1CCBA47F6143}</Project> + <Name>Microsoft.Scripting.Metadata</Name> + </ProjectReference> + </ItemGroup> + <Import Project="$(CSharpTargets)" /> +</Project>
\ No newline at end of file diff --git a/mcs/class/dlr/Runtime/Microsoft.Dynamic/Properties/AssemblyInfo.cs b/mcs/class/dlr/Runtime/Microsoft.Dynamic/Properties/AssemblyInfo.cs index 1d07e6bce67..76977f57cd2 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Dynamic/Properties/AssemblyInfo.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Dynamic/Properties/AssemblyInfo.cs @@ -18,7 +18,6 @@ using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Security; -using System.Security.Permissions; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information @@ -28,7 +27,7 @@ using System.Security.Permissions; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] [assembly: AssemblyProduct("Microsoft.Scripting")] -[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")] +[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -51,23 +50,21 @@ using System.Security.Permissions; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -#if !CLR2 && !SILVERLIGHT -[assembly: SecurityRules(SecurityRuleSet.Level1)] +#if !CLR2 && !SILVERLIGHT && !WIN8 && !ANDROID && !WP75 +[assembly: System.Security.SecurityRules(SecurityRuleSet.Level1)] #endif [assembly: SecurityTransparent] [assembly: System.Resources.NeutralResourcesLanguage("en-US")] - -#if SIGNED -[assembly: InternalsVisibleTo("TestInternalDLR, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")] -#else -[assembly: InternalsVisibleTo("TestInternalDLR")] -#endif +[assembly: InternalsVisibleTo("TestInternalDLR, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c10ce00dd2e0ce5046d68183d3ad035b47e92bf0ce7bcf8a03a217ca5d0b0c7db973fdf97579b52b502a23d4069dbf043389e1ab65a1d6c508a9837f3e2350f15e05cc63c0fc4b0410867a51919090e4c33f80203e9b0035b21c32bae20f98b068f90d99a50133a5336480d94039b176519f5fd8524765f33be43da65c4b68ba")] #if !SILVERLIGHT -[assembly: AssemblyVersion("1.1.0.10")] -[assembly: AssemblyFileVersion("1.1.0.10")] +[assembly: AssemblyVersion("1.1.0.30")] +[assembly: AssemblyFileVersion("1.1.0.30")] [assembly: AssemblyInformationalVersion("1.1")] +#endif + +#if !SILVERLIGHT && !WP75 [assembly: AllowPartiallyTrustedCallers] [assembly: TypeForwardedTo(typeof(Microsoft.Scripting.Runtime.DynamicStackFrame))] #endif diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/BinaryOperationBinder.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/BinaryOperationBinder.cs index 0b55a9e2cd5..9260938dfa1 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/BinaryOperationBinder.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/BinaryOperationBinder.cs @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#if CLR2 +#if !FEATURE_CORE_DLR using Microsoft.Scripting.Ast; #else using System.Linq.Expressions; diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/BindingRestrictions.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/BindingRestrictions.cs index f4fd62fa89a..bf395abba53 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/BindingRestrictions.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/BindingRestrictions.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#if CLR2 +#if !FEATURE_CORE_DLR using Microsoft.Scripting.Ast; #else using System.Linq.Expressions; @@ -30,9 +30,7 @@ namespace System.Dynamic { /// <summary> /// Represents a set of binding restrictions on the <see cref="DynamicMetaObject"/>under which the dynamic binding is valid. /// </summary> -#if !SILVERLIGHT [DebuggerTypeProxy(typeof(BindingRestrictionsProxy)), DebuggerDisplay("{DebugView}")] -#endif public abstract class BindingRestrictions { /// <summary> /// Represents an empty set of binding restrictions. This field is read only. @@ -282,7 +280,7 @@ namespace System.Dynamic { } public override int GetHashCode() { - return InstanceRestrictionHash ^ RuntimeHelpers.GetHashCode(_instance) ^ _expression.GetHashCode(); + return InstanceRestrictionHash ^ ReferenceEqualityComparer<object>.Instance.GetHashCode(_instance) ^ _expression.GetHashCode(); } internal override Expression GetExpression() { diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/CallInfo.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/CallInfo.cs index 0bb62542ac6..27289d49252 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/CallInfo.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/CallInfo.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -13,14 +13,11 @@ * * ***************************************************************************/ -#if CLR2 +#if !FEATURE_CORE_DLR using Microsoft.Scripting.Ast; #else using System.Linq.Expressions; #endif -#if SILVERLIGHT -using System.Core; -#endif using System.Collections.Generic; using System.Collections.ObjectModel; diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/CallSite.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/CallSite.cs index 9dd1f34e65f..5ec58814184 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/CallSite.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/CallSite.cs @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#if CLR2 +#if !FEATURE_CORE_DLR using Microsoft.Scripting.Ast; using Microsoft.Scripting.Ast.Compiler; using Microsoft.Scripting.Utils; @@ -22,10 +22,6 @@ using System.Linq.Expressions; using System.Linq.Expressions.Compiler; #endif -#if SILVERLIGHT -using System.Core; -#endif - using System.Collections.Generic; using System.Collections.ObjectModel; using System.Diagnostics; diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/CallSiteBinder.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/CallSiteBinder.cs index 03fb5d15a90..ccf1134dfa8 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/CallSiteBinder.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/CallSiteBinder.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -13,14 +13,11 @@ * * ***************************************************************************/ -#if CLR2 +#if !FEATURE_CORE_DLR using Microsoft.Scripting.Ast; #else using System.Linq.Expressions; #endif -#if SILVERLIGHT -using System.Core; -#endif using System.Collections.Generic; using System.Collections.ObjectModel; @@ -139,7 +136,7 @@ namespace System.Runtime.CompilerServices { // // finally produce the new rule if we need to // -#if !CLR2 && !SILVERLIGHT +#if !CLR2 && !SILVERLIGHT && !ANDROID && !WP75 // We cannot compile rules in the heterogeneous app domains since they // may come from less trusted sources // Silverlight always uses a homogenous appdomain, so we don’t need this check diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/CallSiteHelpers.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/CallSiteHelpers.cs index 38e177d1546..2bb42801830 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/CallSiteHelpers.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/CallSiteHelpers.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/CallSiteOps.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/CallSiteOps.cs index f13a29b0fc0..7b66829d342 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/CallSiteOps.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/CallSiteOps.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/DeleteIndexBinder.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/DeleteIndexBinder.cs index e2523a5d0e5..1cf5abf7498 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/DeleteIndexBinder.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/DeleteIndexBinder.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/DynamicMetaObject.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/DynamicMetaObject.cs index 96ffe2aecda..5db80654ba1 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/DynamicMetaObject.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/DynamicMetaObject.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -13,15 +13,13 @@ * * ***************************************************************************/ -#if CLR2 +#if !FEATURE_CORE_DLR using Microsoft.Scripting.Ast; #else using System.Linq.Expressions; #endif -#if SILVERLIGHT -using System.Core; -#else +#if FEATURE_REMOTING using System.Runtime.Remoting; #endif @@ -311,7 +309,7 @@ namespace System.Dynamic { ContractUtils.RequiresNotNull(expression, "expression"); IDynamicMetaObjectProvider ido = value as IDynamicMetaObjectProvider; -#if !SILVERLIGHT +#if FEATURE_REMOTING if (ido != null && !RemotingServices.IsObjectOutOfAppDomain(value)) { #else if (ido != null) { diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/DynamicMetaObjectBinder.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/DynamicMetaObjectBinder.cs index 7aece9c5a03..899c45338d3 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/DynamicMetaObjectBinder.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/DynamicMetaObjectBinder.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#if CLR2 +#if !FEATURE_CORE_DLR using Microsoft.Scripting.Ast; using Microsoft.Scripting.Ast.Compiler; #else @@ -21,9 +21,7 @@ using System.Linq.Expressions; using System.Linq.Expressions.Compiler; #endif -#if SILVERLIGHT -using System.Core; -#else +#if FEATURE_REMOTING using System.Runtime.Remoting; #endif @@ -166,8 +164,7 @@ namespace System.Dynamic { } private static BindingRestrictions AddRemoteObjectRestrictions(BindingRestrictions restrictions, object[] args, ReadOnlyCollection<ParameterExpression> parameters) { -#if !SILVERLIGHT - +#if FEATURE_REMOTING for (int i = 0; i < parameters.Count; i++) { var expr = parameters[i]; var value = args[i] as MarshalByRefObject; @@ -203,7 +200,6 @@ namespace System.Dynamic { restrictions = restrictions.Merge(remotedRestriction); } } - #endif return restrictions; } @@ -279,7 +275,7 @@ namespace System.Dynamic { } } -#if !SILVERLIGHT +#if FEATURE_COM private static readonly Type ComObjectType = typeof(object).Assembly.GetType("System.__ComObject"); private static bool IsComObject(object obj) { // we can't use System.Runtime.InteropServices.Marshal.IsComObject(obj) since it doesn't work in partial trust diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/DynamicObject.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/DynamicObject.cs index 5d0bdf6c83a..71341f5bc2d 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/DynamicObject.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/DynamicObject.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#if CLR2 +#if !FEATURE_CORE_DLR using Microsoft.Scripting.Ast; #else using System.Linq.Expressions; diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/ExpandoClass.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/ExpandoClass.cs index 8e8afbe4d67..927dab7fbf1 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/ExpandoClass.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/ExpandoClass.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/ExpandoObject.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/ExpandoObject.cs index 0eb1fcbc28f..5f452afc3f4 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/ExpandoObject.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/ExpandoObject.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -13,15 +13,12 @@ * * ***************************************************************************/ -#if CLR2 +#if !FEATURE_CORE_DLR using Microsoft.Scripting.Ast; using Microsoft.Scripting.Utils; #else using System.Linq.Expressions; #endif -#if SILVERLIGHT -using System.Core; -#endif using System.Collections.Generic; using System.ComponentModel; diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/GetIndexBinder.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/GetIndexBinder.cs index 730c027c09e..56f625968b3 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/GetIndexBinder.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/GetIndexBinder.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/GetMemberBinder.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/GetMemberBinder.cs index edda8e66800..f02ca86ab2b 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/GetMemberBinder.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/GetMemberBinder.cs @@ -83,7 +83,7 @@ namespace System.Dynamic { /// <param name="target">The target of the dynamic get member operation.</param> /// <param name="args">An array of arguments of the dynamic get member operation.</param> /// <returns>The <see cref="DynamicMetaObject"/> representing the result of the binding.</returns> - public sealed override DynamicMetaObject Bind(DynamicMetaObject target, DynamicMetaObject[] args) { + public sealed override DynamicMetaObject Bind(DynamicMetaObject target, params DynamicMetaObject[] args) { ContractUtils.RequiresNotNull(target, "target"); ContractUtils.Requires(args == null || args.Length == 0, "args"); diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/IDynamicMetaObjectProvider.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/IDynamicMetaObjectProvider.cs index b4314cbdff8..2977c2cb1bf 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/IDynamicMetaObjectProvider.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/IDynamicMetaObjectProvider.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -13,10 +13,10 @@ * * ***************************************************************************/ -#if CLR2 -using Microsoft.Scripting.Ast; -#else +#if FEATURE_CORE_DLR using System.Linq.Expressions; +#else +using Microsoft.Scripting.Ast; #endif namespace System.Dynamic { diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/SetIndexBinder.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/SetIndexBinder.cs index ea123b86321..f1e8952bef3 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/SetIndexBinder.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/SetIndexBinder.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/UnaryOperationBinder.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/UnaryOperationBinder.cs index 46c704686df..5d5d45c1a91 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/UnaryOperationBinder.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/UnaryOperationBinder.cs @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#if CLR2 +#if !FEATURE_CORE_DLR using Microsoft.Scripting.Ast; #else using System.Linq.Expressions; diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/UpdateDelegates.Generated.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/UpdateDelegates.Generated.cs index 70a1b92b4f4..3143d6e4efb 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/UpdateDelegates.Generated.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Actions/UpdateDelegates.Generated.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -12,7 +12,7 @@ * * * ***************************************************************************/ -#if CLR2 +#if !FEATURE_CORE_DLR using Microsoft.Scripting.Utils; #endif diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/BinaryExpression.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/BinaryExpression.cs index 845e91a2075..28d06baa662 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/BinaryExpression.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/BinaryExpression.cs @@ -20,11 +20,7 @@ using System.Diagnostics; using System.Dynamic.Utils; using System.Reflection; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { @@ -33,9 +29,7 @@ namespace System.Linq.Expressions { /// <summary> /// Represents an expression that has a binary operator. /// </summary> -#if !SILVERLIGHT [DebuggerTypeProxy(typeof(Expression.BinaryExpressionProxy))] -#endif public class BinaryExpression : Expression { private readonly Expression _left; private readonly Expression _right; diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/BlockExpression.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/BlockExpression.cs index 1867f3ff056..372b05ec9da 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/BlockExpression.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/BlockExpression.cs @@ -20,11 +20,7 @@ using System.Diagnostics; using System.Dynamic.Utils; using System.Threading; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { @@ -32,9 +28,7 @@ namespace System.Linq.Expressions { /// <summary> /// Represents a block that contains a sequence of expressions where variables can be defined. /// </summary> -#if !SILVERLIGHT [DebuggerTypeProxy(typeof(Expression.BlockExpressionProxy))] -#endif public class BlockExpression : Expression { /// <summary> /// Gets the expressions in this block. diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/CatchBlock.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/CatchBlock.cs index 6993ba5bdbe..08e2ab59502 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/CatchBlock.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/CatchBlock.cs @@ -17,11 +17,7 @@ using System; using System.Diagnostics; using System.Dynamic.Utils; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { @@ -31,9 +27,7 @@ namespace System.Linq.Expressions { /// Represents a catch statement in a try block. /// This must have the same return type (i.e., the type of <see cref="P:CatchBlock.Body"/>) as the try block it is associated with. /// </summary> -#if !SILVERLIGHT [DebuggerTypeProxy(typeof(Expression.CatchBlockProxy))] -#endif public sealed class CatchBlock { private readonly Type _test; private readonly ParameterExpression _var; diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/ConditionalExpression.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/ConditionalExpression.cs index 8f49f0f88c4..32d108d08ae 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/ConditionalExpression.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/ConditionalExpression.cs @@ -17,11 +17,7 @@ using System; using System.Dynamic.Utils; using System.Diagnostics; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { @@ -30,9 +26,7 @@ namespace System.Linq.Expressions { /// <summary> /// Represents an expression that has a conditional operator. /// </summary> -#if !SILVERLIGHT [DebuggerTypeProxy(typeof(Expression.ConditionalExpressionProxy))] -#endif public class ConditionalExpression : Expression { private readonly Expression _test; private readonly Expression _true; diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/ConstantExpression.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/ConstantExpression.cs index e338aa71330..b4c3c7b3ceb 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/ConstantExpression.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/ConstantExpression.cs @@ -21,7 +21,7 @@ using System.Dynamic.Utils; using System.Core; #endif -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { @@ -30,9 +30,7 @@ namespace System.Linq.Expressions { /// <summary> /// Represents an expression that has a constant value. /// </summary> -#if !SILVERLIGHT [DebuggerTypeProxy(typeof(Expression.ConstantExpressionProxy))] -#endif public class ConstantExpression : Expression { // Possible optimization: we could have a Constant<T> subclass that // stores the unboxed value. diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/DebugInfoExpression.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/DebugInfoExpression.cs index 9f3c3ff15c8..dd5121a5246 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/DebugInfoExpression.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/DebugInfoExpression.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -17,11 +17,7 @@ using System; using System.Diagnostics; using System.Dynamic.Utils; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { @@ -32,9 +28,7 @@ namespace System.Linq.Expressions { /// This allows the debugger to highlight the correct source code when /// debugging. /// </summary> -#if !SILVERLIGHT [DebuggerTypeProxy(typeof(Expression.DebugInfoExpressionProxy))] -#endif public class DebugInfoExpression : Expression { private readonly SymbolDocumentInfo _document; diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/DebugViewWriter.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/DebugViewWriter.cs index 9ad865fc812..098126a383b 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/DebugViewWriter.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/DebugViewWriter.cs @@ -24,7 +24,7 @@ using System.Reflection; using System.Runtime.CompilerServices; using System.Collections.ObjectModel; -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/DefaultExpression.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/DefaultExpression.cs index 2355f3bd1b8..5234bf84465 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/DefaultExpression.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/DefaultExpression.cs @@ -16,7 +16,7 @@ using System; using System.Diagnostics; -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { @@ -24,9 +24,7 @@ namespace System.Linq.Expressions { /// <summary> /// Represents the default value of a type or an empty expression. /// </summary> -#if !SILVERLIGHT [DebuggerTypeProxy(typeof(Expression.DefaultExpressionProxy))] -#endif public sealed class DefaultExpression : Expression { private readonly Type _type; diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/DynamicExpression.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/DynamicExpression.cs index 4358c758658..14a8d8e5593 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/DynamicExpression.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/DynamicExpression.cs @@ -21,11 +21,7 @@ using System.Dynamic.Utils; using System.Reflection; using System.Runtime.CompilerServices; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { @@ -35,9 +31,7 @@ namespace System.Linq.Expressions { /// <summary> /// Represents a dynamic operation. /// </summary> -#if !SILVERLIGHT [DebuggerTypeProxy(typeof(Expression.DynamicExpressionProxy))] -#endif public class DynamicExpression : Expression, IArgumentProvider { private readonly CallSiteBinder _binder; private readonly Type _delegateType; diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/ElementInit.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/ElementInit.cs index d4e376e3194..21f87689d6a 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/ElementInit.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/ElementInit.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -20,11 +20,7 @@ using System.Reflection; using System.Text; using System.Dynamic.Utils; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/Expression.DebuggerProxy.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/Expression.DebuggerProxy.cs index 81bfaaab3bf..3d1d6c9e352 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/Expression.DebuggerProxy.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/Expression.DebuggerProxy.cs @@ -18,12 +18,11 @@ using System.Collections.ObjectModel; using System.Reflection; using System.Runtime.CompilerServices; -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { #endif -#if !SILVERLIGHT public partial class Expression { #region Generated Expression Debugger Proxies @@ -453,5 +452,4 @@ namespace System.Linq.Expressions { #endregion } -#endif } diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/Expression.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/Expression.cs index 045844fac73..21005b217c7 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/Expression.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/Expression.cs @@ -23,11 +23,7 @@ using System.Reflection; using System.Runtime.CompilerServices; using System.Threading; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { using Microsoft.Scripting.Utils; #else @@ -45,7 +41,7 @@ namespace System.Linq.Expressions { // LINQ protected ctor from 3.5 -#if !CLR2 // needs ConditionWeakTable in 4.0 + // needs ConditionWeakTable in 4.0 // For 4.0, many frequently used Expression nodes have had their memory // footprint reduced by removing the Type and NodeType fields. This has @@ -84,7 +80,6 @@ namespace System.Linq.Expressions { _legacyCtorSupportTable.Add(this, new ExtensionInfo(nodeType, type)); } -#endif /// <summary> /// Constructs a new instance of <see cref="Expression"/>. @@ -97,12 +92,11 @@ namespace System.Linq.Expressions { /// </summary> public virtual ExpressionType NodeType { get { -#if !CLR2 ExtensionInfo extInfo; if (_legacyCtorSupportTable != null && _legacyCtorSupportTable.TryGetValue(this, out extInfo)) { return extInfo.NodeType; } -#endif + // the extension expression failed to override NodeType throw Error.ExtensionNodeMustOverrideProperty("Expression.NodeType"); } @@ -115,12 +109,11 @@ namespace System.Linq.Expressions { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1721:PropertyNamesShouldNotMatchGetMethods")] public virtual Type Type { get { -#if !CLR2 ExtensionInfo extInfo; if (_legacyCtorSupportTable != null && _legacyCtorSupportTable.TryGetValue(this, out extInfo)) { return extInfo.Type; } -#endif + // the extension expression failed to override Type throw Error.ExtensionNodeMustOverrideProperty("Expression.Type"); } @@ -224,7 +217,7 @@ namespace System.Linq.Expressions { return ExpressionStringBuilder.ExpressionToString(this); } -#if CLR2 +#if !FEATURE_CORE_DLR /// <summary> /// Writes a <see cref="String"/> representation of the <see cref="Expression"/> to a <see cref="TextWriter"/>. /// </summary> @@ -326,16 +319,6 @@ namespace System.Linq.Expressions { return ((ReadOnlyCollection<T>)collectionOrT)[0]; } -#if SILVERLIGHT -#if !CLR2 - // Quirks mode for Expression Trees as they existed in Silverlight 2 and 3 - internal readonly static bool SilverlightQuirks = - AppDomain.CurrentDomain.IsCompatibilitySwitchSet("APP_EARLIER_THAN_SL4.0").GetValueOrDefault(); -#else - internal readonly static bool SilverlightQuirks = true; -#endif -#endif - private static void RequiresCanRead(Expression expression, string paramName) { if (expression == null) { throw new ArgumentNullException(paramName); diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/ExpressionStringBuilder.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/ExpressionStringBuilder.cs index 34f9f3bb5db..abfd257c385 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/ExpressionStringBuilder.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/ExpressionStringBuilder.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -22,8 +22,9 @@ using System.Globalization; using System.Reflection; using System.Runtime.CompilerServices; using System.Text; +using Microsoft.Scripting.Utils; -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { @@ -237,22 +238,13 @@ namespace System.Linq.Expressions { // "&&" and "||". Oops. case ExpressionType.AndAlso: op = "AndAlso"; -#if SILVERLIGHT - if (Expression.SilverlightQuirks) op = "&&"; -#endif break; case ExpressionType.OrElse: op = "OrElse"; -#if SILVERLIGHT - if (Expression.SilverlightQuirks) op = "||"; -#endif break; case ExpressionType.Assign: op = "="; break; case ExpressionType.Equal: op = "=="; -#if SILVERLIGHT - if (Expression.SilverlightQuirks) op = "="; -#endif break; case ExpressionType.NotEqual: op = "!="; break; case ExpressionType.GreaterThan: op = ">"; break; @@ -331,12 +323,6 @@ namespace System.Linq.Expressions { } string name = node.Name; if (String.IsNullOrEmpty(name)) { -#if SILVERLIGHT - if (Expression.SilverlightQuirks) { - Out(name ?? "<param>"); - return node; - } -#endif Out("Param_" + GetParamId(node)); } else { Out(name); @@ -492,9 +478,6 @@ namespace System.Linq.Expressions { protected override ElementInit VisitElementInit(ElementInit initializer) { Out(initializer.AddMethod.ToString()); string sep = ", "; -#if SILVERLIGHT - if (Expression.SilverlightQuirks) sep = ","; -#endif VisitExpressions('(', initializer.Arguments, ')', sep); return initializer; } @@ -503,9 +486,6 @@ namespace System.Linq.Expressions { Out("Invoke("); Visit(node.Expression); string sep = ", "; -#if SILVERLIGHT - if (Expression.SilverlightQuirks) sep = ","; -#endif for (int i = 0, n = node.Arguments.Count; i < n; i++) { Out(sep); Visit(node.Arguments[i]); @@ -554,26 +534,6 @@ namespace System.Linq.Expressions { return node; } -#if SILVERLIGHT - private static PropertyInfo GetPropertyNoThrow(MethodInfo method) { - if (method == null) - return null; - Type type = method.DeclaringType; - BindingFlags flags = BindingFlags.Public | BindingFlags.NonPublic; - flags |= (method.IsStatic) ? BindingFlags.Static : BindingFlags.Instance; - PropertyInfo[] props = type.GetProperties(flags); - foreach (PropertyInfo pi in props) { - if (pi.CanRead && method == pi.GetGetMethod(true)) { - return pi; - } - if (pi.CanWrite && method == pi.GetSetMethod(true)) { - return pi; - } - } - return null; - } -#endif - protected internal override Expression VisitNew(NewExpression node) { Out("new " + node.Type.Name); Out("("); @@ -584,15 +544,6 @@ namespace System.Linq.Expressions { } if (members != null) { string name = members[i].Name; -#if SILVERLIGHT - // Members can be the get/set methods rather than the fields/properties - PropertyInfo pi = null; - if (Expression.SilverlightQuirks && - members[i].MemberType == MemberTypes.Method && - (pi = GetPropertyNoThrow((MethodInfo)members[i])) != null) { - name = pi.Name; - } -#endif Out(name); Out(" = "); } @@ -777,7 +728,7 @@ namespace System.Linq.Expressions { protected internal override Expression VisitExtension(Expression node) { // Prefer an overriden ToString, if available. var flags = BindingFlags.Public | BindingFlags.Instance | BindingFlags.ExactBinding; - var toString = node.GetType().GetMethod("ToString", flags, null, Type.EmptyTypes, null); + var toString = node.GetType().GetMethod("ToString", flags, null, ReflectionUtils.EmptyTypes, null); if (toString.DeclaringType != typeof(Expression)) { Out(node.ToString()); return node; diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/ExpressionType.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/ExpressionType.cs index 11fbb1dcd4a..1e3e64cbaa5 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/ExpressionType.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/ExpressionType.cs @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/ExpressionVisitor.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/ExpressionVisitor.cs index 179152bc027..07c1201ddeb 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/ExpressionVisitor.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/ExpressionVisitor.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -19,11 +19,7 @@ using System.Diagnostics; using System.Dynamic.Utils; using System.Runtime.CompilerServices; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { using Microsoft.Scripting.Utils; #else diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/GotoExpression.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/GotoExpression.cs index 0bd9827096a..7fa8c9a61b7 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/GotoExpression.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/GotoExpression.cs @@ -17,11 +17,7 @@ using System; using System.Diagnostics; using System.Dynamic.Utils; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { @@ -51,9 +47,7 @@ namespace System.Linq.Expressions { /// <summary> /// Represents an unconditional jump. This includes return statements, break and continue statements, and other jumps. /// </summary> -#if !SILVERLIGHT [DebuggerTypeProxy(typeof(Expression.GotoExpressionProxy))] -#endif public sealed class GotoExpression : Expression { private readonly GotoExpressionKind _kind; private readonly Expression _value; diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/IArgumentProvider.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/IArgumentProvider.cs index 6dc58ea1765..af67d2bebb6 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/IArgumentProvider.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/IArgumentProvider.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -17,7 +17,7 @@ using System; using System.Collections.Generic; using System.Text; -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { using Microsoft.Scripting.Utils; #else diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/IndexExpression.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/IndexExpression.cs index 1bbf207cb11..b0498c9ebd0 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/IndexExpression.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/IndexExpression.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -22,11 +22,7 @@ using System.Reflection; using System.Runtime.CompilerServices; using System.Text; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { @@ -34,9 +30,7 @@ namespace System.Linq.Expressions { /// <summary> /// Represents indexing a property or array. /// </summary> -#if !SILVERLIGHT [DebuggerTypeProxy(typeof(Expression.IndexExpressionProxy))] -#endif public sealed class IndexExpression : Expression, IArgumentProvider { private readonly Expression _instance; private readonly PropertyInfo _indexer; diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/InvocationExpression.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/InvocationExpression.cs index 05501f42d93..2dfdb3a6be7 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/InvocationExpression.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/InvocationExpression.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -20,11 +20,7 @@ using System.Diagnostics; using System.Dynamic.Utils; using System.Reflection; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { @@ -32,9 +28,7 @@ namespace System.Linq.Expressions { /// <summary> /// Represents an expression that applies a delegate or lambda expression to a list of argument expressions. /// </summary> -#if !SILVERLIGHT [DebuggerTypeProxy(typeof(Expression.InvocationExpressionProxy))] -#endif public sealed class InvocationExpression : Expression, IArgumentProvider { private IList<Expression> _arguments; private readonly Expression _lambda; diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/LabelExpression.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/LabelExpression.cs index 86fc3dfdb40..513b0c4df55 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/LabelExpression.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/LabelExpression.cs @@ -16,7 +16,7 @@ using System; using System.Diagnostics; -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { @@ -27,9 +27,7 @@ namespace System.Linq.Expressions { /// <see cref="GotoExpression"/>. Otherwise, it gets the value in <see cref="LabelExpression.DefaultValue"/>. If the /// <see cref="Type"/> equals System.Void, no value should be provided. /// </summary> -#if !SILVERLIGHT [DebuggerTypeProxy(typeof(Expression.LabelExpressionProxy))] -#endif public sealed class LabelExpression : Expression { private readonly Expression _defaultValue; private readonly LabelTarget _target; diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/LabelTarget.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/LabelTarget.cs index b9c814995b3..3385dbde64d 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/LabelTarget.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/LabelTarget.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -16,7 +16,7 @@ using System; using System.Dynamic.Utils; -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/LambdaExpression.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/LambdaExpression.cs index 7a53dd04c27..5667f889738 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/LambdaExpression.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/LambdaExpression.cs @@ -23,11 +23,7 @@ using System.Reflection.Emit; using System.Threading; using System.Runtime.CompilerServices; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { @@ -41,9 +37,7 @@ namespace System.Linq.Expressions { /// <remarks> /// Lambda expressions take input through parameters and are expected to be fully bound. /// </remarks> -#if !SILVERLIGHT [DebuggerTypeProxy(typeof(Expression.LambdaExpressionProxy))] -#endif public abstract class LambdaExpression : Expression { private readonly string _name; private readonly Expression _body; @@ -68,6 +62,8 @@ namespace System.Linq.Expressions { _tailCall = tailCall; } + internal abstract LambdaExpression Accept(StackSpiller spiller); + /// <summary> /// Gets the static type of the expression that this <see cref="Expression" /> represents. (Inherited from <see cref="Expression"/>.) /// </summary> @@ -139,6 +135,7 @@ namespace System.Linq.Expressions { return LambdaCompiler.Compile(this, debugInfoGenerator); } +#if FEATURE_REFEMIT /// <summary> /// Compiles the lambda into a method definition. /// </summary> @@ -165,8 +162,7 @@ namespace System.Linq.Expressions { LambdaCompiler.Compile(this, method, debugInfoGenerator); } - - internal abstract LambdaExpression Accept(StackSpiller spiller); +#endif } /// <summary> diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/ListArgumentProvider.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/ListArgumentProvider.cs index 5d2292b46bc..da57959aa6d 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/ListArgumentProvider.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/ListArgumentProvider.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -18,7 +18,7 @@ using System.Collections.Generic; using System.Text; using System.Dynamic.Utils; -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/ListInitExpression.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/ListInitExpression.cs index 0b8125a7086..023fd1f3ad9 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/ListInitExpression.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/ListInitExpression.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -21,11 +21,7 @@ using System.Dynamic.Utils; using System.Reflection; using System.Runtime.CompilerServices; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { @@ -37,9 +33,7 @@ namespace System.Linq.Expressions { /// Use the <see cref="M:ListInit"/> factory methods to create a ListInitExpression. /// The value of the NodeType property of a ListInitExpression is ListInit. /// </remarks> -#if !SILVERLIGHT [DebuggerTypeProxy(typeof(Expression.ListInitExpressionProxy))] -#endif public sealed class ListInitExpression : Expression { private readonly NewExpression _newExpression; private readonly ReadOnlyCollection<ElementInit> _initializers; diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/LoopExpression.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/LoopExpression.cs index 5c216ab2d94..f9801246150 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/LoopExpression.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/LoopExpression.cs @@ -17,11 +17,7 @@ using System; using System.Diagnostics; using System.Dynamic.Utils; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { @@ -29,9 +25,7 @@ namespace System.Linq.Expressions { /// <summary> /// Represents an infinite loop. It can be exited with "break". /// </summary> -#if !SILVERLIGHT [DebuggerTypeProxy(typeof(Expression.LoopExpressionProxy))] -#endif public sealed class LoopExpression : Expression { private readonly Expression _body; private readonly LabelTarget _break; diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/MemberAssignment.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/MemberAssignment.cs index d08a85ce55d..b5b205444eb 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/MemberAssignment.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/MemberAssignment.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -17,11 +17,7 @@ using System; using System.Dynamic.Utils; using System.Reflection; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { @@ -108,4 +104,4 @@ namespace System.Linq.Expressions { } } } -} +}
\ No newline at end of file diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/MemberBinding.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/MemberBinding.cs index fdeafaf79ae..c9d7ed846a9 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/MemberBinding.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/MemberBinding.cs @@ -16,7 +16,7 @@ using System; using System.Reflection; -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { @@ -79,4 +79,4 @@ namespace System.Linq.Expressions { return ExpressionStringBuilder.MemberBindingToString(this); } } -} +}
\ No newline at end of file diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/MemberExpression.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/MemberExpression.cs index e314cda8456..0c06640e32c 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/MemberExpression.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/MemberExpression.cs @@ -18,11 +18,7 @@ using System.Diagnostics; using System.Dynamic.Utils; using System.Reflection; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { @@ -31,9 +27,7 @@ namespace System.Linq.Expressions { /// <summary> /// Represents accessing a field or property. /// </summary> -#if !SILVERLIGHT [DebuggerTypeProxy(typeof(Expression.MemberExpressionProxy))] -#endif public class MemberExpression : Expression { private readonly Expression _expression; diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/MemberInitExpression.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/MemberInitExpression.cs index 2eb7fe33db0..04cdd20785f 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/MemberInitExpression.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/MemberInitExpression.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -20,7 +20,7 @@ using System.Diagnostics; using System.Dynamic.Utils; using System.Runtime.CompilerServices; -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { @@ -28,9 +28,7 @@ namespace System.Linq.Expressions { /// <summary> /// Represents calling a constructor and initializing one or more members of the new object. /// </summary> -#if !SILVERLIGHT [DebuggerTypeProxy(typeof(Expression.MemberInitExpressionProxy))] -#endif public sealed class MemberInitExpression : Expression { private readonly NewExpression _newExpression; private readonly ReadOnlyCollection<MemberBinding> _bindings; diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/MemberListBinding.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/MemberListBinding.cs index 0badf175f46..52774f06e4d 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/MemberListBinding.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/MemberListBinding.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -20,11 +20,7 @@ using System.Collections.ObjectModel; using System.Dynamic.Utils; using System.Reflection; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { @@ -138,4 +134,4 @@ namespace System.Linq.Expressions { } } } -} +}
\ No newline at end of file diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/MemberMemberBinding.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/MemberMemberBinding.cs index 9fcc4312b52..6a54633c933 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/MemberMemberBinding.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/MemberMemberBinding.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -19,11 +19,7 @@ using System.Collections.ObjectModel; using System.Dynamic.Utils; using System.Reflection; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { @@ -152,4 +148,4 @@ namespace System.Linq.Expressions { } } } -} +}
\ No newline at end of file diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/MethodCallExpression.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/MethodCallExpression.cs index 66b3bb001dc..1656811de99 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/MethodCallExpression.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/MethodCallExpression.cs @@ -21,11 +21,7 @@ using System.Dynamic.Utils; using System.Reflection; using System.Runtime.CompilerServices; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { @@ -33,9 +29,7 @@ namespace System.Linq.Expressions { /// <summary> /// Represents a call to either static or an instance method. /// </summary> -#if !SILVERLIGHT [DebuggerTypeProxy(typeof(Expression.MethodCallExpressionProxy))] -#endif public class MethodCallExpression : Expression, IArgumentProvider { private readonly MethodInfo _method; @@ -814,9 +808,6 @@ namespace System.Linq.Expressions { private static void ValidateStaticOrInstanceMethod(Expression instance, MethodInfo method) { if (method.IsStatic) { -#if SILVERLIGHT - if (SilverlightQuirks) return; -#endif if (instance != null) throw new ArgumentException(Strings.OnlyStaticMethodsHaveNullInstance, "instance"); } else { if (instance == null) throw new ArgumentException(Strings.OnlyStaticMethodsHaveNullInstance, "method"); @@ -917,9 +908,6 @@ namespace System.Linq.Expressions { // quote (produce a new tree closed over parameter values), only // works consistently for lambdas Type quoteable = typeof(LambdaExpression); -#if SILVERLIGHT - if (SilverlightQuirks) quoteable = typeof(Expression); -#endif if (TypeUtils.IsSameOrSubclass(quoteable, parameterType) && parameterType.IsAssignableFrom(argument.GetType())) { argument = Expression.Quote(argument); diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/NewArrayExpression.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/NewArrayExpression.cs index e51b6f20a1e..d8bf56adea8 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/NewArrayExpression.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/NewArrayExpression.cs @@ -20,11 +20,7 @@ using System.Diagnostics; using System.Dynamic.Utils; using System.Runtime.CompilerServices; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { @@ -33,9 +29,7 @@ namespace System.Linq.Expressions { /// <summary> /// Represents creating a new array and possibly initializing the elements of the new array. /// </summary> -#if !SILVERLIGHT [DebuggerTypeProxy(typeof(Expression.NewArrayExpressionProxy))] -#endif public class NewArrayExpression : Expression { private readonly ReadOnlyCollection<Expression> _expressions; private readonly Type _type; diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/NewExpression.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/NewExpression.cs index 0b3381e92ec..408ae7d99a4 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/NewExpression.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/NewExpression.cs @@ -20,23 +20,17 @@ using System.Diagnostics; using System.Dynamic.Utils; using System.Reflection; using System.Runtime.CompilerServices; +using Microsoft.Scripting.Utils; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { #endif - /// <summary> /// Represents a constructor call. /// </summary> -#if !SILVERLIGHT [DebuggerTypeProxy(typeof(Expression.NewExpressionProxy))] -#endif public class NewExpression : Expression, IArgumentProvider { private readonly ConstructorInfo _constructor; private IList<Expression> _arguments; @@ -213,7 +207,7 @@ namespace System.Linq.Expressions { } ConstructorInfo ci = null; if (!type.IsValueType) { - ci = type.GetConstructor(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic, null, System.Type.EmptyTypes, null); + ci = type.GetConstructor(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic, null, ReflectionUtils.EmptyTypes, null); if (ci == null) { throw Error.TypeMissingDefaultConstructor(type); } @@ -319,13 +313,6 @@ namespace System.Linq.Expressions { if (method.IsStatic) { throw Error.ArgumentMustBeInstanceMember(); } -#if SILVERLIGHT - if (SilverlightQuirks) { - // we used to just store the MethodInfo - memberType = method.ReturnType; - return; - } -#endif PropertyInfo prop = GetProperty(method); member = prop; memberType = prop.PropertyType; diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/ParameterExpression.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/ParameterExpression.cs index df225f11b7a..42a8628181a 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/ParameterExpression.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/ParameterExpression.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -17,11 +17,7 @@ using System; using System.Diagnostics; using System.Dynamic.Utils; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { @@ -30,9 +26,7 @@ namespace System.Linq.Expressions { /// <summary> /// Represents a named parameter expression. /// </summary> -#if !SILVERLIGHT [DebuggerTypeProxy(typeof(Expression.ParameterExpressionProxy))] -#endif public class ParameterExpression : Expression { private readonly string _name; diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/RuntimeVariablesExpression.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/RuntimeVariablesExpression.cs index 5d7e53efb26..a79b12657e3 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/RuntimeVariablesExpression.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/RuntimeVariablesExpression.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -20,7 +20,7 @@ using System.Diagnostics; using System.Dynamic.Utils; using System.Runtime.CompilerServices; -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { @@ -30,9 +30,7 @@ namespace System.Linq.Expressions { /// Needed to implement "eval" in some dynamic languages. /// Evaluates to an instance of <see cref="IList{IStrongBox}" /> when executed. /// </summary> -#if !SILVERLIGHT [DebuggerTypeProxy(typeof(Expression.RuntimeVariablesExpressionProxy))] -#endif public sealed class RuntimeVariablesExpression : Expression { private readonly ReadOnlyCollection<ParameterExpression> _variables; diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/SwitchCase.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/SwitchCase.cs index 2316a65934e..ed080daa52c 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/SwitchCase.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/SwitchCase.cs @@ -19,7 +19,7 @@ using System.Collections.ObjectModel; using System.Diagnostics; using System.Dynamic.Utils; -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { @@ -27,9 +27,7 @@ namespace System.Linq.Expressions { /// <summary> /// Represents one case of a <see cref="SwitchExpression"/>. /// </summary> -#if !SILVERLIGHT [DebuggerTypeProxy(typeof(Expression.SwitchCaseProxy))] -#endif public sealed class SwitchCase { private readonly ReadOnlyCollection<Expression> _testValues; private readonly Expression _body; diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/SwitchExpression.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/SwitchExpression.cs index cff43227771..2bc10185b43 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/SwitchExpression.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/SwitchExpression.cs @@ -20,11 +20,7 @@ using System.Diagnostics; using System.Dynamic.Utils; using System.Reflection; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { @@ -32,9 +28,7 @@ namespace System.Linq.Expressions { /// <summary> /// Represents a control expression that handles multiple selections by passing control to a <see cref="SwitchCase"/>. /// </summary> -#if !SILVERLIGHT [DebuggerTypeProxy(typeof(Expression.SwitchExpressionProxy))] -#endif public sealed class SwitchExpression : Expression { private readonly Type _type; private readonly Expression _switchValue; diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/SymbolDocumentInfo.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/SymbolDocumentInfo.cs index 1b20bafe5e2..1bb206e63dc 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/SymbolDocumentInfo.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/SymbolDocumentInfo.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -16,7 +16,7 @@ using System; using System.Dynamic.Utils; -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/TryExpression.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/TryExpression.cs index 0959ac7cea4..9d19f67a981 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/TryExpression.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/TryExpression.cs @@ -19,11 +19,7 @@ using System.Collections.ObjectModel; using System.Diagnostics; using System.Dynamic.Utils; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { @@ -38,9 +34,7 @@ namespace System.Linq.Expressions { /// Only one of fault or finally can be supplied. /// The return type of the try block must match the return type of any associated catch statements. /// </summary> -#if !SILVERLIGHT [DebuggerTypeProxy(typeof(Expression.TryExpressionProxy))] -#endif public sealed class TryExpression : Expression { private readonly Type _type; private readonly Expression _body; diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/TypeBinaryExpression.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/TypeBinaryExpression.cs index ef5ba7de9f0..0e3b2eee7a5 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/TypeBinaryExpression.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/TypeBinaryExpression.cs @@ -17,11 +17,7 @@ using System; using System.Diagnostics; using System.Dynamic.Utils; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { @@ -29,9 +25,7 @@ namespace System.Linq.Expressions { /// <summary> /// Represents an operation between an expression and a type. /// </summary> -#if !SILVERLIGHT [DebuggerTypeProxy(typeof(Expression.TypeBinaryExpressionProxy))] -#endif public sealed class TypeBinaryExpression : Expression { private readonly Expression _expression; private readonly Type _typeOperand; diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/TypeUtils.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/TypeUtils.cs index 10b518510a2..41a30c1007d 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/TypeUtils.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/TypeUtils.cs @@ -13,14 +13,11 @@ * * ***************************************************************************/ -#if CLR2 +#if !FEATURE_CORE_DLR using Microsoft.Scripting.Ast; #else using System.Linq.Expressions; #endif -#if SILVERLIGHT -using System.Core; -#endif using System.Collections.Generic; using System.Diagnostics; @@ -147,12 +144,11 @@ namespace System.Dynamic.Utils { return false; } - internal static bool AreEquivalent(Type t1, Type t2) - { -#if CLR2 || SILVERLIGHT - return t1 == t2; -#else + internal static bool AreEquivalent(Type t1, Type t2) { +#if FEATURE_TYPE_EQUIVALENCE return t1 == t2 || t1.IsEquivalentTo(t2); +#else + return t1 == t2; #endif } diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/UnaryExpression.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/UnaryExpression.cs index b71b138c705..8cf3b2a6190 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/UnaryExpression.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Ast/UnaryExpression.cs @@ -19,11 +19,7 @@ using System.Dynamic.Utils; using System.Reflection; using System.Runtime.CompilerServices; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { @@ -32,9 +28,7 @@ namespace System.Linq.Expressions { /// <summary> /// Represents an expression that has a unary operator. /// </summary> -#if !SILVERLIGHT [DebuggerTypeProxy(typeof(Expression.UnaryExpressionProxy))] -#endif public sealed class UnaryExpression : Expression { private readonly Expression _operand; private readonly MethodInfo _method; @@ -788,9 +782,6 @@ namespace System.Linq.Expressions { public static UnaryExpression Quote(Expression expression) { RequiresCanRead(expression, "expression"); bool validQuote = expression is LambdaExpression; -#if SILVERLIGHT - validQuote |= SilverlightQuirks; -#endif if (!validQuote) throw Error.QuotedExpressionMustBeLambda(); return new UnaryExpression(ExpressionType.Quote, expression, expression.GetType(), null); } diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/AnalyzedTree.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/AnalyzedTree.cs index 3b8c6c2a86f..9afe053f9ac 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/AnalyzedTree.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/AnalyzedTree.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -19,7 +19,7 @@ using System.Diagnostics.SymbolStore; using System.Dynamic.Utils; using System.Runtime.CompilerServices; -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast.Compiler { #else namespace System.Linq.Expressions.Compiler { diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/AssemblyGen.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/AssemblyGen.cs index b908bcfadbc..37a5aa66308 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/AssemblyGen.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/AssemblyGen.cs @@ -12,6 +12,7 @@ * * * ***************************************************************************/ +#if FEATURE_REFEMIT using System; using System.Collections.Generic; @@ -23,7 +24,9 @@ using System.Security; using System.Text; using System.Threading; -#if CLR2 +using Microsoft.Scripting.Utils; + +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast.Compiler { #else namespace System.Linq.Expressions.Compiler { @@ -33,7 +36,7 @@ namespace System.Linq.Expressions.Compiler { // Testing options. Only ever set in CLR2 build // configurations, see SetSaveAssemblies -#if CLR2 +#if !FEATURE_CORE_DLR private static string _saveAssembliesPath; private static bool _saveAssemblies; #endif @@ -41,7 +44,7 @@ namespace System.Linq.Expressions.Compiler { private readonly AssemblyBuilder _myAssembly; private readonly ModuleBuilder _myModule; -#if CLR2 && !SILVERLIGHT +#if !FEATURE_CORE_DLR && !SILVERLIGHT private readonly string _outFileName; // can be null iff !SaveAndReloadAssemblies private readonly string _outDir; // null means the current directory #endif @@ -66,10 +69,10 @@ namespace System.Linq.Expressions.Compiler { // mark the assembly transparent so that it works in partial trust: var attributes = new[] { - new CustomAttributeBuilder(typeof(SecurityTransparentAttribute).GetConstructor(Type.EmptyTypes), new object[0]) + new CustomAttributeBuilder(typeof(SecurityTransparentAttribute).GetConstructor(ReflectionUtils.EmptyTypes), new object[0]) }; -#if CLR2 +#if !FEATURE_CORE_DLR if (_saveAssemblies) { string outDir = _saveAssembliesPath ?? Directory.GetCurrentDirectory(); try { @@ -128,7 +131,7 @@ namespace System.Linq.Expressions.Compiler { ); } -#if CLR2 +#if !FEATURE_CORE_DLR //Return the location of the saved assembly file. //The file location is used by PE verification in Microsoft.Scripting. [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] @@ -170,10 +173,5 @@ namespace System.Linq.Expressions.Compiler { } #endif } - - internal static class SymbolGuids { - internal static readonly Guid DocumentType_Text = - new Guid(0x5a869d0b, 0x6611, 0x11d3, 0xbd, 0x2a, 0, 0, 0xf8, 8, 0x49, 0xbd); - } } - +#endif
\ No newline at end of file diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/BoundConstants.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/BoundConstants.cs index 5afdbd31f7b..e7b604209ca 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/BoundConstants.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/BoundConstants.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -20,11 +20,7 @@ using System.Reflection.Emit; using System.Runtime.CompilerServices; using System.Dynamic.Utils; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast.Compiler { #else namespace System.Linq.Expressions.Compiler { @@ -52,11 +48,13 @@ namespace System.Linq.Expressions.Compiler { } public override int GetHashCode() { - return RuntimeHelpers.GetHashCode(Value) ^ Type.GetHashCode(); + return ReferenceEqualityComparer<object>.Instance.GetHashCode(Value) ^ Type.GetHashCode(); } + public bool Equals(TypedConstant other) { return object.ReferenceEquals(Value, other.Value) && Type.Equals(other.Type); } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2231:OverloadOperatorEqualsOnOverridingValueTypeEquals")] public override bool Equals(object obj) { return (obj is TypedConstant) && Equals((TypedConstant)obj); diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/Closure.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/Closure.cs index 0adc8608ffa..6c8bd4bc3f1 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/Closure.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/Closure.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/CompilerScope.Storage.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/CompilerScope.Storage.cs index e736ac60f3f..18e7d5aa882 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/CompilerScope.Storage.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/CompilerScope.Storage.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -18,7 +18,7 @@ using System.Reflection; using System.Reflection.Emit; using System.Runtime.CompilerServices; -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast.Compiler { #else namespace System.Linq.Expressions.Compiler { @@ -183,4 +183,4 @@ namespace System.Linq.Expressions.Compiler { } } } -} +}
\ No newline at end of file diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/CompilerScope.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/CompilerScope.cs index ab3d884bd8c..4391c6d6abb 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/CompilerScope.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/CompilerScope.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -21,12 +21,9 @@ using System.Reflection.Emit; using System.Runtime.CompilerServices; using System.Dynamic; using System.Dynamic.Utils; +using Microsoft.Scripting.Utils; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast.Compiler { #else namespace System.Linq.Expressions.Compiler { @@ -205,7 +202,7 @@ namespace System.Linq.Expressions.Compiler { } // No visible variables - lc.IL.Emit(OpCodes.Call, typeof(RuntimeOps).GetMethod("CreateRuntimeVariables", Type.EmptyTypes)); + lc.IL.Emit(OpCodes.Call, typeof(RuntimeOps).GetMethod("CreateRuntimeVariables", ReflectionUtils.EmptyTypes)); return; } @@ -321,13 +318,13 @@ namespace System.Linq.Expressions.Compiler { ResolveVariable(v, _closureHoistedLocals).EmitLoad(); lc.IL.Emit(OpCodes.Newobj, boxType.GetConstructor(new Type[] { v.Type })); } else { -#if CLR2 +#if !FEATURE_CORE_DLR // array[i] = new StrongBox<T>(default(T)); lc.IL.EmitDefault(v.Type); lc.IL.Emit(OpCodes.Newobj, boxType.GetConstructor(new Type[] { v.Type })); #else // array[i] = new StrongBox<T>(); - lc.IL.Emit(OpCodes.Newobj, boxType.GetConstructor(Type.EmptyTypes)); + lc.IL.Emit(OpCodes.Newobj, boxType.GetConstructor(ReflectionUtils.EmptyTypes)); #endif } // if we want to cache this into a local, do it now diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/ConstantCheck.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/ConstantCheck.cs index b901792925c..11470281c84 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/ConstantCheck.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/ConstantCheck.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -17,7 +17,7 @@ using System; using System.Diagnostics; using System.Dynamic.Utils; -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/DebugInfoGenerator.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/DebugInfoGenerator.cs index c20cde6f58a..95dea78f1fe 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/DebugInfoGenerator.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/DebugInfoGenerator.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#if CLR2 +#if !FEATURE_CORE_DLR using Microsoft.Scripting.Ast; using Microsoft.Scripting.Ast.Compiler; #else @@ -30,7 +30,7 @@ using System.Diagnostics.SymbolStore; using System.Reflection; namespace System.Runtime.CompilerServices { -#if CLR2 || SILVERLIGHT +#if !FEATURE_CORE_DLR || SILVERLIGHT using ILGenerator = OffsetTrackingILGenerator; #endif @@ -38,6 +38,7 @@ namespace System.Runtime.CompilerServices { /// Generates debug information for lambdas in an expression tree. /// </summary> public abstract class DebugInfoGenerator { +#if FEATURE_PDBEMIT /// <summary> /// Creates PDB symbol generator. /// </summary> @@ -45,7 +46,7 @@ namespace System.Runtime.CompilerServices { public static DebugInfoGenerator CreatePdbGenerator() { return new SymbolDocumentGenerator(); } - +#endif /// <summary> /// Marks a sequence point. /// </summary> diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/DelegateHelpers.Generated.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/DelegateHelpers.Generated.cs index fe319376ff5..b2e172ff8fb 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/DelegateHelpers.Generated.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/DelegateHelpers.Generated.cs @@ -21,7 +21,7 @@ using System.Dynamic; using System.Dynamic.Utils; using System.Runtime.CompilerServices; -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast.Compiler { using Microsoft.Scripting.Utils; #else diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/DelegateHelpers.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/DelegateHelpers.cs index 47079f8894d..d16f40e4354 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/DelegateHelpers.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/DelegateHelpers.cs @@ -18,7 +18,7 @@ using System.Dynamic.Utils; using System.Reflection; using System.Reflection.Emit; -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast.Compiler { #else namespace System.Linq.Expressions.Compiler { @@ -30,6 +30,7 @@ namespace System.Linq.Expressions.Compiler { private static readonly Type[] _DelegateCtorSignature = new Type[] { typeof(object), typeof(IntPtr) }; private static Type MakeNewCustomDelegate(Type[] types) { +#if FEATURE_REFEMIT Type returnType = types[types.Length - 1]; Type[] parameters = types.RemoveLast(); @@ -37,6 +38,9 @@ namespace System.Linq.Expressions.Compiler { builder.DefineConstructor(CtorAttributes, CallingConventions.Standard, _DelegateCtorSignature).SetImplementationFlags(ImplAttributes); builder.DefineMethod("Invoke", InvokeAttributes, returnType, parameters).SetImplementationFlags(ImplAttributes); return builder.CreateType(); +#else + throw new NotSupportedException("Method signature not supported on this platform"); +#endif } } } diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/ExpressionQuoter.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/ExpressionQuoter.cs index 059308be44e..b26a8266d18 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/ExpressionQuoter.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/ExpressionQuoter.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#if CLR2 +#if !FEATURE_CORE_DLR using Microsoft.Scripting.Ast; using Microsoft.Scripting.Ast.Compiler; #else diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/HoistedLocals.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/HoistedLocals.cs index 8c315fff4f7..b6db15ad2e2 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/HoistedLocals.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/HoistedLocals.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -18,7 +18,7 @@ using System.Collections.ObjectModel; using System.Runtime.CompilerServices; using System.Dynamic.Utils; -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast.Compiler { #else namespace System.Linq.Expressions.Compiler { diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/ILGen.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/ILGen.cs index c08076ec0d3..5577d656495 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/ILGen.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/ILGen.cs @@ -20,17 +20,14 @@ using System.Dynamic.Utils; using System.Reflection; using System.Reflection.Emit; using System.Runtime.CompilerServices; +using Microsoft.Scripting.Utils; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast.Compiler { #else namespace System.Linq.Expressions.Compiler { #endif -#if CLR2 || SILVERLIGHT +#if !FEATURE_CORE_DLR || SILVERLIGHT using ILGenerator = OffsetTrackingILGenerator; #endif @@ -526,7 +523,12 @@ namespace System.Linq.Expressions.Compiler { } internal static bool ShouldLdtoken(Type t) { - return t is TypeBuilder || t.IsGenericParameter || t.IsVisible; +#if FEATURE_REFEMIT + if (t is TypeBuilder) { + return true; + } +#endif + return t.IsGenericParameter || t.IsVisible; } internal static bool ShouldLdtoken(MethodBase mb) { @@ -878,7 +880,7 @@ namespace System.Linq.Expressions.Compiler { internal static void EmitGetValueOrDefault(this ILGenerator il, Type nullableType) { - MethodInfo mi = nullableType.GetMethod("GetValueOrDefault", System.Type.EmptyTypes); + MethodInfo mi = nullableType.GetMethod("GetValueOrDefault", ReflectionUtils.EmptyTypes); Debug.Assert(nullableType.IsValueType); il.Emit(OpCodes.Call, mi); } diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/KeyedQueue.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/KeyedQueue.cs index fdd6e2f8066..cdca6446351 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/KeyedQueue.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/KeyedQueue.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -15,11 +15,7 @@ using System.Collections.Generic; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast.Compiler { #else namespace System.Linq.Expressions.Compiler { diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LabelInfo.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LabelInfo.cs index 435f066910a..74e05ff3090 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LabelInfo.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LabelInfo.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -19,16 +19,12 @@ using System.Diagnostics; using System.Dynamic.Utils; using System.Reflection.Emit; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast.Compiler { #else namespace System.Linq.Expressions.Compiler { #endif -#if CLR2 || SILVERLIGHT +#if !FEATURE_CORE_DLR || SILVERLIGHT using ILGenerator = OffsetTrackingILGenerator; #endif diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.Address.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.Address.cs index cb208f2b9fa..5b34dd25aed 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.Address.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.Address.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -20,7 +20,7 @@ using System.Dynamic.Utils; using System.Reflection; using System.Reflection.Emit; -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast.Compiler { #else namespace System.Linq.Expressions.Compiler { diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.Binary.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.Binary.cs index 6e4ac1f0112..a089b81222d 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.Binary.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.Binary.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -20,11 +20,7 @@ using System.Dynamic.Utils; using System.Reflection; using System.Reflection.Emit; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast.Compiler { #else namespace System.Linq.Expressions.Compiler { diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.ControlFlow.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.ControlFlow.cs index 0501f9d660a..2e8cede7064 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.ControlFlow.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.ControlFlow.cs @@ -16,7 +16,7 @@ using System.Diagnostics; using System.Dynamic.Utils; -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast.Compiler { #else namespace System.Linq.Expressions.Compiler { diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.Expressions.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.Expressions.cs index 70538606d7b..10abcd4ef62 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.Expressions.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.Expressions.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -22,11 +22,7 @@ using System.Reflection; using System.Reflection.Emit; using System.Runtime.CompilerServices; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast.Compiler { #else namespace System.Linq.Expressions.Compiler { @@ -179,7 +175,7 @@ namespace System.Linq.Expressions.Compiler { expr = node.Expression; if (typeof(LambdaExpression).IsAssignableFrom(expr.Type)) { // if the invoke target is a lambda expression tree, first compile it into a delegate - expr = Expression.Call(expr, expr.Type.GetMethod("Compile", Type.EmptyTypes)); + expr = Expression.Call(expr, expr.Type.GetMethod("Compile", new Type[0])); } expr = Expression.Call(expr, expr.Type.GetMethod("Invoke"), node.Arguments); @@ -494,7 +490,7 @@ namespace System.Linq.Expressions.Compiler { // Emit the temp as type CallSite so we get more reuse _ilg.Emit(OpCodes.Dup); -#if CLR2 +#if !FEATURE_CORE_DLR // For 3.5, emit the temp as CallSite<T> to work around a Jit32 // verifier issue (fixed in 3.5 sp1) var siteTemp = GetLocal(siteType); diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.Generated.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.Generated.cs index 405eb6ddf09..bd79a7a50de 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.Generated.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.Generated.cs @@ -16,7 +16,7 @@ using System.Diagnostics; using System.Dynamic.Utils; -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast.Compiler { #else namespace System.Linq.Expressions.Compiler { diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.Lambda.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.Lambda.cs index ed668bceca2..40756223bdf 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.Lambda.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.Lambda.cs @@ -21,7 +21,7 @@ using System.Reflection.Emit; using System.Runtime.CompilerServices; using System.Threading; -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast.Compiler { #else namespace System.Linq.Expressions.Compiler { @@ -39,6 +39,7 @@ namespace System.Linq.Expressions.Compiler { // if not, emit into IL if (_method is DynamicMethod) { EmitConstant(array, typeof(T[])); +#if FEATURE_REFEMIT } else if(_typeBuilder != null) { // store into field in our type builder, we will initialize // the value only once. @@ -51,6 +52,7 @@ namespace System.Linq.Expressions.Compiler { _ilg.Emit(OpCodes.Stsfld, fb); _ilg.MarkLabel(l); _ilg.Emit(OpCodes.Ldsfld, fb); +#endif } else { _ilg.EmitArray(array); } @@ -111,15 +113,7 @@ namespace System.Linq.Expressions.Compiler { /// private void EmitDelegateConstruction(LambdaExpression lambda) { // 1. Create the new compiler - LambdaCompiler impl; - if (_method is DynamicMethod) { - impl = new LambdaCompiler(_tree, lambda); - } else { - // When the lambda does not have a name or the name is empty, generate a unique name for it. - string name = String.IsNullOrEmpty(lambda.Name) ? GetUniqueMethodName() : lambda.Name; - MethodBuilder mb = _typeBuilder.DefineMethod(name, MethodAttributes.Private | MethodAttributes.Static); - impl = new LambdaCompiler(_tree, lambda, mb); - } + LambdaCompiler impl = CreateCompiler(lambda); // 2. emit the lambda // Since additional ILs are always emitted after the lambda's body, should not emit with tail call optimization. @@ -129,6 +123,18 @@ namespace System.Linq.Expressions.Compiler { EmitDelegateConstruction(impl); } + private LambdaCompiler CreateCompiler(LambdaExpression lambda) { +#if FEATURE_REFEMIT + if (!(_method is DynamicMethod)) { + // When the lambda does not have a name or the name is empty, generate a unique name for it. + string name = String.IsNullOrEmpty(lambda.Name) ? GetUniqueMethodName() : lambda.Name; + MethodBuilder mb = _typeBuilder.DefineMethod(name, MethodAttributes.Private | MethodAttributes.Static); + return new LambdaCompiler(_tree, lambda, mb); + } +#endif + return new LambdaCompiler(_tree, lambda); + } + private static Type[] GetParameterTypes(LambdaExpression lambda) { return lambda.Parameters.Map(p => p.IsByRef ? p.Type.MakeByRefType() : p.Type); } diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.Logical.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.Logical.cs index 5c846fb7e0f..5af3a571386 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.Logical.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.Logical.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -19,11 +19,7 @@ using System.Dynamic.Utils; using System.Reflection; using System.Reflection.Emit; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast.Compiler { #else namespace System.Linq.Expressions.Compiler { diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.Statements.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.Statements.cs index 4fbbe062d6d..7ab065c2d93 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.Statements.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.Statements.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -21,11 +21,7 @@ using System.Reflection; using System.Reflection.Emit; using System.Globalization; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast.Compiler { #else namespace System.Linq.Expressions.Compiler { diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.Unary.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.Unary.cs index 1ace72b4e9d..79726b09a0d 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.Unary.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.Unary.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -20,11 +20,7 @@ using System.Reflection; using System.Reflection.Emit; using System.Runtime.CompilerServices; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast.Compiler { #else namespace System.Linq.Expressions.Compiler { diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.cs index 4b004556c47..3c13eac7020 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/LambdaCompiler.cs @@ -23,12 +23,12 @@ using System.Reflection.Emit; using System.Runtime.CompilerServices; using System.Threading; -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast.Compiler { #else namespace System.Linq.Expressions.Compiler { #endif -#if CLR2 || SILVERLIGHT +#if !FEATURE_CORE_DLR || SILVERLIGHT using ILGenerator = OffsetTrackingILGenerator; #endif @@ -47,9 +47,10 @@ namespace System.Linq.Expressions.Compiler { private readonly ILGenerator _ilg; +#if FEATURE_REFEMIT // The TypeBuilder backing this method, if any private readonly TypeBuilder _typeBuilder; - +#endif private readonly MethodInfo _method; // Currently active LabelTargets and their mapping to IL labels @@ -87,7 +88,7 @@ namespace System.Linq.Expressions.Compiler { private LambdaCompiler(AnalyzedTree tree, LambdaExpression lambda) { Type[] parameterTypes = GetParameterTypes(lambda).AddFirst(typeof(Closure)); -#if SILVERLIGHT && CLR2 +#if (SILVERLIGHT && CLR2) || WP75 var method = new DynamicMethod(lambda.Name ?? "lambda_method", lambda.ReturnType, parameterTypes); #else var method = new DynamicMethod(lambda.Name ?? "lambda_method", lambda.ReturnType, parameterTypes, true); @@ -97,7 +98,7 @@ namespace System.Linq.Expressions.Compiler { _lambda = lambda; _method = method; -#if CLR2 || SILVERLIGHT +#if !FEATURE_CORE_DLR || SILVERLIGHT _ilg = new OffsetTrackingILGenerator(method.GetILGenerator()); #else _ilg = method.GetILGenerator(); @@ -112,6 +113,7 @@ namespace System.Linq.Expressions.Compiler { InitializeMethod(); } +#if FEATURE_REFEMIT /// <summary> /// Creates a lambda compiler that will compile into the provided Methodbuilder /// </summary> @@ -136,7 +138,7 @@ namespace System.Linq.Expressions.Compiler { _typeBuilder = (TypeBuilder)method.DeclaringType; _method = method; -#if CLR2 || SILVERLIGHT +#if !FEATURE_CORE_DLR || SILVERLIGHT _ilg = new OffsetTrackingILGenerator(method.GetILGenerator()); #else _ilg = method.GetILGenerator(); @@ -148,6 +150,7 @@ namespace System.Linq.Expressions.Compiler { InitializeMethod(); } +#endif /// <summary> /// Creates a lambda compiler for an inlined lambda @@ -158,9 +161,11 @@ namespace System.Linq.Expressions.Compiler { _method = parent._method; _ilg = parent._ilg; _hasClosureArgument = parent._hasClosureArgument; - _typeBuilder = parent._typeBuilder; _scope = _tree.Scopes[lambda]; _boundConstants = parent._boundConstants; +#if FEATURE_REFEMIT + _typeBuilder = parent._typeBuilder; +#endif } private void InitializeMethod() { @@ -209,6 +214,7 @@ namespace System.Linq.Expressions.Compiler { return c.CreateDelegate(); } +#if FEATURE_REFEMIT /// <summary> /// Mutates the MethodBuilder parameter, filling in IL, parameters, /// and return type. @@ -227,7 +233,7 @@ namespace System.Linq.Expressions.Compiler { // 3. Emit c.EmitLambdaBody(); } - +#endif #endregion private static AnalyzedTree AnalyzeLambda(ref LambdaExpression lambda) { @@ -296,6 +302,7 @@ namespace System.Linq.Expressions.Compiler { return _method.CreateDelegate(_lambda.Type, new Closure(_boundConstants.ToArray(), null)); } +#if FEATURE_REFEMIT private FieldBuilder CreateStaticField(string name, Type type) { // We are emitting into someone else's type. We don't want name // conflicts, so choose a long name that is unlikely to confict. @@ -303,17 +310,18 @@ namespace System.Linq.Expressions.Compiler { // uses. return _typeBuilder.DefineField("<ExpressionCompilerImplementationDetails>{" + Interlocked.Increment(ref _Counter) + "}" + name, type, FieldAttributes.Static | FieldAttributes.Private); } - +#endif /// <summary> /// Creates an unitialized field suitible for private implementation details /// Works with DynamicMethods or TypeBuilders. /// </summary> private MemberExpression CreateLazyInitializedField<T>(string name) { - if (_method is DynamicMethod) { - return Expression.Field(Expression.Constant(new StrongBox<T>(default(T))), "Value"); - } else { +#if FEATURE_REFEMIT + if (!(_method is DynamicMethod)) { return Expression.Field(null, CreateStaticField(name, typeof(T))); - } + } +#endif + return Expression.Field(Expression.Constant(new StrongBox<T>(default(T))), "Value"); } } } diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/OffsetTrackingILGenerator.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/OffsetTrackingILGenerator.cs index 0630f0be074..024cfb90aff 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/OffsetTrackingILGenerator.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/OffsetTrackingILGenerator.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -23,9 +23,9 @@ using System.Diagnostics.SymbolStore; // Not needed in CLR 4 builds because we have the // ILGenerator.ILOffset property. -#if CLR2 || SILVERLIGHT +#if !FEATURE_CORE_DLR || SILVERLIGHT -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast.Compiler { #else namespace System.Linq.Expressions.Compiler { diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/RuntimeVariableList.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/RuntimeVariableList.cs index b69a5a442cc..3b22542c2dc 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/RuntimeVariableList.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/RuntimeVariableList.cs @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#if CLR2 +#if !FEATURE_CORE_DLR using Microsoft.Scripting.Ast.Compiler; #else using System.Linq.Expressions.Compiler; diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/Set.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/Set.cs index 96ec6d33974..4c864ad58fb 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/Set.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/Set.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -17,7 +17,7 @@ using System.Collections; using System.Collections.Generic; // Note: can't move to Utils because name conflicts with System.Linq.Set -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/StackSpiller.Bindings.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/StackSpiller.Bindings.cs index 95ceba84068..1c166a6ce4e 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/StackSpiller.Bindings.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/StackSpiller.Bindings.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -17,11 +17,7 @@ using System.Collections.ObjectModel; using System.Dynamic.Utils; using System.Runtime.CompilerServices; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast.Compiler { #else namespace System.Linq.Expressions.Compiler { diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/StackSpiller.Generated.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/StackSpiller.Generated.cs index f96780dd8b8..d0aea62ff84 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/StackSpiller.Generated.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/StackSpiller.Generated.cs @@ -16,7 +16,7 @@ using System.Diagnostics; using System.Dynamic.Utils; -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast.Compiler { #else namespace System.Linq.Expressions.Compiler { diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/StackSpiller.Temps.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/StackSpiller.Temps.cs index cee6fab837b..fce1b961e57 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/StackSpiller.Temps.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/StackSpiller.Temps.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -19,7 +19,7 @@ using System.Collections.ObjectModel; using System.Diagnostics; using System.Dynamic.Utils; -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast.Compiler { #else namespace System.Linq.Expressions.Compiler { diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/StackSpiller.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/StackSpiller.cs index 38ba4a45170..ff1077ce758 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/StackSpiller.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/StackSpiller.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -21,11 +21,7 @@ using System.Dynamic.Utils; using System.Reflection; using System.Runtime.CompilerServices; -#if SILVERLIGHT -using System.Core; -#endif - -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast.Compiler { #else namespace System.Linq.Expressions.Compiler { diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/SymbolDocumentGenerator.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/SymbolDocumentGenerator.cs index bd883fe92d3..4042f904e98 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/SymbolDocumentGenerator.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/SymbolDocumentGenerator.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -12,8 +12,9 @@ * * * ***************************************************************************/ +#if FEATURE_REFEMIT && FEATURE_PDBEMIT -#if CLR2 +#if !FEATURE_CORE_DLR using Microsoft.Scripting.Ast; using Microsoft.Scripting.Ast.Compiler; #else @@ -21,10 +22,6 @@ using System.Linq.Expressions; using System.Linq.Expressions.Compiler; #endif -#if SILVERLIGHT -using System.Core; -#endif - using System.Collections.Generic; using System.Diagnostics; using System.Diagnostics.SymbolStore; @@ -32,7 +29,7 @@ using System.Reflection; using System.Reflection.Emit; namespace System.Runtime.CompilerServices { -#if CLR2 || SILVERLIGHT +#if !FEATURE_CORE_DLR || SILVERLIGHT using ILGenerator = OffsetTrackingILGenerator; #endif @@ -72,3 +69,4 @@ namespace System.Runtime.CompilerServices { } } } +#endif
\ No newline at end of file diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/SymbolGuids.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/SymbolGuids.cs new file mode 100644 index 00000000000..ec8f0f84c2d --- /dev/null +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/SymbolGuids.cs @@ -0,0 +1,12 @@ +using System; + +#if !FEATURE_CORE_DLR +namespace Microsoft.Scripting.Ast.Compiler { +#else +namespace System.Linq.Expressions.Compiler { +#endif + internal static class SymbolGuids { + internal static readonly Guid DocumentType_Text = + new Guid(0x5a869d0b, 0x6611, 0x11d3, 0xbd, 0x2a, 0, 0, 0xf8, 8, 0x49, 0xbd); + } +} diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/VariableBinder.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/VariableBinder.cs index 0984a04619e..2711f48d08f 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/VariableBinder.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/VariableBinder.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -22,7 +22,7 @@ using System.Dynamic.Utils; using System.Core; #endif -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast.Compiler { #else namespace System.Linq.Expressions.Compiler { diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/GlobalSuppressions.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/GlobalSuppressions.cs index cbf8fe85816..a21aeca06cf 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/GlobalSuppressions.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/GlobalSuppressions.cs @@ -9,7 +9,7 @@ // You do not need to add suppressions to this file manually. //UnhandledExpressionType is used by System.Linq.Expressions.OldExpressionVisitor -#if CLR2 +#if !FEATURE_CORE_DLR [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Scope = "member", Target = "Microsoft.Scripting.Ast.Error.#UnhandledExpressionType(System.Object)")] [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Scope = "member", Target = "Microsoft.Scripting.Ast.Strings.#UnhandledExpressionType(System.Object)")] [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Scope = "member", Target = "Microsoft.Scripting.Ast.Error.#InvalidNullValue(System.Object)")] diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Microsoft.Scripting.Core.csproj b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Microsoft.Scripting.Core.csproj index 5d67e73f9d4..0d0b5797f25 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Microsoft.Scripting.Core.csproj +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Microsoft.Scripting.Core.csproj @@ -1,227 +1,163 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
- <Import Project="$(SolutionDir)..\Solutions\Common.proj" />
-
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">v2Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>10.0.20624</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>System.Scripting</RootNamespace>
- <AssemblyName>Microsoft.Scripting.Core</AssemblyName>
- <DocumentationFile>$(SolutionDir)..\bin\$(Configuration)\Microsoft.Scripting.Core.XML</DocumentationFile>
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- <WarningsNotAsErrors>618</WarningsNotAsErrors>
- <NoWarn>1591</NoWarn>
- <BaseAddress>855638016</BaseAddress>
- <CodeAnalysisRuleSet>Microsoft.Scripting.Core.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'FxCop|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>$(SolutionDir)..\bin\FxCop</OutputPath>
- <DefineConstants>TRACE;$(SignedSym);CLR2</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <RunCodeAnalysis>true</RunCodeAnalysis>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'v2Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>$(SolutionDir)..\bin\v2Debug</OutputPath>
- <DefineConstants>DEBUG;TRACE;$(SignedSym);CLR2</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <RunCodeAnalysis>false</RunCodeAnalysis>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'v2Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>$(SolutionDir)..\bin\v2Release</OutputPath>
- <DefineConstants>TRACE;$(SignedSym);CLR2</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <RunCodeAnalysis>false</RunCodeAnalysis>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Silverlight3Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <OutputPath>$(SolutionDir)..\bin\Silverlight3Debug</OutputPath>
- <DefineConstants>TRACE;DEBUG;SILVERLIGHT;CLR2</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>AnyCPU</PlatformTarget>
- <RunCodeAnalysis>false</RunCodeAnalysis>
- <ErrorReport>prompt</ErrorReport>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Silverlight3Release|AnyCPU' ">
- <OutputPath>$(SolutionDir)..\bin\Silverlight3Release</OutputPath>
- <DefineConstants>TRACE;SILVERLIGHT;CLR2</DefineConstants>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>AnyCPU</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
- </PropertyGroup>
- <ItemGroup>
- <Compile Include="..\..\Hosts\Silverlight\SilverlightVersion.cs" Condition=" '$(SilverlightBuild)' == 'true' ">
- <Link>Properties\SilverlightVersion.cs</Link>
- </Compile>
- <Compile Include="Actions\CallInfo.cs" />
- <Compile Include="Actions\CallSiteOps.cs" />
- <Compile Include="Actions\IInvokeOnGetBinder.cs" />
- <Compile Include="Actions\InvokeMemberBinder.cs" />
- <Compile Include="Actions\BinaryOperationBinder.cs" />
- <Compile Include="Actions\CallSite.cs" />
- <Compile Include="Actions\CallSiteBinder.cs" />
- <Compile Include="Actions\CallSiteHelpers.cs" />
- <Compile Include="Actions\ConvertBinder.cs" />
- <Compile Include="Actions\DeleteIndexBinder.cs" />
- <Compile Include="Actions\DynamicObject.cs" />
- <Compile Include="Actions\ExpandoObject.cs" />
- <Compile Include="Actions\ExpandoClass.cs" />
- <Compile Include="Actions\GetIndexBinder.cs" />
- <Compile Include="Actions\CreateInstanceBinder.cs" />
- <Compile Include="Actions\DeleteMemberBinder.cs" />
- <Compile Include="Actions\GetMemberBinder.cs" />
- <Compile Include="Actions\IDynamicMetaObjectProvider.cs" />
- <Compile Include="Actions\InvokeBinder.cs" />
- <Compile Include="Actions\DynamicMetaObject.cs" />
- <Compile Include="Actions\DynamicMetaObjectBinder.cs" />
- <Compile Include="Actions\BindingRestrictions.cs" />
- <Compile Include="Actions\RuleCache.cs" />
- <Compile Include="Actions\SetIndexBinder.cs" />
- <Compile Include="Actions\SetMemberBinder.cs" />
- <Compile Include="Ast\Expression.DebuggerProxy.cs" />
- <Compile Include="Ast\IArgumentProvider.cs" />
- <Compile Include="Ast\ListArgumentProvider.cs" />
- <Compile Include="Actions\UnaryOperationBinder.cs" />
- <Compile Include="Ast\ExpressionStringBuilder.cs" />
- <Compile Include="Compiler\BoundConstants.cs" />
- <Compile Include="Ast\DebugInfoExpression.cs" />
- <Compile Include="Ast\SymbolDocumentInfo.cs" />
- <Compile Include="Compiler\DelegateHelpers.cs" />
- <Compile Include="Compiler\DelegateHelpers.Generated.cs" />
- <Compile Include="Ast\GotoExpression.cs" />
- <Compile Include="Compiler\LabelInfo.cs" />
- <Compile Include="Compiler\AnalyzedTree.cs" />
- <Compile Include="Compiler\OffsetTrackingILGenerator.cs" />
- <Compile Include="Compiler\RuntimeVariableList.cs" />
- <Compile Include="Actions\UpdateDelegates.Generated.cs" />
- <Compile Include="Ast\DynamicExpression.cs" />
- <Compile Include="Ast\BinaryExpression.cs" />
- <Compile Include="Ast\BlockExpression.cs" />
- <Compile Include="Ast\CatchBlock.cs" />
- <Compile Include="Ast\ConditionalExpression.cs" />
- <Compile Include="Ast\ConstantExpression.cs" />
- <Compile Include="Ast\DefaultExpression.cs" />
- <Compile Include="Ast\ElementInit.cs" />
- <Compile Include="Ast\Expression.cs" />
- <Compile Include="Ast\ExpressionType.cs" />
- <Compile Include="Ast\IndexExpression.cs" />
- <Compile Include="Ast\InvocationExpression.cs" />
- <Compile Include="Ast\LabelTarget.cs" />
- <Compile Include="Ast\LabelExpression.cs" />
- <Compile Include="Ast\LambdaExpression.cs" />
- <Compile Include="Ast\ListInitExpression.cs" />
- <Compile Include="Ast\RuntimeVariablesExpression.cs" />
- <Compile Include="Ast\LoopExpression.cs" />
- <Compile Include="Ast\MemberAssignment.cs" />
- <Compile Include="Ast\MemberBinding.cs" />
- <Compile Include="Ast\MemberExpression.cs" />
- <Compile Include="Ast\MemberInitExpression.cs" />
- <Compile Include="Ast\MemberListBinding.cs" />
- <Compile Include="Ast\MemberMemberBinding.cs" />
- <Compile Include="Ast\MethodCallExpression.cs" />
- <Compile Include="Ast\NewArrayExpression.cs" />
- <Compile Include="Ast\NewExpression.cs" />
- <Compile Include="Ast\ParameterExpression.cs" />
- <Compile Include="Ast\SwitchCase.cs" />
- <Compile Include="Ast\SwitchExpression.cs" />
- <Compile Include="Ast\TryExpression.cs" />
- <Compile Include="Ast\TypeBinaryExpression.cs" />
- <Compile Include="Ast\TypeUtils.cs" />
- <Compile Include="Ast\UnaryExpression.cs" />
- <Compile Include="Compiler\Closure.cs" />
- <Compile Include="Compiler\CompilerScope.Storage.cs" />
- <Compile Include="Compiler\CompilerScope.cs" />
- <Compile Include="Compiler\ConstantCheck.cs" />
- <Compile Include="Compiler\ExpressionQuoter.cs" />
- <Compile Include="Ast\ExpressionVisitor.cs" />
- <Compile Include="Ast\DebugViewWriter.cs" />
- <Compile Include="Compiler\HoistedLocals.cs" />
- <Compile Include="Compiler\KeyedQueue.cs" />
- <Compile Include="Compiler\LambdaCompiler.Address.cs" />
- <Compile Include="Compiler\LambdaCompiler.Binary.cs" />
- <Compile Include="Compiler\LambdaCompiler.ControlFlow.cs" />
- <Compile Include="Compiler\LambdaCompiler.Expressions.cs" />
- <Compile Include="Compiler\LambdaCompiler.Generated.cs" />
- <Compile Include="Compiler\LambdaCompiler.Lambda.cs" />
- <Compile Include="Compiler\LambdaCompiler.Logical.cs" />
- <Compile Include="Compiler\LambdaCompiler.Statements.cs" />
- <Compile Include="Compiler\LambdaCompiler.Unary.cs" />
- <Compile Include="Compiler\LambdaCompiler.cs" />
- <Compile Include="Compiler\DebugInfoGenerator.cs" />
- <Compile Include="Compiler\Set.cs" />
- <Compile Include="Compiler\StackSpiller.Bindings.cs" />
- <Compile Include="Compiler\StackSpiller.Generated.cs" />
- <Compile Include="Compiler\StackSpiller.Temps.cs" />
- <Compile Include="Compiler\StackSpiller.cs" />
- <Compile Include="Compiler\SymbolDocumentGenerator.cs" />
- <Compile Include="Compiler\VariableBinder.cs" />
- <Compile Include="Compiler\AssemblyGen.cs" />
- <Compile Include="Compiler\ILGen.cs" />
- <Compile Include="GlobalSuppressions.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Utils\Action.cs" />
- <Compile Include="Utils\CacheDict.cs" />
- <Compile Include="Utils\CollectionExtensions.cs" />
- <Compile Include="Utils\ContractUtils.cs" />
- <Compile Include="Utils\ExceptionFactory.Generated.cs" />
- <Compile Include="Utils\Function.cs" />
- <Compile Include="Utils\Helpers.cs" />
- <Compile Include="Utils\IRuntimeVariables.cs" />
- <Compile Include="Utils\ReadOnlyCollectionBuilder.cs" />
- <Compile Include="Utils\ReadOnlyDictionary.cs" />
- <Compile Include="Utils\ReferenceEqualityComparer.cs" />
- <Compile Include="Utils\TrueReadOnlyCollection.cs" />
- <Compile Include="Utils\TypeExtensions.cs" />
- <Compile Include="Stubs.cs" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="..\..\System\Linq\Expressions\System.Linq.Expressions.txt">
- <Link>Ast\System.Linq.Expressions.txt</Link>
- </Content>
- </ItemGroup>
- <ItemGroup>
- <None Include="Microsoft.Scripting.Core.ruleset" />
- </ItemGroup>
- <ItemGroup Condition=" '$(SilverlightBuild)' != 'true' ">
- <Reference Include="System" />
- <Reference Include="System.Configuration" />
- <Reference Include="System.Core" />
- </ItemGroup>
- <ItemGroup Condition=" '$(SilverlightBuild)' == 'true' ">
- <Reference Include="mscorlib, Version=2.0.5.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e">
- <HintPath>$(SilverlightPath)\mscorlib.dll</HintPath>
- </Reference>
- <Reference Include="System, Version=2.0.5.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e">
- <HintPath>$(SilverlightPath)\System.dll</HintPath>
- </Reference>
- <Reference Include="System.Core, Version=2.0.5.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e">
- <HintPath>$(SilverlightPath)\System.Core.dll</HintPath>
- </Reference>
- </ItemGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" Condition=" '$(SilverlightTreeBuild)' != 'true' " />
- <!-- This task produces a list of Compile items. -->
- <Target Name="GetCompileItems" Outputs="@(CompileItems)">
- <CreateItem Include="%(Compile.Identity)">
- <Output TaskParameter="Include" ItemName="CompileItems" />
- </CreateItem>
- </Target>
-</Project>
+<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> + <Import Project="$(ProjectDir)..\..\Solutions\Common.proj" /> + <PropertyGroup> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}</ProjectGuid> + <OutputType>Library</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <RootNamespace>System.Scripting</RootNamespace> + <AssemblyName>Microsoft.Scripting.Core</AssemblyName> + <BaseAddress>855638016</BaseAddress> + <CodeAnalysisRuleSet>$(AssemblyName).ruleset</CodeAnalysisRuleSet> + <DocumentationFile>$(SolutionDir)..\bin\$(Configuration)\$(AssemblyName).xml</DocumentationFile> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'FxCop|AnyCPU' "> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'v2Debug|AnyCPU' "> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'v2Release|AnyCPU' "> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'WP7Debug|AnyCPU' "> + </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> + </Compile> + <Compile Include="Actions\CallInfo.cs" /> + <Compile Include="Actions\CallSiteOps.cs" /> + <Compile Include="Actions\IInvokeOnGetBinder.cs" /> + <Compile Include="Actions\InvokeMemberBinder.cs" /> + <Compile Include="Actions\BinaryOperationBinder.cs" /> + <Compile Include="Actions\CallSite.cs" /> + <Compile Include="Actions\CallSiteBinder.cs" /> + <Compile Include="Actions\CallSiteHelpers.cs" /> + <Compile Include="Actions\ConvertBinder.cs" /> + <Compile Include="Actions\DeleteIndexBinder.cs" /> + <Compile Include="Actions\DynamicObject.cs" /> + <Compile Include="Actions\ExpandoObject.cs" /> + <Compile Include="Actions\ExpandoClass.cs" /> + <Compile Include="Actions\GetIndexBinder.cs" /> + <Compile Include="Actions\CreateInstanceBinder.cs" /> + <Compile Include="Actions\DeleteMemberBinder.cs" /> + <Compile Include="Actions\GetMemberBinder.cs" /> + <Compile Include="Actions\IDynamicMetaObjectProvider.cs" /> + <Compile Include="Actions\InvokeBinder.cs" /> + <Compile Include="Actions\DynamicMetaObject.cs" /> + <Compile Include="Actions\DynamicMetaObjectBinder.cs" /> + <Compile Include="Actions\BindingRestrictions.cs" /> + <Compile Include="Actions\RuleCache.cs" /> + <Compile Include="Actions\SetIndexBinder.cs" /> + <Compile Include="Actions\SetMemberBinder.cs" /> + <Compile Include="Ast\Expression.DebuggerProxy.cs" /> + <Compile Include="Ast\IArgumentProvider.cs" /> + <Compile Include="Ast\ListArgumentProvider.cs" /> + <Compile Include="Actions\UnaryOperationBinder.cs" /> + <Compile Include="Ast\ExpressionStringBuilder.cs" /> + <Compile Include="Compiler\BoundConstants.cs" /> + <Compile Include="Ast\DebugInfoExpression.cs" /> + <Compile Include="Ast\SymbolDocumentInfo.cs" /> + <Compile Include="Compiler\DelegateHelpers.cs" /> + <Compile Include="Compiler\DelegateHelpers.Generated.cs" /> + <Compile Include="Ast\GotoExpression.cs" /> + <Compile Include="Compiler\LabelInfo.cs" /> + <Compile Include="Compiler\AnalyzedTree.cs" /> + <Compile Include="Compiler\OffsetTrackingILGenerator.cs" /> + <Compile Include="Compiler\RuntimeVariableList.cs" /> + <Compile Include="Actions\UpdateDelegates.Generated.cs" /> + <Compile Include="Ast\DynamicExpression.cs" /> + <Compile Include="Ast\BinaryExpression.cs" /> + <Compile Include="Ast\BlockExpression.cs" /> + <Compile Include="Ast\CatchBlock.cs" /> + <Compile Include="Ast\ConditionalExpression.cs" /> + <Compile Include="Ast\ConstantExpression.cs" /> + <Compile Include="Ast\DefaultExpression.cs" /> + <Compile Include="Ast\ElementInit.cs" /> + <Compile Include="Ast\Expression.cs" /> + <Compile Include="Ast\ExpressionType.cs" /> + <Compile Include="Ast\IndexExpression.cs" /> + <Compile Include="Ast\InvocationExpression.cs" /> + <Compile Include="Ast\LabelTarget.cs" /> + <Compile Include="Ast\LabelExpression.cs" /> + <Compile Include="Ast\LambdaExpression.cs" /> + <Compile Include="Ast\ListInitExpression.cs" /> + <Compile Include="Ast\RuntimeVariablesExpression.cs" /> + <Compile Include="Ast\LoopExpression.cs" /> + <Compile Include="Ast\MemberAssignment.cs" /> + <Compile Include="Ast\MemberBinding.cs" /> + <Compile Include="Ast\MemberExpression.cs" /> + <Compile Include="Ast\MemberInitExpression.cs" /> + <Compile Include="Ast\MemberListBinding.cs" /> + <Compile Include="Ast\MemberMemberBinding.cs" /> + <Compile Include="Ast\MethodCallExpression.cs" /> + <Compile Include="Ast\NewArrayExpression.cs" /> + <Compile Include="Ast\NewExpression.cs" /> + <Compile Include="Ast\ParameterExpression.cs" /> + <Compile Include="Ast\SwitchCase.cs" /> + <Compile Include="Ast\SwitchExpression.cs" /> + <Compile Include="Ast\TryExpression.cs" /> + <Compile Include="Ast\TypeBinaryExpression.cs" /> + <Compile Include="Ast\TypeUtils.cs" /> + <Compile Include="Ast\UnaryExpression.cs" /> + <Compile Include="Compiler\Closure.cs" /> + <Compile Include="Compiler\CompilerScope.Storage.cs" /> + <Compile Include="Compiler\CompilerScope.cs" /> + <Compile Include="Compiler\ConstantCheck.cs" /> + <Compile Include="Compiler\ExpressionQuoter.cs" /> + <Compile Include="Ast\ExpressionVisitor.cs" /> + <Compile Include="Ast\DebugViewWriter.cs" /> + <Compile Include="Compiler\HoistedLocals.cs" /> + <Compile Include="Compiler\KeyedQueue.cs" /> + <Compile Include="Compiler\LambdaCompiler.Address.cs" /> + <Compile Include="Compiler\LambdaCompiler.Binary.cs" /> + <Compile Include="Compiler\LambdaCompiler.ControlFlow.cs" /> + <Compile Include="Compiler\LambdaCompiler.Expressions.cs" /> + <Compile Include="Compiler\LambdaCompiler.Generated.cs" /> + <Compile Include="Compiler\LambdaCompiler.Lambda.cs" /> + <Compile Include="Compiler\LambdaCompiler.Logical.cs" /> + <Compile Include="Compiler\LambdaCompiler.Statements.cs" /> + <Compile Include="Compiler\LambdaCompiler.Unary.cs" /> + <Compile Include="Compiler\LambdaCompiler.cs" /> + <Compile Include="Compiler\DebugInfoGenerator.cs" /> + <Compile Include="Compiler\Set.cs" /> + <Compile Include="Compiler\StackSpiller.Bindings.cs" /> + <Compile Include="Compiler\StackSpiller.Generated.cs" /> + <Compile Include="Compiler\StackSpiller.Temps.cs" /> + <Compile Include="Compiler\StackSpiller.cs" /> + <Compile Include="Compiler\SymbolDocumentGenerator.cs" /> + <Compile Include="Compiler\SymbolGuids.cs" /> + <Compile Include="Compiler\VariableBinder.cs" /> + <Compile Include="Compiler\AssemblyGen.cs" /> + <Compile Include="Compiler\ILGen.cs" /> + <Compile Include="GlobalSuppressions.cs" /> + <Compile Include="Properties\AssemblyInfo.cs" /> + <Compile Include="Utils\Action.cs" /> + <Compile Include="Utils\CacheDict.cs" /> + <Compile Include="Utils\CollectionExtensions.cs" /> + <Compile Include="Utils\ContractUtils.cs" /> + <Compile Include="Utils\ExceptionFactory.Generated.cs" /> + <Compile Include="Utils\Function.cs" /> + <Compile Include="Utils\Helpers.cs" /> + <Compile Include="Utils\IRuntimeVariables.cs" /> + <Compile Include="Utils\ReadOnlyCollectionBuilder.cs" /> + <Compile Include="Utils\ReadOnlyDictionary.cs" /> + <Compile Include="Utils\ReferenceEqualityComparer.cs" /> + <Compile Include="Utils\ReflectionUtils.cs" /> + <Compile Include="Utils\TrueReadOnlyCollection.cs" /> + <Compile Include="Utils\TypeExtensions.cs" /> + <Compile Include="Stubs.cs" /> + </ItemGroup> + <ItemGroup> + <None Include="Microsoft.Scripting.Core.ruleset" /> + </ItemGroup> + <ItemGroup Condition=" '$(IsFullFramework)' == 'true' "> + <Reference Include="System.Configuration" /> + </ItemGroup> + <Import Project="$(CSharpTargets)" /> +</Project>
\ No newline at end of file diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Properties/AssemblyInfo.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Properties/AssemblyInfo.cs index 97fd02fdc0b..ef2378f2ce3 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Properties/AssemblyInfo.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Properties/AssemblyInfo.cs @@ -55,8 +55,11 @@ using System.Security; [assembly: System.Resources.NeutralResourcesLanguage("en-US")] #if !SILVERLIGHT -[assembly: AssemblyVersion("1.1.0.10")] -[assembly: AssemblyFileVersion("1.1.0.10")] +[assembly: AssemblyVersion("1.1.0.30")] +[assembly: AssemblyFileVersion("1.1.0.30")] [assembly: AssemblyInformationalVersion("1.1")] +#endif + +#if !SILVERLIGHT && !WP75 [assembly: AllowPartiallyTrustedCallers] #endif diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Stubs.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Stubs.cs index b8e796f54fb..36b11a43990 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Stubs.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Stubs.cs @@ -13,200 +13,36 @@ * * ***************************************************************************/ -using System; using System.Diagnostics; -using System.Dynamic.Utils; -#if SILVERLIGHT // Stubs +namespace Microsoft.Scripting.Utils { -// This is needed so we can build Silverlight version on Codeplex -// where System.Core namespace is not defined. -namespace System.Core -{ - class Dummy { } } -namespace System { - - /// <summary> - /// An application exception. - /// </summary> - public class ApplicationException : Exception { - private const int error = unchecked((int)0x80131600); - /// <summary> - /// The constructor. - /// </summary> - public ApplicationException() - : base("Application Exception") { - HResult = error; - } - - /// <summary> - /// The constructor. - /// </summary> - /// <param name="message">The message.</param> - public ApplicationException(string message) - : base(message) { - HResult = error; - } - - /// <summary> - /// The constructor. - /// </summary> - /// <param name="message">The message.</param> - /// <param name="innerException">The inner exception.</param> - public ApplicationException(string message, Exception innerException) - : base(message, innerException) { - HResult = error; - } - } - - namespace Runtime.InteropServices { - /// <summary> - /// The Default Parameter Value Attribute. - /// </summary> - public sealed class DefaultParameterValueAttribute : Attribute { - /// <summary> - /// The constructor - /// </summary> - /// <param name="value">The value.</param> - public DefaultParameterValueAttribute(object value) { } - } - } - - // We reference these namespaces via "using" - // We don't actually use them because the code is #if !SILVERLIGHT - // Rather than fix the usings all over the place, just define these here - namespace Runtime.Remoting { class Dummy {} } - namespace Security.Policy { class Dummy {} } - namespace Xml.XPath { class Dummy {} } - - namespace Reflection { - /// <summary> - /// PortableExecutableKinds enum. - /// </summary> - public enum PortableExecutableKinds { - /// <summary> - /// ILOnly - /// </summary> - ILOnly = 0 - } - - /// <summary> - /// ImageFileMachine enum. - /// </summary> - public enum ImageFileMachine { - /// <summary> - /// I386 - /// </summary> - I386 = 1 - } - } - - namespace ComponentModel { - - /// <summary> - /// The Warning exception. - /// </summary> - public class WarningException : SystemException { - /// <summary> - /// The constructor. - /// </summary> - /// <param name="message">The message.</param> - public WarningException(string message) : base(message) { } - } - } +#if !FEATURE_SERIALIZATION +namespace System { /// <summary> /// The serializable attribute. /// </summary> - public class SerializableAttribute : Attribute { + [Conditional("STUB")] + internal class SerializableAttribute : Attribute { } /// <summary> /// Non serializable attribute. /// </summary> - public class NonSerializedAttribute : Attribute { + [Conditional("STUB")] + internal class NonSerializedAttribute : Attribute { } namespace Runtime.Serialization { /// <summary> /// ISerializable interface. /// </summary> - public interface ISerializable { + internal interface ISerializable { } } - - /// <summary> - /// The ConsoleColor enum. - /// </summary> - public enum ConsoleColor { - /// <summary> - /// Black. - /// </summary> - Black = 0, - /// <summary> - /// DarkBlue. - /// </summary> - DarkBlue = 1, - /// <summary> - /// DarkGreen. - /// </summary> - DarkGreen = 2, - /// <summary> - /// DaryCyan. - /// </summary> - DarkCyan = 3, - /// <summary> - /// DarkRed - /// </summary> - DarkRed = 4, - /// <summary> - /// DarkMagenta - /// </summary> - DarkMagenta = 5, - /// <summary> - /// DarkYellow - /// </summary> - DarkYellow = 6, - /// <summary> - /// Gray - /// </summary> - Gray = 7, - /// <summary> - /// DarkGray - /// </summary> - DarkGray = 8, - /// <summary> - /// Blue - /// </summary> - Blue = 9, - /// <summary> - /// Green - /// </summary> - Green = 10, - /// <summary> - /// Cyan - /// </summary> - Cyan = 11, - /// <summary> - /// Red - /// </summary> - Red = 12, - /// <summary> - /// Magenta - /// </summary> - Magenta = 13, - /// <summary> - /// Yellow - /// </summary> - Yellow = 14, - /// <summary> - /// White - /// </summary> - White = 15, - } - } -#endif +#endif
\ No newline at end of file diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/Action.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/Action.cs index 9e7e53cf34d..f6d2381a2bf 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/Action.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/Action.cs @@ -13,7 +13,8 @@ * * ***************************************************************************/ -#if CLR2 +#if !FEATURE_FUNCS_5_16 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Utils { #else namespace System { @@ -24,7 +25,7 @@ namespace System { // *** BEGIN GENERATED CODE *** // generated by function: gen_action_types from: generate_dynsites.py -#if CLR2 || SILVERLIGHT +#if !FEATURE_VARIANCE /// <summary> /// Encapsulates a method that takes five parameters and does not return a value. @@ -605,3 +606,4 @@ namespace System { #endregion } +#endif
\ No newline at end of file diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/CacheDict.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/CacheDict.cs index 1b94d705030..81371c66e28 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/CacheDict.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/CacheDict.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/CollectionExtensions.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/CollectionExtensions.cs index fd7ac36114d..d9dcd196ae9 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/CollectionExtensions.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/CollectionExtensions.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#if CLR2 +#if !FEATURE_CORE_DLR using Microsoft.Scripting.Utils; using Microsoft.Scripting.Ast; #else @@ -35,9 +35,6 @@ namespace System.Dynamic.Utils { /// changed after creation. The exception is if the enumerable is /// already a ReadOnlyCollection{T}, in which case we just return it. /// </summary> -#if !CLR2 - [Pure] -#endif internal static ReadOnlyCollection<T> ToReadOnly<T>(this IEnumerable<T> enumerable) { if (enumerable == null) { return EmptyReadOnlyCollection<T>.Instance; @@ -90,9 +87,6 @@ namespace System.Dynamic.Utils { return h; } -#if !CLR2 - [Pure] -#endif internal static bool ListEquals<T>(this ICollection<T> first, ICollection<T> second) { if (first.Count != second.Count) { return false; diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/ContractUtils.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/ContractUtils.cs index d8cc36be2bb..26f809e0359 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/ContractUtils.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/ContractUtils.cs @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#if CLR2 +#if !FEATURE_CORE_DLR using Microsoft.Scripting.Ast; #else using System.Linq.Expressions; diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/ExceptionFactory.Generated.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/ExceptionFactory.Generated.cs index 08454fa43df..5cc9f88a4e5 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/ExceptionFactory.Generated.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/ExceptionFactory.Generated.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -15,7 +15,7 @@ using System; -#if CLR2 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Ast { #else namespace System.Linq.Expressions { diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/Function.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/Function.cs index 143e6b32ec6..e3c06d45af4 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/Function.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/Function.cs @@ -13,7 +13,8 @@ * * ***************************************************************************/ -#if CLR2 +#if !FEATURE_FUNCS_5_16 +#if !FEATURE_CORE_DLR namespace Microsoft.Scripting.Utils { #else namespace System { @@ -24,7 +25,7 @@ namespace System { // *** BEGIN GENERATED CODE *** // generated by function: gen_func_types from: generate_dynsites.py -#if CLR2 || SILVERLIGHT +#if !FEATURE_VARIANCE /// <summary> /// Encapsulates a method that has five parameters and returns a value of the type specified by the TResult parameter. @@ -645,3 +646,4 @@ namespace System { #endregion } +#endif
\ No newline at end of file diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/Helpers.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/Helpers.cs index 6f2cc98ffe2..d8827d16968 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/Helpers.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/Helpers.cs @@ -1,4 +1,4 @@ - + /* **************************************************************************** * * Copyright (c) Microsoft Corporation. @@ -14,7 +14,7 @@ * * ***************************************************************************/ -#if CLR2 +#if !FEATURE_CORE_DLR using Microsoft.Scripting.Ast; using Microsoft.Scripting.Utils; #else diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/IRuntimeVariables.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/IRuntimeVariables.cs index 8130a617d86..126763ea03f 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/IRuntimeVariables.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/IRuntimeVariables.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/ReadOnlyCollectionBuilder.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/ReadOnlyCollectionBuilder.cs index 2c272b81e72..c5bb77cc03e 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/ReadOnlyCollectionBuilder.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/ReadOnlyCollectionBuilder.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#if CLR2 +#if !FEATURE_CORE_DLR using Microsoft.Scripting.Ast; #else using System.Linq.Expressions; @@ -31,9 +31,7 @@ namespace System.Runtime.CompilerServices { /// The builder for read only collection. /// </summary> /// <typeparam name="T">The type of the collection element.</typeparam> -#if !SILVERLIGHT [Serializable] -#endif [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1710:IdentifiersShouldHaveCorrectSuffix")] public sealed class ReadOnlyCollectionBuilder<T> : IList<T>, System.Collections.IList { private const int DefaultCapacity = 4; @@ -42,9 +40,7 @@ namespace System.Runtime.CompilerServices { private int _size; private int _version; -#if !SILVERLIGHT [NonSerialized] -#endif private Object _syncRoot; static readonly T[] _emptyArray = new T[0]; @@ -452,9 +448,7 @@ namespace System.Runtime.CompilerServices { throw new ArgumentException(Strings.InvalidObjectType(value != null ? value.GetType() : (object)"null", typeof(T)), argument); } -#if !SILVERLIGHT [Serializable] -#endif private class Enumerator : IEnumerator<T>, System.Collections.IEnumerator { private readonly ReadOnlyCollectionBuilder<T> _builder; private readonly int _version; diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/ReadOnlyDictionary.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/ReadOnlyDictionary.cs index 1202e9db274..33194716d1f 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/ReadOnlyDictionary.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/ReadOnlyDictionary.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#if CLR2 +#if !FEATURE_CORE_DLR using Microsoft.Scripting.Ast; #else using System.Linq.Expressions; diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/ReferenceEqualityComparer.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/ReferenceEqualityComparer.cs index fff90a5c6f0..6b7d1fc1e68 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/ReferenceEqualityComparer.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/ReferenceEqualityComparer.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * @@ -27,7 +27,8 @@ namespace System.Dynamic.Utils { } public int GetHashCode(T obj) { - return RuntimeHelpers.GetHashCode(obj); + // CF RH.GetHashCode throws NullReferenceException if the argument is null + return obj != null ? RuntimeHelpers.GetHashCode(obj) : 0; } } } diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/ReflectionUtils.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/ReflectionUtils.cs new file mode 100644 index 00000000000..a4df5d651b5 --- /dev/null +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/ReflectionUtils.cs @@ -0,0 +1,7 @@ +using System; + +namespace Microsoft.Scripting.Utils { + internal static class ReflectionUtils { + public static readonly Type[] EmptyTypes = new Type[0]; + } +} diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/TrueReadOnlyCollection.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/TrueReadOnlyCollection.cs index da9cf38ee0d..fc0ed6b3676 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/TrueReadOnlyCollection.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/TrueReadOnlyCollection.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/TypeExtensions.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/TypeExtensions.cs index fd0da9097b2..78d5226492a 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/TypeExtensions.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Utils/TypeExtensions.cs @@ -1,4 +1,4 @@ -/* **************************************************************************** +/* **************************************************************************** * * Copyright (c) Microsoft Corporation. * diff --git a/mcs/class/dlr/sync.sh b/mcs/class/dlr/sync.sh index 7a84ed56b96..133bb21ff31 100755 --- a/mcs/class/dlr/sync.sh +++ b/mcs/class/dlr/sync.sh @@ -1,2 +1,5 @@ -rsync -r /home/marek/svn/dlr/svn/DLR_Main/Runtime/Microsoft.Dynamic/ Runtime/Microsoft.Dynamic --exclude=".*/" --exclude="*.snk" -rsync -r /home/marek/svn/dlr/svn/DLR_Main/Runtime/Microsoft.Scripting.Core/ Runtime/Microsoft.Scripting.Core --exclude=".*/" --exclude="*.snk" + +# git clone git://github.com/IronLanguages/main.git + +rsync -r /home/marek/git/dlr/main/Runtime/Microsoft.Dynamic/ Runtime/Microsoft.Dynamic --exclude=".*/" --exclude="*.snk" +rsync -r /home/marek/git/dlr/main/Runtime/Microsoft.Scripting.Core/ Runtime/Microsoft.Scripting.Core --exclude=".*/" --exclude="*.snk" |