Skip to content

Commit 9bc6437

Browse files
pavelsavarapavelsavara
committed
rebase
1 parent f6824bc commit 9bc6437

File tree

82 files changed

+66
-7530
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+66
-7530
lines changed

‎.gitattributes

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,3 @@ src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/revcomp-
7878
src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/knucleotide-input.txt text eol=lf
7979
src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/knucleotide-input-big.txt text eol=lf
8080
src/mono/wasm/runtime/dotnet.d.ts text eol=lf
81-
src/mono/wasm/runtime/dotnet-legacy.d.ts text eol=lf

‎eng/liveBuilds.targets

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@
204204
$(LibrariesNativeArtifactsPath)dotnet.runtime.js;
205205
$(LibrariesNativeArtifactsPath)dotnet.runtime.js.map;
206206
$(LibrariesNativeArtifactsPath)dotnet.d.ts;
207-
$(LibrariesNativeArtifactsPath)dotnet-legacy.d.ts;
208207
$(LibrariesNativeArtifactsPath)package.json;
209208
$(LibrariesNativeArtifactsPath)dotnet.native.wasm;
210209
$(LibrariesNativeArtifactsPath)dotnet.native.js.symbols;

‎eng/testing/tests.browser.targets

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
>true</InstallV8ForTests>
3434

3535
<_BundleAOTTestWasmAppForHelixDependsOn>$(_BundleAOTTestWasmAppForHelixDependsOn);PrepareForWasmBuildApp;_PrepareForAOTOnHelix</_BundleAOTTestWasmAppForHelixDependsOn>
36-
<WasmEnableLegacyJsInterop Condition="'$(WasmEnableLegacyJsInterop)' == ''">true</WasmEnableLegacyJsInterop>
3736
<UseSystemResourceKeys Condition="'$(UseSystemResourceKeys)' == ''">false</UseSystemResourceKeys>
3837
<EventSourceSupport Condition="'$(EventSourceSupport)' == ''">true</EventSourceSupport>
3938
<NullabilityInfoContextSupport Condition="'$(NullabilityInfoContextSupport)' == ''">true</NullabilityInfoContextSupport>
@@ -47,21 +46,6 @@
4746
<WasmIncludeFullIcuData>true</WasmIncludeFullIcuData>
4847
</PropertyGroup>
4948

50-
<PropertyGroup Condition="'$(BuildAOTTestsOn)' == 'local'">
51-
<!--
52-
When building for BuildAOTTestsOnHelix=true, the BrowserWasmApp.targets are *not* imported, because
53-
they get instead used by the AOT proxy project on helix.
54-
55-
On the build machine only the regular part of the build is run, which includes trimming. But if
56-
BrowserWasmApp.targets modify any trimming arguments, then those will not get picked up by this build.
57-
For example - linker substitution files used with simd builds.
58-
59-
So, set those parameters explicitly here.
60-
-->
61-
<_ExtraTrimmerArgs Condition="'$(WasmEnableLegacyJsInterop)' == 'false'">$(_ExtraTrimmerArgs) --substitutions "$(BrowserProjectRoot)build\ILLink.Substitutions.LegacyJsInterop.xml"</_ExtraTrimmerArgs>
62-
</PropertyGroup>
63-
64-
6549
<!-- On CI this is installed as part of pretest, but it should still be installed
6650
for WBT, and debugger tests -->
6751
<Import Project="$(MSBuildThisFileDirectory)wasm-provisioning.targets"

‎src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,6 @@
231231
<PlatformManifestFileEntry Include="dotnet.native.worker.js" IsNative="true" />
232232
<PlatformManifestFileEntry Include="dotnet.native.js.symbols" IsNative="true" />
233233
<PlatformManifestFileEntry Include="dotnet.d.ts" IsNative="true" />
234-
<PlatformManifestFileEntry Include="dotnet-legacy.d.ts" IsNative="true" />
235234
<PlatformManifestFileEntry Include="dotnet.native.wasm" IsNative="true" />
236235
<PlatformManifestFileEntry Include="icudt.dat" IsNative="true" />
237236
<PlatformManifestFileEntry Include="icudt_no_CJK.dat" IsNative="true" />

‎src/libraries/System.Runtime.InteropServices.JavaScript/System.Runtime.InteropServices.JavaScript.sln

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServi
1111
EndProject
1212
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JSImportGenerator.Unit.Tests", "tests\JSImportGenerator.UnitTest\JSImportGenerator.Unit.Tests.csproj", "{BFED925C-18F2-4C98-833E-66F205234598}"
1313
EndProject
14-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServices.JavaScript.Legacy.Tests", "tests\System.Runtime.InteropServices.JavaScript.Legacy.UnitTests\System.Runtime.InteropServices.JavaScript.Legacy.Tests.csproj", "{ABA5A92B-CAD8-47E8-A7CE-D28A67FB69C0}"
15-
EndProject
1614
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServices.JavaScript.Tests", "tests\System.Runtime.InteropServices.JavaScript.UnitTests\System.Runtime.InteropServices.JavaScript.Tests.csproj", "{765B4AA5-723A-44FF-BC4E-EB0F03103F6D}"
1715
EndProject
1816
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComInterfaceGenerator", "..\System.Runtime.InteropServices\gen\ComInterfaceGenerator\ComInterfaceGenerator.csproj", "{FB12C247-AFEF-4772-BB0C-983969B6CF32}"

‎src/libraries/System.Runtime.InteropServices.JavaScript/src/CompatibilitySuppressions.xml

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
3-
<Suppression>
4-
<DiagnosticId>CP0001</DiagnosticId>
5-
<Target>T:System.Runtime.InteropServices.JavaScript.Array</Target>
6-
<Left>ref/net9.0/System.Runtime.InteropServices.JavaScript.dll</Left>
7-
<Right>runtimes/browser/lib/net9.0/System.Runtime.InteropServices.JavaScript.dll</Right>
8-
</Suppression>
9-
<Suppression>
10-
<DiagnosticId>CP0001</DiagnosticId>
11-
<Target>T:System.Runtime.InteropServices.JavaScript.ArrayBuffer</Target>
12-
<Left>ref/net9.0/System.Runtime.InteropServices.JavaScript.dll</Left>
13-
<Right>runtimes/browser/lib/net9.0/System.Runtime.InteropServices.JavaScript.dll</Right>
14-
</Suppression>
15-
<Suppression>
16-
<DiagnosticId>CP0001</DiagnosticId>
17-
<Target>T:System.Runtime.InteropServices.JavaScript.DataView</Target>
18-
<Left>ref/net9.0/System.Runtime.InteropServices.JavaScript.dll</Left>
19-
<Right>runtimes/browser/lib/net9.0/System.Runtime.InteropServices.JavaScript.dll</Right>
20-
</Suppression>
21-
<Suppression>
22-
<DiagnosticId>CP0001</DiagnosticId>
23-
<Target>T:System.Runtime.InteropServices.JavaScript.Function</Target>
24-
<Left>ref/net9.0/System.Runtime.InteropServices.JavaScript.dll</Left>
25-
<Right>runtimes/browser/lib/net9.0/System.Runtime.InteropServices.JavaScript.dll</Right>
26-
</Suppression>
27-
<Suppression>
28-
<DiagnosticId>CP0001</DiagnosticId>
29-
<Target>T:System.Runtime.InteropServices.JavaScript.Runtime</Target>
30-
<Left>ref/net9.0/System.Runtime.InteropServices.JavaScript.dll</Left>
31-
<Right>runtimes/browser/lib/net9.0/System.Runtime.InteropServices.JavaScript.dll</Right>
32-
</Suppression>
33-
<Suppression>
34-
<DiagnosticId>CP0001</DiagnosticId>
35-
<Target>T:System.Runtime.InteropServices.JavaScript.Uint8Array</Target>
36-
<Left>ref/net9.0/System.Runtime.InteropServices.JavaScript.dll</Left>
37-
<Right>runtimes/browser/lib/net9.0/System.Runtime.InteropServices.JavaScript.dll</Right>
38-
</Suppression>
39-
403
<Suppression>
414
<DiagnosticId>CP0001</DiagnosticId>
425
<Target>T:System.Runtime.InteropServices.JavaScript.SynchronizationContextExtension</Target>

‎src/libraries/System.Runtime.InteropServices.JavaScript/src/System.Runtime.InteropServices.JavaScript.csproj

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
<FeatureWasmThreads Condition="'$(TargetPlatformIdentifier)' == 'browser' and '$(MonoWasmBuildVariant)' == 'multithread'">true</FeatureWasmThreads>
1515
<WasmEnableJsInteropByValue Condition="'$(TargetPlatformIdentifier)' == 'browser' and '$(WasmEnableJsInteropByValue)' == '' and '$(FeatureWasmThreads)' == 'true'">true</WasmEnableJsInteropByValue>
1616
<WasmEnableJsInteropByValue Condition="'$(TargetPlatformIdentifier)' == 'browser' and '$(WasmEnableJsInteropByValue)' == ''">false</WasmEnableJsInteropByValue>
17-
<WasmEnableLegacyJsInterop Condition="'$(TargetPlatformIdentifier)' == 'browser' and '$(WasmEnableLegacyJsInterop)' == ''">true</WasmEnableLegacyJsInterop>
1817
<DefineConstants Condition="'$(FeatureWasmThreads)' == 'true'">$(DefineConstants);FEATURE_WASM_THREADS</DefineConstants>
19-
<DefineConstants Condition="'$(WasmEnableLegacyJsInterop)' == 'false'">$(DefineConstants);DISABLE_LEGACY_JS_INTEROP</DefineConstants>
2018
<DefineConstants Condition="'$(WasmEnableJsInteropByValue)' == 'true'">$(DefineConstants);ENABLE_JS_INTEROP_BY_VALUE</DefineConstants>
2119
<EmitCompilerGeneratedFiles Condition="'$(Configuration)' == 'Debug' and '$(TargetPlatformIdentifier)' == 'browser'">true</EmitCompilerGeneratedFiles>
2220
</PropertyGroup>
@@ -29,7 +27,6 @@
2927
<Compile Include="$(CommonPath)Interop\Browser\Interop.Runtime.cs" Link="System\Runtime\InteropServices\JavaScript\Interop\Interop.Runtime.cs" />
3028
<Compile Include="System\Runtime\InteropServices\JavaScript\Interop\JavaScriptImports.Generated.cs" />
3129
<Compile Include="System\Runtime\InteropServices\JavaScript\Interop\JavaScriptExports.cs" />
32-
<Compile Include="System\Runtime\InteropServices\JavaScript\Interop\JavaScriptImports.cs" />
3330

3431
<Compile Include="System\Runtime\InteropServices\JavaScript\JSHost.cs" />
3532
<Compile Include="System\Runtime\InteropServices\JavaScript\JSMarshalerType.cs" />
@@ -68,18 +65,6 @@
6865
<Compile Include="System\Runtime\InteropServices\JavaScript\Marshaling\JSMarshalerArgument.Exception.cs" />
6966
</ItemGroup>
7067

71-
<!-- only include legacy interop when WasmEnableLegacyJsInterop is enabled -->
72-
<ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'browser' and '$(WasmEnableLegacyJsInterop)' != 'false'">
73-
<Compile Include="System\Runtime\InteropServices\JavaScript\Interop\LegacyExports.cs" />
74-
<Compile Include="System\Runtime\InteropServices\JavaScript\Legacy\Runtime.cs" />
75-
<Compile Include="System\Runtime\InteropServices\JavaScript\Legacy\Array.cs" />
76-
<Compile Include="System\Runtime\InteropServices\JavaScript\Legacy\ArrayBuffer.cs" />
77-
<Compile Include="System\Runtime\InteropServices\JavaScript\Legacy\DataView.cs" />
78-
<Compile Include="System\Runtime\InteropServices\JavaScript\Legacy\Function.cs" />
79-
<Compile Include="System\Runtime\InteropServices\JavaScript\Legacy\Uint8Array.cs" />
80-
<Compile Include="System\Runtime\InteropServices\JavaScript\Legacy\LegacyHostImplementation.cs" />
81-
</ItemGroup>
82-
8368
<!-- only include threads support when FeatureWasmThreads is enabled -->
8469
<ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'browser' and '$(FeatureWasmThreads)' == 'true'">
8570
<Compile Include="System\Runtime\InteropServices\JavaScript\JSWebWorker.cs" />

‎src/libraries/System.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Interop/JavaScriptImports.cs

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)