Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
ffc4fd3
[wasi] support builds with no relinking
radical Feb 4, 2023
e4c50c0
wasi: update main() to work for no relinking
radical Feb 4, 2023
e156ceb
enable only wasi builds
radical Feb 4, 2023
dec938c
wasi: fix command line for tests
radical Feb 4, 2023
9215e1a
Merge branch 'wasi-no-relink' into wasi-testing-only
radical Feb 5, 2023
ae474c3
Bring back the workaround for xharness, as the fix hasn't been merged…
radical Feb 6, 2023
ef08c08
Merge remote-tracking branch 'origin/main' into wasi-no-relink
radical Feb 6, 2023
88c5809
Merge branch 'wasi-no-relink' into wasi-testing-only
radical Feb 6, 2023
407abba
Merge remote-tracking branch 'origin/main' into wasi-testing-only
radical Feb 8, 2023
ce696bd
Merge remote-tracking branch 'rf/wasi-testing-only' into wasi-testing…
radical Feb 8, 2023
94e39b6
Merge remote-tracking branch 'origin/main' into wasi-testing-only
radical Feb 13, 2023
c57909b
Merge remote-tracking branch 'origin/main' into wasi-testing-only
radical Feb 23, 2023
b5f4b53
Merge remote-tracking branch 'origin/main' into wasi-testing-only
radical Feb 23, 2023
33ca0c0
Correctly set rid for ilproj on wasi
radical Feb 23, 2023
88fa3ec
Merge remote-tracking branch 'origin/main' into wasi-testing-only
radical Feb 23, 2023
6589ebe
[wasi] Disable `System.Formats.Cbor.Tests.CborWriterTests` - crypto not
radical Feb 24, 2023
8e311c1
disable wbt, and relinking tests
radical Feb 24, 2023
e408091
Enable assert messages for wasi
radical Feb 24, 2023
9e1c812
[wasi] Disable crypto tests - https://github.com/dotnet/runtime/issue…
radical Feb 24, 2023
a4647c2
Merge remote-tracking branch 'origin/main' into wasi-testing-only
radical Feb 24, 2023
58fe14a
[wasi] Disable `System.Net.Requests.Tests`
radical Feb 24, 2023
ec5ebb3
[wasi] Mark some libraries, and tests as not supported
radical Feb 24, 2023
15c382b
Add unsupportedOsPlatforms for wasi
radical Feb 28, 2023
af03d3f
Merge remote-tracking branch 'origin/main' into wasi-testing-only
radical Feb 28, 2023
9882b65
fix
radical Feb 28, 2023
d8c2ac1
Merge remote-tracking branch 'origin/main' into wasi-testing-only
radical Mar 1, 2023
fe0ef55
use new Operatingsystem.IsWasi api
radical Mar 1, 2023
426e2fe
fix
radical Mar 1, 2023
9b1c177
Merge remote-tracking branch 'origin/main' into wasi-testing-only
radical Mar 2, 2023
fd56488
wip
radical Mar 2, 2023
39de3be
wip
radical Mar 2, 2023
a6a1216
Merge remote-tracking branch 'origin/main' into wasi-testing-only
radical Mar 3, 2023
f8ba4c4
System.Security.Cryptography: compile same level of support as browse…
radical Mar 3, 2023
46da578
Disable some crypto tests for wasi, same as for browser
radical Mar 3, 2023
7ba14c3
Fix System.Formats.Asn1.Tests, and System.Formats.Cbor.Tests
radical Mar 3, 2023
f15b2ec
Merge remote-tracking branch 'origin/main' into wasi-testing-only
radical Mar 3, 2023
d47836e
Disable more library tests
radical Mar 3, 2023
fff7ce8
Set shouldContinueOnError for the test PR
radical Mar 3, 2023
97e05bc
[wasi] Copy WasmFilesToIncludeInFileSystem to the bundle too
radical Mar 3, 2023
4a5f9dc
[wasi] Enable System.IO.Packaging, and System.Data.DataSetExtensions …
radical Mar 3, 2023
142f851
[wasi] Copy WasmFilesToIncludeInFileSystem to the bundle too
radical Mar 3, 2023
5571eb5
[wasi] Enable System.IO.Packaging, and System.Data.DataSetExtensions …
radical Mar 3, 2023
db9ecc3
WasiAppBuilder: Create an empty /tmp
radical Mar 4, 2023
492ac11
Disable System.Runtime.Serialization.Xml.XsdDataContractExporterTests…
radical Mar 4, 2023
7e8fa16
Enable System.Runtime.Serialization.Xml.Tests, and System.Runtime.Ser…
radical Mar 4, 2023
fd8c44f
[wasi] Copy WasmFilesToIncludeInFileSystem to the bundle too
radical Mar 3, 2023
dac9582
wip
radical Mar 4, 2023
80d3107
Implement managed SegmentCommandLine (#82883)
huoyaoyuan Mar 3, 2023
da53a7e
[wasi] Enable System.IO.Packaging, and System.Data.DataSetExtensions …
radical Mar 3, 2023
f886a5e
WasiAppBuilder: Create an empty /tmp
radical Mar 4, 2023
1d30b3f
Enable System.Runtime.Serialization.Xml.Tests, and System.Runtime.Ser…
radical Mar 4, 2023
c7ecd57
Disable some System.Data.Common tests, matching browser
radical Mar 4, 2023
d4397cb
Merge remote-tracking branch 'rf/wasi-fixes' into wasi-testing-only
radical Mar 4, 2023
2dc02f0
Merge remote-tracking branch 'origin/main' into wasi-testing-only
radical Mar 4, 2023
a3bdf61
Merge remote-tracking branch 'origin/main' into wasi-testing-only
radical Mar 6, 2023
3530475
Disable Microsoft.Extensions.Configuration.FileExtensions.Tests as it…
radical Mar 6, 2023
c50f8b9
Throw PNSE for Path.GetTempFileName, and Directory.GetTempSubDirectory
radical Mar 6, 2023
ccd951b
Disable Microsoft.Extensions.Configuration.Functional.Tests as it dep…
radical Mar 6, 2023
9de5f1e
Disable Microsoft.Extensions.Configuration.UserSecrets.Tests - cannot…
radical Mar 6, 2023
17b4d1f
Merge remote-tracking branch 'origin/main' into wasi-testing-only
radical May 2, 2023
e60e270
Merge remote-tracking branch 'rf/wasi-testing-only' into wasi-testing…
radical May 2, 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
847 changes: 0 additions & 847 deletions eng/pipelines/common/platform-matrix.yml

Large diffs are not rendered by default.

31 changes: 20 additions & 11 deletions eng/pipelines/runtime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -499,25 +499,34 @@ extends:

# WASI/WASM

#- template: /eng/pipelines/common/templates/wasm-library-tests.yml
#parameters:
#platforms:
#- wasi_wasm
#- wasi_wasm_win
#nameSuffix: _Relinking
#extraBuildArgs: /p:EnableAggressiveTrimming=true /p:RunWasmSamples=true
#alwaysRun: true
#scenarios:
#- normal

- template: /eng/pipelines/common/templates/wasm-library-tests.yml
parameters:
platforms:
- wasi_wasm
- wasi_wasm_win
nameSuffix: '_Smoke'
extraBuildArgs: /p:EnableAggressiveTrimming=true /p:RunWasmSamples=true
shouldContinueOnError: true
shouldRunSmokeOnly: true
alwaysRun: ${{ variables.isRollingBuild }}
extraBuildArgs: /p:RunWasmSamples=true
shouldContinueOnError: false
alwaysRun: true
scenarios:
- normal

- template: /eng/pipelines/common/templates/wasm-build-tests.yml
parameters:
platforms:
- wasi_wasm
- wasi_wasm_win
alwaysRun: ${{ variables.isRollingBuild }}
#- template: /eng/pipelines/common/templates/wasm-build-tests.yml
#parameters:
#platforms:
#- wasi_wasm
#- wasi_wasm_win
#alwaysRun: ${{ variables.isRollingBuild }}

#
# iOS/tvOS devices - Full AOT + AggressiveTrimming to reduce size
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ public static partial class SP800108HmacCounterKdfTests
{
[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/68162", TestPlatforms.Browser)] // wasm threading support
[ActiveIssue("https://github.com/dotnet/runtime/issues/82561", TestPlatforms.Wasi)] // wasm threading support
public static void Race_ReusingOneInstance_Allocating()
{
using (SP800108HmacCounterKdf kdf = new("kdf"u8, HashAlgorithmName.SHA256))
Expand Down Expand Up @@ -55,6 +56,7 @@ public static void Race_ReusingOneInstance_Allocating()

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/68162", TestPlatforms.Browser)] // wasm threading support
[ActiveIssue("https://github.com/dotnet/runtime/issues/82561", TestPlatforms.Wasi)] // wasm threading support
public static void Race_ReusingOneInstance_Buffering()
{
using (SP800108HmacCounterKdf kdf = new("kdf"u8, HashAlgorithmName.SHA256))
Expand Down Expand Up @@ -128,6 +130,7 @@ public static void Race_ReusingOneInstance_Buffering()

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/68162", TestPlatforms.Browser)] // wasm threading support
[ActiveIssue("https://github.com/dotnet/runtime/issues/82561", TestPlatforms.Wasi)] // wasm threading support
public static void Race_UseAndDisposeOneInstance_Allocating()
{
SP800108HmacCounterKdf kdf;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ protected XmlDocumentDecryptor() { }
[System.Diagnostics.CodeAnalysis.RequiresDynamicCodeAttribute("Microsoft.Extensions.Configuration.Xml can use EncryptedXml which may contain XSLTs in the xml. XSLTs require dynamic code.")]
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute("Microsoft.Extensions.Configuration.Xml can use EncryptedXml. If you use encrypted XML files, your application might not have the algorithm implementations it needs. To avoid this problem, one option you can use is a DynamicDependency attribute to keep the algorithm implementations in your application.")]
[System.Runtime.Versioning.UnsupportedOSPlatformAttribute("browser")]
[System.Runtime.Versioning.UnsupportedOSPlatform("wasi")]
protected virtual System.Xml.XmlReader DecryptDocumentAndCreateXmlReader(System.Xml.XmlDocument document) { throw null; }
}
[System.Diagnostics.CodeAnalysis.RequiresDynamicCodeAttribute("Microsoft.Extensions.Configuration.Xml can use EncryptedXml which may contain XSLTs in the xml. XSLTs require dynamic code.")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ public XmlReader CreateDecryptingXmlReader(Stream input, XmlReaderSettings? sett
/// <param name="document">The document.</param>
/// <returns>An XmlReader which can read the document.</returns>
[UnsupportedOSPlatform("browser")]
[UnsupportedOSPlatform("wasi")]
[RequiresDynamicCode(RequiresDynamicCodeMessage)]
[RequiresUnreferencedCode(RequiresUnreferencedCodeMessage)]
protected virtual XmlReader DecryptDocumentAndCreateXmlReader(XmlDocument document)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ internal PhysicalFilesWatcher CreateFileWatcher()
FileSystemWatcher? watcher;
#if NETCOREAPP
// For browser/iOS/tvOS we will proactively fallback to polling since FileSystemWatcher is not supported.
if (OperatingSystem.IsBrowser() || (OperatingSystem.IsIOS() && !OperatingSystem.IsMacCatalyst()) || OperatingSystem.IsTvOS())
if (OperatingSystem.IsBrowser() || OperatingSystem.IsWasi() || (OperatingSystem.IsIOS() && !OperatingSystem.IsMacCatalyst()) || OperatingSystem.IsTvOS())
{
UsePollingFileWatcher = true;
UseActivePolling = true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public PhysicalFilesWatcher(
if (fileSystemWatcher != null)
{
#if NETCOREAPP
if (OperatingSystem.IsBrowser() || (OperatingSystem.IsIOS() && !OperatingSystem.IsMacCatalyst()) || OperatingSystem.IsTvOS())
if (OperatingSystem.IsBrowser() || OperatingSystem.IsWasi() || (OperatingSystem.IsIOS() && !OperatingSystem.IsMacCatalyst()) || OperatingSystem.IsTvOS())
{
throw new PlatformNotSupportedException(SR.Format(SR.FileSystemWatcher_PlatformNotSupported, typeof(FileSystemWatcher)));
}
Expand Down Expand Up @@ -272,6 +272,7 @@ protected virtual void Dispose(bool disposing)
}

[UnsupportedOSPlatform("browser")]
[UnsupportedOSPlatform("wasi")]
[UnsupportedOSPlatform("ios")]
[UnsupportedOSPlatform("tvos")]
[SupportedOSPlatform("maccatalyst")]
Expand Down Expand Up @@ -308,6 +309,7 @@ ex is DirectoryNotFoundException ||
}

[UnsupportedOSPlatform("browser")]
[UnsupportedOSPlatform("wasi")]
[UnsupportedOSPlatform("ios")]
[UnsupportedOSPlatform("tvos")]
[SupportedOSPlatform("maccatalyst")]
Expand All @@ -317,6 +319,7 @@ private void OnChanged(object sender, FileSystemEventArgs e)
}

[UnsupportedOSPlatform("browser")]
[UnsupportedOSPlatform("wasi")]
[UnsupportedOSPlatform("ios")]
[UnsupportedOSPlatform("tvos")]
[SupportedOSPlatform("maccatalyst")]
Expand All @@ -330,6 +333,7 @@ private void OnError(object sender, ErrorEventArgs e)
}

[UnsupportedOSPlatform("browser")]
[UnsupportedOSPlatform("wasi")]
[UnsupportedOSPlatform("ios")]
[UnsupportedOSPlatform("tvos")]
[SupportedOSPlatform("maccatalyst")]
Expand All @@ -356,6 +360,7 @@ ex is SecurityException ||
}

[UnsupportedOSPlatform("browser")]
[UnsupportedOSPlatform("wasi")]
[UnsupportedOSPlatform("ios")]
[UnsupportedOSPlatform("tvos")]
[SupportedOSPlatform("maccatalyst")]
Expand Down Expand Up @@ -396,6 +401,7 @@ private void ReportChangeForMatchedEntries(string path)
}

[UnsupportedOSPlatform("browser")]
[UnsupportedOSPlatform("wasi")]
[UnsupportedOSPlatform("ios")]
[UnsupportedOSPlatform("tvos")]
[SupportedOSPlatform("maccatalyst")]
Expand All @@ -417,6 +423,7 @@ private void TryDisableFileSystemWatcher()
}

[UnsupportedOSPlatform("browser")]
[UnsupportedOSPlatform("wasi")]
[UnsupportedOSPlatform("ios")]
[UnsupportedOSPlatform("tvos")]
[SupportedOSPlatform("maccatalyst")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public static partial class SystemdHelpers
}
[System.Runtime.Versioning.UnsupportedOSPlatformAttribute("android")]
[System.Runtime.Versioning.UnsupportedOSPlatformAttribute("browser")]
[System.Runtime.Versioning.UnsupportedOSPlatformAttribute("wasi")]
[System.Runtime.Versioning.UnsupportedOSPlatformAttribute("ios")]
[System.Runtime.Versioning.UnsupportedOSPlatformAttribute("maccatalyst")]
[System.Runtime.Versioning.UnsupportedOSPlatformAttribute("tvos")]
Expand All @@ -45,6 +46,7 @@ public void Dispose() { }
public System.Threading.Tasks.Task WaitForStartAsync(System.Threading.CancellationToken cancellationToken) { throw null; }
}
[System.Runtime.Versioning.UnsupportedOSPlatformAttribute("browser")]
[System.Runtime.Versioning.UnsupportedOSPlatformAttribute("wasi")]
public partial class SystemdNotifier : Microsoft.Extensions.Hosting.Systemd.ISystemdNotifier
{
public SystemdNotifier() { }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ namespace Microsoft.Extensions.Hosting.Systemd
/// </summary>
[UnsupportedOSPlatform("android")]
[UnsupportedOSPlatform("browser")]
[UnsupportedOSPlatform("wasi")]
[UnsupportedOSPlatform("ios")]
[UnsupportedOSPlatform("maccatalyst")]
[UnsupportedOSPlatform("tvos")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
namespace Microsoft.Extensions.Hosting.Systemd
{
[UnsupportedOSPlatform("browser")]
[UnsupportedOSPlatform("wasi")]
public class SystemdNotifier : ISystemdNotifier
{
private const string NOTIFY_SOCKET = "NOTIFY_SOCKET";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

Commonly Used Types:
System.Net.Http.IHttpClientFactory</PackageDescription>
<UnsupportedOSPlatforms>wasi</UnsupportedOSPlatforms>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@

using Xunit;

[assembly: SkipOnPlatform(TestPlatforms.Browser, "MSBuild is not supported on Browser")]
[assembly: SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.Wasi, "MSBuild is not supported on Browser/Wasi")]
4 changes: 2 additions & 2 deletions src/libraries/System.CodeDom/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<IncludePlatformAttributes>true</IncludePlatformAttributes>
<UnsupportedOSPlatforms>browser;ios;tvos;maccatalyst</UnsupportedOSPlatforms>
<UnsupportedOSPlatforms>browser;wasi;ios;tvos;maccatalyst</UnsupportedOSPlatforms>
</PropertyGroup>
</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2361,6 +2361,7 @@ public partial class ExtendedProtectionPolicyTypeConverter : System.ComponentMod
public ExtendedProtectionPolicyTypeConverter() { }
public override bool CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, [System.Diagnostics.CodeAnalysis.NotNullWhen(true)] System.Type? destinationType) { throw null; }
[System.Runtime.Versioning.UnsupportedOSPlatformAttribute("browser")]
[System.Runtime.Versioning.UnsupportedOSPlatformAttribute("wasi")]
public override object? ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type destinationType) { throw null; }
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public override bool CanConvertTo(ITypeDescriptorContext? context, [NotNullWhen(
}

[UnsupportedOSPlatform("browser")]
[UnsupportedOSPlatform("wasi")]
public override object? ConvertTo(ITypeDescriptorContext? context, CultureInfo? culture, object? value, Type destinationType)
{
if (destinationType == typeof(InstanceDescriptor))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ public void CanConvertTo_PositiveTests()
}

[Fact]
[SkipOnPlatform(TestPlatforms.Browser, "System.Net.Security is not supported on this platform.")]
[SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.Wasi, "System.Net.Security is not supported on this platform.")]
public void ConvertTo_NullTypeTests()
{
Assert.Throws<ArgumentNullException>(() => converter.ConvertTo(null, CultureInfo.InvariantCulture, new ExtendedProtectionPolicy(PolicyEnforcement.Never), null));
}

[Fact]
[SkipOnPlatform(TestPlatforms.Browser, "System.Net.Security is not supported on this platform.")]
[SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.Wasi, "System.Net.Security is not supported on this platform.")]
public void ConvertTo_PositiveTests()
{
ExtendedProtectionPolicy policy = new ExtendedProtectionPolicy(PolicyEnforcement.Never);
Expand All @@ -57,7 +57,7 @@ public void ConvertTo_PositiveTests()
}

[Theory]
[SkipOnPlatform(TestPlatforms.Browser, "System.Net.Security is not supported on this platform.")]
[SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.Wasi, "System.Net.Security is not supported on this platform.")]
[InlineData(typeof(int))]
[InlineData(typeof(ExtendedProtectionPolicy))]
[InlineData(typeof(bool))]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<IncludePlatformAttributes>true</IncludePlatformAttributes>
<UnsupportedOSPlatforms>browser</UnsupportedOSPlatforms>
<UnsupportedOSPlatforms>browser;wasi</UnsupportedOSPlatforms>
</PropertyGroup>
</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@

[assembly: CollectionBehavior(DisableTestParallelization = true, MaxParallelThreads = 1)]

[assembly: SkipOnPlatform(TestPlatforms.Browser, "System.Configuration.ConfigurationManager is not supported on Browser")]
[assembly: SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.Wasi, "System.Configuration.ConfigurationManager is not supported on Browser/Wasi")]
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public sealed class TestProviderFactory : DbProviderFactory
private TestProviderFactory() { }
}

[SkipOnPlatform(TestPlatforms.Browser, "Not supported on Browser.")]
[SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.Wasi, "Not supported on Browser/Wasi.")]
public class DbProviderFactoriesTests
{
[Fact]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace System.Data.Tests.Common
{
[SkipOnPlatform(TestPlatforms.Browser, "Not supported on Browser.")]
[SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.Wasi, "Not supported on Browser/Wasi.")]
public class DbProviderFactoryTest
{
[Fact]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace System.Data.Tests
{
[SkipOnPlatform(TestPlatforms.Browser, "Not supported on Browser.")]
[SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.Wasi, "Not supported on Browser/Wasi.")]
public class DataTableExtensionsTest
{
private DataTable _dt;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class FacadeTest
[Theory]
[InlineData("Microsoft.SqlServer.Server.SqlMetaData")] // Type from System.Data.SqlClient
[InlineData("System.Data.SqlTypes.SqlBytes")] // Type from System.Data.Common
[SkipOnPlatform(TestPlatforms.Browser, "Not supported on Browser.")]
[SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.Wasi, "Not supported on Browser/Wasi.")]
public void TestSystemData(string typeName)
{
// Verify that the type can be loaded via .NET Framework compat facade
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Data.Odbc/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<IncludePlatformAttributes>true</IncludePlatformAttributes>
<UnsupportedOSPlatforms>browser</UnsupportedOSPlatforms>
<UnsupportedOSPlatforms>browser;wasi</UnsupportedOSPlatforms>
</PropertyGroup>
</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
<IncludePlatformAttributes>true</IncludePlatformAttributes>
<UnsupportedOSPlatforms>browser</UnsupportedOSPlatforms>
<UnsupportedOSPlatforms>browser;wasi</UnsupportedOSPlatforms>
</PropertyGroup>
</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@

using Xunit;

[assembly: SkipOnPlatform(TestPlatforms.Browser, "System.Diagnostics.FileVersionInfo is not supported on Browser.")]
[assembly: SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.Wasi, "System.Diagnostics.FileVersionInfo is not supported on Browser/Wasi.")]
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
<IncludePlatformAttributes>true</IncludePlatformAttributes>
<UnsupportedOSPlatforms>browser</UnsupportedOSPlatforms>
<UnsupportedOSPlatforms>browser;wasi</UnsupportedOSPlatforms>
</PropertyGroup>
</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
// like the console code page and environment variables
[assembly: CollectionBehavior(CollectionBehavior.CollectionPerAssembly)]

[assembly: SkipOnPlatform(TestPlatforms.Browser, "System.Diagnostics.Process is not supported on Browser.")]
[assembly: SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.Wasi, "System.Diagnostics.Process is not supported on Browser/Wasi.")]
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ private void WriteEndHeader()
string? processName = s_processName;
if (processName is null)
{
if (OperatingSystem.IsBrowser()) // Process isn't supported on Browser
if (OperatingSystem.IsBrowser() || OperatingSystem.IsWasi()) // Process isn't supported on Browser, or Wasi
{
s_processName = processName = string.Empty;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<PropertyGroup>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
<IncludePlatformAttributes>true</IncludePlatformAttributes>
<UnsupportedOSPlatforms>browser;android;ios;tvos</UnsupportedOSPlatforms>
<UnsupportedOSPlatforms>browser;wasi;android;ios;tvos</UnsupportedOSPlatforms>
</PropertyGroup>
</Project>
8 changes: 8 additions & 0 deletions src/libraries/System.Drawing.Common/tests/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// 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 Xunit;

[assembly: ActiveIssue("https://github.com/dotnet/runtime/issues/35917", typeof(PlatformDetection), nameof(PlatformDetection.IsMonoInterpreter))]
[assembly: SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.Wasi, "System.Drawing.Common is not supported on Browser/Wasi")]
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,7 @@ public static void ReadNamedBitList_BitArray_7993Bits(AsnEncodingRules ruleSet)

[Theory]
[ActiveIssue("https://github.com/dotnet/runtime/issues/37669", TestPlatforms.Browser)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/82561", TestPlatforms.Wasi)]
[InlineData(AsnEncodingRules.BER)]
[InlineData(AsnEncodingRules.CER)]
[InlineData(AsnEncodingRules.DER)]
Expand Down Expand Up @@ -497,6 +498,7 @@ public static void VerifyReadNamedBitList_KeyUsage_OneByte(AsnEncodingRules rule

[Theory]
[ActiveIssue("https://github.com/dotnet/runtime/issues/37669", TestPlatforms.Browser)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/82561", TestPlatforms.Wasi)]
[InlineData(AsnEncodingRules.BER)]
[InlineData(AsnEncodingRules.CER)]
[InlineData(AsnEncodingRules.DER)]
Expand Down
Loading