Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIX (net6.0-ios, net6.0-wasm) #316

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

FIX (net6.0-ios, net6.0-wasm) #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b01d3b
FIX (net6.0-ios, net6.0-wasm) : https://github.com/dotnet/linker/issu…
baskren Dec 2, 2022
643091f
UPDATE : .NET7
baskren Jan 21, 2023
185eee7
FEAT : Prep for NuGet
baskren Feb 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added moonsharp.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion src/MoonSharp.Interpreter/Compatibility/Stopwatch.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -38,4 +39,5 @@ public long ElapsedMilliseconds

}
}
*/
#endif
1 change: 1 addition & 0 deletions ...erpreter/Interop/StandardDescriptors/ReflectionMemberDescriptors/EventMemberDescriptor.cs
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
4 changes: 4 additions & 0 deletions src/MoonSharp.Interpreter/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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("")]
Expand Down Expand Up @@ -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")]
Expand Down
71 changes: 71 additions & 0 deletions src/MoonSharp.Interpreter/_Projects/MoonSharp.Interpreter.net70-client/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
<Project ToolsVersion="15.0">

<PropertyGroup>

<GenerateLibraryLayout>true</GenerateLibraryLayout>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

<!--
Force all projects of this folder to use a different output
path to avoid intermediate output collisions
-->
<BaseOutputPath>bin\$(MSBuildProjectName)</BaseOutputPath>
<BaseIntermediateOutputPath>obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<DefaultItemExcludes>$(DefaultItemExcludes);obj/**;bin/**</DefaultItemExcludes>

<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>

<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<Authors>Ben Askren</Authors>
<Company>42nd Parallel, LLC</Company>
<Description>Convenience classes for Serilog logging</Description>
<Copyright>2023, 4nd Parallel</Copyright>
<PackageProjectUrl>https://github.com/baskren/P42.Serilog.QuickLog</PackageProjectUrl>
<RepositoryUrl>https://github.com/baskren/P42.Serilog.QuickLog</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageReleaseNotes>Inital Public Release</PackageReleaseNotes>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageIcon>moonsharp.png</PackageIcon>
<PackageReadmeFile>README.md</PackageReadmeFile>

</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)'=='Debug' ">
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>

<ItemGroup>
<None Include="..\..\..\..\moonsharp.png" Pack="true" PackagePath="\" />
<None Include="..\..\..\..\README.md" Pack="true" PackagePath="\" />
<None Include="..\..\..\..\LICENSE" Pack="true" PackagePath="\" />
</ItemGroup>

<!-- PROJECT REFERENCES -->
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
</ItemGroup>

<!-- https://docs.microsoft.com/en-us/visualstudio/msbuild/msbuild-targets?view=vs-2022#default-build-targets -->
<Target Name="B1" BeforeTargets="BeforeBuild">
<Message Text=" " Importance="high"/>
<Message Text=" " Importance="high"/>
<Message Text=" " Importance="high"/>
<Message Text="=============================== [ $(AssemblyName) : $(TargetFramework) : $(Configuration) : $(P42TargetPlatform) : $(Version) ] ===============================" Importance="high"/>
<Message Text="COMPILE: ($Compile)"/>
</Target>

<Target Name="NuGetMove" AfterTargets="Pack" Condition=" $(LocalNuGet) != '' AND $(P42TargetPlatform) == '' ">
<Message Text=" " Importance="high"/>
<Message Text=" " Importance="high"/>
<Message Text=" " Importance="high"/>
<Message Text="=============================== NUGET PACK [$(AssemblyName) : $(TargetFramework) : $(Configuration) : $(P42TargetPlatform) : $(Version) ] ===============================" Importance="high"/>
<Message Importance="high" Text="NuGetPath= $([System.IO.Path]::Combine('.',bin,$(Configuration),$(AssemblyName).$(Version).nupkg)) "/>
<Move SourceFiles="$([System.IO.Path]::Combine('.',bin,$(Configuration),$(AssemblyName).$(Version).nupkg))" DestinationFolder=" $(LocalNuGet) " />
<Move SourceFiles="$([System.IO.Path]::Combine('.',bin,$(Configuration),$(AssemblyName).$(Version).snupkg))" DestinationFolder=" $(LocalNuGet) " />
<Message Importance="high" Text="PACKAGE SAVED TO: $(LocalNuGet)) " />
</Target>

</Project>
Loading