Skip to content

Commit

Permalink
[master] Update dependencies from mono/linker (dotnet#47857)
Browse files Browse the repository at this point in the history 
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Marek Safar <[email protected]>
  • Loading branch information
@dotnet-maestro @marek-safar
3 people authored Feb 8, 2021
1 parent 0f055ba commit 4ca10ac
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 28 deletions.
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,9 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0b23cdb2a6047f08966c3c033d028ed34d106cd8</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.0-alpha.1.21103.1">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.0-alpha.1.21105.1">
<Uri>https://github.com/mono/linker</Uri>
<Sha>faf9cc056e4c6481ba3c061521477185e37a1fce</Sha>
<Sha>319ed02ed9a25ec3800f723ff72a1eb92ef050c7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21103.1">
<Uri>https://github.com/dotnet/xharness</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
<!-- Docs -->
<MicrosoftPrivateIntellisenseVersion>5.0.0-preview-20201009.2</MicrosoftPrivateIntellisenseVersion>
<!-- ILLink -->
<MicrosoftNETILLinkTasksVersion>6.0.0-alpha.1.21103.1</MicrosoftNETILLinkTasksVersion>
<MicrosoftNETILLinkTasksVersion>6.0.0-alpha.1.21105.1</MicrosoftNETILLinkTasksVersion>
<!-- ICU -->
<MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-preview.2.21101.12</MicrosoftNETCoreRuntimeICUTransportVersion>
<!-- Mono LLVM -->
Expand Down
5 changes: 0 additions & 5 deletions src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/ILLink/ILLinkTrim.xml
View file

This file was deleted.

40 changes: 20 additions & 20 deletions ...ntime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Runtime.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public static void DumpAotProfileData (ref byte buf, int len, string extraArg)
Interop.Runtime.DumpAotProfileData(ref buf, len, extraArg);
}

private static int BindJSObject(int jsId, bool ownsHandle, int mappedType)
public static int BindJSObject(int jsId, bool ownsHandle, int mappedType)
{
WeakReference? reference;
lock (_boundObjects)
Expand All @@ -99,7 +99,7 @@ private static int BindJSObject(int jsId, bool ownsHandle, int mappedType)
return reference.Target is JSObject target ? target.Int32Handle : 0;
}

private static int BindCoreCLRObject(int jsId, int gcHandle)
public static int BindCoreCLRObject(int jsId, int gcHandle)
{
GCHandle h = (GCHandle)(IntPtr)gcHandle;
JSObject? obj;
Expand Down Expand Up @@ -157,7 +157,7 @@ internal static bool ReleaseJSObject(JSObject objToRelease)
return true;
}

private static void UnBindRawJSObjectAndFree(int gcHandle)
public static void UnBindRawJSObjectAndFree(int gcHandle)
{
GCHandle h = (GCHandle)(IntPtr)gcHandle;
JSObject? obj = h.Target as JSObject;
Expand All @@ -171,27 +171,27 @@ private static void UnBindRawJSObjectAndFree(int gcHandle)
}
}

private static object CreateTaskSource(int jsId)
public static object CreateTaskSource(int jsId)
{
return new TaskCompletionSource<object>();
}

private static void SetTaskSourceResult(TaskCompletionSource<object> tcs, object result)
public static void SetTaskSourceResult(TaskCompletionSource<object> tcs, object result)
{
tcs.SetResult(result);
}

private static void SetTaskSourceFailure(TaskCompletionSource<object> tcs, string reason)
public static void SetTaskSourceFailure(TaskCompletionSource<object> tcs, string reason)
{
tcs.SetException(new JSException(reason));
}

private static int GetTaskAndBind(TaskCompletionSource<object> tcs, int jsId)
public static int GetTaskAndBind(TaskCompletionSource<object> tcs, int jsId)
{
return BindExistingObject(tcs.Task, jsId);
}

private static int BindExistingObject(object rawObj, int jsId)
public static int BindExistingObject(object rawObj, int jsId)
{
JSObject? jsObject;
if (rawObj is Delegate dele)
Expand Down Expand Up @@ -219,7 +219,7 @@ private static int BindExistingObject(object rawObj, int jsId)
return jsObject.Int32Handle;
}

private static int GetJSObjectId(object rawObj)
public static int GetJSObjectId(object rawObj)
{
JSObject? jsObject;
if (rawObj is Delegate dele)
Expand All @@ -239,15 +239,15 @@ private static int GetJSObjectId(object rawObj)
return jsObject?.JSHandle ?? -1;
}

private static object? GetDotNetObject(int gcHandle)
public static object? GetDotNetObject(int gcHandle)
{
GCHandle h = (GCHandle)(IntPtr)gcHandle;

return h.Target is JSObject js ?
js.GetWrappedObject() ?? h.Target : h.Target;
}

private static bool IsSimpleArray(object a)
public static bool IsSimpleArray(object a)
{
return a is System.Array arr && arr.Rank == 1 && arr.GetLowerBound(0) == 0;
}
Expand All @@ -262,7 +262,7 @@ private struct IntPtrAndHandle
internal RuntimeMethodHandle handle;
}

private static string GetCallSignature(IntPtr methodHandle)
public static string GetCallSignature(IntPtr methodHandle)
{
IntPtrAndHandle tmp = default(IntPtrAndHandle);
tmp.ptr = methodHandle;
Expand Down Expand Up @@ -338,7 +338,7 @@ private static string GetCallSignature(IntPtr methodHandle)
return new string(res);
}

private static void SetupJSContinuation(Task task, JSObject continuationObj)
public static void SetupJSContinuation(Task task, JSObject continuationObj)
{
if (task.IsCompleted)
Complete();
Expand Down Expand Up @@ -405,12 +405,12 @@ void Complete()
return null;
}

private static string ObjectToString(object o)
public static string ObjectToString(object o)
{
return o.ToString() ?? string.Empty;
}

private static double GetDateValue(object dtv)
public static double GetDateValue(object dtv)
{
if (dtv == null)
throw new ArgumentNullException(nameof(dtv));
Expand All @@ -423,18 +423,18 @@ private static double GetDateValue(object dtv)
return new DateTimeOffset(dt).ToUnixTimeMilliseconds();
}

private static DateTime CreateDateTime(double ticks)
public static DateTime CreateDateTime(double ticks)
{
DateTimeOffset unixTime = DateTimeOffset.FromUnixTimeMilliseconds((long)ticks);
return unixTime.DateTime;
}

private static Uri CreateUri(string uri)
public static Uri CreateUri(string uri)
{
return new Uri(uri);
}

private static bool SafeHandleAddRef(SafeHandle safeHandle)
public static bool SafeHandleAddRef(SafeHandle safeHandle)
{
bool _addRefSucceeded = false;
#if DEBUG_HANDLE
Expand Down Expand Up @@ -466,7 +466,7 @@ private static bool SafeHandleAddRef(SafeHandle safeHandle)
return _addRefSucceeded;
}

private static void SafeHandleRelease(SafeHandle safeHandle)
public static void SafeHandleRelease(SafeHandle safeHandle)
{
safeHandle.DangerousRelease();
#if DEBUG_HANDLE
Expand All @@ -479,7 +479,7 @@ private static void SafeHandleRelease(SafeHandle safeHandle)
#endif
}

private static void SafeHandleReleaseByHandle(int jsId)
public static void SafeHandleReleaseByHandle(int jsId)
{
#if DEBUG_HANDLE
Debug.WriteLine($"SafeHandleReleaseByHandle: {jsId}");
Expand Down
8 changes: 8 additions & 0 deletions src/mono/System.Private.CoreLib/src/System/ValueType.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ namespace System
[System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
public abstract class ValueType
{
#if TARGET_BROWSER
// Tracking issue https://github.com/dotnet/runtime/issues/47909
[DynamicDependency(DynamicallyAccessedMemberTypes.PublicMethods, "System.Runtime.InteropServices.JavaScript.Runtime", "System.Private.Runtime.InteropServices.JavaScript")]
#endif
protected ValueType()
{
}

// This is also used by RuntimeHelpers
internal static bool DefaultEquals(object o1, object o2)
{
Expand Down

0 comments on commit 4ca10ac

Please sign in to comment.