diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/tests/XmlConfigurationTest.cs b/src/libraries/Microsoft.Extensions.Configuration.Xml/tests/XmlConfigurationTest.cs index 5e34cdc0ad4dab..b3e8e20401591e 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Xml/tests/XmlConfigurationTest.cs +++ b/src/libraries/Microsoft.Extensions.Configuration.Xml/tests/XmlConfigurationTest.cs @@ -432,7 +432,8 @@ public void XmlConfiguration_Does_Not_Throw_On_Optional_Configuration() var config = new ConfigurationBuilder().AddXmlFile("NotExistingConfig.xml", optional: true).Build(); } - [ConditionalFact] + [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/37669", TestPlatforms.Browser)] [FrameworkSkipCondition(RuntimeFrameworks.Mono)] public void LoadKeyValuePairsFromValidEncryptedXml() { diff --git a/src/libraries/Microsoft.Extensions.Configuration/tests/FunctionalTests/ConfigurationTests.cs b/src/libraries/Microsoft.Extensions.Configuration/tests/FunctionalTests/ConfigurationTests.cs index 70878278bef596..7e8940e57e3891 100644 --- a/src/libraries/Microsoft.Extensions.Configuration/tests/FunctionalTests/ConfigurationTests.cs +++ b/src/libraries/Microsoft.Extensions.Configuration/tests/FunctionalTests/ConfigurationTests.cs @@ -902,6 +902,7 @@ public void GetDefaultBasePathForSources() [Fact] [ActiveIssue("https://github.com/dotnet/runtime/issues/34580", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)] + [SkipOnMono("System.IO.FileSystem.Watcher is not supported on wasm", TestPlatforms.Browser)] public void CanEnumerateProviders() { var config = CreateBuilder() diff --git a/src/libraries/Microsoft.Extensions.DependencyModel/tests/AssemblyInfo.cs b/src/libraries/Microsoft.Extensions.DependencyModel/tests/AssemblyInfo.cs new file mode 100644 index 00000000000000..01510ab2d8b719 --- /dev/null +++ b/src/libraries/Microsoft.Extensions.DependencyModel/tests/AssemblyInfo.cs @@ -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. +// See the LICENSE file in the project root for more information. + +using System; +using Xunit; + +[assembly: ActiveIssue("https://github.com/dotnet/runtime/issues/37669", TestPlatforms.Browser)] \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/AssemblyInfo.cs b/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/AssemblyInfo.cs new file mode 100644 index 00000000000000..01510ab2d8b719 --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/AssemblyInfo.cs @@ -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. +// See the LICENSE file in the project root for more information. + +using System; +using Xunit; + +[assembly: ActiveIssue("https://github.com/dotnet/runtime/issues/37669", TestPlatforms.Browser)] \ No newline at end of file diff --git a/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems b/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems index fcd3398d24589e..8de0e0c72c96f3 100644 --- a/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems +++ b/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems @@ -44,6 +44,8 @@ + + diff --git a/src/libraries/System.Private.CoreLib/src/System/AppContext.AnyOS.cs b/src/libraries/System.Private.CoreLib/src/System/AppContext.AnyOS.cs new file mode 100644 index 00000000000000..f9d97fec05bf8f --- /dev/null +++ b/src/libraries/System.Private.CoreLib/src/System/AppContext.AnyOS.cs @@ -0,0 +1,26 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System.IO; +using System.Reflection; + +namespace System +{ + public static partial class AppContext + { + private static string GetBaseDirectoryCore() + { + // Fallback path for hosts that do not set APP_CONTEXT_BASE_DIRECTORY explicitly + string? directory = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location); + + if (directory == null) + return string.Empty; + + if (!Path.EndsInDirectorySeparator(directory)) + directory += PathInternal.DirectorySeparatorCharAsString; + + return directory; + } + } +} \ No newline at end of file diff --git a/src/libraries/System.Private.CoreLib/src/System/AppContext.Browser.cs b/src/libraries/System.Private.CoreLib/src/System/AppContext.Browser.cs new file mode 100644 index 00000000000000..c97cdc4bf76709 --- /dev/null +++ b/src/libraries/System.Private.CoreLib/src/System/AppContext.Browser.cs @@ -0,0 +1,16 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +namespace System +{ + public static partial class AppContext + { + private static string GetBaseDirectoryCore() + { + // GetEntryAssembly().Location returns an empty string for wasm + // Until that can be easily changed, work around the problem here. + return "/"; + } + } +} \ No newline at end of file diff --git a/src/libraries/System.Private.CoreLib/src/System/AppContext.cs b/src/libraries/System.Private.CoreLib/src/System/AppContext.cs index 90735669641622..f809eba655dd19 100644 --- a/src/libraries/System.Private.CoreLib/src/System/AppContext.cs +++ b/src/libraries/System.Private.CoreLib/src/System/AppContext.cs @@ -142,15 +142,6 @@ internal static unsafe void Setup(char** pNames, char** pValues, int count) s_dataStore.Add(new string(pNames[i]), new string(pValues[i])); } } - - private static string GetBaseDirectoryCore() - { - // Fallback path for hosts that do not set APP_CONTEXT_BASE_DIRECTORY explicitly - string? directory = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location); - if (directory != null && !Path.EndsInDirectorySeparator(directory)) - directory += PathInternal.DirectorySeparatorCharAsString; - return directory ?? string.Empty; - } #endif } } diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj index f5b47857a2c20a..2610a2937e76ae 100644 --- a/src/libraries/tests.proj +++ b/src/libraries/tests.proj @@ -31,14 +31,6 @@ - - - - - - - -