edit: $/DevDiv/Dev11/PU/MQPro/ndp/fx/src/Core/Microsoft/Scripting/Microsoft.Scripting.Core.csproj;C1873631 File: Microsoft.Scripting.Core.csproj =================================================================== --- $/DevDiv/Dev11/PU/MQPro/ndp/fx/src/Core/Microsoft/Scripting/Microsoft.Scripting.Core.csproj;C1873631 (server) 6/29/2010 5:45 PM +++ Shelved Change: $/DevDiv/Dev11/PU/MQPro/ndp/fx/src/Core/Microsoft/Scripting/Microsoft.Scripting.Core.csproj;noea6 @@ -24,8 +24,10 @@ true $(SolutionDir)..\Util\Internal\Silverlight\x86ret\ 855638016 + + true + false Microsoft.Scripting.Core.ruleset - v2.0 pdbonly @@ -35,6 +37,7 @@ prompt 4 true + v3.5 true @@ -45,6 +48,7 @@ prompt 4 false + v3.5 pdbonly @@ -54,6 +58,7 @@ prompt 4 false + v3.5 true @@ -65,6 +70,7 @@ prompt true true + v3.5 $(SolutionDir)..\bin\Silverlight3Release @@ -74,22 +80,9 @@ AnyCPU prompt true + v3.5 - - - - False - $(SilverlightPath)\mscorlib.dll - - - False - $(SilverlightPath)\System.dll - - - - - Properties\SilverlightVersion.cs @@ -210,18 +203,11 @@ - - - {8B0F1074-750E-4D64-BF23-A1E0F54261E5} - Microsoft.Scripting.ExtensionAttribute - - - Ast\System.Linq.Expressions.txt @@ -229,6 +215,25 @@ + + + + + + + + False + $(SilverlightPath)\mscorlib.dll + + + False + $(SilverlightPath)\System.dll + + + False + $(SilverlightPath)\System.Core.dll + + =================================================================== delete: $/DevDiv/Dev11/PU/MQPro/ndp/fx/src/Core/Microsoft/Scripting/Microsoft.Scripting.ExtensionAttribute.csproj;C1873631 File: Microsoft.Scripting.ExtensionAttribute.csproj =================================================================== --- $/DevDiv/Dev11/PU/MQPro/ndp/fx/src/Core/Microsoft/Scripting/Microsoft.Scripting.ExtensionAttribute.csproj;C1873631 (server) 6/29/2010 6:54 PM +++ [no target file] @@ -1,107 +1,0 @@ - - - - v2Debug - AnyCPU - 10.0.20624 - 2.0 - {8B0F1074-750E-4D64-BF23-A1E0F54261E5} - Library - Properties - Microsoft.Scripting.ExtensionAttribute - Microsoft.Scripting.ExtensionAttribute - SAK - SAK - SAK - SAK - true - 618 - 1591 - $(SolutionDir)..\Internal\MSSharedLibKey.snk - true - SIGNED - true - 866123776 - .$(SolutionDir)..\Util\Internal\Silverlight\x86ret\ - Microsoft.Scripting.ExtensionAttribute.ruleset - v2.0 - - - pdbonly - true - $(SolutionDir)..\bin\FxCop - TRACE;$(SignedSym) - prompt - 4 - true - - - true - full - false - $(SolutionDir)..\bin\v2Debug - DEBUG;TRACE;$(SignedSym) - prompt - 4 - false - - - pdbonly - true - $(SolutionDir)..\bin\v2Release - TRACE;$(SignedSym) - prompt - 4 - false - 1929379840 - - - true - $(SolutionDir)..\bin\Silverlight3Debug - TRACE;DEBUG;SILVERLIGHT - full - AnyCPU - false - prompt - true - true - - - $(SolutionDir)..\bin\Silverlight3Release - TRACE;SILVERLIGHT - true - pdbonly - AnyCPU - prompt - true - - - - - False - $(SilverlightPath)\mscorlib.dll - - - False - $(SilverlightPath)\System.dll - - - - - Properties\SilverlightVersion.cs - - - - - - - - - - - - - - - - \ No newline at end of file =================================================================== delete: $/DevDiv/Dev11/PU/MQPro/ndp/fx/src/Core/Microsoft/Scripting/Microsoft.Scripting.ExtensionAttribute.csproj.vspscc;C1841263 File: Microsoft.Scripting.ExtensionAttribute.csproj.vspscc =================================================================== --- $/DevDiv/Dev11/PU/MQPro/ndp/fx/src/Core/Microsoft/Scripting/Microsoft.Scripting.ExtensionAttribute.csproj.vspscc;C1841263 (server) 6/29/2010 6:54 PM +++ [no target file] @@ -1,10 +1,0 @@ -"" -{ -"FILE_VERSION" = "9237" -"ENLISTMENT_CHOICE" = "NEVER" -"PROJECT_FILE_RELATIVE_PATH" = "" -"NUMBER_OF_EXCLUDED_FILES" = "0" -"ORIGINAL_PROJECT_FILE_PATH" = "" -"NUMBER_OF_NESTED_PROJECTS" = "0" -"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER" -} =================================================================== delete: $/DevDiv/Dev11/pu/MQPro/ndp/fx/src/Core/Microsoft/Scripting/Microsoft.Scripting.ExtensionAttribute.ruleset;C1841263 File: Microsoft.Scripting.ExtensionAttribute.ruleset =================================================================== --- $/DevDiv/Dev11/pu/MQPro/ndp/fx/src/Core/Microsoft/Scripting/Microsoft.Scripting.ExtensionAttribute.ruleset;C1841263 (server) 6/29/2010 6:54 PM +++ [no target file] @@ -1,211 +1,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file =================================================================== edit: $/DevDiv/Dev11/PU/MQPro/ndp/fx/src/Core/Microsoft/Scripting/Compiler/LambdaCompiler.cs;C1841263 File: LambdaCompiler.cs =================================================================== --- $/DevDiv/Dev11/PU/MQPro/ndp/fx/src/Core/Microsoft/Scripting/Compiler/LambdaCompiler.cs;C1841263 (server) 6/29/2010 5:51 PM +++ Shelved Change: $/DevDiv/Dev11/PU/MQPro/ndp/fx/src/Core/Microsoft/Scripting/Compiler/LambdaCompiler.cs;noea6 @@ -310,7 +310,7 @@ /// private MemberExpression CreateLazyInitializedField(string name) { if (_method is DynamicMethod) { - return Expression.Field(Expression.Constant(new StrongBox()), "Value"); + return Expression.Field(Expression.Constant(new StrongBox(default(T))), "Value"); } else { return Expression.Field(null, CreateStaticField(name, typeof(T))); } =================================================================== delete: $/DevDiv/Dev11/PU/MQPro/ndp/fx/src/Core/Microsoft/Scripting/Properties/ExtensionAssemblyInfo.cs;C1841263 File: ExtensionAssemblyInfo.cs =================================================================== --- $/DevDiv/Dev11/PU/MQPro/ndp/fx/src/Core/Microsoft/Scripting/Properties/ExtensionAssemblyInfo.cs;C1841263 (server) 6/30/2010 10:54 AM +++ [no target file] @@ -1,62 +1,0 @@ -/* **************************************************************************** - * - * 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.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using System.Security; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Microsoft.Scripting.ExtensionAttribute")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("Microsoft.Scripting.ExtensionAttribute")] -[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -[assembly: CLSCompliant(true)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("b828a36d-f568-48a7-9bdd-412b0a1bfa32")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Revision and Build Numbers -// by using the '*' as shown below: -[assembly: SecurityTransparent] - -[assembly: System.Resources.NeutralResourcesLanguage("en-US")] - -#if !SILVERLIGHT -[assembly: AssemblyVersion("2.0.0.0")] // shouldn't change, this assembly is unchanged. This is the version it originally shipped as. -[assembly: AssemblyFileVersion("1.0.1.00")] -[assembly: AssemblyInformationalVersion("1.0.1")] -[assembly: AllowPartiallyTrustedCallers] -#endif =================================================================== edit: $/DevDiv/Dev11/PU/MQPro/ndp/fx/src/Core/Microsoft/Scripting/Utils/Action.cs;C1841263 File: Action.cs =================================================================== --- $/DevDiv/Dev11/PU/MQPro/ndp/fx/src/Core/Microsoft/Scripting/Utils/Action.cs;C1841263 (server) 6/29/2010 6:12 PM +++ Shelved Change: $/DevDiv/Dev11/PU/MQPro/ndp/fx/src/Core/Microsoft/Scripting/Utils/Action.cs;noea6 @@ -19,17 +19,6 @@ namespace System { #endif -#if CLR2 || SILVERLIGHT - - /// - /// Encapsulates a method that takes no parameters and does not return a value. - /// - public delegate void Action(); - -#endif - - // public delegate void Action(T obj); -- Already defined in mscorlib - #region Generated Action Types // *** BEGIN GENERATED CODE *** @@ -38,41 +27,6 @@ #if CLR2 || SILVERLIGHT /// - /// Encapsulates a method that takes two parameters and does not return a value. - /// - /// The type of the first parameter of the method that this delegate encapsulates. - /// The type of the second parameter of the method that this delegate encapsulates. - /// The first parameter of the method that this delegate encapsulates. - /// The second parameter of the method that this delegate encapsulates. - public delegate void Action(T1 arg1, T2 arg2); - - /// - /// Encapsulates a method that takes three parameters and does not return a value. - /// - /// The type of the first parameter of the method that this delegate encapsulates. - /// The type of the second parameter of the method that this delegate encapsulates. - /// The type of the third parameter of the method that this delegate encapsulates. - /// The first parameter of the method that this delegate encapsulates. - /// The second parameter of the method that this delegate encapsulates. - /// The third parameter of the method that this delegate encapsulates. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1005:AvoidExcessiveParametersOnGenericTypes")] - public delegate void Action(T1 arg1, T2 arg2, T3 arg3); - - /// - /// Encapsulates a method that takes four parameters and does not return a value. - /// - /// The type of the first parameter of the method that this delegate encapsulates. - /// The type of the second parameter of the method that this delegate encapsulates. - /// The type of the third parameter of the method that this delegate encapsulates. - /// The type of the fourth parameter of the method that this delegate encapsulates. - /// The first parameter of the method that this delegate encapsulates. - /// The second parameter of the method that this delegate encapsulates. - /// The third parameter of the method that this delegate encapsulates. - /// The fourth parameter of the method that this delegate encapsulates. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1005:AvoidExcessiveParametersOnGenericTypes")] - public delegate void Action(T1 arg1, T2 arg2, T3 arg3, T4 arg4); - - /// /// Encapsulates a method that takes five parameters and does not return a value. /// /// The type of the first parameter of the method that this delegate encapsulates. =================================================================== edit: $/DevDiv/Dev11/PU/MQPro/ndp/fx/src/Core/Microsoft/Scripting/Utils/Function.cs;C1841263 File: Function.cs =================================================================== --- $/DevDiv/Dev11/PU/MQPro/ndp/fx/src/Core/Microsoft/Scripting/Utils/Function.cs;C1841263 (server) 6/29/2010 6:11 PM +++ Shelved Change: $/DevDiv/Dev11/PU/MQPro/ndp/fx/src/Core/Microsoft/Scripting/Utils/Function.cs;noea6 @@ -19,26 +19,6 @@ namespace System { #endif -#if CLR2 || SILVERLIGHT - - /// - /// Encapsulates a method that has no parameters and returns a value of the type specified by the TResult parameter. - /// - /// The type of the return value of the method that this delegate encapsulates. - /// The return value of the method that this delegate encapsulates. - public delegate TResult Func(); - - /// - /// Encapsulates a method that has one parameter and returns a value of the type specified by the TResult parameter. - /// - /// The type of the first parameter of the method that this delegate encapsulates. - /// The type of the return value of the method that this delegate encapsulates. - /// The first parameter of the method that this delegate encapsulates. - /// The return value of the method that this delegate encapsulates. - public delegate TResult Func(T arg); - -#endif - #region Generated Func Types // *** BEGIN GENERATED CODE *** @@ -47,48 +27,6 @@ #if CLR2 || SILVERLIGHT /// - /// Encapsulates a method that has two parameters and returns a value of the type specified by the TResult parameter. - /// - /// The type of the first parameter of the method that this delegate encapsulates. - /// The type of the second parameter of the method that this delegate encapsulates. - /// The type of the return value of the method that this delegate encapsulates. - /// The first parameter of the method that this delegate encapsulates. - /// The second parameter of the method that this delegate encapsulates. - /// The return value of the method that this delegate encapsulates. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1005:AvoidExcessiveParametersOnGenericTypes")] - public delegate TResult Func(T1 arg1, T2 arg2); - - /// - /// Encapsulates a method that has three parameters and returns a value of the type specified by the TResult parameter. - /// - /// The type of the first parameter of the method that this delegate encapsulates. - /// The type of the second parameter of the method that this delegate encapsulates. - /// The type of the third parameter of the method that this delegate encapsulates. - /// The type of the return value of the method that this delegate encapsulates. - /// The first parameter of the method that this delegate encapsulates. - /// The second parameter of the method that this delegate encapsulates. - /// The third parameter of the method that this delegate encapsulates. - /// The return value of the method that this delegate encapsulates. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1005:AvoidExcessiveParametersOnGenericTypes")] - public delegate TResult Func(T1 arg1, T2 arg2, T3 arg3); - - /// - /// Encapsulates a method that has four parameters and returns a value of the type specified by the TResult parameter. - /// - /// The type of the first parameter of the method that this delegate encapsulates. - /// The type of the second parameter of the method that this delegate encapsulates. - /// The type of the third parameter of the method that this delegate encapsulates. - /// The type of the fourth parameter of the method that this delegate encapsulates. - /// The type of the return value of the method that this delegate encapsulates. - /// The first parameter of the method that this delegate encapsulates. - /// The second parameter of the method that this delegate encapsulates. - /// The third parameter of the method that this delegate encapsulates. - /// The fourth parameter of the method that this delegate encapsulates. - /// The return value of the method that this delegate encapsulates. - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1005:AvoidExcessiveParametersOnGenericTypes")] - public delegate TResult Func(T1 arg1, T2 arg2, T3 arg3, T4 arg4); - - /// /// Encapsulates a method that has five parameters and returns a value of the type specified by the TResult parameter. /// /// The type of the first parameter of the method that this delegate encapsulates. =================================================================== edit: $/Personal/merllab/dlr/Util/Internal/Snap/tasks/mrclean.ps1;C1880888 File: mrclean.ps1 =================================================================== --- $/Personal/merllab/dlr/Util/Internal/Snap/tasks/mrclean.ps1;C1880888 (server) 6/30/2010 1:26 PM +++ Shelved Change: $/Personal/merllab/dlr/Util/Internal/Snap/tasks/mrclean.ps1;noea6 @@ -118,9 +118,7 @@ echo "Scrubbing the GAC..." $bin_list = @( "IronPython", "IronPython.Modules", "IronPythonTest", "IronRuby", "IronRuby.Libraries", "IronRuby.Libraries.Yaml", - "Microsoft.JScript.Compiler", "Microsoft.JScript.Runtime", - "Microsoft.Scripting.Core", "Microsoft.Scripting", "Microsoft.Scripting.ExtensionAttribute", "Microsoft.Scripting.Helpers", "Microsoft.Dynamic", - "Microsoft.Web.Scripting", + "Microsoft.Scripting.Core", "Microsoft.Scripting", "Microsoft.Dynamic", "ipy", "ipyw", "ir") #Run it on a predetermined list of binaries =================================================================== edit: $/Personal/merllab/dlr/Util/Internal/Snap/tasks/signoffs/IronRuby/IRSanity.rb;C1880888 File: IRSanity.rb =================================================================== --- $/Personal/merllab/dlr/Util/Internal/Snap/tasks/signoffs/IronRuby/IRSanity.rb;C1880888 (server) 6/30/2010 1:26 PM +++ Shelved Change: $/Personal/merllab/dlr/Util/Internal/Snap/tasks/signoffs/IronRuby/IRSanity.rb;noea6 @@ -136,7 +136,6 @@ IronRuby.dll IronRuby.Libraries.dll IronRuby.Libraries.Yaml.dll Microsoft.Dynamic.dll Microsoft.Scripting.Core.dll Microsoft.Scripting.Debugging.dll Microsoft.Scripting.dll - Microsoft.Scripting.ExtensionAttribute.dll tutorial.bat}, "lib" => %w{ironruby ruby}, "samples" => %w{DiskUse IRPowerShell Tutorial}, @@ -145,7 +144,6 @@ IronRuby.dll IronRuby.Libraries.dlli Microsoft.Dynamic.dll Microsoft.Scripting.Core.dll Microsoft.Scripting.Debugging.dll Microsoft.Scripting.dll - Microsoft.Scripting.ExtensionAttribute.dll Microsoft.Scripting.Silverlight.dll }, "silverlight\\samples" => %w{clock photoviewer repl}, "silverlight\\script" => %w{chr chr.bat sl sl.bat} ===================================================================