Merlin/Main/Hosts/SilverLight/Chiron/XapHttpHandler.cs Merlin/Main/Hosts/SilverLight/Microsoft.Scripting.SilverLight/Extension.cs Merlin/Main/Hosts/SilverLight/Microsoft.Scripting.SilverLight/Repl.cs Merlin/Main/Hosts/SilverLight/Microsoft.Scripting.SilverLight/Window.cs Merlin/Main/Hosts/SilverLight/Microsoft.Scripting.SilverLight/agdlr.css Merlin/Main/Hosts/SilverLight/Microsoft.Scripting.SilverLight/agdlr.js Merlin/Main/Hosts/SilverLight/README.markdown Merlin/Main/Hosts/SilverLight/TODO Merlin/Main/Hosts/SilverLight/Tests/README.markdown Merlin/Main/Hosts/SilverLight/Tests/index.html Merlin/Main/Hosts/SilverLight/Tests/js/error.js Merlin/Main/Hosts/SilverLight/Tests/tests/app.rb Merlin/Main/Hosts/SilverLight/Tests/tests/debugger.rb Merlin/Main/Hosts/SilverLight/Tests/tests/empty.py Merlin/Main/Hosts/SilverLight/Tests/tests/helper.rb Merlin/Main/Hosts/SilverLight/Tests/tests/integration/__init__.py Merlin/Main/Hosts/SilverLight/Tests/tests/integration/fixtures/__init__.py Merlin/Main/Hosts/SilverLight/Tests/tests/integration/fixtures/child1.py Merlin/Main/Hosts/SilverLight/Tests/tests/integration/fixtures/mod1.py Merlin/Main/Hosts/SilverLight/Tests/tests/integration/fixtures/mod2.py Merlin/Main/Hosts/SilverLight/Tests/tests/integration/fixtures/test.py Merlin/Main/Hosts/SilverLight/Tests/tests/integration/fixtures/test.rb Merlin/Main/Hosts/SilverLight/Tests/tests/integration/fixtures/test2.py Merlin/Main/Hosts/SilverLight/Tests/tests/integration/fixtures/test2.rb Merlin/Main/Hosts/SilverLight/Tests/tests/integration/test_01.rb Merlin/Main/Hosts/SilverLight/Tests/tests/integration/test_args.rb Merlin/Main/Hosts/SilverLight/Tests/tests/integration/test_auto_addref.rb Merlin/Main/Hosts/SilverLight/Tests/tests/integration/test_error_handle.rb Merlin/Main/Hosts/SilverLight/Tests/tests/integration/test_execfile.rb Merlin/Main/Hosts/SilverLight/Tests/tests/integration/test_issubclass.rb Merlin/Main/Hosts/SilverLight/Tests/tests/integration/test_modules.rb Merlin/Main/Hosts/SilverLight/Tests/tests/integration/test_multi_import.rb Merlin/Main/Hosts/SilverLight/Tests/tests/integration/test_name.rb Merlin/Main/Hosts/SilverLight/Tests/tests/integration/test_net.rb Merlin/Main/Hosts/SilverLight/Tests/tests/integration/test_querystring.rb Merlin/Main/Hosts/SilverLight/Tests/tests/integration/test_re.rb Merlin/Main/Hosts/SilverLight/Tests/tests/integration/test_s_clock_rb.rb Merlin/Main/Hosts/SilverLight/Tests/tests/integration/test_s_dlr_console.rb Merlin/Main/Hosts/SilverLight/Tests/tests/integration/test_s_fractulator.rb Merlin/Main/Hosts/SilverLight/Tests/tests/integration/test_s_slide.rb Merlin/Main/Hosts/SilverLight/Tests/tests/integration/test_smoke.rb Merlin/Main/Hosts/SilverLight/Tests/tests/integration/test_sys_path.rb Merlin/Main/Hosts/SilverLight/Tests/tests/integration/test_thread.rb Merlin/Main/Hosts/SilverLight/Tests/tests/integration/test_utf8.rb Merlin/Main/Hosts/SilverLight/Tests/tests/integration/test_x_attribute_error.rb Merlin/Main/Hosts/SilverLight/Tests/tests/integration/test_x_devidebyzero.rb Merlin/Main/Hosts/SilverLight/Tests/tests/integration/test_x_import_1.rb Merlin/Main/Hosts/SilverLight/Tests/tests/integration/test_x_import_2.rb Merlin/Main/Hosts/SilverLight/Tests/tests/integration/test_x_import_3.rb Merlin/Main/Hosts/SilverLight/Tests/tests/integration/test_x_rethrow.rb Merlin/Main/Hosts/SilverLight/Tests/tests/integration/test_x_syntax_error.rb Merlin/Main/Hosts/SilverLight/Tests/tests/integration/test_x_typeerror.rb Merlin/Main/Hosts/SilverLight/Tests/tests/integration/test_xamlloader.rb Merlin/Main/Hosts/SilverLight/Tests/tests/integration/test_xcode.rb Merlin/Main/Hosts/SilverLight/Tests/tests/integration/test_xcode_semantics.rb Merlin/Main/Hosts/SilverLight/Tests/tests/lib/eggs/README Merlin/Main/Hosts/SilverLight/Tests/tests/lib/eggs/Rakefile Merlin/Main/Hosts/SilverLight/Tests/tests/lib/eggs/eggxap.bat Merlin/Main/Hosts/SilverLight/Tests/tests/lib/eggs/lib/eggs.rb Merlin/Main/Hosts/SilverLight/Tests/tests/lib/eggs/lib/eggs/empty.py Merlin/Main/Hosts/SilverLight/Tests/tests/lib/eggs/lib/eggs/lib/bacon/lib/bacon.rb Merlin/Main/Hosts/SilverLight/Tests/tests/lib/eggs/lib/eggs/python.rb Merlin/Main/Hosts/SilverLight/Tests/tests/lib/eggs/sample/app.rb Merlin/Main/Hosts/SilverLight/Tests/tests/lib/eggs/sample/index.html Merlin/Main/Hosts/SilverLight/Tests/tests/lib/eggs/sample/tests/sample_test.rb Merlin/Main/Hosts/SilverLight/Tests/tests/lib/eggs/src/Eggs.cs Merlin/Main/Hosts/SilverLight/Tests/tests/manual/test_domain_loading/index.html Merlin/Main/Hosts/SilverLight/Tests/tests/manual/test_domain_loading/sub.html Merlin/Main/Hosts/SilverLight/Tests/tests/manual/test_domain_loading/test/sub.py Merlin/Main/Hosts/SilverLight/Tests/tests/manual/test_domain_loading/test/test_domain_loading.py Merlin/Main/Hosts/SilverLight/Tests/tests/unit/assets/foo.xaml Merlin/Main/Hosts/SilverLight/Tests/tests/unit/assets/pkg.xap Merlin/Main/Hosts/SilverLight/Tests/tests/unit/assets/tmp.txt Merlin/Main/Hosts/SilverLight/Tests/tests/unit/console_test.rb Merlin/Main/Hosts/SilverLight/Tests/tests/unit/dynamic_application_test.rb Merlin/Main/Hosts/SilverLight/Tests/tests/unit/extension_types_test.rb Merlin/Main/Hosts/SilverLight/Tests/tests/unit/package_test.rb Merlin/Main/Hosts/SilverLight/Tests/tests/unit/repl_test.rb Merlin/Main/Hosts/SilverLight/Tests/tests/unit/window_test.rb Merlin/Main/Hosts/SilverLight/Utils/README.markdown Merlin/Main/Hosts/SilverLight/Utils/chiron-here.reg Merlin/Main/Hosts/SilverLight/Utils/xap-http-handler/XapHttpHandler.SampleSite/app/app.py Merlin/Main/Hosts/SilverLight/Utils/xap-http-handler/XapHttpHandler.SampleSite/app/app.xaml Merlin/Main/Hosts/SilverLight/Utils/xap-http-handler/XapHttpHandler.SampleSite/css/screen.css Merlin/Main/Hosts/SilverLight/Utils/xap-http-handler/XapHttpHandler.SampleSite/index.html Merlin/Main/Hosts/SilverLight/Utils/xap-http-handler/XapHttpHandler.SampleSite/js/error.js Merlin/Main/Hosts/SilverLight/Utils/xap-http-handler/XapHttpHandler.SampleSite/web.config Merlin/Main/Hosts/SilverLight/Utils/xap-http-handler/XapHttpHandler.sln Merlin/Main/Hosts/SilverLight/Utils/xap-http-handler/update.bat @@ -20,7 +20,7 @@ --> <!-- the location of language assemblies on disk --> - <add key="localAssemblyPath" value="../../Libraries/Client" /> + <add key="localAssemblyPath" value="." /> </appSettings> <!-- @@ -55,10 +55,11 @@ 2. the urlPrefix will be added to relative assembly paths --> <AppManifest.xaml> - <Deployment xmlns="http://schemas.microsoft.com/client/2007/deployment" - xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - RuntimeVersion="2.0.31005.00" - EntryPointAssembly="Microsoft.Scripting.Silverlight" + <Deployment + xmlns="http://schemas.microsoft.com/client/2007/deployment" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + RuntimeVersion="2.0.31005.0" + EntryPointAssembly="Microsoft.Scripting.Silverlight" EntryPointType="Microsoft.Scripting.Silverlight.DynamicApplication"> <Deployment.Parts> Merlin/Main/Hosts/SilverLight/Chiron/App.config @@ -36,6 +36,7 @@ namespace Chiron { static bool _saveManifest; static string _error; static string _startPage; + static string[] _localPath; // these properties are lazy loaded so we don't parse the configuration file unless necessary static AppManifestTemplate _ManifestTemplate; @@ -57,40 +58,52 @@ Copyright (c) Microsoft Corporation. All rights reserved. Console.WriteLine( @"Usage: Chiron [<options>] -General Options: - - /d[irectory]:<path> - Specifies directory on disk (default: the current directory) - - /x[ap]:<file> - Specifies XAP file to generate - Does not start the web server, cannot be combined with /w or /b - - /n[ologo] - Suppresses display of the logo banner - - /s[ilent] - Suppresses display of all output - -Dynamic Language Options: - - /z[ipdlr]:<file> - Like /x, but includes files needed for dynamic language apps - Does not start the web server, cannot be combined with /w or /b +Options: /w[ebserver][:<port number>] Launches a development web server that automatically creates - XAP files for dynamic language applications + XAP files for dynamic language applications (runs /z for every + request of a XAP file, but generates it in memory). Optionally specifies server port number (default: 2060) /b[rowser][:<start url>] Launches the default browser and starts the web server Implies /w, cannot be combined with /x or /z + /z[ipdlr]:<file> + Generates a XAP file, including dynamic language DLLs, and + auto-generates AppManifest.xaml (equivalent of /m in memory), + if it does not exist. + Does not start the web server, cannot be combined with /w or /b + /m[anifest] Saves the generated AppManifest.xaml file to disk Use /d to set the directory containing the sources Can only be combined with /d, /n and /s + + /d[ir[ectory]]:<path> + Specifies directory on disk (default: the current directory) + + /r[efpath]:<path> + Path where assemblies are located. Default is same directory + as Chiron.exe. Overrides appSettings.localAssemblyPath in + Chiron.exe.config + + /path:<path1;path2;..;pathn> + semi-color-separated directories to be included in the XAP file, + in addition to what is specified by /d + + /x[ap[file]]:<file> + Specifies XAP file to generate. Only XAPs a directory; does not + generate a manifest or add dynamic language DLLs; see /z for that + functionality. + Does not start the web server, cannot be combined with /w or /b + + /n[ologo] + Suppresses display of the logo banner + + /s[ilent] + Suppresses display of all output "); } else if (_error != null) { @@ -105,6 +118,7 @@ Dynamic Language Options: XapBuilder.XapToDisk(_dir, _xapfile); } else { ZipArchive xap = new ZipArchive(_xapfile, FileAccess.Write); + XapBuilder.AddPathDirectories(xap); xap.CopyFromDirectory(_dir, ""); xap.Close(); } @@ -181,6 +195,7 @@ Dynamic Language Options: _silent = false; _nologo = false; _help = false; + _localPath = new string[]{ }; foreach (string option in args) { if (option[0] != '-' && option[0] != '/') { @@ -250,6 +265,9 @@ Dynamic Language Options: _browser = true; _webserver = true; break; + case "path": + ParseAndSetLocalPath(val); + break; case "m": case "manifest": _saveManifest = true; break; @@ -279,6 +297,20 @@ Dynamic Language Options: _help = true; } + internal static void ParseAndSetLocalPath(string pathString) { + var __path = new List<string>(); + string[] paths = pathString.Split(';'); + foreach (string path in paths) { + var fullPath = path; + if (!Path.IsPathRooted(path)) + fullPath = Path.Combine(ChironPath(), path); + if (Directory.Exists(fullPath)) { + __path.Add(fullPath); + } + } + _localPath = __path.ToArray(); + } + public static void Log(int statusCode, string uri, int byteCount, string message) { if (!_silent) { if (string.IsNullOrEmpty(message)) { @@ -292,6 +324,9 @@ Dynamic Language Options: } } + internal static string[] LocalPath { + get { return _localPath; } + } internal static AppManifestTemplate ManifestTemplate { get { @@ -352,19 +387,22 @@ Dynamic Language Options: } } + private static string ChironPath() { + return Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().CodeBase).LocalPath); + } + // Looks for a DLR/language assembly relative to Chiron.exe // The path is set in localAssemblyPath in Chiron.exe.config's appSettings section internal static string TryGetAssemblyPath(string name) { if (_LocalAssemblyPath == null) { - string chironPath = Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().CodeBase).LocalPath); _LocalAssemblyPath = ConfigurationManager.AppSettings["localAssemblyPath"] ?? ""; if (!Path.IsPathRooted(_LocalAssemblyPath)) { - _LocalAssemblyPath = Path.Combine(chironPath, _LocalAssemblyPath); + _LocalAssemblyPath = Path.Combine(ChironPath(), _LocalAssemblyPath); } if (!Directory.Exists(_LocalAssemblyPath)) { // fallback to Chiron install location - _LocalAssemblyPath = chironPath; + _LocalAssemblyPath = ChironPath(); } } Merlin/Main/Hosts/SilverLight/Chiron/Chiron.cs @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>9.0.30729</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{7D07B0CE-FFA3-4402-BFF2-5F42B4267D2A}</ProjectGuid> <OutputType>Exe</OutputType> @@ -44,7 +44,14 @@ <ItemGroup> <Reference Include="System" /> <Reference Include="System.configuration" /> + <Reference Include="System.Core"> + <RequiredTargetFramework>3.5</RequiredTargetFramework> + </Reference> <Reference Include="System.Data" /> + <Reference Include="System.Web" /> + <Reference Include="System.Web.Extensions"> + <RequiredTargetFramework>3.5</RequiredTargetFramework> + </Reference> <Reference Include="System.XML" /> </ItemGroup> <ItemGroup> @@ -55,6 +62,7 @@ <Compile Include="HttpRequestData.cs" /> <Compile Include="HttpSocket.cs" /> <Compile Include="LanguageInfo.cs" /> + <Compile Include="XapHttpHandler.cs" /> <Compile Include="LCA_RESTRICTED\Zip.cs" /> <Compile Include="MimeTypeSection.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> @@ -100,4 +108,4 @@ xcopy /y /d "$(TargetDir)Microsoft.Scripting.Silverlight.dll" "$(ProjectDir)..\t <PreBuildEvent> </PreBuildEvent> </PropertyGroup> -</Project> +</Project> \ No newline at end of file Merlin/Main/Hosts/SilverLight/Chiron/Chiron.csproj @@ -617,8 +617,8 @@ namespace Chiron { internal const uint SignatureFileEntry = 0x04034b50; internal const uint SignatureArchiveDirectory = 0x02014b50; internal const uint SignatureArchiveDirectoryEnd = 0x06054b50; - internal const ushort VersionNeededToExtract = 0x0100; // version 1.0, TODO - internal const ushort MaximumVersionExtractable = 0x0100; + internal const ushort VersionNeededToExtract = 0x0014; // version 1.0, TODO + internal const ushort MaximumVersionExtractable = 0x0014; internal const ushort VersionMadeBy = 0; // MS-DOS, TODO: should this be NTFS? internal const ushort GeneralPurposeBitFlag = 0; // TODO internal const ushort ExtraFieldLength = 0; Merlin/Main/Hosts/SilverLight/Chiron/LCA_RESTRICTED/Zip.cs @@ -57,12 +57,24 @@ namespace Chiron { GenerateLanguagesConfig(zip, langs); + AddPathDirectories(zip); + // add files on disk last so they always overwrite generated files zip.CopyFromDirectory(dir, ""); zip.Close(); } + // add directories that are on Chiron's path + internal static void AddPathDirectories(ZipArchive zip) { + if (Chiron.LocalPath != null) { + foreach (var path in Chiron.LocalPath) { + string[] splitPath = path.Split(Path.DirectorySeparatorChar); + zip.CopyFromDirectory(path, splitPath[splitPath.Length - 1]); + } + } + } + // Get the URIs of the assemblies from the AppManifest.xaml file private static IList<Uri> GetManifestAssemblies(string manifestPath) { List<Uri> assemblies = new List<Uri>(); Merlin/Main/Hosts/SilverLight/Chiron/XapBuilder.cs @@ -18,6 +18,7 @@ using System.IO; using System.Reflection; using System.Dynamic; using System.Windows; +using System.Windows.Resources; namespace Microsoft.Scripting.Silverlight { @@ -33,15 +34,19 @@ namespace Microsoft.Scripting.Silverlight { internal sealed class BrowserPAL : PlatformAdaptationLayer { internal static readonly BrowserPAL/*!*/ PAL = new BrowserPAL(); + private static StreamResourceInfo _xapFile; + + public StreamResourceInfo XapFile { + get { return _xapFile; } + set { _xapFile = value; } + } + public override bool FileExists(string path) { - if (!DynamicApplication.InUIThread) { - return false; // Application.GetResourceStream will throw if called from a non-UI thread - } - return Package.GetFile(path) != null; + return Package.GetFile(_xapFile, path) != null; } public override Assembly LoadAssemblyFromPath(string path) { - Stream stream = Package.GetFile(path); + Stream stream = Package.GetFile(_xapFile, path); if (stream == null) { throw new FileNotFoundException("could not find assembly in XAP: " + path); } @@ -67,7 +72,7 @@ namespace Microsoft.Scripting.Silverlight { } public override Stream OpenInputFileStream(string path) { - Stream result = Package.GetFile(GetFullPath(path)); + Stream result = Package.GetFile(_xapFile, GetFullPath(path)); if (result == null) throw new IOException(String.Format("file {0} not found in XAP", path)); return result; Merlin/Main/Hosts/SilverLight/Microsoft.Scripting.SilverLight/BrowserPAL.cs @@ -1,4 +1,19 @@ -using System; +/* **************************************************************************** + * + * Copyright (c) Microsoft Corporation. + * + * This source code is subject to terms and conditions of the Microsoft Public License. A + * copy of the license can be found in the License.html file at the root of this distribution. If + * you cannot locate the Microsoft Public License, please send an email to + * dlr@microsoft.com. By using this source code in any fashion, you are agreeing to be bound + * by the terms of the Microsoft Public License. + * + * You must not remove this notice, or any other, from this software. + * + * + * ***************************************************************************/ + +using System; using System.Collections.Generic; using System.IO; using System.Reflection; Merlin/Main/Hosts/SilverLight/Microsoft.Scripting.SilverLight/Configuration.cs @@ -24,6 +24,7 @@ using System.Xml; using Microsoft.Scripting.Hosting; using Microsoft.Scripting.Runtime; using Microsoft.Scripting.Utils; +using System.Net; namespace Microsoft.Scripting.Silverlight { @@ -112,11 +113,19 @@ namespace Microsoft.Scripting.Silverlight { get { return _runtime; } } + internal ScriptEngine Engine { + get { return _engine; } + } + + internal ScriptScope EntryPointScope { + get { return _entryPointScope; } + } #endregion #region instance variables private string _entryPoint; + private bool _consoleEnabled; private bool _debug; private bool _exceptionDetail; private bool _reportErrors; @@ -132,12 +141,14 @@ namespace Microsoft.Scripting.Silverlight { private ScriptRuntime _runtime; private ScriptRuntimeSetup _runtimeSetup; + private ScriptEngine _engine; + private ScriptScope _entryPointScope; internal static bool InUIThread { get { return _UIThreadId == Thread.CurrentThread.ManagedThreadId; } } - #endregion + #region public API // these are instance methods so you can do Application.Current.TheMethod(...) @@ -187,8 +198,51 @@ namespace Microsoft.Scripting.Silverlight { return new Uri(baseUri + relativeUri, UriKind.Relative); } + public static ScriptRuntimeSetup CreateRuntimeSetup(IEnumerable<Assembly> assemblies) { + ScriptRuntimeSetup setup = Configuration.TryParseFile(); + if (setup == null) { + if (assemblies == null) { + if (!Package.ContainsDLRAssemblies(Deployment.Current.Parts)) { + assemblies = Package.GetExtensionAssemblies(); + } else { + assemblies = Package.GetManifestAssemblies(); + } + } + setup = Configuration.LoadFromAssemblies(assemblies); + } + setup.HostType = typeof(BrowserScriptHost); + return setup; + } + + public static ScriptRuntimeSetup CreateRuntimeSetup() { + return CreateRuntimeSetup(null); + } + + public static StreamResourceInfo XapFile { + get { + return BrowserPAL.PAL.XapFile; + } + set { + BrowserPAL.PAL.XapFile = value; + } + } #endregion + public static void LoadAssemblies(Action onComplete) { + if (!Package.ContainsDLRAssemblies(Deployment.Current.Parts)) { + // FIXME: for now, we manually redownload extensions. + // A SL bug is stopping us from using Deployment.Current.ExternalParts + // to figure out what extensions have been requested by the application. + // FIXME: The extensions are downloaded one after the other ... should + // be done in parallel. + Extension.FetchDLR(delegate() { + onComplete.Invoke(); + }); + } else { + onComplete.Invoke(); + } + } + #region implementation /// <summary> @@ -211,46 +265,51 @@ namespace Microsoft.Scripting.Silverlight { ReportUnhandledErrors = true; ParseArguments(e.InitParams); - - ScriptRuntimeSetup setup = Configuration.TryParseFile(); - if (setup == null) { - setup = Configuration.LoadFromAssemblies(Package.GetManifestAssemblies()); - } - InitializeDLR(setup); + DynamicApplication.LoadAssemblies(delegate() { + Start(); + }); + } + void Start() { + InitializeDLR(); StartMainProgram(); } - private void InitializeDLR(ScriptRuntimeSetup setup) { - setup.HostType = typeof(BrowserScriptHost); + private void InitializeDLR() { + var setup = CreateRuntimeSetup(); setup.DebugMode = _debug; - setup.Options["SearchPaths"] = new string[] { String.Empty }; _runtimeSetup = setup; _runtime = new ScriptRuntime(setup); _runtime.LoadAssembly(GetType().Assembly); // to expose our helper APIs + LoadDefaultAssemblies(_runtime); + } + public static void LoadDefaultAssemblies(ScriptRuntime runtime) { // Add default references to Silverlight platform DLLs // (Currently we auto reference CoreCLR, UI controls, browser interop, and networking stack.) foreach (string name in new string[] { "mscorlib", "System", "System.Windows", "System.Windows.Browser", "System.Net" }) { - _runtime.LoadAssembly(BrowserPAL.PAL.LoadAssembly(name)); + runtime.LoadAssembly(GetAssemblyByName(name)); } } + public static Assembly GetAssemblyByName(string name) { + return BrowserPAL.PAL.LoadAssembly(name); + } + private void StartMainProgram() { string code = Package.GetEntryPointContents(); + _engine = _runtime.GetEngineByFileExtension(Path.GetExtension(_entryPoint)); + _entryPointScope = _engine.CreateScope(); - ScriptEngine engine = _runtime.GetEngineByFileExtension(Path.GetExtension(_entryPoint)); + if (_consoleEnabled) + Repl.Show(); - ScriptSource sourceCode = engine.CreateScriptSourceFromString(code, _entryPoint, SourceCodeKind.File); - - // Create a new script module & execute the code. - // It's important to use optimized scopes, - // which are ~4x faster on benchmarks that make heavy use of top-level functions/variables. - sourceCode.Compile(new ErrorFormatter.Sink()).Execute(); + ScriptSource sourceCode = _engine.CreateScriptSourceFromString(code, _entryPoint, SourceCodeKind.File); + sourceCode.Compile(new ErrorFormatter.Sink()).Execute(_entryPointScope); } @@ -264,6 +323,13 @@ namespace Microsoft.Scripting.Silverlight { _initParams.TryGetValue("start", out _entryPoint); + string consoleEnabled; + if (_initParams.TryGetValue("console", out consoleEnabled)) { + if (!bool.TryParse(consoleEnabled, out _consoleEnabled)) { + throw new ArgumentException("You must set 'console' to 'true' or 'false', for example: initParams: \"..., console=true\""); + } + } + string debug; if (_initParams.TryGetValue("debug", out debug)) { if (!bool.TryParse(debug, out _debug)) { Merlin/Main/Hosts/SilverLight/Microsoft.Scripting.SilverLight/DynamicApplication.cs @@ -19,15 +19,26 @@ using System.Collections.Generic; using System.Dynamic; using System.Text; using System.Windows.Browser; +using Microsoft.Scripting; using Microsoft.Scripting.Hosting; +using Microsoft.Scripting.Hosting.Providers; using Microsoft.Scripting.Runtime; using Microsoft.Scripting.Utils; -using Microsoft.Scripting.Hosting.Providers; - namespace Microsoft.Scripting.Silverlight { - internal static class ErrorFormatter { + public static class ErrorFormatter { + + #region Error HTML Template + private const string _errorReportId = "silverlightDlrErrorReport"; + private const string _errorMessageId = "silverlightDlrErrorMessage"; + private const string _errorSourceId = "silverlightDlrErrorSource"; + private const string _errorSourceFileId = "silverlightDlrErrorSourceFile"; + private const string _errorSourceCodeId = "silverlightDlrErrorSourceCode"; + private const string _errorDetailsId = "silverlightDlrErrorDetails"; + private const string _errorTypeId = "silverlightDlrErrorType"; + private const string _errorStackTraceId = "silverlightDlrErrorStackTrace"; + private const string _errorLineId = "silverlightDlrErrorLine"; // Template for generating error HTML. Parameters are: // 0 - message @@ -35,42 +46,33 @@ namespace Microsoft.Scripting.Silverlight { // 2 - source code at error location // 3 - error type // 4 - stack trace - static string _ErrorHtmlTemplate = @" -<div id=""silverlightDlrErrorReport"" class=""silverlightDlrErrorReport""> - -<div id=""silverlightDlrErrorWrapper"" class=""silverlightDlrErrorWrapper""> - - <h2 id=""silverlightDlrErrorMessage"" class=""silverlightDlrErrorMessage"">{0}</h2> - - <div class=""silverlightDlrErrorSource""> - - <div id=""silverlightDlrErrorSourceFile"" class=""silverlightDlrErrorSourceFile"">{1}</div> - <code id=""silverlightDlrErrorSourceCode"" class=""silverlightDlrErrorSourceCode"">{2}</code> - - </div> - - <div class=""silverlightDlrErrorDetails""> - - <div id=""silverlightDlrErrorType"" class=""silverlightDlrErrorType"">{3}</div> - <code id=""silverlightDlrErrorStackTrace"" class=""silverlightDlrErrorStackTrace"">{4}</code> - - </div> - -</div> - -<div class=""silverlightDlrErrorMenu"" id=""silverlightDlrErrorHeader"" style=""display: none""> - <a href=""javascript:void(0);"" onclick=""document.getElementById('silverlightDlrErrorFooter').style.display = 'block'; document.getElementById('silverlightDlrErrorWrapper').style.display = 'block'; document.getElementById('silverlightDlrErrorHeader').style.display = 'none'; document.body.style.paddingBottom = '15px';"">&uArr; {0}</a> -</div> - -<div class=""silverlightDlrErrorMenu"" id=""silverlightDlrErrorFooter""> - <a href=""javascript:void(0);"" onclick=""document.getElementById('silverlightDlrErrorFooter').style.display = 'none'; document.getElementById('silverlightDlrErrorWrapper').style.display = 'none'; document.getElementById('silverlightDlrErrorHeader').style.display = 'block'; document.body.style.paddingBottom = '15px';"">&dArr; Hide</a> -</div> + // 5 - error report id/class + // 6 - error message id/class + // 7 - error source id/class + // 8 - error file id/class + // 9 - error source code id/class + // 10 - error details id/class + // 11 - error type id/class + // 12 - error stack trace id/class + private static string _errorHtmlTemplate = @" +<!-- error report html --> +<h2 class=""{6}"" id=""{6}"">{0}</h2> +<div class=""{7}""> + <div class=""{8}"" id=""{8}"">{1}</div> + <code class=""{9}"" id=""{9}""> + {2} + </code> +</div> +<div class=""{10}""> + <div class=""{11}"" id=""{11}"">{3}</div> + <code class=""{12}"" id=""{12}""> + {4} + </code> +</div>"; -</div> -"; // template for highlighted error line, inserted into the silverlightDlrErrorSourceCode div in the template above - const string _ErrorLineTemplate = @"<span id=""silverlightDlrErrorLine"" class=""silverlightDlrErrorLine"">{0}</span>"; - + private const string _errorLineTemplate = @"<span id=""{1}"" class=""{1}"">{0}</span>"; + #endregion static volatile bool _displayedError = false; @@ -80,44 +82,47 @@ namespace Microsoft.Scripting.Silverlight { return; } _displayedError = true; - try { - HtmlElement target = HtmlPage.Document.GetElementById(targetElementId); - if (target == null) { - // Create a div with this ID - target = HtmlPage.Document.CreateElement("div"); - if (!string.IsNullOrEmpty(targetElementId)) { - target.Id = targetElementId; - } - - (HtmlPage.Document.GetElementsByTagName("body")[0] as HtmlElement).AppendChild(target); - } + Window.Show(targetElementId); + Repl.Show(); - target.SetProperty("innerHTML", FormatErrorAsHtml(e)); + string result; + try { + result = FormatErrorAsHtml(e); } catch (Exception ex) { - HtmlPage.Document.GetElementById(targetElementId).SetProperty("innerHTML", EscapeHtml(ex.ToString())); + result = EscapeHtml(ex.ToString()); } + + var report = HtmlPage.Document.CreateElement("div"); + report.Id = report.CssClass = _errorReportId; + report.SetProperty("innerHTML", result); + Window.Current.AddPanel("Error Report (" + EscapeHtml(new DynamicExceptionInfo(e).ErrorTypeName) + ")", report); + Window.Current.Initialize(); + Window.Current.ShowPanel(report.Id); } - private static string FormatErrorAsHtml(Exception e) { + internal static string FormatErrorAsHtml(Exception e) { // Get information about this exception object DynamicExceptionInfo err = new DynamicExceptionInfo(e); - // Template for generating error HTML. Parameters are: - // 0 - message - // 1 - source file - // 2 - source code at error location - // 3 - error type - // 4 - stack trace return string.Format( - _ErrorHtmlTemplate, + _errorHtmlTemplate, EscapeHtml(err.Message), err.SourceFileName != null ? EscapeHtml(err.SourceFileName) : "", FormatSourceCode(err), EscapeHtml(err.ErrorTypeName), - FormatStackTrace(err)); + FormatStackTrace(err), + _errorReportId, + _errorMessageId, + _errorSourceId, + _errorSourceFileId, + _errorSourceCodeId, + _errorDetailsId, + _errorTypeId, + _errorStackTraceId + ); } // Print the line with the error plus some context lines @@ -150,7 +155,7 @@ namespace Microsoft.Scripting.Silverlight { text.Append("Line ").Append(' ', maxLen - lineNum.Length).Append(lineNum).Append(": "); lineText = EscapeHtml(lineText); if (i == line) { - text.AppendFormat(_ErrorLineTemplate, lineText); + text.AppendFormat(_errorLineTemplate, lineText, _errorLineId); } else { text.Append(lineText); } @@ -198,11 +203,11 @@ namespace Microsoft.Scripting.Silverlight { return EscapeHtml(ex.StackTrace != null ? ex.StackTrace : ex.ToString()); } - private static string EscapeHtml(string str) { + public static string EscapeHtml(string str) { return HttpUtility.HtmlEncode(str).Replace(" ", "&nbsp;").Replace("\n", "<br />"); } - internal class Sink : ErrorListener { + public class Sink : ErrorListener { public override void ErrorReported(ScriptSource source, string message, SourceSpan span, int errorCode, Severity severity) { throw new SyntaxErrorException(message, HostingHelpers.GetSourceUnit(source), span, errorCode, severity); } @@ -212,7 +217,7 @@ namespace Microsoft.Scripting.Silverlight { /// Utility class to encapsulate all of the information we retrieve, starting from /// the Exception object. /// </summary> - private class DynamicExceptionInfo { + public class DynamicExceptionInfo { public Exception Exception { get { return _exception; } } @@ -259,9 +264,17 @@ namespace Microsoft.Scripting.Silverlight { _sourceLine = _dynamicStackFrames[0].GetFileLineNumber(); } - ScriptEngine engine; - if (_sourceFileName != null && - DynamicApplication.Current.Runtime.TryGetEngineByFileExtension(System.IO.Path.GetExtension(_sourceFileName), out engine)) { + ScriptEngine engine = null; + if(_sourceFileName.IndexOfAny(Path.GetInvalidPathChars()) == 0) { + var extension = System.IO.Path.GetExtension(_sourceFileName); + DynamicApplication.Current.Runtime.TryGetEngineByFileExtension(extension, out engine); + } else { + // running at an interactive prompt, so get the prompt's engine + if (Repl.Current != null && Repl.Current.Engine != null) { + engine = Repl.Current.Engine; + } + } + if (_sourceFileName != null && engine != null) { ExceptionOperations es = engine.GetService<ExceptionOperations>(); es.GetExceptionMessage(_exception, out _message, out _errorTypeName); } else { Merlin/Main/Hosts/SilverLight/Microsoft.Scripting.SilverLight/ErrorFormatter.cs @@ -84,6 +84,16 @@ <HintPath>$(SilverlightPath)\System.Xml.dll</HintPath> <Private>False</Private> </Reference> + <Reference Include="System.Data, Version=2.0.5.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>$(SilverlightPath)\System.Data.dll</HintPath> + <Private>False</Private> + </Reference> + <Reference Include="System.Net, Version=2.0.5.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>$(SilverlightPath)\System.Net.dll</HintPath> + <Private>False</Private> + </Reference> </ItemGroup> <ItemGroup> <Compile Include="..\SilverlightVersion.cs"> @@ -92,11 +102,18 @@ <Compile Include="BrowserPAL.cs" /> <Compile Include="BrowserScriptHost.cs" /> <Compile Include="Configuration.cs" /> + <Compile Include="Extension.cs" /> + <Compile Include="Repl.cs" /> <Compile Include="DynamicApplication.cs" /> <Compile Include="ErrorFormatter.cs" /> <Compile Include="ExtensionTypes.cs" /> <Compile Include="Package.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> + <Compile Include="Window.cs" /> + </ItemGroup> + <ItemGroup> + <EmbeddedResource Include="agdlr.css" /> + <EmbeddedResource Include="agdlr.js" /> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" Condition=" '$(SilverlightTreeBuild)' != 'true' " /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Merlin/Main/Hosts/SilverLight/Microsoft.Scripting.SilverLight/Microsoft.Scripting.Silverlight.csproj @@ -1,4 +1,19 @@ -using System; +/* **************************************************************************** + * + * Copyright (c) Microsoft Corporation. + * + * This source code is subject to terms and conditions of the Microsoft Public License. A + * copy of the license can be found in the License.html file at the root of this distribution. If + * you cannot locate the Microsoft Public License, please send an email to + * dlr@microsoft.com. By using this source code in any fashion, you are agreeing to be bound + * by the terms of the Microsoft Public License. + * + * You must not remove this notice, or any other, from this software. + * + * + * ***************************************************************************/ + +using System; using System.Collections.Generic; using System.Text; using System.IO; @@ -11,12 +26,48 @@ namespace Microsoft.Scripting.Silverlight { private const string _defaultEntryPoint = "app"; + private static List<string> _extensionUris = new List<string>() { + "http://go.microsoft.com/fwlink/?LinkID=146361", // Microsoft.Scripting.slvx + "http://go.microsoft.com/fwlink/?LinkID=146359", // IronRuby.slvx + "http://go.microsoft.com/fwlink/?LinkID=146360", // IronPython.slvx + }; + + private static List<string> _languageAssemblyNames = new List<string>() { + "IronRuby", + "IronRuby.Libraries", + "IronPython", + "IronPython.Modules" + }; + + private static List<string> _dlrAssemblyNames = new List<String>() + { + "Microsoft.Scripting.Core", + "Microsoft.Scripting", + "Microsoft.Scripting.ExtensionAttribute", + "Microsoft.Scripting.Silverlight" + }; + + private static List<StreamResourceInfo> _languageAssemblies = new List<StreamResourceInfo>(); + + public static List<string> DLRAssemblyNames { get { return _dlrAssemblyNames; } } + public static List<string> LanguageAssemblyNames { get { return _languageAssemblyNames; }} + public static List<string> LanguageExtensionUris { get { return _extensionUris; }} + public static List<StreamResourceInfo> LanguageAssemblies { get { return _languageAssemblies; } } + public static string GetFileContents(string relativePath) { - return GetFileContents(new Uri(NormalizePath(relativePath), UriKind.Relative)); + return GetFileContents(DynamicApplication.XapFile, relativePath); } public static string GetFileContents(Uri relativeUri) { - Stream stream = GetFile(relativeUri); + return GetFileContents(DynamicApplication.XapFile, relativeUri); + } + + public static string GetFileContents(StreamResourceInfo xap, string relativePath) { + return GetFileContents(xap, new Uri(NormalizePath(relativePath), UriKind.Relative)); + } + + public static string GetFileContents(StreamResourceInfo xap, Uri relativeUri) { + Stream stream = GetFile(xap, relativeUri); if (stream == null) { return null; } @@ -29,17 +80,46 @@ namespace Microsoft.Scripting.Silverlight { } public static Stream GetFile(string relativePath) { - return GetFile(new Uri(NormalizePath(relativePath), UriKind.Relative)); + return GetFileInternal(DynamicApplication.XapFile, relativePath); } public static Stream GetFile(Uri relativeUri) { - StreamResourceInfo sri = Application.GetResourceStream(relativeUri); + return GetFileInternal(DynamicApplication.XapFile, relativeUri); + } + + public static Stream GetFile(StreamResourceInfo xap, string relativePath) { + return GetFileInternal(xap, relativePath); + } + + public static Stream GetFile(StreamResourceInfo xap, Uri relativeUri) { + return GetFileInternal(xap, relativeUri); + } + + private static Stream GetFileInternal(StreamResourceInfo xap, string relativePath) { + return GetFileInternal(xap, new Uri(NormalizePath(relativePath), UriKind.Relative)); + } + + private static Stream GetFileInternal(StreamResourceInfo xap, Uri relativeUri) { + StreamResourceInfo sri = null; + if (xap == null) { + sri = Application.GetResourceStream(relativeUri); + } else { + sri = Application.GetResourceStream(xap, relativeUri); + } return (sri != null) ? sri.Stream : null; } public static string NormalizePath(string path) { // files are stored in the XAP using forward slashes - return path.Replace(Path.DirectorySeparatorChar, '/'); + string normPath = path.Replace(Path.DirectorySeparatorChar, '/'); + + // Application.GetResource doesn't like paths that start with ./ + // TODO try to get this fixed in SL + if (normPath.StartsWith("./")) { + normPath = normPath.Substring(2); + } + + return normPath; } public static IEnumerable<Assembly> GetManifestAssemblies() { @@ -54,6 +134,18 @@ namespace Microsoft.Scripting.Silverlight { return result; } + public static IEnumerable<Assembly> GetExtensionAssemblies() { + var result = new List<Assembly>(); + foreach (var sri in LanguageAssemblies) { + try { + result.Add(new AssemblyPart().Load(sri.Stream)); + } catch (Exception) { + // skip + } + } + return result; + } + public static string GetEntryPointContents() { string code = null; @@ -87,5 +179,32 @@ namespace Microsoft.Scripting.Silverlight { } return code; } + + public static bool ContainsDLRAssemblies(AssemblyPartCollection assemblyPartCollection) { + var ret = assemblyPartCollection.Count != 0; + + foreach (var name in _dlrAssemblyNames) { + bool found = false; + foreach (AssemblyPart ap in assemblyPartCollection) { + if (string.Format("{0}.dll", name) == ap.Source) { + found = true; + break; + } + } + ret = ret && found; + } + + bool langFound = false; + foreach (AssemblyPart ap in assemblyPartCollection) { + var rb = string.Format("{0}.dll", _languageAssemblyNames[0]); + var py = string.Format("{0}.dll", _languageAssemblyNames[2]); + if(ap.Source == rb || ap.Source == py) { + langFound = true; + break; + } + } + + return ret && langFound; + } } } Merlin/Main/Hosts/SilverLight/Microsoft.Scripting.SilverLight/Package.cs @@ -19,6 +19,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Python", "Python", "{F26422 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Ruby", "Ruby", "{954F903C-ABF7-400B-B23B-F7D461D23841}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestConsoleHost", "TestConsoleHost\TestConsoleHost.csproj", "{3C0D0159-3295-4ED3-BC48-961AE99CE15E}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Scripting", "..\..\Runtime\Microsoft.Scripting\Microsoft.Scripting.csproj", "{EB66B766-6354-4208-A3D4-AACBDCB5C3B3}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Scripting.ExtensionAttribute", "..\..\..\..\ndp\fx\src\Core\Microsoft\Scripting\Microsoft.Scripting.ExtensionAttribute.csproj", "{8B0F1074-750E-4D64-BF23-A1E0F54261E5}" @@ -46,12 +48,18 @@ Global SccProjectTopLevelParentUniqueName5 = Silverlight.sln SccProjectName5 = ../../Languages/Ruby/Libraries.LCA_RESTRICTED SccLocalPath5 = ..\\..\\Languages\\Ruby\\Libraries.LCA_RESTRICTED + SccProjectUniqueName6 = ..\\..\\Languages\\JS\\JS.Runtime\\JS.Runtime.csproj SccProjectTopLevelParentUniqueName6 = Silverlight.sln + SccProjectName6 = ../../Languages/JS/JS.Runtime + SccLocalPath6 = ..\\..\\Languages\\JS\\JS.Runtime SccProjectUniqueName7 = ..\\..\\Languages\\IronPython\\IronPython\\IronPython.csproj SccProjectTopLevelParentUniqueName7 = Silverlight.sln SccProjectName7 = ../../Languages/IronPython/IronPython SccLocalPath7 = ..\\..\\Languages\\IronPython\\IronPython + SccProjectUniqueName8 = ..\\..\\Languages\\JS\\JSCompiler\\JSCompiler.csproj SccProjectTopLevelParentUniqueName8 = Silverlight.sln + SccProjectName8 = ../../Languages/JS/JSCompiler + SccLocalPath8 = ..\\..\\Languages\\JS\\JSCompiler SccProjectUniqueName9 = ..\\..\\Languages\\Ruby\\Ruby\\Ruby.csproj SccProjectTopLevelParentUniqueName9 = Silverlight.sln SccProjectName9 = ../../Languages/Ruby/Ruby @@ -96,14 +104,6 @@ Global {77323B06-15A2-4CF4-8A7A-86EAA2B66498}.Silverlight Debug|Any CPU.Build.0 = Silverlight Debug|Any CPU {77323B06-15A2-4CF4-8A7A-86EAA2B66498}.Silverlight Release|Any CPU.ActiveCfg = Silverlight Release|Any CPU {77323B06-15A2-4CF4-8A7A-86EAA2B66498}.Silverlight Release|Any CPU.Build.0 = Silverlight Release|Any CPU - {357C287E-9839-41D6-B28C-203836500F2A}.Silverlight Debug|Any CPU.ActiveCfg = Silverlight Debug|Any CPU - {357C287E-9839-41D6-B28C-203836500F2A}.Silverlight Debug|Any CPU.Build.0 = Silverlight Debug|Any CPU - {357C287E-9839-41D6-B28C-203836500F2A}.Silverlight Release|Any CPU.ActiveCfg = Silverlight Release|Any CPU - {357C287E-9839-41D6-B28C-203836500F2A}.Silverlight Release|Any CPU.Build.0 = Silverlight Release|Any CPU - {588FD769-EEED-4CC1-AA39-2974051746AB}.Silverlight Debug|Any CPU.ActiveCfg = Silverlight Debug|Any CPU - {588FD769-EEED-4CC1-AA39-2974051746AB}.Silverlight Debug|Any CPU.Build.0 = Silverlight Debug|Any CPU - {588FD769-EEED-4CC1-AA39-2974051746AB}.Silverlight Release|Any CPU.ActiveCfg = Silverlight Release|Any CPU - {588FD769-EEED-4CC1-AA39-2974051746AB}.Silverlight Release|Any CPU.Build.0 = Silverlight Release|Any CPU {3C0D0159-3295-4ED3-BC48-961AE99CE15E}.Silverlight Debug|Any CPU.ActiveCfg = Silverlight Debug|Any CPU {3C0D0159-3295-4ED3-BC48-961AE99CE15E}.Silverlight Debug|Any CPU.Build.0 = Silverlight Debug|Any CPU {3C0D0159-3295-4ED3-BC48-961AE99CE15E}.Silverlight Release|Any CPU.ActiveCfg = Silverlight Release|Any CPU @@ -125,7 +125,5 @@ Global {95289EA9-5778-489D-AB48-F81F2CE2DA32} = {F26422BE-3900-428B-9C8A-7CDD72186EFB} {77323B06-15A2-4CF4-8A7A-86EAA2B66498} = {954F903C-ABF7-400B-B23B-F7D461D23841} {7F6984B4-EE6D-4E6F-ABB1-E210D7DC4FDD} = {954F903C-ABF7-400B-B23B-F7D461D23841} - {588FD769-EEED-4CC1-AA39-2974051746AB} = {18EE4124-5E86-4DA6-A827-0A5BEFF7B943} - {357C287E-9839-41D6-B28C-203836500F2A} = {18EE4124-5E86-4DA6-A827-0A5BEFF7B943} EndGlobalSection EndGlobal Merlin/Main/Hosts/SilverLight/Silverlight.sln @@ -19,6 +19,9 @@ using System.Reflection; using System.Resources; [assembly: AssemblyVersion("2.0.5.0")] + +// Keep the version number set to the initial Silverlight 2 RTW version (2.0.31005), +// does not need to track the latest Silverlight 2 GDR (2.0.40115). [assembly: AssemblyFileVersion("2.0.31005.0")] [assembly: AssemblyInformationalVersion("2.0.31005.0")] Merlin/Main/Hosts/SilverLight/SilverlightVersion.cs 12cd15a7e6009523fe3e46141113e2a8187083a7 Jim Deville jdeville@microsoft.com http://github.com/ironruby/ironruby/commit/33211840f7482ffaa4970a6e630725fad2a70f5d 33211840f7482ffaa4970a6e630725fad2a70f5d 2009-06-24T19:46:58-07:00 2009-06-24T16:02:58-07:00 Integration from <http://github.com/jschementi/agdlr>: Microsoft.Scripting.Silverlight - In-browser Python/Ruby REPL support with initParams console=true. o Adds Microsoft.Scripting.Silverlight.Repl type. Renders the REPL using HTML. REPL runs in the same scope as the start-script by default, therefore has the same language as the start-script. o Can be instantiated by code as well; see samples/repl. o This should be its own assembly in the future to mitigate any “security” concerns from users getting access to the REPL. Production apps can remove the assembly. - Allow importing/requiring on a background thread: o Removed UI thread check in FileExists o Fixed ErrorReporter bug when _sourceFileName is not a file on disk (e.g. <string>) - Not using try/catch for this anymore (jomes review feedback) - Allows hosts of the DLR load a self-contained Python or Ruby library (n a XAP file) and ensures requires/imports will work: o Enables easy setup of a Ruby testing framework to test C#: - <http://blog.jimmy.schementi.com/2009/03/testing-c-silverlight-apps-with.html> o Package.GetFile* methods now take an optional StreamResourceInfo argument, representing the XAP file to look for the file in. BrowserPAL also has a XapFile property now for telling it which XAP file to look in. - Primitive SL3 Extension support o Hacky at the moment due to a Silverlight 3 bug (which is fixed in more recent internal builds). Need to hardcode extension URLs. - See Silverlight Bugs 31601 and 31873 for context Chiron - Zip version fix (sdlsdk CodePlex Bug# 11803) - Use standard libraries in Silverlight: o Add "/path" option to Chiron for a ";"-separated list of folders to get included into the XAP - Auto-XAP support for IIS: o Add XapHttpHander to Chiron, so it can be used to auto-XAP directories for IIS or Cassini (thanks Harry Pierson!) o Example in Utils/xap-http-handler - Launch Chiron by right-clicking on a folder: chiron-here utility Tests - Run in one Silverlight application: - 52 specifications (81 requirements), 0 failures, 0 errors o Port Python tests 01, args, auto_addref, error_handle, execfile, and issubclass, from existing TestSuites o Unit tests for console, dynamic_application, extension_types, package, and window - Includes Eggs; makes Bacon (a Ruby spec framework) work in Silverlight. Can be used to test a Python/Ruby app, or a C#/VB app (see testing link above). - Not running in SNAP yet. Samples - Cleans up all samples - Adds Photoviewer o <http://blog.jimmy.schementi.com/2008/08/walk-through-silverlight-flickr-client.html> - Updates to dlrconsole to fix Ruby and make dragging clock demo work: o <http://blog.jimmy.schementi.com/2008/08/dragging-elements-in-silverlight-with.html> - Adds REPL - Piano, Tetris, and Surface work again Misc: - reflect new template layout for gopackage MSI generation - Microsoft.Scripting.Helpers.csproj now builds correctly in Silverlight - JScript removed from Silverlight.sln 488a2d7fa2c37f2a1cf251ad609c85bace03378a Jim Deville jdeville@microsoft.com