diff --git a/moonsharp.png b/moonsharp.png new file mode 100644 index 00000000..03f684c4 Binary files /dev/null and b/moonsharp.png differ diff --git a/src/MoonSharp.Interpreter/Compatibility/Stopwatch.cs b/src/MoonSharp.Interpreter/Compatibility/Stopwatch.cs index 0655757f..5035162d 100755 --- a/src/MoonSharp.Interpreter/Compatibility/Stopwatch.cs +++ b/src/MoonSharp.Interpreter/Compatibility/Stopwatch.cs @@ -3,11 +3,12 @@ using System.Collections.Generic; using System.Linq; using System.Text; - +/* namespace System.Diagnostics { internal class Stopwatch { + DateTime startTime, stopTime; public void Start() @@ -38,4 +39,5 @@ public long ElapsedMilliseconds } } +*/ #endif \ No newline at end of file diff --git a/src/MoonSharp.Interpreter/Interop/StandardDescriptors/ReflectionMemberDescriptors/EventMemberDescriptor.cs b/src/MoonSharp.Interpreter/Interop/StandardDescriptors/ReflectionMemberDescriptors/EventMemberDescriptor.cs old mode 100755 new mode 100644 index 3a19cbe5..f1279cc3 --- a/src/MoonSharp.Interpreter/Interop/StandardDescriptors/ReflectionMemberDescriptors/EventMemberDescriptor.cs +++ b/src/MoonSharp.Interpreter/Interop/StandardDescriptors/ReflectionMemberDescriptors/EventMemberDescriptor.cs @@ -6,6 +6,7 @@ using MoonSharp.Interpreter.DataStructs; using MoonSharp.Interpreter.Interop.BasicDescriptors; using MoonSharp.Interpreter.Interop.StandardDescriptors; +using ReferenceEqualityComparer = MoonSharp.Interpreter.DataStructs.ReferenceEqualityComparer; namespace MoonSharp.Interpreter.Interop { diff --git a/src/MoonSharp.Interpreter/Properties/AssemblyInfo.cs b/src/MoonSharp.Interpreter/Properties/AssemblyInfo.cs index 9e2d6d63..a1e8ae43 100644 --- a/src/MoonSharp.Interpreter/Properties/AssemblyInfo.cs +++ b/src/MoonSharp.Interpreter/Properties/AssemblyInfo.cs @@ -5,6 +5,9 @@ // 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. + +#if !NET6_0_OR_GREATER + [assembly: AssemblyTitle("MoonSharp.Interpreter")] [assembly: AssemblyDescription("An interpreter for the Lua language")] [assembly: AssemblyConfiguration("")] @@ -34,6 +37,7 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion(MoonSharp.Interpreter.Script.VERSION)] [assembly: AssemblyFileVersion(MoonSharp.Interpreter.Script.VERSION)] +#endif // Give [assembly: InternalsVisibleTo("MoonSharp.Interpreter.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100F704C50BBDC3F2F011CC26A8C6C4797A40E0B4BC94CFB1335E9BA208326340696B686DC13099F10D3054544532F5E3E66C26A13FF260AEA2343E0410511FE56EDCC2AFB898AAA1BC21DA33C0D0AE60824EB441D02A0E6B7AE251CDE0946BFC748209C12B062573ECDB008A3D10CC40534B314847591CE5342A3BC6AA83CE23B8")] diff --git a/src/MoonSharp.Interpreter/_Projects/MoonSharp.Interpreter.net70-client/Directory.Build.props b/src/MoonSharp.Interpreter/_Projects/MoonSharp.Interpreter.net70-client/Directory.Build.props new file mode 100644 index 00000000..b173ffc4 --- /dev/null +++ b/src/MoonSharp.Interpreter/_Projects/MoonSharp.Interpreter.net70-client/Directory.Build.props @@ -0,0 +1,71 @@ + + + + + true + false + + + bin\$(MSBuildProjectName) + obj\$(MSBuildProjectName) + $(DefaultItemExcludes);obj/**;bin/** + + true + true + true + snupkg + + True + Ben Askren + 42nd Parallel, LLC + Convenience classes for Serilog logging + 2023, 4nd Parallel + https://github.com/baskren/P42.Serilog.QuickLog + https://github.com/baskren/P42.Serilog.QuickLog + git + Inital Public Release + LICENSE + moonsharp.png + README.md + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/MoonSharp.Interpreter/_Projects/MoonSharp.Interpreter.net70-client/MoonSharp.Interpreter.net70-client.csproj b/src/MoonSharp.Interpreter/_Projects/MoonSharp.Interpreter.net70-client/MoonSharp.Interpreter.net70-client.csproj new file mode 100644 index 00000000..c029d58b --- /dev/null +++ b/src/MoonSharp.Interpreter/_Projects/MoonSharp.Interpreter.net70-client/MoonSharp.Interpreter.net70-client.csproj @@ -0,0 +1,826 @@ + + + + 10.0 + Debug + AnyCPU + Library + Properties + MoonSharp.Interpreter + MoonSharp.Interpreter + en-US + 512 + + 2.0.1 + net7.0 + + ..\..\..\keypair.snk + Debug;Release;Dev;Devp4 + + + true + full + false + bin\Debug\ + TRACE;DEBUG;HASDYNAMIC,PCL + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE;HASDYNAMIC,PCL + prompt + 4 + bin\Release\MoonSharp.Interpreter.XML + + + true + bin\Dev\ + TRACE;DEBUG;HASDYNAMIC,PCL + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + true + bin\Devp4\ + TRACE;DEBUG;HASDYNAMIC,PCL + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + + + + + AsyncExtensions.cs + + + AstNode.cs + + + Framework.cs + + + FrameworkBase.cs + + + FrameworkCLR.cs + + + FrameworkReflectionBase.cs + + + FrameworkClrBase.cs + + + FrameworkCore.cs + + + FrameworkPCL.cs + + + FrameworkWin8.cs + + + CoroutineModule.cs + + + BasicModule.cs + + + DebugModule.cs + + + DynamicModule.cs + + + ErrorHandlingModule.cs + + + BinaryEncoding.cs + + + FileUserData.cs + + + IoModule.cs + + + FileUserDataBase.cs + + + StandardIOFileUserDataBase.cs + + + StreamFileUserDataBase.cs + + + JsonModule.cs + + + LoadModule.cs + + + Bit32Module.cs + + + MathModule.cs + + + MetaTableModule.cs + + + OsSystemModule.cs + + + OsTimeModule.cs + + + KopiLua_StrLib.cs + + + MultiDictionary.cs + + + ReferenceEqualityComparer.cs + + + DebuggerCaps.cs + + + DebugService.cs + + + OpCodeMetadataType.cs + + + MoonSharpPropertyAttribute.cs + + + MoonSharpUserDataMetamethodAttribute.cs + + + MoonSharpHideMemberAttribute.cs + + + MoonSharpHiddenAttribute.cs + + + IMemberDescriptor.cs + + + IOptimizableDescriptor.cs + + + IOverloadableMemberDescriptor.cs + + + IWireableDescriptor.cs + + + MemberDescriptorAccess.cs + + + ParameterDescriptor.cs + + + ClrToScriptConversions.cs + + + NumericConversions.cs + + + ScriptToClrConversions.cs + + + StringConversions.cs + + + TableConversions.cs + + + CustomConvertersCollection.cs + + + DescriptorHelpers.cs + + + DispatchingUserDataDescriptor.cs + + + IGeneratorUserDataDescriptor.cs + + + PropertyTableAssigner.cs + + + DelegateProxyFactory.cs + + + IProxyFactory.cs + + + ReflectionSpecialNames.cs + + + AutomaticRegistrationPolicy.cs + + + DefaultRegistrationPolicy.cs + + + PermanentRegistrationPolicy.cs + + + IRegistrationPolicy.cs + + + EventFacade.cs + + + DefaultValue.cs + + + HardwiredMemberDescriptor.cs + + + HardwiredMethodMemberDescriptor.cs + + + HardwiredUserDataDescriptor.cs + + + ArrayMemberDescriptor.cs + + + ProxyUserDataDescriptor.cs + + + ObjectCallbackMemberDescriptor.cs + + + FunctionMemberDescriptorBase.cs + + + StandardEnumUserDataDescriptor.cs + + + DynValueMemberDescriptor.cs + + + EventMemberDescriptor.cs + + + OverloadedMethodMemberDescriptor.cs + + + FieldMemberDescriptor.cs + + + ValueTypeDefaultCtorMemberDescriptor.cs + + + StandardGenericsUserDataDescriptor.cs + + + ExtensionMethodsRegistry.cs + + + TypeDescriptorRegistry.cs + + + BinDumpBinaryReader.cs + + + Code + BinDumpBinaryWriter.cs + + + UndisposableStream.cs + + + InstructionFieldUsage.cs + + + Processor_BinaryDump.cs + + + InteropRegistrationPolicy.cs + + + IUserDataType.cs + + + ScriptFunctionDelegate.cs + + + TypeValidationFlags.cs + + + DynamicExpressionException.cs + + + DynamicExpression.cs + + + CallStackItemFlags.cs + + + AnonWrapper.cs + + + IUserDataDescriptor.cs + + + CharPtr.cs + + + LuaBase.cs + + + StringRange.cs + + + Tools.cs + + + StringModule.cs + + + TableIteratorsModule.cs + + + TableModule.cs + + + Extension_Methods.cs + + + FastStackDynamic.cs + + + LinkedListIndex.cs + + + Slice.cs + + + Coroutine.cs + + + IScriptPrivateResource.cs + + + RefIdObject.cs + + + TailCallData.cs + + + Code + UserData.cs + + + WellKnownSymbols.cs + + + YieldRequest.cs + + + DebuggerAction.cs + + + IDebugger.cs + + + SourceRef.cs + + + WatchItem.cs + + + WatchType.cs + + + DummyPerformanceStopwatch.cs + + + IPerformanceStopwatch.cs + + + PerformanceCounter.cs + + + GlobalPerformanceStopwatch.cs + + + PerformanceCounterType.cs + + + PerformanceStatistics.cs + + + PerformanceResult.cs + + + PerformanceStopwatch.cs + + + Code + ScriptRuntimeException.cs + + + InternalErrorException.cs + + + InterpreterException.cs + + + SyntaxErrorException.cs + + + CallbackArguments.cs + + + Closure.cs + + + CallbackFunction.cs + + + Code + DynValue.cs + + + TablePair.cs + + + Code + ScriptExecutionContext.cs + + + SourceCode.cs + + + CoroutineState.cs + + + ExecutionState.cs + + + DebugContext.cs + + + Processor_Coroutines.cs + + + Processor_Errors.cs + + + EnumerableWrapper.cs + + + LinqHelpers.cs + + + LuaBase_CLib.cs + + + LuaLBuffer.cs + + + LuaState.cs + + + MoonSharpUserDataAttribute.cs + + + MoonSharpVisibleAttribute.cs + + + Code + AutoDescribingUserDataDescriptor.cs + + + Code + CompositeUserDataDescriptor.cs + + + StandardUserDataDescriptor.cs + + + InteropAccessMode.cs + + + MethodMemberDescriptor.cs + + + Code + PropertyMemberDescriptor.cs + + + ClosureContext.cs + + + LoopTracker.cs + + + IClosureBuilder.cs + + + SymbolRefType.cs + + + SymbolRef.cs + + + BuildTimeScope.cs + + + BuildTimeScopeBlock.cs + + + BuildTimeScopeFrame.cs + + + RuntimeScopeBlock.cs + + + RuntimeScopeFrame.cs + + + ScriptLoadingContext.cs + + + DataType.cs + + + EmbeddedResourcesScriptLoader.cs + + + FileSystemScriptLoader.cs + + + InvalidScriptLoader.cs + + + ColonOperatorBehaviour.cs + + + FuzzySymbolMatchingBehavior.cs + + + DotNetCorePlatformAccessor.cs + + + ReplHistoryNavigator.cs + + + ReplInterpreterScriptLoader.cs + + + ScriptLoaderBase.cs + + + IScriptLoader.cs + + + UnityAssetsScriptLoader.cs + + + MoonSharpModuleConstantAttribute.cs + + + NameSpace_XmlHelp.cs + + + IPlatformAccessor.cs + + + PlatformAccessorBase.cs + + + PlatformAutoDetector.cs + + + LimitedPlatformAccessor.cs + + + StandardFileType.cs + + + StandardPlatformAccessor.cs + + + Attributes.cs + + + Stopwatch.cs + + + ReplInterpreter.cs + + + Script.cs + + + Table.cs + + + ByteCode.cs + + + FastStack.cs + + + Instruction.cs + + + OpCode.cs + + + CallStackItem.cs + + + Code + Processor.cs + + + Processor_Debugger.cs + + + Processor_IExecutionContext.cs + + + Processor_InstructionLoop.cs + + + Processor_Scope.cs + + + Processor_UtilityFunctions.cs + + + CoreModules.cs + + + Code + ModuleRegister.cs + + + MoonSharpModuleMethodAttribute.cs + + + Code + MoonSharpModuleAttribute.cs + + + ScriptGlobalOptions.cs + + + ScriptOptions.cs + + + JsonNull.cs + + + JsonTableConverter.cs + + + ObjectValueConverter.cs + + + SerializationExtensions.cs + + + AdjustmentExpression.cs + + + BinaryOperatorExpression.cs + + + DynamicExprExpression.cs + + + FunctionCallExpression.cs + + + FunctionDefinitionExpression.cs + + + LiteralExpression.cs + + + UnaryOperatorExpression.cs + + + Loader_Fast.cs + + + GotoStatement.cs + + + IVariable.cs + + + AssemblyInfo.cs + + + ExprListExpression.cs + + + IndexExpression.cs + + + LexerUtils.cs + + + EmptyStatement.cs + + + FunctionCallStatement.cs + + + FunctionDefinitionStatement.cs + + + Expression_.cs + + + SymbolRefExpression.cs + + + Lexer.cs + + + Token.cs + + + TokenType.cs + + + Loop.cs + + + NodeBase.cs + + + AssignmentStatement.cs + + + Code + ChunkStatement.cs + + + CompositeStatement.cs + + + BreakStatement.cs + + + ForEachLoopStatement.cs + + + ForLoopStatement.cs + + + IfStatement.cs + + + Statement.cs + + + LabelStatement.cs + + + RepeatStatement.cs + + + ReturnStatement.cs + + + TableConstructor.cs + + + ScopeBlockStatement.cs + + + WhileStatement.cs + + + + \ No newline at end of file