Updated silverlight project to vs2010/silverlight 4.

aspclassiccompiler/Parser/SLVBParser.vbproj

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(MSBuildToolsVersion)' == '3.5'">
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+  </PropertyGroup>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +13,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Dlrsoft.VBScript.Parser</RootNamespace>
     <AssemblyName>Dlrsoft.VBParser</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <SilverlightApplication>false</SilverlightApplication>
     <ValidateXaml>true</ValidateXaml>
     <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
@@ -18,6 +21,28 @@
     <OptionCompare>Binary</OptionCompare>
     <OptionStrict>Off</OptionStrict>
     <OptionInfer>On</OptionInfer>
+    <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
+    <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -287,7 +312,24 @@
   <ItemGroup>
     <Folder Include="My Project\" />
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\v3.0\Microsoft.Silverlight.VisualBasic.targets" />
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.VisualBasic.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

aspclassiccompiler/VBScript/Binders/VBScriptUnaryOperationBinder.cs.bak

@@ -1,43 +0,0 @@
-using System;
-using System.Collections.Generic;
-//using System.Text;
-using System.Reflection;
-using System.Dynamic;
-#if USE35
-using Microsoft.Scripting.Ast;
-#else
-using System.Linq.Expressions;
-#endif
-using Dlrsoft.VBScript.Runtime;
-using Debug = System.Diagnostics.Debug;
-
-namespace Dlrsoft.VBScript.Binders
-{
-    public class VBScriptUnaryOperationBinder : UnaryOperationBinder
-    {
-        public VBScriptUnaryOperationBinder(ExpressionType operation)
-            : base(operation)
-        {
-        }
-
-        public override DynamicMetaObject FallbackUnaryOperation(
-                   DynamicMetaObject target, DynamicMetaObject errorSuggestion)
-        {
-            // Defer if any object has no value so that we evaulate their
-            // Expressions and nest a CallSite for the InvokeMember.
-            if (!target.HasValue)
-            {
-                return Defer(target);
-            }
-            return new DynamicMetaObject(
-                RuntimeHelpers.EnsureObjectResult(
-                  Expression.MakeUnary(
-                    this.Operation,
-                    Expression.Convert(target.Expression, target.LimitType),
-                    target.LimitType)),
-                target.Restrictions.Merge(
-                    BindingRestrictions.GetTypeRestriction(
-                        target.Expression, target.LimitType)));
-        }
-    }
-}

aspclassiccompiler/VBScript/Compiler/SourceUtil.cs

@@ -83,7 +83,7 @@ namespace Dlrsoft.VBScript.Compiler
         public static LineColumn GetLineColumn(Range[] lineRanges, int index)
         {
             IComparer comparer = new RangeComparer();
-            int i = Array.BinarySearch(lineRanges, index, comparer);
+            int i = Array.BinarySearch(lineRanges, 0, lineRanges.Length, index, comparer);
             return new LineColumn(i + 1, index - lineRanges[i].Start + 1);
         }
 
@@ -154,17 +154,17 @@ namespace Dlrsoft.VBScript.Compiler
         #endregion
     }
 
-    internal class SpanComparer : IComparer
+    internal class SpanComparer : IComparer<SourceSpan>
     {
         #region IComparer Members
 
-        public int Compare(object x, object y)
+        public int Compare(SourceSpan x, SourceSpan y)
         {
-            if (((SourceSpan)x).End.Line < ((SourceSpan)y).Start.Line)
+            if (x.End.Line < y.Start.Line)
             {
                 return -1;
             }
-            else if (((SourceSpan)x).Start.Line > ((SourceSpan)y).End.Line)
+            else if (x.Start.Line > y.End.Line)
             {
                 return 1;
             }

aspclassiccompiler/VBScript/Compiler/VBScriptSourceMapper.cs

@@ -9,7 +9,7 @@ namespace Dlrsoft.VBScript.Compiler
     public class VBScriptSourceMapper : ISourceMapper
     {
         //Here the range is start line number and the end line number
-        private ArrayList _spans = new ArrayList(); //use ArrayList so that we can use the binary search method
+        private List<SourceSpan> _spans = new List<SourceSpan>(); //use ArrayList so that we can use the binary search method
         private IDictionary<SourceSpan, DocSpan> _mappings = new Dictionary<SourceSpan, DocSpan>();
         static private SpanComparer _comparer = new SpanComparer();
 

aspclassiccompiler/VBScript/SLVBScript.csproj

@@ -1,4 +1,8 @@
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(MSBuildToolsVersion)' == '3.5'">
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+  </PropertyGroup>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,17 +14,39 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Dlrsoft.VBScript</RootNamespace>
     <AssemblyName>Dlrsoft.VBScript</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <SilverlightApplication>false</SilverlightApplication>
     <ValidateXaml>true</ValidateXaml>
     <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
+    <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
+    <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\Bin\Silverlight Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;SILVERLIGHT;USE35</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;SILVERLIGHT;</DefineConstants>
     <NoStdLib>true</NoStdLib>
     <NoConfig>true</NoConfig>
     <ErrorReport>prompt</ErrorReport>
@@ -30,28 +56,21 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\Bin\Silverlight Release\</OutputPath>
-    <DefineConstants>TRACE;SILVERLIGHT;USE35</DefineConstants>
+    <DefineConstants>TRACE;SILVERLIGHT;</DefineConstants>
     <NoStdLib>true</NoStdLib>
     <NoConfig>true</NoConfig>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Dynamic, Version=2.0.5.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Dynamic">
-      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\library\sl4\Microsoft.Dynamic.dll</HintPath>
-      <HintPath>F:\downloads\dlr\DLR-0.92-Src\Codeplex-DLR-0.92\Bin\Silverlight Debug\Microsoft.Dynamic.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Scripting, Version=2.0.5.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Scripting">
-      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\library\sl4\Microsoft.Scripting.dll</HintPath>
-      <HintPath>F:\downloads\dlr\DLR-0.92-Src\Codeplex-DLR-0.92\Bin\Silverlight Debug\Microsoft.Scripting.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Scripting.Core, Version=2.0.5.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Scripting.Silverlight">
-      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\library\sl4\Microsoft.Scripting.Silverlight.dll</HintPath>
-      <HintPath>F:\downloads\dlr\DLR-0.92-Src\Codeplex-DLR-0.92\Bin\Silverlight Debug\Microsoft.Scripting.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Scripting.ExtensionAttribute, Version=2.0.5.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>F:\downloads\dlr\DLR-0.92-Src\Codeplex-DLR-0.92\Bin\Silverlight Debug\Microsoft.Scripting.ExtensionAttribute.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="System.Windows" />
@@ -91,8 +110,13 @@
     <Compile Include="Runtime\DynamicObjectHelpers.cs" />
     <Compile Include="Runtime\ErrObject.cs" />
     <Compile Include="Runtime\HelperFunctions.cs" />
+    <Compile Include="Runtime\IAssert.cs" />
+    <Compile Include="Runtime\InvokeMemberBinderKey.cs" />
+    <Compile Include="Runtime\ITrace.cs" />
     <Compile Include="Runtime\RuntimeHelpers.cs" />
     <Compile Include="Runtime\StringExtensionsClass.cs" />
+    <Compile Include="Runtime\TypeModel.cs" />
+    <Compile Include="Runtime\TypeModelMetaObject.cs" />
     <Compile Include="Runtime\VBScriptRuntimeException.cs" />
     <Compile Include="VBScript.cs" />
   </ItemGroup>
@@ -102,7 +126,24 @@
       <Name>SLVBParser</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\v3.0\Microsoft.Silverlight.CSharp.targets" />
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

aspclassiccompiler/VBScriptSilverlight.sln

@@ -1,6 +1,6 @@
 
-Microsoft Visual Studio Solution File, Format Version 10.00
+Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2008
+# Visual Studio 2010
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "SLVBParser", "Parser\SLVBParser.vbproj", "{FAE34487-11A6-4EE2-96BB-7F73C7611097}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SLVBScript", "VBScript\SLVBScript.csproj", "{1EDAA0A6-FACB-4C7C-8D98-5564B4B49E30}"