[Wasm] Rename System.Runtime.InteropServices.JavaScript to System.Private.Runtime...
authorSteve Pfister <steveisok@users.noreply.github.com>
Fri, 7 Aug 2020 13:45:17 +0000 (09:45 -0400)
committerGitHub <noreply@github.com>
Fri, 7 Aug 2020 13:45:17 +0000 (09:45 -0400)
Fixes https://github.com/dotnet/runtime/issues/39042

46 files changed:
src/libraries/NetCoreAppLibrary.props
src/libraries/System.Net.Http/src/System.Net.Http.csproj
src/libraries/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj
src/libraries/System.Private.Runtime.InteropServices.JavaScript/Directory.Build.props [moved from src/libraries/System.Runtime.InteropServices.JavaScript/Directory.Build.props with 100% similarity]
src/libraries/System.Private.Runtime.InteropServices.JavaScript/System.Private.Runtime.InteropServices.JavaScript.sln [moved from src/libraries/System.Runtime.InteropServices.JavaScript/System.Runtime.InteropServices.JavaScript.sln with 89% similarity]
src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/ILLinkTrim.xml [moved from src/libraries/System.Runtime.InteropServices.JavaScript/src/ILLinkTrim.xml with 60% similarity]
src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/Resources/Strings.resx [moved from src/libraries/System.Runtime.InteropServices.JavaScript/src/Resources/Strings.resx with 98% similarity]
src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System.Private.Runtime.InteropServices.JavaScript.csproj [moved from src/libraries/System.Runtime.InteropServices.JavaScript/src/System.Runtime.InteropServices.JavaScript.csproj with 90% similarity]
src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/AnyRef.cs [moved from src/libraries/System.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/AnyRef.cs with 100% similarity]
src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Array.cs [moved from src/libraries/System.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Array.cs with 100% similarity]
src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/ArrayBuffer.cs [moved from src/libraries/System.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/ArrayBuffer.cs with 100% similarity]
src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/CoreObject.cs [moved from src/libraries/System.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/CoreObject.cs with 100% similarity]
src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/DataView.cs [moved from src/libraries/System.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/DataView.cs with 100% similarity]
src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Float32Array.cs [moved from src/libraries/System.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Float32Array.cs with 100% similarity]
src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Float64Array.cs [moved from src/libraries/System.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Float64Array.cs with 100% similarity]
src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Function.cs [moved from src/libraries/System.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Function.cs with 100% similarity]
src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/HostObject.cs [moved from src/libraries/System.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/HostObject.cs with 100% similarity]
src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Int16Array.cs [moved from src/libraries/System.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Int16Array.cs with 100% similarity]
src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Int32Array.cs [moved from src/libraries/System.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Int32Array.cs with 100% similarity]
src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Int8Array.cs [moved from src/libraries/System.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Int8Array.cs with 100% similarity]
src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/JSException.cs [moved from src/libraries/System.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/JSException.cs with 100% similarity]
src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/JSObject.cs [moved from src/libraries/System.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/JSObject.cs with 100% similarity]
src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Map.cs [moved from src/libraries/System.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Map.cs with 100% similarity]
src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Runtime.cs [moved from src/libraries/System.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Runtime.cs with 100% similarity]
src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/SharedArrayBuffer.cs [moved from src/libraries/System.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/SharedArrayBuffer.cs with 100% similarity]
src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/TypedArray.cs [moved from src/libraries/System.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/TypedArray.cs with 100% similarity]
src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Uint16Array.cs [moved from src/libraries/System.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Uint16Array.cs with 100% similarity]
src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Uint32Array.cs [moved from src/libraries/System.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Uint32Array.cs with 100% similarity]
src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Uint8Array.cs [moved from src/libraries/System.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Uint8Array.cs with 100% similarity]
src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Uint8ClampedArray.cs [moved from src/libraries/System.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Uint8ClampedArray.cs with 100% similarity]
src/libraries/System.Private.Runtime.InteropServices.JavaScript/tests/AssemblyInfo.cs [moved from src/libraries/System.Runtime.InteropServices.JavaScript/tests/AssemblyInfo.cs with 100% similarity]
src/libraries/System.Private.Runtime.InteropServices.JavaScript/tests/System.Private.Runtime.InteropServices.JavaScript.Tests.csproj [moved from src/libraries/System.Runtime.InteropServices.JavaScript/tests/System.Runtime.InteropServices.JavaScript.Tests.csproj with 91% similarity]
src/libraries/System.Private.Runtime.InteropServices.JavaScript/tests/System/Runtime/InteropServices/JavaScript/ArrayTests.cs [moved from src/libraries/System.Runtime.InteropServices.JavaScript/tests/System/Runtime/InteropServices/JavaScript/ArrayTests.cs with 100% similarity]
src/libraries/System.Private.Runtime.InteropServices.JavaScript/tests/System/Runtime/InteropServices/JavaScript/DataViewTests.cs [moved from src/libraries/System.Runtime.InteropServices.JavaScript/tests/System/Runtime/InteropServices/JavaScript/DataViewTests.cs with 100% similarity]
src/libraries/System.Private.Runtime.InteropServices.JavaScript/tests/System/Runtime/InteropServices/JavaScript/HelperMarshal.cs [moved from src/libraries/System.Runtime.InteropServices.JavaScript/tests/System/Runtime/InteropServices/JavaScript/HelperMarshal.cs with 100% similarity]
src/libraries/System.Private.Runtime.InteropServices.JavaScript/tests/System/Runtime/InteropServices/JavaScript/Http/HttpRequestMessageTest.cs [moved from src/libraries/System.Runtime.InteropServices.JavaScript/tests/System/Runtime/InteropServices/JavaScript/Http/HttpRequestMessageTest.cs with 100% similarity]
src/libraries/System.Private.Runtime.InteropServices.JavaScript/tests/System/Runtime/InteropServices/JavaScript/JavaScriptTests.cs [moved from src/libraries/System.Runtime.InteropServices.JavaScript/tests/System/Runtime/InteropServices/JavaScript/JavaScriptTests.cs with 100% similarity]
src/libraries/System.Private.Runtime.InteropServices.JavaScript/tests/System/Runtime/InteropServices/JavaScript/MapTests.cs [moved from src/libraries/System.Runtime.InteropServices.JavaScript/tests/System/Runtime/InteropServices/JavaScript/MapTests.cs with 100% similarity]
src/libraries/System.Private.Runtime.InteropServices.JavaScript/tests/System/Runtime/InteropServices/JavaScript/MarshalTests.cs [moved from src/libraries/System.Runtime.InteropServices.JavaScript/tests/System/Runtime/InteropServices/JavaScript/MarshalTests.cs with 100% similarity]
src/libraries/System.Private.Runtime.InteropServices.JavaScript/tests/System/Runtime/InteropServices/JavaScript/TypedArrayTests.cs [moved from src/libraries/System.Runtime.InteropServices.JavaScript/tests/System/Runtime/InteropServices/JavaScript/TypedArrayTests.cs with 100% similarity]
src/libraries/System.Runtime.InteropServices.JavaScript/ref/System.Runtime.InteropServices.JavaScript.cs [deleted file]
src/libraries/System.Runtime.InteropServices.JavaScript/ref/System.Runtime.InteropServices.JavaScript.csproj [deleted file]
src/libraries/pkg/baseline/packageIndex.json
src/mono/wasm/debugger/tests/debugger-test.csproj
src/mono/wasm/runtime-test.js
src/mono/wasm/runtime/binding_support.js

index 9b52e36..0fd6812 100644 (file)
@@ -78,6 +78,7 @@
       System.Numerics.Vectors;
       System.ObjectModel;
       System.Private.DataContractSerialization;
+      System.Private.Runtime.InteropServices.JavaScript;
       System.Private.Uri;
       System.Private.Xml;
       System.Private.Xml.Linq;
       System.Runtime.Extensions;
       System.Runtime.Handles;
       System.Runtime.InteropServices;
-      System.Runtime.InteropServices.JavaScript;
       System.Runtime.InteropServices.RuntimeInformation;
       System.Runtime.Intrinsics;
       System.Runtime.Loader;
index 983e7f9..1e2ceae 100644 (file)
     <Reference Include="System.Runtime.Extensions" />
     <Reference Include="System.Runtime.InteropServices" />
     <Reference Include="System.Runtime.InteropServices.RuntimeInformation" />
-    <Reference Include="System.Runtime.InteropServices.JavaScript" Condition="'$(TargetsBrowser)' == 'true'" />
     <Reference Include="System.Security.Claims" Condition="'$(TargetsWindows)' == 'true'" />
     <Reference Include="System.Security.Cryptography.Algorithms" />
     <Reference Include="System.Security.Cryptography.Csp" />
     <Reference Include="System.Security.Cryptography.Primitives" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsBrowser)' == 'true'">
-    <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.InteropServices.JavaScript\src\System.Runtime.InteropServices.JavaScript.csproj" />
+    <ProjectReference Include="$(LibrariesProjectRoot)System.Private.Runtime.InteropServices.JavaScript\src\System.Private.Runtime.InteropServices.JavaScript.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="msquic.dll" Condition="Exists('msquic.dll')">
index 1f44cb1..b74f3d8 100644 (file)
@@ -37,6 +37,8 @@
     <Reference Include="System.Security.Cryptography.Algorithms" />
     <Reference Include="System.Security.Cryptography.Primitives" />
     <Reference Include="System.Threading.Channels" Condition="'$(TargetsBrowser)' == 'true'" />
-    <Reference Include="System.Runtime.InteropServices.JavaScript" Condition="'$(TargetsBrowser)' == 'true'" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(LibrariesProjectRoot)System.Private.Runtime.InteropServices.JavaScript\src\System.Private.Runtime.InteropServices.JavaScript.csproj" Condition="'$(TargetsBrowser)' == 'true'" />
   </ItemGroup>
 </Project>
@@ -6,12 +6,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
 EndProject
-Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "System.Runtime.InteropServices.JavaScript.Tests", "tests\System.Runtime.InteropServices.JavaScript.Tests.csproj", "{4F753464-0719-4559-9E0F-86175CECA903}"
+Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "System.Private.Runtime.InteropServices.JavaScript.Tests", "tests\System.Private.Runtime.InteropServices.JavaScript.Tests.csproj", "{4F753464-0719-4559-9E0F-86175CECA903}"
        ProjectSection(ProjectDependencies) = postProject
                {644FCC7F-1478-4D30-BF66-40E0ADF8723C} = {644FCC7F-1478-4D30-BF66-40E0ADF8723C}
        EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.InteropServices.JavaScript", "src\System.Runtime.InteropServices.JavaScript.csproj", "{644FCC7F-1478-4D30-BF66-40E0ADF8723C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Private.Runtime.InteropServices.JavaScript", "src\System.Private.Runtime.InteropServices.JavaScript.csproj", "{644FCC7F-1478-4D30-BF66-40E0ADF8723C}"
 EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -1,5 +1,5 @@
 ï»¿<linker>
-    <assembly fullname="System.Runtime.InteropServices.JavaScript">
+    <assembly fullname="System.Private.Runtime.InteropServices.JavaScript">
         <type fullname="System.Runtime.InteropServices.JavaScript.Runtime" />
     </assembly>
 </linker>
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="SystemRuntimeInteropServicesJavaScript_PlatformNotSupported" xml:space="preserve">
-    <value>System.Runtime.InteropServices.JavaScript is not supported on this platform.</value>
+    <value>System.Private.Runtime.InteropServices.JavaScript is not supported on this platform.</value>
   </data>
 </root>
\ No newline at end of file
@@ -2,12 +2,9 @@
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Nullable>enable</Nullable>
-    <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppCurrent)-Browser</TargetFrameworks>
+    <TargetFrameworks>$(NetCoreAppCurrent)-Browser</TargetFrameworks>
   </PropertyGroup>
   <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
-  <PropertyGroup>
-    <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsAnyOS)' == 'true'">SR.SystemRuntimeInteropServicesJavaScript_PlatformNotSupported</GeneratePlatformNotSupportedAssemblyMessage>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(TargetsBrowser)' == 'true'">
     <!-- The Browser build currently doesn't use any strings from SR, so don't include it until it does. -->
     <OmitResources>true</OmitResources>
diff --git a/src/libraries/System.Runtime.InteropServices.JavaScript/ref/System.Runtime.InteropServices.JavaScript.cs b/src/libraries/System.Runtime.InteropServices.JavaScript/ref/System.Runtime.InteropServices.JavaScript.cs
deleted file mode 100644 (file)
index dc2ac4c..0000000
+++ /dev/null
@@ -1,341 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// ------------------------------------------------------------------------------
-// Changes to this file must follow the https://aka.ms/api-review process.
-// ------------------------------------------------------------------------------
-
-namespace System.Runtime.InteropServices.JavaScript
-{
-    public abstract partial class AnyRef : Microsoft.Win32.SafeHandles.SafeHandleMinusOneIsInvalid
-    {
-        internal AnyRef() : base (default(bool)) { }
-        public int JSHandle { get { throw null; } }
-        protected void FreeGCHandle() { }
-    }
-    public partial class Array : System.Runtime.InteropServices.JavaScript.CoreObject
-    {
-        public Array(params object[] _params) : base (default(int)) { }
-        public object this[int i] { get { throw null; } set { } }
-        public int IndexOf(object searchElement, int fromIndex = 0) { throw null; }
-        public int LastIndexOf(object searchElement) { throw null; }
-        public int LastIndexOf(object searchElement, int endIndex) { throw null; }
-        public object Pop() { throw null; }
-        public int Push(params object[] elements) { throw null; }
-        public object Shift() { throw null; }
-        public int UnShift(params object[] elements) { throw null; }
-    }
-    public partial class ArrayBuffer : System.Runtime.InteropServices.JavaScript.CoreObject
-    {
-        public ArrayBuffer() : base (default(int)) { }
-        public ArrayBuffer(int length) : base (default(int)) { }
-        public int ByteLength { get { throw null; } }
-        public bool IsView { get { throw null; } }
-        public System.Runtime.InteropServices.JavaScript.ArrayBuffer Slice(int begin) { throw null; }
-        public System.Runtime.InteropServices.JavaScript.ArrayBuffer Slice(int begin, int end) { throw null; }
-    }
-    public abstract partial class CoreObject : System.Runtime.InteropServices.JavaScript.JSObject
-    {
-        protected CoreObject(int jsHandle) { }
-    }
-    public partial class DataView : System.Runtime.InteropServices.JavaScript.CoreObject
-    {
-        public DataView(System.Runtime.InteropServices.JavaScript.ArrayBuffer buffer) : base (default(int)) { }
-        public DataView(System.Runtime.InteropServices.JavaScript.ArrayBuffer buffer, int byteOffset) : base (default(int)) { }
-        public DataView(System.Runtime.InteropServices.JavaScript.ArrayBuffer buffer, int byteOffset, int byteLength) : base (default(int)) { }
-        public DataView(System.Runtime.InteropServices.JavaScript.SharedArrayBuffer buffer) : base (default(int)) { }
-        public DataView(System.Runtime.InteropServices.JavaScript.SharedArrayBuffer buffer, int byteOffset) : base (default(int)) { }
-        public DataView(System.Runtime.InteropServices.JavaScript.SharedArrayBuffer buffer, int byteOffset, int byteLength) : base (default(int)) { }
-        public System.Runtime.InteropServices.JavaScript.ArrayBuffer Buffer { get { throw null; } }
-        public int ByteLength { get { throw null; } }
-        public int ByteOffset { get { throw null; } }
-        public float GetFloat32(int byteOffset, bool littleEndian = false) { throw null; }
-        public double GetFloat64(int byteOffset, bool littleEndian = false) { throw null; }
-        public short GetInt16(int byteOffset, bool littleEndian = false) { throw null; }
-        public int GetInt32(int byteOffset, bool littleEndian = false) { throw null; }
-        [System.CLSCompliantAttribute(false)]
-        public sbyte GetInt8(int byteOffset, bool littleEndian = false) { throw null; }
-        [System.CLSCompliantAttribute(false)]
-        public ushort GetUint16(int byteOffset, bool littleEndian = false) { throw null; }
-        [System.CLSCompliantAttribute(false)]
-        public uint GetUint32(int byteOffset, bool littleEndian = false) { throw null; }
-        public byte GetUint8(int byteOffset, bool littleEndian = false) { throw null; }
-        public void SetFloat32(int byteOffset, float value, bool littleEndian = false) { }
-        public void SetFloat64(int byteOffset, double value, bool littleEndian = false) { }
-        public void SetInt16(int byteOffset, short value, bool littleEndian = false) { }
-        public void SetInt32(int byteOffset, int value, bool littleEndian = false) { }
-        [System.CLSCompliantAttribute(false)]
-        public void SetInt8(int byteOffset, sbyte value, bool littleEndian = false) { }
-        [System.CLSCompliantAttribute(false)]
-        public void SetUint16(int byteOffset, ushort value, bool littleEndian = false) { }
-        [System.CLSCompliantAttribute(false)]
-        public void SetUint32(int byteOffset, uint value, bool littleEndian = false) { }
-        public void SetUint8(int byteOffset, byte value, bool littleEndian = false) { }
-    }
-    public sealed partial class Float32Array : System.Runtime.InteropServices.JavaScript.TypedArray<System.Runtime.InteropServices.JavaScript.Float32Array, float>
-    {
-        public Float32Array() { }
-        public Float32Array(int length) { }
-        public Float32Array(System.Runtime.InteropServices.JavaScript.ArrayBuffer buffer) { }
-        public Float32Array(System.Runtime.InteropServices.JavaScript.ArrayBuffer buffer, int byteOffset) { }
-        public Float32Array(System.Runtime.InteropServices.JavaScript.ArrayBuffer buffer, int byteOffset, int length) { }
-        public Float32Array(System.Runtime.InteropServices.JavaScript.SharedArrayBuffer buffer) { }
-        public Float32Array(System.Runtime.InteropServices.JavaScript.SharedArrayBuffer buffer, int byteOffset) { }
-        public Float32Array(System.Runtime.InteropServices.JavaScript.SharedArrayBuffer buffer, int byteOffset, int length) { }
-        public static implicit operator System.Span<float> (System.Runtime.InteropServices.JavaScript.Float32Array typedarray) { throw null; }
-        public static implicit operator System.Runtime.InteropServices.JavaScript.Float32Array (System.Span<float> span) { throw null; }
-    }
-    public sealed partial class Float64Array : System.Runtime.InteropServices.JavaScript.TypedArray<System.Runtime.InteropServices.JavaScript.Float64Array, double>
-    {
-        public Float64Array() { }
-        public Float64Array(int length) { }
-        public Float64Array(System.Runtime.InteropServices.JavaScript.ArrayBuffer buffer) { }
-        public Float64Array(System.Runtime.InteropServices.JavaScript.ArrayBuffer buffer, int byteOffset) { }
-        public Float64Array(System.Runtime.InteropServices.JavaScript.ArrayBuffer buffer, int byteOffset, int length) { }
-        public Float64Array(System.Runtime.InteropServices.JavaScript.SharedArrayBuffer buffer) { }
-        public Float64Array(System.Runtime.InteropServices.JavaScript.SharedArrayBuffer buffer, int byteOffset) { }
-        public Float64Array(System.Runtime.InteropServices.JavaScript.SharedArrayBuffer buffer, int byteOffset, int length) { }
-        public static implicit operator System.Span<double> (System.Runtime.InteropServices.JavaScript.Float64Array typedarray) { throw null; }
-        public static implicit operator System.Runtime.InteropServices.JavaScript.Float64Array (System.Span<double> span) { throw null; }
-    }
-    public partial class Function : System.Runtime.InteropServices.JavaScript.CoreObject
-    {
-        public Function(params object[] args) : base (default(int)) { }
-        public object Apply(object? thisArg = null, object[]? argsArray = null) { throw null; }
-        public System.Runtime.InteropServices.JavaScript.Function Bind(object? thisArg = null, object[]? argsArray = null) { throw null; }
-        public object Call(object? thisArg = null, params object[] argsArray) { throw null; }
-    }
-    public partial class HostObject : System.Runtime.InteropServices.JavaScript.HostObjectBase
-    {
-        public HostObject(string hostName, params object[] _params) : base (default(int)) { }
-    }
-    public abstract partial class HostObjectBase : System.Runtime.InteropServices.JavaScript.JSObject, System.Runtime.InteropServices.JavaScript.IHostObject
-    {
-        protected HostObjectBase(int jHandle) { }
-    }
-    public partial interface IHostObject
-    {
-    }
-    public partial interface IJSObject
-    {
-        int JSHandle { get; }
-        int Length { get; }
-    }
-    public sealed partial class Int16Array : System.Runtime.InteropServices.JavaScript.TypedArray<System.Runtime.InteropServices.JavaScript.Int16Array, short>
-    {
-        public Int16Array() { }
-        public Int16Array(int length) { }
-        public Int16Array(System.Runtime.InteropServices.JavaScript.ArrayBuffer buffer) { }
-        public Int16Array(System.Runtime.InteropServices.JavaScript.ArrayBuffer buffer, int byteOffset) { }
-        public Int16Array(System.Runtime.InteropServices.JavaScript.ArrayBuffer buffer, int byteOffset, int length) { }
-        public Int16Array(System.Runtime.InteropServices.JavaScript.SharedArrayBuffer buffer) { }
-        public Int16Array(System.Runtime.InteropServices.JavaScript.SharedArrayBuffer buffer, int byteOffset) { }
-        public Int16Array(System.Runtime.InteropServices.JavaScript.SharedArrayBuffer buffer, int byteOffset, int length) { }
-        [System.CLSCompliantAttribute(false)]
-        public static implicit operator System.Span<short> (System.Runtime.InteropServices.JavaScript.Int16Array typedarray) { throw null; }
-        public static implicit operator System.Runtime.InteropServices.JavaScript.Int16Array (System.Span<short> span) { throw null; }
-    }
-    public sealed partial class Int32Array : System.Runtime.InteropServices.JavaScript.TypedArray<System.Runtime.InteropServices.JavaScript.Int32Array, int>
-    {
-        public Int32Array() { }
-        public Int32Array(int length) { }
-        public Int32Array(System.Runtime.InteropServices.JavaScript.ArrayBuffer buffer) { }
-        public Int32Array(System.Runtime.InteropServices.JavaScript.ArrayBuffer buffer, int byteOffset) { }
-        public Int32Array(System.Runtime.InteropServices.JavaScript.ArrayBuffer buffer, int byteOffset, int length) { }
-        public Int32Array(System.Runtime.InteropServices.JavaScript.SharedArrayBuffer buffer) { }
-        public Int32Array(System.Runtime.InteropServices.JavaScript.SharedArrayBuffer buffer, int byteOffset) { }
-        public Int32Array(System.Runtime.InteropServices.JavaScript.SharedArrayBuffer buffer, int byteOffset, int length) { }
-        public static implicit operator System.Span<int> (System.Runtime.InteropServices.JavaScript.Int32Array typedarray) { throw null; }
-        public static implicit operator System.Runtime.InteropServices.JavaScript.Int32Array (System.Span<int> span) { throw null; }
-    }
-    [System.CLSCompliantAttribute(false)]
-    public sealed partial class Int8Array : System.Runtime.InteropServices.JavaScript.TypedArray<System.Runtime.InteropServices.JavaScript.Int8Array, sbyte>
-    {
-        public Int8Array() { }
-        public Int8Array(int length) { }
-        public Int8Array(System.Runtime.InteropServices.JavaScript.ArrayBuffer buffer) { }
-        public Int8Array(System.Runtime.InteropServices.JavaScript.ArrayBuffer buffer, int byteOffset) { }
-        public Int8Array(System.Runtime.InteropServices.JavaScript.ArrayBuffer buffer, int byteOffset, int length) { }
-        public Int8Array(System.Runtime.InteropServices.JavaScript.SharedArrayBuffer buffer) { }
-        public Int8Array(System.Runtime.InteropServices.JavaScript.SharedArrayBuffer buffer, int byteOffset) { }
-        public Int8Array(System.Runtime.InteropServices.JavaScript.SharedArrayBuffer buffer, int byteOffset, int length) { }
-        [System.CLSCompliantAttribute(false)]
-        public static implicit operator System.Span<sbyte> (System.Runtime.InteropServices.JavaScript.Int8Array typedarray) { throw null; }
-        [System.CLSCompliantAttribute(false)]
-        public static implicit operator System.Runtime.InteropServices.JavaScript.Int8Array (System.Span<sbyte> span) { throw null; }
-    }
-    public partial interface ITypedArray
-    {
-        System.Runtime.InteropServices.JavaScript.ArrayBuffer Buffer { get; }
-        int ByteLength { get; }
-        int BytesPerElement { get; }
-        string Name { get; }
-        System.Runtime.InteropServices.JavaScript.TypedArrayTypeCode GetTypedArrayType();
-        void Set(System.Runtime.InteropServices.JavaScript.Array array);
-        void Set(System.Runtime.InteropServices.JavaScript.Array array, int offset);
-        void Set(System.Runtime.InteropServices.JavaScript.ITypedArray typedArray);
-        void Set(System.Runtime.InteropServices.JavaScript.ITypedArray typedArray, int offset);
-    }
-    public partial interface ITypedArray<T, U> where U : struct
-    {
-        T Slice();
-        T Slice(int begin);
-        T Slice(int begin, int end);
-        T SubArray();
-        T SubArray(int begin);
-        T SubArray(int begin, int end);
-    }
-    public partial class JSException : System.Exception
-    {
-        public JSException(string msg) { }
-    }
-    public partial class JSObject : System.Runtime.InteropServices.JavaScript.AnyRef, System.IDisposable, System.Runtime.InteropServices.JavaScript.IJSObject
-    {
-        public JSObject() { }
-        public bool IsDisposed { get { throw null; } }
-        public int Length { get { throw null; } set { } }
-        public override bool Equals(object? obj) { throw null; }
-        public override int GetHashCode() { throw null; }
-        public object GetObjectProperty(string name) { throw null; }
-        public bool HasOwnProperty(string prop) { throw null; }
-        public object Invoke(string method, params object?[] args) { throw null; }
-        public bool PropertyIsEnumerable(string prop) { throw null; }
-        protected override bool ReleaseHandle() { throw null; }
-        public void SetObjectProperty(string name, object value, bool createIfNotExists = true, bool hasOwnProperty = false) { }
-        public override string ToString() { throw null; }
-    }
-    public partial class Map : System.Runtime.InteropServices.JavaScript.CoreObject, System.Collections.ICollection, System.Collections.IDictionary, System.Collections.IEnumerable
-    {
-        public Map() : base (default(int)) { }
-        public int Count { get { throw null; } }
-        public bool IsFixedSize { get { throw null; } }
-        public bool IsReadOnly { get { throw null; } }
-        public bool IsSynchronized { get { throw null; } }
-        public object? this[object key] { get { throw null; } set { } }
-        public System.Collections.ICollection Keys { get { throw null; } }
-        public object SyncRoot { get { throw null; } }
-        public System.Collections.ICollection Values { get { throw null; } }
-        public void Add(object key, object? value) { }
-        public void Clear() { }
-        public bool Contains(object key) { throw null; }
-        public void CopyTo(System.Array array, int index) { }
-        public System.Collections.IDictionaryEnumerator GetEnumerator() { throw null; }
-        public void Remove(object key) { }
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; }
-    }
-    public static partial class Runtime
-    {
-        public static System.Runtime.InteropServices.JavaScript.Function? CompileFunction(string snippet) { throw null; }
-        public static void FreeObject(object obj) { }
-        public static object GetGlobalObject(string? str = null) { throw null; }
-        public static string InvokeJS(string str) { throw null; }
-        public static int New(string hostClassName, params object[] parms) { throw null; }
-        public static int New<T>(params object[] parms) { throw null; }
-        public static System.IntPtr SafeHandleGetHandle(System.Runtime.InteropServices.SafeHandle safeHandle, bool addRef) { throw null; }
-    }
-    public partial class SharedArrayBuffer : System.Runtime.InteropServices.JavaScript.CoreObject
-    {
-        public SharedArrayBuffer(int length) : base (default(int)) { }
-        public int ByteLength { get { throw null; } }
-        public System.Runtime.InteropServices.JavaScript.SharedArrayBuffer Slice(int begin, int end) { throw null; }
-    }
-    public enum TypedArrayTypeCode
-    {
-        Int8Array = 5,
-        Uint8Array = 6,
-        Int16Array = 7,
-        Uint16Array = 8,
-        Int32Array = 9,
-        Uint32Array = 10,
-        Float32Array = 13,
-        Float64Array = 14,
-        Uint8ClampedArray = 15,
-    }
-    public abstract partial class TypedArray<T, U> : System.Runtime.InteropServices.JavaScript.CoreObject, System.Runtime.InteropServices.JavaScript.ITypedArray, System.Runtime.InteropServices.JavaScript.ITypedArray<T, U> where U : struct
-    {
-        protected TypedArray() : base (default(int)) { }
-        protected TypedArray(int length) : base (default(int)) { }
-        protected TypedArray(System.Runtime.InteropServices.JavaScript.ArrayBuffer buffer) : base (default(int)) { }
-        protected TypedArray(System.Runtime.InteropServices.JavaScript.ArrayBuffer buffer, int byteOffset) : base (default(int)) { }
-        protected TypedArray(System.Runtime.InteropServices.JavaScript.ArrayBuffer buffer, int byteOffset, int length) : base (default(int)) { }
-        protected TypedArray(System.Runtime.InteropServices.JavaScript.SharedArrayBuffer buffer) : base (default(int)) { }
-        protected TypedArray(System.Runtime.InteropServices.JavaScript.SharedArrayBuffer buffer, int byteOffset) : base (default(int)) { }
-        protected TypedArray(System.Runtime.InteropServices.JavaScript.SharedArrayBuffer buffer, int byteOffset, int length) : base (default(int)) { }
-        public System.Runtime.InteropServices.JavaScript.ArrayBuffer Buffer { get { throw null; } }
-        public int ByteLength { get { throw null; } }
-        public int BytesPerElement { get { throw null; } }
-        public U? this[int i] { get { throw null; } set { } }
-        public string Name { get { throw null; } }
-        public int CopyFrom(System.ReadOnlySpan<U> span) { throw null; }
-        public int CopyTo(System.Span<U> span) { throw null; }
-        public void Fill(U value) { }
-        public void Fill(U value, int start) { }
-        public void Fill(U value, int start, int end) { }
-        public static T From(System.ReadOnlySpan<U> span) { throw null; }
-        public System.Runtime.InteropServices.JavaScript.TypedArrayTypeCode GetTypedArrayType() { throw null; }
-        public void Set(System.Runtime.InteropServices.JavaScript.Array array) { }
-        public void Set(System.Runtime.InteropServices.JavaScript.Array array, int offset) { }
-        public void Set(System.Runtime.InteropServices.JavaScript.ITypedArray typedArray) { }
-        public void Set(System.Runtime.InteropServices.JavaScript.ITypedArray typedArray, int offset) { }
-        public T Slice() { throw null; }
-        public T Slice(int begin) { throw null; }
-        public T Slice(int begin, int end) { throw null; }
-        public T SubArray() { throw null; }
-        public T SubArray(int begin) { throw null; }
-        public T SubArray(int begin, int end) { throw null; }
-        public U[] ToArray() { throw null; }
-    }
-    [System.CLSCompliantAttribute(false)]
-    public sealed partial class Uint16Array : System.Runtime.InteropServices.JavaScript.TypedArray<System.Runtime.InteropServices.JavaScript.Uint16Array, ushort>
-    {
-        public Uint16Array() { }
-        public Uint16Array(int length) { }
-        public Uint16Array(System.Runtime.InteropServices.JavaScript.ArrayBuffer buffer) { }
-        public Uint16Array(System.Runtime.InteropServices.JavaScript.ArrayBuffer buffer, int byteOffset) { }
-        public Uint16Array(System.Runtime.InteropServices.JavaScript.ArrayBuffer buffer, int byteOffset, int length) { }
-        public Uint16Array(System.Runtime.InteropServices.JavaScript.SharedArrayBuffer buffer) { }
-        public Uint16Array(System.Runtime.InteropServices.JavaScript.SharedArrayBuffer buffer, int byteOffset) { }
-        public Uint16Array(System.Runtime.InteropServices.JavaScript.SharedArrayBuffer buffer, int byteOffset, int length) { }
-        public static implicit operator System.Span<ushort> (System.Runtime.InteropServices.JavaScript.Uint16Array typedarray) { throw null; }
-        public static implicit operator System.Runtime.InteropServices.JavaScript.Uint16Array (System.Span<ushort> span) { throw null; }
-    }
-    [System.CLSCompliantAttribute(false)]
-    public sealed partial class Uint32Array : System.Runtime.InteropServices.JavaScript.TypedArray<System.Runtime.InteropServices.JavaScript.Uint32Array, uint>
-    {
-        public Uint32Array() { }
-        public Uint32Array(int length) { }
-        public Uint32Array(System.Runtime.InteropServices.JavaScript.ArrayBuffer buffer) { }
-        public Uint32Array(System.Runtime.InteropServices.JavaScript.ArrayBuffer buffer, int byteOffset) { }
-        public Uint32Array(System.Runtime.InteropServices.JavaScript.ArrayBuffer buffer, int byteOffset, int length) { }
-        public Uint32Array(System.Runtime.InteropServices.JavaScript.SharedArrayBuffer buffer) { }
-        public Uint32Array(System.Runtime.InteropServices.JavaScript.SharedArrayBuffer buffer, int byteOffset) { }
-        public Uint32Array(System.Runtime.InteropServices.JavaScript.SharedArrayBuffer buffer, int byteOffset, int length) { }
-        public static implicit operator System.Span<uint> (System.Runtime.InteropServices.JavaScript.Uint32Array typedarray) { throw null; }
-        public static implicit operator System.Runtime.InteropServices.JavaScript.Uint32Array (System.Span<uint> span) { throw null; }
-    }
-    public sealed partial class Uint8Array : System.Runtime.InteropServices.JavaScript.TypedArray<System.Runtime.InteropServices.JavaScript.Uint8Array, byte>
-    {
-        public Uint8Array() { }
-        public Uint8Array(int length) { }
-        public Uint8Array(System.Runtime.InteropServices.JavaScript.ArrayBuffer buffer) { }
-        public Uint8Array(System.Runtime.InteropServices.JavaScript.ArrayBuffer buffer, int byteOffset) { }
-        public Uint8Array(System.Runtime.InteropServices.JavaScript.ArrayBuffer buffer, int byteOffset, int length) { }
-        public Uint8Array(System.Runtime.InteropServices.JavaScript.SharedArrayBuffer buffer) { }
-        public Uint8Array(System.Runtime.InteropServices.JavaScript.SharedArrayBuffer buffer, int byteOffset) { }
-        public Uint8Array(System.Runtime.InteropServices.JavaScript.SharedArrayBuffer buffer, int byteOffset, int length) { }
-        public static implicit operator System.Span<byte> (System.Runtime.InteropServices.JavaScript.Uint8Array typedarray) { throw null; }
-        public static implicit operator System.Runtime.InteropServices.JavaScript.Uint8Array (System.Span<byte> span) { throw null; }
-    }
-    public sealed partial class Uint8ClampedArray : System.Runtime.InteropServices.JavaScript.TypedArray<System.Runtime.InteropServices.JavaScript.Uint8ClampedArray, byte>
-    {
-        public Uint8ClampedArray() { }
-        public Uint8ClampedArray(int length) { }
-        public Uint8ClampedArray(System.Runtime.InteropServices.JavaScript.ArrayBuffer buffer) { }
-        public Uint8ClampedArray(System.Runtime.InteropServices.JavaScript.ArrayBuffer buffer, int byteOffset) { }
-        public Uint8ClampedArray(System.Runtime.InteropServices.JavaScript.ArrayBuffer buffer, int byteOffset, int length) { }
-        public Uint8ClampedArray(System.Runtime.InteropServices.JavaScript.SharedArrayBuffer buffer) { }
-        public Uint8ClampedArray(System.Runtime.InteropServices.JavaScript.SharedArrayBuffer buffer, int byteOffset) { }
-        public Uint8ClampedArray(System.Runtime.InteropServices.JavaScript.SharedArrayBuffer buffer, int byteOffset, int length) { }
-        public static implicit operator System.Span<byte> (System.Runtime.InteropServices.JavaScript.Uint8ClampedArray typedarray) { throw null; }
-        public static implicit operator System.Runtime.InteropServices.JavaScript.Uint8ClampedArray (System.Span<byte> span) { throw null; }
-    }
-}
diff --git a/src/libraries/System.Runtime.InteropServices.JavaScript/ref/System.Runtime.InteropServices.JavaScript.csproj b/src/libraries/System.Runtime.InteropServices.JavaScript/ref/System.Runtime.InteropServices.JavaScript.csproj
deleted file mode 100644 (file)
index aded6c5..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <Nullable>enable</Nullable>
-    <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="System.Runtime.InteropServices.JavaScript.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
index cc13c1d..427eb60 100644 (file)
         "4.1.1.0": "4.3.0"
       }
     },
-    "System.Runtime.InteropServices.JavaScript": {
+    "System.Private.Runtime.InteropServices.JavaScript": {
       "InboxOn": {
         "net5.0": "5.0.0.0"
       }
index 310ec81..27f295c 100644 (file)
@@ -42,7 +42,7 @@
       MainJS="$(MonoProjectRoot)wasm\runtime-test.js"
       DebugLevel="1"
       AssemblySearchPaths="@(AssemblySearchPaths)"
-      ExtraAssemblies="$(ArtifactsBinDir)\System.Runtime.InteropServices.JavaScript\$(NetCoreAppCurrent)-Browser-$(RuntimeConfiguration)\System.Runtime.InteropServices.JavaScript.dll"/>
+      ExtraAssemblies="$(ArtifactsBinDir)\System.Private.Runtime.InteropServices.JavaScript\$(NetCoreAppCurrent)-Browser-$(RuntimeConfiguration)\System.Private.Runtime.InteropServices.JavaScript.dll"/>
     <Exec Command="chmod a+x $(AppDir)/run-v8.sh" />
   </Target>
 
index 8f4ced5..74f6a66 100644 (file)
@@ -340,6 +340,6 @@ var App = {
                }
        },
        call_test_method: function (method_name, args) {
-               return BINDING.call_static_method("[System.Runtime.InteropServices.JavaScript.Tests]System.Runtime.InteropServices.JavaScript.Tests.HelperMarshal:" + method_name, args);
+               return BINDING.call_static_method("[System.Private.Runtime.InteropServices.JavaScript.Tests]System.Runtime.InteropServices.JavaScript.Tests.HelperMarshal:" + method_name, args);
        }
 };
\ No newline at end of file
index d3dd31e..b9a1dae 100644 (file)
@@ -4,7 +4,7 @@
 var BindingSupportLib = {
        $BINDING__postset: 'BINDING.export_functions (Module);',
        $BINDING: {
-               BINDING_ASM: "[System.Runtime.InteropServices.JavaScript]System.Runtime.InteropServices.JavaScript.Runtime",
+               BINDING_ASM: "[System.Private.Runtime.InteropServices.JavaScript]System.Runtime.InteropServices.JavaScript.Runtime",
                mono_wasm_object_registry: [],
                mono_wasm_ref_counter: 0,
                mono_wasm_free_list: [],