Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
8cd9d39
[wasm] Disable 2 failing Common.Tests for AOT
radical Apr 23, 2021
c54a26e
[wasm][aot] Disable failing System.Collections.Tests for AOT
radical Apr 23, 2021
e57aee1
[wasm][aot] Disable failing System.Diagnostics.StackTrace.Tests for AOT
radical Apr 23, 2021
896932f
[wasm][aot] Disable failing System.Diagnostics.TraceSource.Tests for AOT
radical Apr 23, 2021
2a9ae41
[wasm][aot] Disable 3 failing tests for System.IO.Pipelines.Tests
radical Apr 23, 2021
c828739
[wasm][aot] Disable failing test for System.Memory.Tests
radical Apr 23, 2021
b83375f
[wasm][aot] Disable failing test for System.Runtime.CompilerServices.…
radical Apr 23, 2021
d3271da
[wasm][aot] Disable System.Text.Encodings.Web.Tests due to crash with…
radical Apr 23, 2021
42fbdfc
[wasm][aot] Disable System.Threading.Tasks.Parallel.Tests due to time…
radical Apr 23, 2021
7cde565
[wasm][aot] Disable failing tests for System.Threading.Tasks.Tests
radical Apr 23, 2021
6cf3e7a
[wasm][aot] Disable failing tests for System.Transactions.Local.Tests
radical Apr 23, 2021
f9efb63
[wasm][aot] Disable System.Linq.Tests due to crash with AOT
radical Apr 23, 2021
9f37d69
[wasm][aot] Disable failing tests for System.CodeDom.Tests
radical Apr 23, 2021
c9f391d
[wasm] Add new PlatformDetection.IsBrowserAOT, and use that to disable
radical Apr 24, 2021
33b763c
Merge remote-tracking branch 'origin/main' into wasm-aot-green
radical Apr 24, 2021
8fb3a6f
Add `PlatformDetection.IsMonoAOT`, and update tests to use that
radical Apr 24, 2021
a151eac
[wasm] Enable System.Runtime.CompilerServices.UnsafeTests.NullRef fix…
radical Apr 24, 2021
1a04526
Merge remote-tracking branch 'origin/main' into wasm-aot-green
radical Apr 24, 2021
88e76fe
Fix missed changes
radical Apr 24, 2021
8658525
[wasm] Disable individual tests failing with trimming
radical Apr 25, 2021
cf86c73
[wasm] Disable test failing with trimming - System.Reflection.Metadat…
radical Apr 24, 2021
73301a1
[wasm] Fix test build errors in System.Reflection.Tests with trimming
radical Apr 25, 2021
47a0938
[wasm] Fix System.Reflection.Tests failing due to trimming
radical Apr 25, 2021
e3530bd
Use linker substitutions to set PlatformDetection.IsBuiltWithAggressi…
radical Apr 26, 2021
606c703
Use TestUtilities substitutions only if AggressiveTrimming is enabled
radical Apr 26, 2021
6f1baf6
[wasm] Fix `PlatformDetection.IsMonoAOT`
radical Apr 27, 2021
f448a2e
Merge remote-tracking branch 'origin/main' into wasm-aot-green
radical Apr 27, 2021
e2b7ea9
Update src/libraries/Common/tests/TestUtilities/System/PlatformDetect…
lewing Apr 27, 2021
5196757
Update PlatformDetection.cs
lewing Apr 27, 2021
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
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Collections.Generic;
using Xunit;

Expand Down Expand Up @@ -132,6 +133,7 @@ public void IEnumerable_NonGeneric_Enumerator_MoveNext_AfterEndOfCollection(int
}

[Theory]
[ActiveIssue("https://github.com/dotnet/runtime/issues/51723", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
[MemberData(nameof(ValidCollectionSizes))]
public void IEnumerable_NonGeneric_Enumerator_MoveNext_ModifiedBeforeEnumeration_ThrowsInvalidOperationException(int count)
{
Expand All @@ -145,6 +147,7 @@ public void IEnumerable_NonGeneric_Enumerator_MoveNext_ModifiedBeforeEnumeration
}

[Theory]
[ActiveIssue("https://github.com/dotnet/runtime/issues/51723", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
[MemberData(nameof(ValidCollectionSizes))]
public void IEnumerable_NonGeneric_Enumerator_MoveNext_ModifiedDuringEnumeration_ThrowsInvalidOperationException(int count)
{
Expand All @@ -160,6 +163,7 @@ public void IEnumerable_NonGeneric_Enumerator_MoveNext_ModifiedDuringEnumeration
}

[Theory]
[ActiveIssue("https://github.com/dotnet/runtime/issues/51723", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
[MemberData(nameof(ValidCollectionSizes))]
public void IEnumerable_NonGeneric_Enumerator_MoveNext_ModifiedAfterEnumeration_ThrowsInvalidOperationException(int count)
{
Expand Down Expand Up @@ -247,6 +251,7 @@ public virtual void Enumerator_Current_AfterEndOfEnumerable_UndefinedBehavior(in
}

[Theory]
[ActiveIssue("https://github.com/dotnet/runtime/issues/51723", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
[MemberData(nameof(ValidCollectionSizes))]
public virtual void Enumerator_Current_ModifiedDuringEnumeration_UndefinedBehavior(int count)
{
Expand Down Expand Up @@ -281,6 +286,7 @@ public void IEnumerable_NonGeneric_Enumerator_Reset_BeforeIteration_Support(int
}

[Theory]
[ActiveIssue("https://github.com/dotnet/runtime/issues/51723", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
[MemberData(nameof(ValidCollectionSizes))]
public void IEnumerable_NonGeneric_Enumerator_Reset_ModifiedBeforeEnumeration_ThrowsInvalidOperationException(int count)
{
Expand All @@ -294,6 +300,7 @@ public void IEnumerable_NonGeneric_Enumerator_Reset_ModifiedBeforeEnumeration_Th
}

[Theory]
[ActiveIssue("https://github.com/dotnet/runtime/issues/51723", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
[MemberData(nameof(ValidCollectionSizes))]
public void IEnumerable_NonGeneric_Enumerator_Reset_ModifiedDuringEnumeration_ThrowsInvalidOperationException(int count)
{
Expand All @@ -309,6 +316,7 @@ public void IEnumerable_NonGeneric_Enumerator_Reset_ModifiedDuringEnumeration_Th
}

[Theory]
[ActiveIssue("https://github.com/dotnet/runtime/issues/51723", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
[MemberData(nameof(ValidCollectionSizes))]
public void IEnumerable_NonGeneric_Enumerator_Reset_ModifiedAfterEnumeration_ThrowsInvalidOperationException(int count)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<linker>
<assembly fullname="TestUtilities">
<type fullname="System.PlatformDetection">
<method signature="System.Boolean get_IsBuiltWithAggressiveTrimming()" body="stub" value="true" />
</type>
</assembly>
</linker>
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public static partial class PlatformDetection
public static bool IsMonoRuntime => Type.GetType("Mono.RuntimeStructs") != null;
public static bool IsNotMonoRuntime => !IsMonoRuntime;
public static bool IsMonoInterpreter => GetIsRunningOnMonoInterpreter();
public static bool IsMonoAOT => Environment.GetEnvironmentVariable("MONO_AOT_MODE") == "aot";
public static bool IsFreeBSD => RuntimeInformation.IsOSPlatform(OSPlatform.Create("FREEBSD"));
public static bool IsNetBSD => RuntimeInformation.IsOSPlatform(OSPlatform.Create("NETBSD"));
public static bool IsAndroid => RuntimeInformation.IsOSPlatform(OSPlatform.Create("ANDROID"));
Expand Down Expand Up @@ -136,6 +137,9 @@ public static bool IsNonZeroLowerBoundArraySupported

public static bool IsOpenSslSupported => IsLinux || IsFreeBSD || Isillumos || IsSolaris;

// Changed to `true` when linking
public static bool IsBuiltWithAggressiveTrimming => false;

// Windows - Schannel supports alpn from win8.1/2012 R2 and higher.
// Linux - OpenSsl supports alpn from openssl 1.0.2 and higher.
// OSX - SecureTransport doesn't expose alpn APIs. TODO https://github.com/dotnet/runtime/issues/27727
Expand Down Expand Up @@ -404,10 +408,10 @@ private static bool GetTls13Support()

private static bool GetIsRunningOnMonoInterpreter()
{
// Browser is always using interpreter right now
#if NETCOREAPP
if (IsBrowser)
return true;

return RuntimeFeature.IsDynamicCodeSupported;
#endif
// This is a temporary solution because mono does not support interpreter detection
// within the runtime.
var val = Environment.GetEnvironmentVariable("MONO_ENV_OPTIONS");
Expand Down
4 changes: 4 additions & 0 deletions src/libraries/Common/tests/TestUtilities/TestUtilities.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
<TargetFrameworks>$(NetCoreAppCurrent);net461</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Include="$(MSBuildThisFileDirectory)ILLink.Substitutions.AggressiveTrimming.xml"
LogicalName="ILLink.Substitutions.xml"
Condition="'$(EnableAggressiveTrimming)' == 'true'" />

<Compile Include="System\AdminHelpers.cs" />
<Compile Include="System\AssertExtensions.cs" />
<Compile Include="System\IO\StreamExtensions.cs" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ public void AddSeveralBytesRepeatedlyAndConsumeSeveralBytesRepeatedly_UsingSlice
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/50955", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public void CopyFromRepeatedlyAndCopyToRepeatedly_Success()
{
ReadOnlySpan<byte> source = new byte[] { 1, 2, 3, 4, 5, 6, 7 }.AsSpan();
Expand Down Expand Up @@ -244,6 +245,7 @@ public void CopyFromRepeatedlyAndCopyToRepeatedly_Success()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/50955", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public void CopyFromRepeatedlyAndCopyToRepeatedly_LargeCopies_Success()
{
ReadOnlySpan<byte> source = Enumerable.Range(0, 64 * 1024 - 1).Select(x => (byte)x).ToArray().AsSpan();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ public static IEnumerable<object[]> LateCall_OptionalValues_Data()
}

[Theory]
[ActiveIssue("https://github.com/dotnet/runtime/issues/51834", typeof(PlatformDetection), nameof(PlatformDetection.IsBuiltWithAggressiveTrimming), nameof(PlatformDetection.IsBrowser))]
[MemberData(nameof(LateCall_OptionalValues_Data))]
public void LateCall_OptionalValues(string memberName, object[] arguments, Type[] typeArguments, string expectedValue)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,15 @@ public void TimestampTest()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/50958", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public void CallstackTest_NotEmpty()
{
var cache = new TraceEventCache();
Assert.NotEmpty(cache.Callstack);
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/50958", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public void CallstackTest_ContainsExpectedFrames()
{
var cache = new TraceEventCache();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,7 @@ public void WriteFooterTest(TraceOptions opts, int flagCount)
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/50958", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
[MethodImpl(MethodImplOptions.NoInlining)]
public void WriteFooterTest_Callstack()
{
Expand Down
1 change: 1 addition & 0 deletions src/libraries/System.IO.Pipelines/tests/FlushAsyncTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public void FlushAsync_ReturnsCompletedTaskWhenMaxSizeIfZero()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/50959", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task FlushAsync_ThrowsIfWriterReaderWithException()
{
void ThrowTestException()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ void ThrowTestException(Exception ex, Action<Exception> catchAction)
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/50959", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task ReadAsync_ThrowsIfWriterCompletedWithException()
{
ThrowTestException(new InvalidOperationException("Writer exception"), e => _pipe.Writer.Complete(e));
Expand All @@ -232,6 +233,7 @@ public async Task ReadAsync_ThrowsIfWriterCompletedWithException()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/50959", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task WriteAsync_ThrowsIfReaderCompletedWithException()
{
ThrowTestException(new InvalidOperationException("Reader exception"), e => _pipe.Reader.Complete(e));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ namespace System.SpanTests
public static partial class MemoryMarshalTests
{
[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/50960", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public static void GetArrayDataReference_NullInput_ThrowsNullRef()
{
Assert.Throws<NullReferenceException>(() => MemoryMarshal.GetArrayDataReference((object[])null));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ private IEnumerable<XxxTag> GetTags()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/50714", typeof(PlatformDetection), nameof(PlatformDetection.IsBuiltWithAggressiveTrimming), nameof(PlatformDetection.IsBrowser))]
public void ValidateTagToTokenConversion()
{
foreach (var tag in GetTags())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
<GenerateDependencyFile>false</GenerateDependencyFile>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<NoWarn>$(NoWarn),SYSLIB0013</NoWarn>

<!-- these tests depend on the pdb files -->
<DebuggerSupport Condition="'$(DebuggerSupport)' == '' and '$(TargetOS)' == 'Browser'">true</DebuggerSupport>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(CommonTestPath)System\Reflection\MockParameterInfo.cs"
Expand Down Expand Up @@ -72,6 +75,8 @@
<WasmFilesToIncludeFromPublishDir Include="$(AssemblyName).pdb" />
</ItemGroup>
<ItemGroup>
<TrimmerRootAssembly Include="TestAssembly" />

<!-- Assemblies that should be excluded from the bundle -->
<__ExcludeFromBundle Include="TestAssembly.dll" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Collections;
using System.Collections.Generic;
using System.IO;
Expand Down Expand Up @@ -263,6 +264,7 @@ public static void Exception_Enumerator_Value()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/51833", typeof(PlatformDetection), nameof(PlatformDetection.IsBuiltWithAggressiveTrimming), nameof(PlatformDetection.IsBrowser))]
public static void ReadV1Resources()
{
//NOte: The below ByteStream was generated by V1 framework resource writer from the below dictionary
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Linq;
using System.Reflection;
using System.Runtime.CompilerServices;
Expand Down Expand Up @@ -1166,6 +1167,7 @@ public void Generic_ToString_Success()
}

[Theory]
[ActiveIssue("https://github.com/dotnet/runtime/issues/50722", typeof(PlatformDetection), nameof(PlatformDetection.IsBuiltWithAggressiveTrimming), nameof(PlatformDetection.IsBrowser))]
[InlineData(typeof(ValueTask))]
public void NonGeneric_AsyncMethodBuilderAttribute_ValueTaskAttributed(Type valueTaskType)
{
Expand All @@ -1178,6 +1180,7 @@ public void NonGeneric_AsyncMethodBuilderAttribute_ValueTaskAttributed(Type valu
}

[Theory]
[ActiveIssue("https://github.com/dotnet/runtime/issues/50722", typeof(PlatformDetection), nameof(PlatformDetection.IsBuiltWithAggressiveTrimming), nameof(PlatformDetection.IsBrowser))]
[InlineData(typeof(ValueTask<>))]
[InlineData(typeof(ValueTask<int>))]
[InlineData(typeof(ValueTask<string>))]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,7 @@ private static void TaskMethodBuilderT_UsesCompletedCache<T>(T result, bool shou
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/50968", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public static void Tcs_ValidateFaultedTask()
{
var tcs = new TaskCompletionSource<int>();
Expand All @@ -415,6 +416,7 @@ public static void Tcs_ValidateFaultedTask()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/50968", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public static void TaskMethodBuilder_ValidateFaultedTask()
{
var atmb = AsyncTaskMethodBuilder.Create();
Expand All @@ -424,6 +426,7 @@ public static void TaskMethodBuilder_ValidateFaultedTask()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/50968", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public static void TaskMethodBuilderT_ValidateFaultedTask()
{
var atmbtr = AsyncTaskMethodBuilder<object>.Create();
Expand All @@ -433,6 +436,7 @@ public static void TaskMethodBuilderT_ValidateFaultedTask()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/50968", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public static void TrackedSyncContext_ValidateException()
{
SynchronizationContext previousContext = SynchronizationContext.Current;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ public void SinglePhaseDurable(int volatileCount, EnlistmentOptions volatileEnli
}

[Theory]
[ActiveIssue("https://github.com/dotnet/runtime/issues/50969", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
// This test needs to change once we have promotion support.
// Right now any attempt to create a two phase durable enlistment will attempt to promote and will fail because promotion is not supported. This results in the transaction being
// aborted.
Expand Down
18 changes: 15 additions & 3 deletions src/libraries/tests.proj
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,21 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetOS)' == 'Browser' and '$(BuildAOTTestsOnHelix)' == 'true' and '$(RunDisabledWasmTests)' != 'true'">
<!-- Issue: https://github.com/dotnet/runtime/issues/51722 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Linq\tests\System.Linq.Tests.csproj" />

<!-- Issue: https://github.com/dotnet/runtime/issues/51677 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.csproj" />

<!-- Issue: https://github.com/dotnet/runtime/issues/50965 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.Encodings.Web\tests\System.Text.Encodings.Web.Tests.csproj" />

<!-- Issue: https://github.com/dotnet/runtime/issues/51037 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Collections/tests/System.Collections.Tests.csproj" />

<!-- Issue: https://github.com/dotnet/runtime/issues/50957 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Diagnostics.StackTrace\tests\System.Diagnostics.StackTrace.Tests.csproj" />

<!-- Issue: https://github.com/dotnet/runtime/issues/50705 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Linq.Expressions\tests\System.Linq.Expressions.Tests.csproj" />

Expand Down Expand Up @@ -280,16 +295,13 @@
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Composition\tests\System.Composition.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Dynamic.Runtime\tests\System.Dynamic.Runtime.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Net.Primitives\tests\FunctionalTests\System.Net.Primitives.Functional.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Resources.Reader\tests\System.Resources.Reader.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Runtime.Extensions\tests\System.Runtime.Extensions.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.DependencyInjection\tests\DI.Tests\Microsoft.Extensions.DependencyInjection.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Logging.EventSource\tests\Microsoft.Extensions.Logging.EventSource.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.VisualBasic.Core\tests\Microsoft.VisualBasic.Core.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Diagnostics.DiagnosticSource\tests\System.Diagnostics.DiagnosticSource.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Linq.Queryable\tests\System.Linq.Queryable.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Private.Xml\tests\XmlSerializer\ReflectionOnly\System.Xml.XmlSerializer.ReflectionOnly.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Private.Xml\tests\XmlSerializer\System.Xml.XmlSerializer.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Threading.Tasks.Extensions\tests\System.Threading.Tasks.Extensions.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.ObjectModel/tests/System.ObjectModel.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj" />

Expand Down
2 changes: 2 additions & 0 deletions src/mono/wasm/runtime/driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,8 @@ mono_wasm_load_runtime (const char *unused, int debug_level)
mono_wasm_install_get_native_to_interp_tramp (get_native_to_interp);

#ifdef ENABLE_AOT
monoeg_g_setenv ("MONO_AOT_MODE", "aot", 1);

// Defined in driver-gen.c
register_aot_modules ();
#ifdef EE_MODE_LLVMONLY_INTERP
Expand Down